From 88dc960af82573c6ba269a664eb719dcf051bb04 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Fri, 3 Jul 2026 09:03:53 -0400
Subject: [PATCH 01/82] refactor(core): migrate built-in tools to internal
 plugins (#34956)

---
 packages/core/src/location-services.ts        |  2 -
 packages/core/src/plugin/internal.ts          | 47 ++++++++++
 packages/core/src/tool/apply-patch.ts         | 22 ++---
 packages/core/src/tool/builtins.ts            | 51 -----------
 packages/core/src/tool/edit.ts                | 22 ++---
 packages/core/src/tool/grep.ts                | 22 ++---
 packages/core/src/tool/question.ts            | 22 ++---
 packages/core/src/tool/read.ts                | 36 +++-----
 packages/core/src/tool/skill.ts               | 22 ++---
 packages/core/src/tool/todowrite.ts           | 22 ++---
 packages/core/src/tool/webfetch.ts            | 23 ++---
 packages/core/src/tool/websearch.ts           | 20 ++---
 packages/core/src/tool/write.ts               | 22 ++---
 packages/core/test/lib/tool.ts                | 27 +++++-
 packages/core/test/location-layer.test.ts     | 22 ++++-
 .../core/test/session-instructions.test.ts    | 86 ++++++++++++-------
 packages/core/test/tool-apply-patch.test.ts   | 11 ++-
 packages/core/test/tool-edit.test.ts          | 11 ++-
 packages/core/test/tool-question.test.ts      | 11 ++-
 packages/core/test/tool-read.test.ts          | 21 ++++-
 packages/core/test/tool-skill.test.ts         | 12 ++-
 packages/core/test/tool-todowrite.test.ts     | 11 ++-
 packages/core/test/tool-webfetch.test.ts      | 11 ++-
 packages/core/test/tool-websearch.test.ts     | 11 ++-
 packages/core/test/tool-write.test.ts         | 11 ++-
 25 files changed, 310 insertions(+), 268 deletions(-)
 delete mode 100644 packages/core/src/tool/builtins.ts

diff --git a/packages/core/src/location-services.ts b/packages/core/src/location-services.ts
index 830b9b48be..b1749b34f7 100644
--- a/packages/core/src/location-services.ts
+++ b/packages/core/src/location-services.ts
@@ -41,7 +41,6 @@ import { InstructionContext } from "./instruction-context"
 import { SystemContextBuiltIns } from "./system-context/builtins"
 import { SessionContextEntry } from "./session/context-entry"
 import { SessionInstructions } from "./session/instructions"
-import { BuiltInTools } from "./tool/builtins"
 import { McpTool } from "./tool/mcp"
 import { ReadToolFileSystem } from "./tool/read-filesystem"
 import { ToolRegistry } from "./tool/registry"
@@ -89,7 +88,6 @@ export const locationServices = LayerNode.group([
   QuestionV2.node,
   Generate.node,
   ReadToolFileSystem.node,
-  BuiltInTools.node,
   McpTool.node,
   SessionInstructions.node,
   SessionRunnerModel.node,
diff --git a/packages/core/src/plugin/internal.ts b/packages/core/src/plugin/internal.ts
index f522e85a66..939bb4e731 100644
--- a/packages/core/src/plugin/internal.ts
+++ b/packages/core/src/plugin/internal.ts
@@ -15,9 +15,11 @@ import { ConfigProviderPlugin } from "../config/plugin/provider"
 import { ConfigReferencePlugin } from "../config/plugin/reference"
 import { ConfigSkillPlugin } from "../config/plugin/skill"
 import { EventV2 } from "../event"
+import { FileMutation } from "../file-mutation"
 import { FileSystem } from "../filesystem"
 import { FSUtil } from "../fs-util"
 import { Global } from "../global"
+import { Image } from "../image"
 import { Integration } from "../integration"
 import { Location } from "../location"
 import { LocationMutation } from "../location-mutation"
@@ -26,8 +28,11 @@ import { Npm } from "../npm"
 import { PluginV2 } from "../plugin"
 import { PluginRuntime } from "../plugin/runtime"
 import { PermissionV2 } from "../permission"
+import { QuestionV2 } from "../question"
 import { Reference } from "../reference"
 import { Ripgrep } from "../ripgrep"
+import { SessionInstructions } from "../session/instructions"
+import { SessionTodo } from "../session/todo"
 import { Shell } from "../shell"
 import { SkillV2 } from "../skill"
 import { State } from "../state"
@@ -41,9 +46,20 @@ import { ProviderPlugins } from "./provider"
 import { SdkPlugins } from "./sdk"
 import { SkillPlugin } from "./skill"
 import { VariantPlugin } from "./variant"
+import { ApplyPatchTool } from "../tool/apply-patch"
+import { EditTool } from "../tool/edit"
 import { GlobTool } from "../tool/glob"
+import { GrepTool } from "../tool/grep"
+import { QuestionTool } from "../tool/question"
+import { ReadTool } from "../tool/read"
+import { ReadToolFileSystem } from "../tool/read-filesystem"
 import { ShellTool } from "../tool/shell"
+import { SkillTool } from "../tool/skill"
 import { SubagentTool } from "../tool/subagent"
+import { TodoWriteTool } from "../tool/todowrite"
+import { WebFetchTool } from "../tool/webfetch"
+import { WebSearchTool } from "../tool/websearch"
+import { WriteTool } from "../tool/write"
 
 export type Requirements =
   | AgentV2.Service
@@ -51,10 +67,12 @@ export type Requirements =
   | CommandV2.Service
   | Config.Service
   | EventV2.Service
+  | FileMutation.Service
   | FileSystem.Service
   | FSUtil.Service
   | Global.Service
   | HttpClient.HttpClient
+  | Image.Service
   | Integration.Service
   | Location.Service
   | LocationMutation.Service
@@ -62,11 +80,16 @@ export type Requirements =
   | Npm.Service
   | PermissionV2.Service
   | PluginRuntime.Service
+  | QuestionV2.Service
+  | ReadToolFileSystem.Service
   | Reference.Service
   | Ripgrep.Service
+  | SessionInstructions.Service
+  | SessionTodo.Service
   | Shell.Service
   | SkillV2.Service
   | Tools.Service
+  | WebSearchTool.ConfigService
 
 export interface Plugin<R = never> {
   readonly id: string
@@ -96,13 +119,20 @@ const layer = Layer.effectDiscard(
       Context.make(Global.Service, yield* Global.Service),
       Context.make(HttpClient.HttpClient, yield* HttpClient.HttpClient),
       Context.make(LocationMutation.Service, yield* LocationMutation.Service),
+      Context.make(FileMutation.Service, yield* FileMutation.Service),
+      Context.make(Image.Service, yield* Image.Service),
       Context.make(PermissionV2.Service, yield* PermissionV2.Service),
+      Context.make(QuestionV2.Service, yield* QuestionV2.Service),
+      Context.make(ReadToolFileSystem.Service, yield* ReadToolFileSystem.Service),
+      Context.make(SessionInstructions.Service, yield* SessionInstructions.Service),
+      Context.make(SessionTodo.Service, yield* SessionTodo.Service),
       Context.make(SkillV2.Service, yield* SkillV2.Service),
       Context.make(Reference.Service, yield* Reference.Service),
       Context.make(Ripgrep.Service, yield* Ripgrep.Service),
       Context.make(Shell.Service, yield* Shell.Service),
       Context.make(Tools.Service, yield* Tools.Service),
       Context.make(PluginRuntime.Service, yield* PluginRuntime.Service),
+      Context.make(WebSearchTool.ConfigService, yield* WebSearchTool.ConfigService),
     )
     const add = (input: Plugin<Requirements | Scope.Scope>) =>
       plugin.add(PluginV2.ID.make(input.id), (context: PluginContext) =>
@@ -117,9 +147,19 @@ const layer = Layer.effectDiscard(
         yield* add(SkillPlugin.Plugin)
         yield* add(ModelsDevPlugin)
         yield* add(ConfigExternalPlugin.Plugin)
+        yield* add(ApplyPatchTool.Plugin)
+        yield* add(EditTool.Plugin)
         yield* add(GlobTool.Plugin)
+        yield* add(GrepTool.Plugin)
+        yield* add(QuestionTool.Plugin)
+        yield* add(ReadTool.Plugin)
         yield* add(ShellTool.Plugin)
+        yield* add(SkillTool.Plugin)
         yield* add(SubagentTool.Plugin)
+        yield* add(TodoWriteTool.Plugin)
+        yield* add(WebFetchTool.Plugin)
+        yield* add(WebSearchTool.Plugin)
+        yield* add(WriteTool.Plugin)
         yield* add(ConfigAgentPlugin.Plugin)
         yield* add(ConfigCommandPlugin.Plugin)
         yield* add(ConfigSkillPlugin.Plugin)
@@ -145,6 +185,8 @@ export const node = makeLocationNode({
     Config.node,
     Location.node,
     LocationMutation.node,
+    FileMutation.node,
+    Image.node,
     ModelsDev.node,
     Npm.node,
     EventV2.node,
@@ -153,6 +195,10 @@ export const node = makeLocationNode({
     Global.node,
     httpClient,
     PermissionV2.node,
+    QuestionV2.node,
+    ReadToolFileSystem.node,
+    SessionInstructions.node,
+    SessionTodo.node,
     SkillV2.node,
     Reference.node,
     Ripgrep.node,
@@ -160,5 +206,6 @@ export const node = makeLocationNode({
     ToolRegistry.toolsNode,
     PluginRuntime.node,
     SdkPlugins.node,
+    WebSearchTool.configNode,
   ],
 })
diff --git a/packages/core/src/tool/apply-patch.ts b/packages/core/src/tool/apply-patch.ts
index 3d7105a31a..2f481d8a0d 100644
--- a/packages/core/src/tool/apply-patch.ts
+++ b/packages/core/src/tool/apply-patch.ts
@@ -1,18 +1,16 @@
 export * as ApplyPatchTool from "./apply-patch"
 
+import type { PluginContext } from "@opencode-ai/plugin/v2/effect"
 import { ToolFailure } from "@opencode-ai/llm"
 import { FileDiff } from "@opencode-ai/schema/file-diff"
 import { createTwoFilesPatch, diffLines } from "diff"
-import { Effect, Layer, Schema } from "effect"
-import { makeLocationNode } from "../effect/app-node"
+import { Effect, Schema } from "effect"
 import { FileMutation } from "../file-mutation"
 import { FSUtil } from "../fs-util"
 import { LocationMutation } from "../location-mutation"
 import { Patch } from "../patch"
 import { PermissionV2 } from "../permission"
-import { ToolRegistry } from "./registry"
 import { Tool } from "./tool"
-import { Tools } from "./tools"
 
 export const name = "apply_patch"
 
@@ -56,15 +54,15 @@ type Prepared =
       readonly after: string
     })
 
-const layer = Layer.effectDiscard(
-  Effect.gen(function* () {
-    const tools = yield* Tools.Service
+export const Plugin = {
+  id: "core-apply-patch-tool",
+  effect: Effect.fn("ApplyPatchTool.Plugin")(function* (ctx: PluginContext) {
     const mutation = yield* LocationMutation.Service
     const files = yield* FileMutation.Service
     const fs = yield* FSUtil.Service
     const permission = yield* PermissionV2.Service
 
-    yield* tools
+    yield* ctx.tool
       .register({
         [name]: Tool.withPermission(
           Tool.make({
@@ -194,13 +192,7 @@ const layer = Layer.effectDiscard(
       })
       .pipe(Effect.orDie)
   }),
-)
-
-export const node = makeLocationNode({
-  name: "tool/apply-patch",
-  layer,
-  deps: [ToolRegistry.node, LocationMutation.node, FileMutation.node, FSUtil.node, PermissionV2.node],
-})
+}
 
 function patchFile(change: Prepared): typeof FileDiff.Info.Type {
   const counts = diffLines(change.before, change.after).reduce(
diff --git a/packages/core/src/tool/builtins.ts b/packages/core/src/tool/builtins.ts
deleted file mode 100644
index c72d07d0e7..0000000000
--- a/packages/core/src/tool/builtins.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-export * as BuiltInTools from "./builtins"
-
-import { makeLocationNode } from "../effect/app-node"
-import { Context, Layer } from "effect"
-import { ApplyPatchTool } from "./apply-patch"
-import { EditTool } from "./edit"
-import { GrepTool } from "./grep"
-import { QuestionTool } from "./question"
-import { ReadTool } from "./read"
-import { ReadToolFileSystem } from "./read-filesystem"
-import { SkillTool } from "./skill"
-import { TodoWriteTool } from "./todowrite"
-import { WebFetchTool } from "./webfetch"
-import { WebSearchTool } from "./websearch"
-import { WriteTool } from "./write"
-
-export class Service extends Context.Service<Service, Record<string, never>>()("@opencode/v2/BuiltInTools") {}
-
-/**
- * Composes only the shipped Location-scoped built-in tool transforms.
- * Each tool retains its implementation and focused tests independently. Dynamic
- * MCP and plugin tools later use separate scoped canonical registrations, while
- * provider/model filtering belongs to a future materialization phase rather
- * than this static list. The caller intentionally supplies shared Location
- * services once to this merged set.
- *
- * TODO: Port the remaining launch-follow-up leaves deliberately: edit fuzzy
- * parity, task, LSP,
- * repo_clone, repo_overview, plan_exit, and Rune/code mode. Keep MCP and plugin
- * transforms separate from this static built-in list.
- */
-const layer = Layer.succeed(Service, Service.of({}))
-
-export const node = makeLocationNode({
-  service: Service,
-  layer,
-  deps: [
-    ApplyPatchTool.node,
-    EditTool.node,
-    GrepTool.node,
-    QuestionTool.node,
-    ReadTool.node,
-    ReadToolFileSystem.node,
-    SkillTool.node,
-    TodoWriteTool.node,
-    WebFetchTool.node,
-    WebSearchTool.node,
-    WebSearchTool.configNode,
-    WriteTool.node,
-  ],
-})
diff --git a/packages/core/src/tool/edit.ts b/packages/core/src/tool/edit.ts
index f0bdb488a0..17ff28cfc1 100644
--- a/packages/core/src/tool/edit.ts
+++ b/packages/core/src/tool/edit.ts
@@ -6,18 +6,16 @@
  */
 export * as EditTool from "./edit"
 
+import type { PluginContext } from "@opencode-ai/plugin/v2/effect"
 import { ToolFailure } from "@opencode-ai/llm"
 import { FileDiff } from "@opencode-ai/schema/file-diff"
 import { createTwoFilesPatch, diffLines } from "diff"
-import { Effect, Layer, Schema } from "effect"
-import { makeLocationNode } from "../effect/app-node"
+import { Effect, Schema } from "effect"
 import { FileMutation } from "../file-mutation"
 import { FSUtil } from "../fs-util"
 import { LocationMutation } from "../location-mutation"
 import { PermissionV2 } from "../permission"
-import { ToolRegistry } from "./registry"
 import { Tool } from "./tool"
-import { Tools } from "./tools"
 
 export const name = "edit"
 
@@ -87,15 +85,15 @@ export const toModelOutput = (output: Output, oldString: string, newString: stri
 // TODO: Add snapshots / undo after design exists.
 // TODO: Add LSP notification and diagnostics after V2 LSP runtime exists.
 
-const layer = Layer.effectDiscard(
-  Effect.gen(function* () {
-    const tools = yield* Tools.Service
+export const Plugin = {
+  id: "core-edit-tool",
+  effect: Effect.fn("EditTool.Plugin")(function* (ctx: PluginContext) {
     const mutation = yield* LocationMutation.Service
     const files = yield* FileMutation.Service
     const fs = yield* FSUtil.Service
     const permission = yield* PermissionV2.Service
 
-    yield* tools
+    yield* ctx.tool
       .register({
         [name]: Tool.withPermission(
           Tool.make({
@@ -214,10 +212,4 @@ const layer = Layer.effectDiscard(
       })
       .pipe(Effect.orDie)
   }),
-)
-
-export const node = makeLocationNode({
-  name: "tool/edit",
-  layer,
-  deps: [ToolRegistry.node, LocationMutation.node, FileMutation.node, FSUtil.node, PermissionV2.node],
-})
+}
diff --git a/packages/core/src/tool/grep.ts b/packages/core/src/tool/grep.ts
index f455bd4c8a..e525606609 100644
--- a/packages/core/src/tool/grep.ts
+++ b/packages/core/src/tool/grep.ts
@@ -1,18 +1,16 @@
 export * as GrepTool from "./grep"
 
+import type { PluginContext } from "@opencode-ai/plugin/v2/effect"
 import { ToolFailure } from "@opencode-ai/llm"
-import { Effect, Layer, Schema } from "effect"
+import { Effect, Schema } from "effect"
 import path from "path"
-import { makeLocationNode } from "../effect/app-node"
 import { FileSystem } from "../filesystem"
 import { FSUtil } from "../fs-util"
 import { Location } from "../location"
 import { PermissionV2 } from "../permission"
 import { Ripgrep } from "../ripgrep"
 import { RelativePath } from "../schema"
-import { ToolRegistry } from "./registry"
 import { Tool } from "./tool"
-import { Tools } from "./tools"
 
 export const name = "grep"
 
@@ -50,15 +48,15 @@ export const toModelOutput = (output: ModelOutput) => {
 }
 
 /** Grep leaf that defaults its filesystem root to the active Location. */
-const layer = Layer.effectDiscard(
-  Effect.gen(function* () {
-    const tools = yield* Tools.Service
+export const Plugin = {
+  id: "core-grep-tool",
+  effect: Effect.fn("GrepTool.Plugin")(function* (ctx: PluginContext) {
     const fs = yield* FSUtil.Service
     const ripgrep = yield* Ripgrep.Service
     const location = yield* Location.Service
     const permission = yield* PermissionV2.Service
 
-    yield* tools
+    yield* ctx.tool
       .register({
         [name]: Tool.make({
           description:
@@ -128,10 +126,4 @@ const layer = Layer.effectDiscard(
       })
       .pipe(Effect.orDie)
   }),
-)
-
-export const node = makeLocationNode({
-  name: "tool/grep",
-  layer,
-  deps: [ToolRegistry.node, FSUtil.node, Ripgrep.node, Location.node, PermissionV2.node],
-})
+}
diff --git a/packages/core/src/tool/question.ts b/packages/core/src/tool/question.ts
index e5ae0d7426..218edb57e9 100644
--- a/packages/core/src/tool/question.ts
+++ b/packages/core/src/tool/question.ts
@@ -1,13 +1,11 @@
 export * as QuestionTool from "./question"
 
+import type { PluginContext } from "@opencode-ai/plugin/v2/effect"
 import { ToolFailure } from "@opencode-ai/llm"
-import { Effect, Layer, Schema } from "effect"
-import { makeLocationNode } from "../effect/app-node"
+import { Effect, Schema } from "effect"
 import { PermissionV2 } from "../permission"
 import { QuestionV2 } from "../question"
-import { ToolRegistry } from "./registry"
 import { Tool } from "./tool"
-import { Tools } from "./tools"
 
 export const name = "question"
 
@@ -44,13 +42,13 @@ export const toModelOutput = (
   return `User has answered your questions: ${formatted}. You can now continue with the user's answers in mind.`
 }
 
-const layer = Layer.effectDiscard(
-  Effect.gen(function* () {
-    const tools = yield* Tools.Service
+export const Plugin = {
+  id: "core-question-tool",
+  effect: Effect.fn("QuestionTool.Plugin")(function* (ctx: PluginContext) {
     const question = yield* QuestionV2.Service
     const permission = yield* PermissionV2.Service
 
-    yield* tools
+    yield* ctx.tool
       .register({
         [name]: Tool.make({
           description,
@@ -85,10 +83,4 @@ const layer = Layer.effectDiscard(
       })
       .pipe(Effect.orDie)
   }),
-)
-
-export const node = makeLocationNode({
-  name: "tool/question",
-  layer,
-  deps: [ToolRegistry.node, PermissionV2.node, QuestionV2.node],
-})
+}
diff --git a/packages/core/src/tool/read.ts b/packages/core/src/tool/read.ts
index c94418f94c..028456a4e1 100644
--- a/packages/core/src/tool/read.ts
+++ b/packages/core/src/tool/read.ts
@@ -1,9 +1,9 @@
 export * as ReadTool from "./read"
 
+import type { PluginContext } from "@opencode-ai/plugin/v2/effect"
 import { dirname } from "path"
 import { ToolFailure } from "@opencode-ai/llm"
-import { Effect, Layer, Schema } from "effect"
-import { makeLocationNode } from "../effect/app-node"
+import { Effect, Schema } from "effect"
 import { FileSystem } from "../filesystem"
 import { FSUtil } from "../fs-util"
 import { Image } from "../image"
@@ -13,9 +13,7 @@ import { PermissionV2 } from "../permission"
 import { SessionInstructions } from "../session/instructions"
 import { AbsolutePath } from "../schema"
 import { ReadToolFileSystem } from "./read-filesystem"
-import { ToolRegistry } from "./registry"
 import { Tool } from "./tool"
-import { Tools } from "./tools"
 
 export const name = "read"
 const FILENAME = "AGENTS.md"
@@ -32,9 +30,9 @@ const LocationInput = Schema.Struct({
 const Input = LocationInput
 const Output = Schema.Union([FileSystem.Content, ReadToolFileSystem.TextPage, ReadToolFileSystem.ListPage])
 
-const layer = Layer.effectDiscard(
-  Effect.gen(function* () {
-    const tools = yield* Tools.Service
+export const Plugin = {
+  id: "core-read-tool",
+  effect: Effect.fn("ReadTool.Plugin")(function* (ctx: PluginContext) {
     const reader = yield* ReadToolFileSystem.Service
     const mutation = yield* LocationMutation.Service
     const image = yield* Image.Service
@@ -43,7 +41,7 @@ const layer = Layer.effectDiscard(
     const fs = yield* FSUtil.Service
     const location = yield* Location.Service
 
-    yield* tools
+    yield* ctx.tool
       .register({
         [name]: Tool.make({
           description:
@@ -111,7 +109,10 @@ const layer = Layer.effectDiscard(
                 const candidates = discovered.map(FSUtil.resolve).filter((file) => dirname(file) !== root)
                 if (candidates.length === 0) return
                 yield* sessionInstructions.load({ sessionID: context.sessionID, paths: candidates })
-              }).pipe(Effect.catch(() => Effect.void), Effect.catchDefect(() => Effect.void))
+              }).pipe(
+                Effect.catch(() => Effect.void),
+                Effect.catchDefect(() => Effect.void),
+              )
               if ("encoding" in content && content.encoding === "base64" && SUPPORTED_IMAGE_MIMES.has(content.mime)) {
                 return yield* image
                   .normalize(resource, { ...content, encoding: "base64" })
@@ -137,19 +138,4 @@ const layer = Layer.effectDiscard(
       })
       .pipe(Effect.orDie)
   }),
-)
-
-export const node = makeLocationNode({
-  name: "tool/read",
-  layer,
-  deps: [
-    ToolRegistry.node,
-    ReadToolFileSystem.node,
-    LocationMutation.node,
-    Image.node,
-    PermissionV2.node,
-    SessionInstructions.node,
-    FSUtil.node,
-    Location.node,
-  ],
-})
+}
diff --git a/packages/core/src/tool/skill.ts b/packages/core/src/tool/skill.ts
index 1f8b122903..1c5d23a047 100644
--- a/packages/core/src/tool/skill.ts
+++ b/packages/core/src/tool/skill.ts
@@ -1,15 +1,13 @@
 export * as SkillTool from "./skill"
 
+import type { PluginContext } from "@opencode-ai/plugin/v2/effect"
 import path from "path"
 import { ToolFailure } from "@opencode-ai/llm"
-import { Effect, Layer, Schema } from "effect"
-import { makeLocationNode } from "../effect/app-node"
+import { Effect, Schema } from "effect"
 import { FSUtil } from "../fs-util"
 import { SkillV2 } from "../skill"
 import { PermissionV2 } from "../permission"
-import { ToolRegistry } from "./registry"
 import { Tool } from "./tool"
-import { Tools } from "./tools"
 
 export const name = "skill"
 const FILE_LIMIT = 10
@@ -54,13 +52,13 @@ export const toModelOutput = (skill: SkillV2.Info, files: ReadonlyArray<string>)
 const unableToLoad = (name: string, error?: unknown) =>
   new ToolFailure({ message: `Unable to load skill ${name}`, error })
 
-const layer = Layer.effectDiscard(
-  Effect.gen(function* () {
-    const tools = yield* Tools.Service
+export const Plugin = {
+  id: "core-skill-tool",
+  effect: Effect.fn("SkillTool.Plugin")(function* (ctx: PluginContext) {
     const fs = yield* FSUtil.Service
     const skills = yield* SkillV2.Service
     const permission = yield* PermissionV2.Service
-    yield* tools
+    yield* ctx.tool
       .register({
         [name]: Tool.make({
           description,
@@ -100,10 +98,4 @@ const layer = Layer.effectDiscard(
       })
       .pipe(Effect.orDie)
   }),
-)
-
-export const node = makeLocationNode({
-  name: "tool/skill",
-  layer,
-  deps: [ToolRegistry.node, FSUtil.node, SkillV2.node, PermissionV2.node],
-})
+}
diff --git a/packages/core/src/tool/todowrite.ts b/packages/core/src/tool/todowrite.ts
index bc1ba1fbb3..5f34ebd5aa 100644
--- a/packages/core/src/tool/todowrite.ts
+++ b/packages/core/src/tool/todowrite.ts
@@ -1,13 +1,11 @@
 export * as TodoWriteTool from "./todowrite"
 
+import type { PluginContext } from "@opencode-ai/plugin/v2/effect"
 import { ToolFailure } from "@opencode-ai/llm"
-import { Effect, Layer, Schema } from "effect"
-import { makeLocationNode } from "../effect/app-node"
+import { Effect, Schema } from "effect"
 import { PermissionV2 } from "../permission"
 import { SessionTodo } from "../session/todo"
-import { ToolRegistry } from "./registry"
 import { Tool } from "./tool"
-import { Tools } from "./tools"
 
 export const name = "todowrite"
 
@@ -22,13 +20,13 @@ export type Output = typeof Output.Type
 
 export const toModelOutput = (output: Output) => JSON.stringify(output.todos, null, 2)
 
-const layer = Layer.effectDiscard(
-  Effect.gen(function* () {
-    const tools = yield* Tools.Service
+export const Plugin = {
+  id: "core-todowrite-tool",
+  effect: Effect.fn("TodoWriteTool.Plugin")(function* (ctx: PluginContext) {
     const todos = yield* SessionTodo.Service
     const permission = yield* PermissionV2.Service
 
-    yield* tools
+    yield* ctx.tool
       .register({
         [name]: Tool.make({
           description:
@@ -53,10 +51,4 @@ const layer = Layer.effectDiscard(
       })
       .pipe(Effect.orDie)
   }),
-)
-
-export const node = makeLocationNode({
-  name: "tool/todowrite",
-  layer,
-  deps: [ToolRegistry.node, PermissionV2.node, SessionTodo.node],
-})
+}
diff --git a/packages/core/src/tool/webfetch.ts b/packages/core/src/tool/webfetch.ts
index d3889d6a7a..efac4a2a75 100644
--- a/packages/core/src/tool/webfetch.ts
+++ b/packages/core/src/tool/webfetch.ts
@@ -1,17 +1,14 @@
 export * as WebFetchTool from "./webfetch"
 
+import type { PluginContext } from "@opencode-ai/plugin/v2/effect"
 import { ToolFailure } from "@opencode-ai/llm"
-import { Duration, Effect, Layer, Schema } from "effect"
+import { Duration, Effect, Schema } from "effect"
 import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
 import { Parser } from "htmlparser2"
 import TurndownService from "turndown"
-import { makeLocationNode } from "../effect/app-node"
-import { LayerNodePlatform } from "../effect/app-node-platform"
 import { PermissionV2 } from "../permission"
 import { collectBoundedResponseBody } from "./http-body"
-import { ToolRegistry } from "./registry"
 import { Tool } from "./tool"
-import { Tools } from "./tools"
 
 export const name = "webfetch"
 export const MAX_RESPONSE_BYTES = 5 * 1024 * 1024
@@ -115,13 +112,13 @@ const convert = (content: string, contentType: string, format: Format) => {
   return content
 }
 
-const layer = Layer.effectDiscard(
-  Effect.gen(function* () {
-    const tools = yield* Tools.Service
+export const Plugin = {
+  id: "core-webfetch-tool",
+  effect: Effect.fn("WebFetchTool.Plugin")(function* (ctx: PluginContext) {
     const http = yield* HttpClient.HttpClient
     const permission = yield* PermissionV2.Service
 
-    yield* tools
+    yield* ctx.tool
       .register({
         [name]: Tool.make({
           description,
@@ -178,13 +175,7 @@ const layer = Layer.effectDiscard(
       })
       .pipe(Effect.orDie)
   }),
-)
-
-export const node = makeLocationNode({
-  name: "tool/webfetch",
-  layer,
-  deps: [ToolRegistry.node, PermissionV2.node, LayerNodePlatform.httpClient],
-})
+}
 
 export function extractTextFromHTML(html: string) {
   let text = ""
diff --git a/packages/core/src/tool/websearch.ts b/packages/core/src/tool/websearch.ts
index 6d62236316..80a2422cee 100644
--- a/packages/core/src/tool/websearch.ts
+++ b/packages/core/src/tool/websearch.ts
@@ -1,19 +1,17 @@
 export * as WebSearchTool from "./websearch"
 
+import type { PluginContext } from "@opencode-ai/plugin/v2/effect"
 import { ToolFailure } from "@opencode-ai/llm"
 import { Context, Duration, Effect, Layer, Schema } from "effect"
 import { HttpClient, HttpClientRequest } from "effect/unstable/http"
 import { makeLocationNode } from "../effect/app-node"
-import { LayerNodePlatform } from "../effect/app-node-platform"
 import { truthy } from "../flag/flag"
 import { InstallationVersion } from "../installation/version"
 import { PositiveInt } from "../schema"
 import { PermissionV2 } from "../permission"
 import { Tool } from "./tool"
-import { Tools } from "./tools"
 import { collectBoundedResponseBody } from "./http-body"
 import { checksum } from "../util/encode"
-import { ToolRegistry } from "./registry"
 
 export const name = "websearch"
 export const NO_RESULTS = "No search results found. Please try a different query."
@@ -189,14 +187,14 @@ const Output = Schema.Struct({
   text: Schema.String,
 })
 
-const layer = Layer.effectDiscard(
-  Effect.gen(function* () {
-    const tools = yield* Tools.Service
+export const Plugin = {
+  id: "core-websearch-tool",
+  effect: Effect.fn("WebSearchTool.Plugin")(function* (ctx: PluginContext) {
     const http = yield* HttpClient.HttpClient
     const config = yield* ConfigService
     const permission = yield* PermissionV2.Service
 
-    yield* tools
+    yield* ctx.tool
       .register({
         [name]: Tool.make({
           description,
@@ -251,10 +249,4 @@ const layer = Layer.effectDiscard(
       })
       .pipe(Effect.orDie)
   }),
-)
-
-export const node = makeLocationNode({
-  name: "tool/websearch",
-  layer,
-  deps: [ToolRegistry.node, PermissionV2.node, LayerNodePlatform.httpClient, configNode],
-})
+}
diff --git a/packages/core/src/tool/write.ts b/packages/core/src/tool/write.ts
index 39ad0b20fb..73885b2187 100644
--- a/packages/core/src/tool/write.ts
+++ b/packages/core/src/tool/write.ts
@@ -6,15 +6,13 @@
  */
 export * as WriteTool from "./write"
 
+import type { PluginContext } from "@opencode-ai/plugin/v2/effect"
 import { ToolFailure } from "@opencode-ai/llm"
-import { Effect, Layer, Schema } from "effect"
-import { makeLocationNode } from "../effect/app-node"
+import { Effect, Schema } from "effect"
 import { FileMutation } from "../file-mutation"
 import { LocationMutation } from "../location-mutation"
 import { PermissionV2 } from "../permission"
-import { ToolRegistry } from "./registry"
 import { Tool } from "./tool"
-import { Tools } from "./tools"
 
 export const name = "write"
 
@@ -44,14 +42,14 @@ export const toModelOutput = (output: Output) =>
 // TODO: Add snapshots / undo after design exists.
 // TODO: Add LSP notification and diagnostics after V2 LSP runtime exists.
 
-const layer = Layer.effectDiscard(
-  Effect.gen(function* () {
-    const tools = yield* Tools.Service
+export const Plugin = {
+  id: "core-write-tool",
+  effect: Effect.fn("WriteTool.Plugin")(function* (ctx: PluginContext) {
     const mutation = yield* LocationMutation.Service
     const files = yield* FileMutation.Service
     const permission = yield* PermissionV2.Service
 
-    yield* tools
+    yield* ctx.tool
       .register({
         [name]: Tool.withPermission(
           Tool.make({
@@ -92,10 +90,4 @@ const layer = Layer.effectDiscard(
       })
       .pipe(Effect.orDie)
   }),
-)
-
-export const node = makeLocationNode({
-  name: "tool/write",
-  layer,
-  deps: [ToolRegistry.node, LocationMutation.node, FileMutation.node, PermissionV2.node],
-})
+}
diff --git a/packages/core/test/lib/tool.ts b/packages/core/test/lib/tool.ts
index fa625a591b..74c1b710ab 100644
--- a/packages/core/test/lib/tool.ts
+++ b/packages/core/test/lib/tool.ts
@@ -2,7 +2,9 @@ import { AgentV2 } from "@opencode-ai/core/agent"
 import type { PermissionV2 } from "@opencode-ai/core/permission"
 import { SessionMessage } from "@opencode-ai/core/session/message"
 import { ToolRegistry } from "@opencode-ai/core/tool/registry"
-import { Effect } from "effect"
+import { Tools } from "@opencode-ai/core/tool/tools"
+import type { PluginContext } from "@opencode-ai/plugin/v2/effect"
+import { Effect, type Scope } from "effect"
 
 export const toolIdentity = {
   agent: AgentV2.ID.make("build"),
@@ -34,6 +36,29 @@ export function waitForTool(
   })
 }
 
+/**
+ * Registers a core tool plugin's tools against the real registry without booting the
+ * full plugin host. Only the tool domain is live; focused tool tests exercise
+ * registration, materialization, and settlement through the same path production uses.
+ */
+export const registerToolPlugin = <R>(plugin: {
+  readonly id: string
+  readonly effect: (context: PluginContext) => Effect.Effect<void, never, R>
+}): Effect.Effect<void, never, R | Tools.Service | Scope.Scope> =>
+  Effect.gen(function* () {
+    const tools = yield* Tools.Service
+    const context: Pick<PluginContext, "tool"> = {
+      tool: {
+        register: tools.register,
+        execute: {
+          before: () => Effect.die("registerToolPlugin does not support tool hooks"),
+          after: () => Effect.die("registerToolPlugin does not support tool hooks"),
+        },
+      },
+    }
+    yield* plugin.effect(context as PluginContext)
+  })
+
 export const settleTool = (registry: ToolRegistry.Interface, input: ToolRegistry.ExecuteInput, model = testModel) =>
   registry.materialize({ model }).pipe(Effect.flatMap((materialized) => materialized.settle(input)))
 
diff --git a/packages/core/test/location-layer.test.ts b/packages/core/test/location-layer.test.ts
index a6a2c18fa8..77b7207c42 100644
--- a/packages/core/test/location-layer.test.ts
+++ b/packages/core/test/location-layer.test.ts
@@ -73,9 +73,25 @@ describe("LocationServiceMap", () => {
               const catalog = yield* Catalog.Service
               yield* catalog.transform((editor) => editor.provider.update(ProviderV2.ID.make("test"), () => {}))
               const registry = yield* ToolRegistry.Service
-              yield* waitForTool(registry, "glob")
-              yield* waitForTool(registry, "shell")
-              yield* waitForTool(registry, "subagent")
+              // Tool plugins register during the forked PluginInternal boot; wait for
+              // every expected tool rather than relying on batch ordering.
+              yield* Effect.forEach(
+                [
+                  "edit",
+                  "glob",
+                  "grep",
+                  "question",
+                  "read",
+                  "shell",
+                  "skill",
+                  "subagent",
+                  "todowrite",
+                  "webfetch",
+                  "websearch",
+                  "write",
+                ],
+                (name) => waitForTool(registry, name),
+              )
               return {
                 providers: yield* catalog.provider.all(),
                 tools: yield* toolDefinitions(registry),
diff --git a/packages/core/test/session-instructions.test.ts b/packages/core/test/session-instructions.test.ts
index b9e401be4b..e87fce7234 100644
--- a/packages/core/test/session-instructions.test.ts
+++ b/packages/core/test/session-instructions.test.ts
@@ -33,8 +33,24 @@ import { ToolHooks } from "@opencode-ai/core/tool/hooks"
 import { ToolOutputStore } from "@opencode-ai/core/tool-output-store"
 import { ToolRegistry } from "@opencode-ai/core/tool/registry"
 import { tempLocationLayer } from "./fixture/location"
+import { makeLocationNode } from "@opencode-ai/core/effect/app-node"
 import { testEffect } from "./lib/effect"
-import { settleTool, testModel } from "./lib/tool"
+import { registerToolPlugin, settleTool, testModel } from "./lib/tool"
+
+const readToolNode = makeLocationNode({
+  name: "test/read-tool-plugin",
+  layer: Layer.effectDiscard(registerToolPlugin(ReadTool.Plugin)),
+  deps: [
+    ToolRegistry.toolsNode,
+    ReadToolFileSystem.node,
+    LocationMutation.node,
+    Image.node,
+    PermissionV2.node,
+    SessionInstructions.node,
+    FSUtil.node,
+    Location.node,
+  ],
+})
 
 const projects = Layer.succeed(
   ProjectV2.Service,
@@ -69,7 +85,7 @@ const testLayer = AppNodeBuilder.build(
     FSUtil.node,
     LocationMutation.node,
     ReadToolFileSystem.node,
-    ReadTool.node,
+    readToolNode,
     ToolRegistry.node,
     ToolRegistry.toolsNode,
     ToolHooks.node,
@@ -156,7 +172,9 @@ describe("SessionInstructions", () => {
       expect(firstInjected[0]!.text).toBe(
         `Instructions from: ${deepPath}\ndeep-instructions\n\nInstructions from: ${subPath}\nsub-instructions`,
       )
-      expect(firstInjected[0]!.description).toBe(`Loaded ${path.relative(dir, deepPath)}, ${path.relative(dir, subPath)}`)
+      expect(firstInjected[0]!.description).toBe(
+        `Loaded ${path.relative(dir, deepPath)}, ${path.relative(dir, subPath)}`,
+      )
       // The synthetic's metadata carries the durable dedup ledger.
       expect(firstInjected[0]!.metadata).toEqual({ instruction: { paths: [deepPath, subPath] } })
       expect(firstInjected[0]!.text).not.toContain("root-instructions")
@@ -192,47 +210,49 @@ describe("SessionInstructions", () => {
       // Seed the durable history with a prior synthetic that already claims sub's AGENTS.md
       // via the instruction metadata ledger.
       yield* seedSynthetic(sessionID, [subPath])
-      expect((yield* synthetics(sessionID))).toHaveLength(1)
+      expect(yield* synthetics(sessionID)).toHaveLength(1)
 
       yield* settleTool(registry, readCall(sessionID, "call-sub", "sub/file.txt"))
 
       // The durable claim on the prior synthetic prevents re-injection; no new synthetic.
-      expect((yield* synthetics(sessionID))).toHaveLength(1)
+      expect(yield* synthetics(sessionID)).toHaveLength(1)
     }),
   )
 
-  it.effect("discovers AGENTS.md on a directory listing, including the listed directory's own, and dedups with a later file read", () =>
-    Effect.gen(function* () {
-      const location = yield* Location.Service
-      const dir = location.directory
-      const rootPath = path.resolve(dir, "AGENTS.md")
-      const pkgPath = path.resolve(dir, "packages", "foo", "AGENTS.md")
-      yield* mkdir(path.resolve(dir, "packages", "foo"))
-      yield* writeAgents(rootPath, "root-instructions")
-      yield* writeAgents(pkgPath, "pkg-instructions")
-      yield* Effect.promise(() => fs.writeFile(path.resolve(dir, "packages", "foo", "file.txt"), "content"))
+  it.effect(
+    "discovers AGENTS.md on a directory listing, including the listed directory's own, and dedups with a later file read",
+    () =>
+      Effect.gen(function* () {
+        const location = yield* Location.Service
+        const dir = location.directory
+        const rootPath = path.resolve(dir, "AGENTS.md")
+        const pkgPath = path.resolve(dir, "packages", "foo", "AGENTS.md")
+        yield* mkdir(path.resolve(dir, "packages", "foo"))
+        yield* writeAgents(rootPath, "root-instructions")
+        yield* writeAgents(pkgPath, "pkg-instructions")
+        yield* Effect.promise(() => fs.writeFile(path.resolve(dir, "packages", "foo", "file.txt"), "content"))
 
-      const session = yield* SessionV2.Service
-      const registry = yield* ToolRegistry.Service
-      const sessionID = (yield* session.create({ location: Location.Ref.make({ directory: dir }) })).id
+        const session = yield* SessionV2.Service
+        const registry = yield* ToolRegistry.Service
+        const sessionID = (yield* session.create({ location: Location.Ref.make({ directory: dir }) })).id
 
-      // Listing packages/foo/ discovers its own AGENTS.md, walking up to but excluding
-      // the Location root (already supplied by the core/instructions baseline).
-      yield* settleTool(registry, readCall(sessionID, "call-list", "packages/foo"))
+        // Listing packages/foo/ discovers its own AGENTS.md, walking up to but excluding
+        // the Location root (already supplied by the core/instructions baseline).
+        yield* settleTool(registry, readCall(sessionID, "call-list", "packages/foo"))
 
-      const firstInjected = yield* synthetics(sessionID)
-      expect(firstInjected).toHaveLength(1)
-      expect(firstInjected[0]!.text).toBe(`Instructions from: ${pkgPath}\npkg-instructions`)
-      expect(firstInjected[0]!.description).toBe(`Loaded ${path.relative(dir, pkgPath)}`)
-      expect(firstInjected[0]!.metadata).toEqual({ instruction: { paths: [pkgPath] } })
-      expect(firstInjected[0]!.text).not.toContain("root-instructions")
+        const firstInjected = yield* synthetics(sessionID)
+        expect(firstInjected).toHaveLength(1)
+        expect(firstInjected[0]!.text).toBe(`Instructions from: ${pkgPath}\npkg-instructions`)
+        expect(firstInjected[0]!.description).toBe(`Loaded ${path.relative(dir, pkgPath)}`)
+        expect(firstInjected[0]!.metadata).toEqual({ instruction: { paths: [pkgPath] } })
+        expect(firstInjected[0]!.text).not.toContain("root-instructions")
 
-      // A subsequent file read under the listed directory is a dedup: pkg's AGENTS.md is
-      // already injected for this session, so nothing new is emitted.
-      yield* settleTool(registry, readCall(sessionID, "call-file", "packages/foo/file.txt"))
+        // A subsequent file read under the listed directory is a dedup: pkg's AGENTS.md is
+        // already injected for this session, so nothing new is emitted.
+        yield* settleTool(registry, readCall(sessionID, "call-file", "packages/foo/file.txt"))
 
-      expect((yield* synthetics(sessionID))).toHaveLength(1)
-    }),
+        expect(yield* synthetics(sessionID)).toHaveLength(1)
+      }),
   )
 
   it.effect("listing the Location root directory injects no instructions", () =>
@@ -253,7 +273,7 @@ describe("SessionInstructions", () => {
       // dropped by the dirname filter, and up() only walks upward so nested dirs are unseen.
       yield* settleTool(registry, readCall(sessionID, "call-root-list", "."))
 
-      expect((yield* synthetics(sessionID))).toHaveLength(0)
+      expect(yield* synthetics(sessionID)).toHaveLength(0)
     }),
   )
 
diff --git a/packages/core/test/tool-apply-patch.test.ts b/packages/core/test/tool-apply-patch.test.ts
index 8084cbc24e..a717b799e3 100644
--- a/packages/core/test/tool-apply-patch.test.ts
+++ b/packages/core/test/tool-apply-patch.test.ts
@@ -16,8 +16,15 @@ import { ToolOutputStore } from "@opencode-ai/core/tool-output-store"
 import { ApplyPatchTool } from "@opencode-ai/core/tool/apply-patch"
 import { location } from "./fixture/location"
 import { tmpdir } from "./fixture/tmpdir"
+import { makeLocationNode } from "@opencode-ai/core/effect/app-node"
 import { testEffect } from "./lib/effect"
-import { toolIdentity, executeTool, settleTool, toolDefinitions } from "./lib/tool"
+import { toolIdentity, executeTool, registerToolPlugin, settleTool, toolDefinitions } from "./lib/tool"
+
+const applyPatchToolNode = makeLocationNode({
+  name: "test/apply-patch-tool-plugin",
+  layer: Layer.effectDiscard(registerToolPlugin(ApplyPatchTool.Plugin)),
+  deps: [ToolRegistry.toolsNode, LocationMutation.node, FileMutation.node, FSUtil.node, PermissionV2.node],
+})
 
 const sessionID = SessionV2.ID.make("ses_apply_patch_tool_test")
 const assertions: PermissionV2.AssertInput[] = []
@@ -101,7 +108,7 @@ const withTool = <A, E, R>(directory: string, body: (registry: ToolRegistry.Inte
           ToolRegistry.toolsNode,
           LocationMutation.node,
           FileMutation.node,
-          ApplyPatchTool.node,
+          applyPatchToolNode,
         ]),
         [
           [FSUtil.node, filesystem],
diff --git a/packages/core/test/tool-edit.test.ts b/packages/core/test/tool-edit.test.ts
index 2c684523b7..9df73c9b7d 100644
--- a/packages/core/test/tool-edit.test.ts
+++ b/packages/core/test/tool-edit.test.ts
@@ -17,8 +17,15 @@ import { ToolOutputStore } from "@opencode-ai/core/tool-output-store"
 import { EditTool } from "@opencode-ai/core/tool/edit"
 import { location } from "./fixture/location"
 import { tmpdir } from "./fixture/tmpdir"
+import { makeLocationNode } from "@opencode-ai/core/effect/app-node"
 import { testEffect } from "./lib/effect"
-import { toolIdentity, executeTool, settleTool, toolDefinitions } from "./lib/tool"
+import { toolIdentity, executeTool, registerToolPlugin, settleTool, toolDefinitions } from "./lib/tool"
+
+const editToolNode = makeLocationNode({
+  name: "test/edit-tool-plugin",
+  layer: Layer.effectDiscard(registerToolPlugin(EditTool.Plugin)),
+  deps: [ToolRegistry.toolsNode, LocationMutation.node, FileMutation.node, FSUtil.node, PermissionV2.node],
+})
 
 const sessionID = SessionV2.ID.make("ses_edit_tool_test")
 const assertions: PermissionV2.AssertInput[] = []
@@ -91,7 +98,7 @@ const withTool = <A, E, R>(directory: string, body: (registry: ToolRegistry.Inte
           ToolRegistry.toolsNode,
           LocationMutation.node,
           FileMutation.node,
-          EditTool.node,
+          editToolNode,
         ]),
         [
           [FSUtil.node, filesystem],
diff --git a/packages/core/test/tool-question.test.ts b/packages/core/test/tool-question.test.ts
index 5c5c95da61..dc01563022 100644
--- a/packages/core/test/tool-question.test.ts
+++ b/packages/core/test/tool-question.test.ts
@@ -9,7 +9,8 @@ import { ToolRegistry } from "@opencode-ai/core/tool/registry"
 import { QuestionTool } from "@opencode-ai/core/tool/question"
 import { ToolOutputStore } from "@opencode-ai/core/tool-output-store"
 import { testEffect } from "./lib/effect"
-import { toolIdentity, executeTool, settleTool, toolDefinitions } from "./lib/tool"
+import { makeLocationNode } from "@opencode-ai/core/effect/app-node"
+import { toolIdentity, executeTool, registerToolPlugin, settleTool, toolDefinitions } from "./lib/tool"
 
 const sessionID = SessionV2.ID.make("ses_question_tool_test")
 const assertions: PermissionV2.AssertInput[] = []
@@ -43,8 +44,14 @@ const question = Layer.succeed(
     list: () => Effect.die("unused"),
   }),
 )
+const questionToolNode = makeLocationNode({
+  name: "test/question-tool-plugin",
+  layer: Layer.effectDiscard(registerToolPlugin(QuestionTool.Plugin)),
+  deps: [ToolRegistry.toolsNode, PermissionV2.node, QuestionV2.node],
+})
+
 const it = testEffect(
-  AppNodeBuilder.build(LayerNode.group([ToolRegistry.node, ToolRegistry.toolsNode, QuestionTool.node]), [
+  AppNodeBuilder.build(LayerNode.group([ToolRegistry.node, ToolRegistry.toolsNode, questionToolNode]), [
     [PermissionV2.node, permission],
     [QuestionV2.node, question],
     [ToolOutputStore.node, ToolOutputStore.nodeWithoutConfig],
diff --git a/packages/core/test/tool-read.test.ts b/packages/core/test/tool-read.test.ts
index 3c94888d57..f6f60df485 100644
--- a/packages/core/test/tool-read.test.ts
+++ b/packages/core/test/tool-read.test.ts
@@ -19,8 +19,25 @@ import { ToolRegistry } from "@opencode-ai/core/tool/registry"
 import { ToolOutputStore } from "@opencode-ai/core/tool-output-store"
 import { ReadTool } from "@opencode-ai/core/tool/read"
 import { ReadToolFileSystem } from "@opencode-ai/core/tool/read-filesystem"
+import { makeLocationNode } from "@opencode-ai/core/effect/app-node"
+import { SessionInstructions } from "@opencode-ai/core/session/instructions"
 import { testEffect } from "./lib/effect"
-import { toolIdentity, executeTool, settleTool, toolDefinitions } from "./lib/tool"
+import { toolIdentity, executeTool, registerToolPlugin, settleTool, toolDefinitions } from "./lib/tool"
+
+const readToolNode = makeLocationNode({
+  name: "test/read-tool-plugin",
+  layer: Layer.effectDiscard(registerToolPlugin(ReadTool.Plugin)),
+  deps: [
+    ToolRegistry.toolsNode,
+    ReadToolFileSystem.node,
+    LocationMutation.node,
+    Image.node,
+    PermissionV2.node,
+    SessionInstructions.node,
+    FSUtil.node,
+    Location.node,
+  ],
+})
 
 const assertions: PermissionV2.AssertInput[] = []
 const missingPath = "__missing_read_target__.txt"
@@ -130,7 +147,7 @@ const unavailableImage = Layer.succeed(
   Image.Service.of({ normalize: () => Effect.fail(new Image.ResizerUnavailableError()) }),
 )
 const readLayer = (imageLayer: Layer.Layer<Image.Service>) =>
-  AppNodeBuilder.build(LayerNode.group([ToolRegistry.node, ToolRegistry.toolsNode, ReadTool.node]), [
+  AppNodeBuilder.build(LayerNode.group([ToolRegistry.node, ToolRegistry.toolsNode, readToolNode]), [
     [ReadToolFileSystem.node, reader],
     [PermissionV2.node, permission],
     [Config.node, config],
diff --git a/packages/core/test/tool-skill.test.ts b/packages/core/test/tool-skill.test.ts
index 4831acb799..23e51f6d08 100644
--- a/packages/core/test/tool-skill.test.ts
+++ b/packages/core/test/tool-skill.test.ts
@@ -13,7 +13,15 @@ import { ToolRegistry } from "@opencode-ai/core/tool/registry"
 import { ToolOutputStore } from "@opencode-ai/core/tool-output-store"
 import { tmpdir } from "./fixture/tmpdir"
 import { it } from "./lib/effect"
-import { toolIdentity, executeTool, settleTool, toolDefinitions } from "./lib/tool"
+import { makeLocationNode } from "@opencode-ai/core/effect/app-node"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { toolIdentity, executeTool, registerToolPlugin, settleTool, toolDefinitions } from "./lib/tool"
+
+const skillToolNode = makeLocationNode({
+  name: "test/skill-tool-plugin",
+  layer: Layer.effectDiscard(registerToolPlugin(SkillTool.Plugin)),
+  deps: [ToolRegistry.toolsNode, FSUtil.node, SkillV2.node, PermissionV2.node],
+})
 
 const sessionID = SessionV2.ID.make("ses_skill_tool_test")
 
@@ -66,7 +74,7 @@ describe("SkillTool", () => {
             }),
           )
           const skillToolLayer = AppNodeBuilder.build(
-            LayerNode.group([ToolRegistry.node, ToolRegistry.toolsNode, SkillTool.node]),
+            LayerNode.group([ToolRegistry.node, ToolRegistry.toolsNode, skillToolNode]),
             [
               [PermissionV2.node, permission],
               [SkillV2.node, skills],
diff --git a/packages/core/test/tool-todowrite.test.ts b/packages/core/test/tool-todowrite.test.ts
index 170d1230a3..977ece9fc8 100644
--- a/packages/core/test/tool-todowrite.test.ts
+++ b/packages/core/test/tool-todowrite.test.ts
@@ -15,7 +15,14 @@ import { TodoWriteTool } from "@opencode-ai/core/tool/todowrite"
 import { ToolRegistry } from "@opencode-ai/core/tool/registry"
 import { ToolOutputStore } from "@opencode-ai/core/tool-output-store"
 import { testEffect } from "./lib/effect"
-import { toolIdentity, executeTool, settleTool, toolDefinitions } from "./lib/tool"
+import { makeLocationNode } from "@opencode-ai/core/effect/app-node"
+import { toolIdentity, executeTool, registerToolPlugin, settleTool, toolDefinitions } from "./lib/tool"
+
+const todoWriteToolNode = makeLocationNode({
+  name: "test/todowrite-tool-plugin",
+  layer: Layer.effectDiscard(registerToolPlugin(TodoWriteTool.Plugin)),
+  deps: [ToolRegistry.toolsNode, PermissionV2.node, SessionTodo.node],
+})
 
 const sessionID = SessionV2.ID.make("ses_todowrite_tool_test")
 const assertions: PermissionV2.AssertInput[] = []
@@ -43,7 +50,7 @@ const it = testEffect(
       SessionTodo.node,
       ToolRegistry.node,
       ToolRegistry.toolsNode,
-      TodoWriteTool.node,
+      todoWriteToolNode,
     ]),
     [
       [PermissionV2.node, permission],
diff --git a/packages/core/test/tool-webfetch.test.ts b/packages/core/test/tool-webfetch.test.ts
index 2fe46f0ae5..421c09f876 100644
--- a/packages/core/test/tool-webfetch.test.ts
+++ b/packages/core/test/tool-webfetch.test.ts
@@ -10,8 +10,15 @@ import { SessionV2 } from "@opencode-ai/core/session"
 import { ToolRegistry } from "@opencode-ai/core/tool/registry"
 import { WebFetchTool } from "@opencode-ai/core/tool/webfetch"
 import { ToolOutputStore } from "@opencode-ai/core/tool-output-store"
+import { makeLocationNode } from "@opencode-ai/core/effect/app-node"
 import { testEffect } from "./lib/effect"
-import { toolIdentity, executeTool, settleTool, toolDefinitions } from "./lib/tool"
+import { toolIdentity, executeTool, registerToolPlugin, settleTool, toolDefinitions } from "./lib/tool"
+
+const webFetchToolNode = makeLocationNode({
+  name: "test/webfetch-tool-plugin",
+  layer: Layer.effectDiscard(registerToolPlugin(WebFetchTool.Plugin)),
+  deps: [ToolRegistry.toolsNode, PermissionV2.node, LayerNodePlatform.httpClient],
+})
 
 const sessionID = SessionV2.ID.make("ses_webfetch_test")
 const requests: Array<{ readonly url: string; readonly headers: Record<string, string> }> = []
@@ -40,7 +47,7 @@ const permission = Layer.succeed(
   }),
 )
 const toolLayer = (replacements: LayerNode.Replacements = []) =>
-  AppNodeBuilder.build(LayerNode.group([ToolRegistry.node, ToolRegistry.toolsNode, WebFetchTool.node]), [
+  AppNodeBuilder.build(LayerNode.group([ToolRegistry.node, ToolRegistry.toolsNode, webFetchToolNode]), [
     [PermissionV2.node, permission],
     [ToolOutputStore.node, ToolOutputStore.nodeWithoutConfig],
     ...replacements,
diff --git a/packages/core/test/tool-websearch.test.ts b/packages/core/test/tool-websearch.test.ts
index 0b99a80ecb..53984ef69b 100644
--- a/packages/core/test/tool-websearch.test.ts
+++ b/packages/core/test/tool-websearch.test.ts
@@ -9,8 +9,15 @@ import { SessionV2 } from "@opencode-ai/core/session"
 import { ToolRegistry } from "@opencode-ai/core/tool/registry"
 import { WebSearchTool } from "@opencode-ai/core/tool/websearch"
 import { ToolOutputStore } from "@opencode-ai/core/tool-output-store"
+import { makeLocationNode } from "@opencode-ai/core/effect/app-node"
 import { testEffect } from "./lib/effect"
-import { toolIdentity, executeTool, settleTool, toolDefinitions } from "./lib/tool"
+import { toolIdentity, executeTool, registerToolPlugin, settleTool, toolDefinitions } from "./lib/tool"
+
+const webSearchToolNode = makeLocationNode({
+  name: "test/websearch-tool-plugin",
+  layer: Layer.effectDiscard(registerToolPlugin(WebSearchTool.Plugin)),
+  deps: [ToolRegistry.toolsNode, PermissionV2.node, LayerNodePlatform.httpClient, WebSearchTool.configNode],
+})
 
 const sessionID = SessionV2.ID.make("ses_websearch_test")
 const payload = (text: string) =>
@@ -125,7 +132,7 @@ const websearchConfig = Layer.succeed(
 )
 const it = testEffect(
   AppNodeBuilder.build(
-    LayerNode.group([ToolRegistry.node, ToolRegistry.toolsNode, WebSearchTool.configNode, WebSearchTool.node]),
+    LayerNode.group([ToolRegistry.node, ToolRegistry.toolsNode, WebSearchTool.configNode, webSearchToolNode]),
     [
       [PermissionV2.node, permission],
       [LayerNodePlatform.httpClient, http],
diff --git a/packages/core/test/tool-write.test.ts b/packages/core/test/tool-write.test.ts
index 2bd950f8a0..80fb011cc2 100644
--- a/packages/core/test/tool-write.test.ts
+++ b/packages/core/test/tool-write.test.ts
@@ -17,8 +17,15 @@ import { ToolOutputStore } from "@opencode-ai/core/tool-output-store"
 import { WriteTool } from "@opencode-ai/core/tool/write"
 import { location } from "./fixture/location"
 import { tmpdir } from "./fixture/tmpdir"
+import { makeLocationNode } from "@opencode-ai/core/effect/app-node"
 import { testEffect } from "./lib/effect"
-import { toolIdentity, executeTool, settleTool, toolDefinitions } from "./lib/tool"
+import { toolIdentity, executeTool, registerToolPlugin, settleTool, toolDefinitions } from "./lib/tool"
+
+const writeToolNode = makeLocationNode({
+  name: "test/write-tool-plugin",
+  layer: Layer.effectDiscard(registerToolPlugin(WriteTool.Plugin)),
+  deps: [ToolRegistry.toolsNode, LocationMutation.node, FileMutation.node, PermissionV2.node],
+})
 
 const sessionID = SessionV2.ID.make("ses_write_tool_test")
 const assertions: PermissionV2.AssertInput[] = []
@@ -75,7 +82,7 @@ const withTool = <A, E, R>(directory: string, body: (registry: ToolRegistry.Inte
           ToolRegistry.toolsNode,
           LocationMutation.node,
           FileMutation.node,
-          WriteTool.node,
+          writeToolNode,
         ]),
         [
           [FSUtil.node, filesystem],

From 698ef25f3320dece7fed7e31c4948dfe371dbd10 Mon Sep 17 00:00:00 2001
From: Simon Klee <hello@simonklee.dk>
Date: Fri, 3 Jul 2026 15:38:54 +0200
Subject: [PATCH 02/82] fix(run): use parentID filter for subagent hydration
 (#35168)

---
 .../src/cli/cmd/run/stream-v2.subagent.ts     |  4 ++--
 .../test/cli/run/stream-v2.transport.test.ts  | 21 +++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts b/packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts
index 1988d18d89..eac116b0b8 100644
--- a/packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts
+++ b/packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts
@@ -657,8 +657,8 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
       // Family index: adopt children directly from the current session list so
       // historical subagents beyond the projected message window still get tabs.
       const family = await input.sdk.v2.session
-        .list({ limit: FAMILY_LIST_LIMIT, order: "desc" }, { throwOnError: true })
-        .then((response) => response.data.data.filter((session) => session.parentID === input.sessionID))
+        .list({ parentID: input.sessionID, limit: FAMILY_LIST_LIMIT, order: "desc" }, { throwOnError: true })
+        .then((response) => response.data.data)
         .catch(() => [])
       for (const session of family) {
         const child = ensureChild(session.id)
diff --git a/packages/opencode/test/cli/run/stream-v2.transport.test.ts b/packages/opencode/test/cli/run/stream-v2.transport.test.ts
index c09617701f..7c2fc9f70e 100644
--- a/packages/opencode/test/cli/run/stream-v2.transport.test.ts
+++ b/packages/opencode/test/cli/run/stream-v2.transport.test.ts
@@ -119,11 +119,20 @@ function sdk(input: {
   // The generated methods have conditional return types for throwOnError; the
   // minimal shapes below are enough for family discovery and model fallback.
   spyOn(client.v2.session, "list").mockImplementation(
-    () =>
-      ok({
+    (request) => {
+      const parentID = request?.parentID
+      return ok({
         location: { directory: "/tmp", project: { id: "proj_1", directory: "/tmp" } },
-        data: input.sessions ?? [],
-      }) as never,
+        data:
+          input.sessions?.filter((session) =>
+            parentID === undefined
+              ? true
+              : parentID === null
+                ? session.parentID === undefined
+                : session.parentID === parentID,
+          ) ?? [],
+      }) as never
+    },
   )
   spyOn(client.v2.model, "default").mockImplementation(
     () =>
@@ -1237,6 +1246,10 @@ describe("V2 mini transport", () => {
       footer: ui.api,
     })
     const states = ui.events.flatMap((event) => (event.type === "stream.subagent" ? [event.state] : []))
+    expect(client.v2.session.list).toHaveBeenCalledWith(
+      { parentID: "ses_1", limit: 100, order: "desc" },
+      { throwOnError: true },
+    )
     expect(states.at(-1)?.tabs).toMatchObject([
       {
         sessionID: "ses_child_old",

From 1fa605ad5ec1712de1490302f3b867b94b93171f Mon Sep 17 00:00:00 2001
From: Simon Klee <hello@simonklee.dk>
Date: Fri, 3 Jul 2026 16:35:19 +0200
Subject: [PATCH 03/82] fix(run): handle unattended form blockers (#35170)

---
 packages/opencode/src/cli/cmd/run.ts          |   1 +
 .../src/cli/cmd/run/noninteractive.ts         |  38 +++++-
 .../test/cli/run/noninteractive.test.ts       | 121 ++++++++++++++++++
 3 files changed, 156 insertions(+), 4 deletions(-)
 create mode 100644 packages/opencode/test/cli/run/noninteractive.test.ts

diff --git a/packages/opencode/src/cli/cmd/run.ts b/packages/opencode/src/cli/cmd/run.ts
index fc495213c4..f56775e26c 100644
--- a/packages/opencode/src/cli/cmd/run.ts
+++ b/packages/opencode/src/cli/cmd/run.ts
@@ -958,6 +958,7 @@ export const RunCommand = effectCmd({
                 thinking,
                 format: args.format === "json" ? "json" : "default",
                 dangerouslySkipPermissions: args["dangerously-skip-permissions"],
+                attached: Boolean(args.attach),
                 renderTool: tool,
                 renderToolError: toolError,
               })
diff --git a/packages/opencode/src/cli/cmd/run/noninteractive.ts b/packages/opencode/src/cli/cmd/run/noninteractive.ts
index 440436c704..fe6b95267c 100644
--- a/packages/opencode/src/cli/cmd/run/noninteractive.ts
+++ b/packages/opencode/src/cli/cmd/run/noninteractive.ts
@@ -33,6 +33,8 @@ type Input = {
   thinking: boolean
   format: "default" | "json"
   dangerouslySkipPermissions: boolean
+  /** True when the client is attached to a shared server rather than an exclusive in-process one. */
+  attached: boolean
   renderTool: (part: ToolPart) => Promise<void>
   renderToolError: (part: ToolPart) => Promise<void>
 }
@@ -50,6 +52,13 @@ type ToolState = StartedPart & {
   provider?: unknown
 }
 
+type FormRequest = Extract<V2Event, { type: "form.created" }>["data"]["form"]
+
+// MCP elicitations are temporarily owned by the "global" sentinel instead of a real
+// session. An exclusive local process may treat them as this run's blockers; an
+// attached client must not cancel input that may belong to another session.
+const GLOBAL_FORM_SESSION_ID = "global"
+
 export async function runNonInteractivePrompt(input: Input) {
   const controller = new AbortController()
   const events = await input.client.v2.event.subscribe({
@@ -69,6 +78,7 @@ export async function runNonInteractivePrompt(input: Input) {
   let emittedError = false
   let questionRejected = false
   let permissionRejected = false
+  let formCancelled = false
   let interrupted = false
   let admission: AbortController | undefined
 
@@ -117,6 +127,11 @@ export async function runNonInteractivePrompt(input: Input) {
     await input.client.v2.session.question.reject({ sessionID: input.sessionID, requestID: request.id }).catch(() => {})
   }
 
+  const cancelForm = async (request: Pick<FormRequest, "id" | "sessionID">) => {
+    formCancelled = true
+    await input.client.v2.session.form.cancel({ sessionID: request.sessionID, formID: request.id }).catch(() => {})
+  }
+
   const consume = async () => {
     while (!controller.signal.aborted) {
       const next = await stream.next()
@@ -131,6 +146,15 @@ export async function runNonInteractivePrompt(input: Input) {
         await rejectQuestion(event.data)
         continue
       }
+      if (
+        event.type === "form.created" &&
+        submitted &&
+        (event.data.form.sessionID === input.sessionID ||
+          (!input.attached && event.data.form.sessionID === GLOBAL_FORM_SESSION_ID))
+      ) {
+        await cancelForm(event.data.form)
+        continue
+      }
       if (!("sessionID" in event.data) || event.data.sessionID !== input.sessionID) continue
       const time = "timestamp" in event.data ? toMillis(event.data.timestamp) : Date.now()
 
@@ -144,7 +168,7 @@ export async function runNonInteractivePrompt(input: Input) {
       if (
         event.type === "session.next.execution.settled" &&
         event.data.outcome === "interrupted" &&
-        (interrupted || permissionRejected || questionRejected)
+        (interrupted || permissionRejected || questionRejected || formCancelled)
       ) {
         return
       }
@@ -320,14 +344,14 @@ export async function runNonInteractivePrompt(input: Input) {
         continue
       }
       if (event.type === "session.next.step.failed") {
-        if (interrupted || permissionRejected || questionRejected) continue
+        if (interrupted || permissionRejected || questionRejected || formCancelled) continue
         emittedError = true
         process.exitCode = 1
         if (!emit("error", time, { error: event.data.error })) UI.error(event.data.error.message)
         continue
       }
       if (event.type === "session.next.execution.settled") {
-        if (event.data.outcome === "failure" && !emittedError && !questionRejected) {
+        if (event.data.outcome === "failure" && !emittedError && !questionRejected && !formCancelled) {
           emittedError = true
           process.exitCode = 1
           const error = event.data.error ?? { type: "unknown", message: "Session execution failed" }
@@ -406,13 +430,19 @@ export async function runNonInteractivePrompt(input: Input) {
     if (!response.data.data) throw new Error("Prompt was not admitted")
     if (interrupted) await input.client.v2.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
 
-    const [permissions, questions] = await Promise.all([
+    const [permissions, questions, forms] = await Promise.all([
       input.client.v2.session.permission.list({ sessionID: input.sessionID }).catch(() => undefined),
       input.client.v2.session.question.list({ sessionID: input.sessionID }).catch(() => undefined),
+      Promise.all(
+        (input.attached ? [input.sessionID] : [input.sessionID, GLOBAL_FORM_SESSION_ID]).map((sessionID) =>
+          input.client.v2.session.form.list({ sessionID }).catch(() => undefined),
+        ),
+      ),
     ])
     await Promise.all([
       ...(permissions?.data?.data ?? []).map(replyPermission),
       ...(questions?.data?.data ?? []).map(rejectQuestion),
+      ...forms.flatMap((response) => response?.data?.data ?? []).map(cancelForm),
     ])
     await completed
   } finally {
diff --git a/packages/opencode/test/cli/run/noninteractive.test.ts b/packages/opencode/test/cli/run/noninteractive.test.ts
new file mode 100644
index 0000000000..15cf799c75
--- /dev/null
+++ b/packages/opencode/test/cli/run/noninteractive.test.ts
@@ -0,0 +1,121 @@
+import { afterEach, describe, expect, mock, spyOn, test } from "bun:test"
+import { OpencodeClient, type V2Event } from "@opencode-ai/sdk/v2"
+import { runNonInteractivePrompt } from "@/cli/cmd/run/noninteractive"
+
+type FormInfo = Extract<V2Event, { type: "form.created" }>["data"]["form"]
+
+function ok<T>(data: T) {
+  return Promise.resolve({
+    data,
+    error: undefined,
+    request: new Request("https://opencode.test"),
+    response: new Response(),
+  })
+}
+
+function form(id: string, sessionID: string): FormInfo {
+  return { id, sessionID, mode: "form", fields: [] }
+}
+
+function formCreated(info: FormInfo): V2Event {
+  return { id: `evt_${info.id}`, type: "form.created", data: { form: info } }
+}
+
+function prompted(messageID: string): V2Event {
+  return {
+    id: "evt_prompted",
+    type: "session.next.prompted",
+    data: { timestamp: 1, sessionID: "ses_1", messageID, prompt: { text: "hello" }, delivery: "steer" },
+  }
+}
+
+function settled(outcome: "success" | "interrupted" = "success"): V2Event {
+  return {
+    id: "evt_settled",
+    type: "session.next.execution.settled",
+    data: { timestamp: 2, sessionID: "ses_1", outcome },
+  }
+}
+
+// Runs one non-interactive prompt against a mocked SDK. `turn` produces the
+// live events the prompt admission triggers, keyed by the generated message ID.
+async function run(input: {
+  turn: (messageID: string) => V2Event[]
+  pendingForms?: FormInfo[]
+  attached?: boolean
+}) {
+  const sdk = new OpencodeClient()
+  const values: V2Event[] = [{ id: "evt_connected", type: "server.connected", data: {} }]
+  let wake: (() => void) | undefined
+  const stream = (async function* (): AsyncGenerator<V2Event, void, unknown> {
+    while (true) {
+      const value = values.shift()
+      if (!value) {
+        await new Promise<void>((resolve) => {
+          wake = resolve
+        })
+        continue
+      }
+      yield value
+    }
+  })()
+  spyOn(sdk.v2.event, "subscribe").mockImplementation(
+    () => Promise.resolve({ stream }) as ReturnType<typeof sdk.v2.event.subscribe>,
+  )
+  spyOn(sdk.v2.session.permission, "list").mockImplementation(() => ok({ data: [] }) as never)
+  spyOn(sdk.v2.session.question, "list").mockImplementation(() => ok({ data: [] }) as never)
+  spyOn(sdk.v2.session.form, "list").mockImplementation((request) =>
+    ok({ data: input.pendingForms?.filter((item) => item.sessionID === request.sessionID) ?? [] }) as never,
+  )
+  spyOn(sdk.v2.session.form, "cancel").mockImplementation(() => ok(undefined) as never)
+  spyOn(sdk.v2.session, "prompt").mockImplementation((request) => {
+    const messageID = request.id ?? "msg_prompt"
+    values.push(...input.turn(messageID))
+    wake?.()
+    wake = undefined
+    return ok({ data: { admittedSeq: 1, id: messageID, sessionID: "ses_1", timeCreated: 1 } }) as never
+  })
+  await runNonInteractivePrompt({
+    client: sdk,
+    sessionID: "ses_1",
+    message: "hello",
+    files: [],
+    thinking: false,
+    format: "default",
+    dangerouslySkipPermissions: false,
+    attached: input.attached ?? false,
+    renderTool: () => Promise.resolve(),
+    renderToolError: () => Promise.resolve(),
+  })
+  return sdk
+}
+
+afterEach(() => {
+  mock.restore()
+})
+
+describe("runNonInteractivePrompt", () => {
+  test("cancels session and global form blockers and exits on pre-promotion interrupt", async () => {
+    const sdk = await run({
+      pendingForms: [form("frm_pending", "ses_1"), form("frm_pending_global", "global")],
+      // No prompted event: the execution settles interrupted before promotion,
+      // which must not leave the consume loop waiting forever.
+      turn: () => [formCreated(form("frm_live", "global")), settled("interrupted")],
+    })
+    expect(sdk.v2.session.form.cancel).toHaveBeenCalledWith({ sessionID: "global", formID: "frm_live" })
+    expect(sdk.v2.session.form.cancel).toHaveBeenCalledWith({ sessionID: "ses_1", formID: "frm_pending" })
+    expect(sdk.v2.session.form.cancel).toHaveBeenCalledWith({ sessionID: "global", formID: "frm_pending_global" })
+  })
+
+  test("attach mode cancels only session-owned forms", async () => {
+    const sdk = await run({
+      attached: true,
+      pendingForms: [form("frm_pending", "ses_1"), form("frm_pending_global", "global")],
+      turn: (messageID) => [formCreated(form("frm_live", "global")), prompted(messageID), settled()],
+    })
+    expect(sdk.v2.session.form.cancel).toHaveBeenCalledWith({ sessionID: "ses_1", formID: "frm_pending" })
+    expect(sdk.v2.session.form.list).not.toHaveBeenCalledWith({ sessionID: "global" })
+    expect(sdk.v2.session.form.cancel).not.toHaveBeenCalledWith({ sessionID: "global", formID: "frm_live" })
+    expect(sdk.v2.session.form.cancel).not.toHaveBeenCalledWith({ sessionID: "global", formID: "frm_pending_global" })
+  })
+})

From a2769b5ade6cbb544de05ba402eb1b6bbddcd368 Mon Sep 17 00:00:00 2001
From: James Long <longster@gmail.com>
Date: Fri, 3 Jul 2026 11:26:58 -0400
Subject: [PATCH 04/82] fix(core): rewrite replacements while hoisting layers
 (#35176)

---
 packages/core/src/effect/layer-node.ts | 2 +-
 packages/core/src/location-services.ts | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/effect/layer-node.ts b/packages/core/src/effect/layer-node.ts
index b58692a155..9dbc3d5160 100644
--- a/packages/core/src/effect/layer-node.ts
+++ b/packages/core/src/effect/layer-node.ts
@@ -230,7 +230,7 @@ export function hoist<A, E, T extends Tag, const Items extends Replacements = re
         if (existing && existing !== node) {
           throw new Error(`Tag ${tag} has conflicting implementations for ${node.name}`)
         }
-        hoisted.set(node.name, node)
+        hoisted.set(node.name, rewriteReplacementDependencies(node, replacementMap))
         return group([])
       }
       if (node.kind === "unbound") {
diff --git a/packages/core/src/location-services.ts b/packages/core/src/location-services.ts
index b1749b34f7..1af35e61a1 100644
--- a/packages/core/src/location-services.ts
+++ b/packages/core/src/location-services.ts
@@ -109,6 +109,10 @@ export function buildLocationServiceMap(
     LayerMap.make(
       (ref: Location.Ref) => {
         const allReplacements = replacements.concat([[Location.node, Location.boundNode(ref)]])
+        // Apply replacements during hoist, not afterward: replacements can
+        // introduce new tagged dependencies (Location.boundNode depends on
+        // Project), and the hoist walk is the only pass that can still slice
+        // those back out.
         const location = LayerNode.hoist(locationServices, Node.tags.values.global, allReplacements)
 
         return LayerNode.compile(location.node).pipe(

From 12d9f4b29b595869670ccc9b867e8eb9279b1a9f Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Fri, 3 Jul 2026 10:57:16 -0500
Subject: [PATCH 05/82] feat(codemode): add confined execution package (#35118)

Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
---
 bun.lock                                   |   39 +-
 packages/codemode/AGENTS.md                |   15 +
 packages/codemode/README.md                |  338 ++
 packages/codemode/codemode.md              | 1218 ++++++
 packages/codemode/package.json             |   26 +
 packages/codemode/src/codemode.ts          | 4126 ++++++++++++++++++++
 packages/codemode/src/index.ts             |   21 +
 packages/codemode/src/token.ts             |   10 +
 packages/codemode/src/tool-error.ts        |   11 +
 packages/codemode/src/tool-runtime.ts      |  829 ++++
 packages/codemode/src/tool.ts              |  348 ++
 packages/codemode/src/values.ts            |   34 +
 packages/codemode/test/codemode.test.ts    | 1110 ++++++
 packages/codemode/test/enumeration.test.ts |  159 +
 packages/codemode/test/parity.test.ts      |  425 ++
 packages/codemode/test/promise.test.ts     |  453 +++
 packages/codemode/test/signature.test.ts   |  341 ++
 packages/codemode/test/stdlib.test.ts      |  495 +++
 packages/codemode/tsconfig.json            |    7 +
 19 files changed, 10004 insertions(+), 1 deletion(-)
 create mode 100644 packages/codemode/AGENTS.md
 create mode 100644 packages/codemode/README.md
 create mode 100644 packages/codemode/codemode.md
 create mode 100644 packages/codemode/package.json
 create mode 100644 packages/codemode/src/codemode.ts
 create mode 100644 packages/codemode/src/index.ts
 create mode 100644 packages/codemode/src/token.ts
 create mode 100644 packages/codemode/src/tool-error.ts
 create mode 100644 packages/codemode/src/tool-runtime.ts
 create mode 100644 packages/codemode/src/tool.ts
 create mode 100644 packages/codemode/src/values.ts
 create mode 100644 packages/codemode/test/codemode.test.ts
 create mode 100644 packages/codemode/test/enumeration.test.ts
 create mode 100644 packages/codemode/test/parity.test.ts
 create mode 100644 packages/codemode/test/promise.test.ts
 create mode 100644 packages/codemode/test/signature.test.ts
 create mode 100644 packages/codemode/test/stdlib.test.ts
 create mode 100644 packages/codemode/tsconfig.json

diff --git a/bun.lock b/bun.lock
index 6a203012b5..be72ef8802 100644
--- a/bun.lock
+++ b/bun.lock
@@ -141,6 +141,20 @@
         "effect",
       ],
     },
+    "packages/codemode": {
+      "name": "@opencode-ai/codemode",
+      "version": "0.0.1",
+      "dependencies": {
+        "acorn": "8.15.0",
+        "effect": "catalog:",
+        "typescript": "catalog:",
+      },
+      "devDependencies": {
+        "@tsconfig/bun": "catalog:",
+        "@types/bun": "catalog:",
+        "@typescript/native-preview": "catalog:",
+      },
+    },
     "packages/console/app": {
       "name": "@opencode-ai/console-app",
       "version": "1.17.13",
@@ -583,6 +597,7 @@
         "@octokit/rest": "catalog:",
         "@openauthjs/openauth": "catalog:",
         "@opencode-ai/client": "workspace:*",
+        "@opencode-ai/codemode": "workspace:*",
         "@opencode-ai/llm": "workspace:*",
         "@opencode-ai/plugin": "workspace:*",
         "@opencode-ai/protocol": "workspace:*",
@@ -1939,6 +1954,8 @@
 
     "@opencode-ai/client": ["@opencode-ai/client@workspace:packages/client"],
 
+    "@opencode-ai/codemode": ["@opencode-ai/codemode@workspace:packages/codemode"],
+
     "@opencode-ai/console-app": ["@opencode-ai/console-app@workspace:packages/console/app"],
 
     "@opencode-ai/console-core": ["@opencode-ai/console-core@workspace:packages/console/core"],
@@ -3025,7 +3042,7 @@
 
     "accepts": ["accepts@2.0.0", "", { "dependencies": { "mime-types": "^3.0.0", "negotiator": "^1.0.0" } }, "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng=="],
 
-    "acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+    "acorn": ["acorn@8.15.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="],
 
     "acorn-jsx": ["acorn-jsx@5.3.2", "", { "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="],
 
@@ -5707,6 +5724,8 @@
 
     "@astrojs/mdx/@astrojs/markdown-remark": ["@astrojs/markdown-remark@6.3.11", "", { "dependencies": { "@astrojs/internal-helpers": "0.7.6", "@astrojs/prism": "3.3.0", "github-slugger": "^2.0.0", "hast-util-from-html": "^2.0.3", "hast-util-to-text": "^4.0.2", "import-meta-resolve": "^4.2.0", "js-yaml": "^4.1.1", "mdast-util-definitions": "^6.0.0", "rehype-raw": "^7.0.0", "rehype-stringify": "^10.0.1", "remark-gfm": "^4.0.1", "remark-parse": "^11.0.0", "remark-rehype": "^11.1.2", "remark-smartypants": "^3.0.2", "shiki": "^3.21.0", "smol-toml": "^1.6.0", "unified": "^11.0.5", "unist-util-remove-position": "^5.0.0", "unist-util-visit": "^5.0.0", "unist-util-visit-parents": "^6.0.2", "vfile": "^6.0.3" } }, "sha512-hcaxX/5aC6lQgHeGh1i+aauvSwIT6cfyFjKWvExYSxUhZZBBdvCliOtu06gbQyhbe0pGJNoNmqNlQZ5zYUuIyQ=="],
 
+    "@astrojs/mdx/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+
     "@astrojs/mdx/source-map": ["source-map@0.7.6", "", {}, "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ=="],
 
     "@astrojs/sitemap/zod": ["zod@4.4.3", "", {}, "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ=="],
@@ -5917,6 +5936,8 @@
 
     "@malept/flatpak-bundler/fs-extra": ["fs-extra@9.1.0", "", { "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="],
 
+    "@mdx-js/mdx/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+
     "@mdx-js/mdx/source-map": ["source-map@0.7.6", "", {}, "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ=="],
 
     "@modelcontextprotocol/sdk/hono": ["hono@4.12.23", "", {}, "sha512-eIaZ9qDgu7XV0pxOCrg7/WhnQ6Ivm22UcxhXx/A3dcbqbbYgBEkc6e/J/s7j2tS96zoB0S9VBdLwQNCWwUo4LA=="],
@@ -6165,6 +6186,8 @@
 
     "astro/@astrojs/internal-helpers": ["@astrojs/internal-helpers@0.6.1", "", {}, "sha512-l5Pqf6uZu31aG+3Lv8nl/3s4DbUzdlxTWDof4pEpto6GUJNhhCbelVi9dEyurOVyqaelwmS9oSyOWOENSfgo9A=="],
 
+    "astro/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+
     "astro/common-ancestor-path": ["common-ancestor-path@1.0.1", "", {}, "sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w=="],
 
     "astro/diff": ["diff@5.2.2", "", {}, "sha512-vtcDfH3TOjP8UekytvnHH1o1P4FcUdt4eQ1Y+Abap1tk/OB2MWQvcwS2ClCd1zuIhc3JKOx6p3kod8Vfys3E+A=="],
@@ -6251,6 +6274,8 @@
 
     "engine.io-client/ws": ["ws@8.20.1", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w=="],
 
+    "esast-util-from-js/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+
     "esbuild-plugin-copy/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
 
     "esbuild-plugin-copy/chokidar": ["chokidar@3.6.0", "", { "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" }, "optionalDependencies": { "fsevents": "~2.3.2" } }, "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="],
@@ -6309,6 +6334,8 @@
 
     "md-to-react-email/marked": ["marked@7.0.4", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-t8eP0dXRJMtMvBojtkcsA7n48BkauktUKzfkPSCq85ZMTJ0v76Rke4DYz01omYpPTUh4p/f7HePgRo3ebG8+QQ=="],
 
+    "micromark-extension-mdxjs/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+
     "micromatch/picomatch": ["picomatch@2.3.2", "", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="],
 
     "miniflare/acorn": ["acorn@8.14.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA=="],
@@ -6429,6 +6456,8 @@
 
     "tar/yallist": ["yallist@5.0.0", "", {}, "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw=="],
 
+    "terser/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+
     "terser/commander": ["commander@2.20.3", "", {}, "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="],
 
     "thread-stream/real-require": ["real-require@1.0.0", "", {}, "sha512-P4nbQYQfePJxRSmY+v/KINxVucm4NF3p3s7pJveMTtom52FR4YGltUQLB8idDXwDDWW+eYrWDFbuzUnjoWHF7g=="],
@@ -6447,6 +6476,8 @@
 
     "unifont/ofetch": ["ofetch@1.5.1", "", { "dependencies": { "destr": "^2.0.5", "node-fetch-native": "^1.6.7", "ufo": "^1.6.1" } }, "sha512-2W4oUZlVaqAPAil6FUg/difl6YhqhUR7x2eZY4bQCko22UXg3hptq9KLQdqFClV+Wu85UX7hNtdGTngi/1BxcA=="],
 
+    "unplugin/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+
     "unplugin/chokidar": ["chokidar@3.6.0", "", { "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" }, "optionalDependencies": { "fsevents": "~2.3.2" } }, "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="],
 
     "unused-filename/path-exists": ["path-exists@5.0.0", "", {}, "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ=="],
@@ -6461,6 +6492,8 @@
 
     "verror/core-util-is": ["core-util-is@1.0.2", "", {}, "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="],
 
+    "vite-plugin-dynamic-import/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+
     "vite-plugin-icons-spritesheet/glob": ["glob@11.1.0", "", { "dependencies": { "foreground-child": "^3.3.1", "jackspeak": "^4.1.1", "minimatch": "^10.1.1", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^2.0.0" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw=="],
 
     "vitest/@vitest/expect": ["@vitest/expect@4.1.7", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@types/chai": "^5.2.2", "@vitest/spy": "4.1.7", "@vitest/utils": "4.1.7", "chai": "^6.2.2", "tinyrainbow": "^3.1.0" } }, "sha512-1R+tw0ortHEbZDGMymm+pN7/AFQ/RkFFdtd7EN+VBpynKmLbP8A3rpEXdshBJ7+8hQ9zBJh/i1s0yKNtxAnU7w=="],
@@ -6885,6 +6918,8 @@
 
     "@standard-community/standard-openapi/effect/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
 
+    "@storybook/csf-plugin/unplugin/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+
     "@storybook/csf-plugin/unplugin/webpack-virtual-modules": ["webpack-virtual-modules@0.6.2", "", {}, "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ=="],
 
     "@tailwindcss/oxide-wasm32-wasi/@napi-rs/wasm-runtime/@tybys/wasm-util": ["@tybys/wasm-util@0.10.2", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg=="],
@@ -7043,6 +7078,8 @@
 
     "opencode-gitlab-auth/open/wsl-utils": ["wsl-utils@0.1.0", "", { "dependencies": { "is-wsl": "^3.1.0" } }, "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw=="],
 
+    "openid-client/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="],
+
     "p-locate/p-limit/yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="],
 
     "pkg-dir/find-up/locate-path": ["locate-path@5.0.0", "", { "dependencies": { "p-locate": "^4.1.0" } }, "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="],
diff --git a/packages/codemode/AGENTS.md b/packages/codemode/AGENTS.md
new file mode 100644
index 0000000000..88dd9c81d9
--- /dev/null
+++ b/packages/codemode/AGENTS.md
@@ -0,0 +1,15 @@
+# @opencode-ai/codemode
+
+- This local package owns confined execution over explicit schema-described tools. Applications own authorization, persistence, external authority, and tool-specific delivery semantics.
+- Do not add a speculative generic permission or approval policy. A host omits tools it does not expose and enforces domain authorization inside each provided tool.
+- Keep Code Mode unaware of host session, channel, and conversation models. The hosting application supplies trusted execution scope around it.
+- Tool schemas are the model-facing Interface. Keep arguments minimal and natural to the operation; never add unrelated IDs as ambient capability tokens.
+
+## Future Design Notes
+
+- If a captured user-visible output channel returns (an earlier `output.text`/`output.file`/`output.image` API was removed from v1), keep `output` as its name, distinct from the program return value: `return` stays the structured result for the model, while `output.*` describes artifacts the host may render into a conversation or UI after execution. Keep this host-neutral and let applications decide how captured output is delivered. In v1, hosts collect media host-side (outside the sandbox) instead.
+- Improve the sandbox failure taxonomy. Distinguish parse/compile mistakes, unsupported syntax, user-thrown errors, invalid returned data, tool refusal, tool internal failure, timeout, and genuine runtime defects so agents can recover accurately instead of treating everything as a generic execution failure.
+- Preserve the public/private error split. Tool authors should be able to return a safe model-visible message while retaining a private cause for host diagnostics. Unknown host failures must remain sanitized by default.
+- Think deliberately about richer binary boundaries before allowing `Blob`, `File`, `ArrayBuffer`, streams, or typed arrays beyond today's JSON-like values. If CodeMode supports binary tool args/results, use explicit tagged data shapes and clear size limits rather than relying on ambient runtime serialization.
+- Keep host capabilities explicit. Globals such as `fetch`, `crypto`, filesystem handles, extra modules, or network clients should be opt-in runtime capabilities with obvious policy defaults, not ambient authority. Default to unavailable unless a host deliberately provides the capability.
+- If `fetch` is added, model it as a host-provided outbound capability with policy controls: allowed origins, methods, headers, response size, timeout, and whether response bodies may be returned, emitted, or only summarized through a tool.
diff --git a/packages/codemode/README.md b/packages/codemode/README.md
new file mode 100644
index 0000000000..3f1f641b3f
--- /dev/null
+++ b/packages/codemode/README.md
@@ -0,0 +1,338 @@
+# @opencode-ai/codemode
+
+Effect-native confined code execution over explicit, schema-described tools.
+
+CodeMode lets a model write a small JavaScript program that can call only the tools supplied by the host. The program can sequence calls, transform plain data, branch, loop, and run independent calls in parallel without receiving ambient filesystem, process, network, module, or application authority.
+
+The package is currently private to this workspace. Its API is designed around three uses:
+
+```ts
+// One execution
+yield * CodeMode.execute({ tools, code })
+
+// A reusable runtime
+const runtime = CodeMode.make({ tools, limits })
+yield * runtime.execute(code)
+
+// One agent-facing code tool
+const codeTool = runtime.agentTool()
+```
+
+## Install
+
+Within this workspace:
+
+```json
+{
+  "dependencies": {
+    "@opencode-ai/codemode": "workspace:*"
+  }
+}
+```
+
+Hosts interact with CodeMode through `effect` (tool `run` implementations, `Effect`-typed results), so they should depend on `effect` themselves.
+
+## Quick Start
+
+Define tools with Effect Schema, then place them in the object tree exposed to programs as `tools`:
+
+```ts
+import { CodeMode, Tool } from "@opencode-ai/codemode"
+import { Effect, Schema } from "effect"
+
+const lookupOrder = Tool.make({
+  description: "Look up an order by ID",
+  input: Schema.Struct({ id: Schema.String }),
+  output: Schema.Struct({ id: Schema.String, status: Schema.String }),
+  run: ({ id }) => Effect.succeed({ id, status: "open" }),
+})
+
+const runtime = CodeMode.make({
+  tools: {
+    orders: {
+      lookup: lookupOrder,
+    },
+  },
+})
+
+const result =
+  yield *
+  runtime.execute(`
+  const order = await tools.orders.lookup({ id: "order_42" })
+  return { id: order.id, needsAttention: order.status !== "complete" }
+`)
+```
+
+`result` is always an `ExecuteResult`. Program, validation, limit, and tool failures are returned as diagnostics rather than failing the Effect. Host interruption remains interruption.
+
+Successful result values are JSON-safe data. A program that returns `undefined`, including by reaching the end without `return`, produces `null`; nested `undefined` values are normalized to `null` as well.
+
+## API
+
+### `Tool.make`
+
+```ts
+const tool = Tool.make({
+  description,
+  input, // Effect Schema (validating) or JSON Schema (render-only)
+  output, // optional; same choice
+  run,
+})
+```
+
+`input` and `output` each accept a validating Effect Schema or a render-only JSON Schema document (the natural shape for adapter-provided tools whose schemas arrive as JSON Schema, e.g. MCP definitions). Effect Schema input is decoded before `run` is invoked, and `run` returns the encoded representation of an Effect Schema `output`, which CodeMode decodes and copies before exposing it to the program. JSON Schemas only shape the model-visible signature; values pass through unvalidated (they still cross the plain-data boundary).
+
+`output` is optional. Without it the tool's signature advertises `Promise<unknown>` and the host result is exposed as-is.
+
+The description and schemas are part of the model-visible tool contract. Keep descriptions concrete and put authorization in `run` or in the service it calls.
+
+### `CodeMode.execute`
+
+Use `CodeMode.execute` for a single execution:
+
+```ts
+const result =
+  yield *
+  CodeMode.execute({
+    tools: { orders: { lookup: lookupOrder } },
+    code: `return await tools.orders.lookup({ id: "order_42" })`,
+    limits: { maxToolCalls: 10 },
+    onToolCallStart: (call) => Effect.logDebug("CodeMode tool started", call),
+    onToolCallEnd: (call) => Effect.logDebug("CodeMode tool settled", call),
+  })
+```
+
+The Effect environment is inferred from the supplied tools. CodeMode does not erase service requirements introduced by tool implementations.
+
+### `CodeMode.make`
+
+Use `CodeMode.make` when the tool set and execution policy are reused:
+
+```ts
+const runtime = CodeMode.make({
+  tools: { orders: { lookup: lookupOrder } },
+  limits: { timeoutMs: 30_000 },
+})
+
+runtime.catalog() // structured tool descriptions
+runtime.instructions() // model-facing syntax and tool guide
+runtime.execute(source) // ExecuteResult
+runtime.agentTool() // { name, description, input, output, execute }
+```
+
+`catalog`, `instructions`, and `agentTool` are projections of the same configured tool tree. `agentTool().description` is exactly `instructions()`.
+
+### Results
+
+```ts
+type ExecuteResult = ExecuteSuccess | ExecuteFailure
+
+interface ExecuteSuccess {
+  readonly ok: true
+  readonly value: Schema.Json
+  readonly logs?: ReadonlyArray<string>
+  readonly truncated?: boolean
+  readonly toolCalls: ReadonlyArray<ToolCall>
+}
+
+interface ExecuteFailure {
+  readonly ok: false
+  readonly error: Diagnostic
+  readonly logs?: ReadonlyArray<string>
+  readonly truncated?: boolean
+  readonly toolCalls: ReadonlyArray<ToolCall>
+}
+```
+
+`toolCalls` contains the names of calls admitted by the runtime in call order. It is retained on failure so hosts can audit partial execution without exposing inputs or host failures. `truncated` is present when the value or logs were cut to fit `maxOutputBytes` (see Execution Limits).
+
+### Tool-call hooks
+
+`onToolCallStart` receives `{ index, name, input }` after input decoding and before tool execution. The input is decoded host-side data and may include values produced by schema transformations; applications should avoid logging sensitive tool arguments indiscriminately.
+
+`onToolCallEnd` receives `{ index, name, input, durationMs, outcome, message? }` when an admitted call settles. `outcome` is `"success"` or `"failure"`; `message` is the model-safe failure message and is present only on failure. Interrupted calls (for example when the execution timeout fires) do not produce an end event. Both hooks are Effect-returning and must not fail.
+
+## Discovery
+
+The agent-tool instructions use a budgeted catalog. Every tool namespace is always listed with its tool count regardless of budget, and as many complete tool signatures (each with a one-line description) as fit an estimated-token budget are inlined. Selection is round-robin across namespaces for fairness: in each round (namespaces alphabetical), every namespace still holding un-inlined tools attempts to place its next-cheapest signature line against the shared budget, and a namespace whose next line does not fit drops out while the others keep going - so every namespace gets some representation before any namespace gets everything. The instructions state exactly how comprehensive the list is, both overall (`COMPLETE list` vs `PARTIAL - N of M shown`) and per namespace (`(3 tools)`, `(3 tools, 1 shown)`, `(3 tools, none shown)`).
+
+The default budget is 2,000 estimated tokens (characters / 4, the same heuristic OpenCode uses). Override it when constructing a runtime:
+
+```ts
+const runtime = CodeMode.make({
+  tools,
+  discovery: { maxInlineCatalogTokens: 6_000 },
+})
+```
+
+The budget must be a non-negative safe integer.
+
+The runtime search tool is always registered - including when the catalog is fully inlined - so a speculative `tools.$codemode.search` call never fails as an unknown tool. It is only advertised in the instructions when the inlined list is partial:
+
+```ts
+const matches = await tools.$codemode.search({
+  query: "order status",
+  namespace: "orders", // optional: scope to one top-level namespace
+  limit: 10,
+})
+```
+
+`search` performs deterministic, additive field-weighted matching. The query is tokenized (camelCase boundaries split; every non-alphanumeric character is a separator; empties and `*` are dropped), and each term scores every tool: exact path or path-segment match (20), path substring (8), description substring (4), and searchable-text substring (2). Each term also carries naive singular variants (trailing `s`/`es` stripped), and a field check passes when the term or any variant matches - so a plural query term (`issues`) still finds a tool whose text only says `issue`, without changing the weights. The searchable text also includes the input schema's property names and their description strings, so a query naming a parameter finds its tool, and substring matching means partial words match. Scores sum across terms; matches are sorted by score (ties broken alphabetically by path) and capped at `limit` results (default 10).
+
+Each result contains the path, description, and generated TypeScript signature, so no second lookup is needed. The result signature is the pretty, JSDoc-annotated multiline form: each described input/output field carries its schema `description` as a `/** ... */` comment, and constraints TypeScript cannot express ride along as tags (`@deprecated`, `@default`, `@format`, `@minItems`, `@maxItems`). The inline catalog in the instructions keeps the compact single-line form.
+
+```ts
+tools.github.list_issues(input: {
+  /** Repository owner */
+  owner: string
+  /** Cursor from the previous response's pageInfo */
+  after?: string
+  /**
+   * Results per page
+   * @default 30
+   */
+  perPage?: number
+}): Promise<unknown>
+```
+
+Result paths are rendered as JavaScript expressions rooted at `tools` (`tools.orders.lookup`, or `tools.context7["resolve-library-id"]` for non-identifier segments), so each `path` is directly usable as the call site. An empty query browses the catalog alphabetically by path; combined with `namespace` (`{ query: "", namespace: "orders" }`) it lists everything in that namespace. A query that names one tool path exactly (canonical path, `tools.`-prefixed path, or rendered JavaScript expression) is treated as a lookup and returns that tool alone.
+
+The instructions are structured markdown, ordered so the workflow sits at the top and the catalog at the bottom: a `## Workflow` section with numbered steps (find a tool via search when the catalog is partial, or pick from the inlined list when it is complete; call the exact path as-is; `JSON.parse` string results; return only the needed fields), a `## Rules` section holding only guidance the workflow does not already cover (only listed/search-result tools exist inside `tools`; filter and aggregate collections in code; treat `Promise<unknown>` results as shapeless until verified; run independent calls through `Promise.all`; enumerate `tools` with `Object.keys`/`for...in`; browse a namespace via search when it is advertised), a short `## Syntax` section that assumes standard JavaScript and names only what is unusual (TypeScript annotations stripped; the data-boundary serialization of Date/Map/Set/RegExp) or missing (classes, generators, `for await...of`, `.then`/`.catch`/`.finally`), and the budgeted `## Available tools` catalog. Example call forms use explicit `<namespace>.<tool>`/`<field>` placeholders - never a real or fabricated tool name.
+
+A host cannot define its own `$codemode` top-level namespace.
+
+## Supported Programs
+
+CodeMode executes a deliberately bounded JavaScript subset. It supports:
+
+- Plain data literals, property access, assignment, and destructuring.
+- `if`, conditional expressions, `switch`, `for`, `for...of` (arrays, strings, Maps, Sets), `for...in` (own keys of plain objects, index strings of arrays, and namespace/tool names of `tools` references - anything else is an error suggesting `for...of` or `Object.keys`, rather than real JS's surprising behavior of indices for strings and zero iterations for Maps/Sets), `while`, and `do...while`.
+- Arrow functions and function declarations with closures, defaults, rest parameters, and destructuring.
+- Optional chaining, nullish coalescing, templates, spread (arrays, strings, Maps, Sets), and `try`/`catch`.
+- Common array, string, number, `Object`, `Math`, and `JSON` operations. Mutating array methods include `push`/`pop`/`shift`/`unshift`/`splice` (removes in place and returns the removed elements)/`fill`/`copyWithin`; array `keys`/`values`/`entries` return **arrays** (matching the Map/Set convention) and work with `for...of` and spread. String methods include `localeCompare` (locale/options arguments ignored), `normalize`, and the `trimLeft`/`trimRight` aliases. `Object.keys` also accepts arrays (index strings, as in JS) and tool references: `Object.keys(tools)` lists the top-level namespaces and `Object.keys(tools.ns)` the names at that node (a callable tool enumerates as `[]`; an unknown path is an `UnknownTool` diagnostic). `Object.values`/`Object.entries` on a tool reference fail with a pointer at `Object.keys(tools)` and `tools.$codemode.search`.
+- `Date` - `Date.now()`/`Date.parse()`/`Date.UTC()`, `new Date(...)`, the getter methods, and date arithmetic/comparison via the time value. Dates stringify as ISO (`toString` included, for determinism across host timezones).
+- Regular expressions - `/literals/` and `new RegExp(...)` with `test`/`exec` (stateful `lastIndex` for `g`), plus string `match`/`matchAll`/`replace`/`replaceAll`/`split`/`search` with patterns. Match results are arrays carrying `index` and named `groups` as own properties (`input` is omitted). Invalid patterns, invalid flags, and missing-`g` calls fail with catchable errors that say what was wrong and how to fix it (escaping hints, the exact `/pattern/g` to write). Patterns run on the host engine, so pathological backtracking is bounded only by the execution timeout. Function replacers are not supported.
+- `Map` and `Set` - construction from entries/arrays/strings, `get`/`set`/`add`/`has`/`delete`/`clear`/`size`/`forEach`, and `keys`/`values`/`entries` returning **arrays** (not iterators).
+- First-class promises - an un-awaited `tools.ns.tool(...)` is a promise value whose call starts immediately on a supervised fiber; `await` resolves it (awaiting a non-promise value is a no-op, and `return tools.ns.tool(...)` resolves like an async-function return). `Promise.all`, `Promise.allSettled`, and `Promise.race` accept any array mixing promises and plain values (built inline, beforehand, or via spread); `Promise.resolve`/`Promise.reject` construct settled promises. `Promise.allSettled` rejection reasons are the same plain `{ name?, message }` data a `catch` binding sees, and `Promise.race` interrupts its losing in-flight calls. At most 8 tool calls run concurrently. When a program completes, still-running un-awaited calls are awaited before the execution ends; a failure from a call that was never awaited surfaces as an unhandled-rejection diagnostic.
+- `throw value` and `throw new Error(message)` for explicit program failure. `Error` (and `TypeError`/`RangeError`/`SyntaxError`/`ReferenceError`/`EvalError`/`URIError`) are real constructors, callable with or without `new`; error values are plain `{ name, message }` data that additionally satisfy `instanceof Error` (a specific type matches itself and `Error`, as in JS). Every caught failure - thrown errors, interpreter runtime errors, and tool failures - is `instanceof Error` in a `catch` block; a thrown non-error value (`throw "text"`) is not, matching JS. Caught failures carry the `name` the equivalent real-JS failure would have - `JSON.parse` and invalid regex patterns produce a `SyntaxError` (satisfying `instanceof SyntaxError`), an unknown identifier a `ReferenceError`, assigning to a constant a `TypeError`, a bad `normalize` form a `RangeError`; failures with no specific analogue (including tool failures) are named `"Error"`. `instanceof` also recognizes `Date`, `RegExp`, `Map`, `Set`, `Array`, `Object`, and `Promise`; any other right-hand side is a catchable error.
+
+Inside a program, Date/RegExp/Map/Set values stay live everywhere: the internal data checkpoints (`Object.*` helpers, spread, coercion inputs) preserve the instances, so `Object.values({ d: date })[0].getTime()` and a spread copy of an object holding a Map keep working. Only at the host boundary (final result, tool arguments, `JSON.stringify`) do the four value types serialize exactly as `JSON.stringify` would: a Date becomes its ISO string (`null` when invalid) and RegExp/Map/Set become `{}`. Promise values never cross a data boundary: an un-awaited promise in a result or tool argument produces a diagnostic that says to await it, instead of serializing to `{}`.
+
+It does not expose `eval`, dynamic imports, modules, classes, generators, timers, host globals, prototype mutation, custom promise constructors (`new Promise`), promise chaining (`.then`/`.catch`/`.finally` - `await` with `try`/`catch` is the supported style), or arbitrary method calls. Unsupported syntax returns an `UnsupportedSyntax` diagnostic with a source location when available.
+
+CodeMode is an orchestration language, not a general JavaScript runtime.
+
+## Execution Limits
+
+The limits are exactly three knobs:
+
+| Limit            |              Default | Bounds                                                               |
+| ---------------- | -------------------: | -------------------------------------------------------------------- |
+| `timeoutMs`      |    none - no timeout | Wall-clock execution time.                                           |
+| `maxToolCalls`   |     none - unlimited | Tool calls admitted during the execution.                            |
+| `maxOutputBytes` | none - no truncation | Model-facing output: the serialized result value plus captured logs. |
+
+No limit has a default, on purpose: execution budgets are host policy, not library policy - a host that wants a bound sets one; a host that can interrupt the execution fiber (as OpenCode does on user cancel) may set no timeout, and a host with its own tool-output truncation (as OpenCode has) may leave `maxOutputBytes` unset. A host with neither should set `maxOutputBytes`, or oversized results silently flood model context.
+
+Pass only the overrides you need:
+
+```ts
+const runtime = CodeMode.make({
+  tools,
+  limits: {
+    maxToolCalls: 20,
+    timeoutMs: 60_000,
+  },
+})
+```
+
+Limits are safe integers. `timeoutMs` must be at least `1`; the others may be `0`. Invalid configuration throws a `RangeError` when `CodeMode.make` or `CodeMode.execute` is called. An explicitly `undefined` value is the same as leaving the limit unset.
+
+Exceeding a configured `maxOutputBytes` never fails the execution. An oversized result value is replaced by its truncated serialized text plus an explanatory marker, logs are kept from the start until the remaining budget is exhausted (with a final marker line noting the cut), and the result carries `truncated: true`.
+
+When configured, the timeout interrupts in-flight tool Effects, including eagerly started calls the program has not awaited (their fibers are supervised by the execution). The interpreter yields cooperatively between steps, so the timeout also interrupts pure busy loops (`while (true) {}`) - no separate work budget exists. Tool implementations remain responsible for making their external operations interruptible or independently bounded.
+
+Two interpreter internals are fixed constants rather than knobs: at most 8 tool calls run concurrently, and values crossing a data boundary may nest at most 32 levels deep (deeper values fail as `InvalidDataValue`, which reads better than a native stack-overflow error). Neither is part of the public contract.
+
+## Diagnostics
+
+Failures are data:
+
+| Kind                    | Meaning                                                                                                  |
+| ----------------------- | -------------------------------------------------------------------------------------------------------- |
+| `ParseError`            | Source is empty or cannot be parsed.                                                                     |
+| `UnsupportedSyntax`     | Parsed JavaScript is outside the supported subset.                                                       |
+| `UnknownTool`           | A program referenced a tool the host did not provide.                                                    |
+| `InvalidToolInput`      | Tool input failed schema decoding or safe-data copying.                                                  |
+| `InvalidToolOutput`     | Tool output failed schema decoding or safe-data copying.                                                 |
+| `InvalidDataValue`      | Program data violated the plain-data contract (depth, circularity, blocked properties, non-data values). |
+| `ToolCallLimitExceeded` | Calls exceeded `maxToolCalls`.                                                                           |
+| `TimeoutExceeded`       | Execution exceeded `timeoutMs`.                                                                          |
+| `ToolFailure`           | A tool refused or failed.                                                                                |
+| `ExecutionFailure`      | The program threw or another execution error occurred.                                                   |
+
+Unknown host failures, defects, invalid outputs, and copying failures are sanitized. To return a safe operational refusal, fail with `toolError`:
+
+```ts
+import { toolError } from "@opencode-ai/codemode"
+
+run: ({ id }) => (authorized(id) ? loadOrder(id) : Effect.fail(toolError("Order is unavailable")))
+```
+
+Only the supplied message is model-visible. The optional cause is never returned in `ExecuteResult`; hosts should perform any required internal logging before crossing this boundary.
+
+## Authority Boundary
+
+CodeMode confines programs to the supplied tool tree, but it does not decide what those tools may do.
+
+The host owns:
+
+- Authentication and authorization.
+- Tool selection and immutable scope.
+- Credentials and network clients.
+- Persistence, idempotency, approval, and durable side effects.
+- Logging and redaction policy.
+
+CodeMode owns:
+
+- Parsing and interpreting the supported subset without `eval`.
+- Schema boundaries around tool calls.
+- Plain-data copying and blocked prototype members.
+- Resource limits, call accounting, and normalized diagnostics.
+- Model-facing tool discovery and instructions.
+
+A program cannot gain authority through prose or generated code. It can only exercise authority already present in the supplied tools. Do not expose a broad tool and expect the prompt to restrict it.
+
+## Laws
+
+The public contract is guided by these equivalences:
+
+- `CodeMode.execute({ ...options, code })` is equivalent to `CodeMode.make(options).execute(code)`.
+- `CodeMode.make(options).agentTool().execute({ code })` is equivalent to `CodeMode.make(options).execute(code)`.
+- `CodeMode.make(options).agentTool().description` equals `CodeMode.make(options).instructions()`.
+- A tool implementation is not invoked unless its input has decoded successfully.
+- A tool result is not visible to the program unless its output has decoded and crossed the plain-data boundary successfully.
+- Unknown host failures do not become model-visible diagnostics; `ToolError` is the explicit safe-message channel.
+- Host interruption remains interruption rather than an `ExecuteFailure`.
+
+## Non-Goals
+
+- Generic permission prompts or approval workflows.
+- Durable pause/resume, replay, or storage adapters.
+- Exactly-once external side effects.
+- Application authorization or product policy.
+- A filesystem or process sandbox for arbitrary JavaScript.
+- Compatibility with the full JavaScript language or npm ecosystem.
+
+Applications that need approval or durable consequences should model those above CodeMode and expose only the currently authorized tools.
+
+## Testing
+
+From the package directory:
+
+```sh
+bun test
+bun run typecheck
+```
+
+The direct suite covers public projections, discovery, schema boundaries, diagnostic sanitization, resource limits, tool-call observation, and interruption.
diff --git a/packages/codemode/codemode.md b/packages/codemode/codemode.md
new file mode 100644
index 0000000000..41b801044d
--- /dev/null
+++ b/packages/codemode/codemode.md
@@ -0,0 +1,1218 @@
+# CodeMode - Status, Decisions, and Remaining Work
+
+This document is the working plan for `@opencode-ai/codemode` and its OpenCode integration.
+It captures every locked decision, everything already implemented, and a detailed TODO of what
+remains - enough context that someone (human or agent) can pick up any item cold.
+
+Tracking issue: https://github.com/anomalyco/opencode/issues/34787
+Working branch: `codemode-v2` (base: `dev`)
+
+---
+
+## 1. What this is
+
+CodeMode gives a model one `execute` tool that runs JavaScript/TypeScript programs against a
+tree of schema-described tools (`tools.<namespace>.<tool>(input)`), instead of exposing dozens
+of MCP tools individually. The point is **control flow**: sequencing, filtering, and composing
+tool calls in one program instead of round-tripping through the agent loop, plus not flooding
+the context window when users connect many MCP servers.
+
+Architecture split (locked):
+
+- **`packages/codemode` (`@opencode-ai/codemode`)** - the generic, host-agnostic runtime:
+  a hand-rolled, Effect-native, tree-walking interpreter over acorn ASTs (TypeScript stripped
+  via `typescript`'s `transpileModule`), the tool runtime/data boundary, discovery/search, and
+  `Tool.make`. It knows nothing about OpenCode, MCP, permissions, or rendering.
+- **`packages/opencode`** - the OpenCode integration: an MCP adapter that converts MCP tool
+  definitions into `Tool.make(...)` definitions, permission gating, host-side attachment
+  collection, the agent-facing `execute` tool, and TUI progress rendering.
+
+This package was seeded from the experiments workspace implementation
+(`experiments/agents/packages/codemode`, package `@agents/codemode`) and then modified here.
+The older vendored interpreter in `packages/opencode/src/session/rune/` was superseded by this
+package and was **deleted** in Wave 3 (done, see below).
+
+---
+
+## 2. Locked decisions
+
+From issue #34787 and design discussion. Do not relitigate these casually.
+
+### Core direction
+
+- Generic CodeMode lives in its own package: `@opencode-ai/codemode` (repo scope convention;
+  the issue's `@opencode/codemode` name was normalized to the `@opencode-ai/*` convention).
+- **Keep the hand-rolled interpreter.** No QuickJS/V8/sandbox-engine dependency. We own and
+  test the whole surface; the model only needs orchestration syntax, not a full runtime.
+- Naming: `CodeMode`, `Tool`, `ToolError`, `UnknownTool` (diagnostic kind), `$codemode`
+  reserved discovery namespace. (Historical names - "rune", "capability" - are dead.)
+- Existing OpenCode core tools (bash/edit/patch/...) stay registered normally for v1.
+  CodeMode covers MCP tools, user-registered tools, and deferred tools only.
+- Test runner is `bun test`; typecheck is `tsgo --noEmit` (repo conventions). Not vitest.
+- **Never reference external prior-art implementations** (other companies' code-execution
+  products/blog posts) in code, comments, commit messages, or docs in this repo.
+
+### MCP / tools
+
+- The MCP adapter lives in OpenCode, not here. It converts MCP definitions into ordinary
+  `Tool.make(...)` definitions and hands CodeMode a plain tool tree.
+- Permissions stay in the OpenCode adapter (each tool's `run` wraps the permission ask).
+  CodeMode stays dumb - no permission model in this package.
+- Namespace collisions: last write wins (plain JS object override). No `tools.mcp.*` prefix,
+  no `_2` suffixing, no cleverness. OpenCode groups flat `server_tool` MCP names into
+  `tools.<server>.<tool>` namespaces before handing them over.
+
+### Discovery / search
+
+- **Search only - no separate `describe`.** `tools.$codemode.search({ query?, namespace?,
+limit? })` over the final tool tree, owned by this package.
+- Search result item shape: `{ path, description, signature }` in an `{ items, total }`
+  wrapper. The `signature` string embeds the full input/output TypeScript types - in search
+  results it is the pretty, JSDoc-annotated multiline form (Fix 7), so per-field schema
+  `description`s and constraints (`@default`, `@format`, `@deprecated`, `@minItems`,
+  `@maxItems`) ride along as field comments. The original spec's separate `input`/`output`
+  raw-schema fields are deliberately NOT added: shapes are already fully expressed in the
+  TypeScript signature and schema annotations now arrive as JSDoc - intent satisfied, letter
+  deviated. Result `path`s render a JavaScript expression rooted at `tools` (for example
+  `tools.github.list_issues` or `tools.context7["resolve-library-id"]`) so each is directly
+  usable as the call site; the internal `ToolDescription.path` stays unprefixed.
+- Default limit: **10** (done). Exact-path lookup goes through search too: a query equal to a
+  canonical tool path, `tools.`-prefixed path, or rendered JavaScript expression returns that
+  tool alone (done).
+- Signatures render **native payloads**: `Promise<Issue>`, NOT `Promise<Result<Issue>>`.
+  There is no result envelope; attachments never appear in return types (they are collected
+  host-side, see below).
+- Tools without an output schema render `unknown` as their return type.
+
+### Schemas / Tool.make
+
+- `Tool.make` carries rich metadata so search can render real signatures.
+- Support **Effect Schema** (first-class, validating) and **JSON Schema** (initially
+  render-only - used for TypeScript rendering; the adapter may validate on its own). Leave
+  room for Standard Schema later.
+- Tool implementations are **Effect-based** for v1 (`run` returns `Effect`). Promise
+  normalization for plugin authors can come later.
+
+### Attachments / output
+
+- **No `output.text/file/image` API in v1.** (Deleted in Wave 2.)
+- Tool calls return native structured payloads into the sandbox. Files/images emitted by
+  child tools **never enter the sandbox** - the OpenCode adapter strips and accumulates them
+  host-side as calls happen, then returns them on the outer `execute` tool result as ordinary
+  tool-result attachments (OpenCode already has `Tool.ExecuteResult.attachments` -> vision
+  plumbing in `message-v2.ts`).
+- No base64 in CodeMode values, ever. The model routes nothing; it can't accidentally dump
+  image bytes into context or drop attachments.
+
+### Runtime behavior
+
+- Limits are EXACTLY the three public knobs: `{ timeoutMs, maxToolCalls, maxOutputBytes }` -
+  matching the original locked spec exactly. NO limit has a default (user direction, Fix 6
+  for the first two; extended to `maxOutputBytes` in the truncation-layering fix below):
+  absent = no timeout / unlimited calls / no output truncation - budgets are host policy.
+  A host without its own output bounding should set `maxOutputBytes` explicitly, or
+  oversized results silently flood model context. OpenCode's adapter policy (user
+  direction): NO limits at all - no timeout, unlimited tool calls (each child call is
+  permission-gated; user cancel interrupts the execution fiber and its children), and no
+  CodeMode truncation (output bounding is OpenCode's native tool-output truncation).
+  The internal limit system that Wave 2 kept behind
+  an `@internal` `InternalExecutionLimits` type (maxOperations, maxDataBytes, maxValueDepth,
+  maxCollectionLength, maxSourceBytes, maxAuditBytes, maxConcurrency) was deleted outright in
+  Fix 5 (see Post-wave fixes). Two internals survive as fixed constants, not knobs:
+  `TOOL_CALL_CONCURRENCY = 8` (the fork semaphore) and `MAX_VALUE_DEPTH = 32` (the `copyIn`
+  boundary depth check, kept only because it beats a native stack-overflow RangeError as an
+  error message; still reports `InvalidDataValue`).
+- Truncation layering RESOLVED (user direction): CodeMode truncation is off in OpenCode.
+  `execute` is a normal `Tool.define` tool, so OpenCode's native tool-output truncation
+  (50KB / 2000 lines in `tool.ts` + `truncate.ts`, full output dumped to a file) applies to
+  it with no special-casing - verified by tracing `wrap()` in `tool.ts:130-144` (the
+  `metadata.truncated` exemption never fires for `execute`). One truncation layer, the
+  host's. `maxOutputBytes` remains available for hosts without their own bounding.
+- Pure-JS built-ins only. **No ambient authority**: no fs, child processes, network/fetch,
+  process/env, or timers in v1. The agent has the bash tool for that.
+- Forgiving JS semantics are locked (see section 3, Wave 1a/1b-i) - missing props read `undefined`,
+  `typeof` never throws, NaN/Infinity flow in-sandbox, etc.
+- `console.*` is captured into `logs` on the result; the host appends them to model-facing
+  output. Not a tool call; costs no tool budget.
+- Simple tool-call **start/end hooks** for nested progress: `onToolCallStart({ index, name,
+input })` and `onToolCallEnd({ index, name, input, durationMs, outcome, message? })`.
+  Interrupted calls fire no end event. No `CurrentToolCall` context service (removed in
+  Wave 2).
+
+---
+
+## 3. Current status (what is already done on `codemode-v2`)
+
+Everything below is committed and pushed on `codemode-v2` (six commits, in pairs of
+generic-package + OpenCode-integration: waves 0-5, Fixes 4-9, then the DSL-expansion pass /
+real-JS error names / truncation layering). Verification: from `packages/codemode`,
+`bun test` (211 pass / 0 fail across `codemode/parity/stdlib/promise/enumeration/signature`)
+and `bun run typecheck`; from `packages/opencode`, `bun run typecheck` and
+`bun test test/tool/` (all green - the adapter suites are `test/tool/code-mode.test.ts`,
+43 tests, and `test/tool/code-mode-integration.test.ts`, 16 tests, moved from
+`test/session/` by the registry promotion; registry coverage in
+`test/tool/registry.test.ts`).
+
+### Wave 0 - scaffold (done)
+
+- `packages/codemode` created from the experiments implementation: `src/{index,codemode,tool,
+tool-error,tool-runtime}.ts`, README, AGENTS.md, tests.
+- `package.json`: name `@opencode-ai/codemode`, deps `acorn@8.15.0`, `typescript: catalog:`,
+  `effect: catalog:` (both repos pin effect `4.0.0-beta.83`; opencode's effect patch only
+  touches `unstable/httpapi`, which this package doesn't use).
+- Tests converted vitest -> `bun:test`. Only src change from verbatim: the `CurrentToolCall`
+  Context.Service key string renamed to `@opencode-ai/codemode/CurrentToolCall`.
+
+### Wave 1a - forgiving JS semantics (done)
+
+Ported from the old opencode rune work; `test/parity.test.ts` (24 tests) is the acceptance
+spec. The seeded interpreter was deliberately strict; these behaviors replaced that:
+
+- **H1**: NaN/Infinity flow as in-sandbox values (`copyIn` admits them; `NaN`/`Infinity` are
+  bindable globals; `charCodeAt` returns real NaN). Normalized to `null` only at the data
+  boundary (`copyOut` - single chokepoint for final results AND tool-call arguments), matching
+  `JSON.stringify`. Guards like `Number.isNaN(x)` / `parseInt(x) || 0` work.
+- **H2/H3**: unknown property reads on strings/numbers/arrays -> `undefined` (incl. under
+  `?.`), instead of throwing. This was the real-transcript failure: models write
+  `result?.login ?? result` against JSON-string tool results.
+- **H4**: `typeof undeclaredIdentifier` -> `"undefined"` (short-circuits before resolution).
+- **H5**: `Boolean`/`String`/`Number` accepted as array callbacks (`filter(Boolean)`).
+- **H6**: `{...null}` / `{...undefined}` object spread is a no-op. Array spread of
+  null/undefined still throws (real JS throws too).
+
+### Wave 1b-i - stdlib value types: Date, RegExp, Map, Set (done)
+
+`src/values.ts` holds `SandboxDate/SandboxRegExp/SandboxMap/SandboxSet` (own module so both
+`codemode.ts` and `tool-runtime.ts` import without a cycle). Design:
+
+- Opaque-by-default: all four join `isRuntimeReference`, with explicit carve-outs (member
+  access allowlists, Date in binary/unary ops, Map/Set in spread/for...of, console formatting,
+  `containsOpaqueReference` for operator guards; the `runtimeValueBytes` byte-accounting
+  carve-out died with that machinery in Fix 5).
+- **JSON semantics at every boundary and checkpoint**: Date -> ISO string (invalid -> null),
+  RegExp/Map/Set -> `{}`. `copyIn` also converts host `Date`/`RegExp`/`Map`/`Set` instances the
+  same way (a host tool may legitimately return them). (Narrowed by the DSL-expansion pass:
+  intra-sandbox checkpoints now preserve the instances; JSON forms apply at the host
+  boundary only.)
+- Date: `Date.now/parse/UTC`, `new Date(epoch|string|components)`, getters + UTC variants,
+  `end - start`, `a < b`, `+date`; `toString` is ISO for cross-host determinism.
+- RegExp: literals + `new RegExp`, `test`/`exec` (stateful `lastIndex` for `g`), string
+  `match/matchAll/replace/replaceAll/split/search`. Match results are plain arrays carrying
+  `index`/named `groups` as own properties (enabled by a general array own-property read fix);
+  `input` omitted deliberately. Function replacers unsupported (clear error). Patterns run on
+  the host engine - catastrophic backtracking is bounded only by `timeoutMs` (accepted, in
+  README).
+- Map/Set: full method sets; `keys/values/entries` return **arrays** (not iterators);
+  `for...of` + spread work; `Object.fromEntries(map)`, `Array.from(map|set)`; SameValueZero
+  keys (NaN findable). (The incremental byte totals and `maxCollectionLength`/`maxDataBytes`
+  enforcement this wave added were deleted in Fix 5.)
+- Rode along, same spirit: `typeof` never throws for any value (`typeof fn` -> `"function"`),
+  `!` works on any value, `for...of` over strings, `{...sandboxValue}` no-op, template
+  interpolation renders `/regex/` and ISO dates directly.
+
+### Wave 2 - API layer (done)
+
+The package's public contract, reshaped for the Wave 3 adapter. 101 tests / 0 fail after this
+wave; both packages typecheck clean.
+
+- **`Tool.make` schema flexibility** (`src/tool.ts`): `input`/`output` each accept an Effect
+  Schema (validating, decoded both directions as before) OR a raw JSON Schema document
+  (render-only - no validation, values pass through; rendering handles `$defs`/`definitions`
+  - `$ref`). `output` is **optional** -> signature renders `Promise<unknown>` and the host
+    result is exposed as-is. Discrimination via `Schema.isSchema`. New helpers exported from
+    `tool.ts`: `inputTypeScript`/`outputTypeScript`/`decodeInput`/`decodeOutput`/
+    `jsonSchemaToTypeScript`; `tool-runtime.ts` consumes them (no direct `Schema.*` use there
+    anymore). Types `JsonSchema`/`ToolSchema` exported from the index. Note: an empty
+    `Schema.Struct({})` renders as `{  } | Array<unknown>` (effect's JSON Schema emission) -
+    cosmetic, fixed in Wave 4.
+- **`output.*` API deleted**: `OutputItem`(+Schema), result `output` fields, the `output`
+  global/namespace dispatch, `invokeOutput`/`outputItem`/helpers, interpreter output fields,
+  instructions line, README section, seeded tests. AGENTS.md keeps a rephrased
+  future-design note (channel name stays `output` if it ever returns).
+- **Hooks**: `CurrentToolCall` removed entirely (class, provideService, `Services` Exclude
+  special-casing, index export). `onToolCall` -> `onToolCallStart({ index, name, input })` +
+  `onToolCallEnd({ index, name, input, durationMs, outcome: "success"|"failure", message? })`.
+  End fires symmetrically via `Effect.tap`/`tapError` around the settling portion (host run +
+  output decode + boundary copy; search too - its post-record body is wrapped in `Effect.try`
+  so failures are typed and observable). `message` is the model-safe failure message
+  (`ToolError`/`ToolRuntimeError` message, else "Tool execution failed"). Interrupted calls
+  fire no end event (timeout kills the whole execution anyway).
+- **Limits collapse**: public `ExecutionLimits` = `{ timeoutMs?, maxToolCalls?,
+maxOutputBytes? }` (defaults 10_000 / 100 / 32_000). This wave kept the other knobs as
+  internal defaults reachable through an `@internal` `InternalExecutionLimits` type; Fix 5
+  later deleted that type and the internal limit system entirely.
+- **`maxOutputBytes` truncation** (CodeMode-owned, never fails): applied via `boundOutput` in
+  a final `Effect.map` over every result path (success/timeout/normalized failure). Oversized
+  serialized values become truncated text + ` [result truncated: N bytes exceeds the M-byte
+output limit; return a smaller value]`; logs keep leading lines within the remaining budget
+  - `[logs truncated: showing K of N lines]`; result gains `truncated: true` (also added to
+    `ExecuteResultSchema`). UTF-8-safe truncation (no split code points). (The in-sandbox
+    `maxDataBytes` check that used to throw first on oversized raw values died in Fix 5 -
+    truncation is now the only result-size mechanism.)
+- **Search polish**: default limit 12 -> **10** (`defaultSearchLimit`); exact-path lookup - a
+  trimmed query equal to one tool path (optionally `tools.`-prefixed) returns that tool alone
+  (`total: 1`), bypassing ranking. Tokenization/ranking/shape unchanged.
+
+### Wave 3 - OpenCode MCP adapter (done)
+
+`packages/opencode/src/session/code-mode.ts` rewritten as a thin adapter over this package;
+the vendored rune interpreter is gone. Same `define(mcpTools, mcpDefs, servers)` signature, so
+`tools.ts` gating (flag on + MCP tools exist -> single `execute` tool, early-return suppresses
+per-MCP registration; MCP resource tools unaffected) is unchanged.
+
+- **Tool tree**: `groupByServer` (longest-sanitized-prefix, ported) groups flat `server_tool`
+  keys into `CatalogEntry`s carrying the raw MCP `inputSchema`/`outputSchema` as render-only
+  JSON Schema; `toolTree` turns each into `Tool.make({ description, input, output?, run })`
+  under `tools.<server>.<tool>`. The agent-facing description is
+  `CodeMode.make({ tools }).instructions()` over a preview tree (placeholder runs, never
+  invoked) - so signature rendering, the inline-vs-search switch, and `$codemode.search`
+  availability all come from this package and stay consistent with execution.
+- **`run` path**: per-child permission ask first (`ctx.ask({ permission: entry.key, patterns:
+["*"], always: ["*"] })`, exactly the old gating; approving `execute` approves no child).
+  Denials and host failures are mapped to `toolError(message)` so they surface as safe,
+  catchable in-program failures (MCP `isError` text propagates as `e.message`; without this
+  they'd be sanitized to "Tool execution failed"). Dispatch reuses the ai-sdk wrapper from
+  `catalog.convertTool` (`entry.tool.execute!`), which owns callTool timeouts/progress-reset.
+- **Result shaping** (`toSandboxResult`): prefer `structuredContent`; else joined text
+  content; media (image/audio/resource blob/resource_link) NEVER enters the sandbox - blocks
+  are stripped into a per-execution `Attachment[]` accumulator, and a media-only result
+  becomes a marker payload (`"[1 image attached to the result]"`, noun/count adjusted). An
+  MCP-shaped result with nothing extractable becomes `null`; non-MCP values pass through.
+  No handles, no `Result<T>` envelope, no base64 in the sandbox, no data-size tuning (the
+  `maxDataBytes` budget that existed at the time was deleted in Fix 5).
+- **Execute result**: `{ output: formatValue(value) + trailing "Logs:" section (success AND
+error - logs are plain pre-formatted lines now), attachments: accumulated }` through the
+  existing `Tool.ExecuteResult.attachments` -> `message-v2.ts` vision plumbing; attachments
+  ride on both success and error results. Diagnostic `suggestions` not already contained in
+  the message are appended to error output. Native outer truncation stays on (adapter never
+  sets `metadata.truncated`); CodeMode's own `maxOutputBytes` (32 KB default at the time)
+  cut first - since the truncation-layering fix, native truncation is the only layer.
+  Limits: `{ timeoutMs: 30_000 }` at the time (matched the default MCP request timeout);
+  killed in Fix 6 - the adapter now passes no limits at all.
+- **Progress**: `onToolCallStart`/`onToolCallEnd` -> `ctx.metadata({ toolCalls })` with
+  `{ tool, status: running|completed|error, input? }` per call index - the exact shape the
+  TUI `Execute` component (`packages/tui/src/routes/session/index.tsx`) already renders.
+  `$codemode.search` calls stream through the same channel.
+- **Deletions/deps**: `src/session/rune/` (all five files) and
+  `test/session/rune-parity.test.ts` (superseded by this package's `test/parity.test.ts`)
+  deleted; `acorn` removed from opencode deps, `typescript` moved back to devDependencies,
+  `"@opencode-ai/codemode": "workspace:*"` added; `bun install` run (lockfile updated).
+- **Tests**: both opencode suites rewritten against the adapter design -
+  `code-mode.test.ts` (34: grouping, description/signature rendering incl. the large-catalog
+  search fallback, execution, permission flow + denial, metadata streaming, attachment
+  accumulation + media-only marker, logs on success/error, truncation marker,
+  `toSandboxResult`/`formatValue`/`withLogs` units) and `code-mode-integration.test.ts`
+  (16: real in-memory MCP server; native structured results, attachment accumulation, isError
+  propagation, logs, permissions, live metadata). Old envelope/attachment-handle/`$rune`
+  describe/`renderType`/`rankTools` tests died with the old design (58+17+24 -> 34+16).
+
+### Wave 4 - instructions/prompting + polish (done)
+
+Instructions are now the budgeted-catalog + prompting-guidance form; verified e2e against a
+real MCP config. Package still 101 tests / 0 fail; opencode adapter suites still 34 + 16; both
+packages typecheck clean.
+
+- **Budgeted catalog** (`discoveryPlan` in `tool-runtime.ts`): the all-or-nothing
+  inline/search modes are gone - `DiscoveryMode` deleted, `DiscoveryOptions` is just
+  `{ maxInlineCatalogBytes? }` (default 16,000 UTF-8 bytes; later converted to
+  `maxInlineCatalogTokens`, default 4,000 estimated tokens - see Post-wave fixes). Port of
+  the old opencode
+  `describe()` `PREVIEW_BUDGET` algorithm, adapted to `ToolDescription`: every namespace is
+  ALWAYS listed with its tool count; full signature lines
+  (`  - <signature> // <first line of description, capped at 120 chars>`) are inlined
+  cheapest-first (line byte length, path tiebreak) within each namespace, namespaces processed
+  alphabetically; once one line does not fit, inlining stops for every remaining namespace
+  (counts only), exactly like the ported algorithm (this stop-everything behavior was later
+  replaced by round-robin fairness in Fix 8). The header states comprehensiveness
+  precisely: "Available tools (COMPLETE list - ...)" vs "Available tools (PARTIAL - N of M
+  shown; find the rest with tools.$codemode.search)"; namespace labels are `(N tools)` /
+  `(N tools, K shown)` / `(N tools, none shown)`. An empty tree renders "No tools are
+  currently available."
+- **Search always registered** (documented decision): `DiscoveryPlan.searchIndex` is required
+  and built unconditionally (new exported `ToolRuntime.searchIndex(tools)`; `SearchEntry` type
+  exported); `CodeMode.execute` (one-shot) passes it too, preserving the
+  `execute`==`make().execute` law. A speculative `tools.$codemode.search` call on a small
+  catalog now succeeds instead of `UnknownTool`, and unknown-tool suggestions always point at
+  search. Search is _advertised_ in the instructions only when the inlined list is PARTIAL,
+  keeping small-catalog instructions tight.
+- **Prompting content** in `instructions()`, mapping 1:1 to the section 5 transcript failures:
+  parse-string-results-as-JSON, return-small, console-for-intermediates, and
+  read-the-description-before-calling guidance. (The flat prose layout this wave produced
+  was later replaced wholesale by the markdown-section restructure - see Post-wave fixes -
+  which also deleted this wave's worked example.)
+- **Cosmetic renderer fixes** (`renderSchema` in `tool.ts`): an object schema with no
+  properties renders `{}` (was `{  }`), and the empty `Schema.Struct({})` emission
+  (`anyOf: [{ type: "object" }, { type: "array" }]`, no properties/items) collapses to `{}`
+  (was `{  } | Array<unknown>`).
+- **Tests**: 4 package discovery tests rewritten for the budgeted behavior (COMPLETE small
+  catalog + search-still-registered; PARTIAL at budget 0; cheapest-first selection +
+  per-namespace labels + budget-exhaustion stopping later namespaces; mode-validation
+  assertion dropped); 3 opencode description assertions updated (COMPLETE/PARTIAL headers,
+  namespace labels, `(input: {})` rendering, cheapest-first op_0 shown / op_149 not).
+- **E2E (verified, headless)**: from the repo root with `OPENCODE_EXPERIMENTAL_CODE_MODE=1`,
+  the scratch `.opencode/opencode.jsonc` (context7, github, playwright, sentry, memory,
+  sequential-thinking; left uncommitted/as-is), and `bun packages/opencode/src/index.ts run
+--dangerously-skip-permissions -m opencode/claude-sonnet-4-5 "..."`. Confirmed: a single
+  `execute` tool registered alongside core tools (per-MCP registration suppressed; MCP
+  resource tools unaffected); the live description read back as "Available tools (PARTIAL -
+  56 of 88 shown; find the rest with tools.$codemode.search):" with correct per-namespace
+  labels (context7/github/memory fully shown; playwright/sentry/sequential-thinking "none
+  shown" - the alphabetical-exhaustion starvation Fix 8 later replaced with round-robin
+  fairness); programs executed with in-program `$codemode.search`
+  calls and returned the correct answer. NOT verified e2e (headless only; covered by
+  unit/integration tests instead): TUI child-call rendering, attachments becoming visible
+  images, output truncation.
+
+### Wave 5 - Promise generalization (done)
+
+First-class promise values in the interpreter; the direct-tool-call-only `Promise.all`
+restriction (and its bespoke AST checks) is gone. Package suite is 136 tests / 0 fail (35 new
+in `test/promise.test.ts`); adapter suites and both typechecks unchanged/green; the opencode
+adapter needed **no changes**.
+
+- **Decision: eager fork** (`const p = tools.a.b(x)` starts the call immediately on a
+  supervised child fiber; `await p` observes its settlement). Chosen over lazy because:
+  (1) it's spec-faithful - JS promise work starts at call time, so
+  `const a = t1(); const b = t2(); return [await a, await b]` gets real parallelism instead of
+  silently sequential awaits; (2) run-once is free - a fiber settles exactly once and
+  `Fiber.await` is idempotent, so `await p` twice or `Promise.all([p, p])` can never re-invoke
+  the tool (lazy needs a deferred/latch to match); (3) effect's structured concurrency does the
+  hard part - `Effect.forkChild` children are auto-supervised (interrupted when the parent
+  fiber exits) and `Effect.timeoutOrElse` is `raceFirst`, which runs the program on its own
+  raced fiber, so forked calls cannot escape the timeout (tested: in-flight forks are
+  interrupted, awaited or abandoned, direct or inside `Promise.all`).
+- **Mechanics**: `SandboxPromise` in `values.ts` (fiber-backed for tool calls; fiberless
+  `immediate` effect for `Promise.resolve`/`reject`). Forks run
+  `semaphore.withPermit(invoke)` with `startImmediately: true` - a per-execution
+  `Semaphore.makeUnsafe(TOOL_CALL_CONCURRENCY)` (fixed 8, see Fix 5) caps live calls (the
+  "Effect.all or equivalent" cap lives where the work is, so combinator joins can be
+  sequential without losing parallelism), and the tool-call-count charge (`recordCall`) plus
+  `onToolCallStart` fire at the call site before any await. `await` of a non-promise is a passthrough no-op; a returned
+  top-level promise resolves like an async-function return (`return tools.a.b(x)` works
+  without await).
+- **Promise combinators are normal functions over values**: `Promise.all`/`allSettled`/`race`
+  accept any array (or spreadable collection) mixing promises and plain data - inline, built
+  beforehand, spread, nested in variables. `allSettled` yields
+  `{ status: "fulfilled", value } | { status: "rejected", reason }` with reasons produced by
+  the same `caughtErrorValue` helper the `catch` binding uses (factored out of
+  `evaluateTryStatement`). `race` resolves/rejects with the first settlement and interrupts
+  losing in-flight calls; awaiting an interrupted loser afterwards is a catchable program
+  failure ("interrupted because another value settled a Promise.race first"), while any other
+  interrupt-only settlement keeps propagating as interruption (preserving the
+  host-interruption law). `Promise.resolve` flattens promises; `Promise.reject` rejects with
+  the reason via `ProgramThrow`.
+- **Opaqueness/boundaries**: promises are runtime references - `typeof` -> `"object"` (real JS),
+  operators reject them, `copyIn` raises an await-hinting `InvalidDataValue` ("contains an
+  un-awaited Promise; await tool calls (...) before using their results") for results, tool
+  arguments, and `JSON.stringify` instead of `{}`. Property access on a promise is a
+  deliberate error (not the forgiving `undefined`): `.then/.catch/.finally` ->
+  `UnsupportedSyntax` pointing at `await` + try/catch; anything else -> "await it first".
+  `new Promise(...)` -> UnsupportedSyntax ("tool calls already return promises");
+  `Promise.<unknown>` lists the five available statics. `console.log(p)` prints
+  `[Promise (await it to get its value)]`.
+- **Program-end drain**: on successful completion the interpreter awaits still-running
+  un-awaited fibers (like a runtime waiting on in-flight I/O at exit), so fire-and-forget
+  calls complete deterministically; a failure nobody could have handled surfaces as an
+  "Unhandled rejection from an un-awaited tool call: ..." diagnostic (kind preserved,
+  suggestion says to await) - keeping pre-wave failure visibility for un-awaited
+  statement-position calls. Settlement observation (await/all/allSettled/race) marks a
+  promise handled; failed executions skip the drain and children are interrupted by
+  supervision.
+- **Deletions/updates**: `evaluatePromiseAll`, `evaluateParallelMap`, `isToolCallExpression`,
+  `isToolPath`, `forkForParallelCallback`, and `PromiseAllReference` deleted
+  (`PromiseMethodReference` over `all/allSettled/race/resolve/reject` replaces it);
+  `supportedSyntaxMessage`, the two instructions lines in `tool-runtime.ts`, and README
+  "Supported Programs" rewritten for the new surface.
+- **Known divergences (deliberate)**: `p === q` on promises throws the operators-need-data
+  diagnostic instead of comparing identity; `{...promise}` errors instead of JS's silent `{}`;
+  a per-iteration `await` inside `items.map(async (i) => await tools.x(i))` runs sequentially
+  (interpreter callbacks compose synchronously) - the parallel idiom is mapping to un-awaited
+  calls and awaiting `Promise.all`, which the instructions show.
+
+### Post-wave fixes
+
+- **Key enumeration: `Object.keys(tools)` + `for...in` (done).** Motivating transcript: a
+  model tried to enumerate tool namespaces with `Object.keys(tools)` (failed with the generic
+  "Object.keys input must contain plain objects only." - `tools` is a `ToolReference`, not
+  plain data) and then `for (const key in tools)` ("Syntax 'ForInStatement' is not
+  supported"), and had to fall back to guessing namespace names from the instructions -
+  defeating discovery. Fixes, all in this package:
+  - `ToolRuntime.make` now returns a `keys(path)` capability (`namespaceKeys` in
+    `tool-runtime.ts`) threaded into the `Interpreter` alongside `invoke` - the interpreter
+    still never holds the host tool tree. `Object.keys(tools)` yields the top-level namespace
+    names (never `$codemode`, which is virtual - but `Object.keys(tools.$codemode)` yields
+    `["search"]`), `Object.keys(tools.ns)` the names at that node; a callable tool leaf
+    enumerates as `[]` (like `Object.keys` of a JS function); an unknown path throws an
+    `UnknownTool` diagnostic suggesting `Object.keys(tools)` and `$codemode.search` (matching
+    call-time unknown-tool behavior rather than silently returning `[]`).
+  - `Object.values`/`Object.entries` (and every other `Object.*` helper) on a tool reference
+    now fail with "...not plain data. Use Object.keys(tools) for names, or
+    tools.$codemode.search({ query }) for signatures." instead of the generic message.
+  - `Object.keys(array)` returns index strings (`["0", "1", ...]`) like real JS (was a
+    Backlog item).
+  - `for...in` (ForInStatement) iterates own enumerable string keys of plain objects, index
+    strings of arrays, and namespace/tool names of tool references - sharing the interpreter's
+    `enumerableKeys` helper with the `Object.keys` tool path. const/let declarations and bare
+    identifiers bind the key; break/continue work. Anything else (strings, Map/Set, numbers,
+    null, ...) is a clear error suggesting `for...of` or `Object.keys` - deliberately smaller
+    than real JS (which yields indices for strings and zero iterations for Maps/Sets/null).
+  - `supportedSyntaxMessage`, the instructions loops line, and README "Supported Programs"
+    mention the new surface; tests in `test/enumeration.test.ts` (14, incl. the exact
+    transcript program) plus one adapter-level assertion that `Object.keys(tools)` returns
+    MCP server names.
+
+- **Search ranking, namespace scoping, prefixed result paths (done).**
+  Motivation: the Wave 4 e2e run showed a model retrying calls because search-result paths
+  lacked the `tools.` prefix (a Backlog item), and the word-set ranker missed
+  parameter-name and partial-word queries. Fixes:
+  - **Ranking ported from the pre-rebuild implementation** (the `searchTextFor`/`tokenize`/
+    `rankTools` algorithm in `packages/opencode/src/session/code-mode.ts` at git HEAD),
+    replacing the word-set ranker in `tool-runtime.ts`. Searchable text per tool = path +
+    description + input-schema property names + their `description` strings - extracted by
+    the new `inputProperties` helper in `tool.ts` (Effect Schemas via
+    `Schema.toJsonSchemaDocument`, the same emission signature rendering uses; JSON Schemas
+    read `properties` directly, resolving a trivial top-level `$ref`; try/catch falls back to
+    path + description). Queries tokenize on camelCase boundaries + non-alphanumeric
+    separators (empties and `*` dropped). Additive per-term scoring: exact path or
+    path-segment match 20, path substring 8, description substring 4, searchable-text
+    substring 2; summed across terms, filtered to score > 0, sorted score desc then path asc
+    (Fix 8 later made each field check accept the term OR a naive singular variant).
+    An empty query now browses ALPHABETICALLY by path (was declaration order). Kept:
+    `{ path, description, signature }` result items, default limit 10, exact-path instant
+    lookup, input validation errors.
+  - **Namespace scoping**: `tools.$codemode.search({ query?, namespace?, limit? })` -
+    `namespace` (validated as a string when provided) filters `SearchEntry`s to one top-level
+    namespace before ranking; `{ query: "", namespace: "github" }` lists that namespace
+    alphabetically. `searchSignature` updated.
+  - **Callable result paths**: search-result `path`s are rendered as JavaScript expressions
+    rooted at `tools` (`tools.github.list_issues`, or bracket notation for non-identifier
+    segments), directly usable as the call site. Internal `ToolDescription.path` stays
+    unprefixed; only the search RESULT items are rendered this way. Exact-path queries accept
+    canonical paths and rendered expressions.
+  - **Instructions** (`discoveryPlan`): an explicit calling-convention line and a browse
+    hint on the search advertisement (both since absorbed into the `## Rules` section by
+    the instructions restructure below).
+  - **Tests**: package search/discovery tests updated (prefixed paths, alphabetical browse)
+    plus new coverage for namespace scoping, parameter-name matching, partial-word substring
+    matching, alphabetical empty-query order, and prefixed exact-path lookup; one adapter
+    assertion updated to the prefixed path (suites stay 35 + 16, green).
+
+- **Instructions restructure: markdown sections, placeholder-only call forms (done).**
+  The flat prose instructions (which mixed a real catalog tool with fabricated result
+  fields in the worked example) are replaced by structured markdown in `discoveryPlan`,
+  ordered so the workflow sits at the top (the least likely part of a long description to
+  be truncated or skimmed away) and the catalog at the bottom (the per-section content
+  described here was later condensed by Fix 8 - Workflow/Rules deduped, Syntax inverted):
+  - **Intro** (2 lines): "Write a CodeMode program... Return code only." + "Execute
+    JavaScript in a confined runtime with access to the tools listed below under
+    `tools.*`." (the second line drops the tools clause when the tree is empty).
+  - **`## Workflow`**: numbered steps - find a tool via `tools.$codemode.search` -> read
+    the `{ path, description, signature }` matches -> call by path -> `typeof res ===
+"string" ? JSON.parse(res) : res` -> return only the needed fields. When the catalog is
+    COMPLETE the search/read steps collapse into "Pick a tool from the list under
+    `## Available tools`" and the steps renumber (4 instead of 5).
+  - **`## Rules`**: call-by-exact-path; TEXT-is-JSON -> JSON.parse; return small (never raw
+    payloads); filter/aggregate large collections in code instead of per-item round-trips;
+    console.log/warn/error/dir/table for intermediates; `Promise.all` parallelism (no
+    .then/.catch - await + try/catch); `Object.keys(tools)`/`for...in` enumeration;
+    browse-one-namespace via search (PARTIAL only); and host-side media handling (files/
+    images never enter the program; a media-only call yields a small text marker - wording
+    verified against the adapter's `toSandboxResult`/`mediaMarker`).
+  - **`## Syntax`**: the dense syntax lines unchanged, minus the Promise.all and console
+    lines (moved into Rules) and the `for (const ns in tools)` fragment (redundant with
+    the enumeration rule).
+  - **`## Available tools`**: the budgeted catalog unchanged, with the COMPLETE/PARTIAL
+    header merged into the section heading (no trailing colon); the search-signature
+    advertisement follows when PARTIAL (its description-reading and browse clauses moved
+    to Workflow/Rules).
+  - Every call form in Workflow/Rules uses explicit `<namespace>.<tool>`/`<field>`
+    placeholders - the example builder that derived a worked example from the first inlined
+    catalog tool (`exampleArguments` + the example-selection machinery) is DELETED, so no
+    real catalog tool is cherry-picked into examples and no fabricated names or fields
+    appear anywhere in the instructions. Zero tools keep "No tools are currently
+    available." under minimal sections (intro + Syntax + Available tools).
+  - **Tests**: the package worked-example test replaced by section-structure/placeholder
+    assertions (section order; JSON.parse + return-small rules present; no
+    `total_count`/`list_issues`/real-tool example lines; browse hint only when PARTIAL;
+    zero-tool minimal sections) - 156 pass / 0 fail; adapter suites gain the same
+    assertions on the built description (still 35 + 16, green).
+
+**Fix 4 - token-budgeted catalog (was bytes)** (user direction: signatures need a token
+budget; namespaces must always be present):
+
+- `src/token.ts` added: copy of `@opencode-ai/core/util/token` (`round(chars / 4)`), so
+  the package stays dependency-free; keep in sync if the core heuristic changes.
+- `DiscoveryOptions.maxInlineCatalogBytes` -> `maxInlineCatalogTokens` (default 4,000
+  estimated tokens ~ the old 16,000 bytes at 4 chars/token - behavior parity, not a size
+  reduction). `discoveryPlan` charges `estimate(catalogLine(tool))` per line; cheapest-first
+  - stop-on-first-miss unchanged at the time (stop-on-first-miss replaced by round-robin in
+    Fix 8). Namespace stub lines were and remain unbudgeted - every
+    namespace always appears with its tool count, even at budget 0 (asserted in package and
+    adapter tests).
+- Ripple: chars/4 rounding erases small line-length differences, so equal-cost lines fall
+  to the lexicographic path tiebreak; the adapter's PARTIAL test now asserts the
+  lexicographic tail (`op_99`) is excluded instead of `op_149`. Fixed-prose measurements
+  (2026-07): preamble ~44 + Workflow ~146 + Rules ~362 + Syntax ~453 ~ 1,100 tokens fixed;
+  worst-case net description ~ fixed + 4,000 ~ 5,100 estimated tokens.
+
+**Fix 5 - internal limits removed** (user direction: only the three PUBLIC limits survive as
+configurable knobs; the internal limit system dies):
+
+- `ExecutionLimits` (`timeoutMs` 10_000 / `maxToolCalls` 100 / `maxOutputBytes` 32_000 at
+  the time; Fix 6 later removed the first two defaults. Same validation: safe integers,
+  timeoutMs >= 1, others >= 0, RangeError otherwise) is now
+  the ENTIRE limit surface - exactly the shape section 2's original locked spec named.
+  `ResolvedExecutionLimits` shrank to those three fields; the `@internal`
+  `InternalExecutionLimits` type is deleted.
+- **Deleted outright**: `maxOperations` and the whole operation-budget machinery
+  (`recordWork`/`recordOperation`/`budget.operations`, plus the `workUnits`/
+  `cheapArrayMethods` cost helpers); `maxSourceBytes` (the pre-parse source-size check);
+  `maxDataBytes` (every byte-accounting path: `runtimeValueBytes`, `boundedProgramValue`,
+  the container-size caches (`containerSizes`/`objectCounts`), Map/Set incremental `bytes`
+  fields in `values.ts`, string-growth `limitString` checks, tool-argument/result byte
+  checks in `tool-runtime.ts`, and the final-result size check); `maxAuditBytes` (log and
+  audit-trail byte accounting - `toolCalls` records and the start/end hooks are unchanged);
+  `maxCollectionLength` (every array-length/object-field-count check - this knob was
+  actively harmful: an MCP tool returning 20k rows failed). The `OperationLimitExceeded`
+  and `AuditLimitExceeded` diagnostic kinds are gone from the `DiagnosticKind` union and
+  `ExecuteResultSchema` (fine - the package is unreleased).
+- **Fixed constants, not knobs**: `TOOL_CALL_CONCURRENCY = 8` (codemode.ts; the fork
+  semaphore) and `MAX_VALUE_DEPTH = 32` (tool-runtime.ts; the `copyIn` depth check - kept
+  only because it produces a clearer error than a native stack-overflow RangeError; still
+  `InvalidDataValue`). The `DataLimits` plumbing through `tool-runtime.ts` is gone -
+  `copyIn(value, label)` needs no limits argument, and `ToolRuntime.make` takes just
+  `(tools, maxToolCalls, hooks?, searchIndex?)`.
+- **Verified fact**: timeout interruption does NOT depend on the operation budget - the
+  Effect fiber runtime auto-yields between interpreter steps, so `timeoutMs` interrupts
+  even a pure `while (true) {}` loop (empirically verified: a 200ms timeout fired at
+  ~225ms with maxOperations set to MAX_SAFE_INTEGER before the deletion). A regression
+  test in `codemode.test.ts` asserts exactly this (`while(true){}` + `timeoutMs: 200` ->
+  `TimeoutExceeded`, elapsed well under a few seconds).
+- **Kept (correctness, not budgets)**: circular detection (`copyIn` walks +
+  `rejectCircularInsertion` on mutations), plain-objects-only, blocked properties
+  (`__proto__`/`constructor`/`prototype`), data-only checks, and all three public-limit
+  behaviors unchanged.
+- Behavior deltas beyond the intended kills: in-sandbox structures deeper than 32 levels
+  now fail at the data boundary (`copyIn`) instead of at construction; array index
+  assignment allows any non-negative integer index (holes permitted, message now "must be
+  a non-negative integer"); interpreter-produced deep/hostile structures that overflow the
+  native stack during a walk still normalize to the existing "Execution exceeded the
+  maximum nesting depth." data diagnostic - failures remain data everywhere.
+- Tests: deleted the knob-only tests (stdlib Map/Set collection-length growth x2,
+  enumeration operation-budget, codemode maxDataBytes/maxSourceBytes/maxOperations/
+  maxConcurrency-RangeError assertions, and the adapter's runaway-loop-via-operation-limit
+  test - superseded by the package timeout regression test); rewrote the helpers that used
+  `InternalExecutionLimits` as a convenience to plain `ExecutionLimits`
+  (promise/enumeration/stdlib run helpers). Package suite: 154 pass / 0 fail; adapter
+  suites: 34 + 16.
+
+**Fix 6 - no default timeout / tool-call cap** (user direction): `timeoutMs` and
+`maxToolCalls` lost their defaults (were 10_000 / 100) - absent now means no timeout /
+unlimited calls. Budgets are host policy, not library policy; `maxOutputBytes` kept its
+32,000 default at the time (removed later - see the truncation-layering entry: absent now
+means no truncation). `ResolvedExecutionLimits` carries `number | undefined` for both, the
+timeout wrapper is only applied when configured, and `ToolRuntime.make` treats undefined
+`maxToolCalls` as uncapped. Validation is unchanged when values ARE provided (safe integers,
+timeoutMs >= 1, others >= 0). The OpenCode adapter is unaffected in behavior it sets
+(explicit 30s timeout) but now runs with unlimited tool calls. Immediately after, per user
+direction, the adapter's 30s timeout was killed too: `CODE_LIMITS` is deleted and OpenCode
+passes NO limits - no timeout, no tool-call cap. Rationale: user cancel interrupts the
+execution fiber and structured concurrency takes the program and in-flight child calls down
+with it; every child call is permission-gated; output truncation (32KB default) is the only
+active bound. New regression test: 150 tool calls succeed with no limits configured (would
+have tripped the old default 100). Package suite: 155 pass / 0 fail.
+
+**Fix 7 - JSDoc-annotated search signatures**: `tools.$codemode.search` result signatures are
+now the pretty, indented multiline form with per-field JSDoc - ported from the pre-rebuild
+rune renderer in this repo's git history (`renderType(def, { pretty })`/`docTags`/`jsdoc`/
+`renderObject`), adapted to the current renderer's conventions (`Array<T>`, `unknown`
+fallback, existing `$defs`/`$ref` handling and empty-object `{}` collapse; the old
+`Result<T>`/`returnType` machinery was deliberately not ported - payloads stay native).
+Semantics: each described input/output field carries its schema `description` as a
+`/** ... */` comment at the right indent (nested objects recurse deeper); constraints TS can't
+express surface as JSDoc tags - `@deprecated`, `@default <json>` (unserializable defaults
+skipped), `@format`, `@minItems`/`@maxItems`; `*/` inside text is neutralized to `* /`;
+multiline descriptions become `*`-prefixed blocks with blank edges trimmed; undescribed,
+untagged fields get no comment. Implementation: `renderSchema` in `tool.ts` grew a
+`RenderContext` (`{ definitions, pretty }`), a `MAX_RENDER_DEPTH = 8` recursion ceiling plus
+a `$ref` `seen` guard (the renderer previously had neither - a cyclic `$defs` would have
+looped; it now degrades to the ref name/`unknown`), and try/catch totality on the public
+helpers (`toTypeScript`/`jsonSchemaToTypeScript`/`inputTypeScript`/`outputTypeScript` never
+throw - pathological schemas render `unknown`); each helper takes an optional trailing
+`pretty = false` parameter, so existing callers are unchanged and compact output stays
+byte-identical (inline `catalogLine`s and the token budget depend on it). `SearchEntry`
+gained an eagerly-computed `signature` field (built once per tool at index-build time in
+`toSearchEntry` - rendering is cheap and the search hot path stays allocation-free); both
+ranked results and exact-path lookups serve it. Works for both tool kinds: Effect Schema
+annotations (`Schema.String.annotate({ description })`) flow through the emitted JSON
+Schema, and raw JSON Schema (MCP) property metadata is read directly - both covered in
+`test/signature.test.ts` (12 tests) plus one strengthened adapter assertion (MCP property
+description appears as JSDoc in a live search result; the tool description/catalog contains
+no `/**`). README search section updated with an example. Package suite: 167 pass / 0 fail;
+adapter suites: 34 + 16.
+
+**Fix 8 - condensed instructions + round-robin catalog fairness + plural-aware search**
+(user direction: the fixed instruction prose was too verbose; two discovery fixes ride
+along). All in `tool-runtime.ts`; no interpreter changes.
+
+- **Syntax section inverted**: the three dense allowlist lines (~453 estimated tokens)
+  are replaced by four short lines (~188) built on "models already know JavaScript; name
+  only what is unusual or missing": (1) standard modern JS works - functions/closures,
+  destructuring, template literals, loops, try/catch, spread, optional chaining, the
+  usual Array/String/Object/Math/JSON methods, plus Date/RegExp/Map/Set and
+  Promise.all/allSettled/race/resolve/reject; (2) TypeScript type annotations are
+  stripped before execution, decorators are not supported; (3) NOT supported (each fails
+  with a message naming the alternative): classes, generators, for await...of,
+  .then/.catch/.finally (use await with try/catch), `x instanceof Error` (caught errors
+  are plain `{ name, message }` objects), splice; (4) the data-boundary note (Dates ->
+  ISO strings; Map/Set/RegExp -> `{}`). Every claim was verified against the interpreter
+  before writing: probed empirically - classes/generators/for-await/.then/.catch/
+  .finally/`instanceof Error`/splice/decorators/BigInt/labeled statements/tagged
+  templates/object getters all fail with clear diagnostics; TS annotations/`as`/
+  interfaces/type aliases are stripped and TS **enums actually work** (transpileModule
+  compiles them to an IIFE the interpreter runs), hence enums deliberately unmentioned.
+  `supportedSyntaxMessage` (the in-diagnostic text in `codemode.ts`) is untouched.
+- **Workflow/Rules deduped**: the call-by-exact-path, JSON.parse-string-results, and
+  return-small content now lives ONLY in the numbered Workflow steps (with their
+  compliance-driving justifications inline: "most tools return JSON as a string", "raw
+  payloads get truncated and waste context"); Rules keeps only bullets adding new
+  content - filter/aggregate collections in code, console.\* intermediates (logs ride
+  back), Promise.all parallelism, Object.keys/for...in enumeration, browse-namespace
+  (PARTIAL only), and the media rule compressed to one line. The no-.then/.catch
+  guidance moved to the Syntax not-supported line. Content upgrades: the PARTIAL search
+  step gained query-style guidance (`- short phrases like "list issues" work best`; a
+  clearly-a-query-string example, not a tool name), and the exact-path guidance is now
+  "call it with the result's `path` as-is (never guess segments)" / COMPLETE: "use it
+  as-is rather than guessing segments".
+- **Fixed-prose measurements** (instructions split on `"\n## "`, catalog budget 0,
+  bytes/3.7 - same method as Fix 4; chars/4 in parentheses):
+  preamble 44 -> 44 (41 -> 41), Workflow 146 -> 187 (135 -> 171), Rules 362 -> 191
+  (332 -> 176), Syntax 453 -> 188 (419 -> 174); fixed prose total 1,005 -> 610 (927 -> 562),
+  ~ 40% reduction with no behavioral content dropped. Workflow grew slightly because it
+  absorbed the deduped parse/return-small justifications.
+- **Round-robin namespace inlining** (`discoveryPlan`): the ported stop-on-first-miss
+  behavior (alphabetically-late namespaces starved to "none shown" while an early
+  namespace inlines everything) is replaced by round-robin fairness - in each round
+  (namespaces alphabetical), every namespace still holding un-inlined tools attempts to
+  place its next-cheapest line against the shared token budget; a namespace whose next
+  line does not fit is done while the others keep going; stop when all are done. Every
+  namespace gets some representation before any namespace gets everything. Kept:
+  `estimate` (chars/4) budget accounting, unbudgeted namespace stub lines, per-namespace
+  `(N tools)`/`(N tools, K shown)`/`(N tools, none shown)` labels, COMPLETE vs PARTIAL
+  header, alphabetical namespace order in the output, cheapest-first within each
+  namespace's shown set.
+- **Plural/singular search fix**: `tokenize`d terms matched one-directionally (term must
+  be substring of indexed text), so query "issues" missed a tool whose text only says
+  "issue". Now each term expands to `termForms` - the term plus naive singular variants
+  (trailing "es" stripped when length > 3, trailing "s" when length > 2) - and each of
+  the four field checks passes when ANY form matches. Weights, exact-path lookup, and
+  namespace scoping untouched. A true plural path match still outranks a singular-only
+  description match (path substring 8 + searchable 2 > description 4 + searchable 2).
+- **Tests**: package instruction/structure assertions updated to the new text; new
+  syntax-section test (leads with "Standard modern JavaScript works", names the
+  verified not-supported list, keeps the data-boundary note); the budget-exhaustion
+  test rewritten to assert the new fairness (alpha.expensive not fitting must NOT
+  prevent beta.cheap from showing: PARTIAL 2 of 3, `- beta (1 tool)` fully shown); new
+  plural/singular test (query "issues" finds a singular-only tool; ranking still
+  prefers the true "issues" path match). Adapter: description assertions updated; the
+  large-catalog PARTIAL test now asserts `zeta_only_tool` IS shown (`- zeta (1 tool)` +
+  its inlined line) - it was "none shown" under starvation. README updated (budgeted
+  catalog paragraph -> round-robin; search paragraph -> singular variants;
+  instructions-structure paragraph -> new section contents). Package suite: 169 pass /
+  0 fail; adapter suites: 34 + 16.
+
+**Fix 9 - prompting trims per user review of Fix 8** (user reviewed the condensed
+instructions and directed further cuts):
+
+- Default `maxInlineCatalogTokens` 4,000 -> **2,000** (user wants ~2k tokens of signatures
+  auto-inlined; round-robin fairness from Fix 8 spreads it across all namespaces).
+- Console rule and files/images rule DROPPED from `## Rules`. Replaced by a single
+  `unknown`-treatment warning: "A result typed `Promise<unknown>` has no guaranteed
+  shape - verify what actually came back before relying on its fields." (Deliberately
+  does NOT suggest console.log - user review: naming it there nudges models to log AND
+  return the same data; the prompt stays console-neutral, neither for nor against.)
+  The media-stripping MECHANISM is unchanged and still tested; only the prose about it
+  is gone - the `[N images attached]` marker is self-explanatory in context.
+- Kept as-is per user: the JSON.parse workflow step (maps to the original motivating
+  transcript failure; NOT copied from prior art - see section 5 note), the browse-namespace rule
+  (undecided), no no-fetch/ambient-authority rule added (proposed, not approved).
+- Explicitly REJECTED for now: auto-parsing JSON-looking text results at the adapter
+  boundary ("could get weird" - type flips, program-sees vs tool-sent divergence). Logged
+  as a next-iteration follow-up below.
+
+**DSL-expansion pass - interpreter-surface batch from section 4** (the deferred medium-tier JS
+parity items, done as one focused pass; no public API or limit changes):
+
+- **`instanceof` + real Error values**: the `errorConstructors` names (`Error`,
+  `TypeError`, `RangeError`, `SyntaxError`, `ReferenceError`, `EvalError`, `URIError`) are
+  bound globals (`ErrorConstructorReference`, callable with or without `new`; `typeof` ->
+  `"function"`). Error values stay the same plain `{ name, message }` null-prototype
+  objects as before - the constructor name additionally rides on a NON-ENUMERABLE symbol
+  key (`ErrorBrand`), which every `Object.entries`-based walk (copyIn/copyOut, spread,
+  JSON.stringify) is blind to, so serialization is byte-identical to the old shape and the
+  brand is lost on spread/boundary copies exactly like JS loses the prototype.
+  `caughtErrorValue` produces `{ name, message }` wrappers via `createErrorValue`, so
+  caught interpreter AND tool failures are `instanceof Error` and carry the `name` the
+  equivalent real-JS failure would have (follow-up fix, user-directed - "closest to real
+  JS"): `InterpreterRuntimeError` gained an `errorName` field ("Error" default) set
+  fluently at throw sites via `.as(name)` - `JSON.parse` failures are `"SyntaxError"` (and
+  now include the engine's position detail in the message; safe - derived from the
+  program-supplied string), invalid regex patterns/flags `"SyntaxError"`, unknown
+  identifiers and TDZ access `"ReferenceError"`, assignment to a constant `"TypeError"`,
+  a bad `normalize` form `"RangeError"`; a host Error reaching the catch path directly
+  keeps its own name when it is one of the standard seven. Tool failures and everything
+  without a specific analogue stay `"Error"` - internal class names never leak. Specific
+  names satisfy the specific `instanceof` (`e instanceof SyntaxError`), matching JS.
+  The operator is handled in `evaluateBinaryExpression`
+  BEFORE the data-only operand check (like `typeof`, it observes any lhs - promises and
+  functions included); recognized rhs: the error constructors (a specific type matches its
+  own brand or `Error`, never a sibling), `Date`/`RegExp`/`Map`/`Set` (sandbox classes),
+  `Array`, `Object` (any object/function-ish value), `Promise` (`SandboxPromise`), and
+  `Number`/`String`/`Boolean` (always false - no boxed values exist); anything else is a
+  catchable error naming the recognized constructors.
+- **Array methods**: `splice` (mutating, returns the removed elements; insertions run
+  `rejectCircularInsertion` like push/unshift; one-arg form removes to the end, undefined
+  delete count removes nothing), `fill` (circular-checked value) and `copyWithin`
+  (host-delegated), and `keys`/`values`/`entries` returning **arrays** (the Map/Set
+  convention - for...of and spread work either way). The `retryableArrayMethods`
+  "rewrite using map/filter" hint set emptied out and was deleted with its branch; unknown
+  array properties still read `undefined`.
+- **String methods**: `localeCompare(that)` (locale/options arguments ignored - host
+  default locale; the dominant use is a sort comparator), `normalize(form?)` (invalid form
+  -> catchable error naming the four valid forms), `trimLeft`/`trimRight` as
+  trimStart/trimEnd aliases.
+- **Actionable regex failures**: `toHostRegex` and `constructRegExp` now show the
+  offending pattern (or flags) plus the engine reason (deduped "Invalid regular
+  expression:" prefix via `regexFailureReason`) and a shared escaping hint
+  (`escapeRegexHint`); flags failures list the valid flag letters; the
+  replaceAll/matchAll missing-`g` errors spell out the exact `/pattern/g` to write and
+  the single-match alternative.
+- **copyIn split (the important one)**: `copyIn(value, label, preserveSandboxValues =
+false)` - recursion moved to a private `copyBounded`; `boundedData` (every intra-sandbox
+  checkpoint: `Object.*` helpers, coercion/Array.from/join inputs, template
+  interpolation, expression-result checkpoints) is now `copyIn(value, label, true)`,
+  which passes `SandboxDate`/`SandboxRegExp`/`SandboxMap`/`SandboxSet` through **by
+  reference as leaves** (contents not walked - Map/Set members are validated at their
+  mutation sites) while keeping the depth (`MAX_VALUE_DEPTH`), circularity,
+  plain-objects-only, blocked-property, and data-only checks; un-awaited promises keep
+  the await-hinting rejection in BOTH modes (deliberate - JS-parity pass-through was
+  considered and skipped to preserve the nudge). The HOST boundary (final result,
+  tool-call arguments, `JSON.stringify`, tool-result intake) uses the default mode and
+  still serializes JSON forms (Date -> ISO, RegExp/Map/Set -> `{}`); host instances met on
+  the preserving path are defensively wrapped into sandbox equivalents. Ripple: the
+  `Object.*` helpers treat sandbox values as empty objects (`Object.keys(map)` -> `[]`,
+  assign sources contribute nothing, hasOwn -> false - JS has no own enumerable props
+  there), so interpreter internals (`.map`/`.time`/`.regex`) can never leak; the
+  template-literal sandbox carve-out collapsed into `boundedData`. Object/array spread
+  already preserved instances (reference copies, no checkpoint) - now tested.
+- **Console formatting**: `formatConsoleArgument` is total and deep
+  (`formatConsoleValue`): numbers render via `String` (`NaN`/`Infinity`/`-Infinity`
+  literally - never the JSON `null`; finite numbers match their JSON form), nested
+  strings are JSON-quoted, sandbox values keep their friendly forms at ANY depth (ISO
+  date, `/regex/flags`, `Map(n) [...]`, `Set(n) [...]`), opaque references become
+  in-place `[CodeMode reference]` markers instead of collapsing the whole argument,
+  cycles render `[Circular]` (reachable via Map/Set members, which mutation never
+  checkpoints), and depth beyond `MAX_CONSOLE_DEPTH = 32` (fixed constant, not a knob)
+  degrades to `...` - console can no longer fail a program. `console.table` guards with
+  `containsOpaqueReference` (sandbox cells render, e.g. ISO dates) and its row/cell
+  walkers treat sandbox values as scalar cells.
+- **Prose**: the instructions Syntax not-supported line dropped its `instanceof
+Error`/splice mentions (nothing else reworded); README updated (checkpoint
+  preservation vs boundary serialization, error values/`instanceof`, new array/string
+  methods, regex-failure behavior); `supportedSyntaxMessage` left untouched (it lists
+  supported syntax, was already non-exhaustive, and stays accurate).
+- **Tests**: package suite 169 -> 209 (parity: Error/instanceof + real-JS error-name
+  coverage, splice/fill/copyWithin/keys/values/entries, localeCompare/normalize/trim-alias
+  describes; stdlib: checkpoint survival incl. tool-arg boundary pinning, stdlib
+  `instanceof`, regex-message assertions; codemode: NaN/Infinity + nested/cyclic console
+  rendering, table cells, caught-tool-failure `instanceof`); adapter suites unchanged
+  (34 + 16, green); both packages `tsgo --noEmit` clean.
+
+**Truncation layering - CodeMode truncation off in OpenCode** (user direction; resolves the
+section 4 outer-truncation item the OPPOSITE way from "kill the outer one"):
+
+- `maxOutputBytes` lost its 32,000 default and now behaves exactly like the other two
+  limits: absent = no truncation. All three limits are uniformly no-default - budgets are
+  host policy. `ResolvedExecutionLimits.maxOutputBytes` is `number | undefined`;
+  `boundOutput` only runs when the host set the limit. Explicit values validate as before
+  (safe integer >= 0).
+- OpenCode continues to pass NO limits, which now also means no CodeMode truncation.
+  `execute` is a normal `Tool.define` tool, so OpenCode's native tool-output truncation
+  applies with no special-casing - verified by tracing `wrap()` (`tool.ts:130-144`,
+  50KB/2000-line thresholds in `truncate.ts`, full output dumped to a file under
+  `tool-output/`): the `metadata.truncated` self-truncation exemption never fires for
+  `execute` (its metadata never sets that key). One truncation layer, the host's - and it
+  is the richer one (file dump + explore/grep hint vs an inline marker).
+- Hosts without their own output bounding set `maxOutputBytes` explicitly; README table
+  and prose updated, adapter comment rewritten. Tests: codemode +1 (absent limit -> 100KB
+  value + 50KB log line pass through unbounded, `truncated` undefined); the adapter test
+  that relied on the old default now asserts the oversized result reaches the shared
+  wrapper un-truncated. Suites: 210 + 50, tsgo clean both.
+
+**Docs polish** (post-API-review): stale `DiscoveryOptions` JSDoc fixed (claimed default
+4,000 and alphabetical cheapest-first - now 2,000 and round-robin, matching Fix 8/9 reality)
+and the README's incorrect "`effect` as a peer dependency" line corrected (`effect` is a
+regular dependency; hosts depend on it themselves because the API surface is Effect-typed).
+
+**Registry promotion + permission-aware catalog** (the "promote to a proper tool service"
+restructure; fixes the section 4 permission-advertising bug):
+
+- **The adapter moved** `src/session/code-mode.ts` -> `src/tool/code-mode.ts` and is now a
+  registry-resident tool service on the TaskTool precedent: `CodeModeTool =
+Tool.define(CODE_MODE_TOOL, ...)` whose init depends on `MCP.Service`, `Agent.Service`,
+  and `Session.Service`. It is yielded in `ToolRegistry.layer`, gated into `builtin` by
+  `flags.experimentalCodeMode` (like the lsp/plan experiments), and `MCP.node` joined the
+  registry's `node.deps` (`MCP.node` has no ToolRegistry dependency, so no cycle). The
+  session-level special-casing in `session/tools.ts` (ad-hoc `SessionCodeMode.define` +
+  append) is deleted; the early return that suppresses raw per-MCP registration when the
+  flag is on stays session-side, keyed on the same flag+tool-count condition.
+- **Enablement** lives in `ToolRegistry.tools()` next to the WebSearchTool check: the MCP
+  tool count is consulted once (an Effect) before the synchronous filter, and code mode
+  passes the predicate iff `flags.experimentalCodeMode` && count > 0.
+- **Description split on the `describeTask` precedent**: the tool's static base
+  description is a two-line summary; `describeCodeMode(agent)` in `registry.tools()`
+  appends the full CodeMode instructions (workflow/rules/syntax + grouped catalog,
+  `catalogInstructions` in the adapter) at the same composition point as task - so
+  `plugin.trigger("tool.definition")` sees the base description first.
+- **Permission-aware catalog + dispatch** (the bug fix): the visibility predicate from
+  `llm/request.ts` `resolveTools` is hoisted to `Permission.visibleTools(tools, ruleset)`
+  (a record filter over `Permission.disabled` - only a hard `deny` with pattern `"*"`
+  hides a tool; ask-level rules stay fully visible and prompt at call time) and
+  `resolveTools` now uses it, so the two paths cannot drift. `describeCodeMode` filters
+  with the merged agent+session ruleset that `SessionTools.resolve` passes into the
+  registry before building the catalog/search index; `execute` rebuilds the runtime per
+  execution from a fresh, filtered `mcp.tools()` snapshot using the same merged ruleset
+  (`Agent.get(ctx.agent)` + `Session.get(ctx.sessionID)`, matching the merge
+  `SessionTools.context` wires into `ctx.ask`) - a denied tool is not dispatchable
+  even if the model guesses its name and yields the normal unknown-tool diagnostic.
+  Documented gap (out of scope by design): per-message `user.tools[key] === false` arrives
+  at request-prep after descriptions are built and has no child-call equivalent.
+- **Preserved behavior**: cancellation race + pre-aborted-signal guard, `toSandboxResult`
+  unwrap order, attachment accumulation, `CODE_MODE_TOOL` at all title sites, no execution
+  limits (native truncation only), `displayInput`, per-child `ctx.ask` gating (now wired
+  through `Tool.Context` exactly like every registry tool).
+- **Explicit non-goal**: memoizing the catalog builder keyed on (ToolsChanged generation,
+  permission ruleset) was considered and deliberately skipped - the per-turn rebuild is
+  cheap (grouping + string rendering); revisit only if profiling shows it matters.
+- **Tests**: the two adapter suites moved to `test/tool/{code-mode,code-mode-integration}
+.test.ts` (mocked `MCP.Service`/`Agent.Service`/`Session.Service` replacing the direct
+  `define(...)` construction; description assertions target `catalogInstructions`, the
+  registry's composition input) and gained permission coverage: deny excluded from
+  catalog/search, ask-level stays visible and callable, denied tool undispatchable
+  (unknown-tool diagnostic), `Permission.visibleTools` semantics. `test/tool/
+registry.test.ts` gained four registry-level tests: registered with flag+MCP tools,
+  excluded without MCP tools, excluded with flag off, and deny/ask catalog filtering
+  through `registry.tools()`. Suites: 43 + 16 adapter tests, 16 registry tests, all green.
+
+**Shared MCP invocation middle (`McpInvoke.invoke`)** (closes the section 4 "plugin hooks skip
+child calls" gap):
+
+- `packages/opencode/src/mcp/invoke.ts` extracts the duplicated "invoke an MCP tool"
+  middle into one shared `McpInvoke.invoke(input)`: plugin `tool.execute.before` hook ->
+  permission ask (`{ permission: key, patterns: ["*"], always: ["*"] }` via the caller's
+  `ctx.ask`) -> dispatch through the ai-sdk tool's execute inside the `Tool.execute`
+  tracing span (`tool.name`/`tool.call_id`/`session.id`/`message.id` attributes) ->
+  plugin `tool.execute.after` hook. It returns the RAW result the ai-sdk execute
+  resolved with; each caller keeps its own shaping edge - the legacy per-MCP loop in
+  `SessionTools.resolve` applies its existing model-facing shaping/truncation, code
+  mode applies `toSandboxResult`. It lives under `src/mcp/` because both callers
+  already depend on MCP and the function is about invoking an MCP-backed ai-sdk tool,
+  not about sessions or code mode.
+- **After-hook payload**: fired inside `McpInvoke.invoke` with the raw MCP result -
+  which is exactly what the legacy loop always passed (the raw `CallToolResult`, not
+  the shaped `{title, output, metadata}`), so legacy behavior is preserved bit-for-bit
+  and the hook payload cannot drift between callers. No callback/edge-firing design
+  was needed.
+- **Synthetic child callID**: code-mode child calls pass `${parentCallID}/${n}` as the
+  hook/span callID (`parentCallID` = the `execute` call's `ctx.callID`, falling back to
+  the entry key; `n` = per-execution counter starting at 1, shared across all child
+  calls in one program). callID is an opaque string - nothing parses it. The ai-sdk
+  `toolCallId` (`options.toolCallId`) stays each caller's existing value
+  (`ctx.callID ?? entry.key` for code mode).
+- **Child-scoped hook failures**: `CodeModeTool` (which now also yields
+  `Plugin.Service`) wraps the whole child call - hooks, ask, dispatch - in
+  `toCatchable` (the generalization of the old `askPermission` catchCause), so a plugin
+  hook failure fails ONLY that child call as a catchable in-program `toolError`; other
+  calls in the same program keep running and interruption still propagates as
+  interruption. Legacy semantics unchanged: a hook failure fails the tool call.
+- **Tests**: `test/tool/code-mode.test.ts` +2 (child calls fire before/after with the
+  MCP key and `parent/1`, `parent/2` ids, after hook carries the raw MCP result; a
+  failing before hook is caught in-program, gates dispatch, and leaves the outer
+  execute ok) - both code-mode harnesses gained a `Plugin.Service` mock (pass-through
+  trigger by default, overridable). New `test/session/tools.test.ts` (3 tests) pins
+  `SessionTools.resolve` at the real-registry seam (LayerNode.compile, fake MCP layer):
+  flag on + MCP tools -> `execute` present, raw MCP keys suppressed; flag off -> raw
+  keys present, `execute` absent; and the legacy raw-MCP execute fires before/after
+  hooks keyed by the ai-sdk toolCallId with the raw result payload. Suites: adapter
+  45 + 16, session/tool/permission all green; this package untouched (211 pass).
+
+**Signature rendering + compound-assignment parity fixes** (externally reported, both
+verified real with failing tests before fixing):
+
+- **Non-identifier property names in rendered signatures** (`src/tool.ts`): `renderSchema`
+  emitted raw property names, so schema properties like `foo-bar`/`@type`/`x.y`/`123`
+  rendered invalid TypeScript (`{ foo-bar?: string }`). Fixed with a `renderKey` helper -
+  bare identifiers stay bare, everything else is `JSON.stringify`-quoted - applied in the
+  single `field` closure both the compact and pretty renderings share. The
+  `identifierSegment` regex now lives in `tool.ts` (exported) and `tool-runtime.ts`'s
+  bracket-notation `toolExpression` imports it: one source of truth for "is this a bare
+  identifier" across object keys and tool paths. Tests: `signature.test.ts` +4 (compact,
+  pretty with JSDoc on a quoted key, JSON Schema input+output, Effect Schema struct).
+- **Numeric schema unions keep their real alternatives** (`src/tool.ts`): the old
+  `anyOf`/`oneOf` renderer collapsed any union containing `{ type: "number" }` to just
+  `number`, dropping real JSON Schema alternatives (`string | number`, `number | null`,
+  etc.). The collapse is now restricted to Effect's number-schema artifact
+  (`number | "NaN" | "Infinity" | "-Infinity"`, emitted as single-value string enums),
+  while raw JSON Schema unions render every branch. Tests: `signature.test.ts` +3.
+- **Compound assignment now matches binary-operator semantics** (`src/codemode.ts`):
+  `applyCompoundAssignment` did raw JS ops on interpreter wrapper objects, so `x += y`
+  diverged from `x = x + y` (sandbox Date `d += 1` produced `"[object Object]1"`;
+  `d -= 400` gave `NaN` instead of epoch arithmetic). The operator table + coercion moved
+  verbatim out of `evaluateBinaryExpression` into a shared `applyBinaryOperator`;
+  compound assignment validates against a `compoundOperators` set (`+=` ... `>>>=`) and
+  dispatches through it (`operator.slice(0, -1)`). Logical assignments (`&&=`/`||=`/`??=`)
+  keep their separate short-circuit path (`evaluateLogicalAssignment`), and both
+  assignment call sites still wrap results in `boundedData`. Deliberate side effect:
+  compound assignment now rejects opaque references, consistent with binary operators.
+  Tests: `parity.test.ts` +5 (Date `+=` concat parity, Date `-=`/`/=` epoch parity,
+  string `+=` object/array, member-target compound, 13-case operator sweep vs real JS).
+  Package suite: 220 pass.
+
+---
+
+## 4. Remaining work (detailed TODO)
+
+### Next DSL-expansion pass (done - see the DSL-expansion pass entry in section 3)
+
+Batch these together - per user direction: important, but deliberately deferred to one
+focused interpreter-surface pass rather than picked off piecemeal.
+
+- [x] Medium-tier JS parity items deferred from the original audit: caught errors are plain
+      `{ name, message }` objects, not `instanceof Error` (and `Error` isn't a value -
+      `x instanceof Error` is unsupported syntax); `splice` (still a
+      "rewrite using map/filter" hint) and array `entries()/keys()/values()`;
+      `localeCompare`/`normalize`/`trimLeft`/`trimRight`; friendlier regex-y error messages.
+      (`fill`/`copyWithin` - which the hint set also covered - were implemented too since
+      they are trivial host delegations, so the hint set is gone entirely.)
+- [x] `Date`/`Map`/`Set`/`RegExp` values passing through `Object.*` helpers and coercion
+      checkpoints take their JSON forms (e.g. `Object.values({ d: date })` yields the ISO
+      string, not the Date - calling `.getTime()` on it then fails). Currently deliberate
+      (documented in README) but flagged as important: fix in this pass by letting sandbox
+      values survive `Object.*`/spread checkpoints instead of JSON-serializing them.
+- [x] `console.log(NaN)` prints `"null"` (goes through the boundary chokepoint) - could
+      special-case number formatting in `formatConsoleArgument`.
+- [x] Sandbox values nested inside logged containers print `[CodeMode reference]`
+      (`console.log({ m: map })`) - could deep-format instead.
+
+### Next iteration: text-result handling (deliberate follow-up, user-directed)
+
+- [ ] Revisit how MCP text results reach the program. Today: `structuredContent` when the
+      server sends it, else joined text as a plain string (the program JSON.parses it,
+      guided by a workflow step). Considered and deferred: (a) conservative boundary
+      auto-parse (text starting with `{`/`[` that parses cleanly becomes an object) -
+      rejected for now as potentially confusing (type flips; program sees something other
+      than what the tool sent); (b) raw-envelope passthrough with the envelope shape
+      stamped into every output schema - rejected (more digging per call, verbose
+      signatures). Result quality is dominated by whether servers declare output schemas;
+      revisit once real usage shows which failure modes matter.
+
+### Next iteration: stdlib surface (prioritized)
+
+Current instructions say "usual Array/String/Object/Math/JSON methods," but the interpreter is
+intentionally a subset. Keep CodeMode focused on orchestration and data shaping, not a full host
+runtime, but close the high-friction gaps models are likely to reach for.
+
+- [ ] **P0: tighten wording first** - change instructions/docs to say "common stdlib subset"
+      until the surface is broader. This avoids misleading the model into assuming every JS
+      helper exists.
+- [ ] **P1: URL parsing helpers** - add `URL` and `URLSearchParams`. These are high-value for
+      tool orchestration (query strings, ids in URLs, API links), deterministic, and do not add
+      ambient host authority.
+- [ ] **P2: Math completion** - add the missing standard deterministic `Math` methods
+      (`sin`/`cos`/`tan`, inverse/hyperbolic variants, `atan2`, `log1p`, `expm1`, `imul`,
+      `fround`, `clz32`, etc.). Decide explicitly on `Math.random`: likely acceptable because
+      `Date.now()` is already exposed, but document the nondeterminism if enabled.
+- [ ] **P3: base64 helpers** - add string-only `atob`/`btoa` equivalents. Useful for API/tool
+      payload cleanup and does not require opening the broader binary boundary.
+- [ ] **P4: small crypto helper** - consider `crypto.randomUUID()` only, not full `crypto`.
+      UUID generation is a common orchestration need; broader crypto can wait until there is a
+      concrete use case and a clear capability boundary.
+- [ ] **P5: text/binary primitives** - consider `TextEncoder`/`TextDecoder` first, then
+      `ArrayBuffer`/typed arrays/`DataView`/`Blob`/`File` only with an explicit boundary design
+      (serialization, size limits, and how values cross tool args/results). This is reasonable
+      but lower priority than URL/base64 because CodeMode is still plain-data oriented.
+- [ ] **P6: date/formatting conveniences** - consider `Date` setters and common formatting
+      helpers (`toUTCString`, maybe `Intl` later). Lower priority; most orchestration can use
+      existing getters, `Date.parse`, `Date.UTC`, and ISO strings.
+- [ ] **P7: environment/config access** - do not expose raw `process.env` as a global ambient
+      authority. If this becomes useful, add an explicit host-provided/whitelisted capability
+      (for example a small env/config tool or injected read-only object) so secrets are not
+      accidentally exposed to arbitrary CodeMode programs.
+
+Explicit non-goals for now: `structuredClone`, `WeakMap`/`WeakSet`, and timers
+(`setTimeout`/`setInterval`/`queueMicrotask`). They do not materially improve the current tool
+orchestration use case.
+
+### Wiring-review findings (subagent code review of the OpenCode integration, triaged)
+
+Pre-PR fixes (user-approved cut):
+
+- [x] **Cancellation does not interrupt the interpreter** - the no-limits rationale claimed
+      "user cancel interrupts the execution fiber," but `tools.ts` runs tools via
+      `run.promise` -> `Effect.runPromise` (`effect/bridge.ts:64-66`) with NO abort wiring;
+      on cancel the ai-sdk abandons the promise, child MCP calls abort (they hold
+      `ctx.abort`) but the interpreter fiber spun on - `while(true){}` or a try/catch
+      loop was uncancellable with no timeout backstop. Verified by hand, not just the
+      reviewer. FIXED in the adapter: `Effect.raceFirst(runtime.execute(code), cancelled)`
+      where `cancelled` is an `Effect.callback` abort-signal watcher (listener removed on
+      interruption) resuming with an `ok: false` "Execution cancelled." result - the abort
+      winning the race interrupts the execution fiber (interpreter auto-yield makes busy
+      loops preemptible, same mechanism as timeoutMs) and returning a value keeps the
+      runner's post-abort `completeToolCall` bookkeeping on its normal path. A pre-aborted
+      signal short-circuits at entry before the program starts (racing alone still lets
+      the loser run its first steps). Tests: +2 adapter (child call triggers abort
+      deterministically then the program enters `while(true){}` - would hang if
+      interruption broke; pre-aborted signal runs nothing). Adapter suite 34 -> 36.
+      (Wiring abort->interrupt into the shared `tools.ts` runner for ALL tools remains a
+      worthwhile separate change.)
+- [x] **Permission-denied/disabled MCP tools are still advertised in the catalog** - the
+      non-code-mode path filters them from the model's view (`llm/request.ts:208-213`);
+      code mode builds the catalog from all of `mcp.tools()`, so the model is invited to
+      call tools that can only fail at permission time, and per-message `tools[key]=false`
+      disabling has no child-call equivalent. Fix: filter the catalog with the same
+      ruleset.
+      DONE (see the "Registry promotion + permission-aware catalog" entry in section 3): the
+      shared `Permission.visibleTools` predicate filters both the appended
+      catalog/description (`describeCodeMode`, agent ruleset) and the execute-time tool
+      tree (merged agent+session ruleset) - hard-denied tools are neither advertised nor
+      dispatchable. Ask-level tools stay visible/callable. Per-message
+      `tools[key] === false` remains a documented gap by design (it arrives at
+      request-prep, after descriptions are built).
+- [x] Style: `code-mode.ts` is the only `src/session` sibling without the
+      `export * as ... from "./..."` self-reexport footer, forcing a star import at
+      `tools.ts:26` (AGENTS.md violation). Add footer + import the projection.
+      DONE: added `export * as SessionCodeMode from "./code-mode"` footer; `tools.ts` now
+      imports the named `SessionCodeMode` projection.
+- [x] Trivial: latent `groupByServer` fallback bug - `key.slice(0, key.indexOf("_"))` is
+      `slice(0, -1)` when no underscore (unreachable today; guard or drop); dead
+      `CODE_MODE_TOOL` export (integration points hardcode `"execute"` - use it or inline
+      it).
+      DONE: no-underscore key now falls back to the whole key (test pins it); the four
+      `title: "execute"` sites in `code-mode.ts` now reference `CODE_MODE_TOOL`.
+
+Post-MVP (logged, not blocking an experimental flag):
+
+- [x] **Plugin `tool.execute.before/after` hooks skip child calls** - legacy MCP
+      registration fires them per tool (`tools.ts:419-441`); under code mode only the
+      outer `execute` fires them, so auditing/intercepting plugins silently lose MCP
+      coverage when the flag flips.
+      DONE (see the "Shared MCP invocation middle" entry in section 3): both paths now run
+      `McpInvoke.invoke` (`src/mcp/invoke.ts`) - hooks AND the `Tool.execute` span fire
+      for child calls with synthetic `${parentCallID}/${n}` callIDs; hook failures are
+      child-scoped, catchable in-program errors.
+- [x] Description/preview rebuilt every assistant turn - `registry.tools()` re-runs
+      `groupByServer` + a throwaway `CodeMode.make(...).instructions()` per turn
+      (`describeCodeMode`). DECIDED as an explicit non-goal: memoizing the catalog
+      builder keyed on (ToolsChanged generation, permission ruleset) was considered and
+      deliberately skipped - the per-turn rebuild is cheap (grouping + string
+      rendering); revisit only if profiling shows it matters. A second `CodeMode.make`
+      per execution is inherent (description precedes execution).
+- [ ] Child permission rejection round-trips through the defect channel - `ctx.ask`
+      defect (`tools.ts:90` orDie) recovered via `catchCause` + `Cause.squash`
+      (`code-mode.ts:238-245`). Works, interrupts preserved, but fragile coupling;
+      exposing the typed rejection on `Tool.Context.ask` would be cleaner.
+- [ ] No collision guard on the `execute` tool id (a plugin/custom tool named `execute`
+      is silently shadowed; a log line would do).
+- [ ] Style nits: triple-nested `yield*` in `tools.ts:101-107` argument position (bind
+      first, like neighbors); single-use micro-helpers (`toJsonSchema` is a bare cast);
+      comment density far above session-neighbor norm; adapter tests use raw
+      `Effect.runPromise` + hand-built layers with `as any` instead of the
+      `testEffect`/`LayerNode.compile` fixture pattern (`test/tool/grep.test.ts:25-31`)
+      and star-import `Truncate`.
+- [ ] Reviewer observation worth keeping: MCP server instructions (`sys.mcp`,
+      `session/system.ts:110-126`) still inject prose referencing server-native tool
+      names that are no longer directly callable under code mode.
+
+### Backlog / loose ends (non-blocking, any order)
+
+- [ ] `evaluateUpdateExpression` (`++`/`--`) still uses raw `Number(current)`, so `d++` on a
+      sandbox Date yields `NaN` where `d += 1` now uses epoch semantics (and real JS `d++`
+      would give epoch+0 numeric). Pre-existing, out of scope of the compound-assignment
+      parity fix; route it through `applyBinaryOperator` if it ever matters.
+- [ ] Media-only marker could name what it attached when MCP provides names: `image`/`audio`
+      blocks carry no filename (mime + data only) so the generic
+      `[N images attached to the result]` stays, but `resource`/`resource_link` blocks have
+      URIs/names we could surface, e.g. `[2 files attached: chart.png, data.csv]`. Minor.
+- [x] Truncation layering decided (user direction): the OPPOSITE of killing the outer layer -
+      CodeMode truncation off in OpenCode (`maxOutputBytes` lost its default; absent = no
+      truncation, uniform with the other two limits), native tool-output truncation is the
+      single active layer (verified: `execute` flows through `tool.ts` `wrap()` like any
+      normal tool, no exemption). See the section 3 entry.
+- [x] Flaky wall-clock assertion removed from `test/promise.test.ts`: the parallelism test
+      now relies solely on the deterministic `trace.maxActive > 1` counter (which proves
+      true temporal overlap). The timeout tests were never flaky - 100ms timeout vs 60s
+      tool sleeps (600x margin) with counter-based assertions.
+- [ ] Attachment propagation believed correct but unverified end-to-end at the OpenCode
+      wiring layer (codemode strips -> `Tool.ExecuteResult.attachments` -> processor
+      normalizes -> `FilePart`s visible to the model). Code-reviewed as sound; confirm with
+      one interactive session (an image-returning MCP tool) when convenient. Same session
+      can eyeball TUI child-call rendering via `metadata.toolCalls`.
+- [x] Commit hygiene: all work committed and pushed on `codemode-v2` as six commits, in
+      generic-package + OpenCode-integration pairs (waves 0-5; Fixes 4-9; DSL pass +
+      error names + truncation layering). Future work: commit only when explicitly asked;
+      push with `--no-verify` per repo convention. The scratch `.opencode/opencode.jsonc`
+      stays uncommitted.
+- [ ] MVP scope decided (user direction): the interactive e2e eyeball is NOT required -
+      remaining pre-PR work is essentially just opening the PR. Attachment-propagation
+      verification (below) stays parked as post-MVP.
+
+---
+
+## 5. Context and gotchas for whoever picks this up
+
+- **Motivating failure (why forgiving semantics + prompting matter):** in a real transcript,
+  the model wrote `me.result?.login ?? me.result` where the tool result was a JSON _string_ -
+  the old strict interpreter threw (`String property 'login' is not available`); then the
+  model returned a raw 105KB payload, which native truncation dumped to a file, costing a
+  subagent round-trip to extract one number. Interpreter forgiveness stops the crashes;
+  Wave 4 prompting stops the payload dumping. Both are needed.
+- Realistically **all MCP tools render `Promise<unknown>`** (no outputSchema), so the
+  instructions prose is the only lever for result-shape behavior in the dominant case.
+- **`copyIn` has two roles, split by a mode flag** (DSL-expansion pass): host<->sandbox
+  boundary (default mode - final result, tool arguments, `JSON.stringify`, tool-result
+  intake; sandbox value types serialize to JSON forms) AND intra-sandbox data checkpoint
+  (`boundedData` = `copyIn(value, label, true)` - sandbox value instances pass through by
+  reference as leaves, everything else keeps the same plain-data validation). If you add a
+  new value type, follow the Wave 1b-i pattern: class in `values.ts`, opaque-by-default via
+  `isRuntimeReference`, explicit carve-outs, JSON form in `copyIn`'s boundary mode plus
+  pass-through in its preserving mode, console formatting (`formatConsoleValue`), tests -
+  and make sure the `Object.*` helpers treat it as an empty object so class fields never
+  leak.
+- The interpreter throws synchronously inside `Effect.gen`/`Effect.sync` freely; everything is
+  normalized by `catchCause` -> `normalizeError` into `Diagnostic` data. Program failures are
+  **data, never Effect failures**; only interruption propagates.
+- `parseProgram` wraps source in `async function __codemode__() { ... }`, transpiles TS, then
+  slices between the first `{` and last `}` - line/col diagnostics are offset accordingly
+  (`sourceLocation`). Don't inject prologue code; it breaks the offsets.
+- OpenCode wraps every tool's output with auto-truncation (`Tool.define` wrapper,
+  `truncate.output`, 2000 lines / 50KB, saves full output to disk and appends a hint) unless
+  `metadata.truncated` is set. The `execute` tool currently rides that for free.
+- Effect version: both repos pin `effect@4.0.0-beta.83` via bun catalogs. This package uses
+  v4-only APIs (`Schema.Decoder`, `Schema.toJsonSchemaDocument`, `Context.Service`,
+  `Cause.hasInterruptsOnly`, `Effect.timeoutOrElse`). The effect-smol checkout referenced in
+  the workspace is the implementation source of truth for v4 behavior questions.
+- File map (this package): `src/codemode.ts` - types/limits/parser/Interpreter/execute/make;
+  `src/tool-runtime.ts` - tool tree, `copyIn`/`copyOut`, search/discovery, invoke path;
+  `src/tool.ts` - `Tool.make` + JSON-Schema->TS rendering; `src/values.ts` - sandbox value
+  types; `src/tool-error.ts` - `ToolError`; tests in `test/{codemode,parity,stdlib}.test.ts`.
+- OpenCode file map (integration points): `src/tool/code-mode.ts` (the adapter, now a
+  registry tool service - `CodeModeTool` + `catalogInstructions`; formerly
+  `src/session/code-mode.ts`); `src/tool/registry.ts` (`describeCodeMode`, enablement in
+  `tools()`, `MCP.node` dep); `src/session/tools.ts` (raw-MCP-registration suppression
+  when the flag is on); `src/permission/index.ts` (`Permission.visibleTools`, the shared
+  visibility predicate, also used by `src/session/llm/request.ts` `resolveTools`);
+  `src/mcp/index.ts` (`MCP.tools()`/`MCP.defs()`); `src/mcp/catalog.ts` (`convertTool`,
+  `server_tool` naming); `src/tool/tool.ts` (`ExecuteResult.attachments`, truncation
+  wrapper); `src/session/message-v2.ts` (attachments -> vision);
+  `packages/tui/src/routes/session/index.tsx` (`Execute` progress component);
+  `src/effect/runtime-flags.ts` (feature flag).
diff --git a/packages/codemode/package.json b/packages/codemode/package.json
new file mode 100644
index 0000000000..b2d9ec3ea2
--- /dev/null
+++ b/packages/codemode/package.json
@@ -0,0 +1,26 @@
+{
+  "$schema": "https://json.schemastore.org/package.json",
+  "name": "@opencode-ai/codemode",
+  "version": "0.0.1",
+  "description": "Effect-native confined code execution over schema-described tools",
+  "private": true,
+  "type": "module",
+  "license": "MIT",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "scripts": {
+    "typecheck": "tsgo --noEmit",
+    "test": "bun test"
+  },
+  "dependencies": {
+    "acorn": "8.15.0",
+    "effect": "catalog:",
+    "typescript": "catalog:"
+  },
+  "devDependencies": {
+    "@tsconfig/bun": "catalog:",
+    "@types/bun": "catalog:",
+    "@typescript/native-preview": "catalog:"
+  }
+}
diff --git a/packages/codemode/src/codemode.ts b/packages/codemode/src/codemode.ts
new file mode 100644
index 0000000000..f8a01f23b0
--- /dev/null
+++ b/packages/codemode/src/codemode.ts
@@ -0,0 +1,4126 @@
+import { parse } from "acorn"
+import { Cause, Effect, Exit, Fiber, Schema, Semaphore } from "effect"
+import { DiagnosticCategory, ModuleKind, ScriptTarget, flattenDiagnosticMessageText, transpileModule } from "typescript"
+import {
+  copyIn,
+  copyOut,
+  isBlockedMember,
+  ToolReference,
+  ToolRuntime,
+  ToolRuntimeError,
+  type HostTools,
+  type SafeObject,
+  type ToolCall,
+  type ToolDescription,
+  type Services,
+} from "./tool-runtime.js"
+import type { Definition } from "./tool.js"
+import { ToolError } from "./tool-error.js"
+import { isSandboxValue, SandboxDate, SandboxMap, SandboxPromise, SandboxRegExp, SandboxSet } from "./values.js"
+
+/** A tool call admitted during an execution. */
+export type { ToolCall, ToolCallStarted, ToolDescription } from "./tool-runtime.js"
+export { ToolError, toolError } from "./tool-error.js"
+
+/** Resource budgets enforced independently during each CodeMode program execution. */
+export type ExecutionLimits = {
+  /** Maximum wall-clock execution time in milliseconds. No default: absent means no timeout. */
+  readonly timeoutMs?: number
+  /** Maximum number of tool calls admitted by the runtime. No default: absent means unlimited. */
+  readonly maxToolCalls?: number
+  /**
+   * Maximum UTF-8 bytes of model-facing output: the serialized result value plus captured
+   * logs. Excess output is truncated with an explanatory marker instead of failing. No
+   * default: absent means no truncation (for hosts with their own output bounding).
+   */
+  readonly maxOutputBytes?: number
+}
+
+/** Controls how much of the tool catalog is inlined in agent instructions. */
+export type DiscoveryOptions = {
+  /**
+   * Estimated-token budget (chars/4, default 2000) for inlined full tool signatures in agent
+   * instructions. Signatures that fit are inlined round-robin across namespaces; every
+   * namespace is always listed with its tool count regardless of budget, and
+   * `tools.$codemode.search` is always registered.
+   */
+  readonly maxInlineCatalogTokens?: number
+}
+
+type ToolTree<R = never> = {
+  readonly [name: string]: Definition<R> | ToolTree<R>
+}
+
+type ResolvedExecutionLimits = {
+  /** Undefined means no timeout. */
+  readonly timeoutMs: number | undefined
+  /** Undefined means unlimited tool calls. */
+  readonly maxToolCalls: number | undefined
+  /** Undefined means no output truncation. */
+  readonly maxOutputBytes: number | undefined
+}
+
+/** Options for one CodeMode execution. */
+export type ExecuteOptions<Tools extends Record<string, unknown> = {}> = {
+  /** Source for one program in the supported JavaScript subset. */
+  code: string
+  /** Explicit tool tree exposed to the program as `tools`. */
+  tools?: Tools & ToolTree<Services<Tools>>
+  /** Per-execution overrides for the default resource limits. */
+  limits?: ExecutionLimits
+  /** Observes decoded tool input immediately before tool execution. */
+  onToolCallStart?: (call: ToolRuntime.ToolCallStarted) => Effect.Effect<void, never, Services<Tools>>
+  /** Observes each admitted tool call as it settles, with outcome and duration. */
+  onToolCallEnd?: (call: ToolRuntime.ToolCallEnded) => Effect.Effect<void, never, Services<Tools>>
+}
+
+/** A normalized program diagnostic safe to return across an agent tool boundary. */
+export type Diagnostic = {
+  readonly kind: DiagnosticKind
+  readonly message: string
+  readonly location?: { readonly line: number; readonly column: number }
+  readonly suggestions?: ReadonlyArray<string>
+}
+
+/** A JSON value that can cross the confined interpreter boundary. */
+export type DataValue = Schema.Json
+
+/** Successful execution after the result has crossed the plain-data boundary. */
+export type ExecuteSuccess = {
+  readonly ok: true
+  readonly value: DataValue
+  readonly logs?: ReadonlyArray<string>
+  /** Present when the value or logs were truncated to fit `maxOutputBytes`. */
+  readonly truncated?: boolean
+  readonly toolCalls: ReadonlyArray<ToolCall>
+}
+
+/** Failed execution with calls admitted before the diagnostic was produced. */
+export type ExecuteFailure = {
+  readonly ok: false
+  readonly error: Diagnostic
+  readonly logs?: ReadonlyArray<string>
+  /** Present when the logs were truncated to fit `maxOutputBytes`. */
+  readonly truncated?: boolean
+  readonly toolCalls: ReadonlyArray<ToolCall>
+}
+
+/** Result of executing a CodeMode program. Program failures are data, not Effect failures. */
+export type ExecuteResult = ExecuteSuccess | ExecuteFailure
+
+/** Reusable CodeMode configuration shared by `execute` and `agentTool`. */
+export type CodeModeOptions<Tools extends Record<string, unknown> = {}> = Omit<ExecuteOptions<Tools>, "code"> & {
+  /** Progressive-disclosure configuration for the agent-facing tool catalog. */
+  readonly discovery?: DiscoveryOptions
+}
+
+/** Input schema for the single agent-facing tool produced by `runtime.agentTool()`. */
+export const ExecuteInputSchema = Schema.Struct({ code: Schema.String })
+
+const DiagnosticKindSchema = Schema.Literals([
+  "ParseError",
+  "UnsupportedSyntax",
+  "UnknownTool",
+  "InvalidToolInput",
+  "InvalidToolOutput",
+  "InvalidDataValue",
+  "ToolCallLimitExceeded",
+  "TimeoutExceeded",
+  "ToolFailure",
+  "ExecutionFailure",
+])
+
+/** Structured success or diagnostic result schema returned by CodeMode execution. */
+export const ExecuteResultSchema = Schema.Union([
+  Schema.Struct({
+    ok: Schema.Literal(true),
+    value: Schema.Json,
+    logs: Schema.optionalKey(Schema.Array(Schema.String)),
+    truncated: Schema.optionalKey(Schema.Boolean),
+    toolCalls: Schema.Array(Schema.Struct({ name: Schema.String })),
+  }),
+  Schema.Struct({
+    ok: Schema.Literal(false),
+    error: Schema.Struct({
+      kind: DiagnosticKindSchema,
+      message: Schema.String,
+      location: Schema.optionalKey(Schema.Struct({ line: Schema.Number, column: Schema.Number })),
+      suggestions: Schema.optionalKey(Schema.Array(Schema.String)),
+    }),
+    logs: Schema.optionalKey(Schema.Array(Schema.String)),
+    truncated: Schema.optionalKey(Schema.Boolean),
+    toolCalls: Schema.Array(Schema.Struct({ name: Schema.String })),
+  }),
+])
+
+/** Agent-facing projection of a configured CodeMode runtime. */
+export type AgentToolDefinition<R = never> = {
+  readonly name: "code"
+  readonly description: string
+  readonly input: typeof ExecuteInputSchema
+  readonly output: typeof ExecuteResultSchema
+  readonly execute: (input: { readonly code: string }) => Effect.Effect<ExecuteResult, never, R>
+}
+
+/** Reusable confined runtime over one explicit tool tree. */
+export type CodeModeRuntime<R = never> = {
+  /** Lists schema-described tool paths provided by the host. */
+  readonly catalog: () => ReadonlyArray<ToolDescription>
+  /** Builds model-facing syntax guidance and visible tool signatures. */
+  readonly instructions: () => string
+  /** Projects the configured runtime as one agent-facing `code` tool. */
+  readonly agentTool: () => AgentToolDefinition<R>
+  /** Executes a program using this runtime's configured host tools. */
+  readonly execute: (code: string) => Effect.Effect<ExecuteResult, never, R>
+}
+
+type SourcePosition = {
+  line: number
+  column: number
+}
+
+type SourceLocation = {
+  start: SourcePosition
+  end: SourcePosition
+}
+
+type AstNode = {
+  type: string
+  loc?: SourceLocation
+  [key: string]: unknown
+}
+
+type ProgramNode = AstNode & {
+  type: "Program"
+  body: Array<AstNode>
+}
+
+type Binding = {
+  mutable: boolean
+  value: unknown
+  // Absent means initialized. `false` marks a parameter binding seeded into its scope but not
+  // yet bound, so a default that forward-references a later parameter sees a TDZ error (as in JS)
+  // rather than silently resolving to an outer binding of the same name.
+  initialized?: boolean
+}
+
+type StatementResult =
+  | { kind: "none" }
+  | { kind: "value"; value: unknown }
+  | { kind: "return"; value: unknown }
+  | { kind: "break" }
+  | { kind: "continue" }
+
+type MemberReference = {
+  target: SafeObject | Array<unknown>
+  key: string | number
+}
+
+class CodeModeFunction {
+  constructor(
+    readonly parameters: ReadonlyArray<AstNode>,
+    readonly body: AstNode,
+    readonly capturedScopes: ReadonlyArray<Map<string, Binding>>,
+  ) {}
+}
+
+class IntrinsicReference {
+  constructor(
+    readonly receiver: unknown,
+    readonly name: string,
+  ) {}
+}
+
+class ComputedValue {
+  constructor(readonly value: unknown) {}
+}
+
+class PromiseNamespace {}
+
+type PromiseMethodName = "all" | "allSettled" | "race" | "resolve" | "reject"
+
+class PromiseMethodReference {
+  constructor(readonly name: PromiseMethodName) {}
+}
+
+// A built-in global namespace (`Object`, `Math`, `JSON`, `Array`, ...); members resolve to a
+// GlobalMethodReference, except known constants (e.g. `Math.PI`) which resolve to a value.
+type GlobalNamespaceName = "Object" | "Math" | "JSON" | "Array" | "console" | "Date" | "RegExp" | "Map" | "Set"
+
+class GlobalNamespace {
+  constructor(readonly name: GlobalNamespaceName) {}
+}
+
+class GlobalMethodReference {
+  constructor(
+    readonly namespace: GlobalNamespaceName | "Number" | "String",
+    readonly name: string,
+  ) {}
+}
+
+class CoercionFunction {
+  constructor(readonly name: "Number" | "String" | "Boolean" | "parseInt" | "parseFloat") {}
+}
+
+class ProgramThrow {
+  constructor(readonly value: unknown) {}
+}
+
+class ErrorConstructorReference {
+  constructor(readonly name: string) {}
+}
+
+// Non-enumerable so spread/copyOut preserve the plain `{ name, message }` data shape.
+const ErrorBrand: unique symbol = Symbol("codemode.error")
+
+const brandError = (errorValue: SafeObject, name: string): SafeObject => {
+  Object.defineProperty(errorValue, ErrorBrand, { value: name })
+  return errorValue
+}
+
+const createErrorValue = (name: string, message: string): SafeObject =>
+  brandError(Object.assign(Object.create(null) as SafeObject, { name, message }), name)
+
+const errorBrandName = (value: unknown): string | undefined =>
+  value !== null && typeof value === "object"
+    ? ((value as Record<PropertyKey, unknown>)[ErrorBrand] as string | undefined)
+    : undefined
+
+/** Stable categories produced by program, schema, tool, and limit failures. */
+export type DiagnosticKind =
+  | "ParseError"
+  | "UnsupportedSyntax"
+  | "UnknownTool"
+  | "InvalidToolInput"
+  | "InvalidToolOutput"
+  | "InvalidDataValue"
+  | "ToolCallLimitExceeded"
+  | "TimeoutExceeded"
+  | "ToolFailure"
+  | "ExecutionFailure"
+
+const arrayMethods = new Set([
+  "map",
+  "filter",
+  "find",
+  "findIndex",
+  "findLast",
+  "findLastIndex",
+  "some",
+  "every",
+  "includes",
+  "join",
+  "reduce",
+  "reduceRight",
+  "flatMap",
+  "forEach",
+  "sort",
+  "toSorted",
+  "slice",
+  "concat",
+  "indexOf",
+  "lastIndexOf",
+  "at",
+  "flat",
+  "reverse",
+  "toReversed",
+  "with",
+  "push",
+  "pop",
+  "shift",
+  "unshift",
+  "splice",
+  "fill",
+  "copyWithin",
+  "keys",
+  "values",
+  "entries",
+])
+
+const mathConstants = new Set(["PI", "E", "LN2", "LN10", "LOG2E", "LOG10E", "SQRT2", "SQRT1_2"])
+
+const numberMethods = new Set(["toFixed", "toPrecision", "toExponential", "toString"])
+
+const stringMethods = new Set([
+  "toLowerCase",
+  "toUpperCase",
+  "trim",
+  "trimStart",
+  "trimEnd",
+  "trimLeft",
+  "trimRight",
+  "split",
+  "slice",
+  "substring",
+  "substr",
+  "includes",
+  "startsWith",
+  "endsWith",
+  "indexOf",
+  "lastIndexOf",
+  "replace",
+  "replaceAll",
+  "repeat",
+  "padStart",
+  "padEnd",
+  "charAt",
+  "charCodeAt",
+  "codePointAt",
+  "at",
+  "concat",
+  "toString",
+  "match",
+  "matchAll",
+  "search",
+  "localeCompare",
+  "normalize",
+])
+
+const numberConstants = new Set(["MAX_SAFE_INTEGER", "MIN_SAFE_INTEGER", "MAX_VALUE", "MIN_VALUE", "EPSILON"])
+
+const numberStatics = new Set(["isInteger", "isFinite", "isNaN", "isSafeInteger", "parseInt", "parseFloat"])
+
+const stringStatics = new Set(["fromCharCode", "fromCodePoint"])
+
+const consoleMethods = new Set(["log", "info", "debug", "warn", "error", "dir", "table"])
+
+const promiseStatics = new Set<PromiseMethodName>(["all", "allSettled", "race", "resolve", "reject"])
+
+const errorConstructors = new Set([
+  "Error",
+  "TypeError",
+  "RangeError",
+  "SyntaxError",
+  "ReferenceError",
+  "EvalError",
+  "URIError",
+])
+
+const valueConstructors = new Set(["Date", "RegExp", "Map", "Set"])
+
+const dateMethods = new Set([
+  "getTime",
+  "valueOf",
+  "toISOString",
+  "toJSON",
+  "toString",
+  "getFullYear",
+  "getMonth",
+  "getDate",
+  "getDay",
+  "getHours",
+  "getMinutes",
+  "getSeconds",
+  "getMilliseconds",
+  "getUTCFullYear",
+  "getUTCMonth",
+  "getUTCDate",
+  "getUTCDay",
+  "getUTCHours",
+  "getUTCMinutes",
+  "getUTCSeconds",
+  "getUTCMilliseconds",
+  "getTimezoneOffset",
+])
+const dateStatics = new Set(["now", "parse", "UTC"])
+
+const regexpMethods = new Set(["test", "exec", "toString"])
+// Read-only host regex fields surfaced as plain values.
+const regexpProperties = new Set([
+  "source",
+  "flags",
+  "lastIndex",
+  "global",
+  "ignoreCase",
+  "multiline",
+  "sticky",
+  "unicode",
+  "dotAll",
+])
+
+const mapMethods = new Set(["get", "set", "has", "delete", "clear", "forEach", "keys", "values", "entries"])
+const setMethods = new Set(["add", "has", "delete", "clear", "forEach", "keys", "values", "entries"])
+
+const OptionalShortCircuit: unique symbol = Symbol("codemode.optional-short-circuit")
+
+const supportedSyntaxMessage =
+  "Supported orchestration syntax: tools.* calls (they return promises - resolve them with await), data literals, destructuring, optional chaining, template literals, conditionals, switch, loops (incl. for...of and for...in over object/array/tools keys), arrow functions, spread, try/catch, array methods (map/filter/find/findIndex/some/every/reduce/flatMap/forEach/sort/slice/concat/indexOf/lastIndexOf/at/flat/reverse/includes/join), string methods (incl. match/matchAll/replace/split with regular expressions), Date/RegExp/Map/Set, Object/Math/JSON helpers, captured console.log/warn/error/dir/table, and Promise.all/allSettled/race/resolve/reject over arrays mixing promises and plain values for parallel tool calls (promise chaining with .then/.catch is not supported - use await with try/catch)."
+
+const unsupportedSyntax = (kind: string, node: AstNode): InterpreterRuntimeError =>
+  new InterpreterRuntimeError(
+    `Syntax '${kind}' is not supported in CodeMode. ${supportedSyntaxMessage}`,
+    node,
+    "UnsupportedSyntax",
+    [supportedSyntaxMessage],
+  )
+
+/** How many eagerly forked tool calls may run at once. Fixed; not a configurable knob. */
+const TOOL_CALL_CONCURRENCY = 8
+
+/** Console formatting recursion ceiling; deeper values render as "...". Fixed; not a knob. */
+const MAX_CONSOLE_DEPTH = 32
+
+const validateLimit = <Value extends number | undefined>(
+  name: keyof ExecutionLimits,
+  value: Value,
+  minimum: number,
+): Value => {
+  if (value !== undefined && (!Number.isSafeInteger(value) || value < minimum)) {
+    throw new RangeError(`${name} must be a safe integer greater than or equal to ${minimum}.`)
+  }
+  return value
+}
+
+// No limit has a default: absent means no timeout / unlimited calls / no output truncation -
+// budgets are host policy, not library policy. A host without its own output bounding should
+// pass maxOutputBytes explicitly, or oversized results flood model context.
+const resolveExecutionLimits = (limits?: ExecutionLimits): ResolvedExecutionLimits => ({
+  timeoutMs: validateLimit("timeoutMs", limits?.timeoutMs, 1),
+  maxToolCalls: validateLimit("maxToolCalls", limits?.maxToolCalls, 0),
+  maxOutputBytes: validateLimit("maxOutputBytes", limits?.maxOutputBytes, 0),
+})
+
+class InterpreterRuntimeError extends Error {
+  readonly node?: AstNode
+  /**
+   * The constructor name a program observes when it catches this failure (`caught.name`, and
+   * the brand behind `caught instanceof SyntaxError` etc.). "Error" unless the failing
+   * operation names a standard type in real JS - e.g. JSON.parse and invalid regex patterns
+   * throw SyntaxError, an unknown identifier is a ReferenceError, a bad normalize form is a
+   * RangeError.
+   */
+  errorName: string = "Error"
+
+  constructor(
+    message: string,
+    node?: AstNode,
+    readonly kind: DiagnosticKind = "ExecutionFailure",
+    readonly suggestions?: ReadonlyArray<string>,
+  ) {
+    super(message)
+    this.name = "InterpreterRuntimeError"
+
+    if (node) {
+      this.node = node
+    }
+  }
+
+  as(errorName: string): this {
+    this.errorName = errorName
+    return this
+  }
+}
+
+const isRecord = (value: unknown): value is Record<string, unknown> => typeof value === "object" && value !== null
+
+const asNode = (value: unknown, context: string): AstNode => {
+  if (!isRecord(value) || typeof value.type !== "string") {
+    throw new InterpreterRuntimeError(`Invalid AST node while reading ${context}.`)
+  }
+
+  return value as AstNode
+}
+
+const getArray = (node: AstNode, key: string): Array<unknown> => {
+  const value = node[key]
+  if (!Array.isArray(value)) {
+    throw new InterpreterRuntimeError(`Expected '${key}' to be an array.`, node)
+  }
+
+  return value
+}
+
+const getString = (node: AstNode, key: string): string => {
+  const value = node[key]
+  if (typeof value !== "string") {
+    throw new InterpreterRuntimeError(`Expected '${key}' to be a string.`, node)
+  }
+
+  return value
+}
+
+const getBoolean = (node: AstNode, key: string): boolean => {
+  const value = node[key]
+  if (typeof value !== "boolean") {
+    throw new InterpreterRuntimeError(`Expected '${key}' to be a boolean.`, node)
+  }
+
+  return value
+}
+
+const getOptionalNode = (node: AstNode, key: string): AstNode | undefined => {
+  const value = node[key]
+  if (value === undefined || value === null) {
+    return undefined
+  }
+
+  return asNode(value, key)
+}
+
+const getNode = (node: AstNode, key: string): AstNode => {
+  const value = node[key]
+  return asNode(value, key)
+}
+
+const parseProgram = (code: string): ProgramNode => {
+  const transpiled = transpileModule(`async function __codemode__() {\n${code}\n}`, {
+    reportDiagnostics: true,
+    compilerOptions: {
+      target: ScriptTarget.ESNext,
+      module: ModuleKind.ESNext,
+    },
+  })
+  const diagnostic = transpiled.diagnostics?.find((item) => item.category === DiagnosticCategory.Error)
+
+  if (diagnostic) {
+    throw new InterpreterRuntimeError(
+      `Failed to parse TypeScript: ${flattenDiagnosticMessageText(diagnostic.messageText, "\n")}`,
+      undefined,
+      "ParseError",
+    )
+  }
+
+  const bodyStart = transpiled.outputText.indexOf("{") + 1
+  const bodyEnd = transpiled.outputText.lastIndexOf("}")
+  const executableCode = transpiled.outputText.slice(bodyStart, bodyEnd)
+  const parsed = parse(executableCode, {
+    ecmaVersion: "latest",
+    sourceType: "script",
+    allowReturnOutsideFunction: true,
+    allowAwaitOutsideFunction: true,
+    locations: true,
+  }) as unknown
+
+  if (!isRecord(parsed) || parsed.type !== "Program" || !Array.isArray(parsed.body)) {
+    throw new InterpreterRuntimeError("Failed to parse script as a Program node.")
+  }
+
+  return parsed as ProgramNode
+}
+
+const formatLocation = (node?: AstNode): string => {
+  if (!node || !node.loc) {
+    return ""
+  }
+
+  const location = sourceLocation(node)
+  return ` (line ${location.line}, col ${location.column})`
+}
+
+const sourceLocation = (node: AstNode): { readonly line: number; readonly column: number } => ({
+  line: Math.max(1, (node.loc?.start.line ?? 2) - 1),
+  column: Math.max(1, (node.loc?.start.column ?? 4) - 3),
+})
+
+const publicErrorMessage = (message: string): string =>
+  message.replace(/\/(?:Users|home|private|tmp|var\/folders)\/[^\s"'`]+/g, "<redacted-path>")
+
+const normalizeError = (error: unknown): Diagnostic => {
+  if (error instanceof InterpreterRuntimeError) {
+    return {
+      kind: error.kind,
+      message: `${error.message}${formatLocation(error.node)}`,
+      ...(error.node?.loc ? { location: sourceLocation(error.node) } : {}),
+      ...(error.suggestions ? { suggestions: error.suggestions } : {}),
+    }
+  }
+
+  if (error instanceof ToolRuntimeError) {
+    return {
+      kind: error.kind,
+      message: error.message,
+      ...(error.suggestions.length > 0 ? { suggestions: error.suggestions } : {}),
+    }
+  }
+
+  if (error instanceof ToolError) {
+    return { kind: "ToolFailure", message: publicErrorMessage(error.message) }
+  }
+
+  if (error instanceof ProgramThrow) {
+    const value = error.value
+    let message: string
+    if (containsRuntimeReference(value)) {
+      // A thrown tool/function reference must not leak its internal structure.
+      message = "a non-data value"
+    } else if (typeof value === "string") {
+      message = value
+    } else if (
+      value !== null &&
+      typeof value === "object" &&
+      typeof (value as { message?: unknown }).message === "string"
+    ) {
+      message = (value as { message: string }).message
+    } else {
+      try {
+        message = JSON.stringify(copyOut(value)) ?? String(value)
+      } catch {
+        message = String(value)
+      }
+    }
+    return { kind: "ExecutionFailure", message: `Uncaught: ${message}` }
+  }
+
+  if (error instanceof RangeError && /call stack|recursion/i.test(error.message)) {
+    return {
+      kind: "ExecutionFailure",
+      message: "Execution exceeded the maximum nesting depth.",
+    }
+  }
+
+  if (error instanceof Error) {
+    return {
+      kind: error.name === "SyntaxError" ? "ParseError" : "ExecutionFailure",
+      message: publicErrorMessage(error.message),
+    }
+  }
+
+  // A non-Error thrown by a host tool (raw string / number / Symbol) still routes through
+  // path redaction so filesystem paths can never leak through the catch-all branch.
+  return {
+    kind: "ExecutionFailure",
+    message: publicErrorMessage(String(error)),
+  }
+}
+
+// Shared by catch bindings, Promise.allSettled rejection reasons, and Promise.race losers.
+const caughtErrorValue = (thrown: unknown): unknown => {
+  if (thrown instanceof ProgramThrow) return thrown.value
+  if (thrown instanceof InterpreterRuntimeError) return createErrorValue(thrown.errorName, thrown.message)
+  const name = thrown instanceof Error && errorConstructors.has(thrown.name) ? thrown.name : "Error"
+  return createErrorValue(name, normalizeError(thrown).message)
+}
+
+const boundedData = (value: unknown, label: string): unknown => copyIn(value, label, true)
+
+const isRuntimeReference = (value: unknown): boolean =>
+  value instanceof CodeModeFunction ||
+  value instanceof ToolReference ||
+  value instanceof IntrinsicReference ||
+  value instanceof GlobalNamespace ||
+  value instanceof GlobalMethodReference ||
+  value instanceof PromiseNamespace ||
+  value instanceof PromiseMethodReference ||
+  value instanceof SandboxPromise ||
+  value instanceof CoercionFunction ||
+  value instanceof ErrorConstructorReference ||
+  isSandboxValue(value)
+
+const containsRuntimeReference = (value: unknown, seen = new Set<object>()): boolean => {
+  if (isRuntimeReference(value)) return true
+  if (value === null || typeof value !== "object") return false
+  if (seen.has(value)) return false
+  seen.add(value)
+  const contains = Array.isArray(value)
+    ? value.some((item) => containsRuntimeReference(item, seen))
+    : Object.values(value).some((item) => containsRuntimeReference(item, seen))
+  seen.delete(value)
+  return contains
+}
+
+// Like containsRuntimeReference, but sandbox value types (Date/RegExp/Map/Set) count as data:
+// operators and switch treat them as ordinary object operands (identity equality, ToPrimitive
+// coercion) rather than rejecting them as opaque interpreter machinery.
+const containsOpaqueReference = (value: unknown, seen = new Set<object>()): boolean => {
+  if (isSandboxValue(value)) return false
+  if (isRuntimeReference(value)) return true
+  if (value === null || typeof value !== "object") return false
+  if (seen.has(value)) return false
+  seen.add(value)
+  const contains = Array.isArray(value)
+    ? value.some((item) => containsOpaqueReference(item, seen))
+    : Object.values(value).some((item) => containsOpaqueReference(item, seen))
+  seen.delete(value)
+  return contains
+}
+
+// `typeof` never throws in JS; map every interpreter value to its JS-visible category.
+// A SandboxPromise falls through to the final `typeof value` and reports "object", exactly
+// like a real JS promise.
+const typeofValue = (value: unknown): string => {
+  if (
+    value instanceof CodeModeFunction ||
+    value instanceof CoercionFunction ||
+    value instanceof IntrinsicReference ||
+    value instanceof GlobalMethodReference ||
+    value instanceof PromiseMethodReference ||
+    value instanceof PromiseNamespace ||
+    value instanceof ErrorConstructorReference
+  )
+    return "function"
+  if (value instanceof ToolReference) return value.path.length > 0 ? "function" : "object"
+  if (value instanceof GlobalNamespace) {
+    return value.name === "Math" || value.name === "JSON" || value.name === "console" ? "object" : "function"
+  }
+  return typeof value
+}
+
+// `x instanceof C` against the constructors CodeMode knows. Like `typeof`, it observes any
+// left-hand value (opaque references included) without coercing it. Error checks use the
+// error brand: `instanceof Error` accepts every branded error; a specific error type matches
+// its own brand only (as in JS, where TypeError instances are also Error instances).
+const instanceofValue = (lhs: unknown, rhs: unknown, node: AstNode): boolean => {
+  if (rhs instanceof ErrorConstructorReference) {
+    const brand = errorBrandName(lhs)
+    return brand !== undefined && (rhs.name === "Error" || brand === rhs.name)
+  }
+  if (rhs instanceof GlobalNamespace) {
+    switch (rhs.name) {
+      case "Date":
+        return lhs instanceof SandboxDate
+      case "RegExp":
+        return lhs instanceof SandboxRegExp
+      case "Map":
+        return lhs instanceof SandboxMap
+      case "Set":
+        return lhs instanceof SandboxSet
+      case "Array":
+        return Array.isArray(lhs)
+      case "Object":
+        return lhs !== null && (typeof lhs === "object" || typeofValue(lhs) === "function")
+    }
+  }
+  if (rhs instanceof PromiseNamespace) return lhs instanceof SandboxPromise
+  // Number/String/Boolean wrap primitives in JS; no boxed values exist in CodeMode, so
+  // `x instanceof Number` is always false - exactly what it is for primitives in JS.
+  if (rhs instanceof CoercionFunction && (rhs.name === "Number" || rhs.name === "String" || rhs.name === "Boolean")) {
+    return false
+  }
+  throw new InterpreterRuntimeError(
+    "The right-hand side of 'instanceof' must be a constructor CodeMode knows: Error (or a specific error type like TypeError), Date, RegExp, Map, Set, Array, Object, or Promise.",
+    node,
+  )
+}
+
+// A regex engine failure message without the engine's own "Invalid regular expression:"
+// prefix, so composed diagnostics read as one sentence instead of stuttering the phrase.
+const regexFailureReason = (error: unknown): string =>
+  (error instanceof Error ? error.message : String(error)).replace(/^Invalid regular expression:\s*/i, "")
+
+const escapeRegexHint =
+  'To match special characters like ( ) [ ] { } + * ? . literally, escape them with a backslash (e.g. "\\\\(") or test for them with String.includes instead.'
+
+// A string method's pattern argument as a host regex: a sandbox regex passes its own host
+// instance through (so `g` lastIndex semantics follow the spec across calls); a string becomes
+// a pattern, exactly as String.prototype.match/matchAll/search do (`extraFlags` adds matchAll's
+// implicit `g`). Invalid patterns fail as catchable program errors that say what was wrong
+// with the pattern and how to fix it.
+const toHostRegex = (arg: unknown, method: string, node: AstNode, extraFlags = ""): RegExp => {
+  if (arg instanceof SandboxRegExp) return arg.regex
+  if (typeof arg === "string") {
+    try {
+      return new RegExp(arg, extraFlags)
+    } catch (error) {
+      throw new InterpreterRuntimeError(
+        `String.${method} received the string ${JSON.stringify(arg)}, which is not a valid regular expression pattern (${regexFailureReason(error)}). ${escapeRegexHint}`,
+        node,
+      ).as("SyntaxError")
+    }
+  }
+  throw new InterpreterRuntimeError(
+    `String.${method} expects a regular expression (a /pattern/flags literal or new RegExp(...)) or a string pattern, not ${arg === null ? "null" : typeof arg}.`,
+    node,
+  )
+}
+
+// A host match result as a sandbox value: a plain array of the full match and captures, with
+// `index` and named `groups` attached as own array properties (readable, and dropped at data
+// boundaries exactly like JSON.stringify drops them in JS). `input` is omitted - it duplicates
+// the whole subject string per match.
+const matchToValue = (match: RegExpMatchArray): Array<unknown> => {
+  const result: Array<unknown> = Array.from(match, (group) => group)
+  if (match.index !== undefined) (result as Record<string, unknown> & Array<unknown>).index = match.index
+  if (match.groups) {
+    const groups: SafeObject = Object.create(null) as SafeObject
+    for (const [key, group] of Object.entries(match.groups)) {
+      if (!isBlockedMember(key)) groups[key] = group
+    }
+    ;(result as Record<string, unknown> & Array<unknown>).groups = groups
+  }
+  return result
+}
+
+const invokeStringMethod = (value: string, name: string, args: Array<unknown>, node: AstNode): unknown => {
+  const str = (index: number): string => {
+    const arg = args[index]
+    if (typeof arg !== "string")
+      throw new InterpreterRuntimeError(`String.${name} expects argument ${index + 1} to be a string.`, node)
+    return arg
+  }
+  const num = (index: number): number => {
+    const arg = args[index]
+    if (typeof arg !== "number")
+      throw new InterpreterRuntimeError(`String.${name} expects argument ${index + 1} to be a number.`, node)
+    return arg
+  }
+  const optNum = (index: number): number | undefined => (args[index] === undefined ? undefined : num(index))
+  const optStr = (index: number): string | undefined => (args[index] === undefined ? undefined : str(index))
+
+  let result: unknown
+  switch (name) {
+    case "toLowerCase":
+      result = value.toLowerCase()
+      break
+    case "toUpperCase":
+      result = value.toUpperCase()
+      break
+    case "trim":
+      result = value.trim()
+      break
+    // trimLeft/trimRight are the legacy aliases of trimStart/trimEnd, kept because models write them.
+    case "trimStart":
+    case "trimLeft":
+      result = value.trimStart()
+      break
+    case "trimEnd":
+    case "trimRight":
+      result = value.trimEnd()
+      break
+    // Locale/options arguments are ignored: comparison runs with the host default locale, and
+    // the common use is a sort comparator where any consistent order works.
+    case "localeCompare":
+      result = value.localeCompare(str(0))
+      break
+    case "normalize": {
+      const form = optStr(0)
+      try {
+        result = value.normalize(form)
+      } catch {
+        throw new InterpreterRuntimeError(
+          `String.normalize expects the form "NFC", "NFD", "NFKC", or "NFKD" (got ${JSON.stringify(form)}).`,
+          node,
+        ).as("RangeError")
+      }
+      break
+    }
+    case "split": {
+      if (args.length === 0) {
+        result = [value]
+        break
+      }
+      if (args[0] instanceof SandboxRegExp) {
+        result = value.split((args[0] as SandboxRegExp).regex, optNum(1))
+        break
+      }
+      const requestedLimit = optNum(1)
+      result = value.split(str(0), requestedLimit === undefined ? undefined : requestedLimit >>> 0)
+      break
+    }
+    case "slice":
+      result = value.slice(optNum(0), optNum(1))
+      break
+    case "includes":
+      result = value.includes(str(0), optNum(1))
+      break
+    case "startsWith":
+      result = value.startsWith(str(0), optNum(1))
+      break
+    case "endsWith":
+      result = value.endsWith(str(0), optNum(1))
+      break
+    case "indexOf":
+      result = value.indexOf(str(0), optNum(1))
+      break
+    case "lastIndexOf":
+      result = value.lastIndexOf(str(0), optNum(1))
+      break
+    case "replace":
+    case "replaceAll": {
+      if (args[0] instanceof CodeModeFunction || args[1] instanceof CodeModeFunction) {
+        throw new InterpreterRuntimeError(
+          `String.${name} does not support function replacers in CodeMode; use match/matchAll and rebuild the string instead.`,
+          node,
+          "UnsupportedSyntax",
+          [supportedSyntaxMessage],
+        )
+      }
+      if (args[0] instanceof SandboxRegExp) {
+        const pattern = (args[0] as SandboxRegExp).regex
+        const replacement = str(1)
+        if (name === "replaceAll" && !pattern.global) {
+          throw new InterpreterRuntimeError(
+            `String.replaceAll requires a regular expression with the global (g) flag: write /${pattern.source}/${pattern.flags}g, or use String.replace to replace only the first match.`,
+            node,
+          )
+        }
+        result = name === "replace" ? value.replace(pattern, replacement) : value.replaceAll(pattern, replacement)
+        break
+      }
+      if (name === "replace") {
+        result = value.replace(str(0), str(1))
+        break
+      }
+      result = value.replaceAll(str(0), str(1))
+      break
+    }
+    case "match": {
+      const pattern = toHostRegex(args[0], name, node)
+      const matched = value.match(pattern)
+      if (matched === null) return null
+      // A global match is a plain array of matched strings; a non-global match carries
+      // index/groups own properties, so bypass the copying data checkpoint to keep them.
+      if (pattern.global) return boundedData(matched, "String.match result")
+      return matchToValue(matched)
+    }
+    case "matchAll": {
+      const pattern = toHostRegex(args[0], name, node, "g")
+      if (!pattern.global) {
+        throw new InterpreterRuntimeError(
+          `String.matchAll requires a regular expression with the global (g) flag: write /${pattern.source}/${pattern.flags}g, or use String.match for a single match.`,
+          node,
+        )
+      }
+      // Materialized as an array (not an iterator); each entry is a match array with
+      // index/groups own properties. Match count is bounded by the subject length.
+      return Array.from(value.matchAll(pattern), matchToValue)
+    }
+    case "search": {
+      result = value.search(toHostRegex(args[0], name, node))
+      break
+    }
+    case "repeat": {
+      const count = num(0)
+      if (!Number.isFinite(count) || count < 0)
+        throw new InterpreterRuntimeError("String.repeat expects a finite non-negative count.", node)
+      result = value.repeat(count)
+      break
+    }
+    case "padStart":
+      result = value.padStart(num(0), optStr(1))
+      break
+    case "padEnd":
+      result = value.padEnd(num(0), optStr(1))
+      break
+    case "charAt":
+      result = value.charAt(optNum(0) ?? 0)
+      break
+    case "at":
+      result = value.at(optNum(0) ?? 0)
+      break
+    case "substring":
+      result = value.substring(optNum(0) ?? 0, optNum(1))
+      break
+    case "substr":
+      result = value.substr(optNum(0) ?? 0, optNum(1))
+      break
+    // JS charCodeAt returns NaN out of range; NaN flows as an ordinary in-sandbox value
+    // (normalized to null only at the data boundary - see copyOut), so return it as-is.
+    case "charCodeAt":
+      result = value.charCodeAt(optNum(0) ?? 0)
+      break
+    case "codePointAt":
+      result = value.codePointAt(optNum(0) ?? 0)
+      break
+    case "toString":
+      result = value
+      break
+    case "concat": {
+      result = value.concat(...args.map((_, index) => str(index)))
+      break
+    }
+    default:
+      throw new InterpreterRuntimeError(`String method '${name}' is not available in CodeMode.`, node)
+  }
+  return boundedData(result, `String.${name} result`)
+}
+
+const invokeNumberMethod = (value: number, name: string, args: Array<unknown>, node: AstNode): unknown => {
+  const optNum = (index: number): number | undefined => {
+    const arg = args[index]
+    if (arg === undefined) return undefined
+    if (typeof arg !== "number") throw new InterpreterRuntimeError(`Number.${name} expects a number argument.`, node)
+    return arg
+  }
+  let result: unknown
+  switch (name) {
+    case "toFixed":
+      result = value.toFixed(optNum(0))
+      break
+    case "toExponential":
+      result = value.toExponential(optNum(0))
+      break
+    case "toPrecision": {
+      const digits = optNum(0)
+      result = digits === undefined ? value.toString() : value.toPrecision(digits)
+      break
+    }
+    case "toString": {
+      const radix = optNum(0)
+      if (radix !== undefined && (radix < 2 || radix > 36)) {
+        throw new InterpreterRuntimeError("Number.toString radix must be between 2 and 36.", node)
+      }
+      result = value.toString(radix)
+      break
+    }
+    default:
+      throw new InterpreterRuntimeError(`Number method '${name}' is not available in CodeMode.`, node)
+  }
+  return boundedData(result, `Number.${name} result`)
+}
+
+// JavaScript's String(...) without tripping over CodeMode's null-prototype data objects.
+const coerceToString = (value: unknown): string => {
+  if (value === null) return "null"
+  if (value === undefined) return "undefined"
+  // Sandbox values stringify deterministically: Date as ISO (not the host's locale/timezone
+  // toString), RegExp as its literal form, Map/Set with their JS Object.prototype tags.
+  if (value instanceof SandboxDate)
+    return Number.isFinite(value.time) ? new Date(value.time).toISOString() : "Invalid Date"
+  if (value instanceof SandboxRegExp) return `/${value.regex.source}/${value.regex.flags}`
+  if (value instanceof SandboxMap) return "[object Map]"
+  if (value instanceof SandboxSet) return "[object Set]"
+  if (typeof value === "object") {
+    return Array.isArray(value)
+      ? value.map((item) => (item === null || item === undefined ? "" : coerceToString(item))).join(",")
+      : "[object Object]"
+  }
+  return String(value)
+}
+
+/** Compound assignment operators (`x op= y`), each applying the binary operator `op`. */
+const compoundOperators = new Set(["+=", "-=", "*=", "/=", "%=", "**=", "&=", "|=", "^=", "<<=", ">>=", ">>>="])
+
+const coerceToNumber = (value: unknown): number => {
+  if (value instanceof SandboxDate) return value.time
+  if (isSandboxValue(value)) return Number.NaN
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? Number.NaN : Number(value)
+}
+
+const invokeCoercion = (ref: CoercionFunction, args: Array<unknown>, node: AstNode): unknown => {
+  // Sandbox values coerce before the data checkpoint (which would JSON-serialize them):
+  // Number(date) is its time value, String(date) its ISO form, Boolean(x) is true.
+  const raw = args[0]
+  if (isSandboxValue(raw)) {
+    if (ref.name === "Boolean") return true
+    if (ref.name === "Number") return coerceToNumber(raw)
+    if (ref.name === "String") return coerceToString(raw)
+    if (ref.name === "parseInt") return parseInt(coerceToString(raw))
+    return parseFloat(coerceToString(raw))
+  }
+  const value = boundedData(args[0], `${ref.name} input`)
+  if (ref.name === "Number") return coerceToNumber(value)
+  if (ref.name === "Boolean") return Boolean(value)
+  if (ref.name === "parseInt") {
+    const radix = args[1]
+    if (radix !== undefined && typeof radix !== "number")
+      throw new InterpreterRuntimeError("parseInt expects a numeric radix.", node)
+    return parseInt(coerceToString(value), radix)
+  }
+  if (ref.name === "parseFloat") return parseFloat(coerceToString(value))
+  return coerceToString(value)
+}
+
+const invokeObjectMethod = (name: string, args: Array<unknown>, node: AstNode): unknown => {
+  const requireObject = (): Record<string, unknown> => {
+    const value = boundedData(args[0], `Object.${name} input`)
+    // Sandbox values (Date/RegExp/Map/Set) have no own enumerable properties in JS, so the
+    // Object.* helpers see them as empty objects - never their interpreter internals.
+    if (isSandboxValue(value)) return {}
+    if (value === null || typeof value !== "object" || Array.isArray(value)) {
+      throw new InterpreterRuntimeError(`Object.${name} expects a data object.`, node)
+    }
+    return value as Record<string, unknown>
+  }
+  const guardedSet = (out: Record<string, unknown>, key: string, item: unknown): void => {
+    if (isBlockedMember(key)) throw new InterpreterRuntimeError(`Property '${key}' is not available in CodeMode.`, node)
+    out[key] = item
+  }
+  switch (name) {
+    case "keys": {
+      // Object.keys(array) yields index strings (["0", "1", ...]) exactly as in JS; objects
+      // yield their own enumerable keys. (Tool references never reach here - the interpreter
+      // resolves them against the host tool tree first.)
+      const value = boundedData(args[0], "Object.keys input")
+      if (isSandboxValue(value)) return []
+      if (Array.isArray(value)) return Object.keys(value)
+      if (value === null || typeof value !== "object") {
+        throw new InterpreterRuntimeError("Object.keys expects a data object or array.", node)
+      }
+      return Object.keys(value)
+    }
+    case "values":
+      return Object.values(requireObject())
+    case "entries":
+      return Object.entries(requireObject()).map(([key, item]) => [key, item])
+    case "hasOwn":
+      return Object.hasOwn(requireObject(), String(args[1]))
+    case "assign": {
+      const out: Record<string, unknown> = Object.create(null)
+      for (const source of args) {
+        if (source === null || source === undefined) continue
+        const value = boundedData(source, "Object.assign input")
+        // A sandbox value source contributes nothing (no own enumerable properties in JS).
+        if (isSandboxValue(value)) continue
+        if (value === null || typeof value !== "object" || Array.isArray(value))
+          throw new InterpreterRuntimeError("Object.assign expects data objects.", node)
+        for (const [key, item] of Object.entries(value)) guardedSet(out, key, item)
+      }
+      return out
+    }
+    case "fromEntries": {
+      // A Map is the idiomatic fromEntries source; use its entries directly (the data
+      // checkpoint would serialize a Map to {}).
+      if (args[0] instanceof SandboxMap) {
+        const out: Record<string, unknown> = Object.create(null)
+        for (const [key, item] of (args[0] as SandboxMap).map.entries()) guardedSet(out, coerceToString(key), item)
+        return out
+      }
+      const pairs = boundedData(args[0], "Object.fromEntries input")
+      if (!Array.isArray(pairs))
+        throw new InterpreterRuntimeError("Object.fromEntries expects an array of [key, value] pairs.", node)
+      const out: Record<string, unknown> = Object.create(null)
+      for (const pair of pairs) {
+        if (!Array.isArray(pair))
+          throw new InterpreterRuntimeError("Object.fromEntries expects [key, value] pairs.", node)
+        guardedSet(out, String(pair[0]), pair[1])
+      }
+      return out
+    }
+    default:
+      throw new InterpreterRuntimeError(`Object.${name} is not available in CodeMode.`, node)
+  }
+}
+
+const invokeMathMethod = (name: string, args: Array<unknown>, node: AstNode): number => {
+  const nums = args.map((arg) => {
+    if (typeof arg !== "number") throw new InterpreterRuntimeError(`Math.${name} expects number arguments.`, node)
+    return arg
+  })
+  const [a = Number.NaN, b = Number.NaN] = nums
+  switch (name) {
+    case "max":
+      return Math.max(...nums)
+    case "min":
+      return Math.min(...nums)
+    case "abs":
+      return Math.abs(a)
+    case "floor":
+      return Math.floor(a)
+    case "ceil":
+      return Math.ceil(a)
+    case "round":
+      return Math.round(a)
+    case "trunc":
+      return Math.trunc(a)
+    case "sign":
+      return Math.sign(a)
+    case "sqrt":
+      return Math.sqrt(a)
+    case "cbrt":
+      return Math.cbrt(a)
+    case "pow":
+      return Math.pow(a, b)
+    case "hypot":
+      return Math.hypot(...nums)
+    case "log":
+      return Math.log(a)
+    case "log2":
+      return Math.log2(a)
+    case "log10":
+      return Math.log10(a)
+    case "exp":
+      return Math.exp(a)
+    default:
+      throw new InterpreterRuntimeError(`Math.${name} is not available in CodeMode.`, node)
+  }
+}
+
+const invokeJsonMethod = (name: string, args: Array<unknown>, node: AstNode): unknown => {
+  switch (name) {
+    case "stringify": {
+      const replacer = args[1]
+      if (Array.isArray(replacer) || replacer instanceof CodeModeFunction) {
+        throw new InterpreterRuntimeError(
+          "JSON.stringify replacers are not supported in CodeMode.",
+          node,
+          "UnsupportedSyntax",
+          [supportedSyntaxMessage],
+        )
+      }
+      const space = args[2]
+      const indent = typeof space === "number" || typeof space === "string" ? space : undefined
+      // copyIn first so only Data Values serialize, never a CodeModeFunction/ToolReference.
+      return JSON.stringify(copyOut(copyIn(args[0], "JSON.stringify value")), null, indent)
+    }
+    case "parse": {
+      const text = args[0]
+      if (typeof text !== "string") throw new InterpreterRuntimeError("JSON.parse expects a string.", node)
+      let parsed: unknown
+      try {
+        parsed = JSON.parse(text)
+      } catch (error) {
+        // The engine reason is derived from the program-supplied string (token/position), so
+        // it is safe to surface - and the position is exactly what a model needs to fix it.
+        throw new InterpreterRuntimeError(
+          `JSON.parse received invalid JSON: ${error instanceof Error ? error.message : String(error)}`,
+          node,
+        ).as("SyntaxError")
+      }
+      return copyIn(parsed, "JSON.parse result")
+    }
+    default:
+      throw new InterpreterRuntimeError(`JSON.${name} is not available in CodeMode.`, node)
+  }
+}
+
+const invokeArrayStatic = (name: string, args: Array<unknown>, node: AstNode): unknown => {
+  switch (name) {
+    case "isArray":
+      return Array.isArray(args[0])
+    case "of":
+      return [...args]
+    case "from": {
+      if (args.length > 1) {
+        throw new InterpreterRuntimeError(
+          "Array.from(...) does not support a map function in CodeMode; call .map() on the result instead.",
+          node,
+          "UnsupportedSyntax",
+          [supportedSyntaxMessage],
+        )
+      }
+      // Map/Set materialize directly (the data checkpoint would serialize them to {}).
+      if (args[0] instanceof SandboxMap)
+        return Array.from((args[0] as SandboxMap).map.entries(), ([key, item]) => [key, item])
+      if (args[0] instanceof SandboxSet) return Array.from((args[0] as SandboxSet).set.values())
+      const source = boundedData(args[0], "Array.from input")
+      if (typeof source === "string") return Array.from(source)
+      if (Array.isArray(source)) return [...source]
+      if (
+        source !== null &&
+        typeof source === "object" &&
+        typeof (source as { length?: unknown }).length === "number"
+      ) {
+        return Array.from(source as ArrayLike<unknown>)
+      }
+      throw new InterpreterRuntimeError("Array.from expects an array, string, Map, Set, or array-like value.", node)
+    }
+    default:
+      throw new InterpreterRuntimeError(`Array.${name} is not available in CodeMode.`, node)
+  }
+}
+
+const invokeNumberStatic = (name: string, args: Array<unknown>, node: AstNode): unknown => {
+  const value = args[0]
+  switch (name) {
+    case "isInteger":
+      return Number.isInteger(value)
+    case "isFinite":
+      return Number.isFinite(value)
+    case "isNaN":
+      return Number.isNaN(value)
+    case "isSafeInteger":
+      return Number.isSafeInteger(value)
+    case "parseInt": {
+      const radix = args[1]
+      if (radix !== undefined && typeof radix !== "number")
+        throw new InterpreterRuntimeError("Number.parseInt expects a numeric radix.", node)
+      return parseInt(coerceToString(value), radix)
+    }
+    case "parseFloat":
+      return parseFloat(coerceToString(value))
+    default:
+      throw new InterpreterRuntimeError(`Number.${name} is not available in CodeMode.`, node)
+  }
+}
+
+const invokeStringStatic = (name: string, args: Array<unknown>, node: AstNode): unknown => {
+  const codes = args.map((arg) => {
+    if (typeof arg !== "number") throw new InterpreterRuntimeError(`String.${name} expects number arguments.`, node)
+    return arg
+  })
+  switch (name) {
+    case "fromCharCode":
+      return String.fromCharCode(...codes)
+    case "fromCodePoint":
+      return String.fromCodePoint(...codes)
+    default:
+      throw new InterpreterRuntimeError(`String.${name} is not available in CodeMode.`, node)
+  }
+}
+
+const invokeDateStatic = (name: string, args: Array<unknown>, node: AstNode): number => {
+  switch (name) {
+    case "now":
+      return Date.now()
+    case "parse":
+      return Date.parse(coerceToString(args[0]))
+    case "UTC": {
+      const parts = args.map((arg) => coerceToNumber(arg))
+      return Date.UTC(...(parts as Parameters<typeof Date.UTC>))
+    }
+    default:
+      throw new InterpreterRuntimeError(`Date.${name} is not available in CodeMode.`, node)
+  }
+}
+
+const invokeDateMethod = (value: SandboxDate, name: string, node: AstNode): unknown => {
+  const hosted = new Date(value.time)
+  switch (name) {
+    case "getTime":
+    case "valueOf":
+      return value.time
+    case "toISOString": {
+      if (!Number.isFinite(value.time)) throw new InterpreterRuntimeError("Invalid time value.", node)
+      return hosted.toISOString()
+    }
+    // toJSON of an invalid date is null in JS (never a throw); toString stays ISO for
+    // determinism across host timezones/locales.
+    case "toJSON":
+      return Number.isFinite(value.time) ? hosted.toISOString() : null
+    case "toString":
+      return coerceToString(value)
+    case "getFullYear":
+      return hosted.getFullYear()
+    case "getMonth":
+      return hosted.getMonth()
+    case "getDate":
+      return hosted.getDate()
+    case "getDay":
+      return hosted.getDay()
+    case "getHours":
+      return hosted.getHours()
+    case "getMinutes":
+      return hosted.getMinutes()
+    case "getSeconds":
+      return hosted.getSeconds()
+    case "getMilliseconds":
+      return hosted.getMilliseconds()
+    case "getUTCFullYear":
+      return hosted.getUTCFullYear()
+    case "getUTCMonth":
+      return hosted.getUTCMonth()
+    case "getUTCDate":
+      return hosted.getUTCDate()
+    case "getUTCDay":
+      return hosted.getUTCDay()
+    case "getUTCHours":
+      return hosted.getUTCHours()
+    case "getUTCMinutes":
+      return hosted.getUTCMinutes()
+    case "getUTCSeconds":
+      return hosted.getUTCSeconds()
+    case "getUTCMilliseconds":
+      return hosted.getUTCMilliseconds()
+    case "getTimezoneOffset":
+      return hosted.getTimezoneOffset()
+    default:
+      throw new InterpreterRuntimeError(`Date method '${name}' is not available in CodeMode.`, node)
+  }
+}
+
+const invokeRegExpMethod = (value: SandboxRegExp, name: string, args: Array<unknown>, node: AstNode): unknown => {
+  switch (name) {
+    // test/exec run on the sandbox regex's own host instance, so `g`-flag lastIndex advances
+    // across calls per the spec.
+    case "test":
+      return value.regex.test(coerceToString(args[0]))
+    case "exec": {
+      const matched = value.regex.exec(coerceToString(args[0]))
+      if (matched === null) return null
+      return matchToValue(matched)
+    }
+    case "toString":
+      return coerceToString(value)
+    default:
+      throw new InterpreterRuntimeError(`RegExp method '${name}' is not available in CodeMode.`, node)
+  }
+}
+
+const invokeGlobalMethod = (ref: GlobalMethodReference, args: Array<unknown>, node: AstNode): unknown => {
+  if (ref.namespace === "console")
+    throw new InterpreterRuntimeError(`console.${ref.name} is not available in CodeMode.`, node)
+  if (ref.namespace === "Object") return invokeObjectMethod(ref.name, args, node)
+  if (ref.namespace === "Math") return invokeMathMethod(ref.name, args, node)
+  if (ref.namespace === "Array") return invokeArrayStatic(ref.name, args, node)
+  if (ref.namespace === "Number") return invokeNumberStatic(ref.name, args, node)
+  if (ref.namespace === "String") return invokeStringStatic(ref.name, args, node)
+  if (ref.namespace === "Date") {
+    if (!dateStatics.has(ref.name))
+      throw new InterpreterRuntimeError(`Date.${ref.name} is not available in CodeMode.`, node)
+    return invokeDateStatic(ref.name, args, node)
+  }
+  if (ref.namespace === "RegExp" || ref.namespace === "Map" || ref.namespace === "Set") {
+    throw new InterpreterRuntimeError(`${ref.namespace}.${ref.name} is not available in CodeMode.`, node)
+  }
+  return invokeJsonMethod(ref.name, args, node)
+}
+
+// Iterable spread sources: arrays, strings (code points), Maps (entry pairs), and Sets (values).
+const spreadItems = (spread: unknown): Array<unknown> | undefined => {
+  if (Array.isArray(spread)) return spread
+  if (typeof spread === "string") return Array.from(spread)
+  if (spread instanceof SandboxMap)
+    return Array.from(spread.map.entries(), ([key, item]): Array<unknown> => [key, item])
+  if (spread instanceof SandboxSet) return Array.from(spread.set.values())
+  return undefined
+}
+
+// Every identifier a parameter pattern binds, used to seed TDZ slots before defaults run.
+const collectPatternNames = (pattern: AstNode, out: Array<string> = []): Array<string> => {
+  switch (pattern.type) {
+    case "Identifier":
+      out.push(getString(pattern, "name"))
+      break
+    case "AssignmentPattern":
+      collectPatternNames(getNode(pattern, "left"), out)
+      break
+    case "RestElement":
+      collectPatternNames(getNode(pattern, "argument"), out)
+      break
+    case "ArrayPattern":
+      for (const element of getArray(pattern, "elements")) {
+        if (element !== null) collectPatternNames(asNode(element, "elements"), out)
+      }
+      break
+    case "ObjectPattern":
+      for (const property of getArray(pattern, "properties")) {
+        const prop = asNode(property, "properties")
+        collectPatternNames(prop.type === "RestElement" ? getNode(prop, "argument") : getNode(prop, "value"), out)
+      }
+      break
+  }
+  return out
+}
+
+class Interpreter<R> {
+  private scopes: Array<Map<string, Binding>>
+  private readonly invokeTool: (path: ReadonlyArray<string>, args: Array<unknown>) => Effect.Effect<unknown, unknown, R>
+  // Enumerable namespace/tool names at a node of the host tool tree, threaded from
+  // ToolRuntime.make like invokeTool: the interpreter never holds the tree itself.
+  private readonly toolKeys: (path: ReadonlyArray<string>) => ReadonlyArray<string>
+  private readonly logs: Array<string>
+  private lastValue: unknown
+  // Caps how many eagerly forked tool calls run at once (the parallel-call concurrency cap).
+  private readonly callPermits: Semaphore.Semaphore
+  // Fiber-backed promises whose settlement no program construct has observed yet. Successful
+  // program completion drains these (like a runtime waiting on in-flight work at exit) and
+  // surfaces a never-awaited failure as an unhandled-rejection diagnostic.
+  private readonly pendingSettlements = new Set<SandboxPromise>()
+
+  constructor(
+    invokeTool: (path: ReadonlyArray<string>, args: Array<unknown>) => Effect.Effect<unknown, unknown, R>,
+    toolKeys: (path: ReadonlyArray<string>) => ReadonlyArray<string>,
+    logs: Array<string> = [],
+  ) {
+    const globalScope = new Map<string, Binding>()
+    this.scopes = [globalScope]
+    this.invokeTool = invokeTool
+    this.toolKeys = toolKeys
+    this.logs = logs
+    this.lastValue = undefined
+    this.callPermits = Semaphore.makeUnsafe(TOOL_CALL_CONCURRENCY)
+    globalScope.set("tools", { mutable: false, value: new ToolReference([]) })
+    globalScope.set("Promise", { mutable: false, value: new PromiseNamespace() })
+    globalScope.set("undefined", { mutable: false, value: undefined })
+    globalScope.set("Object", { mutable: false, value: new GlobalNamespace("Object") })
+    globalScope.set("Math", { mutable: false, value: new GlobalNamespace("Math") })
+    globalScope.set("JSON", { mutable: false, value: new GlobalNamespace("JSON") })
+    globalScope.set("Number", { mutable: false, value: new CoercionFunction("Number") })
+    globalScope.set("String", { mutable: false, value: new CoercionFunction("String") })
+    globalScope.set("Boolean", { mutable: false, value: new CoercionFunction("Boolean") })
+    globalScope.set("Array", { mutable: false, value: new GlobalNamespace("Array") })
+    globalScope.set("console", { mutable: false, value: new GlobalNamespace("console") })
+    globalScope.set("parseInt", { mutable: false, value: new CoercionFunction("parseInt") })
+    globalScope.set("parseFloat", { mutable: false, value: new CoercionFunction("parseFloat") })
+    globalScope.set("Date", { mutable: false, value: new GlobalNamespace("Date") })
+    globalScope.set("RegExp", { mutable: false, value: new GlobalNamespace("RegExp") })
+    globalScope.set("Map", { mutable: false, value: new GlobalNamespace("Map") })
+    globalScope.set("Set", { mutable: false, value: new GlobalNamespace("Set") })
+    // Error constructors are real values, so `x instanceof Error` works and `Error("msg")`
+    // (with or without `new`) constructs a branded { name, message } error object.
+    for (const name of errorConstructors) {
+      globalScope.set(name, { mutable: false, value: new ErrorConstructorReference(name) })
+    }
+    // NaN/Infinity flow as ordinary in-sandbox values (normalized to null only at the data
+    // boundary - see copyOut), so their global bindings must exist too, e.g. `reduce(max, -Infinity)`.
+    globalScope.set("NaN", { mutable: false, value: NaN })
+    globalScope.set("Infinity", { mutable: false, value: Infinity })
+  }
+
+  run(program: ProgramNode): Effect.Effect<unknown, unknown, R> {
+    const self = this
+    // Run the program body in its own module scope on top of the builtin global scope, so
+    // top-level declarations (`let undefined = 5`, `const Object = ...`) shadow builtins like
+    // JS module scope, instead of colliding with the seeded globals.
+    this.pushScope()
+    return Effect.gen(function* () {
+      self.hoistFunctions(program.body)
+      let value: unknown = undefined
+      let returned = false
+      for (const statement of program.body) {
+        const result = yield* self.evaluateStatement(statement)
+
+        if (result.kind === "return") {
+          value = result.value
+          returned = true
+          break
+        }
+
+        if (result.kind === "break" || result.kind === "continue") {
+          throw new InterpreterRuntimeError(`Unexpected '${result.kind}' outside of a loop.`, statement)
+        }
+
+        if (result.kind === "value") {
+          self.lastValue = result.value
+        }
+      }
+      if (!returned) value = self.lastValue
+
+      // The program body runs inside an implicit async function, so a returned promise
+      // resolves before crossing the data boundary - `return tools.ns.tool(...)` works
+      // without an explicit await, exactly as in JS.
+      if (value instanceof SandboxPromise) value = yield* self.settlePromise(value)
+      yield* self.drainPendingSettlements()
+      return value
+    }).pipe(Effect.ensuring(Effect.sync(() => self.popScope())))
+  }
+
+  // Awaits every fiber-backed promise the program abandoned (fire-and-forget tool calls), so
+  // their work completes before the execution ends - mirroring a JS runtime waiting on
+  // in-flight I/O at exit. A failure nobody could have handled becomes an unhandled-rejection
+  // diagnostic (interrupted calls, e.g. Promise.race losers, are ignored).
+  private drainPendingSettlements(): Effect.Effect<void, unknown, never> {
+    const self = this
+    return Effect.gen(function* () {
+      for (const promise of [...self.pendingSettlements]) {
+        const exit = yield* self.observePromise(promise)
+        if (Exit.isSuccess(exit) || Cause.hasInterruptsOnly(exit.cause)) continue
+        const failure = normalizeError(Cause.squash(exit.cause))
+        throw new InterpreterRuntimeError(
+          `Unhandled rejection from an un-awaited tool call: ${failure.message}`,
+          undefined,
+          failure.kind,
+          ["Await tool calls - `const result = await tools.ns.tool(...)` - so failures can be caught and handled."],
+        )
+      }
+    })
+  }
+
+  // Eagerly starts a tool call on a supervised child fiber (so the execution timeout and
+  // scope teardown interrupt it) gated by the concurrency semaphore, and wraps the fiber in a
+  // first-class promise value. `startImmediately` makes the runtime admit the call - charging
+  // the tool-call budget and firing onToolCallStart - at the call site, before any await.
+  private createToolCallPromise(
+    path: ReadonlyArray<string>,
+    args: Array<unknown>,
+  ): Effect.Effect<SandboxPromise, never, R> {
+    const self = this
+    return Effect.map(
+      Effect.forkChild(this.callPermits.withPermit(Effect.suspend(() => self.invokeTool(path, args))), {
+        startImmediately: true,
+      }),
+      (fiber) => {
+        const promise = new SandboxPromise(fiber)
+        self.pendingSettlements.add(promise)
+        return promise
+      },
+    )
+  }
+
+  // The promise's settlement as an Exit, marking it observed for unhandled-rejection tracking.
+  // Fiber settlement is idempotent, so observing the same promise repeatedly (await twice,
+  // Promise.all([p, p])) never re-runs the underlying call.
+  private observePromise(promise: SandboxPromise): Effect.Effect<Exit.Exit<unknown, unknown>> {
+    this.pendingSettlements.delete(promise)
+    return promise.fiber !== undefined ? Fiber.await(promise.fiber) : Effect.exit(promise.immediate ?? Effect.void)
+  }
+
+  // `await promise`: succeed with the fulfilled value or re-raise the failure so try/catch
+  // observes it exactly like a synchronous throw at the await site.
+  private settlePromise(promise: SandboxPromise, node?: AstNode): Effect.Effect<unknown, unknown, never> {
+    const self = this
+    return Effect.flatMap(this.observePromise(promise), (exit) => self.unwrapPromiseExit(promise, exit, node))
+  }
+
+  private unwrapPromiseExit(
+    promise: SandboxPromise | undefined,
+    exit: Exit.Exit<unknown, unknown>,
+    node?: AstNode,
+  ): Effect.Effect<unknown, unknown> {
+    if (Exit.isSuccess(exit)) return Effect.succeed(exit.value)
+    // A call Promise.race interrupted after losing settles as a catchable program failure;
+    // any other interruption is execution teardown (timeout/host) and must keep propagating
+    // as interruption rather than becoming program-visible data.
+    if (promise?.interrupted === true && Cause.hasInterruptsOnly(exit.cause)) {
+      return Effect.fail(
+        new InterpreterRuntimeError(
+          "This tool call was interrupted because another value settled a Promise.race first.",
+          node,
+        ),
+      )
+    }
+    return Effect.failCause(exit.cause)
+  }
+
+  private evaluateStatement(node: AstNode): Effect.Effect<StatementResult, unknown, R> {
+    switch (node.type) {
+      case "ExpressionStatement":
+        return Effect.map(this.evaluateExpression(getNode(node, "expression")), (value) => ({ kind: "value", value }))
+      case "VariableDeclaration":
+        return Effect.map(this.evaluateVariableDeclaration(node), () => ({ kind: "none" }))
+      case "ReturnStatement": {
+        const argumentNode = getOptionalNode(node, "argument")
+        return argumentNode
+          ? Effect.map(this.evaluateExpression(argumentNode), (value) => ({ kind: "return", value }))
+          : Effect.succeed({ kind: "return", value: undefined })
+      }
+      case "BlockStatement":
+        return this.evaluateBlock(node)
+      case "IfStatement":
+        return this.evaluateIfStatement(node)
+      case "SwitchStatement":
+        return this.evaluateSwitchStatement(node)
+      case "WhileStatement":
+        return this.evaluateWhileStatement(node)
+      case "DoWhileStatement":
+        return this.evaluateDoWhileStatement(node)
+      case "ForStatement":
+        return this.evaluateForStatement(node)
+      case "ForOfStatement":
+        return this.evaluateForOfStatement(node)
+      case "ForInStatement":
+        return this.evaluateForInStatement(node)
+      case "BreakStatement":
+        return Effect.succeed(this.evaluateBreakStatement(node))
+      case "ContinueStatement":
+        return Effect.succeed(this.evaluateContinueStatement(node))
+      case "ThrowStatement":
+        return this.evaluateThrowStatement(node)
+      case "TryStatement":
+        return this.evaluateTryStatement(node)
+      case "EmptyStatement":
+        return Effect.succeed({ kind: "none" })
+      case "FunctionDeclaration":
+        return Effect.succeed({ kind: "none" }) // bound ahead of time by hoistFunctions
+      default:
+        throw unsupportedSyntax(node.type, node)
+    }
+  }
+
+  private evaluateBlock(node: AstNode): Effect.Effect<StatementResult, unknown, R> {
+    this.pushScope()
+    const self = this
+    return Effect.gen(function* () {
+      const body = getArray(node, "body")
+      self.hoistFunctions(body)
+
+      for (const statementValue of body) {
+        const statement = asNode(statementValue, "body")
+        const result = yield* self.evaluateStatement(statement)
+
+        if (result.kind === "value") {
+          self.lastValue = result.value
+          continue
+        }
+
+        if (result.kind !== "none") {
+          return result
+        }
+      }
+
+      return { kind: "none" } satisfies StatementResult
+    }).pipe(Effect.ensuring(Effect.sync(() => self.popScope())))
+  }
+
+  private createFunction(node: AstNode): CodeModeFunction {
+    if (node.generator === true) {
+      throw new InterpreterRuntimeError(
+        "Generator functions are not supported in CodeMode.",
+        node,
+        "UnsupportedSyntax",
+        [supportedSyntaxMessage],
+      )
+    }
+    return new CodeModeFunction(
+      getArray(node, "params").map((parameter, index) => asNode(parameter, `params[${index}]`)),
+      getNode(node, "body"),
+      this.scopes.slice(),
+    )
+  }
+
+  // Function declarations are hoisted: bound in their scope before the body runs, so a
+  // program can call a helper defined further down (matching JavaScript).
+  private hoistFunctions(statements: Array<unknown>): void {
+    for (const statementValue of statements) {
+      if (!isRecord(statementValue) || statementValue.type !== "FunctionDeclaration") continue
+      const node = statementValue as AstNode
+      this.declare(getString(getNode(node, "id"), "name"), this.createFunction(node), true, node)
+    }
+  }
+
+  private evaluateIfStatement(node: AstNode): Effect.Effect<StatementResult, unknown, R> {
+    const testNode = getNode(node, "test")
+    const consequentNode = getNode(node, "consequent")
+    const alternateNode = getOptionalNode(node, "alternate")
+
+    return Effect.flatMap(this.evaluateExpression(testNode), (test) =>
+      test
+        ? this.evaluateStatement(consequentNode)
+        : alternateNode
+          ? this.evaluateStatement(alternateNode)
+          : Effect.succeed({ kind: "none" }),
+    )
+  }
+
+  private evaluateSwitchStatement(node: AstNode): Effect.Effect<StatementResult, unknown, R> {
+    const self = this
+    this.pushScope()
+    return Effect.gen(function* () {
+      const discriminant = yield* self.evaluateExpression(getNode(node, "discriminant"))
+      if (containsOpaqueReference(discriminant)) {
+        throw new InterpreterRuntimeError(
+          "Switch discriminants must be data values in CodeMode.",
+          node,
+          "InvalidDataValue",
+        )
+      }
+      const cases = getArray(node, "cases").map((value, index) => asNode(value, `cases[${index}]`))
+      let defaultIndex: number | undefined
+      let selected: number | undefined
+      for (const [index, branch] of cases.entries()) {
+        const test = getOptionalNode(branch, "test")
+        if (!test) {
+          defaultIndex = index
+          continue
+        }
+        const candidate = yield* self.evaluateExpression(test)
+        if (containsOpaqueReference(candidate)) {
+          throw new InterpreterRuntimeError(
+            "Switch case values must be data values in CodeMode.",
+            test,
+            "InvalidDataValue",
+          )
+        }
+        if (candidate === discriminant) {
+          selected = index
+          break
+        }
+      }
+      const start = selected ?? defaultIndex
+      if (start === undefined) return { kind: "none" } satisfies StatementResult
+      for (let index = start; index < cases.length; index += 1) {
+        for (const statementValue of getArray(cases[index]!, "consequent")) {
+          const result = yield* self.evaluateStatement(asNode(statementValue, "consequent"))
+          if (result.kind === "break") return { kind: "none" } satisfies StatementResult
+          if (result.kind === "return" || result.kind === "continue") return result
+          if (result.kind === "value") self.lastValue = result.value
+        }
+      }
+      return { kind: "none" } satisfies StatementResult
+    }).pipe(Effect.ensuring(Effect.sync(() => self.popScope())))
+  }
+
+  private evaluateWhileStatement(node: AstNode): Effect.Effect<StatementResult, unknown, R> {
+    const testNode = getNode(node, "test")
+    const bodyNode = getNode(node, "body")
+
+    const self = this
+    return Effect.gen(function* () {
+      while (yield* self.evaluateExpression(testNode)) {
+        const result = yield* self.evaluateStatement(bodyNode)
+
+        if (result.kind === "continue") {
+          continue
+        }
+
+        if (result.kind === "break") {
+          return { kind: "none" } satisfies StatementResult
+        }
+
+        if (result.kind === "return") {
+          return result
+        }
+
+        if (result.kind === "value") {
+          self.lastValue = result.value
+        }
+      }
+
+      return { kind: "none" } satisfies StatementResult
+    })
+  }
+
+  private evaluateDoWhileStatement(node: AstNode): Effect.Effect<StatementResult, unknown, R> {
+    const bodyNode = getNode(node, "body")
+    const testNode = getNode(node, "test")
+
+    const self = this
+    return Effect.gen(function* () {
+      do {
+        const result = yield* self.evaluateStatement(bodyNode)
+
+        if (result.kind === "continue") {
+          continue
+        }
+
+        if (result.kind === "break") {
+          return { kind: "none" } satisfies StatementResult
+        }
+
+        if (result.kind === "return") {
+          return result
+        }
+
+        if (result.kind === "value") {
+          self.lastValue = result.value
+        }
+      } while (yield* self.evaluateExpression(testNode))
+
+      return { kind: "none" } satisfies StatementResult
+    })
+  }
+
+  private evaluateForStatement(node: AstNode): Effect.Effect<StatementResult, unknown, R> {
+    this.pushScope()
+    const self = this
+    return Effect.gen(function* () {
+      const initNode = getOptionalNode(node, "init")
+      const testNode = getOptionalNode(node, "test")
+      const updateNode = getOptionalNode(node, "update")
+      const bodyNode = getNode(node, "body")
+
+      if (initNode) {
+        if (initNode.type === "VariableDeclaration") {
+          yield* self.evaluateVariableDeclaration(initNode)
+        } else {
+          yield* self.evaluateExpression(initNode)
+        }
+      }
+
+      const perIterationBindings =
+        initNode?.type === "VariableDeclaration" && getString(initNode, "kind") !== "var"
+          ? Array.from(self.currentScope().keys())
+          : []
+
+      while (testNode ? yield* self.evaluateExpression(testNode) : true) {
+        let iterationScope: Map<string, Binding> | undefined
+        if (perIterationBindings.length > 0) {
+          iterationScope = new Map(
+            perIterationBindings.map((name) => {
+              const binding = self.currentScope().get(name)!
+              return [name, { ...binding }]
+            }),
+          )
+          self.scopes.push(iterationScope)
+        }
+        const result = yield* self.evaluateStatement(bodyNode).pipe(
+          Effect.ensuring(
+            Effect.sync(() => {
+              if (iterationScope) self.popScope()
+            }),
+          ),
+        )
+
+        if (result.kind === "return") {
+          return result
+        }
+
+        if (result.kind === "break") {
+          return { kind: "none" } satisfies StatementResult
+        }
+
+        if (result.kind === "value") {
+          self.lastValue = result.value
+        }
+
+        if (iterationScope) {
+          const loopScope = self.currentScope()
+          for (const name of perIterationBindings) {
+            loopScope.set(name, { ...iterationScope.get(name)! })
+          }
+        }
+
+        if (updateNode) {
+          yield* self.evaluateExpression(updateNode)
+        }
+
+        if (result.kind === "continue") {
+          continue
+        }
+      }
+
+      return { kind: "none" } satisfies StatementResult
+    }).pipe(Effect.ensuring(Effect.sync(() => self.popScope())))
+  }
+
+  private evaluateForOfStatement(node: AstNode): Effect.Effect<StatementResult, unknown, R> {
+    if (getBoolean(node, "await")) {
+      throw new InterpreterRuntimeError("for await...of is not supported.", node)
+    }
+
+    const self = this
+    return Effect.gen(function* () {
+      const left = getNode(node, "left")
+      const right = yield* self.evaluateExpression(getNode(node, "right"))
+      const body = getNode(node, "body")
+
+      // Arrays iterate in place; strings iterate code points; Maps iterate [key, value]
+      // pairs and Sets iterate values over a snapshot (mutation during iteration is safe).
+      const iterable = Array.isArray(right) ? right : spreadItems(right)
+      if (iterable === undefined) {
+        throw new InterpreterRuntimeError("for...of requires an array, string, Map, or Set value in CodeMode.", node)
+      }
+
+      let declaration: { readonly pattern: AstNode; readonly mutable: boolean } | undefined
+      let assignmentName: string | undefined
+
+      if (left.type === "VariableDeclaration") {
+        const declarations = getArray(left, "declarations")
+        if (declarations.length !== 1) {
+          throw new InterpreterRuntimeError("for...of supports one declared binding.", left)
+        }
+
+        const declarator = asNode(declarations[0], "declarations[0]")
+        declaration = { pattern: getNode(declarator, "id"), mutable: getString(left, "kind") !== "const" }
+      } else if (left.type === "Identifier") {
+        assignmentName = getString(left, "name")
+      } else {
+        throw new InterpreterRuntimeError("Unsupported for...of binding.", left)
+      }
+
+      for (const value of iterable) {
+        if (declaration) {
+          self.pushScope()
+          yield* self.declarePattern(declaration.pattern, value, declaration.mutable, left)
+        } else if (assignmentName) {
+          self.setIdentifierValue(assignmentName, value, left)
+        }
+
+        const result = yield* self.evaluateStatement(body).pipe(
+          Effect.ensuring(
+            Effect.sync(() => {
+              if (declaration) self.popScope()
+            }),
+          ),
+        )
+
+        if (result.kind === "return") {
+          return result
+        }
+
+        if (result.kind === "break") {
+          return { kind: "none" }
+        }
+
+        if (result.kind === "value") {
+          self.lastValue = result.value
+        }
+
+        if (result.kind === "continue") {
+          continue
+        }
+      }
+
+      return { kind: "none" }
+    })
+  }
+
+  // Own enumerable string keys of a value, shared by `for...in` and `Object.keys` over tool
+  // references: plain data objects enumerate their own keys, arrays their index strings (plus
+  // any own non-index properties, e.g. match results' index/groups - exactly Object.keys in
+  // JS), and a tool reference the namespace/tool names at its path in the host tool tree.
+  // Returns undefined for everything else so callers can raise a contextual error.
+  private enumerableKeys(value: unknown): Array<string> | undefined {
+    if (value instanceof ToolReference) {
+      return [...this.toolKeys(value.path)]
+    }
+    if (Array.isArray(value)) {
+      return Object.keys(value)
+    }
+    if (value !== null && typeof value === "object" && !isRuntimeReference(value)) {
+      return Object.keys(value)
+    }
+    return undefined
+  }
+
+  private evaluateForInStatement(node: AstNode): Effect.Effect<StatementResult, unknown, R> {
+    const self = this
+    return Effect.gen(function* () {
+      const left = getNode(node, "left")
+      const right = yield* self.evaluateExpression(getNode(node, "right"))
+      const body = getNode(node, "body")
+
+      // Keys are snapshotted up front (mutation during iteration is safe): plain objects
+      // enumerate their own keys, arrays their index strings, and tool references the
+      // namespace/tool names at that node - the same enumeration Object.keys performs.
+      // Anything else (strings, Maps, Sets, numbers, null, ...) is a deliberate error rather
+      // than real JS's surprising behavior (indices for strings, zero iterations for
+      // Maps/Sets/null): the hint points at the constructs that do what the program means.
+      const keys = self.enumerableKeys(right)
+      if (keys === undefined) {
+        throw new InterpreterRuntimeError(
+          "for...in requires a plain object, array, or tools reference in CodeMode. Use for...of for arrays/strings/Maps/Sets, or Object.keys(value) for a key list.",
+          node,
+        )
+      }
+
+      let declaration: { readonly pattern: AstNode; readonly mutable: boolean } | undefined
+      let assignmentName: string | undefined
+
+      if (left.type === "VariableDeclaration") {
+        const declarations = getArray(left, "declarations")
+        if (declarations.length !== 1) {
+          throw new InterpreterRuntimeError("for...in supports one declared binding.", left)
+        }
+
+        const declarator = asNode(declarations[0], "declarations[0]")
+        declaration = { pattern: getNode(declarator, "id"), mutable: getString(left, "kind") !== "const" }
+      } else if (left.type === "Identifier") {
+        assignmentName = getString(left, "name")
+      } else {
+        throw new InterpreterRuntimeError("Unsupported for...in binding.", left)
+      }
+
+      for (const key of keys) {
+        if (declaration) {
+          self.pushScope()
+          yield* self.declarePattern(declaration.pattern, key, declaration.mutable, left)
+        } else if (assignmentName) {
+          self.setIdentifierValue(assignmentName, key, left)
+        }
+
+        const result = yield* self.evaluateStatement(body).pipe(
+          Effect.ensuring(
+            Effect.sync(() => {
+              if (declaration) self.popScope()
+            }),
+          ),
+        )
+
+        if (result.kind === "return") {
+          return result
+        }
+
+        if (result.kind === "break") {
+          return { kind: "none" }
+        }
+
+        if (result.kind === "value") {
+          self.lastValue = result.value
+        }
+
+        if (result.kind === "continue") {
+          continue
+        }
+      }
+
+      return { kind: "none" }
+    })
+  }
+
+  private evaluateBreakStatement(node: AstNode): StatementResult {
+    const labelNode = getOptionalNode(node, "label")
+
+    if (labelNode) {
+      throw new InterpreterRuntimeError("Labeled break is not supported in v1.", node)
+    }
+
+    return { kind: "break" }
+  }
+
+  private evaluateContinueStatement(node: AstNode): StatementResult {
+    const labelNode = getOptionalNode(node, "label")
+
+    if (labelNode) {
+      throw new InterpreterRuntimeError("Labeled continue is not supported in v1.", node)
+    }
+
+    return { kind: "continue" }
+  }
+
+  private evaluateThrowStatement(node: AstNode): Effect.Effect<StatementResult, unknown, R> {
+    const argument = getNode(node, "argument")
+    return Effect.flatMap(this.evaluateExpression(argument), (value) => Effect.fail(new ProgramThrow(value)))
+  }
+
+  private evaluateTryStatement(node: AstNode): Effect.Effect<StatementResult, unknown, R> {
+    const body = getNode(node, "block")
+    const handler = getOptionalNode(node, "handler")
+    const finalizer = getOptionalNode(node, "finalizer")
+    const self = this
+
+    const attempted = Effect.matchCauseEffect(this.evaluateStatement(body), {
+      onFailure: (cause) => {
+        if (cause.reasons.some(Cause.isInterruptReason) || !handler) {
+          return Effect.failCause(cause)
+        }
+
+        // The program sees a plain { message } error (or the thrown value itself) - see
+        // caughtErrorValue, shared with Promise.allSettled rejection reasons.
+        const caught = caughtErrorValue(Cause.squash(cause))
+        const parameter = getOptionalNode(handler, "param")
+        self.pushScope()
+        return Effect.gen(function* () {
+          if (parameter) yield* self.declarePattern(parameter, caught, true, handler)
+          return yield* self.evaluateStatement(getNode(handler, "body"))
+        }).pipe(Effect.ensuring(Effect.sync(() => self.popScope())))
+      },
+      onSuccess: Effect.succeed,
+    })
+
+    if (!finalizer) return attempted
+
+    const isAbrupt = (result: StatementResult): boolean =>
+      result.kind === "return" || result.kind === "break" || result.kind === "continue"
+
+    return Effect.matchCauseEffect(attempted, {
+      onFailure: (cause) =>
+        cause.reasons.some(Cause.isInterruptReason)
+          ? Effect.failCause(cause)
+          : Effect.flatMap(this.evaluateStatement(finalizer), (final) =>
+              isAbrupt(final) ? Effect.succeed(final) : Effect.failCause(cause),
+            ),
+      onSuccess: (result) =>
+        Effect.flatMap(this.evaluateStatement(finalizer), (final) =>
+          isAbrupt(final) ? Effect.succeed(final) : Effect.succeed(result),
+        ),
+    })
+  }
+
+  private evaluateVariableDeclaration(node: AstNode): Effect.Effect<void, unknown, R> {
+    const kind = getString(node, "kind")
+    const declarations = getArray(node, "declarations")
+    const self = this
+    return Effect.gen(function* () {
+      for (const declarationValue of declarations) {
+        const declaration = asNode(declarationValue, "declarations")
+
+        if (declaration.type !== "VariableDeclarator") {
+          throw new InterpreterRuntimeError("Unsupported variable declaration shape.", declaration)
+        }
+
+        const init = getOptionalNode(declaration, "init")
+        const value = init ? yield* self.evaluateExpression(init) : undefined
+        yield* self.declarePattern(getNode(declaration, "id"), value, kind !== "const", declaration)
+      }
+    })
+  }
+
+  private declarePattern(
+    pattern: AstNode,
+    value: unknown,
+    mutable: boolean,
+    node: AstNode,
+  ): Effect.Effect<void, unknown, R> {
+    const self = this
+    return Effect.gen(function* () {
+      if (pattern.type === "Identifier") {
+        self.declare(getString(pattern, "name"), value, mutable, node)
+        return
+      }
+
+      // Default values: `x = expr` / `{ a = 1 }` - the default is evaluated only when the value is undefined.
+      if (pattern.type === "AssignmentPattern") {
+        const resolved = value === undefined ? yield* self.evaluateExpression(getNode(pattern, "right")) : value
+        yield* self.declarePattern(getNode(pattern, "left"), resolved, mutable, node)
+        return
+      }
+
+      if (pattern.type === "ObjectPattern") {
+        if (value === null || typeof value !== "object" || Array.isArray(value) || isRuntimeReference(value)) {
+          throw new InterpreterRuntimeError(
+            "Object destructuring requires a data object value.",
+            pattern,
+            "InvalidDataValue",
+          )
+        }
+
+        const consumed = new Set<string>()
+        for (const propertyValue of getArray(pattern, "properties")) {
+          const property = asNode(propertyValue, "properties")
+
+          // Object rest: `{ a, ...others }` - gather the not-yet-consumed own keys.
+          if (property.type === "RestElement") {
+            const rest: SafeObject = Object.create(null) as SafeObject
+            for (const [key, item] of Object.entries(value as SafeObject)) {
+              if (!consumed.has(key) && !isBlockedMember(key)) rest[key] = item
+            }
+            yield* self.declarePattern(getNode(property, "argument"), rest, mutable, property)
+            continue
+          }
+
+          if (
+            property.type !== "Property" ||
+            getBoolean(property, "computed") ||
+            getString(property, "kind") !== "init"
+          ) {
+            throw new InterpreterRuntimeError("Only named object destructuring properties are supported.", property)
+          }
+
+          const keyNode = getNode(property, "key")
+          const key = keyNode.type === "Identifier" ? getString(keyNode, "name") : String(keyNode.value)
+          if (isBlockedMember(key)) {
+            throw new InterpreterRuntimeError(`Property '${key}' is not available in CodeMode.`, keyNode)
+          }
+          consumed.add(key)
+          yield* self.declarePattern(getNode(property, "value"), (value as SafeObject)[key], mutable, property)
+        }
+        return
+      }
+
+      if (pattern.type === "ArrayPattern") {
+        if (!Array.isArray(value)) {
+          throw new InterpreterRuntimeError("Array destructuring requires an array value.", pattern)
+        }
+
+        for (const [index, item] of getArray(pattern, "elements").entries()) {
+          if (item === null) continue
+          const element = asNode(item, `elements[${index}]`)
+          // Array rest: `[head, ...tail]` - binds the remaining elements (must be last).
+          if (element.type === "RestElement") {
+            yield* self.declarePattern(getNode(element, "argument"), value.slice(index), mutable, element)
+            break
+          }
+          yield* self.declarePattern(element, value[index], mutable, pattern)
+        }
+        return
+      }
+
+      throw new InterpreterRuntimeError(`Unsupported binding pattern '${pattern.type}'.`, pattern)
+    })
+  }
+
+  private evaluateExpression(node: AstNode): Effect.Effect<unknown, unknown, R> {
+    switch (node.type) {
+      case "Literal": {
+        // A regex literal parses as a Literal node carrying { pattern, flags }; construct the
+        // sandbox regex from those (the host `value` instance is never exposed).
+        const regex = node.regex
+        if (isRecord(regex) && typeof regex.pattern === "string") {
+          return Effect.sync(() =>
+            this.constructRegExp([regex.pattern, typeof regex.flags === "string" ? regex.flags : ""], node),
+          )
+        }
+        return Effect.sync(() => boundedData(node.value, "Literal"))
+      }
+      case "Identifier":
+        return Effect.sync(() => this.getIdentifierValue(getString(node, "name"), node))
+      case "BinaryExpression":
+        return this.evaluateBinaryExpression(node)
+      case "LogicalExpression":
+        return this.evaluateLogicalExpression(node)
+      case "UnaryExpression":
+        return this.evaluateUnaryExpression(node)
+      case "AssignmentExpression":
+        return this.evaluateAssignmentExpression(node)
+      case "CallExpression":
+        return this.evaluateCallExpression(node)
+      case "ArrowFunctionExpression":
+      case "FunctionExpression":
+        return Effect.sync(() => this.createFunction(node))
+      case "MemberExpression":
+        return this.readMember(node)
+      case "ChainExpression":
+        return Effect.map(this.evaluateExpression(getNode(node, "expression")), (value) =>
+          value === OptionalShortCircuit ? undefined : value,
+        )
+      case "ObjectExpression":
+        return this.evaluateObjectExpression(node)
+      case "ArrayExpression":
+        return this.evaluateArrayExpression(node)
+      case "TemplateLiteral":
+        return this.evaluateTemplateLiteral(node)
+      case "ConditionalExpression":
+        return this.evaluateConditionalExpression(node)
+      case "UpdateExpression":
+        return this.evaluateUpdateExpression(node)
+      case "AwaitExpression": {
+        // `await` resolves a promise value; awaiting anything else is a passthrough no-op,
+        // matching real JS semantics for non-thenables.
+        const self = this
+        return Effect.flatMap(this.evaluateExpression(getNode(node, "argument")), (value) =>
+          value instanceof SandboxPromise ? self.settlePromise(value, node) : Effect.succeed(value),
+        )
+      }
+      case "NewExpression":
+        return this.evaluateNewExpression(node)
+      default:
+        throw unsupportedSyntax(node.type, node)
+    }
+  }
+
+  private evaluateNewExpression(node: AstNode): Effect.Effect<unknown, unknown, R> {
+    const callee = getNode(node, "callee")
+    if (callee.type !== "Identifier") {
+      throw unsupportedSyntax("NewExpression", node)
+    }
+    const name = getString(callee, "name")
+    const argNodes = getArray(node, "arguments")
+    const self = this
+    if (name === "Promise") {
+      throw new InterpreterRuntimeError(
+        "new Promise(...) is not supported in CodeMode; tool calls already return promises - call the tool and await the result.",
+        node,
+        "UnsupportedSyntax",
+        [supportedSyntaxMessage],
+      )
+    }
+    if (errorConstructors.has(name)) {
+      return Effect.gen(function* () {
+        const arg =
+          argNodes.length > 0 ? yield* self.evaluateExpression(asNode(argNodes[0], "arguments[0]")) : undefined
+        return createErrorValue(name, arg === undefined ? "" : coerceToString(arg))
+      })
+    }
+    if (valueConstructors.has(name)) {
+      return Effect.gen(function* () {
+        const args = yield* self.evaluateCallArguments(argNodes)
+        switch (name) {
+          case "Date":
+            return self.constructDate(args)
+          case "RegExp":
+            return self.constructRegExp(args, node)
+          case "Map":
+            return self.constructMap(args[0], node)
+          default:
+            return self.constructSet(args[0], node)
+        }
+      })
+    }
+    throw unsupportedSyntax("NewExpression", node)
+  }
+
+  private constructDate(args: Array<unknown>): SandboxDate {
+    if (args.length === 0) return new SandboxDate(Date.now())
+    if (args.length === 1) {
+      const arg = args[0]
+      if (arg instanceof SandboxDate) return new SandboxDate(arg.time)
+      if (typeof arg === "number") return new SandboxDate(new Date(arg).getTime())
+      if (typeof arg === "string") return new SandboxDate(Date.parse(arg))
+      return new SandboxDate(Number.NaN)
+    }
+    // new Date(year, month, day?, hours?, ...) - local-time component form.
+    const parts = args.map((arg) => coerceToNumber(arg))
+    return new SandboxDate(new Date(...(parts as [number, number])).getTime())
+  }
+
+  private constructRegExp(args: Array<unknown>, node: AstNode): SandboxRegExp {
+    const first = args[0]
+    const pattern =
+      first instanceof SandboxRegExp ? first.regex.source : first === undefined ? "" : coerceToString(first)
+    const flagsArg = args[1]
+    if (flagsArg !== undefined && typeof flagsArg !== "string") {
+      throw new InterpreterRuntimeError(
+        `RegExp flags must be a string of flag characters (e.g. "g", "gi"), not ${flagsArg === null ? "null" : typeof flagsArg}.`,
+        node,
+      )
+    }
+    const flags = flagsArg ?? (first instanceof SandboxRegExp ? first.regex.flags : "")
+    try {
+      return new SandboxRegExp(pattern, flags)
+    } catch (error) {
+      // Say which part was rejected and how to fix it, instead of passing the engine
+      // message through bare. A flags failure names the flags; a pattern failure gets the
+      // escaping hint (the usual cause is an unescaped metacharacter in a built-up string).
+      const reason = regexFailureReason(error)
+      throw new InterpreterRuntimeError(
+        /flag/i.test(reason)
+          ? `new RegExp(...) received invalid flags ${JSON.stringify(flags)} (${reason}). Valid flags are d, g, i, m, s, u, v, and y.`
+          : `new RegExp(...) received ${JSON.stringify(pattern)}, which is not a valid regular expression pattern (${reason}). ${escapeRegexHint}`,
+        node,
+      ).as("SyntaxError")
+    }
+  }
+
+  private constructMap(init: unknown, node: AstNode): SandboxMap {
+    const target = new SandboxMap()
+    if (init === undefined || init === null) return target
+    const entries = Array.isArray(init)
+      ? init
+      : init instanceof SandboxMap
+        ? Array.from(init.map.entries(), ([key, item]): Array<unknown> => [key, item])
+        : undefined
+    if (entries === undefined) {
+      throw new InterpreterRuntimeError(
+        "new Map(...) expects an array of [key, value] pairs, a Map, or no argument.",
+        node,
+      )
+    }
+    for (const pair of entries) {
+      if (!Array.isArray(pair)) {
+        throw new InterpreterRuntimeError("new Map(...) expects [key, value] pairs.", node)
+      }
+      target.map.set(pair[0], pair[1])
+    }
+    return target
+  }
+
+  private constructSet(init: unknown, node: AstNode): SandboxSet {
+    const target = new SandboxSet()
+    if (init === undefined || init === null) return target
+    const items = Array.isArray(init)
+      ? init
+      : init instanceof SandboxSet
+        ? Array.from(init.set.values())
+        : typeof init === "string"
+          ? Array.from(init)
+          : undefined
+    if (items === undefined) {
+      throw new InterpreterRuntimeError("new Set(...) expects an array, Set, string, or no argument.", node)
+    }
+    for (const item of items) target.set.add(item)
+    return target
+  }
+
+  private evaluateBinaryExpression(node: AstNode): Effect.Effect<unknown, unknown, R> {
+    const operator = getString(node, "operator")
+    const self = this
+    return Effect.gen(function* () {
+      const lhs = yield* self.evaluateExpression(getNode(node, "left"))
+      const rhs = yield* self.evaluateExpression(getNode(node, "right"))
+      // Like `typeof`, `instanceof` observes any value without coercing it (a promise or
+      // function operand is a legitimate question, not an error), so it is handled before
+      // the data-only operand check.
+      if (operator === "instanceof") return instanceofValue(lhs, rhs, node)
+      return boundedData(self.applyBinaryOperator(operator, lhs, rhs, node), "Binary expression result")
+    })
+  }
+
+  /**
+   * Applies a binary operator to two already-evaluated operands with CodeMode's coercion
+   * semantics. Shared by binary expressions and compound assignment (`x op= y` must behave
+   * exactly like `x = x op y`, coercion included).
+   */
+  private applyBinaryOperator(operator: string, lhs: unknown, rhs: unknown, node: AstNode): unknown {
+    if (containsOpaqueReference(lhs) || containsOpaqueReference(rhs)) {
+      throw new InterpreterRuntimeError("Binary operators require data values in CodeMode.", node, "InvalidDataValue")
+    }
+    // Data objects/arrays are null-prototype, so JS's ToPrimitive throws an opaque host
+    // "No default value" TypeError when an operator coerces them. Coerce to their JS string
+    // form first (as String(x) / template literals do) so operators behave like JavaScript.
+    // A Date follows its ToPrimitive hints: string for `+` (concatenation), its time value
+    // for arithmetic and ordering - so `end - start` and `a < b` work as in JS.
+    // Identity (=== / !==) and the right operand of `in` keep their raw object value.
+    const coerceOperand = (operand: unknown): unknown => {
+      if (operand instanceof SandboxDate) return operator === "+" ? coerceToString(operand) : operand.time
+      return operand !== null && typeof operand === "object" ? coerceToString(operand) : operand
+    }
+    const bothObjects = lhs !== null && typeof lhs === "object" && rhs !== null && typeof rhs === "object"
+    const l = coerceOperand(lhs)
+    const r = coerceOperand(rhs)
+    switch (operator) {
+      case "+":
+        return (l as string) + (r as string)
+      case "-":
+        return (l as number) - (r as number)
+      case "*":
+        return (l as number) * (r as number)
+      case "/":
+        return (l as number) / (r as number)
+      case "%":
+        return (l as number) % (r as number)
+      case "**":
+        return (l as number) ** (r as number)
+      // Two objects compare by identity in JS (no ToPrimitive); only object-vs-primitive coerces.
+      case "==":
+        return bothObjects ? lhs === rhs : l == r
+      case "===":
+        return lhs === rhs
+      case "!=":
+        return bothObjects ? lhs !== rhs : l != r
+      case "!==":
+        return lhs !== rhs
+      case "<":
+        return (l as string) < (r as string)
+      case "<=":
+        return (l as string) <= (r as string)
+      case ">":
+        return (l as string) > (r as string)
+      case ">=":
+        return (l as string) >= (r as string)
+      case "&":
+        return (l as number) & (r as number)
+      case "|":
+        return (l as number) | (r as number)
+      case "^":
+        return (l as number) ^ (r as number)
+      case "<<":
+        return (l as number) << (r as number)
+      case ">>":
+        return (l as number) >> (r as number)
+      case ">>>":
+        return (l as number) >>> (r as number)
+      case "in":
+        if (rhs === null || typeof rhs !== "object") {
+          throw new InterpreterRuntimeError("The 'in' operator requires a data object on the right-hand side.", node)
+        }
+        // Own properties only, so arrays don't leak the host Array.prototype (map/constructor/...).
+        return Object.hasOwn(rhs as object, coerceOperand(lhs) as PropertyKey)
+      default:
+        throw new InterpreterRuntimeError(`Unsupported binary operator '${operator}'.`, node)
+    }
+  }
+
+  private evaluateLogicalExpression(node: AstNode): Effect.Effect<unknown, unknown, R> {
+    const operator = getString(node, "operator")
+    return Effect.flatMap(this.evaluateExpression(getNode(node, "left")), (left) => {
+      if (operator === "&&") return left ? this.evaluateExpression(getNode(node, "right")) : Effect.succeed(left)
+      if (operator === "||") return left ? Effect.succeed(left) : this.evaluateExpression(getNode(node, "right"))
+      if (operator === "??")
+        return left !== null && left !== undefined
+          ? Effect.succeed(left)
+          : this.evaluateExpression(getNode(node, "right"))
+      throw new InterpreterRuntimeError(`Unsupported logical operator '${operator}'.`, node)
+    })
+  }
+
+  private evaluateUnaryExpression(node: AstNode): Effect.Effect<unknown, unknown, R> {
+    const operator = getString(node, "operator")
+    const argument = getNode(node, "argument")
+    // `typeof undeclaredIdentifier` is `"undefined"` in JS (never a ReferenceError), so
+    // feature-detection guards like `typeof x !== "undefined"` don't crash. Short-circuit before
+    // evaluating the argument; a declared-but-TDZ binding still falls through to the normal throw.
+    if (operator === "typeof" && argument.type === "Identifier" && !this.resolveBinding(getString(argument, "name"))) {
+      return Effect.succeed("undefined")
+    }
+    return Effect.map(this.evaluateExpression(argument), (value) => {
+      // `typeof` and `!` never throw in JS - they observe any value (functions and runtime
+      // references included) without coercing it, so feature detection and negation work.
+      if (operator === "typeof") return typeofValue(value)
+      if (operator === "!") return !value
+      if (containsOpaqueReference(value)) {
+        throw new InterpreterRuntimeError("Unary operators require data values in CodeMode.", node, "InvalidDataValue")
+      }
+      // Numeric/bitwise unary operators ToPrimitive their operand; a Date yields its time value
+      // (`+date` is the epoch-ms idiom), other null-prototype data objects/arrays coerce to
+      // their JS string form first (see evaluateBinaryExpression).
+      const operand =
+        value instanceof SandboxDate
+          ? value.time
+          : value !== null && typeof value === "object"
+            ? coerceToString(value)
+            : value
+      let result: unknown
+      switch (operator) {
+        case "+":
+          result = +(operand as number)
+          break
+        case "-":
+          result = -(operand as number)
+          break
+        case "~":
+          result = ~(operand as number)
+          break
+        default:
+          throw new InterpreterRuntimeError(`Unsupported unary operator '${operator}'.`, node)
+      }
+      return boundedData(result, "Unary expression result")
+    })
+  }
+
+  private evaluateAssignmentExpression(node: AstNode): Effect.Effect<unknown, unknown, R> {
+    const left = getNode(node, "left")
+    const operator = getString(node, "operator")
+    const self = this
+    return Effect.gen(function* () {
+      if (operator === "??=" || operator === "||=" || operator === "&&=") {
+        return yield* self.evaluateLogicalAssignment(node, left, operator)
+      }
+      const rightValue = yield* self.evaluateExpression(getNode(node, "right"))
+      if (left.type === "Identifier") {
+        const name = getString(left, "name")
+        if (operator === "=") return self.setIdentifierValue(name, rightValue, left)
+        const next = boundedData(
+          self.applyCompoundAssignment(operator, self.getIdentifierValue(name, left), rightValue, node),
+          "Assignment result",
+        )
+        return self.setIdentifierValue(name, next, left)
+      }
+      if (left.type === "MemberExpression") {
+        if (operator === "=") return yield* self.writeMember(left, rightValue)
+        return yield* self.modifyMember(left, (current) => {
+          const next = boundedData(
+            self.applyCompoundAssignment(operator, current, rightValue, node),
+            "Assignment result",
+          )
+          return Effect.succeed({ write: true, next, result: next })
+        })
+      }
+      throw new InterpreterRuntimeError("Assignment target must be an Identifier or MemberExpression.", left)
+    })
+  }
+
+  private evaluateLogicalAssignment(
+    node: AstNode,
+    left: AstNode,
+    operator: string,
+  ): Effect.Effect<unknown, unknown, R> {
+    const self = this
+    const shouldAssign = (current: unknown): boolean =>
+      operator === "??=" ? current === null || current === undefined : operator === "||=" ? !current : Boolean(current)
+    if (left.type === "Identifier") {
+      const name = getString(left, "name")
+      return Effect.gen(function* () {
+        const current = self.getIdentifierValue(name, left)
+        if (!shouldAssign(current)) return current
+        const rightValue = yield* self.evaluateExpression(getNode(node, "right"))
+        return self.setIdentifierValue(name, rightValue, left)
+      })
+    }
+    if (left.type === "MemberExpression") {
+      // Resolve the member exactly once; evaluate the RHS only if we actually assign.
+      return self.modifyMember(left, (current) =>
+        shouldAssign(current)
+          ? Effect.map(self.evaluateExpression(getNode(node, "right")), (rightValue) => ({
+              write: true,
+              next: rightValue,
+              result: rightValue,
+            }))
+          : Effect.succeed({ write: false, next: current, result: current }),
+      )
+    }
+    throw new InterpreterRuntimeError("Assignment target must be an Identifier or MemberExpression.", left)
+  }
+
+  private evaluateUpdateExpression(node: AstNode): Effect.Effect<unknown, unknown, R> {
+    const operator = getString(node, "operator")
+    const argument = getNode(node, "argument")
+    const prefix = getBoolean(node, "prefix")
+
+    const increment = operator === "++" ? 1 : operator === "--" ? -1 : undefined
+
+    if (increment === undefined) {
+      throw new InterpreterRuntimeError(`Unsupported update operator '${operator}'.`, node)
+    }
+
+    if (argument.type === "Identifier") {
+      return Effect.sync(() => {
+        const name = getString(argument, "name")
+        const current = Number(this.getIdentifierValue(name, argument))
+        const next = current + increment
+        this.setIdentifierValue(name, next, argument)
+        return prefix ? next : current
+      })
+    }
+
+    if (argument.type === "MemberExpression") {
+      return this.modifyMember(argument, (current) => {
+        const value = Number(current)
+        const next = value + increment
+        return Effect.succeed({ write: true, next, result: prefix ? next : value })
+      })
+    }
+
+    throw new InterpreterRuntimeError("Update target must be an Identifier or MemberExpression.", argument)
+  }
+
+  private evaluateCallExpression(node: AstNode): Effect.Effect<unknown, unknown, R> {
+    const callee = getNode(node, "callee")
+    const argNodes = getArray(node, "arguments")
+
+    const self = this
+    return Effect.gen(function* () {
+      const callable = yield* self.evaluateExpression(callee)
+      if (callable === OptionalShortCircuit) return OptionalShortCircuit
+      if ((callable === null || callable === undefined) && node.optional === true) return OptionalShortCircuit
+
+      const args = yield* self.evaluateCallArguments(argNodes)
+
+      if (callable instanceof ToolReference) {
+        if (callable.path.length === 0) throw new InterpreterRuntimeError("The tools root is not callable.", callee)
+        // An un-awaited tool call is a first-class promise value; the call itself starts now.
+        return yield* self.createToolCallPromise(callable.path, args)
+      }
+      if (callable instanceof PromiseMethodReference) {
+        return yield* self.invokePromiseMethod(callable, args, node)
+      }
+      if (callable instanceof CodeModeFunction) {
+        return yield* self.invokeFunction(callable, args)
+      }
+      if (callable instanceof IntrinsicReference) {
+        return yield* self.invokeIntrinsic(callable, args, node)
+      }
+      if (callable instanceof GlobalMethodReference) {
+        if (callable.namespace === "console") return self.invokeConsole(callable.name, args, node)
+        if (callable.namespace === "Object" && args[0] instanceof ToolReference) {
+          return self.invokeObjectMethodOnTools(callable.name, args[0] as ToolReference, node)
+        }
+        return boundedData(invokeGlobalMethod(callable, args, node), `${callable.namespace}.${callable.name} result`)
+      }
+      if (callable instanceof CoercionFunction) {
+        return boundedData(invokeCoercion(callable, args, node), `${callable.name} result`)
+      }
+      // `Error("msg")` without `new` constructs an error exactly like `new Error("msg")`, as in JS.
+      if (callable instanceof ErrorConstructorReference) {
+        return createErrorValue(callable.name, args[0] === undefined ? "" : coerceToString(args[0]))
+      }
+      throw new InterpreterRuntimeError("Only tools are callable in CodeMode.", callee)
+    })
+  }
+
+  // Object.* over a tool reference: `Object.keys(tools)` / `Object.keys(tools.ns)` enumerate
+  // namespace/tool names from the host tool tree - the discovery idiom a model reaches for
+  // first. Every other Object helper cannot produce data from a tool reference, so it fails
+  // with a pointer at the working idioms instead of the generic plain-objects-only message.
+  private invokeObjectMethodOnTools(name: string, ref: ToolReference, node: AstNode): unknown {
+    if (name === "keys") {
+      return boundedData(this.enumerableKeys(ref)!, "Object.keys result")
+    }
+    throw new InterpreterRuntimeError(
+      `Object.${name}(...) cannot read tool references: they are not plain data. Use Object.keys(tools) for names, or tools.$codemode.search({ query }) for signatures.`,
+      node,
+      "InvalidDataValue",
+    )
+  }
+
+  private invokeConsole(name: string, args: Array<unknown>, node: AstNode): undefined {
+    if (!consoleMethods.has(name))
+      throw new InterpreterRuntimeError(`console.${name} is not available in CodeMode.`, node)
+    this.logs.push(publicErrorMessage(this.formatConsoleMessage(name, args, node)))
+    return undefined
+  }
+
+  private formatConsoleMessage(name: string, args: Array<unknown>, node: AstNode): string {
+    if (name === "dir") return args.length === 0 ? "undefined" : this.formatConsoleArgument(args[0])
+    if (name === "table") return this.formatConsoleTable(args[0], args[1], node)
+    const prefix = name === "warn" ? "[warn] " : name === "error" ? "[error] " : name === "debug" ? "[debug] " : ""
+    return `${prefix}${args.map((arg) => this.formatConsoleArgument(arg)).join(" ")}`
+  }
+
+  // Console arguments format deeply and totally: values render as a debugger would show them
+  // rather than as boundary JSON - numbers keep NaN/Infinity (JSON would say null), sandbox
+  // values keep their friendly forms at ANY depth (ISO date, /regex/flags, Map(n) [...],
+  // Set(n) [...]), opaque runtime references become "[CodeMode reference]" markers in place,
+  // and plain objects/arrays render JSON-style. Formatting never fails the program: cycles
+  // render "[Circular]" and extreme depth degrades to "...".
+  private formatConsoleArgument(value: unknown): string {
+    if (value === undefined) return "undefined"
+    // A top-level string prints bare; nested strings are JSON-quoted (see formatConsoleValue).
+    if (typeof value === "string") return value
+    return this.formatConsoleValue(value, new Set(), 0)
+  }
+
+  private formatConsoleValue(value: unknown, seen: Set<object>, depth: number): string {
+    // Nested undefined renders as null, matching what JSON boundary output would show.
+    if (value === null || value === undefined) return "null"
+    if (typeof value === "string") return JSON.stringify(value)
+    // String(value) keeps NaN/Infinity/-Infinity readable; finite numbers match their JSON form.
+    if (typeof value === "number" || typeof value === "boolean") return String(value)
+    if (typeof value !== "object") return String(value)
+    if (value instanceof SandboxPromise) return "[Promise (await it to get its value)]"
+    if (value instanceof SandboxDate) return coerceToString(value)
+    if (value instanceof SandboxRegExp) return coerceToString(value)
+    if (depth > MAX_CONSOLE_DEPTH) return "..."
+    if (seen.has(value)) return "[Circular]"
+    if (value instanceof SandboxMap) {
+      seen.add(value)
+      try {
+        const entries = Array.from(value.map.entries(), ([key, item]): Array<unknown> => [key, item])
+        return `Map(${value.map.size}) ${this.formatConsoleValue(entries, seen, depth + 1)}`
+      } finally {
+        seen.delete(value)
+      }
+    }
+    if (value instanceof SandboxSet) {
+      seen.add(value)
+      try {
+        return `Set(${value.set.size}) ${this.formatConsoleValue(Array.from(value.set.values()), seen, depth + 1)}`
+      } finally {
+        seen.delete(value)
+      }
+    }
+    if (isRuntimeReference(value)) return "[CodeMode reference]"
+    seen.add(value)
+    try {
+      if (Array.isArray(value)) {
+        return `[${value.map((item) => this.formatConsoleValue(item, seen, depth + 1)).join(",")}]`
+      }
+      return `{${Object.entries(value)
+        .map(([key, item]) => `${JSON.stringify(key)}:${this.formatConsoleValue(item, seen, depth + 1)}`)
+        .join(",")}}`
+    } finally {
+      seen.delete(value)
+    }
+  }
+
+  private formatConsoleTable(value: unknown, columnsArgument: unknown, node: AstNode): string {
+    if (value === undefined) return "undefined"
+    // Sandbox values are legitimate table data (cells render their friendly forms); only
+    // truly opaque references (functions, tools, promises) collapse to the marker.
+    if (containsOpaqueReference(value)) return "[CodeMode reference]"
+    const data = boundedData(value, "console.table argument")
+    const columns = this.consoleTableColumns(columnsArgument, node)
+    const rows = this.consoleTableRows(data, columns)
+    const keys = columns ?? Array.from(new Set(rows.flatMap((row) => Object.keys(row.values))))
+    const header = ["(index)", ...keys].join("\t")
+    return [
+      header,
+      ...rows.map((row) => [row.index, ...keys.map((key) => this.formatConsoleTableCell(row.values[key]))].join("\t")),
+    ].join("\n")
+  }
+
+  private consoleTableColumns(value: unknown, node: AstNode): ReadonlyArray<string> | undefined {
+    if (value === undefined) return undefined
+    if (containsRuntimeReference(value)) return undefined
+    const columns = copyOut(copyIn(value, "console.table columns"), true)
+    return Array.isArray(columns) ? columns.map((column) => String(column)) : undefined
+  }
+
+  private consoleTableRows(
+    data: unknown,
+    columns: ReadonlyArray<string> | undefined,
+  ): Array<{ readonly index: string; readonly values: Record<string, unknown> }> {
+    if (Array.isArray(data)) {
+      return data.map((item, index) => ({ index: String(index), values: this.consoleTableValues(item, columns) }))
+    }
+    if (data !== null && typeof data === "object" && !isSandboxValue(data)) {
+      return Object.entries(data).map(([index, item]) => ({ index, values: this.consoleTableValues(item, columns) }))
+    }
+    return [{ index: "0", values: { Value: data } }]
+  }
+
+  private consoleTableValues(value: unknown, columns: ReadonlyArray<string> | undefined): Record<string, unknown> {
+    if (value !== null && typeof value === "object" && !Array.isArray(value) && !isSandboxValue(value)) {
+      const source = value as Record<string, unknown>
+      if (columns !== undefined) return Object.fromEntries(columns.map((column) => [column, source[column]]))
+      return Object.fromEntries(Object.entries(source))
+    }
+    return { Value: value }
+  }
+
+  private formatConsoleTableCell(value: unknown): string {
+    if (value === undefined) return ""
+    if (typeof value === "string") return value
+    return this.formatConsoleValue(value, new Set(), 0)
+  }
+
+  private evaluateCallArguments(argNodes: Array<unknown>): Effect.Effect<Array<unknown>, unknown, R> {
+    const self = this
+    return Effect.gen(function* () {
+      const args: Array<unknown> = []
+      for (const [index, arg] of argNodes.entries()) {
+        const argNode = asNode(arg, `arguments[${index}]`)
+        if (argNode.type === "SpreadElement") {
+          const spread = yield* self.evaluateExpression(getNode(argNode, "argument"))
+          const items = spreadItems(spread)
+          if (items === undefined)
+            throw new InterpreterRuntimeError(
+              "Spread arguments require an array, string, Map, or Set in CodeMode.",
+              argNode,
+            )
+          args.push(...items)
+        } else {
+          args.push(yield* self.evaluateExpression(argNode))
+        }
+      }
+      return args
+    })
+  }
+
+  // Promise.* over ordinary runtime values. Combinators accept ANY array (or spreadable
+  // collection) mixing promise values and plain data - built inline, beforehand, via spread,
+  // whatever - because tool calls already run eagerly on their own fibers; the combinators
+  // only observe settlements. Joining is therefore sequential (no extra fibers) without
+  // costing parallelism, and the concurrency cap stays where the work is: the fork semaphore.
+  private invokePromiseMethod(
+    ref: PromiseMethodReference,
+    args: Array<unknown>,
+    node: AstNode,
+  ): Effect.Effect<unknown, unknown, R> {
+    const self = this
+    if (ref.name === "resolve") {
+      // Promise.resolve of a promise is that promise (JS flattens); anything else is a
+      // promise already fulfilled with the value.
+      const value = args[0]
+      return Effect.succeed(
+        value instanceof SandboxPromise ? value : new SandboxPromise(undefined, Effect.succeed(value)),
+      )
+    }
+    if (ref.name === "reject") {
+      return Effect.sync(() => new SandboxPromise(undefined, Effect.fail(new ProgramThrow(args[0]))))
+    }
+
+    const items = Array.isArray(args[0]) ? args[0] : spreadItems(args[0])
+    if (items === undefined) {
+      throw new InterpreterRuntimeError(
+        `Promise.${ref.name} expects an array of promises or plain values (e.g. Promise.${ref.name}(items.map((item) => tools.ns.tool(item)))).`,
+        node,
+      )
+    }
+
+    switch (ref.name) {
+      case "all": {
+        // Mark every promise element observed up-front (Promise.all handles all of its
+        // members' failures, as in JS), then join in index order; the first failure rejects
+        // the whole call while unrelated in-flight members keep running.
+        const settles = items.map((item) =>
+          item instanceof SandboxPromise ? this.settlePromise(item, node) : Effect.succeed(item),
+        )
+        return Effect.gen(function* () {
+          const values: Array<unknown> = []
+          for (const settle of settles) values.push(yield* settle)
+          return values
+        })
+      }
+      case "allSettled": {
+        const observations = items.map((item) =>
+          item instanceof SandboxPromise
+            ? Effect.map(this.observePromise(item), (exit) => ({ promise: item as SandboxPromise | undefined, exit }))
+            : Effect.succeed({ promise: undefined as SandboxPromise | undefined, exit: Exit.succeed(item as unknown) }),
+        )
+        return Effect.gen(function* () {
+          const outcomes: Array<unknown> = []
+          for (const observation of observations) {
+            const { exit, promise } = yield* observation
+            if (Exit.isSuccess(exit)) {
+              outcomes.push(
+                Object.assign(Object.create(null) as SafeObject, { status: "fulfilled", value: exit.value }),
+              )
+              continue
+            }
+            const raceInterrupted = promise?.interrupted === true && Cause.hasInterruptsOnly(exit.cause)
+            if (Cause.hasInterruptsOnly(exit.cause) && !raceInterrupted) {
+              // Execution teardown (timeout/host interruption), not a program-level rejection.
+              return yield* Effect.failCause(exit.cause)
+            }
+            const thrown = raceInterrupted
+              ? new InterpreterRuntimeError(
+                  "This tool call was interrupted because another value settled a Promise.race first.",
+                  node,
+                )
+              : Cause.squash(exit.cause)
+            outcomes.push(
+              Object.assign(Object.create(null) as SafeObject, {
+                status: "rejected",
+                reason: caughtErrorValue(thrown),
+              }),
+            )
+          }
+          return outcomes
+        })
+      }
+      case "race": {
+        if (items.length === 0) {
+          throw new InterpreterRuntimeError(
+            "Promise.race([]) would never settle; provide at least one promise or value.",
+            node,
+          )
+        }
+        const observations = items.map((item, index) =>
+          item instanceof SandboxPromise
+            ? Effect.map(this.observePromise(item), (exit) => ({ index, exit }))
+            : Effect.succeed({ index, exit: Exit.succeed(item as unknown) }),
+        )
+        return Effect.gen(function* () {
+          // First settlement (fulfilled OR rejected) wins; the observations never fail, so
+          // racing them yields exactly that. Losing in-flight calls are then interrupted.
+          const winner = yield* Effect.raceAll(observations)
+          for (const [index, item] of items.entries()) {
+            if (index === winner.index || !(item instanceof SandboxPromise) || item.fiber === undefined) continue
+            item.interrupted = true
+            yield* Fiber.interrupt(item.fiber)
+          }
+          const winningItem = items[winner.index]
+          return yield* self.unwrapPromiseExit(
+            winningItem instanceof SandboxPromise ? winningItem : undefined,
+            winner.exit,
+            node,
+          )
+        })
+      }
+    }
+  }
+
+  private invokeFunction(fn: CodeModeFunction, args: Array<unknown>): Effect.Effect<unknown, unknown, R> {
+    const self = this
+    return Effect.suspend(() => {
+      const savedScopes = self.scopes
+      self.scopes = [...fn.capturedScopes, new Map<string, Binding>()]
+      const run = Effect.gen(function* () {
+        // Seed every parameter name into the scope as a TDZ slot first, so a default that
+        // references another parameter resolves to that (uninitialized) param rather than
+        // silently falling through to an outer binding of the same name - matching JS.
+        const paramScope = self.currentScope()
+        for (const parameter of fn.parameters) {
+          for (const name of collectPatternNames(parameter)) {
+            paramScope.set(name, { mutable: true, value: undefined, initialized: false })
+          }
+        }
+        for (const [index, parameter] of fn.parameters.entries()) {
+          if (parameter.type === "RestElement") {
+            yield* self.declarePattern(getNode(parameter, "argument"), args.slice(index), true, parameter)
+            break
+          }
+          yield* self.declarePattern(parameter, args[index], true, parameter)
+        }
+
+        if (fn.body.type === "BlockStatement") {
+          const result = yield* self.evaluateStatement(fn.body)
+          return result.kind === "return" || result.kind === "value" ? result.value : undefined
+        }
+
+        return yield* self.evaluateExpression(fn.body)
+      })
+      return run.pipe(
+        Effect.ensuring(
+          Effect.sync(() => {
+            self.scopes = savedScopes
+          }),
+        ),
+      )
+    })
+  }
+
+  private invokeIntrinsic(
+    ref: IntrinsicReference,
+    args: Array<unknown>,
+    node: AstNode,
+  ): Effect.Effect<unknown, unknown, R> {
+    if (typeof ref.receiver === "string") {
+      return Effect.succeed(invokeStringMethod(ref.receiver, ref.name, args, node))
+    }
+    if (typeof ref.receiver === "number") {
+      return Effect.succeed(invokeNumberMethod(ref.receiver, ref.name, args, node))
+    }
+    if (Array.isArray(ref.receiver)) {
+      return this.invokeArrayMethod(ref.receiver, ref.name, args, node)
+    }
+    if (ref.receiver instanceof SandboxDate) {
+      return Effect.succeed(invokeDateMethod(ref.receiver, ref.name, node))
+    }
+    if (ref.receiver instanceof SandboxRegExp) {
+      return Effect.succeed(invokeRegExpMethod(ref.receiver, ref.name, args, node))
+    }
+    if (ref.receiver instanceof SandboxMap) {
+      return this.invokeMapMethod(ref.receiver, ref.name, args, node)
+    }
+    if (ref.receiver instanceof SandboxSet) {
+      return this.invokeSetMethod(ref.receiver, ref.name, args, node)
+    }
+    throw new InterpreterRuntimeError(`Method '${ref.name}' is not available in CodeMode.`, node)
+  }
+
+  // Runs a Map/Set callback (forEach) accepting a user function or a builtin coercion,
+  // mirroring the array-method callback contract.
+  private applyCollectionCallback(
+    callback: unknown,
+    name: string,
+    node: AstNode,
+  ): (args: Array<unknown>) => Effect.Effect<unknown, unknown, R> {
+    if (!(callback instanceof CodeModeFunction) && !(callback instanceof CoercionFunction)) {
+      throw new InterpreterRuntimeError(`${name} expects a function callback.`, node)
+    }
+    return (callbackArgs) =>
+      callback instanceof CoercionFunction
+        ? Effect.succeed(invokeCoercion(callback, callbackArgs, node))
+        : this.invokeFunction(callback, callbackArgs)
+  }
+
+  private invokeMapMethod(
+    target: SandboxMap,
+    name: string,
+    args: Array<unknown>,
+    node: AstNode,
+  ): Effect.Effect<unknown, unknown, R> {
+    switch (name) {
+      case "get":
+        return Effect.succeed(target.map.get(args[0]))
+      case "has":
+        return Effect.succeed(target.map.has(args[0]))
+      case "set":
+        return Effect.sync(() => {
+          target.map.set(args[0], args[1])
+          return target
+        })
+      case "delete":
+        return Effect.sync(() => target.map.delete(args[0]))
+      case "clear":
+        return Effect.sync(() => {
+          target.map.clear()
+          return undefined
+        })
+      case "keys":
+        return Effect.sync(() => Array.from(target.map.keys()))
+      case "values":
+        return Effect.sync(() => Array.from(target.map.values()))
+      case "entries":
+        return Effect.sync(() => Array.from(target.map.entries(), ([key, item]): Array<unknown> => [key, item]))
+      case "forEach": {
+        const apply = this.applyCollectionCallback(args[0], "Map.forEach", node)
+        return Effect.gen(function* () {
+          // Snapshot iteration, matching the array-method callback contract.
+          for (const [key, item] of Array.from(target.map.entries())) yield* apply([item, key, target])
+          return undefined
+        })
+      }
+      default:
+        throw new InterpreterRuntimeError(`Map method '${name}' is not available in CodeMode.`, node)
+    }
+  }
+
+  private invokeSetMethod(
+    target: SandboxSet,
+    name: string,
+    args: Array<unknown>,
+    node: AstNode,
+  ): Effect.Effect<unknown, unknown, R> {
+    switch (name) {
+      case "has":
+        return Effect.succeed(target.set.has(args[0]))
+      case "add":
+        return Effect.sync(() => {
+          target.set.add(args[0])
+          return target
+        })
+      case "delete":
+        return Effect.sync(() => target.set.delete(args[0]))
+      case "clear":
+        return Effect.sync(() => {
+          target.set.clear()
+          return undefined
+        })
+      case "keys":
+      case "values":
+        return Effect.sync(() => Array.from(target.set.values()))
+      case "entries":
+        return Effect.sync(() => Array.from(target.set.values(), (item): Array<unknown> => [item, item]))
+      case "forEach": {
+        const apply = this.applyCollectionCallback(args[0], "Set.forEach", node)
+        return Effect.gen(function* () {
+          for (const item of Array.from(target.set.values())) yield* apply([item, item, target])
+          return undefined
+        })
+      }
+      default:
+        throw new InterpreterRuntimeError(`Set method '${name}' is not available in CodeMode.`, node)
+    }
+  }
+
+  private invokeArrayMethod(
+    target: Array<unknown>,
+    name: string,
+    args: Array<unknown>,
+    node: AstNode,
+  ): Effect.Effect<unknown, unknown, R> {
+    const optNumber = (value: unknown, label: string): number | undefined => {
+      if (value === undefined) return undefined
+      if (typeof value !== "number")
+        throw new InterpreterRuntimeError(`Array.${name} expects ${label} to be a number.`, node)
+      return value
+    }
+    switch (name) {
+      case "join": {
+        if (args.length > 1 || (args.length === 1 && typeof args[0] !== "string")) {
+          throw new InterpreterRuntimeError("Array.join expects zero arguments or one string separator.", node)
+        }
+        const input = boundedData(target, "Array.join input") as Array<unknown>
+        return Effect.succeed(
+          input.map((item) => coerceToString(item ?? "")).join(args.length === 0 ? "," : (args[0] as string)),
+        )
+      }
+      case "includes":
+        if (args.length === 0 || args.length > 2)
+          throw new InterpreterRuntimeError("Array.includes expects a value and optional start index.", node)
+        return Effect.succeed(target.includes(args[0], optNumber(args[1], "start index")))
+      case "indexOf":
+        return Effect.succeed(target.indexOf(args[0], optNumber(args[1], "start index")))
+      case "lastIndexOf":
+        return Effect.succeed(
+          args[1] === undefined
+            ? target.lastIndexOf(args[0])
+            : target.lastIndexOf(args[0], optNumber(args[1], "start index")),
+        )
+      case "at":
+        return Effect.succeed(target.at(optNumber(args[0], "index") ?? 0))
+      case "slice":
+        return Effect.succeed(target.slice(optNumber(args[0], "start"), optNumber(args[1], "end")))
+      case "concat":
+        return Effect.succeed(target.concat(...args))
+      case "flat":
+        return Effect.succeed(target.flat(optNumber(args[0], "depth") ?? 1))
+      case "reverse":
+        return Effect.succeed([...target].reverse())
+      case "sort":
+      case "toSorted":
+        return this.sortArray(target, args[0], node)
+      case "toReversed":
+        return Effect.succeed([...target].reverse())
+      case "with": {
+        const index = optNumber(args[0], "index") ?? 0
+        const resolved = index < 0 ? target.length + index : index
+        if (resolved < 0 || resolved >= target.length) {
+          throw new InterpreterRuntimeError("Array.with index is out of range.", node)
+        }
+        const copied = [...target]
+        copied[resolved] = args[1]
+        return Effect.succeed(copied)
+      }
+      case "push": {
+        // Validate before mutating (so no rollback is needed): inserting a container into
+        // itself would create a cycle no later walk could survive.
+        for (const item of args) this.rejectCircularInsertion(target, item, "Array.push result", node)
+        target.push(...args)
+        return Effect.succeed(target.length)
+      }
+      case "unshift": {
+        for (const item of args) this.rejectCircularInsertion(target, item, "Array.unshift result", node)
+        target.unshift(...args)
+        return Effect.succeed(target.length)
+      }
+      case "pop":
+        return Effect.succeed(target.pop())
+      case "shift":
+        return Effect.succeed(target.shift())
+      case "splice": {
+        // Mutates in place and returns the removed elements, exactly like JS: one argument
+        // removes to the end, an undefined delete count removes nothing.
+        if (args.length === 0) return Effect.succeed(target.splice(0, 0))
+        const start = optNumber(args[0], "start") ?? 0
+        if (args.length === 1) return Effect.succeed(target.splice(start))
+        const deleteCount = optNumber(args[1], "delete count") ?? 0
+        const inserted = args.slice(2)
+        for (const item of inserted) this.rejectCircularInsertion(target, item, "Array.splice result", node)
+        return Effect.succeed(target.splice(start, deleteCount, ...inserted))
+      }
+      case "fill": {
+        this.rejectCircularInsertion(target, args[0], "Array.fill result", node)
+        return Effect.succeed(target.fill(args[0], optNumber(args[1], "start"), optNumber(args[2], "end")))
+      }
+      case "copyWithin":
+        return Effect.succeed(
+          target.copyWithin(
+            optNumber(args[0], "target index") ?? 0,
+            optNumber(args[1], "start") ?? 0,
+            optNumber(args[2], "end"),
+          ),
+        )
+      // keys/values/entries return arrays (not iterators), matching the Map/Set convention;
+      // they work with for...of and spread either way.
+      case "keys":
+        return Effect.succeed(Array.from(target.keys()))
+      case "values":
+        return Effect.succeed([...target])
+      case "entries":
+        return Effect.succeed(Array.from(target.entries(), ([index, item]): Array<unknown> => [index, item]))
+    }
+
+    const callback = args[0]
+    if (!(callback instanceof CodeModeFunction) && !(callback instanceof CoercionFunction)) {
+      throw new InterpreterRuntimeError(`Array.${name} expects a function callback.`, node)
+    }
+    const self = this
+    // Accept a user arrow function or a builtin coercion callable (Boolean/String/Number), so the
+    // idioms `filter(Boolean)` / `map(String)` / `map(Number)` work as in JS. Coercions are
+    // synchronous; only CodeModeFunctions can await tool calls.
+    const apply = (callbackArgs: Array<unknown>): Effect.Effect<unknown, unknown, R> =>
+      callback instanceof CoercionFunction
+        ? Effect.succeed(invokeCoercion(callback, callbackArgs, node))
+        : self.invokeFunction(callback, callbackArgs)
+    return Effect.gen(function* () {
+      // Iterate a snapshot taken at call time so a callback that mutates the array can't
+      // self-extend the loop - matching JS, where elements appended during iteration are not visited.
+      const items = target.slice()
+      switch (name) {
+        case "map": {
+          const values: Array<unknown> = []
+          for (const [index, item] of items.entries()) values.push(yield* apply([item, index, items]))
+          return values
+        }
+        case "flatMap": {
+          const values: Array<unknown> = []
+          for (const [index, item] of items.entries()) {
+            const mapped = yield* apply([item, index, items])
+            if (Array.isArray(mapped)) values.push(...mapped)
+            else values.push(mapped)
+          }
+          return values
+        }
+        case "filter": {
+          const values: Array<unknown> = []
+          for (const [index, item] of items.entries()) {
+            if (yield* apply([item, index, items])) values.push(item)
+          }
+          return values
+        }
+        case "find":
+          for (const [index, item] of items.entries()) {
+            if (yield* apply([item, index, items])) return item
+          }
+          return undefined
+        case "findIndex":
+          for (const [index, item] of items.entries()) {
+            if (yield* apply([item, index, items])) return index
+          }
+          return -1
+        case "some":
+          for (const [index, item] of items.entries()) {
+            if (yield* apply([item, index, items])) return true
+          }
+          return false
+        case "every":
+          for (const [index, item] of items.entries()) {
+            if (!(yield* apply([item, index, items]))) return false
+          }
+          return true
+        case "forEach":
+          for (const [index, item] of items.entries()) yield* apply([item, index, items])
+          return undefined
+        case "reduce": {
+          let accumulator: unknown
+          let start: number
+          if (args.length >= 2) {
+            accumulator = args[1]
+            start = 0
+          } else {
+            if (items.length === 0)
+              throw new InterpreterRuntimeError("Array.reduce of an empty array with no initial value.", node)
+            accumulator = items[0]
+            start = 1
+          }
+          for (let index = start; index < items.length; index += 1) {
+            accumulator = yield* apply([accumulator, items[index], index, items])
+          }
+          return accumulator
+        }
+        case "reduceRight": {
+          let accumulator: unknown
+          let start: number
+          if (args.length >= 2) {
+            accumulator = args[1]
+            start = items.length - 1
+          } else {
+            if (items.length === 0)
+              throw new InterpreterRuntimeError("Array.reduceRight of an empty array with no initial value.", node)
+            accumulator = items[items.length - 1]
+            start = items.length - 2
+          }
+          for (let index = start; index >= 0; index -= 1) {
+            accumulator = yield* apply([accumulator, items[index], index, items])
+          }
+          return accumulator
+        }
+        case "findLast":
+          for (let index = items.length - 1; index >= 0; index -= 1) {
+            if (yield* apply([items[index], index, items])) return items[index]
+          }
+          return undefined
+        case "findLastIndex":
+          for (let index = items.length - 1; index >= 0; index -= 1) {
+            if (yield* apply([items[index], index, items])) return index
+          }
+          return -1
+      }
+      throw new InterpreterRuntimeError(`Array method '${name}' is not available in CodeMode.`, node)
+    })
+  }
+
+  private sortArray(
+    target: Array<unknown>,
+    comparator: unknown,
+    node: AstNode,
+  ): Effect.Effect<Array<unknown>, unknown, R> {
+    if (comparator !== undefined && !(comparator instanceof CodeModeFunction)) {
+      throw new InterpreterRuntimeError("Array.sort expects an arrow function comparator.", node)
+    }
+    if (!(comparator instanceof CodeModeFunction)) {
+      return Effect.sync(() =>
+        [...target].sort((a, b) => {
+          const left = coerceToString(a)
+          const right = coerceToString(b)
+          return left < right ? -1 : left > right ? 1 : 0
+        }),
+      )
+    }
+    const self = this
+    const mergeSort = (items: Array<unknown>): Effect.Effect<Array<unknown>, unknown, R> => {
+      if (items.length <= 1) return Effect.succeed(items)
+      const midpoint = Math.floor(items.length / 2)
+      return Effect.gen(function* () {
+        const left = yield* mergeSort(items.slice(0, midpoint))
+        const right = yield* mergeSort(items.slice(midpoint))
+        const merged: Array<unknown> = []
+        let leftIndex = 0
+        let rightIndex = 0
+        while (leftIndex < left.length && rightIndex < right.length) {
+          // Coerce the comparator's result like JS ToNumber (data objects -> NaN, never a host
+          // crash) and treat NaN as 0 - the spec's "no consistent order" -> keep the left element.
+          const order = coerceToNumber(yield* self.invokeFunction(comparator, [left[leftIndex], right[rightIndex]]))
+          if (Number.isNaN(order) || order <= 0) merged.push(left[leftIndex++])
+          else merged.push(right[rightIndex++])
+        }
+        return [...merged, ...left.slice(leftIndex), ...right.slice(rightIndex)]
+      })
+    }
+    // Per spec, undefined elements sort to the end and the comparator is never called on them.
+    const defined = target.filter((item) => item !== undefined)
+    const undefinedCount = target.length - defined.length
+    return Effect.map(mergeSort(defined), (items) => [...items, ...Array(undefinedCount).fill(undefined)])
+  }
+
+  private evaluateObjectExpression(node: AstNode): Effect.Effect<Record<string, unknown>, unknown, R> {
+    const objectValue: Record<string, unknown> = Object.create(null) as Record<string, unknown>
+    const properties = getArray(node, "properties")
+    const self = this
+    return Effect.gen(function* () {
+      for (const propertyValue of properties) {
+        const property = asNode(propertyValue, "properties")
+
+        if (property.type === "SpreadElement") {
+          const spread = yield* self.evaluateExpression(getNode(property, "argument"))
+          // JS treats `{ ...null }` / `{ ...undefined }` as a no-op, so the common
+          // `{ ...maybeOpts, override }` merge works when the operand is absent. Sandbox values
+          // (Date/RegExp/Map/Set) have no own enumerable properties in JS, so they are no-ops too.
+          if (spread === null || spread === undefined || isSandboxValue(spread)) continue
+          if (typeof spread !== "object" || Array.isArray(spread) || isRuntimeReference(spread)) {
+            throw new InterpreterRuntimeError(
+              "Object spread requires a data object in CodeMode.",
+              property,
+              "InvalidDataValue",
+            )
+          }
+          for (const [key, value] of Object.entries(spread)) {
+            if (isBlockedMember(key))
+              throw new InterpreterRuntimeError(`Property '${key}' is not available in CodeMode.`, property)
+            objectValue[key] = value
+          }
+          continue
+        }
+
+        if (property.type !== "Property") {
+          throw new InterpreterRuntimeError("Only standard object properties are supported.", property)
+        }
+
+        if (getString(property, "kind") !== "init") {
+          throw new InterpreterRuntimeError("Only init object properties are supported.", property)
+        }
+
+        const keyNode = getNode(property, "key")
+        const valueNode = getNode(property, "value")
+        const computed = getBoolean(property, "computed")
+
+        let key: PropertyKey
+
+        if (computed) {
+          key = self.toPropertyKey(yield* self.evaluateExpression(keyNode), keyNode)
+        } else if (keyNode.type === "Identifier") {
+          key = getString(keyNode, "name")
+        } else if (keyNode.type === "Literal") {
+          key = self.toPropertyKey(keyNode.value, keyNode)
+        } else {
+          throw new InterpreterRuntimeError("Unsupported object property key shape.", keyNode)
+        }
+
+        if (isBlockedMember(String(key))) {
+          throw new InterpreterRuntimeError(`Property '${String(key)}' is not available in CodeMode.`, keyNode)
+        }
+        objectValue[String(key)] = yield* self.evaluateExpression(valueNode)
+      }
+
+      return objectValue
+    })
+  }
+
+  private evaluateArrayExpression(node: AstNode): Effect.Effect<Array<unknown>, unknown, R> {
+    const elements = getArray(node, "elements")
+    const values: Array<unknown> = []
+
+    const self = this
+    return Effect.gen(function* () {
+      for (const elementValue of elements) {
+        if (elementValue === null) {
+          values.push(undefined)
+          continue
+        }
+        const element = asNode(elementValue, "elements")
+        if (element.type === "SpreadElement") {
+          const spread = yield* self.evaluateExpression(getNode(element, "argument"))
+          const items = spreadItems(spread)
+          if (items === undefined)
+            throw new InterpreterRuntimeError(
+              "Array spread requires an array, string, Map, or Set in CodeMode.",
+              element,
+            )
+          values.push(...items)
+        } else {
+          values.push(yield* self.evaluateExpression(element))
+        }
+      }
+      return values
+    })
+  }
+
+  private evaluateTemplateLiteral(node: AstNode): Effect.Effect<string, unknown, R> {
+    const quasis = getArray(node, "quasis")
+    const expressions = getArray(node, "expressions")
+
+    let output = ""
+
+    const self = this
+    return Effect.gen(function* () {
+      for (let index = 0; index < quasis.length; index += 1) {
+        const quasi = asNode(quasis[index], "quasis")
+        const rawValue = quasi.value
+
+        if (!isRecord(rawValue) || typeof rawValue.cooked !== "string") {
+          throw new InterpreterRuntimeError("Invalid template literal quasi.", quasi)
+        }
+
+        output += rawValue.cooked
+
+        if (index < expressions.length) {
+          const raw = yield* self.evaluateExpression(asNode(expressions[index], "expressions"))
+          // The preserving checkpoint keeps sandbox values intact, so coerceToString renders
+          // them directly (ISO date, /regex/ literal form) instead of a JSON-serialized husk.
+          output += coerceToString(boundedData(raw, "Template interpolation"))
+        }
+      }
+
+      return output
+    })
+  }
+
+  private evaluateConditionalExpression(node: AstNode): Effect.Effect<unknown, unknown, R> {
+    return Effect.flatMap(this.evaluateExpression(getNode(node, "test")), (test) =>
+      this.evaluateExpression(getNode(node, test ? "consequent" : "alternate")),
+    )
+  }
+
+  private applyCompoundAssignment(operator: string, current: unknown, incoming: unknown, node: AstNode): unknown {
+    // `x op= y` is `x = x op y`: dispatch through the shared binary operator implementation
+    // so compound assignment inherits the same coercion semantics (Dates, data objects, ...).
+    // Only the arithmetic/bitwise operators are compoundable; logical assignments (&&=/||=/??=)
+    // short-circuit and are handled by evaluateLogicalAssignment before reaching here.
+    if (!compoundOperators.has(operator)) {
+      throw new InterpreterRuntimeError(`Unsupported assignment operator '${operator}'.`, node)
+    }
+    return this.applyBinaryOperator(operator.slice(0, -1), current, incoming, node)
+  }
+
+  private getMemberReference(
+    node: AstNode,
+  ): Effect.Effect<
+    | MemberReference
+    | ToolReference
+    | PromiseMethodReference
+    | IntrinsicReference
+    | GlobalMethodReference
+    | ComputedValue
+    | typeof OptionalShortCircuit
+    | undefined,
+    unknown,
+    R
+  > {
+    const objectNode = getNode(node, "object")
+    const propertyNode = getNode(node, "property")
+    const computed = getBoolean(node, "computed")
+    const optional = node.optional === true
+    const self = this
+    return Effect.gen(function* () {
+      const objectValue = yield* self.evaluateExpression(objectNode)
+      if (objectValue === OptionalShortCircuit) return OptionalShortCircuit
+      if ((objectValue === null || objectValue === undefined) && optional) return OptionalShortCircuit
+
+      const key = computed
+        ? self.toPropertyKey(yield* self.evaluateExpression(propertyNode), propertyNode)
+        : propertyNode.type === "Identifier"
+          ? getString(propertyNode, "name")
+          : self.toPropertyKey(yield* self.evaluateExpression(propertyNode), propertyNode)
+
+      if (objectValue instanceof ToolReference) {
+        if (typeof key !== "string" || isBlockedMember(key)) {
+          throw new InterpreterRuntimeError("Tool paths must use safe string property names.", propertyNode)
+        }
+        return new ToolReference([...objectValue.path, key])
+      }
+
+      if (objectValue instanceof PromiseNamespace) {
+        if (typeof key === "string" && promiseStatics.has(key as PromiseMethodName)) {
+          return new PromiseMethodReference(key as PromiseMethodName)
+        }
+        throw new InterpreterRuntimeError(
+          `Promise.${String(key)} is not available in CodeMode. Available: Promise.all, Promise.allSettled, Promise.race, Promise.resolve, and Promise.reject; consume promises with await.`,
+          propertyNode,
+        )
+      }
+
+      if (objectValue instanceof GlobalNamespace) {
+        if (typeof key !== "string" || isBlockedMember(key)) {
+          throw new InterpreterRuntimeError(
+            `${objectValue.name}.${String(key)} is not available in CodeMode.`,
+            propertyNode,
+          )
+        }
+        if (objectValue.name === "Math" && mathConstants.has(key)) {
+          return new ComputedValue((Math as unknown as Record<string, number>)[key])
+        }
+        return new GlobalMethodReference(objectValue.name, key)
+      }
+
+      if (typeof objectValue === "string") {
+        if (key === "length") return new ComputedValue(objectValue.length)
+        if (typeof key === "number") return new ComputedValue(objectValue[key])
+        if (typeof key === "string" && /^\d+$/.test(key)) return new ComputedValue(objectValue[Number(key)])
+        if (typeof key === "string" && stringMethods.has(key)) return new IntrinsicReference(objectValue, key)
+        // Unknown property on a string reads as `undefined`, matching JS (`"x".foo === undefined`),
+        // instead of throwing - so defensive access like `result?.login ?? result` on a JSON-string
+        // tool result doesn't crash. (Optional chaining only guards null/undefined receivers, so a
+        // real string still reaches here.) Only the method allowlist above yields callables.
+        return new ComputedValue(undefined)
+      }
+
+      if (typeof objectValue === "number") {
+        if (typeof key === "string" && numberMethods.has(key)) return new IntrinsicReference(objectValue, key)
+        // Unknown property on a number reads as `undefined`, matching JS, rather than throwing.
+        return new ComputedValue(undefined)
+      }
+
+      // Number / String expose a small allowlist of statics; everything else stays opaque.
+      if (objectValue instanceof CoercionFunction && typeof key === "string" && !isBlockedMember(key)) {
+        if (objectValue.name === "Number" && numberConstants.has(key)) {
+          return new ComputedValue((Number as unknown as Record<string, number>)[key])
+        }
+        if (objectValue.name === "Number" && numberStatics.has(key)) return new GlobalMethodReference("Number", key)
+        if (objectValue.name === "String" && stringStatics.has(key)) return new GlobalMethodReference("String", key)
+      }
+
+      // Sandbox value types expose their method/property allowlists; any other key reads as
+      // `undefined`, consistent with unknown-property reads on strings/numbers/arrays.
+      if (objectValue instanceof SandboxDate) {
+        if (typeof key === "string" && dateMethods.has(key)) return new IntrinsicReference(objectValue, key)
+        return new ComputedValue(undefined)
+      }
+      if (objectValue instanceof SandboxRegExp) {
+        if (typeof key === "string" && regexpProperties.has(key)) {
+          return new ComputedValue((objectValue.regex as unknown as Record<string, unknown>)[key])
+        }
+        if (typeof key === "string" && regexpMethods.has(key)) return new IntrinsicReference(objectValue, key)
+        return new ComputedValue(undefined)
+      }
+      if (objectValue instanceof SandboxMap) {
+        if (key === "size") return new ComputedValue(objectValue.map.size)
+        if (typeof key === "string" && mapMethods.has(key)) return new IntrinsicReference(objectValue, key)
+        return new ComputedValue(undefined)
+      }
+      if (objectValue instanceof SandboxSet) {
+        if (key === "size") return new ComputedValue(objectValue.set.size)
+        if (typeof key === "string" && setMethods.has(key)) return new IntrinsicReference(objectValue, key)
+        return new ComputedValue(undefined)
+      }
+
+      // Any property access on a promise is a confused program (`p.then(...)`, `p.value`);
+      // reading `undefined` here would hide the missing await, so both paths get an explicit,
+      // await-hinting error instead of the forgiving unknown-property fallthrough.
+      if (objectValue instanceof SandboxPromise) {
+        if (key === "then" || key === "catch" || key === "finally") {
+          throw new InterpreterRuntimeError(
+            `Promise.prototype.${String(key)} is not supported in CodeMode; use await instead (with try/catch to handle failures) - e.g. \`const result = await tools.ns.tool(...)\`.`,
+            propertyNode,
+            "UnsupportedSyntax",
+            [supportedSyntaxMessage],
+          )
+        }
+        throw new InterpreterRuntimeError(
+          "This value is an un-awaited Promise and has no readable properties; await it first - e.g. `const result = await tools.ns.tool(...)`.",
+          objectNode,
+          "InvalidDataValue",
+        )
+      }
+
+      if (isRuntimeReference(objectValue)) {
+        throw new InterpreterRuntimeError(
+          "CodeMode runtime references are opaque and do not expose properties.",
+          objectNode,
+          "InvalidDataValue",
+        )
+      }
+
+      if (typeof objectValue !== "object" || objectValue === null) {
+        throw new InterpreterRuntimeError("Cannot access a property on a non-object value.", objectNode)
+      }
+
+      if (typeof key === "string" && isBlockedMember(key)) {
+        throw new InterpreterRuntimeError(`Property '${key}' is not available in CodeMode.`, propertyNode)
+      }
+
+      if (Array.isArray(objectValue)) {
+        if (
+          key !== "length" &&
+          !(typeof key === "string" && arrayMethods.has(key)) &&
+          typeof key !== "number" &&
+          !/^\d+$/.test(key)
+        ) {
+          // Own non-index properties read through (match results carry index/groups); like JS,
+          // they are readable in place and dropped by JSON at data boundaries.
+          if (typeof key === "string" && Object.hasOwn(objectValue, key)) {
+            return new ComputedValue((objectValue as Record<string, unknown> & Array<unknown>)[key])
+          }
+          // Unknown property on an array reads as `undefined`, matching JS (`[1,2].foo === undefined`),
+          // instead of throwing - so defensive access under optional chaining behaves as expected.
+          return new ComputedValue(undefined)
+        }
+        return { target: objectValue, key }
+      }
+
+      return { target: objectValue as SafeObject, key }
+    })
+  }
+
+  private readMember(node: AstNode): Effect.Effect<unknown, unknown, R> {
+    return Effect.map(this.getMemberReference(node), (reference) => {
+      if (reference === OptionalShortCircuit) return OptionalShortCircuit
+      if (reference instanceof ComputedValue) return reference.value
+      if (
+        reference === undefined ||
+        reference instanceof ToolReference ||
+        reference instanceof PromiseMethodReference ||
+        reference instanceof IntrinsicReference ||
+        reference instanceof GlobalMethodReference
+      )
+        return reference
+      if (Array.isArray(reference.target)) {
+        if (typeof reference.key === "string" && arrayMethods.has(reference.key)) {
+          return new IntrinsicReference(reference.target, reference.key)
+        }
+        return reference.key === "length" ? reference.target.length : reference.target[Number(reference.key)]
+      }
+      return reference.target[String(reference.key)]
+    })
+  }
+
+  private writeMember(node: AstNode, value: unknown): Effect.Effect<unknown, unknown, R> {
+    return this.modifyMember(node, () => Effect.succeed({ write: true, next: value, result: value }))
+  }
+
+  // Resolves the member reference EXACTLY ONCE (so a side-effecting object/key expression
+  // runs once), then lets `compute` decide whether to write - enabling compound assignment,
+  // updates, plain writes, and short-circuiting logical assignment to share one safe path.
+  private modifyMember(
+    node: AstNode,
+    compute: (current: unknown) => Effect.Effect<{ write: boolean; next: unknown; result: unknown }, unknown, R>,
+  ): Effect.Effect<unknown, unknown, R> {
+    const self = this
+    return Effect.gen(function* () {
+      const reference = yield* self.getMemberReference(node)
+      if (
+        reference === OptionalShortCircuit ||
+        reference instanceof ComputedValue ||
+        reference === undefined ||
+        reference instanceof ToolReference ||
+        reference instanceof PromiseMethodReference ||
+        reference instanceof IntrinsicReference ||
+        reference instanceof GlobalMethodReference
+      ) {
+        throw new InterpreterRuntimeError("Only data fields may be assigned in CodeMode.", node)
+      }
+      if (Array.isArray(reference.target)) {
+        if (reference.key === "length")
+          throw new InterpreterRuntimeError("Array length cannot be assigned in CodeMode.", node)
+        if (typeof reference.key === "string" && arrayMethods.has(reference.key)) {
+          throw new InterpreterRuntimeError("Array methods cannot be assigned in CodeMode.", node)
+        }
+      }
+      const key = Array.isArray(reference.target) ? Number(reference.key) : String(reference.key)
+      const current = (reference.target as Record<PropertyKey, unknown>)[key]
+      const { write, next, result } = yield* compute(current)
+      if (write) self.assignToReference(reference, key, next, node)
+      return result
+    })
+  }
+
+  // Rejects inserting a value that (transitively) contains the container it is being inserted
+  // into - the mutation that would create a circular structure no later walk could survive.
+  private rejectCircularInsertion(
+    container: object,
+    value: unknown,
+    label: string,
+    node: AstNode,
+    seen = new Set<object>(),
+  ): void {
+    if (value === container)
+      throw new InterpreterRuntimeError(`${label} contains a circular value.`, node, "InvalidDataValue")
+    if (value === null || typeof value !== "object" || isRuntimeReference(value) || seen.has(value)) return
+    seen.add(value)
+    const items = Array.isArray(value) ? value : Object.values(value)
+    for (const item of items) this.rejectCircularInsertion(container, item, label, node, seen)
+    seen.delete(value)
+  }
+
+  private assignToReference(reference: MemberReference, key: number | string, next: unknown, node: AstNode): void {
+    if (Array.isArray(reference.target)) {
+      const target = reference.target
+      const index = key as number
+      if (!Number.isInteger(index) || index < 0) {
+        throw new InterpreterRuntimeError(
+          "Array assignment index must be a non-negative integer.",
+          node,
+          "InvalidDataValue",
+        )
+      }
+      this.rejectCircularInsertion(target, next, "Array assignment result", node)
+      target[index] = next
+      return
+    }
+    const target = reference.target as SafeObject
+    const objectKey = key as string
+    this.rejectCircularInsertion(target, next, "Object assignment result", node)
+    target[objectKey] = next
+  }
+
+  private toPropertyKey(value: unknown, node: AstNode): string | number {
+    if (typeof value === "string" || typeof value === "number") {
+      return value
+    }
+
+    throw new InterpreterRuntimeError("Property key must be a string or number.", node)
+  }
+
+  private declare(name: string, value: unknown, mutable: boolean, node: AstNode): void {
+    const scope = this.currentScope()
+
+    // A pre-seeded parameter slot (initialized === false) is being bound for the first time;
+    // anything else already present is a genuine duplicate declaration.
+    const existing = scope.get(name)
+    if (existing && existing.initialized !== false) {
+      throw new InterpreterRuntimeError(`Identifier '${name}' has already been declared.`, node)
+    }
+
+    scope.set(name, { mutable, value, initialized: true })
+  }
+
+  private getIdentifierValue(name: string, node: AstNode): unknown {
+    const binding = this.resolveBinding(name)
+
+    if (!binding) {
+      throw new InterpreterRuntimeError(`Unknown identifier '${name}'.`, node).as("ReferenceError")
+    }
+
+    // A parameter default that forward-references a later (not-yet-bound) parameter - JS TDZ.
+    if (binding.initialized === false) {
+      throw new InterpreterRuntimeError(`Cannot access '${name}' before initialization.`, node).as("ReferenceError")
+    }
+
+    return binding.value
+  }
+
+  private setIdentifierValue(name: string, value: unknown, node: AstNode): unknown {
+    const binding = this.resolveBinding(name)
+
+    if (!binding) {
+      throw new InterpreterRuntimeError(`Unknown identifier '${name}'.`, node).as("ReferenceError")
+    }
+
+    if (!binding.mutable) {
+      throw new InterpreterRuntimeError(`Cannot assign to constant '${name}'.`, node).as("TypeError")
+    }
+
+    binding.value = value
+    return value
+  }
+
+  private resolveBinding(name: string): Binding | undefined {
+    for (let index = this.scopes.length - 1; index >= 0; index -= 1) {
+      const scope = this.scopes[index]
+      const binding = scope?.get(name)
+
+      if (binding) {
+        return binding
+      }
+    }
+
+    return undefined
+  }
+
+  private currentScope(): Map<string, Binding> {
+    const scope = this.scopes[this.scopes.length - 1]
+
+    if (!scope) {
+      throw new InterpreterRuntimeError("Interpreter scope stack is empty.")
+    }
+
+    return scope
+  }
+
+  private pushScope(): void {
+    this.scopes.push(new Map())
+  }
+
+  private popScope(): void {
+    this.scopes.pop()
+  }
+}
+
+/**
+ * Executes one Effect-native CodeMode program without constructing a reusable runtime.
+ *
+ * @example
+ * ```ts
+ * const result = yield* CodeMode.execute({
+ *   tools: { lookup },
+ *   code: `return await tools.lookup({ id: "order_42" })`,
+ * })
+ * ```
+ */
+const executeWithLimits = <const Tools extends Record<string, unknown>>(
+  options: ExecuteOptions<Tools>,
+  limits: ResolvedExecutionLimits,
+  searchIndex: ToolRuntime.DiscoveryPlan["searchIndex"],
+): Effect.Effect<ExecuteResult, never, Services<Tools>> => {
+  const hooks = {
+    ...(options.onToolCallStart === undefined ? {} : { onToolCallStart: options.onToolCallStart }),
+    ...(options.onToolCallEnd === undefined ? {} : { onToolCallEnd: options.onToolCallEnd }),
+  }
+  const tools = ToolRuntime.make(
+    (options.tools ?? {}) as HostTools<Services<Tools>>,
+    limits.maxToolCalls,
+    hooks,
+    searchIndex,
+  )
+  const logs: Array<string> = []
+  const logged = () => (logs.length > 0 ? { logs: [...logs] } : {})
+
+  if (options.code.trim().length === 0) {
+    return Effect.succeed({
+      ok: false,
+      error: { kind: "ParseError", message: "Code cannot be empty." },
+      toolCalls: tools.calls,
+    })
+  }
+
+  const operation = Effect.gen(function* () {
+    const program = parseProgram(options.code)
+    const interpreter = new Interpreter<Services<Tools>>(tools.invoke, tools.keys, logs)
+    const value = yield* interpreter.run(program)
+    const result = copyOut(copyIn(value, "Execution result"), true) as DataValue
+    return {
+      ok: true,
+      value: result,
+      ...logged(),
+      toolCalls: tools.calls,
+    } satisfies ExecuteResult
+  }).pipe((program) => {
+    const timeoutMs = limits.timeoutMs
+    if (timeoutMs === undefined) return program
+    return program.pipe(
+      Effect.timeoutOrElse({
+        duration: timeoutMs,
+        orElse: () =>
+          Effect.succeed({
+            ok: false,
+            error: { kind: "TimeoutExceeded", message: `Execution timed out after ${timeoutMs}ms.` },
+            ...logged(),
+            toolCalls: tools.calls,
+          } satisfies ExecuteResult),
+      }),
+    )
+  })
+
+  return operation.pipe(
+    Effect.catchCause((cause) =>
+      Cause.hasInterruptsOnly(cause)
+        ? Effect.interrupt
+        : Effect.succeed({
+            ok: false,
+            error: normalizeError(Cause.squash(cause)),
+            ...logged(),
+            toolCalls: tools.calls,
+          } satisfies ExecuteResult),
+    ),
+    Effect.map((result) => (limits.maxOutputBytes === undefined ? result : boundOutput(result, limits.maxOutputBytes))),
+  )
+}
+
+const utf8ByteLength = (value: string): number => new TextEncoder().encode(value).byteLength
+
+// Truncates to a UTF-8 byte budget without splitting a code point (a split multi-byte
+// sequence decodes to a replacement character, which is dropped).
+const utf8Truncate = (value: string, maxBytes: number): string => {
+  const bytes = new TextEncoder().encode(value)
+  if (bytes.byteLength <= maxBytes) return value
+  const text = new TextDecoder("utf-8").decode(bytes.slice(0, Math.max(0, maxBytes)))
+  return text.endsWith("\uFFFD") ? text.slice(0, -1) : text
+}
+
+/**
+ * Bounds the model-facing output (serialized result value plus logs) to `maxOutputBytes`.
+ * Oversized values are replaced by their truncated serialized text with an explanatory marker,
+ * and logs are kept from the start until the remaining budget is exhausted. Truncation never
+ * fails the execution; `truncated: true` marks affected results. Only runs when the host set
+ * `maxOutputBytes` - with the limit absent, output passes through unbounded.
+ */
+const boundOutput = (result: ExecuteResult, maxOutputBytes: number): ExecuteResult => {
+  let truncated = false
+
+  let value: DataValue = null
+  let valueBytes = 0
+  if (result.ok) {
+    const serialized = JSON.stringify(result.value) ?? "null"
+    const bytes = utf8ByteLength(serialized)
+    if (bytes > maxOutputBytes) {
+      truncated = true
+      value = `${utf8Truncate(serialized, maxOutputBytes)} [result truncated: ${bytes} bytes exceeds the ${maxOutputBytes}-byte output limit; return a smaller value]`
+      valueBytes = maxOutputBytes
+    } else {
+      value = result.value
+      valueBytes = bytes
+    }
+  }
+
+  const logs = result.logs ?? []
+  const kept: Array<string> = []
+  const logBudget = Math.max(0, maxOutputBytes - valueBytes)
+  let logBytes = 0
+  for (const line of logs) {
+    const lineBytes = utf8ByteLength(line) + 1
+    if (logBytes + lineBytes > logBudget) break
+    logBytes += lineBytes
+    kept.push(line)
+  }
+  if (kept.length < logs.length) {
+    truncated = true
+    kept.push(`[logs truncated: showing ${kept.length} of ${logs.length} lines]`)
+  }
+
+  if (!truncated) return result
+  const logsPart = kept.length > 0 ? { logs: kept } : {}
+  return result.ok
+    ? { ok: true, value, ...logsPart, truncated: true, toolCalls: result.toolCalls }
+    : { ok: false, error: result.error, ...logsPart, truncated: true, toolCalls: result.toolCalls }
+}
+
+export const execute = <const Tools extends Record<string, unknown>>(
+  options: ExecuteOptions<Tools>,
+): Effect.Effect<ExecuteResult, never, Services<Tools>> => {
+  const tools = (options.tools ?? {}) as HostTools<Services<Tools>>
+  ToolRuntime.assertValidTools(tools)
+  return executeWithLimits(options, resolveExecutionLimits(options.limits), ToolRuntime.searchIndex(tools))
+}
+
+/**
+ * Creates an Effect-native runtime over explicit, schema-described tools.
+ *
+ * Use `execute` for host-driven execution or `agentTool` to expose one confined code tool to an
+ * agent framework. Tool requirements remain in the returned Effect environment.
+ *
+ * @example
+ * ```ts
+ * const runtime = CodeMode.make({ tools: { orders: { lookup } } })
+ * const code = runtime.agentTool()
+ * ```
+ */
+export const make = <const Tools extends Record<string, unknown> = {}>(
+  options: CodeModeOptions<Tools> = {} as CodeModeOptions<Tools>,
+): CodeModeRuntime<Services<Tools>> => {
+  const tools = (options.tools ?? {}) as HostTools<Services<Tools>>
+  ToolRuntime.assertValidTools(tools)
+  const limits = resolveExecutionLimits(options.limits)
+  const discovery = ToolRuntime.discoveryPlan(tools, options.discovery?.maxInlineCatalogTokens)
+  const executeProgram = (code: string) => executeWithLimits<Tools>({ ...options, code }, limits, discovery.searchIndex)
+  const catalog = discovery.catalog
+  const instructions = discovery.instructions
+
+  return {
+    catalog: () => catalog,
+    instructions: () => instructions,
+    agentTool: () => ({
+      name: "code",
+      description: instructions,
+      input: ExecuteInputSchema,
+      output: ExecuteResultSchema,
+      execute: ({ code }) => executeProgram(code),
+    }),
+    execute: executeProgram,
+  }
+}
+
+/** Constructors for one-shot and reusable CodeMode execution. */
+export const CodeMode = { make, execute }
diff --git a/packages/codemode/src/index.ts b/packages/codemode/src/index.ts
new file mode 100644
index 0000000000..96629f486e
--- /dev/null
+++ b/packages/codemode/src/index.ts
@@ -0,0 +1,21 @@
+export { ToolError, CodeMode, ExecuteInputSchema, ExecuteResultSchema, toolError } from "./codemode.js"
+export { Tool } from "./tool.js"
+export type { Definition as ToolDefinition, JsonSchema, ToolSchema } from "./tool.js"
+export type { ToolCallEnded, ToolCallHooks } from "./tool-runtime.js"
+export type {
+  AgentToolDefinition,
+  CodeModeOptions,
+  CodeModeRuntime,
+  DataValue,
+  Diagnostic,
+  DiagnosticKind,
+  DiscoveryOptions,
+  ExecuteFailure,
+  ExecuteOptions,
+  ExecuteResult,
+  ExecuteSuccess,
+  ExecutionLimits,
+  ToolCall,
+  ToolCallStarted,
+  ToolDescription,
+} from "./codemode.js"
diff --git a/packages/codemode/src/token.ts b/packages/codemode/src/token.ts
new file mode 100644
index 0000000000..1e06bec1e4
--- /dev/null
+++ b/packages/codemode/src/token.ts
@@ -0,0 +1,10 @@
+/**
+ * Token estimation for budgeting model-facing text. Copied from
+ * `@opencode-ai/core/util/token` (chars / 4) so this package stays
+ * dependency-free; keep the two in sync if the heuristic ever changes.
+ */
+export * as Token from "./token.js"
+
+const CHARS_PER_TOKEN = 4
+
+export const estimate = (input: string) => Math.max(0, Math.round(input.length / CHARS_PER_TOKEN))
diff --git a/packages/codemode/src/tool-error.ts b/packages/codemode/src/tool-error.ts
new file mode 100644
index 0000000000..16460a019a
--- /dev/null
+++ b/packages/codemode/src/tool-error.ts
@@ -0,0 +1,11 @@
+import { Schema } from "effect"
+
+/** Safe operational refusal from a standard tool pack, reported as `ToolFailure`. */
+export class ToolError extends Schema.TaggedErrorClass<ToolError>()("ToolError", {
+  message: Schema.String,
+  cause: Schema.optionalKey(Schema.Defect()),
+}) {}
+
+/** Creates a tool refusal whose message is safe to include in an execution diagnostic. */
+export const toolError = (message: string, cause?: unknown): ToolError =>
+  new ToolError({ message, ...(cause === undefined ? {} : { cause }) })
diff --git a/packages/codemode/src/tool-runtime.ts b/packages/codemode/src/tool-runtime.ts
new file mode 100644
index 0000000000..fa3ddc6c2f
--- /dev/null
+++ b/packages/codemode/src/tool-runtime.ts
@@ -0,0 +1,829 @@
+import { Cause, Effect } from "effect"
+import { ToolError, toolError } from "./tool-error.js"
+import {
+  decodeInput as decodeToolInput,
+  decodeOutput as decodeToolOutput,
+  identifierSegment,
+  inputProperties,
+  inputTypeScript,
+  isDefinition as isToolDefinition,
+  outputTypeScript,
+  type Definition,
+} from "./tool.js"
+import { estimate } from "./token.js"
+import { SandboxDate, SandboxMap, SandboxPromise, SandboxRegExp, SandboxSet } from "./values.js"
+
+export type HostTool<R = never> = (...args: Array<unknown>) => Effect.Effect<unknown, unknown, R>
+
+export type HostTools<R = never> = {
+  [name: string]: HostTool<R> | Definition<R> | HostTools<R>
+}
+
+export type Services<Tools> = Tools extends (...args: Array<unknown>) => Effect.Effect<unknown, unknown, infer R>
+  ? R
+  : Tools extends {
+        readonly _tag: "CodeModeTool"
+        readonly run: (input: unknown) => Effect.Effect<unknown, unknown, infer R>
+      }
+    ? R
+    : Tools extends object
+      ? string extends keyof Tools
+        ? never
+        : Services<Tools[keyof Tools]>
+      : never
+
+/** Minimal audit record retained for each admitted tool call. */
+export type ToolCall = {
+  readonly name: string
+}
+
+/** Decoded tool call observed immediately before tool execution. */
+export type ToolCallStarted = {
+  readonly index: number
+  readonly name: string
+  readonly input: unknown
+}
+
+/** Completed tool call observed immediately after tool execution settles. */
+export type ToolCallEnded = {
+  readonly index: number
+  readonly name: string
+  readonly input: unknown
+  readonly durationMs: number
+  readonly outcome: "success" | "failure"
+  /** Model-safe failure message; present only when `outcome` is `"failure"`. */
+  readonly message?: string
+}
+
+/** Non-throwing observation hooks fired around each admitted tool call. */
+export type ToolCallHooks<R = never> = {
+  readonly onToolCallStart?: ((call: ToolCallStarted) => Effect.Effect<void, never, R>) | undefined
+  readonly onToolCallEnd?: ((call: ToolCallEnded) => Effect.Effect<void, never, R>) | undefined
+}
+
+/** Model-visible description of one schema-backed tool. */
+export type ToolDescription = {
+  readonly path: string
+  readonly description: string
+  readonly signature: string
+}
+
+export type SafeObject = Record<string, unknown>
+
+const reservedNamespace = "$codemode"
+const defaultMaxInlineCatalogTokens = 2_000
+const defaultSearchLimit = 10
+const searchSignature =
+  "tools.$codemode.search({ query?: string, namespace?: string, limit?: number }): Promise<{ items: Array<{ path: string; description: string; signature: string }>; total: number }>"
+const toolExpression = (path: string) =>
+  "tools" +
+  path
+    .split(".")
+    .map((segment) => (identifierSegment.test(segment) ? `.${segment}` : `[${JSON.stringify(segment)}]`))
+    .join("")
+
+export class ToolReference {
+  constructor(readonly path: ReadonlyArray<string>) {}
+}
+
+/**
+ * Maximum nesting depth for values crossing a data boundary. Fixed (not a configurable
+ * limit) purely because it produces a clearer diagnostic than a native stack-overflow
+ * RangeError would.
+ */
+const MAX_VALUE_DEPTH = 32
+
+export class ToolRuntimeError extends Error {
+  constructor(
+    readonly kind:
+      | "UnknownTool"
+      | "InvalidToolInput"
+      | "InvalidToolOutput"
+      | "InvalidDataValue"
+      | "ToolCallLimitExceeded",
+    message: string,
+    readonly suggestions: ReadonlyArray<string> = [],
+  ) {
+    super(message)
+    this.name = "ToolRuntimeError"
+  }
+}
+
+const isDefinition = <R>(value: HostTool<R> | Definition<R> | HostTools<R>): value is Definition<R> =>
+  isToolDefinition<R>(value)
+
+const runHost = <A, E, R>(effect: Effect.Effect<A, E, R>): Effect.Effect<A, ToolError, R> =>
+  effect.pipe(
+    Effect.catchCause((cause) => {
+      if (Cause.hasInterruptsOnly(cause)) return Effect.interrupt
+      const error = Cause.squash(cause)
+      return Effect.fail(error instanceof ToolError ? error : toolError("Tool execution failed", error))
+    }),
+  )
+
+const blockedMemberNames = new Set(["__proto__", "constructor", "prototype"])
+
+export const isBlockedMember = (name: string): boolean => blockedMemberNames.has(name)
+
+/**
+ * Validates and copies a value against the plain-data contract (depth, circularity, plain
+ * objects only, blocked properties, data-only leaves).
+ *
+ * Two modes share the walk:
+ * - **Boundary** (`preserveSandboxValues` false, the default): the host<->sandbox boundary -
+ *   final results, tool-call arguments, `JSON.stringify`. Sandbox value types serialize
+ *   exactly as JSON.stringify would: Date -> ISO string (invalid -> null), RegExp/Map/Set -> {}.
+ * - **Intra-sandbox checkpoint** (`preserveSandboxValues` true; see `boundedData` in
+ *   codemode.ts): Date/RegExp/Map/Set instances pass through untouched (treated as leaves,
+ *   contents not walked), so values flowing through `Object.*` helpers, coercion inputs, and
+ *   other in-sandbox checkpoints stay fully usable (`.getTime()`, `.has()`, ...).
+ *
+ * Both modes reject un-awaited promises with an await-hinting diagnostic.
+ */
+export const copyIn = (value: unknown, label: string, preserveSandboxValues = false): unknown =>
+  copyBounded(value, label, 0, new Set(), preserveSandboxValues)
+
+const copyBounded = (
+  value: unknown,
+  label: string,
+  depth: number,
+  seen: Set<object>,
+  preserveSandboxValues: boolean,
+): unknown => {
+  if (depth > MAX_VALUE_DEPTH) {
+    throw new ToolRuntimeError("InvalidDataValue", `${label} exceeds the maximum value depth of ${MAX_VALUE_DEPTH}.`)
+  }
+  if (
+    value === null ||
+    value === undefined ||
+    typeof value === "string" ||
+    typeof value === "boolean" ||
+    // NaN/Infinity are allowed to exist as in-sandbox intermediates (matching real JS and a real
+    // engine) so defensive guards like `Number.isNaN(x)` / `parseInt(x) || 0` can run. They are
+    // normalized to `null` when the value leaves the sandbox - see copyOut - exactly as
+    // JSON.stringify already does at any tool boundary.
+    typeof value === "number"
+  ) {
+    return value
+  }
+
+  if (typeof value !== "object") {
+    throw new ToolRuntimeError("InvalidDataValue", `${label} must contain data only.`)
+  }
+
+  // An un-awaited promise never crosses a data checkpoint as `{}`; the diagnostic tells the
+  // model exactly how to fix the program instead.
+  if (value instanceof SandboxPromise) {
+    throw new ToolRuntimeError(
+      "InvalidDataValue",
+      `${label} contains an un-awaited Promise; await tool calls (e.g. \`const result = await tools.ns.tool(...)\`) before using their results.`,
+    )
+  }
+
+  if (preserveSandboxValues) {
+    // Intra-sandbox checkpoints keep sandbox value instances alive as leaves; their contents
+    // are never walked here (Map/Set members are validated where mutation happens, and the
+    // real boundary still serializes them below).
+    if (
+      value instanceof SandboxDate ||
+      value instanceof SandboxRegExp ||
+      value instanceof SandboxMap ||
+      value instanceof SandboxSet
+    ) {
+      return value
+    }
+    // Host instances cannot normally reach an intra-sandbox checkpoint (tool results cross
+    // the boundary first), but wrap them defensively rather than degrading to JSON forms.
+    if (value instanceof Date) return new SandboxDate(value.getTime())
+    if (value instanceof RegExp) return new SandboxRegExp(value.source, value.flags)
+    if (value instanceof Map) {
+      const wrapped = new SandboxMap()
+      for (const [key, item] of value.entries()) {
+        wrapped.map.set(copyBounded(key, label, depth + 1, seen, true), copyBounded(item, label, depth + 1, seen, true))
+      }
+      return wrapped
+    }
+    if (value instanceof Set) {
+      const wrapped = new SandboxSet()
+      for (const item of value.values()) wrapped.set.add(copyBounded(item, label, depth + 1, seen, true))
+      return wrapped
+    }
+  }
+
+  // Sandbox value types (and their host counterparts, which a host tool may legitimately
+  // return) serialize exactly as JSON.stringify would at the data boundary: a Date is its
+  // toJSON() ISO string (invalid -> null), and RegExp/Map/Set have no JSON form beyond {}.
+  if (value instanceof SandboxDate) {
+    return Number.isFinite(value.time) ? new Date(value.time).toISOString() : null
+  }
+  if (value instanceof Date) {
+    return Number.isFinite(value.getTime()) ? value.toISOString() : null
+  }
+  if (
+    value instanceof SandboxRegExp ||
+    value instanceof SandboxMap ||
+    value instanceof SandboxSet ||
+    value instanceof RegExp ||
+    value instanceof Map ||
+    value instanceof Set
+  ) {
+    return Object.create(null) as SafeObject
+  }
+
+  if (seen.has(value)) {
+    throw new ToolRuntimeError("InvalidDataValue", `${label} contains a circular value.`)
+  }
+
+  seen.add(value)
+
+  if (Array.isArray(value)) {
+    const copied = value.map((item) => copyBounded(item, label, depth + 1, seen, preserveSandboxValues))
+    seen.delete(value)
+    return copied
+  }
+
+  const prototype = Object.getPrototypeOf(value)
+  if (prototype !== Object.prototype && prototype !== null) {
+    throw new ToolRuntimeError("InvalidDataValue", `${label} must contain plain objects only.`)
+  }
+
+  const copied: SafeObject = Object.create(null) as SafeObject
+  for (const [key, item] of Object.entries(value)) {
+    if (isBlockedMember(key)) {
+      throw new ToolRuntimeError("InvalidDataValue", `${label} contains blocked property '${key}'.`)
+    }
+    copied[key] = copyBounded(item, label, depth + 1, seen, preserveSandboxValues)
+  }
+  seen.delete(value)
+  return copied
+}
+
+export const copyOut = (value: unknown, undefinedAsNull = false): unknown => {
+  if (value === undefined && undefinedAsNull) return null
+  // Normalize non-finite numbers to null as the value crosses out of the sandbox (final return
+  // and tool-call arguments both funnel through here), matching JSON semantics - NaN/Infinity
+  // have no JSON representation, so JSON.stringify would produce null anyway.
+  if (typeof value === "number" && !Number.isFinite(value)) {
+    return null
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => copyOut(item, undefinedAsNull))
+  }
+
+  if (value !== null && typeof value === "object" && !(value instanceof ToolReference)) {
+    return Object.fromEntries(Object.entries(value).map(([key, item]) => [key, copyOut(item, undefinedAsNull)]))
+  }
+
+  return value
+}
+
+const definitions = <R>(
+  tools: HostTools<R>,
+  path: ReadonlyArray<string> = [],
+): Array<{ path: string; definition: Definition<R> }> => {
+  const entries: Array<{ path: string; definition: Definition<R> }> = []
+  for (const [name, value] of Object.entries(tools)) {
+    const next = [...path, name]
+    if (isDefinition(value)) entries.push({ path: next.join("."), definition: value })
+    else if (typeof value !== "function") entries.push(...definitions(value, next))
+  }
+  return entries
+}
+
+const describeDefinition = <R>(path: string, definition: Definition<R>): ToolDescription => ({
+  path,
+  description: definition.description,
+  signature: `${toolExpression(path)}(input: ${inputTypeScript(definition)}): Promise<${outputTypeScript(definition)}>`,
+})
+
+const visibleDefinitions = <R>(tools: HostTools<R>) =>
+  definitions(tools).flatMap(({ path, definition }) => {
+    const description = describeDefinition(path, definition)
+    return [{ path, definition, description }]
+  })
+
+export const catalog = <R>(tools: HostTools<R>): ReadonlyArray<ToolDescription> =>
+  visibleDefinitions(tools).map(({ description }) => description)
+
+export type DiscoveryPlan = {
+  readonly catalog: ReadonlyArray<ToolDescription>
+  readonly instructions: string
+  readonly searchIndex: ReadonlyArray<SearchEntry>
+}
+
+export type SearchEntry = {
+  readonly description: ToolDescription
+  /**
+   * JSDoc-annotated multiline signature shown on search-result items; the compact
+   * single-line form (inline catalog lines) stays in `description.signature`.
+   */
+  readonly signature: string
+  /** Top-level namespace (first path segment), matched by the search `namespace` option. */
+  readonly namespace: string
+  /** Lowercased path + description + input property names/descriptions, for substring matching. */
+  readonly searchText: string
+}
+
+/**
+ * Split a query into lowercased search terms. camelCase boundaries are split
+ * (`resolveLibrary` -> `resolve library`) and every non-alphanumeric character is a
+ * separator, so `resolve-library-id`, `resolveLibraryId`, and `resolve library id` all
+ * tokenize alike. Empties and the `*` wildcard are dropped.
+ */
+const tokenize = (query: string): Array<string> =>
+  query
+    .replace(/([a-z0-9])([A-Z])/g, "$1 $2")
+    .toLowerCase()
+    .split(/[^a-z0-9]+/)
+    .filter((term) => term.length > 0 && term !== "*")
+
+/**
+ * A term plus its naive singular variants (trailing "s"/"es" stripped), so a plural
+ * query term ("issues") still matches indexed text that only carries the singular
+ * ("issue"). Matching is one-directional substring containment, so the variants are
+ * needed only on the query side; scoring weights are unchanged - each field check
+ * passes when ANY form matches.
+ */
+const termForms = (term: string): Array<string> => {
+  const forms = [term]
+  if (term.endsWith("es") && term.length > 3) forms.push(term.slice(0, -2))
+  if (term.endsWith("s") && term.length > 2) forms.push(term.slice(0, -1))
+  return forms
+}
+
+const firstLine = (text: string) => text.split("\n", 1)[0]!.trim()
+
+/** One-line description used on inline catalog lines; the full text stays in search results. */
+const brief = (text: string, max = 120) => {
+  const line = firstLine(text)
+  return line.length > max ? line.slice(0, max - 1) + "..." : line
+}
+
+const catalogLine = (tool: ToolDescription) => {
+  const description = brief(tool.description)
+  return description === "" ? `  - ${tool.signature}` : `  - ${tool.signature} // ${description}`
+}
+
+const toSearchEntry = <R>(path: string, definition: Definition<R>, description: ToolDescription): SearchEntry => ({
+  description,
+  signature: `${toolExpression(path)}(input: ${inputTypeScript(definition, true)}): Promise<${outputTypeScript(definition, true)}>`,
+  namespace: path.split(".", 1)[0]!,
+  searchText: [
+    path,
+    definition.description,
+    ...inputProperties(definition).flatMap(({ name, description: property }) =>
+      property === undefined ? [name] : [name, property],
+    ),
+  ]
+    .join("\n")
+    .toLowerCase(),
+})
+
+/** The runtime search index over every described tool. Search is always registered. */
+export const searchIndex = <R>(tools: HostTools<R>): ReadonlyArray<SearchEntry> =>
+  visibleDefinitions(tools).map(({ path, definition, description }) => toSearchEntry(path, definition, description))
+
+export const assertValidTools = <R>(tools: HostTools<R>): void => {
+  if (Object.hasOwn(tools, reservedNamespace)) {
+    throw new Error(`Tool namespace '${reservedNamespace}' is reserved for CodeMode discovery tools.`)
+  }
+}
+
+/**
+ * Budgeted catalog: every namespace is always listed with its tool count; full call
+ * signatures are inlined against the `maxInlineCatalogTokens` budget (estimated tokens,
+ * chars/4) round-robin across namespaces - in each round (namespaces alphabetical), every
+ * namespace still holding un-inlined tools attempts to place its next-cheapest line, and
+ * a namespace whose next line does not fit is done while the others keep going - so every
+ * namespace gets some representation before any namespace gets everything. The section
+ * states exactly how comprehensive it is - overall (COMPLETE vs PARTIAL) and per
+ * namespace. Namespace stub lines are never budgeted: every namespace appears with its
+ * tool count even at budget 0.
+ */
+export const discoveryPlan = <R>(
+  tools: HostTools<R>,
+  maxInlineCatalogTokens = defaultMaxInlineCatalogTokens,
+): DiscoveryPlan => {
+  if (!Number.isSafeInteger(maxInlineCatalogTokens) || maxInlineCatalogTokens < 0) {
+    throw new RangeError("discovery.maxInlineCatalogTokens must be a non-negative safe integer")
+  }
+  const visible = visibleDefinitions(tools)
+  const described = visible.map(({ description }) => description)
+
+  const namespaces = new Map<string, Array<ToolDescription>>()
+  for (const tool of described) {
+    const [namespace = tool.path] = tool.path.split(".")
+    const group = namespaces.get(namespace) ?? []
+    group.push(tool)
+    namespaces.set(namespace, group)
+  }
+  const ordered = [...namespaces].sort(([left], [right]) => left.localeCompare(right))
+
+  // Select which signatures fit the budget before emitting, so the list can state
+  // exactly how comprehensive it is. Round-robin fairness: in each round (namespaces
+  // alphabetical), every namespace still holding un-inlined tools tries to place its
+  // next-cheapest line against the shared budget; a namespace whose next line does not
+  // fit is done - the others keep going - so every namespace gets some representation
+  // before any namespace gets everything.
+  const selections = ordered.map(([namespace, group]) => ({
+    namespace,
+    picked: new Set<ToolDescription>(),
+    queue: [...group].sort(
+      (left, right) =>
+        estimate(catalogLine(left)) - estimate(catalogLine(right)) || left.path.localeCompare(right.path),
+    ),
+  }))
+  let used = 0
+  let active = selections.filter((selection) => selection.queue.length > 0)
+  while (active.length > 0) {
+    const stillActive: typeof active = []
+    for (const selection of active) {
+      const tool = selection.queue[0]!
+      const cost = estimate(catalogLine(tool))
+      if (used + cost > maxInlineCatalogTokens) continue
+      selection.queue.shift()
+      selection.picked.add(tool)
+      used += cost
+      if (selection.queue.length > 0) stillActive.push(selection)
+    }
+    active = stillActive
+  }
+  const shown = new Map<string, ReadonlySet<ToolDescription>>(
+    selections.map(({ namespace, picked }) => [namespace, picked]),
+  )
+  const totalShown = selections.reduce((total, { picked }) => total + picked.size, 0)
+  const complete = totalShown === described.length
+
+  const empty = described.length === 0
+
+  // Section order is deliberate: workflow first (the top is the least likely part of a long
+  // description to be truncated or skimmed away), then rules, then syntax, with the budgeted
+  // catalog at the bottom. Example call forms use explicit `<namespace>.<tool>` placeholders -
+  // never a real or fabricated tool name.
+  const intro = [
+    "Write a CodeMode program to answer the request. Return code only.",
+    empty
+      ? "Execute JavaScript in a confined runtime."
+      : complete
+        ? "Execute JavaScript in a confined runtime. Inside this program, `tools` contains only the host-provided tools listed below; surrounding agent tools are not available unless listed here."
+        : "Execute JavaScript in a confined runtime. Inside this program, `tools` contains only the host-provided tools listed or searchable below; surrounding agent tools are not available unless listed here.",
+  ]
+
+  // The search step exists only when search is advertised (PARTIAL catalog); a COMPLETE
+  // catalog already shows every signature, so step 1 picks from the list instead.
+  const workflow = empty
+    ? []
+    : [
+        "",
+        "## Workflow",
+        "",
+        ...(complete
+          ? [
+              "1. Pick a tool from the list under `## Available tools` - each line is the exact call signature; use it as-is rather than guessing segments.",
+              "2. Call it using the exact signature shown: `const res = await tools.<namespace>.<tool>(input)` - bracket notation may appear for names that are not JavaScript identifiers.",
+              '3. Parse text results: `const data = typeof res === "string" ? JSON.parse(res) : res` - most tools return JSON as a string.',
+              "4. Return only the fields you need: `return { <field>: data.<field> }` - raw payloads get truncated and waste context.",
+            ]
+          : [
+              '1. Find a tool (skip when it is already listed below): `const { items } = await tools.$codemode.search({ query: "<intent + key nouns>" })` - short phrases like "list issues" work best.',
+              "2. Read the matches: each item is `{ path, description, signature }` - read the description before using an unfamiliar tool.",
+              "3. Call it with the result's `path` as-is (never guess segments): `const res = await tools.<namespace>.<tool>(input)` - bracket notation may appear for names that are not JavaScript identifiers.",
+              '4. Parse text results: `const data = typeof res === "string" ? JSON.parse(res) : res` - most tools return JSON as a string.',
+              "5. Return only the fields you need: `return { <field>: data.<field> }` - raw payloads get truncated and waste context.",
+            ]),
+      ]
+
+  const rules = empty
+    ? []
+    : [
+        "",
+        "## Rules",
+        "",
+        complete
+          ? "- Only tools listed here are available inside `tools`; tools from the surrounding agent/runtime are not implicitly exposed."
+          : "- Only tools listed here or returned by `tools.$codemode.search` are available inside `tools`; tools from the surrounding agent/runtime are not implicitly exposed.",
+        "- Filter, aggregate, and transform collections in code - never return them raw or call a tool per item across messages.",
+        "- A result typed `Promise<unknown>` has no guaranteed shape - verify what actually came back before relying on its fields.",
+        "- Run independent calls in parallel: `await Promise.all(items.map((item) => tools.<namespace>.<tool>(item)))`.",
+        "- `Object.keys(tools)` lists namespaces; `Object.keys(tools.<namespace>)` lists its tools; `for...in` works on both.",
+        ...(complete
+          ? []
+          : ['- Browse one namespace: `await tools.$codemode.search({ query: "", namespace: "<name>" })`.']),
+      ]
+
+  const syntax = [
+    "",
+    "## Syntax",
+    "",
+    "Standard modern JavaScript works: functions/closures, destructuring, template literals, loops, try/catch, spread, optional chaining, the usual Array/String/Object/Math/JSON methods, plus Date, RegExp, Map, Set, and Promise.all/allSettled/race/resolve/reject.",
+    "TypeScript type annotations are allowed and stripped before execution (decorators are not supported).",
+    "Not supported (each fails with a message naming the alternative): classes, generators, for await...of, .then/.catch/.finally (use await with try/catch).",
+    "Dates serialize to ISO strings at data boundaries; Map/Set/RegExp serialize to `{}`.",
+  ]
+
+  const toolSection: Array<string> = [""]
+  if (empty) {
+    toolSection.push("## Available tools", "", "No tools are currently available.")
+  } else {
+    toolSection.push(
+      complete
+        ? "## Available tools (COMPLETE list - every tool is shown below with its full call signature)"
+        : `## Available tools (PARTIAL - ${totalShown} of ${described.length} shown; find the rest with tools.$codemode.search)`,
+      "",
+    )
+    for (const [namespace, group] of ordered) {
+      const picked = shown.get(namespace)!
+      const count = `${group.length} tool${group.length === 1 ? "" : "s"}`
+      // Annotate only when a namespace is not fully shown, so a comprehensive
+      // namespace reads cleanly and a truncated one is unambiguous.
+      const label =
+        picked.size === group.length
+          ? count
+          : picked.size === 0
+            ? `${count}, none shown`
+            : `${count}, ${picked.size} shown`
+      toolSection.push(`- ${namespace} (${label})`)
+      for (const tool of group) if (picked.has(tool)) toolSection.push(catalogLine(tool))
+    }
+    if (!complete) {
+      toolSection.push("", "Search returns complete callable signatures:", `- ${searchSignature}`)
+    }
+  }
+
+  const lines = [...intro, ...workflow, ...rules, ...syntax, ...toolSection]
+  return {
+    catalog: described,
+    instructions: lines.join("\n"),
+    searchIndex: visible.map(({ path, definition, description }) => toSearchEntry(path, definition, description)),
+  }
+}
+
+/**
+ * The enumerable names at one node of the host tool tree - namespace names at the root,
+ * tool/namespace names below - powering `Object.keys(tools)` and `for...in` over tool
+ * references. A callable tool is a leaf and enumerates as `[]` (like `Object.keys` of a
+ * function in JS). An unknown path is an `UnknownTool` error pointing at the working
+ * discovery idioms, mirroring how calling an unknown tool fails.
+ */
+const namespaceKeys = <R>(
+  tools: HostTools<R>,
+  path: ReadonlyArray<string>,
+  searchEnabled: boolean,
+): ReadonlyArray<string> => {
+  // The reserved discovery namespace is virtual (never present in the host tree); enumerate
+  // it explicitly so `Object.keys(tools.$codemode)` matches the callable surface.
+  if (searchEnabled && path.length === 1 && path[0] === reservedNamespace) return ["search"]
+  let value: HostTool<R> | Definition<R> | HostTools<R> = tools
+  for (const segment of path) {
+    if (
+      isBlockedMember(segment) ||
+      typeof value === "function" ||
+      isDefinition(value) ||
+      !Object.hasOwn(value, segment)
+    ) {
+      throw new ToolRuntimeError(
+        "UnknownTool",
+        `Unknown tool namespace '${path.join(".")}'.`,
+        searchEnabled
+          ? [
+              "Object.keys(tools) lists the available namespaces; tools.$codemode.search({ query }) finds described tools.",
+            ]
+          : ["Object.keys(tools) lists the available namespaces."],
+      )
+    }
+    value = value[segment] as HostTool<R> | Definition<R> | HostTools<R>
+  }
+  if (typeof value === "function" || isDefinition(value)) return []
+  return Object.keys(value)
+}
+
+const resolve = <R>(
+  tools: HostTools<R>,
+  path: ReadonlyArray<string>,
+  searchEnabled: boolean,
+): HostTool<R> | Definition<R> => {
+  let value: HostTool<R> | Definition<R> | HostTools<R> = tools
+
+  for (const segment of path) {
+    if (
+      isBlockedMember(segment) ||
+      typeof value === "function" ||
+      isDefinition(value) ||
+      !Object.hasOwn(value, segment)
+    ) {
+      throw new ToolRuntimeError(
+        "UnknownTool",
+        `Unknown tool '${path.join(".")}'.`,
+        searchEnabled ? ["Use tools.$codemode.search({ query }) to find available described tools."] : [],
+      )
+    }
+    value = value[segment] as HostTool<R> | Definition<R> | HostTools<R>
+  }
+
+  if (typeof value !== "function" && !isDefinition(value)) {
+    throw new ToolRuntimeError("UnknownTool", `Tool '${path.join(".")}' is not callable.`)
+  }
+
+  return value
+}
+
+export type ToolRuntime<R = never> = {
+  readonly root: ToolReference
+  readonly calls: Array<ToolCall>
+  readonly invoke: (path: ReadonlyArray<string>, args: Array<unknown>) => Effect.Effect<unknown, unknown, R>
+  /** Enumerable namespace/tool names at one node of the host tool tree; see `namespaceKeys`. */
+  readonly keys: (path: ReadonlyArray<string>) => ReadonlyArray<string>
+}
+
+const failureMessage = (error: unknown): string =>
+  error instanceof ToolError || error instanceof ToolRuntimeError ? error.message : "Tool execution failed"
+
+export const make = <R>(
+  tools: HostTools<R>,
+  /** Undefined means unlimited tool calls. */
+  maxToolCalls: number | undefined,
+  hooks?: ToolCallHooks<R>,
+  searchIndex?: ReadonlyArray<SearchEntry>,
+): ToolRuntime<R> => {
+  const calls: Array<ToolCall> = []
+  const searchEnabled = searchIndex !== undefined
+
+  // Wraps the settling portion of a tool call so onToolCallEnd observes success and failure
+  // symmetrically. Interruption (e.g. the execution timeout) fires neither outcome.
+  const observeEnd = <A, E>(effect: Effect.Effect<A, E, R>, call: ToolCallStarted): Effect.Effect<A, E, R> => {
+    const onEnd = hooks?.onToolCallEnd
+    if (onEnd === undefined) return effect
+    const startedAt = Date.now()
+    return effect.pipe(
+      Effect.tap(() => onEnd({ ...call, durationMs: Date.now() - startedAt, outcome: "success" })),
+      Effect.tapError((error) =>
+        onEnd({ ...call, durationMs: Date.now() - startedAt, outcome: "failure", message: failureMessage(error) }),
+      ),
+    )
+  }
+
+  const decodeOutput = (value: unknown, name: string) =>
+    Effect.try({
+      try: () => copyIn(value, `Result from tool '${name}'`),
+      catch: () => new ToolRuntimeError("InvalidToolOutput", `Invalid output from tool '${name}'.`),
+    })
+
+  const recordCall = (call: ToolCall): void => {
+    if (maxToolCalls !== undefined && calls.length >= maxToolCalls) {
+      throw new ToolRuntimeError("ToolCallLimitExceeded", `Execution exceeded its tool-call limit of ${maxToolCalls}.`)
+    }
+    calls.push(call)
+  }
+
+  return {
+    root: new ToolReference([]),
+    calls,
+    keys: (path) => namespaceKeys(tools, path, searchEnabled),
+    invoke: (path, args) =>
+      Effect.gen(function* () {
+        const name = path.join(".")
+        const externalArgs = args.map((arg) => copyOut(copyIn(arg, `Arguments for tool '${name}'`)))
+        const call = { name }
+        const recordAndObserve = (input: unknown) =>
+          Effect.sync(() => {
+            recordCall(call)
+            return calls.length - 1
+          }).pipe(Effect.tap((index) => hooks?.onToolCallStart?.({ index, name, input }) ?? Effect.void))
+        if (name === "$codemode.search") {
+          if (!searchEnabled) throw new ToolRuntimeError("UnknownTool", `Unknown tool '${name}'.`)
+          const input = externalArgs[0]
+          if (externalArgs.length !== 1 || input === null || typeof input !== "object" || Array.isArray(input)) {
+            throw new ToolRuntimeError(
+              "InvalidToolInput",
+              "tools.$codemode.search expects { query?: string; namespace?: string; limit?: number }.",
+            )
+          }
+          const request = input as { query?: unknown; namespace?: unknown; limit?: unknown }
+          if (request.query !== undefined && typeof request.query !== "string") {
+            throw new ToolRuntimeError(
+              "InvalidToolInput",
+              "tools.$codemode.search query must be a string when provided.",
+            )
+          }
+          if (request.namespace !== undefined && typeof request.namespace !== "string") {
+            throw new ToolRuntimeError(
+              "InvalidToolInput",
+              "tools.$codemode.search namespace must be a string when provided.",
+            )
+          }
+          if (
+            request.limit !== undefined &&
+            (typeof request.limit !== "number" || !Number.isSafeInteger(request.limit) || request.limit <= 0)
+          ) {
+            throw new ToolRuntimeError(
+              "InvalidToolInput",
+              "tools.$codemode.search limit must be a positive safe integer when provided.",
+            )
+          }
+          const query = typeof request.query === "string" ? request.query : ""
+          const namespace = typeof request.namespace === "string" ? request.namespace : undefined
+          const index = yield* recordAndObserve(request)
+          return yield* observeEnd(
+            Effect.try({
+              try: () => {
+                const limit = typeof request.limit === "number" ? request.limit : defaultSearchLimit
+                const scoped =
+                  namespace === undefined ? searchIndex : searchIndex.filter((entry) => entry.namespace === namespace)
+                // A query that names one tool path exactly (canonical path or rendered
+                // JavaScript expression) is a lookup, not a search: return that tool alone.
+                const trimmed = query.trim()
+                const pathQuery = trimmed.startsWith("tools.") ? trimmed.slice("tools.".length) : trimmed
+                const exact =
+                  pathQuery === ""
+                    ? undefined
+                    : scoped.find(
+                        (entry) =>
+                          entry.description.path === pathQuery || toolExpression(entry.description.path) === trimmed,
+                      )
+                const terms = tokenize(query).map(termForms)
+                // Additive field-weighted scoring, summed across terms: exact path or path
+                // segment (20) > path substring (8) > description substring (4) > any
+                // searchable text, incl. input parameter names/descriptions (2). Each term
+                // matches a field when any of its forms (the term or a singular variant)
+                // does. An empty query browses everything, alphabetical by path.
+                const ranked =
+                  exact !== undefined
+                    ? [exact]
+                    : scoped
+                        .map((entry) => {
+                          const path = entry.description.path.toLowerCase()
+                          const description = entry.description.description.toLowerCase()
+                          const score = terms.reduce(
+                            (total, forms) =>
+                              total +
+                              (forms.some((form) => path === form || path.endsWith(`.${form}`)) ? 20 : 0) +
+                              (forms.some((form) => path.includes(form)) ? 8 : 0) +
+                              (forms.some((form) => description.includes(form)) ? 4 : 0) +
+                              (forms.some((form) => entry.searchText.includes(form)) ? 2 : 0),
+                            0,
+                          )
+                          return { entry, score }
+                        })
+                        .filter(({ score }) => terms.length === 0 || score > 0)
+                        .sort(
+                          (left, right) =>
+                            right.score - left.score ||
+                            left.entry.description.path.localeCompare(right.entry.description.path),
+                        )
+                        .map(({ entry }) => entry)
+                // Result paths are rendered as JavaScript expressions so each `path` is
+                // directly usable as the call site (`await tools.github.list({ ... })` or
+                // `await tools.ns["dashed-name"]({ ... })`). The signature is the pretty,
+                // JSDoc-annotated form (schema descriptions and constraints ride along as
+                // field comments).
+                const items = ranked.slice(0, limit).map(({ description, signature }) => ({
+                  ...description,
+                  path: toolExpression(description.path),
+                  signature,
+                }))
+                return copyIn({ items, total: ranked.length }, "Result from tool '$codemode.search'")
+              },
+              catch: (cause) => cause,
+            }),
+            { index, name, input: request },
+          )
+        }
+
+        const tool = resolve(tools, path, searchEnabled)
+        let describedInput: unknown
+        if (isDefinition(tool)) {
+          if (externalArgs.length !== 1)
+            throw new ToolRuntimeError("InvalidToolInput", `Tool '${name}' expects exactly one input object.`)
+          describedInput = yield* Effect.try({
+            try: () => decodeToolInput(tool, externalArgs[0]),
+            catch: (cause) =>
+              new ToolRuntimeError("InvalidToolInput", `Invalid input for tool '${name}': ${String(cause)}`),
+          })
+        }
+        const input = isDefinition(tool) ? describedInput : externalArgs
+        const index = yield* recordAndObserve(input)
+        const currentCall = { index, name, input }
+        if (isDefinition(tool)) {
+          return yield* observeEnd(
+            Effect.gen(function* () {
+              const raw = yield* runHost(Effect.suspend(() => tool.run(describedInput)))
+              const result = yield* Effect.try({
+                try: () => decodeToolOutput(tool, raw),
+                catch: () => new ToolRuntimeError("InvalidToolOutput", `Invalid output from tool '${name}'.`),
+              })
+              return yield* decodeOutput(result, name)
+            }),
+            currentCall,
+          )
+        }
+        return yield* observeEnd(
+          Effect.gen(function* () {
+            return yield* decodeOutput(yield* runHost(Effect.suspend(() => tool(...externalArgs))), name)
+          }),
+          currentCall,
+        )
+      }),
+  }
+}
+
+export * as ToolRuntime from "./tool-runtime.js"
diff --git a/packages/codemode/src/tool.ts b/packages/codemode/src/tool.ts
new file mode 100644
index 0000000000..5a0d84ad52
--- /dev/null
+++ b/packages/codemode/src/tool.ts
@@ -0,0 +1,348 @@
+import { Effect, Schema } from "effect"
+
+/**
+ * JSON Schema subset accepted for render-only tool schemas.
+ *
+ * A JSON-Schema-described side of a tool is used to generate the model-visible TypeScript
+ * signature only - CodeMode performs no validation against it. This is the natural shape for
+ * adapter-provided tools (e.g. MCP definitions) whose schemas arrive as JSON Schema documents.
+ */
+export type JsonSchema = {
+  readonly type?: string | ReadonlyArray<string>
+  readonly enum?: ReadonlyArray<unknown>
+  readonly const?: unknown
+  readonly anyOf?: ReadonlyArray<JsonSchema>
+  readonly oneOf?: ReadonlyArray<JsonSchema>
+  readonly properties?: Readonly<Record<string, JsonSchema>>
+  readonly required?: ReadonlyArray<string>
+  readonly items?: JsonSchema
+  readonly additionalProperties?: boolean | JsonSchema
+  readonly description?: string
+  readonly default?: unknown
+  readonly format?: string
+  readonly deprecated?: boolean
+  readonly minItems?: number
+  readonly maxItems?: number
+  readonly $ref?: string
+  readonly $defs?: Readonly<Record<string, JsonSchema>>
+  readonly definitions?: Readonly<Record<string, JsonSchema>>
+}
+
+/** Either a validating Effect Schema or a render-only JSON Schema document. */
+export type ToolSchema = Schema.Decoder<unknown> | JsonSchema
+
+/** Schema-backed tool definition consumed by a CodeMode tool tree. */
+export type Definition<R = never> = {
+  readonly _tag: "CodeModeTool"
+  readonly description: string
+  readonly input: ToolSchema
+  readonly output: ToolSchema | undefined
+  readonly run: (input: unknown) => Effect.Effect<unknown, unknown, R>
+}
+
+/** The value `run` receives: the decoded type for Effect Schemas, `unknown` for JSON Schemas. */
+export type InputType<S> = S extends Schema.Decoder<unknown> ? S["Type"] : unknown
+
+/** The value `run` returns: the encoded type for Effect Schemas, `unknown` otherwise. */
+export type ResultType<S> = S extends Schema.Decoder<unknown> ? S["Encoded"] : unknown
+
+/** Options for defining one CodeMode tool. */
+export type Options<I extends ToolSchema, O extends ToolSchema | undefined, R = never> = {
+  readonly description: string
+  readonly input: I
+  readonly output?: O
+  readonly run: (input: InputType<I>) => Effect.Effect<ResultType<O>, unknown, R>
+}
+
+export const isDefinition = <R = never>(value: unknown): value is Definition<R> =>
+  typeof value === "object" && value !== null && "_tag" in value && value._tag === "CodeModeTool"
+
+const isEffectSchema = (schema: ToolSchema): schema is Schema.Decoder<unknown> & Schema.Top => Schema.isSchema(schema)
+
+const renderLiteral = (value: unknown): string => JSON.stringify(value) ?? "unknown"
+
+/**
+ * Bare TypeScript identifier - usable unquoted as an object key (and, in the tool runtime,
+ * with dot access as a tool-path segment). Anything else must be quoted/bracketed.
+ */
+export const identifierSegment = /^[A-Za-z_$][A-Za-z0-9_$]*$/
+
+/** Renders a property name as a valid TS object key: bare when an identifier, quoted otherwise. */
+const renderKey = (name: string): string => (identifierSegment.test(name) ? name : JSON.stringify(name))
+
+const effectNumberSentinel = (schema: JsonSchema) =>
+  schema.type === "string" &&
+  Array.isArray(schema.enum) &&
+  schema.enum.length === 1 &&
+  (schema.enum[0] === "NaN" || schema.enum[0] === "Infinity" || schema.enum[0] === "-Infinity")
+
+/**
+ * Recursion ceiling for schema rendering. Object, array, and union recursion all increment
+ * depth, so this bounds every recursion path - pathological or structurally cyclic schemas
+ * degrade to `unknown` instead of overflowing the stack (rendering must never throw).
+ */
+const MAX_RENDER_DEPTH = 8
+
+type RenderContext = {
+  readonly definitions: Readonly<Record<string, JsonSchema>>
+  /** Indented, JSDoc-annotated multiline rendering (search results); compact single line otherwise. */
+  readonly pretty: boolean
+}
+
+/**
+ * Schema constraints a TypeScript type cannot express natively but a model benefits from,
+ * surfaced as JSDoc tags (`@deprecated`, `@default`, `@format`, `@minItems`, `@maxItems`).
+ */
+const docTags = (schema: JsonSchema): Array<string> => {
+  const tags: Array<string> = []
+  if (schema.deprecated === true) tags.push("@deprecated")
+  if (schema.default !== undefined) {
+    try {
+      const rendered = JSON.stringify(schema.default)
+      if (rendered !== undefined) tags.push(`@default ${rendered}`)
+    } catch {
+      // unserializable default: skip rather than emit a broken tag
+    }
+  }
+  if (typeof schema.format === "string") tags.push(`@format ${schema.format}`)
+  if (typeof schema.minItems === "number") tags.push(`@minItems ${schema.minItems}`)
+  if (typeof schema.maxItems === "number") tags.push(`@maxItems ${schema.maxItems}`)
+  return tags
+}
+
+/**
+ * Format a schema `description` plus `tags` as a JSDoc comment at the given indent,
+ * preserving multi-line text (a single line stays `/** ... *\/`; multiple lines become a
+ * `*`-prefixed block). `*\/` is neutralized so nothing can close the comment early, and
+ * blank leading/trailing lines are trimmed. Returns "" (else a trailing newline) so
+ * callers can prepend it directly to the field line.
+ */
+const jsdoc = (description: string | undefined, tags: ReadonlyArray<string>, pad: string): string => {
+  const lines = [...(description === undefined ? [] : description.split("\n")), ...tags].map((line) =>
+    line.replaceAll("*/", "* /").replace(/\s+$/, ""),
+  )
+  while (lines.length > 0 && lines[0]!.trim() === "") lines.shift()
+  while (lines.length > 0 && lines[lines.length - 1]!.trim() === "") lines.pop()
+  if (lines.length === 0) return ""
+  if (lines.length === 1) return `${pad}/** ${lines[0]} */\n`
+  const body = lines.map((line) => `${pad} *${line === "" ? "" : ` ${line}`}`).join("\n")
+  return `${pad}/**\n${body}\n${pad} */\n`
+}
+
+const renderSchema = (
+  schema: JsonSchema,
+  ctx: RenderContext,
+  depth = 0,
+  seen: ReadonlySet<string> = new Set(),
+): string => {
+  if (depth > MAX_RENDER_DEPTH) return "unknown"
+  if (schema.$ref) {
+    const name = schema.$ref.split("/").pop()
+    if (!name || !ctx.definitions[name]) return name ?? "unknown"
+    if (seen.has(name)) return name // recursive type: reference by name rather than loop
+    return renderSchema(ctx.definitions[name], ctx, depth, new Set([...seen, name]))
+  }
+  if (schema.const !== undefined) return renderLiteral(schema.const)
+  if (schema.enum) return schema.enum.map(renderLiteral).join(" | ")
+  const alternatives = schema.anyOf ?? schema.oneOf
+  if (alternatives) {
+    // Effect's number schema emits `anyOf: [{ type: "number" }, { const: "NaN" },
+    // { const: "Infinity" }, { const: "-Infinity" }]`. Collapse only that artifact;
+    // real JSON Schema unions such as `string | number` or `number | null` must keep
+    // every branch.
+    if (
+      alternatives.some((item) => item.type === "number") &&
+      alternatives.every((item) => item.type === "number" || effectNumberSentinel(item))
+    )
+      return "number"
+    // An empty Schema.Struct({}) emits `anyOf: [{ type: "object" }, { type: "array" }]`
+    // (no properties/items); render the bare shape as {} instead of `{} | Array<unknown>`.
+    if (
+      alternatives.length === 2 &&
+      alternatives[0]?.type === "object" &&
+      alternatives[0].properties === undefined &&
+      alternatives[1]?.type === "array" &&
+      alternatives[1].items === undefined
+    ) {
+      return "{}"
+    }
+    return alternatives.map((item) => renderSchema(item, ctx, depth + 1, seen)).join(" | ")
+  }
+  if (Array.isArray(schema.type)) {
+    return schema.type.map((item) => renderSchema({ type: item }, ctx, depth + 1, seen)).join(" | ")
+  }
+  if (schema.type === "string") return "string"
+  if (schema.type === "number" || schema.type === "integer") return "number"
+  if (schema.type === "boolean") return "boolean"
+  if (schema.type === "null") return "null"
+  if (schema.type === "array") return `Array<${renderSchema(schema.items ?? {}, ctx, depth + 1, seen)}>`
+  if (schema.type === "object" || schema.properties) {
+    const required = new Set(schema.required ?? [])
+    const properties = Object.entries(schema.properties ?? {})
+    const additional = schema.additionalProperties
+    const indexType =
+      additional && typeof additional === "object" ? renderSchema(additional, ctx, depth + 1, seen) : undefined
+    const field = ([name, value]: readonly [string, JsonSchema]) =>
+      `${renderKey(name)}${required.has(name) ? "" : "?"}: ${renderSchema(value, ctx, depth + 1, seen)}`
+
+    if (!ctx.pretty) {
+      const fields = properties.map(field)
+      if (indexType !== undefined) fields.push(`[key: string]: ${indexType}`)
+      return fields.length === 0 ? "{}" : `{ ${fields.join("; ")} }`
+    }
+
+    // Pretty: an indented block, each described field preceded by its JSDoc comment.
+    if (properties.length === 0 && indexType === undefined) return "{}"
+    const pad = "  ".repeat(depth + 1)
+    const lines = properties.map(
+      (entry) => `${jsdoc(entry[1].description, docTags(entry[1]), pad)}${pad}${field(entry)}`,
+    )
+    if (indexType !== undefined) lines.push(`${pad}[key: string]: ${indexType}`)
+    return `{\n${lines.join("\n")}\n${"  ".repeat(depth)}}`
+  }
+  return "unknown"
+}
+
+export const toTypeScript = (schema: Schema.Top, decoded = false, pretty = false): string => {
+  try {
+    const visible = decoded ? Schema.toType(schema) : schema
+    const document = Schema.toJsonSchemaDocument(visible) as {
+      readonly schema: JsonSchema
+      readonly definitions?: Readonly<Record<string, JsonSchema>>
+    }
+    return renderSchema(document.schema, { definitions: document.definitions ?? {}, pretty })
+  } catch {
+    return "unknown"
+  }
+}
+
+/** Renders a raw JSON Schema document as a TypeScript type string. */
+export const jsonSchemaToTypeScript = (schema: JsonSchema, pretty = false): string => {
+  try {
+    return renderSchema(schema, { definitions: { ...(schema.definitions ?? {}), ...(schema.$defs ?? {}) }, pretty })
+  } catch {
+    return "unknown"
+  }
+}
+
+/** One input property of a tool, extracted best-effort from its input schema. */
+export type InputProperty = {
+  readonly name: string
+  readonly description: string | undefined
+  readonly required: boolean
+}
+
+/**
+ * The property names, descriptions, and required flags of a tool's input schema - the raw
+ * material for search text. Best-effort: Effect Schemas go through their
+ * JSON Schema document (the same emission signature rendering uses); JSON Schemas are read
+ * directly, resolving a trivial top-level `$ref` into `$defs`/`definitions` when present.
+ * Anything unresolvable yields `[]` (search falls back to path + description).
+ */
+export const inputProperties = <R>(definition: Definition<R>): Array<InputProperty> => {
+  try {
+    const document = isEffectSchema(definition.input)
+      ? (Schema.toJsonSchemaDocument(definition.input) as {
+          readonly schema: JsonSchema
+          readonly definitions?: Readonly<Record<string, JsonSchema>>
+        })
+      : {
+          schema: definition.input,
+          definitions: { ...(definition.input.definitions ?? {}), ...(definition.input.$defs ?? {}) },
+        }
+    const definitions = document.definitions ?? {}
+    let schema = document.schema
+    if (schema.$ref !== undefined) {
+      const name = schema.$ref.split("/").pop()
+      const resolved = name === undefined ? undefined : definitions[name]
+      if (resolved === undefined) return []
+      schema = resolved
+    }
+    const required = new Set(schema.required ?? [])
+    return Object.entries(schema.properties ?? {}).map(([name, value]) => ({
+      name,
+      description: typeof value.description === "string" ? value.description : undefined,
+      required: required.has(name),
+    }))
+  } catch {
+    return []
+  }
+}
+
+/**
+ * The model-visible TypeScript type of a tool's input. `pretty` renders an indented
+ * multiline block with schema descriptions and constraints as JSDoc comments on the
+ * fields; the default stays the compact single-line form.
+ */
+export const inputTypeScript = <R>(definition: Definition<R>, pretty = false): string =>
+  isEffectSchema(definition.input)
+    ? toTypeScript(definition.input, false, pretty)
+    : jsonSchemaToTypeScript(definition.input, pretty)
+
+/**
+ * The model-visible TypeScript type of a tool's result; tools without an output schema
+ * return `unknown`. `pretty` renders the JSDoc-annotated multiline form, as for inputs.
+ */
+export const outputTypeScript = <R>(definition: Definition<R>, pretty = false): string =>
+  definition.output === undefined
+    ? "unknown"
+    : isEffectSchema(definition.output)
+      ? toTypeScript(definition.output, true, pretty)
+      : jsonSchemaToTypeScript(definition.output, pretty)
+
+/**
+ * Decodes tool input before `run` is invoked. Effect Schemas validate (throwing on failure);
+ * JSON-Schema-described inputs pass through unvalidated (render-only).
+ */
+export const decodeInput = <R>(definition: Definition<R>, value: unknown): unknown =>
+  isEffectSchema(definition.input) ? Schema.decodeUnknownSync(definition.input)(value) : value
+
+/**
+ * Decodes a tool result before it is exposed to the program. Effect Schemas validate and
+ * transform (throwing on failure); JSON Schema outputs and tools without an output schema pass
+ * the host value through unchanged.
+ */
+export const decodeOutput = <R>(definition: Definition<R>, value: unknown): unknown =>
+  definition.output !== undefined && isEffectSchema(definition.output)
+    ? Schema.decodeUnknownSync(definition.output)(value)
+    : value
+
+/**
+ * Defines one schema-described tool available to a CodeMode program through `tools.*`.
+ *
+ * `input` and `output` each accept a validating Effect Schema or a render-only JSON Schema
+ * document. Effect Schema input is decoded before `run` is invoked, and `run` returns the
+ * encoded representation of an Effect Schema `output`, which CodeMode decodes before returning
+ * it to the program. JSON Schemas only shape the model-visible signature; values pass through
+ * unvalidated. `output` is optional - without it the signature advertises `unknown` and the
+ * host result is exposed as-is. The host tool remains responsible for authorization and
+ * durable side-effect handling.
+ *
+ * @example
+ * ```ts
+ * const lookup = Tool.make({
+ *   description: "Look up an order",
+ *   input: Schema.Struct({ id: Schema.String }),
+ *   output: Schema.Struct({ status: Schema.String }),
+ *   run: ({ id }) => Effect.succeed({ status: "open" }),
+ * })
+ *
+ * const fromJsonSchema = Tool.make({
+ *   description: "Call an adapter-described tool",
+ *   input: { type: "object", properties: { id: { type: "string" } }, required: ["id"] },
+ *   run: (input) => callHost(input),
+ * })
+ * ```
+ */
+export const make = <I extends ToolSchema, const O extends ToolSchema | undefined = undefined, R = never>(
+  options: Options<I, O, R>,
+): Definition<R> => ({
+  _tag: "CodeModeTool",
+  description: options.description,
+  input: options.input,
+  output: options.output,
+  run: (input) => options.run(input as InputType<I>),
+})
+
+/** Constructors for schema-backed tools exposed inside CodeMode programs. */
+export const Tool = { make, isDefinition }
diff --git a/packages/codemode/src/values.ts b/packages/codemode/src/values.ts
new file mode 100644
index 0000000000..07f22adb8a
--- /dev/null
+++ b/packages/codemode/src/values.ts
@@ -0,0 +1,34 @@
+import type { Effect, Fiber } from "effect"
+
+export class SandboxPromise {
+  interrupted = false
+  constructor(
+    readonly fiber: Fiber.Fiber<unknown, unknown> | undefined,
+    readonly immediate?: Effect.Effect<unknown, unknown>,
+  ) {}
+}
+
+export class SandboxDate {
+  constructor(readonly time: number) {}
+}
+
+export class SandboxRegExp {
+  readonly regex: RegExp
+  constructor(pattern: string, flags: string) {
+    this.regex = new RegExp(pattern, flags)
+  }
+}
+
+export class SandboxMap {
+  readonly map = new Map<unknown, unknown>()
+}
+
+export class SandboxSet {
+  readonly set = new Set<unknown>()
+}
+
+export const isSandboxValue = (value: unknown): value is SandboxDate | SandboxRegExp | SandboxMap | SandboxSet =>
+  value instanceof SandboxDate ||
+  value instanceof SandboxRegExp ||
+  value instanceof SandboxMap ||
+  value instanceof SandboxSet
diff --git a/packages/codemode/test/codemode.test.ts b/packages/codemode/test/codemode.test.ts
new file mode 100644
index 0000000000..eaa834e0a4
--- /dev/null
+++ b/packages/codemode/test/codemode.test.ts
@@ -0,0 +1,1110 @@
+import { describe, expect, test } from "bun:test"
+import { Cause, Effect, Schema } from "effect"
+import {
+  CodeMode,
+  ExecuteInputSchema,
+  ExecuteResultSchema,
+  Tool,
+  toolError,
+  type ExecutionLimits,
+} from "../src/index.js"
+import type { Definition } from "../src/tool.js"
+
+const run = (tool: Definition<never>) =>
+  Effect.runPromise(CodeMode.make({ tools: { host: { call: tool } } }).execute("return await tools.host.call({})"))
+
+class UnsafeHostError extends Schema.TaggedErrorClass<UnsafeHostError>()("UnsafeHostError", {
+  reason: Schema.String,
+}) {}
+
+describe("CodeMode host failure boundary", () => {
+  test("preserves explicit safe tool failures", async () => {
+    const result = await run(
+      Tool.make({
+        description: "Fail safely",
+        input: Schema.Struct({}),
+        output: Schema.String,
+        run: () => Effect.fail(toolError("Authorized request was refused")),
+      }),
+    )
+
+    expect(result.ok ? undefined : result.error).toStrictEqual({
+      kind: "ToolFailure",
+      message: "Authorized request was refused",
+    })
+  })
+
+  test("sanitizes unknown host failures and defects", async () => {
+    for (const failure of [
+      Effect.fail(new UnsafeHostError({ reason: "Authorization: Bearer typed-secret" })),
+      Effect.die(new Error("postgres://user:defect-secret@example.invalid")),
+    ]) {
+      const result = await run(
+        Tool.make({
+          description: "Fail internally",
+          input: Schema.Struct({}),
+          output: Schema.String,
+          run: () => failure,
+        }),
+      )
+
+      expect(result.ok ? undefined : result.error).toStrictEqual({
+        kind: "ToolFailure",
+        message: "Tool execution failed",
+      })
+      expect(JSON.stringify(result)).not.toMatch(/typed-secret|defect-secret|Authorization: Bearer/)
+    }
+  })
+
+  test("sanitizes invalid host output", async () => {
+    const secret = "invalid-output-secret"
+    const result = await run(
+      Tool.make({
+        description: "Return invalid output",
+        input: Schema.Struct({}),
+        output: Schema.Struct({ safe: Schema.String }),
+        run: () => Effect.succeed({ safe: 1, secret } as unknown as { readonly safe: string }),
+      }),
+    )
+
+    expect(result.ok ? undefined : result.error).toStrictEqual({
+      kind: "InvalidToolOutput",
+      message: "Invalid output from tool 'host.call'.",
+    })
+    expect(JSON.stringify(result)).not.toMatch(/invalid-output-secret/)
+  })
+
+  test("sanitizes host output that throws while being copied", async () => {
+    const result = await run(
+      Tool.make({
+        description: "Return hostile output",
+        input: Schema.Struct({}),
+        output: Schema.Unknown,
+        run: () =>
+          Effect.succeed(
+            new Proxy(
+              {},
+              {
+                ownKeys: () => {
+                  throw new Error("host-output-secret")
+                },
+              },
+            ),
+          ),
+      }),
+    )
+
+    expect(result.ok ? undefined : result.error).toStrictEqual({
+      kind: "InvalidToolOutput",
+      message: "Invalid output from tool 'host.call'.",
+    })
+    expect(JSON.stringify(result)).not.toMatch(/host-output-secret/)
+  })
+
+  test("caught tool failures are Error values in-program", async () => {
+    const result = await Effect.runPromise(
+      CodeMode.make({
+        tools: {
+          host: {
+            call: Tool.make({
+              description: "Refuse",
+              input: Schema.Struct({}),
+              output: Schema.String,
+              run: () => Effect.fail(toolError("Refused")),
+            }),
+          },
+        },
+      }).execute(`
+        try {
+          await tools.host.call({})
+          return "no"
+        } catch (e) {
+          return { isError: e instanceof Error, message: e.message }
+        }
+      `),
+    )
+
+    expect(result.ok).toBe(true)
+    if (result.ok) expect(result.value).toStrictEqual({ isError: true, message: "Refused" })
+  })
+
+  test("propagates host interruption instead of returning a diagnostic", async () => {
+    const exit = await Effect.runPromiseExit(
+      CodeMode.make({
+        tools: {
+          host: {
+            call: Tool.make({
+              description: "Interrupt",
+              input: Schema.Struct({}),
+              output: Schema.String,
+              run: () => Effect.interrupt,
+            }),
+          },
+        },
+      }).execute("return await tools.host.call({})"),
+    )
+
+    expect(exit._tag).toBe("Failure")
+    if (exit._tag === "Failure") {
+      expect(Cause.hasInterruptsOnly(exit.cause)).toBe(true)
+    }
+  })
+})
+
+describe("CodeMode tool-call observation", () => {
+  test("reports the tools actually invoked with decoded input", async () => {
+    const calls: Array<unknown> = []
+    const lookup = Tool.make({
+      description: "Look up a value",
+      input: Schema.Struct({ query: Schema.String }),
+      output: Schema.String,
+      run: ({ query }) => Effect.succeed(query),
+    })
+
+    const result = await Effect.runPromise(
+      CodeMode.make({
+        tools: { context: { lookup } },
+        onToolCallStart: (call) => Effect.sync(() => calls.push(call)),
+      }).execute(`
+        if (false) await tools.context.lookup({ query: "not called" })
+        return await tools.context.lookup({ query: "deployment failure" })
+      `),
+    )
+
+    expect(result.ok).toBe(true)
+    expect(calls).toStrictEqual([{ index: 0, name: "context.lookup", input: { query: "deployment failure" } }])
+  })
+
+  test("observes settled calls with outcome and duration", async () => {
+    const events: Array<{ phase: string; index: number; name: string; outcome?: string; message?: string }> = []
+    const lookup = Tool.make({
+      description: "Look up a value",
+      input: Schema.Struct({ query: Schema.String }),
+      output: Schema.String,
+      run: ({ query }) => (query === "boom" ? Effect.fail(toolError("Lookup refused")) : Effect.succeed(query)),
+    })
+
+    const runtime = CodeMode.make({
+      tools: { context: { lookup } },
+      onToolCallStart: (call) =>
+        Effect.sync(() => {
+          events.push({ phase: "start", index: call.index, name: call.name })
+        }),
+      onToolCallEnd: (call) =>
+        Effect.sync(() => {
+          expect(call.durationMs).toBeGreaterThanOrEqual(0)
+          events.push({
+            phase: "end",
+            index: call.index,
+            name: call.name,
+            outcome: call.outcome,
+            ...(call.message === undefined ? {} : { message: call.message }),
+          })
+        }),
+    })
+
+    const success = await Effect.runPromise(runtime.execute(`return await tools.context.lookup({ query: "ok" })`))
+    expect(success.ok).toBe(true)
+    const failure = await Effect.runPromise(runtime.execute(`return await tools.context.lookup({ query: "boom" })`))
+    expect(failure.ok).toBe(false)
+
+    expect(events).toStrictEqual([
+      { phase: "start", index: 0, name: "context.lookup" },
+      { phase: "end", index: 0, name: "context.lookup", outcome: "success" },
+      { phase: "start", index: 0, name: "context.lookup" },
+      { phase: "end", index: 0, name: "context.lookup", outcome: "failure", message: "Lookup refused" },
+    ])
+  })
+})
+
+describe("CodeMode console capture", () => {
+  test("captures console output as bounded result logs", async () => {
+    const result = await Effect.runPromise(
+      CodeMode.execute({
+        code: `
+        const returned = console.log("Thread info:", { name: "Demo", count: 2 })
+        console.warn("careful")
+        return returned
+      `,
+      }),
+    )
+
+    expect(result).toStrictEqual({
+      ok: true,
+      value: null,
+      logs: ['Thread info: {"name":"Demo","count":2}', "[warn] careful"],
+      toolCalls: [],
+    })
+    expect(Schema.decodeUnknownSync(ExecuteResultSchema)(JSON.parse(JSON.stringify(result)))).toStrictEqual(result)
+  })
+
+  test("keeps logs captured before failures", async () => {
+    const result = await Effect.runPromise(
+      CodeMode.execute({
+        code: `
+        console.log("before failure")
+        throw new Error("boom")
+      `,
+      }),
+    )
+
+    expect(result.ok ? undefined : result.logs).toStrictEqual(["before failure"])
+    expect(result.ok ? undefined : result.error.message).toBe("Uncaught: boom")
+  })
+
+  test("prints NaN and Infinity literally instead of the JSON null", async () => {
+    const result = await Effect.runPromise(
+      CodeMode.execute({
+        code: `
+        console.log(NaN)
+        console.log(Infinity, -Infinity)
+        console.log({ ratio: NaN, bounds: [Infinity] })
+        return null
+      `,
+      }),
+    )
+
+    expect(result.ok).toBe(true)
+    expect(result.logs).toStrictEqual(["NaN", "Infinity -Infinity", '{"ratio":NaN,"bounds":[Infinity]}'])
+  })
+
+  test("renders sandbox values nested inside logged containers", async () => {
+    const result = await Effect.runPromise(
+      CodeMode.execute({
+        code: `
+        console.log({ m: new Map([["a", 1]]), when: new Date(0), r: /ab/g, s: new Set([1, 2]) })
+        console.log([new Date(0)])
+        return null
+      `,
+      }),
+    )
+
+    expect(result.ok).toBe(true)
+    expect(result.logs).toStrictEqual([
+      '{"m":Map(1) [["a",1]],"when":1970-01-01T00:00:00.000Z,"r":/ab/g,"s":Set(2) [1,2]}',
+      "[1970-01-01T00:00:00.000Z]",
+    ])
+  })
+
+  test("console formatting is total: cycles and opaque references render as markers", async () => {
+    const result = await Effect.runPromise(
+      CodeMode.execute({
+        code: `
+        const m = new Map()
+        m.set("self", m)
+        console.log({ box: m })
+        console.log({ fn: (x) => x, ok: 1 })
+        return null
+      `,
+      }),
+    )
+
+    expect(result.ok).toBe(true)
+    expect(result.logs).toStrictEqual(['{"box":Map(1) [["self",[Circular]]]}', '{"fn":[CodeMode reference],"ok":1}'])
+  })
+
+  test("console.table renders sandbox value cells", async () => {
+    const result = await Effect.runPromise(
+      CodeMode.execute({
+        code: `
+        console.table([{ when: new Date(0), n: NaN }])
+        return null
+      `,
+      }),
+    )
+
+    expect(result.ok).toBe(true)
+    expect(result.logs).toStrictEqual(["(index)\twhen\tn\n0\t1970-01-01T00:00:00.000Z\tNaN"])
+  })
+
+  test("captures console.dir and console.table output", async () => {
+    const result = await Effect.runPromise(
+      CodeMode.execute({
+        code: `
+        console.dir({ nested: { ok: true } })
+        console.table([
+          { name: "Kit", count: 1, hidden: "x" },
+          { name: "Olive", count: 2, hidden: "y" }
+        ], ["name", "count"])
+        return "done"
+      `,
+      }),
+    )
+
+    expect(result).toStrictEqual({
+      ok: true,
+      value: "done",
+      logs: ['{"nested":{"ok":true}}', "(index)\tname\tcount\n0\tKit\t1\n1\tOlive\t2"],
+      toolCalls: [],
+    })
+  })
+})
+
+describe("CodeMode output budget", () => {
+  test("absent maxOutputBytes means no truncation at all", async () => {
+    const result = await Effect.runPromise(
+      CodeMode.execute({
+        code: `console.log("z".repeat(50_000)); return "x".repeat(100_000)`,
+      }),
+    )
+
+    expect(result.ok).toBe(true)
+    if (!result.ok) return
+    expect(result.truncated).toBeUndefined()
+    expect(result.value).toBe("x".repeat(100_000))
+    expect(result.logs).toStrictEqual(["z".repeat(50_000)])
+  })
+
+  test("truncates an oversized result value with a marker instead of failing", async () => {
+    const limits: ExecutionLimits = { maxOutputBytes: 40 }
+    const result = await Effect.runPromise(
+      CodeMode.execute({
+        code: `return { data: "${"x".repeat(200)}" }`,
+        limits,
+      }),
+    )
+
+    expect(result.ok).toBe(true)
+    if (!result.ok) return
+    expect(result.truncated).toBe(true)
+    expect(typeof result.value).toBe("string")
+    expect(result.value).toMatch(
+      /^\{"data":"x+ \[result truncated: \d+ bytes exceeds the 40-byte output limit; return a smaller value\]$/,
+    )
+    expect(Schema.decodeUnknownSync(ExecuteResultSchema)(JSON.parse(JSON.stringify(result)))).toStrictEqual(result)
+  })
+
+  test("keeps leading logs within the remaining budget and marks the cut", async () => {
+    const limits: ExecutionLimits = { maxOutputBytes: 40 }
+    const result = await Effect.runPromise(
+      CodeMode.execute({
+        code: `
+        console.log("first line")
+        console.log("${"y".repeat(200)}")
+        return "ok"
+      `,
+        limits,
+      }),
+    )
+
+    expect(result.ok).toBe(true)
+    if (!result.ok) return
+    expect(result.value).toBe("ok")
+    expect(result.truncated).toBe(true)
+    expect(result.logs).toStrictEqual(["first line", "[logs truncated: showing 1 of 2 lines]"])
+  })
+
+  test("does not mark results within the budget", async () => {
+    const result = await Effect.runPromise(
+      CodeMode.execute({
+        code: `
+        console.log("fits")
+        return { fits: true }
+      `,
+      }),
+    )
+    expect(result).toStrictEqual({
+      ok: true,
+      value: { fits: true },
+      logs: ["fits"],
+      toolCalls: [],
+    })
+  })
+})
+
+describe("CodeMode schema flexibility", () => {
+  test("accepts render-only JSON Schema input and omitted output", async () => {
+    const observed: Array<unknown> = []
+    const call = Tool.make({
+      description: "Call an adapter-described tool",
+      input: {
+        type: "object",
+        properties: { id: { type: "string" }, count: { type: "number" } },
+        required: ["id"],
+      },
+      run: (input) =>
+        Effect.sync(() => {
+          observed.push(input)
+          return { echoed: input }
+        }),
+    })
+    const runtime = CodeMode.make({ tools: { adapter: { call } } })
+
+    expect(runtime.catalog()).toStrictEqual([
+      {
+        path: "adapter.call",
+        description: "Call an adapter-described tool",
+        signature: "tools.adapter.call(input: { id: string; count?: number }): Promise<unknown>",
+      },
+    ])
+
+    // JSON Schema is render-only: mistyped input passes through unvalidated.
+    const result = await Effect.runPromise(runtime.execute(`return await tools.adapter.call({ id: 42 })`))
+    expect(result.ok).toBe(true)
+    if (result.ok) expect(result.value).toStrictEqual({ echoed: { id: 42 } })
+    expect(observed).toStrictEqual([{ id: 42 }])
+  })
+
+  test("renders JSON Schema outputs and $defs references", async () => {
+    const lookup = Tool.make({
+      description: "Look up a user",
+      input: { type: "object", properties: { login: { type: "string" } }, required: ["login"] },
+      output: {
+        $ref: "#/$defs/User",
+        $defs: {
+          User: {
+            type: "object",
+            properties: { login: { type: "string" }, id: { type: "number" } },
+            required: ["login", "id"],
+          },
+        },
+      },
+      run: () => Effect.succeed({ login: "kit", id: 7 }),
+    })
+    const runtime = CodeMode.make({ tools: { users: { lookup } } })
+
+    expect(runtime.catalog()).toStrictEqual([
+      {
+        path: "users.lookup",
+        description: "Look up a user",
+        signature: "tools.users.lookup(input: { login: string }): Promise<{ login: string; id: number }>",
+      },
+    ])
+
+    const result = await Effect.runPromise(runtime.execute(`return await tools.users.lookup({ login: "kit" })`))
+    expect(result.ok).toBe(true)
+    if (result.ok) expect(result.value).toStrictEqual({ login: "kit", id: 7 })
+  })
+
+  test("Effect Schema output without an input transform still renders unknown when omitted", async () => {
+    const ping = Tool.make({
+      description: "Ping",
+      input: Schema.Struct({ host: Schema.String }),
+      run: () => Effect.succeed("pong"),
+    })
+    const runtime = CodeMode.make({ tools: { net: { ping } } })
+    expect(runtime.catalog()[0]?.signature).toBe("tools.net.ping(input: { host: string }): Promise<unknown>")
+
+    const result = await Effect.runPromise(runtime.execute(`return await tools.net.ping({ host: "example.test" })`))
+    expect(result.ok).toBe(true)
+    if (result.ok) expect(result.value).toBe("pong")
+  })
+})
+
+describe("CodeMode public contract", () => {
+  const lookup = Tool.make({
+    description: "Look up an order by ID",
+    input: Schema.Struct({ id: Schema.String }),
+    output: Schema.Struct({ id: Schema.String, status: Schema.String }),
+    run: ({ id }) => Effect.succeed({ id, status: "open" }),
+  })
+  const tools = { orders: { lookup } }
+  const source = `return await tools.orders.lookup({ id: "order_42" })`
+
+  test("keeps one-shot, reusable, and agent-tool execution equivalent", async () => {
+    const runtime = CodeMode.make({ tools })
+    const agentTool = runtime.agentTool()
+    const [oneShot, reusable, projected] = await Promise.all([
+      Effect.runPromise(CodeMode.execute({ tools, code: source })),
+      Effect.runPromise(runtime.execute(source)),
+      Effect.runPromise(agentTool.execute({ code: source })),
+    ])
+
+    expect(reusable).toStrictEqual(oneShot)
+    expect(projected).toStrictEqual(oneShot)
+    expect(agentTool.name).toBe("code")
+    expect(agentTool.input).toBe(ExecuteInputSchema)
+    expect(agentTool.output).toBe(ExecuteResultSchema)
+    expect(agentTool.description).toBe(runtime.instructions())
+    expect(Schema.decodeUnknownSync(ExecuteResultSchema)(JSON.parse(JSON.stringify(projected)))).toStrictEqual(
+      projected,
+    )
+  })
+
+  test("inlines a COMPLETE small catalog and keeps search registered but unadvertised", async () => {
+    const runtime = CodeMode.make({ tools })
+    expect(runtime.catalog()).toStrictEqual([
+      {
+        path: "orders.lookup",
+        description: "Look up an order by ID",
+        signature: "tools.orders.lookup(input: { id: string }): Promise<{ id: string; status: string }>",
+      },
+    ])
+    expect(runtime.instructions()).toContain("Available tools (COMPLETE list")
+    expect(runtime.instructions()).toContain("- orders (1 tool)")
+    expect(runtime.instructions()).toContain(
+      "  - tools.orders.lookup(input: { id: string }): Promise<{ id: string; status: string }> // Look up an order by ID",
+    )
+    // A fully inlined catalog does not advertise search in the instructions...
+    expect(runtime.instructions()).not.toMatch(/\$codemode/)
+
+    // ...but the search tool stays registered, so a speculative call still works. Search
+    // results carry the pretty multiline signature; the inline catalog stays compact.
+    const result = await Effect.runPromise(runtime.execute(`return await tools.$codemode.search({ query: "order" })`))
+    expect(result.ok).toBe(true)
+    if (result.ok) {
+      expect(result.value).toStrictEqual({
+        items: [
+          {
+            path: "tools.orders.lookup",
+            description: "Look up an order by ID",
+            signature: "tools.orders.lookup(input: {\n  id: string\n}): Promise<{\n  id: string\n  status: string\n}>",
+          },
+        ],
+        total: 1,
+      })
+    }
+  })
+
+  test("renders bracket notation for tool names that are not JavaScript identifiers", async () => {
+    const resolveLibrary = Tool.make({
+      description: "Resolve a library ID",
+      input: Schema.Struct({ libraryName: Schema.String }),
+      output: Schema.String,
+      run: ({ libraryName }) => Effect.succeed(`/resolved/${libraryName}`),
+    })
+    const runtime = CodeMode.make({ tools: { context7: { "resolve-library-id": resolveLibrary } } })
+
+    expect(runtime.catalog()).toStrictEqual([
+      {
+        path: "context7.resolve-library-id",
+        description: "Resolve a library ID",
+        signature: 'tools.context7["resolve-library-id"](input: { libraryName: string }): Promise<string>',
+      },
+    ])
+    expect(runtime.instructions()).toContain(
+      'tools.context7["resolve-library-id"](input: { libraryName: string }): Promise<string>',
+    )
+
+    const search = await Effect.runPromise(
+      runtime.execute(`return await tools.$codemode.search({ query: "resolve library id" })`),
+    )
+    expect(search.ok).toBe(true)
+    if (search.ok) {
+      expect(search.value).toStrictEqual({
+        items: [
+          {
+            path: 'tools.context7["resolve-library-id"]',
+            description: "Resolve a library ID",
+            signature: 'tools.context7["resolve-library-id"](input: {\n  libraryName: string\n}): Promise<string>',
+          },
+        ],
+        total: 1,
+      })
+    }
+
+    const call = await Effect.runPromise(
+      runtime.execute(`return await tools.context7["resolve-library-id"]({ libraryName: "TypeScript" })`),
+    )
+    expect(call.ok).toBe(true)
+    if (call.ok) expect(call.value).toBe("/resolved/TypeScript")
+
+    const exact = await Effect.runPromise(
+      runtime.execute(`return await tools.$codemode.search({ query: 'tools.context7["resolve-library-id"]' })`),
+    )
+    expect(exact.ok).toBe(true)
+    if (exact.ok) expect((exact.value as { total: number }).total).toBe(1)
+  })
+
+  test("instructions use markdown sections with placeholder-only call forms", () => {
+    const runtime = CodeMode.make({ tools })
+    const instructions = runtime.instructions()
+    // Sections in order: workflow at the top, catalog at the bottom.
+    expect(instructions).toContain("## Workflow")
+    expect(instructions).toContain("## Rules")
+    expect(instructions).toContain("## Syntax")
+    expect(instructions.indexOf("## Workflow")).toBeLessThan(instructions.indexOf("## Rules"))
+    expect(instructions.indexOf("## Rules")).toBeLessThan(instructions.indexOf("## Syntax"))
+    expect(instructions.indexOf("## Syntax")).toBeLessThan(instructions.indexOf("\n## Available tools (COMPLETE list"))
+    // The workflow carries the result-shape guidance; Rules only add content beyond it.
+    expect(instructions).toContain(
+      '`const data = typeof res === "string" ? JSON.parse(res) : res` - most tools return JSON as a string',
+    )
+    expect(instructions).toContain("Return only the fields you need")
+    expect(instructions).toContain("raw payloads get truncated and waste context")
+    expect(instructions).toContain("`const res = await tools.<namespace>.<tool>(input)`")
+    expect(instructions).toContain("surrounding agent tools are not available unless listed here")
+    expect(instructions).toContain("Only tools listed here are available inside `tools`")
+    expect(instructions).toContain("bracket notation may appear for names that are not JavaScript identifiers")
+    // Placeholders use the <namespace>.<tool>/<field> style ONLY - no fabricated tool
+    // names, and no real catalog tools cherry-picked into example lines.
+    expect(instructions).toContain("`return { <field>: data.<field> }`")
+    expect(instructions).not.toContain("total_count")
+    expect(instructions).not.toContain("list_issues")
+    expect(instructions).not.toContain("tools.orders.lookup({")
+    // COMPLETE: step 1 picks from the inlined list; search is not advertised.
+    expect(instructions).toContain("1. Pick a tool from the list under `## Available tools`")
+    expect(instructions).not.toContain("Browse one namespace")
+
+    const partial = CodeMode.make({ tools, discovery: { maxInlineCatalogTokens: 0 } }).instructions()
+    // PARTIAL: the workflow starts with search (with query-style guidance that is clearly
+    // a query string, never a tool name) and the browse-namespace rule appears.
+    expect(partial).toContain(
+      '1. Find a tool (skip when it is already listed below): `const { items } = await tools.$codemode.search({ query: "<intent + key nouns>" })` - short phrases like "list issues" work best.',
+    )
+    expect(partial).toContain(
+      "Only tools listed here or returned by `tools.$codemode.search` are available inside `tools`",
+    )
+    expect(partial).toContain(
+      '- Browse one namespace: `await tools.$codemode.search({ query: "", namespace: "<name>" })`.',
+    )
+    expect(partial).not.toContain("total_count")
+    expect(partial).not.toContain("tools.orders.lookup({")
+  })
+
+  test("the syntax section names what is unusual or missing, not an allowlist", () => {
+    const instructions = CodeMode.make({ tools }).instructions()
+    // Models already know JavaScript; the section leads with that.
+    expect(instructions).toContain("Standard modern JavaScript works")
+    expect(instructions).toContain("TypeScript type annotations are allowed and stripped before execution")
+    // The not-supported list is derived from (and verified against) the interpreter.
+    expect(instructions).toContain("Not supported")
+    for (const missing of ["classes", "generators", "for await...of", ".then/.catch/.finally"]) {
+      expect(instructions).toContain(missing)
+    }
+    // Implemented by the DSL-expansion pass, so no longer listed as missing.
+    expect(instructions).not.toContain("instanceof Error")
+    expect(instructions).not.toContain("splice")
+    // The data-boundary note survives.
+    expect(instructions).toContain(
+      "Dates serialize to ISO strings at data boundaries; Map/Set/RegExp serialize to `{}`.",
+    )
+  })
+
+  test("zero tools keep minimal sections and the no-tools notice", () => {
+    const runtime = CodeMode.make({})
+    const instructions = runtime.instructions()
+    expect(instructions).toContain("No tools are currently available.")
+    expect(instructions).toContain("## Syntax")
+    expect(instructions).toContain("## Available tools")
+    expect(instructions).not.toContain("## Workflow")
+    expect(instructions).not.toContain("## Rules")
+    expect(instructions).not.toMatch(/\$codemode/)
+  })
+
+  test("uses one ranked search returning complete definitions for large catalogs", async () => {
+    const upload = Tool.make({
+      description: "Upload one readable local file to the current Discord thread",
+      input: Schema.Struct({ path: Schema.String }),
+      output: Schema.Struct({ sent: Schema.Boolean }),
+      run: () => Effect.succeed({ sent: true }),
+    })
+    const generate = Tool.make({
+      description: "Generate an image and upload it to the current Discord thread",
+      input: Schema.Struct({ prompt: Schema.String }),
+      output: Schema.Struct({ sent: Schema.Boolean }),
+      run: () => Effect.succeed({ sent: true }),
+    })
+    const runtime = CodeMode.make({
+      tools: { thread: { uploadFile: upload, generateImage: generate }, orders: { lookup } },
+      discovery: { maxInlineCatalogTokens: 0 },
+    })
+    expect(runtime.instructions()).toContain(
+      "Available tools (PARTIAL - 0 of 3 shown; find the rest with tools.$codemode.search)",
+    )
+    expect(runtime.instructions()).toContain("- thread (2 tools, none shown)")
+    expect(runtime.instructions()).toContain("- orders (1 tool, none shown)")
+    expect(runtime.instructions()).toMatch(/\$codemode\.search/)
+    expect(runtime.instructions()).not.toMatch(/tools\.thread\.uploadFile\(input/)
+
+    const result = await Effect.runPromise(
+      runtime.execute(`
+      return await tools.$codemode.search({
+        query: "send message attachment upload file to current Discord thread",
+        limit: 2
+      })
+    `),
+    )
+    expect(result.ok).toBe(true)
+    if (!result.ok) return
+    expect(result.value).toStrictEqual({
+      items: [
+        {
+          path: "tools.thread.uploadFile",
+          description: "Upload one readable local file to the current Discord thread",
+          signature: "tools.thread.uploadFile(input: {\n  path: string\n}): Promise<{\n  sent: boolean\n}>",
+        },
+        {
+          path: "tools.thread.generateImage",
+          description: "Generate an image and upload it to the current Discord thread",
+          signature: "tools.thread.generateImage(input: {\n  prompt: string\n}): Promise<{\n  sent: boolean\n}>",
+        },
+      ],
+      total: 2,
+    })
+    expect(result.toolCalls).toStrictEqual([{ name: "$codemode.search" }])
+
+    const variants = await Effect.runPromise(
+      runtime.execute(`
+      return await Promise.all([
+        tools.$codemode.search({ query: "file" }),
+        tools.$codemode.search({ query: "image" })
+      ])
+    `),
+    )
+    expect(variants.ok).toBe(true)
+    if (variants.ok) {
+      expect((variants.value as Array<{ items: Array<{ path: string }> }>)[0]?.items[0]?.path).toBe(
+        "tools.thread.uploadFile",
+      )
+      expect((variants.value as Array<{ items: Array<{ path: string }> }>)[1]?.items[0]?.path).toBe(
+        "tools.thread.generateImage",
+      )
+    }
+
+    const removed = await Effect.runPromise(
+      runtime.execute(`return await tools.$codemode.describe({ path: "thread.uploadFile" })`),
+    )
+    expect(removed.ok).toBe(false)
+    if (!removed.ok) expect(removed.error.kind).toBe("UnknownTool")
+  })
+
+  test("search defaults to 10 results and resolves exact tool paths", async () => {
+    const tool = (index: number) =>
+      Tool.make({
+        description: `Numbered tool ${index}`,
+        input: Schema.Struct({ id: Schema.String }),
+        output: Schema.String,
+        run: () => Effect.succeed("ok"),
+      })
+    const runtime = CodeMode.make({
+      tools: {
+        many: Object.fromEntries(Array.from({ length: 14 }, (_, index) => [`tool${index}`, tool(index)])),
+      },
+    })
+
+    const browse = await Effect.runPromise(runtime.execute(`return await tools.$codemode.search({})`))
+    expect(browse.ok).toBe(true)
+    if (browse.ok) {
+      const value = browse.value as { items: Array<{ path: string }>; total: number }
+      expect(value.items).toHaveLength(10)
+      expect(value.total).toBe(14)
+    }
+
+    for (const query of ["many.tool13", "tools.many.tool13"]) {
+      const exact = await Effect.runPromise(
+        runtime.execute(`return await tools.$codemode.search({ query: ${JSON.stringify(query)} })`),
+      )
+      expect(exact.ok).toBe(true)
+      if (exact.ok) {
+        expect(exact.value).toStrictEqual({
+          items: [
+            {
+              path: "tools.many.tool13",
+              description: "Numbered tool 13",
+              signature: "tools.many.tool13(input: {\n  id: string\n}): Promise<string>",
+            },
+          ],
+          total: 1,
+        })
+      }
+    }
+  })
+
+  test("scopes search to one namespace and browses it alphabetically", async () => {
+    const simple = (description: string) =>
+      Tool.make({
+        description,
+        input: Schema.Struct({ id: Schema.String }),
+        output: Schema.String,
+        run: () => Effect.succeed("ok"),
+      })
+    const runtime = CodeMode.make({
+      tools: {
+        github: { list_issues: simple("List issues"), create_issue: simple("Create an issue") },
+        linear: { list_issues: simple("List Linear issues") },
+      },
+    })
+
+    // Empty query + namespace browses just that namespace, alphabetical by path.
+    const browse = await Effect.runPromise(
+      runtime.execute(`return await tools.$codemode.search({ query: "", namespace: "github" })`),
+    )
+    expect(browse.ok).toBe(true)
+    if (browse.ok) {
+      const value = browse.value as { items: Array<{ path: string }>; total: number }
+      expect(value.total).toBe(2)
+      expect(value.items.map((item) => item.path)).toStrictEqual([
+        "tools.github.create_issue",
+        "tools.github.list_issues",
+      ])
+    }
+
+    // A query + namespace ranks within that namespace only.
+    const scoped = await Effect.runPromise(
+      runtime.execute(`return await tools.$codemode.search({ query: "issues", namespace: "linear" })`),
+    )
+    expect(scoped.ok).toBe(true)
+    if (scoped.ok) {
+      const value = scoped.value as { items: Array<{ path: string }>; total: number }
+      expect(value.total).toBe(1)
+      expect(value.items[0]?.path).toBe("tools.linear.list_issues")
+    }
+
+    const invalid = await Effect.runPromise(
+      runtime.execute(`return await tools.$codemode.search({ query: "issues", namespace: 7 })`),
+    )
+    expect(invalid.ok).toBe(false)
+    if (!invalid.ok) expect(invalid.error.kind).toBe("InvalidToolInput")
+  })
+
+  test("matches input parameter names and partial-word substrings", async () => {
+    const upload = Tool.make({
+      description: "Send a document to the workspace",
+      input: {
+        type: "object",
+        properties: { attachment: { type: "string", description: "Local path of the payload to send" } },
+        required: ["attachment"],
+      },
+      run: () => Effect.succeed("ok"),
+    })
+    const other = Tool.make({
+      description: "Rename the workspace",
+      input: Schema.Struct({ name: Schema.String }),
+      output: Schema.String,
+      run: () => Effect.succeed("ok"),
+    })
+    const runtime = CodeMode.make({ tools: { files: { upload, other } } })
+
+    // "attachment" appears in neither path nor description - only in the input schema's
+    // property names, which the searchable text includes.
+    const byParameter = await Effect.runPromise(
+      runtime.execute(`return await tools.$codemode.search({ query: "attachment" })`),
+    )
+    expect(byParameter.ok).toBe(true)
+    if (byParameter.ok) {
+      const value = byParameter.value as { items: Array<{ path: string }>; total: number }
+      expect(value.total).toBe(1)
+      expect(value.items[0]?.path).toBe("tools.files.upload")
+    }
+
+    // Substring matching: a partial word ("docum") still hits the description.
+    const bySubstring = await Effect.runPromise(
+      runtime.execute(`return await tools.$codemode.search({ query: "docum" })`),
+    )
+    expect(bySubstring.ok).toBe(true)
+    if (bySubstring.ok) {
+      const value = bySubstring.value as { items: Array<{ path: string }>; total: number }
+      expect(value.total).toBe(1)
+      expect(value.items[0]?.path).toBe("tools.files.upload")
+    }
+  })
+
+  test("a plural query term matches singular-only tool text", async () => {
+    const simple = (description: string) =>
+      Tool.make({
+        description,
+        input: Schema.Struct({ id: Schema.String }),
+        output: Schema.String,
+        run: () => Effect.succeed("ok"),
+      })
+    const runtime = CodeMode.make({
+      tools: {
+        // Neither path nor description contains "issues" - only the singular "issue".
+        tracker: { fetch_all: simple("Fetch every open issue in the project") },
+        github: { list_issues: simple("List issues") },
+        misc: { rename: simple("Rename the workspace") },
+      },
+    })
+
+    // "issues" still finds the singular-only tool (term OR singular(term) per field)...
+    const plural = await Effect.runPromise(
+      runtime.execute(`return await tools.$codemode.search({ query: "issues", namespace: "tracker" })`),
+    )
+    expect(plural.ok).toBe(true)
+    if (plural.ok) {
+      const value = plural.value as { items: Array<{ path: string }>; total: number }
+      expect(value.total).toBe(1)
+      expect(value.items[0]?.path).toBe("tools.tracker.fetch_all")
+    }
+
+    // ...while a true "issues" path match still outranks the singular-only description match.
+    const ranked = await Effect.runPromise(runtime.execute(`return await tools.$codemode.search({ query: "issues" })`))
+    expect(ranked.ok).toBe(true)
+    if (ranked.ok) {
+      const value = ranked.value as { items: Array<{ path: string }>; total: number }
+      expect(value.total).toBe(2)
+      expect(value.items.map((item) => item.path)).toStrictEqual([
+        "tools.github.list_issues",
+        "tools.tracker.fetch_all",
+      ])
+    }
+  })
+
+  test("empty query lists everything alphabetically by path", async () => {
+    const simple = (description: string) =>
+      Tool.make({
+        description,
+        input: Schema.Struct({}),
+        output: Schema.String,
+        run: () => Effect.succeed("ok"),
+      })
+    // Deliberately declared out of alphabetical order.
+    const runtime = CodeMode.make({
+      tools: {
+        zeta: { last: simple("Last") },
+        alpha: { beta: simple("Middle"), aardvark: simple("First") },
+      },
+    })
+    const browse = await Effect.runPromise(runtime.execute(`return await tools.$codemode.search({})`))
+    expect(browse.ok).toBe(true)
+    if (browse.ok) {
+      const value = browse.value as { items: Array<{ path: string }>; total: number }
+      expect(value.items.map((item) => item.path)).toStrictEqual([
+        "tools.alpha.aardvark",
+        "tools.alpha.beta",
+        "tools.zeta.last",
+      ])
+    }
+  })
+
+  test("inlines round-robin across namespaces so one expensive namespace cannot starve the rest", () => {
+    const cheap = Tool.make({
+      description: "Cheap",
+      input: Schema.Struct({ q: Schema.String }),
+      output: Schema.String,
+      run: () => Effect.succeed("ok"),
+    })
+    const expensive = Tool.make({
+      description:
+        "An expensive tool whose description alone consumes far more than the remaining inline catalog byte budget for this runtime",
+      input: Schema.Struct({
+        someRatherLongParameterName: Schema.String,
+        anotherEvenLongerParameterName: Schema.Number,
+      }),
+      output: Schema.String,
+      run: () => Effect.succeed("ok"),
+    })
+    // Round 1 places alpha.cheap (~17 estimated tokens) and beta.cheap (~17); in round 2
+    // alpha.expensive does not fit, which marks only alpha done - it must NOT prevent
+    // other namespaces from inlining (beta already got its line in the same round).
+    const runtime = CodeMode.make({
+      tools: { alpha: { cheap, expensive }, beta: { cheap } },
+      discovery: { maxInlineCatalogTokens: 40 },
+    })
+
+    const instructions = runtime.instructions()
+    expect(instructions).toContain(
+      "Available tools (PARTIAL - 2 of 3 shown; find the rest with tools.$codemode.search)",
+    )
+    expect(instructions).toContain("- alpha (2 tools, 1 shown)")
+    expect(instructions).toContain("  - tools.alpha.cheap(input: { q: string }): Promise<string> // Cheap")
+    expect(instructions).not.toContain("tools.alpha.expensive(")
+    // Fully shown namespaces read cleanly (no "shown" annotation).
+    expect(instructions).toContain("- beta (1 tool)")
+    expect(instructions).toContain("  - tools.beta.cheap(input: { q: string }): Promise<string> // Cheap")
+    expect(instructions).toMatch(/\$codemode\.search/)
+  })
+
+  test("decodes tool input and output before exposing either side", async () => {
+    const observed: Array<unknown> = []
+    const transformed = Tool.make({
+      description: "Double a number",
+      input: Schema.Struct({ value: Schema.NumberFromString }),
+      output: Schema.NumberFromString,
+      run: ({ value }) =>
+        Effect.sync(() => {
+          observed.push(value)
+          return String(value * 2)
+        }),
+    })
+    const runtime = CodeMode.make({
+      tools: { math: { double: transformed } },
+      onToolCallStart: (call) => Effect.sync(() => observed.push(call.input)),
+    })
+
+    const success = await Effect.runPromise(runtime.execute(`return await tools.math.double({ value: "21" })`))
+    expect(success).toStrictEqual({ ok: true, value: 42, toolCalls: [{ name: "math.double" }] })
+    expect(observed).toStrictEqual([{ value: 21 }, 21])
+
+    const invalid = await Effect.runPromise(runtime.execute(`return await tools.math.double({ value: 21 })`))
+    expect(invalid.ok).toBe(false)
+    if (invalid.ok) return
+    expect(invalid.error.kind).toBe("InvalidToolInput")
+    expect(observed).toStrictEqual([{ value: 21 }, 21])
+  })
+
+  test("returns JSON-safe data and normalizes undefined to null", async () => {
+    const result = await Effect.runPromise(
+      CodeMode.execute({
+        code: `return { top: undefined, nested: [1, undefined] }`,
+      }),
+    )
+    expect(result).toStrictEqual({
+      ok: true,
+      value: { top: null, nested: [1, null] },
+      toolCalls: [],
+    })
+    expect(Schema.decodeUnknownSync(ExecuteResultSchema)(JSON.parse(JSON.stringify(result)))).toStrictEqual(result)
+  })
+
+  test("rejects invalid configuration and discovery limits", async () => {
+    expect(() => CodeMode.execute({ code: "return 1", limits: { timeoutMs: 0 } })).toThrow(RangeError)
+    expect(() => CodeMode.execute({ code: "return 1", limits: { timeoutMs: Number.POSITIVE_INFINITY } })).toThrow(
+      RangeError,
+    )
+    expect(() => CodeMode.execute({ code: "return 1", limits: { maxToolCalls: -1 } })).toThrow(RangeError)
+    expect(() => CodeMode.execute({ code: "return 1", limits: { maxOutputBytes: -1 } })).toThrow(RangeError)
+
+    expect(() => CodeMode.make({ tools, discovery: { maxInlineCatalogTokens: -1 } })).toThrow(RangeError)
+
+    const result = await Effect.runPromise(
+      CodeMode.make({
+        tools,
+        discovery: { maxInlineCatalogTokens: 0 },
+      }).execute(`return await tools.$codemode.search({ query: "order", limit: 0.5 })`),
+    )
+    expect(result.ok).toBe(false)
+    if (result.ok) return
+    expect(result.error.kind).toBe("InvalidToolInput")
+  })
+
+  test("enforces the tool-call limit as a diagnostic", async () => {
+    const result = await Effect.runPromise(CodeMode.execute({ tools, code: source, limits: { maxToolCalls: 0 } }))
+    expect(result.ok).toBe(false)
+    if (!result.ok) expect(result.error.kind).toBe("ToolCallLimitExceeded")
+  })
+
+  test("timeoutMs and maxToolCalls have no defaults: absent means unlimited", async () => {
+    // 150 tool calls would have exceeded the old default cap of 100; with no limits
+    // provided, there is no cap and no timeout - budgets are host policy.
+    const counter = Tool.make({
+      description: "Count invocations",
+      input: Schema.Struct({}),
+      output: Schema.Number,
+      run: () => Effect.succeed(1),
+    })
+    const result = await Effect.runPromise(
+      CodeMode.execute({
+        tools: { host: { count: counter } },
+        code: `
+        let total = 0
+        for (let i = 0; i < 150; i += 1) total += await tools.host.count({})
+        return total
+      `,
+      }),
+    )
+    expect(result).toMatchObject({ ok: true, value: 150 })
+    if (result.ok) expect(result.toolCalls.length).toBe(150)
+  })
+
+  test("the timeout interrupts a busy loop without any operation budget", async () => {
+    // Regression: timeout interruption must not depend on interpreter-side work accounting.
+    // The Effect fiber runtime auto-yields between interpreter steps, so a pure `while
+    // (true) {}` loop is interrupted by `timeoutMs` alone.
+    const startedAt = Date.now()
+    const result = await Effect.runPromise(CodeMode.execute({ code: "while (true) {}", limits: { timeoutMs: 200 } }))
+    const elapsedMs = Date.now() - startedAt
+
+    expect(result.ok).toBe(false)
+    if (!result.ok) {
+      expect(result.error.kind).toBe("TimeoutExceeded")
+      expect(result.error.message).toContain("timed out after 200ms")
+    }
+    expect(elapsedMs).toBeLessThan(3_000)
+  })
+
+  test("reserves the discovery namespace", () => {
+    expect(() => CodeMode.make({ tools: { $codemode: { lookup } } })).toThrow(/reserved for CodeMode discovery tools/)
+  })
+})
diff --git a/packages/codemode/test/enumeration.test.ts b/packages/codemode/test/enumeration.test.ts
new file mode 100644
index 0000000000..87c075a792
--- /dev/null
+++ b/packages/codemode/test/enumeration.test.ts
@@ -0,0 +1,159 @@
+import { describe, expect, test } from "bun:test"
+import { Effect, Schema } from "effect"
+import { CodeMode, Tool } from "../src/index.js"
+
+// Key enumeration: Object.keys and for...in share one surface over plain objects, arrays
+// (index strings), and tool references (namespace/tool names from the host tool tree), so a
+// model can discover what it may call instead of guessing names from the instructions. The
+// motivating transcript: `Object.keys(tools)` failed with the generic plain-objects-only
+// message and `for (const key in tools)` was unsupported syntax, forcing blind guesses.
+
+const echo = (description: string) =>
+  Tool.make({
+    description,
+    input: Schema.Struct({ value: Schema.String }),
+    output: Schema.String,
+    run: ({ value }) => Effect.succeed(value),
+  })
+
+const tools = {
+  github: { list_issues: echo("List issues"), get_issue: echo("Get one issue") },
+  memory: { search: echo("Search memory") },
+  playwright: { navigate: echo("Navigate somewhere") },
+}
+
+const run = (code: string) => Effect.runPromise(CodeMode.execute({ tools, code }))
+const value = async (code: string) => {
+  const result = await run(code)
+  if (!result.ok) throw new Error(`expected success, got ${result.error.kind}: ${result.error.message}`)
+  return result.value
+}
+const error = async (code: string) => {
+  const result = await run(code)
+  if (result.ok) throw new Error(`expected failure, got value ${JSON.stringify(result.value)}`)
+  return result.error
+}
+
+describe("Object.keys over tool references", () => {
+  test("enumerates top-level namespaces (the transcript program)", async () => {
+    expect(
+      await value(`
+      const namespaces = Object.keys(tools)
+      return { namespaces, count: namespaces.length }
+    `),
+    ).toEqual({ namespaces: ["github", "memory", "playwright"], count: 3 })
+  })
+
+  test("enumerates tool names at a nested namespace", async () => {
+    expect(await value(`return Object.keys(tools.github)`)).toEqual(["list_issues", "get_issue"])
+  })
+
+  test("a callable tool is a leaf and enumerates as []", async () => {
+    expect(await value(`return Object.keys(tools.github.list_issues)`)).toEqual([])
+  })
+
+  test("the virtual discovery namespace enumerates its callable surface", async () => {
+    expect(await value(`return Object.keys(tools.$codemode)`)).toEqual(["search"])
+  })
+
+  test("an unknown namespace is an UnknownTool error pointing at the discovery idioms", async () => {
+    const failure = await error(`return Object.keys(tools.nonexistent)`)
+    expect(failure.kind).toBe("UnknownTool")
+    expect(failure.message).toContain("Unknown tool namespace 'nonexistent'")
+    expect(failure.suggestions?.join(" ")).toContain("Object.keys(tools)")
+  })
+
+  test("Object.values/entries on a tool reference explain the working idioms", async () => {
+    for (const method of ["values", "entries"] as const) {
+      const failure = await error(`return Object.${method}(tools)`)
+      expect(failure.kind).toBe("InvalidDataValue")
+      expect(failure.message).toContain(
+        `Object.${method}(...) cannot read tool references: they are not plain data. Use Object.keys(tools) for names, or tools.$codemode.search({ query }) for signatures.`,
+      )
+    }
+    const nested = await error(`return Object.entries(tools.github)`)
+    expect(nested.message).toContain("Use Object.keys(tools) for names")
+  })
+})
+
+describe("Object.keys over arrays", () => {
+  test("returns index strings, like JS", async () => {
+    expect(await value(`return Object.keys(["a", "b", "c"])`)).toEqual(["0", "1", "2"])
+    expect(await value(`return Object.keys([])`)).toEqual([])
+  })
+
+  test("objects keep their own enumerable keys", async () => {
+    expect(await value(`return Object.keys({ a: 1, b: 2 })`)).toEqual(["a", "b"])
+  })
+
+  test("non-object inputs still fail clearly", async () => {
+    const failure = await error(`return Object.keys("nope")`)
+    expect(failure.message).toContain("Object.keys expects a data object or array")
+  })
+})
+
+describe("for...in", () => {
+  test("iterates own enumerable keys of a plain object with break/continue", async () => {
+    expect(
+      await value(`
+      const seen = []
+      for (const key in { a: 1, b: 2, c: 3, d: 4 }) {
+        if (key === "b") continue
+        if (key === "d") break
+        seen.push(key)
+      }
+      return seen
+    `),
+    ).toEqual(["a", "c"])
+  })
+
+  test("iterates index strings over arrays", async () => {
+    expect(
+      await value(`
+      const indexes = []
+      for (const i in ["x", "y", "z"]) {
+        if (i === "2") break
+        indexes.push(i)
+      }
+      return indexes
+    `),
+    ).toEqual(["0", "1"])
+  })
+
+  test("supports let declarations and bare identifiers", async () => {
+    expect(
+      await value(`
+      let last = ""
+      for (let key in { a: 1, b: 2 }) last = key
+      return last
+    `),
+    ).toBe("b")
+    expect(
+      await value(`
+      let key = "before"
+      for (key in { only: 1 }) {}
+      return key
+    `),
+    ).toBe("only")
+  })
+
+  test("enumerates namespaces and tools from the host tool tree", async () => {
+    expect(
+      await value(`
+      const names = []
+      for (const ns in tools) {
+        for (const name in tools[ns]) names.push(ns + "." + name)
+      }
+      return names
+    `),
+    ).toEqual(["github.list_issues", "github.get_issue", "memory.search", "playwright.navigate"])
+  })
+
+  test("unsupported values fail with a hint at for...of and Object.keys", async () => {
+    for (const expression of [`"text"`, "new Map([[1, 2]])", "new Set([1])", "42", "null"]) {
+      const failure = await error(`for (const key in ${expression}) {}; return "no"`)
+      expect(failure.message).toContain("for...in requires a plain object, array, or tools reference")
+      expect(failure.message).toContain("Use for...of for arrays/strings/Maps/Sets, or Object.keys(value)")
+    }
+  })
+})
diff --git a/packages/codemode/test/parity.test.ts b/packages/codemode/test/parity.test.ts
new file mode 100644
index 0000000000..e5c1d83822
--- /dev/null
+++ b/packages/codemode/test/parity.test.ts
@@ -0,0 +1,425 @@
+import { describe, expect, test } from "bun:test"
+import { Effect } from "effect"
+import { CodeMode } from "../src/index.js"
+import { ToolRuntime } from "../src/tool-runtime.js"
+
+// Runs a CodeMode program with no host tools and returns the ExecuteResult. These tests pin the
+// JS-parity behaviors for the "99% of ordinary defensive JavaScript just works" goal: cases where
+// a strict interpreter would throw but idiomatic JS yields undefined / succeeds.
+//
+// Note on the result boundary: this package normalizes a bare `undefined` result to `null` when
+// it crosses out of the sandbox (results are JSON data), so tests asserting an in-sandbox
+// `undefined` read check `=== undefined` inside the program and `null` at the boundary.
+const run = (code: string) => Effect.runPromise(CodeMode.execute({ code, tools: {} }))
+const value = async (code: string) => {
+  const result = await run(code)
+  if (!result.ok) throw new Error(`expected success, got ${result.error.kind}: ${result.error.message}`)
+  return result.value
+}
+const error = async (code: string) => {
+  const result = await run(code)
+  if (result.ok) throw new Error(`expected failure, got value ${JSON.stringify(result.value)}`)
+  return result.error
+}
+
+describe("H2: string property access reads as undefined (not a throw)", () => {
+  test("unknown property on a string is undefined", async () => {
+    expect(await value(`const s = "hi"; return s.login === undefined`)).toBe(true)
+    expect(await value(`const s = "hi"; return s.login`)).toBeNull()
+  })
+
+  test("optional chaining + fallback on a string does not throw", async () => {
+    expect(await value(`const s = "hi"; return s?.login ?? "fallback"`)).toBe("fallback")
+  })
+
+  test("the real MCP pattern: result is a JSON string, defensive read falls through", async () => {
+    // me.result is a string; me.result?.login is undefined, so we fall back to the raw string.
+    expect(await value(`const me = { result: '{"login":"x"}' }; return me.result?.login ?? me.result`)).toBe(
+      '{"login":"x"}',
+    )
+  })
+
+  test("unknown property on a number is undefined", async () => {
+    expect(await value(`return (5).foo ?? "n"`)).toBe("n")
+  })
+
+  test("supported string methods still work", async () => {
+    expect(await value(`return "AB".toLowerCase()`)).toBe("ab")
+    expect(await value(`return "hello".length`)).toBe(5)
+  })
+})
+
+describe("H3: array property access reads as undefined (not a throw)", () => {
+  test("unknown property on an array is undefined", async () => {
+    expect(await value(`return [1,2,3].foo === undefined`)).toBe(true)
+    expect(await value(`return [1,2,3].foo`)).toBeNull()
+  })
+
+  test("optional chaining on an array does not throw", async () => {
+    expect(await value(`return [1,2,3]?.foo ?? "fb"`)).toBe("fb")
+  })
+
+  test("unknown property reads stay undefined for methods CodeMode does not implement", async () => {
+    expect(await value(`return [1,2,3].toSpliced === undefined`)).toBe(true)
+  })
+
+  test("supported array methods and indexing still work", async () => {
+    expect(await value(`return [1,2,3].map(x => x + 1)`)).toEqual([2, 3, 4])
+    expect(await value(`return [1,2,3][9] === undefined`)).toBe(true)
+    expect(await value(`return [1,2,3][9]`)).toBeNull()
+  })
+})
+
+describe("H6: object spread of null/undefined is a no-op", () => {
+  test("spreading null is a no-op", async () => {
+    expect(await value(`const o = null; return { ...o, a: 1 }`)).toEqual({ a: 1 })
+  })
+
+  test("spreading an absent argument merges cleanly", async () => {
+    expect(await value(`function f(opts){ return { ...opts, a: 1 } } return f(undefined)`)).toEqual({ a: 1 })
+  })
+
+  test("spreading a real object still works", async () => {
+    expect(await value(`const o = { a: 1 }; return { ...o, b: 2 }`)).toEqual({ a: 1, b: 2 })
+  })
+
+  test("spreading an array into an object still errors", async () => {
+    const err = await error(`return { ...[1,2], a: 1 }`)
+    expect(err.kind).toBe("InvalidDataValue")
+  })
+})
+
+describe("H4: typeof on an undeclared identifier is 'undefined'", () => {
+  test("feature-detection guard does not throw", async () => {
+    expect(await value(`return typeof foo === "undefined" ? "safe" : "no"`)).toBe("safe")
+  })
+
+  test("typeof of a declared binding is unaffected", async () => {
+    expect(await value(`const x = 5; return typeof x`)).toBe("number")
+    expect(await value(`const s = "a"; return typeof s`)).toBe("string")
+  })
+
+  test("referencing an undeclared identifier outside typeof still throws", async () => {
+    const err = await error(`return foo + 1`)
+    expect(err.message).toContain("foo")
+  })
+})
+
+describe("H1: NaN/Infinity flow as intermediates and normalize to null at the boundary", () => {
+  test("guards run instead of the program crashing on a transient NaN", async () => {
+    expect(await value(`return parseInt("abc") || 0`)).toBe(0)
+    expect(await value(`const x = Number("abc"); return Number.isNaN(x) ? 0 : x`)).toBe(0)
+    expect(await value(`const o = {}; o.count = (o.count || 0) + 1; return o.count`)).toBe(1)
+    // average of an empty list, guarded - the classic divide-by-zero that used to throw pre-guard
+    expect(await value(`const a = []; return a.length ? a.reduce((s,x)=>s+x,0)/a.length : 0`)).toBe(0)
+  })
+
+  test("a non-finite value becomes null when it leaves the sandbox", async () => {
+    expect(await value(`return 5/0`)).toBeNull()
+    expect(await value(`return 0/0`)).toBeNull()
+    expect(await value(`return Math.max()`)).toBeNull()
+    // nested, too - normalization walks the returned structure
+    expect(await value(`return { a: Number("x"), b: 2, c: [1/0] }`)).toEqual({ a: null, b: 2, c: [null] })
+  })
+
+  test("NaN and Infinity are usable identifiers and inspectable in-sandbox", async () => {
+    expect(await value(`return Number.isNaN(NaN)`)).toBe(true)
+    expect(await value(`return Infinity > 1e9`)).toBe(true)
+    expect(await value(`return Number.isFinite(1/0)`)).toBe(false)
+    expect(await value(`return [3,1,2].reduce((a,b)=>Math.max(a,b), -Infinity)`)).toBe(3)
+    // JSON.stringify inside the sandbox matches JS: non-finite serializes to null
+    expect(await value(`return JSON.stringify({ x: Number("z") })`)).toBe('{"x":null}')
+  })
+
+  test("copyOut normalizes non-finite numbers to null (the shared return + tool-arg boundary)", () => {
+    // Tool-call arguments funnel through copyOut too, so this one function pins both boundaries.
+    expect(ToolRuntime.copyOut(NaN)).toBeNull()
+    expect(ToolRuntime.copyOut(Infinity)).toBeNull()
+    expect(ToolRuntime.copyOut(-Infinity)).toBeNull()
+    expect(ToolRuntime.copyOut(42)).toBe(42)
+    expect(ToolRuntime.copyOut({ a: NaN, b: [Infinity, 1] })).toEqual({ a: null, b: [null, 1] })
+  })
+})
+
+describe("Error values and instanceof", () => {
+  test("new Error carries name/message and is instanceof Error", async () => {
+    expect(await value(`const e = new Error("boom"); return [e instanceof Error, e.name, e.message]`)).toEqual([
+      true,
+      "Error",
+      "boom",
+    ])
+  })
+
+  test("Error without new behaves like new Error", async () => {
+    expect(await value(`const e = Error("plain"); return [e instanceof Error, e.name, e.message]`)).toEqual([
+      true,
+      "Error",
+      "plain",
+    ])
+    expect(await value(`const e = new Error(); return [e.name, e.message, e instanceof Error]`)).toEqual([
+      "Error",
+      "",
+      true,
+    ])
+  })
+
+  test("specific error types are instanceof themselves and Error, not each other", async () => {
+    expect(
+      await value(
+        `const e = new TypeError("t"); return [e instanceof TypeError, e instanceof Error, e instanceof RangeError]`,
+      ),
+    ).toEqual([true, true, false])
+    expect(await value(`return new Error("e") instanceof TypeError`)).toBe(false)
+  })
+
+  test("thrown errors keep instanceof through try/catch", async () => {
+    expect(await value(`try { throw new Error("x") } catch (e) { return [e instanceof Error, e.message] }`)).toEqual([
+      true,
+      "x",
+    ])
+  })
+
+  test("interpreter runtime failures are caught as Error values", async () => {
+    expect(await value(`try { JSON.parse("nope") } catch (e) { return e instanceof Error }`)).toBe(true)
+    expect(await value(`try { undeclared() } catch (e) { return e instanceof Error }`)).toBe(true)
+  })
+
+  test("caught failures carry the constructor name the real-JS failure would have", async () => {
+    // JSON.parse throws SyntaxError: name and specific-instanceof both carry through, and the
+    // message keeps the engine's position detail.
+    expect(
+      await value(`
+      try { JSON.parse("{oops") } catch (e) {
+        return [e.name, e instanceof SyntaxError, e instanceof Error, e instanceof TypeError, e.message.includes("JSON")]
+      }
+    `),
+    ).toEqual(["SyntaxError", true, true, false, true])
+    expect(await value(`try { undeclared() } catch (e) { return [e.name, e instanceof ReferenceError] }`)).toEqual([
+      "ReferenceError",
+      true,
+    ])
+    expect(await value(`try { const c = 1; c = 2 } catch (e) { return [e.name, e instanceof TypeError] }`)).toEqual([
+      "TypeError",
+      true,
+    ])
+    expect(await value(`try { "a".normalize("NOPE") } catch (e) { return [e.name, e instanceof RangeError] }`)).toEqual(
+      ["RangeError", true],
+    )
+    expect(await value(`try { "a".match("(") } catch (e) { return [e.name, e instanceof SyntaxError] }`)).toEqual([
+      "SyntaxError",
+      true,
+    ])
+    expect(await value(`try { new RegExp("(") } catch (e) { return [e.name, e instanceof SyntaxError] }`)).toEqual([
+      "SyntaxError",
+      true,
+    ])
+  })
+
+  test("diagnostics without a specific real-JS analogue are named plain Error", async () => {
+    expect(await value(`try { JSON.parse(5) } catch (e) { return [e.name, e instanceof Error] }`)).toEqual([
+      "Error",
+      true,
+    ])
+  })
+
+  test("Promise.allSettled rejection reasons are Error values", async () => {
+    expect(
+      await value(`
+      const settled = await Promise.allSettled([Promise.reject(new Error("b"))])
+      return [settled[0].reason instanceof Error, settled[0].reason.message]
+    `),
+    ).toEqual([true, "b"])
+  })
+
+  test("non-error thrown values are not instanceof Error", async () => {
+    expect(await value(`try { throw "raw" } catch (e) { return e instanceof Error }`)).toBe(false)
+    expect(await value(`try { throw { message: "shaped" } } catch (e) { return e instanceof Error }`)).toBe(false)
+  })
+
+  test("plain data is never instanceof Error", async () => {
+    expect(await value(`return [({}) instanceof Error, "s" instanceof Error, null instanceof Error]`)).toEqual([
+      false,
+      false,
+      false,
+    ])
+  })
+
+  test("error values still serialize as plain { name, message } data", async () => {
+    expect(await value(`return new Error("m")`)).toEqual({ name: "Error", message: "m" })
+    expect(await value(`return JSON.stringify(new Error("m"))`)).toBe('{"name":"Error","message":"m"}')
+    expect(await value(`try { throw new Error("m") } catch (e) { return Object.keys(e) }`)).toEqual(["name", "message"])
+  })
+
+  test("spreading an error loses the brand, like losing the prototype in JS", async () => {
+    expect(await value(`const e = new Error("m"); return ({ ...e }) instanceof Error`)).toBe(false)
+    expect(await value(`const e = new Error("m"); return { ...e }`)).toEqual({ name: "Error", message: "m" })
+  })
+
+  test("typeof Error is function; an unknown instanceof right-hand side is a catchable error", async () => {
+    expect(await value(`return typeof Error`)).toBe("function")
+    expect(await value(`try { return 1 instanceof 5 } catch (e) { return "caught" }`)).toBe("caught")
+    const err = await error(`return 1 instanceof 5`)
+    expect(err.message).toContain("right-hand side of 'instanceof'")
+  })
+})
+
+describe("array methods: splice, fill, copyWithin, keys/values/entries", () => {
+  test("splice removes in place and returns the removed elements", async () => {
+    expect(await value(`const a = [1,2,3,4]; const removed = a.splice(1, 2); return { removed, a }`)).toEqual({
+      removed: [2, 3],
+      a: [1, 4],
+    })
+  })
+
+  test("splice inserts new elements at the cut", async () => {
+    expect(await value(`const a = ["a","d"]; a.splice(1, 0, "b", "c"); return a`)).toEqual(["a", "b", "c", "d"])
+    expect(await value(`const a = [1,2,3]; const removed = a.splice(1, 1, "x"); return { removed, a }`)).toEqual({
+      removed: [2],
+      a: [1, "x", 3],
+    })
+  })
+
+  test("splice with one argument removes to the end; negative start counts back", async () => {
+    expect(await value(`const a = [1,2,3]; const removed = a.splice(1); return { removed, a }`)).toEqual({
+      removed: [2, 3],
+      a: [1],
+    })
+    expect(await value(`const a = [1,2,3]; const removed = a.splice(-1); return { removed, a }`)).toEqual({
+      removed: [3],
+      a: [1, 2],
+    })
+  })
+
+  test("splice rejects inserting a container into itself", async () => {
+    const err = await error(`const a = [1]; a.splice(0, 0, [a]); return a`)
+    expect(err.kind).toBe("InvalidDataValue")
+    expect(err.message).toContain("circular")
+  })
+
+  test("fill overwrites a range and returns the mutated array", async () => {
+    expect(await value(`const a = [1,2,3,4]; return a.fill(0, 1, 3)`)).toEqual([1, 0, 0, 4])
+    expect(await value(`return [1,2,3].fill("z")`)).toEqual(["z", "z", "z"])
+  })
+
+  test("copyWithin copies a range in place", async () => {
+    expect(await value(`return [1,2,3,4,5].copyWithin(0, 3)`)).toEqual([4, 5, 3, 4, 5])
+  })
+
+  test("keys/values/entries return arrays usable with for...of and spread", async () => {
+    expect(await value(`return [...["x","y","z"].keys()]`)).toEqual([0, 1, 2])
+    expect(await value(`return ["x","y"].values()`)).toEqual(["x", "y"])
+    expect(
+      await value(`
+      const out = []
+      for (const [index, item] of ["a","b"].entries()) out.push(index + ":" + item)
+      return out
+    `),
+    ).toEqual(["0:a", "1:b"])
+    expect(await value(`return [...[7].entries()]`)).toEqual([[0, 7]])
+  })
+})
+
+describe("string methods: localeCompare, normalize, trim aliases", () => {
+  test("localeCompare orders strings for sorting", async () => {
+    expect(await value(`return ["b","a","c"].sort((x, y) => x.localeCompare(y))`)).toEqual(["a", "b", "c"])
+    expect(await value(`return "a".localeCompare("a")`)).toBe(0)
+  })
+
+  test("normalize applies unicode normalization forms", async () => {
+    expect(await value(`return "\\u0065\\u0301".normalize("NFC").length`)).toBe(1)
+    expect(await value(`return "\\u00e9".normalize("NFD").length`)).toBe(2)
+    expect(await value(`return "x".normalize() === "x"`)).toBe(true)
+  })
+
+  test("an invalid normalize form is a clear catchable error", async () => {
+    expect(await value(`try { "x".normalize("nope"); return "no" } catch (e) { return e.message }`)).toContain('"NFC"')
+  })
+
+  test("trimLeft/trimRight alias trimStart/trimEnd", async () => {
+    expect(await value(`return "  x ".trimLeft()`)).toBe("x ")
+    expect(await value(`return "  x ".trimRight()`)).toBe("  x")
+  })
+})
+
+describe("compound assignment matches its binary operator", () => {
+  // `x op= y` must behave exactly like `x = x op y`, sharing the binary operator's coercion
+  // semantics (Dates string-coerce for `+` and use their time value for arithmetic; data
+  // objects/arrays coerce to their JS string form).
+  const pair = async (compound: string, expanded: string) => {
+    const [a, b] = await Promise.all([value(compound), value(expanded)])
+    expect(a).toEqual(b)
+    return a
+  }
+
+  test("sandbox Date += concatenates its string form, like d = d + 1", async () => {
+    const result = await pair(`let d = new Date(1000); d += 1; return d`, `let d = new Date(1000); d = d + 1; return d`)
+    expect(result).toBe("1970-01-01T00:00:01.000Z1")
+  })
+
+  test("sandbox Date numeric compound ops use its time value", async () => {
+    expect(
+      await pair(`let d = new Date(1000); d -= 400; return d`, `let d = new Date(1000); d = d - 400; return d`),
+    ).toBe(600)
+    expect(await pair(`let d = new Date(1000); d /= 4; return d`, `let d = new Date(1000); d = d / 4; return d`)).toBe(
+      250,
+    )
+  })
+
+  test("string += object/array matches x = x + obj", async () => {
+    expect(await pair(`let x = "a"; x += { b: 1 }; return x`, `let x = "a"; x = x + { b: 1 }; return x`)).toBe(
+      "a[object Object]",
+    )
+    expect(await pair(`let x = "a"; x += [1, 2]; return x`, `let x = "a"; x = x + [1, 2]; return x`)).toBe("a1,2")
+  })
+
+  test("compound assignment through a member target coerces the same way", async () => {
+    expect(
+      await pair(
+        `const o = { s: "t" }; o.s += new Date(0); return o.s`,
+        `const o = { s: "t" }; o.s = o.s + new Date(0); return o.s`,
+      ),
+    ).toBe("t1970-01-01T00:00:00.000Z")
+  })
+
+  test("numeric and string compound operators sweep identically to their expansions", async () => {
+    const cases: Array<[string, number | string]> = [
+      [`let x = 7; x += 3; return x`, 7 + 3],
+      [`let x = 7; x -= 3; return x`, 7 - 3],
+      [`let x = 7; x *= 3; return x`, 7 * 3],
+      [`let x = 7; x /= 2; return x`, 7 / 2],
+      [`let x = 7; x %= 3; return x`, 7 % 3],
+      [`let x = 7; x **= 2; return x`, 7 ** 2],
+      [`let x = 7; x &= 3; return x`, 7 & 3],
+      [`let x = 7; x |= 8; return x`, 7 | 8],
+      [`let x = 7; x ^= 2; return x`, 7 ^ 2],
+      [`let x = 7; x <<= 2; return x`, 7 << 2],
+      [`let x = -7; x >>= 1; return x`, -7 >> 1],
+      [`let x = -7; x >>>= 1; return x`, -7 >>> 1],
+      [`let x = "a"; x += "b"; return x`, "ab"],
+    ]
+    for (const [compound, expected] of cases) {
+      expect(await value(compound)).toBe(expected)
+      expect(await value(compound.replace(/x (\S+)= /, (_, op) => `x = x ${op} `))).toBe(expected)
+    }
+  })
+})
+
+describe("H5: builtin coercion functions work as array callbacks", () => {
+  test("filter(Boolean) drops falsy values", async () => {
+    expect(await value(`return [0, 1, "", 2, null, 3].filter(Boolean)`)).toEqual([1, 2, 3])
+  })
+
+  test("map(String) coerces each element", async () => {
+    expect(await value(`return [1, 2, 3].map(String)`)).toEqual(["1", "2", "3"])
+  })
+
+  test("arrow callbacks still work (no regression)", async () => {
+    expect(await value(`return [1, 2, 3, 4].filter(x => x % 2 === 0)`)).toEqual([2, 4])
+    expect(await value(`return [1, 2, 3].reduce((a, b) => a + b, 0)`)).toBe(6)
+  })
+
+  test("a non-callable callback is still rejected", async () => {
+    const err = await error(`return [1,2,3].map(42)`)
+    expect(err.message).toContain("callback")
+  })
+})
diff --git a/packages/codemode/test/promise.test.ts b/packages/codemode/test/promise.test.ts
new file mode 100644
index 0000000000..952b2fdc50
--- /dev/null
+++ b/packages/codemode/test/promise.test.ts
@@ -0,0 +1,453 @@
+import { describe, expect, test } from "bun:test"
+import { Effect, Schema } from "effect"
+import { CodeMode, Tool, toolError, type ExecuteResult, type ExecutionLimits } from "../src/index.js"
+
+// Wave 5 acceptance suite: first-class promise values. Un-awaited tool calls start eagerly on
+// supervised fibers, `await` settles them, and Promise.all/allSettled/race/resolve/reject are
+// ordinary functions over arbitrary arrays mixing promises and plain values.
+
+type Trace = {
+  starts: Array<number>
+  active: number
+  maxActive: number
+  completed: number
+  interrupted: number
+}
+
+const makeTrace = (): Trace => ({ starts: [], active: 0, maxActive: 0, completed: 0, interrupted: 0 })
+
+/** Echoes `id` after `ms` milliseconds, recording start order, live concurrency, and interruption. */
+const sleepyTool = (trace: Trace) =>
+  Tool.make({
+    description: "Echo an id after a delay",
+    input: Schema.Struct({ id: Schema.Number, ms: Schema.optionalKey(Schema.Number) }),
+    output: Schema.Number,
+    run: ({ id, ms }) =>
+      Effect.gen(function* () {
+        trace.starts.push(id)
+        trace.active += 1
+        trace.maxActive = Math.max(trace.maxActive, trace.active)
+        yield* Effect.sleep(ms ?? 20)
+        trace.active -= 1
+        trace.completed += 1
+        return id
+      }).pipe(
+        Effect.onInterrupt(() =>
+          Effect.sync(() => {
+            trace.active -= 1
+            trace.interrupted += 1
+          }),
+        ),
+      ),
+  })
+
+const failingTool = Tool.make({
+  description: "Always refuse",
+  input: Schema.Struct({}),
+  output: Schema.String,
+  run: () => Effect.fail(toolError("Lookup refused")),
+})
+
+const run = (code: string, options: { trace?: Trace; limits?: ExecutionLimits } = {}): Promise<ExecuteResult> => {
+  const trace = options.trace ?? makeTrace()
+  return Effect.runPromise(
+    CodeMode.execute({
+      tools: { host: { sleepy: sleepyTool(trace), fail: failingTool } },
+      code,
+      ...(options.limits ? { limits: options.limits } : {}),
+    }),
+  )
+}
+
+const value = async (code: string, options: { trace?: Trace; limits?: ExecutionLimits } = {}) => {
+  const result = await run(code, options)
+  if (!result.ok) throw new Error(`expected success, got ${result.error.kind}: ${result.error.message}`)
+  return result.value
+}
+
+const error = async (code: string, options: { trace?: Trace; limits?: ExecutionLimits } = {}) => {
+  const result = await run(code, options)
+  if (result.ok) throw new Error(`expected failure, got value ${JSON.stringify(result.value)}`)
+  return result.error
+}
+
+describe("first-class promise values", () => {
+  test("an un-awaited tool call starts eagerly, in call order, before any await", async () => {
+    const trace = makeTrace()
+    const result = await value(
+      `
+        const a = tools.host.sleepy({ id: 1, ms: 40 })
+        const b = tools.host.sleepy({ id: 2, ms: 40 })
+        const rb = await b
+        const ra = await a
+        return [ra, rb]
+      `,
+      { trace },
+    )
+    expect(result).toEqual([1, 2])
+    expect(trace.starts).toEqual([1, 2])
+    // Both calls overlapped even though they were awaited sequentially.
+    expect(trace.maxActive).toBeGreaterThan(1)
+  })
+
+  test("awaiting the same promise twice settles once and never re-runs the call", async () => {
+    const result = await run(`
+      const p = tools.host.sleepy({ id: 7 })
+      const x = await p
+      const y = await p
+      return [x, y]
+    `)
+    expect(result.ok).toBe(true)
+    if (!result.ok) return
+    expect(result.value).toEqual([7, 7])
+    expect(result.toolCalls).toStrictEqual([{ name: "host.sleepy" }])
+  })
+
+  test("await of a non-promise value is a passthrough no-op", async () => {
+    expect(await value(`return await 42`)).toBe(42)
+    expect(await value(`const x = await "s"; return x`)).toBe("s")
+    expect(await value(`return await null`)).toBeNull()
+    expect(await value(`return (await [1, 2]).length`)).toBe(2)
+  })
+
+  test("returning an un-awaited tool call resolves it (async-function return semantics)", async () => {
+    expect(await value(`return tools.host.sleepy({ id: 9 })`)).toBe(9)
+  })
+
+  test("typeof a promise is 'object', and console.log renders it sensibly", async () => {
+    const result = await run(`
+      const p = Promise.resolve(1)
+      console.log(p)
+      return typeof p
+    `)
+    expect(result.ok).toBe(true)
+    if (!result.ok) return
+    expect(result.value).toBe("object")
+    expect(result.logs).toStrictEqual(["[Promise (await it to get its value)]"])
+  })
+
+  test("an awaited failure is catchable exactly like a synchronous throw", async () => {
+    expect(
+      await value(`
+      const p = tools.host.fail({})
+      try {
+        await p
+        return "no"
+      } catch (e) {
+        return e.message
+      }
+    `),
+    ).toBe("Lookup refused")
+  })
+
+  test("a fire-and-forget call completes before the execution ends", async () => {
+    const trace = makeTrace()
+    const result = await value(
+      `
+        tools.host.sleepy({ id: 1, ms: 30 })
+        return "done"
+      `,
+      { trace },
+    )
+    expect(result).toBe("done")
+    expect(trace.completed).toBe(1)
+    expect(trace.interrupted).toBe(0)
+  })
+
+  test("a never-awaited failing call surfaces as an unhandled-rejection diagnostic", async () => {
+    const diagnostic = await error(`
+      tools.host.fail({})
+      return "done"
+    `)
+    expect(diagnostic.kind).toBe("ToolFailure")
+    expect(diagnostic.message).toContain("Unhandled rejection from an un-awaited tool call")
+    expect(diagnostic.message).toContain("Lookup refused")
+    expect(diagnostic.suggestions?.join(" ")).toContain("await tools.ns.tool(...)")
+  })
+})
+
+describe("promises at data boundaries", () => {
+  test("returning an un-awaited promise inside data is a clear await-hinting diagnostic", async () => {
+    const diagnostic = await error(`return { result: tools.host.sleepy({ id: 1 }) }`)
+    expect(diagnostic.kind).toBe("InvalidDataValue")
+    expect(diagnostic.message).toContain("un-awaited Promise")
+    expect(diagnostic.message).toContain("await tools.ns.tool(...)")
+  })
+
+  test("passing an un-awaited promise as a tool argument is a clear diagnostic", async () => {
+    const diagnostic = await error(`return await tools.host.sleepy({ id: tools.host.sleepy({ id: 1 }) })`)
+    expect(diagnostic.kind).toBe("InvalidDataValue")
+    expect(diagnostic.message).toContain("un-awaited Promise")
+  })
+
+  test("JSON.stringify of a promise is a diagnostic, not '{}'", async () => {
+    const diagnostic = await error(`return JSON.stringify(Promise.resolve(1))`)
+    expect(diagnostic.kind).toBe("InvalidDataValue")
+    expect(diagnostic.message).toContain("un-awaited Promise")
+  })
+
+  test("operators reject promise operands", async () => {
+    const diagnostic = await error(`return Promise.resolve(1) + 1`)
+    expect(diagnostic.kind).toBe("InvalidDataValue")
+  })
+})
+
+describe("Promise.all over arbitrary arrays", () => {
+  test("mixes promises and plain values, preserving order", async () => {
+    expect(
+      await value(`
+      return await Promise.all([tools.host.sleepy({ id: 1 }), "plain", tools.host.sleepy({ id: 2 }), 42])
+    `),
+    ).toEqual([1, "plain", 2, 42])
+  })
+
+  test("accepts arrays built beforehand, passed as identifiers, and spread elements", async () => {
+    expect(
+      await value(`
+      const calls = []
+      calls.push(tools.host.sleepy({ id: 1 }))
+      calls.push(7)
+      const more = [tools.host.sleepy({ id: 2 })]
+      const batch = [...calls, ...more, "x"]
+      return await Promise.all(batch)
+    `),
+    ).toEqual([1, 7, 2, "x"])
+  })
+
+  test("runs items.map tool calls in parallel", async () => {
+    const trace = makeTrace()
+    const result = await value(
+      `
+        const ids = [1, 2, 3, 4]
+        return await Promise.all(ids.map((id) => tools.host.sleepy({ id, ms: 40 })))
+      `,
+      { trace },
+    )
+    expect(result).toEqual([1, 2, 3, 4])
+    // maxActive counts truly-overlapping live executions, so > 1 proves real
+    // parallelism deterministically - no wall-clock assertion needed.
+    expect(trace.maxActive).toBeGreaterThan(1)
+  })
+
+  test("caps live tool-call concurrency at the fixed internal constant (8)", async () => {
+    const trace = makeTrace()
+    const result = await value(
+      `
+        const ids = []
+        for (let i = 0; i < 20; i += 1) ids.push(i)
+        const results = await Promise.all(ids.map((id) => tools.host.sleepy({ id, ms: 10 })))
+        return results.length
+      `,
+      { trace },
+    )
+    expect(result).toBe(20)
+    expect(trace.maxActive).toBeGreaterThan(1)
+    expect(trace.maxActive).toBeLessThanOrEqual(8)
+  })
+
+  test("resolves the empty array", async () => {
+    expect(await value(`return await Promise.all([])`)).toEqual([])
+  })
+
+  test("rejects with the first failure, catchable in-program", async () => {
+    expect(
+      await value(`
+      try {
+        await Promise.all([tools.host.sleepy({ id: 1 }), tools.host.fail({})])
+        return "no"
+      } catch (e) {
+        return e.message
+      }
+    `),
+    ).toBe("Lookup refused")
+  })
+
+  test("a non-collection argument is a clear error", async () => {
+    const diagnostic = await error(`return await Promise.all(42)`)
+    expect(diagnostic.message).toContain("Promise.all expects an array")
+  })
+
+  test("exceeding maxToolCalls inside Promise.all is a ToolCallLimitExceeded diagnostic", async () => {
+    const diagnostic = await error(
+      `return await Promise.all([tools.host.sleepy({ id: 1 }), tools.host.sleepy({ id: 2 }), tools.host.sleepy({ id: 3 })])`,
+      { limits: { maxToolCalls: 2 } },
+    )
+    expect(diagnostic.kind).toBe("ToolCallLimitExceeded")
+  })
+})
+
+describe("Promise.allSettled", () => {
+  test("reports fulfilled and rejected outcomes with catch-normalized reasons", async () => {
+    expect(
+      await value(`
+      return await Promise.allSettled([
+        tools.host.sleepy({ id: 5 }),
+        tools.host.fail({}),
+        "plain",
+        Promise.reject(new Error("boom")),
+      ])
+    `),
+    ).toEqual([
+      { status: "fulfilled", value: 5 },
+      { status: "rejected", reason: { name: "Error", message: "Lookup refused" } },
+      { status: "fulfilled", value: "plain" },
+      { status: "rejected", reason: { name: "Error", message: "boom" } },
+    ])
+  })
+
+  test("never rejects for program-level failures", async () => {
+    const result = await run(`
+      const settled = await Promise.allSettled([tools.host.fail({}), tools.host.fail({})])
+      return settled.filter((s) => s.status === "rejected").length
+    `)
+    expect(result.ok).toBe(true)
+    if (result.ok) expect(result.value).toBe(2)
+  })
+})
+
+describe("Promise.race", () => {
+  test("first settlement wins and losers are interrupted", async () => {
+    const trace = makeTrace()
+    const result = await value(
+      `
+        const fast = tools.host.sleepy({ id: 1, ms: 10 })
+        const slow = tools.host.sleepy({ id: 2, ms: 5000 })
+        return await Promise.race([fast, slow])
+      `,
+      { trace },
+    )
+    expect(result).toBe(1)
+    expect(trace.interrupted).toBe(1)
+    expect(trace.completed).toBe(1)
+  })
+
+  test("awaiting an interrupted loser afterwards is a catchable program failure", async () => {
+    expect(
+      await value(`
+      const fast = tools.host.sleepy({ id: 1, ms: 10 })
+      const slow = tools.host.sleepy({ id: 2, ms: 5000 })
+      const winner = await Promise.race([fast, slow])
+      try {
+        await slow
+        return "no"
+      } catch (e) {
+        return { winner, caught: e.message }
+      }
+    `),
+    ).toEqual({
+      winner: 1,
+      caught: "This tool call was interrupted because another value settled a Promise.race first.",
+    })
+  })
+
+  test("a rejection can win the race", async () => {
+    expect(
+      await value(`
+      try {
+        await Promise.race([tools.host.fail({}), tools.host.sleepy({ id: 1, ms: 5000 })])
+        return "no"
+      } catch (e) {
+        return e.message
+      }
+    `),
+    ).toBe("Lookup refused")
+  })
+
+  test("a plain value wins over pending promises", async () => {
+    const trace = makeTrace()
+    expect(
+      await value(`return await Promise.race([tools.host.sleepy({ id: 1, ms: 5000 }), "immediate"])`, { trace }),
+    ).toBe("immediate")
+    expect(trace.interrupted).toBe(1)
+  })
+
+  test("an empty race is a clear error instead of hanging", async () => {
+    const diagnostic = await error(`return await Promise.race([])`)
+    expect(diagnostic.message).toContain("never settle")
+  })
+})
+
+describe("Promise.resolve / Promise.reject", () => {
+  test("resolve wraps plain values and passes promises through", async () => {
+    expect(await value(`return await Promise.resolve(42)`)).toBe(42)
+    expect(await value(`return await Promise.resolve(Promise.resolve("nested"))`)).toBe("nested")
+    expect(await value(`return await Promise.resolve(tools.host.sleepy({ id: 3 }))`)).toBe(3)
+  })
+
+  test("reject produces a promise whose await throws the reason", async () => {
+    expect(
+      await value(`
+      try {
+        await Promise.reject("nope")
+        return "no"
+      } catch (e) {
+        return e
+      }
+    `),
+    ).toBe("nope")
+  })
+})
+
+describe("timeout interruption of forked calls", () => {
+  test("the execution timeout interrupts in-flight forked fibers", async () => {
+    const trace = makeTrace()
+    const result = await run(
+      `
+        const a = tools.host.sleepy({ id: 1, ms: 60000 })
+        const b = tools.host.sleepy({ id: 2, ms: 60000 })
+        return await a
+      `,
+      { trace, limits: { timeoutMs: 100 } },
+    )
+    expect(result.ok).toBe(false)
+    if (result.ok) return
+    expect(result.error.kind).toBe("TimeoutExceeded")
+    // Both calls started; neither escaped the timeout - the awaited one AND the abandoned one.
+    expect(trace.starts).toEqual([1, 2])
+    expect(trace.interrupted).toBe(2)
+    expect(trace.completed).toBe(0)
+  })
+
+  test("the timeout also interrupts calls inside Promise.all", async () => {
+    const trace = makeTrace()
+    const result = await run(
+      `return await Promise.all([tools.host.sleepy({ id: 1, ms: 60000 }), tools.host.sleepy({ id: 2, ms: 60000 })])`,
+      { trace, limits: { timeoutMs: 100 } },
+    )
+    expect(result.ok).toBe(false)
+    if (result.ok) return
+    expect(result.error.kind).toBe("TimeoutExceeded")
+    expect(trace.interrupted).toBe(2)
+  })
+})
+
+describe("unsupported promise surface", () => {
+  test(".then/.catch/.finally give a clear await-instead error", async () => {
+    for (const method of ["then", "catch", "finally"]) {
+      const diagnostic = await error(`return tools.host.sleepy({ id: 1 }).${method}((x) => x)`)
+      expect(diagnostic.kind).toBe("UnsupportedSyntax")
+      expect(diagnostic.message).toContain(`Promise.prototype.${method} is not supported`)
+      expect(diagnostic.message).toContain("await")
+    }
+  })
+
+  test("other property reads on a promise hint at the missing await", async () => {
+    const diagnostic = await error(`return tools.host.sleepy({ id: 1 }).value`)
+    expect(diagnostic.kind).toBe("InvalidDataValue")
+    expect(diagnostic.message).toContain("un-awaited Promise")
+    expect(diagnostic.message).toContain("await it first")
+  })
+
+  test("unknown Promise statics list what is available", async () => {
+    const diagnostic = await error(`return await Promise.any([tools.host.sleepy({ id: 1 })])`)
+    expect(diagnostic.message).toContain("Promise.any is not available")
+    expect(diagnostic.message).toContain("Promise.allSettled")
+  })
+
+  test("new Promise(...) points at tool calls instead", async () => {
+    const diagnostic = await error(`return new Promise((resolve) => resolve(1))`)
+    expect(diagnostic.kind).toBe("UnsupportedSyntax")
+    expect(diagnostic.message).toContain("new Promise(...) is not supported")
+    expect(diagnostic.message).toContain("already return promises")
+  })
+})
diff --git a/packages/codemode/test/signature.test.ts b/packages/codemode/test/signature.test.ts
new file mode 100644
index 0000000000..9c45371d93
--- /dev/null
+++ b/packages/codemode/test/signature.test.ts
@@ -0,0 +1,341 @@
+import { describe, expect, test } from "bun:test"
+import { Effect, Schema } from "effect"
+import { CodeMode } from "../src/index.js"
+import { Tool, inputTypeScript, jsonSchemaToTypeScript, outputTypeScript } from "../src/tool.js"
+
+// A raw JSON Schema tool in the shape an MCP adapter produces: render-only input schema
+// whose property descriptions and constraints must surface as JSDoc in pretty signatures.
+const listIssues = Tool.make({
+  description: "List issues in a repository",
+  input: {
+    type: "object",
+    properties: {
+      owner: { type: "string", description: "Repository owner" },
+      after: { type: "string", description: "Cursor from the previous response's pageInfo" },
+      perPage: { type: "number", description: "Results per page", default: 30 },
+      labels: { type: "array", items: { type: "string" }, description: "Filter by labels", minItems: 1, maxItems: 10 },
+      state: { type: "string", enum: ["open", "closed"] },
+    },
+    required: ["owner"],
+  },
+  run: () => Effect.succeed("[]"),
+})
+
+// An Effect Schema tool whose field annotations must flow through the emitted JSON Schema.
+const lookupOrder = Tool.make({
+  description: "Look up an order",
+  input: Schema.Struct({
+    id: Schema.String.annotate({ description: "Order identifier" }),
+    verbose: Schema.optionalKey(Schema.Boolean),
+  }),
+  output: Schema.Struct({
+    status: Schema.String.annotate({ description: "Current order status" }),
+  }),
+  run: () => Effect.succeed({ status: "open" }),
+})
+
+describe("pretty signature rendering", () => {
+  test("described fields get JSDoc comments; undescribed and untagged fields get none", () => {
+    expect(inputTypeScript(listIssues, true)).toBe(
+      [
+        "{",
+        "  /** Repository owner */",
+        "  owner: string",
+        "  /** Cursor from the previous response's pageInfo */",
+        "  after?: string",
+        "  /**",
+        "   * Results per page",
+        "   * @default 30",
+        "   */",
+        "  perPage?: number",
+        "  /**",
+        "   * Filter by labels",
+        "   * @minItems 1",
+        "   * @maxItems 10",
+        "   */",
+        "  labels?: Array<string>",
+        '  state?: "open" | "closed"',
+        "}",
+      ].join("\n"),
+    )
+  })
+
+  test("compact mode output is unchanged by the pretty machinery", () => {
+    expect(inputTypeScript(listIssues)).toBe(
+      '{ owner: string; after?: string; perPage?: number; labels?: Array<string>; state?: "open" | "closed" }',
+    )
+    expect(inputTypeScript(lookupOrder)).toBe("{ id: string; verbose?: boolean }")
+    expect(outputTypeScript(lookupOrder)).toBe("{ status: string }")
+  })
+
+  test("nested objects recurse with increasing indent and their own JSDoc", () => {
+    const pretty = jsonSchemaToTypeScript(
+      {
+        type: "object",
+        properties: {
+          filter: {
+            type: "object",
+            description: "Search filter",
+            properties: { state: { type: "string", description: "Issue state" } },
+          },
+        },
+      },
+      true,
+    )
+    expect(pretty).toBe(
+      ["{", "  /** Search filter */", "  filter?: {", "    /** Issue state */", "    state?: string", "  }", "}"].join(
+        "\n",
+      ),
+    )
+  })
+
+  test("Effect Schema annotations become JSDoc on input and output fields", () => {
+    expect(inputTypeScript(lookupOrder, true)).toBe(
+      ["{", "  /** Order identifier */", "  id: string", "  verbose?: boolean", "}"].join("\n"),
+    )
+    expect(outputTypeScript(lookupOrder, true)).toBe(
+      ["{", "  /** Current order status */", "  status: string", "}"].join("\n"),
+    )
+  })
+
+  test("constraints TypeScript cannot express surface as JSDoc tags", () => {
+    const pretty = jsonSchemaToTypeScript(
+      {
+        type: "object",
+        properties: {
+          legacy: { type: "string", deprecated: true },
+          homepage: { type: "string", format: "uri" },
+          tags: { type: "array", items: { type: "string" }, minItems: 2, maxItems: 5, default: ["a", "b"] },
+        },
+      },
+      true,
+    )
+    expect(pretty).toContain("  /** @deprecated */\n  legacy?: string")
+    expect(pretty).toContain("  /** @format uri */\n  homepage?: string")
+    expect(pretty).toContain(
+      [
+        "  /**",
+        '   * @default ["a","b"]',
+        "   * @minItems 2",
+        "   * @maxItems 5",
+        "   */",
+        "  tags?: Array<string>",
+      ].join("\n"),
+    )
+  })
+
+  test("skips an unserializable default rather than emitting a broken tag", () => {
+    const pretty = jsonSchemaToTypeScript(
+      { type: "object", properties: { size: { type: "number", default: 1n } } },
+      true,
+    )
+    expect(pretty).toBe(["{", "  size?: number", "}"].join("\n"))
+  })
+
+  test("neutralizes */ inside descriptions so nothing closes the comment early", () => {
+    const pretty = jsonSchemaToTypeScript(
+      { type: "object", properties: { note: { type: "string", description: "Ends */ early" } } },
+      true,
+    )
+    expect(pretty).toContain("  /** Ends * / early */")
+    expect(pretty).not.toContain("Ends */")
+  })
+
+  test("multiline descriptions become *-prefixed blocks with blank edges trimmed", () => {
+    const pretty = jsonSchemaToTypeScript(
+      {
+        type: "object",
+        properties: { query: { type: "string", description: "\nFirst line\n\nSecond line\n" } },
+      },
+      true,
+    )
+    expect(pretty).toBe(
+      ["{", "  /**", "   * First line", "   *", "   * Second line", "   */", "  query?: string", "}"].join("\n"),
+    )
+  })
+
+  test("stays total on cyclic $refs and pathological nesting in both modes", () => {
+    const cyclic = {
+      $ref: "#/$defs/Node",
+      $defs: { Node: { type: "object", properties: { child: { $ref: "#/$defs/Node" }, name: { type: "string" } } } },
+    } as const
+    expect(jsonSchemaToTypeScript(cyclic)).toBe("{ child?: Node; name?: string }")
+    expect(jsonSchemaToTypeScript(cyclic, true)).toContain("child?: Node")
+
+    let deep: Record<string, unknown> = { type: "string" }
+    for (let level = 0; level < 12; level += 1) deep = { type: "object", properties: { next: deep } }
+    for (const pretty of [false, true]) {
+      const rendered = jsonSchemaToTypeScript(deep, pretty)
+      expect(rendered).toContain("unknown")
+      expect(rendered).toContain("next?:")
+    }
+  })
+})
+
+describe("non-identifier property names render as quoted keys", () => {
+  // MCP-style schemas routinely carry property names that are not bare TS identifiers
+  // (`foo-bar`, `@type`, dotted names); the rendered signature must quote them so the
+  // model sees a valid TypeScript object type. Bare identifiers stay unquoted.
+  const rawSchema = {
+    type: "object",
+    properties: {
+      "foo-bar": { type: "string" },
+      "@type": { type: "string" },
+      "x.y": { type: "number", description: "Dotted name" },
+      "123": { type: "number" },
+      plain: { type: "boolean" },
+    },
+    required: ["@type"],
+  } as const
+
+  test("compact rendering quotes non-identifier keys and leaves identifiers bare", () => {
+    expect(jsonSchemaToTypeScript(rawSchema)).toBe(
+      '{ "123"?: number; "foo-bar"?: string; "@type": string; "x.y"?: number; plain?: boolean }',
+    )
+  })
+
+  test("pretty rendering quotes non-identifier keys and keeps their JSDoc", () => {
+    expect(jsonSchemaToTypeScript(rawSchema, true)).toBe(
+      [
+        "{",
+        '  "123"?: number',
+        '  "foo-bar"?: string',
+        '  "@type": string',
+        "  /** Dotted name */",
+        '  "x.y"?: number',
+        "  plain?: boolean",
+        "}",
+      ].join("\n"),
+    )
+  })
+
+  test("JSON Schema input and output signatures of a tool both quote", () => {
+    const tool = Tool.make({
+      description: "Adapter tool with awkward field names",
+      input: rawSchema,
+      output: {
+        type: "object",
+        properties: { "content-type": { type: "string" } },
+        required: ["content-type"],
+      } as const,
+      run: () => Effect.succeed({ "content-type": "text/plain" }),
+    })
+    expect(inputTypeScript(tool)).toContain('"foo-bar"?: string')
+    expect(outputTypeScript(tool)).toBe('{ "content-type": string }')
+    expect(outputTypeScript(tool, true)).toBe(["{", '  "content-type": string', "}"].join("\n"))
+  })
+
+  test("Effect Schema structs with non-identifier field names quote too", () => {
+    const tool = Tool.make({
+      description: "Schema tool with awkward field names",
+      input: Schema.Struct({ "foo-bar": Schema.String, plain: Schema.optionalKey(Schema.Number) }),
+      run: () => Effect.succeed(null),
+    })
+    expect(inputTypeScript(tool)).toBe('{ "foo-bar": string; plain?: number }')
+    expect(inputTypeScript(tool, true)).toBe(["{", '  "foo-bar": string', "  plain?: number", "}"].join("\n"))
+  })
+})
+
+describe("union schemas render every alternative", () => {
+  test("anyOf with a number branch keeps sibling alternatives", () => {
+    const schema = {
+      anyOf: [{ type: "string" }, { type: "number" }],
+    } as const
+    expect(jsonSchemaToTypeScript(schema)).toBe("string | number")
+    expect(jsonSchemaToTypeScript(schema, true)).toBe("string | number")
+  })
+
+  test("nullable numeric unions keep null", () => {
+    const schema = {
+      oneOf: [{ type: "number" }, { type: "null" }],
+    } as const
+    expect(jsonSchemaToTypeScript(schema)).toBe("number | null")
+    expect(jsonSchemaToTypeScript(schema, true)).toBe("number | null")
+  })
+
+  test("tool input and output signatures preserve numeric unions", () => {
+    const tool = Tool.make({
+      description: "Tool with numeric unions",
+      input: {
+        type: "object",
+        properties: {
+          value: { anyOf: [{ type: "string" }, { type: "number" }] },
+        },
+      } as const,
+      output: { anyOf: [{ type: "number" }, { type: "boolean" }] } as const,
+      run: () => Effect.succeed(1),
+    })
+    expect(inputTypeScript(tool)).toBe("{ value?: string | number }")
+    expect(outputTypeScript(tool)).toBe("number | boolean")
+  })
+})
+
+describe("pretty signatures in search results", () => {
+  const runtime = CodeMode.make({ tools: { github: { list_issues: listIssues }, orders: { lookup: lookupOrder } } })
+
+  const search = async (query: string) => {
+    const result = await Effect.runPromise(
+      runtime.execute(`return await tools.$codemode.search({ query: ${JSON.stringify(query)} })`),
+    )
+    expect(result.ok).toBe(true)
+    if (!result.ok) throw new Error("search failed")
+    return result.value as { items: Array<{ path: string; signature: string }>; total: number }
+  }
+
+  test("a raw JSON Schema (MCP-style) tool's result signature carries field JSDoc and tags", async () => {
+    const { items } = await search("list issues repository")
+    const item = items.find(({ path }) => path === "tools.github.list_issues")!
+    expect(item.signature).toBe(
+      [
+        "tools.github.list_issues(input: {",
+        "  /** Repository owner */",
+        "  owner: string",
+        "  /** Cursor from the previous response's pageInfo */",
+        "  after?: string",
+        "  /**",
+        "   * Results per page",
+        "   * @default 30",
+        "   */",
+        "  perPage?: number",
+        "  /**",
+        "   * Filter by labels",
+        "   * @minItems 1",
+        "   * @maxItems 10",
+        "   */",
+        "  labels?: Array<string>",
+        '  state?: "open" | "closed"',
+        "}): Promise<unknown>",
+      ].join("\n"),
+    )
+  })
+
+  test("an annotated Effect Schema tool's result signature carries field JSDoc (exact-path lookup too)", async () => {
+    for (const query of ["look up order", "tools.orders.lookup"]) {
+      const { items } = await search(query)
+      const item = items.find(({ path }) => path === "tools.orders.lookup")!
+      expect(item.signature).toBe(
+        [
+          "tools.orders.lookup(input: {",
+          "  /** Order identifier */",
+          "  id: string",
+          "  verbose?: boolean",
+          "}): Promise<{",
+          "  /** Current order status */",
+          "  status: string",
+          "}>",
+        ].join("\n"),
+      )
+    }
+  })
+
+  test("the inline catalog line for the same tool stays single-line compact", () => {
+    const instructions = runtime.instructions()
+    expect(instructions).toContain(
+      '  - tools.github.list_issues(input: { owner: string; after?: string; perPage?: number; labels?: Array<string>; state?: "open" | "closed" }): Promise<unknown> // List issues in a repository',
+    )
+    expect(instructions).toContain(
+      "  - tools.orders.lookup(input: { id: string; verbose?: boolean }): Promise<{ status: string }> // Look up an order",
+    )
+    expect(instructions).not.toContain("/**")
+  })
+})
diff --git a/packages/codemode/test/stdlib.test.ts b/packages/codemode/test/stdlib.test.ts
new file mode 100644
index 0000000000..ac0e8e2e79
--- /dev/null
+++ b/packages/codemode/test/stdlib.test.ts
@@ -0,0 +1,495 @@
+import { describe, expect, test } from "bun:test"
+import { Effect } from "effect"
+import { CodeMode, Tool } from "../src/index.js"
+
+// Standard-library value types: Date, RegExp, Map, Set. Programs use them as ordinary JS;
+// intra-sandbox checkpoints (Object.* helpers, spread, coercion inputs) preserve the live
+// values, while at the host boundary (final result, tool arguments, JSON.stringify) they
+// serialize exactly as JSON.stringify would: Date -> ISO string (invalid -> null),
+// RegExp/Map/Set -> {}.
+const run = (code: string) => Effect.runPromise(CodeMode.execute({ code, tools: {} }))
+const value = async (code: string) => {
+  const result = await run(code)
+  if (!result.ok) throw new Error(`expected success, got ${result.error.kind}: ${result.error.message}`)
+  return result.value
+}
+const error = async (code: string) => {
+  const result = await run(code)
+  if (result.ok) throw new Error(`expected failure, got value ${JSON.stringify(result.value)}`)
+  return result.error
+}
+
+describe("Date", () => {
+  test("Date.now() returns a number", async () => {
+    expect(await value(`return typeof Date.now()`)).toBe("number")
+  })
+
+  test("epoch construction and ISO rendering", async () => {
+    expect(await value(`return new Date(0).toISOString()`)).toBe("1970-01-01T00:00:00.000Z")
+  })
+
+  test("string parsing round-trips", async () => {
+    expect(await value(`return new Date("2024-01-02T03:04:05.000Z").getTime()`)).toBe(1704164645000)
+    expect(await value(`return Date.parse("2024-01-02T03:04:05.000Z")`)).toBe(1704164645000)
+  })
+
+  test("date arithmetic and comparison use the time value", async () => {
+    expect(await value(`const a = new Date(1000); const b = new Date(3000); return b - a`)).toBe(2000)
+    expect(await value(`const a = new Date(1000); const b = new Date(3000); return a < b`)).toBe(true)
+    expect(await value(`return +new Date(42)`)).toBe(42)
+  })
+
+  test("UTC getters read calendar components", async () => {
+    expect(
+      await value(
+        `const d = new Date("2024-03-05T06:07:08.009Z"); return [d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate(), d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds(), d.getUTCMilliseconds()]`,
+      ),
+    ).toEqual([2024, 2, 5, 6, 7, 8, 9])
+  })
+
+  test("invalid dates yield NaN times, guardable in-sandbox", async () => {
+    expect(await value(`return Number.isNaN(new Date("garbage").getTime())`)).toBe(true)
+    expect(await value(`return new Date("garbage").toJSON()`)).toBeNull()
+  })
+
+  test("toISOString on an invalid date is a catchable error", async () => {
+    expect(await value(`try { new Date("garbage").toISOString(); return "no" } catch { return "caught" }`)).toBe(
+      "caught",
+    )
+  })
+
+  test("template interpolation renders the ISO form", async () => {
+    expect(await value("return `at ${new Date(0)}`")).toBe("at 1970-01-01T00:00:00.000Z")
+  })
+
+  test("dates serialize to ISO strings at the boundary, direct and nested", async () => {
+    expect(await value(`return new Date(0)`)).toBe("1970-01-01T00:00:00.000Z")
+    expect(await value(`return { when: new Date(0), tags: [new Date(1000)] }`)).toEqual({
+      when: "1970-01-01T00:00:00.000Z",
+      tags: ["1970-01-01T00:00:01.000Z"],
+    })
+    expect(await value(`return JSON.stringify({ d: new Date(0) })`)).toBe('{"d":"1970-01-01T00:00:00.000Z"}')
+  })
+
+  test("coercions: Number is the time, String is ISO, Boolean is true", async () => {
+    expect(await value(`return Number(new Date(5))`)).toBe(5)
+    expect(await value(`return String(new Date(0))`)).toBe("1970-01-01T00:00:00.000Z")
+    expect(await value(`return Boolean(new Date(0))`)).toBe(true)
+  })
+
+  test("sorting dates with a numeric comparator", async () => {
+    expect(
+      await value(`
+      const dates = [new Date(3000), new Date(1000), new Date(2000)]
+      return dates.sort((a, b) => a - b).map((d) => d.getTime())
+    `),
+    ).toEqual([1000, 2000, 3000])
+  })
+
+  test("new Date(year, month, day) accepts component form", async () => {
+    expect(await value(`const d = new Date(2024, 0, 2); return [d.getFullYear(), d.getMonth(), d.getDate()]`)).toEqual([
+      2024, 0, 2,
+    ])
+  })
+
+  test("typeof and unknown properties are forgiving", async () => {
+    expect(await value(`return typeof new Date(0)`)).toBe("object")
+    expect(await value(`return new Date(0).nope === undefined`)).toBe(true)
+  })
+})
+
+describe("RegExp", () => {
+  test("literal test", async () => {
+    expect(await value(`return /ab+c/.test("xabbbc")`)).toBe(true)
+    expect(await value(`return /ab+c/.test("nope")`)).toBe(false)
+  })
+
+  test("exec exposes captures and index", async () => {
+    expect(await value(`const m = /a(b+)/.exec("xxabbc"); return { full: m[0], group: m[1], index: m.index }`)).toEqual(
+      {
+        full: "abb",
+        group: "bb",
+        index: 2,
+      },
+    )
+    expect(await value(`return /a/.exec("zzz")`)).toBeNull()
+  })
+
+  test("named groups read through", async () => {
+    expect(
+      await value(`const m = /(?<word>[a-z]+)-(?<num>\\d+)/.exec("id ab-42"); return m.groups.word + m.groups.num`),
+    ).toBe("ab42")
+  })
+
+  test("global exec advances lastIndex across calls", async () => {
+    expect(
+      await value(`
+      const r = /\\d+/g
+      const first = r.exec("a1b22c")
+      const second = r.exec("a1b22c")
+      return [first[0], second[0]]
+    `),
+    ).toEqual(["1", "22"])
+  })
+
+  test("string match: non-global carries index, global lists all matches", async () => {
+    expect(await value(`const m = "a1b22".match(/\\d+/); return [m[0], m.index]`)).toEqual(["1", 1])
+    expect(await value(`return "a1b22".match(/\\d+/g)`)).toEqual(["1", "22"])
+    expect(await value(`return "abc".match(/\\d/)`)).toBeNull()
+  })
+
+  test("matchAll materializes match arrays with captures", async () => {
+    expect(await value(`return "a1b22".matchAll(/(\\d+)/g).map((m) => m[1])`)).toEqual(["1", "22"])
+  })
+
+  test("replace and replaceAll with patterns and $1 substitution", async () => {
+    expect(await value(`return "a1b2".replace(/\\d/, "#")`)).toBe("a#b2")
+    expect(await value(`return "a1b2".replace(/\\d/g, "#")`)).toBe("a#b#")
+    expect(await value(`return "a1b2".replaceAll(/\\d/g, "#")`)).toBe("a#b#")
+    expect(await value(`return "hi bob".replace(/b(o)b/, "[$1]")`)).toBe("hi [o]")
+  })
+
+  test("replaceAll without the g flag is a catchable error", async () => {
+    expect(await value(`try { "a".replaceAll(/a/, "b"); return "no" } catch { return "caught" }`)).toBe("caught")
+  })
+
+  test("split and search accept patterns", async () => {
+    expect(await value(`return "a1b22c".split(/\\d+/)`)).toEqual(["a", "b", "c"])
+    expect(await value(`return "ab42".search(/\\d/)`)).toBe(2)
+    expect(await value(`return "ab".search(/\\d/)`)).toBe(-1)
+  })
+
+  test("new RegExp constructs from strings; invalid patterns are catchable", async () => {
+    expect(await value(`return new RegExp("a+", "i").test("AAA")`)).toBe(true)
+    expect(await value(`try { new RegExp("("); return "no" } catch { return "caught" }`)).toBe("caught")
+    expect(await value(`return [/a/ instanceof RegExp, /a/.source]`)).toEqual([true, "a"])
+  })
+
+  test("invalid patterns fail with actionable messages", async () => {
+    const fromString = await error(`return "abc".match("(")`)
+    expect(fromString.message).toContain('String.match received the string "("')
+    expect(fromString.message).toContain("escape them with a backslash")
+
+    const fromConstructor = await error(`return new RegExp("(")`)
+    expect(fromConstructor.message).toContain('new RegExp(...) received "("')
+    expect(fromConstructor.message).toContain("escape them with a backslash")
+
+    const fromFlags = await error(`return new RegExp("a", "xz")`)
+    expect(fromFlags.message).toContain('invalid flags "xz"')
+    expect(fromFlags.message).toContain("Valid flags are")
+  })
+
+  test("missing g-flag errors say how to fix the call", async () => {
+    expect((await error(`return "aa".replaceAll(/a/, "b")`)).message).toContain("write /a/g, or use String.replace")
+    expect((await error(`return "aa".matchAll(/a/)`)).message).toContain("write /a/g, or use String.match")
+  })
+
+  test("a non-pattern argument names the expected shapes", async () => {
+    const err = await error(`return "abc".match(42)`)
+    expect(err.message).toContain("expects a regular expression")
+    expect(err.message).toContain("not number")
+  })
+
+  test("source and flags properties read through", async () => {
+    expect(await value(`const r = /ab/gi; return { source: r.source, flags: r.flags, global: r.global }`)).toEqual({
+      source: "ab",
+      flags: "gi",
+      global: true,
+    })
+  })
+
+  test("regexes serialize to {} at the boundary, like JSON", async () => {
+    expect(await value(`return /a/`)).toEqual({})
+    expect(await value(`return JSON.stringify({ r: /a/g })`)).toBe('{"r":{}}')
+  })
+
+  test("template interpolation renders the literal form", async () => {
+    expect(await value("return `${/ab/g}`")).toBe("/ab/g")
+  })
+})
+
+describe("Map", () => {
+  test("get/set/has/size with chaining", async () => {
+    expect(
+      await value(`
+      const m = new Map()
+      m.set("a", 1).set("b", 2)
+      return { a: m.get("a"), b: m.get("b"), has: m.has("a"), miss: m.get("zz") === undefined, size: m.size }
+    `),
+    ).toEqual({ a: 1, b: 2, has: true, miss: true, size: 5 - 3 })
+  })
+
+  test("object keys use identity", async () => {
+    expect(
+      await value(`
+      const key = { id: 1 }
+      const m = new Map()
+      m.set(key, "hit")
+      return [m.get(key), m.get({ id: 1 }) === undefined]
+    `),
+    ).toEqual(["hit", true])
+  })
+
+  test("construction from entry pairs and another Map", async () => {
+    expect(await value(`const m = new Map([["a", 1], ["b", 2]]); return m.get("b")`)).toBe(2)
+    expect(
+      await value(
+        `const m = new Map([["a", 1]]); const n = new Map(m); n.set("b", 2); return [n.get("a"), n.get("b"), m.has("b")]`,
+      ),
+    ).toEqual([1, 2, false])
+    expect((await error(`return new Map("nope")`)).message).toMatch(/\[key, value\] pairs/)
+    expect((await error(`return new Map(["flat"])`)).message).toMatch(/\[key, value\] pairs/)
+  })
+
+  test("keys/values/entries return arrays", async () => {
+    expect(
+      await value(`
+      const m = new Map([["a", 1], ["b", 2]])
+      return { keys: m.keys(), values: m.values(), entries: m.entries() }
+    `),
+    ).toEqual({
+      keys: ["a", "b"],
+      values: [1, 2],
+      entries: [
+        ["a", 1],
+        ["b", 2],
+      ],
+    })
+  })
+
+  test("Object.fromEntries(map) and Array.from(map)", async () => {
+    expect(await value(`return Object.fromEntries(new Map([["a", 1], ["b", 2]]))`)).toEqual({ a: 1, b: 2 })
+    expect(await value(`return Array.from(new Map([["a", 1]]))`)).toEqual([["a", 1]])
+  })
+
+  test("for...of iterates [key, value] pairs with destructuring", async () => {
+    expect(
+      await value(`
+      const m = new Map([["a", 1], ["b", 2]])
+      let total = 0
+      let names = ""
+      for (const [key, count] of m) { names += key; total += count }
+      return names + total
+    `),
+    ).toBe("ab3")
+  })
+
+  test("spread produces entry pairs", async () => {
+    expect(await value(`return [...new Map([["a", 1]])]`)).toEqual([["a", 1]])
+  })
+
+  test("forEach passes (value, key)", async () => {
+    expect(
+      await value(`
+      const m = new Map([["a", 1], ["b", 2]])
+      const seen = []
+      m.forEach((count, key) => seen.push(key + count))
+      return seen
+    `),
+    ).toEqual(["a1", "b2"])
+  })
+
+  test("delete and clear", async () => {
+    expect(
+      await value(`
+      const m = new Map([["a", 1], ["b", 2]])
+      const removed = m.delete("a")
+      const missed = m.delete("zz")
+      const sizeAfterDelete = m.size
+      m.clear()
+      return [removed, missed, sizeAfterDelete, m.size]
+    `),
+    ).toEqual([true, false, 1, 0])
+  })
+
+  test("counting idiom: grouped tallies", async () => {
+    expect(
+      await value(`
+      const words = ["a", "b", "a", "c", "a"]
+      const counts = new Map()
+      for (const word of words) counts.set(word, (counts.get(word) ?? 0) + 1)
+      return Object.fromEntries(counts)
+    `),
+    ).toEqual({ a: 3, b: 1, c: 1 })
+  })
+
+  test("maps serialize to {} at the boundary, like JSON", async () => {
+    expect(await value(`return new Map([["a", 1]])`)).toEqual({})
+    expect(await value(`return JSON.stringify(new Map([["a", 1]]))`)).toBe("{}")
+  })
+
+  test("console.log renders map contents for debugging", async () => {
+    const result = await run(`console.log(new Map([["a", 1]])); return null`)
+    expect(result.ok).toBe(true)
+    expect(result.logs?.[0]).toBe(`Map(1) [["a",1]]`)
+  })
+})
+
+describe("Set", () => {
+  test("add/has/delete/size with chaining", async () => {
+    expect(
+      await value(`
+      const s = new Set()
+      s.add(1).add(2).add(1)
+      const removed = s.delete(2)
+      return [s.size, s.has(1), s.has(2), removed]
+    `),
+    ).toEqual([1, true, false, true])
+  })
+
+  test("dedupe idiom: [...new Set(items)]", async () => {
+    expect(await value(`return [...new Set([1, 2, 2, 3, 1])]`)).toEqual([1, 2, 3])
+  })
+
+  test("construction from strings and other Sets", async () => {
+    expect(await value(`return [...new Set("aba")]`)).toEqual(["a", "b"])
+    expect(await value(`return Array.from(new Set(new Set([1, 2])))`)).toEqual([1, 2])
+  })
+
+  test("SameValueZero: NaN is findable", async () => {
+    expect(await value(`const s = new Set([NaN]); return s.has(NaN)`)).toBe(true)
+  })
+
+  test("for...of iterates values", async () => {
+    expect(
+      await value(`
+      let total = 0
+      for (const n of new Set([1, 2, 3])) total += n
+      return total
+    `),
+    ).toBe(6)
+  })
+
+  test("sets serialize to {} at the boundary, like JSON", async () => {
+    expect(await value(`return { s: new Set([1]) }`)).toEqual({ s: {} })
+  })
+})
+
+describe("stdlib integration", () => {
+  test("typeof reports constructors as functions and never throws", async () => {
+    expect(await value(`return typeof Map`)).toBe("function")
+    expect(await value(`return typeof ((x) => x)`)).toBe("function")
+    expect(await value(`return typeof Math`)).toBe("object")
+    expect(await value(`return typeof tools`)).toBe("object")
+  })
+
+  test("negation works on any value", async () => {
+    expect(await value(`return !new Map()`)).toBe(false)
+    expect(await value(`const fn = () => 1; return !fn`)).toBe(false)
+  })
+
+  test("object spread of sandbox values is a no-op, like JS", async () => {
+    expect(await value(`return { ...new Map([["a", 1]]), kept: true }`)).toEqual({ kept: true })
+  })
+
+  test("dates inside Map values survive in-sandbox reads", async () => {
+    expect(
+      await value(`
+      const m = new Map([["start", new Date(1000)]])
+      return m.get("start").getTime()
+    `),
+    ).toBe(1000)
+  })
+
+  test("instanceof recognizes the stdlib value types", async () => {
+    expect(
+      await value(
+        `return [new Date(0) instanceof Date, /a/ instanceof RegExp, new Map() instanceof Map, new Set() instanceof Set]`,
+      ),
+    ).toEqual([true, true, true, true])
+    expect(
+      await value(`return [[1] instanceof Array, [1] instanceof Object, ({}) instanceof Object, 5 instanceof Object]`),
+    ).toEqual([true, true, true, false])
+    expect(await value(`return [new Map() instanceof Set, "s" instanceof Date]`)).toEqual([false, false])
+    expect(
+      await value(`const p = Promise.resolve(1); const isPromise = p instanceof Promise; await p; return isPromise`),
+    ).toBe(true)
+  })
+
+  test("realistic pipeline: parse, extract with regex, dedupe, count by day", async () => {
+    expect(
+      await value(`
+      const raw = '[{"at":"2024-01-01T05:00:00Z","tag":"a b"},{"at":"2024-01-01T09:00:00Z","tag":"b c"},{"at":"2024-01-02T01:00:00Z","tag":"a"}]'
+      const rows = JSON.parse(raw)
+      const tags = new Set()
+      const byDay = new Map()
+      for (const row of rows) {
+        for (const m of row.tag.matchAll(/[a-z]+/g)) tags.add(m[0])
+        const day = new Date(row.at).toISOString().slice(0, 10)
+        byDay.set(day, (byDay.get(day) ?? 0) + 1)
+      }
+      return { tags: [...tags].sort((a, b) => (a < b ? -1 : 1)), byDay: Object.fromEntries(byDay) }
+    `),
+    ).toEqual({ tags: ["a", "b", "c"], byDay: { "2024-01-01": 2, "2024-01-02": 1 } })
+  })
+})
+
+describe("sandbox values at intra-sandbox checkpoints", () => {
+  test("Object.values/entries keep Dates usable", async () => {
+    expect(await value(`return Object.values({ d: new Date(0) })[0].getTime()`)).toBe(0)
+    expect(await value(`const [key, d] = Object.entries({ d: new Date(0) })[0]; return key + ":" + d.getTime()`)).toBe(
+      "d:0",
+    )
+  })
+
+  test("Object.assign keeps Maps usable", async () => {
+    expect(await value(`const merged = Object.assign({}, { m: new Map([["a", 1]]) }); return merged.m.get("a")`)).toBe(
+      1,
+    )
+  })
+
+  test("object and array spread keep sandbox values usable", async () => {
+    expect(
+      await value(`
+      const src = { m: new Map([["a", 1]]) }
+      const copy = { ...src }
+      copy.m.set("b", 2)
+      return [copy.m.get("a"), src.m.get("b")]
+    `),
+    ).toEqual([1, 2])
+    expect(await value(`const list = [new Date(1000)]; const copy = [...list]; return copy[0].getTime()`)).toBe(1000)
+  })
+
+  test("Array.from over arrays keeps nested sandbox values usable", async () => {
+    expect(await value(`return Array.from([new Date(5)])[0].getTime()`)).toBe(5)
+  })
+
+  test("regexes stay callable through Object.values", async () => {
+    expect(await value(`return Object.values({ r: /ab+/ })[0].test("abb")`)).toBe(true)
+  })
+
+  test("Object.* helpers see sandbox values as empty objects, never internals", async () => {
+    expect(await value(`return Object.keys(new Map([["a", 1]]))`)).toEqual([])
+    expect(await value(`return Object.values(new Date(0))`)).toEqual([])
+    expect(await value(`return Object.entries(new Set([1]))`)).toEqual([])
+    expect(await value(`return Object.assign({}, new Map([["a", 1]]))`)).toEqual({})
+    expect(await value(`return Object.hasOwn(new Date(0), "time")`)).toBe(false)
+  })
+
+  test("the host boundary still serializes JSON forms: results, JSON.stringify, and tool arguments", async () => {
+    expect(await value(`return { d: new Date(0), m: new Map([["a", 1]]) }`)).toEqual({
+      d: "1970-01-01T00:00:00.000Z",
+      m: {},
+    })
+    expect(await value(`return JSON.stringify({ d: new Date(0) })`)).toBe('{"d":"1970-01-01T00:00:00.000Z"}')
+
+    const observed: Array<unknown> = []
+    const capture = Tool.make({
+      description: "Capture the exact input the host receives",
+      input: { type: "object" },
+      run: (input) =>
+        Effect.sync(() => {
+          observed.push(input)
+          return "ok"
+        }),
+    })
+    const result = await Effect.runPromise(
+      CodeMode.execute({
+        tools: { host: { capture } },
+        code: `return await tools.host.capture({ when: new Date(0), tags: new Map([["a", 1]]) })`,
+      }),
+    )
+    expect(result.ok).toBe(true)
+    expect(observed).toStrictEqual([{ when: "1970-01-01T00:00:00.000Z", tags: {} }])
+  })
+})
diff --git a/packages/codemode/tsconfig.json b/packages/codemode/tsconfig.json
new file mode 100644
index 0000000000..fe5c4d217b
--- /dev/null
+++ b/packages/codemode/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "extends": "@tsconfig/bun/tsconfig.json",
+  "compilerOptions": {
+    "noUncheckedIndexedAccess": false
+  }
+}

From 5fc4e18b82d5fd15341f41bc370b15581792da46 Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Fri, 3 Jul 2026 11:10:49 -0500
Subject: [PATCH 06/82] test(core): cover when AND semantics and multiselect
 neq (#35182)

---
 packages/core/test/form.test.ts | 73 +++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/packages/core/test/form.test.ts b/packages/core/test/form.test.ts
index 7ea351df3a..e032cf6c71 100644
--- a/packages/core/test/form.test.ts
+++ b/packages/core/test/form.test.ts
@@ -92,6 +92,79 @@ describe("Form", () => {
     }),
   )
 
+  it.effect("requires every when condition to match and treats empty when as active", () =>
+    Effect.gen(function* () {
+      const service = yield* Form.Service
+      const created = yield* service.create({
+        sessionID: "global",
+        mode: "form",
+        fields: [
+          { key: "a", type: "boolean" },
+          { key: "b", type: "boolean" },
+          {
+            key: "x",
+            type: "string",
+            required: true,
+            when: [
+              { key: "a", op: "eq", value: true },
+              { key: "b", op: "eq", value: true },
+            ],
+          },
+          { key: "z", type: "string", required: true, when: [] },
+        ],
+      })
+
+      const missingX = yield* service.reply({ id: created.id, answer: { a: true, b: true, z: "ok" } }).pipe(Effect.flip)
+      expect(missingX).toEqual(new Form.InvalidAnswerError({ id: created.id, message: "Missing required form field: x" }))
+
+      const inactiveX = yield* service
+        .reply({ id: created.id, answer: { a: true, b: false, x: "nope", z: "ok" } })
+        .pipe(Effect.flip)
+      expect(inactiveX).toEqual(new Form.InvalidAnswerError({ id: created.id, message: "Form field is not active: x" }))
+
+      const missingZ = yield* service.reply({ id: created.id, answer: { a: true, b: false } }).pipe(Effect.flip)
+      expect(missingZ).toEqual(new Form.InvalidAnswerError({ id: created.id, message: "Missing required form field: z" }))
+
+      yield* service.reply({ id: created.id, answer: { a: true, b: false, z: "ok" } })
+      expect(yield* service.state(created.id)).toEqual({ status: "answered", answer: { a: true, b: false, z: "ok" } })
+    }),
+  )
+
+  it.effect("evaluates neq against multiselect answers as non-inclusion", () =>
+    Effect.gen(function* () {
+      const service = yield* Form.Service
+      const options = [
+        { value: "go", label: "Go" },
+        { value: "ts", label: "TypeScript" },
+      ]
+      const created = yield* service.create({
+        sessionID: "global",
+        mode: "form",
+        fields: [
+          { key: "langs", type: "multiselect", options },
+          { key: "note", type: "string", required: true, when: [{ key: "langs", op: "neq", value: "go" }] },
+        ],
+      })
+
+      const missing = yield* service.reply({ id: created.id, answer: { langs: ["ts"] } }).pipe(Effect.flip)
+      expect(missing).toEqual(
+        new Form.InvalidAnswerError({ id: created.id, message: "Missing required form field: note" }),
+      )
+
+      // an answered-but-empty multiselect also satisfies neq
+      const missingEmpty = yield* service.reply({ id: created.id, answer: { langs: [] } }).pipe(Effect.flip)
+      expect(missingEmpty).toEqual(
+        new Form.InvalidAnswerError({ id: created.id, message: "Missing required form field: note" }),
+      )
+
+      const inactive = yield* service.reply({ id: created.id, answer: { langs: ["go"], note: "x" } }).pipe(Effect.flip)
+      expect(inactive).toEqual(new Form.InvalidAnswerError({ id: created.id, message: "Form field is not active: note" }))
+
+      yield* service.reply({ id: created.id, answer: { langs: ["go"] } })
+      expect(yield* service.state(created.id)).toEqual({ status: "answered", answer: { langs: ["go"] } })
+    }),
+  )
+
   it.effect("treats unanswered when references as false and cascades inactivity", () =>
     Effect.gen(function* () {
       const service = yield* Form.Service

From bd8d858bf7fafc8bb9b5d1ac88001e83bede430e Mon Sep 17 00:00:00 2001
From: James Long <longster@gmail.com>
Date: Fri, 3 Jul 2026 12:19:09 -0400
Subject: [PATCH 07/82] feat(core): implement V2 session.shell (#35183)

---
 .../client/src/effect/generated/client.ts     | 137 ++++++++++--------
 .../client/src/promise/generated/client.ts    |  14 ++
 .../client/src/promise/generated/types.ts     |   8 +
 packages/core/src/session.ts                  |  70 ++++++++-
 packages/core/test/session-create.test.ts     |  56 +++++--
 .../plugin/src/v2/effect/generated/api.ts     | 132 +++++++++--------
 packages/protocol/src/groups/session.ts       |  20 +++
 packages/sdk/js/src/v2/gen/sdk.gen.ts         |  39 +++++
 packages/sdk/js/src/v2/gen/types.gen.ts       |  38 +++++
 packages/server/src/handlers/session.ts       |  18 +++
 packages/tui/src/component/prompt/index.tsx   |   7 +-
 packages/tui/src/routes/session/index.tsx     |  27 +++-
 12 files changed, 414 insertions(+), 152 deletions(-)

diff --git a/packages/client/src/effect/generated/client.ts b/packages/client/src/effect/generated/client.ts
index f25557c0de..a9a91eb8c6 100644
--- a/packages/client/src/effect/generated/client.ts
+++ b/packages/client/src/effect/generated/client.ts
@@ -208,23 +208,35 @@ const Endpoint4_11 = (raw: RawClient["server.session"]) => (input: Endpoint4_11I
     payload: { text: input["text"], description: input["description"], metadata: input["metadata"] },
   }).pipe(Effect.mapError(mapClientError))
 
-type Endpoint4_12Request = Parameters<RawClient["server.session"]["session.compact"]>[0]
-type Endpoint4_12Input = { readonly sessionID: Endpoint4_12Request["params"]["sessionID"] }
+type Endpoint4_12Request = Parameters<RawClient["server.session"]["session.shell"]>[0]
+type Endpoint4_12Input = {
+  readonly sessionID: Endpoint4_12Request["params"]["sessionID"]
+  readonly id?: Endpoint4_12Request["payload"]["id"]
+  readonly command: Endpoint4_12Request["payload"]["command"]
+}
 const Endpoint4_12 = (raw: RawClient["server.session"]) => (input: Endpoint4_12Input) =>
-  raw["session.compact"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))
+  raw["session.shell"]({
+    params: { sessionID: input["sessionID"] },
+    payload: { id: input["id"], command: input["command"] },
+  }).pipe(Effect.mapError(mapClientError))
 
-type Endpoint4_13Request = Parameters<RawClient["server.session"]["session.wait"]>[0]
+type Endpoint4_13Request = Parameters<RawClient["server.session"]["session.compact"]>[0]
 type Endpoint4_13Input = { readonly sessionID: Endpoint4_13Request["params"]["sessionID"] }
 const Endpoint4_13 = (raw: RawClient["server.session"]) => (input: Endpoint4_13Input) =>
+  raw["session.compact"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))
+
+type Endpoint4_14Request = Parameters<RawClient["server.session"]["session.wait"]>[0]
+type Endpoint4_14Input = { readonly sessionID: Endpoint4_14Request["params"]["sessionID"] }
+const Endpoint4_14 = (raw: RawClient["server.session"]) => (input: Endpoint4_14Input) =>
   raw["session.wait"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))
 
-type Endpoint4_14Request = Parameters<RawClient["server.session"]["session.revert.stage"]>[0]
-type Endpoint4_14Input = {
-  readonly sessionID: Endpoint4_14Request["params"]["sessionID"]
-  readonly messageID: Endpoint4_14Request["payload"]["messageID"]
-  readonly files?: Endpoint4_14Request["payload"]["files"]
+type Endpoint4_15Request = Parameters<RawClient["server.session"]["session.revert.stage"]>[0]
+type Endpoint4_15Input = {
+  readonly sessionID: Endpoint4_15Request["params"]["sessionID"]
+  readonly messageID: Endpoint4_15Request["payload"]["messageID"]
+  readonly files?: Endpoint4_15Request["payload"]["files"]
 }
-const Endpoint4_14 = (raw: RawClient["server.session"]) => (input: Endpoint4_14Input) =>
+const Endpoint4_15 = (raw: RawClient["server.session"]) => (input: Endpoint4_15Input) =>
   raw["session.revert.stage"]({
     params: { sessionID: input["sessionID"] },
     payload: { messageID: input["messageID"], files: input["files"] },
@@ -233,61 +245,61 @@ const Endpoint4_14 = (raw: RawClient["server.session"]) => (input: Endpoint4_14I
     Effect.map((value) => value.data),
   )
 
-type Endpoint4_15Request = Parameters<RawClient["server.session"]["session.revert.clear"]>[0]
-type Endpoint4_15Input = { readonly sessionID: Endpoint4_15Request["params"]["sessionID"] }
-const Endpoint4_15 = (raw: RawClient["server.session"]) => (input: Endpoint4_15Input) =>
-  raw["session.revert.clear"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))
-
-type Endpoint4_16Request = Parameters<RawClient["server.session"]["session.revert.commit"]>[0]
+type Endpoint4_16Request = Parameters<RawClient["server.session"]["session.revert.clear"]>[0]
 type Endpoint4_16Input = { readonly sessionID: Endpoint4_16Request["params"]["sessionID"] }
 const Endpoint4_16 = (raw: RawClient["server.session"]) => (input: Endpoint4_16Input) =>
-  raw["session.revert.commit"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))
+  raw["session.revert.clear"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))
 
-type Endpoint4_17Request = Parameters<RawClient["server.session"]["session.context"]>[0]
+type Endpoint4_17Request = Parameters<RawClient["server.session"]["session.revert.commit"]>[0]
 type Endpoint4_17Input = { readonly sessionID: Endpoint4_17Request["params"]["sessionID"] }
 const Endpoint4_17 = (raw: RawClient["server.session"]) => (input: Endpoint4_17Input) =>
+  raw["session.revert.commit"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))
+
+type Endpoint4_18Request = Parameters<RawClient["server.session"]["session.context"]>[0]
+type Endpoint4_18Input = { readonly sessionID: Endpoint4_18Request["params"]["sessionID"] }
+const Endpoint4_18 = (raw: RawClient["server.session"]) => (input: Endpoint4_18Input) =>
   raw["session.context"]({ params: { sessionID: input["sessionID"] } }).pipe(
     Effect.mapError(mapClientError),
     Effect.map((value) => value.data),
   )
 
-type Endpoint4_18Request = Parameters<RawClient["server.session"]["session.context.entry.list"]>[0]
-type Endpoint4_18Input = { readonly sessionID: Endpoint4_18Request["params"]["sessionID"] }
-const Endpoint4_18 = (raw: RawClient["server.session"]) => (input: Endpoint4_18Input) =>
+type Endpoint4_19Request = Parameters<RawClient["server.session"]["session.context.entry.list"]>[0]
+type Endpoint4_19Input = { readonly sessionID: Endpoint4_19Request["params"]["sessionID"] }
+const Endpoint4_19 = (raw: RawClient["server.session"]) => (input: Endpoint4_19Input) =>
   raw["session.context.entry.list"]({ params: { sessionID: input["sessionID"] } }).pipe(
     Effect.mapError(mapClientError),
     Effect.map((value) => value.data),
   )
 
-type Endpoint4_19Request = Parameters<RawClient["server.session"]["session.context.entry.put"]>[0]
-type Endpoint4_19Input = {
-  readonly sessionID: Endpoint4_19Request["params"]["sessionID"]
-  readonly key: Endpoint4_19Request["params"]["key"]
-  readonly value: Endpoint4_19Request["payload"]["value"]
+type Endpoint4_20Request = Parameters<RawClient["server.session"]["session.context.entry.put"]>[0]
+type Endpoint4_20Input = {
+  readonly sessionID: Endpoint4_20Request["params"]["sessionID"]
+  readonly key: Endpoint4_20Request["params"]["key"]
+  readonly value: Endpoint4_20Request["payload"]["value"]
 }
-const Endpoint4_19 = (raw: RawClient["server.session"]) => (input: Endpoint4_19Input) =>
+const Endpoint4_20 = (raw: RawClient["server.session"]) => (input: Endpoint4_20Input) =>
   raw["session.context.entry.put"]({
     params: { sessionID: input["sessionID"], key: input["key"] },
     payload: { value: input["value"] },
   }).pipe(Effect.mapError(mapClientError))
 
-type Endpoint4_20Request = Parameters<RawClient["server.session"]["session.context.entry.remove"]>[0]
-type Endpoint4_20Input = {
-  readonly sessionID: Endpoint4_20Request["params"]["sessionID"]
-  readonly key: Endpoint4_20Request["params"]["key"]
+type Endpoint4_21Request = Parameters<RawClient["server.session"]["session.context.entry.remove"]>[0]
+type Endpoint4_21Input = {
+  readonly sessionID: Endpoint4_21Request["params"]["sessionID"]
+  readonly key: Endpoint4_21Request["params"]["key"]
 }
-const Endpoint4_20 = (raw: RawClient["server.session"]) => (input: Endpoint4_20Input) =>
+const Endpoint4_21 = (raw: RawClient["server.session"]) => (input: Endpoint4_21Input) =>
   raw["session.context.entry.remove"]({ params: { sessionID: input["sessionID"], key: input["key"] } }).pipe(
     Effect.mapError(mapClientError),
   )
 
-type Endpoint4_21Request = Parameters<RawClient["server.session"]["session.log"]>[0]
-type Endpoint4_21Input = {
-  readonly sessionID: Endpoint4_21Request["params"]["sessionID"]
-  readonly after?: Endpoint4_21Request["query"]["after"]
-  readonly follow?: Endpoint4_21Request["query"]["follow"]
+type Endpoint4_22Request = Parameters<RawClient["server.session"]["session.log"]>[0]
+type Endpoint4_22Input = {
+  readonly sessionID: Endpoint4_22Request["params"]["sessionID"]
+  readonly after?: Endpoint4_22Request["query"]["after"]
+  readonly follow?: Endpoint4_22Request["query"]["follow"]
 }
-const Endpoint4_21 = (raw: RawClient["server.session"]) => (input: Endpoint4_21Input) =>
+const Endpoint4_22 = (raw: RawClient["server.session"]) => (input: Endpoint4_22Input) =>
   Stream.unwrap(
     raw["session.log"]({
       params: { sessionID: input["sessionID"] },
@@ -298,22 +310,22 @@ const Endpoint4_21 = (raw: RawClient["server.session"]) => (input: Endpoint4_21I
     ),
   )
 
-type Endpoint4_22Request = Parameters<RawClient["server.session"]["session.interrupt"]>[0]
-type Endpoint4_22Input = { readonly sessionID: Endpoint4_22Request["params"]["sessionID"] }
-const Endpoint4_22 = (raw: RawClient["server.session"]) => (input: Endpoint4_22Input) =>
-  raw["session.interrupt"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))
-
-type Endpoint4_23Request = Parameters<RawClient["server.session"]["session.background"]>[0]
+type Endpoint4_23Request = Parameters<RawClient["server.session"]["session.interrupt"]>[0]
 type Endpoint4_23Input = { readonly sessionID: Endpoint4_23Request["params"]["sessionID"] }
 const Endpoint4_23 = (raw: RawClient["server.session"]) => (input: Endpoint4_23Input) =>
+  raw["session.interrupt"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))
+
+type Endpoint4_24Request = Parameters<RawClient["server.session"]["session.background"]>[0]
+type Endpoint4_24Input = { readonly sessionID: Endpoint4_24Request["params"]["sessionID"] }
+const Endpoint4_24 = (raw: RawClient["server.session"]) => (input: Endpoint4_24Input) =>
   raw["session.background"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))
 
-type Endpoint4_24Request = Parameters<RawClient["server.session"]["session.message"]>[0]
-type Endpoint4_24Input = {
-  readonly sessionID: Endpoint4_24Request["params"]["sessionID"]
-  readonly messageID: Endpoint4_24Request["params"]["messageID"]
+type Endpoint4_25Request = Parameters<RawClient["server.session"]["session.message"]>[0]
+type Endpoint4_25Input = {
+  readonly sessionID: Endpoint4_25Request["params"]["sessionID"]
+  readonly messageID: Endpoint4_25Request["params"]["messageID"]
 }
-const Endpoint4_24 = (raw: RawClient["server.session"]) => (input: Endpoint4_24Input) =>
+const Endpoint4_25 = (raw: RawClient["server.session"]) => (input: Endpoint4_25Input) =>
   raw["session.message"]({ params: { sessionID: input["sessionID"], messageID: input["messageID"] } }).pipe(
     Effect.mapError(mapClientError),
     Effect.map((value) => value.data),
@@ -332,19 +344,20 @@ const adaptGroup4 = (raw: RawClient["server.session"]) => ({
   command: Endpoint4_9(raw),
   skill: Endpoint4_10(raw),
   synthetic: Endpoint4_11(raw),
-  compact: Endpoint4_12(raw),
-  wait: Endpoint4_13(raw),
-  revertStage: Endpoint4_14(raw),
-  revertClear: Endpoint4_15(raw),
-  revertCommit: Endpoint4_16(raw),
-  context: Endpoint4_17(raw),
-  listContextEntries: Endpoint4_18(raw),
-  putContextEntry: Endpoint4_19(raw),
-  removeContextEntry: Endpoint4_20(raw),
-  log: Endpoint4_21(raw),
-  interrupt: Endpoint4_22(raw),
-  background: Endpoint4_23(raw),
-  message: Endpoint4_24(raw),
+  shell: Endpoint4_12(raw),
+  compact: Endpoint4_13(raw),
+  wait: Endpoint4_14(raw),
+  revertStage: Endpoint4_15(raw),
+  revertClear: Endpoint4_16(raw),
+  revertCommit: Endpoint4_17(raw),
+  context: Endpoint4_18(raw),
+  listContextEntries: Endpoint4_19(raw),
+  putContextEntry: Endpoint4_20(raw),
+  removeContextEntry: Endpoint4_21(raw),
+  log: Endpoint4_22(raw),
+  interrupt: Endpoint4_23(raw),
+  background: Endpoint4_24(raw),
+  message: Endpoint4_25(raw),
 })
 
 type Endpoint5_0Request = Parameters<RawClient["server.message"]["session.messages"]>[0]
diff --git a/packages/client/src/promise/generated/client.ts b/packages/client/src/promise/generated/client.ts
index ee752f23ef..79368764c7 100644
--- a/packages/client/src/promise/generated/client.ts
+++ b/packages/client/src/promise/generated/client.ts
@@ -29,6 +29,8 @@ import type {
   SessionSkillOutput,
   SessionSyntheticInput,
   SessionSyntheticOutput,
+  SessionShellInput,
+  SessionShellOutput,
   SessionCompactInput,
   SessionCompactOutput,
   SessionWaitInput,
@@ -525,6 +527,18 @@ export function make(options: ClientOptions) {
           },
           requestOptions,
         ),
+      shell: (input: SessionShellInput, requestOptions?: RequestOptions) =>
+        request<SessionShellOutput>(
+          {
+            method: "POST",
+            path: `/api/session/${encodeURIComponent(input.sessionID)}/shell`,
+            body: { id: input["id"], command: input["command"] },
+            successStatus: 204,
+            declaredStatuses: [404, 400, 401],
+            empty: true,
+          },
+          requestOptions,
+        ),
       compact: (input: SessionCompactInput, requestOptions?: RequestOptions) =>
         request<SessionCompactOutput>(
           {
diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts
index d858ded933..6c8286fc52 100644
--- a/packages/client/src/promise/generated/types.ts
+++ b/packages/client/src/promise/generated/types.ts
@@ -865,6 +865,14 @@ export type SessionSyntheticInput = {
 
 export type SessionSyntheticOutput = void
 
+export type SessionShellInput = {
+  readonly sessionID: { readonly sessionID: string }["sessionID"]
+  readonly id?: { readonly id?: string | undefined; readonly command: string }["id"]
+  readonly command: { readonly id?: string | undefined; readonly command: string }["command"]
+}
+
+export type SessionShellOutput = void
+
 export type SessionCompactInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }
 
 export type SessionCompactOutput = void
diff --git a/packages/core/src/session.ts b/packages/core/src/session.ts
index 4f1be4151c..acae2691c8 100644
--- a/packages/core/src/session.ts
+++ b/packages/core/src/session.ts
@@ -41,6 +41,9 @@ import type { EventLog } from "@opencode-ai/schema/event-log"
 import { SkillV2 } from "./skill"
 import { Job } from "./job"
 import { CommandV2 } from "./command"
+import { Identifier } from "./util/identifier"
+import { Shell } from "./shell"
+import { KeyedMutex } from "./effect/keyed-mutex"
 
 export const RevertState = Revert.State
 export type RevertState = Revert.State
@@ -106,7 +109,7 @@ export class NotFoundError extends Schema.TaggedErrorClass<NotFoundError>()("Ses
 export class OperationUnavailableError extends Schema.TaggedErrorClass<OperationUnavailableError>()(
   "Session.OperationUnavailableError",
   {
-    operation: Schema.Literals(["move", "shell", "skill", "switchAgent", "compact"]),
+    operation: Schema.Literals(["move", "skill", "switchAgent", "compact"]),
   },
 ) {}
 
@@ -208,8 +211,7 @@ export interface Interface {
     id?: EventV2.ID
     sessionID: SessionSchema.ID
     command: string
-    resume?: boolean
-  }) => Effect.Effect<void, OperationUnavailableError>
+  }) => Effect.Effect<void, NotFoundError>
   readonly skill: (input: {
     id?: SessionMessage.ID
     sessionID: SessionSchema.ID
@@ -255,6 +257,8 @@ const layer = Layer.effect(
     const locations = yield* LocationServiceMap.Service
     const jobs = yield* Job.Service
     const scope = yield* Scope.Scope
+    const activeShells = new Set<SessionSchema.ID>()
+    const shellLocks = KeyedMutex.makeUnsafe<SessionSchema.ID>()
     const decodeMessage = Schema.decodeUnknownEffect(SessionMessage.Message)
     const isDurableSessionEvent = Schema.is(SessionEvent.Durable)
     const decode = (row: typeof SessionMessageTable.$inferSelect) =>
@@ -268,6 +272,19 @@ const layer = Layer.effect(
         ),
       )
 
+    // Session shell is user-initiated and synchronous at the API boundary, while
+    // the Location shell service owns process lifecycle and file-backed output.
+    const runShellCommand = (command: string, cwd: string) =>
+      Effect.gen(function* () {
+        const shell = yield* Shell.Service
+        const info = yield* shell.create({ command, cwd })
+        yield* shell.wait(info.id)
+        const output = yield* shell.output(info.id, { limit: SHELL_MAX_CAPTURE_BYTES })
+        return output.output || "(no output)"
+      }).pipe(
+        Effect.catchTag("Shell.NotFoundError", () => Effect.succeed("Shell command output is no longer available.")),
+      )
+
     const result = Service.of({
       create: Effect.fn("V2Session.create")(function* (input) {
         const sessionID = input.id ?? SessionSchema.ID.create()
@@ -489,7 +506,10 @@ const layer = Layer.effect(
             )
             if (!SessionInput.equivalent(admitted, expected))
               return yield* new PromptConflictError({ sessionID: input.sessionID, messageID })
-            if (input.resume !== false) yield* execution.wake(admitted.sessionID)
+            if (input.resume !== false) {
+              if (activeShells.has(admitted.sessionID)) return admitted
+              yield* execution.wake(admitted.sessionID)
+            }
             return admitted
           }),
         ),
@@ -525,8 +545,43 @@ const layer = Layer.effect(
           resume: input.resume,
         })
       }),
-      shell: Effect.fn("V2Session.shell")(function* () {
-        return yield* new OperationUnavailableError({ operation: "shell" })
+      shell: Effect.fn("V2Session.shell")(function* (input) {
+        const session = yield* result.get(input.sessionID)
+        yield* shellLocks.withLock(input.sessionID)(
+          Effect.gen(function* () {
+            activeShells.add(input.sessionID)
+            if ((yield* execution.active).has(input.sessionID)) yield* execution.awaitIdle(input.sessionID)
+            const messageID = SessionMessage.ID.create()
+            const callID = Identifier.ascending()
+            yield* events.publish(
+              SessionEvent.Shell.Started,
+              {
+                sessionID: input.sessionID,
+                messageID,
+                callID,
+                command: input.command,
+                timestamp: yield* DateTime.now,
+              },
+              { id: input.id },
+            )
+            const output = yield* runShellCommand(input.command, session.location.directory).pipe(
+              Effect.provide(locations.get(session.location)),
+            )
+            yield* events.publish(SessionEvent.Shell.Ended, {
+              sessionID: input.sessionID,
+              callID,
+              output,
+              timestamp: yield* DateTime.now,
+            })
+          }).pipe(
+            Effect.ensuring(
+              Effect.gen(function* () {
+                activeShells.delete(input.sessionID)
+                yield* execution.wake(input.sessionID)
+              }),
+            ),
+          ),
+        )
       }),
       skill: Effect.fn("V2Session.skill")(function* (input) {
         const session = yield* result.get(input.sessionID)
@@ -679,6 +734,9 @@ const resolvePrompt = (input: PromptInput.Prompt) =>
     }),
   })
 
+// Mirrors the shell tool's in-memory preview safety limit.
+const SHELL_MAX_CAPTURE_BYTES = 1024 * 1024
+
 export const node = makeGlobalNode({
   service: Service,
   layer: layer.pipe(Layer.orDie),
diff --git a/packages/core/test/session-create.test.ts b/packages/core/test/session-create.test.ts
index 9c41d1d9ac..b22c65ec97 100644
--- a/packages/core/test/session-create.test.ts
+++ b/packages/core/test/session-create.test.ts
@@ -17,11 +17,11 @@ import { AbsolutePath } from "@opencode-ai/core/schema"
 import { SessionV2 } from "@opencode-ai/core/session"
 import { SessionV1 } from "@opencode-ai/core/v1/session"
 import { Prompt } from "@opencode-ai/core/session/prompt"
+import { SessionMessage } from "@opencode-ai/core/session/message"
 import { SessionProjector } from "@opencode-ai/core/session/projector"
 import { SessionExecution } from "@opencode-ai/core/session/execution"
 import { SessionInput } from "@opencode-ai/core/session/input"
 import { SessionEvent } from "@opencode-ai/core/session/event"
-import { SessionMessage } from "@opencode-ai/core/session/message"
 import { SessionTable } from "@opencode-ai/core/session/sql"
 import { SessionStore } from "@opencode-ai/core/session/store"
 import { WorkspaceV2 } from "@opencode-ai/core/workspace"
@@ -62,6 +62,13 @@ const assertCreateInputTypes = (session: SessionV2.Interface) => {
 }
 void assertCreateInputTypes
 
+function withTmp<A, E, R>(f: (directory: string) => Effect.Effect<A, E, R>) {
+  return Effect.acquireRelease(
+    Effect.promise(() => tmpdir()),
+    (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+  ).pipe(Effect.flatMap((tmp) => f(tmp.path)))
+}
+
 describe("SessionV2.create", () => {
   it.effect("creates a fresh projected session when the ID is omitted", () =>
     Effect.gen(function* () {
@@ -476,20 +483,41 @@ describe("SessionV2.create", () => {
     }),
   )
 
-  it.effect("reports unfinished Session operations as unavailable", () =>
-    Effect.gen(function* () {
-      const session = yield* SessionV2.Service
-      const created = yield* session.create({ location })
-      const unavailable = (
-        effect: Effect.Effect<void, SessionV2.NotFoundError | SessionV2.OperationUnavailableError>,
-      ) =>
-        effect.pipe(
-          Effect.flip,
-          Effect.map((error) => (error instanceof SessionV2.OperationUnavailableError ? error.operation : "not-found")),
-        )
+  it.live("runs a shell command and projects the started/ended shell message", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const session = yield* SessionV2.Service
+        const created = yield* session.create({
+          location: Location.Ref.make({ directory: AbsolutePath.make(directory) }),
+        })
 
-      expect(yield* unavailable(session.shell({ sessionID: created.id, command: "pwd" }))).toBe("shell")
-    }),
+        yield* session.shell({ sessionID: created.id, command: "echo hello" })
+
+        const messages = yield* session.messages({ sessionID: created.id, order: "asc" })
+        const shell = messages.find((message): message is SessionMessage.Shell => message.type === "shell")
+        expect(shell).toMatchObject({ type: "shell", command: "echo hello" })
+        expect(shell?.output).toContain("hello")
+        expect(shell?.time.completed).toBeDefined()
+      }),
+    ),
+  )
+
+  it.live("still emits shell ended for a failing command", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const session = yield* SessionV2.Service
+        const created = yield* session.create({
+          location: Location.Ref.make({ directory: AbsolutePath.make(directory) }),
+        })
+
+        yield* session.shell({ sessionID: created.id, command: "false" })
+
+        const messages = yield* session.messages({ sessionID: created.id, order: "asc" })
+        const shell = messages.find((message): message is SessionMessage.Shell => message.type === "shell")
+        expect(shell).toMatchObject({ type: "shell", command: "false" })
+        expect(shell?.time.completed).toBeDefined()
+      }),
+    ),
   )
 
   it.effect("switches the selected agent through the durable Session event", () =>
diff --git a/packages/plugin/src/v2/effect/generated/api.ts b/packages/plugin/src/v2/effect/generated/api.ts
index 049ca7486c..8e764daa82 100644
--- a/packages/plugin/src/v2/effect/generated/api.ts
+++ b/packages/plugin/src/v2/effect/generated/api.ts
@@ -153,96 +153,105 @@ export type Endpoint4_11Input = {
 export type Endpoint4_11Output = EffectValue<ReturnType<RawClient["server.session"]["session.synthetic"]>>
 export type SessionSyntheticOperation<E = never> = (input: Endpoint4_11Input) => Effect.Effect<Endpoint4_11Output, E>
 
-type Endpoint4_12Request = Parameters<RawClient["server.session"]["session.compact"]>[0]
-export type Endpoint4_12Input = { readonly sessionID: Endpoint4_12Request["params"]["sessionID"] }
-export type Endpoint4_12Output = EffectValue<ReturnType<RawClient["server.session"]["session.compact"]>>
-export type SessionCompactOperation<E = never> = (input: Endpoint4_12Input) => Effect.Effect<Endpoint4_12Output, E>
-
-type Endpoint4_13Request = Parameters<RawClient["server.session"]["session.wait"]>[0]
-export type Endpoint4_13Input = { readonly sessionID: Endpoint4_13Request["params"]["sessionID"] }
-export type Endpoint4_13Output = EffectValue<ReturnType<RawClient["server.session"]["session.wait"]>>
-export type SessionWaitOperation<E = never> = (input: Endpoint4_13Input) => Effect.Effect<Endpoint4_13Output, E>
-
-type Endpoint4_14Request = Parameters<RawClient["server.session"]["session.revert.stage"]>[0]
-export type Endpoint4_14Input = {
-  readonly sessionID: Endpoint4_14Request["params"]["sessionID"]
-  readonly messageID: Endpoint4_14Request["payload"]["messageID"]
-  readonly files?: Endpoint4_14Request["payload"]["files"]
+type Endpoint4_12Request = Parameters<RawClient["server.session"]["session.shell"]>[0]
+export type Endpoint4_12Input = {
+  readonly sessionID: Endpoint4_12Request["params"]["sessionID"]
+  readonly id?: Endpoint4_12Request["payload"]["id"]
+  readonly command: Endpoint4_12Request["payload"]["command"]
 }
-export type Endpoint4_14Output = EffectValue<ReturnType<RawClient["server.session"]["session.revert.stage"]>>["data"]
-export type SessionRevertStageOperation<E = never> = (input: Endpoint4_14Input) => Effect.Effect<Endpoint4_14Output, E>
+export type Endpoint4_12Output = EffectValue<ReturnType<RawClient["server.session"]["session.shell"]>>
+export type SessionShellOperation<E = never> = (input: Endpoint4_12Input) => Effect.Effect<Endpoint4_12Output, E>
 
-type Endpoint4_15Request = Parameters<RawClient["server.session"]["session.revert.clear"]>[0]
-export type Endpoint4_15Input = { readonly sessionID: Endpoint4_15Request["params"]["sessionID"] }
-export type Endpoint4_15Output = EffectValue<ReturnType<RawClient["server.session"]["session.revert.clear"]>>
-export type SessionRevertClearOperation<E = never> = (input: Endpoint4_15Input) => Effect.Effect<Endpoint4_15Output, E>
+type Endpoint4_13Request = Parameters<RawClient["server.session"]["session.compact"]>[0]
+export type Endpoint4_13Input = { readonly sessionID: Endpoint4_13Request["params"]["sessionID"] }
+export type Endpoint4_13Output = EffectValue<ReturnType<RawClient["server.session"]["session.compact"]>>
+export type SessionCompactOperation<E = never> = (input: Endpoint4_13Input) => Effect.Effect<Endpoint4_13Output, E>
 
-type Endpoint4_16Request = Parameters<RawClient["server.session"]["session.revert.commit"]>[0]
+type Endpoint4_14Request = Parameters<RawClient["server.session"]["session.wait"]>[0]
+export type Endpoint4_14Input = { readonly sessionID: Endpoint4_14Request["params"]["sessionID"] }
+export type Endpoint4_14Output = EffectValue<ReturnType<RawClient["server.session"]["session.wait"]>>
+export type SessionWaitOperation<E = never> = (input: Endpoint4_14Input) => Effect.Effect<Endpoint4_14Output, E>
+
+type Endpoint4_15Request = Parameters<RawClient["server.session"]["session.revert.stage"]>[0]
+export type Endpoint4_15Input = {
+  readonly sessionID: Endpoint4_15Request["params"]["sessionID"]
+  readonly messageID: Endpoint4_15Request["payload"]["messageID"]
+  readonly files?: Endpoint4_15Request["payload"]["files"]
+}
+export type Endpoint4_15Output = EffectValue<ReturnType<RawClient["server.session"]["session.revert.stage"]>>["data"]
+export type SessionRevertStageOperation<E = never> = (input: Endpoint4_15Input) => Effect.Effect<Endpoint4_15Output, E>
+
+type Endpoint4_16Request = Parameters<RawClient["server.session"]["session.revert.clear"]>[0]
 export type Endpoint4_16Input = { readonly sessionID: Endpoint4_16Request["params"]["sessionID"] }
-export type Endpoint4_16Output = EffectValue<ReturnType<RawClient["server.session"]["session.revert.commit"]>>
-export type SessionRevertCommitOperation<E = never> = (input: Endpoint4_16Input) => Effect.Effect<Endpoint4_16Output, E>
+export type Endpoint4_16Output = EffectValue<ReturnType<RawClient["server.session"]["session.revert.clear"]>>
+export type SessionRevertClearOperation<E = never> = (input: Endpoint4_16Input) => Effect.Effect<Endpoint4_16Output, E>
 
-type Endpoint4_17Request = Parameters<RawClient["server.session"]["session.context"]>[0]
+type Endpoint4_17Request = Parameters<RawClient["server.session"]["session.revert.commit"]>[0]
 export type Endpoint4_17Input = { readonly sessionID: Endpoint4_17Request["params"]["sessionID"] }
-export type Endpoint4_17Output = EffectValue<ReturnType<RawClient["server.session"]["session.context"]>>["data"]
-export type SessionContextOperation<E = never> = (input: Endpoint4_17Input) => Effect.Effect<Endpoint4_17Output, E>
+export type Endpoint4_17Output = EffectValue<ReturnType<RawClient["server.session"]["session.revert.commit"]>>
+export type SessionRevertCommitOperation<E = never> = (input: Endpoint4_17Input) => Effect.Effect<Endpoint4_17Output, E>
 
-type Endpoint4_18Request = Parameters<RawClient["server.session"]["session.context.entry.list"]>[0]
+type Endpoint4_18Request = Parameters<RawClient["server.session"]["session.context"]>[0]
 export type Endpoint4_18Input = { readonly sessionID: Endpoint4_18Request["params"]["sessionID"] }
-export type Endpoint4_18Output = EffectValue<
+export type Endpoint4_18Output = EffectValue<ReturnType<RawClient["server.session"]["session.context"]>>["data"]
+export type SessionContextOperation<E = never> = (input: Endpoint4_18Input) => Effect.Effect<Endpoint4_18Output, E>
+
+type Endpoint4_19Request = Parameters<RawClient["server.session"]["session.context.entry.list"]>[0]
+export type Endpoint4_19Input = { readonly sessionID: Endpoint4_19Request["params"]["sessionID"] }
+export type Endpoint4_19Output = EffectValue<
   ReturnType<RawClient["server.session"]["session.context.entry.list"]>
 >["data"]
 export type SessionListContextEntriesOperation<E = never> = (
-  input: Endpoint4_18Input,
-) => Effect.Effect<Endpoint4_18Output, E>
-
-type Endpoint4_19Request = Parameters<RawClient["server.session"]["session.context.entry.put"]>[0]
-export type Endpoint4_19Input = {
-  readonly sessionID: Endpoint4_19Request["params"]["sessionID"]
-  readonly key: Endpoint4_19Request["params"]["key"]
-  readonly value: Endpoint4_19Request["payload"]["value"]
-}
-export type Endpoint4_19Output = EffectValue<ReturnType<RawClient["server.session"]["session.context.entry.put"]>>
-export type SessionPutContextEntryOperation<E = never> = (
   input: Endpoint4_19Input,
 ) => Effect.Effect<Endpoint4_19Output, E>
 
-type Endpoint4_20Request = Parameters<RawClient["server.session"]["session.context.entry.remove"]>[0]
+type Endpoint4_20Request = Parameters<RawClient["server.session"]["session.context.entry.put"]>[0]
 export type Endpoint4_20Input = {
   readonly sessionID: Endpoint4_20Request["params"]["sessionID"]
   readonly key: Endpoint4_20Request["params"]["key"]
+  readonly value: Endpoint4_20Request["payload"]["value"]
 }
-export type Endpoint4_20Output = EffectValue<ReturnType<RawClient["server.session"]["session.context.entry.remove"]>>
-export type SessionRemoveContextEntryOperation<E = never> = (
+export type Endpoint4_20Output = EffectValue<ReturnType<RawClient["server.session"]["session.context.entry.put"]>>
+export type SessionPutContextEntryOperation<E = never> = (
   input: Endpoint4_20Input,
 ) => Effect.Effect<Endpoint4_20Output, E>
 
-type Endpoint4_21Request = Parameters<RawClient["server.session"]["session.log"]>[0]
+type Endpoint4_21Request = Parameters<RawClient["server.session"]["session.context.entry.remove"]>[0]
 export type Endpoint4_21Input = {
   readonly sessionID: Endpoint4_21Request["params"]["sessionID"]
-  readonly after?: Endpoint4_21Request["query"]["after"]
-  readonly follow?: Endpoint4_21Request["query"]["follow"]
+  readonly key: Endpoint4_21Request["params"]["key"]
 }
-export type Endpoint4_21Output = StreamValue<EffectValue<ReturnType<RawClient["server.session"]["session.log"]>>>
-export type SessionLogOperation<E = never> = (input: Endpoint4_21Input) => Stream.Stream<Endpoint4_21Output, E>
+export type Endpoint4_21Output = EffectValue<ReturnType<RawClient["server.session"]["session.context.entry.remove"]>>
+export type SessionRemoveContextEntryOperation<E = never> = (
+  input: Endpoint4_21Input,
+) => Effect.Effect<Endpoint4_21Output, E>
 
-type Endpoint4_22Request = Parameters<RawClient["server.session"]["session.interrupt"]>[0]
-export type Endpoint4_22Input = { readonly sessionID: Endpoint4_22Request["params"]["sessionID"] }
-export type Endpoint4_22Output = EffectValue<ReturnType<RawClient["server.session"]["session.interrupt"]>>
-export type SessionInterruptOperation<E = never> = (input: Endpoint4_22Input) => Effect.Effect<Endpoint4_22Output, E>
+type Endpoint4_22Request = Parameters<RawClient["server.session"]["session.log"]>[0]
+export type Endpoint4_22Input = {
+  readonly sessionID: Endpoint4_22Request["params"]["sessionID"]
+  readonly after?: Endpoint4_22Request["query"]["after"]
+  readonly follow?: Endpoint4_22Request["query"]["follow"]
+}
+export type Endpoint4_22Output = StreamValue<EffectValue<ReturnType<RawClient["server.session"]["session.log"]>>>
+export type SessionLogOperation<E = never> = (input: Endpoint4_22Input) => Stream.Stream<Endpoint4_22Output, E>
 
-type Endpoint4_23Request = Parameters<RawClient["server.session"]["session.background"]>[0]
+type Endpoint4_23Request = Parameters<RawClient["server.session"]["session.interrupt"]>[0]
 export type Endpoint4_23Input = { readonly sessionID: Endpoint4_23Request["params"]["sessionID"] }
-export type Endpoint4_23Output = EffectValue<ReturnType<RawClient["server.session"]["session.background"]>>
-export type SessionBackgroundOperation<E = never> = (input: Endpoint4_23Input) => Effect.Effect<Endpoint4_23Output, E>
+export type Endpoint4_23Output = EffectValue<ReturnType<RawClient["server.session"]["session.interrupt"]>>
+export type SessionInterruptOperation<E = never> = (input: Endpoint4_23Input) => Effect.Effect<Endpoint4_23Output, E>
 
-type Endpoint4_24Request = Parameters<RawClient["server.session"]["session.message"]>[0]
-export type Endpoint4_24Input = {
-  readonly sessionID: Endpoint4_24Request["params"]["sessionID"]
-  readonly messageID: Endpoint4_24Request["params"]["messageID"]
+type Endpoint4_24Request = Parameters<RawClient["server.session"]["session.background"]>[0]
+export type Endpoint4_24Input = { readonly sessionID: Endpoint4_24Request["params"]["sessionID"] }
+export type Endpoint4_24Output = EffectValue<ReturnType<RawClient["server.session"]["session.background"]>>
+export type SessionBackgroundOperation<E = never> = (input: Endpoint4_24Input) => Effect.Effect<Endpoint4_24Output, E>
+
+type Endpoint4_25Request = Parameters<RawClient["server.session"]["session.message"]>[0]
+export type Endpoint4_25Input = {
+  readonly sessionID: Endpoint4_25Request["params"]["sessionID"]
+  readonly messageID: Endpoint4_25Request["params"]["messageID"]
 }
-export type Endpoint4_24Output = EffectValue<ReturnType<RawClient["server.session"]["session.message"]>>["data"]
-export type SessionMessageOperation<E = never> = (input: Endpoint4_24Input) => Effect.Effect<Endpoint4_24Output, E>
+export type Endpoint4_25Output = EffectValue<ReturnType<RawClient["server.session"]["session.message"]>>["data"]
+export type SessionMessageOperation<E = never> = (input: Endpoint4_25Input) => Effect.Effect<Endpoint4_25Output, E>
 
 export interface SessionApi<E = never> {
   readonly list: SessionListOperation<E>
@@ -257,6 +266,7 @@ export interface SessionApi<E = never> {
   readonly command: SessionCommandOperation<E>
   readonly skill: SessionSkillOperation<E>
   readonly synthetic: SessionSyntheticOperation<E>
+  readonly shell: SessionShellOperation<E>
   readonly compact: SessionCompactOperation<E>
   readonly wait: SessionWaitOperation<E>
   readonly revertStage: SessionRevertStageOperation<E>
diff --git a/packages/protocol/src/groups/session.ts b/packages/protocol/src/groups/session.ts
index d2114ddee9..527dcc6f61 100644
--- a/packages/protocol/src/groups/session.ts
+++ b/packages/protocol/src/groups/session.ts
@@ -349,6 +349,26 @@ export const makeSessionGroup = <I extends HttpApiMiddleware.AnyId, S>(sessionLo
           }),
         ),
     )
+    .add(
+      HttpApiEndpoint.post("session.shell", "/api/session/:sessionID/shell", {
+        params: { sessionID: Session.ID },
+        payload: Schema.Struct({
+          id: Event.ID.pipe(Schema.optional),
+          command: Schema.String,
+        }),
+        success: HttpApiSchema.NoContent,
+        error: SessionNotFoundError,
+      })
+        .middleware(sessionLocationMiddleware)
+        .annotateMerge(
+          OpenApi.annotations({
+            identifier: "v2.session.shell",
+            summary: "Run shell command",
+            description:
+              "Execute one shell command in the session's working directory. Emits a shell.started event before execution and a shell.ended event with the merged output after.",
+          }),
+        ),
+    )
     .add(
       HttpApiEndpoint.post("session.compact", "/api/session/:sessionID/compact", {
         params: { sessionID: Session.ID },
diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts
index 1c896d80a3..ae8318d78e 100644
--- a/packages/sdk/js/src/v2/gen/sdk.gen.ts
+++ b/packages/sdk/js/src/v2/gen/sdk.gen.ts
@@ -422,6 +422,8 @@ import type {
   V2SessionRevertCommitResponses,
   V2SessionRevertStageErrors,
   V2SessionRevertStageResponses,
+  V2SessionShellErrors,
+  V2SessionShellResponses,
   V2SessionSkillErrors,
   V2SessionSkillResponses,
   V2SessionSwitchAgentErrors,
@@ -6240,6 +6242,43 @@ export class Session3 extends HeyApiClient {
     })
   }
 
+  /**
+   * Run shell command
+   *
+   * Execute one shell command in the session's working directory. Emits a shell.started event before execution and a shell.ended event with the merged output after.
+   */
+  public shell<ThrowOnError extends boolean = false>(
+    parameters: {
+      sessionID: string
+      id?: string | null
+      command?: string
+    },
+    options?: Options<never, ThrowOnError>,
+  ) {
+    const params = buildClientParams(
+      [parameters],
+      [
+        {
+          args: [
+            { in: "path", key: "sessionID" },
+            { in: "body", key: "id" },
+            { in: "body", key: "command" },
+          ],
+        },
+      ],
+    )
+    return (options?.client ?? this.client).post<V2SessionShellResponses, V2SessionShellErrors, ThrowOnError>({
+      url: "/api/session/{sessionID}/shell",
+      ...options,
+      ...params,
+      headers: {
+        "Content-Type": "application/json",
+        ...options?.headers,
+        ...params.headers,
+      },
+    })
+  }
+
   /**
    * Compact session
    *
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index 13fbacae2b..2f476f2844 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -16686,6 +16686,44 @@ export type V2SessionSyntheticResponses = {
 
 export type V2SessionSyntheticResponse = V2SessionSyntheticResponses[keyof V2SessionSyntheticResponses]
 
+export type V2SessionShellData = {
+  body: {
+    id?: string | null
+    command: string
+  }
+  path: {
+    sessionID: string
+  }
+  query?: never
+  url: "/api/session/{sessionID}/shell"
+}
+
+export type V2SessionShellErrors = {
+  /**
+   * InvalidRequestError
+   */
+  400: InvalidRequestErrorV2
+  /**
+   * UnauthorizedError
+   */
+  401: UnauthorizedErrorV2
+  /**
+   * SessionNotFoundError
+   */
+  404: SessionNotFoundErrorV2
+}
+
+export type V2SessionShellError = V2SessionShellErrors[keyof V2SessionShellErrors]
+
+export type V2SessionShellResponses = {
+  /**
+   * <No Content>
+   */
+  204: void
+}
+
+export type V2SessionShellResponse = V2SessionShellResponses[keyof V2SessionShellResponses]
+
 export type V2SessionCompactData = {
   body?: never
   path: {
diff --git a/packages/server/src/handlers/session.ts b/packages/server/src/handlers/session.ts
index f6dbabdbf8..8a3cf1b130 100644
--- a/packages/server/src/handlers/session.ts
+++ b/packages/server/src/handlers/session.ts
@@ -323,6 +323,24 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl
           return HttpApiSchema.NoContent.make()
         }),
       )
+      .handle(
+        "session.shell",
+        Effect.fn(function* (ctx) {
+          yield* session
+            .shell({ sessionID: ctx.params.sessionID, id: ctx.payload.id, command: ctx.payload.command })
+            .pipe(
+              Effect.catchTag("Session.NotFoundError", (error) =>
+                Effect.fail(
+                  new SessionNotFoundError({
+                    sessionID: error.sessionID,
+                    message: `Session not found: ${error.sessionID}`,
+                  }),
+                ),
+              ),
+            )
+          return HttpApiSchema.NoContent.make()
+        }),
+      )
       .handle(
         "session.compact",
         Effect.fn(function* (ctx) {
diff --git a/packages/tui/src/component/prompt/index.tsx b/packages/tui/src/component/prompt/index.tsx
index 7b0724e5dc..9fad2eb21c 100644
--- a/packages/tui/src/component/prompt/index.tsx
+++ b/packages/tui/src/component/prompt/index.tsx
@@ -1101,13 +1101,8 @@ export function Prompt(props: PromptProps) {
 
     if (store.mode === "shell") {
       move.startSubmit()
-      void sdk.client.session.shell({
+      void sdk.client.v2.session.shell({
         sessionID,
-        agent: agent.id,
-        model: {
-          providerID: selectedModel.providerID,
-          modelID: selectedModel.modelID,
-        },
         command: inputText,
       })
       setStore("mode", "normal")
diff --git a/packages/tui/src/routes/session/index.tsx b/packages/tui/src/routes/session/index.tsx
index fc7c2d3a0e..d406fe664e 100644
--- a/packages/tui/src/routes/session/index.tsx
+++ b/packages/tui/src/routes/session/index.tsx
@@ -1068,9 +1068,7 @@ function SessionMessageView(props: { message: SessionMessage }) {
         <UserMessage message={props.message as SessionMessageUser} />
       </Match>
       <Match when={props.message.type === "shell"}>
-        <box paddingLeft={3}>
-          <text>{props.message.type === "shell" ? `$ ${props.message.command}\n${props.message.output}` : ""}</text>
-        </box>
+        <ShellMessage message={props.message as Extract<SessionMessage, { type: "shell" }>} />
       </Match>
       <Match when={props.message.type === "agent-switched" || props.message.type === "model-switched"}>
         <SessionSwitchMessageV2 message={props.message} />
@@ -1346,6 +1344,29 @@ function RevertMessage(props: {
   )
 }
 
+function ShellMessage(props: { message: Extract<SessionMessage, { type: "shell" }> }) {
+  const { theme } = useTheme()
+  const output = createMemo(() => stripAnsi(props.message.output.trim()))
+
+  return (
+    <box
+      border={["left"]}
+      paddingTop={1}
+      paddingBottom={1}
+      paddingLeft={2}
+      gap={1}
+      backgroundColor={theme.backgroundPanel}
+      customBorderChars={SplitBorder.customBorderChars}
+      borderColor={theme.background}
+    >
+      <text fg={theme.text}>$ {props.message.command}</text>
+      <Show when={output()}>
+        <text fg={theme.textMuted}>{output()}</text>
+      </Show>
+    </box>
+  )
+}
+
 function UserMessage(props: { message: SessionMessageUser }) {
   const ctx = use()
   const data = useData()

From de476aa51b768e390809f343bff41df9c2d5d4d5 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Fri, 3 Jul 2026 12:35:35 -0400
Subject: [PATCH 08/82] refactor(schema): declare event durability at
 definition level (#35172)

---
 .../client/src/promise/generated/types.ts     | 242 ++---
 packages/core/src/event.ts                    |   3 +-
 packages/core/src/session/projector.ts        |   4 +-
 packages/core/test/event.test.ts              |  14 +-
 packages/core/test/session-log.test.ts        |   2 +-
 .../test/cli/run/noninteractive.test.ts       |  12 +-
 .../test/cli/run/stream-v2.transport.test.ts  | 114 ++-
 .../test/v2/session-message-updater.test.ts   |  15 +
 packages/protocol/src/groups/event.ts         |   1 -
 packages/schema/src/agent.ts                  |   4 +-
 packages/schema/src/catalog.ts                |   4 +-
 packages/schema/src/command.ts                |   4 +-
 packages/schema/src/durable-event-manifest.ts |   7 +-
 packages/schema/src/event-manifest.ts         |   8 +-
 packages/schema/src/event.ts                  |  82 +-
 packages/schema/src/filesystem-watcher.ts     |   4 +-
 packages/schema/src/filesystem.ts             |   4 +-
 packages/schema/src/form.ts                   |  16 +-
 packages/schema/src/ide-event.ts              |   2 +-
 packages/schema/src/installation-event.ts     |   4 +-
 packages/schema/src/integration.ts            |   6 +-
 packages/schema/src/lsp-event.ts              |   2 +-
 packages/schema/src/mcp-event.ts              |   6 +-
 packages/schema/src/models-dev.ts             |   4 +-
 packages/schema/src/permission.ts             |   6 +-
 packages/schema/src/plugin.ts                 |   4 +-
 packages/schema/src/project-directories.ts    |   4 +-
 packages/schema/src/project.ts                |   4 +-
 packages/schema/src/pty.ts                    |  10 +-
 packages/schema/src/question.ts               |   8 +-
 packages/schema/src/reference.ts              |   4 +-
 packages/schema/src/server-event.ts           |   4 +-
 .../schema/src/session-compaction-event.ts    |   2 +-
 packages/schema/src/session-event.ts          | 110 +--
 packages/schema/src/session-status-event.ts   |   4 +-
 packages/schema/src/session-todo.ts           |   4 +-
 packages/schema/src/shell.ts                  |   8 +-
 packages/schema/src/skill.ts                  |   4 +-
 packages/schema/src/tui-event.ts              |   8 +-
 packages/schema/src/v1/legacy-event.ts        |   4 +-
 packages/schema/src/v1/permission.ts          |   6 +-
 packages/schema/src/v1/question.ts            |   8 +-
 packages/schema/src/v1/session.ts             |  22 +-
 packages/schema/src/vcs-event.ts              |   2 +-
 packages/schema/src/workspace-event.ts        |   6 +-
 packages/schema/src/worktree-event.ts         |   4 +-
 packages/schema/test/event-manifest.test.ts   |  69 +-
 packages/schema/test/event.test.ts            |  10 +-
 packages/sdk-next/test/embedded.test.ts       |   2 +-
 packages/sdk/js/src/v2/gen/types.gen.ts       | 930 ++++--------------
 .../test/cli/cmd/tui/notifications.test.ts    |  12 +-
 packages/tui/test/cli/tui/data.test.tsx       |  22 +-
 specs/v2/schema-changelog.md                  |  20 +
 53 files changed, 700 insertions(+), 1165 deletions(-)

diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts
index 6c8286fc52..798155e88e 100644
--- a/packages/client/src/promise/generated/types.ts
+++ b/packages/client/src/promise/generated/types.ts
@@ -1109,7 +1109,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.agent.switched"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1122,7 +1122,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.model.switched"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1135,7 +1135,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.moved"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1148,7 +1148,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.renamed"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: { readonly timestamp: number; readonly sessionID: string; readonly title: string }
         }
@@ -1156,7 +1156,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.forked"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1169,7 +1169,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.prompted"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1196,7 +1196,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.prompt.admitted"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1223,7 +1223,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.context.updated"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1236,7 +1236,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.synthetic"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1251,7 +1251,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.skill.activated"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1265,7 +1265,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.shell.started"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1279,7 +1279,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.shell.ended"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1292,7 +1292,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.step.started"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1307,7 +1307,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.step.ended"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1329,7 +1329,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.step.failed"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1342,7 +1342,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.text.started"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1355,7 +1355,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.text.ended"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1365,11 +1365,40 @@ export type SessionLogOutput =
             readonly text: string
           }
         }
+      | {
+          readonly id: string
+          readonly metadata?: { readonly [x: string]: unknown }
+          readonly type: "session.next.reasoning.started"
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly location?: { readonly directory: string; readonly workspaceID?: string }
+          readonly data: {
+            readonly timestamp: number
+            readonly sessionID: string
+            readonly assistantMessageID: string
+            readonly reasoningID: string
+            readonly providerMetadata?: { readonly [x: string]: { readonly [x: string]: unknown } }
+          }
+        }
+      | {
+          readonly id: string
+          readonly metadata?: { readonly [x: string]: unknown }
+          readonly type: "session.next.reasoning.ended"
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly location?: { readonly directory: string; readonly workspaceID?: string }
+          readonly data: {
+            readonly timestamp: number
+            readonly sessionID: string
+            readonly assistantMessageID: string
+            readonly reasoningID: string
+            readonly text: string
+            readonly providerMetadata?: { readonly [x: string]: { readonly [x: string]: unknown } }
+          }
+        }
       | {
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.tool.input.started"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1383,7 +1412,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.tool.input.ended"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1397,7 +1426,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.tool.called"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1416,7 +1445,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.tool.progress"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1434,7 +1463,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.tool.success"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1458,7 +1487,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.tool.failed"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1473,40 +1502,11 @@ export type SessionLogOutput =
             }
           }
         }
-      | {
-          readonly id: string
-          readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.reasoning.started"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-          readonly location?: { readonly directory: string; readonly workspaceID?: string }
-          readonly data: {
-            readonly timestamp: number
-            readonly sessionID: string
-            readonly assistantMessageID: string
-            readonly reasoningID: string
-            readonly providerMetadata?: { readonly [x: string]: { readonly [x: string]: unknown } }
-          }
-        }
-      | {
-          readonly id: string
-          readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.reasoning.ended"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-          readonly location?: { readonly directory: string; readonly workspaceID?: string }
-          readonly data: {
-            readonly timestamp: number
-            readonly sessionID: string
-            readonly assistantMessageID: string
-            readonly reasoningID: string
-            readonly text: string
-            readonly providerMetadata?: { readonly [x: string]: { readonly [x: string]: unknown } }
-          }
-        }
       | {
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.retried"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1526,7 +1526,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.compaction.started"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1539,7 +1539,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.compaction.ended"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1554,7 +1554,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.revert.staged"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
             readonly timestamp: number
@@ -1578,7 +1578,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.revert.cleared"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: { readonly timestamp: number; readonly sessionID: string }
         }
@@ -1586,7 +1586,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly metadata?: { readonly [x: string]: unknown }
           readonly type: "session.next.revert.committed"
-          readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: { readonly timestamp: number; readonly sessionID: string; readonly messageID: string }
         }
@@ -3773,7 +3773,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "models-dev.refreshed"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {}
     }
@@ -3781,7 +3780,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "integration.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {}
     }
@@ -3789,7 +3787,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "integration.connection.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly integrationID: string }
     }
@@ -3797,7 +3794,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "catalog.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {}
     }
@@ -3805,7 +3801,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "agent.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {}
     }
@@ -3813,7 +3808,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.created"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly sessionID: string
@@ -3874,7 +3869,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly sessionID: string
@@ -3935,7 +3930,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.deleted"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly sessionID: string
@@ -3996,7 +3991,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "message.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly sessionID: string
@@ -4100,7 +4095,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "message.removed"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly sessionID: string; readonly messageID: string }
     }
@@ -4108,7 +4103,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "message.part.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly sessionID: string
@@ -4346,7 +4341,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "message.part.removed"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly sessionID: string; readonly messageID: string; readonly partID: string }
     }
@@ -4354,7 +4349,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.agent.switched"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4367,7 +4362,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.model.switched"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4380,7 +4375,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.moved"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4393,7 +4388,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.renamed"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly timestamp: number; readonly sessionID: string; readonly title: string }
     }
@@ -4401,7 +4396,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.forked"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4414,7 +4409,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.prompted"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4441,7 +4436,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.prompt.admitted"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4468,7 +4463,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.execution.settled"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4481,7 +4475,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.context.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4494,7 +4488,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.synthetic"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4509,7 +4503,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.skill.activated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4523,7 +4517,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.shell.started"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4537,7 +4531,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.shell.ended"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4550,7 +4544,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.step.started"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4565,7 +4559,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.step.ended"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4587,7 +4581,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.step.failed"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4600,7 +4594,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.text.started"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4613,7 +4607,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.text.delta"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4627,7 +4620,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.text.ended"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4641,7 +4634,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.reasoning.started"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4655,7 +4648,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.reasoning.delta"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4669,7 +4661,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.reasoning.ended"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4684,7 +4676,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.tool.input.started"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4698,7 +4690,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.tool.input.delta"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4712,7 +4703,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.tool.input.ended"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4726,7 +4717,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.tool.called"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4745,7 +4736,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.tool.progress"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4763,7 +4754,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.tool.success"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4787,7 +4778,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.tool.failed"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4806,7 +4797,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.retried"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4826,7 +4817,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.compaction.started"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4839,7 +4830,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.compaction.delta"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4852,7 +4842,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.compaction.ended"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4867,7 +4857,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.revert.staged"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly timestamp: number
@@ -4891,7 +4881,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.revert.cleared"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly timestamp: number; readonly sessionID: string }
     }
@@ -4899,7 +4889,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.next.revert.committed"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly timestamp: number; readonly sessionID: string; readonly messageID: string }
     }
@@ -4907,7 +4897,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "file.edited"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly file: string }
     }
@@ -4915,7 +4904,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "reference.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {}
     }
@@ -4923,7 +4911,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "permission.v2.asked"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly id: string
@@ -4939,7 +4926,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "permission.v2.replied"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly sessionID: string
@@ -4951,7 +4937,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "plugin.added"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly id: string }
     }
@@ -4959,7 +4944,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "project.directories.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly projectID: string }
     }
@@ -4967,7 +4951,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "command.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {}
     }
@@ -4975,7 +4958,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "skill.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {}
     }
@@ -4983,7 +4965,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "file.watcher.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly file: string; readonly event: "add" | "change" | "unlink" }
     }
@@ -4991,7 +4972,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "pty.created"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly info: {
@@ -5010,7 +4990,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "pty.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly info: {
@@ -5029,7 +5008,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "pty.exited"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly id: string; readonly exitCode: number }
     }
@@ -5037,7 +5015,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "pty.deleted"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly id: string }
     }
@@ -5045,7 +5022,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "shell.created"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly info: {
@@ -5066,7 +5042,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "shell.exited"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly id: string
@@ -5078,7 +5053,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "shell.deleted"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly id: string }
     }
@@ -5086,7 +5060,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "question.v2.asked"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly id: string
@@ -5105,7 +5078,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "question.v2.replied"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly sessionID: string
@@ -5117,7 +5089,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "question.v2.rejected"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly sessionID: string; readonly requestID: string }
     }
@@ -5125,7 +5096,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "form.created"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly form:
@@ -5240,7 +5210,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "form.replied"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly id: string
@@ -5252,7 +5221,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "form.cancelled"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly id: string; readonly sessionID: string }
     }
@@ -5260,7 +5228,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "todo.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly sessionID: string
@@ -5271,7 +5238,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.status"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly sessionID: string
@@ -5298,7 +5264,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.idle"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly sessionID: string }
     }
@@ -5306,7 +5271,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "tui.prompt.append"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly text: string }
     }
@@ -5314,7 +5278,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "tui.command.execute"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly command:
@@ -5342,7 +5305,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "tui.toast.show"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly title?: string
@@ -5355,7 +5317,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "tui.session.select"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly sessionID: string }
     }
@@ -5363,7 +5324,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "installation.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly version: string }
     }
@@ -5371,7 +5331,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "installation.update-available"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly version: string }
     }
@@ -5379,7 +5338,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "vcs.branch.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly branch?: string }
     }
@@ -5387,7 +5345,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "mcp.status.changed"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly server: string }
     }
@@ -5395,7 +5352,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "permission.asked"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly id: string
@@ -5411,7 +5367,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "permission.replied"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly sessionID: string
@@ -5423,7 +5378,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "question.asked"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly id: string
@@ -5442,7 +5396,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "question.replied"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly sessionID: string
@@ -5454,7 +5407,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "question.rejected"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly sessionID: string; readonly requestID: string }
     }
@@ -5462,7 +5414,6 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.error"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly sessionID?: string | undefined
@@ -5503,7 +5454,6 @@ export type EventSubscribeOutput =
   | {
       readonly id: string
       readonly metadata?: { readonly [x: string]: unknown } | undefined
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number } | undefined
       readonly location?: { readonly directory: string; readonly workspaceID?: string } | undefined
       readonly type: "server.connected"
       readonly data: {}
diff --git a/packages/core/src/event.ts b/packages/core/src/event.ts
index 66ee91c6c6..dd0aa43181 100644
--- a/packages/core/src/event.ts
+++ b/packages/core/src/event.ts
@@ -92,8 +92,9 @@ export class SubscriberOverflowError extends Schema.TaggedErrorClass<SubscriberO
   { capacity: Schema.Int },
 ) {}
 
-export const define = Event.define
 export const versionedType = Event.versionedType
+export const durable = Event.durable
+export const ephemeral = Event.ephemeral
 
 export interface PublishOptions {
   readonly id?: ID
diff --git a/packages/core/src/session/projector.ts b/packages/core/src/session/projector.ts
index 8f4cc4e5df..c7145e8dba 100644
--- a/packages/core/src/session/projector.ts
+++ b/packages/core/src/session/projector.ts
@@ -25,7 +25,7 @@ import type { DeepMutable } from "../schema"
 import { Slug } from "../util/slug"
 
 type DatabaseService = Database.Interface["db"]
-type MessageEvent = Exclude<SessionEvent.Event, typeof SessionEvent.Forked.Type>
+type MessageEvent = Exclude<SessionEvent.DurableEvent, typeof SessionEvent.Forked.Type>
 
 const decodeMessage = Schema.decodeUnknownSync(SessionMessage.Message)
 const encodeMessage = Schema.encodeSync(SessionMessage.Message)
@@ -417,7 +417,7 @@ function run(db: DatabaseService, event: MessageEvent) {
   })
 }
 
-function insertMessage(db: DatabaseService, event: SessionEvent.Event, message: SessionMessage.Message) {
+function insertMessage(db: DatabaseService, event: SessionEvent.DurableEvent, message: SessionMessage.Message) {
   if (event.durable === undefined) return Effect.die("Durable Session event is missing aggregate sequence")
   const encoded = encodeMessage(message)
   const { id, type, ...data } = encoded
diff --git a/packages/core/test/event.test.ts b/packages/core/test/event.test.ts
index b40f088c5d..a9220df422 100644
--- a/packages/core/test/event.test.ts
+++ b/packages/core/test/event.test.ts
@@ -22,14 +22,14 @@ const locationLayer = Layer.succeed(
     location({ directory: AbsolutePath.make("project"), workspaceID: WorkspaceV2.ID.make("wrk_test") }),
   ),
 )
-const Message = EventV2.define({
+const Message = EventV2.ephemeral({
   type: "test.message",
   schema: {
     text: Schema.String,
   },
 })
 
-const SyncMessage = EventV2.define({
+const SyncMessage = EventV2.durable({
   type: "test.sync",
   durable: {
     version: 1,
@@ -41,7 +41,7 @@ const SyncMessage = EventV2.define({
   },
 })
 
-const SyncSent = EventV2.define({
+const SyncSent = EventV2.durable({
   type: "test.sent",
   durable: {
     version: 1,
@@ -53,14 +53,14 @@ const SyncSent = EventV2.define({
   },
 })
 
-const GlobalMessage = EventV2.define({
+const GlobalMessage = EventV2.ephemeral({
   type: "test.global",
   schema: {
     text: Schema.String,
   },
 })
 
-const VersionedMessage = EventV2.define({
+const VersionedMessage = EventV2.durable({
   type: "test.versioned",
   durable: {
     version: 2,
@@ -129,12 +129,12 @@ describe("EventV2", () => {
 
   it.effect("selects the latest durable definition independent of declaration order", () =>
     Effect.sync(() => {
-      const latest = EventV2.define({
+      const latest = EventV2.durable({
         type: "test.out-of-order",
         durable: { version: 2, aggregate: "id" },
         schema: { id: Schema.String },
       })
-      const historical = EventV2.define({
+      const historical = EventV2.durable({
         type: "test.out-of-order",
         durable: { version: 1, aggregate: "id" },
         schema: { id: Schema.String },
diff --git a/packages/core/test/session-log.test.ts b/packages/core/test/session-log.test.ts
index b80dd2c206..3b9229589c 100644
--- a/packages/core/test/session-log.test.ts
+++ b/packages/core/test/session-log.test.ts
@@ -78,7 +78,7 @@ describe("SessionV2.log", () => {
 
   it.effect("reads across undecodable gaps in aggregate order and marks the true log position", () =>
     Effect.gen(function* () {
-      const GapEvent = EventV2.define({
+      const GapEvent = EventV2.durable({
         type: "test.session.log.gap",
         durable: { aggregate: "sessionID", version: 1 },
         schema: { sessionID: SessionV2.ID, value: Schema.String },
diff --git a/packages/opencode/test/cli/run/noninteractive.test.ts b/packages/opencode/test/cli/run/noninteractive.test.ts
index 15cf799c75..d8bff61a73 100644
--- a/packages/opencode/test/cli/run/noninteractive.test.ts
+++ b/packages/opencode/test/cli/run/noninteractive.test.ts
@@ -25,6 +25,7 @@ function prompted(messageID: string): V2Event {
   return {
     id: "evt_prompted",
     type: "session.next.prompted",
+    durable: { aggregateID: "ses_1", seq: 0, version: 1 },
     data: { timestamp: 1, sessionID: "ses_1", messageID, prompt: { text: "hello" }, delivery: "steer" },
   }
 }
@@ -39,11 +40,7 @@ function settled(outcome: "success" | "interrupted" = "success"): V2Event {
 
 // Runs one non-interactive prompt against a mocked SDK. `turn` produces the
 // live events the prompt admission triggers, keyed by the generated message ID.
-async function run(input: {
-  turn: (messageID: string) => V2Event[]
-  pendingForms?: FormInfo[]
-  attached?: boolean
-}) {
+async function run(input: { turn: (messageID: string) => V2Event[]; pendingForms?: FormInfo[]; attached?: boolean }) {
   const sdk = new OpencodeClient()
   const values: V2Event[] = [{ id: "evt_connected", type: "server.connected", data: {} }]
   let wake: (() => void) | undefined
@@ -64,8 +61,9 @@ async function run(input: {
   )
   spyOn(sdk.v2.session.permission, "list").mockImplementation(() => ok({ data: [] }) as never)
   spyOn(sdk.v2.session.question, "list").mockImplementation(() => ok({ data: [] }) as never)
-  spyOn(sdk.v2.session.form, "list").mockImplementation((request) =>
-    ok({ data: input.pendingForms?.filter((item) => item.sessionID === request.sessionID) ?? [] }) as never,
+  spyOn(sdk.v2.session.form, "list").mockImplementation(
+    (request) =>
+      ok({ data: input.pendingForms?.filter((item) => item.sessionID === request.sessionID) ?? [] }) as never,
   )
   spyOn(sdk.v2.session.form, "cancel").mockImplementation(() => ok(undefined) as never)
   spyOn(sdk.v2.session, "prompt").mockImplementation((request) => {
diff --git a/packages/opencode/test/cli/run/stream-v2.transport.test.ts b/packages/opencode/test/cli/run/stream-v2.transport.test.ts
index 7c2fc9f70e..2f78d106cf 100644
--- a/packages/opencode/test/cli/run/stream-v2.transport.test.ts
+++ b/packages/opencode/test/cli/run/stream-v2.transport.test.ts
@@ -53,6 +53,10 @@ function connected(id = "evt_connected") {
   return { id, type: "server.connected", data: {} } satisfies RunV2Event
 }
 
+function durable(sessionID: string, seq = 0, version = 1) {
+  return { aggregateID: sessionID, seq, version }
+}
+
 function footer() {
   const commits: StreamCommit[] = []
   const events: FooterEvent[] = []
@@ -94,7 +98,10 @@ function sdk(input: {
   const client = new OpencodeClient()
   let subscription = 0
   spyOn(client.v2.event, "subscribe").mockImplementation(
-    () => Promise.resolve({ stream: input.streams[subscription++]?.stream ?? feed().stream }) as ReturnType<typeof client.v2.event.subscribe>,
+    () =>
+      Promise.resolve({ stream: input.streams[subscription++]?.stream ?? feed().stream }) as ReturnType<
+        typeof client.v2.event.subscribe
+      >,
   )
   spyOn(client.v2.session, "messages").mockImplementation((request) =>
     ok({
@@ -193,32 +200,33 @@ describe("V2 mini transport", () => {
     })
     while (!admitted) await Bun.sleep(0)
     events.push({
-        id: "evt_prompted",
-        type: "session.next.prompted",
-        data: {
-          timestamp: 2,
-          sessionID: "ses_1",
-          messageID: "msg_prompt",
-          prompt: { text: "hello" },
-          delivery: "steer",
-        },
-      })
-      events.push({
-        id: "evt_text",
-        type: "session.next.text.delta",
-        data: {
-          timestamp: 3,
-          sessionID: "ses_1",
-          assistantMessageID: "msg_assistant",
-          textID: "txt_1",
-          delta: "answer",
-        },
-      })
-      events.push({
-        id: "evt_settled",
-        type: "session.next.execution.settled",
-        data: { timestamp: 4, sessionID: "ses_1", outcome: "success" },
-      })
+      id: "evt_prompted",
+      type: "session.next.prompted",
+      durable: durable("ses_1"),
+      data: {
+        timestamp: 2,
+        sessionID: "ses_1",
+        messageID: "msg_prompt",
+        prompt: { text: "hello" },
+        delivery: "steer",
+      },
+    })
+    events.push({
+      id: "evt_text",
+      type: "session.next.text.delta",
+      data: {
+        timestamp: 3,
+        sessionID: "ses_1",
+        assistantMessageID: "msg_assistant",
+        textID: "txt_1",
+        delta: "answer",
+      },
+    })
+    events.push({
+      id: "evt_settled",
+      type: "session.next.execution.settled",
+      data: { timestamp: 4, sessionID: "ses_1", outcome: "success" },
+    })
     await turn
 
     expect(ui.commits.map((item) => item.text)).toEqual(["previous prompt", "answer"])
@@ -245,9 +253,7 @@ describe("V2 mini transport", () => {
       limits: () => ({}),
       footer: ui.api,
     })
-    let request:
-      | Parameters<OpencodeClient["v2"]["session"]["prompt"]>[0]
-      | undefined
+    let request: Parameters<OpencodeClient["v2"]["session"]["prompt"]>[0] | undefined
     // The generated method has conditional return types for throwOnError; this mock represents the successful branch.
     // @ts-expect-error successful SDK response is valid for both modes at runtime
     spyOn(client.v2.session, "prompt").mockImplementation((input) => {
@@ -256,6 +262,7 @@ describe("V2 mini transport", () => {
         events.push({
           id: "evt_prompted",
           type: "session.next.prompted",
+          durable: durable("ses_1"),
           data: {
             timestamp: 2,
             sessionID: "ses_1",
@@ -341,9 +348,7 @@ describe("V2 mini transport", () => {
       limits: () => ({}),
       footer: ui.api,
     })
-    let request:
-      | Parameters<OpencodeClient["v2"]["session"]["prompt"]>[0]
-      | undefined
+    let request: Parameters<OpencodeClient["v2"]["session"]["prompt"]>[0] | undefined
     // The generated method has conditional return types for throwOnError; this mock represents the successful branch.
     // @ts-expect-error successful SDK response is valid for both modes at runtime
     spyOn(client.v2.session, "prompt").mockImplementation((input) => {
@@ -352,6 +357,7 @@ describe("V2 mini transport", () => {
         events.push({
           id: "evt_prompted",
           type: "session.next.prompted",
+          durable: durable("ses_1"),
           data: {
             timestamp: 2,
             sessionID: "ses_1",
@@ -440,9 +446,7 @@ describe("V2 mini transport", () => {
       limits: () => ({}),
       footer: ui.api,
     })
-    let request:
-      | Parameters<OpencodeClient["v2"]["session"]["prompt"]>[0]
-      | undefined
+    let request: Parameters<OpencodeClient["v2"]["session"]["prompt"]>[0] | undefined
     // The generated method has conditional return types for throwOnError; this mock represents the successful branch.
     // @ts-expect-error successful SDK response is valid for both modes at runtime
     spyOn(client.v2.session, "prompt").mockImplementation((input) => {
@@ -451,6 +455,7 @@ describe("V2 mini transport", () => {
         events.push({
           id: "evt_prompted",
           type: "session.next.prompted",
+          durable: durable("ses_1"),
           data: {
             timestamp: 2,
             sessionID: "ses_1",
@@ -593,7 +598,9 @@ describe("V2 mini transport", () => {
       const messageID = request.id ?? "msg_prompt"
       const prompt = request.prompt ?? { text: "" }
       admitted = true
-      return ok({ data: { admittedSeq: 1, id: messageID, sessionID: "ses_1", prompt, delivery: "steer" as const, timeCreated: 2 } })
+      return ok({
+        data: { admittedSeq: 1, id: messageID, sessionID: "ses_1", prompt, delivery: "steer" as const, timeCreated: 2 },
+      })
     })
 
     const turn = transport.runPromptTurn({
@@ -663,7 +670,9 @@ describe("V2 mini transport", () => {
       const messageID = request.id ?? "msg_prompt"
       const prompt = request.prompt ?? { text: "" }
       admitted = true
-      return ok({ data: { admittedSeq: 1, id: messageID, sessionID: "ses_1", prompt, delivery: "steer" as const, timeCreated: 2 } })
+      return ok({
+        data: { admittedSeq: 1, id: messageID, sessionID: "ses_1", prompt, delivery: "steer" as const, timeCreated: 2 },
+      })
     })
 
     const turn = transport.runPromptTurn({
@@ -805,6 +814,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_reasoning",
       type: "session.next.reasoning.ended",
+      durable: durable("ses_1"),
       data: {
         timestamp: 3,
         sessionID: "ses_1",
@@ -841,7 +851,9 @@ describe("V2 mini transport", () => {
       const messageID = request.id ?? "msg_prompt"
       const prompt = request.prompt ?? { text: "" }
       admitted = true
-      return ok({ data: { admittedSeq: 1, id: messageID, sessionID: "ses_1", prompt, delivery: "steer" as const, timeCreated: 2 } })
+      return ok({
+        data: { admittedSeq: 1, id: messageID, sessionID: "ses_1", prompt, delivery: "steer" as const, timeCreated: 2 },
+      })
     })
     const interrupted = spyOn(client.v2.session, "interrupt").mockImplementation(() => ok(undefined))
 
@@ -896,7 +908,9 @@ describe("V2 mini transport", () => {
       const messageID = request.id ?? "msg_prompt"
       const prompt = request.prompt ?? { text: "" }
       admitted = true
-      return ok({ data: { admittedSeq: 1, id: messageID, sessionID: "ses_1", prompt, delivery: "steer" as const, timeCreated: 2 } })
+      return ok({
+        data: { admittedSeq: 1, id: messageID, sessionID: "ses_1", prompt, delivery: "steer" as const, timeCreated: 2 },
+      })
     })
 
     const turn = transport.runPromptTurn({
@@ -911,6 +925,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_prompted",
       type: "session.next.prompted",
+      durable: durable("ses_1"),
       data: {
         timestamp: 2,
         sessionID: "ses_1",
@@ -952,7 +967,9 @@ describe("V2 mini transport", () => {
       const messageID = request.id ?? "msg_prompt"
       const prompt = request.prompt ?? { text: "" }
       admitted = true
-      return ok({ data: { admittedSeq: 1, id: messageID, sessionID: "ses_1", prompt, delivery: "steer" as const, timeCreated: 2 } })
+      return ok({
+        data: { admittedSeq: 1, id: messageID, sessionID: "ses_1", prompt, delivery: "steer" as const, timeCreated: 2 },
+      })
     })
     const interrupted = spyOn(client.v2.session, "interrupt").mockImplementation(() => ok(undefined))
     const controller = new AbortController()
@@ -969,6 +986,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_prompted",
       type: "session.next.prompted",
+      durable: durable("ses_1"),
       data: {
         timestamp: 2,
         sessionID: "ses_1",
@@ -1031,13 +1049,13 @@ describe("V2 mini transport", () => {
       limits: () => ({}),
       footer: ui.api,
     })
-    const states = () =>
-      ui.events.flatMap((event) => (event.type === "stream.subagent" ? [event.state] : []))
+    const states = () => ui.events.flatMap((event) => (event.type === "stream.subagent" ? [event.state] : []))
     transport.selectSubagent("ses_child")
 
     events.push({
       id: "evt_child_step",
       type: "session.next.step.started",
+      durable: durable("ses_child"),
       data: {
         timestamp: 2,
         sessionID: "ses_child",
@@ -1107,13 +1125,13 @@ describe("V2 mini transport", () => {
       limits: () => ({}),
       footer: ui.api,
     })
-    const states = () =>
-      ui.events.flatMap((event) => (event.type === "stream.subagent" ? [event.state] : []))
+    const states = () => ui.events.flatMap((event) => (event.type === "stream.subagent" ? [event.state] : []))
 
     // Both events arrive while session.get is still in flight.
     events.push({
       id: "evt_child_step",
       type: "session.next.step.started",
+      durable: durable("ses_child"),
       data: {
         timestamp: 2,
         sessionID: "ses_child",
@@ -1165,13 +1183,13 @@ describe("V2 mini transport", () => {
       limits: () => ({}),
       footer: ui.api,
     })
-    const states = () =>
-      ui.events.flatMap((event) => (event.type === "stream.subagent" ? [event.state] : []))
+    const states = () => ui.events.flatMap((event) => (event.type === "stream.subagent" ? [event.state] : []))
 
     // Child event arrives first and gets buffered behind the gated session.get.
     events.push({
       id: "evt_child_step",
       type: "session.next.step.started",
+      durable: durable("ses_child"),
       data: {
         timestamp: 2,
         sessionID: "ses_child",
@@ -1184,6 +1202,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_parent_call",
       type: "session.next.tool.called",
+      durable: durable("ses_1"),
       data: {
         timestamp: 3,
         sessionID: "ses_1",
@@ -1197,6 +1216,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_parent_success",
       type: "session.next.tool.success",
+      durable: durable("ses_1", 1),
       data: {
         timestamp: 4,
         sessionID: "ses_1",
diff --git a/packages/opencode/test/v2/session-message-updater.test.ts b/packages/opencode/test/v2/session-message-updater.test.ts
index 668a353f67..e85afaeeff 100644
--- a/packages/opencode/test/v2/session-message-updater.test.ts
+++ b/packages/opencode/test/v2/session-message-updater.test.ts
@@ -9,6 +9,10 @@ import { SessionEvent } from "@opencode-ai/core/session/event"
 import { SessionMessageUpdater } from "@opencode-ai/core/session/message-updater"
 import { SessionMessage } from "@opencode-ai/core/session/message"
 
+function durable(sessionID: SessionID, seq = 0, version = 1) {
+  return { aggregateID: sessionID, seq: EventV2.Seq.make(seq), version: EventV2.Version.make(version) }
+}
+
 test.skip("step snapshots carry over to assistant messages", () => {
   const state: SessionMessageUpdater.MemoryState = { messages: [] }
   const sessionID = SessionID.make("session")
@@ -18,6 +22,7 @@ test.skip("step snapshots carry over to assistant messages", () => {
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       type: "session.next.step.started",
+      durable: durable(sessionID),
       data: {
         sessionID,
         assistantMessageID,
@@ -39,6 +44,7 @@ test.skip("step snapshots carry over to assistant messages", () => {
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       type: "session.next.step.ended",
+      durable: durable(sessionID, 1, 2),
       data: {
         sessionID,
         assistantMessageID,
@@ -71,6 +77,7 @@ test.skip("text ended populates assistant text content", () => {
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       type: "session.next.step.started",
+      durable: durable(sessionID),
       data: {
         sessionID,
         assistantMessageID,
@@ -89,6 +96,7 @@ test.skip("text ended populates assistant text content", () => {
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       type: "session.next.text.started",
+      durable: durable(sessionID, 1),
       data: {
         sessionID,
         assistantMessageID,
@@ -102,6 +110,7 @@ test.skip("text ended populates assistant text content", () => {
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       type: "session.next.text.ended",
+      durable: durable(sessionID, 2),
       data: {
         sessionID,
         assistantMessageID,
@@ -127,6 +136,7 @@ test.skip("tool completion stores completed timestamp", () => {
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       type: "session.next.step.started",
+      durable: durable(sessionID),
       data: {
         sessionID,
         assistantMessageID,
@@ -145,6 +155,7 @@ test.skip("tool completion stores completed timestamp", () => {
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       type: "session.next.tool.input.started",
+      durable: durable(sessionID, 1),
       data: {
         sessionID,
         assistantMessageID,
@@ -159,6 +170,7 @@ test.skip("tool completion stores completed timestamp", () => {
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       type: "session.next.tool.called",
+      durable: durable(sessionID, 2),
       data: {
         sessionID,
         assistantMessageID,
@@ -175,6 +187,7 @@ test.skip("tool completion stores completed timestamp", () => {
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       type: "session.next.tool.success",
+      durable: durable(sessionID, 3),
       data: {
         sessionID,
         assistantMessageID,
@@ -205,6 +218,7 @@ test("compaction events reduce to compaction message only when completed", () =>
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id,
       type: "session.next.compaction.started",
+      durable: durable(sessionID),
       data: {
         sessionID,
         messageID: compactionID,
@@ -246,6 +260,7 @@ test("compaction events reduce to compaction message only when completed", () =>
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       type: "session.next.compaction.ended",
+      durable: durable(sessionID, 1),
       data: {
         sessionID,
         messageID: compactionID,
diff --git a/packages/protocol/src/groups/event.ts b/packages/protocol/src/groups/event.ts
index f5a0c0c7bb..9860aa0cad 100644
--- a/packages/protocol/src/groups/event.ts
+++ b/packages/protocol/src/groups/event.ts
@@ -9,7 +9,6 @@ import { HttpApiEndpoint, HttpApiGroup, HttpApiSchema, OpenApi } from "effect/un
 const fields = {
   id: Event.ID,
   metadata: Schema.optional(Schema.Record(Schema.String, Schema.Unknown)),
-  durable: Schema.optional(Schema.Struct({ aggregateID: Schema.String, seq: Event.Seq, version: Event.Version })),
   location: Schema.optional(Location.Ref),
 }
 
diff --git a/packages/schema/src/agent.ts b/packages/schema/src/agent.ts
index 3d8068b89a..eb84cf500b 100644
--- a/packages/schema/src/agent.ts
+++ b/packages/schema/src/agent.ts
@@ -1,14 +1,14 @@
 export * as Agent from "./agent.js"
 
 import { Schema } from "effect"
-import { define, inventory } from "./event.js"
+import { ephemeral, inventory } from "./event.js"
 import { optional } from "./schema.js"
 import { Model } from "./model.js"
 import { Permission } from "./permission.js"
 import { Provider } from "./provider.js"
 import { PositiveInt, statics } from "./schema.js"
 
-const Updated = define({ type: "agent.updated", schema: {} })
+const Updated = ephemeral({ type: "agent.updated", schema: {} })
 
 export const ID = Schema.String.pipe(Schema.brand("AgentV2.ID"))
 export type ID = typeof ID.Type
diff --git a/packages/schema/src/catalog.ts b/packages/schema/src/catalog.ts
index 19e2c26b9f..58545cd86b 100644
--- a/packages/schema/src/catalog.ts
+++ b/packages/schema/src/catalog.ts
@@ -1,6 +1,6 @@
 export * as Catalog from "./catalog.js"
 
-import { define, inventory } from "./event.js"
+import { ephemeral, inventory } from "./event.js"
 
-const Updated = define({ type: "catalog.updated", schema: {} })
+const Updated = ephemeral({ type: "catalog.updated", schema: {} })
 export const Event = { Updated, Definitions: inventory(Updated) }
diff --git a/packages/schema/src/command.ts b/packages/schema/src/command.ts
index fb88087dbd..81e37157c6 100644
--- a/packages/schema/src/command.ts
+++ b/packages/schema/src/command.ts
@@ -1,11 +1,11 @@
 export * as Command from "./command.js"
 
 import { Schema } from "effect"
-import { define, inventory } from "./event.js"
+import { ephemeral, inventory } from "./event.js"
 import { optional } from "./schema.js"
 import { Model } from "./model.js"
 
-const Updated = define({ type: "command.updated", schema: {} })
+const Updated = ephemeral({ type: "command.updated", schema: {} })
 
 export interface Info extends Schema.Schema.Type<typeof Info> {}
 export const Info = Schema.Struct({
diff --git a/packages/schema/src/durable-event-manifest.ts b/packages/schema/src/durable-event-manifest.ts
index 6b481dcfb9..8f8870f581 100644
--- a/packages/schema/src/durable-event-manifest.ts
+++ b/packages/schema/src/durable-event-manifest.ts
@@ -5,11 +5,8 @@ import { SessionEvent } from "./session-event.js"
 import { SessionV1 } from "./session-v1.js"
 
 export const SessionDurable = {
-  definitions: Event.durable(SessionEvent.DurableDefinitions),
+  definitions: Event.durableMap(SessionEvent.Definitions),
   schema: SessionEvent.Durable,
 } as const
 
-export const Durable = Event.durable([
-  ...SessionV1.Event.Definitions.filter((definition) => definition.durable !== undefined),
-  ...SessionEvent.DurableDefinitions,
-])
+export const Durable = Event.durableMap([...SessionV1.Event.Definitions, ...SessionEvent.Definitions])
diff --git a/packages/schema/src/event-manifest.ts b/packages/schema/src/event-manifest.ts
index 19fca5e79d..e17ff96bc9 100644
--- a/packages/schema/src/event-manifest.ts
+++ b/packages/schema/src/event-manifest.ts
@@ -36,8 +36,12 @@ import { VcsEvent } from "./vcs-event.js"
 import { WorkspaceEvent } from "./workspace-event.js"
 import { WorktreeEvent } from "./worktree-event.js"
 
-const sessionV1DurableDefinitions = SessionV1.Event.Definitions.filter((definition) => definition.durable !== undefined)
-const sessionV1LiveDefinitions = SessionV1.Event.Definitions.filter((definition) => definition.durable === undefined)
+const sessionV1DurableDefinitions = SessionV1.Event.Definitions.filter(
+  (definition) => definition.durability === "durable",
+)
+const sessionV1LiveDefinitions = SessionV1.Event.Definitions.filter(
+  (definition) => definition.durability === "ephemeral",
+)
 
 const coreDefinitions = Event.inventory(...sessionV1DurableDefinitions, ...SessionEvent.Definitions)
 
diff --git a/packages/schema/src/event.ts b/packages/schema/src/event.ts
index 1157a2bc44..aac2f0315e 100644
--- a/packages/schema/src/event.ts
+++ b/packages/schema/src/event.ts
@@ -24,50 +24,70 @@ export type Seq = typeof Seq.Type
 export const Version = Schema.Int.check(Schema.isGreaterThanOrEqualTo(1)).pipe(Schema.brand("Event.Version"))
 export type Version = typeof Version.Type
 
-export type Definition<
+const DurableEnvelope = Schema.Struct({ aggregateID: Schema.String, seq: Seq, version: Version })
+export type DurableEnvelope = typeof DurableEnvelope.Type
+
+export type DurableDefinition<
   Type extends string = string,
   DataSchema extends Schema.Codec<unknown, unknown> = Schema.Codec<unknown, unknown>,
 > = Schema.Top & {
   readonly type: Type
-  readonly durable?: {
+  readonly durability: "durable"
+  readonly durable: {
     readonly version: number
     readonly aggregate: string
   }
   readonly data: DataSchema
 }
 
+export type EphemeralDefinition<
+  Type extends string = string,
+  DataSchema extends Schema.Codec<unknown, unknown> = Schema.Codec<unknown, unknown>,
+> = Schema.Top & {
+  readonly type: Type
+  readonly durability: "ephemeral"
+  readonly durable?: never
+  readonly data: DataSchema
+}
+
+export type Definition<
+  Type extends string = string,
+  DataSchema extends Schema.Codec<unknown, unknown> = Schema.Codec<unknown, unknown>,
+> = DurableDefinition<Type, DataSchema> | EphemeralDefinition<Type, DataSchema>
+
 export type Data<D extends Definition> = Schema.Schema.Type<D["data"]>
 
-export type Payload<D extends Definition = Definition> = {
+type PayloadBase<D extends Definition> = {
   readonly id: ID
   readonly type: D["type"]
   readonly data: Data<D>
-  readonly durable?: {
-    readonly aggregateID: string
-    readonly seq: Seq
-    readonly version: Version
-  }
   readonly location?: Location.Ref
   readonly metadata?: Record<string, unknown>
 }
 
-export function define<
-  const Type extends string,
-  const Fields extends Readonly<Record<PropertyKey, Schema.Codec<unknown, unknown>>>,
->(input: {
+export type Payload<D extends Definition = Definition> = D extends DurableDefinition
+  ? PayloadBase<D> & { readonly durable: DurableEnvelope }
+  : PayloadBase<D> & { readonly durable?: never }
+
+type Input<Type extends string, Fields extends Readonly<Record<PropertyKey, Schema.Codec<unknown, unknown>>>> = {
   readonly type: Type
   readonly durable?: {
     readonly version: number
     readonly aggregate: string
   }
   readonly schema: Fields
-}) {
+}
+
+export function durable<
+  const Type extends string,
+  const Fields extends Readonly<Record<PropertyKey, Schema.Codec<unknown, unknown>>>,
+>(input: Input<Type, Fields> & { readonly durable: NonNullable<Input<Type, Fields>["durable"]> }) {
   const data = Schema.Struct(input.schema)
   return Schema.Struct({
     id: ID,
     metadata: optional(Schema.Record(Schema.String, Schema.Unknown)),
     type: Schema.Literal(input.type),
-    durable: optional(Schema.Struct({ aggregateID: Schema.String, seq: Seq, version: Version })),
+    durable: DurableEnvelope,
     location: optional(Location.Ref),
     data,
   })
@@ -75,10 +95,34 @@ export function define<
     .pipe(
       statics(() => ({
         type: input.type,
-        ...(input.durable === undefined ? {} : { durable: input.durable }),
+        durability: "durable" as const,
+        durable: input.durable,
         data,
       })),
-    ) satisfies Definition<Type, typeof data>
+    ) satisfies DurableDefinition<Type, typeof data>
+}
+
+export function ephemeral<
+  const Type extends string,
+  const Fields extends Readonly<Record<PropertyKey, Schema.Codec<unknown, unknown>>>,
+>(input: Omit<Input<Type, Fields>, "durable">) {
+  const data = Schema.Struct(input.schema)
+  return Schema.Struct({
+    id: ID,
+    metadata: optional(Schema.Record(Schema.String, Schema.Unknown)),
+    type: Schema.Literal(input.type),
+    location: optional(Location.Ref),
+    data,
+  })
+    .annotate({ identifier: input.type })
+    .pipe(
+      statics(() => ({
+        type: input.type,
+        durability: "ephemeral" as const,
+        durable: undefined,
+        data,
+      })),
+    ) satisfies EphemeralDefinition<Type, typeof data>
 }
 
 export function inventory<const Definitions extends ReadonlyArray<Definition>>(...definitions: Definitions) {
@@ -107,15 +151,15 @@ export function versionedType(type: string, version: number) {
   return `${type}.${version}`
 }
 
-export function durable<const Definitions extends ReadonlyArray<Definition>>(definitions: Definitions) {
+export function durableMap<const Definitions extends ReadonlyArray<Definition>>(definitions: Definitions) {
   return readonlyMap(
     definitions.reduce((result, definition) => {
-      if (!definition.durable) return result
+      if (definition.durability !== "durable") return result
       const key = versionedType(definition.type, definition.durable.version)
       if (result.has(key)) throw new Error(`Duplicate durable event definition for ${key}`)
       result.set(key, definition)
       return result
-    }, new Map<string, Definitions[number]>()),
+    }, new Map<string, DurableDefinition>()),
   )
 }
 
diff --git a/packages/schema/src/filesystem-watcher.ts b/packages/schema/src/filesystem-watcher.ts
index e1e1d557d6..debe0914d1 100644
--- a/packages/schema/src/filesystem-watcher.ts
+++ b/packages/schema/src/filesystem-watcher.ts
@@ -1,9 +1,9 @@
 export * as FileSystemWatcher from "./filesystem-watcher.js"
 
 import { Schema } from "effect"
-import { define, inventory } from "./event.js"
+import { ephemeral, inventory } from "./event.js"
 
-const Updated = define({
+const Updated = ephemeral({
   type: "file.watcher.updated",
   schema: {
     file: Schema.String,
diff --git a/packages/schema/src/filesystem.ts b/packages/schema/src/filesystem.ts
index 882c3f0abf..3599e48c7c 100644
--- a/packages/schema/src/filesystem.ts
+++ b/packages/schema/src/filesystem.ts
@@ -2,10 +2,10 @@ export * as FileSystem from "./filesystem.js"
 
 import { Schema } from "effect"
 import { optional } from "./schema.js"
-import { define, inventory } from "./event.js"
+import { ephemeral, inventory } from "./event.js"
 import { NonNegativeInt, PositiveInt, RelativePath } from "./schema.js"
 
-const Edited = define({
+const Edited = ephemeral({
   type: "file.edited",
   schema: { file: Schema.String },
 })
diff --git a/packages/schema/src/form.ts b/packages/schema/src/form.ts
index 820192d06f..df9d455f13 100644
--- a/packages/schema/src/form.ts
+++ b/packages/schema/src/form.ts
@@ -1,7 +1,7 @@
 export * as Form from "./form.js"
 
 import { Schema } from "effect"
-import { define, inventory } from "./event.js"
+import { ephemeral, inventory } from "./event.js"
 import { ascending } from "./identifier.js"
 import { NonNegativeInt, optional, statics } from "./schema.js"
 
@@ -127,9 +127,11 @@ export interface UrlInfo extends Schema.Schema.Type<typeof UrlInfo> {}
 export const Info = Schema.Union([FormInfo, UrlInfo]).pipe(Schema.toTaggedUnion("mode"))
 export type Info = FormInfo | UrlInfo
 
-export const Value = Schema.Union([Schema.String, Schema.Number, Schema.Boolean, Schema.Array(Schema.String)]).annotate({
-  identifier: "Form.Value",
-})
+export const Value = Schema.Union([Schema.String, Schema.Number, Schema.Boolean, Schema.Array(Schema.String)]).annotate(
+  {
+    identifier: "Form.Value",
+  },
+)
 export type Value = typeof Value.Type
 
 export const Answer = Schema.Record(Schema.String, Value).annotate({ identifier: "Form.Answer" })
@@ -149,8 +151,8 @@ export const Reply = Schema.Struct({
 }).annotate({ identifier: "Form.Reply" })
 export interface Reply extends Schema.Schema.Type<typeof Reply> {}
 
-const Created = define({ type: "form.created", schema: { form: Info } })
-const Replied = define({ type: "form.replied", schema: { id: ID, sessionID: Schema.String, answer: Answer } })
-const Cancelled = define({ type: "form.cancelled", schema: { id: ID, sessionID: Schema.String } })
+const Created = ephemeral({ type: "form.created", schema: { form: Info } })
+const Replied = ephemeral({ type: "form.replied", schema: { id: ID, sessionID: Schema.String, answer: Answer } })
+const Cancelled = ephemeral({ type: "form.cancelled", schema: { id: ID, sessionID: Schema.String } })
 
 export const Event = { Created, Replied, Cancelled, Definitions: inventory(Created, Replied, Cancelled) }
diff --git a/packages/schema/src/ide-event.ts b/packages/schema/src/ide-event.ts
index ec01d9fa36..dd88975b38 100644
--- a/packages/schema/src/ide-event.ts
+++ b/packages/schema/src/ide-event.ts
@@ -3,7 +3,7 @@ export * as IdeEvent from "./ide-event.js"
 import { Schema } from "effect"
 import { Event } from "./event.js"
 
-export const Installed = Event.define({
+export const Installed = Event.ephemeral({
   type: "ide.installed",
   schema: {
     ide: Schema.String,
diff --git a/packages/schema/src/installation-event.ts b/packages/schema/src/installation-event.ts
index dde53f7b72..f36a2dfc14 100644
--- a/packages/schema/src/installation-event.ts
+++ b/packages/schema/src/installation-event.ts
@@ -3,14 +3,14 @@ export * as InstallationEvent from "./installation-event.js"
 import { Schema } from "effect"
 import { Event } from "./event.js"
 
-export const Updated = Event.define({
+export const Updated = Event.ephemeral({
   type: "installation.updated",
   schema: {
     version: Schema.String,
   },
 })
 
-export const UpdateAvailable = Event.define({
+export const UpdateAvailable = Event.ephemeral({
   type: "installation.update-available",
   schema: {
     version: Schema.String,
diff --git a/packages/schema/src/integration.ts b/packages/schema/src/integration.ts
index f1d9c63784..329bf8207f 100644
--- a/packages/schema/src/integration.ts
+++ b/packages/schema/src/integration.ts
@@ -2,7 +2,7 @@ export * as Integration from "./integration.js"
 
 import { Schema } from "effect"
 import { optional } from "./schema.js"
-import { define, inventory } from "./event.js"
+import { ephemeral, inventory } from "./event.js"
 import { Connection } from "./connection.js"
 import { ascending } from "./identifier.js"
 import { statics } from "./schema.js"
@@ -76,11 +76,11 @@ export type Method = typeof Method.Type
 export const Inputs = Schema.Record(Schema.String, Schema.String).annotate({ identifier: "Integration.Inputs" })
 export type Inputs = typeof Inputs.Type
 
-const Updated = define({
+const Updated = ephemeral({
   type: "integration.updated",
   schema: {},
 })
-const ConnectionUpdated = define({
+const ConnectionUpdated = ephemeral({
   type: "integration.connection.updated",
   schema: { integrationID: ID },
 })
diff --git a/packages/schema/src/lsp-event.ts b/packages/schema/src/lsp-event.ts
index 68f31fbc6c..7928fa00a0 100644
--- a/packages/schema/src/lsp-event.ts
+++ b/packages/schema/src/lsp-event.ts
@@ -2,6 +2,6 @@ export * as LspEvent from "./lsp-event.js"
 
 import { Event } from "./event.js"
 
-export const Updated = Event.define({ type: "lsp.updated", schema: {} })
+export const Updated = Event.ephemeral({ type: "lsp.updated", schema: {} })
 
 export const Definitions = Event.inventory(Updated)
diff --git a/packages/schema/src/mcp-event.ts b/packages/schema/src/mcp-event.ts
index 70be7a91d8..f4221335e9 100644
--- a/packages/schema/src/mcp-event.ts
+++ b/packages/schema/src/mcp-event.ts
@@ -3,14 +3,14 @@ export * as McpEvent from "./mcp-event.js"
 import { Schema } from "effect"
 import { Event } from "./event.js"
 
-export const ToolsChanged = Event.define({
+export const ToolsChanged = Event.ephemeral({
   type: "mcp.tools.changed",
   schema: {
     server: Schema.String,
   },
 })
 
-export const BrowserOpenFailed = Event.define({
+export const BrowserOpenFailed = Event.ephemeral({
   type: "mcp.browser.open.failed",
   schema: {
     mcpName: Schema.String,
@@ -20,7 +20,7 @@ export const BrowserOpenFailed = Event.define({
 
 // Emitted whenever a server's connection status settles (connected, failed, needs_auth, closed) so
 // observers can refresh status without polling.
-export const StatusChanged = Event.define({
+export const StatusChanged = Event.ephemeral({
   type: "mcp.status.changed",
   schema: {
     server: Schema.String,
diff --git a/packages/schema/src/models-dev.ts b/packages/schema/src/models-dev.ts
index 60d630ecfa..925639aef3 100644
--- a/packages/schema/src/models-dev.ts
+++ b/packages/schema/src/models-dev.ts
@@ -1,8 +1,8 @@
 export * as ModelsDev from "./models-dev.js"
 
-import { define, inventory } from "./event.js"
+import { ephemeral, inventory } from "./event.js"
 
-const Refreshed = define({
+const Refreshed = ephemeral({
   type: "models-dev.refreshed",
   schema: {},
 })
diff --git a/packages/schema/src/permission.ts b/packages/schema/src/permission.ts
index de86fd1b1e..ca79081eda 100644
--- a/packages/schema/src/permission.ts
+++ b/packages/schema/src/permission.ts
@@ -2,7 +2,7 @@ export * as Permission from "./permission.js"
 
 import { Schema } from "effect"
 import { optional } from "./schema.js"
-import { define, inventory } from "./event.js"
+import { ephemeral, inventory } from "./event.js"
 import { ascending } from "./identifier.js"
 import { SessionID } from "./session-id.js"
 import { statics } from "./schema.js"
@@ -40,8 +40,8 @@ export interface Request extends Schema.Schema.Type<typeof Request> {}
 export const Reply = Schema.Literals(["once", "always", "reject"]).annotate({ identifier: "PermissionV2.Reply" })
 export type Reply = typeof Reply.Type
 
-const Asked = define({ type: "permission.v2.asked", schema: Request.fields })
-const Replied = define({
+const Asked = ephemeral({ type: "permission.v2.asked", schema: Request.fields })
+const Replied = ephemeral({
   type: "permission.v2.replied",
   schema: {
     sessionID: SessionID,
diff --git a/packages/schema/src/plugin.ts b/packages/schema/src/plugin.ts
index 3a9b8b55b1..40379e3051 100644
--- a/packages/schema/src/plugin.ts
+++ b/packages/schema/src/plugin.ts
@@ -1,7 +1,7 @@
 export * as Plugin from "./plugin.js"
 
 import { Schema } from "effect"
-import { define, inventory } from "./event.js"
+import { ephemeral, inventory } from "./event.js"
 
 export const ID = Schema.String.pipe(Schema.brand("Plugin.ID"))
 export type ID = typeof ID.Type
@@ -11,7 +11,7 @@ export const Info = Schema.Struct({
   id: ID,
 }).annotate({ identifier: "Plugin.Info" })
 
-const Added = define({
+const Added = ephemeral({
   type: "plugin.added",
   schema: { id: ID },
 })
diff --git a/packages/schema/src/project-directories.ts b/packages/schema/src/project-directories.ts
index d80322287c..aa5d51f0cf 100644
--- a/packages/schema/src/project-directories.ts
+++ b/packages/schema/src/project-directories.ts
@@ -1,9 +1,9 @@
 export * as ProjectDirectories from "./project-directories.js"
 
-import { define, inventory } from "./event.js"
+import { ephemeral, inventory } from "./event.js"
 import { Project } from "./project.js"
 
-const Updated = define({
+const Updated = ephemeral({
   type: "project.directories.updated",
   schema: { projectID: Project.ID },
 })
diff --git a/packages/schema/src/project.ts b/packages/schema/src/project.ts
index fce8d19ebf..e8524300a9 100644
--- a/packages/schema/src/project.ts
+++ b/packages/schema/src/project.ts
@@ -1,7 +1,7 @@
 export * as Project from "./project.js"
 
 import { Schema } from "effect"
-import { define, inventory } from "./event.js"
+import { ephemeral, inventory } from "./event.js"
 import { AbsolutePath, NonNegativeInt, optional } from "./schema.js"
 import { ProjectID } from "./project-id.js"
 
@@ -56,5 +56,5 @@ export const Info = Schema.Struct({
 }).annotate({ identifier: "Project" })
 export interface Info extends Schema.Schema.Type<typeof Info> {}
 
-const Updated = define({ type: "project.updated", schema: Info.fields })
+const Updated = ephemeral({ type: "project.updated", schema: Info.fields })
 export const Event = { Updated, Definitions: inventory(Updated) }
diff --git a/packages/schema/src/pty.ts b/packages/schema/src/pty.ts
index 58dc9cb833..b2da9093f0 100644
--- a/packages/schema/src/pty.ts
+++ b/packages/schema/src/pty.ts
@@ -2,7 +2,7 @@ export * as Pty from "./pty.js"
 
 import { Schema } from "effect"
 import { optional } from "./schema.js"
-import { define, inventory } from "./event.js"
+import { ephemeral, inventory } from "./event.js"
 import { ascending } from "./identifier.js"
 import { NonNegativeInt, PositiveInt, statics } from "./schema.js"
 
@@ -31,10 +31,10 @@ export const Info = Schema.Struct({
 }).annotate({ identifier: "Pty" })
 export interface Info extends Schema.Schema.Type<typeof Info> {}
 
-const Created = define({ type: "pty.created", schema: { info: Info } })
-const Updated = define({ type: "pty.updated", schema: { info: Info } })
-const Exited = define({ type: "pty.exited", schema: { id: ID, exitCode: NonNegativeInt } })
-const Deleted = define({ type: "pty.deleted", schema: { id: ID } })
+const Created = ephemeral({ type: "pty.created", schema: { info: Info } })
+const Updated = ephemeral({ type: "pty.updated", schema: { info: Info } })
+const Exited = ephemeral({ type: "pty.exited", schema: { id: ID, exitCode: NonNegativeInt } })
+const Deleted = ephemeral({ type: "pty.deleted", schema: { id: ID } })
 export const Event = { Created, Updated, Exited, Deleted, Definitions: inventory(Created, Updated, Exited, Deleted) }
 
 export const CreateInput = Schema.Struct({
diff --git a/packages/schema/src/question.ts b/packages/schema/src/question.ts
index 56fa7a277b..617ad2a895 100644
--- a/packages/schema/src/question.ts
+++ b/packages/schema/src/question.ts
@@ -2,7 +2,7 @@ export * as Question from "./question.js"
 
 import { Schema } from "effect"
 import { optional } from "./schema.js"
-import { define, inventory } from "./event.js"
+import { ephemeral, inventory } from "./event.js"
 import { ascending } from "./identifier.js"
 import { SessionID } from "./session-id.js"
 import { statics } from "./schema.js"
@@ -67,8 +67,8 @@ export const Reply = Schema.Struct({
 }).annotate({ identifier: "QuestionV2.Reply" })
 export interface Reply extends Schema.Schema.Type<typeof Reply> {}
 
-const Asked = define({ type: "question.v2.asked", schema: Request.fields })
-const Replied = define({
+const Asked = ephemeral({ type: "question.v2.asked", schema: Request.fields })
+const Replied = ephemeral({
   type: "question.v2.replied",
   schema: {
     sessionID: SessionID,
@@ -76,7 +76,7 @@ const Replied = define({
     answers: Schema.Array(Answer),
   },
 })
-const Rejected = define({
+const Rejected = ephemeral({
   type: "question.v2.rejected",
   schema: {
     sessionID: SessionID,
diff --git a/packages/schema/src/reference.ts b/packages/schema/src/reference.ts
index 5d63bea9df..9dd277f62b 100644
--- a/packages/schema/src/reference.ts
+++ b/packages/schema/src/reference.ts
@@ -2,10 +2,10 @@ export * as Reference from "./reference.js"
 
 import { Schema } from "effect"
 import { optional } from "./schema.js"
-import { define, inventory } from "./event.js"
+import { ephemeral, inventory } from "./event.js"
 import { AbsolutePath } from "./schema.js"
 
-const Updated = define({ type: "reference.updated", schema: {} })
+const Updated = ephemeral({ type: "reference.updated", schema: {} })
 export const Event = { Updated, Definitions: inventory(Updated) }
 
 export interface LocalSource extends Schema.Schema.Type<typeof LocalSource> {}
diff --git a/packages/schema/src/server-event.ts b/packages/schema/src/server-event.ts
index ec8599ad32..4f4963cfbf 100644
--- a/packages/schema/src/server-event.ts
+++ b/packages/schema/src/server-event.ts
@@ -2,7 +2,7 @@ export * as ServerEvent from "./server-event.js"
 
 import { Event } from "./event.js"
 
-export const Connected = Event.define({ type: "server.connected", schema: {} })
-export const Disposed = Event.define({ type: "global.disposed", schema: {} })
+export const Connected = Event.ephemeral({ type: "server.connected", schema: {} })
+export const Disposed = Event.ephemeral({ type: "global.disposed", schema: {} })
 
 export const Definitions = Event.inventory(Connected, Disposed)
diff --git a/packages/schema/src/session-compaction-event.ts b/packages/schema/src/session-compaction-event.ts
index 56782fd5d5..a9c0144c98 100644
--- a/packages/schema/src/session-compaction-event.ts
+++ b/packages/schema/src/session-compaction-event.ts
@@ -3,7 +3,7 @@ export * as SessionCompactionEvent from "./session-compaction-event.js"
 import { Event } from "./event.js"
 import { SessionID } from "./session-id.js"
 
-export const Compacted = Event.define({
+export const Compacted = Event.ephemeral({
   type: "session.compacted",
   schema: {
     sessionID: SessionID,
diff --git a/packages/schema/src/session-event.ts b/packages/schema/src/session-event.ts
index df78fa1493..fe1a698555 100644
--- a/packages/schema/src/session-event.ts
+++ b/packages/schema/src/session-event.ts
@@ -51,7 +51,7 @@ const stepSettlementOptions = {
 export const UnknownError = SessionMessage.UnknownError
 export type UnknownError = SessionMessage.UnknownError
 
-export const AgentSwitched = Event.define({
+export const AgentSwitched = Event.durable({
   type: "session.next.agent.switched",
   ...options,
   schema: {
@@ -62,7 +62,7 @@ export const AgentSwitched = Event.define({
 })
 export type AgentSwitched = typeof AgentSwitched.Type
 
-export const ModelSwitched = Event.define({
+export const ModelSwitched = Event.durable({
   type: "session.next.model.switched",
   ...options,
   schema: {
@@ -73,7 +73,7 @@ export const ModelSwitched = Event.define({
 })
 export type ModelSwitched = typeof ModelSwitched.Type
 
-export const Moved = Event.define({
+export const Moved = Event.durable({
   type: "session.next.moved",
   ...options,
   schema: {
@@ -84,7 +84,7 @@ export const Moved = Event.define({
 })
 export type Moved = typeof Moved.Type
 
-export const Renamed = Event.define({
+export const Renamed = Event.durable({
   type: "session.next.renamed",
   ...options,
   schema: {
@@ -94,7 +94,7 @@ export const Renamed = Event.define({
 })
 export type Renamed = typeof Renamed.Type
 
-export const Forked = Event.define({
+export const Forked = Event.durable({
   type: "session.next.forked",
   ...options,
   schema: {
@@ -105,21 +105,21 @@ export const Forked = Event.define({
 })
 export type Forked = typeof Forked.Type
 
-export const Prompted = Event.define({
+export const Prompted = Event.durable({
   type: "session.next.prompted",
   ...options,
   schema: PromptFields,
 })
 export type Prompted = typeof Prompted.Type
 
-export const PromptAdmitted = Event.define({
+export const PromptAdmitted = Event.durable({
   type: "session.next.prompt.admitted",
   ...options,
   schema: PromptFields,
 })
 export type PromptAdmitted = typeof PromptAdmitted.Type
 
-export const ExecutionSettled = Event.define({
+export const ExecutionSettled = Event.ephemeral({
   type: "session.next.execution.settled",
   schema: {
     ...Base,
@@ -129,7 +129,7 @@ export const ExecutionSettled = Event.define({
 })
 export type ExecutionSettled = typeof ExecutionSettled.Type
 
-export const ContextUpdated = Event.define({
+export const ContextUpdated = Event.durable({
   type: "session.next.context.updated",
   ...options,
   schema: {
@@ -140,7 +140,7 @@ export const ContextUpdated = Event.define({
 })
 export type ContextUpdated = typeof ContextUpdated.Type
 
-export const Synthetic = Event.define({
+export const Synthetic = Event.durable({
   type: "session.next.synthetic",
   ...options,
   schema: {
@@ -154,7 +154,7 @@ export const Synthetic = Event.define({
 export type Synthetic = typeof Synthetic.Type
 
 export namespace Skill {
-  export const Activated = Event.define({
+  export const Activated = Event.durable({
     type: "session.next.skill.activated",
     ...options,
     schema: {
@@ -168,7 +168,7 @@ export namespace Skill {
 }
 
 export namespace Shell {
-  export const Started = Event.define({
+  export const Started = Event.durable({
     type: "session.next.shell.started",
     ...options,
     schema: {
@@ -180,7 +180,7 @@ export namespace Shell {
   })
   export type Started = typeof Started.Type
 
-  export const Ended = Event.define({
+  export const Ended = Event.durable({
     type: "session.next.shell.ended",
     ...options,
     schema: {
@@ -193,7 +193,7 @@ export namespace Shell {
 }
 
 export namespace Step {
-  export const Started = Event.define({
+  export const Started = Event.durable({
     type: "session.next.step.started",
     ...options,
     schema: {
@@ -206,7 +206,7 @@ export namespace Step {
   })
   export type Started = typeof Started.Type
 
-  export const Ended = Event.define({
+  export const Ended = Event.durable({
     type: "session.next.step.ended",
     ...stepSettlementOptions,
     schema: {
@@ -229,7 +229,7 @@ export namespace Step {
   })
   export type Ended = typeof Ended.Type
 
-  export const Failed = Event.define({
+  export const Failed = Event.durable({
     type: "session.next.step.failed",
     ...stepSettlementOptions,
     schema: {
@@ -242,7 +242,7 @@ export namespace Step {
 }
 
 export namespace Text {
-  export const Started = Event.define({
+  export const Started = Event.durable({
     type: "session.next.text.started",
     ...options,
     schema: {
@@ -254,7 +254,7 @@ export namespace Text {
   export type Started = typeof Started.Type
 
   // Stream fragments are live-only; Text.Ended is the replayable full-value boundary.
-  export const Delta = Event.define({
+  export const Delta = Event.ephemeral({
     type: "session.next.text.delta",
     schema: {
       ...Base,
@@ -265,7 +265,7 @@ export namespace Text {
   })
   export type Delta = typeof Delta.Type
 
-  export const Ended = Event.define({
+  export const Ended = Event.durable({
     type: "session.next.text.ended",
     ...options,
     schema: {
@@ -279,7 +279,7 @@ export namespace Text {
 }
 
 export namespace Reasoning {
-  export const Started = Event.define({
+  export const Started = Event.durable({
     type: "session.next.reasoning.started",
     ...options,
     schema: {
@@ -292,7 +292,7 @@ export namespace Reasoning {
   export type Started = typeof Started.Type
 
   // Stream fragments are live-only; Reasoning.Ended is the replayable full-value boundary.
-  export const Delta = Event.define({
+  export const Delta = Event.ephemeral({
     type: "session.next.reasoning.delta",
     schema: {
       ...Base,
@@ -303,7 +303,7 @@ export namespace Reasoning {
   })
   export type Delta = typeof Delta.Type
 
-  export const Ended = Event.define({
+  export const Ended = Event.durable({
     type: "session.next.reasoning.ended",
     ...options,
     schema: {
@@ -325,7 +325,7 @@ export namespace Tool {
   }
 
   export namespace Input {
-    export const Started = Event.define({
+    export const Started = Event.durable({
       type: "session.next.tool.input.started",
       ...options,
       schema: {
@@ -336,7 +336,7 @@ export namespace Tool {
     export type Started = typeof Started.Type
 
     // Stream fragments are live-only; Input.Ended is the replayable raw-input boundary.
-    export const Delta = Event.define({
+    export const Delta = Event.ephemeral({
       type: "session.next.tool.input.delta",
       schema: {
         ...ToolBase,
@@ -345,7 +345,7 @@ export namespace Tool {
     })
     export type Delta = typeof Delta.Type
 
-    export const Ended = Event.define({
+    export const Ended = Event.durable({
       type: "session.next.tool.input.ended",
       ...options,
       schema: {
@@ -356,7 +356,7 @@ export namespace Tool {
     export type Ended = typeof Ended.Type
   }
 
-  export const Called = Event.define({
+  export const Called = Event.durable({
     type: "session.next.tool.called",
     ...options,
     schema: {
@@ -375,7 +375,7 @@ export namespace Tool {
    * Replayable bounded running-tool state. Tools should checkpoint semantic
    * transitions or at a bounded cadence, not persist every stdout/stderr chunk.
    */
-  export const Progress = Event.define({
+  export const Progress = Event.durable({
     type: "session.next.tool.progress",
     ...options,
     schema: {
@@ -386,7 +386,7 @@ export namespace Tool {
   })
   export type Progress = typeof Progress.Type
 
-  export const Success = Event.define({
+  export const Success = Event.durable({
     type: "session.next.tool.success",
     ...options,
     schema: {
@@ -403,7 +403,7 @@ export namespace Tool {
   })
   export type Success = typeof Success.Type
 
-  export const Failed = Event.define({
+  export const Failed = Event.durable({
     type: "session.next.tool.failed",
     ...options,
     schema: {
@@ -431,7 +431,7 @@ export const RetryError = Schema.Struct({
 })
 export interface RetryError extends Schema.Schema.Type<typeof RetryError> {}
 
-export const Retried = Event.define({
+export const Retried = Event.durable({
   type: "session.next.retried",
   ...options,
   schema: {
@@ -443,7 +443,7 @@ export const Retried = Event.define({
 export type Retried = typeof Retried.Type
 
 export namespace Compaction {
-  export const Started = Event.define({
+  export const Started = Event.durable({
     type: "session.next.compaction.started",
     ...options,
     schema: {
@@ -454,7 +454,7 @@ export namespace Compaction {
   })
   export type Started = typeof Started.Type
 
-  export const Delta = Event.define({
+  export const Delta = Event.ephemeral({
     type: "session.next.compaction.delta",
     schema: {
       ...Base,
@@ -464,7 +464,7 @@ export namespace Compaction {
   })
   export type Delta = typeof Delta.Type
 
-  export const Ended = Event.define({
+  export const Ended = Event.durable({
     type: "session.next.compaction.ended",
     ...options,
     schema: {
@@ -479,53 +479,19 @@ export namespace Compaction {
 }
 
 export namespace RevertEvent {
-  export const Staged = Event.define({
+  export const Staged = Event.durable({
     type: "session.next.revert.staged",
     ...options,
     schema: { ...Base, revert: Revert.State },
   })
-  export const Cleared = Event.define({ type: "session.next.revert.cleared", ...options, schema: Base })
-  export const Committed = Event.define({
+  export const Cleared = Event.durable({ type: "session.next.revert.cleared", ...options, schema: Base })
+  export const Committed = Event.durable({
     type: "session.next.revert.committed",
     ...options,
     schema: { ...Base, messageID: SessionMessage.ID },
   })
 }
 
-export const DurableDefinitions = Event.inventory(
-  AgentSwitched,
-  ModelSwitched,
-  Moved,
-  Renamed,
-  Forked,
-  Prompted,
-  PromptAdmitted,
-  ContextUpdated,
-  Synthetic,
-  Skill.Activated,
-  Shell.Started,
-  Shell.Ended,
-  Step.Started,
-  Step.Ended,
-  Step.Failed,
-  Text.Started,
-  Text.Ended,
-  Tool.Input.Started,
-  Tool.Input.Ended,
-  Tool.Called,
-  Tool.Progress,
-  Tool.Success,
-  Tool.Failed,
-  Reasoning.Started,
-  Reasoning.Ended,
-  Retried,
-  Compaction.Started,
-  Compaction.Ended,
-  RevertEvent.Staged,
-  RevertEvent.Cleared,
-  RevertEvent.Committed,
-)
-
 export const Definitions = Event.inventory(
   AgentSwitched,
   ModelSwitched,
@@ -565,6 +531,10 @@ export const Definitions = Event.inventory(
   RevertEvent.Committed,
 )
 
+export const DurableDefinitions = Event.inventory(
+  ...Definitions.filter((definition) => definition.durability === "durable"),
+)
+
 export const Durable = Schema.Union(DurableDefinitions, { mode: "oneOf" })
   .pipe(Schema.toTaggedUnion("type"))
   .annotate({ identifier: "SessionDurableEvent" })
diff --git a/packages/schema/src/session-status-event.ts b/packages/schema/src/session-status-event.ts
index 331c58ba1c..03e6940215 100644
--- a/packages/schema/src/session-status-event.ts
+++ b/packages/schema/src/session-status-event.ts
@@ -32,7 +32,7 @@ export const Info = Schema.Union([
 ]).annotate({ identifier: "SessionStatus" })
 export type Info = Schema.Schema.Type<typeof Info>
 
-export const Status = Event.define({
+export const Status = Event.ephemeral({
   type: "session.status",
   schema: {
     sessionID: SessionID,
@@ -41,7 +41,7 @@ export const Status = Event.define({
 })
 
 // deprecated
-export const Idle = Event.define({
+export const Idle = Event.ephemeral({
   type: "session.idle",
   schema: {
     sessionID: SessionID,
diff --git a/packages/schema/src/session-todo.ts b/packages/schema/src/session-todo.ts
index f72abcd17e..f4d68268ff 100644
--- a/packages/schema/src/session-todo.ts
+++ b/packages/schema/src/session-todo.ts
@@ -1,7 +1,7 @@
 export * as SessionTodo from "./session-todo.js"
 
 import { Schema } from "effect"
-import { define, inventory } from "./event.js"
+import { ephemeral, inventory } from "./event.js"
 import { SessionID } from "./session-id.js"
 
 export const Info = Schema.Struct({
@@ -15,7 +15,7 @@ export const Info = Schema.Struct({
 }).annotate({ identifier: "Todo" })
 export interface Info extends Schema.Schema.Type<typeof Info> {}
 
-const Updated = define({
+const Updated = ephemeral({
   type: "todo.updated",
   schema: {
     sessionID: SessionID,
diff --git a/packages/schema/src/shell.ts b/packages/schema/src/shell.ts
index a627a15950..fbe877c974 100644
--- a/packages/schema/src/shell.ts
+++ b/packages/schema/src/shell.ts
@@ -2,7 +2,7 @@ export * as Shell from "./shell.js"
 
 import { Schema } from "effect"
 import { optional } from "./schema.js"
-import { define, inventory } from "./event.js"
+import { ephemeral, inventory } from "./event.js"
 import { ascending } from "./identifier.js"
 import { NonNegativeInt, statics } from "./schema.js"
 
@@ -49,9 +49,9 @@ export const Info = Schema.Struct({
 }).annotate({ identifier: "Shell" })
 export interface Info extends Schema.Schema.Type<typeof Info> {}
 
-const Created = define({ type: "shell.created", schema: { info: Info } })
-const Exited = define({ type: "shell.exited", schema: { id: ID, exit: optional(Schema.Number), status: Status } })
-const Deleted = define({ type: "shell.deleted", schema: { id: ID } })
+const Created = ephemeral({ type: "shell.created", schema: { info: Info } })
+const Exited = ephemeral({ type: "shell.exited", schema: { id: ID, exit: optional(Schema.Number), status: Status } })
+const Deleted = ephemeral({ type: "shell.deleted", schema: { id: ID } })
 export const Event = { Created, Exited, Deleted, Definitions: inventory(Created, Exited, Deleted) }
 
 export const CreateInput = Schema.Struct({
diff --git a/packages/schema/src/skill.ts b/packages/schema/src/skill.ts
index bf0dd7aa2b..184266f2ad 100644
--- a/packages/schema/src/skill.ts
+++ b/packages/schema/src/skill.ts
@@ -3,7 +3,7 @@ export * as Skill from "./skill.js"
 import { Schema } from "effect"
 import { optional } from "./schema.js"
 import { AbsolutePath } from "./schema.js"
-import { define, inventory } from "./event.js"
+import { ephemeral, inventory } from "./event.js"
 
 export interface DirectorySource extends Schema.Schema.Type<typeof DirectorySource> {}
 export const DirectorySource = Schema.Struct({
@@ -27,7 +27,7 @@ export const Info = Schema.Struct({
   content: Schema.String,
 }).annotate({ identifier: "SkillV2.Info" })
 
-const Updated = define({ type: "skill.updated", schema: {} })
+const Updated = ephemeral({ type: "skill.updated", schema: {} })
 export const Event = { Updated, Definitions: inventory(Updated) }
 
 export interface EmbeddedSource extends Schema.Schema.Type<typeof EmbeddedSource> {}
diff --git a/packages/schema/src/tui-event.ts b/packages/schema/src/tui-event.ts
index 0de2b6e369..ba9fd29ef8 100644
--- a/packages/schema/src/tui-event.ts
+++ b/packages/schema/src/tui-event.ts
@@ -8,9 +8,9 @@ import { SessionID } from "./session-id.js"
 
 const DEFAULT_TOAST_DURATION = 5000
 
-export const PromptAppend = Event.define({ type: "tui.prompt.append", schema: { text: Schema.String } })
+export const PromptAppend = Event.ephemeral({ type: "tui.prompt.append", schema: { text: Schema.String } })
 
-export const CommandExecute = Event.define({
+export const CommandExecute = Event.ephemeral({
   type: "tui.command.execute",
   schema: {
     command: Schema.Union([
@@ -38,7 +38,7 @@ export const CommandExecute = Event.define({
   },
 })
 
-export const ToastShow = Event.define({
+export const ToastShow = Event.ephemeral({
   type: "tui.toast.show",
   schema: {
     title: optional(Schema.String),
@@ -50,7 +50,7 @@ export const ToastShow = Event.define({
   },
 })
 
-export const SessionSelect = Event.define({
+export const SessionSelect = Event.ephemeral({
   type: "tui.session.select",
   schema: {
     sessionID: SessionID.annotate({ description: "Session ID to navigate to" }),
diff --git a/packages/schema/src/v1/legacy-event.ts b/packages/schema/src/v1/legacy-event.ts
index 12037e104f..ac22fff5e3 100644
--- a/packages/schema/src/v1/legacy-event.ts
+++ b/packages/schema/src/v1/legacy-event.ts
@@ -1,11 +1,11 @@
 export * as LegacyEvent from "./legacy-event.js"
 
 import { Schema } from "effect"
-import { define, inventory } from "../event.js"
+import { ephemeral, inventory } from "../event.js"
 import { SessionID } from "../session-id.js"
 import { SessionV1 } from "./session.js"
 
-export const CommandExecuted = define({
+export const CommandExecuted = ephemeral({
   type: "command.executed",
   schema: {
     name: Schema.String,
diff --git a/packages/schema/src/v1/permission.ts b/packages/schema/src/v1/permission.ts
index af1d0098b8..1faa46a508 100644
--- a/packages/schema/src/v1/permission.ts
+++ b/packages/schema/src/v1/permission.ts
@@ -1,7 +1,7 @@
 export * as PermissionV1 from "./permission.js"
 
 import { Schema } from "effect"
-import { define, inventory } from "../event.js"
+import { ephemeral, inventory } from "../event.js"
 import { ascending } from "../identifier.js"
 import { Project } from "../project.js"
 import { statics } from "../schema.js"
@@ -58,8 +58,8 @@ export const ReplyInput = Schema.Struct({ requestID: ID, ...ReplyBody.fields }).
 })
 export type ReplyInput = typeof ReplyInput.Type
 
-const Asked = define({ type: "permission.asked", schema: Request.fields })
-const Replied = define({
+const Asked = ephemeral({ type: "permission.asked", schema: Request.fields })
+const Replied = ephemeral({
   type: "permission.replied",
   schema: { sessionID: SessionID, requestID: ID, reply: Reply },
 })
diff --git a/packages/schema/src/v1/question.ts b/packages/schema/src/v1/question.ts
index 557646c44e..da47f37ffd 100644
--- a/packages/schema/src/v1/question.ts
+++ b/packages/schema/src/v1/question.ts
@@ -1,7 +1,7 @@
 export * as QuestionV1 from "./question.js"
 
 import { Schema } from "effect"
-import { define, inventory } from "../event.js"
+import { ephemeral, inventory } from "../event.js"
 import { ascending } from "../identifier.js"
 import { statics } from "../schema.js"
 import { SessionID } from "../session-id.js"
@@ -55,9 +55,9 @@ export const Rejected = Schema.Struct({ sessionID: SessionID, requestID: ID }).a
   identifier: "QuestionRejected",
 })
 
-const Asked = define({ type: "question.asked", schema: Request.fields })
-const RepliedEvent = define({ type: "question.replied", schema: Replied.fields })
-const RejectedEvent = define({ type: "question.rejected", schema: Rejected.fields })
+const Asked = ephemeral({ type: "question.asked", schema: Request.fields })
+const RepliedEvent = ephemeral({ type: "question.replied", schema: Replied.fields })
+const RejectedEvent = ephemeral({ type: "question.rejected", schema: Rejected.fields })
 export const Event = {
   Asked,
   Replied: RepliedEvent,
diff --git a/packages/schema/src/v1/session.ts b/packages/schema/src/v1/session.ts
index 452ba3a186..1c2827f0d8 100644
--- a/packages/schema/src/v1/session.ts
+++ b/packages/schema/src/v1/session.ts
@@ -1,7 +1,7 @@
 export * as SessionV1 from "./session.js"
 
 import { Effect, Schema, Types } from "effect"
-import { define, inventory } from "../event.js"
+import { durable, ephemeral, inventory } from "../event.js"
 import { FileDiff } from "../file-diff.js"
 import { Project } from "../project.js"
 import { Provider } from "../provider.js"
@@ -569,7 +569,7 @@ export const SessionInfo = Schema.Struct({
 export type SessionInfo = typeof SessionInfo.Type
 
 const events = {
-  Created: define({
+  Created: durable({
     type: "session.created",
     ...options,
     schema: {
@@ -577,7 +577,7 @@ const events = {
       info: SessionInfo,
     },
   }),
-  Updated: define({
+  Updated: durable({
     type: "session.updated",
     ...options,
     schema: {
@@ -585,7 +585,7 @@ const events = {
       info: SessionInfo,
     },
   }),
-  Deleted: define({
+  Deleted: durable({
     type: "session.deleted",
     ...options,
     schema: {
@@ -593,7 +593,7 @@ const events = {
       info: SessionInfo,
     },
   }),
-  MessageUpdated: define({
+  MessageUpdated: durable({
     type: "message.updated",
     ...options,
     schema: {
@@ -601,7 +601,7 @@ const events = {
       info: Info,
     },
   }),
-  MessageRemoved: define({
+  MessageRemoved: durable({
     type: "message.removed",
     ...options,
     schema: {
@@ -609,7 +609,7 @@ const events = {
       messageID: MessageID,
     },
   }),
-  PartUpdated: define({
+  PartUpdated: durable({
     type: "message.part.updated",
     ...options,
     schema: {
@@ -618,7 +618,7 @@ const events = {
       time: Schema.Finite,
     },
   }),
-  PartRemoved: define({
+  PartRemoved: durable({
     type: "message.part.removed",
     ...options,
     schema: {
@@ -629,7 +629,7 @@ const events = {
   }),
 }
 
-export const PartDelta = define({
+export const PartDelta = ephemeral({
   type: "message.part.delta",
   schema: {
     sessionID: SessionID,
@@ -640,7 +640,7 @@ export const PartDelta = define({
   },
 })
 
-export const Diff = define({
+export const Diff = ephemeral({
   type: "session.diff",
   schema: {
     sessionID: SessionID,
@@ -648,7 +648,7 @@ export const Diff = define({
   },
 })
 
-export const Error = define({
+export const Error = ephemeral({
   type: "session.error",
   schema: {
     sessionID: Schema.optional(SessionID),
diff --git a/packages/schema/src/vcs-event.ts b/packages/schema/src/vcs-event.ts
index 2428b432b4..5ece3cd844 100644
--- a/packages/schema/src/vcs-event.ts
+++ b/packages/schema/src/vcs-event.ts
@@ -4,7 +4,7 @@ import { Schema } from "effect"
 import { optional } from "./schema.js"
 import { Event } from "./event.js"
 
-export const BranchUpdated = Event.define({
+export const BranchUpdated = Event.ephemeral({
   type: "vcs.branch.updated",
   schema: {
     branch: optional(Schema.String),
diff --git a/packages/schema/src/workspace-event.ts b/packages/schema/src/workspace-event.ts
index 6468a4410c..2b6a752ef5 100644
--- a/packages/schema/src/workspace-event.ts
+++ b/packages/schema/src/workspace-event.ts
@@ -10,21 +10,21 @@ export const ConnectionStatus = Schema.Struct({
 }).annotate({ identifier: "WorkspaceEvent.ConnectionStatus" })
 export interface ConnectionStatus extends Schema.Schema.Type<typeof ConnectionStatus> {}
 
-export const Ready = Event.define({
+export const Ready = Event.ephemeral({
   type: "workspace.ready",
   schema: {
     name: Schema.String,
   },
 })
 
-export const Failed = Event.define({
+export const Failed = Event.ephemeral({
   type: "workspace.failed",
   schema: {
     message: Schema.String,
   },
 })
 
-export const Status = Event.define({
+export const Status = Event.ephemeral({
   type: "workspace.status",
   schema: ConnectionStatus.fields,
 })
diff --git a/packages/schema/src/worktree-event.ts b/packages/schema/src/worktree-event.ts
index 2acb72fe7e..db80d794e5 100644
--- a/packages/schema/src/worktree-event.ts
+++ b/packages/schema/src/worktree-event.ts
@@ -4,7 +4,7 @@ import { Schema } from "effect"
 import { optional } from "./schema.js"
 import { Event } from "./event.js"
 
-export const Ready = Event.define({
+export const Ready = Event.ephemeral({
   type: "worktree.ready",
   schema: {
     name: Schema.String,
@@ -12,7 +12,7 @@ export const Ready = Event.define({
   },
 })
 
-export const Failed = Event.define({
+export const Failed = Event.ephemeral({
   type: "worktree.failed",
   schema: {
     message: Schema.String,
diff --git a/packages/schema/test/event-manifest.test.ts b/packages/schema/test/event-manifest.test.ts
index 452b0ac149..4e0c6eaa18 100644
--- a/packages/schema/test/event-manifest.test.ts
+++ b/packages/schema/test/event-manifest.test.ts
@@ -1,5 +1,15 @@
 import { describe, expect, test } from "bun:test"
-import { Agent, FileSystem, Form, Integration, Permission, Project, Reference, Session, Workspace } from "../src/index.js"
+import {
+  Agent,
+  FileSystem,
+  Form,
+  Integration,
+  Permission,
+  Project,
+  Reference,
+  Session,
+  Workspace,
+} from "../src/index.js"
 import { EventManifest } from "../src/event-manifest.js"
 import { IdeEvent } from "../src/ide-event.js"
 import { SessionEvent } from "../src/session-event.js"
@@ -9,11 +19,11 @@ import { WorkspaceEvent } from "../src/workspace-event.js"
 
 describe("public event manifest", () => {
   test("owns the complete public event surface", () => {
-    expect(EventManifest.ServerDefinitions.filter((definition) => definition.type !== "agent.updated").length).toBe(86)
+    expect(EventManifest.ServerDefinitions).toContain(Agent.Event.Updated)
     expect(EventManifest.ServerDefinitions.filter((definition) => definition.type === "agent.updated")).toEqual([
       Agent.Event.Updated,
     ])
-    expect(EventManifest.Definitions.filter((definition) => definition.type !== "agent.updated").length).toBe(101)
+    expect(EventManifest.Definitions).toContain(Agent.Event.Updated)
     expect(EventManifest.Definitions.filter((definition) => definition.type === "agent.updated")).toEqual([
       Agent.Event.Updated,
     ])
@@ -29,7 +39,9 @@ describe("public event manifest", () => {
       SessionV1.Event.Diff,
       SessionV1.Event.Error,
     ])
-    expect(Array.from(EventManifest.Latest.keys()).filter((type) => type !== "agent.updated").length).toBe(101)
+    expect(Array.from(EventManifest.Latest.keys())).toEqual(
+      EventManifest.Definitions.map((definition) => definition.type),
+    )
     expect(EventManifest.Latest.get("agent.updated")).toBe(Agent.Event.Updated)
     expect(Agent.Event.Updated.durable).toBeUndefined()
     expect(EventManifest.Durable.has("agent.updated")).toBe(false)
@@ -62,4 +74,53 @@ describe("public event manifest", () => {
     expect(EventManifest.Durable.has("session.next.step.ended.1")).toBe(false)
     expect(EventManifest.Durable.get("session.next.step.ended.2")).toBe(SessionEvent.Step.Ended)
   })
+
+  test("derives durable definitions from explicit definition durability", () => {
+    expect(Array.from(EventManifest.Durable.keys()).toSorted()).toEqual(
+      [
+        "session.created.1",
+        "session.updated.1",
+        "session.deleted.1",
+        "message.updated.1",
+        "message.removed.1",
+        "message.part.updated.1",
+        "message.part.removed.1",
+        "session.next.agent.switched.1",
+        "session.next.model.switched.1",
+        "session.next.moved.1",
+        "session.next.renamed.1",
+        "session.next.forked.1",
+        "session.next.prompted.1",
+        "session.next.prompt.admitted.1",
+        "session.next.context.updated.1",
+        "session.next.synthetic.1",
+        "session.next.skill.activated.1",
+        "session.next.shell.started.1",
+        "session.next.shell.ended.1",
+        "session.next.step.started.1",
+        "session.next.step.ended.2",
+        "session.next.step.failed.2",
+        "session.next.text.started.1",
+        "session.next.text.ended.1",
+        "session.next.tool.input.started.1",
+        "session.next.tool.input.ended.1",
+        "session.next.tool.called.1",
+        "session.next.tool.progress.1",
+        "session.next.tool.success.1",
+        "session.next.tool.failed.1",
+        "session.next.reasoning.started.1",
+        "session.next.reasoning.ended.1",
+        "session.next.retried.1",
+        "session.next.compaction.started.1",
+        "session.next.compaction.ended.1",
+        "session.next.revert.staged.1",
+        "session.next.revert.cleared.1",
+        "session.next.revert.committed.1",
+      ].toSorted(),
+    )
+    expect(SessionEvent.DurableDefinitions).toEqual(
+      SessionEvent.Definitions.filter((definition) => definition.durability === "durable"),
+    )
+    expect(EventManifest.Definitions.every((definition) => definition.durability !== undefined)).toBe(true)
+  })
 })
diff --git a/packages/schema/test/event.test.ts b/packages/schema/test/event.test.ts
index a05dca0c6e..404b49aa74 100644
--- a/packages/schema/test/event.test.ts
+++ b/packages/schema/test/event.test.ts
@@ -6,17 +6,17 @@ import { EventLog } from "../src/event-log.js"
 describe("public event schemas", () => {
   test("definition is pure", () => {
     const definitions = Event.inventory()
-    Event.define({ type: "test.pure", schema: { value: Schema.String } })
+    Event.ephemeral({ type: "test.pure", schema: { value: Schema.String } })
     expect(definitions).toEqual([])
   })
 
   test("latest selection is independent of declaration order", () => {
-    const historical = Event.define({
+    const historical = Event.durable({
       type: "test.versioned",
       durable: { aggregate: "id", version: 1 },
       schema: { id: Schema.String },
     })
-    const current = Event.define({
+    const current = Event.durable({
       type: "test.versioned",
       durable: { aggregate: "id", version: 2 },
       schema: { id: Schema.String, value: Schema.String },
@@ -27,13 +27,13 @@ describe("public event schemas", () => {
   })
 
   test("durable definitions are indexed by type and version", () => {
-    const definition = Event.define({
+    const definition = Event.durable({
       type: "test.durable",
       durable: { aggregate: "id", version: 1 },
       schema: { id: Schema.String },
     })
 
-    expect(Event.durable([definition]).get("test.durable.1")).toBe(definition)
+    expect(Event.durableMap([definition]).get("test.durable.1")).toBe(definition)
   })
 
   test("synced marker encodes the captured watermark", () => {
diff --git a/packages/sdk-next/test/embedded.test.ts b/packages/sdk-next/test/embedded.test.ts
index 572cdd9665..81f3d480ad 100644
--- a/packages/sdk-next/test/embedded.test.ts
+++ b/packages/sdk-next/test/embedded.test.ts
@@ -149,7 +149,7 @@ it.live(
         const opencode = yield* fixture.sdk.OpenCode.create()
         const id = sessionID(fixture)
         const connected = yield* Latch.make(false)
-        const prompted = yield* Deferred.make<OpenCodeEvent>()
+        const prompted = yield* Deferred.make<Extract<OpenCodeEvent, { type: "session.next.prompted" }>>()
 
         yield* opencode.events.subscribe().pipe(
           Stream.runForEach((event) =>
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index 2f476f2844..a1ba35e5ae 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -2928,14 +2928,14 @@ export type SessionDurableEvent =
   | SessionNextStepFailed
   | SessionNextTextStarted
   | SessionNextTextEnded
+  | SessionNextReasoningStarted
+  | SessionNextReasoningEnded
   | SessionNextToolInputStarted
   | SessionNextToolInputEnded
   | SessionNextToolCalled
   | SessionNextToolProgress
   | SessionNextToolSuccess
   | SessionNextToolFailed
-  | SessionNextReasoningStarted
-  | SessionNextReasoningEnded
   | SessionNextRetried
   | SessionNextCompactionStarted
   | SessionNextCompactionEnded
@@ -3020,11 +3020,6 @@ export type SessionStatus2 = {
     [key: string]: unknown
   }
   type: "session.status"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     sessionID: string
@@ -3038,11 +3033,6 @@ export type QuestionReplied2 = {
     [key: string]: unknown
   }
   type: "question.replied"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     sessionID: string
@@ -3057,11 +3047,6 @@ export type QuestionRejected2 = {
     [key: string]: unknown
   }
   type: "question.rejected"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     sessionID: string
@@ -4634,7 +4619,7 @@ export type SessionNextAgentSwitched = {
     [key: string]: unknown
   }
   type: "session.next.agent.switched"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -4654,7 +4639,7 @@ export type SessionNextModelSwitched = {
     [key: string]: unknown
   }
   type: "session.next.model.switched"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -4674,7 +4659,7 @@ export type SessionNextMoved = {
     [key: string]: unknown
   }
   type: "session.next.moved"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -4694,7 +4679,7 @@ export type SessionNextRenamed = {
     [key: string]: unknown
   }
   type: "session.next.renamed"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -4713,7 +4698,7 @@ export type SessionNextForked = {
     [key: string]: unknown
   }
   type: "session.next.forked"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -4733,7 +4718,7 @@ export type SessionNextPrompted = {
     [key: string]: unknown
   }
   type: "session.next.prompted"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -4754,7 +4739,7 @@ export type SessionNextPromptAdmitted = {
     [key: string]: unknown
   }
   type: "session.next.prompt.admitted"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -4775,7 +4760,7 @@ export type SessionNextContextUpdated = {
     [key: string]: unknown
   }
   type: "session.next.context.updated"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -4795,7 +4780,7 @@ export type SessionNextSynthetic = {
     [key: string]: unknown
   }
   type: "session.next.synthetic"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -4819,7 +4804,7 @@ export type SessionNextSkillActivated = {
     [key: string]: unknown
   }
   type: "session.next.skill.activated"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -4840,7 +4825,7 @@ export type SessionNextShellStarted = {
     [key: string]: unknown
   }
   type: "session.next.shell.started"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -4861,7 +4846,7 @@ export type SessionNextShellEnded = {
     [key: string]: unknown
   }
   type: "session.next.shell.ended"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -4881,7 +4866,7 @@ export type SessionNextStepStarted = {
     [key: string]: unknown
   }
   type: "session.next.step.started"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -4903,7 +4888,7 @@ export type SessionNextStepEnded = {
     [key: string]: unknown
   }
   type: "session.next.step.ended"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -4935,7 +4920,7 @@ export type SessionNextStepFailed = {
     [key: string]: unknown
   }
   type: "session.next.step.failed"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -4955,7 +4940,7 @@ export type SessionNextTextStarted = {
     [key: string]: unknown
   }
   type: "session.next.text.started"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -4975,7 +4960,7 @@ export type SessionNextTextEnded = {
     [key: string]: unknown
   }
   type: "session.next.text.ended"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -4990,13 +4975,56 @@ export type SessionNextTextEnded = {
   }
 }
 
+export type SessionNextReasoningStarted = {
+  id: string
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "session.next.reasoning.started"
+  durable: {
+    aggregateID: string
+    seq: number
+    version: number
+  }
+  location?: LocationRef
+  data: {
+    timestamp: number
+    sessionID: string
+    assistantMessageID: string
+    reasoningID: string
+    providerMetadata?: LlmProviderMetadata
+  }
+}
+
+export type SessionNextReasoningEnded = {
+  id: string
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "session.next.reasoning.ended"
+  durable: {
+    aggregateID: string
+    seq: number
+    version: number
+  }
+  location?: LocationRef
+  data: {
+    timestamp: number
+    sessionID: string
+    assistantMessageID: string
+    reasoningID: string
+    text: string
+    providerMetadata?: LlmProviderMetadata
+  }
+}
+
 export type SessionNextToolInputStarted = {
   id: string
   metadata?: {
     [key: string]: unknown
   }
   type: "session.next.tool.input.started"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5017,7 +5045,7 @@ export type SessionNextToolInputEnded = {
     [key: string]: unknown
   }
   type: "session.next.tool.input.ended"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5038,7 +5066,7 @@ export type SessionNextToolCalled = {
     [key: string]: unknown
   }
   type: "session.next.tool.called"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5066,7 +5094,7 @@ export type SessionNextToolProgress = {
     [key: string]: unknown
   }
   type: "session.next.tool.progress"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5090,7 +5118,7 @@ export type SessionNextToolSuccess = {
     [key: string]: unknown
   }
   type: "session.next.tool.success"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5120,7 +5148,7 @@ export type SessionNextToolFailed = {
     [key: string]: unknown
   }
   type: "session.next.tool.failed"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5140,56 +5168,13 @@ export type SessionNextToolFailed = {
   }
 }
 
-export type SessionNextReasoningStarted = {
-  id: string
-  metadata?: {
-    [key: string]: unknown
-  }
-  type: "session.next.reasoning.started"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
-  location?: LocationRef
-  data: {
-    timestamp: number
-    sessionID: string
-    assistantMessageID: string
-    reasoningID: string
-    providerMetadata?: LlmProviderMetadata
-  }
-}
-
-export type SessionNextReasoningEnded = {
-  id: string
-  metadata?: {
-    [key: string]: unknown
-  }
-  type: "session.next.reasoning.ended"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
-  location?: LocationRef
-  data: {
-    timestamp: number
-    sessionID: string
-    assistantMessageID: string
-    reasoningID: string
-    text: string
-    providerMetadata?: LlmProviderMetadata
-  }
-}
-
 export type SessionNextRetried = {
   id: string
   metadata?: {
     [key: string]: unknown
   }
   type: "session.next.retried"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5209,7 +5194,7 @@ export type SessionNextCompactionStarted = {
     [key: string]: unknown
   }
   type: "session.next.compaction.started"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5229,7 +5214,7 @@ export type SessionNextCompactionEnded = {
     [key: string]: unknown
   }
   type: "session.next.compaction.ended"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5251,7 +5236,7 @@ export type SessionNextRevertStaged = {
     [key: string]: unknown
   }
   type: "session.next.revert.staged"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5270,7 +5255,7 @@ export type SessionNextRevertCleared = {
     [key: string]: unknown
   }
   type: "session.next.revert.cleared"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5288,7 +5273,7 @@ export type SessionNextRevertCommitted = {
     [key: string]: unknown
   }
   type: "session.next.revert.committed"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5634,11 +5619,6 @@ export type ModelsDevRefreshed = {
     [key: string]: unknown
   }
   type: "models-dev.refreshed"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     [key: string]: unknown
@@ -5651,11 +5631,6 @@ export type IntegrationUpdated = {
     [key: string]: unknown
   }
   type: "integration.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     [key: string]: unknown
@@ -5668,11 +5643,6 @@ export type IntegrationConnectionUpdated = {
     [key: string]: unknown
   }
   type: "integration.connection.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     integrationID: string
@@ -5685,11 +5655,6 @@ export type CatalogUpdated = {
     [key: string]: unknown
   }
   type: "catalog.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     [key: string]: unknown
@@ -5702,11 +5667,6 @@ export type AgentUpdated = {
     [key: string]: unknown
   }
   type: "agent.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     [key: string]: unknown
@@ -5719,7 +5679,7 @@ export type SessionCreated = {
     [key: string]: unknown
   }
   type: "session.created"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5737,7 +5697,7 @@ export type SessionUpdated = {
     [key: string]: unknown
   }
   type: "session.updated"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5755,7 +5715,7 @@ export type SessionDeleted = {
     [key: string]: unknown
   }
   type: "session.deleted"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5773,7 +5733,7 @@ export type MessageUpdated = {
     [key: string]: unknown
   }
   type: "message.updated"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5791,7 +5751,7 @@ export type MessageRemoved = {
     [key: string]: unknown
   }
   type: "message.removed"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5809,7 +5769,7 @@ export type MessagePartUpdated = {
     [key: string]: unknown
   }
   type: "message.part.updated"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5828,7 +5788,7 @@ export type MessagePartRemoved = {
     [key: string]: unknown
   }
   type: "message.part.removed"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -5847,11 +5807,6 @@ export type SessionNextExecutionSettled = {
     [key: string]: unknown
   }
   type: "session.next.execution.settled"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     timestamp: number
@@ -5867,11 +5822,6 @@ export type SessionNextTextDelta = {
     [key: string]: unknown
   }
   type: "session.next.text.delta"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     timestamp: number
@@ -5888,11 +5838,6 @@ export type SessionNextReasoningDelta = {
     [key: string]: unknown
   }
   type: "session.next.reasoning.delta"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     timestamp: number
@@ -5909,11 +5854,6 @@ export type SessionNextToolInputDelta = {
     [key: string]: unknown
   }
   type: "session.next.tool.input.delta"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     timestamp: number
@@ -5930,11 +5870,6 @@ export type SessionNextCompactionDelta = {
     [key: string]: unknown
   }
   type: "session.next.compaction.delta"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     timestamp: number
@@ -5950,11 +5885,6 @@ export type MessagePartDelta = {
     [key: string]: unknown
   }
   type: "message.part.delta"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     sessionID: string
@@ -5971,11 +5901,6 @@ export type SessionDiff = {
     [key: string]: unknown
   }
   type: "session.diff"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     sessionID: string
@@ -5989,11 +5914,6 @@ export type SessionError = {
     [key: string]: unknown
   }
   type: "session.error"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     sessionID?: string
@@ -6015,11 +5935,6 @@ export type InstallationUpdated = {
     [key: string]: unknown
   }
   type: "installation.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     version: string
@@ -6032,11 +5947,6 @@ export type InstallationUpdateAvailable = {
     [key: string]: unknown
   }
   type: "installation.update-available"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     version: string
@@ -6049,11 +5959,6 @@ export type FileEdited = {
     [key: string]: unknown
   }
   type: "file.edited"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     file: string
@@ -6066,11 +5971,6 @@ export type ReferenceUpdated = {
     [key: string]: unknown
   }
   type: "reference.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     [key: string]: unknown
@@ -6083,11 +5983,6 @@ export type PermissionV2Asked = {
     [key: string]: unknown
   }
   type: "permission.v2.asked"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     id: string
@@ -6108,11 +6003,6 @@ export type PermissionV2Replied = {
     [key: string]: unknown
   }
   type: "permission.v2.replied"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     sessionID: string
@@ -6127,11 +6017,6 @@ export type PluginAdded = {
     [key: string]: unknown
   }
   type: "plugin.added"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     id: string
@@ -6144,11 +6029,6 @@ export type ProjectDirectoriesUpdated = {
     [key: string]: unknown
   }
   type: "project.directories.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     projectID: string
@@ -6161,11 +6041,6 @@ export type CommandUpdated = {
     [key: string]: unknown
   }
   type: "command.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     [key: string]: unknown
@@ -6178,11 +6053,6 @@ export type SkillUpdated = {
     [key: string]: unknown
   }
   type: "skill.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     [key: string]: unknown
@@ -6195,11 +6065,6 @@ export type FileWatcherUpdated = {
     [key: string]: unknown
   }
   type: "file.watcher.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     file: string
@@ -6213,11 +6078,6 @@ export type PtyCreated = {
     [key: string]: unknown
   }
   type: "pty.created"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     info: Pty
@@ -6230,11 +6090,6 @@ export type PtyUpdated = {
     [key: string]: unknown
   }
   type: "pty.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     info: Pty
@@ -6247,11 +6102,6 @@ export type PtyExited = {
     [key: string]: unknown
   }
   type: "pty.exited"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     id: string
@@ -6265,11 +6115,6 @@ export type PtyDeleted = {
     [key: string]: unknown
   }
   type: "pty.deleted"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     id: string
@@ -6282,11 +6127,6 @@ export type ShellCreated = {
     [key: string]: unknown
   }
   type: "shell.created"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     info: Shell1
@@ -6299,11 +6139,6 @@ export type ShellExited = {
     [key: string]: unknown
   }
   type: "shell.exited"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     id: string
@@ -6318,11 +6153,6 @@ export type ShellDeleted = {
     [key: string]: unknown
   }
   type: "shell.deleted"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     id: string
@@ -6335,11 +6165,6 @@ export type QuestionV2Asked = {
     [key: string]: unknown
   }
   type: "question.v2.asked"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     id: string
@@ -6358,11 +6183,6 @@ export type QuestionV2Replied = {
     [key: string]: unknown
   }
   type: "question.v2.replied"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     sessionID: string
@@ -6377,11 +6197,6 @@ export type QuestionV2Rejected = {
     [key: string]: unknown
   }
   type: "question.v2.rejected"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     sessionID: string
@@ -6425,11 +6240,6 @@ export type FormCreated = {
     [key: string]: unknown
   }
   type: "form.created"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     form: FormFormInfo | FormUrlInfo
@@ -6444,11 +6254,6 @@ export type FormReplied = {
     [key: string]: unknown
   }
   type: "form.replied"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     id: string
@@ -6463,11 +6268,6 @@ export type FormCancelled = {
     [key: string]: unknown
   }
   type: "form.cancelled"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     id: string
@@ -6481,11 +6281,6 @@ export type TodoUpdated = {
     [key: string]: unknown
   }
   type: "todo.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     sessionID: string
@@ -6499,11 +6294,6 @@ export type LspUpdated = {
     [key: string]: unknown
   }
   type: "lsp.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     [key: string]: unknown
@@ -6516,11 +6306,6 @@ export type PermissionAsked = {
     [key: string]: unknown
   }
   type: "permission.asked"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     id: string
@@ -6544,11 +6329,6 @@ export type PermissionReplied = {
     [key: string]: unknown
   }
   type: "permission.replied"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     sessionID: string
@@ -6563,11 +6343,6 @@ export type TuiPromptAppend = {
     [key: string]: unknown
   }
   type: "tui.prompt.append"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     text: string
@@ -6580,11 +6355,6 @@ export type TuiCommandExecute = {
     [key: string]: unknown
   }
   type: "tui.command.execute"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     command:
@@ -6615,11 +6385,6 @@ export type TuiToastShow = {
     [key: string]: unknown
   }
   type: "tui.toast.show"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     title?: string
@@ -6635,11 +6400,6 @@ export type TuiSessionSelect = {
     [key: string]: unknown
   }
   type: "tui.session.select"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     /**
@@ -6655,11 +6415,6 @@ export type McpToolsChanged = {
     [key: string]: unknown
   }
   type: "mcp.tools.changed"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     server: string
@@ -6672,11 +6427,6 @@ export type McpBrowserOpenFailed = {
     [key: string]: unknown
   }
   type: "mcp.browser.open.failed"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     mcpName: string
@@ -6690,11 +6440,6 @@ export type McpStatusChanged = {
     [key: string]: unknown
   }
   type: "mcp.status.changed"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     server: string
@@ -6707,11 +6452,6 @@ export type CommandExecuted = {
     [key: string]: unknown
   }
   type: "command.executed"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     name: string
@@ -6727,11 +6467,6 @@ export type ProjectUpdated = {
     [key: string]: unknown
   }
   type: "project.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     id: string
@@ -6751,11 +6486,6 @@ export type SessionIdle = {
     [key: string]: unknown
   }
   type: "session.idle"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     sessionID: string
@@ -6768,11 +6498,6 @@ export type QuestionAsked = {
     [key: string]: unknown
   }
   type: "question.asked"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     id: string
@@ -6791,11 +6516,6 @@ export type SessionCompacted = {
     [key: string]: unknown
   }
   type: "session.compacted"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     sessionID: string
@@ -6808,11 +6528,6 @@ export type VcsBranchUpdated = {
     [key: string]: unknown
   }
   type: "vcs.branch.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     branch?: string
@@ -6825,11 +6540,6 @@ export type WorkspaceReady = {
     [key: string]: unknown
   }
   type: "workspace.ready"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     name: string
@@ -6842,11 +6552,6 @@ export type WorkspaceFailed = {
     [key: string]: unknown
   }
   type: "workspace.failed"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     message: string
@@ -6859,11 +6564,6 @@ export type WorkspaceStatus = {
     [key: string]: unknown
   }
   type: "workspace.status"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     workspaceID: string
@@ -6877,11 +6577,6 @@ export type WorktreeReady = {
     [key: string]: unknown
   }
   type: "worktree.ready"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     name: string
@@ -6895,11 +6590,6 @@ export type WorktreeFailed = {
     [key: string]: unknown
   }
   type: "worktree.failed"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     message: string
@@ -6912,11 +6602,6 @@ export type ServerConnected = {
     [key: string]: unknown
   }
   type: "server.connected"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     [key: string]: unknown
@@ -6929,11 +6614,6 @@ export type GlobalDisposed = {
     [key: string]: unknown
   }
   type: "global.disposed"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef
   data: {
     [key: string]: unknown
@@ -8627,7 +8307,7 @@ export type SessionNextAgentSwitched2 = {
     [key: string]: unknown
   }
   type: "session.next.agent.switched"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -8647,7 +8327,7 @@ export type SessionNextModelSwitched2 = {
     [key: string]: unknown
   }
   type: "session.next.model.switched"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -8667,7 +8347,7 @@ export type SessionNextMoved2 = {
     [key: string]: unknown
   }
   type: "session.next.moved"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -8687,7 +8367,7 @@ export type SessionNextRenamed2 = {
     [key: string]: unknown
   }
   type: "session.next.renamed"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -8706,7 +8386,7 @@ export type SessionNextForked2 = {
     [key: string]: unknown
   }
   type: "session.next.forked"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -8726,7 +8406,7 @@ export type SessionNextPrompted2 = {
     [key: string]: unknown
   }
   type: "session.next.prompted"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -8747,7 +8427,7 @@ export type SessionNextPromptAdmitted2 = {
     [key: string]: unknown
   }
   type: "session.next.prompt.admitted"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -8768,7 +8448,7 @@ export type SessionNextContextUpdated2 = {
     [key: string]: unknown
   }
   type: "session.next.context.updated"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -8788,7 +8468,7 @@ export type SessionNextSynthetic2 = {
     [key: string]: unknown
   }
   type: "session.next.synthetic"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -8812,7 +8492,7 @@ export type SessionNextSkillActivated2 = {
     [key: string]: unknown
   }
   type: "session.next.skill.activated"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -8833,7 +8513,7 @@ export type SessionNextShellStarted2 = {
     [key: string]: unknown
   }
   type: "session.next.shell.started"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -8854,7 +8534,7 @@ export type SessionNextShellEnded2 = {
     [key: string]: unknown
   }
   type: "session.next.shell.ended"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -8874,7 +8554,7 @@ export type SessionNextStepStarted2 = {
     [key: string]: unknown
   }
   type: "session.next.step.started"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -8896,7 +8576,7 @@ export type SessionNextStepEnded2 = {
     [key: string]: unknown
   }
   type: "session.next.step.ended"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -8928,7 +8608,7 @@ export type SessionNextStepFailed2 = {
     [key: string]: unknown
   }
   type: "session.next.step.failed"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -8948,7 +8628,7 @@ export type SessionNextTextStarted2 = {
     [key: string]: unknown
   }
   type: "session.next.text.started"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -8968,7 +8648,7 @@ export type SessionNextTextEnded2 = {
     [key: string]: unknown
   }
   type: "session.next.text.ended"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -8983,13 +8663,68 @@ export type SessionNextTextEnded2 = {
   }
 }
 
+export type LlmProviderMetadata3 = {
+  [key: string]: {
+    [key: string]: unknown
+  }
+}
+
+export type SessionNextReasoningStarted2 = {
+  id: string
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "session.next.reasoning.started"
+  durable: {
+    aggregateID: string
+    seq: number
+    version: number
+  }
+  location?: LocationRef2
+  data: {
+    timestamp: number
+    sessionID: string
+    assistantMessageID: string
+    reasoningID: string
+    providerMetadata?: LlmProviderMetadata3
+  }
+}
+
+export type LlmProviderMetadata4 = {
+  [key: string]: {
+    [key: string]: unknown
+  }
+}
+
+export type SessionNextReasoningEnded2 = {
+  id: string
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "session.next.reasoning.ended"
+  durable: {
+    aggregateID: string
+    seq: number
+    version: number
+  }
+  location?: LocationRef2
+  data: {
+    timestamp: number
+    sessionID: string
+    assistantMessageID: string
+    reasoningID: string
+    text: string
+    providerMetadata?: LlmProviderMetadata4
+  }
+}
+
 export type SessionNextToolInputStarted2 = {
   id: string
   metadata?: {
     [key: string]: unknown
   }
   type: "session.next.tool.input.started"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -9010,7 +8745,7 @@ export type SessionNextToolInputEnded2 = {
     [key: string]: unknown
   }
   type: "session.next.tool.input.ended"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -9025,7 +8760,7 @@ export type SessionNextToolInputEnded2 = {
   }
 }
 
-export type LlmProviderMetadata3 = {
+export type LlmProviderMetadata5 = {
   [key: string]: {
     [key: string]: unknown
   }
@@ -9037,7 +8772,7 @@ export type SessionNextToolCalled2 = {
     [key: string]: unknown
   }
   type: "session.next.tool.called"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -9054,7 +8789,7 @@ export type SessionNextToolCalled2 = {
     }
     provider: {
       executed: boolean
-      metadata?: LlmProviderMetadata3
+      metadata?: LlmProviderMetadata5
     }
   }
 }
@@ -9065,7 +8800,7 @@ export type SessionNextToolProgress2 = {
     [key: string]: unknown
   }
   type: "session.next.tool.progress"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -9083,7 +8818,7 @@ export type SessionNextToolProgress2 = {
   }
 }
 
-export type LlmProviderMetadata4 = {
+export type LlmProviderMetadata6 = {
   [key: string]: {
     [key: string]: unknown
   }
@@ -9095,7 +8830,7 @@ export type SessionNextToolSuccess2 = {
     [key: string]: unknown
   }
   type: "session.next.tool.success"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -9114,12 +8849,12 @@ export type SessionNextToolSuccess2 = {
     result?: unknown
     provider: {
       executed: boolean
-      metadata?: LlmProviderMetadata4
+      metadata?: LlmProviderMetadata6
     }
   }
 }
 
-export type LlmProviderMetadata5 = {
+export type LlmProviderMetadata7 = {
   [key: string]: {
     [key: string]: unknown
   }
@@ -9131,7 +8866,7 @@ export type SessionNextToolFailed2 = {
     [key: string]: unknown
   }
   type: "session.next.tool.failed"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -9146,66 +8881,11 @@ export type SessionNextToolFailed2 = {
     result?: unknown
     provider: {
       executed: boolean
-      metadata?: LlmProviderMetadata5
+      metadata?: LlmProviderMetadata7
     }
   }
 }
 
-export type LlmProviderMetadata6 = {
-  [key: string]: {
-    [key: string]: unknown
-  }
-}
-
-export type SessionNextReasoningStarted2 = {
-  id: string
-  metadata?: {
-    [key: string]: unknown
-  }
-  type: "session.next.reasoning.started"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
-  location?: LocationRef2
-  data: {
-    timestamp: number
-    sessionID: string
-    assistantMessageID: string
-    reasoningID: string
-    providerMetadata?: LlmProviderMetadata6
-  }
-}
-
-export type LlmProviderMetadata7 = {
-  [key: string]: {
-    [key: string]: unknown
-  }
-}
-
-export type SessionNextReasoningEnded2 = {
-  id: string
-  metadata?: {
-    [key: string]: unknown
-  }
-  type: "session.next.reasoning.ended"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
-  location?: LocationRef2
-  data: {
-    timestamp: number
-    sessionID: string
-    assistantMessageID: string
-    reasoningID: string
-    text: string
-    providerMetadata?: LlmProviderMetadata7
-  }
-}
-
 export type SessionNextRetryError2 = {
   message: string
   statusCode?: number
@@ -9225,7 +8905,7 @@ export type SessionNextRetried2 = {
     [key: string]: unknown
   }
   type: "session.next.retried"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -9245,7 +8925,7 @@ export type SessionNextCompactionStarted2 = {
     [key: string]: unknown
   }
   type: "session.next.compaction.started"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -9265,7 +8945,7 @@ export type SessionNextCompactionEnded2 = {
     [key: string]: unknown
   }
   type: "session.next.compaction.ended"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -9287,7 +8967,7 @@ export type SessionNextRevertStaged2 = {
     [key: string]: unknown
   }
   type: "session.next.revert.staged"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -9306,7 +8986,7 @@ export type SessionNextRevertCleared2 = {
     [key: string]: unknown
   }
   type: "session.next.revert.cleared"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -9324,7 +9004,7 @@ export type SessionNextRevertCommitted2 = {
     [key: string]: unknown
   }
   type: "session.next.revert.committed"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -9355,14 +9035,14 @@ export type SessionDurableEventV2 =
   | SessionNextStepFailed2
   | SessionNextTextStarted2
   | SessionNextTextEnded2
+  | SessionNextReasoningStarted2
+  | SessionNextReasoningEnded2
   | SessionNextToolInputStarted2
   | SessionNextToolInputEnded2
   | SessionNextToolCalled2
   | SessionNextToolProgress2
   | SessionNextToolSuccess2
   | SessionNextToolFailed2
-  | SessionNextReasoningStarted2
-  | SessionNextReasoningEnded2
   | SessionNextRetried2
   | SessionNextCompactionStarted2
   | SessionNextCompactionEnded2
@@ -9889,11 +9569,6 @@ export type ModelsDevRefreshed2 = {
     [key: string]: unknown
   }
   type: "models-dev.refreshed"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data:
     | {
@@ -9908,11 +9583,6 @@ export type IntegrationUpdated2 = {
     [key: string]: unknown
   }
   type: "integration.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data:
     | {
@@ -9927,11 +9597,6 @@ export type IntegrationConnectionUpdated2 = {
     [key: string]: unknown
   }
   type: "integration.connection.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     integrationID: string
@@ -9944,11 +9609,6 @@ export type CatalogUpdated2 = {
     [key: string]: unknown
   }
   type: "catalog.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data:
     | {
@@ -9963,11 +9623,6 @@ export type AgentUpdated2 = {
     [key: string]: unknown
   }
   type: "agent.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data:
     | {
@@ -10053,7 +9708,7 @@ export type SessionCreated2 = {
     [key: string]: unknown
   }
   type: "session.created"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -10071,7 +9726,7 @@ export type SessionUpdated2 = {
     [key: string]: unknown
   }
   type: "session.updated"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -10089,7 +9744,7 @@ export type SessionDeleted2 = {
     [key: string]: unknown
   }
   type: "session.deleted"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -10263,7 +9918,7 @@ export type MessageUpdated2 = {
     [key: string]: unknown
   }
   type: "message.updated"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -10281,7 +9936,7 @@ export type MessageRemoved2 = {
     [key: string]: unknown
   }
   type: "message.removed"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -10562,7 +10217,7 @@ export type MessagePartUpdated2 = {
     [key: string]: unknown
   }
   type: "message.part.updated"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -10581,7 +10236,7 @@ export type MessagePartRemoved2 = {
     [key: string]: unknown
   }
   type: "message.part.removed"
-  durable?: {
+  durable: {
     aggregateID: string
     seq: number
     version: number
@@ -10600,11 +10255,6 @@ export type SessionNextExecutionSettled2 = {
     [key: string]: unknown
   }
   type: "session.next.execution.settled"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     timestamp: number
@@ -10620,11 +10270,6 @@ export type SessionNextTextDelta2 = {
     [key: string]: unknown
   }
   type: "session.next.text.delta"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     timestamp: number
@@ -10641,11 +10286,6 @@ export type SessionNextReasoningDelta2 = {
     [key: string]: unknown
   }
   type: "session.next.reasoning.delta"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     timestamp: number
@@ -10662,11 +10302,6 @@ export type SessionNextToolInputDelta2 = {
     [key: string]: unknown
   }
   type: "session.next.tool.input.delta"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     timestamp: number
@@ -10683,11 +10318,6 @@ export type SessionNextCompactionDelta2 = {
     [key: string]: unknown
   }
   type: "session.next.compaction.delta"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     timestamp: number
@@ -10703,11 +10333,6 @@ export type FileEdited2 = {
     [key: string]: unknown
   }
   type: "file.edited"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     file: string
@@ -10720,11 +10345,6 @@ export type ReferenceUpdated2 = {
     [key: string]: unknown
   }
   type: "reference.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data:
     | {
@@ -10739,11 +10359,6 @@ export type PermissionV2Asked2 = {
     [key: string]: unknown
   }
   type: "permission.v2.asked"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     id: string
@@ -10764,11 +10379,6 @@ export type PermissionV2Replied2 = {
     [key: string]: unknown
   }
   type: "permission.v2.replied"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     sessionID: string
@@ -10783,11 +10393,6 @@ export type PluginAdded2 = {
     [key: string]: unknown
   }
   type: "plugin.added"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     id: string
@@ -10800,11 +10405,6 @@ export type ProjectDirectoriesUpdated2 = {
     [key: string]: unknown
   }
   type: "project.directories.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     projectID: string
@@ -10817,11 +10417,6 @@ export type CommandUpdated2 = {
     [key: string]: unknown
   }
   type: "command.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data:
     | {
@@ -10836,11 +10431,6 @@ export type SkillUpdated2 = {
     [key: string]: unknown
   }
   type: "skill.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data:
     | {
@@ -10855,11 +10445,6 @@ export type FileWatcherUpdated2 = {
     [key: string]: unknown
   }
   type: "file.watcher.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     file: string
@@ -10884,11 +10469,6 @@ export type PtyCreated2 = {
     [key: string]: unknown
   }
   type: "pty.created"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     info: PtyV2
@@ -10901,11 +10481,6 @@ export type PtyUpdated2 = {
     [key: string]: unknown
   }
   type: "pty.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     info: PtyV2
@@ -10918,11 +10493,6 @@ export type PtyExited2 = {
     [key: string]: unknown
   }
   type: "pty.exited"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     id: string
@@ -10936,11 +10506,6 @@ export type PtyDeleted2 = {
     [key: string]: unknown
   }
   type: "pty.deleted"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     id: string
@@ -10971,11 +10536,6 @@ export type ShellCreated2 = {
     [key: string]: unknown
   }
   type: "shell.created"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     info: ShellV2
@@ -10988,11 +10548,6 @@ export type ShellExited2 = {
     [key: string]: unknown
   }
   type: "shell.exited"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     id: string
@@ -11007,11 +10562,6 @@ export type ShellDeleted2 = {
     [key: string]: unknown
   }
   type: "shell.deleted"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     id: string
@@ -11057,11 +10607,6 @@ export type QuestionV2Asked2 = {
     [key: string]: unknown
   }
   type: "question.v2.asked"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     id: string
@@ -11082,11 +10627,6 @@ export type QuestionV2Replied2 = {
     [key: string]: unknown
   }
   type: "question.v2.replied"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     sessionID: string
@@ -11101,11 +10641,6 @@ export type QuestionV2Rejected2 = {
     [key: string]: unknown
   }
   type: "question.v2.rejected"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     sessionID: string
@@ -11212,11 +10747,6 @@ export type FormCreated2 = {
     [key: string]: unknown
   }
   type: "form.created"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     form: FormFormInfo1 | FormUrlInfo1
@@ -11235,11 +10765,6 @@ export type FormReplied2 = {
     [key: string]: unknown
   }
   type: "form.replied"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     id: string
@@ -11254,11 +10779,6 @@ export type FormCancelled2 = {
     [key: string]: unknown
   }
   type: "form.cancelled"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     id: string
@@ -11287,11 +10807,6 @@ export type TodoUpdated2 = {
     [key: string]: unknown
   }
   type: "todo.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     sessionID: string
@@ -11327,11 +10842,6 @@ export type SessionStatusV22 = {
     [key: string]: unknown
   }
   type: "session.status"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     sessionID: string
@@ -11345,11 +10855,6 @@ export type SessionIdle2 = {
     [key: string]: unknown
   }
   type: "session.idle"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     sessionID: string
@@ -11362,11 +10867,6 @@ export type TuiPromptAppend2 = {
     [key: string]: unknown
   }
   type: "tui.prompt.append"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     text: string
@@ -11379,11 +10879,6 @@ export type TuiCommandExecute2 = {
     [key: string]: unknown
   }
   type: "tui.command.execute"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     command:
@@ -11414,11 +10909,6 @@ export type TuiToastShow2 = {
     [key: string]: unknown
   }
   type: "tui.toast.show"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     title?: string
@@ -11434,11 +10924,6 @@ export type TuiSessionSelect2 = {
     [key: string]: unknown
   }
   type: "tui.session.select"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     /**
@@ -11454,11 +10939,6 @@ export type InstallationUpdated2 = {
     [key: string]: unknown
   }
   type: "installation.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     version: string
@@ -11471,11 +10951,6 @@ export type InstallationUpdateAvailable2 = {
     [key: string]: unknown
   }
   type: "installation.update-available"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     version: string
@@ -11488,11 +10963,6 @@ export type VcsBranchUpdated2 = {
     [key: string]: unknown
   }
   type: "vcs.branch.updated"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     branch?: string
@@ -11505,11 +10975,6 @@ export type McpStatusChanged2 = {
     [key: string]: unknown
   }
   type: "mcp.status.changed"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     server: string
@@ -11522,11 +10987,6 @@ export type PermissionAsked2 = {
     [key: string]: unknown
   }
   type: "permission.asked"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     id: string
@@ -11550,11 +11010,6 @@ export type PermissionReplied2 = {
     [key: string]: unknown
   }
   type: "permission.replied"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     sessionID: string
@@ -11608,11 +11063,6 @@ export type QuestionAsked2 = {
     [key: string]: unknown
   }
   type: "question.asked"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     id: string
@@ -11633,11 +11083,6 @@ export type QuestionRepliedV2 = {
     [key: string]: unknown
   }
   type: "question.replied"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     sessionID: string
@@ -11652,11 +11097,6 @@ export type QuestionRejectedV2 = {
     [key: string]: unknown
   }
   type: "question.rejected"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     sessionID: string
@@ -11670,11 +11110,6 @@ export type SessionError2 = {
     [key: string]: unknown
   }
   type: "session.error"
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
   location?: LocationRef2
   data: {
     sessionID?: string | null
@@ -11696,11 +11131,6 @@ export type V2EventServerConnected = {
   metadata?: {
     [key: string]: unknown
   } | null
-  durable?: {
-    aggregateID: string
-    seq: number
-    version: number
-  } | null
   location?: LocationRef2 | null
   type: "server.connected"
   data:
diff --git a/packages/tui/test/cli/cmd/tui/notifications.test.ts b/packages/tui/test/cli/cmd/tui/notifications.test.ts
index 1a19f7be25..a914b34dbc 100644
--- a/packages/tui/test/cli/cmd/tui/notifications.test.ts
+++ b/packages/tui/test/cli/cmd/tui/notifications.test.ts
@@ -33,10 +33,7 @@ async function setup() {
         },
       },
       event: {
-        on: <Type extends V2Event["type"]>(
-          type: Type,
-          handler: (event: Extract<V2Event, { type: Type }>) => void,
-        ) => {
+        on: <Type extends V2Event["type"]>(type: Type, handler: (event: Extract<V2Event, { type: Type }>) => void) => {
           const list = handlers.get(type) ?? []
           const wrapped = handler as (event: V2Event) => void
           list.push(wrapped)
@@ -86,10 +83,15 @@ function permission(id: string, sessionID = "session"): PermissionRequest {
   }
 }
 
+function durable(sessionID: string) {
+  return { aggregateID: sessionID, seq: 0, version: 1 }
+}
+
 function stepStarted(id: string, sessionID = "session"): V2Event {
   return {
     id,
     type: "session.next.step.started",
+    durable: durable(sessionID),
     data: {
       sessionID,
       assistantMessageID: `msg_${id}`,
@@ -104,6 +106,7 @@ function stepEnded(id: string, sessionID = "session", finish = "stop"): V2Event
   return {
     id,
     type: "session.next.step.ended",
+    durable: durable(sessionID),
     data: {
       sessionID,
       assistantMessageID: `msg_${id}`,
@@ -119,6 +122,7 @@ function stepFailed(id: string, sessionID = "session"): V2Event {
   return {
     id,
     type: "session.next.step.failed",
+    durable: durable(sessionID),
     data: {
       sessionID,
       assistantMessageID: `msg_${id}`,
diff --git a/packages/tui/test/cli/tui/data.test.tsx b/packages/tui/test/cli/tui/data.test.tsx
index fc7af6c8ed..b2bacfc0dd 100644
--- a/packages/tui/test/cli/tui/data.test.tsx
+++ b/packages/tui/test/cli/tui/data.test.tsx
@@ -21,6 +21,10 @@ function emitEvent(events: ReturnType<typeof createEventStream>, event: V2Event)
   events.emit({ ...event, location: { directory } })
 }
 
+function durable(sessionID: string, seq = 0, version = 1) {
+  return { aggregateID: sessionID, seq, version }
+}
+
 test("refreshes resources into reactive getters", async () => {
   const events = createEventStream()
   const location = {
@@ -261,6 +265,7 @@ test("tracks session status from active sessions and execution events", async ()
     emitEvent(events, {
       id: "evt_step_started",
       type: "session.next.step.started",
+      durable: durable("session-live"),
       data: {
         sessionID: "session-live",
         assistantMessageID: "message-live",
@@ -274,6 +279,7 @@ test("tracks session status from active sessions and execution events", async ()
     emitEvent(events, {
       id: "evt_step_ended",
       type: "session.next.step.ended",
+      durable: durable("session-live", 1, 2),
       data: {
         sessionID: "session-live",
         assistantMessageID: "message-live",
@@ -303,6 +309,7 @@ test("tracks session status from active sessions and execution events", async ()
     emitEvent(events, {
       id: "evt_failed_step_started",
       type: "session.next.step.started",
+      durable: durable("session-failed"),
       data: {
         sessionID: "session-failed",
         assistantMessageID: "message-failed",
@@ -316,6 +323,7 @@ test("tracks session status from active sessions and execution events", async ()
     emitEvent(events, {
       id: "evt_step_failed",
       type: "session.next.step.failed",
+      durable: durable("session-failed", 1, 2),
       data: {
         sessionID: "session-failed",
         assistantMessageID: "message-failed",
@@ -548,7 +556,10 @@ test("keeps shell state scoped to location", async () => {
     if (url.pathname !== "/api/shell") return
     const requestDirectory = url.searchParams.get("location[directory]")
     return json({
-      location: { directory: requestDirectory ?? directory, project: { id: "proj_test", directory: requestDirectory ?? directory } },
+      location: {
+        directory: requestDirectory ?? directory,
+        project: { id: "proj_test", directory: requestDirectory ?? directory },
+      },
       data: [
         {
           id: requestDirectory === other ? "sh_other" : "sh_default",
@@ -773,11 +784,13 @@ test("settles pending tools when a live failure arrives", async () => {
     emitEvent(events, {
       id: "evt_agent_1",
       type: "session.next.agent.switched",
+      durable: durable("session-1"),
       data: { sessionID: "session-1", messageID: "msg_agent_1", timestamp: 0, agent: "build" },
     })
     emitEvent(events, {
       id: "evt_model_1",
       type: "session.next.model.switched",
+      durable: durable("session-1", 1),
       data: {
         sessionID: "session-1",
         messageID: "msg_model_1",
@@ -788,6 +801,7 @@ test("settles pending tools when a live failure arrives", async () => {
     emitEvent(events, {
       id: "evt_step_started_1",
       type: "session.next.step.started",
+      durable: durable("session-1", 2),
       data: {
         sessionID: "session-1",
         assistantMessageID: "msg_explicit_assistant_9",
@@ -799,6 +813,7 @@ test("settles pending tools when a live failure arrives", async () => {
     emitEvent(events, {
       id: "evt_input_1",
       type: "session.next.tool.input.started",
+      durable: durable("session-1", 3),
       data: {
         sessionID: "session-1",
         assistantMessageID: "msg_explicit_assistant_9",
@@ -810,6 +825,7 @@ test("settles pending tools when a live failure arrives", async () => {
     emitEvent(events, {
       id: "evt_called_1",
       type: "session.next.tool.called",
+      durable: durable("session-1", 4),
       data: {
         sessionID: "session-1",
         timestamp: 2,
@@ -823,6 +839,7 @@ test("settles pending tools when a live failure arrives", async () => {
     emitEvent(events, {
       id: "evt_failed_1",
       type: "session.next.tool.failed",
+      durable: durable("session-1", 5),
       data: {
         sessionID: "session-1",
         timestamp: 3,
@@ -912,6 +929,7 @@ test("renders admitted prompts immediately with queued marker and clears when pr
     emitEvent(events, {
       id: "evt_admitted_1",
       type: "session.next.prompt.admitted",
+      durable: durable(sessionID),
       data: {
         sessionID,
         messageID,
@@ -930,6 +948,7 @@ test("renders admitted prompts immediately with queued marker and clears when pr
     emitEvent(events, {
       id: "evt_prompted_1",
       type: "session.next.prompted",
+      durable: durable(sessionID, 1),
       data: {
         sessionID,
         messageID,
@@ -989,6 +1008,7 @@ test("projects live context updates with their message ID", async () => {
     emitEvent(events, {
       id: "evt_context_1",
       type: "session.next.context.updated",
+      durable: durable("session-1"),
       data: {
         sessionID: "session-1",
         messageID: "msg_context_1",
diff --git a/specs/v2/schema-changelog.md b/specs/v2/schema-changelog.md
index 794db93c95..d526b5d8e7 100644
--- a/specs/v2/schema-changelog.md
+++ b/specs/v2/schema-changelog.md
@@ -1,5 +1,25 @@
 # V2 Schema Changelog
 
+## 2026-07-03: Require Durable Envelope On Durable Events
+
+- Make the wire `durable` envelope required on durable event definitions.
+- Remove the `durable` envelope field from live-only event definitions.
+
+Compatibility:
+
+- No stored event row, database, or runtime publish behavior change; runtime already attaches the envelope only after durable commit/replay.
+- Generated clients now model the existing invariant: durable events carry `durable`, live-only events do not.
+
+## 2026-07-03: Declare Event Durability At Definition Level
+
+- Add explicit `Event.durable(...)` and `Event.ephemeral(...)` definition constructors.
+- Preserve the existing durable and live-only event classifications while deriving durable inventories from definition metadata instead of hand-maintained lists.
+
+Compatibility:
+
+- No wire payload, stored event row, database, or behavior change.
+- Generated clients were regenerated from the unchanged public event schemas.
+
 ## 2026-07-02: Rename Session Log Replay Marker
 
 - Rename the replay boundary marker from `log.caught_up` / `EventLog.CaughtUp` to `log.synced` / `EventLog.Synced`.

From dd768e30e2c9c3e67f709132a7f7ca455816c7c2 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Fri, 3 Jul 2026 12:36:46 -0400
Subject: [PATCH 09/82] refactor(client): namespace service exports and share
 the registration contract

---
 packages/cli/src/commands/handlers/api.ts     |  3 +-
 packages/cli/src/commands/handlers/default.ts |  3 +-
 packages/cli/src/commands/handlers/serve.ts   | 29 +++++-----
 packages/cli/src/services/service-config.ts   |  2 +-
 packages/cli/src/tui.ts                       |  4 +-
 packages/client/src/effect/index.ts           |  1 -
 packages/client/src/effect/service.ts         | 54 +++++++++----------
 packages/client/src/promise/index.ts          |  1 -
 8 files changed, 47 insertions(+), 50 deletions(-)

diff --git a/packages/cli/src/commands/handlers/api.ts b/packages/cli/src/commands/handlers/api.ts
index 82d273c25d..de4d1a2b87 100644
--- a/packages/cli/src/commands/handlers/api.ts
+++ b/packages/cli/src/commands/handlers/api.ts
@@ -4,7 +4,6 @@ import { Commands } from "../commands"
 import { Runtime } from "../../framework/runtime"
 import { Service } from "@opencode-ai/client/effect"
 import { ServiceConfig } from "../../services/service-config"
-import type { Transport } from "@opencode-ai/client/effect"
 
 const methods = new Set(["delete", "get", "head", "options", "patch", "post", "put"])
 
@@ -61,7 +60,7 @@ export function rawRequest(input: readonly string[]) {
 }
 
 function resolveRequest(
-  transport: Transport,
+  transport: Service.Transport,
   input: readonly string[],
   params: Record<string, string>,
 ) {
diff --git a/packages/cli/src/commands/handlers/default.ts b/packages/cli/src/commands/handlers/default.ts
index 98b0c9b3c9..32e542e634 100644
--- a/packages/cli/src/commands/handlers/default.ts
+++ b/packages/cli/src/commands/handlers/default.ts
@@ -3,7 +3,6 @@ import { Commands } from "../commands"
 import { Runtime } from "../../framework/runtime"
 import { Effect, Option } from "effect"
 import { Service } from "@opencode-ai/client/effect"
-import type { Transport } from "@opencode-ai/client/effect"
 import { ServiceConfig } from "../../services/service-config"
 import { Standalone } from "../../services/standalone"
 import { Updater } from "../../services/updater"
@@ -23,7 +22,7 @@ export default Runtime.handler(Commands, (input) =>
         return {
           url: server,
           headers: password ? { authorization: "Basic " + btoa("opencode:" + password) } : undefined,
-        } satisfies Transport
+        } satisfies Service.Transport
       }
       if (input.standalone) return yield* Standalone.transport()
       const options = yield* ServiceConfig.options()
diff --git a/packages/cli/src/commands/handlers/serve.ts b/packages/cli/src/commands/handlers/serve.ts
index 80cf6cba9f..d6b6938ee3 100644
--- a/packages/cli/src/commands/handlers/serve.ts
+++ b/packages/cli/src/commands/handlers/serve.ts
@@ -14,6 +14,7 @@ import { InstallationVersion } from "@opencode-ai/core/installation/version"
 import { createOpencodeClient } from "@opencode-ai/sdk/v2/client"
 import { Commands } from "../commands"
 import { Runtime } from "../../framework/runtime"
+import { Service } from "@opencode-ai/client/effect"
 import { ServiceConfig } from "../../services/service-config"
 import { Updater } from "../../services/updater"
 import { randomBytes, randomUUID } from "crypto"
@@ -63,8 +64,11 @@ export default Runtime.handler(
 // not a startup lock: the atomic rename elects the latest writer, the watcher
 // self-evicts losers, and the finalizer id-guard keeps an exiting server from
 // deleting its successor's registration.
-const RegistrationId = Schema.Struct({ id: Schema.optional(Schema.String) })
-const decodeRegistrationId = Schema.decodeUnknownEffect(Schema.fromJsonString(RegistrationId))
+// Written and read through Service.Info so the file the server registers is
+// provably the contract clients discover with.
+const infoJson = Schema.fromJsonString(Service.Info)
+const encodeInfo = Schema.encodeEffect(infoJson)
+const decodeInfo = Schema.decodeUnknownEffect(infoJson)
 
 const register = Effect.fnUntraced(function* (address: HttpServer.Address) {
   const fs = yield* FileSystem.FileSystem
@@ -73,20 +77,17 @@ const register = Effect.fnUntraced(function* (address: HttpServer.Address) {
   const secret = yield* ServiceConfig.password()
   const temp = file + "." + id + ".tmp"
   yield* fs.makeDirectory(path.dirname(file), { recursive: true })
-  yield* fs.writeFileString(
-    temp,
-    JSON.stringify({
-      id,
-      version: InstallationVersion,
-      url: HttpServer.formatAddress(address),
-      pid: process.pid,
-      password: secret,
-    }),
-    { mode: 0o600 },
-  )
+  const encoded = yield* encodeInfo({
+    id,
+    version: InstallationVersion,
+    url: HttpServer.formatAddress(address),
+    pid: process.pid,
+    password: secret,
+  })
+  yield* fs.writeFileString(temp, encoded, { mode: 0o600 })
   yield* fs.rename(temp, file)
   const currentID = fs.readFileString(file).pipe(
-    Effect.flatMap(decodeRegistrationId),
+    Effect.flatMap(decodeInfo),
     Effect.map((info) => info.id),
     Effect.orElseSucceed(() => undefined),
   )
diff --git a/packages/cli/src/services/service-config.ts b/packages/cli/src/services/service-config.ts
index 356472e359..ecdd5bf19a 100644
--- a/packages/cli/src/services/service-config.ts
+++ b/packages/cli/src/services/service-config.ts
@@ -5,7 +5,7 @@ import { Effect, FileSystem, Schema } from "effect"
 import { randomBytes } from "crypto"
 import path from "path"
 
-// The CLI's service configuration file, plus the ServiceOptions binding that
+// The CLI's service configuration file, plus the Service.Options binding that
 // points the client package's service operations at this CLI: which
 // registration file (by channel), which version, and how to spawn opencode.
 
diff --git a/packages/cli/src/tui.ts b/packages/cli/src/tui.ts
index 577a7be493..a535309d42 100644
--- a/packages/cli/src/tui.ts
+++ b/packages/cli/src/tui.ts
@@ -5,11 +5,11 @@ import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { Global } from "@opencode-ai/core/global"
 import { loadBuiltinPlugins } from "@opencode-ai/tui/builtins"
 import { OpenCode } from "@opencode-ai/client/promise"
-import type { Transport } from "@opencode-ai/client/effect"
+import type { Service } from "@opencode-ai/client/effect"
 import { createOpencodeClient } from "@opencode-ai/sdk/v2/client"
 import type { Args } from "@opencode-ai/tui/context/args"
 
-export function runTui(transport: Transport, args: Args, discover?: () => Promise<Transport>) {
+export function runTui(transport: Service.Transport, args: Args, discover?: () => Promise<Service.Transport>) {
   const config = TuiConfig.resolve({}, { terminalSuspend: false })
   let disposeSlots: (() => void) | undefined
   return Effect.gen(function* () {
diff --git a/packages/client/src/effect/index.ts b/packages/client/src/effect/index.ts
index 1a69a358cc..23e6d55c74 100644
--- a/packages/client/src/effect/index.ts
+++ b/packages/client/src/effect/index.ts
@@ -2,7 +2,6 @@
 // Core or Server. Preserve these datatype exports so internal model reorganizations do not require caller migrations.
 export * from "./generated/index"
 export { Service } from "./service.js"
-export type { Transport, ServiceOptions } from "./service.js"
 export { Agent } from "@opencode-ai/schema/agent"
 export { Command } from "@opencode-ai/schema/command"
 export { Credential } from "@opencode-ai/schema/credential"
diff --git a/packages/client/src/effect/service.ts b/packages/client/src/effect/service.ts
index 93cbdd03fc..ca428f5aa6 100644
--- a/packages/client/src/effect/service.ts
+++ b/packages/client/src/effect/service.ts
@@ -16,7 +16,7 @@ export type Transport = {
   readonly headers?: RequestInit["headers"]
 }
 
-export type ServiceOptions = {
+export type Options = {
   // Absolute path to the service registration file. Defaults to
   // opencode/service.json in the XDG state directory.
   readonly file?: string
@@ -30,21 +30,21 @@ export type ServiceOptions = {
 
 // Read-only lookup: registration file plus health check and version gate.
 // Never spawns; escalation to start() is the caller's policy.
-export const discover = Effect.fn("service.discover")(function* (options: ServiceOptions = {}) {
-  const registration = yield* read(options.file)
-  if (registration === undefined) return undefined
-  if (options.version !== undefined && registration.version !== options.version) return undefined
-  const found = yield* probe(registration)
+export const discover = Effect.fn("service.discover")(function* (options: Options = {}) {
+  const info = yield* read(options.file)
+  if (info === undefined) return undefined
+  if (options.version !== undefined && info.version !== options.version) return undefined
+  const found = yield* probe(info)
   return found?.transport
 })
 
 // Idempotent ensure-running: reuses a healthy compatible server, replaces a
 // version-mismatched one, and otherwise spawns the service command detached.
-export const start = Effect.fn("service.start")(function* (options: ServiceOptions = {}) {
+export const start = Effect.fn("service.start")(function* (options: Options = {}) {
   const compatible = yield* discover(options)
   if (compatible !== undefined) return compatible
   const mismatched = yield* find(options)
-  if (mismatched !== undefined) yield* kill(mismatched.registration, options).pipe(Effect.ignore)
+  if (mismatched !== undefined) yield* kill(mismatched.info, options).pipe(Effect.ignore)
 
   const [command, ...args] = options.command ?? ["opencode", "serve", "--service"]
   if (command === undefined) return yield* Effect.fail(new Error("Missing service command"))
@@ -64,10 +64,10 @@ export const start = Effect.fn("service.start")(function* (options: ServiceOptio
   )
 })
 
-export const stop = Effect.fn("service.stop")(function* (options: ServiceOptions = {}) {
+export const stop = Effect.fn("service.stop")(function* (options: Options = {}) {
   const fs = yield* FileSystem.FileSystem
   const existing = yield* find(options)
-  if (existing !== undefined) yield* kill(existing.registration, options)
+  if (existing !== undefined) yield* kill(existing.info, options)
   yield* fs.remove(options.file ?? fallback()).pipe(Effect.ignore)
 })
 
@@ -80,18 +80,18 @@ function auth(password: string): RequestInit["headers"] {
   return { authorization: "Basic " + btoa("opencode:" + password) }
 }
 
-const Registration = Schema.Struct({
+export const Info = Schema.Struct({
   id: Schema.optional(Schema.String),
   version: Schema.optional(Schema.String),
   url: Schema.String,
   pid: Schema.Int.check(Schema.isGreaterThan(0)),
   password: Schema.optional(Schema.String),
 })
-type Registration = typeof Registration.Type
+export type Info = typeof Info.Type
 
-const decode = Schema.decodeUnknownEffect(Schema.fromJsonString(Registration))
+const decode = Schema.decodeUnknownEffect(Schema.fromJsonString(Info))
 
-// A missing or corrupt file means no valid registration; callers treat both
+// A missing or corrupt file means no valid info; callers treat both
 // the same (the registering server self-evicts, clients rediscover).
 const read = Effect.fnUntraced(function* (file?: string) {
   const fs = yield* FileSystem.FileSystem
@@ -101,14 +101,14 @@ const read = Effect.fnUntraced(function* (file?: string) {
 })
 
 type LocalService = {
-  readonly registration: Registration
+  readonly info: Info
   readonly transport: Transport
 }
 
-const probe = Effect.fnUntraced(function* (registration: Registration) {
-  const headers = registration.password === undefined ? undefined : auth(registration.password)
+const probe = Effect.fnUntraced(function* (info: Info) {
+  const headers = info.password === undefined ? undefined : auth(info.password)
   const healthy = yield* Effect.tryPromise(() =>
-    fetch(new URL("/api/health", registration.url), {
+    fetch(new URL("/api/health", info.url), {
       headers,
       signal: AbortSignal.timeout(2_000),
     }),
@@ -117,15 +117,15 @@ const probe = Effect.fnUntraced(function* (registration: Registration) {
     Effect.orElseSucceed(() => false),
   )
   if (!healthy) return undefined
-  return { registration, transport: { url: registration.url, headers } } satisfies LocalService
+  return { info, transport: { url: info.url, headers } } satisfies LocalService
 })
 
 // Health-checked lookup without the version gate: lifecycle operations must be
 // able to see (and replace or stop) a server from a different version.
-const find = Effect.fnUntraced(function* (options: ServiceOptions) {
-  const registration = yield* read(options.file)
-  if (registration === undefined) return undefined
-  return yield* probe(registration)
+const find = Effect.fnUntraced(function* (options: Options) {
+  const info = yield* read(options.file)
+  if (info === undefined) return undefined
+  return yield* probe(info)
 })
 
 // 50ms cadence bounded at ~5s, shared by stop escalation and start readiness.
@@ -142,22 +142,22 @@ const stopped = Effect.fnUntraced(function* (pid: number) {
   return yield* Effect.fail(new Error(`Server process ${pid} is still running`))
 })
 
-function same(left: Registration, right: Registration) {
+function same(left: Info, right: Info) {
   return left.id === right.id && left.version === right.version && left.url === right.url && left.pid === right.pid
 }
 
-const kill = Effect.fnUntraced(function* (info: Registration, options: ServiceOptions) {
+const kill = Effect.fnUntraced(function* (info: Info, options: Options) {
   // A stale registration may point at a PID that has since been reused by
   // another process. Only signal the PID after authenticating the server.
   const current = yield* find(options)
-  if (current === undefined || !same(current.registration, info)) return
+  if (current === undefined || !same(current.info, info)) return
 
   yield* signal(info.pid, "SIGTERM")
   const done = yield* stopped(info.pid).pipe(Effect.retry(poll), Effect.option)
   if (Option.isSome(done)) return
 
   const latest = yield* find(options)
-  if (latest === undefined || !same(latest.registration, info)) return
+  if (latest === undefined || !same(latest.info, info)) return
   yield* signal(info.pid, "SIGKILL")
   yield* stopped(info.pid).pipe(Effect.retry(poll))
 })
diff --git a/packages/client/src/promise/index.ts b/packages/client/src/promise/index.ts
index 61bdcdf888..e9e848b160 100644
--- a/packages/client/src/promise/index.ts
+++ b/packages/client/src/promise/index.ts
@@ -1,4 +1,3 @@
 export * from "./generated/index"
-export type { Transport } from "../effect/service.js"
 export type { EventSubscribeOutput as OpenCodeEvent } from "./generated/types"
 export type OpenCodeClient = ReturnType<typeof import("./generated/client").make>

From 6f47459c68cb6db4e9df0afa431bfad968bc2e1c Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Fri, 3 Jul 2026 12:42:09 -0400
Subject: [PATCH 10/82] chore: update lockfile

---
 bun.lock | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bun.lock b/bun.lock
index be72ef8802..5eca1724f1 100644
--- a/bun.lock
+++ b/bun.lock
@@ -126,6 +126,7 @@
         "@opencode-ai/schema": "workspace:*",
       },
       "devDependencies": {
+        "@effect/platform-node": "catalog:",
         "@opencode-ai/core": "workspace:*",
         "@opencode-ai/httpapi-codegen": "workspace:*",
         "@opencode-ai/server": "workspace:*",
@@ -597,7 +598,6 @@
         "@octokit/rest": "catalog:",
         "@openauthjs/openauth": "catalog:",
         "@opencode-ai/client": "workspace:*",
-        "@opencode-ai/codemode": "workspace:*",
         "@opencode-ai/llm": "workspace:*",
         "@opencode-ai/plugin": "workspace:*",
         "@opencode-ai/protocol": "workspace:*",
@@ -7078,8 +7078,6 @@
 
     "opencode-gitlab-auth/open/wsl-utils": ["wsl-utils@0.1.0", "", { "dependencies": { "is-wsl": "^3.1.0" } }, "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw=="],
 
-    "openid-client/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="],
-
     "p-locate/p-limit/yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="],
 
     "pkg-dir/find-up/locate-path": ["locate-path@5.0.0", "", { "dependencies": { "p-locate": "^4.1.0" } }, "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="],

From aad8d90dd182c43b1c06e670c00d02233e9c160c Mon Sep 17 00:00:00 2001
From: James Long <longster@gmail.com>
Date: Fri, 3 Jul 2026 13:25:38 -0400
Subject: [PATCH 11/82] refactor(core): move path resolve into fs service
 (#35201)

---
 packages/core/src/fs-util.ts              | 10 ++++++++++
 packages/core/src/instruction-context.ts  | 24 ++++++++++++-----------
 packages/core/src/project/copy.ts         |  2 +-
 packages/core/src/session/instructions.ts |  2 +-
 packages/core/src/tool/read.ts            |  6 +++---
 packages/core/src/tool/shell.ts           | 14 ++++++++-----
 6 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/packages/core/src/fs-util.ts b/packages/core/src/fs-util.ts
index ff71477d70..124ac6d702 100644
--- a/packages/core/src/fs-util.ts
+++ b/packages/core/src/fs-util.ts
@@ -38,6 +38,7 @@ export namespace FSUtil {
     readonly ensureDir: (path: string) => Effect.Effect<void, Error>
     readonly writeWithDirs: (path: string, content: string | Uint8Array, mode?: number) => Effect.Effect<void, Error>
     readonly readDirectoryEntries: (path: string) => Effect.Effect<DirEntry[], Error>
+    readonly resolve: (path: string) => Effect.Effect<string>
     readonly findUp: (target: string, start: string, stop?: string) => Effect.Effect<string[], Error>
     readonly up: (options: { targets: string[]; start: string; stop?: string }) => Effect.Effect<string[], Error>
     readonly globUp: (pattern: string, start: string, stop?: string) => Effect.Effect<string[], Error>
@@ -89,6 +90,14 @@ export namespace FSUtil {
         })
       })
 
+      const resolve = Effect.fn("FileSystem.resolve")(function* (path: string) {
+        const resolved = pathResolve(windowsPath(path))
+        return yield* fs.realPath(resolved).pipe(
+          Effect.catchReason("PlatformError", "NotFound", () => Effect.succeed(resolved)),
+          Effect.orDie,
+        )
+      })
+
       const readJson = Effect.fn("FileSystem.readJson")(function* (path: string) {
         const text = yield* fs.readFileString(path)
         return yield* Effect.try({
@@ -187,6 +196,7 @@ export namespace FSUtil {
         isDir,
         isFile,
         readDirectoryEntries,
+        resolve,
         readJson,
         writeJson,
         ensureDir,
diff --git a/packages/core/src/instruction-context.ts b/packages/core/src/instruction-context.ts
index 94d9e787ce..66d9e14c01 100644
--- a/packages/core/src/instruction-context.ts
+++ b/packages/core/src/instruction-context.ts
@@ -43,22 +43,24 @@ const layer = Layer.effect(
       })
 
     const observe = Effect.fn("InstructionContext.observe")(function* () {
-      const start = FSUtil.resolve(location.directory)
-      const stop = FSUtil.resolve(location.project.directory)
+      const start = yield* fs.resolve(location.directory)
+      const stop = yield* fs.resolve(location.project.directory)
       const fromProject = relative(stop, start)
       const insideProject =
         fromProject === "" || (fromProject !== ".." && !fromProject.startsWith(`..${sep}`) && !isAbsolute(fromProject))
       const discovered = new Set(
-        (Flag.OPENCODE_DISABLE_PROJECT_CONFIG || !insideProject
-          ? []
-          : yield* fs.up({
-              targets: ["AGENTS.md"],
-              start,
-              stop,
-            })
-        ).map(FSUtil.resolve),
+        yield* Effect.forEach(
+          Flag.OPENCODE_DISABLE_PROJECT_CONFIG || !insideProject
+            ? []
+            : yield* fs.up({
+                targets: ["AGENTS.md"],
+                start,
+                stop,
+              }),
+          fs.resolve,
+        ),
       )
-      const paths = Array.dedupe([FSUtil.resolve(join(global.config, "AGENTS.md")), ...discovered])
+      const paths = Array.dedupe([yield* fs.resolve(join(global.config, "AGENTS.md")), ...discovered])
       const files = yield* Effect.forEach(
         paths,
         (path) =>
diff --git a/packages/core/src/project/copy.ts b/packages/core/src/project/copy.ts
index b42df4045c..0980ef44f7 100644
--- a/packages/core/src/project/copy.ts
+++ b/packages/core/src/project/copy.ts
@@ -139,7 +139,7 @@ const layer = Layer.effect(
     })
 
     const canonical = Effect.fnUntraced(function* (input: AbsolutePath) {
-      const resolved = AbsolutePath.make(FSUtil.resolve(input))
+      const resolved = AbsolutePath.make(yield* fs.resolve(input))
       if (!(yield* fs.isDir(resolved))) return yield* new DirectoryUnavailableError({ directory: input })
       return resolved
     })
diff --git a/packages/core/src/session/instructions.ts b/packages/core/src/session/instructions.ts
index 3e2eb27147..913f5c7334 100644
--- a/packages/core/src/session/instructions.ts
+++ b/packages/core/src/session/instructions.ts
@@ -35,7 +35,7 @@ const layer = Layer.effect(
     // Resolved once for the Location layer; the synthetic text and dedup ledger keep
     // absolute paths, but the human-facing description shows paths relative to the project
     // root so opening a subdirectory still describes paths from the project root.
-    const root = FSUtil.resolve(location.project.directory)
+    const root = yield* fs.resolve(location.project.directory)
     // Same-turn parallel reads settle concurrently, so an in-memory claim guards each
     // Session/path pair before any filesystem work. The durable history check below covers
     // paths injected in earlier turns after this Location layer was reopened.
diff --git a/packages/core/src/tool/read.ts b/packages/core/src/tool/read.ts
index 028456a4e1..16e229d97d 100644
--- a/packages/core/src/tool/read.ts
+++ b/packages/core/src/tool/read.ts
@@ -97,8 +97,8 @@ export const Plugin = {
               // skipped, and discovery failures never fail the read.
               yield* Effect.gen(function* () {
                 if (target.externalDirectory !== undefined) return
-                const resolved = FSUtil.resolve(target.canonical)
-                const root = FSUtil.resolve(location.directory)
+                const resolved = yield* fs.resolve(target.canonical)
+                const root = yield* fs.resolve(location.directory)
                 // up() searches its stop directory, so the Location-root AGENTS.md (already
                 // supplied by the core/instructions baseline) is dropped by the dirname filter.
                 const discovered = yield* fs.up({
@@ -106,7 +106,7 @@ export const Plugin = {
                   start: type === "directory" ? resolved : dirname(resolved),
                   stop: root,
                 })
-                const candidates = discovered.map(FSUtil.resolve).filter((file) => dirname(file) !== root)
+                const candidates = (yield* Effect.forEach(discovered, fs.resolve)).filter((file) => dirname(file) !== root)
                 if (candidates.length === 0) return
                 yield* sessionInstructions.load({ sessionID: context.sessionID, paths: candidates })
               }).pipe(
diff --git a/packages/core/src/tool/shell.ts b/packages/core/src/tool/shell.ts
index e86f960ba5..cb7edb3113 100644
--- a/packages/core/src/tool/shell.ts
+++ b/packages/core/src/tool/shell.ts
@@ -80,17 +80,21 @@ const modelOutput = (output: Output): string | undefined => {
 
 const shellTokens = (command: string) => command.match(/(?:[^\s"']+|"[^"]*"|'[^']*')+/g) ?? []
 const unquote = (value: string) => value.replace(/^(['"])(.*)\1$/, "$2")
-const externalCommandDirectories = (command: string, cwd: string) => {
+const externalCommandDirectories = Effect.fn("ShellTool.externalCommandDirectories")(function* (
+  fs: FSUtil.Interface,
+  command: string,
+  cwd: string,
+) {
   const directories = new Set<string>()
   for (const token of shellTokens(command)) {
     const value = unquote(token).replace(/[;,|&]+$/, "")
     if (!path.isAbsolute(value)) continue
-    const resolved = FSUtil.resolve(value)
+    const resolved = yield* fs.resolve(value)
     if (FSUtil.contains(cwd, resolved)) continue
-    directories.add(FSUtil.resolve(path.dirname(resolved)))
+    directories.add(yield* fs.resolve(path.dirname(resolved)))
   }
   return [...directories]
-}
+})
 
 export const Plugin = {
   id: "core-shell-tool",
@@ -168,7 +172,7 @@ export const Plugin = {
                   agent: context.agent,
                   source,
                 })
-              const warnings = externalCommandDirectories(input.command, target.canonical).map(
+              const warnings = (yield* externalCommandDirectories(fsUtil, input.command, target.canonical)).map(
                 (directory) =>
                   `Command argument references external directory ${path.join(directory, "*").replaceAll("\\", "/")}. Shell runs with host-user filesystem, process, and network authority; this scan is advisory only.`,
               )

From c6a52a39b5f1e1d3bb0165d47259afa8c2b5e297 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Fri, 3 Jul 2026 13:33:25 -0400
Subject: [PATCH 12/82] fix(cli): read OPENCODE_PASSWORD for explicit server
 auth

---
 packages/cli/src/commands/handlers/default.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/src/commands/handlers/default.ts b/packages/cli/src/commands/handlers/default.ts
index 32e542e634..ca4c6469b4 100644
--- a/packages/cli/src/commands/handlers/default.ts
+++ b/packages/cli/src/commands/handlers/default.ts
@@ -18,7 +18,7 @@ export default Runtime.handler(Commands, (input) =>
       return yield* Effect.fail(new Error("--server and --standalone cannot be combined"))
     const transport = yield* Effect.gen(function* () {
       if (server !== undefined) {
-        const password = process.env["OPENCODE_SERVER_PASSWORD"]
+        const password = process.env["OPENCODE_PASSWORD"]
         return {
           url: server,
           headers: password ? { authorization: "Basic " + btoa("opencode:" + password) } : undefined,

From c22793d5f6aac55252fe251c21da65f412235de6 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Fri, 3 Jul 2026 13:34:11 -0400
Subject: [PATCH 13/82] feat(cli): validate explicit server before starting the
 tui

---
 packages/cli/src/commands/handlers/default.ts | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/commands/handlers/default.ts b/packages/cli/src/commands/handlers/default.ts
index ca4c6469b4..addafa634f 100644
--- a/packages/cli/src/commands/handlers/default.ts
+++ b/packages/cli/src/commands/handlers/default.ts
@@ -19,10 +19,26 @@ export default Runtime.handler(Commands, (input) =>
     const transport = yield* Effect.gen(function* () {
       if (server !== undefined) {
         const password = process.env["OPENCODE_PASSWORD"]
-        return {
+        const explicit = {
           url: server,
           headers: password ? { authorization: "Basic " + btoa("opencode:" + password) } : undefined,
         } satisfies Service.Transport
+        // Fail loudly before entering the TUI: an explicit server that is
+        // unreachable or rejects auth should not present as reconnect churn.
+        const response = yield* Effect.tryPromise(() =>
+          fetch(new URL("/api/health", server), { headers: explicit.headers, signal: AbortSignal.timeout(5_000) }),
+        ).pipe(Effect.mapError((cause) => new Error(`Could not reach server at ${server}`, { cause })))
+        if (response.status === 401)
+          return yield* Effect.fail(
+            new Error(
+              password
+                ? `Server at ${server} rejected the password`
+                : `Server at ${server} requires a password; set OPENCODE_PASSWORD`,
+            ),
+          )
+        if (!response.ok)
+          return yield* Effect.fail(new Error(`Server at ${server} responded with status ${response.status}`))
+        return explicit
       }
       if (input.standalone) return yield* Standalone.transport()
       const options = yield* ServiceConfig.options()

From 24d26365e6403fd8add79fec45ed63f2fb20381e Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Fri, 3 Jul 2026 13:37:12 -0400
Subject: [PATCH 14/82] refactor(cli): manage environment variables with effect
 config

---
 packages/cli/src/commands/handlers/default.ts |  9 ++++++---
 packages/cli/src/commands/handlers/serve.ts   | 11 ++++++++---
 packages/cli/src/env.ts                       | 18 ++++++++++++++++++
 3 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 packages/cli/src/env.ts

diff --git a/packages/cli/src/commands/handlers/default.ts b/packages/cli/src/commands/handlers/default.ts
index addafa634f..5521af8fe6 100644
--- a/packages/cli/src/commands/handlers/default.ts
+++ b/packages/cli/src/commands/handlers/default.ts
@@ -1,8 +1,9 @@
 import { NodeFileSystem } from "@effect/platform-node"
 import { Commands } from "../commands"
 import { Runtime } from "../../framework/runtime"
-import { Effect, Option } from "effect"
+import { Effect, Option, Redacted } from "effect"
 import { Service } from "@opencode-ai/client/effect"
+import { Env } from "../../env"
 import { ServiceConfig } from "../../services/service-config"
 import { Standalone } from "../../services/standalone"
 import { Updater } from "../../services/updater"
@@ -18,10 +19,12 @@ export default Runtime.handler(Commands, (input) =>
       return yield* Effect.fail(new Error("--server and --standalone cannot be combined"))
     const transport = yield* Effect.gen(function* () {
       if (server !== undefined) {
-        const password = process.env["OPENCODE_PASSWORD"]
+        const password = Option.getOrUndefined(yield* Env.password)
         const explicit = {
           url: server,
-          headers: password ? { authorization: "Basic " + btoa("opencode:" + password) } : undefined,
+          headers: password
+            ? { authorization: "Basic " + btoa("opencode:" + Redacted.value(password)) }
+            : undefined,
         } satisfies Service.Transport
         // Fail loudly before entering the TUI: an explicit server that is
         // unreachable or rejects auth should not present as reconnect churn.
diff --git a/packages/cli/src/commands/handlers/serve.ts b/packages/cli/src/commands/handlers/serve.ts
index d6b6938ee3..2b00b297a3 100644
--- a/packages/cli/src/commands/handlers/serve.ts
+++ b/packages/cli/src/commands/handlers/serve.ts
@@ -4,7 +4,7 @@ import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { PermissionSaved } from "@opencode-ai/core/permission/saved"
 import { Global } from "@opencode-ai/core/global"
-import { Context, FileSystem, Layer, Option, Schedule, Schema } from "effect"
+import { Context, FileSystem, Layer, Option, Redacted, Schedule, Schema } from "effect"
 import * as Effect from "effect/Effect"
 import { HttpRouter, HttpServer } from "effect/unstable/http"
 import { createServer } from "node:http"
@@ -15,6 +15,7 @@ import { createOpencodeClient } from "@opencode-ai/sdk/v2/client"
 import { Commands } from "../commands"
 import { Runtime } from "../../framework/runtime"
 import { Service } from "@opencode-ai/client/effect"
+import { Env } from "../../env"
 import { ServiceConfig } from "../../services/service-config"
 import { Updater } from "../../services/updater"
 import { randomBytes, randomUUID } from "crypto"
@@ -26,12 +27,16 @@ export default Runtime.handler(
     if (input.service) yield* Effect.sync(() => process.chdir(Global.Path.home))
     return yield* Effect.scoped(
       Effect.gen(function* () {
-        const standalonePassword = process.env.OPENCODE_SERVER_PASSWORD
+        const standalonePassword = Option.getOrUndefined(yield* Env.serverPassword)
+        // Keep the lease credential out of the environment inherited by any
+        // process this server spawns.
         if (input.stdio) delete process.env.OPENCODE_SERVER_PASSWORD
         const config = input.service ? yield* ServiceConfig.read() : {}
         const password = input.service
           ? yield* ServiceConfig.password()
-          : standalonePassword || randomBytes(32).toString("base64url")
+          : standalonePassword
+            ? Redacted.value(standalonePassword)
+            : randomBytes(32).toString("base64url")
         if (!password) return yield* Effect.fail(new Error("Missing server password"))
         const hostname = Option.getOrUndefined(input.hostname) ?? config.hostname ?? "127.0.0.1"
         const port = Option.isSome(input.port)
diff --git a/packages/cli/src/env.ts b/packages/cli/src/env.ts
new file mode 100644
index 0000000000..914abac644
--- /dev/null
+++ b/packages/cli/src/env.ts
@@ -0,0 +1,18 @@
+import { Config } from "effect"
+
+// Every environment variable the CLI reads, in one place. Consumers yield
+// these instead of touching process.env so the full surface stays visible,
+// typed, and redacted where secret.
+
+// Client-side password for an explicit --server target. The legacy name is
+// still honored; it also remains the variable a standalone child inherits.
+export const password = Config.redacted("OPENCODE_PASSWORD").pipe(
+  Config.orElse(() => Config.redacted("OPENCODE_SERVER_PASSWORD")),
+  Config.option,
+)
+
+// Server-side lease password: set by the standalone spawner for its child,
+// or preset for a manually managed `opencode serve`.
+export const serverPassword = Config.redacted("OPENCODE_SERVER_PASSWORD").pipe(Config.option)
+
+export * as Env from "./env"

From 08293e74a0edd22dfd335ce86b47bcc95bf2acf0 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Fri, 3 Jul 2026 13:41:15 -0400
Subject: [PATCH 15/82] refactor(cli): single password config with legacy
 fallback

---
 packages/cli/src/commands/handlers/default.ts |  2 +-
 packages/cli/src/commands/handlers/serve.ts   |  7 +++++--
 packages/cli/src/env.ts                       | 11 ++++-------
 packages/cli/src/services/standalone.ts       |  4 +++-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/cli/src/commands/handlers/default.ts b/packages/cli/src/commands/handlers/default.ts
index 5521af8fe6..1f8ebe89c4 100644
--- a/packages/cli/src/commands/handlers/default.ts
+++ b/packages/cli/src/commands/handlers/default.ts
@@ -19,7 +19,7 @@ export default Runtime.handler(Commands, (input) =>
       return yield* Effect.fail(new Error("--server and --standalone cannot be combined"))
     const transport = yield* Effect.gen(function* () {
       if (server !== undefined) {
-        const password = Option.getOrUndefined(yield* Env.password)
+        const password = yield* Env.password
         const explicit = {
           url: server,
           headers: password
diff --git a/packages/cli/src/commands/handlers/serve.ts b/packages/cli/src/commands/handlers/serve.ts
index 2b00b297a3..11483189c3 100644
--- a/packages/cli/src/commands/handlers/serve.ts
+++ b/packages/cli/src/commands/handlers/serve.ts
@@ -27,10 +27,13 @@ export default Runtime.handler(
     if (input.service) yield* Effect.sync(() => process.chdir(Global.Path.home))
     return yield* Effect.scoped(
       Effect.gen(function* () {
-        const standalonePassword = Option.getOrUndefined(yield* Env.serverPassword)
+        const standalonePassword = yield* Env.password
         // Keep the lease credential out of the environment inherited by any
         // process this server spawns.
-        if (input.stdio) delete process.env.OPENCODE_SERVER_PASSWORD
+        if (input.stdio) {
+          delete process.env.OPENCODE_PASSWORD
+          delete process.env.OPENCODE_SERVER_PASSWORD
+        }
         const config = input.service ? yield* ServiceConfig.read() : {}
         const password = input.service
           ? yield* ServiceConfig.password()
diff --git a/packages/cli/src/env.ts b/packages/cli/src/env.ts
index 914abac644..6cc76b793f 100644
--- a/packages/cli/src/env.ts
+++ b/packages/cli/src/env.ts
@@ -4,15 +4,12 @@ import { Config } from "effect"
 // these instead of touching process.env so the full surface stays visible,
 // typed, and redacted where secret.
 
-// Client-side password for an explicit --server target. The legacy name is
-// still honored; it also remains the variable a standalone child inherits.
+// The opencode server password: sent by clients connecting to an explicit
+// --server, and adopted by a manually run or standalone server. The legacy
+// name is still honored.
 export const password = Config.redacted("OPENCODE_PASSWORD").pipe(
   Config.orElse(() => Config.redacted("OPENCODE_SERVER_PASSWORD")),
-  Config.option,
+  Config.withDefault(undefined),
 )
 
-// Server-side lease password: set by the standalone spawner for its child,
-// or preset for a manually managed `opencode serve`.
-export const serverPassword = Config.redacted("OPENCODE_SERVER_PASSWORD").pipe(Config.option)
-
 export * as Env from "./env"
diff --git a/packages/cli/src/services/standalone.ts b/packages/cli/src/services/standalone.ts
index b591a5deb1..285a433b55 100644
--- a/packages/cli/src/services/standalone.ts
+++ b/packages/cli/src/services/standalone.ts
@@ -15,7 +15,9 @@ function command(password: string) {
   if (!compiled && entrypoint.length === 0) throw new Error("Failed to resolve CLI entrypoint")
   return ChildProcess.make(process.execPath, [...entrypoint, "serve", "--stdio", "--port", "0"], {
     cwd: process.cwd(),
-    env: { OPENCODE_SERVER_PASSWORD: password },
+    // Explicit entry wins over anything inherited, so a user-exported
+    // OPENCODE_PASSWORD cannot shadow the child's lease credential.
+    env: { OPENCODE_PASSWORD: password },
     extendEnv: true,
     // The server treats EOF on this pipe as the end of its ownership lease.
     // The OS closes it even when the TUI is killed before Effect finalizers run.

From 1b88ff8d5380d707548a06ef5100c993d209ce8f Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Fri, 3 Jul 2026 13:54:13 -0400
Subject: [PATCH 16/82] fix(core): clean up Effect audit patterns (#35174)

---
 bun.lock                                      | 29 +++++++++++-----
 package.json                                  |  2 ++
 packages/core/src/database/path.ts            |  5 ++-
 packages/core/src/filesystem/watcher.ts       |  3 +-
 packages/core/src/models-dev.ts               | 17 ++++++++--
 packages/core/src/plugin/provider/openai.ts   | 34 ++++++++++---------
 .../core/src/plugin/provider/sap-ai-core.ts   | 17 +++++-----
 packages/core/src/project/copy.ts             |  3 +-
 packages/core/src/ripgrep.ts                  |  6 ++--
 packages/core/src/session/projector.ts        |  2 +-
 .../core/src/session/runner/to-llm-message.ts | 15 ++++----
 packages/server/src/handlers/credential.ts    |  6 ++--
 packages/server/src/handlers/fs.ts            |  3 +-
 packages/server/src/handlers/permission.ts    | 12 ++++---
 packages/server/src/handlers/pty.ts           |  3 +-
 packages/server/src/handlers/question.ts      |  6 ++--
 script/ast-grep/no-json-parse-cast.yml        |  6 ++++
 .../no-nested-effect-service-yield.yml        | 11 ++++++
 18 files changed, 118 insertions(+), 62 deletions(-)
 create mode 100644 script/ast-grep/no-json-parse-cast.yml
 create mode 100644 script/ast-grep/no-nested-effect-service-yield.yml

diff --git a/bun.lock b/bun.lock
index 5eca1724f1..9c5bbb1591 100644
--- a/bun.lock
+++ b/bun.lock
@@ -14,6 +14,7 @@
       },
       "devDependencies": {
         "@actions/artifact": "5.0.1",
+        "@ast-grep/cli": "0.44.0",
         "@tsconfig/bun": "catalog:",
         "@types/mime-types": "3.0.1",
         "@typescript/native-preview": "catalog:",
@@ -1236,6 +1237,22 @@
 
     "@anycable/core": ["@anycable/core@0.9.2", "", { "dependencies": { "nanoevents": "^7.0.1" } }, "sha512-x5ZXDcW/N4cxWl93CnbHs/u7qq4793jS2kNPWm+duPrXlrva+ml2ZGT7X9tuOBKzyIHf60zWCdIK7TUgMPAwXA=="],
 
+    "@ast-grep/cli": ["@ast-grep/cli@0.44.0", "", { "dependencies": { "detect-libc": "2.1.2" }, "optionalDependencies": { "@ast-grep/cli-darwin-arm64": "0.44.0", "@ast-grep/cli-darwin-x64": "0.44.0", "@ast-grep/cli-linux-arm64-gnu": "0.44.0", "@ast-grep/cli-linux-x64-gnu": "0.44.0", "@ast-grep/cli-win32-arm64-msvc": "0.44.0", "@ast-grep/cli-win32-ia32-msvc": "0.44.0", "@ast-grep/cli-win32-x64-msvc": "0.44.0" }, "bin": { "sg": "sg", "ast-grep": "ast-grep" } }, "sha512-Jf4PuP7XjzsMa3m9gYxmzV8KyWZc4w1ZzKe/t0+90wWxmSasQJe6AtMkJxHEi98MGgfAF1nWziqjDd0/6EsBjA=="],
+
+    "@ast-grep/cli-darwin-arm64": ["@ast-grep/cli-darwin-arm64@0.44.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-bF7euu/hF/cYg4510z8110vh60rrqfrBdsfRqVGd6xqNSPENu7CJnTVN/Z4Nk5U1NM8YKzUD+dYx1ySUJ0CUNQ=="],
+
+    "@ast-grep/cli-darwin-x64": ["@ast-grep/cli-darwin-x64@0.44.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-0fI9caQGp1dFcmBATNlVytIRdAeYb91v1D2xjMIi1bSX+l8Uj846JUiaimUGBuBZmyFq+BScoWM4RnprEmZMpQ=="],
+
+    "@ast-grep/cli-linux-arm64-gnu": ["@ast-grep/cli-linux-arm64-gnu@0.44.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-JB6EUnqEtGGtyg1GqNquld/++1CvaWD7r84IwwhddX1qx0NmDoHyn2mKd8vnQ24Z0RkV3g7y7foMLakELbGtDw=="],
+
+    "@ast-grep/cli-linux-x64-gnu": ["@ast-grep/cli-linux-x64-gnu@0.44.0", "", { "os": "linux", "cpu": "x64" }, "sha512-rNL0LsI682D9EMzfaGVEtZa1xaqTtGb2I+Zk4ZzidX6u+fF7f79wdqyKahKjXzoIrGkuhkoL3gcyLKAtQd9+qg=="],
+
+    "@ast-grep/cli-win32-arm64-msvc": ["@ast-grep/cli-win32-arm64-msvc@0.44.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-lqD0MhGQAddh2YoV/brKQ6GVcFLmRiTBwIElutwedaUvRCdasTGukFPYuSWk/iI8Kv19xom6s7l+mGuZ7v+xwQ=="],
+
+    "@ast-grep/cli-win32-ia32-msvc": ["@ast-grep/cli-win32-ia32-msvc@0.44.0", "", { "os": "win32", "cpu": "ia32" }, "sha512-ZJrnS+2OkNfwyr6yrN69glP67uybBxDvl9mqZvh1J44vB3OFn9U9c+cVAoZIAo7JD5F4rZNxwyu3gcy4+xuwEA=="],
+
+    "@ast-grep/cli-win32-x64-msvc": ["@ast-grep/cli-win32-x64-msvc@0.44.0", "", { "os": "win32", "cpu": "x64" }, "sha512-OJEo7f95YYaSuS1byUB7ZctbzxoA7/wCoAol+pt6pvfdW/8Wq+L1qU28glwx7dQ0HgTsnPZbWpXQwmZpCBHhZg=="],
+
     "@astrojs/check": ["@astrojs/check@0.9.6", "", { "dependencies": { "@astrojs/language-server": "^2.16.1", "chokidar": "^4.0.1", "kleur": "^4.1.5", "yargs": "^17.7.2" }, "peerDependencies": { "typescript": "^5.0.0" }, "bin": { "astro-check": "bin/astro-check.js" } }, "sha512-jlaEu5SxvSgmfGIFfNgcn5/f+29H61NJzEMfAZ82Xopr4XBchXB1GVlcJsE+elUlsYSbXlptZLX+JMG3b/wZEA=="],
 
     "@astrojs/cloudflare": ["@astrojs/cloudflare@12.6.3", "", { "dependencies": { "@astrojs/internal-helpers": "0.7.1", "@astrojs/underscore-redirects": "1.0.0", "@cloudflare/workers-types": "^4.20250507.0", "tinyglobby": "^0.2.13", "vite": "^6.3.5", "wrangler": "^4.14.1" }, "peerDependencies": { "astro": "^5.0.0" } }, "sha512-xhJptF5tU2k5eo70nIMyL1Udma0CqmUEnGSlGyFflLqSY82CRQI6nWZ/xZt0ZvmXuErUjIx0YYQNfZsz5CNjLQ=="],
@@ -3490,7 +3507,7 @@
 
     "destroy": ["destroy@1.2.0", "", {}, "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="],
 
-    "detect-libc": ["detect-libc@1.0.3", "", { "bin": { "detect-libc": "./bin/detect-libc.js" } }, "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg=="],
+    "detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="],
 
     "detect-node": ["detect-node@2.1.0", "", {}, "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="],
 
@@ -6048,6 +6065,8 @@
 
     "@oxc-resolver/binding-wasm32-wasi/@emnapi/runtime": ["@emnapi/runtime@1.10.0", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA=="],
 
+    "@parcel/watcher/detect-libc": ["detect-libc@1.0.3", "", { "bin": { "detect-libc": "./bin/detect-libc.js" } }, "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg=="],
+
     "@pierre/diffs/@shikijs/transformers": ["@shikijs/transformers@3.20.0", "", { "dependencies": { "@shikijs/core": "3.20.0", "@shikijs/types": "3.20.0" } }, "sha512-PrHHMRr3Q5W1qB/42kJW6laqFyWdhrPF2hNR9qjOm1xcSiAO3hAHo7HaVyHE6pMyevmy3i51O8kuGGXC78uK3g=="],
 
     "@pierre/diffs/diff": ["diff@8.0.3", "", {}, "sha512-qejHi7bcSD4hQAZE0tNAawRK1ZtafHDmMTMkrrIGgSLl7hTnQHmKCeB45xAcbfTqK2zowkM3j3bHt/4b/ARbYQ=="],
@@ -6114,8 +6133,6 @@
 
     "@storybook/csf-plugin/unplugin": ["unplugin@2.3.11", "", { "dependencies": { "@jridgewell/remapping": "^2.3.5", "acorn": "^8.15.0", "picomatch": "^4.0.3", "webpack-virtual-modules": "^0.6.2" } }, "sha512-5uKD0nqiYVzlmCRs01Fhs2BdkEgBS3SAVP6ndrBsuK42iC2+JHyxM05Rm9G8+5mkmRtzMZGY8Ct5+mliZxU/Ww=="],
 
-    "@tailwindcss/oxide/detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="],
-
     "@tailwindcss/oxide-wasm32-wasi/@emnapi/core": ["@emnapi/core@1.10.0", "", { "dependencies": { "@emnapi/wasi-threads": "1.2.1", "tslib": "^2.4.0" }, "bundled": true }, "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw=="],
 
     "@tailwindcss/oxide-wasm32-wasi/@emnapi/runtime": ["@emnapi/runtime@1.10.0", "", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA=="],
@@ -6328,8 +6345,6 @@
 
     "light-my-request/process-warning": ["process-warning@4.0.1", "", {}, "sha512-3c2LzQ3rY9d0hc1emcsHhfT9Jwz0cChib/QN89oME2R451w5fy3f0afAhERFZAwrbDU43wk12d0ORBpDVME50Q=="],
 
-    "lightningcss/detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="],
-
     "matcher/escape-string-regexp": ["escape-string-regexp@4.0.0", "", {}, "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="],
 
     "md-to-react-email/marked": ["marked@7.0.4", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-t8eP0dXRJMtMvBojtkcsA7n48BkauktUKzfkPSCq85ZMTJ0v76Rke4DYz01omYpPTUh4p/f7HePgRo3ebG8+QQ=="],
@@ -6360,8 +6375,6 @@
 
     "node-gyp/undici": ["undici@6.26.0", "", {}, "sha512-4yqz8a3n5HmGTlsbADNtr/dJlhkh/55Rq798G6ibiULcXbDtaLpTl1pvdqcbFfeoj3iSi52lePFM7h9H21cw/A=="],
 
-    "node-gyp-build-optional-packages/detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="],
-
     "npm-run-path/path-key": ["path-key@4.0.0", "", {}, "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ=="],
 
     "nypm/citty": ["citty@0.2.2", "", {}, "sha512-+6vJA3L98yv+IdfKGZHBNiGW5KHn22e/JwID0Strsz8h4S/csAu/OuICwxrg44k5MRiZHWIo8XXuJgQTriRP4w=="],
@@ -6428,8 +6441,6 @@
 
     "serialize-error/type-fest": ["type-fest@0.13.1", "", {}, "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="],
 
-    "sharp/detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="],
-
     "shiki/@shikijs/core": ["@shikijs/core@4.2.0", "", { "dependencies": { "@shikijs/primitive": "4.2.0", "@shikijs/types": "4.2.0", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4", "hast-util-to-html": "^9.0.5" } }, "sha512-Hc87Ab1Ld/vEbZRCbwx344I5v+4RU8CVToUTRkqXL1+TjbuOp9U5Xa0M23V4GEWHxVn+yO5otb+HkQVm3ptWQQ=="],
 
     "shiki/@shikijs/types": ["@shikijs/types@4.2.0", "", { "dependencies": { "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-VT/MKtlpOhEPZloSH3Pb9WCZEBDoQVMa9jedp5UAwmJOar1DVc9DRODAxmYPW9M93IK4ryuqRejFfmlvlVDemw=="],
diff --git a/package.json b/package.json
index 226a86ff2c..0810127669 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "dev:stats": "bun sst shell --stage=production -- bun run --cwd packages/stats/app dev",
     "dev:storybook": "bun --cwd packages/storybook storybook",
     "lint": "oxlint",
+    "lint:effect-patterns": "ast-grep scan --rule script/ast-grep/no-json-parse-cast.yml packages/core/src packages/server/src packages/protocol/src && ast-grep scan --rule script/ast-grep/no-nested-effect-service-yield.yml packages/core/src packages/server/src packages/protocol/src",
     "typecheck": "bun turbo typecheck",
     "upgrade-opentui": "bun run script/upgrade-opentui.ts",
     "postinstall": "bun run --cwd packages/core fix-node-pty",
@@ -95,6 +96,7 @@
   },
   "devDependencies": {
     "@actions/artifact": "5.0.1",
+    "@ast-grep/cli": "0.44.0",
     "@tsconfig/bun": "catalog:",
     "@types/mime-types": "3.0.1",
     "@typescript/native-preview": "catalog:",
diff --git a/packages/core/src/database/path.ts b/packages/core/src/database/path.ts
index 379d5f8aa7..93fd2d5773 100644
--- a/packages/core/src/database/path.ts
+++ b/packages/core/src/database/path.ts
@@ -1,5 +1,6 @@
 import nodePath from "path"
 import { customType } from "drizzle-orm/sqlite-core"
+import { Schema } from "effect"
 import { AbsolutePath } from "../schema"
 
 function storagePath(input: string) {
@@ -74,6 +75,8 @@ export const pathColumn = customType<{
   },
 })
 
+const decodeAbsoluteArray = Schema.decodeUnknownSync(Schema.fromJsonString(Schema.Array(Schema.String)))
+
 export const absoluteArrayColumn = customType<{
   data: AbsolutePath[]
   driverData: string
@@ -86,6 +89,6 @@ export const absoluteArrayColumn = customType<{
     return JSON.stringify(input.map(absolute))
   },
   fromDriver(input) {
-    return (JSON.parse(input) as string[]).map((item) => AbsolutePath.make(toPlatform(absolute(item))))
+    return decodeAbsoluteArray(input).map((item) => AbsolutePath.make(toPlatform(absolute(item))))
   },
 })
diff --git a/packages/core/src/filesystem/watcher.ts b/packages/core/src/filesystem/watcher.ts
index fe7a5b2594..1efc9d6907 100644
--- a/packages/core/src/filesystem/watcher.ts
+++ b/packages/core/src/filesystem/watcher.ts
@@ -113,7 +113,8 @@ const layer = Layer.effect(
       )
     }
 
-    const config = (yield* (yield* Config.Service).entries())
+    const configService = yield* Config.Service
+    const config = (yield* configService.entries())
       .filter((entry): entry is Config.Document => entry.type === "document")
       .flatMap((item) => item.info.watcher?.ignore ?? [])
     yield* Effect.forkScoped(
diff --git a/packages/core/src/models-dev.ts b/packages/core/src/models-dev.ts
index cf2991168a..8a3fb965bf 100644
--- a/packages/core/src/models-dev.ts
+++ b/packages/core/src/models-dev.ts
@@ -47,7 +47,7 @@ const Cost = Schema.Struct({
 const ReasoningOption = Schema.Union([
   Schema.Struct({
     type: Schema.Literal("effort"),
-    values: Schema.Array(Schema.String),
+    values: Schema.Array(Schema.Union([Schema.String, Schema.Null])),
   }),
   Schema.Struct({
     type: Schema.Literal("toggle"),
@@ -125,6 +125,10 @@ export const Provider = Schema.Struct({
 
 export type Provider = Schema.Schema.Type<typeof Provider>
 
+const Providers = Schema.Record(Schema.String, Provider)
+const decodeProviders = Schema.decodeUnknownEffect(Schema.fromJsonString(Providers))
+const decodeProvidersUnknown = Schema.decodeUnknownEffect(Providers)
+
 export const Event = ModelsDev.Event
 
 declare const OPENCODE_MODELS_DEV: Record<string, Provider> | undefined
@@ -176,6 +180,7 @@ const layer = Layer.effect(
     })
 
     const loadFromDisk = fs.readJson(Flag.OPENCODE_MODELS_PATH ?? filepath).pipe(
+      Effect.flatMap(decodeProvidersUnknown),
       Effect.catch((error) => {
         if (
           Flag.OPENCODE_MODELS_PATH === undefined &&
@@ -186,11 +191,17 @@ const layer = Layer.effect(
         }
         return Effect.succeed(undefined)
       }),
-      Effect.map((v) => v as Record<string, Provider> | undefined),
     )
 
     const loadSnapshot = Effect.sync(() =>
       typeof OPENCODE_MODELS_DEV === "undefined" ? undefined : OPENCODE_MODELS_DEV,
+    ).pipe(
+      Effect.flatMap((snapshot) =>
+        snapshot === undefined ? Effect.succeed(undefined) : decodeProvidersUnknown(snapshot),
+      ),
+      Effect.catch((cause) =>
+        Effect.logWarning("bundled models snapshot failed schema decode", { cause }).pipe(Effect.as(undefined)),
+      ),
     )
 
     const fetchAndWrite = Effect.fn("ModelsDev.fetchAndWrite")(function* () {
@@ -221,7 +232,7 @@ const layer = Layer.effect(
           return yield* fetchAndWrite()
         }),
       )
-      return JSON.parse(text) as Record<string, Provider>
+      return yield* decodeProviders(text)
     }).pipe(Effect.withSpan("ModelsDev.populate"), Effect.orDie)
 
     const [cachedGet, invalidate] = yield* Effect.cachedInvalidateWithTTL(populate, Duration.infinity)
diff --git a/packages/core/src/plugin/provider/openai.ts b/packages/core/src/plugin/provider/openai.ts
index 82e2319a1b..e8974195a6 100644
--- a/packages/core/src/plugin/provider/openai.ts
+++ b/packages/core/src/plugin/provider/openai.ts
@@ -1,7 +1,7 @@
 import { createServer } from "node:http"
 import type { IntegrationOAuthMethodRegistration } from "@opencode-ai/plugin/v2/effect/integration"
 import { define } from "@opencode-ai/plugin/v2/effect/plugin"
-import { Deferred, Effect, Semaphore, Stream } from "effect"
+import { Deferred, Effect, Option, Schema, Semaphore, Stream } from "effect"
 import type { Scope } from "effect"
 import { Credential } from "../../credential"
 import { EventV2 } from "../../event"
@@ -32,11 +32,16 @@ type TokenResponse = {
   expires_in?: number
 }
 
-type Claims = {
-  chatgpt_account_id?: string
-  organizations?: Array<{ id: string }>
-  "https://api.openai.com/auth"?: { chatgpt_account_id?: string }
-}
+const Claims = Schema.fromJsonString(
+  Schema.Struct({
+    chatgpt_account_id: Schema.optional(Schema.String),
+    organizations: Schema.optional(Schema.Array(Schema.Struct({ id: Schema.String }))),
+    "https://api.openai.com/auth": Schema.optional(
+      Schema.Struct({ chatgpt_account_id: Schema.optional(Schema.String) }),
+    ),
+  }),
+)
+const decodeClaims = Schema.decodeUnknownOption(Claims)
 
 const browser = {
   integrationID: Integration.ID.make("openai"),
@@ -315,14 +320,11 @@ function extractAccountID(tokens: TokenResponse) {
 function claim(token: string) {
   const part = token.split(".")[1]
   if (!part) return
-  try {
-    const claims = JSON.parse(Buffer.from(part, "base64url").toString()) as Claims
-    return (
-      claims.chatgpt_account_id ??
-      claims["https://api.openai.com/auth"]?.chatgpt_account_id ??
-      claims.organizations?.[0]?.id
-    )
-  } catch {
-    return
-  }
+  const claims = Option.getOrUndefined(decodeClaims(Buffer.from(part, "base64url").toString()))
+  if (!claims) return
+  return (
+    claims.chatgpt_account_id ??
+    claims["https://api.openai.com/auth"]?.chatgpt_account_id ??
+    claims.organizations?.[0]?.id
+  )
 }
diff --git a/packages/core/src/plugin/provider/sap-ai-core.ts b/packages/core/src/plugin/provider/sap-ai-core.ts
index 8c668d8b41..b6c3a540e6 100644
--- a/packages/core/src/plugin/provider/sap-ai-core.ts
+++ b/packages/core/src/plugin/provider/sap-ai-core.ts
@@ -19,17 +19,18 @@ export const SapAICorePlugin = define({
         const installedPath = evt.package.startsWith("file://")
           ? evt.package
           : (yield* npm.add(evt.package).pipe(Effect.orDie)).entrypoint
-        if (!installedPath) throw new Error(`Package ${evt.package} has no import entrypoint`)
+        if (!installedPath) return yield* Effect.die(new Error(`Package ${evt.package} has no import entrypoint`))
 
-        const mod = yield* Effect.promise(async () => {
-          return (await import(
-            installedPath.startsWith("file://") ? installedPath : pathToFileURL(installedPath).href
-          )) as Record<string, (options: any) => any>
-        }).pipe(Effect.orDie)
+        const mod: Record<string, unknown> = yield* Effect.promise(
+          () => import(installedPath.startsWith("file://") ? installedPath : pathToFileURL(installedPath).href),
+        )
         const match = Object.keys(mod).find((name) => name.startsWith("create"))
-        if (!match) throw new Error(`Package ${evt.package} has no provider factory export`)
+        if (!match) return yield* Effect.die(new Error(`Package ${evt.package} has no provider factory export`))
+        const factory = mod[match]
+        if (typeof factory !== "function")
+          return yield* Effect.die(new Error(`Package ${evt.package} provider factory export is not callable`))
 
-        evt.sdk = mod[match](
+        evt.sdk = factory(
           serviceKey
             ? { deploymentId: process.env.AICORE_DEPLOYMENT_ID, resourceGroup: process.env.AICORE_RESOURCE_GROUP }
             : {},
diff --git a/packages/core/src/project/copy.ts b/packages/core/src/project/copy.ts
index 0980ef44f7..9183e26eb9 100644
--- a/packages/core/src/project/copy.ts
+++ b/packages/core/src/project/copy.ts
@@ -202,7 +202,8 @@ const layer = Layer.effect(
       const copyDirectory = yield* canonical(input.directory)
       const stored = yield* directories.get({ projectID: input.projectID, directory: copyDirectory })
       if (!stored?.strategy) return yield* new InvalidDirectoryError({ directory: copyDirectory })
-      yield* (yield* getStrategy(StrategyID.make(stored.strategy))).remove({
+      const strategy = yield* getStrategy(StrategyID.make(stored.strategy))
+      yield* strategy.remove({
         directory: copyDirectory,
         force: input.force,
       })
diff --git a/packages/core/src/ripgrep.ts b/packages/core/src/ripgrep.ts
index ac8ea52d93..7e1056c4d8 100644
--- a/packages/core/src/ripgrep.ts
+++ b/packages/core/src/ripgrep.ts
@@ -35,6 +35,7 @@ const RawMatch = Schema.Struct({
     ),
   }),
 })
+const decodeJsonRecord = Schema.decodeUnknownEffect(Schema.UnknownFromJsonString)
 
 type RawMatchData = (typeof RawMatch.Type)["data"]
 
@@ -232,10 +233,7 @@ const layer = Layer.effect(
           parse: (line) =>
             (Buffer.byteLength(line, "utf8") > MAX_RECORD_BYTES
               ? Effect.fail(failure(`Ripgrep JSON record exceeded ${MAX_RECORD_BYTES} bytes`))
-              : Effect.try({
-                  try: () => JSON.parse(line) as unknown,
-                  catch: (cause) => failure("Invalid ripgrep JSON output", cause),
-                })
+              : decodeJsonRecord(line).pipe(Effect.mapError((cause) => failure("Invalid ripgrep JSON output", cause)))
             ).pipe(
               Effect.flatMap((json) => {
                 if (!json || typeof json !== "object" || !("type" in json) || json.type !== "match")
diff --git a/packages/core/src/session/projector.ts b/packages/core/src/session/projector.ts
index c7145e8dba..5e2d112229 100644
--- a/packages/core/src/session/projector.ts
+++ b/packages/core/src/session/projector.ts
@@ -438,7 +438,7 @@ function insertMessage(db: DatabaseService, event: SessionEvent.DurableEvent, me
 const layer = Layer.effectDiscard(
   Effect.gen(function* () {
     const events = yield* EventV2.Service
-    const { db } = yield* Database.Service
+    const db = (yield* Database.Service).db
     yield* events.project(SessionV1.Event.Created, (event) =>
       Effect.gen(function* () {
         const stored = yield* db
diff --git a/packages/core/src/session/runner/to-llm-message.ts b/packages/core/src/session/runner/to-llm-message.ts
index 8ddd7cce5c..0d9055e480 100644
--- a/packages/core/src/session/runner/to-llm-message.ts
+++ b/packages/core/src/session/runner/to-llm-message.ts
@@ -7,6 +7,7 @@ import {
   type Model,
   type ProviderMetadata,
 } from "@opencode-ai/llm"
+import { Option, Schema } from "effect"
 import { SessionMessage } from "../message"
 import type { FileAttachment } from "../prompt"
 
@@ -18,14 +19,12 @@ const media = (file: FileAttachment): ContentPart => ({
   metadata: file.description === undefined ? undefined : { description: file.description },
 })
 
-const toolInput = (tool: SessionMessage.AssistantTool) => {
-  if (tool.state.status !== "pending") return tool.state.input
-  try {
-    return JSON.parse(tool.state.input) as unknown
-  } catch {
-    return tool.state.input
-  }
-}
+const decodeToolInput = Schema.decodeUnknownOption(Schema.UnknownFromJsonString)
+
+const toolInput = (tool: SessionMessage.AssistantTool) =>
+  tool.state.status === "pending"
+    ? Option.getOrElse(decodeToolInput(tool.state.input), () => tool.state.input)
+    : tool.state.input
 
 const toolCall = (tool: SessionMessage.AssistantTool, providerMetadata: ProviderMetadata | undefined): ContentPart =>
   ToolCallPart.make({
diff --git a/packages/server/src/handlers/credential.ts b/packages/server/src/handlers/credential.ts
index 7e138a5d5a..49e84d49ba 100644
--- a/packages/server/src/handlers/credential.ts
+++ b/packages/server/src/handlers/credential.ts
@@ -8,14 +8,16 @@ export const CredentialHandler = HttpApiBuilder.group(Api, "server.credential",
     .handle(
       "credential.update",
       Effect.fn(function* (ctx) {
-        yield* (yield* Integration.Service).connection.update(ctx.params.credentialID, { label: ctx.payload.label })
+        const integration = yield* Integration.Service
+        yield* integration.connection.update(ctx.params.credentialID, { label: ctx.payload.label })
         return HttpApiSchema.NoContent.make()
       }),
     )
     .handle(
       "credential.remove",
       Effect.fn(function* (ctx) {
-        yield* (yield* Integration.Service).connection.remove(ctx.params.credentialID)
+        const integration = yield* Integration.Service
+        yield* integration.connection.remove(ctx.params.credentialID)
         return HttpApiSchema.NoContent.make()
       }),
     ),
diff --git a/packages/server/src/handlers/fs.ts b/packages/server/src/handlers/fs.ts
index c7d1d43bab..d623f2d7e6 100644
--- a/packages/server/src/handlers/fs.ts
+++ b/packages/server/src/handlers/fs.ts
@@ -11,7 +11,8 @@ export const FileSystemHandler = HttpApiBuilder.group(Api, "server.fs", (handler
     return handlers
       .handleRaw("fs.read", (ctx) =>
         Effect.gen(function* () {
-          const file = yield* (yield* FileSystem.Service).read({
+          const fs = yield* FileSystem.Service
+          const file = yield* fs.read({
             path: RelativePath.make(
               decodeURIComponent(new URL(ctx.request.url, "http://localhost").pathname.slice(13)),
             ),
diff --git a/packages/server/src/handlers/permission.ts b/packages/server/src/handlers/permission.ts
index 0425c14996..cbc49180f6 100644
--- a/packages/server/src/handlers/permission.ts
+++ b/packages/server/src/handlers/permission.ts
@@ -17,7 +17,8 @@ export const PermissionHandler = HttpApiBuilder.group(Api, "server.permission",
       .handle(
         "permission.request.list",
         Effect.fn(function* () {
-          return yield* response((yield* PermissionV2.Service).list())
+          const permission = yield* PermissionV2.Service
+          return yield* response(permission.list())
         }),
       )
       .handle(
@@ -59,7 +60,8 @@ export const PermissionHandler = HttpApiBuilder.group(Api, "server.permission",
       .handle(
         "session.permission.get",
         Effect.fn(function* (ctx) {
-          const request = yield* (yield* PermissionV2.Service).get(ctx.params.requestID)
+          const permission = yield* PermissionV2.Service
+          const request = yield* permission.get(ctx.params.requestID)
           if (!request || request.sessionID !== ctx.params.sessionID) return yield* missingRequest(ctx.params.requestID)
           return { data: request }
         }),
@@ -80,8 +82,9 @@ export const PermissionHandler = HttpApiBuilder.group(Api, "server.permission",
         "permission.saved.list",
         Effect.fn(function* (ctx) {
           const location = yield* Location.Service
+          const saved = yield* PermissionSaved.Service
           return {
-            data: yield* (yield* PermissionSaved.Service).list({
+            data: yield* saved.list({
               projectID: ctx.query.projectID ?? location.project.id,
             }),
           }
@@ -90,7 +93,8 @@ export const PermissionHandler = HttpApiBuilder.group(Api, "server.permission",
       .handle(
         "permission.saved.remove",
         Effect.fn(function* (ctx) {
-          yield* (yield* PermissionSaved.Service).remove(ctx.params.id)
+          const saved = yield* PermissionSaved.Service
+          yield* saved.remove(ctx.params.id)
           return HttpApiSchema.NoContent.make()
         }),
       )
diff --git a/packages/server/src/handlers/pty.ts b/packages/server/src/handlers/pty.ts
index cda2cf43e9..e2c5fcc568 100644
--- a/packages/server/src/handlers/pty.ts
+++ b/packages/server/src/handlers/pty.ts
@@ -32,7 +32,8 @@ export const PtyHandler = HttpApiBuilder.group(Api, "server.pty", (handlers) =>
       .handle(
         "pty.list",
         Effect.fn(function* () {
-          return yield* response((yield* Pty.Service).list())
+          const pty = yield* Pty.Service
+          return yield* response(pty.list())
         }),
       )
       .handle(
diff --git a/packages/server/src/handlers/question.ts b/packages/server/src/handlers/question.ts
index 954afe0df5..d8011dd269 100644
--- a/packages/server/src/handlers/question.ts
+++ b/packages/server/src/handlers/question.ts
@@ -26,13 +26,15 @@ export const QuestionHandler = HttpApiBuilder.group(Api, "server.question", (han
       .handle(
         "question.request.list",
         Effect.fn(function* () {
-          return yield* response((yield* QuestionV2.Service).list())
+          const question = yield* QuestionV2.Service
+          return yield* response(question.list())
         }),
       )
       .handle(
         "session.question.list",
         Effect.fn(function* (ctx) {
-          const requests = yield* (yield* QuestionV2.Service).list()
+          const question = yield* QuestionV2.Service
+          const requests = yield* question.list()
           return { data: requests.filter((request) => request.sessionID === ctx.params.sessionID) }
         }),
       )
diff --git a/script/ast-grep/no-json-parse-cast.yml b/script/ast-grep/no-json-parse-cast.yml
new file mode 100644
index 0000000000..923528d880
--- /dev/null
+++ b/script/ast-grep/no-json-parse-cast.yml
@@ -0,0 +1,6 @@
+id: no-json-parse-cast
+language: TypeScript
+message: Prefer Effect Schema JSON decoding over JSON.parse casts.
+severity: error
+rule:
+  pattern: JSON.parse($INPUT) as $TYPE
diff --git a/script/ast-grep/no-nested-effect-service-yield.yml b/script/ast-grep/no-nested-effect-service-yield.yml
new file mode 100644
index 0000000000..aaa6107a48
--- /dev/null
+++ b/script/ast-grep/no-nested-effect-service-yield.yml
@@ -0,0 +1,11 @@
+id: no-nested-effect-service-yield
+language: TypeScript
+message: Bind Effect services before calling methods instead of nesting service yields.
+severity: error
+rule:
+  any:
+    - pattern: (yield* $SERVICE).$METHOD($$$ARGS)
+    - pattern: (yield* $SERVICE).$PROPERTY.$METHOD($$$ARGS)
+constraints:
+  SERVICE:
+    regex: \.Service$

From 14019015292f19bddd5665cc7bcdae93744e91ad Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Fri, 3 Jul 2026 13:58:26 -0400
Subject: [PATCH 17/82] chore: effect pattern lint infrastructure (#35210)

---
 package.json                                  |  3 +-
 .../cli/src/commands/handlers/debug/agents.ts |  2 +-
 .../cli/src/commands/handlers/mcp/list.ts     |  2 +-
 packages/cli/src/commands/handlers/migrate.ts |  2 +-
 packages/cli/src/commands/handlers/serve.ts   |  5 +-
 .../cli/src/commands/handlers/service/get.ts  |  3 +-
 .../src/commands/handlers/service/restart.ts  |  2 +-
 .../cli/src/commands/handlers/service/set.ts  |  2 +-
 .../src/commands/handlers/service/start.ts    |  2 +-
 .../src/commands/handlers/service/status.ts   |  2 +-
 .../cli/src/commands/handlers/service/stop.ts |  2 +-
 .../src/commands/handlers/service/unset.ts    |  2 +-
 packages/cli/src/framework/runtime.ts         | 21 ++++--
 packages/cli/src/framework/spec.ts            |  2 +-
 packages/cli/src/index.ts                     | 13 ++--
 packages/core/src/account.ts                  |  2 +-
 packages/core/src/config/experimental.ts      | 10 +--
 packages/core/src/cross-spawn-spawner.ts      | 33 ++++-----
 packages/core/src/database/database.ts        |  6 +-
 packages/core/src/database/migration.ts       |  2 +-
 packages/core/src/database/sqlite.bun.ts      | 23 +++---
 packages/core/src/database/sqlite.node.ts     | 23 +++---
 packages/core/src/form.ts                     | 29 +++++---
 packages/core/src/fs-util.ts                  | 14 ++--
 packages/core/src/id/id.ts                    | 10 +--
 packages/core/src/integration.ts              | 11 +--
 packages/core/src/location-services.ts        |  2 +-
 packages/core/src/permission.ts               | 72 +++++++++----------
 packages/core/src/plugin.ts                   |  4 +-
 packages/core/src/plugin/host.ts              |  6 +-
 packages/core/src/plugin/runtime.ts           |  2 +-
 packages/core/src/policy.ts                   | 19 ++---
 packages/core/src/project/sql.ts              |  8 +--
 packages/core/src/pty/pty.bun.ts              |  8 ++-
 packages/core/src/pty/pty.node.ts             |  1 +
 packages/core/src/pty/ticket.ts               |  2 +-
 packages/core/src/session/compaction.ts       | 12 ++--
 .../core/src/session/context-checkpoint.ts    |  4 +-
 packages/core/src/session/execution/local.ts  |  2 +-
 packages/core/src/session/input.ts            |  2 +-
 packages/core/src/session/projector.ts        | 17 +++--
 packages/core/src/session/runner/llm.ts       |  4 +-
 packages/core/src/session/runner/model.ts     |  3 +
 .../src/session/runner/publish-llm-event.ts   | 44 ++++++------
 packages/core/src/session/sql.ts              |  6 +-
 packages/core/src/shell/select.ts             |  6 +-
 packages/core/test/session-runner.test.ts     | 14 ++--
 packages/server/src/auth.ts                   |  9 +--
 packages/server/src/handlers/event.ts         |  2 +-
 packages/server/src/handlers/pty.ts           |  2 +-
 packages/server/src/routes.ts                 |  4 +-
 .../no-drizzle-column-name-snapshot.yml       | 12 ++++
 .../no-effect-die-string-snapshot.yml         | 30 ++++++++
 .../no-import-alias-snapshot.yml              | 42 +++++++++++
 .../no-json-parse-cast-snapshot.yml           |  8 +++
 ...o-nested-effect-service-yield-snapshot.yml | 20 ++++++
 .../__snapshots__/no-star-import-snapshot.yml | 22 ++++++
 .../no-drizzle-column-name-test.yml           | 14 ++++
 .../rule-tests/no-effect-die-string-test.yml  |  7 ++
 .../rule-tests/no-import-alias-test.yml       | 13 ++++
 .../rule-tests/no-json-parse-cast-test.yml    |  6 ++
 .../no-nested-effect-service-yield-test.yml   | 21 ++++++
 .../rule-tests/no-star-import-test.yml        |  8 +++
 .../ast-grep/rules/no-drizzle-column-name.yml | 22 ++++++
 .../ast-grep/rules/no-effect-die-string.yml   | 22 ++++++
 script/ast-grep/rules/no-import-alias.yml     | 14 ++++
 .../{ => rules}/no-json-parse-cast.yml        |  0
 .../no-nested-effect-service-yield.yml        |  0
 script/ast-grep/rules/no-star-import.yml      | 10 +++
 script/ast-grep/sgconfig.yml                  |  4 ++
 70 files changed, 524 insertions(+), 234 deletions(-)
 create mode 100644 script/ast-grep/rule-tests/__snapshots__/no-drizzle-column-name-snapshot.yml
 create mode 100644 script/ast-grep/rule-tests/__snapshots__/no-effect-die-string-snapshot.yml
 create mode 100644 script/ast-grep/rule-tests/__snapshots__/no-import-alias-snapshot.yml
 create mode 100644 script/ast-grep/rule-tests/__snapshots__/no-json-parse-cast-snapshot.yml
 create mode 100644 script/ast-grep/rule-tests/__snapshots__/no-nested-effect-service-yield-snapshot.yml
 create mode 100644 script/ast-grep/rule-tests/__snapshots__/no-star-import-snapshot.yml
 create mode 100644 script/ast-grep/rule-tests/no-drizzle-column-name-test.yml
 create mode 100644 script/ast-grep/rule-tests/no-effect-die-string-test.yml
 create mode 100644 script/ast-grep/rule-tests/no-import-alias-test.yml
 create mode 100644 script/ast-grep/rule-tests/no-json-parse-cast-test.yml
 create mode 100644 script/ast-grep/rule-tests/no-nested-effect-service-yield-test.yml
 create mode 100644 script/ast-grep/rule-tests/no-star-import-test.yml
 create mode 100644 script/ast-grep/rules/no-drizzle-column-name.yml
 create mode 100644 script/ast-grep/rules/no-effect-die-string.yml
 create mode 100644 script/ast-grep/rules/no-import-alias.yml
 rename script/ast-grep/{ => rules}/no-json-parse-cast.yml (100%)
 rename script/ast-grep/{ => rules}/no-nested-effect-service-yield.yml (100%)
 create mode 100644 script/ast-grep/rules/no-star-import.yml
 create mode 100644 script/ast-grep/sgconfig.yml

diff --git a/package.json b/package.json
index 0810127669..9da29ab6ba 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,8 @@
     "dev:stats": "bun sst shell --stage=production -- bun run --cwd packages/stats/app dev",
     "dev:storybook": "bun --cwd packages/storybook storybook",
     "lint": "oxlint",
-    "lint:effect-patterns": "ast-grep scan --rule script/ast-grep/no-json-parse-cast.yml packages/core/src packages/server/src packages/protocol/src && ast-grep scan --rule script/ast-grep/no-nested-effect-service-yield.yml packages/core/src packages/server/src packages/protocol/src",
+    "lint:effect-patterns": "ast-grep scan -c script/ast-grep/sgconfig.yml packages/core/src packages/server/src packages/protocol/src packages/cli/src",
+    "test:lint-rules": "ast-grep test -c script/ast-grep/sgconfig.yml",
     "typecheck": "bun turbo typecheck",
     "upgrade-opentui": "bun run script/upgrade-opentui.ts",
     "postinstall": "bun run --cwd packages/core fix-node-pty",
diff --git a/packages/cli/src/commands/handlers/debug/agents.ts b/packages/cli/src/commands/handlers/debug/agents.ts
index ee241bcc1b..1dbaf4d801 100644
--- a/packages/cli/src/commands/handlers/debug/agents.ts
+++ b/packages/cli/src/commands/handlers/debug/agents.ts
@@ -1,5 +1,5 @@
 import { EOL } from "os"
-import * as Effect from "effect/Effect"
+import { Effect } from "effect"
 import { createOpencodeClient } from "@opencode-ai/sdk/v2/client"
 import { Commands } from "../../commands"
 import { Runtime } from "../../../framework/runtime"
diff --git a/packages/cli/src/commands/handlers/mcp/list.ts b/packages/cli/src/commands/handlers/mcp/list.ts
index 167509fb70..2d38a6aca0 100644
--- a/packages/cli/src/commands/handlers/mcp/list.ts
+++ b/packages/cli/src/commands/handlers/mcp/list.ts
@@ -1,5 +1,5 @@
 import { EOL } from "node:os"
-import * as Effect from "effect/Effect"
+import { Effect } from "effect"
 import { createOpencodeClient, type McpServer } from "@opencode-ai/sdk/v2/client"
 import { Commands } from "../../commands"
 import { Runtime } from "../../../framework/runtime"
diff --git a/packages/cli/src/commands/handlers/migrate.ts b/packages/cli/src/commands/handlers/migrate.ts
index c73c7750df..6ff6939aa1 100644
--- a/packages/cli/src/commands/handlers/migrate.ts
+++ b/packages/cli/src/commands/handlers/migrate.ts
@@ -1,4 +1,4 @@
-import * as Effect from "effect/Effect"
+import { Effect } from "effect"
 import { Commands } from "../commands"
 import { Runtime } from "../../framework/runtime"
 
diff --git a/packages/cli/src/commands/handlers/serve.ts b/packages/cli/src/commands/handlers/serve.ts
index 11483189c3..8a6b1c2ceb 100644
--- a/packages/cli/src/commands/handlers/serve.ts
+++ b/packages/cli/src/commands/handlers/serve.ts
@@ -4,8 +4,7 @@ import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { PermissionSaved } from "@opencode-ai/core/permission/saved"
 import { Global } from "@opencode-ai/core/global"
-import { Context, FileSystem, Layer, Option, Redacted, Schedule, Schema } from "effect"
-import * as Effect from "effect/Effect"
+import { Context, Effect, FileSystem, Layer, Option, Redacted, Schedule, Schema } from "effect"
 import { HttpRouter, HttpServer } from "effect/unstable/http"
 import { createServer } from "node:http"
 import { createRoutes } from "@opencode-ai/server/routes"
@@ -60,7 +59,7 @@ export default Runtime.handler(
         if (!input.service && !input.stdio && !standalonePassword) console.log(`server password ${password}`)
         const updater = yield* Updater.Service
         yield* updater.check().pipe(Effect.schedule(Schedule.spaced("10 minutes")), Effect.forkScoped)
-        return yield* (input.stdio ? waitForStdinClose() : Effect.never)
+        return yield* input.stdio ? waitForStdinClose() : Effect.never
       }).pipe(Effect.annotateLogs({ role: "server" })),
     )
   }),
diff --git a/packages/cli/src/commands/handlers/service/get.ts b/packages/cli/src/commands/handlers/service/get.ts
index 1b85faf6e9..fd4b9af384 100644
--- a/packages/cli/src/commands/handlers/service/get.ts
+++ b/packages/cli/src/commands/handlers/service/get.ts
@@ -1,6 +1,5 @@
 import { EOL } from "os"
-import { Option } from "effect"
-import * as Effect from "effect/Effect"
+import { Effect, Option } from "effect"
 import { Commands } from "../../commands"
 import { Runtime } from "../../../framework/runtime"
 import { ServiceConfig } from "../../../services/service-config"
diff --git a/packages/cli/src/commands/handlers/service/restart.ts b/packages/cli/src/commands/handlers/service/restart.ts
index c78273ed0f..93b8836acd 100644
--- a/packages/cli/src/commands/handlers/service/restart.ts
+++ b/packages/cli/src/commands/handlers/service/restart.ts
@@ -1,5 +1,5 @@
 import { EOL } from "os"
-import * as Effect from "effect/Effect"
+import { Effect } from "effect"
 import { Service } from "@opencode-ai/client/effect"
 import { Commands } from "../../commands"
 import { Runtime } from "../../../framework/runtime"
diff --git a/packages/cli/src/commands/handlers/service/set.ts b/packages/cli/src/commands/handlers/service/set.ts
index 6ecde18d41..f761c02411 100644
--- a/packages/cli/src/commands/handlers/service/set.ts
+++ b/packages/cli/src/commands/handlers/service/set.ts
@@ -1,4 +1,4 @@
-import * as Effect from "effect/Effect"
+import { Effect } from "effect"
 import { Commands } from "../../commands"
 import { Runtime } from "../../../framework/runtime"
 import { ServiceConfig } from "../../../services/service-config"
diff --git a/packages/cli/src/commands/handlers/service/start.ts b/packages/cli/src/commands/handlers/service/start.ts
index a3a7200bf9..602a26ecf1 100644
--- a/packages/cli/src/commands/handlers/service/start.ts
+++ b/packages/cli/src/commands/handlers/service/start.ts
@@ -1,5 +1,5 @@
 import { EOL } from "os"
-import * as Effect from "effect/Effect"
+import { Effect } from "effect"
 import { Service } from "@opencode-ai/client/effect"
 import { Commands } from "../../commands"
 import { Runtime } from "../../../framework/runtime"
diff --git a/packages/cli/src/commands/handlers/service/status.ts b/packages/cli/src/commands/handlers/service/status.ts
index 807d7d749d..bf58968eef 100644
--- a/packages/cli/src/commands/handlers/service/status.ts
+++ b/packages/cli/src/commands/handlers/service/status.ts
@@ -1,5 +1,5 @@
 import { EOL } from "os"
-import * as Effect from "effect/Effect"
+import { Effect } from "effect"
 import { Service } from "@opencode-ai/client/effect"
 import { Commands } from "../../commands"
 import { Runtime } from "../../../framework/runtime"
diff --git a/packages/cli/src/commands/handlers/service/stop.ts b/packages/cli/src/commands/handlers/service/stop.ts
index 53ad3615c3..5bf45ccabc 100644
--- a/packages/cli/src/commands/handlers/service/stop.ts
+++ b/packages/cli/src/commands/handlers/service/stop.ts
@@ -1,4 +1,4 @@
-import * as Effect from "effect/Effect"
+import { Effect } from "effect"
 import { Service } from "@opencode-ai/client/effect"
 import { Commands } from "../../commands"
 import { Runtime } from "../../../framework/runtime"
diff --git a/packages/cli/src/commands/handlers/service/unset.ts b/packages/cli/src/commands/handlers/service/unset.ts
index ef5fdf9330..cc738125d3 100644
--- a/packages/cli/src/commands/handlers/service/unset.ts
+++ b/packages/cli/src/commands/handlers/service/unset.ts
@@ -1,4 +1,4 @@
-import * as Effect from "effect/Effect"
+import { Effect } from "effect"
 import { Commands } from "../../commands"
 import { Runtime } from "../../../framework/runtime"
 import { ServiceConfig } from "../../../services/service-config"
diff --git a/packages/cli/src/framework/runtime.ts b/packages/cli/src/framework/runtime.ts
index 902c89d716..2108da415d 100644
--- a/packages/cli/src/framework/runtime.ts
+++ b/packages/cli/src/framework/runtime.ts
@@ -1,9 +1,8 @@
-import * as Effect from "effect/Effect"
-import * as Command from "effect/unstable/cli/Command"
+import { Effect, FileSystem, Scope } from "effect"
+import { Command } from "effect/unstable/cli"
 import { Spec } from "./spec"
 import { Global } from "@opencode-ai/core/global"
 import { Updater } from "../services/updater"
-import { FileSystem, Scope } from "effect"
 
 export type Input<Value> =
   Value extends Spec.Node<infer _Name, infer Command, infer _Commands>
@@ -12,11 +11,21 @@ export type Input<Value> =
       ? Input
       : never
 
-type RuntimeHandler = (input: unknown) => Effect.Effect<void, unknown, FileSystem.FileSystem | Global.Service | Updater.Service | Scope.Scope>
+type RuntimeHandler = (
+  input: unknown,
+) => Effect.Effect<void, unknown, FileSystem.FileSystem | Global.Service | Updater.Service | Scope.Scope>
 type Loader<Node extends Spec.Any> = () => Promise<{
-  default: (input: Input<Node>) => Effect.Effect<void, any, FileSystem.FileSystem | Global.Service | Updater.Service | Scope.Scope>
+  default: (
+    input: Input<Node>,
+  ) => Effect.Effect<void, any, FileSystem.FileSystem | Global.Service | Updater.Service | Scope.Scope>
 }>
-type ProvidedCommand = Command.Command<string, unknown, unknown, unknown, FileSystem.FileSystem | Global.Service | Updater.Service | Scope.Scope>
+type ProvidedCommand = Command.Command<
+  string,
+  unknown,
+  unknown,
+  unknown,
+  FileSystem.FileSystem | Global.Service | Updater.Service | Scope.Scope
+>
 
 export type Handlers<Node extends Spec.Any> = keyof Node["commands"] extends never
   ? Loader<Node>
diff --git a/packages/cli/src/framework/spec.ts b/packages/cli/src/framework/spec.ts
index 3bb47e5e5e..345a0cfa85 100644
--- a/packages/cli/src/framework/spec.ts
+++ b/packages/cli/src/framework/spec.ts
@@ -1,4 +1,4 @@
-import * as Command from "effect/unstable/cli/Command"
+import { Command } from "effect/unstable/cli"
 
 type Options<Config extends Command.Command.Config, Commands extends ReadonlyArray<Any>> = {
   readonly description?: string
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index 071fd37e1a..e515424183 100755
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -1,10 +1,7 @@
 #!/usr/bin/env bun
 
-import * as NodeRuntime from "@effect/platform-node/NodeRuntime"
-import * as NodeServices from "@effect/platform-node/NodeServices"
-import { NodeFileSystem } from "@effect/platform-node"
-import * as Effect from "effect/Effect"
-import { Layer, Logger, References } from "effect"
+import { NodeFileSystem, NodeRuntime, NodeServices } from "@effect/platform-node"
+import { Effect, Layer, Logger, References } from "effect"
 import { Commands } from "./commands/commands"
 import { Runtime } from "./framework/runtime"
 import { Logging } from "@opencode-ai/core/observability/logging"
@@ -46,7 +43,11 @@ const Handlers = Runtime.handlers(Commands, {
   serve: () => import("./commands/handlers/serve"),
 })
 
-Effect.logInfo("cli starting", { version: InstallationVersion, channel: InstallationChannel, local: InstallationLocal }).pipe(
+Effect.logInfo("cli starting", {
+  version: InstallationVersion,
+  channel: InstallationChannel,
+  local: InstallationLocal,
+}).pipe(
   Effect.flatMap(() => Runtime.run(Commands, Handlers, { version: InstallationVersion })),
   Effect.annotateLogs({ role: "cli" }),
   Effect.provide(Updater.layer),
diff --git a/packages/core/src/account.ts b/packages/core/src/account.ts
index d364d6f344..7e81780e95 100644
--- a/packages/core/src/account.ts
+++ b/packages/core/src/account.ts
@@ -1,7 +1,7 @@
 export * as AccountV2 from "./account"
 
 import { Schema } from "effect"
-import type * as HttpClientError from "effect/unstable/http/HttpClientError"
+import type { HttpClientError } from "effect/unstable/http"
 
 export const ID = Schema.String.pipe(Schema.brand("AccountID"))
 export type ID = Schema.Schema.Type<typeof ID>
diff --git a/packages/core/src/config/experimental.ts b/packages/core/src/config/experimental.ts
index 12a02635db..8b38a225b4 100644
--- a/packages/core/src/config/experimental.ts
+++ b/packages/core/src/config/experimental.ts
@@ -2,17 +2,19 @@ export * as ConfigExperimental from "./experimental"
 
 import { Schema } from "effect"
 import { Catalog } from "../catalog"
-import { Policy as PolicyV2 } from "../policy"
+import { Policy } from "../policy"
 
 // Each core domain exports the policy actions it supports. Adding an action to
 // this union makes it valid in authored config while keeping Policy generic.
 export const PolicyAction = Schema.Union([Catalog.PolicyActions])
 
-export class Policy extends Schema.Class<Policy>("ConfigV2.Experimental.Policy")({
-  ...PolicyV2.Info.fields,
+class PolicyConfig extends Schema.Class<PolicyConfig>("ConfigV2.Experimental.Policy")({
+  ...Policy.Info.fields,
   action: PolicyAction,
 }) {}
 
+export { PolicyConfig as Policy }
+
 export class Experimental extends Schema.Class<Experimental>("ConfigV2.Experimental")({
-  policies: Policy.pipe(Schema.Array, Schema.optional),
+  policies: PolicyConfig.pipe(Schema.Array, Schema.optional),
 }) {}
diff --git a/packages/core/src/cross-spawn-spawner.ts b/packages/core/src/cross-spawn-spawner.ts
index 6ea9022acf..f6a04ffd93 100644
--- a/packages/core/src/cross-spawn-spawner.ts
+++ b/packages/core/src/cross-spawn-spawner.ts
@@ -1,26 +1,17 @@
-import type * as Arr from "effect/Array"
-import { NodeFileSystem, NodeSink, NodeStream } from "@effect/platform-node"
-import * as NodePath from "@effect/platform-node/NodePath"
-import * as Deferred from "effect/Deferred"
-import * as Effect from "effect/Effect"
-import * as Exit from "effect/Exit"
-import * as FileSystem from "effect/FileSystem"
-import * as Layer from "effect/Layer"
-import * as Path from "effect/Path"
-import * as PlatformError from "effect/PlatformError"
-import * as Predicate from "effect/Predicate"
-import type * as Scope from "effect/Scope"
-import * as Sink from "effect/Sink"
-import * as Stream from "effect/Stream"
-import * as ChildProcess from "effect/unstable/process/ChildProcess"
-import type { ChildProcessHandle } from "effect/unstable/process/ChildProcessSpawner"
+import type { NonEmptyReadonlyArray } from "effect/Array"
+import { NodeFileSystem, NodePath, NodeSink, NodeStream } from "@effect/platform-node"
+import { Deferred, Effect, Exit, FileSystem, Layer, Path, PlatformError, Predicate, Sink, Stream } from "effect"
+import type { Scope } from "effect"
+import { ChildProcess } from "effect/unstable/process"
 import {
   ChildProcessSpawner,
   ExitCode,
-  make as makeSpawner,
+  make,
   makeHandle,
   ProcessId,
+  type ChildProcessHandle,
 } from "effect/unstable/process/ChildProcessSpawner"
+// ast-grep-ignore: no-star-import
 import * as NodeChildProcess from "node:child_process"
 import { PassThrough } from "node:stream"
 import launch from "cross-spawn"
@@ -71,7 +62,7 @@ const flatten = (command: ChildProcess.Command) => {
   if (commands.length === 0) throw new Error("flatten produced empty commands array")
   const [head, ...tail] = commands
   return {
-    commands: [head, ...tail] as Arr.NonEmptyReadonlyArray<ChildProcess.StandardCommand>,
+    commands: [head, ...tail] as NonEmptyReadonlyArray<ChildProcess.StandardCommand>,
     opts,
   }
 }
@@ -96,7 +87,7 @@ const toPlatformError = (
 
 type ExitSignal = Deferred.Deferred<readonly [code: number | null, signal: NodeJS.Signals | null]>
 
-export const make = Effect.gen(function* () {
+const makeCrossSpawnSpawner = Effect.gen(function* () {
   const fs = yield* FileSystem.FileSystem
   const path = yield* Path.Path
 
@@ -494,12 +485,12 @@ export const make = Effect.gen(function* () {
     },
   )
 
-  return makeSpawner(spawnCommand)
+  return make(spawnCommand)
 })
 
 const layer: Layer.Layer<ChildProcessSpawner, never, FileSystem.FileSystem | Path.Path> = Layer.effect(
   ChildProcessSpawner,
-  make,
+  makeCrossSpawnSpawner,
 )
 
 export const node = makeGlobalNode({ service: ChildProcessSpawner, layer, deps: [filesystem, path] })
diff --git a/packages/core/src/database/database.ts b/packages/core/src/database/database.ts
index d61adf047e..f3cc8b3f9f 100644
--- a/packages/core/src/database/database.ts
+++ b/packages/core/src/database/database.ts
@@ -1,7 +1,7 @@
 export * as Database from "./database"
 
 import { EffectDrizzleSqlite } from "@opencode-ai/effect-drizzle-sqlite"
-import { layer as sqliteLayer } from "#sqlite"
+import { layer } from "#sqlite"
 import { Context, Effect, Layer } from "effect"
 import { Global } from "../global"
 import { Flag } from "../flag/flag"
@@ -19,7 +19,7 @@ export interface Interface {
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/v2/storage/Database") {}
 
-const layer = Layer.effect(
+const databaseLayer = Layer.effect(
   Service,
   Effect.gen(function* () {
     const db = yield* makeDatabase
@@ -37,7 +37,7 @@ const layer = Layer.effect(
 )
 
 export function layerFromPath(filename: string) {
-  return layer.pipe(Layer.provide(sqliteLayer({ filename })))
+  return databaseLayer.pipe(Layer.provide(layer({ filename })))
 }
 
 export function path() {
diff --git a/packages/core/src/database/migration.ts b/packages/core/src/database/migration.ts
index 90dee8acbf..17bf0a5c44 100644
--- a/packages/core/src/database/migration.ts
+++ b/packages/core/src/database/migration.ts
@@ -22,7 +22,7 @@ export function apply(db: Database) {
         sql`SELECT name FROM sqlite_master WHERE type = 'table' AND name NOT LIKE 'sqlite_%'`,
       )
       if (tables.some((table) => table.name === "session")) return yield* applyOnly(db, migrations)
-      if (tables.length > 0) return yield* Effect.die("Database is not empty and has no session table")
+      if (tables.length > 0) return yield* Effect.die(new Error("Database is not empty and has no session table"))
       yield* db.transaction((tx) =>
         Effect.gen(function* () {
           yield* schema.up(tx)
diff --git a/packages/core/src/database/sqlite.bun.ts b/packages/core/src/database/sqlite.bun.ts
index e15f4c117e..bbb3ad6143 100644
--- a/packages/core/src/database/sqlite.bun.ts
+++ b/packages/core/src/database/sqlite.bun.ts
@@ -1,18 +1,11 @@
 import { Database } from "bun:sqlite"
 import { drizzle } from "drizzle-orm/bun-sqlite"
-import * as Context from "effect/Context"
-import * as Effect from "effect/Effect"
-import * as Fiber from "effect/Fiber"
+import { Context, Effect, Fiber, Layer, Scope, Semaphore, Stream } from "effect"
 import { identity } from "effect/Function"
-import * as Layer from "effect/Layer"
-import * as Scope from "effect/Scope"
-import * as Semaphore from "effect/Semaphore"
-import * as Stream from "effect/Stream"
-import * as Reactivity from "effect/unstable/reactivity/Reactivity"
-import * as Client from "effect/unstable/sql/SqlClient"
+import { Reactivity } from "effect/unstable/reactivity"
+import { SqlClient, Statement } from "effect/unstable/sql"
 import type { Connection } from "effect/unstable/sql/SqlConnection"
 import { classifySqliteError, SqlError } from "effect/unstable/sql/SqlError"
-import * as Statement from "effect/unstable/sql/Statement"
 import { Sqlite } from "./sqlite"
 
 const ATTR_DB_SYSTEM_NAME = "db.system.name"
@@ -20,7 +13,7 @@ const ATTR_DB_SYSTEM_NAME = "db.system.name"
 const TypeId = "~@opencode-ai/core/database/SqliteBun" as const
 type TypeId = typeof TypeId
 
-interface SqliteClient extends Client.SqlClient {
+interface SqliteClient extends SqlClient.SqlClient {
   readonly [TypeId]: TypeId
   readonly config: Config
   readonly export: Effect.Effect<Uint8Array, SqlError>
@@ -57,7 +50,7 @@ const make = (options: Config) =>
       Effect.withFiber<Array<Record<string, unknown>>, SqlError>((fiber) => {
         const statement = native.query(query)
         // @ts-ignore bun-types missing safeIntegers method, fixed in https://github.com/oven-sh/bun/pull/26627
-        statement.safeIntegers(Context.get(fiber.context, Client.SafeIntegers))
+        statement.safeIntegers(Context.get(fiber.context, SqlClient.SafeIntegers))
         try {
           return Effect.succeed((statement.all(...(params as any)) ?? []) as Array<Record<string, unknown>>)
         } catch (cause) {
@@ -73,7 +66,7 @@ const make = (options: Config) =>
       Effect.withFiber<Array<unknown[]>, SqlError>((fiber) => {
         const statement = native.query(query)
         // @ts-ignore bun-types missing safeIntegers method, fixed in https://github.com/oven-sh/bun/pull/26627
-        statement.safeIntegers(Context.get(fiber.context, Client.SafeIntegers))
+        statement.safeIntegers(Context.get(fiber.context, SqlClient.SafeIntegers))
         try {
           return Effect.succeed((statement.values(...(params as any)) ?? []) as Array<unknown[]>)
         } catch (cause) {
@@ -130,7 +123,7 @@ const make = (options: Config) =>
     })
 
     const client = Object.assign(
-      (yield* Client.make({
+      (yield* SqlClient.make({
         acquirer,
         compiler,
         transactionAcquirer,
@@ -166,7 +159,7 @@ const nativeLayer = (config: Config) =>
     }),
   )
 
-const sqliteLayer = (config: Config) => Layer.effect(Client.SqlClient, make(config))
+const sqliteLayer = (config: Config) => Layer.effect(SqlClient.SqlClient, make(config))
 
 const drizzleLayer = Layer.effect(
   Sqlite.Drizzle,
diff --git a/packages/core/src/database/sqlite.node.ts b/packages/core/src/database/sqlite.node.ts
index 6eaecbee26..6fcbd76e4e 100644
--- a/packages/core/src/database/sqlite.node.ts
+++ b/packages/core/src/database/sqlite.node.ts
@@ -1,18 +1,11 @@
 import { DatabaseSync, type SQLInputValue } from "node:sqlite"
 import { drizzle } from "drizzle-orm/node-sqlite"
-import * as Context from "effect/Context"
-import * as Effect from "effect/Effect"
-import * as Fiber from "effect/Fiber"
+import { Context, Effect, Fiber, Layer, Scope, Semaphore, Stream } from "effect"
 import { identity } from "effect/Function"
-import * as Layer from "effect/Layer"
-import * as Scope from "effect/Scope"
-import * as Semaphore from "effect/Semaphore"
-import * as Stream from "effect/Stream"
-import * as Reactivity from "effect/unstable/reactivity/Reactivity"
-import * as Client from "effect/unstable/sql/SqlClient"
+import { Reactivity } from "effect/unstable/reactivity"
+import { SqlClient, Statement } from "effect/unstable/sql"
 import type { Connection } from "effect/unstable/sql/SqlConnection"
 import { classifySqliteError, SqlError } from "effect/unstable/sql/SqlError"
-import * as Statement from "effect/unstable/sql/Statement"
 import { Sqlite } from "./sqlite"
 
 const ATTR_DB_SYSTEM_NAME = "db.system.name"
@@ -20,7 +13,7 @@ const ATTR_DB_SYSTEM_NAME = "db.system.name"
 const TypeId = "~@opencode-ai/core/database/SqliteNode" as const
 type TypeId = typeof TypeId
 
-interface SqliteClient extends Client.SqlClient {
+interface SqliteClient extends SqlClient.SqlClient {
   readonly [TypeId]: TypeId
   readonly config: Config
   readonly loadExtension: (path: string) => Effect.Effect<void, SqlError>
@@ -56,7 +49,7 @@ const make = (options: Config) =>
     const run = (query: string, params: ReadonlyArray<unknown> = []) =>
       Effect.withFiber<Array<Record<string, unknown>>, SqlError>((fiber) => {
         const statement = native.prepare(query)
-        statement.setReadBigInts(Context.get(fiber.context, Client.SafeIntegers))
+        statement.setReadBigInts(Context.get(fiber.context, SqlClient.SafeIntegers))
         try {
           return Effect.succeed(statement.all(...(params as SQLInputValue[])) as Array<Record<string, unknown>>)
         } catch (cause) {
@@ -71,7 +64,7 @@ const make = (options: Config) =>
     const runValues = (query: string, params: ReadonlyArray<unknown> = []) =>
       Effect.withFiber<ReadonlyArray<ReadonlyArray<unknown>>, SqlError>((fiber) => {
         const statement = native.prepare(query)
-        statement.setReadBigInts(Context.get(fiber.context, Client.SafeIntegers))
+        statement.setReadBigInts(Context.get(fiber.context, SqlClient.SafeIntegers))
         statement.setReturnArrays(true)
         try {
           return Effect.succeed(
@@ -124,7 +117,7 @@ const make = (options: Config) =>
     })
 
     const client = Object.assign(
-      (yield* Client.make({
+      (yield* SqlClient.make({
         acquirer,
         compiler,
         transactionAcquirer,
@@ -161,7 +154,7 @@ const nativeLayer = (config: Config) =>
     }),
   )
 
-const sqliteLayer = (config: Config) => Layer.effect(Client.SqlClient, make(config))
+const sqliteLayer = (config: Config) => Layer.effect(SqlClient.SqlClient, make(config))
 
 const drizzleLayer = Layer.effect(
   Sqlite.Drizzle,
diff --git a/packages/core/src/form.ts b/packages/core/src/form.ts
index 47a72ed23a..d49129b3b8 100644
--- a/packages/core/src/form.ts
+++ b/packages/core/src/form.ts
@@ -98,10 +98,14 @@ export const layer = Layer.effect(
   Service,
   Effect.gen(function* () {
     const events = yield* EventV2.Service
-    const forms = yield* Cache.makeWith<ID, Entry>(() => Effect.die("Form cache must be used via set/getSuccess, never get"), {
-      capacity: Number.MAX_SAFE_INTEGER,
-      timeToLive: (exit) => (Exit.isSuccess(exit) && exit.value.state.status === "pending" ? Duration.infinity : RETENTION),
-    })
+    const forms = yield* Cache.makeWith<ID, Entry>(
+      () => Effect.die(new Error("Form cache must be used via set/getSuccess, never get")),
+      {
+        capacity: Number.MAX_SAFE_INTEGER,
+        timeToLive: (exit) =>
+          Exit.isSuccess(exit) && exit.value.state.status === "pending" ? Duration.infinity : RETENTION,
+      },
+    )
 
     const find = Effect.fn("Form.find")(function* (id: ID) {
       return yield* Cache.getSuccess(forms, id).pipe(
@@ -131,7 +135,9 @@ export const layer = Layer.effect(
             ...(input.metadata === undefined ? {} : { metadata: input.metadata }),
           }
           const form: Info =
-            input.mode === "form" ? { ...base, mode: "form", fields: input.fields } : { ...base, mode: "url", url: input.url }
+            input.mode === "form"
+              ? { ...base, mode: "form", fields: input.fields }
+              : { ...base, mode: "url", url: input.url }
           const entry: Entry = {
             form,
             state: { status: "pending" },
@@ -149,7 +155,9 @@ export const layer = Layer.effect(
         Effect.gen(function* () {
           const form = yield* create(input)
           const entry = yield* find(form.id).pipe(Effect.orDie)
-          return yield* restore(Deferred.await(entry.deferred)).pipe(Effect.onInterrupt(() => Effect.ignore(cancel(form.id))))
+          return yield* restore(Deferred.await(entry.deferred)).pipe(
+            Effect.onInterrupt(() => Effect.ignore(cancel(form.id))),
+          )
         }),
       ),
     )
@@ -301,7 +309,8 @@ function validateField(field: Form.Field, value: Form.Value): string | undefined
         return `Form field has invalid pattern: ${field.key}`
       }
     }
-    if (field.format === "email" && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value)) return `Expected email for form field: ${field.key}`
+    if (field.format === "email" && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value))
+      return `Expected email for form field: ${field.key}`
     if (field.format === "uri" && !isUri(value)) return `Expected URI for form field: ${field.key}`
     if (field.format === "date" && !isDate(value)) return `Expected date for form field: ${field.key}`
     if (field.format === "date-time" && !isDateTime(value)) return `Expected date-time for form field: ${field.key}`
@@ -324,8 +333,10 @@ function validateField(field: Form.Field, value: Form.Value): string | undefined
   if (field.type === "multiselect") {
     if (!isStringArray(value)) return `Expected string array for form field: ${field.key}`
     if (field.required && value.length === 0) return `Missing required form field: ${field.key}`
-    if (field.minItems !== undefined && value.length < field.minItems) return `Too few selections for form field: ${field.key}`
-    if (field.maxItems !== undefined && value.length > field.maxItems) return `Too many selections for form field: ${field.key}`
+    if (field.minItems !== undefined && value.length < field.minItems)
+      return `Too few selections for form field: ${field.key}`
+    if (field.maxItems !== undefined && value.length > field.maxItems)
+      return `Too many selections for form field: ${field.key}`
     if (!field.custom && value.some((item) => !field.options.some((option) => option.value === item))) {
       return `Invalid option for form field: ${field.key}`
     }
diff --git a/packages/core/src/fs-util.ts b/packages/core/src/fs-util.ts
index 124ac6d702..b6edce6657 100644
--- a/packages/core/src/fs-util.ts
+++ b/packages/core/src/fs-util.ts
@@ -1,7 +1,7 @@
 import { NodeFileSystem } from "@effect/platform-node"
-import { dirname, isAbsolute, join, relative, resolve as pathResolve, sep } from "path"
+import path, { dirname, isAbsolute, join, relative, sep } from "path"
 import { realpathSync } from "fs"
-import * as NFS from "fs/promises"
+import { readdir } from "fs/promises"
 import { lookup } from "mime-types"
 import { Context, Effect, FileSystem, Layer, Schema } from "effect"
 import type { PlatformError } from "effect/PlatformError"
@@ -78,7 +78,7 @@ export namespace FSUtil {
       const readDirectoryEntries = Effect.fn("FileSystem.readDirectoryEntries")(function* (dirPath: string) {
         return yield* Effect.tryPromise({
           try: async () => {
-            const entries = await NFS.readdir(dirPath, { withFileTypes: true })
+            const entries = await readdir(dirPath, { withFileTypes: true })
             return entries.map(
               (e): DirEntry => ({
                 name: e.name,
@@ -90,8 +90,8 @@ export namespace FSUtil {
         })
       })
 
-      const resolve = Effect.fn("FileSystem.resolve")(function* (path: string) {
-        const resolved = pathResolve(windowsPath(path))
+      const resolve = Effect.fn("FileSystem.resolve")(function* (input: string) {
+        const resolved = path.resolve(windowsPath(input))
         return yield* fs.realPath(resolved).pipe(
           Effect.catchReason("PlatformError", "NotFound", () => Effect.succeed(resolved)),
           Effect.orDie,
@@ -219,7 +219,7 @@ export namespace FSUtil {
 
   export function normalizePath(p: string): string {
     if (process.platform !== "win32") return p
-    const resolved = pathResolve(windowsPath(p))
+    const resolved = path.resolve(windowsPath(p))
     try {
       return realpathSync.native(resolved)
     } catch {
@@ -237,7 +237,7 @@ export namespace FSUtil {
   }
 
   export function resolve(p: string): string {
-    const resolved = pathResolve(windowsPath(p))
+    const resolved = path.resolve(windowsPath(p))
     try {
       return normalizePath(realpathSync(resolved))
     } catch (e: any) {
diff --git a/packages/core/src/id/id.ts b/packages/core/src/id/id.ts
index be1efc446a..b4d6e496ea 100644
--- a/packages/core/src/id/id.ts
+++ b/packages/core/src/id/id.ts
@@ -1,4 +1,4 @@
-import { create as createIdentifier } from "@opencode-ai/schema/identifier"
+import { create } from "@opencode-ai/schema/identifier"
 
 const prefixes = {
   job: "job",
@@ -23,7 +23,7 @@ export function descending(prefix: keyof typeof prefixes, given?: string) {
 
 function generateID(prefix: keyof typeof prefixes, direction: "descending" | "ascending", given?: string): string {
   if (!given) {
-    return create(prefixes[prefix], direction)
+    return createID(prefixes[prefix], direction)
   }
 
   if (!given.startsWith(prefixes[prefix])) {
@@ -32,10 +32,12 @@ function generateID(prefix: keyof typeof prefixes, direction: "descending" | "as
   return given
 }
 
-export function create(prefix: string, direction: "descending" | "ascending", timestamp?: number): string {
-  return prefix + "_" + createIdentifier(direction === "descending", timestamp)
+function createID(prefix: string, direction: "descending" | "ascending", timestamp?: number): string {
+  return prefix + "_" + create(direction === "descending", timestamp)
 }
 
+export { createID as create }
+
 /** Extract timestamp from an ascending ID. Does not work with descending IDs. */
 export function timestamp(id: string): number {
   const prefix = id.split("_")[0]
diff --git a/packages/core/src/integration.ts b/packages/core/src/integration.ts
index 9acbbe93eb..12dad07dd3 100644
--- a/packages/core/src/integration.ts
+++ b/packages/core/src/integration.ts
@@ -406,7 +406,7 @@ const layer = Layer.effect(
             .get()
             .integrations.get(input.integrationID)
             ?.methods.some((method) => method.type === "key")
-          if (!method) return yield* Effect.die(`Key method not found: ${input.integrationID}`)
+          if (!method) return yield* Effect.die(new Error(`Key method not found: ${input.integrationID}`))
           yield* credentials.create({
             integrationID: input.integrationID,
             label: input.label,
@@ -418,7 +418,7 @@ const layer = Layer.effect(
         oauth: Effect.fn("Integration.connection.oauth")(function* (input) {
           const method = state.get().integrations.get(input.integrationID)?.implementations.get(input.methodID)
           if (!method) {
-            return yield* Effect.die(`OAuth method not found: ${input.integrationID}/${input.methodID}`)
+            return yield* Effect.die(new Error(`OAuth method not found: ${input.integrationID}/${input.methodID}`))
           }
           const attemptScope = yield* Scope.fork(scope)
           const authorization = yield* authorize(method.authorize(input.inputs)).pipe(
@@ -475,7 +475,7 @@ const layer = Layer.effect(
       attempt: {
         status: Effect.fn("Integration.attempt.status")(function* (attemptID) {
           const attempt = (yield* SynchronizedRef.get(attempts)).get(attemptID)
-          if (!attempt) return yield* Effect.die(`OAuth attempt not found: ${attemptID}`)
+          if (!attempt) return yield* Effect.die(new Error(`OAuth attempt not found: ${attemptID}`))
           if (attempt.status === "failed") {
             return { status: attempt.status, message: attempt.message ?? "Authorization failed", time: attempt.time }
           }
@@ -488,12 +488,13 @@ const layer = Layer.effect(
             if (match.authorization.mode === "code" && input.code === undefined) return [match, current]
             return [match, new Map(current).set(input.attemptID, { ...match, completing: true })]
           })
-          if (!attempt) return yield* Effect.die(`OAuth attempt not found: ${input.attemptID}`)
+          if (!attempt) return yield* Effect.die(new Error(`OAuth attempt not found: ${input.attemptID}`))
           if (attempt.status !== "pending") return
           if (attempt.authorization.mode === "code" && input.code === undefined) {
             return yield* new CodeRequiredError({ attemptID: input.attemptID })
           }
-          if (attempt.completing) return yield* Effect.die(`OAuth attempt already completing: ${input.attemptID}`)
+          if (attempt.completing)
+            return yield* Effect.die(new Error(`OAuth attempt already completing: ${input.attemptID}`))
           const callback =
             attempt.authorization.mode === "auto"
               ? attempt.authorization.callback
diff --git a/packages/core/src/location-services.ts b/packages/core/src/location-services.ts
index 1af35e61a1..ffb7db2cf1 100644
--- a/packages/core/src/location-services.ts
+++ b/packages/core/src/location-services.ts
@@ -29,7 +29,7 @@ import { QuestionV2 } from "./question"
 import { Shell } from "./shell"
 import { Reference } from "./reference"
 import { ReferenceGuidance } from "./reference/guidance"
-import * as SessionRunnerLLM from "./session/runner/llm"
+import { SessionRunnerLLM } from "./session/runner/llm"
 import { SessionRunnerModel } from "./session/runner/model"
 import { SessionCompaction } from "./session/compaction"
 import { SessionTitle } from "./session/title"
diff --git a/packages/core/src/permission.ts b/packages/core/src/permission.ts
index 791d0a9bcd..3a8dc12b25 100644
--- a/packages/core/src/permission.ts
+++ b/packages/core/src/permission.ts
@@ -1,7 +1,7 @@
 export * as PermissionV2 from "./permission"
 
 import { makeLocationNode } from "./effect/app-node"
-import { Context, Deferred, Effect as EffectRuntime, Layer, Schema } from "effect"
+import { Context, Deferred, Effect, Layer, Schema } from "effect"
 import { Permission } from "@opencode-ai/schema/permission"
 import { EventV2 } from "./event"
 import { Location } from "./location"
@@ -11,7 +11,9 @@ import { SessionStore } from "./session/store"
 import { Wildcard } from "./util/wildcard"
 import { PermissionSaved } from "./permission/saved"
 
-export { Effect, Rule, Ruleset } from "@opencode-ai/schema/permission"
+const PermissionEffect = Permission.Effect
+export { PermissionEffect as Effect }
+export { Rule, Ruleset } from "@opencode-ai/schema/permission"
 const missingAgentPermissions: Permission.Ruleset = [{ action: "*", resource: "*", effect: "deny" }]
 
 export const ID = Permission.ID
@@ -90,12 +92,12 @@ export function merge(...rulesets: Permission.Ruleset[]): Permission.Ruleset {
 }
 
 export interface Interface {
-  readonly ask: (input: AssertInput) => EffectRuntime.Effect<AskResult, SessionV2.NotFoundError>
-  readonly assert: (input: AssertInput) => EffectRuntime.Effect<void, Error | SessionV2.NotFoundError>
-  readonly reply: (input: ReplyInput) => EffectRuntime.Effect<void, NotFoundError>
-  readonly get: (id: ID) => EffectRuntime.Effect<Request | undefined>
-  readonly forSession: (sessionID: SessionV2.ID) => EffectRuntime.Effect<ReadonlyArray<Request>>
-  readonly list: () => EffectRuntime.Effect<ReadonlyArray<Request>>
+  readonly ask: (input: AssertInput) => Effect.Effect<AskResult, SessionV2.NotFoundError>
+  readonly assert: (input: AssertInput) => Effect.Effect<void, Error | SessionV2.NotFoundError>
+  readonly reply: (input: ReplyInput) => Effect.Effect<void, NotFoundError>
+  readonly get: (id: ID) => Effect.Effect<Request | undefined>
+  readonly forSession: (sessionID: SessionV2.ID) => Effect.Effect<ReadonlyArray<Request>>
+  readonly list: () => Effect.Effect<ReadonlyArray<Request>>
 }
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/v2/Permission") {}
@@ -108,7 +110,7 @@ interface Pending {
 
 const layer = Layer.effect(
   Service,
-  EffectRuntime.gen(function* () {
+  Effect.gen(function* () {
     const events = yield* EventV2.Service
     const location = yield* Location.Service
     const agents = yield* AgentV2.Service
@@ -116,28 +118,25 @@ const layer = Layer.effect(
     const saved = yield* PermissionSaved.Service
     const pending = new Map<ID, Pending>()
 
-    yield* EffectRuntime.addFinalizer(() =>
-      EffectRuntime.forEach(pending.values(), (item) => Deferred.fail(item.deferred, new RejectedError()), {
+    yield* Effect.addFinalizer(() =>
+      Effect.forEach(pending.values(), (item) => Deferred.fail(item.deferred, new RejectedError()), {
         discard: true,
       }).pipe(
-        EffectRuntime.ensuring(
-          EffectRuntime.sync(() => {
+        Effect.ensuring(
+          Effect.sync(() => {
             pending.clear()
           }),
         ),
       ),
     )
 
-    const savedRules = EffectRuntime.fnUntraced(function* () {
+    const savedRules = Effect.fnUntraced(function* () {
       return (yield* saved.list({ projectID: location.project.id })).map(
         (item): Permission.Rule => ({ action: item.action, resource: item.resource, effect: "allow" }),
       )
     })
 
-    const configured = EffectRuntime.fn("PermissionV2.configured")(function* (
-      sessionID: SessionV2.ID,
-      agentID?: AgentV2.ID,
-    ) {
+    const configured = Effect.fn("PermissionV2.configured")(function* (sessionID: SessionV2.ID, agentID?: AgentV2.ID) {
       const session = yield* sessions.get(sessionID)
       if (!session) return yield* new SessionV2.NotFoundError({ sessionID })
       const agent = yield* agents.resolve(agentID ?? session.agent)
@@ -152,7 +151,7 @@ const layer = Layer.effect(
       return rules.filter((rule) => Wildcard.match(input.action, rule.action))
     }
 
-    const evaluateInput = EffectRuntime.fnUntraced(function* (input: AssertInput) {
+    const evaluateInput = Effect.fnUntraced(function* (input: AssertInput) {
       const rules = yield* configured(input.sessionID, input.agent)
       if (denied(input, rules)) return { effect: "deny" as const, rules }
       const all = [...rules, ...(yield* savedRules())]
@@ -174,29 +173,30 @@ const layer = Layer.effect(
     }
 
     const create = (request: Request, agent?: AgentV2.ID) =>
-      EffectRuntime.uninterruptible(
-        EffectRuntime.gen(function* () {
+      Effect.uninterruptible(
+        Effect.gen(function* () {
           const deferred = yield* Deferred.make<void, RejectedError | CorrectedError>()
           const item = { request, agent, deferred }
-          if (pending.has(request.id)) return yield* EffectRuntime.die(`Duplicate pending permission ID: ${request.id}`)
+          if (pending.has(request.id))
+            return yield* Effect.die(new Error(`Duplicate pending permission ID: ${request.id}`))
           pending.set(request.id, item)
           yield* events
             .publish(Event.Asked, request)
-            .pipe(EffectRuntime.onError(() => EffectRuntime.sync(() => pending.delete(request.id))))
+            .pipe(Effect.onError(() => Effect.sync(() => pending.delete(request.id))))
           return item
         }),
       )
 
-    const ask = EffectRuntime.fn("PermissionV2.ask")(function* (input: AssertInput) {
+    const ask = Effect.fn("PermissionV2.ask")(function* (input: AssertInput) {
       const result = yield* evaluateInput(input)
       const value = request(input)
       if (result.effect === "ask") yield* create(value, input.agent)
       return { id: value.id, effect: result.effect }
     })
 
-    const assert = EffectRuntime.fn("PermissionV2.assert")((input: AssertInput) =>
-      EffectRuntime.uninterruptibleMask((restore) =>
-        EffectRuntime.gen(function* () {
+    const assert = Effect.fn("PermissionV2.assert")((input: AssertInput) =>
+      Effect.uninterruptibleMask((restore) =>
+        Effect.gen(function* () {
           const result = yield* evaluateInput(input)
           if (result.effect === "deny") {
             return yield* new DeniedError({
@@ -206,8 +206,8 @@ const layer = Layer.effect(
           if (result.effect === "allow") return
           const item = yield* create(request(input), input.agent)
           return yield* restore(Deferred.await(item.deferred)).pipe(
-            EffectRuntime.ensuring(
-              EffectRuntime.sync(() => {
+            Effect.ensuring(
+              Effect.sync(() => {
                 pending.delete(item.request.id)
               }),
             ),
@@ -216,9 +216,9 @@ const layer = Layer.effect(
       ),
     )
 
-    const reply = EffectRuntime.fn("PermissionV2.reply")((input: ReplyInput) =>
-      EffectRuntime.uninterruptible(
-        EffectRuntime.gen(function* () {
+    const reply = Effect.fn("PermissionV2.reply")((input: ReplyInput) =>
+      Effect.uninterruptible(
+        Effect.gen(function* () {
           const existing = pending.get(input.requestID)
           if (!existing) return yield* new NotFoundError({ requestID: input.requestID })
           yield* events.publish(Event.Replied, {
@@ -261,7 +261,7 @@ const layer = Layer.effect(
           for (const [id, item] of pending) {
             const input = { ...item.request }
             const rules = yield* configured(item.request.sessionID, item.agent).pipe(
-              EffectRuntime.catchTag("Session.NotFoundError", () => EffectRuntime.succeed(undefined)),
+              Effect.catchTag("Session.NotFoundError", () => Effect.succeed(undefined)),
             )
             if (!rules) continue
             if (denied(input, rules)) continue
@@ -284,15 +284,15 @@ const layer = Layer.effect(
       ),
     )
 
-    const list = EffectRuntime.fn("PermissionV2.list")(function* () {
+    const list = Effect.fn("PermissionV2.list")(function* () {
       return Array.from(pending.values(), (item) => item.request)
     })
 
-    const get = EffectRuntime.fn("PermissionV2.get")(function* (id: ID) {
+    const get = Effect.fn("PermissionV2.get")(function* (id: ID) {
       return pending.get(id)?.request
     })
 
-    const forSession = EffectRuntime.fn("PermissionV2.forSession")(function* (sessionID: SessionV2.ID) {
+    const forSession = Effect.fn("PermissionV2.forSession")(function* (sessionID: SessionV2.ID) {
       return Array.from(pending.values(), (item) => item.request).filter((request) => request.sessionID === sessionID)
     })
 
diff --git a/packages/core/src/plugin.ts b/packages/core/src/plugin.ts
index dd80647a73..a6ff337c62 100644
--- a/packages/core/src/plugin.ts
+++ b/packages/core/src/plugin.ts
@@ -48,7 +48,7 @@ const layer = Layer.effect(
     let host: Parameters<PluginDefinition["effect"]>[0]
 
     const add = Effect.fn("Plugin.add")(function* (id: ID, effect: PluginDefinition["effect"]) {
-      if (loading.has(id)) return yield* Effect.die(`Plugin load cycle detected for ${id}`)
+      if (loading.has(id)) return yield* Effect.die(new Error(`Plugin load cycle detected for ${id}`))
 
       yield* locks.withLock(id)(
         Effect.sync(() => {
@@ -90,7 +90,7 @@ const layer = Layer.effect(
     })
 
     const remove = Effect.fn("Plugin.remove")(function* (id: ID) {
-      if (loading.has(id)) return yield* Effect.die(`Cannot remove plugin ${id} while it is loading`)
+      if (loading.has(id)) return yield* Effect.die(new Error(`Cannot remove plugin ${id} while it is loading`))
 
       yield* locks.withLock(id)(
         State.batch(
diff --git a/packages/core/src/plugin/host.ts b/packages/core/src/plugin/host.ts
index 00ff7c82af..d07ba6f0fd 100644
--- a/packages/core/src/plugin/host.ts
+++ b/packages/core/src/plugin/host.ts
@@ -1,6 +1,6 @@
 export * as PluginHost from "./host"
 
-import type { PluginContext as Interface } from "@opencode-ai/plugin/v2/effect"
+import type { PluginContext } from "@opencode-ai/plugin/v2/effect"
 import { Effect, Schema } from "effect"
 import { AgentV2 } from "../agent"
 import { AISDK } from "../aisdk"
@@ -40,7 +40,7 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: PluginV2.Int
       workspaceID: location.workspaceID,
       project: location.project,
     })
-  const locationRef = (input?: Parameters<Interface["agent"]["list"]>[0]) =>
+  const locationRef = (input?: Parameters<PluginContext["agent"]["list"]>[0]) =>
     input?.location === undefined
       ? undefined
       : Location.Ref.make({
@@ -305,5 +305,5 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: PluginV2.Int
       command: runtime.session.command,
       interrupt: (input) => runtime.session.interrupt(input.sessionID),
     },
-  } satisfies Interface
+  } satisfies PluginContext
 })
diff --git a/packages/core/src/plugin/runtime.ts b/packages/core/src/plugin/runtime.ts
index cb5b40fd17..e79b498bd4 100644
--- a/packages/core/src/plugin/runtime.ts
+++ b/packages/core/src/plugin/runtime.ts
@@ -31,7 +31,7 @@ export interface Cell {
 
 export const makeCell = (): Cell => ({})
 
-const unavailable = <A, E, R>() => Effect.die("Plugin runtime is unavailable") as Effect.Effect<A, E, R>
+const unavailable = <A, E, R>() => Effect.die(new Error("Plugin runtime is unavailable")) as Effect.Effect<A, E, R>
 const require = <A, E, R>(cell: Cell, f: (runtime: Interface) => Effect.Effect<A, E, R>) =>
   Effect.suspend(() => {
     const runtime = cell.runtime
diff --git a/packages/core/src/policy.ts b/packages/core/src/policy.ts
index 782f182b0e..d1dbb3e37c 100644
--- a/packages/core/src/policy.ts
+++ b/packages/core/src/policy.ts
@@ -1,22 +1,23 @@
 export * as Policy from "./policy"
 
 import { makeLocationNode } from "./effect/app-node"
-import { Context, Effect as EffectRuntime, Layer, Schema } from "effect"
+import { Context, Effect, Layer, Schema } from "effect"
 import { Wildcard } from "./util/wildcard"
 import { Location } from "./location"
 
-export const Effect = Schema.Literals(["allow", "deny"]).annotate({ identifier: "Policy.Effect" })
-export type Effect = typeof Effect.Type
+const PolicyEffect = Schema.Literals(["allow", "deny"]).annotate({ identifier: "Policy.Effect" })
+export { PolicyEffect as Effect }
+export type Effect = typeof PolicyEffect.Type
 
 export class Info extends Schema.Class<Info>("Policy.Info")({
   action: Schema.String,
-  effect: Effect,
+  effect: PolicyEffect,
   resource: Schema.String,
 }) {}
 
 export interface Interface {
-  readonly load: (statements: Info[]) => EffectRuntime.Effect<void>
-  readonly evaluate: (action: string, resource: string, fallback: Effect) => EffectRuntime.Effect<Effect>
+  readonly load: (statements: Info[]) => Effect.Effect<void>
+  readonly evaluate: (action: string, resource: string, fallback: Effect) => Effect.Effect<Effect>
   readonly hasStatements: () => boolean
 }
 
@@ -24,16 +25,16 @@ export class Service extends Context.Service<Service, Interface>()("@opencode/v2
 
 const layer = Layer.effect(
   Service,
-  EffectRuntime.gen(function* () {
+  Effect.gen(function* () {
     let statements: Info[] = []
     yield* Location.Service
 
     return Service.of({
-      load: EffectRuntime.fn("Policy.load")(function* (input) {
+      load: Effect.fn("Policy.load")(function* (input) {
         statements = input
       }),
       hasStatements: () => statements.length > 0,
-      evaluate: EffectRuntime.fn("Policy.evaluate")(function* (action, resource, fallback) {
+      evaluate: Effect.fn("Policy.evaluate")(function* (action, resource, fallback) {
         return (
           statements.findLast(
             (statement) => Wildcard.match(action, statement.action) && Wildcard.match(resource, statement.resource),
diff --git a/packages/core/src/project/sql.ts b/packages/core/src/project/sql.ts
index ab05fdac4a..6a7e5a9d54 100644
--- a/packages/core/src/project/sql.ts
+++ b/packages/core/src/project/sql.ts
@@ -1,11 +1,11 @@
 import { sqliteTable, text, integer, primaryKey } from "drizzle-orm/sqlite-core"
-import * as DatabasePath from "../database/path"
+import { absoluteArrayColumn, absoluteColumn } from "../database/path"
 import { Timestamps } from "../database/schema.sql"
 import { ProjectSchema } from "./schema"
 
 export const ProjectTable = sqliteTable("project", {
   id: text().$type<ProjectSchema.ID>().primaryKey(),
-  worktree: DatabasePath.absoluteColumn().notNull(),
+  worktree: absoluteColumn().notNull(),
   vcs: text(),
   name: text(),
   icon_url: text(),
@@ -13,7 +13,7 @@ export const ProjectTable = sqliteTable("project", {
   icon_color: text(),
   ...Timestamps,
   time_initialized: integer(),
-  sandboxes: DatabasePath.absoluteArrayColumn().notNull(),
+  sandboxes: absoluteArrayColumn().notNull(),
   commands: text({ mode: "json" }).$type<{ start?: string }>(),
 })
 
@@ -24,7 +24,7 @@ export const ProjectDirectoryTable = sqliteTable(
       .$type<ProjectSchema.ID>()
       .notNull()
       .references(() => ProjectTable.id, { onDelete: "cascade" }),
-    directory: DatabasePath.absoluteColumn().notNull(),
+    directory: absoluteColumn().notNull(),
     type: text().$type<"main" | "root" | "git_worktree">(),
     strategy: text(),
     time_created: integer()
diff --git a/packages/core/src/pty/pty.bun.ts b/packages/core/src/pty/pty.bun.ts
index 1f8ce8e454..b92ba4409b 100644
--- a/packages/core/src/pty/pty.bun.ts
+++ b/packages/core/src/pty/pty.bun.ts
@@ -1,10 +1,10 @@
-import { spawn as create } from "bun-pty"
+import { spawn } from "bun-pty"
 import type { Opts, Proc } from "./pty"
 
 export type { Disp, Exit, Opts, Proc } from "./pty"
 
-export function spawn(file: string, args: string[], opts: Opts): Proc {
-  const pty = create(file, args, opts)
+function spawnPty(file: string, args: string[], opts: Opts): Proc {
+  const pty = spawn(file, args, opts)
   return {
     pid: pty.pid,
     onData(listener) {
@@ -24,3 +24,5 @@ export function spawn(file: string, args: string[], opts: Opts): Proc {
     },
   }
 }
+
+export { spawnPty as spawn }
diff --git a/packages/core/src/pty/pty.node.ts b/packages/core/src/pty/pty.node.ts
index 76f415f4cd..cc775c8fda 100644
--- a/packages/core/src/pty/pty.node.ts
+++ b/packages/core/src/pty/pty.node.ts
@@ -1,3 +1,4 @@
+// ast-grep-ignore: no-star-import
 import * as pty from "@lydell/node-pty"
 import type { Opts, Proc } from "./pty"
 
diff --git a/packages/core/src/pty/ticket.ts b/packages/core/src/pty/ticket.ts
index 07838b1415..2f227aa142 100644
--- a/packages/core/src/pty/ticket.ts
+++ b/packages/core/src/pty/ticket.ts
@@ -32,7 +32,7 @@ function matches(record: Scope, input: Scope) {
 
 // Tickets are inserted via Cache.set and removed atomically via invalidateWhen. The lookup is
 // never invoked; it dies if it ever is, which would signal a misuse of the Service interface.
-const noLookup = () => Effect.die("PtyTicket cache must be used via set/invalidateWhen, never get")
+const noLookup = () => Effect.die(new Error("PtyTicket cache must be used via set/invalidateWhen, never get"))
 
 // Visible for tests so the TTL can be shortened. Production uses `layer` with the default TTL.
 export const make = (ttl: Duration.Input = DEFAULT_TTL) =>
diff --git a/packages/core/src/session/compaction.ts b/packages/core/src/session/compaction.ts
index 9ff953be82..fdb81c5045 100644
--- a/packages/core/src/session/compaction.ts
+++ b/packages/core/src/session/compaction.ts
@@ -2,10 +2,8 @@ export * as SessionCompaction from "./compaction"
 
 import { LLM, LLMClient, LLMError, LLMEvent, Message, type LLMRequest, type Model } from "@opencode-ai/llm"
 import { Context, DateTime, Effect, Layer, Stream } from "effect"
-import type { Config } from "../config"
-import { Config as ConfigV2 } from "../config"
-import type { EventV2 } from "../event"
-import { EventV2 as EventV2Service } from "../event"
+import { Config } from "../config"
+import { EventV2 } from "../event"
 import { makeLocationNode } from "../effect/app-node"
 import { llmClient } from "../effect/app-node-platform"
 import { SessionEvent } from "./event"
@@ -311,9 +309,9 @@ const make = (dependencies: Dependencies) => {
 export const layer = Layer.effect(
   Service,
   Effect.gen(function* () {
-    const events = yield* EventV2Service.Service
+    const events = yield* EventV2.Service
     const llm = yield* LLMClient.Service
-    const config = yield* ConfigV2.Service
+    const config = yield* Config.Service
     const models = yield* SessionRunnerModel.Service
     const compaction = make({ events, llm, config: yield* config.entries() })
 
@@ -336,5 +334,5 @@ export const layer = Layer.effect(
 export const node = makeLocationNode({
   service: Service,
   layer,
-  deps: [EventV2Service.node, llmClient, ConfigV2.node, SessionRunnerModel.node],
+  deps: [EventV2.node, llmClient, Config.node, SessionRunnerModel.node],
 })
diff --git a/packages/core/src/session/context-checkpoint.ts b/packages/core/src/session/context-checkpoint.ts
index c2036e726a..8ea1f46513 100644
--- a/packages/core/src/session/context-checkpoint.ts
+++ b/packages/core/src/session/context-checkpoint.ts
@@ -112,7 +112,7 @@ const rewrite = Effect.fnUntraced(function* (
     .returning({ sessionID: SessionContextCheckpointTable.session_id })
     .get()
     .pipe(Effect.orDie)
-  if (!updated) return yield* Effect.die("Context checkpoint not found")
+  if (!updated) return yield* Effect.die(new Error("Context checkpoint not found"))
 })
 
 const advance = Effect.fnUntraced(function* (
@@ -127,5 +127,5 @@ const advance = Effect.fnUntraced(function* (
     .returning({ sessionID: SessionContextCheckpointTable.session_id })
     .get()
     .pipe(Effect.orDie)
-  if (!updated) return yield* Effect.die("Context checkpoint not found")
+  if (!updated) return yield* Effect.die(new Error("Context checkpoint not found"))
 })
diff --git a/packages/core/src/session/execution/local.ts b/packages/core/src/session/execution/local.ts
index 8609162c82..60e32b7c2c 100644
--- a/packages/core/src/session/execution/local.ts
+++ b/packages/core/src/session/execution/local.ts
@@ -19,7 +19,7 @@ const layer = Layer.effect(
     const coordinator = yield* SessionRunCoordinator.make<SessionSchema.ID, SessionRunner.RunError>({
       drain: Effect.fnUntraced(function* (sessionID: SessionSchema.ID, force) {
         const session = yield* store.get(sessionID)
-        if (!session) return yield* Effect.die(`Session not found: ${sessionID}`)
+        if (!session) return yield* Effect.die(new Error(`Session not found: ${sessionID}`))
         return yield* SessionRunner.Service.use((runner) => runner.run({ sessionID, force })).pipe(
           Effect.provide(locations.get(session.location)),
           Effect.tapCause((cause) =>
diff --git a/packages/core/src/session/input.ts b/packages/core/src/session/input.ts
index 2c6aeda460..8d89563543 100644
--- a/packages/core/src/session/input.ts
+++ b/packages/core/src/session/input.ts
@@ -62,7 +62,7 @@ export const admit = Effect.fn("SessionInput.admit")(function* (
     .pipe(
       Effect.flatMap((event) =>
         event.durable === undefined
-          ? Effect.die("Prompt admission event is missing aggregate sequence")
+          ? Effect.die(new Error("Prompt admission event is missing aggregate sequence"))
           : Effect.succeed(
               Admitted.make({
                 admittedSeq: event.durable.seq,
diff --git a/packages/core/src/session/projector.ts b/packages/core/src/session/projector.ts
index 5e2d112229..7b08733684 100644
--- a/packages/core/src/session/projector.ts
+++ b/packages/core/src/session/projector.ts
@@ -157,7 +157,7 @@ const projectFork = Effect.fn("SessionProjector.projectFork")(function* (
     .where(eq(SessionTable.id, event.data.parentID))
     .get()
     .pipe(Effect.orDie)
-  if (!parent) return yield* Effect.die(`Fork parent session not found: ${event.data.parentID}`)
+  if (!parent) return yield* Effect.die(new Error(`Fork parent session not found: ${event.data.parentID}`))
   const boundary = event.data.messageID
     ? yield* db
         .select({ seq: SessionMessageTable.seq })
@@ -172,7 +172,7 @@ const projectFork = Effect.fn("SessionProjector.projectFork")(function* (
         .pipe(Effect.orDie)
     : undefined
   if (event.data.messageID && !boundary)
-    return yield* Effect.die(`Fork boundary message not found: ${event.data.messageID}`)
+    return yield* Effect.die(new Error(`Fork boundary message not found: ${event.data.messageID}`))
   const copied = yield* db
     .select({ seq: SessionMessageTable.seq })
     .from(SessionMessageTable)
@@ -341,7 +341,8 @@ function run(db: DatabaseService, event: MessageEvent) {
     const decodeRow = (row: typeof SessionMessageTable.$inferSelect) =>
       decodeMessage({ ...row.data, id: row.id, type: row.type })
     const updateMessage = (message: SessionMessage.Message) => {
-      if (event.durable === undefined) return Effect.die("Durable Session event is missing aggregate sequence")
+      if (event.durable === undefined)
+        return Effect.die(new Error("Durable Session event is missing aggregate sequence"))
       const encoded = encodeMessage(message)
       const { id, type, ...data } = encoded
       return db
@@ -418,7 +419,7 @@ function run(db: DatabaseService, event: MessageEvent) {
 }
 
 function insertMessage(db: DatabaseService, event: SessionEvent.DurableEvent, message: SessionMessage.Message) {
-  if (event.durable === undefined) return Effect.die("Durable Session event is missing aggregate sequence")
+  if (event.durable === undefined) return Effect.die(new Error("Durable Session event is missing aggregate sequence"))
   const encoded = encodeMessage(message)
   const { id, type, ...data } = encoded
   return db
@@ -585,7 +586,8 @@ const layer = Layer.effectDiscard(
     yield* events.project(SessionEvent.Forked, (event) => projectFork(db, event))
     yield* events.project(SessionEvent.Prompted, (event) =>
       Effect.gen(function* () {
-        if (event.durable === undefined) return yield* Effect.die("Durable Session event is missing aggregate sequence")
+        if (event.durable === undefined)
+          return yield* Effect.die(new Error("Durable Session event is missing aggregate sequence"))
         yield* SessionInput.projectPrompted(db, {
           id: event.data.messageID,
           sessionID: event.data.sessionID,
@@ -599,7 +601,8 @@ const layer = Layer.effectDiscard(
     )
     yield* events.project(SessionEvent.PromptAdmitted, (event) =>
       Effect.gen(function* () {
-        if (event.durable === undefined) return yield* Effect.die("Durable Session event is missing aggregate sequence")
+        if (event.durable === undefined)
+          return yield* Effect.die(new Error("Durable Session event is missing aggregate sequence"))
         yield* SessionInput.projectAdmitted(db, {
           admittedSeq: event.durable.seq,
           id: event.data.messageID,
@@ -670,7 +673,7 @@ const layer = Layer.effectDiscard(
           )
           .get()
           .pipe(Effect.orDie)
-        if (!boundary) return yield* Effect.die(`Revert boundary message not found: ${event.data.messageID}`)
+        if (!boundary) return yield* Effect.die(new Error(`Revert boundary message not found: ${event.data.messageID}`))
         yield* db
           .delete(SessionMessageTable)
           .where(
diff --git a/packages/core/src/session/runner/llm.ts b/packages/core/src/session/runner/llm.ts
index 42e9674904..f76ee10a3f 100644
--- a/packages/core/src/session/runner/llm.ts
+++ b/packages/core/src/session/runner/llm.ts
@@ -1,3 +1,5 @@
+export * as SessionRunnerLLM from "./llm"
+
 import {
   LLM,
   LLMClient,
@@ -119,7 +121,7 @@ const layer = Layer.effect(
     const forkTitle = yield* FiberSet.makeRuntime<never, void, never>()
     const getSession = Effect.fn("SessionRunner.getSession")(function* (sessionID: SessionSchema.ID) {
       const session = yield* store.get(sessionID)
-      if (!session) return yield* Effect.die(`Session not found: ${sessionID}`)
+      if (!session) return yield* Effect.die(new Error(`Session not found: ${sessionID}`))
       return session
     })
 
diff --git a/packages/core/src/session/runner/model.ts b/packages/core/src/session/runner/model.ts
index b21492d18d..2b81e609ea 100644
--- a/packages/core/src/session/runner/model.ts
+++ b/packages/core/src/session/runner/model.ts
@@ -2,8 +2,11 @@ export * as SessionRunnerModel from "./model"
 
 import { makeLocationNode } from "../../effect/app-node"
 import { type Model } from "@opencode-ai/llm"
+// ast-grep-ignore: no-star-import
 import * as AnthropicMessages from "@opencode-ai/llm/protocols/anthropic-messages"
+// ast-grep-ignore: no-star-import
 import * as OpenAICompatibleChat from "@opencode-ai/llm/protocols/openai-compatible-chat"
+// ast-grep-ignore: no-star-import
 import * as OpenAIResponses from "@opencode-ai/llm/protocols/openai-responses"
 import { Auth, type AnyRoute } from "@opencode-ai/llm/route"
 import { Context, Effect, Layer, Schema } from "effect"
diff --git a/packages/core/src/session/runner/publish-llm-event.ts b/packages/core/src/session/runner/publish-llm-event.ts
index 33652a618c..04c6437ef4 100644
--- a/packages/core/src/session/runner/publish-llm-event.ts
+++ b/packages/core/src/session/runner/publish-llm-event.ts
@@ -85,7 +85,7 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
   })
   const currentAssistantMessageID = () =>
     assistantMessageID === undefined
-      ? Effect.die("Tool event before assistant step start")
+      ? Effect.die(new Error("Tool event before assistant step start"))
       : Effect.succeed(assistantMessageID)
 
   const fragments = (
@@ -95,20 +95,20 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
     const chunks = new Map<string, string[]>()
     const start = (id: string) =>
       Effect.suspend(() => {
-        if (chunks.has(id)) return Effect.die(`Duplicate ${name} start: ${id}`)
+        if (chunks.has(id)) return Effect.die(new Error(`Duplicate ${name} start: ${id}`))
         chunks.set(id, [])
         return Effect.void
       })
     const append = (id: string, value: string) =>
       Effect.suspend(() => {
         const current = chunks.get(id)
-        if (!current) return Effect.die(`${name} delta before start: ${id}`)
+        if (!current) return Effect.die(new Error(`${name} delta before start: ${id}`))
         current.push(value)
         return Effect.void
       })
     const end = Effect.fnUntraced(function* (id: string, providerMetadata?: ProviderMetadata) {
       const current = chunks.get(id)
-      if (!current) return yield* Effect.die(`${name} end before start: ${id}`)
+      if (!current) return yield* Effect.die(new Error(`${name} end before start: ${id}`))
       yield* ended(id, current.join(""), providerMetadata)
       chunks.delete(id)
     })
@@ -144,7 +144,7 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
   const toolInput = fragments("tool input", (callID, value) =>
     Effect.gen(function* () {
       const tool = tools.get(callID)
-      if (!tool) return yield* Effect.die(`Tool input end before start: ${callID}`)
+      if (!tool) return yield* Effect.die(new Error(`Tool input end before start: ${callID}`))
       yield* events.publish(SessionEvent.Tool.Input.Ended, {
         sessionID: input.sessionID,
         timestamp: yield* timestamp,
@@ -163,7 +163,7 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
   })
 
   const startToolInput = Effect.fnUntraced(function* (event: { readonly id: string; readonly name: string }) {
-    if (tools.has(event.id)) return yield* Effect.die(`Duplicate tool input start: ${event.id}`)
+    if (tools.has(event.id)) return yield* Effect.die(new Error(`Duplicate tool input start: ${event.id}`))
     const assistantMessageID = yield* startAssistant()
     tools.set(event.id, {
       assistantMessageID,
@@ -185,10 +185,10 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
 
   const endToolInput = Effect.fnUntraced(function* (event: { readonly id: string; readonly name: string }) {
     const tool = tools.get(event.id)
-    if (!tool) return yield* Effect.die(`Tool input end before start: ${event.id}`)
+    if (!tool) return yield* Effect.die(new Error(`Tool input end before start: ${event.id}`))
     if (tool.name !== event.name)
-      return yield* Effect.die(`Tool input name changed for ${event.id}: ${tool.name} -> ${event.name}`)
-    if (tool.inputEnded) return yield* Effect.die(`Duplicate tool input end: ${event.id}`)
+      return yield* Effect.die(new Error(`Tool input name changed for ${event.id}: ${tool.name} -> ${event.name}`))
+    if (tool.inputEnded) return yield* Effect.die(new Error(`Duplicate tool input end: ${event.id}`))
     yield* toolInput.end(event.id)
   })
 
@@ -233,7 +233,7 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
 
   const assistantMessageIDForTool = (callID: string) => {
     const tool = tools.get(callID)
-    return tool ? Effect.succeed(tool.assistantMessageID) : Effect.die(`Unknown tool call: ${callID}`)
+    return tool ? Effect.succeed(tool.assistantMessageID) : Effect.die(new Error(`Unknown tool call: ${callID}`))
   }
 
   const publish = Effect.fn("SessionRunner.publishLLMEvent")(function* (
@@ -293,10 +293,10 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
         return
       case "tool-input-delta": {
         const tool = tools.get(event.id)
-        if (!tool) return yield* Effect.die(`Tool input delta before start: ${event.id}`)
+        if (!tool) return yield* Effect.die(new Error(`Tool input delta before start: ${event.id}`))
         if (tool.name !== event.name)
-          return yield* Effect.die(`Tool input name changed for ${event.id}: ${tool.name} -> ${event.name}`)
-        if (tool.inputEnded) return yield* Effect.die(`Tool input delta after end: ${event.id}`)
+          return yield* Effect.die(new Error(`Tool input name changed for ${event.id}: ${tool.name} -> ${event.name}`))
+        if (tool.inputEnded) return yield* Effect.die(new Error(`Tool input delta after end: ${event.id}`))
         yield* toolInput.append(event.id, event.text)
         yield* events.publish(SessionEvent.Tool.Input.Delta, {
           sessionID: input.sessionID,
@@ -315,8 +315,8 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
         const tool = tools.get(event.id)!
         if (!tool.inputEnded) yield* endToolInput(event)
         if (tool.name !== event.name)
-          return yield* Effect.die(`Tool call name changed for ${event.id}: ${tool.name} -> ${event.name}`)
-        if (tool.called) return yield* Effect.die(`Duplicate tool call: ${event.id}`)
+          return yield* Effect.die(new Error(`Tool call name changed for ${event.id}: ${tool.name} -> ${event.name}`))
+        if (tool.called) return yield* Effect.die(new Error(`Duplicate tool call: ${event.id}`))
         tool.called = true
         tool.providerExecuted = event.providerExecuted === true
         tool.providerMetadata = event.providerMetadata
@@ -336,12 +336,12 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
       }
       case "tool-result": {
         const tool = tools.get(event.id)
-        if (!tool?.called) return yield* Effect.die(`Tool result before call: ${event.id}`)
+        if (!tool?.called) return yield* Effect.die(new Error(`Tool result before call: ${event.id}`))
         if (tool.name !== event.name)
-          return yield* Effect.die(`Tool result name changed for ${event.id}: ${tool.name} -> ${event.name}`)
+          return yield* Effect.die(new Error(`Tool result name changed for ${event.id}: ${tool.name} -> ${event.name}`))
         if (tool.settled) {
           if (event.result.type === "error") return
-          return yield* Effect.die(`Duplicate tool result: ${event.id}`)
+          return yield* Effect.die(new Error(`Duplicate tool result: ${event.id}`))
         }
         tool.settled = true
         const result = settledOutput(event.output, event.result)
@@ -375,10 +375,10 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
       }
       case "tool-error": {
         const tool = tools.get(event.id)
-        if (!tool?.called) return yield* Effect.die(`Tool error before call: ${event.id}`)
+        if (!tool?.called) return yield* Effect.die(new Error(`Tool error before call: ${event.id}`))
         if (tool.name !== event.name)
-          return yield* Effect.die(`Tool error name changed for ${event.id}: ${tool.name} -> ${event.name}`)
-        if (tool.settled) return yield* Effect.die(`Duplicate tool error: ${event.id}`)
+          return yield* Effect.die(new Error(`Tool error name changed for ${event.id}: ${tool.name} -> ${event.name}`))
+        if (tool.settled) return yield* Effect.die(new Error(`Duplicate tool error: ${event.id}`))
         tool.settled = true
         yield* events.publish(SessionEvent.Tool.Failed, {
           sessionID: input.sessionID,
@@ -396,7 +396,7 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
       case "step-finish":
         yield* flush()
         assistantActive = false
-        if (stepSettlement) return yield* Effect.die("Duplicate step finish")
+        if (stepSettlement) return yield* Effect.die(new Error("Duplicate step finish"))
         stepSettlement = { finish: event.reason, tokens: tokens(event.usage) }
         return
       case "finish":
diff --git a/packages/core/src/session/sql.ts b/packages/core/src/session/sql.ts
index d1e923b40f..739d3f1888 100644
--- a/packages/core/src/session/sql.ts
+++ b/packages/core/src/session/sql.ts
@@ -1,5 +1,5 @@
 import { sqliteTable, text, integer, index, primaryKey, real, uniqueIndex } from "drizzle-orm/sqlite-core"
-import * as DatabasePath from "../database/path"
+import { directoryColumn, pathColumn } from "../database/path"
 import { ProjectTable } from "../project/sql"
 import type { SessionMessage } from "./message"
 import type { Prompt } from "./prompt"
@@ -31,8 +31,8 @@ export const SessionTable = sqliteTable(
     workspace_id: text().$type<WorkspaceV2.ID>(),
     parent_id: text().$type<SessionSchema.ID>(),
     slug: text().notNull(),
-    directory: DatabasePath.directoryColumn().notNull(),
-    path: DatabasePath.pathColumn(),
+    directory: directoryColumn().notNull(),
+    path: pathColumn(),
     title: text().notNull(),
     version: text().notNull(),
     share_url: text(),
diff --git a/packages/core/src/shell/select.ts b/packages/core/src/shell/select.ts
index 110697421d..311fb7c9a1 100644
--- a/packages/core/src/shell/select.ts
+++ b/packages/core/src/shell/select.ts
@@ -4,7 +4,7 @@ import path from "path"
 import { spawn, type ChildProcess } from "child_process"
 import { readFile } from "fs/promises"
 import { statSync } from "fs"
-import { setTimeout as sleep } from "node:timers/promises"
+import { setTimeout } from "node:timers/promises"
 import { Flag } from "../flag/flag"
 import { FSUtil } from "../fs-util"
 import { which } from "../util/which"
@@ -46,13 +46,13 @@ export async function killTree(proc: ChildProcess, opts?: { exited?: () => boole
 
   try {
     process.kill(-pid, "SIGTERM")
-    await sleep(SIGKILL_TIMEOUT_MS)
+    await setTimeout(SIGKILL_TIMEOUT_MS)
     if (!opts?.exited?.()) {
       process.kill(-pid, "SIGKILL")
     }
   } catch {
     proc.kill("SIGTERM")
-    await sleep(SIGKILL_TIMEOUT_MS)
+    await setTimeout(SIGKILL_TIMEOUT_MS)
     if (!opts?.exited?.()) {
       proc.kill("SIGKILL")
     }
diff --git a/packages/core/test/session-runner.test.ts b/packages/core/test/session-runner.test.ts
index 45699e7112..4c9446394c 100644
--- a/packages/core/test/session-runner.test.ts
+++ b/packages/core/test/session-runner.test.ts
@@ -3424,9 +3424,10 @@ describe("SessionRunnerLLM", () => {
       streamStarted = undefined
       response = [LLMEvent.textStart({ id: "text-1" }), LLMEvent.textStart({ id: "text-1" })]
 
-      expect(yield* session.resume(sessionID).pipe(Effect.catchDefect(Effect.succeed))).toBe(
-        "Duplicate text start: text-1",
-      )
+      const defect = yield* session.resume(sessionID).pipe(Effect.catchDefect(Effect.succeed))
+      expect(defect).toBeInstanceOf(Error)
+      if (!(defect instanceof Error)) return
+      expect(defect.message).toBe("Duplicate text start: text-1")
     }),
   )
 
@@ -3468,9 +3469,10 @@ describe("SessionRunnerLLM", () => {
       streamStarted = undefined
       response = [LLMEvent.toolInputDelta({ id: "call-1", name: "read", text: "{}" })]
 
-      expect(yield* session.resume(sessionID).pipe(Effect.catchDefect(Effect.succeed))).toBe(
-        "Tool input delta before start: call-1",
-      )
+      const defect = yield* session.resume(sessionID).pipe(Effect.catchDefect(Effect.succeed))
+      expect(defect).toBeInstanceOf(Error)
+      if (!(defect instanceof Error)) return
+      expect(defect.message).toBe("Tool input delta before start: call-1")
     }),
   )
 })
diff --git a/packages/server/src/auth.ts b/packages/server/src/auth.ts
index c71536518d..239eb0d237 100644
--- a/packages/server/src/auth.ts
+++ b/packages/server/src/auth.ts
@@ -1,6 +1,7 @@
 export * as ServerAuth from "./auth"
 
-import { Config as EffectConfig, Context, Effect, Layer, Option, Redacted } from "effect"
+import { Context, Effect, Layer, Option, Redacted } from "effect"
+import { all, option, string, withDefault } from "effect/Config"
 
 export type Credentials = {
   password?: string
@@ -27,9 +28,9 @@ export class Config extends Context.Service<Config, Info>()("@opencode/ServerAut
       this,
       Effect.gen(function* () {
         return Config.of(
-          yield* EffectConfig.all({
-            password: EffectConfig.string("OPENCODE_SERVER_PASSWORD").pipe(EffectConfig.option),
-            username: EffectConfig.string("OPENCODE_SERVER_USERNAME").pipe(EffectConfig.withDefault("opencode")),
+          yield* all({
+            password: string("OPENCODE_SERVER_PASSWORD").pipe(option),
+            username: string("OPENCODE_SERVER_USERNAME").pipe(withDefault("opencode")),
           }),
         )
       }),
diff --git a/packages/server/src/handlers/event.ts b/packages/server/src/handlers/event.ts
index f412137aba..ca9c02620d 100644
--- a/packages/server/src/handlers/event.ts
+++ b/packages/server/src/handlers/event.ts
@@ -1,9 +1,9 @@
 import { EventV2 } from "@opencode-ai/core/event"
 import { OpenCodeEvent } from "@opencode-ai/protocol/groups/event"
 import { Effect, Schema, Stream } from "effect"
+import { Sse } from "effect/unstable/encoding"
 import { HttpServerResponse } from "effect/unstable/http"
 import { HttpApiBuilder } from "effect/unstable/httpapi"
-import * as Sse from "effect/unstable/encoding/Sse"
 import { Api } from "../api"
 
 const subscriberCapacity = 256
diff --git a/packages/server/src/handlers/pty.ts b/packages/server/src/handlers/pty.ts
index e2c5fcc568..7f8a9ea64e 100644
--- a/packages/server/src/handlers/pty.ts
+++ b/packages/server/src/handlers/pty.ts
@@ -5,7 +5,7 @@ import { Location } from "@opencode-ai/core/location"
 import { Effect, Queue } from "effect"
 import { HttpServerRequest, HttpServerResponse } from "effect/unstable/http"
 import { HttpApiBuilder, HttpApiSchema } from "effect/unstable/httpapi"
-import * as Socket from "effect/unstable/socket/Socket"
+import { Socket } from "effect/unstable/socket"
 import { Api } from "../api"
 import { CorsConfig, isAllowedRequestOrigin } from "../cors"
 import { ForbiddenError, PtyNotFoundError } from "@opencode-ai/protocol/errors"
diff --git a/packages/server/src/routes.ts b/packages/server/src/routes.ts
index 30c3d961b7..db69ba6c7f 100644
--- a/packages/server/src/routes.ts
+++ b/packages/server/src/routes.ts
@@ -23,7 +23,7 @@ import { handlers } from "./handlers"
 import { authorizationLayer } from "./middleware/authorization"
 import { schemaErrorLayer } from "./middleware/schema-error"
 import { PtyEnvironment } from "./pty-environment"
-import { layer as locationLayer } from "./location"
+import { layer } from "./location"
 import { formLocationLayer } from "./middleware/form-location"
 import { sessionLocationLayer } from "./middleware/session-location"
 
@@ -82,7 +82,7 @@ function makeRoutes<AuthError, AuthServices>(
     Layer.provide(handlers),
     Layer.provide(formLocationLayer),
     Layer.provide(sessionLocationLayer),
-    Layer.provide(locationLayer),
+    Layer.provide(layer),
     Layer.provide(authorizationLayer),
     Layer.provide(schemaErrorLayer),
     Layer.provide(auth),
diff --git a/script/ast-grep/rule-tests/__snapshots__/no-drizzle-column-name-snapshot.yml b/script/ast-grep/rule-tests/__snapshots__/no-drizzle-column-name-snapshot.yml
new file mode 100644
index 0000000000..aae0c580ee
--- /dev/null
+++ b/script/ast-grep/rule-tests/__snapshots__/no-drizzle-column-name-snapshot.yml
@@ -0,0 +1,12 @@
+id: no-drizzle-column-name
+snapshots:
+  ? |
+    const table = sqliteTable("session", {
+      projectID: text("project_id").notNull(),
+      createdAt: integer("time_created").notNull(),
+    })
+  : labels:
+    - source: text("project_id")
+      style: primary
+      start: 52
+      end: 70
diff --git a/script/ast-grep/rule-tests/__snapshots__/no-effect-die-string-snapshot.yml b/script/ast-grep/rule-tests/__snapshots__/no-effect-die-string-snapshot.yml
new file mode 100644
index 0000000000..a1bb464164
--- /dev/null
+++ b/script/ast-grep/rule-tests/__snapshots__/no-effect-die-string-snapshot.yml
@@ -0,0 +1,30 @@
+id: no-effect-die-string
+snapshots:
+  Effect.die("boom"):
+    labels:
+    - source: Effect.die("boom")
+      style: primary
+      start: 0
+      end: 18
+    - source: '"boom"'
+      style: secondary
+      start: 11
+      end: 17
+    - source: ("boom")
+      style: secondary
+      start: 10
+      end: 18
+  Effect.die(`boom ${value}`):
+    labels:
+    - source: Effect.die(`boom ${value}`)
+      style: primary
+      start: 0
+      end: 27
+    - source: '`boom ${value}`'
+      style: secondary
+      start: 11
+      end: 26
+    - source: (`boom ${value}`)
+      style: secondary
+      start: 10
+      end: 27
diff --git a/script/ast-grep/rule-tests/__snapshots__/no-import-alias-snapshot.yml b/script/ast-grep/rule-tests/__snapshots__/no-import-alias-snapshot.yml
new file mode 100644
index 0000000000..6336c0bd01
--- /dev/null
+++ b/script/ast-grep/rule-tests/__snapshots__/no-import-alias-snapshot.yml
@@ -0,0 +1,42 @@
+id: no-import-alias
+snapshots:
+  import { baz, foo as bar } from "./foo":
+    labels:
+    - source: foo as bar
+      style: primary
+      start: 14
+      end: 24
+    - source: bar
+      style: secondary
+      start: 21
+      end: 24
+  import { foo as bar } from "./foo":
+    labels:
+    - source: foo as bar
+      style: primary
+      start: 9
+      end: 19
+    - source: bar
+      style: secondary
+      start: 16
+      end: 19
+  import { foo as bar, baz } from "./foo":
+    labels:
+    - source: foo as bar
+      style: primary
+      start: 9
+      end: 19
+    - source: bar
+      style: secondary
+      start: 16
+      end: 19
+  import { type Foo as Bar, baz } from "./foo":
+    labels:
+    - source: type Foo as Bar
+      style: primary
+      start: 9
+      end: 24
+    - source: Bar
+      style: secondary
+      start: 21
+      end: 24
diff --git a/script/ast-grep/rule-tests/__snapshots__/no-json-parse-cast-snapshot.yml b/script/ast-grep/rule-tests/__snapshots__/no-json-parse-cast-snapshot.yml
new file mode 100644
index 0000000000..0aa2a274ea
--- /dev/null
+++ b/script/ast-grep/rule-tests/__snapshots__/no-json-parse-cast-snapshot.yml
@@ -0,0 +1,8 @@
+id: no-json-parse-cast
+snapshots:
+  const value = JSON.parse(input) as Record<string, unknown>:
+    labels:
+    - source: JSON.parse(input) as Record<string, unknown>
+      style: primary
+      start: 14
+      end: 58
diff --git a/script/ast-grep/rule-tests/__snapshots__/no-nested-effect-service-yield-snapshot.yml b/script/ast-grep/rule-tests/__snapshots__/no-nested-effect-service-yield-snapshot.yml
new file mode 100644
index 0000000000..30619694f8
--- /dev/null
+++ b/script/ast-grep/rule-tests/__snapshots__/no-nested-effect-service-yield-snapshot.yml
@@ -0,0 +1,20 @@
+id: no-nested-effect-service-yield
+snapshots:
+  ? |
+    Effect.gen(function* () {
+      yield* (yield* Foo.Service).client.run()
+    })
+  : labels:
+    - source: (yield* Foo.Service).client.run()
+      style: primary
+      start: 35
+      end: 68
+  ? |
+    Effect.gen(function* () {
+      yield* (yield* Foo.Service).run()
+    })
+  : labels:
+    - source: (yield* Foo.Service).run()
+      style: primary
+      start: 35
+      end: 61
diff --git a/script/ast-grep/rule-tests/__snapshots__/no-star-import-snapshot.yml b/script/ast-grep/rule-tests/__snapshots__/no-star-import-snapshot.yml
new file mode 100644
index 0000000000..dab38e82f6
--- /dev/null
+++ b/script/ast-grep/rule-tests/__snapshots__/no-star-import-snapshot.yml
@@ -0,0 +1,22 @@
+id: no-star-import
+snapshots:
+  import * as Foo from "./foo":
+    labels:
+    - source: '* as Foo'
+      style: primary
+      start: 7
+      end: 15
+    - source: import * as Foo from "./foo"
+      style: secondary
+      start: 0
+      end: 28
+  import type * as Foo from "./foo":
+    labels:
+    - source: '* as Foo'
+      style: primary
+      start: 12
+      end: 20
+    - source: import type * as Foo from "./foo"
+      style: secondary
+      start: 0
+      end: 33
diff --git a/script/ast-grep/rule-tests/no-drizzle-column-name-test.yml b/script/ast-grep/rule-tests/no-drizzle-column-name-test.yml
new file mode 100644
index 0000000000..00e1a7bb28
--- /dev/null
+++ b/script/ast-grep/rule-tests/no-drizzle-column-name-test.yml
@@ -0,0 +1,14 @@
+id: no-drizzle-column-name
+valid:
+  - |
+    const table = sqliteTable("session", {
+      project_id: text().notNull(),
+      time_created: integer().notNull(),
+      payload: text({ mode: "json" }),
+    })
+invalid:
+  - |
+    const table = sqliteTable("session", {
+      projectID: text("project_id").notNull(),
+      createdAt: integer("time_created").notNull(),
+    })
diff --git a/script/ast-grep/rule-tests/no-effect-die-string-test.yml b/script/ast-grep/rule-tests/no-effect-die-string-test.yml
new file mode 100644
index 0000000000..4ca9e737c0
--- /dev/null
+++ b/script/ast-grep/rule-tests/no-effect-die-string-test.yml
@@ -0,0 +1,7 @@
+id: no-effect-die-string
+valid:
+  - Effect.die(new Error("boom"))
+  - Effect.fail("boom")
+invalid:
+  - Effect.die("boom")
+  - Effect.die(`boom ${value}`)
diff --git a/script/ast-grep/rule-tests/no-import-alias-test.yml b/script/ast-grep/rule-tests/no-import-alias-test.yml
new file mode 100644
index 0000000000..7c3ab9235b
--- /dev/null
+++ b/script/ast-grep/rule-tests/no-import-alias-test.yml
@@ -0,0 +1,13 @@
+id: no-import-alias
+valid:
+  - import { foo } from "./foo"
+  - import type { Foo } from "./foo"
+  - import foo from "./foo"
+  - export { foo as bar } from "./foo"
+  - import type { Plugin as EffectPlugin } from "./foo"
+  - import type { Foo as Bar, Baz } from "./foo"
+invalid:
+  - import { foo as bar } from "./foo"
+  - import { baz, foo as bar } from "./foo"
+  - import { foo as bar, baz } from "./foo"
+  - import { type Foo as Bar, baz } from "./foo"
diff --git a/script/ast-grep/rule-tests/no-json-parse-cast-test.yml b/script/ast-grep/rule-tests/no-json-parse-cast-test.yml
new file mode 100644
index 0000000000..ee44819ce8
--- /dev/null
+++ b/script/ast-grep/rule-tests/no-json-parse-cast-test.yml
@@ -0,0 +1,6 @@
+id: no-json-parse-cast
+valid:
+  - const value = JSON.parse(input)
+  - const value = Schema.decodeUnknownOption(Schema.UnknownFromJsonString)(input)
+invalid:
+  - const value = JSON.parse(input) as Record<string, unknown>
diff --git a/script/ast-grep/rule-tests/no-nested-effect-service-yield-test.yml b/script/ast-grep/rule-tests/no-nested-effect-service-yield-test.yml
new file mode 100644
index 0000000000..e126f2d68a
--- /dev/null
+++ b/script/ast-grep/rule-tests/no-nested-effect-service-yield-test.yml
@@ -0,0 +1,21 @@
+id: no-nested-effect-service-yield
+valid:
+  - |
+    Effect.gen(function* () {
+      const service = yield* Foo.Service
+      yield* service.run()
+    })
+  - |
+    Effect.gen(function* () {
+      const db = (yield* Database.Service).db
+      yield* db.run()
+    })
+invalid:
+  - |
+    Effect.gen(function* () {
+      yield* (yield* Foo.Service).run()
+    })
+  - |
+    Effect.gen(function* () {
+      yield* (yield* Foo.Service).client.run()
+    })
diff --git a/script/ast-grep/rule-tests/no-star-import-test.yml b/script/ast-grep/rule-tests/no-star-import-test.yml
new file mode 100644
index 0000000000..6006f02140
--- /dev/null
+++ b/script/ast-grep/rule-tests/no-star-import-test.yml
@@ -0,0 +1,8 @@
+id: no-star-import
+valid:
+  - import { Foo } from "./foo"
+  - import Foo from "./foo"
+  - export * as Foo from "./foo"
+invalid:
+  - import * as Foo from "./foo"
+  - import type * as Foo from "./foo"
diff --git a/script/ast-grep/rules/no-drizzle-column-name.yml b/script/ast-grep/rules/no-drizzle-column-name.yml
new file mode 100644
index 0000000000..5b798b81ab
--- /dev/null
+++ b/script/ast-grep/rules/no-drizzle-column-name.yml
@@ -0,0 +1,22 @@
+id: no-drizzle-column-name
+language: TypeScript
+message: Use snake_case object keys instead of explicit drizzle column names.
+severity: error
+files:
+  - packages/core/src/**/sql.ts
+  - packages/core/src/**/*.sql.ts
+rule:
+  any:
+    - pattern: text($NAME)
+    - pattern: text($NAME, $$$ARGS)
+    - pattern: integer($NAME)
+    - pattern: integer($NAME, $$$ARGS)
+    - pattern: blob($NAME)
+    - pattern: blob($NAME, $$$ARGS)
+    - pattern: real($NAME)
+    - pattern: real($NAME, $$$ARGS)
+    - pattern: numeric($NAME)
+    - pattern: numeric($NAME, $$$ARGS)
+constraints:
+  NAME:
+    kind: string
diff --git a/script/ast-grep/rules/no-effect-die-string.yml b/script/ast-grep/rules/no-effect-die-string.yml
new file mode 100644
index 0000000000..77265afb29
--- /dev/null
+++ b/script/ast-grep/rules/no-effect-die-string.yml
@@ -0,0 +1,22 @@
+id: no-effect-die-string
+language: TypeScript
+message: die with `new Error(...)`.
+severity: error
+rule:
+  any:
+    - all:
+        - pattern: Effect.die($MESSAGE)
+        - has:
+            field: arguments
+            all:
+              - kind: arguments
+              - has:
+                  kind: string
+    - all:
+        - pattern: Effect.die($MESSAGE)
+        - has:
+            field: arguments
+            all:
+              - kind: arguments
+              - has:
+                  kind: template_string
diff --git a/script/ast-grep/rules/no-import-alias.yml b/script/ast-grep/rules/no-import-alias.yml
new file mode 100644
index 0000000000..1c6c4c5298
--- /dev/null
+++ b/script/ast-grep/rules/no-import-alias.yml
@@ -0,0 +1,14 @@
+id: no-import-alias
+language: TypeScript
+message: Do not alias value imports. For type name collisions, alias inside a dedicated `import type` statement.
+severity: error
+rule:
+  all:
+    - kind: import_specifier
+    - has:
+        field: alias
+        kind: identifier
+    - not:
+        inside:
+          pattern: import type { $$$SPECS } from "$MOD"
+          stopBy: end
diff --git a/script/ast-grep/no-json-parse-cast.yml b/script/ast-grep/rules/no-json-parse-cast.yml
similarity index 100%
rename from script/ast-grep/no-json-parse-cast.yml
rename to script/ast-grep/rules/no-json-parse-cast.yml
diff --git a/script/ast-grep/no-nested-effect-service-yield.yml b/script/ast-grep/rules/no-nested-effect-service-yield.yml
similarity index 100%
rename from script/ast-grep/no-nested-effect-service-yield.yml
rename to script/ast-grep/rules/no-nested-effect-service-yield.yml
diff --git a/script/ast-grep/rules/no-star-import.yml b/script/ast-grep/rules/no-star-import.yml
new file mode 100644
index 0000000000..e804223108
--- /dev/null
+++ b/script/ast-grep/rules/no-star-import.yml
@@ -0,0 +1,10 @@
+id: no-star-import
+language: TypeScript
+message: Do not use star imports.
+severity: error
+rule:
+  all:
+    - kind: namespace_import
+    - inside:
+        kind: import_statement
+        stopBy: end
diff --git a/script/ast-grep/sgconfig.yml b/script/ast-grep/sgconfig.yml
new file mode 100644
index 0000000000..098ecb2af4
--- /dev/null
+++ b/script/ast-grep/sgconfig.yml
@@ -0,0 +1,4 @@
+ruleDirs:
+  - rules
+testConfigs:
+  - testDir: rule-tests

From 2ff19171dcc733e31f8aa312b7743251cba7fd6b Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Fri, 3 Jul 2026 14:01:00 -0400
Subject: [PATCH 18/82] feat(tui): reload command restarts the service

---
 packages/cli/src/commands/handlers/default.ts | 20 +++++++++++++++-
 packages/cli/src/tui.ts                       |  8 ++++++-
 packages/tui/src/app.tsx                      | 23 ++++++++++++++++++-
 packages/tui/src/context/sdk.tsx              |  3 +++
 4 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/commands/handlers/default.ts b/packages/cli/src/commands/handlers/default.ts
index 1f8ebe89c4..d7ba88a824 100644
--- a/packages/cli/src/commands/handlers/default.ts
+++ b/packages/cli/src/commands/handlers/default.ts
@@ -63,6 +63,24 @@ export default Runtime.handler(Commands, (input) =>
             }).pipe(Effect.provide(NodeFileSystem.layer)),
           )
       : () => Promise.resolve(transport)
-    yield* runTui(transport, { continue: input.continue, sessionID: Option.getOrUndefined(input.session) }, discover)
+    // Restart the managed service in place; start() resolves once the
+    // replacement is healthy and the reconnect loop reattaches on its own.
+    // Only meaningful in service mode: --server is not ours to restart and a
+    // standalone child cannot be respawned.
+    const reload = serviceOptions
+      ? () =>
+          Effect.runPromise(
+            Effect.gen(function* () {
+              yield* Service.stop(serviceOptions)
+              yield* Service.start(serviceOptions)
+            }).pipe(Effect.provide(NodeFileSystem.layer)),
+          )
+      : undefined
+    yield* runTui(
+      transport,
+      { continue: input.continue, sessionID: Option.getOrUndefined(input.session) },
+      discover,
+      reload,
+    )
   }),
 )
diff --git a/packages/cli/src/tui.ts b/packages/cli/src/tui.ts
index a535309d42..96d92c50b2 100644
--- a/packages/cli/src/tui.ts
+++ b/packages/cli/src/tui.ts
@@ -9,7 +9,12 @@ import type { Service } from "@opencode-ai/client/effect"
 import { createOpencodeClient } from "@opencode-ai/sdk/v2/client"
 import type { Args } from "@opencode-ai/tui/context/args"
 
-export function runTui(transport: Service.Transport, args: Args, discover?: () => Promise<Service.Transport>) {
+export function runTui(
+  transport: Service.Transport,
+  args: Args,
+  discover?: () => Promise<Service.Transport>,
+  reload?: () => Promise<void>,
+) {
   const config = TuiConfig.resolve({}, { terminalSuspend: false })
   let disposeSlots: (() => void) | undefined
   return Effect.gen(function* () {
@@ -33,6 +38,7 @@ export function runTui(transport: Service.Transport, args: Args, discover?: () =
             }
           }
         : undefined,
+      reload,
       args,
       config,
       pluginHost: {
diff --git a/packages/tui/src/app.tsx b/packages/tui/src/app.tsx
index ccde2fa5e6..876faff9de 100644
--- a/packages/tui/src/app.tsx
+++ b/packages/tui/src/app.tsx
@@ -139,6 +139,7 @@ export type TuiInput = {
   client: OpencodeClient
   api: OpenCodeClient
   discover?: () => Promise<{ client: OpencodeClient; api: OpenCodeClient }>
+  reload?: () => Promise<void>
   args: Args
   config: TuiConfig.Resolved
   onSnapshot?: () => Promise<string[]>
@@ -301,7 +302,7 @@ export const run = Effect.fn("Tui.run")(function* (input: TuiInput) {
                                   >
                                     <TuiConfigProvider config={input.config}>
                                       <PluginRuntimeProvider value={pluginRuntime}>
-                                        <SDKProvider client={input.client} api={input.api} discover={input.discover}>
+                                        <SDKProvider client={input.client} api={input.api} discover={input.discover} reload={input.reload}>
                                           <PermissionProvider>
                                             <ProjectProvider>
                                               <SyncProvider>
@@ -800,6 +801,26 @@ function App(props: { onSnapshot?: () => Promise<string[]>; pluginHost: TuiPlugi
         },
         category: "System",
       },
+      ...(sdk.reload
+        ? [
+            {
+              name: "server.reload",
+              title: "Reload server",
+              slashName: "reload",
+              run: async () => {
+                dialog.clear()
+                toast.show({ variant: "info", message: "Reloading server...", duration: 30000 })
+                // reload resolves once the replacement service is healthy; the
+                // event stream reattaches through the reconnect loop.
+                await sdk
+                  .reload!()
+                  .then(() => toast.show({ variant: "success", message: "Server reloaded" }))
+                  .catch(toast.error)
+              },
+              category: "System",
+            },
+          ]
+        : []),
       {
         name: "theme.switch",
         title: "Switch theme",
diff --git a/packages/tui/src/context/sdk.tsx b/packages/tui/src/context/sdk.tsx
index 7686ed6e94..0ad516ceac 100644
--- a/packages/tui/src/context/sdk.tsx
+++ b/packages/tui/src/context/sdk.tsx
@@ -16,6 +16,8 @@ export const { use: useSDK, provider: SDKProvider } = createSimpleContext({
     client: OpencodeClient
     api: OpenCodeClient
     discover?: () => Promise<{ client: OpencodeClient; api: OpenCodeClient }>
+    // Stops and starts the managed service; present only in service mode.
+    reload?: () => Promise<void>
   }) => {
     const abort = new AbortController()
     let client = props.client
@@ -138,6 +140,7 @@ export const { use: useSDK, provider: SDKProvider } = createSimpleContext({
           return connection.connectedOnce
         },
       },
+      reload: props.reload,
     }
   },
 })

From 4790a2772c0300ff610834c5628c62b4668c6bf1 Mon Sep 17 00:00:00 2001
From: James Long <longster@gmail.com>
Date: Fri, 3 Jul 2026 14:19:25 -0400
Subject: [PATCH 19/82] feat(simulation): add driver controlled backend LLM
 (#35186)

---
 bun.lock                                      |  19 +
 packages/core/src/effect/layer-node.ts        |   2 +-
 packages/core/src/fs-util.ts                  |   4 +-
 packages/llm/src/protocols/openai-chat.ts     |   4 +-
 .../specs/simulation/simulated-network-llm.md | 150 +++++++
 .../specs/simulation/simulation-phases.md     |  22 +
 packages/server/package.json                  |   1 +
 packages/server/src/routes.ts                 |   2 +-
 packages/server/src/simulation/index.ts       |  14 -
 packages/simulation/package.json              |  28 ++
 packages/simulation/src/backend/control.ts    | 145 +++++++
 packages/simulation/src/backend/filesystem.ts | 390 ++++++++++++++++++
 packages/simulation/src/backend/fs-util.ts    |  89 ++++
 packages/simulation/src/backend/index.ts      |  41 ++
 .../simulation/src/backend/llm-exchange.ts    | 105 +++++
 packages/simulation/src/backend/network.ts    |  94 +++++
 packages/simulation/src/backend/openai.ts     |  89 ++++
 .../src/frontend}/actions.ts                  |   0
 .../src/frontend}/renderer.ts                 |   0
 .../src/frontend}/server.ts                   |   0
 .../src/frontend}/simulation.ts               |   0
 .../src/frontend}/trace.ts                    |   0
 packages/simulation/tsconfig.json             |   8 +
 packages/tui/package.json                     |   1 +
 packages/tui/src/app.tsx                      |   4 +-
 25 files changed, 1191 insertions(+), 21 deletions(-)
 create mode 100644 packages/opencode/specs/simulation/simulated-network-llm.md
 delete mode 100644 packages/server/src/simulation/index.ts
 create mode 100644 packages/simulation/package.json
 create mode 100644 packages/simulation/src/backend/control.ts
 create mode 100644 packages/simulation/src/backend/filesystem.ts
 create mode 100644 packages/simulation/src/backend/fs-util.ts
 create mode 100644 packages/simulation/src/backend/index.ts
 create mode 100644 packages/simulation/src/backend/llm-exchange.ts
 create mode 100644 packages/simulation/src/backend/network.ts
 create mode 100644 packages/simulation/src/backend/openai.ts
 rename packages/{tui/src/simulation => simulation/src/frontend}/actions.ts (100%)
 rename packages/{tui/src/simulation => simulation/src/frontend}/renderer.ts (100%)
 rename packages/{tui/src/simulation => simulation/src/frontend}/server.ts (100%)
 rename packages/{tui/src/simulation => simulation/src/frontend}/simulation.ts (100%)
 rename packages/{tui/src/simulation => simulation/src/frontend}/trace.ts (100%)
 create mode 100644 packages/simulation/tsconfig.json

diff --git a/bun.lock b/bun.lock
index 9c5bbb1591..6522800a13 100644
--- a/bun.lock
+++ b/bun.lock
@@ -796,6 +796,7 @@
       "dependencies": {
         "@opencode-ai/core": "workspace:*",
         "@opencode-ai/protocol": "workspace:*",
+        "@opencode-ai/simulation": "workspace:*",
         "drizzle-orm": "catalog:",
         "effect": "catalog:",
       },
@@ -849,6 +850,21 @@
         "vite": "catalog:",
       },
     },
+    "packages/simulation": {
+      "name": "@opencode-ai/simulation",
+      "version": "1.17.13",
+      "dependencies": {
+        "@opencode-ai/core": "workspace:*",
+        "@opencode-ai/llm": "workspace:*",
+        "@opentui/core": "catalog:",
+        "effect": "catalog:",
+      },
+      "devDependencies": {
+        "@tsconfig/bun": "catalog:",
+        "@types/bun": "catalog:",
+        "@typescript/native-preview": "catalog:",
+      },
+    },
     "packages/slack": {
       "name": "@opencode-ai/slack",
       "version": "1.17.13",
@@ -963,6 +979,7 @@
         "@opencode-ai/core": "workspace:*",
         "@opencode-ai/plugin": "workspace:*",
         "@opencode-ai/sdk": "workspace:*",
+        "@opencode-ai/simulation": "workspace:*",
         "@opencode-ai/ui": "workspace:*",
         "@opentui/core": "catalog:",
         "@opentui/keymap": "catalog:",
@@ -2019,6 +2036,8 @@
 
     "@opencode-ai/session-ui": ["@opencode-ai/session-ui@workspace:packages/session-ui"],
 
+    "@opencode-ai/simulation": ["@opencode-ai/simulation@workspace:packages/simulation"],
+
     "@opencode-ai/slack": ["@opencode-ai/slack@workspace:packages/slack"],
 
     "@opencode-ai/stats-app": ["@opencode-ai/stats-app@workspace:packages/stats/app"],
diff --git a/packages/core/src/effect/layer-node.ts b/packages/core/src/effect/layer-node.ts
index 9dbc3d5160..dc7aa972f0 100644
--- a/packages/core/src/effect/layer-node.ts
+++ b/packages/core/src/effect/layer-node.ts
@@ -227,7 +227,7 @@ export function hoist<A, E, T extends Tag, const Items extends Replacements = re
       }
       if (node.tag === tag) {
         const existing = hoisted.get(node.name)
-        if (existing && existing !== node) {
+        if (existing && existing.implementation !== node.implementation) {
           throw new Error(`Tag ${tag} has conflicting implementations for ${node.name}`)
         }
         hoisted.set(node.name, rewriteReplacementDependencies(node, replacementMap))
diff --git a/packages/core/src/fs-util.ts b/packages/core/src/fs-util.ts
index b6edce6657..e01b546384 100644
--- a/packages/core/src/fs-util.ts
+++ b/packages/core/src/fs-util.ts
@@ -50,7 +50,9 @@ export namespace FSUtil {
 
   export const use = serviceUse(Service)
 
-  const layer = Layer.effect(
+  // Exported so simulation can wrap this layer and override the methods that
+  // bypass the injected FileSystem (readDirectoryEntries, glob, globUp).
+  export const layer = Layer.effect(
     Service,
     Effect.gen(function* () {
       const fs = yield* FileSystem.FileSystem
diff --git a/packages/llm/src/protocols/openai-chat.ts b/packages/llm/src/protocols/openai-chat.ts
index 656f8179d6..eb3b7141c6 100644
--- a/packages/llm/src/protocols/openai-chat.ts
+++ b/packages/llm/src/protocols/openai-chat.ts
@@ -153,11 +153,11 @@ const OpenAIChatChoice = Schema.Struct({
   finish_reason: optionalNull(Schema.String),
 })
 
-const OpenAIChatEvent = Schema.Struct({
+export const OpenAIChatEvent = Schema.Struct({
   choices: Schema.Array(OpenAIChatChoice),
   usage: optionalNull(OpenAIChatUsage),
 })
-type OpenAIChatEvent = Schema.Schema.Type<typeof OpenAIChatEvent>
+export type OpenAIChatEvent = Schema.Schema.Type<typeof OpenAIChatEvent>
 type OpenAIChatRequestMessage = LLMRequest["messages"][number]
 
 interface ParserState {
diff --git a/packages/opencode/specs/simulation/simulated-network-llm.md b/packages/opencode/specs/simulation/simulated-network-llm.md
new file mode 100644
index 0000000000..c7631cf4cb
--- /dev/null
+++ b/packages/opencode/specs/simulation/simulated-network-llm.md
@@ -0,0 +1,150 @@
+# Simulated Network And Driver-Scripted LLM
+
+Status: design for the Phase 2 network and LLM items in `simulation-phases.md`.
+
+## Summary
+
+Simulation replaces the `HttpClient.HttpClient` platform node with a simulated network. The LLM is not a separate fake: it is one registered route in that network (`api.openai.com`), answered by the **external driver** over the existing control WebSocket. When the app issues a provider request, the backend forwards it to the driver and the driver streams response chunks back. There is no enqueueing and no scripted-response store; the driver is the model.
+
+Everything above the HTTP boundary runs real: catalog and auth resolution, `LLMClient`, request body construction, SSE framing, the OpenAI protocol event schema, the `step` state machine, `Lifecycle` grammar, tool-argument accumulation, the session runner, tools, and permissions.
+
+## Why the network seam
+
+`LLMClient.stream` sits on a stack that ends in one platform node:
+
+```
+LLMClient.stream(request)
+  route.body.from            LLMRequest -> OpenAI JSON body        (real)
+  transport.prepare          body + endpoint + auth -> HttpRequest (real)
+  RequestExecutor.execute    status/error taxonomy                 (real)
+    HttpClient.HttpClient    <- replaced by the simulated network
+  Framing.sse                bytes -> frames                       (real)
+  protocol.stream.event      frame -> OpenAIChatEvent, validated   (real)
+  protocol.stream.step       state machine -> LLMEvents            (real)
+```
+
+Replacing `httpClient` (already a `LayerNode` in `app-node-platform.ts`, already used by `simulationReplacements` mechanics) keeps the entire pipeline under test and gives wire-fidelity observation of what would have been sent to the provider. Failure injection (429s, malformed SSE, truncated streams) exercises real error paths that a typed `LLMClient` fake cannot reach.
+
+## Components
+
+### 1. Simulated network (`packages/simulation/src/backend/network.ts`)
+
+Replaces `httpClient` in `simulationReplacements`. An in-memory route table:
+
+- `register(matcher, responder)` where matcher is method + URL pattern and responder is `(HttpClientRequest) => Effect<HttpClientResponse>`.
+- Unknown requests fail loudly with a typed simulation error (spec: deny unknown external network by default).
+- Optional loopback allowance for the app's own server is not required server-side (the server does not call itself over HTTP); revisit if a consumer needs it.
+- Every request/response summary is traced.
+
+### 2. OpenAI endpoint route (`packages/simulation/src/backend/openai.ts`)
+
+Registered in the network at startup for `POST {DEFAULT_BASE_URL}{PATH}` from `protocols/openai-chat.ts` (`https://api.openai.com/v1/chat/completions`).
+
+On request:
+
+1. Allocate an exchange id. Parse the real OpenAI request body (available to the driver for assertions).
+2. Publish a `request` record to the LLM exchange service (below) and create a chunk `Queue`.
+3. Return `HttpClientResponse` with `content-type: text/event-stream` whose body stream reads from the queue, encoding each item as an SSE `data:` frame, terminated by `[DONE]`.
+
+Chunks are constructed through the `OpenAIChatEvent` schema so drift in the protocol schema breaks the build, not the runtime.
+
+The response stream is interruptible like a real HTTP response: if the runner cancels (user interrupt), the exchange closes and the driver is notified.
+
+### 3. LLM exchange service (`packages/simulation/src/backend/llm-exchange.ts`)
+
+Process-global simulation service owning pending exchanges:
+
+```
+Exchange = { id, body, queue: Queue<Item | Error | Done>, deferred lifecycle }
+```
+
+- `requests()` — stream of newly opened exchanges (consumed by the control route).
+- `push(id, item)` — append one response item to an open exchange.
+- `finish(id, reason)` / `fail(id, failure)` — terminate the exchange.
+- Exchanges that receive no driver within a configurable timeout fail the provider request with a simulation error (surfaces in the real provider-error path).
+
+### 4. Backend control WebSocket (simulation-gated)
+
+Started when the simulation module loads (lazy import, `OPENCODE_SIMULATION` only): a loopback JSON-RPC 2.0 WebSocket on `127.0.0.1:40950+`, hosted by the backend process. Drivers connect to it directly — the standalone topology has exactly one backend per TUI, so there is no proxying through the frontend. This socket is also the headless-simulation interface: it works with no TUI at all.
+
+Server -> driver notification (after `llm.attach`; pending exchanges are replayed on attach so late-attaching drivers miss nothing):
+
+```
+{ "jsonrpc": "2.0", "method": "llm.request",
+  "params": { "id": "ex_1", "url": "...", "body": { ...openai request body... } } }
+```
+
+Driver -> server methods:
+
+```
+llm.attach                                subscribe to llm.request notifications
+llm.chunk   { id, items: Item[] }         append response items
+llm.finish  { id, reason?: "stop" | ... } finish the exchange
+llm.pending                               list open exchanges
+network.log                               simulated network request log
+```
+
+`Item` is the response vocabulary the driver speaks:
+
+```
+{ type: "textDelta",      text }
+{ type: "reasoningDelta", text }
+{ type: "toolCall",       id, name, input }
+{ type: "raw",            chunk }        // escape hatch: raw OpenAIChatEvent JSON
+```
+
+The backend compiles items to OpenAI chunks (`delta.content`, `delta.tool_calls[].function.arguments`, `finish_reason`); `raw` passes through unmodified. Streaming granularity is the driver's choice: many small `llm.chunk` calls stream word by word; one call with many items plus `llm.finish` responds at once.
+
+Failure injection (`llm.fail`: HTTP status instead of SSE) is specced but not yet implemented.
+
+### 5. Driver topology
+
+A driver manages two loopback WebSocket connections:
+
+- TUI control server (`127.0.0.1:40900+`) — UI state, actions, render, trace.
+- Backend control server (`127.0.0.1:40950+`) — LLM exchanges, network log.
+
+Both speak the same JSON-RPC shape. Headless drivers use only the backend socket plus the normal HTTP API. Multiple drivers are out of scope; last attach wins.
+
+### 6. Pacing and the clock
+
+No server-side pacing by default: the driver controls timing by when it sends chunks, which is the point of driver-in-the-loop. A convenience `llm.chunk` option `{ delayMs }` may sleep via `Effect.sleep` between items server-side; because that uses the fiber `Clock`, scoping a controllable clock to the exchange stream (`Stream.provideService(Clock.Clock, simClock)`) remains available for deterministic replay without touching app time. Defer until replay work needs it.
+
+### 7. Catalog and auth seeding
+
+The driver-facing model must be selectable in the TUI. Simulation seeds config (via the snapshot filesystem) defining a provider on the openai-chat route with `baseURL` left at the OpenAI default and a dummy `apiKey` (satisfies `Catalog.available()`). No catalog code changes.
+
+## End-to-end flow
+
+```
+driver                TUI sim server (40900+)     backend + control WS (40950+)
+  |                            |                          |
+  |-- ui.action (submit) ----->|                          |
+  |                            |-- (normal app HTTP) ---->|  session runner starts
+  |                            |                          |  llm.stream -> HttpClient
+  |                            |                          |  simulated network matches openai route
+  |<================== llm.request {ex_1} ===============|  exchange ex_1 opened
+  |-- llm.chunk {ex_1,[...]} ============================>|  SSE frames flow into the real
+  |-- llm.chunk {ex_1,[...]} ============================>|  decode -> step -> LLMEvents ->
+  |-- llm.finish {ex_1} =================================>|  runner publishes, TUI renders
+  |                            |                          |
+  |   (if toolCall was sent: runner executes the real tool against the
+  |    fake filesystem, then issues the next provider turn -> new exchange
+  |    ex_2 -> driver decides the next response)
+```
+
+The driver observes the TUI through `ui.state` while chunks stream, so mid-stream UI assertions need no clock control at all: the driver simply has not sent the rest yet.
+
+## Implementation order
+
+1. `network.ts`: simulated `HttpClient` + route table + deny-unknown + trace. Replace `httpClient` in `simulationReplacements`.
+2. `llm-exchange.ts` + `openai.ts`: exchange service and the OpenAI SSE route (schema-constructed chunks, `[DONE]`, interruption).
+3. `control.ts`: backend-hosted control WebSocket (`llm.attach|chunk|finish|pending`, `network.log`), started when the simulation module loads.
+4. Config seeding for the sim provider; end-to-end verification via `packages/server/script/e2e-sim.ts` (headless) and `packages/tui/script/sim-llm-driver.ts` (TUI + backend sockets).
+5. Trace records for network and LLM exchange activity.
+
+## Consequences
+
+- No enqueue/script store to keep consistent; the driver is the single source of model behavior.
+- Deterministic tests write drivers (respond to `llm.request` programmatically) instead of pre-baked scripts; replay (Phase 4) records exchanges and replays them as an automatic driver.
+- Provider-coupling is confined to `openai.ts` (one wire encoder against a schema that lives in the repo); a second simulated provider (e.g. Anthropic) is another route file if ever needed.
diff --git a/packages/opencode/specs/simulation/simulation-phases.md b/packages/opencode/specs/simulation/simulation-phases.md
index ef7aa41e3f..ebc4bd3743 100644
--- a/packages/opencode/specs/simulation/simulation-phases.md
+++ b/packages/opencode/specs/simulation/simulation-phases.md
@@ -51,6 +51,28 @@ Out of scope:
 
 Goal: make the app safe and controlled by swapping the lowest layers, not app logic.
 
+Implementation checklist:
+
+- [x] Add `packages/simulation/src/backend` as the home for backend simulation layer replacements, exported from `backend/index.ts` as `simulationReplacements`; `@opencode-ai/simulation` is private/non-published and depends on logic/framework packages (`core`, `llm`, `effect`, OpenTUI), while `server` and `tui` consume it.
+- [x] Wire simulation replacements through the server's `makeRoutes` via `Layer.unwrap` + dynamic `import("@opencode-ai/simulation/backend")` gated on `OPENCODE_SIMULATION`, so the simulation module is never loaded eagerly and `makeRoutes` stays synchronous.
+- [x] Implement in-memory `FileSystem.FileSystem` (`simulation/filesystem.ts`) replacing the `NodeFileSystem` platform node. Backed by a flat path map; implements the operations the app uses (stat, access, chmod, realPath, read/write file, make/read directory, remove, rename, copy, copyFile, temp dirs, read-only open handles); unused operations die with a clear defect; `watch` fails as unsupported.
+- [x] Root the fake filesystem at `OPENCODE_SIMULATION_ROOT` (falling back to `process.cwd()` at layer-build time). The anchor is a real, empty host directory the runner creates and cds into.
+- [x] Deny host filesystem escapes loudly: content/mutation operations outside the root fail with `PermissionDenied` simulation errors. Probe operations (`stat`/`access`/`exists`) report `NotFound` outside the root so walk-up loops (project discovery, `findUp`, `globUp`) terminate naturally.
+- [x] Add `SimulationFSUtil` replacement (`simulation/fs-util.ts`): wraps the real `FSUtil` layer and reroutes `readDirectoryEntries`, `glob`, and `globUp` — which bypass the injected `FileSystem` via node `fs/promises` and the `glob` package — through the simulated filesystem.
+- [x] Fix `LayerNode.hoist` conflict detection to compare node implementations instead of object identity; replacement rewriting produces dependency-rewritten copies of the same node, which previously false-positived as "conflicting implementations".
+- [x] Add snapshot seeding from `OPENCODE_SIMULATION_STATE`: `project/` contents of the snapshot directory are read from the host once at layer-build time and seeded into the in-memory tree joined onto the anchor root.
+- [x] Verify end to end: `opencode serve` boots with `OPENCODE_SIMULATION=1` + `OPENCODE_SIMULATION_ROOT` + path/DB env seams (`OPENCODE_CONFIG_DIR`, `OPENCODE_TEST_HOME`, `OPENCODE_DB=:memory:`); `fs.list`/`fs.read` observe only seeded in-memory files; the anchor directory on the host remains empty after the run.
+- [ ] Create the anchor directory + `chdir` + env seam setup automatically in CLI startup when simulation mode is enabled (currently set manually by the runner; a full run needs `OPENCODE_SIMULATION_ROOT/STATE`, `OPENCODE_CONFIG_DIR`, `OPENCODE_TEST_HOME`, `OPENCODE_DB=:memory:`, and `XDG_*_HOME` pointed into the anchor, plus Bun's `--preload=@opentui/solid/preload` when launched outside `packages/cli`).
+- [ ] Assert the anchor directory is still empty at the end of the run (KV/log/flock still write through real XDG paths; they are contained in the anchor by the env seams but not yet in-memory).
+- [x] Add simulated network registry (`packages/simulation/src/backend/network.ts`): replaces the `httpClient` platform node, resolves all outbound HTTP against an in-memory route table, denies unknown destinations loudly, and keeps a bounded request log (design: `simulated-network-llm.md`).
+- [x] Add driver-answered LLM as an OpenAI route in the simulated network (`openai.ts` + `llm-exchange.ts`): provider requests open exchanges; the driver streams chunks back which are encoded as real OpenAI Chat SSE (schema-checked against `OpenAIChatEvent`) and consumed by the real protocol pipeline. No enqueue store — the driver is the model.
+- [x] Add backend-hosted simulation control WebSocket (`control.ts`): JSON-RPC on `127.0.0.1:40950+`, started when the simulation module loads. Drivers connect directly (standalone topology — no frontend proxy): `llm.attach` (replays pending exchanges), `llm.chunk`, `llm.finish`, `llm.pending`, `network.log`; `llm.request` notifications push opened exchanges. This is also the headless-simulation interface. Drivers manage two sockets: TUI control (40900+) for UI, backend control (40950+) for LLM/network.
+- [x] Answer `https://models.dev/api.json` with an empty catalog in the simulated network; providers come from seeded config (`opencode.json` in the snapshot defines an openai-compatible provider with a dummy `apiKey`, which passes the catalog availability gate and resolves onto the real openai-chat route).
+- [x] Fix `buildLocationServiceMap` to apply replacements when compiling hoisted global nodes; platform-node replacements (filesystem, httpClient) were silently ignored inside hoisted globals.
+- [x] Verify end to end headless (real route stack in-process + backend control WS: prompt -> `llm.request` -> driver chunks -> assistant message contains driver text; script: `packages/server/script/e2e-sim.ts`) and through the TUI (fake renderer, both sockets: type + submit via TUI WS, answer `llm.request` via backend WS, assistant reply rendered on screen; script: `packages/tui/script/sim-llm-driver.ts`).
+- [ ] Add simulated process registry (shell via `just-bash`, minimal fake `git`, deny unsupported spawns).
+- [ ] Trace filesystem, process, and LLM exchange activity (network requests are traced in the backend network log ring buffer; LLM exchange trace records moved out with the frontend proxy and need re-adding on the backend control server).
+
 Scope:
 
 - Wire simulation replacements through `AppNodeBuilder.build(...)` and `AppNodeBuilderV1.build(...)`.
diff --git a/packages/server/package.json b/packages/server/package.json
index 86e5683dcf..6c5b3cb1b5 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -14,6 +14,7 @@
   "dependencies": {
     "@opencode-ai/core": "workspace:*",
     "@opencode-ai/protocol": "workspace:*",
+    "@opencode-ai/simulation": "workspace:*",
     "drizzle-orm": "catalog:",
     "effect": "catalog:"
   },
diff --git a/packages/server/src/routes.ts b/packages/server/src/routes.ts
index db69ba6c7f..2157dd0b04 100644
--- a/packages/server/src/routes.ts
+++ b/packages/server/src/routes.ts
@@ -72,7 +72,7 @@ function makeRoutes<AuthError, AuthServices>(
   const serviceLayer = simulationEnabled()
     ? Layer.unwrap(
         Effect.gen(function* () {
-          const { simulationReplacements } = yield* Effect.promise(() => import("./simulation"))
+          const { simulationReplacements } = yield* Effect.promise(() => import("@opencode-ai/simulation/backend"))
           return AppNodeBuilder.build(applicationServices, [...replacements, ...simulationReplacements])
         }),
       )
diff --git a/packages/server/src/simulation/index.ts b/packages/server/src/simulation/index.ts
deleted file mode 100644
index 3f499a5bf8..0000000000
--- a/packages/server/src/simulation/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { LayerNode } from "@opencode-ai/core/effect/layer-node"
-
-/**
- * Layer replacements applied when the server is built in simulation mode.
- *
- * Empty for now; simulation-mode implementations will populate this with
- * replacement nodes/layers that swap real services for simulated ones (e.g.
- * a fake filesystem). The server merges these into the app node build when
- * `OPENCODE_SIMULATION` is enabled, via a dynamic import so this module is
- * never loaded eagerly.
- */
-export const simulationReplacements: LayerNode.Replacements = []
-
-export * as Simulation from "./index"
diff --git a/packages/simulation/package.json b/packages/simulation/package.json
new file mode 100644
index 0000000000..93bab0540e
--- /dev/null
+++ b/packages/simulation/package.json
@@ -0,0 +1,28 @@
+{
+  "$schema": "https://json.schemastore.org/package.json",
+  "name": "@opencode-ai/simulation",
+  "version": "1.17.13",
+  "private": true,
+  "type": "module",
+  "license": "MIT",
+  "exports": {
+    "./backend": "./src/backend/index.ts",
+    "./backend/*": "./src/backend/*.ts",
+    "./frontend": "./src/frontend/simulation.ts",
+    "./frontend/*": "./src/frontend/*.ts"
+  },
+  "scripts": {
+    "typecheck": "tsgo --noEmit"
+  },
+  "dependencies": {
+    "@opencode-ai/core": "workspace:*",
+    "@opencode-ai/llm": "workspace:*",
+    "@opentui/core": "catalog:",
+    "effect": "catalog:"
+  },
+  "devDependencies": {
+    "@tsconfig/bun": "catalog:",
+    "@types/bun": "catalog:",
+    "@typescript/native-preview": "catalog:"
+  }
+}
diff --git a/packages/simulation/src/backend/control.ts b/packages/simulation/src/backend/control.ts
new file mode 100644
index 0000000000..f3fc67116c
--- /dev/null
+++ b/packages/simulation/src/backend/control.ts
@@ -0,0 +1,145 @@
+import { Effect, Schema } from "effect"
+import { SimulationLLMExchange } from "./llm-exchange"
+import { SimulationNetwork } from "./network"
+
+/**
+ * Backend-hosted simulation control WebSocket.
+ *
+ * JSON-RPC 2.0 over a loopback WebSocket, mirroring the protocol of the TUI
+ * simulation server. Drivers connect directly (standalone topology; no
+ * frontend proxy) to answer LLM exchanges and inspect the simulated network.
+ * This is also the headless-simulation interface: it works with no TUI at
+ * all.
+ *
+ * Methods:
+ * - `llm.attach`            -> subscribe; pending and future exchanges arrive
+ *                              as `llm.request` notifications
+ * - `llm.chunk`   { id, items }   append response items to an exchange
+ * - `llm.finish`  { id, reason? } finish an exchange
+ * - `llm.pending`                 list open exchanges
+ * - `network.log`                 simulated network request log
+ */
+
+const DefaultPort = 40950
+const MaxPortAttempts = 100
+
+const ChunkItem = Schema.Union([
+  Schema.Struct({ type: Schema.Literal("textDelta"), text: Schema.String }),
+  Schema.Struct({ type: Schema.Literal("reasoningDelta"), text: Schema.String }),
+  Schema.Struct({ type: Schema.Literal("toolCall"), id: Schema.String, name: Schema.String, input: Schema.Unknown }),
+  Schema.Struct({ type: Schema.Literal("raw"), chunk: Schema.Unknown }),
+])
+
+const ChunkParams = Schema.Struct({ id: Schema.String, items: Schema.Array(ChunkItem) })
+
+const FinishParams = Schema.Struct({
+  id: Schema.String,
+  reason: Schema.Literals(["stop", "tool-calls", "length", "content-filter"]).pipe(
+    Schema.withDecodingDefault(Effect.succeed("stop" as const)),
+  ),
+})
+
+const decodeChunkParams = Schema.decodeUnknownPromise(ChunkParams)
+const decodeFinishParams = Schema.decodeUnknownPromise(FinishParams)
+
+type JsonRpcRequest = {
+  readonly jsonrpc: "2.0"
+  readonly id?: string | number | null
+  readonly method: string
+  readonly params?: unknown
+}
+
+type ControlSocket = Bun.ServerWebSocket<{ unsubscribe?: () => void }>
+
+function parseRequest(input: string | Buffer): JsonRpcRequest {
+  const value = JSON.parse(typeof input === "string" ? input : input.toString()) as unknown
+  if (typeof value !== "object" || value === null) throw new Error("Invalid JSON-RPC request")
+  if (!("jsonrpc" in value) || value.jsonrpc !== "2.0") throw new Error("Invalid JSON-RPC version")
+  if (!("method" in value) || typeof value.method !== "string") throw new Error("Invalid JSON-RPC method")
+  return value as JsonRpcRequest
+}
+
+async function handle(socket: ControlSocket, request: JsonRpcRequest): Promise<unknown> {
+  switch (request.method) {
+    case "llm.attach": {
+      socket.data.unsubscribe?.()
+      socket.data.unsubscribe = SimulationLLMExchange.subscribe((exchange) => {
+        socket.send(JSON.stringify({ jsonrpc: "2.0", method: "llm.request", params: exchange }))
+      })
+      return { attached: true }
+    }
+    case "llm.chunk": {
+      const params = await decodeChunkParams(request.params)
+      await Effect.runPromise(
+        SimulationLLMExchange.push(
+          params.id,
+          params.items.map((item) => ({ type: "item", item }) as const),
+        ),
+      )
+      return { ok: true }
+    }
+    case "llm.finish": {
+      const params = await decodeFinishParams(request.params)
+      await Effect.runPromise(SimulationLLMExchange.push(params.id, [{ type: "finish", reason: params.reason }]))
+      return { ok: true }
+    }
+    case "llm.pending":
+      return { exchanges: SimulationLLMExchange.pending() }
+    case "network.log":
+      return { entries: SimulationNetwork.log() }
+  }
+  throw new Error(`Unknown simulation control method: ${request.method}`)
+}
+
+function serve(port = DefaultPort, attempts = MaxPortAttempts): Bun.Server<{ unsubscribe?: () => void }> {
+  try {
+    return Bun.serve<{ unsubscribe?: () => void }>({
+      hostname: "127.0.0.1",
+      port,
+      fetch(request, server) {
+        if (server.upgrade(request, { data: {} })) return undefined
+        return new Response("opencode simulation control websocket", { status: 426 })
+      },
+      websocket: {
+        close(socket) {
+          socket.data.unsubscribe?.()
+        },
+        async message(socket, message) {
+          let request: JsonRpcRequest | undefined
+          try {
+            request = parseRequest(message)
+            const result = await handle(socket, request)
+            if (request.id !== undefined) socket.send(JSON.stringify({ jsonrpc: "2.0", id: request.id, result }))
+          } catch (error) {
+            socket.send(
+              JSON.stringify({
+                jsonrpc: "2.0",
+                id: request?.id ?? null,
+                error: { code: -32000, message: error instanceof Error ? error.message : String(error) },
+              }),
+            )
+          }
+        },
+      },
+    })
+  } catch (error) {
+    const message = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase()
+    const unavailable = message.includes("eaddrinuse") || message.includes("in use")
+    if (!unavailable || attempts <= 1 || port >= 65535) throw error
+    return serve(port + 1, attempts - 1)
+  }
+}
+
+export function start() {
+  const server = serve()
+  const url = `ws://${server.hostname}:${server.port}`
+  process.stderr.write(`opencode simulation backend control websocket: ${url}\n`)
+  return {
+    url,
+    stop: () => {
+      server.stop(true)
+    },
+  }
+}
+
+export * as SimulationControl from "./control"
diff --git a/packages/simulation/src/backend/filesystem.ts b/packages/simulation/src/backend/filesystem.ts
new file mode 100644
index 0000000000..01a7b00329
--- /dev/null
+++ b/packages/simulation/src/backend/filesystem.ts
@@ -0,0 +1,390 @@
+import { Effect, FileSystem, Layer, Option, Stream } from "effect"
+import { systemError, type PlatformError, type SystemErrorTag } from "effect/PlatformError"
+import nodeFs from "fs"
+import path from "path"
+
+/**
+ * In-memory simulated `FileSystem.FileSystem`.
+ *
+ * Replaces the `NodeFileSystem` platform node when the server runs in
+ * simulation mode. Backed by a flat map of absolute paths to entries and
+ * rooted at a single directory (the simulation anchor): paths that resolve
+ * outside the root fail with `PermissionDenied` so host filesystem escapes
+ * are loud. Only the operations the app actually uses are implemented;
+ * everything else dies with a clear defect.
+ *
+ * Inspired by the V1 prototype on `jlongster/simulation-rebase`, rewritten
+ * for the V2 platform node shape without the `just-bash` dependency.
+ */
+
+export interface Options {
+  readonly root: string
+  readonly files?: Record<string, string | Uint8Array>
+}
+
+interface FileEntry {
+  readonly type: "File"
+  content: Uint8Array
+  mode: number
+  mtime: Date
+}
+
+interface DirectoryEntry {
+  readonly type: "Directory"
+  mode: number
+  mtime: Date
+}
+
+type Entry = FileEntry | DirectoryEntry
+
+export function make(options: Options): FileSystem.FileSystem {
+  const root = path.resolve(options.root)
+  const store = new Map<string, Entry>()
+  const temp = { value: 0 }
+  const encoder = new TextEncoder()
+  store.set(root, makeDirectoryEntry())
+
+  const within = (resolved: string) => resolved === root || resolved.startsWith(withSep(root))
+
+  const childrenOf = (resolved: string) => [...store.keys()].filter((key) => key.startsWith(withSep(resolved)))
+
+  const fail = (
+    tag: SystemErrorTag,
+    method: string,
+    file: string,
+    description?: string,
+  ): Effect.Effect<never, PlatformError> =>
+    Effect.fail(
+      systemError({ _tag: tag, module: "SimulationFileSystem", method, description, pathOrDescriptor: file }),
+    )
+
+  const locate = (method: string, file: string): Effect.Effect<string, PlatformError> => {
+    const resolved = path.resolve(root, file)
+    if (within(resolved)) return Effect.succeed(resolved)
+    return fail("PermissionDenied", method, file, "path escapes the simulated filesystem root")
+  }
+
+  const requireEntry = (method: string, file: string): Effect.Effect<readonly [string, Entry], PlatformError> =>
+    locate(method, file).pipe(
+      Effect.flatMap((resolved) => {
+        const entry = store.get(resolved)
+        if (!entry) return fail("NotFound", method, file)
+        return Effect.succeed([resolved, entry] as const)
+      }),
+    )
+
+  const requireParentDirectory = (
+    method: string,
+    resolved: string,
+    file: string,
+  ): Effect.Effect<void, PlatformError> => {
+    const parent = store.get(path.dirname(resolved))
+    if (parent?.type === "Directory") return Effect.void
+    return fail("NotFound", method, file, "parent directory does not exist")
+  }
+
+  // Creates every missing directory between root and resolved (inclusive).
+  const ensureDirectories = (method: string, file: string, resolved: string): Effect.Effect<void, PlatformError> =>
+    Effect.suspend(() => {
+      const segments = path.relative(root, resolved).split(path.sep).filter(Boolean)
+      const conflict = segments.reduce<string | Effect.Effect<never, PlatformError>>((current, segment) => {
+        if (typeof current !== "string") return current
+        const next = path.join(current, segment)
+        const entry = store.get(next)
+        if (entry && entry.type !== "Directory")
+          return fail("AlreadyExists", method, file, "path component is not a directory")
+        if (!entry) store.set(next, makeDirectoryEntry())
+        return next
+      }, root)
+      return typeof conflict === "string" ? Effect.void : conflict
+    })
+
+  // Seed initial files, creating parents as needed. Entries outside the root are ignored.
+  for (const [file, content] of Object.entries(options.files ?? {})) {
+    const resolved = path.resolve(root, file)
+    if (!within(resolved)) continue
+    Effect.runSync(ensureDirectories("seed", file, path.dirname(resolved)))
+    store.set(resolved, {
+      type: "File",
+      content: typeof content === "string" ? encoder.encode(content) : content.slice(),
+      mode: 0o644,
+      mtime: new Date(),
+    })
+  }
+
+  // Probe operations report NotFound outside the root instead of
+  // PermissionDenied: walk-up loops (project discovery, findUp, globUp)
+  // legitimately probe ancestor directories of the anchor and must observe
+  // "nothing there". Content access and mutation outside the root stay loud.
+  const probe = (method: string, file: string): Effect.Effect<Entry, PlatformError> =>
+    Effect.suspend(() => {
+      const resolved = path.resolve(root, file)
+      const entry = within(resolved) ? store.get(resolved) : undefined
+      if (!entry) return fail("NotFound", method, file)
+      return Effect.succeed(entry)
+    })
+
+  const stat: FileSystem.FileSystem["stat"] = (file) => probe("stat", file).pipe(Effect.map(toInfo))
+
+  const access: FileSystem.FileSystem["access"] = (file) => probe("access", file).pipe(Effect.asVoid)
+
+  const chmod: FileSystem.FileSystem["chmod"] = (file, mode) =>
+    requireEntry("chmod", file).pipe(
+      Effect.map(([, entry]) => {
+        entry.mode = mode
+      }),
+    )
+
+  const realPath: FileSystem.FileSystem["realPath"] = (file) =>
+    requireEntry("realPath", file).pipe(Effect.map(([resolved]) => resolved))
+
+  const readFile: FileSystem.FileSystem["readFile"] = (file) =>
+    requireEntry("readFile", file).pipe(
+      Effect.flatMap(([, entry]) => {
+        if (entry.type !== "File") return fail("BadResource", "readFile", file, "path is a directory")
+        return Effect.succeed(entry.content.slice())
+      }),
+    )
+
+  const writeFile: FileSystem.FileSystem["writeFile"] = (file, data, writeOptions) =>
+    locate("writeFile", file).pipe(
+      Effect.flatMap((resolved) => {
+        const existing = store.get(resolved)
+        if (existing?.type === "Directory") return fail("BadResource", "writeFile", file, "path is a directory")
+        return requireParentDirectory("writeFile", resolved, file).pipe(
+          Effect.map(() => {
+            store.set(resolved, {
+              type: "File",
+              content: data.slice(),
+              mode: writeOptions?.mode ?? existing?.mode ?? 0o644,
+              mtime: new Date(),
+            })
+          }),
+        )
+      }),
+    )
+
+  const makeDirectory: FileSystem.FileSystem["makeDirectory"] = (file, dirOptions) =>
+    locate("makeDirectory", file).pipe(
+      Effect.flatMap((resolved) => {
+        if (dirOptions?.recursive) return ensureDirectories("makeDirectory", file, resolved)
+        if (store.has(resolved)) return fail("AlreadyExists", "makeDirectory", file)
+        return requireParentDirectory("makeDirectory", resolved, file).pipe(
+          Effect.map(() => {
+            store.set(resolved, { type: "Directory", mode: dirOptions?.mode ?? 0o755, mtime: new Date() })
+          }),
+        )
+      }),
+    )
+
+  const readDirectory: FileSystem.FileSystem["readDirectory"] = (file, readOptions) =>
+    requireEntry("readDirectory", file).pipe(
+      Effect.flatMap(([resolved, entry]) => {
+        if (entry.type !== "Directory") return fail("BadResource", "readDirectory", file, "path is not a directory")
+        const children = childrenOf(resolved)
+        const names = readOptions?.recursive
+          ? children.map((key) => path.relative(resolved, key))
+          : children.filter((key) => path.dirname(key) === resolved).map((key) => path.basename(key))
+        return Effect.succeed(names.sort((a, b) => a.localeCompare(b)))
+      }),
+    )
+
+  const remove: FileSystem.FileSystem["remove"] = (file, removeOptions) =>
+    locate("remove", file).pipe(
+      Effect.flatMap((resolved) => {
+        const entry = store.get(resolved)
+        if (!entry) return removeOptions?.force ? Effect.void : fail("NotFound", "remove", file)
+        const children = childrenOf(resolved)
+        if (entry.type === "Directory" && children.length > 0 && !removeOptions?.recursive)
+          return fail("Unknown", "remove", file, "directory is not empty")
+        for (const key of children) store.delete(key)
+        store.delete(resolved)
+        // The root itself must always exist.
+        if (resolved === root) store.set(root, makeDirectoryEntry())
+        return Effect.void
+      }),
+    )
+
+  const rename: FileSystem.FileSystem["rename"] = (oldPath, newPath) =>
+    Effect.all([locate("rename", oldPath), locate("rename", newPath)]).pipe(
+      Effect.flatMap(([from, to]) => {
+        const entry = store.get(from)
+        if (!entry) return fail("NotFound", "rename", oldPath)
+        return requireParentDirectory("rename", to, newPath).pipe(
+          Effect.map(() => {
+            const moved = [from, ...childrenOf(from)].map((key) => [key, store.get(key)!] as const)
+            for (const [key] of moved) store.delete(key)
+            for (const key of [to, ...childrenOf(to)]) store.delete(key)
+            for (const [key, value] of moved) store.set(key === from ? to : to + key.slice(from.length), value)
+          }),
+        )
+      }),
+    )
+
+  const copy: FileSystem.FileSystem["copy"] = (fromPath, toPath) =>
+    Effect.all([locate("copy", fromPath), locate("copy", toPath)]).pipe(
+      Effect.flatMap(([from, to]) => {
+        const entry = store.get(from)
+        if (!entry) return fail("NotFound", "copy", fromPath)
+        return requireParentDirectory("copy", to, toPath).pipe(
+          Effect.map(() => {
+            for (const key of [from, ...childrenOf(from)]) {
+              const source = store.get(key)!
+              const target = key === from ? to : to + key.slice(from.length)
+              store.set(
+                target,
+                source.type === "File"
+                  ? { ...source, content: source.content.slice(), mtime: new Date() }
+                  : { ...source, mtime: new Date() },
+              )
+            }
+          }),
+        )
+      }),
+    )
+
+  const copyFile: FileSystem.FileSystem["copyFile"] = (fromPath, toPath) =>
+    readFile(fromPath).pipe(Effect.flatMap((content) => writeFile(toPath, content)))
+
+  const makeTempDirectory: FileSystem.FileSystem["makeTempDirectory"] = (tempOptions) =>
+    Effect.suspend(() => {
+      const directory = tempOptions?.directory ?? path.join(root, ".simulation-tmp")
+      const file = path.join(directory, `${tempOptions?.prefix ?? "tmp-"}${++temp.value}`)
+      return makeDirectory(file, { recursive: true }).pipe(Effect.map(() => file))
+    })
+
+  const makeTempDirectoryScoped: FileSystem.FileSystem["makeTempDirectoryScoped"] = (tempOptions) =>
+    Effect.acquireRelease(makeTempDirectory(tempOptions), (directory) =>
+      remove(directory, { recursive: true, force: true }).pipe(Effect.ignore),
+    )
+
+  // Read-only file handle: enough for the read tool's stat/seek/readAlloc use.
+  const open: FileSystem.FileSystem["open"] = (file) =>
+    requireEntry("open", file).pipe(
+      Effect.map(([resolved]) => {
+        const position = { value: 0 }
+        const contentOf = () => {
+          const current = store.get(resolved)
+          return current?.type === "File" ? current.content : new Uint8Array()
+        }
+        return {
+          [FileSystem.FileTypeId]: FileSystem.FileTypeId,
+          fd: FileSystem.FileDescriptor(0),
+          stat: Effect.suspend(() => stat(resolved)),
+          seek: (offset, from) =>
+            Effect.sync(() => {
+              position.value = from === "start" ? Number(offset) : position.value + Number(offset)
+            }),
+          sync: Effect.void,
+          read: (buffer) =>
+            Effect.sync(() => {
+              const chunk = contentOf().subarray(position.value, position.value + buffer.length)
+              buffer.set(chunk)
+              position.value += chunk.length
+              return FileSystem.Size(chunk.length)
+            }),
+          readAlloc: (size) =>
+            Effect.sync(() => {
+              const chunk = contentOf().slice(position.value, position.value + Number(size))
+              position.value += chunk.length
+              return chunk.length === 0 ? Option.none() : Option.some(chunk)
+            }),
+          truncate: () => unimplemented("File.truncate"),
+          write: () => unimplemented("File.write"),
+          writeAll: () => unimplemented("File.writeAll"),
+        } satisfies FileSystem.File
+      }),
+    )
+
+  return FileSystem.make({
+    access,
+    chmod,
+    chown: () => unimplemented("chown"),
+    copy,
+    copyFile,
+    link: () => unimplemented("link"),
+    makeDirectory,
+    makeTempDirectory,
+    makeTempDirectoryScoped,
+    makeTempFile: () => unimplemented("makeTempFile"),
+    makeTempFileScoped: () => unimplemented("makeTempFileScoped"),
+    open,
+    readDirectory,
+    readFile,
+    readLink: () => unimplemented("readLink"),
+    realPath,
+    remove,
+    rename,
+    stat,
+    symlink: () => unimplemented("symlink"),
+    truncate: () => unimplemented("truncate"),
+    utimes: () => unimplemented("utimes"),
+    watch: () => Stream.die(new Error("SimulationFileSystem.watch is not implemented in simulation")),
+    writeFile,
+  })
+}
+
+/**
+ * Lazily constructed layer so the root defaults to `process.cwd()` at
+ * layer-build time (the simulation anchor directory), not at import time.
+ *
+ * When `OPENCODE_SIMULATION_STATE` points at a snapshot directory, its
+ * `project/` contents are read from the host once at build time and seeded
+ * into the in-memory tree, joined onto the anchor root.
+ */
+export const layer = (options?: Partial<Options>) =>
+  Layer.sync(FileSystem.FileSystem)(() =>
+    make({
+      root: options?.root ?? process.cwd(),
+      files: { ...loadSnapshotFiles(process.env.OPENCODE_SIMULATION_STATE), ...options?.files },
+    }),
+  )
+
+function loadSnapshotFiles(stateDirectory: string | undefined) {
+  if (!stateDirectory) return {}
+  const project = path.join(stateDirectory, "project")
+  if (!nodeFs.existsSync(project)) return {}
+  const files: Record<string, Uint8Array> = {}
+  const walk = (dir: string) => {
+    for (const entry of nodeFs.readdirSync(dir, { withFileTypes: true })) {
+      const file = path.join(dir, entry.name)
+      if (entry.isDirectory()) walk(file)
+      if (entry.isFile()) files[path.relative(project, file)] = new Uint8Array(nodeFs.readFileSync(file))
+    }
+  }
+  walk(project)
+  return files
+}
+
+function makeDirectoryEntry(): Entry {
+  return { type: "Directory", mode: 0o755, mtime: new Date() }
+}
+
+function withSep(dir: string) {
+  return dir.endsWith(path.sep) ? dir : dir + path.sep
+}
+
+function toInfo(entry: Entry): FileSystem.File.Info {
+  return {
+    type: entry.type,
+    mtime: Option.some(entry.mtime),
+    atime: Option.some(entry.mtime),
+    birthtime: Option.some(entry.mtime),
+    dev: 0,
+    ino: Option.none(),
+    mode: entry.mode,
+    nlink: Option.none(),
+    uid: Option.none(),
+    gid: Option.none(),
+    rdev: Option.none(),
+    size: FileSystem.Size(entry.type === "File" ? entry.content.length : 0),
+    blksize: Option.none(),
+    blocks: Option.none(),
+  }
+}
+
+function unimplemented(method: string) {
+  return Effect.die(new Error(`SimulationFileSystem.${method} is not implemented in simulation`))
+}
+
+export * as SimulationFileSystem from "./filesystem"
diff --git a/packages/simulation/src/backend/fs-util.ts b/packages/simulation/src/backend/fs-util.ts
new file mode 100644
index 0000000000..e24d0c9c4b
--- /dev/null
+++ b/packages/simulation/src/backend/fs-util.ts
@@ -0,0 +1,89 @@
+import { Effect, FileSystem, Layer } from "effect"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { Glob } from "@opencode-ai/core/util/glob"
+import { makeGlobalNode } from "@opencode-ai/core/effect/app-node"
+import { filesystem } from "@opencode-ai/core/effect/app-node-platform"
+import path from "path"
+
+/**
+ * Simulation replacement for `FSUtil`.
+ *
+ * The real `FSUtil` layer builds most helpers on the injected
+ * `FileSystem.FileSystem`, but `readDirectoryEntries`, `glob`, and `globUp`
+ * reach for node `fs/promises` and the `glob` package directly, and `resolve`
+ * canonicalizes through the host filesystem. This wraps the real layer and
+ * reroutes those through the injected `FileSystem`/lexical path resolution so
+ * every read observes the in-memory tree.
+ */
+
+const layer = Layer.effect(
+  FSUtil.Service,
+  Effect.gen(function* () {
+    const base = yield* FSUtil.Service
+    const fs = yield* FileSystem.FileSystem
+
+    const resolve = Effect.fn("SimulationFSUtil.resolve")(function* (input: string) {
+      return input
+    })
+
+    const readDirectoryEntries = Effect.fn("SimulationFSUtil.readDirectoryEntries")(function* (dirPath: string) {
+      const names = yield* fs.readDirectory(dirPath)
+      return yield* Effect.forEach(names, (name) =>
+        fs.stat(path.join(dirPath, name)).pipe(
+          Effect.map(
+            (info): FSUtil.DirEntry => ({
+              name,
+              type:
+                info.type === "Directory"
+                  ? "directory"
+                  : info.type === "File"
+                    ? "file"
+                    : info.type === "SymbolicLink"
+                      ? "symlink"
+                      : "other",
+            }),
+          ),
+          Effect.orElseSucceed((): FSUtil.DirEntry => ({ name, type: "other" })),
+        ),
+      )
+    })
+
+    const glob = Effect.fn("SimulationFSUtil.glob")(function* (pattern: string, options?: Glob.Options) {
+      const cwd = path.resolve(options?.cwd ?? process.cwd())
+      const entries = yield* fs
+        .readDirectory(cwd, { recursive: true })
+        .pipe(Effect.orElseSucceed(() => [] as string[]))
+      const matches = yield* Effect.forEach(entries, (entry) =>
+        fs.stat(path.join(cwd, entry)).pipe(
+          Effect.map((info) => ({ entry, type: info.type })),
+          Effect.orElseSucceed(() => undefined),
+        ),
+      )
+      return matches
+        .filter((item) => item !== undefined)
+        .filter((item) => options?.include === "all" || item.type === "File")
+        .filter((item) => Glob.match(pattern, item.entry))
+        .map((item) => (options?.absolute ? path.join(cwd, item.entry) : item.entry))
+        .sort((a, b) => a.localeCompare(b))
+    })
+
+    const globUp = Effect.fn("SimulationFSUtil.globUp")(function* (pattern: string, start: string, stop?: string) {
+      const result: string[] = []
+      let current = path.resolve(start)
+      while (true) {
+        result.push(...(yield* glob(pattern, { cwd: current, absolute: true, include: "file", dot: true })))
+        if (stop === current) break
+        const parent = path.dirname(current)
+        if (parent === current) break
+        current = parent
+      }
+      return result
+    })
+
+    return FSUtil.Service.of({ ...base, readDirectoryEntries, resolve, glob, globUp })
+  }),
+).pipe(Layer.provide(FSUtil.layer))
+
+export const node = makeGlobalNode({ service: FSUtil.Service, layer, deps: [filesystem] })
+
+export * as SimulationFSUtil from "./fs-util"
diff --git a/packages/simulation/src/backend/index.ts b/packages/simulation/src/backend/index.ts
new file mode 100644
index 0000000000..dd735d40dd
--- /dev/null
+++ b/packages/simulation/src/backend/index.ts
@@ -0,0 +1,41 @@
+import { LayerNode } from "@opencode-ai/core/effect/layer-node"
+import { filesystem, httpClient } from "@opencode-ai/core/effect/app-node-platform"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { SimulationControl } from "./control"
+import { SimulationFileSystem } from "./filesystem"
+import { SimulationFSUtil } from "./fs-util"
+import { SimulationNetwork } from "./network"
+import { SimulationOpenAI } from "./openai"
+
+/**
+ * Layer replacements applied when the server is built in simulation mode.
+ *
+ * The server merges these into the app node build when `OPENCODE_SIMULATION`
+ * is enabled, via a dynamic import so this module is never loaded eagerly.
+ *
+ * - Filesystem: in-memory tree rooted at `OPENCODE_SIMULATION_ROOT` (the real,
+ *   empty anchor directory the runner created and chdir'd into). Everything
+ *   under the root lives in memory; paths outside it fail loudly.
+ * - Network: all outbound HTTP resolves against the simulated route table;
+ *   unknown destinations are denied. The driver-answered OpenAI endpoint is
+ *   registered here as the first route.
+ *
+ * Loading this module also starts the backend simulation control WebSocket,
+ * which drivers connect to directly for LLM exchange control and network
+ * inspection (standalone topology; also the headless-simulation interface).
+ */
+
+SimulationNetwork.register(SimulationOpenAI.route)
+// ModelsDev dies when its catalog fetch fails, so simulation answers it with
+// an empty catalog; providers come from seeded config instead.
+SimulationNetwork.register(SimulationNetwork.json("GET", "https://models.dev/api.json", {}))
+
+SimulationControl.start()
+
+export const simulationReplacements: LayerNode.Replacements = [
+  [filesystem, SimulationFileSystem.layer({ root: process.env.OPENCODE_SIMULATION_ROOT })],
+  [FSUtil.node, SimulationFSUtil.node],
+  [httpClient, SimulationNetwork.layer],
+]
+
+export * as Simulation from "./index"
diff --git a/packages/simulation/src/backend/llm-exchange.ts b/packages/simulation/src/backend/llm-exchange.ts
new file mode 100644
index 0000000000..759f52866c
--- /dev/null
+++ b/packages/simulation/src/backend/llm-exchange.ts
@@ -0,0 +1,105 @@
+import { Effect, Queue } from "effect"
+
+/**
+ * Pending driver-answered LLM exchanges.
+ *
+ * When the simulated network receives a provider request it opens an
+ * exchange: the parsed request body plus a queue of response chunks. The
+ * simulation control WebSocket notifies the external driver, and the driver
+ * pushes chunks back until it finishes the exchange. The driver is the
+ * model; nothing is scripted or enqueued server-side.
+ *
+ * Process-global by design (plain module state, like the network route
+ * table): the simulated network and the control server must observe the same
+ * exchanges regardless of which layer instance touched them.
+ */
+
+/** One response item the driver sends back. Compiled to provider wire chunks by the endpoint. */
+export type Item =
+  | { readonly type: "textDelta"; readonly text: string }
+  | { readonly type: "reasoningDelta"; readonly text: string }
+  | { readonly type: "toolCall"; readonly id: string; readonly name: string; readonly input: unknown }
+  | { readonly type: "raw"; readonly chunk: unknown }
+
+export type FinishReason = "stop" | "tool-calls" | "length" | "content-filter"
+
+export type Chunk =
+  | { readonly type: "item"; readonly item: Item }
+  | { readonly type: "finish"; readonly reason: FinishReason }
+
+export interface Exchange {
+  readonly id: string
+  readonly url: string
+  readonly body: unknown
+  readonly queue: Queue.Queue<Chunk>
+}
+
+export interface OpenedExchange {
+  readonly id: string
+  readonly url: string
+  readonly body: unknown
+}
+
+const state = {
+  counter: 0,
+  exchanges: new Map<string, Exchange>(),
+  listeners: new Set<(exchange: OpenedExchange) => void>(),
+}
+
+export class ExchangeNotFoundError extends Error {
+  constructor(id: string) {
+    super(`Simulation LLM exchange not found or already finished: ${id}`)
+  }
+}
+
+/** Opens an exchange and notifies listeners. Called by the simulated provider endpoint. */
+export const open = (input: { readonly url: string; readonly body: unknown }) =>
+  Effect.gen(function* () {
+    const id = `ex_${++state.counter}`
+    const queue = yield* Queue.unbounded<Chunk>()
+    const exchange: Exchange = { id, url: input.url, body: input.body, queue }
+    state.exchanges.set(id, exchange)
+    for (const listener of state.listeners) listener({ id, url: input.url, body: input.body })
+    return exchange
+  })
+
+/** Closes an exchange without consuming remaining chunks (response interrupted or finished). */
+export const close = (id: string) =>
+  Effect.suspend(() => {
+    const exchange = state.exchanges.get(id)
+    state.exchanges.delete(id)
+    if (!exchange) return Effect.void
+    return Queue.shutdown(exchange.queue).pipe(Effect.asVoid)
+  })
+
+/** Appends response chunks to an open exchange. Driver-facing. */
+export const push = (id: string, chunks: readonly Chunk[]) =>
+  Effect.gen(function* () {
+    const exchange = state.exchanges.get(id)
+    if (!exchange) return yield* Effect.fail(new ExchangeNotFoundError(id))
+    yield* Queue.offerAll(exchange.queue, chunks)
+  })
+
+/**
+ * Registers a listener for newly opened exchanges and immediately replays
+ * currently-pending ones, so a late-attaching driver observes requests that
+ * arrived before it connected. Returns an unsubscribe function.
+ */
+export function subscribe(listener: (exchange: OpenedExchange) => void) {
+  state.listeners.add(listener)
+  for (const exchange of pending()) listener(exchange)
+  return () => {
+    state.listeners.delete(listener)
+  }
+}
+
+/** Snapshot of currently open exchanges, for control-surface inspection. */
+export function pending(): OpenedExchange[] {
+  return [...state.exchanges.values()].map((exchange) => ({
+    id: exchange.id,
+    url: exchange.url,
+    body: exchange.body,
+  }))
+}
+
+export * as SimulationLLMExchange from "./llm-exchange"
diff --git a/packages/simulation/src/backend/network.ts b/packages/simulation/src/backend/network.ts
new file mode 100644
index 0000000000..7b002fcb4e
--- /dev/null
+++ b/packages/simulation/src/backend/network.ts
@@ -0,0 +1,94 @@
+import { Effect, Layer } from "effect"
+import { HttpClient, HttpClientResponse } from "effect/unstable/http"
+import { HttpClientError, TransportError } from "effect/unstable/http/HttpClientError"
+import type { HttpClientRequest } from "effect/unstable/http"
+
+/**
+ * Simulated network.
+ *
+ * Replaces the `HttpClient.HttpClient` platform node in simulation mode. All
+ * outbound HTTP resolves against an in-memory route table; unknown
+ * destinations fail loudly with a transport error so no simulation run can
+ * silently reach the real network. The scripted LLM is one registered route,
+ * not a separate mechanism.
+ *
+ * The route table is process-global module state so the control surface and
+ * the client layer observe the same registrations.
+ */
+
+export interface Route {
+  /** Return a response effect to claim the request, undefined to pass. */
+  readonly match: (
+    request: HttpClientRequest.HttpClientRequest,
+    url: URL,
+  ) => Effect.Effect<HttpClientResponse.HttpClientResponse> | undefined
+}
+
+interface LogEntry {
+  readonly time: number
+  readonly method: string
+  readonly url: string
+  readonly matched: boolean
+}
+
+const state = {
+  routes: [] as Route[],
+  log: [] as LogEntry[],
+}
+
+const LOG_LIMIT = 1000
+
+export function register(route: Route) {
+  state.routes.push(route)
+  return () => {
+    const index = state.routes.indexOf(route)
+    if (index >= 0) state.routes.splice(index, 1)
+  }
+}
+
+/** Static JSON route: exact method + origin/path match answered with a fixed body. */
+export function json(method: string, url: string, body: unknown): Route {
+  return {
+    match: (request, requestUrl) => {
+      if (request.method !== method) return undefined
+      if (requestUrl.origin + requestUrl.pathname !== url) return undefined
+      return Effect.sync(() =>
+        HttpClientResponse.fromWeb(
+          request,
+          new Response(JSON.stringify(body), { status: 200, headers: { "content-type": "application/json" } }),
+        ),
+      )
+    },
+  }
+}
+
+export function log(): readonly LogEntry[] {
+  return state.log
+}
+
+function record(entry: LogEntry) {
+  state.log.push(entry)
+  if (state.log.length > LOG_LIMIT) state.log.splice(0, state.log.length - LOG_LIMIT)
+}
+
+export const layer = Layer.sync(HttpClient.HttpClient)(() =>
+  HttpClient.make((request, url) =>
+    Effect.suspend(() => {
+      const matched = state.routes
+        .map((route) => route.match(request, url))
+        .find((response) => response !== undefined)
+      record({ time: Date.now(), method: request.method, url: url.toString(), matched: matched !== undefined })
+      if (matched) return matched
+      return Effect.fail(
+        new HttpClientError({
+          reason: new TransportError({
+            request,
+            description: `Simulation denied unregistered network destination: ${request.method} ${url}`,
+          }),
+        }),
+      )
+    }),
+  ),
+)
+
+export * as SimulationNetwork from "./network"
diff --git a/packages/simulation/src/backend/openai.ts b/packages/simulation/src/backend/openai.ts
new file mode 100644
index 0000000000..c13e7772ef
--- /dev/null
+++ b/packages/simulation/src/backend/openai.ts
@@ -0,0 +1,89 @@
+import { Effect, Schema, Stream } from "effect"
+import { HttpClientResponse } from "effect/unstable/http"
+import { OpenAIChatEvent, DEFAULT_BASE_URL, PATH } from "@opencode-ai/llm/protocols/openai-chat"
+import { SimulationLLMExchange } from "./llm-exchange"
+import { SimulationNetwork } from "./network"
+
+/**
+ * Driver-answered OpenAI endpoint for the simulated network.
+ *
+ * Claims `POST {DEFAULT_BASE_URL}{PATH}` (the real openai-chat route
+ * endpoint), opens an LLM exchange, and streams the driver's chunks back as
+ * an OpenAI Chat SSE response terminated by `[DONE]`. Everything downstream
+ * of the response bytes is the real pipeline: SSE framing, the OpenAIChat
+ * event schema, the protocol state machine, and Lifecycle grammar.
+ */
+
+const encodeChunk = Schema.encodeUnknownSync(OpenAIChatEvent)
+
+const encoder = new TextEncoder()
+
+// The simulated model id is echoed back only in non-schema fields; the
+// protocol event schema ignores unknown fields, so id/object/model are
+// decorative wire realism.
+function chunkOf(item: SimulationLLMExchange.Item): OpenAIChatEvent | unknown {
+  if (item.type === "textDelta") return { choices: [{ delta: { content: item.text } }] }
+  if (item.type === "reasoningDelta") return { choices: [{ delta: { reasoning_content: item.text } }] }
+  if (item.type === "toolCall")
+    return {
+      choices: [
+        {
+          delta: {
+            tool_calls: [
+              { index: 0, id: item.id, function: { name: item.name, arguments: JSON.stringify(item.input) } },
+            ],
+          },
+        },
+      ],
+    }
+  return item.chunk
+}
+
+const finishReasonWire: Record<SimulationLLMExchange.FinishReason, string> = {
+  stop: "stop",
+  "tool-calls": "tool_calls",
+  length: "length",
+  "content-filter": "content_filter",
+}
+
+function frame(payload: unknown): Uint8Array {
+  return encoder.encode(`data: ${JSON.stringify(payload)}\n\n`)
+}
+
+function sseBody(exchange: SimulationLLMExchange.Exchange): Stream.Stream<Uint8Array> {
+  const chunks = Stream.fromQueue(exchange.queue).pipe(
+    Stream.takeUntil((chunk) => chunk.type === "finish"),
+    Stream.map((chunk) => {
+      if (chunk.type === "finish")
+        return frame(encodeChunk({ choices: [{ delta: {}, finish_reason: finishReasonWire[chunk.reason] }] }))
+      if (chunk.item.type === "raw") return frame(chunk.item.chunk)
+      return frame(encodeChunk(chunkOf(chunk.item)))
+    }),
+  )
+  return chunks.pipe(
+    Stream.concat(Stream.make(encoder.encode("data: [DONE]\n\n"))),
+    // Close the exchange when the response body ends or is interrupted, so
+    // late driver pushes fail with ExchangeNotFoundError instead of leaking.
+    Stream.ensuring(SimulationLLMExchange.close(exchange.id)),
+  )
+}
+
+export const route: SimulationNetwork.Route = {
+  match: (request, url) => {
+    if (request.method !== "POST") return undefined
+    if (url.origin + url.pathname !== DEFAULT_BASE_URL + PATH) return undefined
+    return Effect.gen(function* () {
+      const body = request.body._tag === "Uint8Array" ? JSON.parse(new TextDecoder().decode(request.body.body)) : {}
+      const exchange = yield* SimulationLLMExchange.open({ url: url.toString(), body })
+      return HttpClientResponse.fromWeb(
+        request,
+        new Response(Stream.toReadableStream(sseBody(exchange)), {
+          status: 200,
+          headers: { "content-type": "text/event-stream" },
+        }),
+      )
+    })
+  },
+}
+
+export * as SimulationOpenAI from "./openai"
diff --git a/packages/tui/src/simulation/actions.ts b/packages/simulation/src/frontend/actions.ts
similarity index 100%
rename from packages/tui/src/simulation/actions.ts
rename to packages/simulation/src/frontend/actions.ts
diff --git a/packages/tui/src/simulation/renderer.ts b/packages/simulation/src/frontend/renderer.ts
similarity index 100%
rename from packages/tui/src/simulation/renderer.ts
rename to packages/simulation/src/frontend/renderer.ts
diff --git a/packages/tui/src/simulation/server.ts b/packages/simulation/src/frontend/server.ts
similarity index 100%
rename from packages/tui/src/simulation/server.ts
rename to packages/simulation/src/frontend/server.ts
diff --git a/packages/tui/src/simulation/simulation.ts b/packages/simulation/src/frontend/simulation.ts
similarity index 100%
rename from packages/tui/src/simulation/simulation.ts
rename to packages/simulation/src/frontend/simulation.ts
diff --git a/packages/tui/src/simulation/trace.ts b/packages/simulation/src/frontend/trace.ts
similarity index 100%
rename from packages/tui/src/simulation/trace.ts
rename to packages/simulation/src/frontend/trace.ts
diff --git a/packages/simulation/tsconfig.json b/packages/simulation/tsconfig.json
new file mode 100644
index 0000000000..00ef125468
--- /dev/null
+++ b/packages/simulation/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "extends": "@tsconfig/bun/tsconfig.json",
+  "compilerOptions": {
+    "lib": ["ESNext", "DOM", "DOM.Iterable"],
+    "noUncheckedIndexedAccess": false
+  }
+}
diff --git a/packages/tui/package.json b/packages/tui/package.json
index 8bf349c2da..4dade71898 100644
--- a/packages/tui/package.json
+++ b/packages/tui/package.json
@@ -51,6 +51,7 @@
     "@opencode-ai/core": "workspace:*",
     "@opencode-ai/plugin": "workspace:*",
     "@opencode-ai/sdk": "workspace:*",
+    "@opencode-ai/simulation": "workspace:*",
     "@opencode-ai/ui": "workspace:*",
     "@opentui/core": "catalog:",
     "@opentui/keymap": "catalog:",
diff --git a/packages/tui/src/app.tsx b/packages/tui/src/app.tsx
index 876faff9de..d5cf93c2c7 100644
--- a/packages/tui/src/app.tsx
+++ b/packages/tui/src/app.tsx
@@ -200,8 +200,8 @@ export const run = Effect.fn("Tui.run")(function* (input: TuiInput) {
               },
             } satisfies CliRendererConfig
 
-            if (process.env.OPENCODE_SIMULATION === "1" || process.env.OPENCODE_SIMULATION === "true") {
-              const { Simulation } = await import("./simulation/simulation")
+            if (!!process.env.OPENCODE_SIMULATION) {
+              const { Simulation } = await import("@opencode-ai/simulation/frontend")
               return Simulation.createSimulation(options)
             }
 

From 394e0b9045d08e334463aeeb4f80fd231d74c848 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Fri, 3 Jul 2026 14:25:59 -0400
Subject: [PATCH 20/82] refactor(schema): rename V2 session events and
 normalize payloads (#35217)

---
 .../client/src/promise/generated/types.ts     |  509 +++--
 packages/client/test/effect.test.ts           |   29 +-
 packages/client/test/promise.test.ts          |   11 +-
 packages/core/schema.json                     |   14 +-
 .../core/src/control-plane/move-session.ts    |    3 +-
 packages/core/src/database/migration.gen.ts   |    2 +
 ...60703090000_reset_v2_event_rename_sweep.ts |   17 +
 .../20260703181610_event_created_column.ts    |   11 +
 packages/core/src/database/schema.gen.ts      |    1 +
 packages/core/src/event.ts                    |    9 +-
 packages/core/src/event/sql.ts                |    1 +
 packages/core/src/session.ts                  |   20 +-
 packages/core/src/session/compaction.ts       |    7 +-
 .../core/src/session/context-checkpoint.ts    |    5 +-
 packages/core/src/session/execution/local.ts  |    1 -
 packages/core/src/session/input.ts            |   27 +-
 packages/core/src/session/instructions.ts     |    8 +-
 packages/core/src/session/message-updater.ts  |  138 +-
 packages/core/src/session/projector.ts        |   61 +-
 packages/core/src/session/revert.ts           |    3 -
 packages/core/src/session/runner/llm.ts       |    2 -
 .../src/session/runner/publish-llm-event.ts   |   16 -
 packages/core/src/session/title.ts            |    8 +-
 packages/core/test/database-migration.test.ts |    2 +-
 packages/core/test/event.test.ts              |   32 +-
 packages/core/test/session-compact.test.ts    |   10 +-
 packages/core/test/session-create.test.ts     |   17 +-
 .../core/test/session-instructions.test.ts    |    2 -
 packages/core/test/session-log.test.ts        |    4 +-
 packages/core/test/session-projector.test.ts  |   70 +-
 packages/core/test/session-prompt.test.ts     |   32 +-
 .../core/test/session-runner-message.test.ts  |    4 +-
 .../core/test/session-runner-recorded.test.ts |   12 +-
 .../test/session-runner-tool-events.test.ts   |   11 +-
 packages/core/test/session-runner.test.ts     |   58 +-
 packages/core/test/session-title.test.ts      |   10 +-
 .../core/test/session-tool-progress.test.ts   |    7 -
 packages/core/test/shared-schema.test.ts      |    4 +-
 packages/core/test/tool-shell.test.ts         |    4 -
 packages/core/test/tool-subagent.test.ts      |    4 -
 .../src/cli/cmd/run/noninteractive.ts         |   42 +-
 .../opencode/src/cli/cmd/run/session-data.ts  |    4 +-
 .../src/cli/cmd/run/stream-v2.subagent.ts     |   60 +-
 .../src/cli/cmd/run/stream-v2.transport.ts    |   73 +-
 .../test/cli/run/noninteractive.test.ts       |   18 +-
 .../test/cli/run/session-data.test.ts         |   12 +-
 .../test/cli/run/stream-v2.transport.test.ts  |  167 +-
 .../test/v2/session-message-updater.test.ts   |   64 +-
 packages/schema/src/event.ts                  |    5 +-
 packages/schema/src/session-event.ts          |  119 +-
 packages/schema/src/session-message.ts        |   24 +-
 packages/schema/test/event-manifest.test.ts   |   68 +-
 packages/sdk-next/test/embedded.test.ts       |   12 +-
 packages/sdk/js/script/build.ts               |   14 +-
 packages/sdk/js/src/v2/gen/types.gen.ts       | 1732 ++++++++---------
 packages/tui/src/context/data.tsx             |  160 +-
 .../feature-plugins/system/notifications.ts   |   16 +-
 packages/tui/src/routes/session/rows.ts       |   44 +-
 .../test/cli/cmd/tui/notifications.test.ts    |   34 +-
 packages/tui/test/cli/tui/data.test.tsx       |  103 +-
 packages/tui/test/cli/tui/use-event.test.tsx  |    2 +
 specs/v2/schema-changelog.md                  |   14 +
 specs/v2/session.md                           |    6 +-
 63 files changed, 1939 insertions(+), 2040 deletions(-)
 create mode 100644 packages/core/src/database/migration/20260703090000_reset_v2_event_rename_sweep.ts
 create mode 100644 packages/core/src/database/migration/20260703181610_event_created_column.ts

diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts
index 798155e88e..13dab421d5 100644
--- a/packages/client/src/promise/generated/types.ts
+++ b/packages/client/src/promise/generated/types.ts
@@ -1107,74 +1107,75 @@ export type SessionLogOutput =
   | (
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.agent.switched"
+          readonly type: "agent.selected"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
-          readonly data: {
-            readonly timestamp: number
-            readonly sessionID: string
-            readonly messageID: string
-            readonly agent: string
-          }
+          readonly data: { readonly sessionID: string; readonly agent: string }
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.model.switched"
+          readonly type: "model.selected"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
-            readonly messageID: string
             readonly model: { readonly id: string; readonly providerID: string; readonly variant?: string }
           }
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.moved"
+          readonly type: "session.moved"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
             readonly location: { readonly directory: string; readonly workspaceID?: string }
-            readonly subdirectory?: string
+            readonly subpath?: string
           }
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.renamed"
+          readonly type: "renamed"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
-          readonly data: { readonly timestamp: number; readonly sessionID: string; readonly title: string }
+          readonly data: { readonly sessionID: string; readonly title: string }
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.forked"
+          readonly type: "forked"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
-          readonly data: {
-            readonly timestamp: number
-            readonly sessionID: string
-            readonly parentID: string
-            readonly messageID?: string
-          }
+          readonly data: { readonly sessionID: string; readonly parentID: string; readonly from?: string }
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.prompted"
+          readonly type: "prompt.promoted"
+          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+          readonly location?: { readonly directory: string; readonly workspaceID?: string }
+          readonly data: { readonly sessionID: string; readonly inputID: string }
+        }
+      | {
+          readonly id: string
+          readonly created: number
+          readonly metadata?: { readonly [x: string]: unknown }
+          readonly type: "prompt.admitted"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
-            readonly messageID: string
+            readonly inputID: string
             readonly prompt: {
               readonly text: string
               readonly files?: ReadonlyArray<{
@@ -1194,54 +1195,22 @@ export type SessionLogOutput =
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.prompt.admitted"
+          readonly type: "session.context.updated"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
-          readonly data: {
-            readonly timestamp: number
-            readonly sessionID: string
-            readonly messageID: string
-            readonly prompt: {
-              readonly text: string
-              readonly files?: ReadonlyArray<{
-                readonly uri: string
-                readonly mime: string
-                readonly name?: string
-                readonly description?: string
-                readonly source?: { readonly start: number; readonly end: number; readonly text: string }
-              }>
-              readonly agents?: ReadonlyArray<{
-                readonly name: string
-                readonly source?: { readonly start: number; readonly end: number; readonly text: string }
-              }>
-            }
-            readonly delivery: "steer" | "queue"
-          }
+          readonly data: { readonly sessionID: string; readonly text: string }
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.context.updated"
+          readonly type: "synthetic"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
-            readonly messageID: string
-            readonly text: string
-          }
-        }
-      | {
-          readonly id: string
-          readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.synthetic"
-          readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-          readonly location?: { readonly directory: string; readonly workspaceID?: string }
-          readonly data: {
-            readonly timestamp: number
-            readonly sessionID: string
-            readonly messageID: string
             readonly text: string
             readonly description?: string
             readonly metadata?: { readonly [x: string]: unknown }
@@ -1249,53 +1218,39 @@ export type SessionLogOutput =
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.skill.activated"
+          readonly type: "skill.activated"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
-          readonly data: {
-            readonly timestamp: number
-            readonly sessionID: string
-            readonly messageID: string
-            readonly name: string
-            readonly text: string
-          }
+          readonly data: { readonly sessionID: string; readonly name: string; readonly text: string }
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.shell.started"
+          readonly type: "shell.started"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
-          readonly data: {
-            readonly timestamp: number
-            readonly sessionID: string
-            readonly messageID: string
-            readonly callID: string
-            readonly command: string
-          }
+          readonly data: { readonly sessionID: string; readonly callID: string; readonly command: string }
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.shell.ended"
+          readonly type: "shell.ended"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
-          readonly data: {
-            readonly timestamp: number
-            readonly sessionID: string
-            readonly callID: string
-            readonly output: string
-          }
+          readonly data: { readonly sessionID: string; readonly callID: string; readonly output: string }
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.step.started"
+          readonly type: "step.started"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
             readonly assistantMessageID: string
             readonly agent: string
@@ -1305,12 +1260,12 @@ export type SessionLogOutput =
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.step.ended"
+          readonly type: "step.ended"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
             readonly assistantMessageID: string
             readonly finish: string
@@ -1327,12 +1282,12 @@ export type SessionLogOutput =
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.step.failed"
+          readonly type: "step.failed"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
             readonly assistantMessageID: string
             readonly error: { readonly type: "unknown"; readonly message: string }
@@ -1340,25 +1295,21 @@ export type SessionLogOutput =
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.text.started"
+          readonly type: "text.started"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
-          readonly data: {
-            readonly timestamp: number
-            readonly sessionID: string
-            readonly assistantMessageID: string
-            readonly textID: string
-          }
+          readonly data: { readonly sessionID: string; readonly assistantMessageID: string; readonly textID: string }
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.text.ended"
+          readonly type: "text.ended"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
             readonly assistantMessageID: string
             readonly textID: string
@@ -1367,12 +1318,12 @@ export type SessionLogOutput =
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.reasoning.started"
+          readonly type: "reasoning.started"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
             readonly assistantMessageID: string
             readonly reasoningID: string
@@ -1381,12 +1332,12 @@ export type SessionLogOutput =
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.reasoning.ended"
+          readonly type: "reasoning.ended"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
             readonly assistantMessageID: string
             readonly reasoningID: string
@@ -1396,12 +1347,12 @@ export type SessionLogOutput =
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.tool.input.started"
+          readonly type: "tool.input.started"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
             readonly assistantMessageID: string
             readonly callID: string
@@ -1410,12 +1361,12 @@ export type SessionLogOutput =
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.tool.input.ended"
+          readonly type: "tool.input.ended"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
             readonly assistantMessageID: string
             readonly callID: string
@@ -1424,12 +1375,12 @@ export type SessionLogOutput =
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.tool.called"
+          readonly type: "tool.called"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
             readonly assistantMessageID: string
             readonly callID: string
@@ -1443,12 +1394,12 @@ export type SessionLogOutput =
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.tool.progress"
+          readonly type: "tool.progress"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
             readonly assistantMessageID: string
             readonly callID: string
@@ -1461,12 +1412,12 @@ export type SessionLogOutput =
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.tool.success"
+          readonly type: "tool.success"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
             readonly assistantMessageID: string
             readonly callID: string
@@ -1485,12 +1436,12 @@ export type SessionLogOutput =
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.tool.failed"
+          readonly type: "tool.failed"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
             readonly assistantMessageID: string
             readonly callID: string
@@ -1504,12 +1455,12 @@ export type SessionLogOutput =
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.retried"
+          readonly type: "retried"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
             readonly attempt: number
             readonly error: {
@@ -1524,27 +1475,22 @@ export type SessionLogOutput =
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.compaction.started"
+          readonly type: "compaction.started"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
-          readonly data: {
-            readonly timestamp: number
-            readonly sessionID: string
-            readonly messageID: string
-            readonly reason: "auto" | "manual"
-          }
+          readonly data: { readonly sessionID: string; readonly reason: "auto" | "manual" }
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.compaction.ended"
+          readonly type: "compaction.ended"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
-            readonly messageID: string
             readonly reason: "auto" | "manual"
             readonly text: string
             readonly recent: string
@@ -1552,12 +1498,12 @@ export type SessionLogOutput =
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.revert.staged"
+          readonly type: "revert.staged"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
-            readonly timestamp: number
             readonly sessionID: string
             readonly revert: {
               readonly messageID: string
@@ -1576,19 +1522,21 @@ export type SessionLogOutput =
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.revert.cleared"
+          readonly type: "revert.cleared"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
-          readonly data: { readonly timestamp: number; readonly sessionID: string }
+          readonly data: { readonly sessionID: string }
         }
       | {
           readonly id: string
+          readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "session.next.revert.committed"
+          readonly type: "revert.committed"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
-          readonly data: { readonly timestamp: number; readonly sessionID: string; readonly messageID: string }
+          readonly data: { readonly sessionID: string; readonly messageID: string }
         }
     )
   | { readonly type: "log.synced"; readonly aggregateID: string; readonly seq?: number }
@@ -3771,6 +3719,7 @@ export type SkillListOutput = {
 export type EventSubscribeOutput =
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "models-dev.refreshed"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -3778,6 +3727,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "integration.updated"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -3785,6 +3735,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "integration.connection.updated"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -3792,6 +3743,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "catalog.updated"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -3799,6 +3751,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "agent.updated"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -3806,6 +3759,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.created"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
@@ -3867,6 +3821,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.updated"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
@@ -3928,6 +3883,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.deleted"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
@@ -3989,6 +3945,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "message.updated"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
@@ -4093,6 +4050,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "message.removed"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
@@ -4101,6 +4059,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "message.part.updated"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
@@ -4339,6 +4298,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "message.part.removed"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
@@ -4347,74 +4307,75 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.agent.switched"
+      readonly type: "agent.selected"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly agent: string
-      }
+      readonly data: { readonly sessionID: string; readonly agent: string }
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.model.switched"
+      readonly type: "model.selected"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
-        readonly messageID: string
         readonly model: { readonly id: string; readonly providerID: string; readonly variant?: string }
       }
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.moved"
+      readonly type: "session.moved"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly location: { readonly directory: string; readonly workspaceID?: string }
-        readonly subdirectory?: string
+        readonly subpath?: string
       }
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.renamed"
+      readonly type: "renamed"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly timestamp: number; readonly sessionID: string; readonly title: string }
+      readonly data: { readonly sessionID: string; readonly title: string }
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.forked"
+      readonly type: "forked"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly parentID: string
-        readonly messageID?: string
-      }
+      readonly data: { readonly sessionID: string; readonly parentID: string; readonly from?: string }
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.prompted"
+      readonly type: "prompt.promoted"
+      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly location?: { readonly directory: string; readonly workspaceID?: string }
+      readonly data: { readonly sessionID: string; readonly inputID: string }
+    }
+  | {
+      readonly id: string
+      readonly created: number
+      readonly metadata?: { readonly [x: string]: unknown }
+      readonly type: "prompt.admitted"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
-        readonly messageID: string
+        readonly inputID: string
         readonly prompt: {
           readonly text: string
           readonly files?: ReadonlyArray<{
@@ -4434,38 +4395,11 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.prompt.admitted"
-      readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
+      readonly type: "execution.settled"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly prompt: {
-          readonly text: string
-          readonly files?: ReadonlyArray<{
-            readonly uri: string
-            readonly mime: string
-            readonly name?: string
-            readonly description?: string
-            readonly source?: { readonly start: number; readonly end: number; readonly text: string }
-          }>
-          readonly agents?: ReadonlyArray<{
-            readonly name: string
-            readonly source?: { readonly start: number; readonly end: number; readonly text: string }
-          }>
-        }
-        readonly delivery: "steer" | "queue"
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.execution.settled"
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly outcome: "success" | "failure" | "interrupted"
         readonly error?: { readonly type: "unknown"; readonly message: string }
@@ -4473,27 +4407,22 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.context.updated"
+      readonly type: "session.context.updated"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly text: string
-      }
+      readonly data: { readonly sessionID: string; readonly text: string }
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.synthetic"
+      readonly type: "synthetic"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
-        readonly messageID: string
         readonly text: string
         readonly description?: string
         readonly metadata?: { readonly [x: string]: unknown }
@@ -4501,53 +4430,39 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.skill.activated"
+      readonly type: "skill.activated"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly name: string
-        readonly text: string
-      }
+      readonly data: { readonly sessionID: string; readonly name: string; readonly text: string }
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.shell.started"
+      readonly type: "shell.started"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly callID: string
-        readonly command: string
-      }
+      readonly data: { readonly sessionID: string; readonly callID: string; readonly command: string }
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.shell.ended"
+      readonly type: "shell.ended"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly callID: string
-        readonly output: string
-      }
+      readonly data: { readonly sessionID: string; readonly callID: string; readonly output: string }
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.step.started"
+      readonly type: "step.started"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly assistantMessageID: string
         readonly agent: string
@@ -4557,12 +4472,12 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.step.ended"
+      readonly type: "step.ended"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly assistantMessageID: string
         readonly finish: string
@@ -4579,12 +4494,12 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.step.failed"
+      readonly type: "step.failed"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly assistantMessageID: string
         readonly error: { readonly type: "unknown"; readonly message: string }
@@ -4592,24 +4507,20 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.text.started"
+      readonly type: "text.started"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly assistantMessageID: string
-        readonly textID: string
-      }
+      readonly data: { readonly sessionID: string; readonly assistantMessageID: string; readonly textID: string }
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.text.delta"
+      readonly type: "text.delta"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly assistantMessageID: string
         readonly textID: string
@@ -4618,12 +4529,12 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.text.ended"
+      readonly type: "text.ended"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly assistantMessageID: string
         readonly textID: string
@@ -4632,12 +4543,12 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.reasoning.started"
+      readonly type: "reasoning.started"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly assistantMessageID: string
         readonly reasoningID: string
@@ -4646,11 +4557,11 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.reasoning.delta"
+      readonly type: "reasoning.delta"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly assistantMessageID: string
         readonly reasoningID: string
@@ -4659,12 +4570,12 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.reasoning.ended"
+      readonly type: "reasoning.ended"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly assistantMessageID: string
         readonly reasoningID: string
@@ -4674,12 +4585,12 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.tool.input.started"
+      readonly type: "tool.input.started"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly assistantMessageID: string
         readonly callID: string
@@ -4688,11 +4599,11 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.tool.input.delta"
+      readonly type: "tool.input.delta"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly assistantMessageID: string
         readonly callID: string
@@ -4701,12 +4612,12 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.tool.input.ended"
+      readonly type: "tool.input.ended"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly assistantMessageID: string
         readonly callID: string
@@ -4715,12 +4626,12 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.tool.called"
+      readonly type: "tool.called"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly assistantMessageID: string
         readonly callID: string
@@ -4734,12 +4645,12 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.tool.progress"
+      readonly type: "tool.progress"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly assistantMessageID: string
         readonly callID: string
@@ -4752,12 +4663,12 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.tool.success"
+      readonly type: "tool.success"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly assistantMessageID: string
         readonly callID: string
@@ -4776,12 +4687,12 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.tool.failed"
+      readonly type: "tool.failed"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly assistantMessageID: string
         readonly callID: string
@@ -4795,12 +4706,12 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.retried"
+      readonly type: "retried"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly attempt: number
         readonly error: {
@@ -4815,39 +4726,30 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.compaction.started"
+      readonly type: "compaction.started"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly reason: "auto" | "manual"
-      }
+      readonly data: { readonly sessionID: string; readonly reason: "auto" | "manual" }
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.compaction.delta"
+      readonly type: "compaction.delta"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly text: string
-      }
+      readonly data: { readonly sessionID: string; readonly text: string }
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.compaction.ended"
+      readonly type: "compaction.ended"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
-        readonly messageID: string
         readonly reason: "auto" | "manual"
         readonly text: string
         readonly recent: string
@@ -4855,12 +4757,12 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.revert.staged"
+      readonly type: "revert.staged"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
-        readonly timestamp: number
         readonly sessionID: string
         readonly revert: {
           readonly messageID: string
@@ -4879,22 +4781,25 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.revert.cleared"
+      readonly type: "revert.cleared"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly timestamp: number; readonly sessionID: string }
+      readonly data: { readonly sessionID: string }
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.revert.committed"
+      readonly type: "revert.committed"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly timestamp: number; readonly sessionID: string; readonly messageID: string }
+      readonly data: { readonly sessionID: string; readonly messageID: string }
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "file.edited"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -4902,6 +4807,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "reference.updated"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -4909,6 +4815,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "permission.v2.asked"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -4924,6 +4831,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "permission.v2.replied"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -4935,6 +4843,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "plugin.added"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -4942,6 +4851,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "project.directories.updated"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -4949,6 +4859,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "command.updated"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -4956,6 +4867,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "skill.updated"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -4963,6 +4875,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "file.watcher.updated"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -4970,6 +4883,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "pty.created"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -4988,6 +4902,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "pty.updated"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5006,6 +4921,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "pty.exited"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5013,6 +4929,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "pty.deleted"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5020,6 +4937,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "shell.created"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5040,6 +4958,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "shell.exited"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5051,6 +4970,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "shell.deleted"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5058,6 +4978,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "question.v2.asked"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5076,6 +4997,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "question.v2.replied"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5087,6 +5009,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "question.v2.rejected"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5094,6 +5017,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "form.created"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5208,6 +5132,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "form.replied"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5219,6 +5144,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "form.cancelled"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5226,6 +5152,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "todo.updated"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5236,6 +5163,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.status"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5262,6 +5190,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.idle"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5269,6 +5198,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "tui.prompt.append"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5276,6 +5206,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "tui.command.execute"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5303,6 +5234,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "tui.toast.show"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5315,6 +5247,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "tui.session.select"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5322,6 +5255,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "installation.updated"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5329,6 +5263,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "installation.update-available"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5336,6 +5271,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "vcs.branch.updated"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5343,6 +5279,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "mcp.status.changed"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5350,6 +5287,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "permission.asked"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5365,6 +5303,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "permission.replied"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5376,6 +5315,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "question.asked"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5394,6 +5334,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "question.replied"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5405,6 +5346,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "question.rejected"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
@@ -5412,6 +5354,7 @@ export type EventSubscribeOutput =
     }
   | {
       readonly id: string
+      readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
       readonly type: "session.error"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
diff --git a/packages/client/test/effect.test.ts b/packages/client/test/effect.test.ts
index 445a9cf3de..5a7ec9b7cc 100644
--- a/packages/client/test/effect.test.ts
+++ b/packages/client/test/effect.test.ts
@@ -1,7 +1,17 @@
 import { expect, test } from "bun:test"
 import { DateTime, Effect, Stream } from "effect"
 import { HttpClient, HttpClientResponse } from "effect/unstable/http"
-import { AbsolutePath, Agent, Event, Location, Model, OpenCode, Prompt, Session, SessionMessage } from "../src/effect/index"
+import {
+  AbsolutePath,
+  Agent,
+  Event,
+  Location,
+  Model,
+  OpenCode,
+  Prompt,
+  Session,
+  SessionMessage,
+} from "../src/effect/index"
 
 const synced = { type: "log.synced" as const, aggregateID: "ses_test", seq: Event.Seq.make(1) }
 
@@ -23,7 +33,7 @@ test("event.subscribe exposes and decodes the native Effect event stream", async
       HttpClientResponse.fromWeb(
         request,
         new Response(
-          `data: ${JSON.stringify({ id: "evt_connected", type: "server.connected", data: {} })}\n\n` +
+          `data: ${JSON.stringify({ id: "evt_connected", created: 0, type: "server.connected", data: {} })}\n\n` +
             `data: ${JSON.stringify(modelSwitchedEvent)}\n\n`,
           { headers: { "content-type": "text/event-stream" } },
         ),
@@ -35,10 +45,10 @@ test("event.subscribe exposes and decodes the native Effect event stream", async
     return yield* client.event.subscribe().pipe(Stream.runCollect)
   }).pipe(Effect.provideService(HttpClient.HttpClient, httpClient), Effect.runPromise)
 
-  expect(Array.from(events).map((event) => event.type)).toEqual(["server.connected", "session.next.model.switched"])
+  expect(Array.from(events).map((event) => event.type)).toEqual(["server.connected", "model.selected"])
   const durable = events[1]
-  if (durable?.type !== "session.next.model.switched") throw new Error("Expected model event")
-  expect(DateTime.toEpochMillis(durable.data.timestamp)).toBe(1_717_171_717_000)
+  if (durable?.type !== "model.selected") throw new Error("Expected model event")
+  expect(DateTime.toEpochMillis(durable.created)).toBe(1_717_171_717_000)
   expect(durable.durable).toEqual({ aggregateID: "ses_test", seq: 1, version: 1 })
 })
 
@@ -149,8 +159,8 @@ test("session methods retain decoded Effect inputs and outputs", async () => {
   expect(result.context).toEqual([])
   expect(logQueries[0]).toEqual({ after: "0" })
   const logged = Array.from(result.log)
-  expect(logged.map((item) => item.type)).toEqual(["session.next.model.switched", "log.synced"])
-  expect(logged[0]?.type === "session.next.model.switched" && DateTime.toEpochMillis(logged[0].data.timestamp)).toBe(
+  expect(logged.map((item) => item.type)).toEqual(["model.selected", "log.synced"])
+  expect(logged[0]?.type === "model.selected" && DateTime.toEpochMillis(logged[0].created)).toBe(
     1_717_171_717_000,
   )
   expect(logged.at(-1)).toEqual(synced)
@@ -217,12 +227,11 @@ const modelSwitchedMessage = {
 
 const modelSwitchedEvent = {
   id: "evt_model",
-  type: "session.next.model.switched",
+  created: 1_717_171_717_000,
+  type: "model.selected",
   durable: { aggregateID: "ses_test", seq: 1, version: 1 },
   data: {
-    timestamp: 1_717_171_717_000,
     sessionID: "ses_test",
-    messageID: "msg_model",
     model: { id: "claude", providerID: "anthropic" },
   },
 }
diff --git a/packages/client/test/promise.test.ts b/packages/client/test/promise.test.ts
index 030b761fa6..9e8ea7acfe 100644
--- a/packages/client/test/promise.test.ts
+++ b/packages/client/test/promise.test.ts
@@ -151,7 +151,7 @@ test("event.subscribe exposes the Promise event stream wire projection", async (
     baseUrl: "http://localhost:3000",
     fetch: async () =>
       new Response(
-        `: heartbeat\n\ndata: ${JSON.stringify({ id: "evt_connected", type: "server.connected", data: {} })}\n\n` +
+        `: heartbeat\n\ndata: ${JSON.stringify({ id: "evt_connected", created: 0, type: "server.connected", data: {} })}\n\n` +
           `data: ${JSON.stringify(modelSwitchedEvent)}\n\n`,
         { headers: { "content-type": "text/event-stream" } },
       ),
@@ -159,8 +159,8 @@ test("event.subscribe exposes the Promise event stream wire projection", async (
   const events = []
   for await (const event of client.event.subscribe()) events.push(event)
 
-  expect(events).toEqual([{ id: "evt_connected", type: "server.connected", data: {} }, modelSwitchedEvent])
-  expect(events[1]?.type === "session.next.model.switched" && events[1].data.timestamp).toBe(1_717_171_717_000)
+  expect(events).toEqual([{ id: "evt_connected", created: 0, type: "server.connected", data: {} }, modelSwitchedEvent])
+  expect(events[1]?.type === "model.selected" && events[1].created).toBe(1_717_171_717_000)
 })
 
 test("event.subscribe terminates on malformed Promise SSE data", async () => {
@@ -328,12 +328,11 @@ const synced = { type: "log.synced", aggregateID: "ses_test", seq: 1 }
 
 const modelSwitchedEvent = {
   id: "evt_model",
-  type: "session.next.model.switched",
+  created: 1_717_171_717_000,
+  type: "model.selected",
   durable: { aggregateID: "ses_test", seq: 1, version: 1 },
   data: {
-    timestamp: 1_717_171_717_000,
     sessionID: "ses_test",
-    messageID: "msg_model",
     model: { id: "claude", providerID: "anthropic" },
   },
 }
diff --git a/packages/core/schema.json b/packages/core/schema.json
index e8a2502a34..d9e0b20b22 100644
--- a/packages/core/schema.json
+++ b/packages/core/schema.json
@@ -1,9 +1,9 @@
 {
   "version": "7",
   "dialect": "sqlite",
-  "id": "22e57fed-b9b8-4e94-a3b4-f94bece680a8",
+  "id": "96e9fe64-d810-4102-8f79-3317a88bb6d2",
   "prevIds": [
-    "f14a9b18-8207-487e-a3d3-227e629ba9ad"
+    "22e57fed-b9b8-4e94-a3b4-f94bece680a8"
   ],
   "ddl": [
     {
@@ -526,6 +526,16 @@
       "entityType": "columns",
       "table": "event"
     },
+    {
+      "type": "integer",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "created",
+      "entityType": "columns",
+      "table": "event"
+    },
     {
       "type": "text",
       "notNull": true,
diff --git a/packages/core/src/control-plane/move-session.ts b/packages/core/src/control-plane/move-session.ts
index e227f88df5..6f0c6e3081 100644
--- a/packages/core/src/control-plane/move-session.ts
+++ b/packages/core/src/control-plane/move-session.ts
@@ -106,8 +106,7 @@ const layer = Layer.effect(
       yield* events.publish(SessionEvent.Moved, {
         sessionID: input.sessionID,
         location: Location.Ref.make({ directory }),
-        subdirectory: RelativePath.make(path.relative(destination.directory, directory).replaceAll("\\", "/")),
-        timestamp: yield* DateTime.now,
+        subpath: RelativePath.make(path.relative(destination.directory, directory).replaceAll("\\", "/")),
       })
 
       if (patch) {
diff --git a/packages/core/src/database/migration.gen.ts b/packages/core/src/database/migration.gen.ts
index 55c1b212cd..7956b64f4d 100644
--- a/packages/core/src/database/migration.gen.ts
+++ b/packages/core/src/database/migration.gen.ts
@@ -41,5 +41,7 @@ export const migrations = (
     import("./migration/20260622170816_reset_v2_session_state"),
     import("./migration/20260622202450_simplify_session_input"),
     import("./migration/20260702134641_add_session_context_entry"),
+    import("./migration/20260703090000_reset_v2_event_rename_sweep"),
+    import("./migration/20260703181610_event_created_column"),
   ])
 ).map((module) => module.default) satisfies DatabaseMigration.Migration[]
diff --git a/packages/core/src/database/migration/20260703090000_reset_v2_event_rename_sweep.ts b/packages/core/src/database/migration/20260703090000_reset_v2_event_rename_sweep.ts
new file mode 100644
index 0000000000..20672f0734
--- /dev/null
+++ b/packages/core/src/database/migration/20260703090000_reset_v2_event_rename_sweep.ts
@@ -0,0 +1,17 @@
+import { Effect } from "effect"
+import type { DatabaseMigration } from "../migration"
+
+export default {
+  id: "20260703090000_reset_v2_event_rename_sweep",
+  up(tx) {
+    return Effect.gen(function* () {
+      yield* tx.run(`DELETE FROM \`session_input\`;`)
+      yield* tx.run(`DELETE FROM \`session_message\`;`)
+      yield* tx.run(`DELETE FROM \`event\`;`)
+      yield* tx.run(`DELETE FROM \`event_sequence\`;`)
+      // `created` column is added by the generated 20260703181610_event_created_column
+      // migration, which runs after this wipe (NOT NULL without default is safe on the
+      // emptied table).
+    })
+  },
+} satisfies DatabaseMigration.Migration
diff --git a/packages/core/src/database/migration/20260703181610_event_created_column.ts b/packages/core/src/database/migration/20260703181610_event_created_column.ts
new file mode 100644
index 0000000000..29d2cf9c12
--- /dev/null
+++ b/packages/core/src/database/migration/20260703181610_event_created_column.ts
@@ -0,0 +1,11 @@
+import { Effect } from "effect"
+import type { DatabaseMigration } from "../migration"
+
+export default {
+  id: "20260703181610_event_created_column",
+  up(tx) {
+    return Effect.gen(function* () {
+      yield* tx.run(`ALTER TABLE \`event\` ADD \`created\` integer NOT NULL;`)
+    })
+  },
+} satisfies DatabaseMigration.Migration
diff --git a/packages/core/src/database/schema.gen.ts b/packages/core/src/database/schema.gen.ts
index d8f0f1c665..17a7d12aed 100644
--- a/packages/core/src/database/schema.gen.ts
+++ b/packages/core/src/database/schema.gen.ts
@@ -81,6 +81,7 @@ export default {
           \`id\` text PRIMARY KEY,
           \`aggregate_id\` text NOT NULL,
           \`seq\` integer NOT NULL,
+          \`created\` integer NOT NULL,
           \`type\` text NOT NULL,
           \`data\` text NOT NULL,
           CONSTRAINT \`fk_event_aggregate_id_event_sequence_aggregate_id_fk\` FOREIGN KEY (\`aggregate_id\`) REFERENCES \`event_sequence\`(\`aggregate_id\`) ON DELETE CASCADE
diff --git a/packages/core/src/event.ts b/packages/core/src/event.ts
index dd0aa43181..587688d814 100644
--- a/packages/core/src/event.ts
+++ b/packages/core/src/event.ts
@@ -1,6 +1,6 @@
 export * as EventV2 from "./event"
 
-import { Cause, Context, Effect, Layer, Option, PubSub, Queue, Schema, Stream } from "effect"
+import { Cause, Context, DateTime, Effect, Layer, Option, PubSub, Queue, Schema, Stream } from "effect"
 import { Event } from "@opencode-ai/schema/event"
 import type { Data, Definition, Payload } from "@opencode-ai/schema/event"
 import type { EventLog } from "@opencode-ai/schema/event-log"
@@ -55,6 +55,7 @@ export const reserveSequence = Effect.fn("EventV2.reserveSequence")(function* (
 export type SerializedEvent = {
   readonly id: ID
   readonly type: string
+  readonly created?: DateTime.Utc
   readonly seq: number
   readonly aggregateID: string
   readonly data: Record<string, unknown>
@@ -81,6 +82,7 @@ const decodeSerializedEvent = (event: SerializedEvent): Payload => {
   }
   return {
     id: event.id,
+    created: event.created ?? DateTime.makeUnsafe(0),
     type: definition.type,
     durable: envelope(event.aggregateID, event.seq, definition.durable.version),
     data: Schema.decodeUnknownSync(definition.data)(event.data),
@@ -295,6 +297,7 @@ export const layerWith = (options?: LayerOptions) =>
                             if (
                               stored?.id === event.id &&
                               stored.type === versionedType(definition.type, durable.version) &&
+                              stored.created === DateTime.toEpochMillis(event.created ?? DateTime.makeUnsafe(0)) &&
                               isDeepStrictEqual(stored.data, encoded)
                             ) {
                               if (input.ownerID && row?.ownerID == null) {
@@ -366,6 +369,7 @@ export const layerWith = (options?: LayerOptions) =>
                                 id: event.id,
                                 aggregate_id: aggregateID,
                                 seq,
+                                created: DateTime.toEpochMillis(event.created ?? DateTime.makeUnsafe(0)),
                                 type: versionedType(definition.type, durable.version),
                                 data: encoded,
                               },
@@ -471,6 +475,7 @@ export const layerWith = (options?: LayerOptions) =>
             definition,
             {
               id: options?.id ?? ID.create(),
+              created: yield* DateTime.now,
               ...(options?.metadata ? { metadata: options.metadata } : {}),
               type: definition.type,
               ...(location ? { location } : {}),
@@ -494,6 +499,7 @@ export const layerWith = (options?: LayerOptions) =>
           } else {
             const payload = {
               id: event.id,
+              created: event.created ?? DateTime.makeUnsafe(0),
               type: definition.type,
               data: Schema.decodeUnknownSync(definition.data)(event.data),
             } as Payload
@@ -610,6 +616,7 @@ export const layerWith = (options?: LayerOptions) =>
               return [
                 decodeSerializedEvent({
                   id: event.id,
+                  created: DateTime.makeUnsafe(event.created),
                   aggregateID: event.aggregate_id,
                   seq: event.seq,
                   type: event.type,
diff --git a/packages/core/src/event/sql.ts b/packages/core/src/event/sql.ts
index 38fe34f1e3..17c88cefd3 100644
--- a/packages/core/src/event/sql.ts
+++ b/packages/core/src/event/sql.ts
@@ -15,6 +15,7 @@ export const EventTable = sqliteTable(
       .notNull()
       .references(() => EventSequenceTable.aggregate_id, { onDelete: "cascade" }),
     seq: integer().notNull(),
+    created: integer().notNull(),
     type: text().notNull(),
     data: text({ mode: "json" }).$type<Record<string, unknown>>().notNull(),
   },
diff --git a/packages/core/src/session.ts b/packages/core/src/session.ts
index acae2691c8..108d36707a 100644
--- a/packages/core/src/session.ts
+++ b/packages/core/src/session.ts
@@ -363,8 +363,7 @@ const layer = Layer.effect(
         yield* events.publish(SessionEvent.Forked, {
           sessionID,
           parentID: parent.id,
-          messageID: input.messageID,
-          timestamp: yield* DateTime.now,
+          from: input.messageID,
         })
         return yield* result.get(sessionID).pipe(Effect.orDie)
       }),
@@ -551,16 +550,13 @@ const layer = Layer.effect(
           Effect.gen(function* () {
             activeShells.add(input.sessionID)
             if ((yield* execution.active).has(input.sessionID)) yield* execution.awaitIdle(input.sessionID)
-            const messageID = SessionMessage.ID.create()
             const callID = Identifier.ascending()
             yield* events.publish(
               SessionEvent.Shell.Started,
               {
                 sessionID: input.sessionID,
-                messageID,
                 callID,
                 command: input.command,
-                timestamp: yield* DateTime.now,
               },
               { id: input.id },
             )
@@ -571,7 +567,6 @@ const layer = Layer.effect(
               sessionID: input.sessionID,
               callID,
               output,
-              timestamp: yield* DateTime.now,
             })
           }).pipe(
             Effect.ensuring(
@@ -590,8 +585,6 @@ const layer = Layer.effect(
         if (!skill) return yield* new SkillNotFoundError({ skill: input.skill })
         yield* events.publish(SessionEvent.Skill.Activated, {
           sessionID: input.sessionID,
-          messageID: input.id ?? SessionMessage.ID.create(),
-          timestamp: yield* DateTime.now,
           name: skill.name,
           text: skill.content,
         })
@@ -602,10 +595,8 @@ const layer = Layer.effect(
       }),
       switchAgent: Effect.fn("V2Session.switchAgent")(function* (input) {
         yield* result.get(input.sessionID)
-        yield* events.publish(SessionEvent.AgentSwitched, {
+        yield* events.publish(SessionEvent.AgentSelected, {
           sessionID: input.sessionID,
-          messageID: SessionMessage.ID.create(),
-          timestamp: yield* DateTime.now,
           agent: input.agent,
         })
       }),
@@ -617,10 +608,8 @@ const layer = Layer.effect(
           (session.model.variant ?? "default") === (input.model.variant ?? "default")
         )
           return
-        yield* events.publish(SessionEvent.ModelSwitched, {
+        yield* events.publish(SessionEvent.ModelSelected, {
           sessionID: input.sessionID,
-          messageID: SessionMessage.ID.create(),
-          timestamp: yield* DateTime.now,
           model: input.model,
         })
       }),
@@ -628,7 +617,6 @@ const layer = Layer.effect(
         yield* result.get(input.sessionID)
         yield* events.publish(SessionEvent.Renamed, {
           sessionID: input.sessionID,
-          timestamp: yield* DateTime.now,
           title: input.title,
         })
       }),
@@ -676,8 +664,6 @@ const layer = Layer.effect(
         yield* result.get(input.sessionID)
         yield* events.publish(SessionEvent.Synthetic, {
           sessionID: input.sessionID,
-          messageID: SessionMessage.ID.create(),
-          timestamp: yield* DateTime.now,
           text: input.text,
           description: input.description,
           metadata: input.metadata,
diff --git a/packages/core/src/session/compaction.ts b/packages/core/src/session/compaction.ts
index fdb81c5045..1174b65f40 100644
--- a/packages/core/src/session/compaction.ts
+++ b/packages/core/src/session/compaction.ts
@@ -7,7 +7,7 @@ import { EventV2 } from "../event"
 import { makeLocationNode } from "../effect/app-node"
 import { llmClient } from "../effect/app-node-platform"
 import { SessionEvent } from "./event"
-import { SessionMessage } from "./message"
+import type { SessionMessage } from "./message"
 import { SessionRunnerModel } from "./runner/model"
 import { SessionSchema } from "./schema"
 import { Token } from "../util/token"
@@ -206,11 +206,8 @@ const make = (dependencies: Dependencies) => {
     const summaryPrompt = buildPrompt({ previousSummary: input.previousSummary, context: input.context })
     const summaryOutput = Math.min(output || SUMMARY_OUTPUT_TOKENS, SUMMARY_OUTPUT_TOKENS)
     if (Token.estimate(summaryPrompt) > context - summaryOutput) return false
-    const messageID = SessionMessage.ID.create()
     yield* dependencies.events.publish(SessionEvent.Compaction.Started, {
       sessionID: input.sessionID,
-      messageID,
-      timestamp: yield* DateTime.now,
       reason: input.reason,
     })
 
@@ -238,8 +235,6 @@ const make = (dependencies: Dependencies) => {
     if (!summarized || failed || !summary.trim()) return false
     yield* dependencies.events.publish(SessionEvent.Compaction.Ended, {
       sessionID: input.sessionID,
-      messageID,
-      timestamp: yield* DateTime.now,
       reason: input.reason,
       text: summary,
       recent: input.recent,
diff --git a/packages/core/src/session/context-checkpoint.ts b/packages/core/src/session/context-checkpoint.ts
index 8ea1f46513..fa3b24aedb 100644
--- a/packages/core/src/session/context-checkpoint.ts
+++ b/packages/core/src/session/context-checkpoint.ts
@@ -1,13 +1,12 @@
 export * as SessionContextCheckpoint from "./context-checkpoint"
 
 import { eq } from "drizzle-orm"
-import { DateTime, Effect, Option, Schema } from "effect"
+import { Effect, Option, Schema } from "effect"
 import type { Database } from "../database/database"
 import { EventV2 } from "../event"
 import { SystemContext } from "../system-context/index"
 import { SessionEvent } from "./event"
 import { SessionHistory } from "./history"
-import { SessionMessage } from "./message"
 import { SessionSchema } from "./schema"
 import { SessionContextCheckpointTable } from "./sql"
 
@@ -50,7 +49,7 @@ export const prepare = Effect.fn("SessionContextCheckpoint.prepare")(function* (
 
   yield* events.publish(
     SessionEvent.ContextUpdated,
-    { sessionID, messageID: SessionMessage.ID.create(), timestamp: yield* DateTime.now, text: result.text },
+    { sessionID, text: result.text },
     { commit: () => advance(db, sessionID, result.applied).pipe(Effect.orDie) },
   )
   return { baseline: stored.baseline, baselineSeq: stored.baseline_seq }
diff --git a/packages/core/src/session/execution/local.ts b/packages/core/src/session/execution/local.ts
index 60e32b7c2c..1a45537490 100644
--- a/packages/core/src/session/execution/local.ts
+++ b/packages/core/src/session/execution/local.ts
@@ -36,7 +36,6 @@ const layer = Layer.effect(
             Exit.isFailure(exit) && !Cause.hasInterrupts(exit.cause) ? Cause.squash(exit.cause) : undefined
           yield* events.publish(SessionEvent.ExecutionSettled, {
             sessionID,
-            timestamp: yield* DateTime.now,
             outcome: Exit.isSuccess(exit) ? "success" : Cause.hasInterrupts(exit.cause) ? "interrupted" : "failure",
             error:
               failure !== undefined
diff --git a/packages/core/src/session/input.ts b/packages/core/src/session/input.ts
index 8d89563543..1d0dfc71c3 100644
--- a/packages/core/src/session/input.ts
+++ b/packages/core/src/session/input.ts
@@ -50,12 +50,10 @@ export const admit = Effect.fn("SessionInput.admit")(function* (
 ) {
   const existing = yield* find(db, input.id)
   if (existing !== undefined) return existing
-  const timestamp = yield* DateTime.now
   return yield* events
     .publish(SessionEvent.PromptAdmitted, {
-      messageID: input.id,
+      inputID: input.id,
       sessionID: input.sessionID,
-      timestamp,
       prompt: input.prompt,
       delivery: input.delivery,
     })
@@ -70,7 +68,7 @@ export const admit = Effect.fn("SessionInput.admit")(function* (
                 sessionID: input.sessionID,
                 prompt: input.prompt,
                 delivery: input.delivery,
-                timeCreated: timestamp,
+                timeCreated: event.created,
               }),
             ),
       ),
@@ -115,14 +113,11 @@ export const projectAdmitted = Effect.fn("SessionInput.projectAdmitted")(functio
   if (!stored) return yield* Effect.die(new LifecycleConflict({ id: input.id }))
 })
 
-export const projectPrompted = Effect.fn("SessionInput.projectPrompted")(function* (
+export const projectPromptPromoted = Effect.fn("SessionInput.projectPromptPromoted")(function* (
   db: DatabaseService,
   input: {
     readonly id: SessionMessage.ID
     readonly sessionID: SessionSchema.ID
-    readonly prompt: Prompt
-    readonly delivery: Delivery
-    readonly timeCreated: DateTime.Utc
     readonly promotedSeq: number
   },
 ) {
@@ -141,15 +136,16 @@ export const projectPrompted = Effect.fn("SessionInput.projectPrompted")(functio
     .pipe(Effect.orDie)
   if (updated) {
     const stored = fromRow(updated)
-    if (!matchesProjection(stored, input)) return yield* Effect.die(new LifecycleConflict({ id: input.id }))
-    return
+    if (stored.sessionID !== input.sessionID) return yield* Effect.die(new LifecycleConflict({ id: input.id }))
+    return stored
   }
 
-  // Every Prompted event is published from an admitted inbox row, so a missing or
+  // Every PromptPromoted event is published from an admitted inbox row, so a missing or
   // divergent row on replay is an invariant violation.
   const stored = yield* find(db, input.id)
-  if (!stored || !matchesProjection(stored, input) || stored.promotedSeq !== input.promotedSeq)
+  if (!stored || stored.sessionID !== input.sessionID || stored.promotedSeq !== input.promotedSeq)
     return yield* Effect.die(new LifecycleConflict({ id: input.id }))
+  return stored
 })
 
 export const hasPending = Effect.fn("SessionInput.hasPending")(function* (
@@ -206,12 +202,9 @@ const publish = Effect.fn("SessionInput.publish")(function* (
   for (const row of rows) {
     const id = SessionMessage.ID.make(row.id)
     yield* events
-      .publish(SessionEvent.Prompted, {
+      .publish(SessionEvent.PromptPromoted, {
         sessionID,
-        timestamp: DateTime.makeUnsafe(row.time_created),
-        messageID: id,
-        prompt: decodePrompt(row.prompt),
-        delivery: row.delivery,
+        inputID: id,
       })
       .pipe(
         Effect.catchDefect((defect) =>
diff --git a/packages/core/src/session/instructions.ts b/packages/core/src/session/instructions.ts
index 913f5c7334..a75074ae04 100644
--- a/packages/core/src/session/instructions.ts
+++ b/packages/core/src/session/instructions.ts
@@ -60,9 +60,9 @@ const layer = Layer.effect(
       const files = yield* Effect.forEach(
         toInject,
         (path) =>
-          fs.readFileStringSafe(path).pipe(
-            Effect.map((content) => (content === undefined ? undefined : { path, content })),
-          ),
+          fs
+            .readFileStringSafe(path)
+            .pipe(Effect.map((content) => (content === undefined ? undefined : { path, content }))),
         { concurrency: "unbounded" },
       )
       const readable = files.filter((file): file is { path: string; content: string } => file !== undefined)
@@ -74,8 +74,6 @@ const layer = Layer.effect(
       // metadata so it survives across Location layer restarts.
       yield* events.publish(SessionEvent.Synthetic, {
         sessionID: input.sessionID,
-        messageID: SessionMessage.ID.create(),
-        timestamp: yield* DateTime.now,
         text: readable.map((file) => `Instructions from: ${file.path}\n${file.content}`).join("\n\n"),
         description: `Loaded ${readable.map((file) => describePath(root, file.path)).join(", ")}`,
         metadata: { instruction: { paths: readable.map((file) => file.path) } },
diff --git a/packages/core/src/session/message-updater.ts b/packages/core/src/session/message-updater.ts
index 9ee8f5f739..b07d0d1234 100644
--- a/packages/core/src/session/message-updater.ts
+++ b/packages/core/src/session/message-updater.ts
@@ -100,112 +100,100 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
 
   return Effect.gen(function* () {
     yield* SessionEvent.All.match(event, {
-      "session.next.agent.switched": (event) => {
+      "agent.selected": (event) => {
         return adapter.appendMessage(
-          SessionMessage.AgentSwitched.make({
-            id: event.data.messageID,
+          SessionMessage.AgentSelected.make({
+            id: SessionMessage.ID.fromEvent(event.id),
             type: "agent-switched",
             metadata: event.metadata,
             agent: event.data.agent,
-            time: { created: event.data.timestamp },
+            time: { created: event.created },
           }),
         )
       },
-      "session.next.model.switched": (event) => {
+      "model.selected": (event) => {
         return adapter.appendMessage(
-          SessionMessage.ModelSwitched.make({
-            id: event.data.messageID,
+          SessionMessage.ModelSelected.make({
+            id: SessionMessage.ID.fromEvent(event.id),
             type: "model-switched",
             metadata: event.metadata,
             model: event.data.model,
-            time: { created: event.data.timestamp },
+            time: { created: event.created },
           }),
         )
       },
-      "session.next.moved": () => Effect.void,
-      "session.next.renamed": () => Effect.void,
-      "session.next.forked": () => Effect.void,
-      "session.next.prompted": (event) => {
-        return adapter.appendMessage(
-          SessionMessage.User.make({
-            id: event.data.messageID,
-            type: "user",
-            metadata: event.metadata,
-            text: event.data.prompt.text,
-            files: event.data.prompt.files,
-            agents: event.data.prompt.agents,
-            time: { created: event.data.timestamp },
-          }),
-        )
-      },
-      "session.next.prompt.admitted": () => Effect.void,
-      "session.next.execution.settled": () => Effect.void,
-      "session.next.context.updated": (event) =>
+      "session.moved": () => Effect.void,
+      renamed: () => Effect.void,
+      forked: () => Effect.void,
+      "prompt.promoted": () => Effect.void,
+      "prompt.admitted": () => Effect.void,
+      "execution.settled": () => Effect.void,
+      "session.context.updated": (event) =>
         adapter.appendMessage(
           SessionMessage.System.make({
-            id: event.data.messageID,
+            id: SessionMessage.ID.fromEvent(event.id),
             type: "system",
             text: event.data.text,
-            time: { created: event.data.timestamp },
+            time: { created: event.created },
           }),
         ),
-      "session.next.synthetic": (event) => {
+      synthetic: (event) => {
         return adapter.appendMessage(
           SessionMessage.Synthetic.make({
             sessionID: event.data.sessionID,
             text: event.data.text,
             description: event.data.description,
             metadata: event.data.metadata,
-            id: event.data.messageID,
+            id: SessionMessage.ID.fromEvent(event.id),
             type: "synthetic",
-            time: { created: event.data.timestamp },
+            time: { created: event.created },
           }),
         )
       },
-      "session.next.skill.activated": (event) => {
+      "skill.activated": (event) => {
         return adapter.appendMessage(
           SessionMessage.Skill.make({
-            id: event.data.messageID,
+            id: SessionMessage.ID.fromEvent(event.id),
             type: "skill",
             name: event.data.name,
             text: event.data.text,
-            time: { created: event.data.timestamp },
+            time: { created: event.created },
           }),
         )
       },
-      "session.next.shell.started": (event) => {
+      "shell.started": (event) => {
         return adapter.appendMessage(
           SessionMessage.Shell.make({
-            id: event.data.messageID,
+            id: SessionMessage.ID.fromEvent(event.id),
             type: "shell",
             metadata: event.metadata,
             callID: event.data.callID,
             command: event.data.command,
             output: "",
-            time: { created: event.data.timestamp },
+            time: { created: event.created },
           }),
         )
       },
-      "session.next.shell.ended": (event) => {
+      "shell.ended": (event) => {
         return Effect.gen(function* () {
           const currentShell = yield* adapter.getCurrentShell(event.data.callID)
           if (currentShell) {
             yield* adapter.updateShell(
               produce(currentShell, (draft) => {
                 draft.output = event.data.output
-                draft.time.completed = event.data.timestamp
+                draft.time.completed = event.created
               }),
             )
           }
         })
       },
-      "session.next.step.started": (event) => {
+      "step.started": (event) => {
         return Effect.gen(function* () {
           const currentAssistant = yield* adapter.getCurrentAssistant()
           if (currentAssistant) {
             yield* adapter.updateAssistant(
               produce(currentAssistant, (draft) => {
-                draft.time.completed = event.data.timestamp
+                draft.time.completed = event.created
               }),
             )
           }
@@ -215,16 +203,16 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
               type: "assistant",
               agent: event.data.agent,
               model: event.data.model,
-              time: { created: event.data.timestamp },
+              time: { created: event.created },
               content: [],
               snapshot: event.data.snapshot ? { start: event.data.snapshot } : undefined,
             }),
           )
         })
       },
-      "session.next.step.ended": (event) => {
+      "step.ended": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
-          draft.time.completed = event.data.timestamp
+          draft.time.completed = event.created
           draft.finish = event.data.finish
           draft.cost = event.data.cost
           draft.tokens = event.data.tokens
@@ -236,33 +224,33 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
             }
         })
       },
-      "session.next.step.failed": (event) => {
+      "step.failed": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
-          draft.time.completed = event.data.timestamp
+          draft.time.completed = event.created
           draft.finish = "error"
           draft.error = event.data.error
         })
       },
-      "session.next.text.started": (event) => {
+      "text.started": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           draft.content.push(
             castDraft(SessionMessage.AssistantText.make({ type: "text", id: event.data.textID, text: "" })),
           )
         })
       },
-      "session.next.text.delta": (event) => {
+      "text.delta": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           const match = latestText(draft, event.data.textID)
           if (match) match.text += event.data.delta
         })
       },
-      "session.next.text.ended": (event) => {
+      "text.ended": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           const match = latestText(draft, event.data.textID)
           if (match) match.text = event.data.text
         })
       },
-      "session.next.tool.input.started": (event) => {
+      "tool.input.started": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           draft.content.push(
             castDraft(
@@ -270,26 +258,26 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
                 type: "tool",
                 id: event.data.callID,
                 name: event.data.name,
-                time: { created: event.data.timestamp },
+                time: { created: event.created },
                 state: SessionMessage.ToolStatePending.make({ status: "pending", input: "" }),
               }),
             ),
           )
         })
       },
-      "session.next.tool.input.delta": () => Effect.void,
-      "session.next.tool.input.ended": (event) => {
+      "tool.input.delta": () => Effect.void,
+      "tool.input.ended": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           const match = latestTool(draft, event.data.callID)
           if (match && match.state.status === "pending") match.state.input = event.data.text
         })
       },
-      "session.next.tool.called": (event) => {
+      "tool.called": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           const match = latestTool(draft, event.data.callID)
           if (match) {
             match.provider = event.data.provider
-            match.time.ran = event.data.timestamp
+            match.time.ran = event.created
             match.state = castDraft(
               SessionMessage.ToolStateRunning.make({
                 status: "running",
@@ -301,7 +289,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
           }
         })
       },
-      "session.next.tool.progress": (event) => {
+      "tool.progress": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           const match = latestTool(draft, event.data.callID)
           if (match && match.state.status === "running") {
@@ -310,7 +298,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
           }
         })
       },
-      "session.next.tool.success": (event) => {
+      "tool.success": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           const match = latestTool(draft, event.data.callID)
           if (match && match.state.status === "running") {
@@ -319,7 +307,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
               metadata: match.provider?.metadata,
               resultMetadata: event.data.provider.metadata,
             }
-            match.time.completed = event.data.timestamp
+            match.time.completed = event.created
             match.state = castDraft(
               SessionMessage.ToolStateCompleted.make({
                 status: "completed",
@@ -333,7 +321,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
           }
         })
       },
-      "session.next.tool.failed": (event) => {
+      "tool.failed": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           const match = latestTool(draft, event.data.callID)
           if (match && (match.state.status === "pending" || match.state.status === "running")) {
@@ -342,7 +330,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
               metadata: match.provider?.metadata,
               resultMetadata: event.data.provider.metadata,
             }
-            match.time.completed = event.data.timestamp
+            match.time.completed = event.created
             match.state = castDraft(
               SessionMessage.ToolStateError.make({
                 status: "error",
@@ -356,7 +344,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
           }
         })
       },
-      "session.next.reasoning.started": (event) => {
+      "reasoning.started": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           draft.content.push(
             castDraft(
@@ -365,47 +353,47 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
                 id: event.data.reasoningID,
                 text: "",
                 providerMetadata: event.data.providerMetadata,
-                time: { created: event.data.timestamp },
+                time: { created: event.created },
               }),
             ),
           )
         })
       },
-      "session.next.reasoning.delta": (event) => {
+      "reasoning.delta": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           const match = latestReasoning(draft, event.data.reasoningID)
           if (match) match.text += event.data.delta
         })
       },
-      "session.next.reasoning.ended": (event) => {
+      "reasoning.ended": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           const match = latestReasoning(draft, event.data.reasoningID)
           if (match) {
             match.text = event.data.text
-            match.time = { created: match.time?.created ?? event.data.timestamp, completed: event.data.timestamp }
+            match.time = { created: match.time?.created ?? event.created, completed: event.created }
             if (event.data.providerMetadata !== undefined) match.providerMetadata = event.data.providerMetadata
           }
         })
       },
-      "session.next.retried": () => Effect.void,
-      "session.next.compaction.started": () => Effect.void,
-      "session.next.compaction.delta": () => Effect.void,
-      "session.next.compaction.ended": (event) => {
+      retried: () => Effect.void,
+      "compaction.started": () => Effect.void,
+      "compaction.delta": () => Effect.void,
+      "compaction.ended": (event) => {
         return adapter.appendMessage(
           SessionMessage.Compaction.make({
-            id: event.data.messageID,
+            id: SessionMessage.ID.fromEvent(event.id),
             type: "compaction",
             metadata: event.metadata,
             reason: event.data.reason,
             summary: event.data.text,
             recent: event.data.recent,
-            time: { created: event.data.timestamp },
+            time: { created: event.created },
           }),
         )
       },
-      "session.next.revert.staged": () => Effect.void,
-      "session.next.revert.cleared": () => Effect.void,
-      "session.next.revert.committed": () => Effect.void,
+      "revert.staged": () => Effect.void,
+      "revert.cleared": () => Effect.void,
+      "revert.committed": () => Effect.void,
     })
   })
 }
diff --git a/packages/core/src/session/projector.ts b/packages/core/src/session/projector.ts
index 7b08733684..62ad7ec2ce 100644
--- a/packages/core/src/session/projector.ts
+++ b/packages/core/src/session/projector.ts
@@ -158,21 +158,17 @@ const projectFork = Effect.fn("SessionProjector.projectFork")(function* (
     .get()
     .pipe(Effect.orDie)
   if (!parent) return yield* Effect.die(new Error(`Fork parent session not found: ${event.data.parentID}`))
-  const boundary = event.data.messageID
+  const boundary = event.data.from
     ? yield* db
         .select({ seq: SessionMessageTable.seq })
         .from(SessionMessageTable)
         .where(
-          and(
-            eq(SessionMessageTable.session_id, event.data.parentID),
-            eq(SessionMessageTable.id, event.data.messageID),
-          ),
+          and(eq(SessionMessageTable.session_id, event.data.parentID), eq(SessionMessageTable.id, event.data.from)),
         )
         .get()
         .pipe(Effect.orDie)
     : undefined
-  if (event.data.messageID && !boundary)
-    return yield* Effect.die(new Error(`Fork boundary message not found: ${event.data.messageID}`))
+  if (event.data.from && !boundary) return yield* Effect.die(new Error(`Fork boundary message not found: ${event.data.from}`))
   const copied = yield* db
     .select({ seq: SessionMessageTable.seq })
     .from(SessionMessageTable)
@@ -208,8 +204,8 @@ const projectFork = Effect.fn("SessionProjector.projectFork")(function* (
       tokens_reasoning: 0,
       tokens_cache_read: 0,
       tokens_cache_write: 0,
-      time_created: DateTime.toEpochMillis(event.data.timestamp),
-      time_updated: DateTime.toEpochMillis(event.data.timestamp),
+      time_created: DateTime.toEpochMillis(event.created),
+      time_updated: DateTime.toEpochMillis(event.created),
     })
     .onConflictDoNothing()
     .returning({ sessionID: SessionTable.id })
@@ -474,9 +470,9 @@ const layer = Layer.effectDiscard(
           .update(SessionTable)
           .set({
             directory: event.data.location.directory,
-            path: event.data.subdirectory,
+            path: event.data.subpath,
             workspace_id: event.data.location.workspaceID ? WorkspaceV2.ID.make(event.data.location.workspaceID) : null,
-            time_updated: DateTime.toEpochMillis(event.data.timestamp),
+            time_updated: DateTime.toEpochMillis(event.created),
           })
           .where(eq(SessionTable.id, event.data.sessionID))
           .run()
@@ -556,19 +552,19 @@ const layer = Layer.effectDiscard(
         if (next) yield* applyUsage(db, sessionID, next)
       }),
     )
-    yield* events.project(SessionEvent.AgentSwitched, (event) =>
+    yield* events.project(SessionEvent.AgentSelected, (event) =>
       db
         .update(SessionTable)
-        .set({ agent: event.data.agent, time_updated: DateTime.toEpochMillis(event.data.timestamp) })
+        .set({ agent: event.data.agent, time_updated: DateTime.toEpochMillis(event.created) })
         .where(eq(SessionTable.id, event.data.sessionID))
         .run()
         .pipe(Effect.orDie, Effect.andThen(run(db, event))),
     )
-    yield* events.project(SessionEvent.ModelSwitched, (event) =>
+    yield* events.project(SessionEvent.ModelSelected, (event) =>
       Effect.gen(function* () {
         yield* db
           .update(SessionTable)
-          .set({ model: event.data.model, time_updated: DateTime.toEpochMillis(event.data.timestamp) })
+          .set({ model: event.data.model, time_updated: DateTime.toEpochMillis(event.created) })
           .where(eq(SessionTable.id, event.data.sessionID))
           .run()
           .pipe(Effect.orDie)
@@ -578,25 +574,30 @@ const layer = Layer.effectDiscard(
     yield* events.project(SessionEvent.Renamed, (event) =>
       db
         .update(SessionTable)
-        .set({ title: event.data.title, time_updated: DateTime.toEpochMillis(event.data.timestamp) })
+        .set({ title: event.data.title, time_updated: DateTime.toEpochMillis(event.created) })
         .where(eq(SessionTable.id, event.data.sessionID))
         .run()
         .pipe(Effect.orDie),
     )
     yield* events.project(SessionEvent.Forked, (event) => projectFork(db, event))
-    yield* events.project(SessionEvent.Prompted, (event) =>
+    yield* events.project(SessionEvent.PromptPromoted, (event) =>
       Effect.gen(function* () {
         if (event.durable === undefined)
           return yield* Effect.die(new Error("Durable Session event is missing aggregate sequence"))
-        yield* SessionInput.projectPrompted(db, {
-          id: event.data.messageID,
+        const input = yield* SessionInput.projectPromptPromoted(db, {
+          id: event.data.inputID,
           sessionID: event.data.sessionID,
-          prompt: event.data.prompt,
-          delivery: event.data.delivery,
-          timeCreated: event.data.timestamp,
           promotedSeq: event.durable.seq,
         })
-        yield* run(db, event)
+        yield* insertMessage(db, event, {
+          id: input.id,
+          type: "user",
+          metadata: event.metadata,
+          text: input.prompt.text,
+          files: input.prompt.files,
+          agents: input.prompt.agents,
+          time: { created: event.created },
+        })
       }),
     )
     yield* events.project(SessionEvent.PromptAdmitted, (event) =>
@@ -605,11 +606,11 @@ const layer = Layer.effectDiscard(
           return yield* Effect.die(new Error("Durable Session event is missing aggregate sequence"))
         yield* SessionInput.projectAdmitted(db, {
           admittedSeq: event.durable.seq,
-          id: event.data.messageID,
+          id: event.data.inputID,
           sessionID: event.data.sessionID,
           prompt: event.data.prompt,
           delivery: event.data.delivery,
-          timeCreated: event.data.timestamp,
+          timeCreated: event.created,
         })
       }),
     )
@@ -617,11 +618,11 @@ const layer = Layer.effectDiscard(
     yield* events.project(SessionEvent.Synthetic, (event) => run(db, event))
     yield* events.project(SessionEvent.Skill.Activated, (event) =>
       insertMessage(db, event, {
-        id: event.data.messageID,
+        id: SessionMessage.ID.fromEvent(event.id),
         type: "skill",
         name: event.data.name,
         text: event.data.text,
-        time: { created: event.data.timestamp },
+        time: { created: event.created },
       }),
     )
     yield* events.project(SessionEvent.Shell.Started, (event) => run(db, event))
@@ -646,7 +647,7 @@ const layer = Layer.effectDiscard(
         .update(SessionTable)
         .set({
           revert: { ...event.data.revert, files: event.data.revert.files ? [...event.data.revert.files] : undefined },
-          time_updated: DateTime.toEpochMillis(event.data.timestamp),
+          time_updated: DateTime.toEpochMillis(event.created),
         })
         .where(eq(SessionTable.id, event.data.sessionID))
         .run()
@@ -655,7 +656,7 @@ const layer = Layer.effectDiscard(
     yield* events.project(SessionEvent.RevertEvent.Cleared, (event) =>
       db
         .update(SessionTable)
-        .set({ revert: null, time_updated: DateTime.toEpochMillis(event.data.timestamp) })
+        .set({ revert: null, time_updated: DateTime.toEpochMillis(event.created) })
         .where(eq(SessionTable.id, event.data.sessionID))
         .run()
         .pipe(Effect.orDie, Effect.asVoid),
@@ -693,7 +694,7 @@ const layer = Layer.effectDiscard(
           .pipe(Effect.orDie)
         yield* db
           .update(SessionTable)
-          .set({ revert: null, time_updated: DateTime.toEpochMillis(event.data.timestamp) })
+          .set({ revert: null, time_updated: DateTime.toEpochMillis(event.created) })
           .where(eq(SessionTable.id, event.data.sessionID))
           .run()
           .pipe(Effect.orDie)
diff --git a/packages/core/src/session/revert.ts b/packages/core/src/session/revert.ts
index 9999d5da5a..8c0b8bbf7b 100644
--- a/packages/core/src/session/revert.ts
+++ b/packages/core/src/session/revert.ts
@@ -89,7 +89,6 @@ export const stage = Effect.fn("SessionRevert.stage")(function* (input: {
   } satisfies SessionSchema.Info["revert"]
   yield* events.publish(SessionEvent.RevertEvent.Staged, {
     sessionID: input.session.id,
-    timestamp: yield* DateTime.now,
     revert,
   })
   return revert
@@ -106,7 +105,6 @@ export const clear = Effect.fn("SessionRevert.clear")(function* (session: Sessio
   const events = yield* EventV2.Service
   yield* events.publish(SessionEvent.RevertEvent.Cleared, {
     sessionID: session.id,
-    timestamp: yield* DateTime.now,
   })
 })
 
@@ -116,6 +114,5 @@ export const commit = Effect.fn("SessionRevert.commit")(function* (session: Sess
   yield* events.publish(SessionEvent.RevertEvent.Committed, {
     sessionID: session.id,
     messageID: session.revert.messageID,
-    timestamp: yield* DateTime.now,
   })
 })
diff --git a/packages/core/src/session/runner/llm.ts b/packages/core/src/session/runner/llm.ts
index f76ee10a3f..ba575b8146 100644
--- a/packages/core/src/session/runner/llm.ts
+++ b/packages/core/src/session/runner/llm.ts
@@ -134,7 +134,6 @@ const layer = Layer.effect(
           if (tool.type !== "tool" || (tool.state.status !== "pending" && tool.state.status !== "running")) continue
           yield* events.publish(SessionEvent.Tool.Failed, {
             sessionID,
-            timestamp: yield* DateTime.now,
             assistantMessageID: message.id,
             callID: tool.id,
             error: { type: "unknown", message: "Tool execution interrupted" },
@@ -297,7 +296,6 @@ const layer = Layer.effect(
           yield* serialized(
             events.publish(SessionEvent.Step.Ended, {
               sessionID: session.id,
-              timestamp: yield* DateTime.now,
               assistantMessageID: yield* publisher.startAssistant(),
               finish: settlement.finish,
               cost: 0,
diff --git a/packages/core/src/session/runner/publish-llm-event.ts b/packages/core/src/session/runner/publish-llm-event.ts
index 04c6437ef4..4b7b6fb92c 100644
--- a/packages/core/src/session/runner/publish-llm-event.ts
+++ b/packages/core/src/session/runner/publish-llm-event.ts
@@ -78,7 +78,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
     yield* events.publish(SessionEvent.Step.Started, {
       ...input,
       assistantMessageID,
-      timestamp: yield* timestamp,
       snapshot: input.snapshot,
     })
     return assistantMessageID
@@ -123,7 +122,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
       yield* events.publish(SessionEvent.Text.Ended, {
         sessionID: input.sessionID,
         assistantMessageID: yield* currentAssistantMessageID(),
-        timestamp: yield* timestamp,
         textID,
         text: value,
       })
@@ -134,7 +132,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
       yield* events.publish(SessionEvent.Reasoning.Ended, {
         sessionID: input.sessionID,
         assistantMessageID: yield* currentAssistantMessageID(),
-        timestamp: yield* timestamp,
         reasoningID,
         text: value,
         providerMetadata,
@@ -147,7 +144,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
       if (!tool) return yield* Effect.die(new Error(`Tool input end before start: ${callID}`))
       yield* events.publish(SessionEvent.Tool.Input.Ended, {
         sessionID: input.sessionID,
-        timestamp: yield* timestamp,
         assistantMessageID: tool.assistantMessageID,
         callID,
         text: value,
@@ -176,7 +172,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
     yield* toolInput.start(event.id)
     yield* events.publish(SessionEvent.Tool.Input.Started, {
       sessionID: input.sessionID,
-      timestamp: yield* timestamp,
       assistantMessageID,
       callID: event.id,
       name: event.name,
@@ -204,7 +199,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
     assistantFailed = true
     yield* events.publish(SessionEvent.Step.Failed, {
       sessionID: input.sessionID,
-      timestamp: yield* timestamp,
       assistantMessageID,
       error: { type: "unknown", message },
     })
@@ -219,7 +213,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
       tool.settled = true
       yield* events.publish(SessionEvent.Tool.Failed, {
         sessionID: input.sessionID,
-        timestamp: yield* timestamp,
         assistantMessageID: tool.assistantMessageID,
         callID,
         error: { type: "unknown", message },
@@ -248,7 +241,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
         yield* events.publish(SessionEvent.Text.Started, {
           sessionID: input.sessionID,
           assistantMessageID: yield* startAssistant(),
-          timestamp: yield* timestamp,
           textID: event.id,
         })
         return
@@ -257,7 +249,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
         yield* events.publish(SessionEvent.Text.Delta, {
           sessionID: input.sessionID,
           assistantMessageID: yield* currentAssistantMessageID(),
-          timestamp: yield* timestamp,
           textID: event.id,
           delta: event.text,
         })
@@ -270,7 +261,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
         yield* events.publish(SessionEvent.Reasoning.Started, {
           sessionID: input.sessionID,
           assistantMessageID: yield* startAssistant(),
-          timestamp: yield* timestamp,
           reasoningID: event.id,
           providerMetadata: event.providerMetadata,
         })
@@ -280,7 +270,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
         yield* events.publish(SessionEvent.Reasoning.Delta, {
           sessionID: input.sessionID,
           assistantMessageID: yield* currentAssistantMessageID(),
-          timestamp: yield* timestamp,
           reasoningID: event.id,
           delta: event.text,
         })
@@ -300,7 +289,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
         yield* toolInput.append(event.id, event.text)
         yield* events.publish(SessionEvent.Tool.Input.Delta, {
           sessionID: input.sessionID,
-          timestamp: yield* timestamp,
           assistantMessageID: tool.assistantMessageID,
           callID: event.id,
           delta: event.text,
@@ -322,7 +310,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
         tool.providerMetadata = event.providerMetadata
         yield* events.publish(SessionEvent.Tool.Called, {
           sessionID: input.sessionID,
-          timestamp: yield* timestamp,
           assistantMessageID: tool.assistantMessageID,
           callID: event.id,
           tool: event.name,
@@ -352,7 +339,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
         if ("error" in result) {
           yield* events.publish(SessionEvent.Tool.Failed, {
             sessionID: input.sessionID,
-            timestamp: yield* timestamp,
             assistantMessageID: tool.assistantMessageID,
             callID: event.id,
             error: result.error,
@@ -363,7 +349,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
         }
         yield* events.publish(SessionEvent.Tool.Success, {
           sessionID: input.sessionID,
-          timestamp: yield* timestamp,
           assistantMessageID: tool.assistantMessageID,
           callID: event.id,
           ...result,
@@ -382,7 +367,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
         tool.settled = true
         yield* events.publish(SessionEvent.Tool.Failed, {
           sessionID: input.sessionID,
-          timestamp: yield* timestamp,
           assistantMessageID: tool.assistantMessageID,
           callID: event.id,
           error: { type: "unknown", message: event.message },
diff --git a/packages/core/src/session/title.ts b/packages/core/src/session/title.ts
index abed5ce33c..8e7b5857b7 100644
--- a/packages/core/src/session/title.ts
+++ b/packages/core/src/session/title.ts
@@ -42,9 +42,10 @@ const make = (dependencies: Dependencies) => {
     if (!firstUser) return
     const agent = yield* dependencies.agents.get(AgentV2.ID.make("title"))
     if (!agent) return
-    const resolved = yield* (agent.model
-      ? dependencies.models.resolve({ ...session, model: agent.model })
-      : dependencies.models.resolve(session)
+    const resolved = yield* (
+      agent.model
+        ? dependencies.models.resolve({ ...session, model: agent.model })
+        : dependencies.models.resolve(session)
     ).pipe(Effect.catch(() => Effect.succeed(undefined)))
     if (!resolved) return
     const chunks: string[] = []
@@ -76,7 +77,6 @@ const make = (dependencies: Dependencies) => {
     if (!title) return
     yield* dependencies.events.publish(SessionEvent.Renamed, {
       sessionID: session.id,
-      timestamp: yield* DateTime.now,
       title: truncate(title),
     })
   })
diff --git a/packages/core/test/database-migration.test.ts b/packages/core/test/database-migration.test.ts
index b381cc7418..b36de1abac 100644
--- a/packages/core/test/database-migration.test.ts
+++ b/packages/core/test/database-migration.test.ts
@@ -255,7 +255,7 @@ describe("DatabaseMigration", () => {
         )
         yield* db.run(sql`INSERT INTO event_sequence (aggregate_id, seq) VALUES ('session', 9)`)
         yield* db.run(
-          sql`INSERT INTO event (id, aggregate_id, seq, type, data) VALUES ('event', 'session', 9, 'session.updated.1', '{}')`,
+          sql`INSERT INTO event (id, aggregate_id, seq, type, data, created) VALUES ('event', 'session', 9, 'session.updated.1', '{}', 1)`,
         )
         yield* db.run(
           sql`INSERT INTO session_input (id, session_id, prompt, delivery, admitted_seq, time_created) VALUES ('input', 'session', '{}', 'steer', 9, 1)`,
diff --git a/packages/core/test/event.test.ts b/packages/core/test/event.test.ts
index a9220df422..65c370f1eb 100644
--- a/packages/core/test/event.test.ts
+++ b/packages/core/test/event.test.ts
@@ -554,6 +554,7 @@ describe("EventV2", () => {
 
       yield* events.replay({
         id: EventV2.ID.create(),
+        created: DateTime.makeUnsafe(0),
         type: EventV2.versionedType(DurableMessage.type, 1),
         seq: 0,
         aggregateID,
@@ -573,6 +574,7 @@ describe("EventV2", () => {
 
       yield* events.replay({
         id: EventV2.ID.create(),
+        created: DateTime.makeUnsafe(0),
         type: EventV2.versionedType(DurableMessage.type, 1),
         seq: 0,
         aggregateID,
@@ -609,6 +611,7 @@ describe("EventV2", () => {
         const exit = yield* events
           .replay({
             id: EventV2.ID.create(),
+            created: DateTime.makeUnsafe(0),
             type: EventV2.versionedType(DurableMessage.type, 1),
             seq: 1,
             aggregateID: envelopeAggregateID,
@@ -642,6 +645,7 @@ describe("EventV2", () => {
 
       yield* events.replay({
         id: EventV2.ID.create(),
+        created: DateTime.makeUnsafe(0),
         type: EventV2.versionedType(DurableMessage.type, 1),
         seq: 0,
         aggregateID,
@@ -650,6 +654,7 @@ describe("EventV2", () => {
       const exit = yield* events
         .replay({
           id: EventV2.ID.create(),
+          created: DateTime.makeUnsafe(0),
           type: EventV2.versionedType(DurableMessage.type, 1),
           seq: 5,
           aggregateID,
@@ -674,13 +679,14 @@ describe("EventV2", () => {
 
       yield* events.replay({
         id: EventV2.ID.create(),
+        created: DateTime.makeUnsafe(0),
         type: EventV2.versionedType(SessionEvent.ContextUpdated.type, 1),
         seq: 0,
         aggregateID,
-        data: { sessionID: aggregateID, messageID: "msg_context", timestamp: 0, text: "context" },
+        data: { sessionID: aggregateID, text: "context" },
       })
 
-      expect(received[0]?.data.timestamp).toEqual(DateTime.makeUnsafe(0))
+      expect(received[0]?.created).toEqual(DateTime.makeUnsafe(0))
     }),
   )
 
@@ -690,6 +696,7 @@ describe("EventV2", () => {
       const exit = yield* events
         .replay({
           id: EventV2.ID.create(),
+          created: DateTime.makeUnsafe(0),
           type: "unknown.event.1",
           seq: 0,
           aggregateID: EventV2.ID.create(),
@@ -708,6 +715,7 @@ describe("EventV2", () => {
       const source = yield* events.replayAll([
         {
           id: EventV2.ID.create(),
+          created: DateTime.makeUnsafe(0),
           type: EventV2.versionedType(DurableMessage.type, 1),
           seq: 0,
           aggregateID,
@@ -715,6 +723,7 @@ describe("EventV2", () => {
         },
         {
           id: EventV2.ID.create(),
+          created: DateTime.makeUnsafe(0),
           type: EventV2.versionedType(DurableMessage.type, 1),
           seq: 1,
           aggregateID,
@@ -735,6 +744,7 @@ describe("EventV2", () => {
       const one = yield* events.replayAll([
         {
           id: EventV2.ID.create(),
+          created: DateTime.makeUnsafe(0),
           type: EventV2.versionedType(DurableMessage.type, 1),
           seq: 0,
           aggregateID,
@@ -742,6 +752,7 @@ describe("EventV2", () => {
         },
         {
           id: EventV2.ID.create(),
+          created: DateTime.makeUnsafe(0),
           type: EventV2.versionedType(DurableMessage.type, 1),
           seq: 1,
           aggregateID,
@@ -751,6 +762,7 @@ describe("EventV2", () => {
       const two = yield* events.replayAll([
         {
           id: EventV2.ID.create(),
+          created: DateTime.makeUnsafe(0),
           type: EventV2.versionedType(DurableMessage.type, 1),
           seq: 2,
           aggregateID,
@@ -758,6 +770,7 @@ describe("EventV2", () => {
         },
         {
           id: EventV2.ID.create(),
+          created: DateTime.makeUnsafe(0),
           type: EventV2.versionedType(DurableMessage.type, 1),
           seq: 3,
           aggregateID,
@@ -793,6 +806,7 @@ describe("EventV2", () => {
       yield* events.replay(
         {
           id: EventV2.ID.create(),
+          created: DateTime.makeUnsafe(0),
           type: EventV2.versionedType(DurableMessage.type, 1),
           seq: 1,
           aggregateID,
@@ -812,6 +826,7 @@ describe("EventV2", () => {
       const id = EventV2.ID.create()
       const replayed = {
         id,
+        created: DateTime.makeUnsafe(0),
         type: EventV2.versionedType(DurableMessage.type, 1),
         seq: 0,
         aggregateID,
@@ -833,6 +848,7 @@ describe("EventV2", () => {
       const published = yield* events.publish(DurableMessage, durableData(aggregateID, "owned"))
       const replayed = {
         id: published.id,
+        created: published.created,
         type: EventV2.versionedType(DurableMessage.type, 1),
         seq: published.durable!.seq,
         aggregateID,
@@ -867,6 +883,7 @@ describe("EventV2", () => {
       yield* events.replay(
         {
           id: EventV2.ID.create(),
+          created: DateTime.makeUnsafe(0),
           type: EventV2.versionedType(DurableMessage.type, 1),
           seq: 0,
           aggregateID,
@@ -895,6 +912,7 @@ describe("EventV2", () => {
       yield* events.replay(
         {
           id: EventV2.ID.create(),
+          created: DateTime.makeUnsafe(0),
           type: EventV2.versionedType(DurableMessage.type, 1),
           seq: 1,
           aggregateID,
@@ -905,6 +923,7 @@ describe("EventV2", () => {
       yield* events.replay(
         {
           id: EventV2.ID.create(),
+          created: DateTime.makeUnsafe(0),
           type: EventV2.versionedType(DurableMessage.type, 1),
           seq: 2,
           aggregateID,
@@ -937,6 +956,7 @@ describe("EventV2", () => {
       yield* events.replay(
         {
           id: EventV2.ID.create(),
+          created: DateTime.makeUnsafe(0),
           type: EventV2.versionedType(DurableMessage.type, 1),
           seq: 0,
           aggregateID,
@@ -949,6 +969,7 @@ describe("EventV2", () => {
         .replay(
           {
             id: EventV2.ID.create(),
+            created: DateTime.makeUnsafe(0),
             type: EventV2.versionedType(DurableMessage.type, 1),
             seq: 1,
             aggregateID,
@@ -970,6 +991,7 @@ describe("EventV2", () => {
       yield* events.listen((event) => Effect.sync(() => received.push(event)))
       const replayed = {
         id: EventV2.ID.create(),
+        created: DateTime.makeUnsafe(0),
         type: EventV2.versionedType(DurableMessage.type, 1),
         seq: 0,
         aggregateID,
@@ -990,6 +1012,7 @@ describe("EventV2", () => {
       const aggregateID = Session.ID.create()
       const replayed = {
         id: EventV2.ID.create(),
+        created: DateTime.makeUnsafe(0),
         type: EventV2.versionedType(DurableMessage.type, 1),
         seq: 0,
         aggregateID,
@@ -1014,6 +1037,7 @@ describe("EventV2", () => {
       const id = EventV2.ID.create()
       yield* events.replay({
         id,
+        created: DateTime.makeUnsafe(0),
         type: EventV2.versionedType(DurableMessage.type, 1),
         seq: 0,
         aggregateID,
@@ -1023,6 +1047,7 @@ describe("EventV2", () => {
       const exit = yield* events
         .replay({
           id,
+          created: DateTime.makeUnsafe(0),
           type: EventV2.versionedType(DurableMessage.type, 1),
           seq: 1,
           aggregateID,
@@ -1045,6 +1070,7 @@ describe("EventV2", () => {
       yield* events.replay(
         {
           id: EventV2.ID.create(),
+          created: DateTime.makeUnsafe(0),
           type: EventV2.versionedType(DurableMessage.type, 1),
           seq: 0,
           aggregateID,
@@ -1055,6 +1081,7 @@ describe("EventV2", () => {
       yield* events.replay(
         {
           id: EventV2.ID.create(),
+          created: DateTime.makeUnsafe(0),
           type: EventV2.versionedType(DurableMessage.type, 1),
           seq: 1,
           aggregateID,
@@ -1116,6 +1143,7 @@ describe("EventV2", () => {
 
       yield* events.replay({
         id: EventV2.ID.create(),
+        created: DateTime.makeUnsafe(0),
         type: EventV2.versionedType(DurableMessage.type, 1),
         seq: 0,
         aggregateID,
diff --git a/packages/core/test/session-compact.test.ts b/packages/core/test/session-compact.test.ts
index cee32ade04..4a9a520d59 100644
--- a/packages/core/test/session-compact.test.ts
+++ b/packages/core/test/session-compact.test.ts
@@ -85,17 +85,13 @@ describe("SessionV2.compact", () => {
       const prompt = Prompt.make({ text: "Please compact this session history." })
       yield* events.publish(SessionEvent.PromptAdmitted, {
         sessionID: created.id,
-        messageID,
-        timestamp: DateTime.makeUnsafe(0),
+        inputID: messageID,
         prompt,
         delivery: "steer",
       })
-      yield* events.publish(SessionEvent.Prompted, {
+      yield* events.publish(SessionEvent.PromptPromoted, {
         sessionID: created.id,
-        messageID,
-        timestamp: DateTime.makeUnsafe(0),
-        prompt,
-        delivery: "steer",
+        inputID: messageID,
       })
 
       yield* session.compact({ sessionID: created.id })
diff --git a/packages/core/test/session-create.test.ts b/packages/core/test/session-create.test.ts
index b22c65ec97..0100ca4ae9 100644
--- a/packages/core/test/session-create.test.ts
+++ b/packages/core/test/session-create.test.ts
@@ -197,8 +197,6 @@ describe("SessionV2.create", () => {
       yield* SessionInput.promoteSteers(db, events, parent.id)
       yield* events.publish(SessionEvent.Synthetic, {
         sessionID: parent.id,
-        messageID: SessionMessage.ID.create(),
-        timestamp: yield* DateTime.now,
         text: "parent note",
       })
 
@@ -215,7 +213,7 @@ describe("SessionV2.create", () => {
       expect(forkContext.map((message) => message.id)).not.toEqual(parentContext.map((message) => message.id))
       expect(history).toHaveLength(1)
       expect(history[0]).toMatchObject({
-        type: "session.next.forked",
+        type: "forked",
         durable: { seq: 0 },
         data: { sessionID: forked.id, parentID: parent.id },
       })
@@ -267,7 +265,7 @@ describe("SessionV2.create", () => {
       const history = Array.from(yield* Stream.runCollect(logEvents(session, forked.id)))
       expect(context).toMatchObject([{ text: "First" }])
       expect(context[0]?.id).not.toBe(first.id)
-      expect(history[0]).toMatchObject({ data: { messageID: second.id } })
+      expect(history[0]).toMatchObject({ data: { from: second.id } })
     }),
   )
 
@@ -380,8 +378,8 @@ describe("SessionV2.create", () => {
       expect(
         Array.from(yield* logEvents(session, created.id, true).pipe(Stream.take(2), Stream.runCollect)),
       ).toMatchObject([
-        { durable: { seq: 1 }, type: "session.next.prompt.admitted", data: { prompt: { text: "Hello" } } },
-        { durable: { seq: 2 }, type: "session.next.prompted" },
+        { durable: { seq: 1 }, type: "prompt.admitted", data: { prompt: { text: "Hello" } } },
+        { durable: { seq: 2 }, type: "prompt.promoted" },
       ])
     }),
   )
@@ -406,6 +404,7 @@ describe("SessionV2.create", () => {
         .all()
         .pipe(Effect.orDie)).map((event) => ({
         id: event.id,
+        created: DateTime.makeUnsafe(event.created),
         aggregateID: event.aggregate_id,
         seq: event.seq,
         type: event.type,
@@ -466,7 +465,7 @@ describe("SessionV2.create", () => {
         ).toEqual([
           [0, EventV2.versionedType(SessionV1.Event.Created.type, 1)],
           [1, EventV2.versionedType(SessionEvent.PromptAdmitted.type, 1)],
-          [2, EventV2.versionedType(SessionEvent.Prompted.type, 1)],
+          [2, EventV2.versionedType(SessionEvent.PromptPromoted.type, 1)],
         ])
       }).pipe(Effect.provide(Layer.fresh(targetLayer)))
     }),
@@ -530,7 +529,7 @@ describe("SessionV2.create", () => {
       expect(yield* session.get(created.id)).toMatchObject({ agent: "plan" })
       expect(
         Array.from(yield* logEvents(session, created.id, true).pipe(Stream.take(1), Stream.runCollect)),
-      ).toMatchObject([{ type: "session.next.agent.switched", data: { agent: "plan" } }])
+      ).toMatchObject([{ type: "agent.selected", data: { agent: "plan" } }])
     }),
   )
 
@@ -563,7 +562,7 @@ describe("SessionV2.create", () => {
       expect(yield* session.get(created.id)).toMatchObject({ model })
       expect(
         Array.from(yield* logEvents(session, created.id, true).pipe(Stream.take(1), Stream.runCollect)),
-      ).toMatchObject([{ type: "session.next.model.switched", data: { model } }])
+      ).toMatchObject([{ type: "model.selected", data: { model } }])
     }),
   )
 
diff --git a/packages/core/test/session-instructions.test.ts b/packages/core/test/session-instructions.test.ts
index e87fce7234..daf0308b6f 100644
--- a/packages/core/test/session-instructions.test.ts
+++ b/packages/core/test/session-instructions.test.ts
@@ -133,8 +133,6 @@ const seedSynthetic = (sessionID: SessionV2.ID, paths: string[]) =>
     const events = yield* EventV2.Service
     yield* events.publish(SessionEvent.Synthetic, {
       sessionID,
-      messageID: SessionMessage.ID.create(),
-      timestamp: yield* DateTime.now,
       text: `Instructions from: ${paths[0]}\nprior`,
       description: `Loaded ${paths[0]}`,
       metadata: { instruction: { paths } },
diff --git a/packages/core/test/session-log.test.ts b/packages/core/test/session-log.test.ts
index 3b9229589c..8c49b94582 100644
--- a/packages/core/test/session-log.test.ts
+++ b/packages/core/test/session-log.test.ts
@@ -47,7 +47,7 @@ describe("SessionV2.log", () => {
 
       // Session creation commits a non-public durable event, so the marker's
       // seq covers more of the aggregate than the public events emitted.
-      expect(items.map((item) => item.type)).toEqual(["session.next.renamed", "log.synced"])
+      expect(items.map((item) => item.type)).toEqual(["renamed", "log.synced"])
       expect(items.at(-1)).toEqual({ type: "log.synced", aggregateID: created.id, seq: watermark })
     }),
   )
@@ -64,7 +64,7 @@ describe("SessionV2.log", () => {
       yield* session.rename({ sessionID: created.id, title: "renamed live" })
 
       const items = Array.from(yield* Fiber.join(fiber))
-      expect(items.map((item) => item.type)).toEqual(["log.synced", "session.next.renamed"])
+      expect(items.map((item) => item.type)).toEqual(["log.synced", "renamed"])
     }),
   )
 
diff --git a/packages/core/test/session-projector.test.ts b/packages/core/test/session-projector.test.ts
index 4191a58715..c0d172088e 100644
--- a/packages/core/test/session-projector.test.ts
+++ b/packages/core/test/session-projector.test.ts
@@ -79,7 +79,6 @@ describe("SessionProjector", () => {
       const events = yield* EventV2.Service
       yield* events.publish(SessionEvent.RevertEvent.Staged, {
         sessionID,
-        timestamp: DateTime.makeUnsafe(1),
         revert: { messageID: boundary, snapshot: Snapshot.ID.make("tree"), diff: "patch", files: [] },
       })
       expect((yield* db.select({ revert: SessionTable.revert }).from(SessionTable).get())?.revert).toMatchObject({
@@ -87,17 +86,15 @@ describe("SessionProjector", () => {
         snapshot: "tree",
         files: [],
       })
-      yield* events.publish(SessionEvent.RevertEvent.Cleared, { sessionID, timestamp: DateTime.makeUnsafe(2) })
+      yield* events.publish(SessionEvent.RevertEvent.Cleared, { sessionID })
       expect((yield* db.select({ revert: SessionTable.revert }).from(SessionTable).get())?.revert).toBeNull()
       yield* events.publish(SessionEvent.RevertEvent.Staged, {
         sessionID,
-        timestamp: DateTime.makeUnsafe(3),
         revert: { messageID: boundary, files: [] },
       })
       yield* events.publish(SessionEvent.RevertEvent.Committed, {
         sessionID,
         messageID: boundary,
-        timestamp: DateTime.makeUnsafe(4),
       })
       expect(
         (yield* db.select({ id: SessionMessageTable.id }).from(SessionMessageTable).all()).map((row) => row.id),
@@ -131,37 +128,29 @@ describe("SessionProjector", () => {
 
       yield* events.publish(SessionEvent.PromptAdmitted, {
         sessionID,
-        messageID: SessionMessage.ID.make("msg_first"),
-        timestamp: created,
+        inputID: SessionMessage.ID.make("msg_first"),
         prompt: Prompt.make({ text: "first" }),
         delivery: "steer",
       })
       yield* events.publish(
-        SessionEvent.Prompted,
+        SessionEvent.PromptPromoted,
         {
           sessionID,
-          messageID: SessionMessage.ID.make("msg_first"),
-          timestamp: created,
-          prompt: Prompt.make({ text: "first" }),
-          delivery: "steer",
+          inputID: SessionMessage.ID.make("msg_first"),
         },
         { id: EventV2.ID.make("evt_z") },
       )
       yield* events.publish(SessionEvent.PromptAdmitted, {
         sessionID,
-        messageID: SessionMessage.ID.make("msg_second"),
-        timestamp: created,
+        inputID: SessionMessage.ID.make("msg_second"),
         prompt: Prompt.make({ text: "second" }),
         delivery: "steer",
       })
       yield* events.publish(
-        SessionEvent.Prompted,
+        SessionEvent.PromptPromoted,
         {
           sessionID,
-          messageID: SessionMessage.ID.make("msg_second"),
-          timestamp: created,
-          prompt: Prompt.make({ text: "second" }),
-          delivery: "steer",
+          inputID: SessionMessage.ID.make("msg_second"),
         },
         { id: EventV2.ID.make("evt_a") },
       )
@@ -190,7 +179,7 @@ describe("SessionProjector", () => {
     }).pipe(Effect.provide(sessionsLayer)),
   )
 
-  it.effect("marks an inbox row promoted with the Prompted event sequence", () =>
+  it.effect("marks an inbox row promoted with the PromptPromoted event sequence", () =>
     Effect.gen(function* () {
       const { db } = yield* Database.Service
       yield* db
@@ -220,12 +209,9 @@ describe("SessionProjector", () => {
       })
       if (!admitted) return yield* Effect.die("Prompt admission failed")
 
-      const event = yield* events.publish(SessionEvent.Prompted, {
+      const event = yield* events.publish(SessionEvent.PromptPromoted, {
         sessionID,
-        timestamp: admitted.timeCreated,
-        messageID: id,
-        prompt: Prompt.make({ text: "promote me" }),
-        delivery: "steer",
+        inputID: id,
       })
 
       expect(
@@ -256,49 +242,36 @@ describe("SessionProjector", () => {
         .pipe(Effect.orDie)
       const events = yield* EventV2.Service
 
-      yield* events.publish(SessionEvent.AgentSwitched, {
+      yield* events.publish(SessionEvent.AgentSelected, {
         sessionID,
-        messageID: SessionMessage.ID.create(),
-        timestamp: created,
         agent: "build",
       })
-      yield* events.publish(SessionEvent.ModelSwitched, {
+      yield* events.publish(SessionEvent.ModelSelected, {
         sessionID,
-        messageID: SessionMessage.ID.create(),
-        timestamp: created,
         model,
       })
       yield* events.publish(SessionEvent.Synthetic, {
         sessionID,
-        messageID: SessionMessage.ID.create(),
-        timestamp: created,
         text: "synthetic context",
         metadata: { source: "projector-test" },
       })
       yield* events.publish(SessionEvent.Shell.Started, {
         sessionID,
-        messageID: SessionMessage.ID.create(),
-        timestamp: created,
         callID: "shell-1",
         command: "pwd",
       })
       yield* events.publish(SessionEvent.Shell.Ended, {
         sessionID,
-        timestamp: DateTime.makeUnsafe(1),
         callID: "shell-1",
         output: "/project",
       })
       const compactionID = SessionMessage.ID.create()
       yield* events.publish(SessionEvent.Compaction.Started, {
         sessionID,
-        messageID: compactionID,
-        timestamp: created,
         reason: "manual",
       })
       yield* events.publish(SessionEvent.Compaction.Delta, {
         sessionID,
-        messageID: compactionID,
-        timestamp: created,
         text: "partial",
       })
       expect(
@@ -319,8 +292,6 @@ describe("SessionProjector", () => {
       ).toEqual([])
       yield* events.publish(SessionEvent.Compaction.Ended, {
         sessionID,
-        messageID: compactionID,
-        timestamp: DateTime.makeUnsafe(1),
         reason: "manual",
         text: "summary",
         recent: "recent context",
@@ -350,7 +321,7 @@ describe("SessionProjector", () => {
       })
       expect(messages.find((message) => message.type === "shell")).toMatchObject({
         output: "/project",
-        time: { completed: DateTime.makeUnsafe(1) },
+        time: { completed: DateTime.makeUnsafe(0) },
       })
       expect(messages.find((message) => message.type === "compaction")).toMatchObject({
         summary: "summary",
@@ -388,13 +359,20 @@ describe("SessionProjector", () => {
         .pipe(Effect.orDie)
       const events = yield* EventV2.Service
       const id = SessionMessage.ID.make("msg_creator_collision")
+      const {
+        id: _,
+        type,
+        ...data
+      } = encodeMessage({ id, sessionID, type: "synthetic", text: "existing", time: { created } })
+      yield* db
+        .insert(SessionMessageTable)
+        .values({ id, session_id: sessionID, type, seq: 0, time_created: 0, data })
+        .run()
 
-      yield* events.publish(SessionEvent.Synthetic, { sessionID, messageID: id, timestamp: created, text: "keep me" })
       const exit = yield* events
         .publish(SessionEvent.Step.Started, {
           sessionID,
           assistantMessageID: id,
-          timestamp: created,
           agent: "build",
           model,
         })
@@ -464,7 +442,6 @@ describe("SessionProjector", () => {
       const service = yield* EventV2.Service
       yield* service.publish(SessionEvent.Step.Ended, {
         sessionID,
-        timestamp: DateTime.makeUnsafe(1),
         assistantMessageID: SessionMessage.ID.make("msg_assistant_2"),
         finish: "stop",
         cost: 0,
@@ -485,7 +462,7 @@ describe("SessionProjector", () => {
       expect(messages[1]).toMatchObject({
         type: "assistant",
         finish: "stop",
-        time: { completed: DateTime.makeUnsafe(1) },
+        time: { completed: DateTime.makeUnsafe(0) },
       })
     }),
   )
@@ -526,7 +503,6 @@ describe("SessionProjector", () => {
       yield* service.publish(SessionEvent.Text.Started, {
         sessionID,
         assistantMessageID: SessionMessage.ID.make("msg_assistant_completed"),
-        timestamp: DateTime.makeUnsafe(3),
         textID: "text-stale",
       })
 
diff --git a/packages/core/test/session-prompt.test.ts b/packages/core/test/session-prompt.test.ts
index 58e26b7b5c..58a613a324 100644
--- a/packages/core/test/session-prompt.test.ts
+++ b/packages/core/test/session-prompt.test.ts
@@ -201,7 +201,6 @@ describe("SessionV2.prompt", () => {
       yield* db.insert(SessionMessageTable).values(assistantRow(stale, 100)).run().pipe(Effect.orDie)
       yield* events.publish(SessionEvent.RevertEvent.Staged, {
         sessionID,
-        timestamp: yield* DateTime.now,
         revert: { messageID: boundary.id, files: [] },
       })
       expect((yield* session.get(sessionID)).revert?.messageID).toBe(boundary.id)
@@ -257,16 +256,16 @@ describe("SessionV2.prompt", () => {
       const streamed = Array.from(yield* Fiber.join(fiber))
 
       expect(streamed.map((event): [number | undefined, string] => [event.durable?.seq, event.type])).toEqual([
-        [0, "session.next.prompt.admitted"],
-        [1, "session.next.prompt.admitted"],
-        [2, "session.next.prompted"],
-        [3, "session.next.prompted"],
+        [0, "prompt.admitted"],
+        [1, "prompt.admitted"],
+        [2, "prompt.promoted"],
+        [3, "prompt.promoted"],
       ])
       expect(
         Array.from(
           yield* publicEvents({ sessionID, after: streamed[0].durable?.seq }).pipe(Stream.take(1), Stream.runCollect),
         ).map((event): [number | undefined, string] => [event.durable?.seq, event.type]),
-      ).toEqual([[1, "session.next.prompt.admitted"]])
+      ).toEqual([[1, "prompt.admitted"]])
     }),
   )
 
@@ -429,7 +428,7 @@ describe("SessionV2.prompt", () => {
         { concurrency: "unbounded" },
       )
 
-      expect(yield* eventCount(EventV2.versionedType(SessionEvent.Prompted.type, 1))).toBe(1)
+      expect(yield* eventCount(EventV2.versionedType(SessionEvent.PromptPromoted.type, 1))).toBe(1)
       expect(yield* admitted(messageID)).toMatchObject({ promotedSeq: 1 })
       expect(yield* session.messages({ sessionID })).toMatchObject([
         { id: messageID, type: "user", text: "Promote once" },
@@ -467,6 +466,7 @@ describe("SessionV2.prompt", () => {
       yield* events.replayAll(
         recorded.map((event) => ({
           id: event.id,
+          created: DateTime.makeUnsafe(event.created),
           aggregateID: event.aggregate_id,
           seq: event.seq,
           type: event.type,
@@ -514,13 +514,23 @@ describe("SessionV2.prompt", () => {
     Effect.gen(function* () {
       yield* setup
       const session = yield* SessionV2.Service
-      const events = yield* EventV2.Service
-      yield* events.publish(SessionEvent.Synthetic, {
+      const { db } = yield* Database.Service
+      const {
+        id: _,
+        type,
+        ...data
+      } = encodeMessage({
+        id: messageID,
         sessionID,
-        messageID,
-        timestamp: yield* DateTime.now,
+        type: "synthetic",
         text: "Existing history",
+        time: { created: DateTime.makeUnsafe(0) },
       })
+      yield* db
+        .insert(SessionMessageTable)
+        .values({ id: messageID, session_id: sessionID, type, seq: 0, time_created: 0, data })
+        .run()
+        .pipe(Effect.orDie)
 
       const failure = yield* session
         .prompt({ id: messageID, sessionID, prompt: Prompt.make({ text: "Conflicting prompt" }), resume: false })
diff --git a/packages/core/test/session-runner-message.test.ts b/packages/core/test/session-runner-message.test.ts
index 5798b665a8..840a4e424c 100644
--- a/packages/core/test/session-runner-message.test.ts
+++ b/packages/core/test/session-runner-message.test.ts
@@ -51,13 +51,13 @@ describe("toLLMMessages", () => {
     const file = FileAttachment.make({ uri: "data:image/png;base64,aGVsbG8=", mime: "image/png", name: "hello.png" })
     const messages = toLLMMessages(
       [
-        SessionMessage.AgentSwitched.make({
+        SessionMessage.AgentSelected.make({
           id: id("agent"),
           type: "agent-switched",
           agent: "build",
           time: { created },
         }),
-        SessionMessage.ModelSwitched.make({
+        SessionMessage.ModelSelected.make({
           id: id("model"),
           type: "model-switched",
           model: { id: ModelV2.ID.make("model"), providerID: ProviderV2.ID.make("provider") },
diff --git a/packages/core/test/session-runner-recorded.test.ts b/packages/core/test/session-runner-recorded.test.ts
index 0ebe7a6f9e..2768be820a 100644
--- a/packages/core/test/session-runner-recorded.test.ts
+++ b/packages/core/test/session-runner-recorded.test.ts
@@ -193,12 +193,12 @@ describe("SessionRunnerLLM recorded", () => {
           .orderBy(EventTable.seq)
           .all()).map((event) => event.type),
       ).toEqual([
-        "session.next.prompt.admitted.1",
-        "session.next.prompted.1",
-        "session.next.step.started.1",
-        "session.next.text.started.1",
-        "session.next.text.ended.1",
-        "session.next.step.ended.2",
+        "prompt.admitted.1",
+        "prompt.promoted.1",
+        "step.started.1",
+        "text.started.1",
+        "text.ended.1",
+        "step.ended.1",
       ])
     }),
   )
diff --git a/packages/core/test/session-runner-tool-events.test.ts b/packages/core/test/session-runner-tool-events.test.ts
index 048766e439..5c8d7e07f4 100644
--- a/packages/core/test/session-runner-tool-events.test.ts
+++ b/packages/core/test/session-runner-tool-events.test.ts
@@ -76,7 +76,7 @@ test("local tool success serializes media base64 once and reconstructs from stru
   await Effect.runPromise(publisher.publish(call))
   await Effect.runPromise(publisher.publish(result))
 
-  const success = published.find((event) => event.type === "session.next.tool.success.1")
+  const success = published.find((event) => event.type === "tool.success.1")
   expect(success).toBeDefined()
   const serialized = JSON.stringify(success)
   expect(serialized.split(base64)).toHaveLength(2)
@@ -94,7 +94,7 @@ test("provider-executed success retains its compatibility result", async () => {
   const { published, publisher } = capture()
   await Effect.runPromise(publisher.publish(LLMEvent.toolCall({ ...call, providerExecuted: true })))
   await Effect.runPromise(publisher.publish(LLMEvent.toolResult({ ...result, providerExecuted: true })))
-  const success = published.find((event) => event.type === "session.next.tool.success.1")
+  const success = published.find((event) => event.type === "tool.success.1")
   expect(success?.data).toHaveProperty("result")
 })
 
@@ -110,14 +110,13 @@ test("binary failure emits no success event", async () => {
       }),
     ),
   )
-  expect(published.some((event) => event.type === "session.next.tool.success.1")).toBe(false)
-  expect(published.some((event) => event.type === "session.next.tool.failed.1")).toBe(true)
+  expect(published.some((event) => event.type === "tool.success.1")).toBe(false)
+  expect(published.some((event) => event.type === "tool.failed.1")).toBe(true)
 })
 
 test("old success event data containing result still decodes", () => {
   const decoded = Schema.decodeUnknownSync(SessionEvent.Tool.Success.data)({
     sessionID,
-    timestamp: Date.now(),
     assistantMessageID: SessionMessage.ID.create(),
     callID: "call-old",
     structured: { type: "media", mime: "image/png" },
@@ -133,6 +132,6 @@ test("step finish records settlement without publishing step ended", async () =>
   await Effect.runPromise(publisher.publish(LLMEvent.stepStart({ index: 0 })))
   await Effect.runPromise(publisher.publish(LLMEvent.stepFinish({ index: 0, reason: "stop" })))
 
-  expect(published.some((event) => event.type === "session.next.step.ended.2")).toBe(false)
+  expect(published.some((event) => event.type === "step.ended.2")).toBe(false)
   expect(publisher.stepSettlement()).toMatchObject({ finish: "stop" })
 })
diff --git a/packages/core/test/session-runner.test.ts b/packages/core/test/session-runner.test.ts
index 4c9446394c..ca8ec42775 100644
--- a/packages/core/test/session-runner.test.ts
+++ b/packages/core/test/session-runner.test.ts
@@ -423,6 +423,7 @@ const replaySessionProjection = (id: SessionV2.ID) =>
     yield* events.replayAll(
       recorded.map((event) => ({
         id: event.id,
+        created: DateTime.makeUnsafe(event.created),
         aggregateID: event.aggregate_id,
         seq: event.seq,
         type: event.type,
@@ -740,7 +741,6 @@ describe("SessionRunnerLLM", () => {
 
       yield* events.publish(SessionEvent.Moved, {
         sessionID,
-        timestamp: DateTime.makeUnsafe(1),
         location: Location.Ref.make({ directory: AbsolutePath.make("/moved") }),
       })
       expect(
@@ -848,7 +848,7 @@ describe("SessionRunnerLLM", () => {
         yield* db
           .select({ id: EventTable.id })
           .from(EventTable)
-          .where(eq(EventTable.type, "session.next.context.updated.1"))
+          .where(eq(EventTable.type, "session.context.updated.1"))
           .all()
           .pipe(Effect.orDie),
       ).toHaveLength(1)
@@ -1010,10 +1010,8 @@ describe("SessionRunnerLLM", () => {
       response = []
       yield* session.resume(sessionID)
       skillBaselines.set(AgentV2.ID.make("reviewer"), "Reviewer skills")
-      yield* events.publish(SessionEvent.AgentSwitched, {
+      yield* events.publish(SessionEvent.AgentSelected, {
         sessionID,
-        messageID: SessionMessage.ID.create(),
-        timestamp: DateTime.makeUnsafe(1),
         agent: "reviewer",
       })
       yield* session.prompt({ sessionID, prompt: Prompt.make({ text: "Second" }), resume: false })
@@ -1039,10 +1037,8 @@ describe("SessionRunnerLLM", () => {
         if (switched) return Effect.void
         switched = true
         return events
-          .publish(SessionEvent.AgentSwitched, {
+          .publish(SessionEvent.AgentSelected, {
             sessionID,
-            messageID: SessionMessage.ID.create(),
-            timestamp: DateTime.makeUnsafe(1),
             agent: "reviewer",
           })
           .pipe(Effect.asVoid)
@@ -1069,10 +1065,8 @@ describe("SessionRunnerLLM", () => {
         if (switched) return Effect.void
         switched = true
         return events
-          .publish(SessionEvent.ModelSwitched, {
+          .publish(SessionEvent.ModelSelected, {
             sessionID,
-            messageID: SessionMessage.ID.create(),
-            timestamp: DateTime.makeUnsafe(1),
             model: { id: ModelV2.ID.make("replacement"), providerID: ProviderV2.ID.make("fake") },
           })
           .pipe(Effect.asVoid)
@@ -1175,10 +1169,8 @@ describe("SessionRunnerLLM", () => {
       systemBaseline = "Changed context"
       yield* session.prompt({ sessionID, prompt: Prompt.make({ text: "Second" }), resume: false })
       yield* session.resume(sessionID)
-      yield* events.publish(SessionEvent.ModelSwitched, {
+      yield* events.publish(SessionEvent.ModelSelected, {
         sessionID,
-        messageID: SessionMessage.ID.create(),
-        timestamp: DateTime.makeUnsafe(1),
         model: { id: ModelV2.ID.make("replacement"), providerID: ProviderV2.ID.make("fake") },
       })
       systemBaseline = "Replacement context"
@@ -1217,10 +1209,8 @@ describe("SessionRunnerLLM", () => {
       requests.length = 0
       response = []
       yield* session.resume(sessionID)
-      yield* events.publish(SessionEvent.ModelSwitched, {
+      yield* events.publish(SessionEvent.ModelSelected, {
         sessionID,
-        messageID: SessionMessage.ID.create(),
-        timestamp: DateTime.makeUnsafe(1),
         model: { id: ModelV2.ID.make("replacement"), providerID: ProviderV2.ID.make("fake") },
       })
       systemUnavailable = true
@@ -1252,14 +1242,10 @@ describe("SessionRunnerLLM", () => {
       const compactionID = SessionMessage.ID.create()
       yield* events.publish(SessionEvent.Compaction.Started, {
         sessionID,
-        messageID: compactionID,
-        timestamp: DateTime.makeUnsafe(1),
         reason: "manual",
       })
       yield* events.publish(SessionEvent.Compaction.Ended, {
         sessionID,
-        messageID: compactionID,
-        timestamp: DateTime.makeUnsafe(2),
         reason: "manual",
         text: "summary",
         recent: "",
@@ -1482,14 +1468,10 @@ describe("SessionRunnerLLM", () => {
       const compactionID = SessionMessage.ID.create()
       yield* events.publish(SessionEvent.Compaction.Started, {
         sessionID,
-        messageID: compactionID,
-        timestamp: DateTime.makeUnsafe(1),
         reason: "manual",
       })
       yield* events.publish(SessionEvent.Compaction.Ended, {
         sessionID,
-        messageID: compactionID,
-        timestamp: DateTime.makeUnsafe(2),
         reason: "manual",
         text: "summary",
         recent: "",
@@ -1686,10 +1668,8 @@ describe("SessionRunnerLLM", () => {
       toolExecutionsReady = 1
       const run = yield* Effect.forkChild(session.resume(sessionID))
       yield* Deferred.await(toolExecutionsStarted)
-      yield* events.publish(SessionEvent.ModelSwitched, {
+      yield* events.publish(SessionEvent.ModelSelected, {
         sessionID,
-        messageID: SessionMessage.ID.create(),
-        timestamp: DateTime.makeUnsafe(1),
         model: { id: ModelV2.ID.make("replacement"), providerID: ProviderV2.ID.make("fake") },
       })
       systemBaseline = "Replacement context"
@@ -2403,27 +2383,23 @@ describe("SessionRunnerLLM", () => {
       yield* events.publish(SessionEvent.Step.Started, {
         sessionID,
         assistantMessageID,
-        timestamp: yield* DateTime.now,
         agent: "build",
         model: { id: ModelV2.ID.make("fake-model"), providerID: ProviderV2.ID.make("fake") },
       })
       yield* events.publish(SessionEvent.Tool.Input.Started, {
         sessionID,
-        timestamp: yield* DateTime.now,
         assistantMessageID,
         callID: "call-interrupted",
         name: "echo",
       })
       yield* events.publish(SessionEvent.Tool.Input.Ended, {
         sessionID,
-        timestamp: yield* DateTime.now,
         assistantMessageID,
         callID: "call-interrupted",
         text: '{"text":"stale"}',
       })
       yield* events.publish(SessionEvent.Tool.Called, {
         sessionID,
-        timestamp: yield* DateTime.now,
         assistantMessageID,
         callID: "call-interrupted",
         tool: "echo",
@@ -2467,27 +2443,23 @@ describe("SessionRunnerLLM", () => {
       yield* events.publish(SessionEvent.Step.Started, {
         sessionID,
         assistantMessageID,
-        timestamp: yield* DateTime.now,
         agent: "build",
         model: { id: ModelV2.ID.make("fake-model"), providerID: ProviderV2.ID.make("fake") },
       })
       yield* events.publish(SessionEvent.Tool.Input.Started, {
         sessionID,
-        timestamp: yield* DateTime.now,
         assistantMessageID,
         callID: "call-hosted-interrupted",
         name: "web_search",
       })
       yield* events.publish(SessionEvent.Tool.Input.Ended, {
         sessionID,
-        timestamp: yield* DateTime.now,
         assistantMessageID,
         callID: "call-hosted-interrupted",
         text: '{"query":"stale"}',
       })
       yield* events.publish(SessionEvent.Tool.Called, {
         sessionID,
-        timestamp: yield* DateTime.now,
         assistantMessageID,
         callID: "call-hosted-interrupted",
         tool: "web_search",
@@ -2527,13 +2499,11 @@ describe("SessionRunnerLLM", () => {
       yield* events.publish(SessionEvent.Step.Started, {
         sessionID,
         assistantMessageID,
-        timestamp: yield* DateTime.now,
         agent: "build",
         model: { id: ModelV2.ID.make("fake-model"), providerID: ProviderV2.ID.make("fake") },
       })
       yield* events.publish(SessionEvent.Tool.Input.Started, {
         sessionID,
-        timestamp: yield* DateTime.now,
         assistantMessageID,
         callID: "call-pending-interrupted",
         name: "echo",
@@ -2578,7 +2548,7 @@ describe("SessionRunnerLLM", () => {
       const events = yield* EventV2.Service
       const defect = new Error("fail after prompt promotion")
       let fail = true
-      yield* events.project(SessionEvent.Prompted, () => (fail ? Effect.die(defect) : Effect.void))
+      yield* events.project(SessionEvent.PromptPromoted, () => (fail ? Effect.die(defect) : Effect.void))
       yield* session.prompt({ sessionID, prompt: Prompt.make({ text: "Recover promoted input" }), resume: false })
 
       expect(yield* session.resume(sessionID).pipe(Effect.catchDefect(Effect.succeed))).toBe(defect)
@@ -2603,7 +2573,9 @@ describe("SessionRunnerLLM", () => {
       const session = yield* SessionV2.Service
       const events = yield* EventV2.Service
       yield* events.listen((event) =>
-        event.type === SessionEvent.Prompted.type ? Effect.die("fail after prompt promotion commits") : Effect.void,
+        event.type === SessionEvent.PromptPromoted.type
+          ? Effect.die("fail after prompt promotion commits")
+          : Effect.void,
       )
       yield* session.prompt({
         sessionID,
@@ -3013,7 +2985,7 @@ describe("SessionRunnerLLM", () => {
         { type: "user", text: "Interrupt provider" },
         { type: "assistant", finish: "error", error: { type: "unknown", message: "Provider turn interrupted" } },
       ])
-      expect(yield* recordedEventTypes(sessionID)).toContain("session.next.step.failed.2")
+      expect(yield* recordedEventTypes(sessionID)).toContain("step.failed.1")
       yield* session.interrupt(sessionID)
     }),
   )
@@ -3057,8 +3029,8 @@ describe("SessionRunnerLLM", () => {
         },
       ])
       const eventTypes = yield* recordedEventTypes(sessionID)
-      expect(eventTypes).toContain("session.next.step.failed.2")
-      expect(eventTypes).not.toContain("session.next.step.ended.2")
+      expect(eventTypes).toContain("step.failed.1")
+      expect(eventTypes).not.toContain("step.ended.1")
     }),
   )
 
diff --git a/packages/core/test/session-title.test.ts b/packages/core/test/session-title.test.ts
index 1e9bcfbeb8..59abb8fabc 100644
--- a/packages/core/test/session-title.test.ts
+++ b/packages/core/test/session-title.test.ts
@@ -86,17 +86,13 @@ const prompt = (sessionID: SessionV2.ID, text: string) =>
     const messageID = SessionMessage.ID.create()
     yield* events.publish(SessionEvent.PromptAdmitted, {
       sessionID,
-      messageID,
-      timestamp: DateTime.makeUnsafe(0),
+      inputID: messageID,
       prompt: Prompt.make({ text }),
       delivery: "steer",
     })
-    yield* events.publish(SessionEvent.Prompted, {
+    yield* events.publish(SessionEvent.PromptPromoted, {
       sessionID,
-      messageID,
-      timestamp: DateTime.makeUnsafe(0),
-      prompt: Prompt.make({ text }),
-      delivery: "steer",
+      inputID: messageID,
     })
   })
 
diff --git a/packages/core/test/session-tool-progress.test.ts b/packages/core/test/session-tool-progress.test.ts
index 6d07b14657..e730b3556b 100644
--- a/packages/core/test/session-tool-progress.test.ts
+++ b/packages/core/test/session-tool-progress.test.ts
@@ -51,7 +51,6 @@ describe("Tool.Progress", () => {
       yield* service.publish(SessionEvent.Step.Started, {
         sessionID,
         assistantMessageID,
-        timestamp,
         agent: "build",
         model,
       })
@@ -69,14 +68,12 @@ describe("Tool.Progress", () => {
         Effect.gen(function* () {
           yield* service.publish(SessionEvent.Tool.Input.Started, {
             sessionID,
-            timestamp,
             assistantMessageID,
             callID,
             name: "bash",
           })
           yield* service.publish(SessionEvent.Tool.Called, {
             sessionID,
-            timestamp,
             assistantMessageID,
             callID,
             tool: "bash",
@@ -92,7 +89,6 @@ describe("Tool.Progress", () => {
 
       yield* service.publish(SessionEvent.Tool.Progress, {
         sessionID,
-        timestamp,
         assistantMessageID,
         callID: "call-success",
         structured: { phase: "checkpoint" },
@@ -104,7 +100,6 @@ describe("Tool.Progress", () => {
 
       const success = yield* service.publish(SessionEvent.Tool.Success, {
         sessionID,
-        timestamp,
         assistantMessageID,
         callID: "call-success",
         structured: { phase: "done" },
@@ -118,7 +113,6 @@ describe("Tool.Progress", () => {
       yield* start("call-failed")
       yield* service.publish(SessionEvent.Tool.Progress, {
         sessionID,
-        timestamp,
         assistantMessageID,
         callID: "call-failed",
         structured: { phase: "checkpoint" },
@@ -126,7 +120,6 @@ describe("Tool.Progress", () => {
       })
       const failed = yield* service.publish(SessionEvent.Tool.Failed, {
         sessionID,
-        timestamp,
         assistantMessageID,
         callID: "call-failed",
         error: { type: "unknown", message: "boom" },
diff --git a/packages/core/test/shared-schema.test.ts b/packages/core/test/shared-schema.test.ts
index e7556a8b7c..ecdd555fa8 100644
--- a/packages/core/test/shared-schema.test.ts
+++ b/packages/core/test/shared-schema.test.ts
@@ -148,8 +148,8 @@ test("Core reuses the canonical shared schemas", async () => {
     [coreSessionInput.Admitted, SessionInput.Admitted],
     [coreSessionMessage.ID, SessionMessage.ID],
     [coreSessionMessage.UnknownError, SessionMessage.UnknownError],
-    [coreSessionMessage.AgentSwitched, SessionMessage.AgentSwitched],
-    [coreSessionMessage.ModelSwitched, SessionMessage.ModelSwitched],
+    [coreSessionMessage.AgentSelected, SessionMessage.AgentSelected],
+    [coreSessionMessage.ModelSelected, SessionMessage.ModelSelected],
     [coreSessionMessage.User, SessionMessage.User],
     [coreSessionMessage.Synthetic, SessionMessage.Synthetic],
     [coreSessionMessage.System, SessionMessage.System],
diff --git a/packages/core/test/tool-shell.test.ts b/packages/core/test/tool-shell.test.ts
index 15bd741a2e..6fd43ee2a2 100644
--- a/packages/core/test/tool-shell.test.ts
+++ b/packages/core/test/tool-shell.test.ts
@@ -79,27 +79,23 @@ const executionNode = makeGlobalNode({
         yield* events.publish(SessionEvent.Step.Started, {
           sessionID: id,
           assistantMessageID,
-          timestamp: yield* DateTime.now,
           agent: session.agent ?? AgentV2.ID.make("code"),
           model: sessionModel,
         })
         yield* events.publish(SessionEvent.Text.Started, {
           sessionID: id,
           assistantMessageID,
-          timestamp: yield* DateTime.now,
           textID,
         })
         yield* events.publish(SessionEvent.Text.Ended, {
           sessionID: id,
           assistantMessageID,
-          timestamp: yield* DateTime.now,
           textID,
           text: "ok",
         })
         yield* events.publish(SessionEvent.Step.Ended, {
           sessionID: id,
           assistantMessageID,
-          timestamp: yield* DateTime.now,
           finish: "stop",
           cost: 0,
           tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
diff --git a/packages/core/test/tool-subagent.test.ts b/packages/core/test/tool-subagent.test.ts
index 6274e329aa..4dd46da691 100644
--- a/packages/core/test/tool-subagent.test.ts
+++ b/packages/core/test/tool-subagent.test.ts
@@ -53,27 +53,23 @@ const executionNode = makeGlobalNode({
         yield* events.publish(SessionEvent.Step.Started, {
           sessionID,
           assistantMessageID,
-          timestamp: yield* DateTime.now,
           agent: AgentV2.ID.make("reviewer"),
           model: childModel,
         })
         yield* events.publish(SessionEvent.Text.Started, {
           sessionID,
           assistantMessageID,
-          timestamp: yield* DateTime.now,
           textID,
         })
         yield* events.publish(SessionEvent.Text.Ended, {
           sessionID,
           assistantMessageID,
-          timestamp: yield* DateTime.now,
           textID,
           text: childText,
         })
         yield* events.publish(SessionEvent.Step.Ended, {
           sessionID,
           assistantMessageID,
-          timestamp: yield* DateTime.now,
           finish: "stop",
           cost: 0,
           tokens,
diff --git a/packages/opencode/src/cli/cmd/run/noninteractive.ts b/packages/opencode/src/cli/cmd/run/noninteractive.ts
index fe6b95267c..60ded4ebd9 100644
--- a/packages/opencode/src/cli/cmd/run/noninteractive.ts
+++ b/packages/opencode/src/cli/cmd/run/noninteractive.ts
@@ -156,17 +156,16 @@ export async function runNonInteractivePrompt(input: Input) {
         continue
       }
       if (!("sessionID" in event.data) || event.data.sessionID !== input.sessionID) continue
-      const time = "timestamp" in event.data ? toMillis(event.data.timestamp) : Date.now()
+      const time = toMillis(event.created)
 
-      if (event.type === "session.next.prompted") {
-        if (event.data.messageID === messageID) {
+      if (event.type === "prompt.promoted") {
+        if (event.data.inputID === messageID) {
           promoted = true
           continue
         }
-        if (promoted && event.data.delivery === "queue") return
       }
       if (
-        event.type === "session.next.execution.settled" &&
+        event.type === "execution.settled" &&
         event.data.outcome === "interrupted" &&
         (interrupted || permissionRejected || questionRejected || formCancelled)
       ) {
@@ -174,7 +173,7 @@ export async function runNonInteractivePrompt(input: Input) {
       }
       if (!promoted) continue
 
-      if (event.type === "session.next.step.started") {
+      if (event.type === "step.started") {
         const part: StepStartPart = {
           id: partID(event.id),
           sessionID: input.sessionID,
@@ -190,11 +189,11 @@ export async function runNonInteractivePrompt(input: Input) {
         continue
       }
 
-      if (event.type === "session.next.text.started") {
+      if (event.type === "text.started") {
         starts.set(event.data.textID, { id: partID(event.id), timestamp: time })
         continue
       }
-      if (event.type === "session.next.text.ended") {
+      if (event.type === "text.ended") {
         const started = starts.get(event.data.textID)
         const part: TextPart = {
           id: started?.id ?? partID(event.id),
@@ -208,11 +207,11 @@ export async function runNonInteractivePrompt(input: Input) {
         continue
       }
 
-      if (event.type === "session.next.reasoning.started") {
+      if (event.type === "reasoning.started") {
         starts.set(event.data.reasoningID, { id: partID(event.id), timestamp: time })
         continue
       }
-      if (event.type === "session.next.reasoning.ended" && input.thinking) {
+      if (event.type === "reasoning.ended" && input.thinking) {
         const started = starts.get(event.data.reasoningID)
         const part: ReasoningPart = {
           id: started?.id ?? partID(event.id),
@@ -237,7 +236,7 @@ export async function runNonInteractivePrompt(input: Input) {
         continue
       }
 
-      if (event.type === "session.next.tool.input.started") {
+      if (event.type === "tool.input.started") {
         tools.set(event.data.callID, {
           id: partID(event.id),
           timestamp: time,
@@ -247,12 +246,12 @@ export async function runNonInteractivePrompt(input: Input) {
         })
         continue
       }
-      if (event.type === "session.next.tool.input.ended") {
+      if (event.type === "tool.input.ended") {
         const current = tools.get(event.data.callID)
         if (current) current.raw = event.data.text
         continue
       }
-      if (event.type === "session.next.tool.called") {
+      if (event.type === "tool.called") {
         const current = tools.get(event.data.callID)
         tools.set(event.data.callID, {
           id: current?.id ?? partID(event.id),
@@ -265,7 +264,7 @@ export async function runNonInteractivePrompt(input: Input) {
         })
         continue
       }
-      if (event.type === "session.next.tool.success") {
+      if (event.type === "tool.success") {
         const current = tools.get(event.data.callID) ?? fallbackTool(event)
         const part: ToolPart = {
           id: current.id,
@@ -298,7 +297,7 @@ export async function runNonInteractivePrompt(input: Input) {
         if (!emit("tool_use", time, { part })) await input.renderTool(part)
         continue
       }
-      if (event.type === "session.next.tool.failed") {
+      if (event.type === "tool.failed") {
         const current = tools.get(event.data.callID) ?? fallbackTool(event)
         const error = event.data.error.message
         const part: ToolPart = {
@@ -329,7 +328,7 @@ export async function runNonInteractivePrompt(input: Input) {
         continue
       }
 
-      if (event.type === "session.next.step.ended") {
+      if (event.type === "step.ended") {
         const part: StepFinishPart = {
           id: partID(event.id),
           sessionID: input.sessionID,
@@ -343,19 +342,19 @@ export async function runNonInteractivePrompt(input: Input) {
         emit("step_finish", time, { part })
         continue
       }
-      if (event.type === "session.next.step.failed") {
+      if (event.type === "step.failed") {
         if (interrupted || permissionRejected || questionRejected || formCancelled) continue
         emittedError = true
         process.exitCode = 1
         if (!emit("error", time, { error: event.data.error })) UI.error(event.data.error.message)
         continue
       }
-      if (event.type === "session.next.execution.settled") {
+      if (event.type === "execution.settled") {
         if (event.data.outcome === "failure" && !emittedError && !questionRejected && !formCancelled) {
           emittedError = true
           process.exitCode = 1
           const error = event.data.error ?? { type: "unknown", message: "Session execution failed" }
-          if (!emit("error", toMillis(event.data.timestamp), { error })) UI.error(error.message)
+          if (!emit("error", time, { error })) UI.error(error.message)
         }
         if (event.data.outcome === "interrupted" && interrupted) process.exitCode = 130
         return
@@ -458,11 +457,12 @@ function partID(eventID: string) {
 
 function fallbackTool(event: {
   id: string
-  data: { timestamp: number; assistantMessageID: string; callID: string }
+  created: number
+  data: { assistantMessageID: string; callID: string }
 }): ToolState {
   return {
     id: partID(event.id),
-    timestamp: toMillis(event.data.timestamp),
+    timestamp: toMillis(event.created),
     assistantMessageID: event.data.assistantMessageID,
     tool: "tool",
     input: {},
diff --git a/packages/opencode/src/cli/cmd/run/session-data.ts b/packages/opencode/src/cli/cmd/run/session-data.ts
index 05daa8b423..9450f6cf78 100644
--- a/packages/opencode/src/cli/cmd/run/session-data.ts
+++ b/packages/opencode/src/cli/cmd/run/session-data.ts
@@ -728,7 +728,7 @@ export function reduceSessionData(input: SessionDataInput): SessionDataOutput {
   const data = input.data
   const event = input.event
 
-  if (event.type === "session.next.shell.started") {
+  if (event.type === "shell.started") {
     if (event.properties.sessionID !== input.sessionID) {
       return out(data, commits)
     }
@@ -748,7 +748,7 @@ export function reduceSessionData(input: SessionDataInput): SessionDataOutput {
     return out(data, commits, patch({ status: "running shell" }))
   }
 
-  if (event.type === "session.next.shell.ended") {
+  if (event.type === "shell.ended") {
     if (event.properties.sessionID !== input.sessionID) {
       return out(data, commits)
     }
diff --git a/packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts b/packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts
index eac116b0b8..ac652423a1 100644
--- a/packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts
+++ b/packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts
@@ -424,21 +424,21 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
   }
 
   const reduce = (child: ChildState, event: V2Event) => {
-    if (event.type === "session.next.prompted") {
-      if (userFrame(child, event.data.messageID, event.data.prompt.text)) {
-        touch(child, event.data.timestamp)
+    if (event.type === "prompt.promoted") {
+      if (userFrame(child, event.data.inputID, "")) {
+        touch(child, event.created)
         notifyDetail(child)
       }
       return
     }
-    if (event.type === "session.next.step.started") {
-      touch(child, event.data.timestamp)
+    if (event.type === "step.started") {
+      touch(child, event.created)
       if (child.label === FALLBACK_LABEL && event.data.agent) child.label = Locale.titlecase(event.data.agent)
       if (child.status !== "running") child.status = "running"
       input.emit()
       return
     }
-    if (event.type === "session.next.text.delta") {
+    if (event.type === "text.delta") {
       const projected = child.projectedText.get(event.data.textID)
       const covered = projected?.indexOf(event.data.delta) ?? -1
       if (projected && covered >= 0) {
@@ -455,11 +455,11 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
         messageID: event.data.assistantMessageID,
         partID: event.data.textID,
       })
-      touch(child, event.data.timestamp)
+      touch(child, event.created)
       notifyDetail(child)
       return
     }
-    if (event.type === "session.next.text.ended") {
+    if (event.type === "text.ended") {
       child.text.set(event.data.textID, event.data.text)
       child.projectedText.delete(event.data.textID)
       setFrame(child, `text:${event.data.textID}`, {
@@ -470,11 +470,11 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
         messageID: event.data.assistantMessageID,
         partID: event.data.textID,
       })
-      touch(child, event.data.timestamp)
+      touch(child, event.created)
       notifyDetail(child)
       return
     }
-    if (event.type === "session.next.reasoning.delta") {
+    if (event.type === "reasoning.delta") {
       const projected = child.projectedReasoning.get(event.data.reasoningID)
       const covered = projected?.indexOf(event.data.delta) ?? -1
       if (projected && covered >= 0) {
@@ -495,7 +495,7 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
       notifyDetail(child)
       return
     }
-    if (event.type === "session.next.reasoning.ended") {
+    if (event.type === "reasoning.ended") {
       child.reasoning.set(event.data.reasoningID, event.data.text)
       child.projectedReasoning.delete(event.data.reasoningID)
       if (!input.thinking) return
@@ -510,16 +510,16 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
       notifyDetail(child)
       return
     }
-    if (event.type === "session.next.tool.input.started") {
-      child.tools.set(event.data.callID, { name: event.data.name, input: {}, started: event.data.timestamp })
+    if (event.type === "tool.input.started") {
+      child.tools.set(event.data.callID, { name: event.data.name, input: {}, started: event.created })
       return
     }
-    if (event.type === "session.next.tool.called") {
+    if (event.type === "tool.called") {
       const current = child.tools.get(event.data.callID)
       child.tools.set(event.data.callID, {
         name: event.data.tool,
         input: event.data.input,
-        started: current?.started ?? event.data.timestamp,
+        started: current?.started ?? event.created,
       })
       childTool(
         child,
@@ -529,18 +529,18 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
           name: event.data.tool,
           provider: event.data.provider,
           state: { status: "running", input: event.data.input, structured: {}, content: [] },
-          time: { created: current?.started ?? event.data.timestamp, ran: event.data.timestamp },
+          time: { created: current?.started ?? event.created, ran: event.created },
         },
         event.data.assistantMessageID,
       )
-      touch(child, event.data.timestamp)
+      touch(child, event.created)
       notifyDetail(child)
       return
     }
-    if (event.type === "session.next.tool.success" || event.type === "session.next.tool.failed") {
+    if (event.type === "tool.success" || event.type === "tool.failed") {
       if (child.finishedTools.has(event.data.callID)) return
       const current = child.tools.get(event.data.callID)
-      const failed = event.type === "session.next.tool.failed"
+      const failed = event.type === "tool.failed"
       childTool(
         child,
         {
@@ -566,18 +566,18 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
                 result: event.data.result,
               },
           time: {
-            created: current?.started ?? event.data.timestamp,
+            created: current?.started ?? event.created,
             ran: current?.started,
-            completed: event.data.timestamp,
+            completed: event.created,
           },
         },
         event.data.assistantMessageID,
       )
-      touch(child, event.data.timestamp)
+      touch(child, event.created)
       notifyDetail(child)
       return
     }
-    if (event.type === "session.next.step.failed") {
+    if (event.type === "step.failed") {
       setFrame(child, `error:step:${event.data.assistantMessageID}`, {
         kind: "error",
         source: "system",
@@ -585,14 +585,14 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
         phase: "start",
         messageID: event.data.assistantMessageID,
       })
-      touch(child, event.data.timestamp)
+      touch(child, event.created)
       notifyDetail(child)
       return
     }
-    if (event.type === "session.next.execution.settled") {
+    if (event.type === "execution.settled") {
       child.status =
         event.data.outcome === "success" ? "completed" : event.data.outcome === "interrupted" ? "cancelled" : "error"
-      touch(child, event.data.timestamp)
+      touch(child, event.created)
       input.emit()
     }
   }
@@ -613,15 +613,15 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
 
   return {
     main(event) {
-      if (event.type === "session.next.tool.called") {
+      if (event.type === "tool.called") {
         if (event.data.tool === "subagent") pendingCalls.set(event.data.callID, event.data.input)
         return
       }
-      if (event.type === "session.next.tool.failed") {
+      if (event.type === "tool.failed") {
         pendingCalls.delete(event.data.callID)
         return
       }
-      if (event.type !== "session.next.tool.success") return
+      if (event.type !== "tool.success") return
       const pending = pendingCalls.get(event.data.callID)
       pendingCalls.delete(event.data.callID)
       const found = childSessionID(record(event.data.structured))
@@ -633,7 +633,7 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
         child.status = "running"
       }
       if (!found.running && child.status === "running") child.status = "completed"
-      touch(child, event.data.timestamp)
+      touch(child, event.created)
       input.emit()
       if (!child.hydrated) void hydrateChild(child)
     },
diff --git a/packages/opencode/src/cli/cmd/run/stream-v2.transport.ts b/packages/opencode/src/cli/cmd/run/stream-v2.transport.ts
index 7700ddd024..614a960634 100644
--- a/packages/opencode/src/cli/cmd/run/stream-v2.transport.ts
+++ b/packages/opencode/src/cli/cmd/run/stream-v2.transport.ts
@@ -294,7 +294,14 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
     if (!state.tools.get(item.id)?.running) write([toolCommit(part, "start")])
     state.finishedTools.add(item.id)
     state.tools.delete(item.id)
-    write([toolCommit(part, item.state.status === "completed" && part.state.status === "completed" && part.state.output ? "progress" : "final")])
+    write([
+      toolCommit(
+        part,
+        item.state.status === "completed" && part.state.status === "completed" && part.state.output
+          ? "progress"
+          : "final",
+      ),
+    ])
   }
 
   const renderMessage = (message: SessionMessage, render: boolean, reuseVisibleWait: boolean) => {
@@ -395,17 +402,17 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
     }
     input.trace?.write("recv.event", event)
     subagents.main(event)
-    if (event.type === "session.next.prompted") {
-      if (state.wait?.messageID === event.data.messageID) state.wait.promoted = true
-      state.messageIDs.add(event.data.messageID)
+    if (event.type === "prompt.promoted") {
+      if (state.wait?.messageID === event.data.inputID) state.wait.promoted = true
+      state.messageIDs.add(event.data.inputID)
       write([], { phase: "running", status: "waiting for assistant" })
       return
     }
-    if (event.type === "session.next.step.started") {
+    if (event.type === "step.started") {
       write([], { phase: "running", status: "assistant responding" })
       return
     }
-    if (event.type === "session.next.text.delta") {
+    if (event.type === "text.delta") {
       const key = streamPartKey(event.data.assistantMessageID, event.data.textID)
       const projected = state.projectedText.get(key)
       const covered = projected?.indexOf(event.data.delta) ?? -1
@@ -427,7 +434,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       ])
       return
     }
-    if (event.type === "session.next.text.ended") {
+    if (event.type === "text.ended") {
       const key = streamPartKey(event.data.assistantMessageID, event.data.textID)
       const previous = state.text.get(key) ?? ""
       if (event.data.text.length > previous.length)
@@ -445,7 +452,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       state.projectedText.delete(key)
       return
     }
-    if (event.type === "session.next.reasoning.delta") {
+    if (event.type === "reasoning.delta") {
       const key = streamPartKey(event.data.assistantMessageID, event.data.reasoningID)
       const projected = state.projectedReasoning.get(key)
       const covered = projected?.indexOf(event.data.delta) ?? -1
@@ -468,7 +475,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
         ])
       return
     }
-    if (event.type === "session.next.reasoning.ended") {
+    if (event.type === "reasoning.ended") {
       const key = streamPartKey(event.data.assistantMessageID, event.data.reasoningID)
       const previous = state.reasoning.get(key) ?? ""
       if (input.thinking && event.data.text.length > previous.length)
@@ -486,17 +493,17 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       state.projectedReasoning.delete(key)
       return
     }
-    if (event.type === "session.next.tool.input.started") {
+    if (event.type === "tool.input.started") {
       state.tools.set(event.data.callID, {
         messageID: event.data.assistantMessageID,
         name: event.data.name,
         input: {},
-        started: event.data.timestamp,
+        started: event.created,
         running: false,
       })
       return
     }
-    if (event.type === "session.next.tool.called") {
+    if (event.type === "tool.called") {
       if (state.finishedTools.has(event.data.callID)) return
       const current = state.tools.get(event.data.callID)
       const item: SessionMessageAssistantTool = {
@@ -505,22 +512,29 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
         name: event.data.tool,
         provider: event.data.provider,
         state: { status: "running", input: event.data.input, structured: {}, content: [] },
-        time: { created: current?.started ?? event.data.timestamp, ran: event.data.timestamp },
+        time: { created: current?.started ?? event.created, ran: event.created },
       }
       renderTool(event.data.assistantMessageID, item)
       return
     }
-    if (event.type === "session.next.tool.progress") return
-    if (event.type === "session.next.tool.success" || event.type === "session.next.tool.failed") {
+    if (event.type === "tool.progress") return
+    if (event.type === "tool.success" || event.type === "tool.failed") {
       const current = state.tools.get(event.data.callID)
-      const failed = event.type === "session.next.tool.failed"
+      const failed = event.type === "tool.failed"
       const item: SessionMessageAssistantTool = {
         type: "tool",
         id: event.data.callID,
         name: current?.name ?? "tool",
         provider: event.data.provider,
         state: failed
-          ? { status: "error", input: current?.input ?? {}, structured: {}, content: [], error: event.data.error, result: event.data.result }
+          ? {
+              status: "error",
+              input: current?.input ?? {},
+              structured: {},
+              content: [],
+              error: event.data.error,
+              result: event.data.result,
+            }
           : {
               status: "completed",
               input: current?.input ?? {},
@@ -529,7 +543,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
               outputPaths: event.data.outputPaths,
               result: event.data.result,
             },
-        time: { created: current?.started ?? event.data.timestamp, ran: current?.started, completed: event.data.timestamp },
+        time: { created: current?.started ?? event.created, ran: current?.started, completed: event.created },
       }
       renderTool(event.data.assistantMessageID, item)
       return
@@ -554,7 +568,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       syncBlockers()
       return
     }
-    if (event.type === "session.next.step.ended") {
+    if (event.type === "step.ended") {
       const total =
         event.data.tokens.input +
         event.data.tokens.output +
@@ -562,16 +576,19 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
         event.data.tokens.cache.read +
         event.data.tokens.cache.write
       const usage = total > 0 ? total.toLocaleString() : ""
-      write([], { phase: event.data.finish === "tool-calls" ? "running" : "idle", usage: event.data.cost ? `${usage} · ${money.format(event.data.cost)}` : usage })
+      write([], {
+        phase: event.data.finish === "tool-calls" ? "running" : "idle",
+        usage: event.data.cost ? `${usage} · ${money.format(event.data.cost)}` : usage,
+      })
       return
     }
-    if (event.type === "session.next.step.failed") {
+    if (event.type === "step.failed") {
       state.errors.add(event.data.assistantMessageID)
       if (state.wait) state.wait.failureRendered = true
       write([{ kind: "error", source: "system", text: errorMessage(event.data.error), phase: "start" }])
       return
     }
-    if (event.type === "session.next.execution.settled") {
+    if (event.type === "execution.settled") {
       write([], { phase: "idle", status: "" })
       const current = state.wait
       if (!current || (!current.promoted && !current.interrupted)) return
@@ -611,7 +628,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
           sseMaxRetryAttempts: 0,
           throwOnError: true,
         })
-          const stream = response.stream[Symbol.asyncIterator]() as AsyncGenerator<RunV2Event>
+        const stream = response.stream[Symbol.asyncIterator]() as AsyncGenerator<RunV2Event>
         try {
           const first = await stream.next()
           if (first.done || first.value.type !== "server.connected") throw new Error("Event stream disconnected")
@@ -689,10 +706,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
             ]
           : [],
       )
-      const attachments = [
-        ...prepared.flatMap((file) => (file.attachment ? [file.attachment] : [])),
-        ...promptFiles,
-      ]
+      const attachments = [...prepared.flatMap((file) => (file.attachment ? [file.attachment] : [])), ...promptFiles]
       const agents = next.prompt.parts.flatMap((part) =>
         part.type === "agent"
           ? [
@@ -735,10 +749,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
             sessionID: input.sessionID,
             id: messageID,
             prompt: {
-              text: [
-                next.prompt.text,
-                ...prepared.flatMap((file) => (file.text ? [file.text] : [])),
-              ].join("\n\n"),
+              text: [next.prompt.text, ...prepared.flatMap((file) => (file.text ? [file.text] : []))].join("\n\n"),
               files: attachments.length ? attachments : undefined,
               agents: agents.length ? agents : undefined,
             },
diff --git a/packages/opencode/test/cli/run/noninteractive.test.ts b/packages/opencode/test/cli/run/noninteractive.test.ts
index d8bff61a73..839b99656b 100644
--- a/packages/opencode/test/cli/run/noninteractive.test.ts
+++ b/packages/opencode/test/cli/run/noninteractive.test.ts
@@ -18,31 +18,33 @@ function form(id: string, sessionID: string): FormInfo {
 }
 
 function formCreated(info: FormInfo): V2Event {
-  return { id: `evt_${info.id}`, type: "form.created", data: { form: info } }
+  return { id: `evt_${info.id}`, created: 0, type: "form.created", data: { form: info } }
 }
 
-function prompted(messageID: string): V2Event {
+function prompted(inputID: string): V2Event {
   return {
     id: "evt_prompted",
-    type: "session.next.prompted",
+    created: 0,
+    type: "prompt.promoted",
     durable: { aggregateID: "ses_1", seq: 0, version: 1 },
-    data: { timestamp: 1, sessionID: "ses_1", messageID, prompt: { text: "hello" }, delivery: "steer" },
+    data: { sessionID: "ses_1", inputID },
   }
 }
 
 function settled(outcome: "success" | "interrupted" = "success"): V2Event {
   return {
     id: "evt_settled",
-    type: "session.next.execution.settled",
-    data: { timestamp: 2, sessionID: "ses_1", outcome },
+    created: 0,
+    type: "execution.settled",
+    data: { sessionID: "ses_1", outcome },
   }
 }
 
 // Runs one non-interactive prompt against a mocked SDK. `turn` produces the
 // live events the prompt admission triggers, keyed by the generated message ID.
-async function run(input: { turn: (messageID: string) => V2Event[]; pendingForms?: FormInfo[]; attached?: boolean }) {
+async function run(input: { turn: (inputID: string) => V2Event[]; pendingForms?: FormInfo[]; attached?: boolean }) {
   const sdk = new OpencodeClient()
-  const values: V2Event[] = [{ id: "evt_connected", type: "server.connected", data: {} }]
+  const values: V2Event[] = [{ id: "evt_connected", created: 0, type: "server.connected", data: {} }]
   let wake: (() => void) | undefined
   const stream = (async function* (): AsyncGenerator<V2Event, void, unknown> {
     while (true) {
diff --git a/packages/opencode/test/cli/run/session-data.test.ts b/packages/opencode/test/cli/run/session-data.test.ts
index ec21cd007e..89a6751d1b 100644
--- a/packages/opencode/test/cli/run/session-data.test.ts
+++ b/packages/opencode/test/cli/run/session-data.test.ts
@@ -329,7 +329,7 @@ describe("run session data", () => {
   test("renders direct shell mode from first-class shell events", () => {
     let data = createSessionData()
     const started = reduce(data, {
-      type: "session.next.shell.started",
+      type: "shell.started",
       properties: {
         sessionID: "session-1",
         timestamp: 1,
@@ -353,7 +353,7 @@ describe("run session data", () => {
 
     data = started.data
     const ended = reduce(data, {
-      type: "session.next.shell.ended",
+      type: "shell.ended",
       properties: {
         sessionID: "session-1",
         timestamp: 2,
@@ -380,7 +380,7 @@ describe("run session data", () => {
 
   test("suppresses legacy bash part updates once shell events claim the call", () => {
     let data = reduce(createSessionData(), {
-      type: "session.next.shell.started",
+      type: "shell.started",
       properties: {
         sessionID: "session-1",
         timestamp: 1,
@@ -409,7 +409,7 @@ describe("run session data", () => {
     ).toEqual([])
 
     data = reduce(data, {
-      type: "session.next.shell.ended",
+      type: "shell.ended",
       properties: {
         sessionID: "session-1",
         timestamp: 2,
@@ -463,7 +463,7 @@ describe("run session data", () => {
 
     expect(
       reduce(data, {
-        type: "session.next.shell.started",
+        type: "shell.started",
         properties: {
           sessionID: "session-1",
           timestamp: 1,
@@ -497,7 +497,7 @@ describe("run session data", () => {
 
     expect(
       reduce(data, {
-        type: "session.next.shell.ended",
+        type: "shell.ended",
         properties: {
           sessionID: "session-1",
           timestamp: 2,
diff --git a/packages/opencode/test/cli/run/stream-v2.transport.test.ts b/packages/opencode/test/cli/run/stream-v2.transport.test.ts
index 2f78d106cf..8bf429e500 100644
--- a/packages/opencode/test/cli/run/stream-v2.transport.test.ts
+++ b/packages/opencode/test/cli/run/stream-v2.transport.test.ts
@@ -50,7 +50,7 @@ function ok<T>(data: T) {
 }
 
 function connected(id = "evt_connected") {
-  return { id, type: "server.connected", data: {} } satisfies RunV2Event
+  return { id, created: 0, type: "server.connected", data: {} } satisfies RunV2Event
 }
 
 function durable(sessionID: string, seq = 0, version = 1) {
@@ -125,22 +125,20 @@ function sdk(input: {
   spyOn(client.v2.session, "switchModel").mockImplementation(() => ok(undefined))
   // The generated methods have conditional return types for throwOnError; the
   // minimal shapes below are enough for family discovery and model fallback.
-  spyOn(client.v2.session, "list").mockImplementation(
-    (request) => {
-      const parentID = request?.parentID
-      return ok({
-        location: { directory: "/tmp", project: { id: "proj_1", directory: "/tmp" } },
-        data:
-          input.sessions?.filter((session) =>
-            parentID === undefined
-              ? true
-              : parentID === null
-                ? session.parentID === undefined
-                : session.parentID === parentID,
-          ) ?? [],
-      }) as never
-    },
-  )
+  spyOn(client.v2.session, "list").mockImplementation((request) => {
+    const parentID = request?.parentID
+    return ok({
+      location: { directory: "/tmp", project: { id: "proj_1", directory: "/tmp" } },
+      data:
+        input.sessions?.filter((session) =>
+          parentID === undefined
+            ? true
+            : parentID === null
+              ? session.parentID === undefined
+              : session.parentID === parentID,
+        ) ?? [],
+    }) as never
+  })
   spyOn(client.v2.model, "default").mockImplementation(
     () =>
       ok({
@@ -201,21 +199,19 @@ describe("V2 mini transport", () => {
     while (!admitted) await Bun.sleep(0)
     events.push({
       id: "evt_prompted",
-      type: "session.next.prompted",
+      created: 0,
+      type: "prompt.promoted",
       durable: durable("ses_1"),
       data: {
-        timestamp: 2,
         sessionID: "ses_1",
-        messageID: "msg_prompt",
-        prompt: { text: "hello" },
-        delivery: "steer",
+        inputID: "msg_prompt",
       },
     })
     events.push({
       id: "evt_text",
-      type: "session.next.text.delta",
+      created: 0,
+      type: "text.delta",
       data: {
-        timestamp: 3,
         sessionID: "ses_1",
         assistantMessageID: "msg_assistant",
         textID: "txt_1",
@@ -224,8 +220,9 @@ describe("V2 mini transport", () => {
     })
     events.push({
       id: "evt_settled",
-      type: "session.next.execution.settled",
-      data: { timestamp: 4, sessionID: "ses_1", outcome: "success" },
+      created: 0,
+      type: "execution.settled",
+      data: { sessionID: "ses_1", outcome: "success" },
     })
     await turn
 
@@ -261,20 +258,19 @@ describe("V2 mini transport", () => {
       queueMicrotask(() => {
         events.push({
           id: "evt_prompted",
-          type: "session.next.prompted",
+          created: 0,
+          type: "prompt.promoted",
           durable: durable("ses_1"),
           data: {
-            timestamp: 2,
             sessionID: "ses_1",
-            messageID: "msg_prompt",
-            prompt: { text: input.prompt?.text ?? "" },
-            delivery: "steer",
+            inputID: "msg_prompt",
           },
         })
         events.push({
           id: "evt_settled",
-          type: "session.next.execution.settled",
-          data: { timestamp: 3, sessionID: "ses_1", outcome: "success" },
+          created: 0,
+          type: "execution.settled",
+          data: { sessionID: "ses_1", outcome: "success" },
         })
       })
       return ok({
@@ -356,20 +352,19 @@ describe("V2 mini transport", () => {
       queueMicrotask(() => {
         events.push({
           id: "evt_prompted",
-          type: "session.next.prompted",
+          created: 0,
+          type: "prompt.promoted",
           durable: durable("ses_1"),
           data: {
-            timestamp: 2,
             sessionID: "ses_1",
-            messageID: "msg_prompt",
-            prompt: { text: input.prompt?.text ?? "" },
-            delivery: "steer",
+            inputID: "msg_prompt",
           },
         })
         events.push({
           id: "evt_settled",
-          type: "session.next.execution.settled",
-          data: { timestamp: 3, sessionID: "ses_1", outcome: "success" },
+          created: 0,
+          type: "execution.settled",
+          data: { sessionID: "ses_1", outcome: "success" },
         })
       })
       return ok({
@@ -454,20 +449,19 @@ describe("V2 mini transport", () => {
       queueMicrotask(() => {
         events.push({
           id: "evt_prompted",
-          type: "session.next.prompted",
+          created: 0,
+          type: "prompt.promoted",
           durable: durable("ses_1"),
           data: {
-            timestamp: 2,
             sessionID: "ses_1",
-            messageID: "msg_prompt",
-            prompt: { text: input.prompt?.text ?? "" },
-            delivery: "steer",
+            inputID: "msg_prompt",
           },
         })
         events.push({
           id: "evt_settled",
-          type: "session.next.execution.settled",
-          data: { timestamp: 3, sessionID: "ses_1", outcome: "success" },
+          created: 0,
+          type: "execution.settled",
+          data: { sessionID: "ses_1", outcome: "success" },
         })
       })
       return ok({
@@ -528,6 +522,7 @@ describe("V2 mini transport", () => {
     })
     events.push({
       id: "evt_permission",
+      created: 0,
       type: "permission.v2.asked",
       data: { id: "per_1", sessionID: "ses_1", action: "read", resources: ["/tmp/file"] },
     })
@@ -728,9 +723,9 @@ describe("V2 mini transport", () => {
     const replay = transport.replayOnResize({ localRows: () => [], reset: () => resetting })
     events.push({
       id: "evt_text",
-      type: "session.next.text.delta",
+      created: 0,
+      type: "text.delta",
       data: {
-        timestamp: 3,
         sessionID: "ses_1",
         assistantMessageID: "msg_assistant",
         textID: "txt_1",
@@ -813,10 +808,10 @@ describe("V2 mini transport", () => {
     })
     events.push({
       id: "evt_reasoning",
-      type: "session.next.reasoning.ended",
+      created: 0,
+      type: "reasoning.ended",
       durable: durable("ses_1"),
       data: {
-        timestamp: 3,
         sessionID: "ses_1",
         assistantMessageID: "msg_assistant",
         reasoningID: "reasoning_1",
@@ -869,8 +864,9 @@ describe("V2 mini transport", () => {
     await transport.interruptActiveTurn()
     events.push({
       id: "evt_settled",
-      type: "session.next.execution.settled",
-      data: { timestamp: 3, sessionID: "ses_1", outcome: "interrupted" },
+      created: 0,
+      type: "execution.settled",
+      data: { sessionID: "ses_1", outcome: "success" },
     })
     await turn
 
@@ -924,20 +920,19 @@ describe("V2 mini transport", () => {
     while (!admitted) await Bun.sleep(0)
     events.push({
       id: "evt_prompted",
-      type: "session.next.prompted",
+      created: 0,
+      type: "prompt.promoted",
       durable: durable("ses_1"),
       data: {
-        timestamp: 2,
         sessionID: "ses_1",
-        messageID: "msg_prompt",
-        prompt: { text: "hello" },
-        delivery: "steer",
+        inputID: "msg_prompt",
       },
     })
     events.push({
       id: "evt_settled",
-      type: "session.next.execution.settled",
-      data: { timestamp: 3, sessionID: "ses_1", outcome: "success" },
+      created: 0,
+      type: "execution.settled",
+      data: { sessionID: "ses_1", outcome: "success" },
     })
     await turn
 
@@ -985,22 +980,21 @@ describe("V2 mini transport", () => {
     while (!admitted) await Bun.sleep(0)
     events.push({
       id: "evt_prompted",
-      type: "session.next.prompted",
+      created: 0,
+      type: "prompt.promoted",
       durable: durable("ses_1"),
       data: {
-        timestamp: 2,
         sessionID: "ses_1",
-        messageID: "msg_prompt",
-        prompt: { text: "hello" },
-        delivery: "steer",
+        inputID: "msg_prompt",
       },
     })
     await Bun.sleep(0)
     controller.abort()
     events.push({
       id: "evt_settled",
-      type: "session.next.execution.settled",
-      data: { timestamp: 3, sessionID: "ses_1", outcome: "interrupted" },
+      created: 0,
+      type: "execution.settled",
+      data: { sessionID: "ses_1", outcome: "success" },
     })
     await turn
 
@@ -1054,10 +1048,10 @@ describe("V2 mini transport", () => {
 
     events.push({
       id: "evt_child_step",
-      type: "session.next.step.started",
+      created: 0,
+      type: "step.started",
       durable: durable("ses_child"),
       data: {
-        timestamp: 2,
         sessionID: "ses_child",
         assistantMessageID: "msg_child_a",
         agent: "explore",
@@ -1072,9 +1066,9 @@ describe("V2 mini transport", () => {
 
     events.push({
       id: "evt_child_text",
-      type: "session.next.text.delta",
+      created: 0,
+      type: "text.delta",
       data: {
-        timestamp: 3,
         sessionID: "ses_child",
         assistantMessageID: "msg_child_a",
         textID: "txt_child",
@@ -1086,8 +1080,9 @@ describe("V2 mini transport", () => {
 
     events.push({
       id: "evt_child_settled",
-      type: "session.next.execution.settled",
-      data: { timestamp: 4, sessionID: "ses_child", outcome: "success" },
+      created: 0,
+      type: "execution.settled",
+      data: { sessionID: "ses_child", outcome: "success" },
     })
     while (!states().some((state) => state.tabs.some((tab) => tab.status === "completed"))) await Bun.sleep(0)
     await transport.close()
@@ -1130,10 +1125,10 @@ describe("V2 mini transport", () => {
     // Both events arrive while session.get is still in flight.
     events.push({
       id: "evt_child_step",
-      type: "session.next.step.started",
+      created: 0,
+      type: "step.started",
       durable: durable("ses_child"),
       data: {
-        timestamp: 2,
         sessionID: "ses_child",
         assistantMessageID: "msg_child_a",
         agent: "explore",
@@ -1142,8 +1137,9 @@ describe("V2 mini transport", () => {
     })
     events.push({
       id: "evt_child_settled",
-      type: "session.next.execution.settled",
-      data: { timestamp: 3, sessionID: "ses_child", outcome: "interrupted" },
+      created: 0,
+      type: "execution.settled",
+      data: { sessionID: "ses_child", outcome: "interrupted" },
     })
     await Bun.sleep(0)
     resolveGet?.()
@@ -1188,10 +1184,10 @@ describe("V2 mini transport", () => {
     // Child event arrives first and gets buffered behind the gated session.get.
     events.push({
       id: "evt_child_step",
-      type: "session.next.step.started",
+      created: 0,
+      type: "step.started",
       durable: durable("ses_child"),
       data: {
-        timestamp: 2,
         sessionID: "ses_child",
         assistantMessageID: "msg_child_a",
         agent: "explore",
@@ -1201,10 +1197,10 @@ describe("V2 mini transport", () => {
     // Parent's background subagent tool.success adopts the child mid-discovery.
     events.push({
       id: "evt_parent_call",
-      type: "session.next.tool.called",
+      created: 0,
+      type: "tool.called",
       durable: durable("ses_1"),
       data: {
-        timestamp: 3,
         sessionID: "ses_1",
         assistantMessageID: "msg_parent_a",
         callID: "call_sub",
@@ -1215,10 +1211,10 @@ describe("V2 mini transport", () => {
     })
     events.push({
       id: "evt_parent_success",
-      type: "session.next.tool.success",
+      created: 0,
+      type: "tool.success",
       durable: durable("ses_1", 1),
       data: {
-        timestamp: 4,
         sessionID: "ses_1",
         assistantMessageID: "msg_parent_a",
         callID: "call_sub",
@@ -1230,8 +1226,9 @@ describe("V2 mini transport", () => {
     // The settled event arrives after adoption, so it applies directly.
     events.push({
       id: "evt_child_settled",
-      type: "session.next.execution.settled",
-      data: { timestamp: 5, sessionID: "ses_child", outcome: "interrupted" },
+      created: 0,
+      type: "execution.settled",
+      data: { sessionID: "ses_child", outcome: "interrupted" },
     })
     while (!states().some((state) => state.tabs.some((tab) => tab.status === "cancelled"))) await Bun.sleep(0)
 
diff --git a/packages/opencode/test/v2/session-message-updater.test.ts b/packages/opencode/test/v2/session-message-updater.test.ts
index e85afaeeff..4da4dc9d13 100644
--- a/packages/opencode/test/v2/session-message-updater.test.ts
+++ b/packages/opencode/test/v2/session-message-updater.test.ts
@@ -21,12 +21,12 @@ test.skip("step snapshots carry over to assistant messages", () => {
   Effect.runSync(
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
-      type: "session.next.step.started",
+      created: DateTime.makeUnsafe(0),
+      type: "step.started",
       durable: durable(sessionID),
       data: {
         sessionID,
         assistantMessageID,
-        timestamp: DateTime.makeUnsafe(1),
         agent: "build",
         model: {
           id: ModelV2.ID.make("model"),
@@ -43,12 +43,12 @@ test.skip("step snapshots carry over to assistant messages", () => {
   Effect.runSync(
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
-      type: "session.next.step.ended",
+      created: DateTime.makeUnsafe(0),
+      type: "step.ended",
       durable: durable(sessionID, 1, 2),
       data: {
         sessionID,
         assistantMessageID,
-        timestamp: DateTime.makeUnsafe(2),
         finish: "stop",
         cost: 0,
         tokens: {
@@ -76,12 +76,12 @@ test.skip("text ended populates assistant text content", () => {
   Effect.runSync(
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
-      type: "session.next.step.started",
+      created: DateTime.makeUnsafe(0),
+      type: "step.started",
       durable: durable(sessionID),
       data: {
         sessionID,
         assistantMessageID,
-        timestamp: DateTime.makeUnsafe(1),
         agent: "build",
         model: {
           id: ModelV2.ID.make("model"),
@@ -95,12 +95,12 @@ test.skip("text ended populates assistant text content", () => {
   Effect.runSync(
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
-      type: "session.next.text.started",
+      created: DateTime.makeUnsafe(0),
+      type: "text.started",
       durable: durable(sessionID, 1),
       data: {
         sessionID,
         assistantMessageID,
-        timestamp: DateTime.makeUnsafe(2),
         textID: "text-1",
       },
     } satisfies SessionEvent.Event),
@@ -109,12 +109,12 @@ test.skip("text ended populates assistant text content", () => {
   Effect.runSync(
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
-      type: "session.next.text.ended",
+      created: DateTime.makeUnsafe(0),
+      type: "text.ended",
       durable: durable(sessionID, 2),
       data: {
         sessionID,
         assistantMessageID,
-        timestamp: DateTime.makeUnsafe(3),
         textID: "text-1",
         text: "hello assistant",
       },
@@ -135,12 +135,12 @@ test.skip("tool completion stores completed timestamp", () => {
   Effect.runSync(
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
-      type: "session.next.step.started",
+      created: DateTime.makeUnsafe(0),
+      type: "step.started",
       durable: durable(sessionID),
       data: {
         sessionID,
         assistantMessageID,
-        timestamp: DateTime.makeUnsafe(1),
         agent: "build",
         model: {
           id: ModelV2.ID.make("model"),
@@ -154,12 +154,12 @@ test.skip("tool completion stores completed timestamp", () => {
   Effect.runSync(
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
-      type: "session.next.tool.input.started",
+      created: DateTime.makeUnsafe(0),
+      type: "tool.input.started",
       durable: durable(sessionID, 1),
       data: {
         sessionID,
         assistantMessageID,
-        timestamp: DateTime.makeUnsafe(2),
         callID,
         name: "bash",
       },
@@ -169,12 +169,12 @@ test.skip("tool completion stores completed timestamp", () => {
   Effect.runSync(
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
-      type: "session.next.tool.called",
+      created: DateTime.makeUnsafe(0),
+      type: "tool.called",
       durable: durable(sessionID, 2),
       data: {
         sessionID,
         assistantMessageID,
-        timestamp: DateTime.makeUnsafe(3),
         callID,
         tool: "bash",
         input: { command: "pwd" },
@@ -186,12 +186,12 @@ test.skip("tool completion stores completed timestamp", () => {
   Effect.runSync(
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
-      type: "session.next.tool.success",
+      created: DateTime.makeUnsafe(0),
+      type: "tool.success",
       durable: durable(sessionID, 3),
       data: {
         sessionID,
         assistantMessageID,
-        timestamp: DateTime.makeUnsafe(4),
         callID,
         structured: {},
         content: [{ type: "text", text: "/tmp" }],
@@ -212,17 +212,16 @@ test("compaction events reduce to compaction message only when completed", () =>
   const state: SessionMessageUpdater.MemoryState = { messages: [] }
   const sessionID = SessionID.make("session")
   const id = EventV2.ID.create()
-  const compactionID = SessionMessage.ID.create()
+  const endedID = EventV2.ID.create()
 
   Effect.runSync(
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id,
-      type: "session.next.compaction.started",
+      created: DateTime.makeUnsafe(0),
+      type: "compaction.started",
       durable: durable(sessionID),
       data: {
         sessionID,
-        messageID: compactionID,
-        timestamp: DateTime.makeUnsafe(1),
         reason: "auto",
       },
     } satisfies SessionEvent.Event),
@@ -233,11 +232,10 @@ test("compaction events reduce to compaction message only when completed", () =>
   Effect.runSync(
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
-      type: "session.next.compaction.delta",
+      created: DateTime.makeUnsafe(0),
+      type: "compaction.delta",
       data: {
         sessionID,
-        messageID: compactionID,
-        timestamp: DateTime.makeUnsafe(2),
         text: "hello ",
       },
     } satisfies SessionEvent.Event),
@@ -246,11 +244,10 @@ test("compaction events reduce to compaction message only when completed", () =>
   Effect.runSync(
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
-      type: "session.next.compaction.delta",
+      created: DateTime.makeUnsafe(0),
+      type: "compaction.delta",
       data: {
         sessionID,
-        messageID: compactionID,
-        timestamp: DateTime.makeUnsafe(3),
         text: "summary",
       },
     } satisfies SessionEvent.Event),
@@ -258,13 +255,12 @@ test("compaction events reduce to compaction message only when completed", () =>
 
   Effect.runSync(
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
-      id: EventV2.ID.create(),
-      type: "session.next.compaction.ended",
+      id: endedID,
+      created: DateTime.makeUnsafe(0),
+      type: "compaction.ended",
       durable: durable(sessionID, 1),
       data: {
         sessionID,
-        messageID: compactionID,
-        timestamp: DateTime.makeUnsafe(4),
         reason: "auto",
         text: "final summary",
         recent: "recent context",
@@ -274,11 +270,11 @@ test("compaction events reduce to compaction message only when completed", () =>
 
   expect(state.messages).toHaveLength(1)
   expect(state.messages[0]).toMatchObject({
-    id: compactionID,
+    id: SessionMessage.ID.fromEvent(endedID),
     type: "compaction",
     reason: "auto",
     summary: "final summary",
     recent: "recent context",
-    time: { created: DateTime.makeUnsafe(4) },
+    time: { created: DateTime.makeUnsafe(0) },
   })
 })
diff --git a/packages/schema/src/event.ts b/packages/schema/src/event.ts
index aac2f0315e..9f7c347b03 100644
--- a/packages/schema/src/event.ts
+++ b/packages/schema/src/event.ts
@@ -4,7 +4,7 @@ import { Schema } from "effect"
 import { optional } from "./schema.js"
 import { ascending } from "./identifier.js"
 import { Location } from "./location.js"
-import { statics } from "./schema.js"
+import { DateTimeUtcFromMillis, statics } from "./schema.js"
 
 export const ID = Schema.String.check(Schema.isStartsWith("evt_")).pipe(
   Schema.brand("Event.ID"),
@@ -60,6 +60,7 @@ export type Data<D extends Definition> = Schema.Schema.Type<D["data"]>
 type PayloadBase<D extends Definition> = {
   readonly id: ID
   readonly type: D["type"]
+  readonly created: typeof DateTimeUtcFromMillis.Type
   readonly data: Data<D>
   readonly location?: Location.Ref
   readonly metadata?: Record<string, unknown>
@@ -85,6 +86,7 @@ export function durable<
   const data = Schema.Struct(input.schema)
   return Schema.Struct({
     id: ID,
+    created: DateTimeUtcFromMillis,
     metadata: optional(Schema.Record(Schema.String, Schema.Unknown)),
     type: Schema.Literal(input.type),
     durable: DurableEnvelope,
@@ -109,6 +111,7 @@ export function ephemeral<
   const data = Schema.Struct(input.schema)
   return Schema.Struct({
     id: ID,
+    created: DateTimeUtcFromMillis,
     metadata: optional(Schema.Record(Schema.String, Schema.Unknown)),
     type: Schema.Literal(input.type),
     location: optional(Location.Ref),
diff --git a/packages/schema/src/session-event.ts b/packages/schema/src/session-event.ts
index fe1a698555..fce091545a 100644
--- a/packages/schema/src/session-event.ts
+++ b/packages/schema/src/session-event.ts
@@ -6,7 +6,7 @@ import { Event } from "./event.js"
 import { ProviderMetadata, ToolContent } from "./llm.js"
 import { Delivery } from "./session-delivery.js"
 import { Model } from "./model.js"
-import { DateTimeUtcFromMillis, NonNegativeInt, RelativePath } from "./schema.js"
+import { NonNegativeInt, RelativePath } from "./schema.js"
 import { FileAttachment, Prompt } from "./prompt.js"
 import { SessionID } from "./session-id.js"
 import { Location } from "./location.js"
@@ -20,17 +20,16 @@ export const Source = Schema.Struct({
   end: NonNegativeInt,
   text: Schema.String,
 }).annotate({
-  identifier: "session.next.event.source",
+  identifier: "session.event.source",
 })
 export interface Source extends Schema.Schema.Type<typeof Source> {}
 
 const Base = {
-  timestamp: DateTimeUtcFromMillis,
   sessionID: SessionID,
 }
 const PromptFields = {
   ...Base,
-  messageID: SessionMessage.ID,
+  inputID: SessionMessage.ID,
   prompt: Prompt,
   delivery: Delivery,
 }
@@ -44,48 +43,46 @@ const options = {
 const stepSettlementOptions = {
   durable: {
     aggregate: "sessionID",
-    version: 2,
+    version: 1,
   },
 } as const
 
 export const UnknownError = SessionMessage.UnknownError
 export type UnknownError = SessionMessage.UnknownError
 
-export const AgentSwitched = Event.durable({
-  type: "session.next.agent.switched",
+export const AgentSelected = Event.durable({
+  type: "agent.selected",
   ...options,
   schema: {
     ...Base,
-    messageID: SessionMessage.ID,
     agent: Schema.String,
   },
 })
-export type AgentSwitched = typeof AgentSwitched.Type
+export type AgentSelected = typeof AgentSelected.Type
 
-export const ModelSwitched = Event.durable({
-  type: "session.next.model.switched",
+export const ModelSelected = Event.durable({
+  type: "model.selected",
   ...options,
   schema: {
     ...Base,
-    messageID: SessionMessage.ID,
     model: Model.Ref,
   },
 })
-export type ModelSwitched = typeof ModelSwitched.Type
+export type ModelSelected = typeof ModelSelected.Type
 
 export const Moved = Event.durable({
-  type: "session.next.moved",
+  type: "session.moved",
   ...options,
   schema: {
     ...Base,
     location: Location.Ref,
-    subdirectory: RelativePath.pipe(optional),
+    subpath: RelativePath.pipe(optional),
   },
 })
 export type Moved = typeof Moved.Type
 
 export const Renamed = Event.durable({
-  type: "session.next.renamed",
+  type: "renamed",
   ...options,
   schema: {
     ...Base,
@@ -95,32 +92,35 @@ export const Renamed = Event.durable({
 export type Renamed = typeof Renamed.Type
 
 export const Forked = Event.durable({
-  type: "session.next.forked",
+  type: "forked",
   ...options,
   schema: {
     ...Base,
     parentID: SessionID,
-    messageID: SessionMessage.ID.pipe(optional),
+    from: SessionMessage.ID.pipe(optional),
   },
 })
 export type Forked = typeof Forked.Type
 
-export const Prompted = Event.durable({
-  type: "session.next.prompted",
+export const PromptPromoted = Event.durable({
+  type: "prompt.promoted",
   ...options,
-  schema: PromptFields,
+  schema: {
+    sessionID: SessionID,
+    inputID: SessionMessage.ID,
+  },
 })
-export type Prompted = typeof Prompted.Type
+export type PromptPromoted = typeof PromptPromoted.Type
 
 export const PromptAdmitted = Event.durable({
-  type: "session.next.prompt.admitted",
+  type: "prompt.admitted",
   ...options,
   schema: PromptFields,
 })
 export type PromptAdmitted = typeof PromptAdmitted.Type
 
 export const ExecutionSettled = Event.ephemeral({
-  type: "session.next.execution.settled",
+  type: "execution.settled",
   schema: {
     ...Base,
     outcome: Schema.Literals(["success", "failure", "interrupted"]),
@@ -130,22 +130,20 @@ export const ExecutionSettled = Event.ephemeral({
 export type ExecutionSettled = typeof ExecutionSettled.Type
 
 export const ContextUpdated = Event.durable({
-  type: "session.next.context.updated",
+  type: "session.context.updated",
   ...options,
   schema: {
     ...Base,
-    messageID: SessionMessage.ID,
     text: Schema.String,
   },
 })
 export type ContextUpdated = typeof ContextUpdated.Type
 
 export const Synthetic = Event.durable({
-  type: "session.next.synthetic",
+  type: "synthetic",
   ...options,
   schema: {
     ...Base,
-    messageID: SessionMessage.ID,
     text: Schema.String,
     description: Schema.String.pipe(optional),
     metadata: Schema.Record(Schema.String, Schema.Unknown).pipe(optional),
@@ -155,11 +153,10 @@ export type Synthetic = typeof Synthetic.Type
 
 export namespace Skill {
   export const Activated = Event.durable({
-    type: "session.next.skill.activated",
+    type: "skill.activated",
     ...options,
     schema: {
       ...Base,
-      messageID: SessionMessage.ID,
       name: Schema.String,
       text: Schema.String,
     },
@@ -169,11 +166,10 @@ export namespace Skill {
 
 export namespace Shell {
   export const Started = Event.durable({
-    type: "session.next.shell.started",
+    type: "shell.started",
     ...options,
     schema: {
       ...Base,
-      messageID: SessionMessage.ID,
       callID: Schema.String,
       command: Schema.String,
     },
@@ -181,7 +177,7 @@ export namespace Shell {
   export type Started = typeof Started.Type
 
   export const Ended = Event.durable({
-    type: "session.next.shell.ended",
+    type: "shell.ended",
     ...options,
     schema: {
       ...Base,
@@ -194,7 +190,7 @@ export namespace Shell {
 
 export namespace Step {
   export const Started = Event.durable({
-    type: "session.next.step.started",
+    type: "step.started",
     ...options,
     schema: {
       ...Base,
@@ -207,7 +203,7 @@ export namespace Step {
   export type Started = typeof Started.Type
 
   export const Ended = Event.durable({
-    type: "session.next.step.ended",
+    type: "step.ended",
     ...stepSettlementOptions,
     schema: {
       ...Base,
@@ -230,7 +226,7 @@ export namespace Step {
   export type Ended = typeof Ended.Type
 
   export const Failed = Event.durable({
-    type: "session.next.step.failed",
+    type: "step.failed",
     ...stepSettlementOptions,
     schema: {
       ...Base,
@@ -243,7 +239,7 @@ export namespace Step {
 
 export namespace Text {
   export const Started = Event.durable({
-    type: "session.next.text.started",
+    type: "text.started",
     ...options,
     schema: {
       ...Base,
@@ -255,7 +251,7 @@ export namespace Text {
 
   // Stream fragments are live-only; Text.Ended is the replayable full-value boundary.
   export const Delta = Event.ephemeral({
-    type: "session.next.text.delta",
+    type: "text.delta",
     schema: {
       ...Base,
       assistantMessageID: SessionMessage.ID,
@@ -266,7 +262,7 @@ export namespace Text {
   export type Delta = typeof Delta.Type
 
   export const Ended = Event.durable({
-    type: "session.next.text.ended",
+    type: "text.ended",
     ...options,
     schema: {
       ...Base,
@@ -280,7 +276,7 @@ export namespace Text {
 
 export namespace Reasoning {
   export const Started = Event.durable({
-    type: "session.next.reasoning.started",
+    type: "reasoning.started",
     ...options,
     schema: {
       ...Base,
@@ -293,7 +289,7 @@ export namespace Reasoning {
 
   // Stream fragments are live-only; Reasoning.Ended is the replayable full-value boundary.
   export const Delta = Event.ephemeral({
-    type: "session.next.reasoning.delta",
+    type: "reasoning.delta",
     schema: {
       ...Base,
       assistantMessageID: SessionMessage.ID,
@@ -304,7 +300,7 @@ export namespace Reasoning {
   export type Delta = typeof Delta.Type
 
   export const Ended = Event.durable({
-    type: "session.next.reasoning.ended",
+    type: "reasoning.ended",
     ...options,
     schema: {
       ...Base,
@@ -326,7 +322,7 @@ export namespace Tool {
 
   export namespace Input {
     export const Started = Event.durable({
-      type: "session.next.tool.input.started",
+      type: "tool.input.started",
       ...options,
       schema: {
         ...ToolBase,
@@ -337,7 +333,7 @@ export namespace Tool {
 
     // Stream fragments are live-only; Input.Ended is the replayable raw-input boundary.
     export const Delta = Event.ephemeral({
-      type: "session.next.tool.input.delta",
+      type: "tool.input.delta",
       schema: {
         ...ToolBase,
         delta: Schema.String,
@@ -346,7 +342,7 @@ export namespace Tool {
     export type Delta = typeof Delta.Type
 
     export const Ended = Event.durable({
-      type: "session.next.tool.input.ended",
+      type: "tool.input.ended",
       ...options,
       schema: {
         ...ToolBase,
@@ -357,7 +353,7 @@ export namespace Tool {
   }
 
   export const Called = Event.durable({
-    type: "session.next.tool.called",
+    type: "tool.called",
     ...options,
     schema: {
       ...ToolBase,
@@ -376,7 +372,7 @@ export namespace Tool {
    * transitions or at a bounded cadence, not persist every stdout/stderr chunk.
    */
   export const Progress = Event.durable({
-    type: "session.next.tool.progress",
+    type: "tool.progress",
     ...options,
     schema: {
       ...ToolBase,
@@ -387,7 +383,7 @@ export namespace Tool {
   export type Progress = typeof Progress.Type
 
   export const Success = Event.durable({
-    type: "session.next.tool.success",
+    type: "tool.success",
     ...options,
     schema: {
       ...ToolBase,
@@ -404,7 +400,7 @@ export namespace Tool {
   export type Success = typeof Success.Type
 
   export const Failed = Event.durable({
-    type: "session.next.tool.failed",
+    type: "tool.failed",
     ...options,
     schema: {
       ...ToolBase,
@@ -427,12 +423,12 @@ export const RetryError = Schema.Struct({
   responseBody: Schema.String.pipe(optional),
   metadata: Schema.Record(Schema.String, Schema.String).pipe(optional),
 }).annotate({
-  identifier: "session.next.retry_error",
+  identifier: "session.retry.error",
 })
 export interface RetryError extends Schema.Schema.Type<typeof RetryError> {}
 
 export const Retried = Event.durable({
-  type: "session.next.retried",
+  type: "retried",
   ...options,
   schema: {
     ...Base,
@@ -444,32 +440,29 @@ export type Retried = typeof Retried.Type
 
 export namespace Compaction {
   export const Started = Event.durable({
-    type: "session.next.compaction.started",
+    type: "compaction.started",
     ...options,
     schema: {
       ...Base,
-      messageID: SessionMessage.ID,
       reason: Schema.Union([Schema.Literal("auto"), Schema.Literal("manual")]),
     },
   })
   export type Started = typeof Started.Type
 
   export const Delta = Event.ephemeral({
-    type: "session.next.compaction.delta",
+    type: "compaction.delta",
     schema: {
       ...Base,
-      messageID: SessionMessage.ID,
       text: Schema.String,
     },
   })
   export type Delta = typeof Delta.Type
 
   export const Ended = Event.durable({
-    type: "session.next.compaction.ended",
+    type: "compaction.ended",
     ...options,
     schema: {
       ...Base,
-      messageID: SessionMessage.ID,
       reason: Started.data.fields.reason,
       text: Schema.String,
       recent: Schema.String,
@@ -480,25 +473,25 @@ export namespace Compaction {
 
 export namespace RevertEvent {
   export const Staged = Event.durable({
-    type: "session.next.revert.staged",
+    type: "revert.staged",
     ...options,
     schema: { ...Base, revert: Revert.State },
   })
-  export const Cleared = Event.durable({ type: "session.next.revert.cleared", ...options, schema: Base })
+  export const Cleared = Event.durable({ type: "revert.cleared", ...options, schema: Base })
   export const Committed = Event.durable({
-    type: "session.next.revert.committed",
+    type: "revert.committed",
     ...options,
     schema: { ...Base, messageID: SessionMessage.ID },
   })
 }
 
 export const Definitions = Event.inventory(
-  AgentSwitched,
-  ModelSwitched,
+  AgentSelected,
+  ModelSelected,
   Moved,
   Renamed,
   Forked,
-  Prompted,
+  PromptPromoted,
   PromptAdmitted,
   ExecutionSettled,
   ContextUpdated,
diff --git a/packages/schema/src/session-message.ts b/packages/schema/src/session-message.ts
index 457cf87206..349d04d06e 100644
--- a/packages/schema/src/session-message.ts
+++ b/packages/schema/src/session-message.ts
@@ -8,10 +8,14 @@ import { FileAttachment, Prompt } from "./prompt.js"
 import { DateTimeUtcFromMillis, RelativePath, statics } from "./schema.js"
 import { SessionID } from "./session-id.js"
 import { ascending } from "./identifier.js"
+import { Event } from "./event.js"
 
 export const ID = Schema.String.check(Schema.isStartsWith("msg_")).pipe(
   Schema.brand("Session.Message.ID"),
-  statics((schema) => ({ create: () => schema.make("msg_" + ascending()) })),
+  statics((schema) => ({
+    create: () => schema.make("msg_" + ascending()),
+    fromEvent: (eventID: Event.ID) => schema.make(eventID.replace(/^evt_/, "msg_")),
+  })),
 )
 export type ID = typeof ID.Type
 
@@ -27,19 +31,19 @@ const Base = {
   time: Schema.Struct({ created: DateTimeUtcFromMillis }),
 }
 
-export interface AgentSwitched extends Schema.Schema.Type<typeof AgentSwitched> {}
-export const AgentSwitched = Schema.Struct({
+export interface AgentSelected extends Schema.Schema.Type<typeof AgentSelected> {}
+export const AgentSelected = Schema.Struct({
   ...Base,
   type: Schema.Literal("agent-switched"),
   agent: Schema.String,
-}).annotate({ identifier: "Session.Message.AgentSwitched" })
+}).annotate({ identifier: "Session.Message.AgentSelected" })
 
-export interface ModelSwitched extends Schema.Schema.Type<typeof ModelSwitched> {}
-export const ModelSwitched = Schema.Struct({
+export interface ModelSelected extends Schema.Schema.Type<typeof ModelSelected> {}
+export const ModelSelected = Schema.Struct({
   ...Base,
   type: Schema.Literal("model-switched"),
   model: Model.Ref,
-}).annotate({ identifier: "Session.Message.ModelSwitched" })
+}).annotate({ identifier: "Session.Message.ModelSelected" })
 
 export interface User extends Schema.Schema.Type<typeof User> {}
 export const User = Schema.Struct({
@@ -207,8 +211,8 @@ export const Compaction = Schema.Struct({
 }).annotate({ identifier: "Session.Message.Compaction" })
 
 export const Message = Schema.Union([
-  AgentSwitched,
-  ModelSwitched,
+  AgentSelected,
+  ModelSelected,
   User,
   Synthetic,
   System,
@@ -219,5 +223,5 @@ export const Message = Schema.Union([
 ])
   .pipe(Schema.toTaggedUnion("type"))
   .annotate({ identifier: "Session.Message" })
-export type Message = AgentSwitched | ModelSwitched | User | Synthetic | System | Skill | Shell | Assistant | Compaction
+export type Message = AgentSelected | ModelSelected | User | Synthetic | System | Skill | Shell | Assistant | Compaction
 export type Type = Message["type"]
diff --git a/packages/schema/test/event-manifest.test.ts b/packages/schema/test/event-manifest.test.ts
index 4e0c6eaa18..9cdf3a787a 100644
--- a/packages/schema/test/event-manifest.test.ts
+++ b/packages/schema/test/event-manifest.test.ts
@@ -52,7 +52,7 @@ describe("public event manifest", () => {
     expect(Session.Event.Definitions).toBe(SessionEvent.Definitions)
     expect(Workspace.Event).toBe(WorkspaceEvent)
     expect(Workspace.Event.Definitions).toBe(WorkspaceEvent.Definitions)
-    expect(EventManifest.Latest.get("session.next.step.ended")).toBe(SessionEvent.Step.Ended)
+    expect(EventManifest.Latest.get("step.ended")).toBe(SessionEvent.Step.Ended)
     expect(EventManifest.Latest.get("todo.updated")).toBe(SessionTodo.Event.Updated)
     expect(EventManifest.Latest.get("agent.updated")).toBe(Agent.Event.Updated)
     expect(EventManifest.Latest.get("project.updated")).toBe(Project.Event.Updated)
@@ -71,8 +71,8 @@ describe("public event manifest", () => {
       SessionV1.Event.Diff,
       SessionV1.Event.Error,
     ])
-    expect(EventManifest.Durable.has("session.next.step.ended.1")).toBe(false)
-    expect(EventManifest.Durable.get("session.next.step.ended.2")).toBe(SessionEvent.Step.Ended)
+    expect(EventManifest.Durable.get("step.ended.1")).toBe(SessionEvent.Step.Ended)
+    expect(EventManifest.Durable.has("step.ended.2")).toBe(false)
   })
 
   test("derives durable definitions from explicit definition durability", () => {
@@ -85,37 +85,37 @@ describe("public event manifest", () => {
         "message.removed.1",
         "message.part.updated.1",
         "message.part.removed.1",
-        "session.next.agent.switched.1",
-        "session.next.model.switched.1",
-        "session.next.moved.1",
-        "session.next.renamed.1",
-        "session.next.forked.1",
-        "session.next.prompted.1",
-        "session.next.prompt.admitted.1",
-        "session.next.context.updated.1",
-        "session.next.synthetic.1",
-        "session.next.skill.activated.1",
-        "session.next.shell.started.1",
-        "session.next.shell.ended.1",
-        "session.next.step.started.1",
-        "session.next.step.ended.2",
-        "session.next.step.failed.2",
-        "session.next.text.started.1",
-        "session.next.text.ended.1",
-        "session.next.tool.input.started.1",
-        "session.next.tool.input.ended.1",
-        "session.next.tool.called.1",
-        "session.next.tool.progress.1",
-        "session.next.tool.success.1",
-        "session.next.tool.failed.1",
-        "session.next.reasoning.started.1",
-        "session.next.reasoning.ended.1",
-        "session.next.retried.1",
-        "session.next.compaction.started.1",
-        "session.next.compaction.ended.1",
-        "session.next.revert.staged.1",
-        "session.next.revert.cleared.1",
-        "session.next.revert.committed.1",
+        "agent.selected.1",
+        "model.selected.1",
+        "session.moved.1",
+        "renamed.1",
+        "forked.1",
+        "prompt.promoted.1",
+        "prompt.admitted.1",
+        "session.context.updated.1",
+        "synthetic.1",
+        "skill.activated.1",
+        "shell.started.1",
+        "shell.ended.1",
+        "step.started.1",
+        "step.ended.1",
+        "step.failed.1",
+        "text.started.1",
+        "text.ended.1",
+        "tool.input.started.1",
+        "tool.input.ended.1",
+        "tool.called.1",
+        "tool.progress.1",
+        "tool.success.1",
+        "tool.failed.1",
+        "reasoning.started.1",
+        "reasoning.ended.1",
+        "retried.1",
+        "compaction.started.1",
+        "compaction.ended.1",
+        "revert.staged.1",
+        "revert.cleared.1",
+        "revert.committed.1",
       ].toSorted(),
     )
     expect(SessionEvent.DurableDefinitions).toEqual(
diff --git a/packages/sdk-next/test/embedded.test.ts b/packages/sdk-next/test/embedded.test.ts
index 81f3d480ad..5419b7e838 100644
--- a/packages/sdk-next/test/embedded.test.ts
+++ b/packages/sdk-next/test/embedded.test.ts
@@ -78,7 +78,7 @@ it.live(
           prompt: fixture.sdk.Prompt.make({ text: "Promote this input" }),
         })
         const prompted = yield* opencode.sessions.log({ sessionID: id, follow: true }).pipe(
-          Stream.filter((event) => event.type === "session.next.prompted" && event.data.messageID === wake.id),
+          Stream.filter((event) => event.type === "prompt.promoted" && event.data.inputID === wake.id),
           Stream.runHead,
           Effect.timeout("10 seconds"),
           Effect.map(Option.getOrThrow),
@@ -119,7 +119,7 @@ it.live(
         expect(page.data.some((session) => session.id === id)).toBe(true)
         expect(active).toEqual({ data: {}, watermarks: {} })
         expect(admitted.sessionID).toBe(id)
-        expect(prompted.type).toBe("session.next.prompted")
+        expect(prompted.type).toBe("prompt.promoted")
         expect(wakeContext).toContainEqual(expect.objectContaining({ id: wake.id, type: "user" }))
         expect(contextEntries).toEqual([
           { key: "deploy-target", value: "production" },
@@ -127,7 +127,7 @@ it.live(
         ])
         expect(remainingContextEntries).toEqual([{ key: "deploy-target", value: "production" }])
         expect(context.some((message) => message.type === "model-switched")).toBe(true)
-        expect(event).toMatchObject({ type: "session.next.model.switched", durable: { seq: 1 } })
+        expect(event).toMatchObject({ type: "model.selected", durable: { seq: 1 } })
         expect(message).toEqual(modelMessage)
         expect(missing.map((error) => error._tag)).toEqual([
           "SessionNotFoundError",
@@ -149,13 +149,13 @@ it.live(
         const opencode = yield* fixture.sdk.OpenCode.create()
         const id = sessionID(fixture)
         const connected = yield* Latch.make(false)
-        const prompted = yield* Deferred.make<Extract<OpenCodeEvent, { type: "session.next.prompted" }>>()
+        const prompted = yield* Deferred.make<Extract<OpenCodeEvent, { type: "prompt.promoted" }>>()
 
         yield* opencode.events.subscribe().pipe(
           Stream.runForEach((event) =>
             event.type === "server.connected"
               ? connected.open
-              : event.type === "session.next.prompted" && event.data.sessionID === id
+              : event.type === "prompt.promoted" && event.data.sessionID === id
                 ? Deferred.succeed(prompted, event).pipe(Effect.asVoid)
                 : Effect.void,
           ),
@@ -191,7 +191,7 @@ it.live(
           Stream.runForEach((notification: OpenCodeEvent) =>
             notification.type === "server.connected"
               ? ready.open
-              : notification.type === "session.next.agent.switched" && notification.data.sessionID === id
+              : notification.type === "agent.selected" && notification.data.sessionID === id
                 ? event.open
                 : Effect.void,
           )
diff --git a/packages/sdk/js/script/build.ts b/packages/sdk/js/script/build.ts
index 8fc0f363e7..d87f8bf98a 100755
--- a/packages/sdk/js/script/build.ts
+++ b/packages/sdk/js/script/build.ts
@@ -59,7 +59,13 @@ if (schemas) {
   }
   visit({ ...document, components: { ...document.components, schemas: undefined } })
   for (const name of Object.keys(schemas)) {
-    if (/^SessionNext\w+1$/.test(name) && !reachable.has(name)) delete schemas[name]
+    if (
+      /^(AgentSelected|ModelSelected|SessionMoved|Renamed|Forked|PromptPromoted|PromptAdmitted|ExecutionSettled|ContextUpdated|Synthetic|SkillActivated|ShellStarted|ShellEnded|StepStarted|StepEnded|StepFailed|TextStarted|TextDelta|TextEnded|ReasoningStarted|ReasoningDelta|ReasoningEnded|ToolInputStarted|ToolInputDelta|ToolInputEnded|ToolCalled|ToolProgress|ToolSuccess|ToolFailed|Retried|CompactionStarted|CompactionDelta|CompactionEnded|RevertStaged|RevertCleared|RevertCommitted)1$/.test(
+        name,
+      ) &&
+      !reachable.has(name)
+    )
+      delete schemas[name]
   }
   await Bun.write("./openapi.json", JSON.stringify(document))
 }
@@ -93,7 +99,11 @@ await createClient({
 
 const generatedTypesPath = "./src/v2/gen/types.gen.ts"
 const generatedTypes = await Bun.file(generatedTypesPath).text()
-if (/export type SessionNext\w+1 =/.test(generatedTypes)) {
+if (
+  /export type (AgentSelected|ModelSelected|SessionMoved|Renamed|Forked|PromptPromoted|PromptAdmitted|ExecutionSettled|ContextUpdated|Synthetic|SkillActivated|ShellStarted|ShellEnded|StepStarted|StepEnded|StepFailed|TextStarted|TextDelta|TextEnded|ReasoningStarted|ReasoningDelta|ReasoningEnded|ToolInputStarted|ToolInputDelta|ToolInputEnded|ToolCalled|ToolProgress|ToolSuccess|ToolFailed|Retried|CompactionStarted|CompactionDelta|CompactionEnded|RevertStaged|RevertCleared|RevertCommitted)1 =/.test(
+    generatedTypes,
+  )
+) {
   throw new Error("Session history generated duplicate Session event variants")
 }
 const logTypesPatched = generatedTypes.replace(
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index a1ba35e5ae..d97eb59298 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -17,42 +17,42 @@ export type Event =
   | EventMessageRemoved
   | EventMessagePartUpdated
   | EventMessagePartRemoved
-  | EventSessionNextAgentSwitched
-  | EventSessionNextModelSwitched
-  | EventSessionNextMoved
-  | EventSessionNextRenamed
-  | EventSessionNextForked
-  | EventSessionNextPrompted
-  | EventSessionNextPromptAdmitted
-  | EventSessionNextExecutionSettled
-  | EventSessionNextContextUpdated
-  | EventSessionNextSynthetic
-  | EventSessionNextSkillActivated
-  | EventSessionNextShellStarted
-  | EventSessionNextShellEnded
-  | EventSessionNextStepStarted
-  | EventSessionNextStepEnded
-  | EventSessionNextStepFailed
-  | EventSessionNextTextStarted
-  | EventSessionNextTextDelta
-  | EventSessionNextTextEnded
-  | EventSessionNextReasoningStarted
-  | EventSessionNextReasoningDelta
-  | EventSessionNextReasoningEnded
-  | EventSessionNextToolInputStarted
-  | EventSessionNextToolInputDelta
-  | EventSessionNextToolInputEnded
-  | EventSessionNextToolCalled
-  | EventSessionNextToolProgress
-  | EventSessionNextToolSuccess
-  | EventSessionNextToolFailed
-  | EventSessionNextRetried
-  | EventSessionNextCompactionStarted
-  | EventSessionNextCompactionDelta
-  | EventSessionNextCompactionEnded
-  | EventSessionNextRevertStaged
-  | EventSessionNextRevertCleared
-  | EventSessionNextRevertCommitted
+  | EventAgentSelected
+  | EventModelSelected
+  | EventSessionMoved
+  | EventRenamed
+  | EventForked
+  | EventPromptPromoted
+  | EventPromptAdmitted
+  | EventExecutionSettled
+  | EventSessionContextUpdated
+  | EventSynthetic
+  | EventSkillActivated
+  | EventShellStarted
+  | EventShellEnded
+  | EventStepStarted
+  | EventStepEnded
+  | EventStepFailed
+  | EventTextStarted
+  | EventTextDelta
+  | EventTextEnded
+  | EventReasoningStarted
+  | EventReasoningDelta
+  | EventReasoningEnded
+  | EventToolInputStarted
+  | EventToolInputDelta
+  | EventToolInputEnded
+  | EventToolCalled
+  | EventToolProgress
+  | EventToolSuccess
+  | EventToolFailed
+  | EventRetried
+  | EventCompactionStarted
+  | EventCompactionDelta
+  | EventCompactionEnded
+  | EventRevertStaged
+  | EventRevertCleared
+  | EventRevertCommitted
   | EventMessagePartDelta
   | EventSessionDiff
   | EventSessionError
@@ -859,80 +859,68 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.agent.switched"
+        type: "agent.selected"
         properties: {
-          timestamp: number
           sessionID: string
-          messageID: string
           agent: string
         }
       }
     | {
         id: string
-        type: "session.next.model.switched"
+        type: "model.selected"
         properties: {
-          timestamp: number
           sessionID: string
-          messageID: string
           model: ModelRef
         }
       }
     | {
         id: string
-        type: "session.next.moved"
+        type: "session.moved"
         properties: {
-          timestamp: number
           sessionID: string
           location: LocationRef
-          subdirectory?: string
+          subpath?: string
         }
       }
     | {
         id: string
-        type: "session.next.renamed"
+        type: "renamed"
         properties: {
-          timestamp: number
           sessionID: string
           title: string
         }
       }
     | {
         id: string
-        type: "session.next.forked"
+        type: "forked"
         properties: {
-          timestamp: number
           sessionID: string
           parentID: string
-          messageID?: string
+          from?: string
         }
       }
     | {
         id: string
-        type: "session.next.prompted"
+        type: "prompt.promoted"
         properties: {
-          timestamp: number
           sessionID: string
-          messageID: string
+          inputID: string
+        }
+      }
+    | {
+        id: string
+        type: "prompt.admitted"
+        properties: {
+          sessionID: string
+          inputID: string
           prompt: Prompt
           delivery: "steer" | "queue"
         }
       }
     | {
         id: string
-        type: "session.next.prompt.admitted"
+        type: "execution.settled"
         properties: {
-          timestamp: number
-          sessionID: string
-          messageID: string
-          prompt: Prompt
-          delivery: "steer" | "queue"
-        }
-      }
-    | {
-        id: string
-        type: "session.next.execution.settled"
-        properties: {
-          timestamp: number
           sessionID: string
           outcome: "success" | "failure" | "interrupted"
           error?: SessionErrorUnknown
@@ -940,21 +928,17 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.context.updated"
+        type: "session.context.updated"
         properties: {
-          timestamp: number
           sessionID: string
-          messageID: string
           text: string
         }
       }
     | {
         id: string
-        type: "session.next.synthetic"
+        type: "synthetic"
         properties: {
-          timestamp: number
           sessionID: string
-          messageID: string
           text: string
           description?: string
           metadata?: {
@@ -964,31 +948,26 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.skill.activated"
+        type: "skill.activated"
         properties: {
-          timestamp: number
           sessionID: string
-          messageID: string
           name: string
           text: string
         }
       }
     | {
         id: string
-        type: "session.next.shell.started"
+        type: "shell.started"
         properties: {
-          timestamp: number
           sessionID: string
-          messageID: string
           callID: string
           command: string
         }
       }
     | {
         id: string
-        type: "session.next.shell.ended"
+        type: "shell.ended"
         properties: {
-          timestamp: number
           sessionID: string
           callID: string
           output: string
@@ -996,9 +975,8 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.step.started"
+        type: "step.started"
         properties: {
-          timestamp: number
           sessionID: string
           assistantMessageID: string
           agent: string
@@ -1008,9 +986,8 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.step.ended"
+        type: "step.ended"
         properties: {
-          timestamp: number
           sessionID: string
           assistantMessageID: string
           finish: string
@@ -1030,9 +1007,8 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.step.failed"
+        type: "step.failed"
         properties: {
-          timestamp: number
           sessionID: string
           assistantMessageID: string
           error: SessionErrorUnknown
@@ -1040,9 +1016,8 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.text.started"
+        type: "text.started"
         properties: {
-          timestamp: number
           sessionID: string
           assistantMessageID: string
           textID: string
@@ -1050,9 +1025,8 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.text.delta"
+        type: "text.delta"
         properties: {
-          timestamp: number
           sessionID: string
           assistantMessageID: string
           textID: string
@@ -1061,9 +1035,8 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.text.ended"
+        type: "text.ended"
         properties: {
-          timestamp: number
           sessionID: string
           assistantMessageID: string
           textID: string
@@ -1072,9 +1045,8 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.reasoning.started"
+        type: "reasoning.started"
         properties: {
-          timestamp: number
           sessionID: string
           assistantMessageID: string
           reasoningID: string
@@ -1083,9 +1055,8 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.reasoning.delta"
+        type: "reasoning.delta"
         properties: {
-          timestamp: number
           sessionID: string
           assistantMessageID: string
           reasoningID: string
@@ -1094,9 +1065,8 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.reasoning.ended"
+        type: "reasoning.ended"
         properties: {
-          timestamp: number
           sessionID: string
           assistantMessageID: string
           reasoningID: string
@@ -1106,9 +1076,8 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.tool.input.started"
+        type: "tool.input.started"
         properties: {
-          timestamp: number
           sessionID: string
           assistantMessageID: string
           callID: string
@@ -1117,9 +1086,8 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.tool.input.delta"
+        type: "tool.input.delta"
         properties: {
-          timestamp: number
           sessionID: string
           assistantMessageID: string
           callID: string
@@ -1128,9 +1096,8 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.tool.input.ended"
+        type: "tool.input.ended"
         properties: {
-          timestamp: number
           sessionID: string
           assistantMessageID: string
           callID: string
@@ -1139,9 +1106,8 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.tool.called"
+        type: "tool.called"
         properties: {
-          timestamp: number
           sessionID: string
           assistantMessageID: string
           callID: string
@@ -1157,9 +1123,8 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.tool.progress"
+        type: "tool.progress"
         properties: {
-          timestamp: number
           sessionID: string
           assistantMessageID: string
           callID: string
@@ -1171,9 +1136,8 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.tool.success"
+        type: "tool.success"
         properties: {
-          timestamp: number
           sessionID: string
           assistantMessageID: string
           callID: string
@@ -1191,9 +1155,8 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.tool.failed"
+        type: "tool.failed"
         properties: {
-          timestamp: number
           sessionID: string
           assistantMessageID: string
           callID: string
@@ -1207,41 +1170,34 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.retried"
+        type: "retried"
         properties: {
-          timestamp: number
           sessionID: string
           attempt: number
-          error: SessionNextRetryError
+          error: SessionRetryError
         }
       }
     | {
         id: string
-        type: "session.next.compaction.started"
+        type: "compaction.started"
         properties: {
-          timestamp: number
           sessionID: string
-          messageID: string
           reason: "auto" | "manual"
         }
       }
     | {
         id: string
-        type: "session.next.compaction.delta"
+        type: "compaction.delta"
         properties: {
-          timestamp: number
           sessionID: string
-          messageID: string
           text: string
         }
       }
     | {
         id: string
-        type: "session.next.compaction.ended"
+        type: "compaction.ended"
         properties: {
-          timestamp: number
           sessionID: string
-          messageID: string
           reason: "auto" | "manual"
           text: string
           recent: string
@@ -1249,26 +1205,23 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "session.next.revert.staged"
+        type: "revert.staged"
         properties: {
-          timestamp: number
           sessionID: string
           revert: RevertState
         }
       }
     | {
         id: string
-        type: "session.next.revert.cleared"
+        type: "revert.cleared"
         properties: {
-          timestamp: number
           sessionID: string
         }
       }
     | {
         id: string
-        type: "session.next.revert.committed"
+        type: "revert.committed"
         properties: {
-          timestamp: number
           sessionID: string
           messageID: string
         }
@@ -1760,37 +1713,37 @@ export type GlobalEvent = {
     | SyncEventMessageRemoved
     | SyncEventMessagePartUpdated
     | SyncEventMessagePartRemoved
-    | SyncEventSessionNextAgentSwitched
-    | SyncEventSessionNextModelSwitched
-    | SyncEventSessionNextMoved
-    | SyncEventSessionNextRenamed
-    | SyncEventSessionNextForked
-    | SyncEventSessionNextPrompted
-    | SyncEventSessionNextPromptAdmitted
-    | SyncEventSessionNextContextUpdated
-    | SyncEventSessionNextSynthetic
-    | SyncEventSessionNextSkillActivated
-    | SyncEventSessionNextShellStarted
-    | SyncEventSessionNextShellEnded
-    | SyncEventSessionNextStepStarted
-    | SyncEventSessionNextStepEnded
-    | SyncEventSessionNextStepFailed
-    | SyncEventSessionNextTextStarted
-    | SyncEventSessionNextTextEnded
-    | SyncEventSessionNextReasoningStarted
-    | SyncEventSessionNextReasoningEnded
-    | SyncEventSessionNextToolInputStarted
-    | SyncEventSessionNextToolInputEnded
-    | SyncEventSessionNextToolCalled
-    | SyncEventSessionNextToolProgress
-    | SyncEventSessionNextToolSuccess
-    | SyncEventSessionNextToolFailed
-    | SyncEventSessionNextRetried
-    | SyncEventSessionNextCompactionStarted
-    | SyncEventSessionNextCompactionEnded
-    | SyncEventSessionNextRevertStaged
-    | SyncEventSessionNextRevertCleared
-    | SyncEventSessionNextRevertCommitted
+    | SyncEventAgentSelected
+    | SyncEventModelSelected
+    | SyncEventSessionMoved
+    | SyncEventRenamed
+    | SyncEventForked
+    | SyncEventPromptPromoted
+    | SyncEventPromptAdmitted
+    | SyncEventSessionContextUpdated
+    | SyncEventSynthetic
+    | SyncEventSkillActivated
+    | SyncEventShellStarted
+    | SyncEventShellEnded
+    | SyncEventStepStarted
+    | SyncEventStepEnded
+    | SyncEventStepFailed
+    | SyncEventTextStarted
+    | SyncEventTextEnded
+    | SyncEventReasoningStarted
+    | SyncEventReasoningEnded
+    | SyncEventToolInputStarted
+    | SyncEventToolInputEnded
+    | SyncEventToolCalled
+    | SyncEventToolProgress
+    | SyncEventToolSuccess
+    | SyncEventToolFailed
+    | SyncEventRetried
+    | SyncEventCompactionStarted
+    | SyncEventCompactionEnded
+    | SyncEventRevertStaged
+    | SyncEventRevertCleared
+    | SyncEventRevertCommitted
 }
 
 /**
@@ -2910,38 +2863,120 @@ export type UnknownError1 = {
   ref?: string
 }
 
+export type Renamed = {
+  id: string
+  created: number
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "renamed"
+  durable: {
+    aggregateID: string
+    seq: number
+    version: number
+  }
+  location?: LocationRef
+  data: {
+    sessionID: string
+    title: string
+  }
+}
+
+export type Forked = {
+  id: string
+  created: number
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "forked"
+  durable: {
+    aggregateID: string
+    seq: number
+    version: number
+  }
+  location?: LocationRef
+  data: {
+    sessionID: string
+    parentID: string
+    from?: string
+  }
+}
+
+export type Synthetic = {
+  id: string
+  created: number
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "synthetic"
+  durable: {
+    aggregateID: string
+    seq: number
+    version: number
+  }
+  location?: LocationRef
+  data: {
+    sessionID: string
+    text: string
+    description?: string
+    metadata?: {
+      [key: string]: unknown
+    }
+  }
+}
+
+export type Retried = {
+  id: string
+  created: number
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "retried"
+  durable: {
+    aggregateID: string
+    seq: number
+    version: number
+  }
+  location?: LocationRef
+  data: {
+    sessionID: string
+    attempt: number
+    error: SessionRetryError
+  }
+}
+
 export type SessionDurableEvent =
-  | SessionNextAgentSwitched
-  | SessionNextModelSwitched
-  | SessionNextMoved
-  | SessionNextRenamed
-  | SessionNextForked
-  | SessionNextPrompted
-  | SessionNextPromptAdmitted
-  | SessionNextContextUpdated
-  | SessionNextSynthetic
-  | SessionNextSkillActivated
-  | SessionNextShellStarted
-  | SessionNextShellEnded
-  | SessionNextStepStarted
-  | SessionNextStepEnded
-  | SessionNextStepFailed
-  | SessionNextTextStarted
-  | SessionNextTextEnded
-  | SessionNextReasoningStarted
-  | SessionNextReasoningEnded
-  | SessionNextToolInputStarted
-  | SessionNextToolInputEnded
-  | SessionNextToolCalled
-  | SessionNextToolProgress
-  | SessionNextToolSuccess
-  | SessionNextToolFailed
-  | SessionNextRetried
-  | SessionNextCompactionStarted
-  | SessionNextCompactionEnded
-  | SessionNextRevertStaged
-  | SessionNextRevertCleared
-  | SessionNextRevertCommitted
+  | AgentSelected
+  | ModelSelected
+  | SessionMoved
+  | Renamed
+  | Forked
+  | PromptPromoted
+  | PromptAdmitted
+  | SessionContextUpdated
+  | Synthetic
+  | SkillActivated
+  | ShellStarted
+  | ShellEnded
+  | StepStarted
+  | StepEnded
+  | StepFailed
+  | TextStarted
+  | TextEnded
+  | ReasoningStarted
+  | ReasoningEnded
+  | ToolInputStarted
+  | ToolInputEnded
+  | ToolCalled
+  | ToolProgress
+  | ToolSuccess
+  | ToolFailed
+  | Retried
+  | CompactionStarted
+  | CompactionEnded
+  | RevertStaged
+  | RevertCleared
+  | RevertCommitted
 
 export type SessionLogItem = SessionDurableEvent | EventLogSynced
 
@@ -3016,6 +3051,7 @@ export type Shell1 = {
 
 export type SessionStatus2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -3029,6 +3065,7 @@ export type SessionStatus2 = {
 
 export type QuestionReplied2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -3043,6 +3080,7 @@ export type QuestionReplied2 = {
 
 export type QuestionRejected2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -3067,42 +3105,42 @@ export type V2Event =
   | MessageRemoved
   | MessagePartUpdated
   | MessagePartRemoved
-  | SessionNextAgentSwitched
-  | SessionNextModelSwitched
-  | SessionNextMoved
-  | SessionNextRenamed
-  | SessionNextForked
-  | SessionNextPrompted
-  | SessionNextPromptAdmitted
-  | SessionNextExecutionSettled
-  | SessionNextContextUpdated
-  | SessionNextSynthetic
-  | SessionNextSkillActivated
-  | SessionNextShellStarted
-  | SessionNextShellEnded
-  | SessionNextStepStarted
-  | SessionNextStepEnded
-  | SessionNextStepFailed
-  | SessionNextTextStarted
-  | SessionNextTextDelta
-  | SessionNextTextEnded
-  | SessionNextReasoningStarted
-  | SessionNextReasoningDelta
-  | SessionNextReasoningEnded
-  | SessionNextToolInputStarted
-  | SessionNextToolInputDelta
-  | SessionNextToolInputEnded
-  | SessionNextToolCalled
-  | SessionNextToolProgress
-  | SessionNextToolSuccess
-  | SessionNextToolFailed
-  | SessionNextRetried
-  | SessionNextCompactionStarted
-  | SessionNextCompactionDelta
-  | SessionNextCompactionEnded
-  | SessionNextRevertStaged
-  | SessionNextRevertCleared
-  | SessionNextRevertCommitted
+  | AgentSelected
+  | ModelSelected
+  | SessionMoved
+  | Renamed
+  | Forked
+  | PromptPromoted
+  | PromptAdmitted
+  | ExecutionSettled
+  | SessionContextUpdated
+  | Synthetic
+  | SkillActivated
+  | ShellStarted
+  | ShellEnded
+  | StepStarted
+  | StepEnded
+  | StepFailed
+  | TextStarted
+  | TextDelta
+  | TextEnded
+  | ReasoningStarted
+  | ReasoningDelta
+  | ReasoningEnded
+  | ToolInputStarted
+  | ToolInputDelta
+  | ToolInputEnded
+  | ToolCalled
+  | ToolProgress
+  | ToolSuccess
+  | ToolFailed
+  | Retried
+  | CompactionStarted
+  | CompactionDelta
+  | CompactionEnded
+  | RevertStaged
+  | RevertCleared
+  | RevertCommitted
   | MessagePartDelta
   | SessionDiff
   | SessionError
@@ -3338,7 +3376,7 @@ export type ToolFileContent = {
 
 export type LlmToolContent = ToolTextContent | ToolFileContent
 
-export type SessionNextRetryError = {
+export type SessionRetryError = {
   message: string
   statusCode?: number
   isRetryable: boolean
@@ -3661,155 +3699,140 @@ export type SyncEventMessagePartRemoved = {
   }
 }
 
-export type SyncEventSessionNextAgentSwitched = {
+export type SyncEventAgentSelected = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.agent.switched.1"
+    type: "agent.selected.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
-      messageID: string
       agent: string
     }
   }
 }
 
-export type SyncEventSessionNextModelSwitched = {
+export type SyncEventModelSelected = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.model.switched.1"
+    type: "model.selected.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
-      messageID: string
       model: ModelRef
     }
   }
 }
 
-export type SyncEventSessionNextMoved = {
+export type SyncEventSessionMoved = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.moved.1"
+    type: "session.moved.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       location: LocationRef
-      subdirectory?: string
+      subpath?: string
     }
   }
 }
 
-export type SyncEventSessionNextRenamed = {
+export type SyncEventRenamed = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.renamed.1"
+    type: "renamed.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       title: string
     }
   }
 }
 
-export type SyncEventSessionNextForked = {
+export type SyncEventForked = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.forked.1"
+    type: "forked.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       parentID: string
-      messageID?: string
+      from?: string
     }
   }
 }
 
-export type SyncEventSessionNextPrompted = {
+export type SyncEventPromptPromoted = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.prompted.1"
+    type: "prompt.promoted.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
-      messageID: string
+      inputID: string
+    }
+  }
+}
+
+export type SyncEventPromptAdmitted = {
+  type: "sync"
+  id: string
+  syncEvent: {
+    type: "prompt.admitted.1"
+    id: string
+    seq: number
+    aggregateID: string
+    data: {
+      sessionID: string
+      inputID: string
       prompt: Prompt
       delivery: "steer" | "queue"
     }
   }
 }
 
-export type SyncEventSessionNextPromptAdmitted = {
+export type SyncEventSessionContextUpdated = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.prompt.admitted.1"
+    type: "session.context.updated.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
-      messageID: string
-      prompt: Prompt
-      delivery: "steer" | "queue"
-    }
-  }
-}
-
-export type SyncEventSessionNextContextUpdated = {
-  type: "sync"
-  id: string
-  syncEvent: {
-    type: "session.next.context.updated.1"
-    id: string
-    seq: number
-    aggregateID: string
-    data: {
-      timestamp: number
-      sessionID: string
-      messageID: string
       text: string
     }
   }
 }
 
-export type SyncEventSessionNextSynthetic = {
+export type SyncEventSynthetic = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.synthetic.1"
+    type: "synthetic.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
-      messageID: string
       text: string
       description?: string
       metadata?: {
@@ -3819,52 +3842,47 @@ export type SyncEventSessionNextSynthetic = {
   }
 }
 
-export type SyncEventSessionNextSkillActivated = {
+export type SyncEventSkillActivated = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.skill.activated.1"
+    type: "skill.activated.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
-      messageID: string
       name: string
       text: string
     }
   }
 }
 
-export type SyncEventSessionNextShellStarted = {
+export type SyncEventShellStarted = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.shell.started.1"
+    type: "shell.started.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
-      messageID: string
       callID: string
       command: string
     }
   }
 }
 
-export type SyncEventSessionNextShellEnded = {
+export type SyncEventShellEnded = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.shell.ended.1"
+    type: "shell.ended.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       callID: string
       output: string
@@ -3872,16 +3890,15 @@ export type SyncEventSessionNextShellEnded = {
   }
 }
 
-export type SyncEventSessionNextStepStarted = {
+export type SyncEventStepStarted = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.step.started.1"
+    type: "step.started.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       assistantMessageID: string
       agent: string
@@ -3891,16 +3908,15 @@ export type SyncEventSessionNextStepStarted = {
   }
 }
 
-export type SyncEventSessionNextStepEnded = {
+export type SyncEventStepEnded = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.step.ended.2"
+    type: "step.ended.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       assistantMessageID: string
       finish: string
@@ -3920,16 +3936,15 @@ export type SyncEventSessionNextStepEnded = {
   }
 }
 
-export type SyncEventSessionNextStepFailed = {
+export type SyncEventStepFailed = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.step.failed.2"
+    type: "step.failed.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       assistantMessageID: string
       error: SessionErrorUnknown
@@ -3937,16 +3952,15 @@ export type SyncEventSessionNextStepFailed = {
   }
 }
 
-export type SyncEventSessionNextTextStarted = {
+export type SyncEventTextStarted = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.text.started.1"
+    type: "text.started.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       assistantMessageID: string
       textID: string
@@ -3954,16 +3968,15 @@ export type SyncEventSessionNextTextStarted = {
   }
 }
 
-export type SyncEventSessionNextTextEnded = {
+export type SyncEventTextEnded = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.text.ended.1"
+    type: "text.ended.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       assistantMessageID: string
       textID: string
@@ -3972,16 +3985,15 @@ export type SyncEventSessionNextTextEnded = {
   }
 }
 
-export type SyncEventSessionNextReasoningStarted = {
+export type SyncEventReasoningStarted = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.reasoning.started.1"
+    type: "reasoning.started.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       assistantMessageID: string
       reasoningID: string
@@ -3990,16 +4002,15 @@ export type SyncEventSessionNextReasoningStarted = {
   }
 }
 
-export type SyncEventSessionNextReasoningEnded = {
+export type SyncEventReasoningEnded = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.reasoning.ended.1"
+    type: "reasoning.ended.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       assistantMessageID: string
       reasoningID: string
@@ -4009,16 +4020,15 @@ export type SyncEventSessionNextReasoningEnded = {
   }
 }
 
-export type SyncEventSessionNextToolInputStarted = {
+export type SyncEventToolInputStarted = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.tool.input.started.1"
+    type: "tool.input.started.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       assistantMessageID: string
       callID: string
@@ -4027,16 +4037,15 @@ export type SyncEventSessionNextToolInputStarted = {
   }
 }
 
-export type SyncEventSessionNextToolInputEnded = {
+export type SyncEventToolInputEnded = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.tool.input.ended.1"
+    type: "tool.input.ended.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       assistantMessageID: string
       callID: string
@@ -4045,16 +4054,15 @@ export type SyncEventSessionNextToolInputEnded = {
   }
 }
 
-export type SyncEventSessionNextToolCalled = {
+export type SyncEventToolCalled = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.tool.called.1"
+    type: "tool.called.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       assistantMessageID: string
       callID: string
@@ -4070,16 +4078,15 @@ export type SyncEventSessionNextToolCalled = {
   }
 }
 
-export type SyncEventSessionNextToolProgress = {
+export type SyncEventToolProgress = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.tool.progress.1"
+    type: "tool.progress.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       assistantMessageID: string
       callID: string
@@ -4091,16 +4098,15 @@ export type SyncEventSessionNextToolProgress = {
   }
 }
 
-export type SyncEventSessionNextToolSuccess = {
+export type SyncEventToolSuccess = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.tool.success.1"
+    type: "tool.success.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       assistantMessageID: string
       callID: string
@@ -4118,16 +4124,15 @@ export type SyncEventSessionNextToolSuccess = {
   }
 }
 
-export type SyncEventSessionNextToolFailed = {
+export type SyncEventToolFailed = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.tool.failed.1"
+    type: "tool.failed.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       assistantMessageID: string
       callID: string
@@ -4141,52 +4146,47 @@ export type SyncEventSessionNextToolFailed = {
   }
 }
 
-export type SyncEventSessionNextRetried = {
+export type SyncEventRetried = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.retried.1"
+    type: "retried.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       attempt: number
-      error: SessionNextRetryError
+      error: SessionRetryError
     }
   }
 }
 
-export type SyncEventSessionNextCompactionStarted = {
+export type SyncEventCompactionStarted = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.compaction.started.1"
+    type: "compaction.started.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
-      messageID: string
       reason: "auto" | "manual"
     }
   }
 }
 
-export type SyncEventSessionNextCompactionEnded = {
+export type SyncEventCompactionEnded = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.compaction.ended.1"
+    type: "compaction.ended.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
-      messageID: string
       reason: "auto" | "manual"
       text: string
       recent: string
@@ -4194,47 +4194,44 @@ export type SyncEventSessionNextCompactionEnded = {
   }
 }
 
-export type SyncEventSessionNextRevertStaged = {
+export type SyncEventRevertStaged = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.revert.staged.1"
+    type: "revert.staged.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       revert: RevertState
     }
   }
 }
 
-export type SyncEventSessionNextRevertCleared = {
+export type SyncEventRevertCleared = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.revert.cleared.1"
+    type: "revert.cleared.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
     }
   }
 }
 
-export type SyncEventSessionNextRevertCommitted = {
+export type SyncEventRevertCommitted = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "session.next.revert.committed.1"
+    type: "revert.committed.1"
     id: string
     seq: number
     aggregateID: string
     data: {
-      timestamp: number
       sessionID: string
       messageID: string
     }
@@ -4375,7 +4372,7 @@ export type SessionInputAdmitted = {
   promotedSeq?: number
 }
 
-export type SessionMessageAgentSwitched = {
+export type SessionMessageAgentSelected = {
   id: string
   metadata?: {
     [key: string]: unknown
@@ -4387,7 +4384,7 @@ export type SessionMessageAgentSwitched = {
   agent: string
 }
 
-export type SessionMessageModelSwitched = {
+export type SessionMessageModelSelected = {
   id: string
   metadata?: {
     [key: string]: unknown
@@ -4596,8 +4593,8 @@ export type SessionMessageCompaction = {
 }
 
 export type SessionMessage =
-  | SessionMessageAgentSwitched
-  | SessionMessageModelSwitched
+  | SessionMessageAgentSelected
+  | SessionMessageModelSelected
   | SessionMessageUser
   | SessionMessageSynthetic
   | SessionMessageSystem
@@ -4613,12 +4610,13 @@ export type SessionContextEntryInfo = {
   value: unknown
 }
 
-export type SessionNextAgentSwitched = {
+export type AgentSelected = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.agent.switched"
+  type: "agent.selected"
   durable: {
     aggregateID: string
     seq: number
@@ -4626,19 +4624,18 @@ export type SessionNextAgentSwitched = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
-    messageID: string
     agent: string
   }
 }
 
-export type SessionNextModelSwitched = {
+export type ModelSelected = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.model.switched"
+  type: "model.selected"
   durable: {
     aggregateID: string
     seq: number
@@ -4646,19 +4643,18 @@ export type SessionNextModelSwitched = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
-    messageID: string
     model: ModelRef
   }
 }
 
-export type SessionNextMoved = {
+export type SessionMoved = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.moved"
+  type: "session.moved"
   durable: {
     aggregateID: string
     seq: number
@@ -4666,19 +4662,19 @@ export type SessionNextMoved = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     location: LocationRef
-    subdirectory?: string
+    subpath?: string
   }
 }
 
-export type SessionNextRenamed = {
+export type PromptPromoted = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.renamed"
+  type: "prompt.promoted"
   durable: {
     aggregateID: string
     seq: number
@@ -4686,18 +4682,18 @@ export type SessionNextRenamed = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
-    title: string
+    inputID: string
   }
 }
 
-export type SessionNextForked = {
+export type PromptAdmitted = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.forked"
+  type: "prompt.admitted"
   durable: {
     aggregateID: string
     seq: number
@@ -4705,40 +4701,20 @@ export type SessionNextForked = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
-    parentID: string
-    messageID?: string
-  }
-}
-
-export type SessionNextPrompted = {
-  id: string
-  metadata?: {
-    [key: string]: unknown
-  }
-  type: "session.next.prompted"
-  durable: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
-  location?: LocationRef
-  data: {
-    timestamp: number
-    sessionID: string
-    messageID: string
+    inputID: string
     prompt: Prompt
     delivery: "steer" | "queue"
   }
 }
 
-export type SessionNextPromptAdmitted = {
+export type SessionContextUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.prompt.admitted"
+  type: "session.context.updated"
   durable: {
     aggregateID: string
     seq: number
@@ -4746,40 +4722,18 @@ export type SessionNextPromptAdmitted = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
-    messageID: string
-    prompt: Prompt
-    delivery: "steer" | "queue"
-  }
-}
-
-export type SessionNextContextUpdated = {
-  id: string
-  metadata?: {
-    [key: string]: unknown
-  }
-  type: "session.next.context.updated"
-  durable: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
-  location?: LocationRef
-  data: {
-    timestamp: number
-    sessionID: string
-    messageID: string
     text: string
   }
 }
 
-export type SessionNextSynthetic = {
+export type SkillActivated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.synthetic"
+  type: "skill.activated"
   durable: {
     aggregateID: string
     seq: number
@@ -4787,44 +4741,19 @@ export type SessionNextSynthetic = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
-    messageID: string
-    text: string
-    description?: string
-    metadata?: {
-      [key: string]: unknown
-    }
-  }
-}
-
-export type SessionNextSkillActivated = {
-  id: string
-  metadata?: {
-    [key: string]: unknown
-  }
-  type: "session.next.skill.activated"
-  durable: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
-  location?: LocationRef
-  data: {
-    timestamp: number
-    sessionID: string
-    messageID: string
     name: string
     text: string
   }
 }
 
-export type SessionNextShellStarted = {
+export type ShellStarted = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.shell.started"
+  type: "shell.started"
   durable: {
     aggregateID: string
     seq: number
@@ -4832,20 +4761,19 @@ export type SessionNextShellStarted = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
-    messageID: string
     callID: string
     command: string
   }
 }
 
-export type SessionNextShellEnded = {
+export type ShellEnded = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.shell.ended"
+  type: "shell.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -4853,19 +4781,19 @@ export type SessionNextShellEnded = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     callID: string
     output: string
   }
 }
 
-export type SessionNextStepStarted = {
+export type StepStarted = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.step.started"
+  type: "step.started"
   durable: {
     aggregateID: string
     seq: number
@@ -4873,7 +4801,6 @@ export type SessionNextStepStarted = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     agent: string
@@ -4882,12 +4809,13 @@ export type SessionNextStepStarted = {
   }
 }
 
-export type SessionNextStepEnded = {
+export type StepEnded = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.step.ended"
+  type: "step.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -4895,7 +4823,6 @@ export type SessionNextStepEnded = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     finish: string
@@ -4914,12 +4841,13 @@ export type SessionNextStepEnded = {
   }
 }
 
-export type SessionNextStepFailed = {
+export type StepFailed = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.step.failed"
+  type: "step.failed"
   durable: {
     aggregateID: string
     seq: number
@@ -4927,19 +4855,19 @@ export type SessionNextStepFailed = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     error: SessionErrorUnknown
   }
 }
 
-export type SessionNextTextStarted = {
+export type TextStarted = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.text.started"
+  type: "text.started"
   durable: {
     aggregateID: string
     seq: number
@@ -4947,19 +4875,19 @@ export type SessionNextTextStarted = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     textID: string
   }
 }
 
-export type SessionNextTextEnded = {
+export type TextEnded = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.text.ended"
+  type: "text.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -4967,7 +4895,6 @@ export type SessionNextTextEnded = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     textID: string
@@ -4975,12 +4902,13 @@ export type SessionNextTextEnded = {
   }
 }
 
-export type SessionNextReasoningStarted = {
+export type ReasoningStarted = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.reasoning.started"
+  type: "reasoning.started"
   durable: {
     aggregateID: string
     seq: number
@@ -4988,7 +4916,6 @@ export type SessionNextReasoningStarted = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     reasoningID: string
@@ -4996,12 +4923,13 @@ export type SessionNextReasoningStarted = {
   }
 }
 
-export type SessionNextReasoningEnded = {
+export type ReasoningEnded = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.reasoning.ended"
+  type: "reasoning.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -5009,7 +4937,6 @@ export type SessionNextReasoningEnded = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     reasoningID: string
@@ -5018,12 +4945,13 @@ export type SessionNextReasoningEnded = {
   }
 }
 
-export type SessionNextToolInputStarted = {
+export type ToolInputStarted = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.tool.input.started"
+  type: "tool.input.started"
   durable: {
     aggregateID: string
     seq: number
@@ -5031,7 +4959,6 @@ export type SessionNextToolInputStarted = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -5039,12 +4966,13 @@ export type SessionNextToolInputStarted = {
   }
 }
 
-export type SessionNextToolInputEnded = {
+export type ToolInputEnded = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.tool.input.ended"
+  type: "tool.input.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -5052,7 +4980,6 @@ export type SessionNextToolInputEnded = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -5060,12 +4987,13 @@ export type SessionNextToolInputEnded = {
   }
 }
 
-export type SessionNextToolCalled = {
+export type ToolCalled = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.tool.called"
+  type: "tool.called"
   durable: {
     aggregateID: string
     seq: number
@@ -5073,7 +5001,6 @@ export type SessionNextToolCalled = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -5088,12 +5015,13 @@ export type SessionNextToolCalled = {
   }
 }
 
-export type SessionNextToolProgress = {
+export type ToolProgress = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.tool.progress"
+  type: "tool.progress"
   durable: {
     aggregateID: string
     seq: number
@@ -5101,7 +5029,6 @@ export type SessionNextToolProgress = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -5112,12 +5039,13 @@ export type SessionNextToolProgress = {
   }
 }
 
-export type SessionNextToolSuccess = {
+export type ToolSuccess = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.tool.success"
+  type: "tool.success"
   durable: {
     aggregateID: string
     seq: number
@@ -5125,7 +5053,6 @@ export type SessionNextToolSuccess = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -5142,12 +5069,13 @@ export type SessionNextToolSuccess = {
   }
 }
 
-export type SessionNextToolFailed = {
+export type ToolFailed = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.tool.failed"
+  type: "tool.failed"
   durable: {
     aggregateID: string
     seq: number
@@ -5155,7 +5083,6 @@ export type SessionNextToolFailed = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -5168,12 +5095,13 @@ export type SessionNextToolFailed = {
   }
 }
 
-export type SessionNextRetried = {
+export type CompactionStarted = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.retried"
+  type: "compaction.started"
   durable: {
     aggregateID: string
     seq: number
@@ -5181,39 +5109,18 @@ export type SessionNextRetried = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
-    attempt: number
-    error: SessionNextRetryError
-  }
-}
-
-export type SessionNextCompactionStarted = {
-  id: string
-  metadata?: {
-    [key: string]: unknown
-  }
-  type: "session.next.compaction.started"
-  durable: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
-  location?: LocationRef
-  data: {
-    timestamp: number
-    sessionID: string
-    messageID: string
     reason: "auto" | "manual"
   }
 }
 
-export type SessionNextCompactionEnded = {
+export type CompactionEnded = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.compaction.ended"
+  type: "compaction.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -5221,21 +5128,20 @@ export type SessionNextCompactionEnded = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
-    messageID: string
     reason: "auto" | "manual"
     text: string
     recent: string
   }
 }
 
-export type SessionNextRevertStaged = {
+export type RevertStaged = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.revert.staged"
+  type: "revert.staged"
   durable: {
     aggregateID: string
     seq: number
@@ -5243,18 +5149,18 @@ export type SessionNextRevertStaged = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     revert: RevertState
   }
 }
 
-export type SessionNextRevertCleared = {
+export type RevertCleared = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.revert.cleared"
+  type: "revert.cleared"
   durable: {
     aggregateID: string
     seq: number
@@ -5262,17 +5168,17 @@ export type SessionNextRevertCleared = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
   }
 }
 
-export type SessionNextRevertCommitted = {
+export type RevertCommitted = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.revert.committed"
+  type: "revert.committed"
   durable: {
     aggregateID: string
     seq: number
@@ -5280,7 +5186,6 @@ export type SessionNextRevertCommitted = {
   }
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     messageID: string
   }
@@ -5615,6 +5520,7 @@ export type SkillV2Info = {
 
 export type ModelsDevRefreshed = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5627,6 +5533,7 @@ export type ModelsDevRefreshed = {
 
 export type IntegrationUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5639,6 +5546,7 @@ export type IntegrationUpdated = {
 
 export type IntegrationConnectionUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5651,6 +5559,7 @@ export type IntegrationConnectionUpdated = {
 
 export type CatalogUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5663,6 +5572,7 @@ export type CatalogUpdated = {
 
 export type AgentUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5675,6 +5585,7 @@ export type AgentUpdated = {
 
 export type SessionCreated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5693,6 +5604,7 @@ export type SessionCreated = {
 
 export type SessionUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5711,6 +5623,7 @@ export type SessionUpdated = {
 
 export type SessionDeleted = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5729,6 +5642,7 @@ export type SessionDeleted = {
 
 export type MessageUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5747,6 +5661,7 @@ export type MessageUpdated = {
 
 export type MessageRemoved = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5765,6 +5680,7 @@ export type MessageRemoved = {
 
 export type MessagePartUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5784,6 +5700,7 @@ export type MessagePartUpdated = {
 
 export type MessagePartRemoved = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5801,30 +5718,30 @@ export type MessagePartRemoved = {
   }
 }
 
-export type SessionNextExecutionSettled = {
+export type ExecutionSettled = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.execution.settled"
+  type: "execution.settled"
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     outcome: "success" | "failure" | "interrupted"
     error?: SessionErrorUnknown
   }
 }
 
-export type SessionNextTextDelta = {
+export type TextDelta = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.text.delta"
+  type: "text.delta"
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     textID: string
@@ -5832,15 +5749,15 @@ export type SessionNextTextDelta = {
   }
 }
 
-export type SessionNextReasoningDelta = {
+export type ReasoningDelta = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.reasoning.delta"
+  type: "reasoning.delta"
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     reasoningID: string
@@ -5848,15 +5765,15 @@ export type SessionNextReasoningDelta = {
   }
 }
 
-export type SessionNextToolInputDelta = {
+export type ToolInputDelta = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.tool.input.delta"
+  type: "tool.input.delta"
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -5864,23 +5781,23 @@ export type SessionNextToolInputDelta = {
   }
 }
 
-export type SessionNextCompactionDelta = {
+export type CompactionDelta = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.compaction.delta"
+  type: "compaction.delta"
   location?: LocationRef
   data: {
-    timestamp: number
     sessionID: string
-    messageID: string
     text: string
   }
 }
 
 export type MessagePartDelta = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5897,6 +5814,7 @@ export type MessagePartDelta = {
 
 export type SessionDiff = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5910,6 +5828,7 @@ export type SessionDiff = {
 
 export type SessionError = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5931,6 +5850,7 @@ export type SessionError = {
 
 export type InstallationUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5943,6 +5863,7 @@ export type InstallationUpdated = {
 
 export type InstallationUpdateAvailable = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5955,6 +5876,7 @@ export type InstallationUpdateAvailable = {
 
 export type FileEdited = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5967,6 +5889,7 @@ export type FileEdited = {
 
 export type ReferenceUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5979,6 +5902,7 @@ export type ReferenceUpdated = {
 
 export type PermissionV2Asked = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -5999,6 +5923,7 @@ export type PermissionV2Asked = {
 
 export type PermissionV2Replied = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6013,6 +5938,7 @@ export type PermissionV2Replied = {
 
 export type PluginAdded = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6025,6 +5951,7 @@ export type PluginAdded = {
 
 export type ProjectDirectoriesUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6037,6 +5964,7 @@ export type ProjectDirectoriesUpdated = {
 
 export type CommandUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6049,6 +5977,7 @@ export type CommandUpdated = {
 
 export type SkillUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6061,6 +5990,7 @@ export type SkillUpdated = {
 
 export type FileWatcherUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6074,6 +6004,7 @@ export type FileWatcherUpdated = {
 
 export type PtyCreated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6086,6 +6017,7 @@ export type PtyCreated = {
 
 export type PtyUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6098,6 +6030,7 @@ export type PtyUpdated = {
 
 export type PtyExited = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6111,6 +6044,7 @@ export type PtyExited = {
 
 export type PtyDeleted = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6123,6 +6057,7 @@ export type PtyDeleted = {
 
 export type ShellCreated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6135,6 +6070,7 @@ export type ShellCreated = {
 
 export type ShellExited = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6149,6 +6085,7 @@ export type ShellExited = {
 
 export type ShellDeleted = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6161,6 +6098,7 @@ export type ShellDeleted = {
 
 export type QuestionV2Asked = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6179,6 +6117,7 @@ export type QuestionV2Asked = {
 
 export type QuestionV2Replied = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6193,6 +6132,7 @@ export type QuestionV2Replied = {
 
 export type QuestionV2Rejected = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6236,6 +6176,7 @@ export type FormIntegerField1 = {
 
 export type FormCreated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6250,6 +6191,7 @@ export type FormValue1 = string | number | "NaN" | "Infinity" | "-Infinity" | bo
 
 export type FormReplied = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6264,6 +6206,7 @@ export type FormReplied = {
 
 export type FormCancelled = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6277,6 +6220,7 @@ export type FormCancelled = {
 
 export type TodoUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6290,6 +6234,7 @@ export type TodoUpdated = {
 
 export type LspUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6302,6 +6247,7 @@ export type LspUpdated = {
 
 export type PermissionAsked = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6325,6 +6271,7 @@ export type PermissionAsked = {
 
 export type PermissionReplied = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6339,6 +6286,7 @@ export type PermissionReplied = {
 
 export type TuiPromptAppend = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6351,6 +6299,7 @@ export type TuiPromptAppend = {
 
 export type TuiCommandExecute = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6381,6 +6330,7 @@ export type TuiCommandExecute = {
 
 export type TuiToastShow = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6396,6 +6346,7 @@ export type TuiToastShow = {
 
 export type TuiSessionSelect = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6411,6 +6362,7 @@ export type TuiSessionSelect = {
 
 export type McpToolsChanged = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6423,6 +6375,7 @@ export type McpToolsChanged = {
 
 export type McpBrowserOpenFailed = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6436,6 +6389,7 @@ export type McpBrowserOpenFailed = {
 
 export type McpStatusChanged = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6448,6 +6402,7 @@ export type McpStatusChanged = {
 
 export type CommandExecuted = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6463,6 +6418,7 @@ export type CommandExecuted = {
 
 export type ProjectUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6482,6 +6438,7 @@ export type ProjectUpdated = {
 
 export type SessionIdle = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6494,6 +6451,7 @@ export type SessionIdle = {
 
 export type QuestionAsked = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6512,6 +6470,7 @@ export type QuestionAsked = {
 
 export type SessionCompacted = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6524,6 +6483,7 @@ export type SessionCompacted = {
 
 export type VcsBranchUpdated = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6536,6 +6496,7 @@ export type VcsBranchUpdated = {
 
 export type WorkspaceReady = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6548,6 +6509,7 @@ export type WorkspaceReady = {
 
 export type WorkspaceFailed = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6560,6 +6522,7 @@ export type WorkspaceFailed = {
 
 export type WorkspaceStatus = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6573,6 +6536,7 @@ export type WorkspaceStatus = {
 
 export type WorktreeReady = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6586,6 +6550,7 @@ export type WorktreeReady = {
 
 export type WorktreeFailed = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6598,6 +6563,7 @@ export type WorktreeFailed = {
 
 export type ServerConnected = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6610,6 +6576,7 @@ export type ServerConnected = {
 
 export type GlobalDisposed = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -6787,113 +6754,97 @@ export type EventMessagePartRemoved = {
   }
 }
 
-export type EventSessionNextAgentSwitched = {
+export type EventAgentSelected = {
   id: string
-  type: "session.next.agent.switched"
+  type: "agent.selected"
   properties: {
-    timestamp: number
     sessionID: string
-    messageID: string
     agent: string
   }
 }
 
-export type EventSessionNextModelSwitched = {
+export type EventModelSelected = {
   id: string
-  type: "session.next.model.switched"
+  type: "model.selected"
   properties: {
-    timestamp: number
     sessionID: string
-    messageID: string
     model: ModelRef
   }
 }
 
-export type EventSessionNextMoved = {
+export type EventSessionMoved = {
   id: string
-  type: "session.next.moved"
+  type: "session.moved"
   properties: {
-    timestamp: number
     sessionID: string
     location: LocationRef
-    subdirectory?: string
+    subpath?: string
   }
 }
 
-export type EventSessionNextRenamed = {
+export type EventRenamed = {
   id: string
-  type: "session.next.renamed"
+  type: "renamed"
   properties: {
-    timestamp: number
     sessionID: string
     title: string
   }
 }
 
-export type EventSessionNextForked = {
+export type EventForked = {
   id: string
-  type: "session.next.forked"
+  type: "forked"
   properties: {
-    timestamp: number
     sessionID: string
     parentID: string
-    messageID?: string
+    from?: string
   }
 }
 
-export type EventSessionNextPrompted = {
+export type EventPromptPromoted = {
   id: string
-  type: "session.next.prompted"
+  type: "prompt.promoted"
   properties: {
-    timestamp: number
     sessionID: string
-    messageID: string
+    inputID: string
+  }
+}
+
+export type EventPromptAdmitted = {
+  id: string
+  type: "prompt.admitted"
+  properties: {
+    sessionID: string
+    inputID: string
     prompt: Prompt
     delivery: "steer" | "queue"
   }
 }
 
-export type EventSessionNextPromptAdmitted = {
+export type EventExecutionSettled = {
   id: string
-  type: "session.next.prompt.admitted"
+  type: "execution.settled"
   properties: {
-    timestamp: number
-    sessionID: string
-    messageID: string
-    prompt: Prompt
-    delivery: "steer" | "queue"
-  }
-}
-
-export type EventSessionNextExecutionSettled = {
-  id: string
-  type: "session.next.execution.settled"
-  properties: {
-    timestamp: number
     sessionID: string
     outcome: "success" | "failure" | "interrupted"
     error?: SessionErrorUnknown
   }
 }
 
-export type EventSessionNextContextUpdated = {
+export type EventSessionContextUpdated = {
   id: string
-  type: "session.next.context.updated"
+  type: "session.context.updated"
   properties: {
-    timestamp: number
     sessionID: string
-    messageID: string
     text: string
   }
 }
 
-export type EventSessionNextSynthetic = {
+export type EventSynthetic = {
   id: string
-  type: "session.next.synthetic"
+  type: "synthetic"
   properties: {
-    timestamp: number
     sessionID: string
-    messageID: string
     text: string
     description?: string
     metadata?: {
@@ -6902,46 +6853,40 @@ export type EventSessionNextSynthetic = {
   }
 }
 
-export type EventSessionNextSkillActivated = {
+export type EventSkillActivated = {
   id: string
-  type: "session.next.skill.activated"
+  type: "skill.activated"
   properties: {
-    timestamp: number
     sessionID: string
-    messageID: string
     name: string
     text: string
   }
 }
 
-export type EventSessionNextShellStarted = {
+export type EventShellStarted = {
   id: string
-  type: "session.next.shell.started"
+  type: "shell.started"
   properties: {
-    timestamp: number
     sessionID: string
-    messageID: string
     callID: string
     command: string
   }
 }
 
-export type EventSessionNextShellEnded = {
+export type EventShellEnded = {
   id: string
-  type: "session.next.shell.ended"
+  type: "shell.ended"
   properties: {
-    timestamp: number
     sessionID: string
     callID: string
     output: string
   }
 }
 
-export type EventSessionNextStepStarted = {
+export type EventStepStarted = {
   id: string
-  type: "session.next.step.started"
+  type: "step.started"
   properties: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     agent: string
@@ -6950,11 +6895,10 @@ export type EventSessionNextStepStarted = {
   }
 }
 
-export type EventSessionNextStepEnded = {
+export type EventStepEnded = {
   id: string
-  type: "session.next.step.ended"
+  type: "step.ended"
   properties: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     finish: string
@@ -6973,33 +6917,30 @@ export type EventSessionNextStepEnded = {
   }
 }
 
-export type EventSessionNextStepFailed = {
+export type EventStepFailed = {
   id: string
-  type: "session.next.step.failed"
+  type: "step.failed"
   properties: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     error: SessionErrorUnknown
   }
 }
 
-export type EventSessionNextTextStarted = {
+export type EventTextStarted = {
   id: string
-  type: "session.next.text.started"
+  type: "text.started"
   properties: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     textID: string
   }
 }
 
-export type EventSessionNextTextDelta = {
+export type EventTextDelta = {
   id: string
-  type: "session.next.text.delta"
+  type: "text.delta"
   properties: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     textID: string
@@ -7007,11 +6948,10 @@ export type EventSessionNextTextDelta = {
   }
 }
 
-export type EventSessionNextTextEnded = {
+export type EventTextEnded = {
   id: string
-  type: "session.next.text.ended"
+  type: "text.ended"
   properties: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     textID: string
@@ -7019,11 +6959,10 @@ export type EventSessionNextTextEnded = {
   }
 }
 
-export type EventSessionNextReasoningStarted = {
+export type EventReasoningStarted = {
   id: string
-  type: "session.next.reasoning.started"
+  type: "reasoning.started"
   properties: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     reasoningID: string
@@ -7031,11 +6970,10 @@ export type EventSessionNextReasoningStarted = {
   }
 }
 
-export type EventSessionNextReasoningDelta = {
+export type EventReasoningDelta = {
   id: string
-  type: "session.next.reasoning.delta"
+  type: "reasoning.delta"
   properties: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     reasoningID: string
@@ -7043,11 +6981,10 @@ export type EventSessionNextReasoningDelta = {
   }
 }
 
-export type EventSessionNextReasoningEnded = {
+export type EventReasoningEnded = {
   id: string
-  type: "session.next.reasoning.ended"
+  type: "reasoning.ended"
   properties: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     reasoningID: string
@@ -7056,11 +6993,10 @@ export type EventSessionNextReasoningEnded = {
   }
 }
 
-export type EventSessionNextToolInputStarted = {
+export type EventToolInputStarted = {
   id: string
-  type: "session.next.tool.input.started"
+  type: "tool.input.started"
   properties: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -7068,11 +7004,10 @@ export type EventSessionNextToolInputStarted = {
   }
 }
 
-export type EventSessionNextToolInputDelta = {
+export type EventToolInputDelta = {
   id: string
-  type: "session.next.tool.input.delta"
+  type: "tool.input.delta"
   properties: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -7080,11 +7015,10 @@ export type EventSessionNextToolInputDelta = {
   }
 }
 
-export type EventSessionNextToolInputEnded = {
+export type EventToolInputEnded = {
   id: string
-  type: "session.next.tool.input.ended"
+  type: "tool.input.ended"
   properties: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -7092,11 +7026,10 @@ export type EventSessionNextToolInputEnded = {
   }
 }
 
-export type EventSessionNextToolCalled = {
+export type EventToolCalled = {
   id: string
-  type: "session.next.tool.called"
+  type: "tool.called"
   properties: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -7111,11 +7044,10 @@ export type EventSessionNextToolCalled = {
   }
 }
 
-export type EventSessionNextToolProgress = {
+export type EventToolProgress = {
   id: string
-  type: "session.next.tool.progress"
+  type: "tool.progress"
   properties: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -7126,11 +7058,10 @@ export type EventSessionNextToolProgress = {
   }
 }
 
-export type EventSessionNextToolSuccess = {
+export type EventToolSuccess = {
   id: string
-  type: "session.next.tool.success"
+  type: "tool.success"
   properties: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -7147,11 +7078,10 @@ export type EventSessionNextToolSuccess = {
   }
 }
 
-export type EventSessionNextToolFailed = {
+export type EventToolFailed = {
   id: string
-  type: "session.next.tool.failed"
+  type: "tool.failed"
   properties: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -7164,76 +7094,66 @@ export type EventSessionNextToolFailed = {
   }
 }
 
-export type EventSessionNextRetried = {
+export type EventRetried = {
   id: string
-  type: "session.next.retried"
+  type: "retried"
   properties: {
-    timestamp: number
     sessionID: string
     attempt: number
-    error: SessionNextRetryError
+    error: SessionRetryError
   }
 }
 
-export type EventSessionNextCompactionStarted = {
+export type EventCompactionStarted = {
   id: string
-  type: "session.next.compaction.started"
+  type: "compaction.started"
   properties: {
-    timestamp: number
     sessionID: string
-    messageID: string
     reason: "auto" | "manual"
   }
 }
 
-export type EventSessionNextCompactionDelta = {
+export type EventCompactionDelta = {
   id: string
-  type: "session.next.compaction.delta"
+  type: "compaction.delta"
   properties: {
-    timestamp: number
     sessionID: string
-    messageID: string
     text: string
   }
 }
 
-export type EventSessionNextCompactionEnded = {
+export type EventCompactionEnded = {
   id: string
-  type: "session.next.compaction.ended"
+  type: "compaction.ended"
   properties: {
-    timestamp: number
     sessionID: string
-    messageID: string
     reason: "auto" | "manual"
     text: string
     recent: string
   }
 }
 
-export type EventSessionNextRevertStaged = {
+export type EventRevertStaged = {
   id: string
-  type: "session.next.revert.staged"
+  type: "revert.staged"
   properties: {
-    timestamp: number
     sessionID: string
     revert: RevertState
   }
 }
 
-export type EventSessionNextRevertCleared = {
+export type EventRevertCleared = {
   id: string
-  type: "session.next.revert.cleared"
+  type: "revert.cleared"
   properties: {
-    timestamp: number
     sessionID: string
   }
 }
 
-export type EventSessionNextRevertCommitted = {
+export type EventRevertCommitted = {
   id: string
-  type: "session.next.revert.committed"
+  type: "revert.committed"
   properties: {
-    timestamp: number
     sessionID: string
     messageID: string
   }
@@ -8035,7 +7955,7 @@ export type UnknownErrorV2 = {
   ref?: string | null
 }
 
-export type SessionMessageAgentSwitched2 = {
+export type SessionMessageAgentSelected2 = {
   id: string
   metadata?: {
     [key: string]: unknown
@@ -8047,7 +7967,7 @@ export type SessionMessageAgentSwitched2 = {
   agent: string
 }
 
-export type SessionMessageModelSwitched2 = {
+export type SessionMessageModelSelected2 = {
   id: string
   metadata?: {
     [key: string]: unknown
@@ -8281,8 +8201,8 @@ export type SessionMessageCompaction2 = {
 }
 
 export type SessionMessage2 =
-  | SessionMessageAgentSwitched2
-  | SessionMessageModelSwitched2
+  | SessionMessageAgentSelected2
+  | SessionMessageModelSelected2
   | SessionMessageUser2
   | SessionMessageSynthetic2
   | SessionMessageSystem2
@@ -8301,12 +8221,13 @@ export type SessionContextEntryInfo2 = {
   value: unknown
 }
 
-export type SessionNextAgentSwitched2 = {
+export type AgentSelected2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.agent.switched"
+  type: "agent.selected"
   durable: {
     aggregateID: string
     seq: number
@@ -8314,19 +8235,18 @@ export type SessionNextAgentSwitched2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
-    messageID: string
     agent: string
   }
 }
 
-export type SessionNextModelSwitched2 = {
+export type ModelSelected2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.model.switched"
+  type: "model.selected"
   durable: {
     aggregateID: string
     seq: number
@@ -8334,19 +8254,18 @@ export type SessionNextModelSwitched2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
-    messageID: string
     model: ModelRef2
   }
 }
 
-export type SessionNextMoved2 = {
+export type SessionMoved2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.moved"
+  type: "session.moved"
   durable: {
     aggregateID: string
     seq: number
@@ -8354,19 +8273,19 @@ export type SessionNextMoved2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     location: LocationRef2
-    subdirectory?: string
+    subpath?: string
   }
 }
 
-export type SessionNextRenamed2 = {
+export type RenamedV2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.renamed"
+  type: "renamed"
   durable: {
     aggregateID: string
     seq: number
@@ -8374,18 +8293,18 @@ export type SessionNextRenamed2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     title: string
   }
 }
 
-export type SessionNextForked2 = {
+export type ForkedV2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.forked"
+  type: "forked"
   durable: {
     aggregateID: string
     seq: number
@@ -8393,19 +8312,19 @@ export type SessionNextForked2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     parentID: string
-    messageID?: string
+    from?: string
   }
 }
 
-export type SessionNextPrompted2 = {
+export type PromptPromoted2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.prompted"
+  type: "prompt.promoted"
   durable: {
     aggregateID: string
     seq: number
@@ -8413,20 +8332,39 @@ export type SessionNextPrompted2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
-    messageID: string
+    inputID: string
+  }
+}
+
+export type PromptAdmitted2 = {
+  id: string
+  created: number
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "prompt.admitted"
+  durable: {
+    aggregateID: string
+    seq: number
+    version: number
+  }
+  location?: LocationRef2
+  data: {
+    sessionID: string
+    inputID: string
     prompt: PromptV2
     delivery: "steer" | "queue"
   }
 }
 
-export type SessionNextPromptAdmitted2 = {
+export type SessionContextUpdated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.prompt.admitted"
+  type: "session.context.updated"
   durable: {
     aggregateID: string
     seq: number
@@ -8434,40 +8372,18 @@ export type SessionNextPromptAdmitted2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
-    messageID: string
-    prompt: PromptV2
-    delivery: "steer" | "queue"
-  }
-}
-
-export type SessionNextContextUpdated2 = {
-  id: string
-  metadata?: {
-    [key: string]: unknown
-  }
-  type: "session.next.context.updated"
-  durable: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
-  location?: LocationRef2
-  data: {
-    timestamp: number
-    sessionID: string
-    messageID: string
     text: string
   }
 }
 
-export type SessionNextSynthetic2 = {
+export type SyntheticV2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.synthetic"
+  type: "synthetic"
   durable: {
     aggregateID: string
     seq: number
@@ -8475,9 +8391,7 @@ export type SessionNextSynthetic2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
-    messageID: string
     text: string
     description?: string
     metadata?: {
@@ -8486,12 +8400,13 @@ export type SessionNextSynthetic2 = {
   }
 }
 
-export type SessionNextSkillActivated2 = {
+export type SkillActivated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.skill.activated"
+  type: "skill.activated"
   durable: {
     aggregateID: string
     seq: number
@@ -8499,20 +8414,19 @@ export type SessionNextSkillActivated2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
-    messageID: string
     name: string
     text: string
   }
 }
 
-export type SessionNextShellStarted2 = {
+export type ShellStarted2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.shell.started"
+  type: "shell.started"
   durable: {
     aggregateID: string
     seq: number
@@ -8520,20 +8434,19 @@ export type SessionNextShellStarted2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
-    messageID: string
     callID: string
     command: string
   }
 }
 
-export type SessionNextShellEnded2 = {
+export type ShellEnded2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.shell.ended"
+  type: "shell.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -8541,19 +8454,19 @@ export type SessionNextShellEnded2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     callID: string
     output: string
   }
 }
 
-export type SessionNextStepStarted2 = {
+export type StepStarted2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.step.started"
+  type: "step.started"
   durable: {
     aggregateID: string
     seq: number
@@ -8561,7 +8474,6 @@ export type SessionNextStepStarted2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     agent: string
@@ -8570,12 +8482,13 @@ export type SessionNextStepStarted2 = {
   }
 }
 
-export type SessionNextStepEnded2 = {
+export type StepEnded2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.step.ended"
+  type: "step.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -8583,7 +8496,6 @@ export type SessionNextStepEnded2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     finish: string
@@ -8602,12 +8514,13 @@ export type SessionNextStepEnded2 = {
   }
 }
 
-export type SessionNextStepFailed2 = {
+export type StepFailed2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.step.failed"
+  type: "step.failed"
   durable: {
     aggregateID: string
     seq: number
@@ -8615,19 +8528,19 @@ export type SessionNextStepFailed2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     error: SessionErrorUnknown2
   }
 }
 
-export type SessionNextTextStarted2 = {
+export type TextStarted2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.text.started"
+  type: "text.started"
   durable: {
     aggregateID: string
     seq: number
@@ -8635,19 +8548,19 @@ export type SessionNextTextStarted2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     textID: string
   }
 }
 
-export type SessionNextTextEnded2 = {
+export type TextEnded2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.text.ended"
+  type: "text.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -8655,7 +8568,6 @@ export type SessionNextTextEnded2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     textID: string
@@ -8669,12 +8581,13 @@ export type LlmProviderMetadata3 = {
   }
 }
 
-export type SessionNextReasoningStarted2 = {
+export type ReasoningStarted2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.reasoning.started"
+  type: "reasoning.started"
   durable: {
     aggregateID: string
     seq: number
@@ -8682,7 +8595,6 @@ export type SessionNextReasoningStarted2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     reasoningID: string
@@ -8696,12 +8608,13 @@ export type LlmProviderMetadata4 = {
   }
 }
 
-export type SessionNextReasoningEnded2 = {
+export type ReasoningEnded2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.reasoning.ended"
+  type: "reasoning.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -8709,7 +8622,6 @@ export type SessionNextReasoningEnded2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     reasoningID: string
@@ -8718,12 +8630,13 @@ export type SessionNextReasoningEnded2 = {
   }
 }
 
-export type SessionNextToolInputStarted2 = {
+export type ToolInputStarted2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.tool.input.started"
+  type: "tool.input.started"
   durable: {
     aggregateID: string
     seq: number
@@ -8731,7 +8644,6 @@ export type SessionNextToolInputStarted2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -8739,12 +8651,13 @@ export type SessionNextToolInputStarted2 = {
   }
 }
 
-export type SessionNextToolInputEnded2 = {
+export type ToolInputEnded2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.tool.input.ended"
+  type: "tool.input.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -8752,7 +8665,6 @@ export type SessionNextToolInputEnded2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -8766,12 +8678,13 @@ export type LlmProviderMetadata5 = {
   }
 }
 
-export type SessionNextToolCalled2 = {
+export type ToolCalled2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.tool.called"
+  type: "tool.called"
   durable: {
     aggregateID: string
     seq: number
@@ -8779,7 +8692,6 @@ export type SessionNextToolCalled2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -8794,12 +8706,13 @@ export type SessionNextToolCalled2 = {
   }
 }
 
-export type SessionNextToolProgress2 = {
+export type ToolProgress2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.tool.progress"
+  type: "tool.progress"
   durable: {
     aggregateID: string
     seq: number
@@ -8807,7 +8720,6 @@ export type SessionNextToolProgress2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -8824,12 +8736,13 @@ export type LlmProviderMetadata6 = {
   }
 }
 
-export type SessionNextToolSuccess2 = {
+export type ToolSuccess2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.tool.success"
+  type: "tool.success"
   durable: {
     aggregateID: string
     seq: number
@@ -8837,7 +8750,6 @@ export type SessionNextToolSuccess2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -8860,12 +8772,13 @@ export type LlmProviderMetadata7 = {
   }
 }
 
-export type SessionNextToolFailed2 = {
+export type ToolFailed2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.tool.failed"
+  type: "tool.failed"
   durable: {
     aggregateID: string
     seq: number
@@ -8873,7 +8786,6 @@ export type SessionNextToolFailed2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -8886,7 +8798,7 @@ export type SessionNextToolFailed2 = {
   }
 }
 
-export type SessionNextRetryError2 = {
+export type SessionRetryError2 = {
   message: string
   statusCode?: number
   isRetryable: boolean
@@ -8899,12 +8811,13 @@ export type SessionNextRetryError2 = {
   }
 }
 
-export type SessionNextRetried2 = {
+export type RetriedV2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.retried"
+  type: "retried"
   durable: {
     aggregateID: string
     seq: number
@@ -8912,19 +8825,19 @@ export type SessionNextRetried2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     attempt: number
-    error: SessionNextRetryError2
+    error: SessionRetryError2
   }
 }
 
-export type SessionNextCompactionStarted2 = {
+export type CompactionStarted2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.compaction.started"
+  type: "compaction.started"
   durable: {
     aggregateID: string
     seq: number
@@ -8932,19 +8845,18 @@ export type SessionNextCompactionStarted2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
-    messageID: string
     reason: "auto" | "manual"
   }
 }
 
-export type SessionNextCompactionEnded2 = {
+export type CompactionEnded2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.compaction.ended"
+  type: "compaction.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -8952,21 +8864,20 @@ export type SessionNextCompactionEnded2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
-    messageID: string
     reason: "auto" | "manual"
     text: string
     recent: string
   }
 }
 
-export type SessionNextRevertStaged2 = {
+export type RevertStaged2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.revert.staged"
+  type: "revert.staged"
   durable: {
     aggregateID: string
     seq: number
@@ -8974,18 +8885,18 @@ export type SessionNextRevertStaged2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     revert: RevertState2
   }
 }
 
-export type SessionNextRevertCleared2 = {
+export type RevertCleared2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.revert.cleared"
+  type: "revert.cleared"
   durable: {
     aggregateID: string
     seq: number
@@ -8993,17 +8904,17 @@ export type SessionNextRevertCleared2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
   }
 }
 
-export type SessionNextRevertCommitted2 = {
+export type RevertCommitted2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.revert.committed"
+  type: "revert.committed"
   durable: {
     aggregateID: string
     seq: number
@@ -9011,44 +8922,43 @@ export type SessionNextRevertCommitted2 = {
   }
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     messageID: string
   }
 }
 
 export type SessionDurableEventV2 =
-  | SessionNextAgentSwitched2
-  | SessionNextModelSwitched2
-  | SessionNextMoved2
-  | SessionNextRenamed2
-  | SessionNextForked2
-  | SessionNextPrompted2
-  | SessionNextPromptAdmitted2
-  | SessionNextContextUpdated2
-  | SessionNextSynthetic2
-  | SessionNextSkillActivated2
-  | SessionNextShellStarted2
-  | SessionNextShellEnded2
-  | SessionNextStepStarted2
-  | SessionNextStepEnded2
-  | SessionNextStepFailed2
-  | SessionNextTextStarted2
-  | SessionNextTextEnded2
-  | SessionNextReasoningStarted2
-  | SessionNextReasoningEnded2
-  | SessionNextToolInputStarted2
-  | SessionNextToolInputEnded2
-  | SessionNextToolCalled2
-  | SessionNextToolProgress2
-  | SessionNextToolSuccess2
-  | SessionNextToolFailed2
-  | SessionNextRetried2
-  | SessionNextCompactionStarted2
-  | SessionNextCompactionEnded2
-  | SessionNextRevertStaged2
-  | SessionNextRevertCleared2
-  | SessionNextRevertCommitted2
+  | AgentSelected2
+  | ModelSelected2
+  | SessionMoved2
+  | RenamedV2
+  | ForkedV2
+  | PromptPromoted2
+  | PromptAdmitted2
+  | SessionContextUpdated2
+  | SyntheticV2
+  | SkillActivated2
+  | ShellStarted2
+  | ShellEnded2
+  | StepStarted2
+  | StepEnded2
+  | StepFailed2
+  | TextStarted2
+  | TextEnded2
+  | ReasoningStarted2
+  | ReasoningEnded2
+  | ToolInputStarted2
+  | ToolInputEnded2
+  | ToolCalled2
+  | ToolProgress2
+  | ToolSuccess2
+  | ToolFailed2
+  | RetriedV2
+  | CompactionStarted2
+  | CompactionEnded2
+  | RevertStaged2
+  | RevertCleared2
+  | RevertCommitted2
 
 /**
  * Marker emitted once when a log read reaches its captured watermark. The reader holds every event committed at or below seq.
@@ -9565,6 +9475,7 @@ export type SkillV2Info2 = {
 
 export type ModelsDevRefreshed2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -9579,6 +9490,7 @@ export type ModelsDevRefreshed2 = {
 
 export type IntegrationUpdated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -9593,6 +9505,7 @@ export type IntegrationUpdated2 = {
 
 export type IntegrationConnectionUpdated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -9605,6 +9518,7 @@ export type IntegrationConnectionUpdated2 = {
 
 export type CatalogUpdated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -9619,6 +9533,7 @@ export type CatalogUpdated2 = {
 
 export type AgentUpdated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -9704,6 +9619,7 @@ export type SessionV2 = {
 
 export type SessionCreated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -9722,6 +9638,7 @@ export type SessionCreated2 = {
 
 export type SessionUpdated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -9740,6 +9657,7 @@ export type SessionUpdated2 = {
 
 export type SessionDeleted2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -9914,6 +9832,7 @@ export type MessageV2 = UserMessageV2 | AssistantMessageV2
 
 export type MessageUpdated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -9932,6 +9851,7 @@ export type MessageUpdated2 = {
 
 export type MessageRemoved2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10213,6 +10133,7 @@ export type PartV2 =
 
 export type MessagePartUpdated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10232,6 +10153,7 @@ export type MessagePartUpdated2 = {
 
 export type MessagePartRemoved2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10249,30 +10171,30 @@ export type MessagePartRemoved2 = {
   }
 }
 
-export type SessionNextExecutionSettled2 = {
+export type ExecutionSettled2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.execution.settled"
+  type: "execution.settled"
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     outcome: "success" | "failure" | "interrupted"
     error?: SessionErrorUnknown2
   }
 }
 
-export type SessionNextTextDelta2 = {
+export type TextDelta2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.text.delta"
+  type: "text.delta"
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     textID: string
@@ -10280,15 +10202,15 @@ export type SessionNextTextDelta2 = {
   }
 }
 
-export type SessionNextReasoningDelta2 = {
+export type ReasoningDelta2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.reasoning.delta"
+  type: "reasoning.delta"
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     reasoningID: string
@@ -10296,15 +10218,15 @@ export type SessionNextReasoningDelta2 = {
   }
 }
 
-export type SessionNextToolInputDelta2 = {
+export type ToolInputDelta2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.tool.input.delta"
+  type: "tool.input.delta"
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
     assistantMessageID: string
     callID: string
@@ -10312,23 +10234,23 @@ export type SessionNextToolInputDelta2 = {
   }
 }
 
-export type SessionNextCompactionDelta2 = {
+export type CompactionDelta2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "session.next.compaction.delta"
+  type: "compaction.delta"
   location?: LocationRef2
   data: {
-    timestamp: number
     sessionID: string
-    messageID: string
     text: string
   }
 }
 
 export type FileEdited2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10341,6 +10263,7 @@ export type FileEdited2 = {
 
 export type ReferenceUpdated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10355,6 +10278,7 @@ export type ReferenceUpdated2 = {
 
 export type PermissionV2Asked2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10375,6 +10299,7 @@ export type PermissionV2Asked2 = {
 
 export type PermissionV2Replied2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10389,6 +10314,7 @@ export type PermissionV2Replied2 = {
 
 export type PluginAdded2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10401,6 +10327,7 @@ export type PluginAdded2 = {
 
 export type ProjectDirectoriesUpdated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10413,6 +10340,7 @@ export type ProjectDirectoriesUpdated2 = {
 
 export type CommandUpdated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10427,6 +10355,7 @@ export type CommandUpdated2 = {
 
 export type SkillUpdated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10441,6 +10370,7 @@ export type SkillUpdated2 = {
 
 export type FileWatcherUpdated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10465,6 +10395,7 @@ export type PtyV2 = {
 
 export type PtyCreated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10477,6 +10408,7 @@ export type PtyCreated2 = {
 
 export type PtyUpdated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10489,6 +10421,7 @@ export type PtyUpdated2 = {
 
 export type PtyExited2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10502,6 +10435,7 @@ export type PtyExited2 = {
 
 export type PtyDeleted2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10532,6 +10466,7 @@ export type ShellV2 = {
 
 export type ShellCreated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10544,6 +10479,7 @@ export type ShellCreated2 = {
 
 export type ShellExited2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10558,6 +10494,7 @@ export type ShellExited2 = {
 
 export type ShellDeleted2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10603,6 +10540,7 @@ export type QuestionV2Tool2 = {
 
 export type QuestionV2Asked2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10623,6 +10561,7 @@ export type QuestionV2Answer2 = Array<string>
 
 export type QuestionV2Replied2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10637,6 +10576,7 @@ export type QuestionV2Replied2 = {
 
 export type QuestionV2Rejected2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10743,6 +10683,7 @@ export type FormUrlInfo1 = {
 
 export type FormCreated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10761,6 +10702,7 @@ export type FormAnswer1 = {
 
 export type FormReplied2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10775,6 +10717,7 @@ export type FormReplied2 = {
 
 export type FormCancelled2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10803,6 +10746,7 @@ export type TodoV2 = {
 
 export type TodoUpdated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10838,6 +10782,7 @@ export type SessionStatusV2 =
 
 export type SessionStatusV22 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10851,6 +10796,7 @@ export type SessionStatusV22 = {
 
 export type SessionIdle2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10863,6 +10809,7 @@ export type SessionIdle2 = {
 
 export type TuiPromptAppend2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10875,6 +10822,7 @@ export type TuiPromptAppend2 = {
 
 export type TuiCommandExecute2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10905,6 +10853,7 @@ export type TuiCommandExecute2 = {
 
 export type TuiToastShow2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10920,6 +10869,7 @@ export type TuiToastShow2 = {
 
 export type TuiSessionSelect2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10935,6 +10885,7 @@ export type TuiSessionSelect2 = {
 
 export type InstallationUpdated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10947,6 +10898,7 @@ export type InstallationUpdated2 = {
 
 export type InstallationUpdateAvailable2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10959,6 +10911,7 @@ export type InstallationUpdateAvailable2 = {
 
 export type VcsBranchUpdated2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10971,6 +10924,7 @@ export type VcsBranchUpdated2 = {
 
 export type McpStatusChanged2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -10983,6 +10937,7 @@ export type McpStatusChanged2 = {
 
 export type PermissionAsked2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -11006,6 +10961,7 @@ export type PermissionAsked2 = {
 
 export type PermissionReplied2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -11059,6 +11015,7 @@ export type QuestionToolV2 = {
 
 export type QuestionAsked2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -11079,6 +11036,7 @@ export type QuestionAnswerV2 = Array<string>
 
 export type QuestionRepliedV2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -11093,6 +11051,7 @@ export type QuestionRepliedV2 = {
 
 export type QuestionRejectedV2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -11106,6 +11065,7 @@ export type QuestionRejectedV2 = {
 
 export type SessionError2 = {
   id: string
+  created: number
   metadata?: {
     [key: string]: unknown
   }
@@ -11153,42 +11113,42 @@ export type V2EventV2 =
   | MessageRemoved2
   | MessagePartUpdated2
   | MessagePartRemoved2
-  | SessionNextAgentSwitched2
-  | SessionNextModelSwitched2
-  | SessionNextMoved2
-  | SessionNextRenamed2
-  | SessionNextForked2
-  | SessionNextPrompted2
-  | SessionNextPromptAdmitted2
-  | SessionNextExecutionSettled2
-  | SessionNextContextUpdated2
-  | SessionNextSynthetic2
-  | SessionNextSkillActivated2
-  | SessionNextShellStarted2
-  | SessionNextShellEnded2
-  | SessionNextStepStarted2
-  | SessionNextStepEnded2
-  | SessionNextStepFailed2
-  | SessionNextTextStarted2
-  | SessionNextTextDelta2
-  | SessionNextTextEnded2
-  | SessionNextReasoningStarted2
-  | SessionNextReasoningDelta2
-  | SessionNextReasoningEnded2
-  | SessionNextToolInputStarted2
-  | SessionNextToolInputDelta2
-  | SessionNextToolInputEnded2
-  | SessionNextToolCalled2
-  | SessionNextToolProgress2
-  | SessionNextToolSuccess2
-  | SessionNextToolFailed2
-  | SessionNextRetried2
-  | SessionNextCompactionStarted2
-  | SessionNextCompactionDelta2
-  | SessionNextCompactionEnded2
-  | SessionNextRevertStaged2
-  | SessionNextRevertCleared2
-  | SessionNextRevertCommitted2
+  | AgentSelected2
+  | ModelSelected2
+  | SessionMoved2
+  | RenamedV2
+  | ForkedV2
+  | PromptPromoted2
+  | PromptAdmitted2
+  | ExecutionSettled2
+  | SessionContextUpdated2
+  | SyntheticV2
+  | SkillActivated2
+  | ShellStarted2
+  | ShellEnded2
+  | StepStarted2
+  | StepEnded2
+  | StepFailed2
+  | TextStarted2
+  | TextDelta2
+  | TextEnded2
+  | ReasoningStarted2
+  | ReasoningDelta2
+  | ReasoningEnded2
+  | ToolInputStarted2
+  | ToolInputDelta2
+  | ToolInputEnded2
+  | ToolCalled2
+  | ToolProgress2
+  | ToolSuccess2
+  | ToolFailed2
+  | RetriedV2
+  | CompactionStarted2
+  | CompactionDelta2
+  | CompactionEnded2
+  | RevertStaged2
+  | RevertCleared2
+  | RevertCommitted2
   | FileEdited2
   | ReferenceUpdated2
   | PermissionV2Asked2
diff --git a/packages/tui/src/context/data.tsx b/packages/tui/src/context/data.tsx
index d70a71be5c..cc9378dbac 100644
--- a/packages/tui/src/context/data.tsx
+++ b/packages/tui/src/context/data.tsx
@@ -27,6 +27,8 @@ import { createSignal, onCleanup } from "solid-js"
 
 export type DataSessionStatus = "idle" | "running"
 
+const messageIDFromEvent = (eventID: string) => eventID.replace(/^evt_/, "msg_")
+
 type LocationData = {
   agent?: AgentV2Info[]
   command?: CommandV2Info[]
@@ -181,17 +183,21 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
       const info = store.session.info[sessionID]
       if (!info) return
       const rootID = resolveRoot(sessionID)
-      setStore("session", "family", produce((draft) => {
-        if (sessionID !== rootID && draft[sessionID]) {
-          const members = draft[rootID] ??= []
-          for (const id of draft[sessionID]) {
-            if (!members.includes(id)) members.push(id)
+      setStore(
+        "session",
+        "family",
+        produce((draft) => {
+          if (sessionID !== rootID && draft[sessionID]) {
+            const members = (draft[rootID] ??= [])
+            for (const id of draft[sessionID]) {
+              if (!members.includes(id)) members.push(id)
+            }
+            delete draft[sessionID]
           }
-          delete draft[sessionID]
-        }
-        const family = draft[rootID] ??= []
-        if (!family.includes(sessionID)) family.push(sessionID)
-      }))
+          const family = (draft[rootID] ??= [])
+          if (!family.includes(sessionID)) family.push(sessionID)
+        }),
+      )
     }
 
     function handleEvent(event: V2Event) {
@@ -214,124 +220,113 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
         case "skill.updated":
           void result.location.skill.refresh(event.location)
           break
-        case "session.next.agent.switched":
+        case "agent.selected":
           if (store.session.info[event.data.sessionID])
             setStore("session", "info", event.data.sessionID, "agent", event.data.agent)
           message.update(event.data.sessionID, (draft, index) => {
             message.append(draft, index, {
-              id: event.data.messageID,
+              id: messageIDFromEvent(event.id),
               type: "agent-switched",
               agent: event.data.agent,
-              time: { created: event.data.timestamp },
+              time: { created: event.created },
             })
           })
           break
-        case "session.next.model.switched":
+        case "model.selected":
           if (store.session.info[event.data.sessionID])
             setStore("session", "info", event.data.sessionID, "model", event.data.model)
           message.update(event.data.sessionID, (draft, index) => {
             message.append(draft, index, {
-              id: event.data.messageID,
+              id: messageIDFromEvent(event.id),
               type: "model-switched",
               model: event.data.model,
-              time: { created: event.data.timestamp },
+              time: { created: event.created },
             })
           })
           break
-        case "session.next.renamed":
+        case "renamed":
           if (store.session.info[event.data.sessionID])
             setStore("session", "info", event.data.sessionID, "title", event.data.title)
           break
-        case "session.next.prompted": {
+        case "prompt.promoted": {
           setStore("session", "status", event.data.sessionID, "running")
           message.update(event.data.sessionID, (draft, index) => {
-            const position = index.get(event.data.messageID)
+            const position = index.get(event.data.inputID)
             const existing = position === undefined ? undefined : draft[position]
             if (existing?.type === "user") {
-              existing.text = event.data.prompt.text
-              existing.files = event.data.prompt.files
-              existing.agents = event.data.prompt.agents
-              existing.time.created = event.data.timestamp
+              existing.time.created = event.created
               if (existing.metadata?.queued === true) {
                 delete existing.metadata.queued
                 if (Object.keys(existing.metadata).length === 0) existing.metadata = undefined
               }
               return
             }
-            message.append(draft, index, {
-              id: event.data.messageID,
-              type: "user",
-              text: event.data.prompt.text,
-              files: event.data.prompt.files,
-              agents: event.data.prompt.agents,
-              time: { created: event.data.timestamp },
-            })
           })
           break
         }
-        case "session.next.prompt.admitted":
+        case "prompt.admitted":
           message.update(event.data.sessionID, (draft, index) => {
             message.append(draft, index, {
-              id: event.data.messageID,
+              id: event.data.inputID,
               type: "user",
               text: event.data.prompt.text,
               files: event.data.prompt.files,
               agents: event.data.prompt.agents,
               metadata: { queued: true },
-              time: { created: event.data.timestamp },
+              time: { created: event.created },
             })
           })
           break
-        case "session.next.context.updated":
+        case "session.context.updated":
           message.update(event.data.sessionID, (draft, index) => {
             message.append(draft, index, {
-              id: event.data.messageID,
+              id: messageIDFromEvent(event.id),
               type: "system",
               text: event.data.text,
-              time: { created: event.data.timestamp },
+              time: { created: event.created },
             })
           })
           break
-        case "session.next.synthetic":
+        case "synthetic":
           message.update(event.data.sessionID, (draft, index) => {
             message.append(draft, index, {
-              id: event.data.messageID,
+              id: messageIDFromEvent(event.id),
               type: "synthetic",
               sessionID: event.data.sessionID,
               text: event.data.text,
               description: event.data.description,
-              time: { created: event.data.timestamp },
+              time: { created: event.created },
             })
           })
           break
-        case "session.next.shell.started":
+        case "shell.started":
           setStore("session", "status", event.data.sessionID, "running")
           message.update(event.data.sessionID, (draft, index) => {
             message.append(draft, index, {
-              id: event.data.messageID,
+              id: messageIDFromEvent(event.id),
               type: "shell",
               callID: event.data.callID,
               command: event.data.command,
               output: "",
-              time: { created: event.data.timestamp },
+              time: { created: event.created },
             })
           })
           break
-        case "session.next.shell.ended":
+        case "shell.ended":
           setStore("session", "status", event.data.sessionID, "idle")
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.activeShell(draft, event.data.callID)
             if (!match) return
             match.output = event.data.output
-            match.time.completed = event.data.timestamp
+            match.time.completed = event.created
           })
           break
-        case "session.next.step.started":
+        case "step.started":
           setStore("session", "status", event.data.sessionID, "running")
           message.update(event.data.sessionID, (draft, index) => {
             if (index.has(event.data.assistantMessageID)) return
             const currentAssistant = message.activeAssistant(draft)
-            if (currentAssistant) currentAssistant.time.completed = event.data.timestamp
+            if (currentAssistant) currentAssistant.time.completed = event.created
             message.append(draft, index, {
               id: event.data.assistantMessageID,
               type: "assistant",
@@ -339,16 +334,16 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
               model: event.data.model,
               content: [],
               snapshot: event.data.snapshot ? { start: event.data.snapshot } : undefined,
-              time: { created: event.data.timestamp },
+              time: { created: event.created },
             })
           })
           break
-        case "session.next.step.ended":
+        case "step.ended":
           setStore("session", "status", event.data.sessionID, "running")
           message.update(event.data.sessionID, (draft, index) => {
             const currentAssistant = message.assistant(draft, index, event.data.assistantMessageID)
             if (!currentAssistant) return
-            currentAssistant.time.completed = event.data.timestamp
+            currentAssistant.time.completed = event.created
             currentAssistant.finish = event.data.finish
             currentAssistant.cost = event.data.cost
             currentAssistant.tokens = event.data.tokens
@@ -356,16 +351,16 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
               currentAssistant.snapshot = { ...currentAssistant.snapshot, end: event.data.snapshot }
           })
           break
-        case "session.next.step.failed":
+        case "step.failed":
           message.update(event.data.sessionID, (draft, index) => {
             const currentAssistant = message.assistant(draft, index, event.data.assistantMessageID)
             if (!currentAssistant) return
-            currentAssistant.time.completed = event.data.timestamp
+            currentAssistant.time.completed = event.created
             currentAssistant.finish = "error"
             currentAssistant.error = event.data.error
           })
           break
-        case "session.next.text.started":
+        case "text.started":
           message.update(event.data.sessionID, (draft, index) => {
             message.assistant(draft, index, event.data.assistantMessageID)?.content.push({
               type: "text",
@@ -374,7 +369,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             })
           })
           break
-        case "session.next.text.delta":
+        case "text.delta":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestText(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -383,7 +378,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             if (match) match.text += event.data.delta
           })
           break
-        case "session.next.text.ended":
+        case "text.ended":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestText(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -392,18 +387,18 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             if (match) match.text = event.data.text
           })
           break
-        case "session.next.tool.input.started":
+        case "tool.input.started":
           message.update(event.data.sessionID, (draft, index) => {
             message.assistant(draft, index, event.data.assistantMessageID)?.content.push({
               type: "tool",
               id: event.data.callID,
               name: event.data.name,
-              time: { created: event.data.timestamp },
+              time: { created: event.created },
               state: { status: "pending", input: "" },
             })
           })
           break
-        case "session.next.tool.input.delta":
+        case "tool.input.delta":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestTool(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -412,7 +407,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             if (match?.state.status === "pending") match.state.input += event.data.delta
           })
           break
-        case "session.next.tool.input.ended":
+        case "tool.input.ended":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestTool(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -421,19 +416,19 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             if (match?.state.status === "pending") match.state.input = event.data.text
           })
           break
-        case "session.next.tool.called":
+        case "tool.called":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestTool(
               message.assistant(draft, index, event.data.assistantMessageID),
               event.data.callID,
             )
             if (!match) return
-            match.time.ran = event.data.timestamp
+            match.time.ran = event.created
             match.provider = event.data.provider
             match.state = { status: "running", input: event.data.input, structured: {}, content: [] }
           })
           break
-        case "session.next.tool.progress":
+        case "tool.progress":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestTool(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -444,7 +439,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             match.state.content = [...event.data.content]
           })
           break
-        case "session.next.tool.success":
+        case "tool.success":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestTool(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -463,10 +458,10 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
               metadata: match.provider?.metadata,
               resultMetadata: event.data.provider.metadata,
             }
-            match.time.completed = event.data.timestamp
+            match.time.completed = event.created
           })
           break
-        case "session.next.tool.failed":
+        case "tool.failed":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestTool(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -486,21 +481,21 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
               metadata: match.provider?.metadata,
               resultMetadata: event.data.provider.metadata,
             }
-            match.time.completed = event.data.timestamp
+            match.time.completed = event.created
           })
           break
-        case "session.next.reasoning.started":
+        case "reasoning.started":
           message.update(event.data.sessionID, (draft, index) => {
             message.assistant(draft, index, event.data.assistantMessageID)?.content.push({
               type: "reasoning",
               id: event.data.reasoningID,
               text: "",
               providerMetadata: event.data.providerMetadata,
-              time: { created: event.data.timestamp },
+              time: { created: event.created },
             })
           })
           break
-        case "session.next.reasoning.delta":
+        case "reasoning.delta":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestReasoning(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -509,7 +504,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             if (match) match.text += event.data.delta
           })
           break
-        case "session.next.reasoning.ended":
+        case "reasoning.ended":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestReasoning(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -517,38 +512,38 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             )
             if (match) {
               match.text = event.data.text
-              match.time = { created: match.time?.created ?? event.data.timestamp, completed: event.data.timestamp }
+              match.time = { created: match.time?.created ?? event.created, completed: event.created }
               if (event.data.providerMetadata !== undefined) match.providerMetadata = event.data.providerMetadata
             }
           })
           break
-        case "session.next.retried":
-        case "session.next.compaction.started":
+        case "retried":
+        case "compaction.started":
           setStore("session", "status", event.data.sessionID, "running")
           break
-        case "session.next.execution.settled":
+        case "execution.settled":
           setStore("session", "status", event.data.sessionID, "idle")
           break
-        case "session.next.revert.staged":
+        case "revert.staged":
           if (store.session.info[event.data.sessionID])
             setStore("session", "info", event.data.sessionID, "revert", event.data.revert)
           break
-        case "session.next.revert.cleared":
-        case "session.next.revert.committed":
+        case "revert.cleared":
+        case "revert.committed":
           if (store.session.info[event.data.sessionID])
             setStore("session", "info", event.data.sessionID, "revert", undefined)
           break
-        case "session.next.compaction.delta":
+        case "compaction.delta":
           break
-        case "session.next.compaction.ended":
+        case "compaction.ended":
           message.update(event.data.sessionID, (draft, index) => {
             message.append(draft, index, {
-              id: event.data.messageID,
+              id: messageIDFromEvent(event.id),
               type: "compaction",
               reason: event.data.reason,
               summary: event.data.text,
               recent: event.data.recent,
-              time: { created: event.data.timestamp },
+              time: { created: event.created },
             })
           })
           break
@@ -692,8 +687,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
                 return liveByID.get(message.id) ?? message
               }),
               ...live.filter((message) => !loadedIDs.has(message.id)),
-            ]
-              .toSorted((a, b) => a.time.created - b.time.created)
+            ].toSorted((a, b) => a.time.created - b.time.created)
             messageIndex.set(sessionID, new Map(messages.map((message, index) => [message.id, index])))
             setStore("session", "message", sessionID, messages)
           },
diff --git a/packages/tui/src/feature-plugins/system/notifications.ts b/packages/tui/src/feature-plugins/system/notifications.ts
index 81c696ef13..aa8dcace19 100644
--- a/packages/tui/src/feature-plugins/system/notifications.ts
+++ b/packages/tui/src/feature-plugins/system/notifications.ts
@@ -74,17 +74,17 @@ const tui: TuiPlugin = async (api) => {
     notify(api, sessionID, "Session done", session?.parentID ? "subagent_done" : "done")
   }
 
-  api.event.on("session.next.prompted", (event) => started(event.data.sessionID))
-  api.event.on("session.next.shell.started", (event) => started(event.data.sessionID))
-  api.event.on("session.next.step.started", (event) => started(event.data.sessionID))
-  api.event.on("session.next.retried", (event) => started(event.data.sessionID))
-  api.event.on("session.next.compaction.started", (event) => started(event.data.sessionID))
-  api.event.on("session.next.shell.ended", (event) => ended(event.data.sessionID))
-  api.event.on("session.next.step.ended", (event) => {
+  api.event.on("prompt.promoted", (event) => started(event.data.sessionID))
+  api.event.on("shell.started", (event) => started(event.data.sessionID))
+  api.event.on("step.started", (event) => started(event.data.sessionID))
+  api.event.on("retried", (event) => started(event.data.sessionID))
+  api.event.on("compaction.started", (event) => started(event.data.sessionID))
+  api.event.on("shell.ended", (event) => ended(event.data.sessionID))
+  api.event.on("step.ended", (event) => {
     if (event.data.finish === "tool-calls") return
     ended(event.data.sessionID)
   })
-  api.event.on("session.next.step.failed", (event) => {
+  api.event.on("step.failed", (event) => {
     const sessionID = event.data.sessionID
     if (!active.has(sessionID)) return
     errored.add(sessionID)
diff --git a/packages/tui/src/routes/session/rows.ts b/packages/tui/src/routes/session/rows.ts
index f1c4714276..23b43c3b17 100644
--- a/packages/tui/src/routes/session/rows.ts
+++ b/packages/tui/src/routes/session/rows.ts
@@ -126,45 +126,49 @@ export function createSessionRows(sessionID: Accessor<string>) {
     return index === -1 ? rows.length : index
   }
 
-  const message = (event: { data: { sessionID: string; messageID: string } }) => {
-    if (event.data.sessionID === sessionID()) appendMessage(event.data.messageID)
+  const message = (event: { id: string; data: { sessionID: string } }) => {
+    if (event.data.sessionID === sessionID()) appendMessage(event.id.replace(/^evt_/, "msg_"))
+  }
+  const input = (event: { data: { sessionID: string; inputID: string } }) => {
+    if (event.data.sessionID === sessionID()) appendMessage(event.data.inputID)
   }
   const subscriptions = [
-    data.on("session.next.prompt.admitted", message),
-    data.on("session.next.prompted", message),
-    data.on("session.next.context.updated", message),
-    data.on("session.next.synthetic", (event) => {
-      if (event.data.sessionID === sessionID() && event.data.description?.trim()) appendMessage(event.data.messageID)
+    data.on("prompt.admitted", input),
+    data.on("prompt.promoted", input),
+    data.on("session.context.updated", message),
+    data.on("synthetic", (event) => {
+      if (event.data.sessionID === sessionID() && event.data.description?.trim())
+        appendMessage(event.id.replace(/^evt_/, "msg_"))
     }),
-    data.on("session.next.shell.started", message),
-    data.on("session.next.agent.switched", message),
-    data.on("session.next.model.switched", message),
-    data.on("session.next.compaction.ended", message),
-    data.on("session.next.text.delta", (event) => {
+    data.on("shell.started", message),
+    data.on("agent.selected", message),
+    data.on("model.selected", message),
+    data.on("compaction.ended", message),
+    data.on("text.delta", (event) => {
       if (event.data.sessionID === sessionID())
         appendPart({ messageID: event.data.assistantMessageID, partID: event.data.textID })
     }),
-    data.on("session.next.text.ended", (event) => {
+    data.on("text.ended", (event) => {
       if (event.data.sessionID === sessionID() && event.data.text.trim())
         appendPart({ messageID: event.data.assistantMessageID, partID: event.data.textID })
     }),
-    data.on("session.next.reasoning.delta", (event) => {
+    data.on("reasoning.delta", (event) => {
       if (event.data.sessionID === sessionID())
         appendPart({ messageID: event.data.assistantMessageID, partID: event.data.reasoningID })
     }),
-    data.on("session.next.reasoning.ended", (event) => {
+    data.on("reasoning.ended", (event) => {
       if (event.data.sessionID === sessionID() && event.data.text.trim())
         appendPart({ messageID: event.data.assistantMessageID, partID: event.data.reasoningID })
     }),
-    data.on("session.next.tool.input.started", (event) => {
+    data.on("tool.input.started", (event) => {
       if (event.data.sessionID === sessionID())
         appendPart({ messageID: event.data.assistantMessageID, partID: event.data.callID }, event.data.name)
     }),
-    data.on("session.next.step.ended", (event) => {
+    data.on("step.ended", (event) => {
       if (event.data.sessionID !== sessionID() || ["tool-calls", "unknown"].includes(event.data.finish)) return
       appendFooter(event.data.assistantMessageID)
     }),
-    data.on("session.next.step.failed", (event) => {
+    data.on("step.failed", (event) => {
       if (event.data.sessionID === sessionID()) appendFooter(event.data.assistantMessageID)
     }),
   ]
@@ -229,8 +233,6 @@ function hasPart(rows: SessionRow[], ref: PartRef) {
   return rows.some((row) => {
     if (row.type === "part") return row.ref.messageID === ref.messageID && row.ref.partID === ref.partID
     if (row.type !== "group") return false
-    return [...row.refs, ...row.pending].some(
-      (item) => item.messageID === ref.messageID && item.partID === ref.partID,
-    )
+    return [...row.refs, ...row.pending].some((item) => item.messageID === ref.messageID && item.partID === ref.partID)
   })
 }
diff --git a/packages/tui/test/cli/cmd/tui/notifications.test.ts b/packages/tui/test/cli/cmd/tui/notifications.test.ts
index a914b34dbc..5f1c6355b3 100644
--- a/packages/tui/test/cli/cmd/tui/notifications.test.ts
+++ b/packages/tui/test/cli/cmd/tui/notifications.test.ts
@@ -90,12 +90,12 @@ function durable(sessionID: string) {
 function stepStarted(id: string, sessionID = "session"): V2Event {
   return {
     id,
-    type: "session.next.step.started",
+    created: 0,
+    type: "step.started",
     durable: durable(sessionID),
     data: {
       sessionID,
       assistantMessageID: `msg_${id}`,
-      timestamp: 0,
       agent: "build",
       model: { id: "model", providerID: "provider" },
     },
@@ -105,12 +105,12 @@ function stepStarted(id: string, sessionID = "session"): V2Event {
 function stepEnded(id: string, sessionID = "session", finish = "stop"): V2Event {
   return {
     id,
-    type: "session.next.step.ended",
+    created: 0,
+    type: "step.ended",
     durable: durable(sessionID),
     data: {
       sessionID,
       assistantMessageID: `msg_${id}`,
-      timestamp: 0,
       finish,
       cost: 0,
       tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
@@ -121,12 +121,12 @@ function stepEnded(id: string, sessionID = "session", finish = "stop"): V2Event
 function stepFailed(id: string, sessionID = "session"): V2Event {
   return {
     id,
-    type: "session.next.step.failed",
+    created: 0,
+    type: "step.failed",
     durable: durable(sessionID),
     data: {
       sessionID,
       assistantMessageID: `msg_${id}`,
-      timestamp: 0,
       error: { type: "unknown", message: "boom" },
     },
   }
@@ -150,8 +150,8 @@ describe("internal notifications TUI plugin", () => {
   test("notifies for question and permission requests with blurred notifications and always-on sounds", async () => {
     const harness = await setup()
 
-    harness.emit({ id: "event-1", type: "question.asked", data: question("question-1") })
-    harness.emit({ id: "event-2", type: "permission.asked", data: permission("permission-1") })
+    harness.emit({ id: "event-1", created: 0, type: "question.asked", data: question("question-1") })
+    harness.emit({ id: "event-2", created: 0, type: "permission.asked", data: permission("permission-1") })
 
     expect(harness.notifications).toEqual([questionNotification, permissionNotification])
   })
@@ -159,23 +159,25 @@ describe("internal notifications TUI plugin", () => {
   test("dedupes pending questions and permissions until they are resolved", async () => {
     const harness = await setup()
 
-    harness.emit({ id: "event-1", type: "question.asked", data: question("question-1") })
-    harness.emit({ id: "event-2", type: "question.asked", data: question("question-1") })
+    harness.emit({ id: "event-1", created: 0, type: "question.asked", data: question("question-1") })
+    harness.emit({ id: "event-2", created: 0, type: "question.asked", data: question("question-1") })
     harness.emit({
       id: "event-3",
+      created: 0,
       type: "question.replied",
       data: { sessionID: "session", requestID: "question-1", answers: [] },
     })
-    harness.emit({ id: "event-4", type: "question.asked", data: question("question-1") })
+    harness.emit({ id: "event-4", created: 0, type: "question.asked", data: question("question-1") })
 
-    harness.emit({ id: "event-5", type: "permission.asked", data: permission("permission-1") })
-    harness.emit({ id: "event-6", type: "permission.asked", data: permission("permission-1") })
+    harness.emit({ id: "event-5", created: 0, type: "permission.asked", data: permission("permission-1") })
+    harness.emit({ id: "event-6", created: 0, type: "permission.asked", data: permission("permission-1") })
     harness.emit({
       id: "event-7",
+      created: 0,
       type: "permission.replied",
       data: { sessionID: "session", requestID: "permission-1", reply: "once" },
     })
-    harness.emit({ id: "event-8", type: "permission.asked", data: permission("permission-1") })
+    harness.emit({ id: "event-8", created: 0, type: "permission.asked", data: permission("permission-1") })
 
     expect(harness.notifications).toEqual([
       questionNotification,
@@ -205,7 +207,7 @@ describe("internal notifications TUI plugin", () => {
   test("uses sound-only notifications and subagent_done sound for subagent sessions", async () => {
     const harness = await setup()
 
-    harness.emit({ id: "event-1", type: "question.asked", data: question("question-1", "subagent") })
+    harness.emit({ id: "event-1", created: 0, type: "question.asked", data: question("question-1", "subagent") })
     harness.emit(stepStarted("event-2", "subagent"))
     harness.emit(stepEnded("event-3", "subagent"))
 
@@ -248,12 +250,14 @@ describe("internal notifications TUI plugin", () => {
     harness.emit(stepStarted("event-1", "abort"))
     harness.emit({
       id: "event-2",
+      created: 0,
       type: "session.error",
       data: { sessionID: "abort", error: { name: "MessageAbortedError", data: { message: "Aborted" } } },
     })
     harness.emit(stepStarted("event-3", "timeout"))
     harness.emit({
       id: "event-4",
+      created: 0,
       type: "session.error",
       data: { sessionID: "timeout", error: { name: "UnknownError", data: { message: "SSE read timed out" } } },
     })
diff --git a/packages/tui/test/cli/tui/data.test.tsx b/packages/tui/test/cli/tui/data.test.tsx
index b2bacfc0dd..a71bdc47d8 100644
--- a/packages/tui/test/cli/tui/data.test.tsx
+++ b/packages/tui/test/cli/tui/data.test.tsx
@@ -2,6 +2,8 @@
 import { expect, test } from "bun:test"
 import { testRender } from "@opentui/solid"
 import type { V2Event } from "@opencode-ai/sdk/v2"
+import { SessionMessage } from "@opencode-ai/core/session/message"
+import { EventV2 } from "@opencode-ai/core/event"
 import { onMount } from "solid-js"
 import { ProjectProvider } from "../../../src/context/project"
 import { SDKProvider } from "../../../src/context/sdk"
@@ -47,8 +49,8 @@ test("refreshes resources into reactive getters", async () => {
     if (url.pathname === "/api/session/ses_test/message")
       return json({
         data: [
-          { id: "msg_second", type: "user", text: "Second", time: { created: 2 } },
-          { id: "msg_first", type: "user", text: "First", time: { created: 1 } },
+          { id: "msg_second", created: 0, type: "user", text: "Second", time: { created: 2 } },
+          { id: "msg_first", created: 0, type: "user", text: "First", time: { created: 1 } },
         ],
         cursor: {},
       })
@@ -187,7 +189,9 @@ test("connectedOnce is false until first connect and persists across disconnect"
     )
   const connect = () =>
     stream?.enqueue(
-      encoder.encode(`data: ${JSON.stringify({ id: "evt_connected", type: "server.connected", data: {} })}\n\n`),
+      encoder.encode(
+        `data: ${JSON.stringify({ id: "evt_connected", created: 0, type: "server.connected", data: {} })}\n\n`,
+      ),
     )
   const disconnect = () => {
     stream?.close()
@@ -264,12 +268,12 @@ test("tracks session status from active sessions and execution events", async ()
 
     emitEvent(events, {
       id: "evt_step_started",
-      type: "session.next.step.started",
+      created: 0,
+      type: "step.started",
       durable: durable("session-live"),
       data: {
         sessionID: "session-live",
         assistantMessageID: "message-live",
-        timestamp: 1,
         agent: "build",
         model: { id: "model", providerID: "provider" },
       },
@@ -278,12 +282,12 @@ test("tracks session status from active sessions and execution events", async ()
 
     emitEvent(events, {
       id: "evt_step_ended",
-      type: "session.next.step.ended",
+      created: 0,
+      type: "step.ended",
       durable: durable("session-live", 1, 2),
       data: {
         sessionID: "session-live",
         assistantMessageID: "message-live",
-        timestamp: 2,
         finish: "stop",
         cost: 0,
         tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
@@ -297,10 +301,10 @@ test("tracks session status from active sessions and execution events", async ()
 
     emitEvent(events, {
       id: "evt_execution_settled",
-      type: "session.next.execution.settled",
+      created: 0,
+      type: "execution.settled",
       data: {
         sessionID: "session-live",
-        timestamp: 3,
         outcome: "success",
       },
     })
@@ -308,12 +312,12 @@ test("tracks session status from active sessions and execution events", async ()
 
     emitEvent(events, {
       id: "evt_failed_step_started",
-      type: "session.next.step.started",
+      created: 0,
+      type: "step.started",
       durable: durable("session-failed"),
       data: {
         sessionID: "session-failed",
         assistantMessageID: "message-failed",
-        timestamp: 3,
         agent: "build",
         model: { id: "model", providerID: "provider" },
       },
@@ -322,12 +326,12 @@ test("tracks session status from active sessions and execution events", async ()
 
     emitEvent(events, {
       id: "evt_step_failed",
-      type: "session.next.step.failed",
+      created: 0,
+      type: "step.failed",
       durable: durable("session-failed", 1, 2),
       data: {
         sessionID: "session-failed",
         assistantMessageID: "message-failed",
-        timestamp: 4,
         error: { type: "unknown", message: "Provider unavailable" },
       },
     })
@@ -339,10 +343,10 @@ test("tracks session status from active sessions and execution events", async ()
 
     emitEvent(events, {
       id: "evt_failed_execution_settled",
-      type: "session.next.execution.settled",
+      created: 0,
+      type: "execution.settled",
       data: {
         sessionID: "session-failed",
-        timestamp: 5,
         outcome: "failure",
         error: { type: "unknown", message: "Provider unavailable" },
       },
@@ -411,7 +415,7 @@ test("refreshes integrations after integration updates", async () => {
     expect(data.location.integration.list()).toEqual([])
     const before = { ...requests }
 
-    emitEvent(events, { id: "evt_integration", type: "integration.updated", data: {} })
+    emitEvent(events, { id: "evt_integration", created: 0, type: "integration.updated", data: {} })
     await wait(() => data.location.integration.list()?.length === 1)
     await wait(() => requests.model > before.model && requests.provider > before.provider)
     expect(data.location.integration.list()?.[0]).toMatchObject({ id: "openai", name: "OpenAI" })
@@ -449,7 +453,7 @@ test("refreshes effective catalog data after catalog updates", async () => {
   try {
     await wait(() => requests.model > 0 && requests.provider > 0)
     const before = { ...requests }
-    emitEvent(events, { id: "evt_catalog", type: "catalog.updated", data: {} })
+    emitEvent(events, { id: "evt_catalog", created: 0, type: "catalog.updated", data: {} })
     await wait(() => requests.model > before.model && requests.provider > before.provider)
   } finally {
     app.renderer.destroy()
@@ -496,7 +500,7 @@ test("refreshes agents after agent updates", async () => {
 
   try {
     await wait(() => data.location.agent.list()?.[0]?.id === "build")
-    emitEvent(events, { id: "evt_agent", type: "agent.updated", data: {} })
+    emitEvent(events, { id: "evt_agent", created: 0, type: "agent.updated", data: {} })
     await wait(() => data.location.agent.list()?.[0]?.id === "reviewer")
   } finally {
     app.renderer.destroy()
@@ -541,7 +545,7 @@ test("refreshes references after updates", async () => {
   try {
     await mounted
     await wait(() => requests === 1)
-    emitEvent(events, { id: "evt_reference_1", type: "reference.updated", data: {} })
+    emitEvent(events, { id: "evt_reference_1", created: 0, type: "reference.updated", data: {} })
     await wait(() => data.location.reference.list()?.length === 1)
     expect(data.location.reference.list()?.[0]?.name).toBe("docs")
   } finally {
@@ -602,6 +606,7 @@ test("keeps shell state scoped to location", async () => {
 
     events.emit({
       id: "evt_shell_created",
+      created: 0,
       type: "shell.created",
       location: { directory: other },
       data: {
@@ -650,6 +655,7 @@ test("adds and dismisses permission requests from live events", async () => {
     await wait(() => data.connection.status() === "connected")
     emitEvent(events, {
       id: "evt_permission_asked_1",
+      created: 0,
       type: "permission.v2.asked",
       data: {
         id: "per_1",
@@ -660,6 +666,7 @@ test("adds and dismisses permission requests from live events", async () => {
     })
     emitEvent(events, {
       id: "evt_permission_asked_2",
+      created: 0,
       type: "permission.v2.asked",
       data: {
         id: "per_2",
@@ -672,6 +679,7 @@ test("adds and dismisses permission requests from live events", async () => {
 
     emitEvent(events, {
       id: "evt_permission_replied_1",
+      created: 0,
       type: "permission.v2.replied",
       data: { sessionID: "ses_1", requestID: "per_1", reply: "once" },
     })
@@ -680,6 +688,7 @@ test("adds and dismisses permission requests from live events", async () => {
 
     emitEvent(events, {
       id: "evt_permission_replied_2",
+      created: 0,
       type: "permission.v2.replied",
       data: { sessionID: "ses_1", requestID: "per_2", reply: "reject" },
     })
@@ -715,6 +724,7 @@ test("adds and dismisses question requests from live events", async () => {
     await wait(() => data.connection.status() === "connected")
     emitEvent(events, {
       id: "evt_question_asked_1",
+      created: 0,
       type: "question.v2.asked",
       data: {
         id: "que_1",
@@ -724,6 +734,7 @@ test("adds and dismisses question requests from live events", async () => {
     })
     emitEvent(events, {
       id: "evt_question_asked_2",
+      created: 0,
       type: "question.v2.asked",
       data: {
         id: "que_2",
@@ -735,6 +746,7 @@ test("adds and dismisses question requests from live events", async () => {
 
     emitEvent(events, {
       id: "evt_question_replied_1",
+      created: 0,
       type: "question.v2.replied",
       data: { sessionID: "ses_1", requestID: "que_1", answers: [["First"]] },
     })
@@ -743,6 +755,7 @@ test("adds and dismisses question requests from live events", async () => {
 
     emitEvent(events, {
       id: "evt_question_rejected_2",
+      created: 0,
       type: "question.v2.rejected",
       data: { sessionID: "ses_1", requestID: "que_2" },
     })
@@ -783,52 +796,52 @@ test("settles pending tools when a live failure arrives", async () => {
     await mounted
     emitEvent(events, {
       id: "evt_agent_1",
-      type: "session.next.agent.switched",
+      created: 0,
+      type: "agent.selected",
       durable: durable("session-1"),
-      data: { sessionID: "session-1", messageID: "msg_agent_1", timestamp: 0, agent: "build" },
+      data: { sessionID: "session-1", agent: "build" },
     })
     emitEvent(events, {
       id: "evt_model_1",
-      type: "session.next.model.switched",
+      created: 0,
+      type: "model.selected",
       durable: durable("session-1", 1),
       data: {
         sessionID: "session-1",
-        messageID: "msg_model_1",
-        timestamp: 0,
         model: { id: "model-1", providerID: "provider-1" },
       },
     })
     emitEvent(events, {
       id: "evt_step_started_1",
-      type: "session.next.step.started",
+      created: 0,
+      type: "step.started",
       durable: durable("session-1", 2),
       data: {
         sessionID: "session-1",
         assistantMessageID: "msg_explicit_assistant_9",
-        timestamp: 1,
         agent: "build",
         model: { id: "model-1", providerID: "provider-1" },
       },
     })
     emitEvent(events, {
       id: "evt_input_1",
-      type: "session.next.tool.input.started",
+      created: 0,
+      type: "tool.input.started",
       durable: durable("session-1", 3),
       data: {
         sessionID: "session-1",
         assistantMessageID: "msg_explicit_assistant_9",
-        timestamp: 2,
         callID: "call-1",
         name: "bash",
       },
     })
     emitEvent(events, {
       id: "evt_called_1",
-      type: "session.next.tool.called",
+      created: 0,
+      type: "tool.called",
       durable: durable("session-1", 4),
       data: {
         sessionID: "session-1",
-        timestamp: 2,
         assistantMessageID: "msg_explicit_assistant_9",
         callID: "call-1",
         tool: "bash",
@@ -838,11 +851,11 @@ test("settles pending tools when a live failure arrives", async () => {
     })
     emitEvent(events, {
       id: "evt_failed_1",
-      type: "session.next.tool.failed",
+      created: 0,
+      type: "tool.failed",
       durable: durable("session-1", 5),
       data: {
         sessionID: "session-1",
-        timestamp: 3,
         assistantMessageID: "msg_explicit_assistant_9",
         callID: "call-1",
         error: { type: "unknown", message: "aborted" },
@@ -928,12 +941,12 @@ test("renders admitted prompts immediately with queued marker and clears when pr
     const unsubscribe = sync.listen((event) => received.push(event.name))
     emitEvent(events, {
       id: "evt_admitted_1",
-      type: "session.next.prompt.admitted",
+      created: 0,
+      type: "prompt.admitted",
       durable: durable(sessionID),
       data: {
         sessionID,
-        messageID,
-        timestamp: 0,
+        inputID: messageID,
         prompt: { text: "hello" },
         delivery: "steer",
       },
@@ -947,19 +960,17 @@ test("renders admitted prompts immediately with queued marker and clears when pr
 
     emitEvent(events, {
       id: "evt_prompted_1",
-      type: "session.next.prompted",
+      created: 0,
+      type: "prompt.promoted",
       durable: durable(sessionID, 1),
       data: {
         sessionID,
-        messageID,
-        timestamp: 0,
-        prompt: { text: "hello" },
-        delivery: "steer",
+        inputID: messageID,
       },
     })
 
-    await wait(() => received.at(-1) === "session.next.prompted")
-    expect(received.slice(-2)).toEqual(["session.next.prompt.admitted", "session.next.prompted"])
+    await wait(() => received.at(-1) === "prompt.promoted")
+    expect(received.slice(-2)).toEqual(["prompt.admitted", "prompt.promoted"])
     unsubscribe()
     const message = sync.session.message.list(sessionID)?.[0]
     expect(message?.type).toBe("user")
@@ -1007,21 +1018,21 @@ test("projects live context updates with their message ID", async () => {
     await mounted
     emitEvent(events, {
       id: "evt_context_1",
-      type: "session.next.context.updated",
+      created: 0,
+      type: "session.context.updated",
       durable: durable("session-1"),
       data: {
         sessionID: "session-1",
-        messageID: "msg_context_1",
-        timestamp: 1,
         text: "Updated context",
       },
     })
 
     await wait(() => sync.session.message.list("session-1")?.length === 1)
     expect(sync.session.message.list("session-1")?.[0]).toMatchObject({
-      id: "msg_context_1",
+      id: SessionMessage.ID.fromEvent(EventV2.ID.make("evt_context_1")),
       type: "system",
       text: "Updated context",
+      time: { created: 0 },
     })
   } finally {
     app.renderer.destroy()
diff --git a/packages/tui/test/cli/tui/use-event.test.tsx b/packages/tui/test/cli/tui/use-event.test.tsx
index 6ba38a83b8..7a4465c927 100644
--- a/packages/tui/test/cli/tui/use-event.test.tsx
+++ b/packages/tui/test/cli/tui/use-event.test.tsx
@@ -30,6 +30,7 @@ function event(payload: V2Event, input: { directory: string; project?: string; w
 function vcs(branch: string): V2Event {
   return {
     id: `evt_vcs_${branch}`,
+    created: 0,
     type: "vcs.branch.updated",
     data: {
       branch,
@@ -40,6 +41,7 @@ function vcs(branch: string): V2Event {
 function update(version: string): V2Event {
   return {
     id: `evt_update_${version}`,
+    created: 0,
     type: "installation.update-available",
     data: {
       version,
diff --git a/specs/v2/schema-changelog.md b/specs/v2/schema-changelog.md
index d526b5d8e7..466cc73a8a 100644
--- a/specs/v2/schema-changelog.md
+++ b/specs/v2/schema-changelog.md
@@ -904,3 +904,17 @@ Compatibility:
 
 - Existing Context Epoch rows migrate in place by dropping the obsolete selection and pending-replacement columns.
 - Model and agent switches no longer discard earlier chronological System Context updates by forcing a new baseline.
+
+## 2026-07-03: Normalize Session Event Names And Envelope Time
+
+- Drop the experimental `session.next.` prefix from current Session event names.
+- Rename `agent.switched` to `agent.selected`, `model.switched` to `model.selected`, and `prompted` to `prompt.promoted`; add `prompt.admitted` as the durable prompt admission record.
+- Add an envelope-level `created` timestamp stored on each event row; payload-level `timestamp` fields are removed.
+- Remove projection-only `messageID` fields from selected/message-producing events; projected message IDs derive from the event ID. `revert.committed.messageID` remains, and `forked.messageID` is now `forked.from`.
+- Rename `session.moved.subdirectory` to `subpath` and normalize event-related schema identifiers.
+
+Compatibility:
+
+- V2 durable events and projections are experimental and are reset by `20260703090000_reset_v2_event_rename_sweep`; existing V2 event rows, event sequences, projected session messages, and admitted inputs are wiped.
+- All renamed durable event types restart at version 1 under their normalized names.
+- Generated Promise, Effect, and legacy JavaScript SDK surfaces were regenerated from the normalized schemas.
diff --git a/specs/v2/session.md b/specs/v2/session.md
index 15bc970b47..bb04c21356 100644
--- a/specs/v2/session.md
+++ b/specs/v2/session.md
@@ -114,7 +114,7 @@ Before each provider turn, the runner estimates the complete model-visible reque
 
 Compaction keeps the full transcript durable while replacing its active model representation with one hidden checkpoint containing a structured rolling summary and token-bounded serialized recent context. Provider-native assistant, reasoning, and tool messages never survive across the boundary, avoiding signature and encrypted-reasoning failures when the earlier prefix changes.
 
-`session.next.compaction.started.1` durably identifies the attempt. Compaction deltas are live-only progress. `session.next.compaction.ended.1` durably stores the final summary and serialized recent context; only this completed event projects a model-visible compaction message. On the next provider attempt, the runner observes that completed compaction and directly renders a fresh Context Epoch baseline. A failed or interrupted attempt therefore leaves the previous history boundary active.
+`compaction.started.1` durably identifies the attempt. Compaction deltas are live-only progress. `compaction.ended.1` durably stores the final summary and serialized recent context; only this completed event projects a model-visible compaction message. On the next provider attempt, the runner observes that completed compaction and directly renders a fresh Context Epoch baseline. A failed or interrupted attempt therefore leaves the previous history boundary active.
 
 Repeated compactions update the previous structured summary with newly compacted messages. The runner then reloads projected history and executes the original pending turn.
 
@@ -170,9 +170,9 @@ The coordinator's active registry is also the source for `sessions.active()`. It
 
 Inbox promotion coalesces pending steers in durable admission order. Once continuation would otherwise end, it promotes one queued input at a time in FIFO order. Add explicit inbox backlog and steering-batch limits before exposing broad multi-caller admission or untrusted queue growth.
 
-Eager local-tool execution is intentionally unbounded in the current local slice. This minimizes tool latency but does not increase SQLite settlement throughput: Session-event publication remains serialized per provider turn. Before broadening exposure, revisit per-turn call limits, output truncation, and operational backpressure using observed workloads. The `session.next.*` event schemas remain experimental and unshipped; databases created by earlier experimental builds are disposable rather than compatibility targets.
+Eager local-tool execution is intentionally unbounded in the current local slice. This minimizes tool latency but does not increase SQLite settlement throughput: Session-event publication remains serialized per provider turn. Before broadening exposure, revisit per-turn call limits, output truncation, and operational backpressure using observed workloads. The normalized Session event schemas remain experimental and unshipped; databases created by earlier experimental builds are disposable rather than compatibility targets.
 
-The synchronized `session.next.*` event family and projected Session-message model predate this branch. This slice refines their replay contract: projected Session messages retain their source aggregate sequence so canonical context ordering and `sessions.messages(...)` pagination follow durable event order even when caller-supplied IDs or timestamps do not. Consumers can use `sessions.log({ sessionID, after? })` to replay durable `session.next.*` events after an aggregate sequence cursor, then tail durable events without a race. Live-only text, reasoning, and tool-input fragments remain available through EventV2 subscriptions for connected renderers; they are intentionally absent from the replayable Session stream.
+The normalized Session event family and projected Session-message model predate this branch. This slice refines their replay contract: projected Session messages retain their source aggregate sequence so canonical context ordering and `sessions.messages(...)` pagination follow durable event order even when caller-supplied IDs differ; event time is carried by the envelope `created` field rather than duplicated in payloads. Consumers can use `sessions.log({ sessionID, after? })` to replay durable Session events after an aggregate sequence cursor, then tail durable events without a race. Live-only text, reasoning, and tool-input fragments remain available through EventV2 subscriptions for connected renderers; they are intentionally absent from the replayable Session stream.
 
 The first `sessions.log(...)` contract is durable-only during both replay and live tailing. This keeps one cursor equal to one persisted aggregate sequence and is sufficient for reconnect-safe consumers. A later UI-facing API may optionally interleave live-only deltas while connected, but those fragments must remain explicitly ephemeral: they cannot advance the durable cursor, replay after reconnect, or be mistaken for publication boundaries.
 

From bf3ae45439ccd97f2991c87457081648e75cff71 Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Fri, 3 Jul 2026 13:43:21 -0500
Subject: [PATCH 21/82] fix(core): clean up mcp event surface (#35221)

---
 packages/core/src/mcp/client.ts             |  6 +++-
 packages/core/src/mcp/index.ts              |  6 +++-
 packages/core/test/mcp.test.ts              | 14 +++++++++
 packages/schema/src/mcp-event.ts            |  2 +-
 packages/schema/test/event-manifest.test.ts |  3 ++
 packages/sdk/js/src/v2/gen/types.gen.ts     | 33 ---------------------
 6 files changed, 28 insertions(+), 36 deletions(-)
 create mode 100644 packages/core/test/mcp.test.ts

diff --git a/packages/core/src/mcp/client.ts b/packages/core/src/mcp/client.ts
index fcd0814fb8..84ccbd70bb 100644
--- a/packages/core/src/mcp/client.ts
+++ b/packages/core/src/mcp/client.ts
@@ -46,7 +46,11 @@ const TolerantListPromptsResult = ListPromptsResultSchema.extend({
 
 export class NeedsAuthError extends Schema.TaggedErrorClass<NeedsAuthError>()("MCP.NeedsAuthError", {
   server: Schema.String,
-}) {}
+}) {
+  override get message() {
+    return `MCP server requires authentication: ${this.server}`
+  }
+}
 
 export class ConnectError extends Schema.TaggedErrorClass<ConnectError>()("MCP.ConnectError", {
   server: Schema.String,
diff --git a/packages/core/src/mcp/index.ts b/packages/core/src/mcp/index.ts
index 2075c8dd19..d4935dc512 100644
--- a/packages/core/src/mcp/index.ts
+++ b/packages/core/src/mcp/index.ts
@@ -127,7 +127,11 @@ export class ResourceContent extends Schema.Class<ResourceContent>("MCP.Resource
 
 export class NotFoundError extends Schema.TaggedErrorClass<NotFoundError>()("MCP.NotFoundError", {
   server: ServerName,
-}) {}
+}) {
+  override get message() {
+    return `MCP server not found: ${this.server}`
+  }
+}
 
 export class ToolCallError extends Schema.TaggedErrorClass<ToolCallError>()("MCP.ToolCallError", {
   server: ServerName,
diff --git a/packages/core/test/mcp.test.ts b/packages/core/test/mcp.test.ts
new file mode 100644
index 0000000000..15ff95a28f
--- /dev/null
+++ b/packages/core/test/mcp.test.ts
@@ -0,0 +1,14 @@
+import { describe, expect, test } from "bun:test"
+import { MCP } from "@opencode-ai/core/mcp/index"
+import { MCPClient } from "@opencode-ai/core/mcp/client"
+
+describe("MCP errors", () => {
+  test("expose useful messages", () => {
+    expect(new MCP.NotFoundError({ server: MCP.ServerName.make("demo") }).message).toBe("MCP server not found: demo")
+    expect(new MCP.ToolCallError({ server: MCP.ServerName.make("demo"), tool: "search", message: "failed" }).message).toBe(
+      "failed",
+    )
+    expect(new MCPClient.NeedsAuthError({ server: "demo" }).message).toBe("MCP server requires authentication: demo")
+    expect(new MCPClient.ConnectError({ server: "demo", message: "offline" }).message).toBe("offline")
+  })
+})
diff --git a/packages/schema/src/mcp-event.ts b/packages/schema/src/mcp-event.ts
index f4221335e9..ae1e82656d 100644
--- a/packages/schema/src/mcp-event.ts
+++ b/packages/schema/src/mcp-event.ts
@@ -27,4 +27,4 @@ export const StatusChanged = Event.ephemeral({
   },
 })
 
-export const Definitions = Event.inventory(ToolsChanged, BrowserOpenFailed, StatusChanged)
+export const Definitions = Event.inventory(ToolsChanged, StatusChanged)
diff --git a/packages/schema/test/event-manifest.test.ts b/packages/schema/test/event-manifest.test.ts
index 9cdf3a787a..4fa23e75f7 100644
--- a/packages/schema/test/event-manifest.test.ts
+++ b/packages/schema/test/event-manifest.test.ts
@@ -12,6 +12,7 @@ import {
 } from "../src/index.js"
 import { EventManifest } from "../src/event-manifest.js"
 import { IdeEvent } from "../src/ide-event.js"
+import { McpEvent } from "../src/mcp-event.js"
 import { SessionEvent } from "../src/session-event.js"
 import { SessionTodo } from "../src/session-todo.js"
 import { SessionV1 } from "../src/session-v1.js"
@@ -63,6 +64,8 @@ describe("public event manifest", () => {
     expect(Permission.Event.Definitions).toEqual([Permission.Event.Asked, Permission.Event.Replied])
     expect(Form.Event.Definitions).toEqual([Form.Event.Created, Form.Event.Replied, Form.Event.Cancelled])
     expect(Reference.Event.Definitions).toEqual([Reference.Event.Updated])
+    expect(McpEvent.Definitions).toEqual([McpEvent.ToolsChanged, McpEvent.StatusChanged])
+    expect(EventManifest.Latest.has("mcp.browser.open.failed")).toBe(false)
     expect(EventManifest.Latest.has("ide.installed")).toBe(false)
     expect(IdeEvent.Definitions).toEqual([IdeEvent.Installed])
     const sessionV1TailStart = EventManifest.Definitions.indexOf(SessionV1.Event.PartDelta)
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index d97eb59298..56cdccf087 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -89,7 +89,6 @@ export type Event =
   | EventTuiToastShow2
   | EventTuiSessionSelect2
   | EventMcpToolsChanged
-  | EventMcpBrowserOpenFailed
   | EventMcpStatusChanged
   | EventCommandExecuted
   | EventProjectUpdated
@@ -1556,14 +1555,6 @@ export type GlobalEvent = {
           server: string
         }
       }
-    | {
-        id: string
-        type: "mcp.browser.open.failed"
-        properties: {
-          mcpName: string
-          url: string
-        }
-      }
     | {
         id: string
         type: "mcp.status.changed"
@@ -3177,7 +3168,6 @@ export type V2Event =
   | TuiToastShow
   | TuiSessionSelect
   | McpToolsChanged
-  | McpBrowserOpenFailed
   | McpStatusChanged
   | CommandExecuted
   | ProjectUpdated
@@ -6373,20 +6363,6 @@ export type McpToolsChanged = {
   }
 }
 
-export type McpBrowserOpenFailed = {
-  id: string
-  created: number
-  metadata?: {
-    [key: string]: unknown
-  }
-  type: "mcp.browser.open.failed"
-  location?: LocationRef
-  data: {
-    mcpName: string
-    url: string
-  }
-}
-
 export type McpStatusChanged = {
   id: string
   created: number
@@ -7493,15 +7469,6 @@ export type EventMcpToolsChanged = {
   }
 }
 
-export type EventMcpBrowserOpenFailed = {
-  id: string
-  type: "mcp.browser.open.failed"
-  properties: {
-    mcpName: string
-    url: string
-  }
-}
-
 export type EventMcpStatusChanged = {
   id: string
   type: "mcp.status.changed"

From 34a08cbdb807a3e3bcdd43ac7f570a75df0a899d Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Fri, 3 Jul 2026 14:45:56 -0400
Subject: [PATCH 22/82] fix(core): tolerate missing models.dev temperature

---
 packages/core/src/models-dev.ts   |  2 +-
 packages/core/test/models.test.ts | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/models-dev.ts b/packages/core/src/models-dev.ts
index 8a3fb965bf..a88aebfe07 100644
--- a/packages/core/src/models-dev.ts
+++ b/packages/core/src/models-dev.ts
@@ -67,7 +67,7 @@ export const Model = Schema.Struct({
   attachment: Schema.Boolean,
   reasoning: Schema.Boolean,
   reasoning_options: Schema.optional(Schema.Array(ReasoningOption)),
-  temperature: Schema.Boolean,
+  temperature: Schema.optional(Schema.Boolean),
   tool_call: Schema.Boolean,
   interleaved: Schema.optional(
     Schema.Union([
diff --git a/packages/core/test/models.test.ts b/packages/core/test/models.test.ts
index d9b7ed5582..9aa1cedc4d 100644
--- a/packages/core/test/models.test.ts
+++ b/packages/core/test/models.test.ts
@@ -149,6 +149,22 @@ describe("ModelsDev Service", () => {
     }),
   )
 
+  it.effect("allows models.dev entries without temperature metadata", () =>
+    Effect.sync(() => {
+      const result = Schema.decodeUnknownSync(ModelsDev.Model)({
+        id: "no-temperature-model",
+        name: "No Temperature Model",
+        release_date: "2026-01-01",
+        attachment: false,
+        reasoning: false,
+        tool_call: true,
+        limit: { context: 128000, output: 8192 },
+      })
+
+      expect(result.temperature).toBeUndefined()
+    }),
+  )
+
   it.live("get() returns providers from disk when cache file exists", () =>
     Effect.gen(function* () {
       yield* writeCache(fixture)

From ca861fdf43500ff7a59489b7aa01cb45b8780abb Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Fri, 3 Jul 2026 14:49:05 -0400
Subject: [PATCH 23/82] docs: consolidate session work-unit vocabulary (#35218)

---
 AGENTS.md                               |  5 +-
 CONTEXT.md                              | 61 +++++++++++++++----------
 packages/core/src/session/runner/llm.ts |  6 ++-
 specs/v2/session.md                     | 46 +++++++++----------
 specs/v2/todo.md                        | 16 +++----
 specs/v2/tools.md                       |  4 +-
 6 files changed, 79 insertions(+), 59 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index 703bae8912..8c72fe65a8 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -155,9 +155,10 @@ const table = sqliteTable("session", {
 - Reusing a Session ID adopts the existing Session. Reusing a prompt message ID reconciles an exact retry only when Session, prompt, and delivery mode match; conflicting reuse fails. Historical projected prompts lazily synthesize promoted inbox records during exact retry.
 - Keep `SessionExecution` process-global and Session-ID based. Its local implementation owns the process-local Session coordinator and discovers placement through `SessionStore` plus `LocationServiceMap.get(session.location)` only when a drain starts; no layer should take a Session ID. V2 interruption targets the active process-local ownership chain for that Session; idle or missing interruption is a no-op.
 - Keep `SessionRunner`, model resolution, tool registry, permissions, and filesystem Location-scoped. Omitted `Location.workspaceID` means implicit-local placement; explicit workspace identity remains reserved for future placement semantics.
-- Preserve one explicit `llm.stream(request)` call per provider turn and reload projected history before durable continuation. Do not bridge through legacy `SessionPrompt.loop(...)` or delegate orchestration to an in-memory tool loop.
+- Preserve one explicit `llm.stream(request)` call per step and reload projected history before durable continuation. Do not bridge through legacy `SessionPrompt.loop(...)` or delegate orchestration to an in-memory tool loop.
 - Keep local Session drains process-local until clustering is implemented. `SessionRunCoordinator` joins explicit same-Session resumes, coalesces prompt wakeups, and allows different Sessions to run concurrently. Advisory wakes drain eligible durable inbox rows only; post-crash continuation recovery requires a separate explicit design before it may retry provider work. A drain has no durable identity or transcript boundary.
-- Keep delivery vocabulary explicit. Prompts steer by default and promote at the next safe provider-turn boundary while the current drain requires continuation. An explicit `queue` input remains pending until the Session would otherwise become idle; promote one queued input at that boundary, then reevaluate continuation before promoting another. Promoting any new user input resets the selected agent's provider-turn allowance; a batch of steers resets it once.
+- Keep delivery vocabulary explicit. Prompts steer by default and promote at the next safe step boundary while the current drain requires continuation. An explicit `queue` input remains pending until the Session would otherwise become idle; promote one queued input at that boundary, then reevaluate continuation before promoting another. Promoting any new user input resets the selected agent's step allowance; a batch of steers resets it once.
+- One step is one logical LLM call; its durable record covers only the model-visible span. Do not write "provider turn", and do not use bare "turn" for a single call: "turn" is reserved for the future assistant-turn unit containing all steps from prompt promotion until the session would go idle.
 - Keep EventV2 replay owner claims separate from clustered Session execution ownership.
 - Keep the System Context algebra and built-ins in `src/system-context`; keep Context Source producers with their observed domains, and keep Session History selection plus Context Checkpoint persistence Session-owned. The runner composes all context producers explicitly in `loadSystemContext`; there is no context registry.
 - The durable Applied record is what the model was last told, per source. Reconcile narrates drift as chronological System updates and never rewrites the baseline; only completed compaction rebaselines, and move or committed revert resets the checkpoint. Unavailable sources keep the model's prior belief, blocking only a session's first baseline.
diff --git a/CONTEXT.md b/CONTEXT.md
index 5e5955d344..712e91bf10 100644
--- a/CONTEXT.md
+++ b/CONTEXT.md
@@ -9,7 +9,7 @@ The structured collection of contextual facts presented to the model as initial
 _Avoid_: System prompt
 
 **Session History**:
-The projected chronological conversation selected for a provider turn after applying the active compaction and **Context Epoch** cutoffs.
+The projected chronological conversation selected for a **Step** after applying the active compaction and **Context Epoch** cutoffs.
 _Avoid_: Session Context
 
 **Context Source**:
@@ -31,13 +31,13 @@ The full **System Context** rendered at the start of a **Context Epoch**.
 _Avoid_: Live system prompt
 
 **Context Snapshot**:
-The overwriteable model-hidden JSON state used to compare each **Context Source** with the value last admitted to a provider turn.
+The overwriteable model-hidden JSON state used to compare each **Context Source** with the value last admitted to a **Step**.
 
 **Unavailable Context**:
 An expected temporary inability to observe a **Context Source** value; the runtime retains its prior effective state and emits no update, or omits it until first successfully loaded.
 
-**Safe Provider-Turn Boundary**:
-The point immediately before a provider call, after durable input promotion and any required tool settlement, where context changes may be admitted chronologically.
+**Safe Step Boundary**:
+The point immediately before a provider request, after durable input promotion and any required tool settlement, where context changes may be admitted chronologically.
 
 **Admitted Prompt**:
 A durable user input accepted into the Session inbox but not yet included in **Session History**.
@@ -45,11 +45,24 @@ A durable user input accepted into the Session inbox but not yet included in **S
 **Prompt Promotion**:
 The durable transition that removes an **Admitted Prompt** from pending input and appends its user message to **Session History**.
 
-**Provider Turn**:
-One request to a model provider and the response projected from that request.
+**Step**:
+One logical LLM call spanning pre-flight context checkpoint preparation, input promotion, request build, and compaction check; the provider stream; and tool settlement.
+_Avoid_: provider turn, turn (unqualified)
+
+**Physical Attempt**:
+One actual provider request on the wire in service of a **Step**; most Steps have one Physical Attempt, while overflow-triggered compaction recovery may give one Step two.
+
+**Assistant Turn**:
+A reserved name for the not-yet-modeled unit containing all **Steps** from prompt promotion until the assistant yields the floor; do not reify it until something durable needs it.
+
+**Settlement**:
+The terminal transition for a unit of work: Step and tool settlement are durable, while drain and execution settlement are coordinator-observed.
+
+**Execution**:
+One session-scoped coordinator busy period from first wake until idle. An Execution is process-local coordination rather than a durable domain entity.
 
 **Session Drain**:
-One process-local execution span that promotes eligible input and runs required **Provider Turns** until no immediate continuation remains. A Session Drain has no durable identity or transcript boundary.
+One process-local execution span that promotes eligible input and runs required **Steps** until no immediate continuation remains. A Session Drain has no durable identity or transcript boundary.
 
 **Model Tool Output**:
 The bounded projection of a Core-executed tool result persisted in Session history and replayed to the model. A tool may shape this projection semantically, but the Tool Registry enforces the final size limit.
@@ -89,23 +102,25 @@ _Avoid_: Response envelope
 
 - A **System Context** is an opaque carrier composed from zero or more **Context Sources**.
 - **Session History** contains projected conversational messages and admitted **Mid-Conversation System Messages**; the active **Baseline System Context** remains separate provider-request state.
-- The **System Context Registry** uses stable-keyed scoped contributions to assemble the current **System Context**; contributor removal naturally removes its sources at the next **Safe Provider-Turn Boundary**.
+- The **System Context Registry** uses stable-keyed scoped contributions to assemble the current **System Context**; contributor removal naturally removes its sources at the next **Safe Step Boundary**.
 - A changed **Context Source** may produce one **Mid-Conversation System Message** containing its newly effective state.
 - A **Mid-Conversation System Message** persists the exact combined rendered text sent to the model.
 - The current **Context Snapshot** advances atomically with the corresponding durable **Mid-Conversation System Message**.
 - A **Context Snapshot** stores one codec-encoded JSON value and, for removable dynamic sources, a pre-rendered removal message per stable **Context Source** key.
 - Changes from multiple **Context Sources** admitted at one safe boundary combine into one **Mid-Conversation System Message**.
-- Context changes are sampled and admitted lazily at a **Safe Provider-Turn Boundary**, never pushed asynchronously when their source changes.
-- At a **Safe Provider-Turn Boundary**, newly promoted user input or settled tool results precede any combined **Mid-Conversation System Message**.
+- Context changes are sampled and admitted lazily at a **Safe Step Boundary**, never pushed asynchronously when their source changes.
+- At a **Safe Step Boundary**, newly promoted user input or settled tool results precede any combined **Mid-Conversation System Message**.
 - An **Admitted Prompt** is replayable pending input, not yet model-visible **Session History**.
 - **Prompt Promotion** atomically consumes the pending inbox entry and appends its model-visible user message.
-- Steering prompts promote at the next **Safe Provider-Turn Boundary** while the current **Session Drain** still requires continuation. Promoting any newly admitted user input resets the selected agent's provider-turn allowance; multiple prompts promoted at one boundary reset it once.
+- Steering prompts promote at the next **Safe Step Boundary** while the current **Session Drain** still requires continuation. Promoting any newly admitted user input resets the selected agent's step allowance; multiple prompts promoted at one boundary reset it once.
 - A queued prompt does not promote while the current **Session Drain** requires continuation. The runner promotes one queued prompt when the Session would otherwise become idle, then reevaluates continuation before promoting another.
-- A **Session Drain** is process-local coordination rather than a durable domain entity. Durable recovery must reason from prompts, projected history, provider attempts, and tool state rather than inventing an enclosing execution identity.
-- The first provider turn renders the latest complete **Baseline System Context** and initializes its **Context Snapshot** without emitting a redundant **Mid-Conversation System Message**; unavailable initial context blocks the turn instead of persisting an incomplete baseline.
+- A **Session Drain** is process-local coordination rather than a durable domain entity. Durable recovery must reason from prompts, projected history, physical attempts, and tool state rather than inventing an enclosing execution identity.
+- An **Execution** contains one or more **Session Drains**; a **Session Drain** contains one reserved assistant-turn span at a time; that span contains **Steps**; and each **Step** contains one or more **Physical Attempts** plus any tool calls it requires.
+- A **Step** record covers only the model-visible span from first assistant output through tool settlement; pre-flight leaves no record, and one Step settles at most one record.
+- The first **Step** renders the latest complete **Baseline System Context** and initializes its **Context Snapshot** without emitting a redundant **Mid-Conversation System Message**; unavailable initial context blocks the Step instead of persisting an incomplete baseline.
 - Initial **System Context** preparation precedes the first durable input promotion so an unavailable baseline leaves that input pending and retryable; ordinary reconciliation remains after promotion.
 - Compaction starts a new **Context Epoch** with a freshly rendered **Baseline System Context** and **Context Snapshot**; prior **Mid-Conversation System Messages** remain durable audit history but leave projected model history.
-- A newly registered core or plugin-defined **Context Source** absent from the current snapshot emits its baseline rendering once at the next **Safe Provider-Turn Boundary**.
+- A newly registered core or plugin-defined **Context Source** absent from the current snapshot emits its baseline rendering once at the next **Safe Step Boundary**.
 - **Context Source** keys are stable and namespaced; duplicate keys fail composition. `SystemContext.combine(...)` preserves caller order; the **System Context Registry** evaluates producers concurrently and combines them in stable contribution-key order so rendered context remains deterministic.
 - Each **Context Source** loader returns one coherent typed value. `SystemContext.make(...)` hides that value type so differently typed sources compose uniformly. Its codec compares and stores that value; its pure renderers produce model-visible baseline, update, and removal text only when needed.
 - `SystemContext.initialize(...)` observes a composed **System Context** once and produces a fresh **Baseline System Context** with its **Context Snapshot**.
@@ -113,26 +128,26 @@ _Avoid_: Response envelope
 - `SystemContext.replace(...)` renders a fresh generation after completed compaction or another baseline-replacing transition; it reports replacement blocked while previously admitted context is unavailable.
 - **Unavailable Context** uses stale-while-revalidate semantics and is distinct from a successfully loaded absence, which may emit removal text.
 - Ordinary **Context Source** loaders return values directly; loaders that intentionally use stale-while-revalidate may explicitly return **Unavailable Context**.
-- Nested project instruction discovery after successful reads remains a follow-up; when implemented, discovered instructions must be admitted durably at the next **Safe Provider-Turn Boundary**.
+- Nested project instruction discovery after successful reads remains a follow-up; when implemented, discovered instructions must be admitted durably at the next **Safe Step Boundary**.
 - Location-scoped services naturally re-resolve effective context when a moved session next runs in its destination location.
 - Moving a Session clears its active **Context Epoch**, so the destination must initialize a complete baseline before another prompt can promote.
 - Instruction discovery, source identity, persistence, and file loading belong to the instruction service; the **System Context** abstraction only composes effectful producers and renders loaded values.
-- The first instruction-service slice observes global and upward project `AGENTS.md` files as one ordered aggregate **Context Source** at each **Safe Provider-Turn Boundary**.
+- The first instruction-service slice observes global and upward project `AGENTS.md` files as one ordered aggregate **Context Source** at each **Safe Step Boundary**.
 - Built-in and instruction context producers register through the **System Context Registry** with stable contribution keys. Plugin-defined context registration and hot-reload lifecycle remain a follow-up built on the same scoped registry seam.
 - Selected-agent available-skill guidance is a **Context Source** composed with Location-wide registry sources immediately before Context Epoch admission. It lists only names and descriptions permitted for that agent; skill bodies and locations are exposed only through the permission-checked `skill` tool.
-- The selected agent and model are sampled when a provider turn starts. Changes admitted after that boundary apply to the next provider turn and do not restart the current turn.
+- The selected agent and model are sampled when a **Step** starts. Changes admitted after that boundary apply to the next Step and do not restart the current Step.
 - Selected-agent available-skill guidance remains a **Context Source**. An agent switch that changes that guidance produces a **Mid-Conversation System Message** while preserving the current baseline.
-- Local tool authorization and pending permission requests retain the effective agent of the provider turn that issued the call; a later agent switch cannot change that call's policy.
-- Context source changes never wake idle sessions; the next naturally scheduled **Safe Provider-Turn Boundary** loads and compares current values lazily.
-- Once admitted, a **Mid-Conversation System Message** remains durable even if the following provider attempt fails and is replayed unchanged on retry.
+- Local tool authorization and pending permission requests retain the effective agent of the **Step** that issued the call; a later agent switch cannot change that call's policy.
+- Context source changes never wake idle sessions; the next naturally scheduled **Safe Step Boundary** loads and compares current values lazily.
+- Once admitted, a **Mid-Conversation System Message** remains durable even if the following **Physical Attempt** fails and is replayed unchanged on retry.
 - **Mid-Conversation System Messages** remain durable Session-message history; normal user-facing transcript surfaces may hide them.
 - The date **Context Source** initially preserves host-local calendar-date behavior; a configured user timezone may replace that default later.
 - A **Context Epoch** begins with one immutable **Baseline System Context**.
 - A **Baseline System Context** is stored durably and reused verbatim across process restarts within its **Context Epoch**.
 - A **Baseline System Context** durably preserves the exact joined text used for the active provider-cache prefix.
-- Completed compaction starts a new **Context Epoch** on the next provider attempt, folding the current complete **System Context** into a fresh baseline and removing earlier **Mid-Conversation System Messages** from active model history.
-- A model/provider switch preserves the current **Context Epoch** and chronological conversation history; the new selection applies to the next provider turn.
-- **Native Continuation Metadata** remains in durable history. Provider-turn projection includes it only for a successful exact originating provider/model match; failed turns and incompatible models omit opaque metadata, while non-empty visible reasoning lowers to ordinary assistant text after a model switch. This conservative relation may widen only when recorded provider tests establish compatibility.
+- Completed compaction starts a new **Context Epoch** on the next **Physical Attempt**, folding the current complete **System Context** into a fresh baseline and removing earlier **Mid-Conversation System Messages** from active model history.
+- A model/provider switch preserves the current **Context Epoch** and chronological conversation history; the new selection applies to the next **Step**.
+- **Native Continuation Metadata** remains in durable history. Step projection includes it only for a successful exact originating provider/model match; failed Steps and incompatible models omit opaque metadata, while non-empty visible reasoning lowers to ordinary assistant text after a model switch. This conservative relation may widen only when recorded provider tests establish compatibility.
 - **Model Request Options** remain provider-semantic through Catalog resolution. The Session runner maps them into the LLM package's provider-option namespace; the selected protocol adapter alone owns provider wire encoding.
 - **Generation Controls**, protocol-semantic **Model Request Options**, and compatibility request body fields are separate Catalog domains. A shared ingestion adapter partitions legacy and models.dev AI-SDK-shaped options before routing.
 - The **PTY Environment** is a server concern rather than a Core PTY concern. PTY creation merges caller values, then the host overlay, then Core-forced terminal invariants such as `TERM` and `OPENCODE_TERMINAL`.
diff --git a/packages/core/src/session/runner/llm.ts b/packages/core/src/session/runner/llm.ts
index ba575b8146..12c73832c8 100644
--- a/packages/core/src/session/runner/llm.ts
+++ b/packages/core/src/session/runner/llm.ts
@@ -166,7 +166,7 @@ const layer = Layer.effect(
         { concurrency: "unbounded" },
       ).pipe(Effect.map(SystemContext.combine))
 
-    const runTurnAttempt = Effect.fn("SessionRunner.runTurn")(function* (
+    const runTurnAttempt = Effect.fn("SessionRunner.runTurnAttempt")(function* (
       sessionID: SessionSchema.ID,
       promotion: SessionInput.Delivery | undefined,
       step: number,
@@ -423,6 +423,10 @@ const layer = Layer.effect(
       while (shouldRun) {
         let needsContinuation = true
         let step = 1
+        // Repeat steps while continuation is needed. A step needs continuation only
+        // when it recorded local tool calls whose results the model has not yet seen;
+        // a provider error suppresses it. Pending steers also continue the loop so
+        // interjections are answered before the session goes idle.
         while (needsContinuation) {
           const result = yield* runTurn(input.sessionID, promotion, step)
           // Steer/queue promotion inside runTurn has already made the pending input a visible
diff --git a/specs/v2/session.md b/specs/v2/session.md
index bb04c21356..4abc7104fe 100644
--- a/specs/v2/session.md
+++ b/specs/v2/session.md
@@ -47,7 +47,7 @@ SessionExecution.resume(sessionID)
 
 `SessionExecution` and the read-side `SessionStore` are process-global. `SessionRunner`, catalog, model resolver, tool registry, permission state, and filesystem are cached per Location. No layer takes a Session ID. An omitted `Location.workspaceID` means implicit-local placement; explicit workspace identity remains reserved for future placement semantics.
 
-The local runner issues one explicit `llm.stream(request)` per provider turn, projects each complete local tool call durably before eagerly starting its structured child execution, awaits every started tool fiber after provider-stream closure, and reloads projected history once before continuation. Promoting any new user input resets the selected agent's configured provider-turn allowance; multiple steers promoted at one boundary reset it once. Tool settlement events carry the owning assistant message ID because provider-local call IDs may repeat across turns. Before assembling a provider request, the runner durably fails any local tool still projected as `running` from a previous process with `Tool execution interrupted`; abandoned side effects are never silently replayed.
+The local runner issues one explicit `llm.stream(request)` per step, projects each complete local tool call durably before eagerly starting its structured child execution, awaits every started tool fiber after provider-stream closure, and reloads projected history once before continuation. Promoting any new user input resets the selected agent's configured step allowance; multiple steers promoted at one boundary reset it once. Tool settlement events carry the owning assistant message ID because provider-local call IDs may repeat across steps. Before assembling a provider request, the runner durably fails any local tool still projected as `running` from a previous process with `Tool execution interrupted`; abandoned side effects are never silently replayed.
 
 Projected hosted tools preserve call-side and settlement-side provider metadata separately so settlement and interruption recovery cannot erase continuation identifiers. Provider-native reasoning and provider metadata replay only while the historical assistant model matches the selected continuation model; after a model switch, visible reasoning text remains ordinary assistant text and provider-native metadata is omitted.
 
@@ -55,7 +55,7 @@ Projected hosted tools preserve call-side and settlement-side provider metadata
 
 V2 Sessions persist the exact privileged System Context shown to the model. A Context Epoch stores one immutable provider-cache baseline and a model-hidden structured snapshot used to compare independently observed Context Sources. Environment facts, the host-local date, ambient global/upward-project `AGENTS.md` files, and selected-agent available-skill guidance are the initial sources. Location-wide sources come from the System Context Registry; selected-agent guidance composes with them immediately before Context Epoch admission.
 
-The first complete observation initializes the epoch before any pending prompt becomes model-visible. If initial context is temporarily unavailable, execution stops while the prompt remains pending and retryable. On later provider turns, the runner promotes eligible input first, then reconciles current sources at the safe boundary. Changed context becomes one durable chronological System message, and its event commit advances the epoch snapshot atomically.
+The first complete observation initializes the epoch before any pending prompt becomes model-visible. If initial context is temporarily unavailable, execution stops while the prompt remains pending and retryable. On later steps, the runner promotes eligible input first, then reconciles current sources at the safe boundary. Changed context becomes one durable chronological System message, and its event commit advances the epoch snapshot atomically.
 
 ```text
 Client            Runner                         System Context Registry       Context Epoch Store       Session History         LLM
@@ -79,7 +79,7 @@ Client            Runner                         System Context Registry       C
    │                 ├─ Baseline + chronological history ─────────────────────────────────────────────────────────────────────────▶
 ```
 
-Agent and model selection are provider-turn scoped. A switch admitted after the current safe provider-turn boundary applies to the next provider turn without restarting the current turn or replacing the baseline. Agent-specific skill guidance remains a Context Source, so changed guidance is admitted as a chronological System message. A completed compaction causes the next provider attempt to render a fresh baseline directly from current complete context. A Session move clears the epoch so the destination Location initializes a complete baseline on its next run.
+Agent and model selection are step-scoped. A switch admitted after the current safe step boundary applies to the next step without restarting the current step or replacing the baseline. Agent-specific skill guidance remains a Context Source, so changed guidance is admitted as a chronological System message. A completed compaction causes the next physical attempt to render a fresh baseline directly from current complete context. A Session move clears the epoch so the destination Location initializes a complete baseline on its next run.
 
 ```text
 Session                            Epoch
@@ -110,15 +110,15 @@ Current Context Epoch follow-ups:
 
 ## Automatic Compaction
 
-Before each provider turn, the runner estimates the complete model-visible request and compares it with the selected model's context window minus absolute reserved headroom. The reserve is the greater of the requested/model output allowance and configured `compaction.buffer`. When the request exceeds that budget and older complete turns are available, the runner compacts before executing the pending turn.
+Before each step, the runner estimates the complete model-visible request and compares it with the selected model's context window minus absolute reserved headroom. The reserve is the greater of the requested/model output allowance and configured `compaction.buffer`. When the request exceeds that budget and older complete steps are available, the runner compacts before executing the pending step.
 
 Compaction keeps the full transcript durable while replacing its active model representation with one hidden checkpoint containing a structured rolling summary and token-bounded serialized recent context. Provider-native assistant, reasoning, and tool messages never survive across the boundary, avoiding signature and encrypted-reasoning failures when the earlier prefix changes.
 
-`compaction.started.1` durably identifies the attempt. Compaction deltas are live-only progress. `compaction.ended.1` durably stores the final summary and serialized recent context; only this completed event projects a model-visible compaction message. On the next provider attempt, the runner observes that completed compaction and directly renders a fresh Context Epoch baseline. A failed or interrupted attempt therefore leaves the previous history boundary active.
+`compaction.started.1` durably identifies the attempt. Compaction deltas are live-only progress. `compaction.ended.1` durably stores the final summary and serialized recent context; only this completed event projects a model-visible compaction message. On the next physical attempt, the runner observes that completed compaction and directly renders a fresh Context Epoch baseline. A failed or interrupted attempt therefore leaves the previous history boundary active.
 
-Repeated compactions update the previous structured summary with newly compacted messages. The runner then reloads projected history and executes the original pending turn.
+Repeated compactions update the previous structured summary with newly compacted messages. The runner then reloads projected history and executes the original pending step.
 
-When a provider rejects a request as context overflow before durable assistant output or tool execution, the runner attempts one overflow-triggered compaction even when the local estimate did not predict pressure. A completed checkpoint rebuilds the same logical provider turn with one remaining physical attempt. A second overflow, unavailable compaction, or overflow after durable output becomes the ordinary terminal failure; recovery never loops or replays partial side effects. Deterministic old tool-result pruning remains a separate follow-up.
+When a provider rejects a request as context overflow before durable assistant output or tool execution, the runner attempts one overflow-triggered compaction even when the local estimate did not predict pressure. A completed checkpoint rebuilds the same logical step with one remaining physical attempt. A second overflow, unavailable compaction, or overflow after durable output becomes the ordinary terminal failure; recovery never loops or replays partial side effects. Deterministic old tool-result pruning remains a separate follow-up.
 
 ## V1 Runtime Context Parity
 
@@ -131,18 +131,18 @@ Status: `complete` is usable in the native V2 path, `partial` covers only part o
 | Durable Context Source     | Environment facts and host-local date                                    | partial  | Add selected provider/model identity without making model selection a stale Location-wide value.                                       |
 | Durable Context Source     | Global and upward project instructions                                   | partial  | Decide whether V2 also discovers legacy `CLAUDE.md` and deprecated `CONTEXT.md`.                                                       |
 | Durable Context Source     | Configured local/glob and remote URL instructions                        | missing  | Add independent sources with explicit precedence, unavailable, and removal semantics.                                                  |
-| Durable Context Source     | Nearby nested instructions discovered after successful reads             | missing  | Persist discoveries and admit them at the next safe provider-turn boundary.                                                            |
+| Durable Context Source     | Nearby nested instructions discovered after successful reads             | missing  | Persist discoveries and admit them at the next safe step boundary.                                                                     |
 | Durable Context Source     | Selected-agent available skill guidance and skill-body loading           | partial  | Guidance and body exposure are permission-filtered; remove globally denied skill definitions during request-time tool materialization. |
-| Per-turn request assembly  | Placement, selected model, chronological history, and canonical lowering | complete | None.                                                                                                                                  |
-| Per-turn request assembly  | Selected agent, agent prompt, and effective permissions                  | partial  | V2 uses selected-agent permissions for skill guidance and tool authorization; still apply the agent system prompt and request policy.  |
-| Per-turn request assembly  | Provider/model-specific base instructions                                | complete | Native V2 selects the provider-family baseline unless the effective agent overrides it.                                                |
-| Per-turn request assembly  | Policy-filtered built-in, MCP, plugin, and structured-output tools       | partial  | Materialize definitions for the effective agent and request.                                                                           |
-| Per-turn request assembly  | Per-prompt system text and tool overrides                                | missing  | Design admission and durable replay semantics before exposing them.                                                                    |
-| Per-turn request assembly  | Steering, plan/build-switch, and final-step reminders                    | missing  | Add only reminders whose behavior remains part of V2.                                                                                  |
-| Per-turn request assembly  | Plugin message, system, parameter, and header transforms                 | missing  | Design V2 plugin hooks and lifecycle semantics.                                                                                        |
-| Per-turn request assembly  | Model variants and request settings                                      | partial  | Apply effective agent options and future plugin-mutated request settings.                                                              |
-| Per-turn request assembly  | Structured-output policy                                                 | missing  | Add prompt format, generated tool, tool choice, and model-visible policy together.                                                     |
-| Per-turn request assembly  | Automatic/context-pressure compaction                                    | complete | V2 initiates automatic and overflow-triggered compaction, then rebuilds the baseline from the completed checkpoint.                    |
+| Step request assembly      | Placement, selected model, chronological history, and canonical lowering | complete | None.                                                                                                                                  |
+| Step request assembly      | Selected agent, agent prompt, and effective permissions                  | partial  | V2 uses selected-agent permissions for skill guidance and tool authorization; still apply the agent system prompt and request policy.  |
+| Step request assembly      | Provider/model-specific base instructions                                | complete | Native V2 selects the provider-family baseline unless the effective agent overrides it.                                                |
+| Step request assembly      | Policy-filtered built-in, MCP, plugin, and structured-output tools       | partial  | Materialize definitions for the effective agent and request.                                                                           |
+| Step request assembly      | Per-prompt system text and tool overrides                                | missing  | Design admission and durable replay semantics before exposing them.                                                                    |
+| Step request assembly      | Steering, plan/build-switch, and final-step reminders                    | missing  | Add only reminders whose behavior remains part of V2.                                                                                  |
+| Step request assembly      | Plugin message, system, parameter, and header transforms                 | missing  | Design V2 plugin hooks and lifecycle semantics.                                                                                        |
+| Step request assembly      | Model variants and request settings                                      | partial  | Apply effective agent options and future plugin-mutated request settings.                                                              |
+| Step request assembly      | Structured-output policy                                                 | missing  | Add prompt format, generated tool, tool choice, and model-visible policy together.                                                     |
+| Step request assembly      | Automatic/context-pressure compaction                                    | complete | V2 initiates automatic and overflow-triggered compaction, then rebuilds the baseline from the completed checkpoint.                    |
 | Prompt/reference expansion | Durable typed prompt attachments                                         | complete | None.                                                                                                                                  |
 | Prompt/reference expansion | Native template and `@` mention expansion                                | missing  | Parse and resolve native V2 prompt input before durable admission.                                                                     |
 | Prompt/reference expansion | File, directory, media, and MCP-resource materialization                 | partial  | Materialize and normalize sources instead of lowering unresolved attachment metadata.                                                  |
@@ -154,23 +154,23 @@ Provider timeout, retry, and watchdog policy is intentionally deferred. The runn
 
 Inbox delivery is explicit:
 
-- `steer` inputs promote at the next safe provider-turn boundary, including continuation inside the current drain.
+- `steer` inputs promote at the next safe step boundary, including continuation inside the current drain.
 - `queue` inputs remain in a FIFO while the current drain requires continuation. When the Session would otherwise become idle, the runner promotes exactly one queued input, then reevaluates continuation before promoting another.
 
 Execution has two entry points:
 
-- `run` is an explicit resume. It joins any active execution or starts a forced drain while idle. A forced drain bypasses the no-eligible-input guard, but preparation may still fail before a provider attempt.
+- `run` is an explicit resume. It joins any active execution or starts a forced drain while idle. A forced drain bypasses the no-eligible-input guard, but preparation may still fail before a physical attempt.
 - `wake` reports newly recorded durable inbox work. Repeated wakes coalesce. A wake calls the provider only when it can promote eligible input.
 
 Post-crash continuation recovery is intentionally deferred. A wake does not infer that ambiguous provider work is safe to retry after an input has already been promoted. Explicit `run` may deliberately continue from durable projected history. A future recovery slice should model provider-dispatch ambiguity, required continuation, queued-input promotion, retry policy, and visible recovery status together. It must not assume an enclosing durable execution identity that the Session model does not otherwise need.
 
-A process-global `SessionRunCoordinator` serializes execution for each local Session while allowing different Sessions to run concurrently. Resumes join active execution, overlapping wakes coalesce into one follow-up, and interruption stops current process-local execution without deleting durable inbox work. The runner enters the Session's current Location when execution starts and fences each new provider turn against that Location.
+A process-global `SessionRunCoordinator` serializes execution for each local Session while allowing different Sessions to run concurrently. Resumes join active execution, overlapping wakes coalesce into one follow-up, and interruption stops current process-local execution without deleting durable inbox work. The runner enters the Session's current Location when execution starts and fences each new step against that Location.
 
 The coordinator's active registry is also the source for `sessions.active()`. It represents only foreground Session drains owned by the current process; background subagents and tasks do not add parent Sessions to this registry. The snapshot is runtime state and is empty after a process restart.
 
 Inbox promotion coalesces pending steers in durable admission order. Once continuation would otherwise end, it promotes one queued input at a time in FIFO order. Add explicit inbox backlog and steering-batch limits before exposing broad multi-caller admission or untrusted queue growth.
 
-Eager local-tool execution is intentionally unbounded in the current local slice. This minimizes tool latency but does not increase SQLite settlement throughput: Session-event publication remains serialized per provider turn. Before broadening exposure, revisit per-turn call limits, output truncation, and operational backpressure using observed workloads. The normalized Session event schemas remain experimental and unshipped; databases created by earlier experimental builds are disposable rather than compatibility targets.
+Eager local-tool execution is intentionally unbounded in the current local slice. This minimizes tool latency but does not increase SQLite settlement throughput: Session-event publication remains serialized per step. Before broadening exposure, revisit per-step call limits, output truncation, and operational backpressure using observed workloads. The normalized Session event schemas remain experimental and unshipped; databases created by earlier experimental builds are disposable rather than compatibility targets.
 
 The normalized Session event family and projected Session-message model predate this branch. This slice refines their replay contract: projected Session messages retain their source aggregate sequence so canonical context ordering and `sessions.messages(...)` pagination follow durable event order even when caller-supplied IDs differ; event time is carried by the envelope `created` field rather than duplicated in payloads. Consumers can use `sessions.log({ sessionID, after? })` to replay durable Session events after an aggregate sequence cursor, then tail durable events without a race. Live-only text, reasoning, and tool-input fragments remain available through EventV2 subscriptions for connected renderers; they are intentionally absent from the replayable Session stream.
 
@@ -209,7 +209,7 @@ The first V2 `apply_patch` leaf supports add, update, and delete hunks. It parse
 
 ### Current Runner Follow-Ups
 
-- Keep eager structured local-tool settlement: durably record each complete call, start its child execution immediately, await all started settlements after provider-turn consumption, persist every result, and reload history once before continuation.
+- Keep eager structured local-tool settlement: durably record each complete call, start its child execution immediately, await all started settlements after step consumption, persist every result, and reload history once before continuation.
 - Buffer or coalesce streamed deltas before rewriting growing assistant projections.
 - Revisit additional covering indexes as larger-history query shapes become concrete.
 - Design any global multi-Session event stream separately; the finite history API deliberately reads one authorized Session aggregate and does not change global Event publication.
diff --git a/specs/v2/todo.md b/specs/v2/todo.md
index ee7f9dff2a..6f09684a1b 100644
--- a/specs/v2/todo.md
+++ b/specs/v2/todo.md
@@ -21,17 +21,17 @@ through legacy `SessionPrompt.loop(...)`:
 - process-global `SessionExecution.resume(sessionID)` discovers Location from
   the Session read model
 - cached Location-scoped `SessionRunner` resolves one supported catalog model
-  and issues one explicit `llm.stream(request)` provider turn at a time
+  and issues one explicit `llm.stream(request)` step at a time
 - durable V2 projections record text, reasoning, provider failures, tool calls,
   tool results, and assistant output
 - a scoped `ToolRegistry` advertises definitions and the first permission-checked
   `read` built-in
-- local continuation reloads projected history, and promoting new user input resets the selected agent's configured provider-turn allowance
+- local continuation reloads projected history, and promoting new user input resets the selected agent's configured step allowance
 - concurrent resumes for one Session join one process-local run while different
   Sessions remain concurrent
 
 Prompt admission now uses a durable `session_input` inbox rather than immediate
-transcript projection. `steer` inputs promote at the next safe provider-turn
+transcript projection. `steer` inputs promote at the next safe step
 boundary while the current drain requires continuation. `queue` inputs remain in
 a FIFO until the Session would otherwise become idle and then promote one at a time.
 
@@ -39,12 +39,12 @@ Next reviewed slices:
 
 - preserve eager structured local-tool settlement: durably record each complete
   call, start its child execution immediately, await every settlement after the
-  provider turn closes, then reload projected history once
-- revisit per-turn tool-call limits, output truncation, and operational
+  step closes, then reload projected history once
+- revisit per-step tool-call limits, output truncation, and operational
   backpressure before broadening exposure; eager local execution is deliberately
   unbounded in the current local slice while SQLite publication stays serialized
 - remove the public in-memory `@opencode-ai/llm` tool loop after replacing its
-  remaining one-turn native-adapter use with a narrow typed dispatcher
+  remaining single-step native-adapter use with a narrow typed dispatcher
 - batch streamed deltas and add covering context indexes
 - expose replayable Session event cursors over HTTP and the generated SDK where remote consumers need them
 - integrate the new Job service with V2 tool execution: support background
@@ -56,14 +56,14 @@ Next reviewed slices:
 ### Deferred durable continuation recovery
 
 Do not infer that ambiguous provider work is safe to retry from an advisory wake.
-The first inbox-driven runner intentionally omits outer provider-attempt markers
+The first inbox-driven runner intentionally omits outer physical-attempt markers
 until they have a concrete consumer and a complete recovery policy.
 
 Design post-crash continuation recovery as one explicit slice. It should model:
 
 - promoted input and projected-history state
 - queued-input promotion and steering assignment
-- provider-attempt preparation versus provider-dispatch ambiguity
+- physical-attempt preparation versus provider-dispatch ambiguity
 - required post-tool continuation across process loss
 - explicit `retry` and `abandon` decisions for unknown outcomes
 - bounded automatic retry only where provider and tool idempotency make it safe
diff --git a/specs/v2/tools.md b/specs/v2/tools.md
index 4dc7bfac22..6be14d2f7b 100644
--- a/specs/v2/tools.md
+++ b/specs/v2/tools.md
@@ -148,7 +148,7 @@ Invalid input never invokes the tool. Invalid output never produces a successful
 
 `toModelOutput` is pure and total. When omitted, the encoded output remains structured output; an encoded string is also projected as text. Projection does not receive invocation identity because presentation depends only on validated input and output.
 
-Provider-turn materialization captures the effective registration identity for each advertised name without retaining its handler. Settlement rejects the call as stale if that registration was removed or replaced, including when closing an overlay reveals the previously effective registration. The current handler is captured only after this check; removing or replacing its registration afterward does not affect the running invocation.
+Step materialization captures the effective registration identity for each advertised name without retaining its handler. Settlement rejects the call as stale if that registration was removed or replaced, including when closing an overlay reveals the previously effective registration. The current handler is captured only after this check; removing or replacing its registration afterward does not affect the running invocation.
 
 ## Output Bounding
 
@@ -176,7 +176,7 @@ Leaf tools translate only errors they deliberately classify as recoverable. Broa
 - **Durable identity:** invocation-owned records use the exact Session, agent, assistant message, and call IDs supplied by the runner.
 - **Scoped registration:** closing a Scope removes exactly its registration and reveals any prior active overlay.
 - **Captured execution:** registration changes cannot alter an invocation after effective lookup.
-- **Stale rejection:** a call never executes a registration other than the one advertised for its provider turn.
+- **Stale rejection:** a call never executes a registration other than the one advertised for its step.
 - **Storage encapsulation:** domain output does not change according to model-output bounding or retention policy.
 
 ## Follow-Up

From a644e0e7a095efcca87e6bbd079fc1acf86f0bf4 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Fri, 3 Jul 2026 14:57:40 -0400
Subject: [PATCH 24/82] sync

---
 packages/cli/src/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index e515424183..64116b9b76 100755
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -47,6 +47,7 @@ Effect.logInfo("cli starting", {
   version: InstallationVersion,
   channel: InstallationChannel,
   local: InstallationLocal,
+  args: process.argv.slice(2),
 }).pipe(
   Effect.flatMap(() => Runtime.run(Commands, Handlers, { version: InstallationVersion })),
   Effect.annotateLogs({ role: "cli" }),

From 50977dd4fe85e89802313741d643f2255236c80c Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Fri, 3 Jul 2026 15:13:37 -0400
Subject: [PATCH 25/82] server: emit logs for every HTTP request to help debug
 API traffic

---
 packages/cli/src/commands/handlers/serve.ts | 2 +-
 packages/server/src/routes.ts               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/commands/handlers/serve.ts b/packages/cli/src/commands/handlers/serve.ts
index 8a6b1c2ceb..546c5de7c5 100644
--- a/packages/cli/src/commands/handlers/serve.ts
+++ b/packages/cli/src/commands/handlers/serve.ts
@@ -142,7 +142,7 @@ function listen(hostname: string, port: Option.Option<number>, password: string)
 function bind(hostname: string, port: number, password: string) {
   const server = createServer()
   return Layer.build(
-    HttpRouter.serve(createRoutes(password), { disableListenLog: true, disableLogger: true }).pipe(
+    HttpRouter.serve(createRoutes(password), { disableListenLog: true }).pipe(
       Layer.provideMerge(NodeHttpServer.layer(() => server, { port, host: hostname })),
       Layer.provide(AppNodeBuilder.build(LayerNode.group([Credential.node, PermissionSaved.node]))),
     ),
diff --git a/packages/server/src/routes.ts b/packages/server/src/routes.ts
index 2157dd0b04..18ab2878f7 100644
--- a/packages/server/src/routes.ts
+++ b/packages/server/src/routes.ts
@@ -97,4 +97,4 @@ function simulationEnabled() {
 export const routes = createRoutes()
 
 export const webHandler = () =>
-  HttpRouter.toWebHandler(routes.pipe(Layer.provide(HttpServer.layerServices)), { disableLogger: true })
+  HttpRouter.toWebHandler(routes.pipe(Layer.provide(HttpServer.layerServices)))

From e66cbf36e97d02b25ca8794b4313e679ca411967 Mon Sep 17 00:00:00 2001
From: James Long <longster@gmail.com>
Date: Fri, 3 Jul 2026 15:34:30 -0400
Subject: [PATCH 26/82] fix(core): constrain location services (#35228)

---
 packages/cli/src/commands/handlers/serve.ts | 3 ++-
 packages/core/src/location-services.ts      | 8 ++++----
 packages/sdk-next/src/opencode.ts           | 5 ++++-
 packages/server/src/routes.ts               | 2 ++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/commands/handlers/serve.ts b/packages/cli/src/commands/handlers/serve.ts
index 546c5de7c5..8d263880c5 100644
--- a/packages/cli/src/commands/handlers/serve.ts
+++ b/packages/cli/src/commands/handlers/serve.ts
@@ -3,6 +3,7 @@ import { Credential } from "@opencode-ai/core/credential"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { PermissionSaved } from "@opencode-ai/core/permission/saved"
+import { Project } from "@opencode-ai/core/project"
 import { Global } from "@opencode-ai/core/global"
 import { Context, Effect, FileSystem, Layer, Option, Redacted, Schedule, Schema } from "effect"
 import { HttpRouter, HttpServer } from "effect/unstable/http"
@@ -144,7 +145,7 @@ function bind(hostname: string, port: number, password: string) {
   return Layer.build(
     HttpRouter.serve(createRoutes(password), { disableListenLog: true }).pipe(
       Layer.provideMerge(NodeHttpServer.layer(() => server, { port, host: hostname })),
-      Layer.provide(AppNodeBuilder.build(LayerNode.group([Credential.node, PermissionSaved.node]))),
+      Layer.provide(AppNodeBuilder.build(LayerNode.group([Credential.node, PermissionSaved.node, Project.node]))),
     ),
   ).pipe(
     Effect.tap(() => Effect.addFinalizer(() => Effect.sync(() => server.closeAllConnections()))),
diff --git a/packages/core/src/location-services.ts b/packages/core/src/location-services.ts
index ffb7db2cf1..f0f2d63e7f 100644
--- a/packages/core/src/location-services.ts
+++ b/packages/core/src/location-services.ts
@@ -22,7 +22,6 @@ import { PermissionV2 } from "./permission"
 import { PluginV2 } from "./plugin"
 import { PluginInternal } from "./plugin/internal"
 import { Policy } from "./policy"
-import { Project } from "./project"
 import { ProjectCopy } from "./project/copy"
 import { Pty } from "./pty"
 import { QuestionV2 } from "./question"
@@ -49,8 +48,7 @@ import { Vcs } from "./vcs"
 
 export { LocationServiceMap } from "./location-service-map"
 
-export const locationServices = LayerNode.group([
-  Project.node,
+const locationServiceNodes = [
   Location.node,
   Policy.node,
   Config.node,
@@ -96,7 +94,9 @@ export const locationServices = LayerNode.group([
   Snapshot.node,
   SessionRunnerLLM.node,
   Vcs.node,
-])
+] as const satisfies readonly Node.LocationNode<unknown, unknown>[]
+
+export const locationServices = LayerNode.group<typeof locationServiceNodes>(locationServiceNodes)
 
 export type LocationServices = LayerNode.Output<typeof locationServices>
 export type LocationError = LayerNode.Error<typeof locationServices>
diff --git a/packages/sdk-next/src/opencode.ts b/packages/sdk-next/src/opencode.ts
index 4737852ff4..087f689366 100644
--- a/packages/sdk-next/src/opencode.ts
+++ b/packages/sdk-next/src/opencode.ts
@@ -3,6 +3,7 @@ import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { PermissionSaved } from "@opencode-ai/core/permission/saved"
 import { SdkPlugins } from "@opencode-ai/core/plugin/sdk"
+import { Project } from "@opencode-ai/core/project"
 import { createEmbeddedRoutes } from "@opencode-ai/server/routes"
 import { Context, Effect, Layer, Scope } from "effect"
 import { FetchHttpClient, HttpRouter, HttpServer } from "effect/unstable/http"
@@ -12,7 +13,7 @@ export const create = Effect.fn("OpenCode.create")(function* () {
   const memoMap = yield* Layer.makeMemoMap
   const sdkPlugins = SdkPlugins.makeStore()
   const context = yield* Layer.buildWithMemoMap(
-    AppNodeBuilder.build(LayerNode.group([PermissionSaved.node, SdkPlugins.node]), [
+    AppNodeBuilder.build(LayerNode.group([PermissionSaved.node, Project.node, SdkPlugins.node]), [
       [SdkPlugins.node, SdkPlugins.layerWithStore(sdkPlugins)],
     ]),
     memoMap,
@@ -20,11 +21,13 @@ export const create = Effect.fn("OpenCode.create")(function* () {
   )
   const plugins = Context.get(context, SdkPlugins.Service)
   const permissions = Context.get(context, PermissionSaved.Service)
+  const project = Context.get(context, Project.Service)
   const web = yield* Effect.acquireRelease(
     Effect.sync(() =>
       HttpRouter.toWebHandler(
         createEmbeddedRoutes(sdkPlugins).pipe(
           HttpRouter.provideRequest(Layer.succeed(PermissionSaved.Service, permissions)),
+          HttpRouter.provideRequest(Layer.succeed(Project.Service, project)),
           Layer.provide(HttpServer.layerServices),
         ),
         { disableLogger: true, memoMap },
diff --git a/packages/server/src/routes.ts b/packages/server/src/routes.ts
index 18ab2878f7..c5e43989d0 100644
--- a/packages/server/src/routes.ts
+++ b/packages/server/src/routes.ts
@@ -6,6 +6,7 @@ import { EventV2 } from "@opencode-ai/core/event"
 import { Credential } from "@opencode-ai/core/credential"
 import { PermissionSaved } from "@opencode-ai/core/permission/saved"
 import { PtyTicket } from "@opencode-ai/core/pty/ticket"
+import { Project } from "@opencode-ai/core/project"
 import { SessionV2 } from "@opencode-ai/core/session"
 import { SessionExecution } from "@opencode-ai/core/session/execution"
 import { Job } from "@opencode-ai/core/job"
@@ -33,6 +34,7 @@ const applicationServices = LayerNode.group([
   httpClient,
   ToolOutputStore.cleanupNode,
   Job.node,
+  Project.node,
   SessionV2.node,
   PluginRuntime.providerNode,
   PermissionSaved.node,

From 5d14c7a18550e1f886caf5b14e6962ee22ad6bdf Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Fri, 3 Jul 2026 15:41:50 -0400
Subject: [PATCH 27/82] refactor(core): align runner naming with step
 vocabulary (#35227)

---
 .../core/src/session/context-checkpoint.ts    |  2 +-
 packages/core/src/session/execution/local.ts  |  2 +-
 packages/core/src/session/history.ts          |  2 +-
 packages/core/src/session/instructions.ts     |  4 +-
 packages/core/src/session/message-updater.ts  |  2 +-
 packages/core/src/session/projector.ts        |  5 ++-
 packages/core/src/session/runner/index.ts     | 10 ++---
 packages/core/src/session/runner/llm.ts       | 44 +++++++++----------
 .../src/session/runner/publish-llm-event.ts   |  2 +-
 packages/core/src/system-context/index.ts     |  2 +-
 .../core/test/session-runner-message.test.ts  |  6 +--
 .../core/test/session-runner-recorded.test.ts |  2 +-
 packages/core/test/session-runner.test.ts     | 12 ++---
 specs/v2/session.md                           |  2 +-
 14 files changed, 47 insertions(+), 50 deletions(-)

diff --git a/packages/core/src/session/context-checkpoint.ts b/packages/core/src/session/context-checkpoint.ts
index fa3b24aedb..977514e8ca 100644
--- a/packages/core/src/session/context-checkpoint.ts
+++ b/packages/core/src/session/context-checkpoint.ts
@@ -18,7 +18,7 @@ const decodeApplied = Schema.decodeUnknownOption(SystemContext.Applied)
  * Loads or creates the session's durable context checkpoint, narrating any
  * drift since the model was last told as a chronological update. Completed
  * compaction rebaselines; nothing else rewrites the baseline. Runs before
- * input promotion so a blocked first turn leaves pending inputs untouched.
+ * input promotion so a blocked first step leaves pending inputs untouched.
  */
 export const prepare = Effect.fn("SessionContextCheckpoint.prepare")(function* (
   db: DatabaseService,
diff --git a/packages/core/src/session/execution/local.ts b/packages/core/src/session/execution/local.ts
index 1a45537490..4e68e6c3d9 100644
--- a/packages/core/src/session/execution/local.ts
+++ b/packages/core/src/session/execution/local.ts
@@ -20,7 +20,7 @@ const layer = Layer.effect(
       drain: Effect.fnUntraced(function* (sessionID: SessionSchema.ID, force) {
         const session = yield* store.get(sessionID)
         if (!session) return yield* Effect.die(new Error(`Session not found: ${sessionID}`))
-        return yield* SessionRunner.Service.use((runner) => runner.run({ sessionID, force })).pipe(
+        return yield* SessionRunner.Service.use((runner) => runner.drain({ sessionID, force })).pipe(
           Effect.provide(locations.get(session.location)),
           Effect.tapCause((cause) =>
             Cause.hasInterruptsOnly(cause)
diff --git a/packages/core/src/session/history.ts b/packages/core/src/session/history.ts
index a704a631f7..9a6a75fe2f 100644
--- a/packages/core/src/session/history.ts
+++ b/packages/core/src/session/history.ts
@@ -34,7 +34,7 @@ const messageRows = Effect.fnUntraced(function* (
       and(
         eq(SessionMessageTable.session_id, sessionID),
         // Keep system updates visible in the gap between a completed compaction
-        // and the next prepared turn's rebaseline, when their content is not yet
+        // and the next prepared step's rebaseline, when their content is not yet
         // folded into a new baseline.
         compaction
           ? or(
diff --git a/packages/core/src/session/instructions.ts b/packages/core/src/session/instructions.ts
index a75074ae04..22f003e5ea 100644
--- a/packages/core/src/session/instructions.ts
+++ b/packages/core/src/session/instructions.ts
@@ -36,9 +36,9 @@ const layer = Layer.effect(
     // absolute paths, but the human-facing description shows paths relative to the project
     // root so opening a subdirectory still describes paths from the project root.
     const root = yield* fs.resolve(location.project.directory)
-    // Same-turn parallel reads settle concurrently, so an in-memory claim guards each
+    // Same-step parallel reads settle concurrently, so an in-memory claim guards each
     // Session/path pair before any filesystem work. The durable history check below covers
-    // paths injected in earlier turns after this Location layer was reopened.
+    // paths injected in earlier steps after this Location layer was reopened.
     const injected = yield* Ref.make<Map<SessionSchema.ID, Set<string>>>(new Map())
 
     const load = Effect.fn("SessionInstructions.load")(function* (input: {
diff --git a/packages/core/src/session/message-updater.ts b/packages/core/src/session/message-updater.ts
index b07d0d1234..a23ecb224c 100644
--- a/packages/core/src/session/message-updater.ts
+++ b/packages/core/src/session/message-updater.ts
@@ -19,7 +19,7 @@ export interface Adapter {
 export function memory(state: MemoryState): Adapter {
   const assistantIndex = (messageID: SessionMessage.ID) =>
     state.messages.findLastIndex((message) => message.id === messageID)
-  // A newer turn supersedes stale incomplete rows; never resume an older assistant projection.
+  // A newer step supersedes stale incomplete rows; never resume an older assistant projection.
   const latestAssistantIndex = () => state.messages.findLastIndex((message) => message.type === "assistant")
   const activeShellIndex = (callID: string) =>
     state.messages.findLastIndex((message) => message.type === "shell" && message.callID === callID)
diff --git a/packages/core/src/session/projector.ts b/packages/core/src/session/projector.ts
index 62ad7ec2ce..c5b552e8b4 100644
--- a/packages/core/src/session/projector.ts
+++ b/packages/core/src/session/projector.ts
@@ -168,7 +168,8 @@ const projectFork = Effect.fn("SessionProjector.projectFork")(function* (
         .get()
         .pipe(Effect.orDie)
     : undefined
-  if (event.data.from && !boundary) return yield* Effect.die(new Error(`Fork boundary message not found: ${event.data.from}`))
+  if (event.data.from && !boundary)
+    return yield* Effect.die(new Error(`Fork boundary message not found: ${event.data.from}`))
   const copied = yield* db
     .select({ seq: SessionMessageTable.seq })
     .from(SessionMessageTable)
@@ -357,7 +358,7 @@ function run(db: DatabaseService, event: MessageEvent) {
     const adapter: SessionMessageUpdater.Adapter = {
       getCurrentAssistant() {
         return Effect.gen(function* () {
-          // A newer turn supersedes stale incomplete rows; never resume an older assistant projection.
+          // A newer step supersedes stale incomplete rows; never resume an older assistant projection.
           const row = yield* db
             .select()
             .from(SessionMessageTable)
diff --git a/packages/core/src/session/runner/index.ts b/packages/core/src/session/runner/index.ts
index 11141c3447..7c2a6f463d 100644
--- a/packages/core/src/session/runner/index.ts
+++ b/packages/core/src/session/runner/index.ts
@@ -9,16 +9,12 @@ import type { SystemContext } from "../../system-context/index"
 import type { ToolOutputStore } from "../../tool-output-store"
 
 export type RunError =
-  | LLMError
-  | SessionRunnerModel.Error
-  | MessageDecodeError
-  | SystemContext.InitializationBlocked
-  | ToolOutputStore.Error
+  LLMError | SessionRunnerModel.Error | MessageDecodeError | SystemContext.InitializationBlocked | ToolOutputStore.Error
 
 /** Runs one local continuation from already-recorded Session history. */
 export interface Interface {
-  /** Drains eligible durable work. Explicit runs perform one provider attempt even when no work is eligible. */
-  readonly run: (input: {
+  /** Drains eligible durable work. Explicit runs perform one physical attempt even when no work is eligible. */
+  readonly drain: (input: {
     readonly sessionID: SessionSchema.ID
     readonly force: boolean
   }) => Effect.Effect<void, RunError>
diff --git a/packages/core/src/session/runner/llm.ts b/packages/core/src/session/runner/llm.ts
index 12c73832c8..0aeaa0e052 100644
--- a/packages/core/src/session/runner/llm.ts
+++ b/packages/core/src/session/runner/llm.ts
@@ -61,11 +61,11 @@ import { llmClient } from "../../effect/app-node-platform"
  * - Runtime context assembly
  *   - Track V1 runtime-context parity canonically in `specs/v2/session.md`.
  *
- * - One provider turn
+ * - One step
  *   - [x] Translate every projected V2 Session message variant into canonical
  *     `@opencode-ai/llm` messages.
  *   - [ ] Resolve policy-filtered built-in, MCP, plugin, and structured-output tool definitions.
- *   - [x] Stream exactly one `llm.stream(request)` provider turn.
+ *   - [x] Stream exactly one `llm.stream(request)` physical attempt.
  *   - [x] Persist assistant text and usage events incrementally as they arrive.
  *   - [ ] Persist snapshots, patches, and retry notices incrementally as they arrive.
  *   - [x] Persist reasoning, provider errors, and tool-call events incrementally as they arrive.
@@ -77,8 +77,8 @@ import { llmClient } from "../../effect/app-node-platform"
  *   - [x] Start each recorded local call eagerly and await all settlements before continuation.
  *   - [ ] Add scoped runtime context, progress updates, attachment normalization,
  *     plugins, and cancellation settlement.
- *   - [x] Reload projected history and start the next explicit provider turn after local tool results.
- *   - [x] Continue for durable user steering accepted during an active provider turn.
+ *   - [x] Reload projected history and start the next explicit step after local tool results.
+ *   - [x] Continue for durable user steering accepted during an active step.
  *   - [ ] Continue for compaction or another continuation condition when required.
  *
  * - Post-run maintenance
@@ -86,12 +86,12 @@ import { llmClient } from "../../effect/app-node-platform"
  *   - [ ] Coalesce streamed deltas and add covering projected-history indexes.
  *   - [ ] Update title, summaries, compaction state, and cleanup in bounded background work.
  *
- * Use `llm.stream(request)` for each provider turn. Keep tool execution and continuation here.
+ * Use `llm.stream(request)` for each physical attempt. Keep tool execution and continuation here.
  * Durable continuation recovery remains a separate future slice with an explicit retry policy.
  *
  * The current slice loads V2 history, translates it, resolves a model through a core service, and persists one
- * provider turn. Registry definitions are advertised, local tool calls are settled durably, and an
- * explicit loop starts the next provider turn after local settlement. Configured agent step limits bound the loop.
+ * step. Registry definitions are advertised, local tool calls are settled durably, and an
+ * explicit loop starts the next step after local settlement. Configured agent step limits bound the loop.
  */
 
 const layer = Layer.effect(
@@ -114,7 +114,7 @@ const layer = Layer.effect(
     const db = (yield* Database.Service).db
     const compaction = yield* SessionCompaction.Service
     const title = yield* SessionTitle.Service
-    // Title generation is a side effect of the first turn; it must not delay turn continuation.
+    // Title generation is a side effect of the first step; it must not delay step continuation.
     // Tracked per process so repeated wakes before the second user message arrives don't
     // re-fire a redundant LLM call; `SessionTitle` itself is idempotent based on durable history.
     const titleAttempted = new Set<SessionSchema.ID>()
@@ -166,7 +166,7 @@ const layer = Layer.effect(
         { concurrency: "unbounded" },
       ).pipe(Effect.map(SystemContext.combine))
 
-    const runTurnAttempt = Effect.fn("SessionRunner.runTurnAttempt")(function* (
+    const attemptStep = Effect.fn("SessionRunner.attemptStep")(function* (
       sessionID: SessionSchema.ID,
       promotion: SessionInput.Delivery | undefined,
       step: number,
@@ -177,7 +177,7 @@ const layer = Layer.effect(
         return yield* Effect.interrupt
       const agent = yield* agents.select(session.agent)
       // Establish what the model knows before admitting what the user said, so
-      // a blocked first turn leaves pending inputs untouched.
+      // a blocked first step leaves pending inputs untouched.
       const checkpoint = yield* SessionContextCheckpoint.prepare(
         db,
         events,
@@ -231,7 +231,7 @@ const layer = Layer.effect(
         snapshot: startSnapshot,
       })
       const publication = Semaphore.makeUnsafe(1)
-      // Durable publishes are serialized so tool fibers and turn settlement never interleave
+      // Durable publishes are serialized so tool fibers and step settlement never interleave
       // mid-event.
       const serialized = <A, E, R>(effect: Effect.Effect<A, E, R>) => publication.withPermit(effect)
       const publish = (event: LLMEvent, outputPaths: ReadonlyArray<string> = []) =>
@@ -282,7 +282,7 @@ const layer = Layer.effect(
         Effect.ensuring(serialized(publisher.flush())),
       )
 
-      // Captures the end snapshot, diffs it against the turn's start, and durably ends the
+      // Captures the end snapshot, diffs it against the step's start, and durably ends the
       // assistant step.
       const publishStepEnd = (settlement: NonNullable<ReturnType<typeof publisher.stepSettlement>>) =>
         Effect.gen(function* () {
@@ -316,7 +316,7 @@ const layer = Layer.effect(
           const streamInterrupted = stream._tag === "Failure" && Cause.hasInterrupts(stream.cause)
 
           // A context overflow before any assistant output is recoverable: compact and
-          // restart the turn instead of surfacing the provider error.
+          // restart the step instead of surfacing the provider error.
           if (
             recoverOverflow &&
             !publisher.hasAssistantStarted() &&
@@ -325,7 +325,7 @@ const layer = Layer.effect(
           )
             return { _tag: "RestartAfterOverflowCompaction", step: currentStep } as const
 
-          // An unrecovered held-back overflow becomes the turn's durable provider error. A
+          // An unrecovered held-back overflow becomes the step's durable provider error. A
           // thrown LLM failure fails hosted tool calls and the assistant unless a provider
           // error was already recorded from the stream.
           if (overflowFailure) yield* publish(overflowFailure)
@@ -346,12 +346,12 @@ const layer = Layer.effect(
           if (questionDismissed || streamInterrupted || toolsInterrupted) {
             yield* FiberSet.clear(toolFibers)
             yield* serialized(publisher.failUnsettledTools("Tool execution interrupted"))
-            yield* serialized(publisher.failAssistant("Provider turn interrupted"))
+            yield* serialized(publisher.failAssistant("Step interrupted"))
             // Match V1: dismissing a question halts the loop like an interruption.
             if (questionDismissed) return yield* Effect.interrupt
           }
           // A settled tool fiber failure is one of two things. A defect from a tool
-          // implementation becomes a failed tool call the model can read, and the turn still
+          // implementation becomes a failed tool call the model can read, and the step still
           // settles so the model may recover. A typed infrastructure failure (tool output
           // could not be persisted) also fails the assistant and then fails the drain.
           const settledFailure = settled._tag === "Failure" && !toolsInterrupted ? settled.cause : undefined
@@ -387,7 +387,7 @@ const layer = Layer.effect(
       )
     }, Effect.scoped)
 
-    const runTurn = Effect.fnUntraced(function* (
+    const runStep = Effect.fnUntraced(function* (
       sessionID: SessionSchema.ID,
       promotion: SessionInput.Delivery | undefined,
       step: number,
@@ -399,7 +399,7 @@ const layer = Layer.effect(
       let currentPromotion = promotion
       let currentStep = step
       while (true) {
-        const attempt = yield* runTurnAttempt(sessionID, currentPromotion, currentStep, recoverOverflow)
+        const attempt = yield* attemptStep(sessionID, currentPromotion, currentStep, recoverOverflow)
         if (attempt._tag === "Completed") return { needsContinuation: attempt.needsContinuation, step: attempt.step }
         if (attempt._tag === "RestartAfterOverflowCompaction") recoverOverflow = undefined
         yield* Effect.yieldNow
@@ -410,7 +410,7 @@ const layer = Layer.effect(
 
     // ExecutionSettled is published per execution (busy period) by SessionExecution, not per
     // drain here.
-    const run = Effect.fn("SessionRunner.run")(function* (input: {
+    const drain = Effect.fn("SessionRunner.drain")(function* (input: {
       readonly sessionID: SessionSchema.ID
       readonly force: boolean
     }) {
@@ -428,8 +428,8 @@ const layer = Layer.effect(
         // a provider error suppresses it. Pending steers also continue the loop so
         // interjections are answered before the session goes idle.
         while (needsContinuation) {
-          const result = yield* runTurn(input.sessionID, promotion, step)
-          // Steer/queue promotion inside runTurn has already made the pending input a visible
+          const result = yield* runStep(input.sessionID, promotion, step)
+          // Steer/queue promotion inside runStep has already made the pending input a visible
           // user message by this point, so the first-user-message check below is reliable.
           if (!titleAttempted.has(input.sessionID)) {
             titleAttempted.add(input.sessionID)
@@ -445,7 +445,7 @@ const layer = Layer.effect(
       }
     })
 
-    return Service.of({ run })
+    return Service.of({ drain })
   }),
 )
 
diff --git a/packages/core/src/session/runner/publish-llm-event.ts b/packages/core/src/session/runner/publish-llm-event.ts
index 4b7b6fb92c..9a334a0a6d 100644
--- a/packages/core/src/session/runner/publish-llm-event.ts
+++ b/packages/core/src/session/runner/publish-llm-event.ts
@@ -50,7 +50,7 @@ const settledOutput = (value: ToolOutput | undefined, result: ToolResultValue):
   return { structured: record(settled.structured), content: settled.content }
 }
 
-/** Persist one provider turn without executing tools or starting a continuation turn. */
+/** Persist one step without executing tools or starting a continuation step. */
 export const createLLMEventPublisher = (events: EventV2.Interface, input: Input) => {
   const tools = new Map<
     string,
diff --git a/packages/core/src/system-context/index.ts b/packages/core/src/system-context/index.ts
index ce6aaae454..d86efceb91 100644
--- a/packages/core/src/system-context/index.ts
+++ b/packages/core/src/system-context/index.ts
@@ -12,7 +12,7 @@ import { Effect, Option, Schema } from "effect"
  * The durable `Applied` record tracks what the model was last told, per source:
  * it is the model's current belief. Interpreters uphold one invariant —
  * `reconcile` never rewrites the baseline; it only narrates drift as update
- * text. Only `rebaseline` (compaction) and `initialize` (first turn) produce
+ * text. Only `rebaseline` (compaction) and `initialize` (first step) produce
  * baseline text.
  *
  * Returning `unavailable` means observation failed temporarily. It differs from
diff --git a/packages/core/test/session-runner-message.test.ts b/packages/core/test/session-runner-message.test.ts
index 840a4e424c..d33b44728d 100644
--- a/packages/core/test/session-runner-message.test.ts
+++ b/packages/core/test/session-runner-message.test.ts
@@ -354,7 +354,7 @@ Recent work
               state: SessionMessage.ToolStateError.make({
                 status: "error",
                 input: { query: "Effect" },
-                error: { type: "unknown", message: "Provider turn interrupted" },
+                error: { type: "unknown", message: "Step interrupted" },
                 content: [],
                 structured: {},
               }),
@@ -362,7 +362,7 @@ Recent work
             }),
           ],
           finish: "error",
-          error: { type: "unknown", message: "Provider turn interrupted" },
+          error: { type: "unknown", message: "Step interrupted" },
           time: { created, completed: created },
         }),
       ],
@@ -386,7 +386,7 @@ Recent work
         result: {
           type: "error",
           value: {
-            error: { type: "unknown", message: "Provider turn interrupted" },
+            error: { type: "unknown", message: "Step interrupted" },
             content: [],
             structured: {},
           },
diff --git a/packages/core/test/session-runner-recorded.test.ts b/packages/core/test/session-runner-recorded.test.ts
index 2768be820a..4f82baba96 100644
--- a/packages/core/test/session-runner-recorded.test.ts
+++ b/packages/core/test/session-runner-recorded.test.ts
@@ -98,7 +98,7 @@ const execution = Layer.effect(
   Effect.gen(function* () {
     const sessionRunner = yield* SessionRunner.Service
     const coordinator = yield* SessionRunCoordinator.make<SessionV2.ID, SessionRunner.RunError>({
-      drain: (sessionID, force) => sessionRunner.run({ sessionID, force }),
+      drain: (sessionID, force) => sessionRunner.drain({ sessionID, force }),
     })
     return SessionExecution.Service.of({
       active: coordinator.active,
diff --git a/packages/core/test/session-runner.test.ts b/packages/core/test/session-runner.test.ts
index ca8ec42775..e6f14c8e19 100644
--- a/packages/core/test/session-runner.test.ts
+++ b/packages/core/test/session-runner.test.ts
@@ -260,7 +260,7 @@ const execution = Layer.effect(
   Effect.gen(function* () {
     const sessionRunner = yield* SessionRunner.Service
     const coordinator = yield* SessionRunCoordinator.make<SessionV2.ID, SessionRunner.RunError>({
-      drain: (sessionID, force) => sessionRunner.run({ sessionID, force }),
+      drain: (sessionID, force) => sessionRunner.drain({ sessionID, force }),
     })
     return SessionExecution.Service.of({
       active: coordinator.active,
@@ -575,7 +575,7 @@ const verifyPartialFlushOnInterruption = (kind: FragmentKind) =>
     )
 
     const runner = yield* SessionRunner.Service
-    const fiber = yield* runner.run({ sessionID, force: true }).pipe(Effect.forkChild)
+    const fiber = yield* runner.drain({ sessionID, force: true }).pipe(Effect.forkChild)
     yield* Deferred.await(streamed)
     yield* Fiber.interrupt(fiber)
     expect(yield* session.context(sessionID)).toMatchObject([
@@ -583,7 +583,7 @@ const verifyPartialFlushOnInterruption = (kind: FragmentKind) =>
       {
         type: "assistant",
         finish: "error",
-        error: { type: "unknown", message: "Provider turn interrupted" },
+        error: { type: "unknown", message: "Step interrupted" },
         content: [
           kind === "tool input"
             ? { type: "tool", id: fragmentID(kind, "interrupted"), state: { status: "error" } }
@@ -2983,7 +2983,7 @@ describe("SessionRunnerLLM", () => {
       expect(requests).toHaveLength(1)
       expect(yield* session.context(sessionID)).toMatchObject([
         { type: "user", text: "Interrupt provider" },
-        { type: "assistant", finish: "error", error: { type: "unknown", message: "Provider turn interrupted" } },
+        { type: "assistant", finish: "error", error: { type: "unknown", message: "Step interrupted" } },
       ])
       expect(yield* recordedEventTypes(sessionID)).toContain("step.failed.1")
       yield* session.interrupt(sessionID)
@@ -3007,7 +3007,7 @@ describe("SessionRunnerLLM", () => {
       ]
 
       const runner = yield* SessionRunner.Service
-      const run = yield* runner.run({ sessionID, force: true }).pipe(Effect.forkChild)
+      const run = yield* runner.drain({ sessionID, force: true }).pipe(Effect.forkChild)
       yield* Deferred.await(toolExecutionsStarted)
       yield* Fiber.interrupt(run)
       toolExecutionGate = undefined
@@ -3018,7 +3018,7 @@ describe("SessionRunnerLLM", () => {
         {
           type: "assistant",
           finish: "error",
-          error: { type: "unknown", message: "Provider turn interrupted" },
+          error: { type: "unknown", message: "Step interrupted" },
           content: [
             {
               type: "tool",
diff --git a/specs/v2/session.md b/specs/v2/session.md
index 4abc7104fe..b4b91ace09 100644
--- a/specs/v2/session.md
+++ b/specs/v2/session.md
@@ -42,7 +42,7 @@ Execution routing starts from only the Session ID:
 SessionExecution.resume(sessionID)
 -> SessionStore.get(sessionID)
 -> LocationServiceMap.get(session.location)
--> SessionRunner.run({ sessionID, force? })
+-> SessionRunner.drain({ sessionID, force? })
 ```
 
 `SessionExecution` and the read-side `SessionStore` are process-global. `SessionRunner`, catalog, model resolver, tool registry, permission state, and filesystem are cached per Location. No layer takes a Session ID. An omitted `Location.workspaceID` means implicit-local placement; explicit workspace identity remains reserved for future placement semantics.

From 37b26e495ba857e0727e7124221e54f940b509d8 Mon Sep 17 00:00:00 2001
From: James Long <longster@gmail.com>
Date: Fri, 3 Jul 2026 15:46:04 -0400
Subject: [PATCH 28/82] feat(simulation): share control protocol schemas
 (#35230)

---
 packages/simulation/package.json            |   3 +-
 packages/simulation/src/backend/control.ts  |  56 ++------
 packages/simulation/src/frontend/actions.ts |  31 +----
 packages/simulation/src/frontend/server.ts  |  83 ++---------
 packages/simulation/src/protocol/index.ts   | 145 ++++++++++++++++++++
 5 files changed, 170 insertions(+), 148 deletions(-)
 create mode 100644 packages/simulation/src/protocol/index.ts

diff --git a/packages/simulation/package.json b/packages/simulation/package.json
index 93bab0540e..29613ff28a 100644
--- a/packages/simulation/package.json
+++ b/packages/simulation/package.json
@@ -9,7 +9,8 @@
     "./backend": "./src/backend/index.ts",
     "./backend/*": "./src/backend/*.ts",
     "./frontend": "./src/frontend/simulation.ts",
-    "./frontend/*": "./src/frontend/*.ts"
+    "./frontend/*": "./src/frontend/*.ts",
+    "./protocol": "./src/protocol/index.ts"
   },
   "scripts": {
     "typecheck": "tsgo --noEmit"
diff --git a/packages/simulation/src/backend/control.ts b/packages/simulation/src/backend/control.ts
index f3fc67116c..10bded13af 100644
--- a/packages/simulation/src/backend/control.ts
+++ b/packages/simulation/src/backend/control.ts
@@ -1,4 +1,5 @@
-import { Effect, Schema } from "effect"
+import { Effect } from "effect"
+import { SimulationProtocol } from "../protocol"
 import { SimulationLLMExchange } from "./llm-exchange"
 import { SimulationNetwork } from "./network"
 
@@ -23,43 +24,13 @@ import { SimulationNetwork } from "./network"
 const DefaultPort = 40950
 const MaxPortAttempts = 100
 
-const ChunkItem = Schema.Union([
-  Schema.Struct({ type: Schema.Literal("textDelta"), text: Schema.String }),
-  Schema.Struct({ type: Schema.Literal("reasoningDelta"), text: Schema.String }),
-  Schema.Struct({ type: Schema.Literal("toolCall"), id: Schema.String, name: Schema.String, input: Schema.Unknown }),
-  Schema.Struct({ type: Schema.Literal("raw"), chunk: Schema.Unknown }),
-])
-
-const ChunkParams = Schema.Struct({ id: Schema.String, items: Schema.Array(ChunkItem) })
-
-const FinishParams = Schema.Struct({
-  id: Schema.String,
-  reason: Schema.Literals(["stop", "tool-calls", "length", "content-filter"]).pipe(
-    Schema.withDecodingDefault(Effect.succeed("stop" as const)),
-  ),
-})
-
-const decodeChunkParams = Schema.decodeUnknownPromise(ChunkParams)
-const decodeFinishParams = Schema.decodeUnknownPromise(FinishParams)
-
-type JsonRpcRequest = {
-  readonly jsonrpc: "2.0"
-  readonly id?: string | number | null
-  readonly method: string
-  readonly params?: unknown
-}
-
 type ControlSocket = Bun.ServerWebSocket<{ unsubscribe?: () => void }>
 
-function parseRequest(input: string | Buffer): JsonRpcRequest {
-  const value = JSON.parse(typeof input === "string" ? input : input.toString()) as unknown
-  if (typeof value !== "object" || value === null) throw new Error("Invalid JSON-RPC request")
-  if (!("jsonrpc" in value) || value.jsonrpc !== "2.0") throw new Error("Invalid JSON-RPC version")
-  if (!("method" in value) || typeof value.method !== "string") throw new Error("Invalid JSON-RPC method")
-  return value as JsonRpcRequest
+function parseRequest(input: string | Buffer) {
+  return SimulationProtocol.JsonRpc.decodeRequest(JSON.parse(typeof input === "string" ? input : input.toString()))
 }
 
-async function handle(socket: ControlSocket, request: JsonRpcRequest): Promise<unknown> {
+async function handle(socket: ControlSocket, request: SimulationProtocol.JsonRpc.Request): Promise<unknown> {
   switch (request.method) {
     case "llm.attach": {
       socket.data.unsubscribe?.()
@@ -69,7 +40,7 @@ async function handle(socket: ControlSocket, request: JsonRpcRequest): Promise<u
       return { attached: true }
     }
     case "llm.chunk": {
-      const params = await decodeChunkParams(request.params)
+      const params = await SimulationProtocol.Backend.decodeChunkParams(request.params)
       await Effect.runPromise(
         SimulationLLMExchange.push(
           params.id,
@@ -79,7 +50,7 @@ async function handle(socket: ControlSocket, request: JsonRpcRequest): Promise<u
       return { ok: true }
     }
     case "llm.finish": {
-      const params = await decodeFinishParams(request.params)
+      const params = await SimulationProtocol.Backend.decodeFinishParams(request.params)
       await Effect.runPromise(SimulationLLMExchange.push(params.id, [{ type: "finish", reason: params.reason }]))
       return { ok: true }
     }
@@ -105,19 +76,14 @@ function serve(port = DefaultPort, attempts = MaxPortAttempts): Bun.Server<{ uns
           socket.data.unsubscribe?.()
         },
         async message(socket, message) {
-          let request: JsonRpcRequest | undefined
+          let request: SimulationProtocol.JsonRpc.Request | undefined
           try {
             request = parseRequest(message)
             const result = await handle(socket, request)
-            if (request.id !== undefined) socket.send(JSON.stringify({ jsonrpc: "2.0", id: request.id, result }))
+            const response = SimulationProtocol.JsonRpc.success(request.id, result)
+            if (response) socket.send(JSON.stringify(response))
           } catch (error) {
-            socket.send(
-              JSON.stringify({
-                jsonrpc: "2.0",
-                id: request?.id ?? null,
-                error: { code: -32000, message: error instanceof Error ? error.message : String(error) },
-              }),
-            )
+            socket.send(JSON.stringify(SimulationProtocol.JsonRpc.failure(request?.id, error)))
           }
         },
       },
diff --git a/packages/simulation/src/frontend/actions.ts b/packages/simulation/src/frontend/actions.ts
index 68725ec252..d03e4a5f75 100644
--- a/packages/simulation/src/frontend/actions.ts
+++ b/packages/simulation/src/frontend/actions.ts
@@ -1,36 +1,11 @@
 import type { CliRenderer, Renderable } from "@opentui/core"
 import { createMockKeys, createMockMouse, type MockInput, type MockMouse } from "@opentui/core/testing"
+import type { SimulationProtocol } from "../protocol"
 import { SimulationRenderer } from "./renderer"
 import { SimulationTrace } from "./trace"
 
-export interface KeyModifiers {
-  readonly ctrl?: boolean
-  readonly shift?: boolean
-  readonly meta?: boolean
-  readonly super?: boolean
-  readonly hyper?: boolean
-}
-
-export type Action =
-  | { readonly type: "typeText"; readonly text: string }
-  | { readonly type: "pressKey"; readonly key: string; readonly modifiers?: KeyModifiers }
-  | { readonly type: "pressEnter" }
-  | { readonly type: "pressArrow"; readonly direction: "up" | "down" | "left" | "right" }
-  | { readonly type: "focus"; readonly target: number }
-  | { readonly type: "click"; readonly target: number; readonly x: number; readonly y: number }
-
-export interface Element {
-  readonly id: string
-  readonly num: number
-  readonly x: number
-  readonly y: number
-  readonly width: number
-  readonly height: number
-  readonly focusable: boolean
-  readonly focused: boolean
-  readonly clickable: boolean
-  readonly editor: boolean
-}
+export type Action = SimulationProtocol.Frontend.Action
+export type Element = SimulationProtocol.Frontend.Element
 
 export interface Harness {
   readonly renderer: CliRenderer
diff --git a/packages/simulation/src/frontend/server.ts b/packages/simulation/src/frontend/server.ts
index 65d814d2f5..c6a6c8784c 100644
--- a/packages/simulation/src/frontend/server.ts
+++ b/packages/simulation/src/frontend/server.ts
@@ -1,27 +1,10 @@
-import { SimulationActions, type Action, type Harness } from "./actions"
+import { SimulationProtocol } from "../protocol"
+import { SimulationActions, type Harness } from "./actions"
 import { SimulationTrace } from "./trace"
 
 const DefaultPort = 40900
 const MaxPortAttempts = 100
 
-type JsonRpcRequest = {
-  readonly jsonrpc: "2.0"
-  readonly id?: string | number | null
-  readonly method: string
-  readonly params?: unknown
-}
-
-type JsonRpcResponse = {
-  readonly jsonrpc: "2.0"
-  readonly id: string | number | null
-  readonly result?: unknown
-  readonly error?: {
-    readonly code: number
-    readonly message: string
-    readonly data?: unknown
-  }
-}
-
 export interface Server {
   readonly url: string
   readonly stop: () => void
@@ -36,63 +19,15 @@ function isPortUnavailable(error: unknown) {
   return message.includes("eaddrinuse") || message.includes("address already in use") || message.includes(" in use")
 }
 
-function parseRequest(input: string | Buffer): JsonRpcRequest {
-  const value = JSON.parse(typeof input === "string" ? input : input.toString()) as unknown
-  if (typeof value !== "object" || value === null) throw new Error("Invalid JSON-RPC request")
-  if (!("jsonrpc" in value) || value.jsonrpc !== "2.0") throw new Error("Invalid JSON-RPC version")
-  if (!("method" in value) || typeof value.method !== "string") throw new Error("Invalid JSON-RPC method")
-  return value as JsonRpcRequest
-}
-
-function isAction(input: unknown): input is Action {
-  if (typeof input !== "object" || input === null || !("type" in input)) return false
-  switch (input.type) {
-    case "typeText":
-      return "text" in input && typeof input.text === "string"
-    case "pressKey":
-      return "key" in input && typeof input.key === "string"
-    case "pressEnter":
-      return true
-    case "pressArrow":
-      return "direction" in input && ["up", "down", "left", "right"].includes(String(input.direction))
-    case "focus":
-      return "target" in input && typeof input.target === "number"
-    case "click":
-      return (
-        "target" in input &&
-        typeof input.target === "number" &&
-        "x" in input &&
-        typeof input.x === "number" &&
-        "y" in input &&
-        typeof input.y === "number"
-      )
-  }
-  return false
-}
-
 function actionParam(params: unknown) {
-  if (typeof params !== "object" || params === null || !("action" in params)) throw new Error("Missing action")
-  if (!isAction(params.action)) throw new Error("Invalid action")
-  return params.action
+  return SimulationProtocol.Frontend.decodeActionParams(params).action
 }
 
-function response(id: JsonRpcRequest["id"], result: unknown): JsonRpcResponse | undefined {
-  if (id === undefined) return undefined
-  return { jsonrpc: "2.0", id, result }
+function parseRequest(input: string | Buffer) {
+  return SimulationProtocol.JsonRpc.decodeRequest(JSON.parse(typeof input === "string" ? input : input.toString()))
 }
 
-function errorResponse(id: JsonRpcRequest["id"], error: unknown): JsonRpcResponse {
-  return {
-    jsonrpc: "2.0",
-    id: id ?? null,
-    error: {
-      code: -32000,
-      message: error instanceof Error ? error.message : String(error),
-    },
-  }
-}
-
-async function handle(harness: Harness, request: JsonRpcRequest) {
+async function handle(harness: Harness, request: SimulationProtocol.JsonRpc.Request) {
   switch (request.method) {
     case "ui.state": {
       const result = SimulationActions.state(harness)
@@ -139,14 +74,14 @@ function serve(
           SimulationTrace.add("control.disconnect")
         },
         async message(socket, message) {
-          let request: JsonRpcRequest | undefined
+          let request: SimulationProtocol.JsonRpc.Request | undefined
           try {
             request = parseRequest(message)
             const result = await handle(harness, request)
-            const next = response(request.id, result)
+            const next = SimulationProtocol.JsonRpc.success(request.id, result)
             if (next) socket.send(JSON.stringify(next))
           } catch (error) {
-            socket.send(JSON.stringify(errorResponse(request?.id, error)))
+            socket.send(JSON.stringify(SimulationProtocol.JsonRpc.failure(request?.id, error)))
           }
         },
       },
diff --git a/packages/simulation/src/protocol/index.ts b/packages/simulation/src/protocol/index.ts
new file mode 100644
index 0000000000..6ff63c9bb3
--- /dev/null
+++ b/packages/simulation/src/protocol/index.ts
@@ -0,0 +1,145 @@
+import { Effect, Schema } from "effect"
+
+const JsonRpcID = Schema.Union([Schema.String, Schema.Number, Schema.Null])
+type Json = Schema.Schema.Type<typeof Schema.Json>
+
+export namespace JsonRpc {
+  export const Request = Schema.Struct({
+    jsonrpc: Schema.Literal("2.0"),
+    id: Schema.optional(JsonRpcID),
+    method: Schema.String,
+    params: Schema.optional(Schema.Json),
+  })
+  export interface Request extends Schema.Schema.Type<typeof Request> {}
+
+  export const ErrorObject = Schema.Struct({
+    code: Schema.Number,
+    message: Schema.String,
+    data: Schema.optional(Schema.Json),
+  })
+
+  export const Response = Schema.Struct({
+    jsonrpc: Schema.Literal("2.0"),
+    id: JsonRpcID,
+    result: Schema.optional(Schema.Json),
+    error: Schema.optional(ErrorObject),
+  })
+  export interface Response extends Schema.Schema.Type<typeof Response> {}
+
+  export const decodeRequest = Schema.decodeUnknownSync(Request)
+
+  export function success(id: Request["id"], result: unknown): Response | undefined {
+    if (id === undefined) return undefined
+    return { jsonrpc: "2.0", id, result: result as Json }
+  }
+
+  export function failure(id: Request["id"], error: unknown): Response {
+    return {
+      jsonrpc: "2.0",
+      id: id ?? null,
+      error: {
+        code: -32000,
+        message: error instanceof Error ? error.message : String(error),
+      },
+    }
+  }
+}
+
+export namespace Frontend {
+  export const KeyModifiers = Schema.Struct({
+    ctrl: Schema.optional(Schema.Boolean),
+    shift: Schema.optional(Schema.Boolean),
+    meta: Schema.optional(Schema.Boolean),
+    super: Schema.optional(Schema.Boolean),
+    hyper: Schema.optional(Schema.Boolean),
+  })
+  export interface KeyModifiers extends Schema.Schema.Type<typeof KeyModifiers> {}
+
+  export const Action = Schema.Union([
+    Schema.Struct({ type: Schema.Literal("typeText"), text: Schema.String }),
+    Schema.Struct({ type: Schema.Literal("pressKey"), key: Schema.String, modifiers: Schema.optional(KeyModifiers) }),
+    Schema.Struct({ type: Schema.Literal("pressEnter") }),
+    Schema.Struct({ type: Schema.Literal("pressArrow"), direction: Schema.Literals(["up", "down", "left", "right"]) }),
+    Schema.Struct({ type: Schema.Literal("focus"), target: Schema.Number }),
+    Schema.Struct({ type: Schema.Literal("click"), target: Schema.Number, x: Schema.Number, y: Schema.Number }),
+  ])
+  export type Action = Schema.Schema.Type<typeof Action>
+
+  export const Element = Schema.Struct({
+    id: Schema.String,
+    num: Schema.Number,
+    x: Schema.Number,
+    y: Schema.Number,
+    width: Schema.Number,
+    height: Schema.Number,
+    focusable: Schema.Boolean,
+    focused: Schema.Boolean,
+    clickable: Schema.Boolean,
+    editor: Schema.Boolean,
+  })
+  export interface Element extends Schema.Schema.Type<typeof Element> {}
+
+  export const State = Schema.Struct({
+    screen: Schema.String,
+    focused: Schema.Struct({
+      renderable: Schema.optional(Schema.Number),
+      editor: Schema.Boolean,
+    }),
+    elements: Schema.Array(Element),
+    actions: Schema.Array(Action),
+  })
+  export interface State extends Schema.Schema.Type<typeof State> {}
+
+  export const ActionParams = Schema.Struct({ action: Action })
+  export interface ActionParams extends Schema.Schema.Type<typeof ActionParams> {}
+  export const decodeActionParams = Schema.decodeUnknownSync(ActionParams)
+
+  export const TraceRecord = Schema.Struct({
+    id: Schema.Number,
+    time: Schema.String,
+    type: Schema.String,
+    data: Schema.optional(Schema.Json),
+  })
+  export interface TraceRecord extends Schema.Schema.Type<typeof TraceRecord> {}
+
+  export const TraceList = Schema.Struct({ records: Schema.Array(TraceRecord) })
+  export interface TraceList extends Schema.Schema.Type<typeof TraceList> {}
+}
+
+export namespace Backend {
+  export const Item = Schema.Union([
+    Schema.Struct({ type: Schema.Literal("textDelta"), text: Schema.String }),
+    Schema.Struct({ type: Schema.Literal("reasoningDelta"), text: Schema.String }),
+    Schema.Struct({ type: Schema.Literal("toolCall"), id: Schema.String, name: Schema.String, input: Schema.Json }),
+    Schema.Struct({ type: Schema.Literal("raw"), chunk: Schema.Json }),
+  ])
+  export type Item = Schema.Schema.Type<typeof Item>
+
+  export const FinishReason = Schema.Literals(["stop", "tool-calls", "length", "content-filter"])
+  export type FinishReason = Schema.Schema.Type<typeof FinishReason>
+
+  export const ChunkParams = Schema.Struct({ id: Schema.String, items: Schema.Array(Item) })
+  export interface ChunkParams extends Schema.Schema.Type<typeof ChunkParams> {}
+
+  export const FinishParams = Schema.Struct({
+    id: Schema.String,
+    reason: FinishReason.pipe(Schema.withDecodingDefault(Effect.succeed("stop" as const))),
+  })
+  export interface FinishParams extends Schema.Schema.Type<typeof FinishParams> {}
+
+  export const OpenedExchange = Schema.Struct({ id: Schema.String, url: Schema.String, body: Schema.Json })
+  export interface OpenedExchange extends Schema.Schema.Type<typeof OpenedExchange> {}
+
+  export const NetworkLogEntry = Schema.Struct({
+    time: Schema.Number,
+    method: Schema.String,
+    url: Schema.String,
+    matched: Schema.Boolean,
+  })
+  export interface NetworkLogEntry extends Schema.Schema.Type<typeof NetworkLogEntry> {}
+
+  export const decodeChunkParams = Schema.decodeUnknownPromise(ChunkParams)
+  export const decodeFinishParams = Schema.decodeUnknownPromise(FinishParams)
+}
+
+export * as SimulationProtocol from "./index"

From 438654768c767d3d81b21d0c0181cf039e9d43d4 Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Fri, 3 Jul 2026 14:55:03 -0500
Subject: [PATCH 29/82] fix(codemode): require exact tool paths in guidance
 (#35224)

---
 packages/codemode/src/tool-runtime.ts    | 13 ++++----
 packages/codemode/test/codemode.test.ts  | 10 +++---
 packages/codemode/test/signature.test.ts | 40 ++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/packages/codemode/src/tool-runtime.ts b/packages/codemode/src/tool-runtime.ts
index fa3ddc6c2f..d79d0182b5 100644
--- a/packages/codemode/src/tool-runtime.ts
+++ b/packages/codemode/src/tool-runtime.ts
@@ -458,8 +458,8 @@ export const discoveryPlan = <R>(
 
   // Section order is deliberate: workflow first (the top is the least likely part of a long
   // description to be truncated or skimmed away), then rules, then syntax, with the budgeted
-  // catalog at the bottom. Example call forms use explicit `<namespace>.<tool>` placeholders -
-  // never a real or fabricated tool name.
+  // catalog at the bottom. Example call forms use placeholders - never a real or fabricated
+  // tool name - and show both dot and bracket notation so non-identifier names are not normalized.
   const intro = [
     "Write a CodeMode program to answer the request. Return code only.",
     empty
@@ -467,6 +467,7 @@ export const discoveryPlan = <R>(
       : complete
         ? "Execute JavaScript in a confined runtime. Inside this program, `tools` contains only the host-provided tools listed below; surrounding agent tools are not available unless listed here."
         : "Execute JavaScript in a confined runtime. Inside this program, `tools` contains only the host-provided tools listed or searchable below; surrounding agent tools are not available unless listed here.",
+    ...(empty ? [] : ["Do not infer or normalize tool names; use only exact signatures shown below or returned by search."]),
   ]
 
   // The search step exists only when search is advertised (PARTIAL catalog); a COMPLETE
@@ -480,14 +481,14 @@ export const discoveryPlan = <R>(
         ...(complete
           ? [
               "1. Pick a tool from the list under `## Available tools` - each line is the exact call signature; use it as-is rather than guessing segments.",
-              "2. Call it using the exact signature shown: `const res = await tools.<namespace>.<tool>(input)` - bracket notation may appear for names that are not JavaScript identifiers.",
+              '2. Call it using the exact signature shown; bracket notation and quotes are part of the path.',
               '3. Parse text results: `const data = typeof res === "string" ? JSON.parse(res) : res` - most tools return JSON as a string.',
               "4. Return only the fields you need: `return { <field>: data.<field> }` - raw payloads get truncated and waste context.",
             ]
           : [
-              '1. Find a tool (skip when it is already listed below): `const { items } = await tools.$codemode.search({ query: "<intent + key nouns>" })` - short phrases like "list issues" work best.',
+              '1. If the exact signature is not listed below, first search: `const { items } = await tools.$codemode.search({ query: "<intent + key nouns>" })`.',
               "2. Read the matches: each item is `{ path, description, signature }` - read the description before using an unfamiliar tool.",
-              "3. Call it with the result's `path` as-is (never guess segments): `const res = await tools.<namespace>.<tool>(input)` - bracket notation may appear for names that are not JavaScript identifiers.",
+              "3. Call the result's `path` as-is; bracket notation and quotes are part of the path.",
               '4. Parse text results: `const data = typeof res === "string" ? JSON.parse(res) : res` - most tools return JSON as a string.',
               "5. Return only the fields you need: `return { <field>: data.<field> }` - raw payloads get truncated and waste context.",
             ]),
@@ -504,7 +505,7 @@ export const discoveryPlan = <R>(
           : "- Only tools listed here or returned by `tools.$codemode.search` are available inside `tools`; tools from the surrounding agent/runtime are not implicitly exposed.",
         "- Filter, aggregate, and transform collections in code - never return them raw or call a tool per item across messages.",
         "- A result typed `Promise<unknown>` has no guaranteed shape - verify what actually came back before relying on its fields.",
-        "- Run independent calls in parallel: `await Promise.all(items.map((item) => tools.<namespace>.<tool>(item)))`.",
+        '- Run independent calls in parallel: `await Promise.all(items.map((item) => tools.<namespace>.<tool>(item)))`, or use `tools.<namespace>["tool-name"](item)` when the listed signature uses bracket notation.',
         "- `Object.keys(tools)` lists namespaces; `Object.keys(tools.<namespace>)` lists its tools; `for...in` works on both.",
         ...(complete
           ? []
diff --git a/packages/codemode/test/codemode.test.ts b/packages/codemode/test/codemode.test.ts
index eaa834e0a4..4fda88b384 100644
--- a/packages/codemode/test/codemode.test.ts
+++ b/packages/codemode/test/codemode.test.ts
@@ -622,12 +622,12 @@ describe("CodeMode public contract", () => {
     )
     expect(instructions).toContain("Return only the fields you need")
     expect(instructions).toContain("raw payloads get truncated and waste context")
-    expect(instructions).toContain("`const res = await tools.<namespace>.<tool>(input)`")
+    expect(instructions).toContain("Do not infer or normalize tool names")
+    expect(instructions).toContain("bracket notation and quotes are part of the path")
     expect(instructions).toContain("surrounding agent tools are not available unless listed here")
     expect(instructions).toContain("Only tools listed here are available inside `tools`")
-    expect(instructions).toContain("bracket notation may appear for names that are not JavaScript identifiers")
-    // Placeholders use the <namespace>.<tool>/<field> style ONLY - no fabricated tool
-    // names, and no real catalog tools cherry-picked into example lines.
+    // Placeholders use generic namespace/tool/field names only - no fabricated real tools
+    // and no real catalog tools cherry-picked into example lines.
     expect(instructions).toContain("`return { <field>: data.<field> }`")
     expect(instructions).not.toContain("total_count")
     expect(instructions).not.toContain("list_issues")
@@ -640,7 +640,7 @@ describe("CodeMode public contract", () => {
     // PARTIAL: the workflow starts with search (with query-style guidance that is clearly
     // a query string, never a tool name) and the browse-namespace rule appears.
     expect(partial).toContain(
-      '1. Find a tool (skip when it is already listed below): `const { items } = await tools.$codemode.search({ query: "<intent + key nouns>" })` - short phrases like "list issues" work best.',
+      '1. If the exact signature is not listed below, first search: `const { items } = await tools.$codemode.search({ query: "<intent + key nouns>" })`.',
     )
     expect(partial).toContain(
       "Only tools listed here or returned by `tools.$codemode.search` are available inside `tools`",
diff --git a/packages/codemode/test/signature.test.ts b/packages/codemode/test/signature.test.ts
index 9c45371d93..edf4c442c4 100644
--- a/packages/codemode/test/signature.test.ts
+++ b/packages/codemode/test/signature.test.ts
@@ -339,3 +339,43 @@ describe("pretty signatures in search results", () => {
     expect(instructions).not.toContain("/**")
   })
 })
+
+describe("non-identifier tool paths", () => {
+  const resolveLibrary = Tool.make({
+    description: "Resolve a Context7 library ID",
+    input: {
+      type: "object",
+      properties: {
+        query: { type: "string" },
+        libraryName: { type: "string" },
+      },
+      required: ["query", "libraryName"],
+    } as const,
+    run: () => Effect.succeed("/reactjs/react.dev"),
+  })
+  const runtime = CodeMode.make({ tools: { context7: { "resolve-library-id": resolveLibrary } } })
+
+  test("inline catalog uses bracket notation for dashed tool names", () => {
+    const instructions = runtime.instructions()
+
+    expect(instructions).toContain(
+      'tools.context7["resolve-library-id"](input: { query: string; libraryName: string }): Promise<unknown>',
+    )
+    expect(instructions).toContain("Do not infer or normalize tool names")
+    expect(instructions).toContain("bracket notation and quotes are part of the path")
+    expect(instructions).not.toContain("tools.context7.resolve-library-id")
+    expect(instructions).not.toContain("tools.context7.resolve_library_id")
+  })
+
+  test("search results return callable bracket-notation paths and signatures", async () => {
+    const result = await Effect.runPromise(
+      runtime.execute(`return await tools.$codemode.search({ query: "resolve library" })`),
+    )
+    expect(result.ok).toBe(true)
+    if (!result.ok) throw new Error("search failed")
+
+    const value = result.value as { items: Array<{ path: string; signature: string }> }
+    expect(value.items[0]?.path).toBe('tools.context7["resolve-library-id"]')
+    expect(value.items[0]?.signature).toContain('tools.context7["resolve-library-id"](input: {')
+  })
+})

From d097cc806508c6bdcfd3d9332a781d688c313ff4 Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Fri, 3 Jul 2026 15:10:25 -0500
Subject: [PATCH 30/82] feat(tui): render execute child calls on v2 (#35231)

---
 packages/tui/src/routes/session/index.tsx | 63 +++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/packages/tui/src/routes/session/index.tsx b/packages/tui/src/routes/session/index.tsx
index d406fe664e..b0f337c2d4 100644
--- a/packages/tui/src/routes/session/index.tsx
+++ b/packages/tui/src/routes/session/index.tsx
@@ -1810,6 +1810,9 @@ function ToolPart(props: { part: SessionMessageAssistantTool }) {
         <Match when={display() === "subagent"}>
           <Subagent {...toolprops} />
         </Match>
+        <Match when={display() === "execute"}>
+          <Execute {...toolprops} />
+        </Match>
         <Match when={display() === "apply_patch"}>
           <ApplyPatch {...toolprops} />
         </Match>
@@ -2296,6 +2299,65 @@ export function formatCompletedSubagentDetail(toolcalls: number, duration: strin
   return `${formatSubagentToolcalls(toolcalls)} · ${duration}`
 }
 
+type ExecuteCall = { tool: string; status: "running" | "completed" | "error"; input?: Record<string, unknown> }
+
+function executeCalls(value: unknown): ExecuteCall[] {
+  if (!Array.isArray(value)) return []
+  return value.flatMap((call) => {
+    const item = recordValue(call)
+    const tool = stringValue(item?.tool)
+    const status = stringValue(item?.status)
+    if (!tool || !status || !["running", "completed", "error"].includes(status)) return []
+    return [{ tool, status: status as ExecuteCall["status"], input: recordValue(item?.input) }]
+  })
+}
+
+function Execute(props: ToolProps) {
+  const ctx = use()
+  const { theme } = useTheme()
+  const isLoading = createMemo(() => props.part.state.status === "pending" || props.part.state.status === "running")
+  const calls = createMemo(() => executeCalls(props.metadata.toolCalls))
+  const output = createMemo(() => stripAnsi(props.output?.trim() ?? ""))
+  const hasRuntimeError = createMemo(() => props.metadata.error === true)
+  const outputPreview = createMemo(() => collapseToolOutput(output(), 4, 4 * Math.max(20, ctx.width - 6)).output)
+  const showOutput = createMemo(() => output() && hasRuntimeError())
+  const content = createMemo(() => {
+    const lines = ["execute"]
+    for (const call of calls()) {
+      const args = input(call.input ?? {})
+      lines.push(`↳ ${call.tool}${args ? ` ${args}` : ""}${call.status === "error" ? " (failed)" : ""}`)
+    }
+    return lines.join("\n")
+  })
+
+  return (
+    <>
+      <InlineTool
+        icon={hasRuntimeError() ? "✗" : props.part.state.status === "completed" ? "✓" : "│"}
+        color={hasRuntimeError() ? theme.error : undefined}
+        spinner={isLoading()}
+        pending="execute"
+        complete={true}
+        part={props.part}
+      >
+        {content()}
+      </InlineTool>
+      <Show when={showOutput()}>
+        <box paddingLeft={3}>
+          <For each={outputPreview().split("\n")}>
+            {(line, index) => (
+              <text paddingLeft={3} fg={theme.error}>
+                {index() === 0 ? "↳ " : "  "}
+                {line}
+              </text>
+            )}
+          </For>
+        </box>
+      </Show>
+    </>
+  )
+}
+
 function Edit(props: ToolProps) {
   const ctx = use()
   const { theme, syntax } = useTheme()
@@ -2571,6 +2633,7 @@ const toolDisplays = new Set([
   "write",
   "edit",
   "subagent",
+  "execute",
   "apply_patch",
   "todowrite",
   "question",

From 64e4f6f91b951680320a6cbe07e059a550c95261 Mon Sep 17 00:00:00 2001
From: Simon Klee <hello@simonklee.dk>
Date: Fri, 3 Jul 2026 22:47:04 +0200
Subject: [PATCH 31/82] cli: route run commands through v2 APIs (#35234)

---
 .../src/cli/cmd/run/footer.prompt.tsx         |  17 +-
 .../opencode/src/cli/cmd/run/footer.view.tsx  |   1 +
 packages/opencode/src/cli/cmd/run/runtime.ts  |   4 +-
 .../src/cli/cmd/run/stream-v2.transport.ts    | 378 +++++++++++++----
 packages/opencode/src/cli/cmd/run/types.ts    |   2 +
 .../test/cli/run/footer.view.test.tsx         |  49 ++-
 .../test/cli/run/stream-v2.transport.test.ts  | 389 ++++++++++++++++++
 7 files changed, 763 insertions(+), 77 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/run/footer.prompt.tsx b/packages/opencode/src/cli/cmd/run/footer.prompt.tsx
index 90efdc5695..9d10a5266a 100644
--- a/packages/opencode/src/cli/cmd/run/footer.prompt.tsx
+++ b/packages/opencode/src/cli/cmd/run/footer.prompt.tsx
@@ -175,14 +175,18 @@ function parseSlashCommand(text: string, commands: RunCommand[] | undefined) {
     return { type: "pending" as const }
   }
 
-  if (!commands.some((item) => item.name === head.name)) {
+  const item = commands.find((entry) => entry.name === head.name)
+  if (!item) {
     return { type: "none" as const }
   }
 
-  return { type: "command" as const, command: { name: head.name, arguments: head.arguments } }
+  return {
+    type: "command" as const,
+    command: { name: head.name, arguments: head.arguments, ...(item.source ? { source: item.source } : {}) },
+  }
 }
 
-function selectedCommand(text: string, command: RunPrompt["command"]) {
+export function selectedCommand(text: string, command: RunPrompt["command"], commands?: RunCommand[]) {
   if (!command) {
     return
   }
@@ -192,9 +196,14 @@ function selectedCommand(text: string, command: RunPrompt["command"]) {
     return
   }
 
+  // Bound drafts (e.g. the skill picker) may predate or omit the catalog
+  // source; resolve it at submit time so routing never degrades to a plain
+  // command for a skill entry.
+  const source = command.source ?? commands?.find((item) => item.name === command.name)?.source
   return {
     name: command.name,
     arguments: head.arguments,
+    ...(source ? { source } : {}),
   }
 }
 
@@ -1178,7 +1187,7 @@ export function createPromptState(input: PromptInput): PromptState {
       return
     }
 
-    const command = next.mode === "shell" ? undefined : selectedCommand(next.text, next.command)
+    const command = next.mode === "shell" ? undefined : selectedCommand(next.text, next.command, input.commands())
     if (!command && next.mode !== "shell" && isExitCommand(next.text)) {
       input.onExit()
       return
diff --git a/packages/opencode/src/cli/cmd/run/footer.view.tsx b/packages/opencode/src/cli/cmd/run/footer.view.tsx
index 245a24816d..a7c1321494 100644
--- a/packages/opencode/src/cli/cmd/run/footer.view.tsx
+++ b/packages/opencode/src/cli/cmd/run/footer.view.tsx
@@ -781,6 +781,7 @@ export function RunFooterView(props: RunFooterViewProps) {
                                 command: {
                                   name,
                                   arguments: "",
+                                  source: "skill",
                                 },
                               })
                               closePanel()
diff --git a/packages/opencode/src/cli/cmd/run/runtime.ts b/packages/opencode/src/cli/cmd/run/runtime.ts
index 8f3704fd41..e340a89cc3 100644
--- a/packages/opencode/src/cli/cmd/run/runtime.ts
+++ b/packages/opencode/src/cli/cmd/run/runtime.ts
@@ -665,7 +665,9 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
               (row) => row.commit.kind !== "user" || row.commit.messageID !== prompt.messageID,
             )
           }
-          includeFiles = false
+          // Shell and skill turns never send CLI file attachments; keep them
+          // pending for the next prompt-shaped turn.
+          if (prompt.mode !== "shell" && prompt.command?.source !== "skill") includeFiles = false
         } catch (error) {
           if (signal.aborted || footer.isClosed) {
             return
diff --git a/packages/opencode/src/cli/cmd/run/stream-v2.transport.ts b/packages/opencode/src/cli/cmd/run/stream-v2.transport.ts
index 614a960634..c15ed48e5b 100644
--- a/packages/opencode/src/cli/cmd/run/stream-v2.transport.ts
+++ b/packages/opencode/src/cli/cmd/run/stream-v2.transport.ts
@@ -77,6 +77,15 @@ type Wait = {
   onVisibleOutput?: (anchor: LocalReplayAnchor) => void
 }
 
+// One active session.shell call. The HTTP response is the completion signal;
+// callID correlates the live shell events once shell.started is observed, and
+// abort cancels the blocking request when the user interrupts the turn.
+type ShellWait = {
+  callID?: string
+  resolve: () => void
+  abort: () => void
+}
+
 type RunV2Event = V2Event
 type PromptFilePart = Extract<RunPromptPart, { type: "file" }>
 
@@ -99,6 +108,11 @@ type State = {
   projectedReasoning: Map<string, string>
   tools: Map<string, ToolState>
   finishedTools: Set<string>
+  skillMessages: Set<string>
+  shellCommands: Map<string, string>
+  shellStarted: Set<string>
+  shellEnded: Set<string>
+  shellWait?: ShellWait
   wait?: Wait
   connected: boolean
   closed: boolean
@@ -179,10 +193,71 @@ function promptFileSource(part: PromptFilePart) {
   }
 }
 
+function promptFiles(next: SessionTurnInput) {
+  return next.prompt.parts.flatMap((part) =>
+    part.type === "file"
+      ? [
+          {
+            uri: part.url,
+            name: part.filename,
+            source: promptFileSource(part),
+          },
+        ]
+      : [],
+  )
+}
+
+function promptAgents(next: SessionTurnInput) {
+  return next.prompt.parts.flatMap((part) =>
+    part.type === "agent"
+      ? [
+          {
+            name: part.name,
+            source: part.source ? { start: part.source.start, end: part.source.end, text: part.source.value } : undefined,
+          },
+        ]
+      : [],
+  )
+}
+
 function streamPartKey(messageID: string, partID: string) {
   return `${messageID}\u0000${partID}`
 }
 
+// Matches the commit shapes the legacy session-data reducer produced for direct
+// shell calls: one "start" commit rendering `$ command` and one "progress"
+// commit rendering the merged output (see toolEntryBody in tool.ts).
+function shellCommit(
+  callID: string,
+  command: string,
+  next: { text: string; phase: "start" | "progress"; toolState: "running" | "completed" },
+): StreamCommit {
+  return {
+    kind: "tool",
+    source: "tool",
+    partID: `shell:${callID}`,
+    tool: "bash",
+    shell: { callID, command },
+    ...next,
+  }
+}
+
+// session.shell resolves after the command settled server-side; the matching
+// live shell.ended event usually lands within the same tick, but hold the turn
+// briefly so the output commit renders inside it.
+const SHELL_OUTPUT_GRACE_MS = 1500
+
+function skillCommit(messageID: string, name: string): StreamCommit {
+  return {
+    kind: "system",
+    source: "system",
+    messageID,
+    partID: `skill:${messageID}`,
+    text: `→ Skill "${name}"`,
+    phase: "start",
+  }
+}
+
 async function resolveSelectedModel(input: StreamInput, next: Pick<SessionTurnInput, "model" | "variant" | "signal">) {
   if (next.model) return { providerID: next.model.providerID, id: next.model.modelID, variant: next.variant }
   if (!next.variant) return
@@ -213,6 +288,10 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
     projectedReasoning: new Map(),
     tools: new Map(),
     finishedTools: new Set(),
+    skillMessages: new Set(),
+    shellCommands: new Map(),
+    shellStarted: new Set(),
+    shellEnded: new Set(),
     connected: false,
     closed: false,
     initial: true,
@@ -314,6 +393,40 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       write([{ kind: "user", source: "system", text: message.text, phase: "start", messageID: message.id }])
       return
     }
+    if (message.type === "skill") {
+      if (state.wait?.messageID === message.id) state.wait.promoted = true
+      if (!render || state.skillMessages.has(message.id)) {
+        state.skillMessages.add(message.id)
+        return
+      }
+      state.skillMessages.add(message.id)
+      write([skillCommit(message.id, message.name)])
+      return
+    }
+    if (message.type === "shell") {
+      state.shellCommands.set(message.callID, message.command)
+      const completed = message.time.completed !== undefined
+      if (!render) {
+        // Suppressed history: mark settled shells rendered so live redelivery
+        // stays silent. A still-running shell stays unmarked and renders in
+        // full when its live shell.ended event arrives.
+        if (completed) {
+          state.shellStarted.add(message.callID)
+          state.shellEnded.add(message.callID)
+        }
+        return
+      }
+      if (!state.shellStarted.has(message.callID)) {
+        state.shellStarted.add(message.callID)
+        write([shellCommit(message.callID, message.command, { text: "running shell", phase: "start", toolState: "running" })])
+      }
+      if (completed && !state.shellEnded.has(message.callID)) {
+        state.shellEnded.add(message.callID)
+        write([shellCommit(message.callID, message.command, { text: message.output, phase: "progress", toolState: "completed" })])
+      }
+      if (completed && state.shellWait?.callID === message.callID) state.shellWait.resolve()
+      return
+    }
     if (message.type !== "assistant") return
     state.messageIDs.add(message.id)
     for (const item of message.content) {
@@ -412,6 +525,45 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       write([], { phase: "running", status: "assistant responding" })
       return
     }
+    if (event.type === "skill.activated") {
+      const messageID = event.id.replace(/^evt_/, "msg_")
+      if (state.wait) state.wait.promoted = true
+      if (state.skillMessages.has(messageID)) return
+      state.skillMessages.add(messageID)
+      write([skillCommit(messageID, event.data.name)])
+      return
+    }
+    if (event.type === "shell.started") {
+      state.shellCommands.set(event.data.callID, event.data.command)
+      const wait = state.shellWait
+      if (wait && wait.callID === undefined) wait.callID = event.data.callID
+      if (state.shellStarted.has(event.data.callID)) return
+      state.shellStarted.add(event.data.callID)
+      write([shellCommit(event.data.callID, event.data.command, { text: "running shell", phase: "start", toolState: "running" })], {
+        phase: "running",
+        status: "running shell",
+      })
+      return
+    }
+    if (event.type === "shell.ended") {
+      const command = state.shellCommands.get(event.data.callID) ?? ""
+      const commits: StreamCommit[] = []
+      if (!state.shellStarted.has(event.data.callID)) {
+        state.shellStarted.add(event.data.callID)
+        if (command) commits.push(shellCommit(event.data.callID, command, { text: "running shell", phase: "start", toolState: "running" }))
+      }
+      if (!state.shellEnded.has(event.data.callID)) {
+        state.shellEnded.add(event.data.callID)
+        commits.push(shellCommit(event.data.callID, command, { text: event.data.output, phase: "progress", toolState: "completed" }))
+      }
+      const wait = state.shellWait
+      // An unset callID means shell.started has not been observed yet (event
+      // delivery lag); mini serializes its own shells, so adopt this ended.
+      const owned = wait !== undefined && (wait.callID === undefined || wait.callID === event.data.callID)
+      write(commits, owned || state.wait ? undefined : { phase: "idle", status: "" })
+      if (owned) wait.resolve()
+      return
+    }
     if (event.type === "text.delta") {
       const key = streamPartKey(event.data.assistantMessageID, event.data.textID)
       const projected = state.projectedText.get(key)
@@ -673,12 +825,129 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
     controller.signal.removeEventListener("abort", abortReady)
   }
 
+  const runShellTurn = async (next: SessionTurnInput) => {
+    if (state.wait || state.shellWait) throw new Error("prompt already running")
+    if (!state.connected) throw new Error("Event stream is reconnecting")
+    const abort = new AbortController()
+    const onAbort = () => abort.abort()
+    next.signal?.addEventListener("abort", onAbort, { once: true })
+    let rendered!: () => void
+    const output = new Promise<void>((resolve) => {
+      rendered = resolve
+    })
+    const active: ShellWait = { resolve: rendered, abort: () => abort.abort() }
+    state.shellWait = active
+    input.trace?.write("send.shell", { sessionID: input.sessionID, command: next.prompt.text })
+    write([], { phase: "running", status: "running shell" })
+    try {
+      await input.sdk.v2.session.shell(
+        { sessionID: input.sessionID, command: next.prompt.text },
+        { throwOnError: true, signal: abort.signal },
+      )
+      await Promise.race([output, wait(SHELL_OUTPUT_GRACE_MS, abort.signal)])
+    } catch (error) {
+      if (abort.signal.aborted) return
+      throw error
+    } finally {
+      next.signal?.removeEventListener("abort", onAbort)
+      if (state.shellWait === active) state.shellWait = undefined
+    }
+  }
+
+  // Shared settlement scaffolding for prompt-shaped turns: registers the wait,
+  // wires interruption, sends, then blocks until the live settled event (or a
+  // hydration pass over an idle session) resolves it.
+  const runTurnWait = async (
+    next: SessionTurnInput,
+    messageID: string,
+    turn: { promoted?: boolean; send: () => Promise<unknown> },
+  ) => {
+    let resolve!: () => void
+    let reject!: (error: unknown) => void
+    const done = new Promise<void>((ok, fail) => {
+      resolve = ok
+      reject = fail
+    })
+    const active: Wait = {
+      messageID,
+      promoted: turn.promoted === true,
+      interrupted: false,
+      failureRendered: false,
+      resolve,
+      reject,
+      onVisibleOutput: next.onVisibleOutput,
+    }
+    state.wait = active
+    const interrupt = () => {
+      active.interrupted = true
+      void input.sdk.v2.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
+    }
+    next.signal?.addEventListener("abort", interrupt, { once: true })
+    try {
+      await turn.send()
+      await done
+    } catch (error) {
+      if (state.wait === active) state.wait = undefined
+      if (next.signal?.aborted) return
+      throw error
+    } finally {
+      next.signal?.removeEventListener("abort", interrupt)
+    }
+  }
+
   return {
     async runPromptTurn(next) {
-      if (next.prompt.mode === "shell") throw new Error("Shell is not yet available for current Session transcripts")
-      if (next.prompt.command) throw new Error("Commands are not yet available for current Session transcripts")
-      if (state.wait) throw new Error("prompt already running")
+      if (next.prompt.mode === "shell") {
+        await runShellTurn(next)
+        return
+      }
+      if (state.wait || state.shellWait) throw new Error("prompt already running")
       if (!state.connected) throw new Error("Event stream is reconnecting")
+      const messageID = next.prompt.messageID
+      if (!messageID) throw new Error("Prompt message ID is required")
+
+      const command = next.prompt.command
+      if (command?.source === "skill") {
+        input.trace?.write("send.skill", { sessionID: input.sessionID, messageID, skill: command.name })
+        await runTurnWait(next, messageID, {
+          send: () =>
+            input.sdk.v2.session.skill(
+              { sessionID: input.sessionID, id: messageID, skill: command.name },
+              { throwOnError: true, signal: next.signal },
+            ),
+        })
+        return
+      }
+      if (command) {
+        const selected = await resolveSelectedModel(input, next)
+        if (next.variant && !selected) throw new Error("Cannot select a variant before selecting a model")
+        // Agent and model ride the command payload; the server switches only
+        // when the command itself does not pin them.
+        const files = [
+          ...(next.includeFiles ? next.files : []).map((file) => ({ uri: file.url, name: file.filename })),
+          ...promptFiles(next),
+        ]
+        const agents = promptAgents(next)
+        input.trace?.write("send.command", { sessionID: input.sessionID, messageID, command: command.name })
+        await runTurnWait(next, messageID, {
+          send: () =>
+            input.sdk.v2.session.command(
+              {
+                sessionID: input.sessionID,
+                id: messageID,
+                command: command.name,
+                arguments: command.arguments,
+                agent: next.agent,
+                model: selected,
+                files: files.length ? files : undefined,
+                agents: agents.length ? agents : undefined,
+                delivery: "steer",
+              },
+              { throwOnError: true, signal: next.signal },
+            ),
+        })
+        return
+      }
 
       if (next.agent) {
         await input.sdk.v2.session.switchAgent(
@@ -695,78 +964,41 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
         )
 
       const prepared = await Promise.all((next.includeFiles ? next.files : []).map(prepareFile))
-      const promptFiles = next.prompt.parts.flatMap((part) =>
-        part.type === "file"
-          ? [
-              {
-                uri: part.url,
-                name: part.filename,
-                source: promptFileSource(part),
+      const attachments = [
+        ...prepared.flatMap((file) => (file.attachment ? [file.attachment] : [])),
+        ...promptFiles(next),
+      ]
+      const agents = promptAgents(next)
+      input.trace?.write("send.prompt", { sessionID: input.sessionID, messageID })
+      await runTurnWait(next, messageID, {
+        send: () =>
+          input.sdk.v2.session.prompt(
+            {
+              sessionID: input.sessionID,
+              id: messageID,
+              prompt: {
+                text: [
+                  next.prompt.text,
+                  ...prepared.flatMap((file) => (file.text ? [file.text] : [])),
+                ].join("\n\n"),
+                files: attachments.length ? attachments : undefined,
+                agents: agents.length ? agents : undefined,
               },
-            ]
-          : [],
-      )
-      const attachments = [...prepared.flatMap((file) => (file.attachment ? [file.attachment] : [])), ...promptFiles]
-      const agents = next.prompt.parts.flatMap((part) =>
-        part.type === "agent"
-          ? [
-              {
-                name: part.name,
-                source: part.source
-                  ? { start: part.source.start, end: part.source.end, text: part.source.value }
-                  : undefined,
-              },
-            ]
-          : [],
-      )
-      const messageID = next.prompt.messageID
-      if (!messageID) throw new Error("Prompt message ID is required")
-      let resolve!: () => void
-      let reject!: (error: unknown) => void
-      const done = new Promise<void>((done, fail) => {
-        resolve = done
-        reject = fail
-      })
-      const active: Wait = {
-        messageID,
-        promoted: false,
-        interrupted: false,
-        failureRendered: false,
-        resolve,
-        reject,
-        onVisibleOutput: next.onVisibleOutput,
-      }
-      state.wait = active
-      const interrupt = () => {
-        active.interrupted = true
-        void input.sdk.v2.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
-      }
-      next.signal?.addEventListener("abort", interrupt, { once: true })
-      try {
-        input.trace?.write("send.prompt", { sessionID: input.sessionID, messageID })
-        await input.sdk.v2.session.prompt(
-          {
-            sessionID: input.sessionID,
-            id: messageID,
-            prompt: {
-              text: [next.prompt.text, ...prepared.flatMap((file) => (file.text ? [file.text] : []))].join("\n\n"),
-              files: attachments.length ? attachments : undefined,
-              agents: agents.length ? agents : undefined,
+              delivery: "steer",
             },
-            delivery: "steer",
-          },
-          { throwOnError: true, signal: next.signal },
-        )
-        await done
-      } catch (error) {
-        if (state.wait === active) state.wait = undefined
-        if (next.signal?.aborted) return
-        throw error
-      } finally {
-        next.signal?.removeEventListener("abort", interrupt)
-      }
+            { throwOnError: true, signal: next.signal },
+          ),
+      })
     },
     async interruptActiveTurn() {
+      // A running shell holds no drain, so session.interrupt cannot reach it;
+      // abort the blocking request instead. The server-side command keeps its
+      // own lifecycle and simply loses its waiter.
+      const shell = state.shellWait
+      if (shell) {
+        shell.abort()
+        return
+      }
       if (state.wait) state.wait.interrupted = true
       await input.sdk.v2.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
     },
@@ -787,6 +1019,10 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
         state.projectedReasoning.clear()
         state.tools.clear()
         state.finishedTools.clear()
+        state.skillMessages.clear()
+        state.shellCommands.clear()
+        state.shellStarted.clear()
+        state.shellEnded.clear()
         state.errors.clear()
         await hydrate({ render: true, reuseVisibleWait: false })
       } finally {
diff --git a/packages/opencode/src/cli/cmd/run/types.ts b/packages/opencode/src/cli/cmd/run/types.ts
index 27372596f1..f311febb26 100644
--- a/packages/opencode/src/cli/cmd/run/types.ts
+++ b/packages/opencode/src/cli/cmd/run/types.ts
@@ -93,6 +93,8 @@ export type RunPrompt = {
   command?: {
     name: string
     arguments: string
+    // Catalog source of the matched slash entry ("skill" routes to session.skill).
+    source?: string
   }
 }
 
diff --git a/packages/opencode/test/cli/run/footer.view.test.tsx b/packages/opencode/test/cli/run/footer.view.test.tsx
index 83042040f2..da9ce384b4 100644
--- a/packages/opencode/test/cli/run/footer.view.test.tsx
+++ b/packages/opencode/test/cli/run/footer.view.test.tsx
@@ -32,6 +32,7 @@ import type {
   StreamCommit,
 } from "@/cli/cmd/run/types"
 import { RunQuestionBody } from "@/cli/cmd/run/footer.question"
+import { selectedCommand } from "@/cli/cmd/run/footer.prompt"
 import { RejectField } from "@/cli/cmd/run/footer.permission"
 import { createTuiResolvedConfig } from "../../fixture/tui-runtime"
 
@@ -832,6 +833,52 @@ test("direct footer slash autocomplete keeps a real skills command", async () =>
   }
 })
 
+test("selectedCommand backfills the catalog source for bound drafts", () => {
+  const catalog = [command({ name: "opencode-ts", description: "TS skill", source: "skill" })]
+
+  // The skill picker binds `/name ` drafts; older drafts may lack source.
+  expect(selectedCommand("/opencode-ts fix it", { name: "opencode-ts", arguments: "" }, catalog)).toEqual({
+    name: "opencode-ts",
+    arguments: "fix it",
+    source: "skill",
+  })
+  // An explicit source wins without a catalog lookup.
+  expect(selectedCommand("/opencode-ts", { name: "opencode-ts", arguments: "", source: "skill" })).toEqual({
+    name: "opencode-ts",
+    arguments: "",
+    source: "skill",
+  })
+  // Plain commands stay untagged.
+  expect(selectedCommand("/deploy prod", { name: "deploy", arguments: "" }, [
+    command({ name: "deploy", description: "Deploy" }),
+  ])).toEqual({ name: "deploy", arguments: "prod" })
+})
+
+test("direct footer tags skill slash submissions with their catalog source", async () => {
+  const submits: RunPrompt[] = []
+  const app = await renderFooter({
+    commands: [command({ name: "formatter", description: "Apply formatter fixes", source: "skill" })],
+    onSubmit(prompt) {
+      submits.push(prompt)
+      return true
+    },
+  })
+
+  try {
+    await app.renderOnce()
+    "/formatter src".split("").forEach((key) => app.mockInput.pressKey(key))
+    await app.renderOnce()
+    app.mockInput.pressEnter()
+    await app.renderOnce()
+
+    expect(submits).toEqual([
+      { text: "/formatter src", parts: [], command: { name: "formatter", arguments: "src", source: "skill" } },
+    ])
+  } finally {
+    app.cleanup()
+  }
+})
+
 // OpenTUI currently segfaults Bun while tearing down this composer-to-skill-panel transition.
 // Re-enable after the upstream renderer teardown fix lands.
 test.skip("direct footer skill picker inserts an editable bound skill command", async () => {
@@ -864,7 +911,7 @@ test.skip("direct footer skill picker inserts an editable bound skill command",
     app.mockInput.pressEnter()
     await app.renderOnce()
 
-    expect(submits).toEqual([{ text: "/new task", parts: [], command: { name: "new", arguments: "task" } }])
+    expect(submits).toEqual([{ text: "/new task", parts: [], command: { name: "new", arguments: "task", source: "skill" } }])
   } finally {
     app.cleanup()
   }
diff --git a/packages/opencode/test/cli/run/stream-v2.transport.test.ts b/packages/opencode/test/cli/run/stream-v2.transport.test.ts
index 8bf429e500..e43e88f934 100644
--- a/packages/opencode/test/cli/run/stream-v2.transport.test.ts
+++ b/packages/opencode/test/cli/run/stream-v2.transport.test.ts
@@ -1002,6 +1002,395 @@ describe("V2 mini transport", () => {
     await transport.close()
   })
 
+  test("runs a shell turn through v2.session.shell and renders live output", async () => {
+    const events = feed()
+    events.push(connected())
+    const client = sdk({ streams: [events] })
+    const ui = footer()
+    const transport = await createSessionTransport({
+      sdk: client,
+      sessionID: "ses_1",
+      thinking: false,
+      limits: () => ({}),
+      footer: ui.api,
+    })
+    let request: Parameters<OpencodeClient["v2"]["session"]["shell"]>[0] | undefined
+    spyOn(client.v2.session, "shell").mockImplementation((input) => {
+      request = input
+      queueMicrotask(() => {
+        events.push({
+          id: "evt_shell_start",
+          created: 0,
+          type: "shell.started",
+          durable: durable("ses_1"),
+          data: { sessionID: "ses_1", callID: "call_shell", command: "ls" },
+        })
+        events.push({
+          id: "evt_shell_end",
+          created: 0,
+          type: "shell.ended",
+          durable: durable("ses_1", 1),
+          data: { sessionID: "ses_1", callID: "call_shell", output: "file.txt" },
+        })
+      })
+      return ok(undefined) as never
+    })
+
+    await transport.runPromptTurn({
+      agent: undefined,
+      model: undefined,
+      variant: undefined,
+      prompt: { text: "ls", parts: [], mode: "shell" },
+      files: [],
+      includeFiles: true,
+    })
+
+    expect(request).toMatchObject({ sessionID: "ses_1", command: "ls" })
+    expect(ui.commits.filter((item) => item.shell)).toMatchObject([
+      { phase: "start", tool: "bash", toolState: "running", shell: { callID: "call_shell", command: "ls" } },
+      { phase: "progress", text: "file.txt", toolState: "completed", shell: { callID: "call_shell", command: "ls" } },
+    ])
+    expect(ui.events).toContainEqual({ type: "stream.patch", patch: { phase: "running", status: "running shell" } })
+    await transport.close()
+  })
+
+  test("aborts an active shell turn without interrupting the session", async () => {
+    const events = feed()
+    events.push(connected())
+    const client = sdk({ streams: [events] })
+    const ui = footer()
+    const transport = await createSessionTransport({
+      sdk: client,
+      sessionID: "ses_1",
+      thinking: false,
+      limits: () => ({}),
+      footer: ui.api,
+    })
+    let started = false
+    let aborted = false
+    spyOn(client.v2.session, "shell").mockImplementation(
+      (_input, options) =>
+        new Promise((_, reject) => {
+          started = true
+          options?.signal?.addEventListener("abort", () => {
+            aborted = true
+            reject(new Error("aborted"))
+          })
+        }) as never,
+    )
+    const interrupted = spyOn(client.v2.session, "interrupt").mockImplementation(() => ok(undefined))
+
+    const turn = transport.runPromptTurn({
+      agent: undefined,
+      model: undefined,
+      variant: undefined,
+      prompt: { text: "sleep 100", parts: [], mode: "shell" },
+      files: [],
+      includeFiles: true,
+    })
+    while (!started) await Bun.sleep(0)
+    await transport.interruptActiveTurn()
+    await turn
+
+    expect(aborted).toBe(true)
+    expect(interrupted).not.toHaveBeenCalled()
+    await transport.close()
+  })
+
+  test("hydrates projected shell transcripts once and dedupes live redelivery", async () => {
+    const events = feed()
+    events.push(connected())
+    const client = sdk({
+      streams: [events],
+      messages: {
+        ses_1: [
+          {
+            id: "msg_shell",
+            type: "shell" as const,
+            callID: "call_1",
+            command: "ls",
+            output: "file.txt",
+            time: { created: 1, completed: 2 },
+          },
+        ],
+      },
+    })
+    const ui = footer()
+    const transport = await createSessionTransport({
+      sdk: client,
+      sessionID: "ses_1",
+      thinking: false,
+      replay: true,
+      limits: () => ({}),
+      footer: ui.api,
+    })
+    events.push({
+      id: "evt_shell_end",
+      created: 0,
+      type: "shell.ended",
+      durable: durable("ses_1", 1),
+      data: { sessionID: "ses_1", callID: "call_1", output: "file.txt" },
+    })
+    await Bun.sleep(0)
+    await Bun.sleep(0)
+
+    expect(ui.commits.filter((item) => item.shell)).toMatchObject([
+      { phase: "start", shell: { callID: "call_1", command: "ls" } },
+      { phase: "progress", text: "file.txt", toolState: "completed" },
+    ])
+    await transport.close()
+  })
+
+  test("routes command prompts through v2.session.command", async () => {
+    const events = feed()
+    events.push(connected())
+    const client = sdk({ streams: [events] })
+    const ui = footer()
+    const transport = await createSessionTransport({
+      sdk: client,
+      sessionID: "ses_1",
+      thinking: false,
+      limits: () => ({}),
+      footer: ui.api,
+    })
+    let request: Parameters<OpencodeClient["v2"]["session"]["command"]>[0] | undefined
+    spyOn(client.v2.session, "command").mockImplementation((input) => {
+      request = input
+      queueMicrotask(() => {
+        events.push({
+          id: "evt_prompted",
+          created: 0,
+          type: "prompt.promoted",
+          durable: durable("ses_1"),
+          data: {
+            sessionID: "ses_1",
+            inputID: "msg_cmd",
+          },
+        })
+        events.push({
+          id: "evt_settled",
+          created: 0,
+          type: "execution.settled",
+          data: { sessionID: "ses_1", outcome: "success" },
+        })
+      })
+      return ok({
+        data: {
+          admittedSeq: 1,
+          id: input.id ?? "msg_cmd",
+          sessionID: "ses_1",
+          prompt: { text: "evaluated template" },
+          delivery: "steer" as const,
+          timeCreated: 2,
+        },
+      })
+    })
+
+    await transport.runPromptTurn({
+      agent: "build",
+      model: { providerID: "test", modelID: "model" },
+      variant: undefined,
+      prompt: {
+        messageID: "msg_cmd",
+        text: "/deploy prod",
+        parts: [],
+        command: { name: "deploy", arguments: "prod" },
+      },
+      files: [],
+      includeFiles: true,
+    })
+
+    expect(request).toMatchObject({
+      sessionID: "ses_1",
+      id: "msg_cmd",
+      command: "deploy",
+      arguments: "prod",
+      agent: "build",
+      model: { providerID: "test", id: "model" },
+      delivery: "steer",
+    })
+    // Selection rides the command payload; no separate client-side switch.
+    expect(client.v2.session.switchAgent).not.toHaveBeenCalled()
+    expect(client.v2.session.switchModel).not.toHaveBeenCalled()
+    await transport.close()
+  })
+
+  test("routes skill prompts through v2.session.skill and settles without promotion", async () => {
+    const events = feed()
+    events.push(connected())
+    const client = sdk({ streams: [events] })
+    const ui = footer()
+    const transport = await createSessionTransport({
+      sdk: client,
+      sessionID: "ses_1",
+      thinking: false,
+      limits: () => ({}),
+      footer: ui.api,
+    })
+    let request: Parameters<OpencodeClient["v2"]["session"]["skill"]>[0] | undefined
+    const command = spyOn(client.v2.session, "command")
+    const prompt = spyOn(client.v2.session, "prompt")
+    spyOn(client.v2.session, "skill").mockImplementation((input) => {
+      request = input
+      queueMicrotask(() => {
+        events.push({
+          id: "evt_skill",
+          created: 0,
+          type: "skill.activated",
+          durable: durable("ses_1"),
+          data: {
+            sessionID: "ses_1",
+            name: input.skill ?? "tigerstyle",
+            text: "skill instructions",
+          },
+        })
+        events.push({
+          id: "evt_settled",
+          created: 0,
+          type: "execution.settled",
+          data: { sessionID: "ses_1", outcome: "success" },
+        })
+      })
+      return ok(undefined) as never
+    })
+
+    await transport.runPromptTurn({
+      agent: undefined,
+      model: undefined,
+      variant: undefined,
+      prompt: {
+        messageID: "msg_skill",
+        text: "/tigerstyle",
+        parts: [],
+        command: { name: "tigerstyle", arguments: "", source: "skill" },
+      },
+      files: [],
+      includeFiles: true,
+    })
+
+    expect(request).toMatchObject({ sessionID: "ses_1", id: "msg_skill", skill: "tigerstyle" })
+    expect(command).not.toHaveBeenCalled()
+    expect(prompt).not.toHaveBeenCalled()
+    expect(ui.commits).toContainEqual(
+      expect.objectContaining({ kind: "system", text: '→ Skill "tigerstyle"', messageID: "msg_skill" }),
+    )
+    await transport.close()
+  })
+
+  test("does not resolve a skill turn before the matching activation is observed", async () => {
+    const events = feed()
+    events.push(connected())
+    const client = sdk({ streams: [events] })
+    const ui = footer()
+    const transport = await createSessionTransport({
+      sdk: client,
+      sessionID: "ses_1",
+      thinking: false,
+      limits: () => ({}),
+      footer: ui.api,
+    })
+    let sent = false
+    spyOn(client.v2.session, "skill").mockImplementation(() => {
+      sent = true
+      return ok(undefined) as never
+    })
+
+    let done = false
+    const turn = transport
+      .runPromptTurn({
+        agent: undefined,
+        model: undefined,
+        variant: undefined,
+        prompt: {
+          messageID: "msg_skill",
+          text: "/tigerstyle",
+          parts: [],
+          command: { name: "tigerstyle", arguments: "", source: "skill" },
+        },
+        files: [],
+        includeFiles: true,
+      })
+      .then(() => {
+        done = true
+      })
+    while (!sent) await Bun.sleep(0)
+    events.push({
+      id: "evt_unrelated_settled",
+      created: 0,
+      type: "execution.settled",
+      data: { sessionID: "ses_1", outcome: "success" },
+    })
+    await Bun.sleep(0)
+    await Bun.sleep(0)
+    expect(done).toBe(false)
+
+    events.push({
+      id: "evt_skill",
+      created: 0,
+      type: "skill.activated",
+      durable: durable("ses_1"),
+      data: {
+        sessionID: "ses_1",
+        name: "tigerstyle",
+        text: "skill instructions",
+      },
+    })
+    events.push({
+      id: "evt_skill_settled",
+      created: 0,
+      type: "execution.settled",
+      data: { sessionID: "ses_1", outcome: "success" },
+    })
+    await turn
+
+    expect(done).toBe(true)
+    await transport.close()
+  })
+
+  test("hydrates skill activation messages once and dedupes live redelivery", async () => {
+    const events = feed()
+    events.push(connected())
+    const client = sdk({
+      streams: [events],
+      messages: {
+        ses_1: [
+          {
+            id: "msg_skill",
+            type: "skill" as const,
+            name: "tigerstyle",
+            text: "skill instructions",
+            time: { created: 2 },
+          },
+        ],
+      },
+    })
+    const ui = footer()
+    const transport = await createSessionTransport({
+      sdk: client,
+      sessionID: "ses_1",
+      thinking: false,
+      replay: true,
+      limits: () => ({}),
+      footer: ui.api,
+    })
+    events.push({
+      id: "evt_skill",
+      created: 0,
+      type: "skill.activated",
+      durable: durable("ses_1"),
+      data: {
+        sessionID: "ses_1",
+        name: "tigerstyle",
+        text: "skill instructions",
+      },
+    })
+    await Bun.sleep(0)
+    await Bun.sleep(0)
+
+    expect(ui.commits.filter((item) => item.text === '→ Skill "tigerstyle"')).toHaveLength(1)
+    await transport.close()
+  })
+
   test("discovers a live child session and tracks its tab and selected detail", async () => {
     const events = feed()
     events.push(connected())

From 650d7743726dada59c30c56d0118783e34ad65ff Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Fri, 3 Jul 2026 17:30:25 -0400
Subject: [PATCH 32/82] refactor(schema): session shell payloads and event
 prefix restore (#35229)

---
 .../src/components/dialog-custom-provider.tsx |    2 +-
 .../app/src/components/settings-providers.tsx |    2 +-
 .../src/components/settings-v2/providers.tsx  |    2 +-
 .../client/src/promise/generated/types.ts     |  274 +++-
 packages/client/test/effect.test.ts           |   10 +-
 packages/client/test/promise.test.ts          |    4 +-
 packages/core/src/database/migration.gen.ts   |    1 +
 ...703190000_reset_v2_shell_event_payloads.ts |   14 +
 packages/core/src/session.ts                  |   66 +-
 packages/core/src/session/compaction.ts       |    2 +-
 packages/core/src/session/message-updater.ts  |  106 +-
 packages/core/src/session/projector.ts        |   21 +-
 .../core/src/session/runner/to-llm-message.ts |    2 +-
 packages/core/test/session-create.test.ts     |   18 +-
 packages/core/test/session-log.test.ts        |    8 +-
 packages/core/test/session-projector.test.ts  |   31 +-
 packages/core/test/session-prompt.test.ts     |   10 +-
 .../core/test/session-runner-message.test.ts  |   16 +-
 .../core/test/session-runner-recorded.test.ts |   12 +-
 .../test/session-runner-tool-events.test.ts   |    8 +-
 packages/core/test/session-runner.test.ts     |    6 +-
 .../src/cli/cmd/run/noninteractive.ts         |   30 +-
 .../opencode/src/cli/cmd/run/session-data.ts  |   30 +-
 .../src/cli/cmd/run/stream-v2.subagent.ts     |   30 +-
 .../src/cli/cmd/run/stream-v2.transport.ts    |  125 +-
 .../test/cli/run/noninteractive.test.ts       |    4 +-
 .../test/cli/run/session-data.test.ts         |   12 +-
 .../test/cli/run/stream-v2.transport.test.ts  |  139 +-
 .../opencode/test/server/httpapi-pty.test.ts  |    4 +-
 .../opencode/test/server/httpapi-sdk.test.ts  |    2 +-
 .../opencode/test/tool/apply_patch.test.ts    |    4 +-
 .../test/tool/fixtures/models-api.json        |    4 +-
 .../test/v2/session-message-updater.test.ts   |   26 +-
 packages/schema/src/session-event.ts          |   76 +-
 packages/schema/src/session-message.ts        |    6 +-
 packages/schema/test/event-manifest.test.ts   |   64 +-
 packages/sdk-next/test/embedded.test.ts       |   12 +-
 packages/sdk/js/script/build.ts               |    4 +-
 packages/sdk/js/src/v2/gen/types.gen.ts       | 1324 +++++++++--------
 packages/sdk/openapi.json                     |    6 +-
 packages/tui/src/context/data.tsx             |   77 +-
 .../feature-plugins/system/notifications.ts   |   16 +-
 packages/tui/src/routes/session/index.tsx     |   18 +-
 packages/tui/src/routes/session/rows.ts       |   28 +-
 .../test/cli/cmd/tui/notifications.test.ts    |    6 +-
 packages/tui/test/cli/tui/data.test.tsx       |   32 +-
 packages/ui/src/components/provider-icon.tsx  |    2 +-
 specs/v2/schema-changelog.md                  |   23 +-
 specs/v2/session.md                           |    2 +-
 49 files changed, 1521 insertions(+), 1200 deletions(-)
 create mode 100644 packages/core/src/database/migration/20260703190000_reset_v2_shell_event_payloads.ts

diff --git a/packages/app/src/components/dialog-custom-provider.tsx b/packages/app/src/components/dialog-custom-provider.tsx
index 647e5002a2..dfc1bb8c22 100644
--- a/packages/app/src/components/dialog-custom-provider.tsx
+++ b/packages/app/src/components/dialog-custom-provider.tsx
@@ -177,7 +177,7 @@ export function DialogCustomProvider(props: Props) {
     >
       <div class="flex flex-col gap-6 px-2.5 pb-3 overflow-y-auto max-h-[60vh]">
         <div class="px-2.5 flex gap-4 items-center">
-          <ProviderIcon id="synthetic" class="size-5 shrink-0 icon-strong-base" />
+          <ProviderIcon id="session.synthetic" class="size-5 shrink-0 icon-strong-base" />
           <div class="text-16-medium text-text-strong">{language.t("provider.custom.title")}</div>
         </div>
 
diff --git a/packages/app/src/components/settings-providers.tsx b/packages/app/src/components/settings-providers.tsx
index 24e7a60104..ca6413e4ba 100644
--- a/packages/app/src/components/settings-providers.tsx
+++ b/packages/app/src/components/settings-providers.tsx
@@ -226,7 +226,7 @@ const SettingsProvidersContent: Component = () => {
             >
               <div class="flex flex-col min-w-0">
                 <div class="flex flex-wrap items-center gap-x-3 gap-y-1">
-                  <ProviderIcon id="synthetic" class="size-5 shrink-0 icon-strong-base" />
+                  <ProviderIcon id="session.synthetic" class="size-5 shrink-0 icon-strong-base" />
                   <span class="text-14-medium text-text-strong">{language.t("provider.custom.title")}</span>
                   <Tag>{language.t("settings.providers.tag.custom")}</Tag>
                 </div>
diff --git a/packages/app/src/components/settings-v2/providers.tsx b/packages/app/src/components/settings-v2/providers.tsx
index cd24bbd455..e244581b97 100644
--- a/packages/app/src/components/settings-v2/providers.tsx
+++ b/packages/app/src/components/settings-v2/providers.tsx
@@ -223,7 +223,7 @@ export const SettingsProvidersV2: Component = () => {
             <div class="settings-v2-provider-row" data-component="custom-provider-section">
               <div class="settings-v2-provider-lead">
                 <ProviderIcon
-                  id="synthetic"
+                  id="session.synthetic"
                   width={PROVIDER_ICON_SIZE}
                   height={PROVIDER_ICON_SIZE}
                   class="settings-v2-provider-icon shrink-0"
diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts
index 13dab421d5..6d1db75b5e 100644
--- a/packages/client/src/promise/generated/types.ts
+++ b/packages/client/src/promise/generated/types.ts
@@ -976,9 +976,27 @@ export type SessionContextOutput = {
         readonly metadata?: { readonly [x: string]: JsonValue }
         readonly time: { readonly created: number; readonly completed?: number }
         readonly type: "shell"
-        readonly callID: string
-        readonly command: string
-        readonly output: string
+        readonly shell: {
+          readonly id: string
+          readonly status: "running" | "exited" | "timeout" | "killed"
+          readonly command: string
+          readonly cwd: string
+          readonly shell: string
+          readonly file: string
+          readonly pid?: number
+          readonly exit?: number | "Infinity" | "-Infinity" | "NaN"
+          readonly metadata: { readonly [x: string]: JsonValue }
+          readonly time: {
+            readonly started: number | "Infinity" | "-Infinity" | "NaN"
+            readonly completed?: number | "Infinity" | "-Infinity" | "NaN"
+          }
+        }
+        readonly output?: {
+          readonly output: string
+          readonly cursor: number
+          readonly size: number
+          readonly truncated: boolean
+        }
       }
     | {
         readonly id: string
@@ -1109,7 +1127,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "agent.selected"
+          readonly type: "session.agent.selected"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: { readonly sessionID: string; readonly agent: string }
@@ -1118,7 +1136,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "model.selected"
+          readonly type: "session.model.selected"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
@@ -1143,7 +1161,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "renamed"
+          readonly type: "session.renamed"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: { readonly sessionID: string; readonly title: string }
@@ -1152,7 +1170,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "forked"
+          readonly type: "session.forked"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: { readonly sessionID: string; readonly parentID: string; readonly from?: string }
@@ -1161,7 +1179,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "prompt.promoted"
+          readonly type: "session.prompt.promoted"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: { readonly sessionID: string; readonly inputID: string }
@@ -1170,7 +1188,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "prompt.admitted"
+          readonly type: "session.prompt.admitted"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
@@ -1206,7 +1224,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "synthetic"
+          readonly type: "session.synthetic"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
@@ -1220,7 +1238,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "skill.activated"
+          readonly type: "session.skill.activated"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: { readonly sessionID: string; readonly name: string; readonly text: string }
@@ -1229,25 +1247,59 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "shell.started"
+          readonly type: "session.shell.started"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
-          readonly data: { readonly sessionID: string; readonly callID: string; readonly command: string }
+          readonly data: {
+            readonly sessionID: string
+            readonly shell: {
+              readonly id: string
+              readonly status: "running" | "exited" | "timeout" | "killed"
+              readonly command: string
+              readonly cwd: string
+              readonly shell: string
+              readonly file: string
+              readonly pid?: number
+              readonly exit?: number
+              readonly metadata: { readonly [x: string]: unknown }
+              readonly time: { readonly started: number; readonly completed?: number }
+            }
+          }
         }
       | {
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "shell.ended"
+          readonly type: "session.shell.ended"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
-          readonly data: { readonly sessionID: string; readonly callID: string; readonly output: string }
+          readonly data: {
+            readonly sessionID: string
+            readonly shell: {
+              readonly id: string
+              readonly status: "running" | "exited" | "timeout" | "killed"
+              readonly command: string
+              readonly cwd: string
+              readonly shell: string
+              readonly file: string
+              readonly pid?: number
+              readonly exit?: number
+              readonly metadata: { readonly [x: string]: unknown }
+              readonly time: { readonly started: number; readonly completed?: number }
+            }
+            readonly output: {
+              readonly output: string
+              readonly cursor: number
+              readonly size: number
+              readonly truncated: boolean
+            }
+          }
         }
       | {
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "step.started"
+          readonly type: "session.step.started"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
@@ -1262,7 +1314,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "step.ended"
+          readonly type: "session.step.ended"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
@@ -1284,7 +1336,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "step.failed"
+          readonly type: "session.step.failed"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
@@ -1297,7 +1349,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "text.started"
+          readonly type: "session.text.started"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: { readonly sessionID: string; readonly assistantMessageID: string; readonly textID: string }
@@ -1306,7 +1358,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "text.ended"
+          readonly type: "session.text.ended"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
@@ -1320,7 +1372,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "reasoning.started"
+          readonly type: "session.reasoning.started"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
@@ -1334,7 +1386,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "reasoning.ended"
+          readonly type: "session.reasoning.ended"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
@@ -1349,7 +1401,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "tool.input.started"
+          readonly type: "session.tool.input.started"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
@@ -1363,7 +1415,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "tool.input.ended"
+          readonly type: "session.tool.input.ended"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
@@ -1377,7 +1429,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "tool.called"
+          readonly type: "session.tool.called"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
@@ -1396,7 +1448,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "tool.progress"
+          readonly type: "session.tool.progress"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
@@ -1414,7 +1466,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "tool.success"
+          readonly type: "session.tool.success"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
@@ -1438,7 +1490,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "tool.failed"
+          readonly type: "session.tool.failed"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
@@ -1457,7 +1509,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "retried"
+          readonly type: "session.retried"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
@@ -1477,7 +1529,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "compaction.started"
+          readonly type: "session.compaction.started"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: { readonly sessionID: string; readonly reason: "auto" | "manual" }
@@ -1486,7 +1538,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "compaction.ended"
+          readonly type: "session.compaction.ended"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
@@ -1500,7 +1552,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "revert.staged"
+          readonly type: "session.revert.staged"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: {
@@ -1524,7 +1576,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "revert.cleared"
+          readonly type: "session.revert.cleared"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: { readonly sessionID: string }
@@ -1533,7 +1585,7 @@ export type SessionLogOutput =
           readonly id: string
           readonly created: number
           readonly metadata?: { readonly [x: string]: unknown }
-          readonly type: "revert.committed"
+          readonly type: "session.revert.committed"
           readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
           readonly location?: { readonly directory: string; readonly workspaceID?: string }
           readonly data: { readonly sessionID: string; readonly messageID: string }
@@ -1617,9 +1669,27 @@ export type SessionMessageOutput = {
         readonly metadata?: { readonly [x: string]: JsonValue }
         readonly time: { readonly created: number; readonly completed?: number }
         readonly type: "shell"
-        readonly callID: string
-        readonly command: string
-        readonly output: string
+        readonly shell: {
+          readonly id: string
+          readonly status: "running" | "exited" | "timeout" | "killed"
+          readonly command: string
+          readonly cwd: string
+          readonly shell: string
+          readonly file: string
+          readonly pid?: number
+          readonly exit?: number | "Infinity" | "-Infinity" | "NaN"
+          readonly metadata: { readonly [x: string]: JsonValue }
+          readonly time: {
+            readonly started: number | "Infinity" | "-Infinity" | "NaN"
+            readonly completed?: number | "Infinity" | "-Infinity" | "NaN"
+          }
+        }
+        readonly output?: {
+          readonly output: string
+          readonly cursor: number
+          readonly size: number
+          readonly truncated: boolean
+        }
       }
     | {
         readonly id: string
@@ -1798,9 +1868,27 @@ export type MessageListOutput = {
         readonly metadata?: { readonly [x: string]: JsonValue }
         readonly time: { readonly created: number; readonly completed?: number }
         readonly type: "shell"
-        readonly callID: string
-        readonly command: string
-        readonly output: string
+        readonly shell: {
+          readonly id: string
+          readonly status: "running" | "exited" | "timeout" | "killed"
+          readonly command: string
+          readonly cwd: string
+          readonly shell: string
+          readonly file: string
+          readonly pid?: number
+          readonly exit?: number | "Infinity" | "-Infinity" | "NaN"
+          readonly metadata: { readonly [x: string]: JsonValue }
+          readonly time: {
+            readonly started: number | "Infinity" | "-Infinity" | "NaN"
+            readonly completed?: number | "Infinity" | "-Infinity" | "NaN"
+          }
+        }
+        readonly output?: {
+          readonly output: string
+          readonly cursor: number
+          readonly size: number
+          readonly truncated: boolean
+        }
       }
     | {
         readonly id: string
@@ -4309,7 +4397,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "agent.selected"
+      readonly type: "session.agent.selected"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly sessionID: string; readonly agent: string }
@@ -4318,7 +4406,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "model.selected"
+      readonly type: "session.model.selected"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
@@ -4343,7 +4431,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "renamed"
+      readonly type: "session.renamed"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly sessionID: string; readonly title: string }
@@ -4352,7 +4440,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "forked"
+      readonly type: "session.forked"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly sessionID: string; readonly parentID: string; readonly from?: string }
@@ -4361,7 +4449,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "prompt.promoted"
+      readonly type: "session.prompt.promoted"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly sessionID: string; readonly inputID: string }
@@ -4370,7 +4458,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "prompt.admitted"
+      readonly type: "session.prompt.admitted"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
@@ -4397,7 +4485,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "execution.settled"
+      readonly type: "session.execution.settled"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly sessionID: string
@@ -4418,7 +4506,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "synthetic"
+      readonly type: "session.synthetic"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
@@ -4432,7 +4520,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "skill.activated"
+      readonly type: "session.skill.activated"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly sessionID: string; readonly name: string; readonly text: string }
@@ -4441,25 +4529,59 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "shell.started"
+      readonly type: "session.shell.started"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly sessionID: string; readonly callID: string; readonly command: string }
+      readonly data: {
+        readonly sessionID: string
+        readonly shell: {
+          readonly id: string
+          readonly status: "running" | "exited" | "timeout" | "killed"
+          readonly command: string
+          readonly cwd: string
+          readonly shell: string
+          readonly file: string
+          readonly pid?: number
+          readonly exit?: number
+          readonly metadata: { readonly [x: string]: unknown }
+          readonly time: { readonly started: number; readonly completed?: number }
+        }
+      }
     }
   | {
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "shell.ended"
+      readonly type: "session.shell.ended"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly sessionID: string; readonly callID: string; readonly output: string }
+      readonly data: {
+        readonly sessionID: string
+        readonly shell: {
+          readonly id: string
+          readonly status: "running" | "exited" | "timeout" | "killed"
+          readonly command: string
+          readonly cwd: string
+          readonly shell: string
+          readonly file: string
+          readonly pid?: number
+          readonly exit?: number
+          readonly metadata: { readonly [x: string]: unknown }
+          readonly time: { readonly started: number; readonly completed?: number }
+        }
+        readonly output: {
+          readonly output: string
+          readonly cursor: number
+          readonly size: number
+          readonly truncated: boolean
+        }
+      }
     }
   | {
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "step.started"
+      readonly type: "session.step.started"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
@@ -4474,7 +4596,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "step.ended"
+      readonly type: "session.step.ended"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
@@ -4496,7 +4618,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "step.failed"
+      readonly type: "session.step.failed"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
@@ -4509,7 +4631,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "text.started"
+      readonly type: "session.text.started"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly sessionID: string; readonly assistantMessageID: string; readonly textID: string }
@@ -4518,7 +4640,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "text.delta"
+      readonly type: "session.text.delta"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly sessionID: string
@@ -4531,7 +4653,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "text.ended"
+      readonly type: "session.text.ended"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
@@ -4545,7 +4667,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "reasoning.started"
+      readonly type: "session.reasoning.started"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
@@ -4559,7 +4681,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "reasoning.delta"
+      readonly type: "session.reasoning.delta"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly sessionID: string
@@ -4572,7 +4694,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "reasoning.ended"
+      readonly type: "session.reasoning.ended"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
@@ -4587,7 +4709,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "tool.input.started"
+      readonly type: "session.tool.input.started"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
@@ -4601,7 +4723,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "tool.input.delta"
+      readonly type: "session.tool.input.delta"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
         readonly sessionID: string
@@ -4614,7 +4736,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "tool.input.ended"
+      readonly type: "session.tool.input.ended"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
@@ -4628,7 +4750,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "tool.called"
+      readonly type: "session.tool.called"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
@@ -4647,7 +4769,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "tool.progress"
+      readonly type: "session.tool.progress"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
@@ -4665,7 +4787,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "tool.success"
+      readonly type: "session.tool.success"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
@@ -4689,7 +4811,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "tool.failed"
+      readonly type: "session.tool.failed"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
@@ -4708,7 +4830,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "retried"
+      readonly type: "session.retried"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
@@ -4728,7 +4850,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "compaction.started"
+      readonly type: "session.compaction.started"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly sessionID: string; readonly reason: "auto" | "manual" }
@@ -4737,7 +4859,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "compaction.delta"
+      readonly type: "session.compaction.delta"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly sessionID: string; readonly text: string }
     }
@@ -4745,7 +4867,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "compaction.ended"
+      readonly type: "session.compaction.ended"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
@@ -4759,7 +4881,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "revert.staged"
+      readonly type: "session.revert.staged"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {
@@ -4783,7 +4905,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "revert.cleared"
+      readonly type: "session.revert.cleared"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly sessionID: string }
@@ -4792,7 +4914,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "revert.committed"
+      readonly type: "session.revert.committed"
       readonly durable: { readonly aggregateID: string; readonly seq: number; readonly version: number }
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly sessionID: string; readonly messageID: string }
diff --git a/packages/client/test/effect.test.ts b/packages/client/test/effect.test.ts
index 5a7ec9b7cc..2077c27ca5 100644
--- a/packages/client/test/effect.test.ts
+++ b/packages/client/test/effect.test.ts
@@ -45,9 +45,9 @@ test("event.subscribe exposes and decodes the native Effect event stream", async
     return yield* client.event.subscribe().pipe(Stream.runCollect)
   }).pipe(Effect.provideService(HttpClient.HttpClient, httpClient), Effect.runPromise)
 
-  expect(Array.from(events).map((event) => event.type)).toEqual(["server.connected", "model.selected"])
+  expect(Array.from(events).map((event) => event.type)).toEqual(["server.connected", "session.model.selected"])
   const durable = events[1]
-  if (durable?.type !== "model.selected") throw new Error("Expected model event")
+  if (durable?.type !== "session.model.selected") throw new Error("Expected model event")
   expect(DateTime.toEpochMillis(durable.created)).toBe(1_717_171_717_000)
   expect(durable.durable).toEqual({ aggregateID: "ses_test", seq: 1, version: 1 })
 })
@@ -159,8 +159,8 @@ test("session methods retain decoded Effect inputs and outputs", async () => {
   expect(result.context).toEqual([])
   expect(logQueries[0]).toEqual({ after: "0" })
   const logged = Array.from(result.log)
-  expect(logged.map((item) => item.type)).toEqual(["model.selected", "log.synced"])
-  expect(logged[0]?.type === "model.selected" && DateTime.toEpochMillis(logged[0].created)).toBe(
+  expect(logged.map((item) => item.type)).toEqual(["session.model.selected", "log.synced"])
+  expect(logged[0]?.type === "session.model.selected" && DateTime.toEpochMillis(logged[0].created)).toBe(
     1_717_171_717_000,
   )
   expect(logged.at(-1)).toEqual(synced)
@@ -228,7 +228,7 @@ const modelSwitchedMessage = {
 const modelSwitchedEvent = {
   id: "evt_model",
   created: 1_717_171_717_000,
-  type: "model.selected",
+  type: "session.model.selected",
   durable: { aggregateID: "ses_test", seq: 1, version: 1 },
   data: {
     sessionID: "ses_test",
diff --git a/packages/client/test/promise.test.ts b/packages/client/test/promise.test.ts
index 9e8ea7acfe..d445a69c08 100644
--- a/packages/client/test/promise.test.ts
+++ b/packages/client/test/promise.test.ts
@@ -160,7 +160,7 @@ test("event.subscribe exposes the Promise event stream wire projection", async (
   for await (const event of client.event.subscribe()) events.push(event)
 
   expect(events).toEqual([{ id: "evt_connected", created: 0, type: "server.connected", data: {} }, modelSwitchedEvent])
-  expect(events[1]?.type === "model.selected" && events[1].created).toBe(1_717_171_717_000)
+  expect(events[1]?.type === "session.model.selected" && events[1].created).toBe(1_717_171_717_000)
 })
 
 test("event.subscribe terminates on malformed Promise SSE data", async () => {
@@ -329,7 +329,7 @@ const synced = { type: "log.synced", aggregateID: "ses_test", seq: 1 }
 const modelSwitchedEvent = {
   id: "evt_model",
   created: 1_717_171_717_000,
-  type: "model.selected",
+  type: "session.model.selected",
   durable: { aggregateID: "ses_test", seq: 1, version: 1 },
   data: {
     sessionID: "ses_test",
diff --git a/packages/core/src/database/migration.gen.ts b/packages/core/src/database/migration.gen.ts
index 7956b64f4d..e6a236f527 100644
--- a/packages/core/src/database/migration.gen.ts
+++ b/packages/core/src/database/migration.gen.ts
@@ -43,5 +43,6 @@ export const migrations = (
     import("./migration/20260702134641_add_session_context_entry"),
     import("./migration/20260703090000_reset_v2_event_rename_sweep"),
     import("./migration/20260703181610_event_created_column"),
+    import("./migration/20260703190000_reset_v2_shell_event_payloads"),
   ])
 ).map((module) => module.default) satisfies DatabaseMigration.Migration[]
diff --git a/packages/core/src/database/migration/20260703190000_reset_v2_shell_event_payloads.ts b/packages/core/src/database/migration/20260703190000_reset_v2_shell_event_payloads.ts
new file mode 100644
index 0000000000..ffbe40652c
--- /dev/null
+++ b/packages/core/src/database/migration/20260703190000_reset_v2_shell_event_payloads.ts
@@ -0,0 +1,14 @@
+import { Effect } from "effect"
+import type { DatabaseMigration } from "../migration"
+
+export default {
+  id: "20260703190000_reset_v2_shell_event_payloads",
+  up(tx) {
+    return Effect.gen(function* () {
+      yield* tx.run(`DELETE FROM \`session_input\`;`)
+      yield* tx.run(`DELETE FROM \`session_message\`;`)
+      yield* tx.run(`DELETE FROM \`event\`;`)
+      yield* tx.run(`DELETE FROM \`event_sequence\`;`)
+    })
+  },
+} satisfies DatabaseMigration.Migration
diff --git a/packages/core/src/session.ts b/packages/core/src/session.ts
index 108d36707a..e8928a7520 100644
--- a/packages/core/src/session.ts
+++ b/packages/core/src/session.ts
@@ -41,8 +41,8 @@ import type { EventLog } from "@opencode-ai/schema/event-log"
 import { SkillV2 } from "./skill"
 import { Job } from "./job"
 import { CommandV2 } from "./command"
-import { Identifier } from "./util/identifier"
 import { Shell } from "./shell"
+import { Shell as ShellSchema } from "@opencode-ai/schema/shell"
 import { KeyedMutex } from "./effect/keyed-mutex"
 
 export const RevertState = Revert.State
@@ -272,19 +272,6 @@ const layer = Layer.effect(
         ),
       )
 
-    // Session shell is user-initiated and synchronous at the API boundary, while
-    // the Location shell service owns process lifecycle and file-backed output.
-    const runShellCommand = (command: string, cwd: string) =>
-      Effect.gen(function* () {
-        const shell = yield* Shell.Service
-        const info = yield* shell.create({ command, cwd })
-        yield* shell.wait(info.id)
-        const output = yield* shell.output(info.id, { limit: SHELL_MAX_CAPTURE_BYTES })
-        return output.output || "(no output)"
-      }).pipe(
-        Effect.catchTag("Shell.NotFoundError", () => Effect.succeed("Shell command output is no longer available.")),
-      )
-
     const result = Service.of({
       create: Effect.fn("V2Session.create")(function* (input) {
         const sessionID = input.id ?? SessionSchema.ID.create()
@@ -550,23 +537,38 @@ const layer = Layer.effect(
           Effect.gen(function* () {
             activeShells.add(input.sessionID)
             if ((yield* execution.active).has(input.sessionID)) yield* execution.awaitIdle(input.sessionID)
-            const callID = Identifier.ascending()
+            const started = yield* Effect.gen(function* () {
+              const shell = yield* Shell.Service
+              return yield* shell.create({ command: input.command, cwd: session.location.directory })
+            }).pipe(Effect.provide(locations.get(session.location)))
             yield* events.publish(
               SessionEvent.Shell.Started,
               {
                 sessionID: input.sessionID,
-                callID,
-                command: input.command,
+                shell: started,
               },
               { id: input.id },
             )
-            const output = yield* runShellCommand(input.command, session.location.directory).pipe(
-              Effect.provide(locations.get(session.location)),
-            )
+            const completed = yield* Effect.gen(function* () {
+              const shell = yield* Shell.Service
+              const terminal = yield* shell.wait(started.id).pipe(
+                Effect.map((info) => ({ info, retained: true as const })),
+                Effect.catchTag("Shell.NotFoundError", () =>
+                  Effect.succeed({ info: synthesizeTerminalShellInfo(started), retained: false as const }),
+                ),
+              )
+              const output = terminal.retained
+                ? yield* shell
+                    .output(started.id, { limit: SHELL_MAX_CAPTURE_BYTES })
+                    .pipe(Effect.catchTag("Shell.NotFoundError", () => Effect.succeed(missingShellOutput())))
+                : missingShellOutput()
+              return { shell: terminal.info, output }
+            })
+              .pipe(Effect.provide(locations.get(session.location)))
             yield* events.publish(SessionEvent.Shell.Ended, {
               sessionID: input.sessionID,
-              callID,
-              output,
+              shell: completed.shell,
+              output: completed.output,
             })
           }).pipe(
             Effect.ensuring(
@@ -706,6 +708,26 @@ const layer = Layer.effect(
   }),
 )
 
+function missingShellOutput() {
+  const output = "Shell command output is no longer available."
+  return {
+    output,
+    cursor: Buffer.byteLength(output),
+    size: Buffer.byteLength(output),
+    truncated: false,
+  }
+}
+
+function synthesizeTerminalShellInfo(started: ShellSchema.Info): ShellSchema.Info {
+  return {
+    ...started,
+    // The Shell record was removed before waiters could observe it; publish a terminal
+    // boundary instead of leaving the Session shell message permanently running.
+    status: "killed",
+    time: { ...started.time, completed: Date.now() },
+  }
+}
+
 const resolvePrompt = (input: PromptInput.Prompt) =>
   Prompt.make({
     text: input.text,
diff --git a/packages/core/src/session/compaction.ts b/packages/core/src/session/compaction.ts
index 1174b65f40..9ad9ddc81a 100644
--- a/packages/core/src/session/compaction.ts
+++ b/packages/core/src/session/compaction.ts
@@ -129,7 +129,7 @@ const serialize = (message: SessionMessage.Message) => {
   if (message.type === "system") return `[System update]: ${message.text}`
   if (message.type === "synthetic") return `[Synthetic context]: ${message.text}`
   if (message.type === "skill") return `[Skill activated: ${message.name}]\n${message.text}`
-  if (message.type === "shell") return `[Shell]: ${message.command}\n${truncate(message.output)}`
+  if (message.type === "shell") return `[Shell]: ${message.shell.command}\n${truncate(message.output?.output ?? "")}`
   return ""
 }
 
diff --git a/packages/core/src/session/message-updater.ts b/packages/core/src/session/message-updater.ts
index a23ecb224c..3658e67c0f 100644
--- a/packages/core/src/session/message-updater.ts
+++ b/packages/core/src/session/message-updater.ts
@@ -8,21 +8,25 @@ export type MemoryState = {
 }
 
 export interface Adapter {
-  readonly getCurrentAssistant: () => Effect.Effect<SessionMessage.Assistant | undefined>
-  readonly getAssistant: (messageID: SessionMessage.ID) => Effect.Effect<SessionMessage.Assistant | undefined>
-  readonly getCurrentShell: (callID: string) => Effect.Effect<SessionMessage.Shell | undefined>
-  readonly updateAssistant: (assistant: SessionMessage.Assistant) => Effect.Effect<void>
-  readonly updateShell: (shell: SessionMessage.Shell) => Effect.Effect<void>
-  readonly appendMessage: (message: SessionMessage.Message) => Effect.Effect<void>
+  readonly getCurrentAssistant: () => Effect.Effect<SessionMessage.Assistant | undefined, never, never>
+  readonly getAssistant: (
+    messageID: SessionMessage.ID,
+  ) => Effect.Effect<SessionMessage.Assistant | undefined, never, never>
+  readonly getShell: (
+    shellID: SessionMessage.Shell["shell"]["id"],
+  ) => Effect.Effect<SessionMessage.Shell | undefined, never, never>
+  readonly updateAssistant: (assistant: SessionMessage.Assistant) => Effect.Effect<void, never, never>
+  readonly updateShell: (shell: SessionMessage.Shell) => Effect.Effect<void, never, never>
+  readonly appendMessage: (message: SessionMessage.Message) => Effect.Effect<void, never, never>
 }
 
 export function memory(state: MemoryState): Adapter {
   const assistantIndex = (messageID: SessionMessage.ID) =>
     state.messages.findLastIndex((message) => message.id === messageID)
+  const shellIndex = (messageID: SessionMessage.ID) =>
+    state.messages.findLastIndex((message) => message.id === messageID)
   // A newer step supersedes stale incomplete rows; never resume an older assistant projection.
   const latestAssistantIndex = () => state.messages.findLastIndex((message) => message.type === "assistant")
-  const activeShellIndex = (callID: string) =>
-    state.messages.findLastIndex((message) => message.type === "shell" && message.callID === callID)
 
   return {
     getCurrentAssistant() {
@@ -41,12 +45,11 @@ export function memory(state: MemoryState): Adapter {
         return assistant?.type === "assistant" ? assistant : undefined
       })
     },
-    getCurrentShell(callID) {
+    getShell(shellID) {
       return Effect.sync(() => {
-        const index = activeShellIndex(callID)
-        if (index < 0) return
-        const shell = state.messages[index]
-        return shell?.type === "shell" ? shell : undefined
+        return state.messages.find((message): message is SessionMessage.Shell => {
+          return message.type === "shell" && message.shell.id === shellID
+        })
       })
     },
     updateAssistant(assistant) {
@@ -60,7 +63,7 @@ export function memory(state: MemoryState): Adapter {
     },
     updateShell(shell) {
       return Effect.sync(() => {
-        const index = activeShellIndex(shell.callID)
+        const index = shellIndex(shell.id)
         if (index < 0) return
         const current = state.messages[index]
         if (current?.type !== "shell") return
@@ -100,7 +103,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
 
   return Effect.gen(function* () {
     yield* SessionEvent.All.match(event, {
-      "agent.selected": (event) => {
+      "session.agent.selected": (event) => {
         return adapter.appendMessage(
           SessionMessage.AgentSelected.make({
             id: SessionMessage.ID.fromEvent(event.id),
@@ -111,7 +114,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
           }),
         )
       },
-      "model.selected": (event) => {
+      "session.model.selected": (event) => {
         return adapter.appendMessage(
           SessionMessage.ModelSelected.make({
             id: SessionMessage.ID.fromEvent(event.id),
@@ -123,11 +126,11 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
         )
       },
       "session.moved": () => Effect.void,
-      renamed: () => Effect.void,
-      forked: () => Effect.void,
-      "prompt.promoted": () => Effect.void,
-      "prompt.admitted": () => Effect.void,
-      "execution.settled": () => Effect.void,
+      "session.renamed": () => Effect.void,
+      "session.forked": () => Effect.void,
+      "session.prompt.promoted": () => Effect.void,
+      "session.prompt.admitted": () => Effect.void,
+      "session.execution.settled": () => Effect.void,
       "session.context.updated": (event) =>
         adapter.appendMessage(
           SessionMessage.System.make({
@@ -137,7 +140,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
             time: { created: event.created },
           }),
         ),
-      synthetic: (event) => {
+      "session.synthetic": (event) => {
         return adapter.appendMessage(
           SessionMessage.Synthetic.make({
             sessionID: event.data.sessionID,
@@ -150,7 +153,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
           }),
         )
       },
-      "skill.activated": (event) => {
+      "session.skill.activated": (event) => {
         return adapter.appendMessage(
           SessionMessage.Skill.make({
             id: SessionMessage.ID.fromEvent(event.id),
@@ -161,25 +164,24 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
           }),
         )
       },
-      "shell.started": (event) => {
+      "session.shell.started": (event) => {
         return adapter.appendMessage(
           SessionMessage.Shell.make({
             id: SessionMessage.ID.fromEvent(event.id),
             type: "shell",
             metadata: event.metadata,
-            callID: event.data.callID,
-            command: event.data.command,
-            output: "",
+            shell: event.data.shell,
             time: { created: event.created },
           }),
         )
       },
-      "shell.ended": (event) => {
+      "session.shell.ended": (event) => {
         return Effect.gen(function* () {
-          const currentShell = yield* adapter.getCurrentShell(event.data.callID)
+          const currentShell = yield* adapter.getShell(event.data.shell.id)
           if (currentShell) {
             yield* adapter.updateShell(
               produce(currentShell, (draft) => {
+                draft.shell = castDraft(event.data.shell)
                 draft.output = event.data.output
                 draft.time.completed = event.created
               }),
@@ -187,7 +189,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
           }
         })
       },
-      "step.started": (event) => {
+      "session.step.started": (event) => {
         return Effect.gen(function* () {
           const currentAssistant = yield* adapter.getCurrentAssistant()
           if (currentAssistant) {
@@ -210,7 +212,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
           )
         })
       },
-      "step.ended": (event) => {
+      "session.step.ended": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           draft.time.completed = event.created
           draft.finish = event.data.finish
@@ -224,33 +226,33 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
             }
         })
       },
-      "step.failed": (event) => {
+      "session.step.failed": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           draft.time.completed = event.created
           draft.finish = "error"
           draft.error = event.data.error
         })
       },
-      "text.started": (event) => {
+      "session.text.started": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           draft.content.push(
             castDraft(SessionMessage.AssistantText.make({ type: "text", id: event.data.textID, text: "" })),
           )
         })
       },
-      "text.delta": (event) => {
+      "session.text.delta": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           const match = latestText(draft, event.data.textID)
           if (match) match.text += event.data.delta
         })
       },
-      "text.ended": (event) => {
+      "session.text.ended": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           const match = latestText(draft, event.data.textID)
           if (match) match.text = event.data.text
         })
       },
-      "tool.input.started": (event) => {
+      "session.tool.input.started": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           draft.content.push(
             castDraft(
@@ -265,14 +267,14 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
           )
         })
       },
-      "tool.input.delta": () => Effect.void,
-      "tool.input.ended": (event) => {
+      "session.tool.input.delta": () => Effect.void,
+      "session.tool.input.ended": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           const match = latestTool(draft, event.data.callID)
           if (match && match.state.status === "pending") match.state.input = event.data.text
         })
       },
-      "tool.called": (event) => {
+      "session.tool.called": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           const match = latestTool(draft, event.data.callID)
           if (match) {
@@ -289,7 +291,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
           }
         })
       },
-      "tool.progress": (event) => {
+      "session.tool.progress": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           const match = latestTool(draft, event.data.callID)
           if (match && match.state.status === "running") {
@@ -298,7 +300,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
           }
         })
       },
-      "tool.success": (event) => {
+      "session.tool.success": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           const match = latestTool(draft, event.data.callID)
           if (match && match.state.status === "running") {
@@ -321,7 +323,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
           }
         })
       },
-      "tool.failed": (event) => {
+      "session.tool.failed": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           const match = latestTool(draft, event.data.callID)
           if (match && (match.state.status === "pending" || match.state.status === "running")) {
@@ -344,7 +346,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
           }
         })
       },
-      "reasoning.started": (event) => {
+      "session.reasoning.started": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           draft.content.push(
             castDraft(
@@ -359,13 +361,13 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
           )
         })
       },
-      "reasoning.delta": (event) => {
+      "session.reasoning.delta": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           const match = latestReasoning(draft, event.data.reasoningID)
           if (match) match.text += event.data.delta
         })
       },
-      "reasoning.ended": (event) => {
+      "session.reasoning.ended": (event) => {
         return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
           const match = latestReasoning(draft, event.data.reasoningID)
           if (match) {
@@ -375,10 +377,10 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
           }
         })
       },
-      retried: () => Effect.void,
-      "compaction.started": () => Effect.void,
-      "compaction.delta": () => Effect.void,
-      "compaction.ended": (event) => {
+      "session.retried": () => Effect.void,
+      "session.compaction.started": () => Effect.void,
+      "session.compaction.delta": () => Effect.void,
+      "session.compaction.ended": (event) => {
         return adapter.appendMessage(
           SessionMessage.Compaction.make({
             id: SessionMessage.ID.fromEvent(event.id),
@@ -391,9 +393,9 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
           }),
         )
       },
-      "revert.staged": () => Effect.void,
-      "revert.cleared": () => Effect.void,
-      "revert.committed": () => Effect.void,
+      "session.revert.staged": () => Effect.void,
+      "session.revert.cleared": () => Effect.void,
+      "session.revert.committed": () => Effect.void,
     })
   })
 }
diff --git a/packages/core/src/session/projector.ts b/packages/core/src/session/projector.ts
index c5b552e8b4..746e448a3b 100644
--- a/packages/core/src/session/projector.ts
+++ b/packages/core/src/session/projector.ts
@@ -393,18 +393,25 @@ function run(db: DatabaseService, event: MessageEvent) {
           return message.type === "assistant" ? message : undefined
         })
       },
-      getCurrentShell(callID) {
+      getShell(shellID) {
         return Effect.gen(function* () {
-          const rows = yield* db
+          const row = yield* db
             .select()
             .from(SessionMessageTable)
-            .where(and(eq(SessionMessageTable.session_id, event.data.sessionID), eq(SessionMessageTable.type, "shell")))
+            .where(
+              and(
+                eq(SessionMessageTable.session_id, event.data.sessionID),
+                eq(SessionMessageTable.type, "shell"),
+                sql`json_extract(${SessionMessageTable.data}, '$.shell.id') = ${shellID}`,
+              ),
+            )
             .orderBy(desc(SessionMessageTable.seq))
-            .all()
+            .limit(1)
+            .get()
             .pipe(Effect.orDie)
-          return rows
-            .map(decodeRow)
-            .find((message): message is SessionMessage.Shell => message.type === "shell" && message.callID === callID)
+          if (!row) return
+          const message = decodeRow(row)
+          return message.type === "shell" ? message : undefined
         })
       },
       updateAssistant: updateMessage,
diff --git a/packages/core/src/session/runner/to-llm-message.ts b/packages/core/src/session/runner/to-llm-message.ts
index 0d9055e480..e6a91a9ef1 100644
--- a/packages/core/src/session/runner/to-llm-message.ts
+++ b/packages/core/src/session/runner/to-llm-message.ts
@@ -139,7 +139,7 @@ function toLLMMessage(message: SessionMessage.Message, model: Model): Message[]
         Message.make({
           id: message.id,
           role: "user",
-          content: `Shell command: ${message.command}\n\n${message.output}`,
+          content: `Shell command: ${message.shell.command}\n\n${message.output?.output ?? ""}`,
           metadata: message.metadata,
         }),
       ]
diff --git a/packages/core/test/session-create.test.ts b/packages/core/test/session-create.test.ts
index 0100ca4ae9..d18c2c8e81 100644
--- a/packages/core/test/session-create.test.ts
+++ b/packages/core/test/session-create.test.ts
@@ -213,7 +213,7 @@ describe("SessionV2.create", () => {
       expect(forkContext.map((message) => message.id)).not.toEqual(parentContext.map((message) => message.id))
       expect(history).toHaveLength(1)
       expect(history[0]).toMatchObject({
-        type: "forked",
+        type: "session.forked",
         durable: { seq: 0 },
         data: { sessionID: forked.id, parentID: parent.id },
       })
@@ -378,8 +378,8 @@ describe("SessionV2.create", () => {
       expect(
         Array.from(yield* logEvents(session, created.id, true).pipe(Stream.take(2), Stream.runCollect)),
       ).toMatchObject([
-        { durable: { seq: 1 }, type: "prompt.admitted", data: { prompt: { text: "Hello" } } },
-        { durable: { seq: 2 }, type: "prompt.promoted" },
+        { durable: { seq: 1 }, type: "session.prompt.admitted", data: { prompt: { text: "Hello" } } },
+        { durable: { seq: 2 }, type: "session.prompt.promoted" },
       ])
     }),
   )
@@ -494,8 +494,9 @@ describe("SessionV2.create", () => {
 
         const messages = yield* session.messages({ sessionID: created.id, order: "asc" })
         const shell = messages.find((message): message is SessionMessage.Shell => message.type === "shell")
-        expect(shell).toMatchObject({ type: "shell", command: "echo hello" })
-        expect(shell?.output).toContain("hello")
+        expect(shell).toMatchObject({ type: "shell", shell: { command: "echo hello", status: "exited", exit: 0 } })
+        expect(shell?.output?.output).toContain("hello")
+        expect(shell?.output?.truncated).toBe(false)
         expect(shell?.time.completed).toBeDefined()
       }),
     ),
@@ -513,7 +514,8 @@ describe("SessionV2.create", () => {
 
         const messages = yield* session.messages({ sessionID: created.id, order: "asc" })
         const shell = messages.find((message): message is SessionMessage.Shell => message.type === "shell")
-        expect(shell).toMatchObject({ type: "shell", command: "false" })
+        expect(shell).toMatchObject({ type: "shell", shell: { command: "false", status: "exited" } })
+        expect(shell?.shell.exit).not.toBe(0)
         expect(shell?.time.completed).toBeDefined()
       }),
     ),
@@ -529,7 +531,7 @@ describe("SessionV2.create", () => {
       expect(yield* session.get(created.id)).toMatchObject({ agent: "plan" })
       expect(
         Array.from(yield* logEvents(session, created.id, true).pipe(Stream.take(1), Stream.runCollect)),
-      ).toMatchObject([{ type: "agent.selected", data: { agent: "plan" } }])
+      ).toMatchObject([{ type: "session.agent.selected", data: { agent: "plan" } }])
     }),
   )
 
@@ -562,7 +564,7 @@ describe("SessionV2.create", () => {
       expect(yield* session.get(created.id)).toMatchObject({ model })
       expect(
         Array.from(yield* logEvents(session, created.id, true).pipe(Stream.take(1), Stream.runCollect)),
-      ).toMatchObject([{ type: "model.selected", data: { model } }])
+      ).toMatchObject([{ type: "session.model.selected", data: { model } }])
     }),
   )
 
diff --git a/packages/core/test/session-log.test.ts b/packages/core/test/session-log.test.ts
index 8c49b94582..ed8dda7f4d 100644
--- a/packages/core/test/session-log.test.ts
+++ b/packages/core/test/session-log.test.ts
@@ -40,14 +40,14 @@ describe("SessionV2.log", () => {
       const session = yield* SessionV2.Service
       const events = yield* EventV2.Service
       const created = yield* session.create({ location })
-      yield* session.rename({ sessionID: created.id, title: "renamed" })
+      yield* session.rename({ sessionID: created.id, title: "session.renamed" })
 
       const items = Array.from(yield* Stream.runCollect(session.log({ sessionID: created.id })))
       const watermark = (yield* events.sequences([created.id])).get(created.id)
 
       // Session creation commits a non-public durable event, so the marker's
       // seq covers more of the aggregate than the public events emitted.
-      expect(items.map((item) => item.type)).toEqual(["renamed", "log.synced"])
+      expect(items.map((item) => item.type)).toEqual(["session.renamed", "log.synced"])
       expect(items.at(-1)).toEqual({ type: "log.synced", aggregateID: created.id, seq: watermark })
     }),
   )
@@ -64,7 +64,7 @@ describe("SessionV2.log", () => {
       yield* session.rename({ sessionID: created.id, title: "renamed live" })
 
       const items = Array.from(yield* Fiber.join(fiber))
-      expect(items.map((item) => item.type)).toEqual(["log.synced", "renamed"])
+      expect(items.map((item) => item.type)).toEqual(["log.synced", "session.renamed"])
     }),
   )
 
@@ -137,7 +137,7 @@ describe("SessionV2 watermarks", () => {
       const events = yield* EventV2.Service
       const first = yield* session.create({ location })
       const second = yield* session.create({ location })
-      yield* session.rename({ sessionID: first.id, title: "renamed" })
+      yield* session.rename({ sessionID: first.id, title: "session.renamed" })
 
       const page = yield* session.list()
       const sequences = yield* events.sequences([first.id, second.id])
diff --git a/packages/core/test/session-projector.test.ts b/packages/core/test/session-projector.test.ts
index c0d172088e..c17b979076 100644
--- a/packages/core/test/session-projector.test.ts
+++ b/packages/core/test/session-projector.test.ts
@@ -19,6 +19,7 @@ import { SessionMessageUpdater } from "@opencode-ai/core/session/message-updater
 import { SessionProjector } from "@opencode-ai/core/session/projector"
 import { SessionExecution } from "@opencode-ai/core/session/execution"
 import { SessionInput } from "@opencode-ai/core/session/input"
+import { Shell } from "@opencode-ai/schema/shell"
 import {
   SessionContextCheckpointTable,
   SessionInputTable,
@@ -257,15 +258,32 @@ describe("SessionProjector", () => {
       })
       yield* events.publish(SessionEvent.Shell.Started, {
         sessionID,
-        callID: "shell-1",
-        command: "pwd",
+        shell: Shell.Info.make({
+          id: Shell.ID.make("sh_projector"),
+          status: "running",
+          command: "pwd",
+          cwd: "/project",
+          shell: "/bin/sh",
+          file: "/tmp/sh_projector.out",
+          metadata: {},
+          time: { started: 0 },
+        }),
       })
       yield* events.publish(SessionEvent.Shell.Ended, {
         sessionID,
-        callID: "shell-1",
-        output: "/project",
+        shell: Shell.Info.make({
+          id: Shell.ID.make("sh_projector"),
+          status: "exited",
+          command: "pwd",
+          cwd: "/project",
+          shell: "/bin/sh",
+          file: "/tmp/sh_projector.out",
+          exit: 0,
+          metadata: {},
+          time: { started: 0, completed: 1 },
+        }),
+        output: { output: "/project", cursor: 8, size: 8, truncated: false },
       })
-      const compactionID = SessionMessage.ID.create()
       yield* events.publish(SessionEvent.Compaction.Started, {
         sessionID,
         reason: "manual",
@@ -320,7 +338,8 @@ describe("SessionProjector", () => {
         metadata: { source: "projector-test" },
       })
       expect(messages.find((message) => message.type === "shell")).toMatchObject({
-        output: "/project",
+        shell: { command: "pwd", status: "exited", exit: 0 },
+        output: { output: "/project", truncated: false },
         time: { completed: DateTime.makeUnsafe(0) },
       })
       expect(messages.find((message) => message.type === "compaction")).toMatchObject({
diff --git a/packages/core/test/session-prompt.test.ts b/packages/core/test/session-prompt.test.ts
index 58a613a324..e7d3f5189f 100644
--- a/packages/core/test/session-prompt.test.ts
+++ b/packages/core/test/session-prompt.test.ts
@@ -256,16 +256,16 @@ describe("SessionV2.prompt", () => {
       const streamed = Array.from(yield* Fiber.join(fiber))
 
       expect(streamed.map((event): [number | undefined, string] => [event.durable?.seq, event.type])).toEqual([
-        [0, "prompt.admitted"],
-        [1, "prompt.admitted"],
-        [2, "prompt.promoted"],
-        [3, "prompt.promoted"],
+        [0, "session.prompt.admitted"],
+        [1, "session.prompt.admitted"],
+        [2, "session.prompt.promoted"],
+        [3, "session.prompt.promoted"],
       ])
       expect(
         Array.from(
           yield* publicEvents({ sessionID, after: streamed[0].durable?.seq }).pipe(Stream.take(1), Stream.runCollect),
         ).map((event): [number | undefined, string] => [event.durable?.seq, event.type]),
-      ).toEqual([[1, "prompt.admitted"]])
+      ).toEqual([[1, "session.prompt.admitted"]])
     }),
   )
 
diff --git a/packages/core/test/session-runner-message.test.ts b/packages/core/test/session-runner-message.test.ts
index d33b44728d..9aed484858 100644
--- a/packages/core/test/session-runner-message.test.ts
+++ b/packages/core/test/session-runner-message.test.ts
@@ -7,6 +7,7 @@ import { SessionMessage } from "@opencode-ai/core/session/message"
 import { AgentAttachment, FileAttachment } from "@opencode-ai/core/session/prompt"
 import { toLLMMessages } from "@opencode-ai/core/session/runner/to-llm-message"
 import { SessionV2 } from "@opencode-ai/core/session"
+import { Shell } from "@opencode-ai/schema/shell"
 import { DateTime } from "effect"
 
 const created = DateTime.makeUnsafe(0)
@@ -87,9 +88,18 @@ describe("toLLMMessages", () => {
         SessionMessage.Shell.make({
           id: id("shell"),
           type: "shell",
-          callID: "shell-1",
-          command: "pwd",
-          output: "/project",
+          shell: Shell.Info.make({
+            id: Shell.ID.make("sh_test"),
+            status: "exited",
+            command: "pwd",
+            cwd: "/project",
+            shell: "/bin/sh",
+            file: "/tmp/sh_test.out",
+            exit: 0,
+            metadata: {},
+            time: { started: 0, completed: 0 },
+          }),
+          output: { output: "/project", cursor: 8, size: 8, truncated: false },
           time: { created, completed: created },
         }),
         SessionMessage.Compaction.make({
diff --git a/packages/core/test/session-runner-recorded.test.ts b/packages/core/test/session-runner-recorded.test.ts
index 4f82baba96..35e84fcb6c 100644
--- a/packages/core/test/session-runner-recorded.test.ts
+++ b/packages/core/test/session-runner-recorded.test.ts
@@ -193,12 +193,12 @@ describe("SessionRunnerLLM recorded", () => {
           .orderBy(EventTable.seq)
           .all()).map((event) => event.type),
       ).toEqual([
-        "prompt.admitted.1",
-        "prompt.promoted.1",
-        "step.started.1",
-        "text.started.1",
-        "text.ended.1",
-        "step.ended.1",
+        "session.prompt.admitted.1",
+        "session.prompt.promoted.1",
+        "session.step.started.1",
+        "session.text.started.1",
+        "session.text.ended.1",
+        "session.step.ended.1",
       ])
     }),
   )
diff --git a/packages/core/test/session-runner-tool-events.test.ts b/packages/core/test/session-runner-tool-events.test.ts
index 5c8d7e07f4..d016b2694b 100644
--- a/packages/core/test/session-runner-tool-events.test.ts
+++ b/packages/core/test/session-runner-tool-events.test.ts
@@ -76,7 +76,7 @@ test("local tool success serializes media base64 once and reconstructs from stru
   await Effect.runPromise(publisher.publish(call))
   await Effect.runPromise(publisher.publish(result))
 
-  const success = published.find((event) => event.type === "tool.success.1")
+  const success = published.find((event) => event.type === "session.tool.success.1")
   expect(success).toBeDefined()
   const serialized = JSON.stringify(success)
   expect(serialized.split(base64)).toHaveLength(2)
@@ -94,7 +94,7 @@ test("provider-executed success retains its compatibility result", async () => {
   const { published, publisher } = capture()
   await Effect.runPromise(publisher.publish(LLMEvent.toolCall({ ...call, providerExecuted: true })))
   await Effect.runPromise(publisher.publish(LLMEvent.toolResult({ ...result, providerExecuted: true })))
-  const success = published.find((event) => event.type === "tool.success.1")
+  const success = published.find((event) => event.type === "session.tool.success.1")
   expect(success?.data).toHaveProperty("result")
 })
 
@@ -110,8 +110,8 @@ test("binary failure emits no success event", async () => {
       }),
     ),
   )
-  expect(published.some((event) => event.type === "tool.success.1")).toBe(false)
-  expect(published.some((event) => event.type === "tool.failed.1")).toBe(true)
+  expect(published.some((event) => event.type === "session.tool.success.1")).toBe(false)
+  expect(published.some((event) => event.type === "session.tool.failed.1")).toBe(true)
 })
 
 test("old success event data containing result still decodes", () => {
diff --git a/packages/core/test/session-runner.test.ts b/packages/core/test/session-runner.test.ts
index e6f14c8e19..6856b6a7ce 100644
--- a/packages/core/test/session-runner.test.ts
+++ b/packages/core/test/session-runner.test.ts
@@ -2985,7 +2985,7 @@ describe("SessionRunnerLLM", () => {
         { type: "user", text: "Interrupt provider" },
         { type: "assistant", finish: "error", error: { type: "unknown", message: "Step interrupted" } },
       ])
-      expect(yield* recordedEventTypes(sessionID)).toContain("step.failed.1")
+      expect(yield* recordedEventTypes(sessionID)).toContain("session.step.failed.1")
       yield* session.interrupt(sessionID)
     }),
   )
@@ -3029,8 +3029,8 @@ describe("SessionRunnerLLM", () => {
         },
       ])
       const eventTypes = yield* recordedEventTypes(sessionID)
-      expect(eventTypes).toContain("step.failed.1")
-      expect(eventTypes).not.toContain("step.ended.1")
+      expect(eventTypes).toContain("session.step.failed.1")
+      expect(eventTypes).not.toContain("session.step.ended.1")
     }),
   )
 
diff --git a/packages/opencode/src/cli/cmd/run/noninteractive.ts b/packages/opencode/src/cli/cmd/run/noninteractive.ts
index 60ded4ebd9..6874527222 100644
--- a/packages/opencode/src/cli/cmd/run/noninteractive.ts
+++ b/packages/opencode/src/cli/cmd/run/noninteractive.ts
@@ -158,14 +158,14 @@ export async function runNonInteractivePrompt(input: Input) {
       if (!("sessionID" in event.data) || event.data.sessionID !== input.sessionID) continue
       const time = toMillis(event.created)
 
-      if (event.type === "prompt.promoted") {
+      if (event.type === "session.prompt.promoted") {
         if (event.data.inputID === messageID) {
           promoted = true
           continue
         }
       }
       if (
-        event.type === "execution.settled" &&
+        event.type === "session.execution.settled" &&
         event.data.outcome === "interrupted" &&
         (interrupted || permissionRejected || questionRejected || formCancelled)
       ) {
@@ -173,7 +173,7 @@ export async function runNonInteractivePrompt(input: Input) {
       }
       if (!promoted) continue
 
-      if (event.type === "step.started") {
+      if (event.type === "session.step.started") {
         const part: StepStartPart = {
           id: partID(event.id),
           sessionID: input.sessionID,
@@ -189,11 +189,11 @@ export async function runNonInteractivePrompt(input: Input) {
         continue
       }
 
-      if (event.type === "text.started") {
+      if (event.type === "session.text.started") {
         starts.set(event.data.textID, { id: partID(event.id), timestamp: time })
         continue
       }
-      if (event.type === "text.ended") {
+      if (event.type === "session.text.ended") {
         const started = starts.get(event.data.textID)
         const part: TextPart = {
           id: started?.id ?? partID(event.id),
@@ -207,11 +207,11 @@ export async function runNonInteractivePrompt(input: Input) {
         continue
       }
 
-      if (event.type === "reasoning.started") {
+      if (event.type === "session.reasoning.started") {
         starts.set(event.data.reasoningID, { id: partID(event.id), timestamp: time })
         continue
       }
-      if (event.type === "reasoning.ended" && input.thinking) {
+      if (event.type === "session.reasoning.ended" && input.thinking) {
         const started = starts.get(event.data.reasoningID)
         const part: ReasoningPart = {
           id: started?.id ?? partID(event.id),
@@ -236,7 +236,7 @@ export async function runNonInteractivePrompt(input: Input) {
         continue
       }
 
-      if (event.type === "tool.input.started") {
+      if (event.type === "session.tool.input.started") {
         tools.set(event.data.callID, {
           id: partID(event.id),
           timestamp: time,
@@ -246,12 +246,12 @@ export async function runNonInteractivePrompt(input: Input) {
         })
         continue
       }
-      if (event.type === "tool.input.ended") {
+      if (event.type === "session.tool.input.ended") {
         const current = tools.get(event.data.callID)
         if (current) current.raw = event.data.text
         continue
       }
-      if (event.type === "tool.called") {
+      if (event.type === "session.tool.called") {
         const current = tools.get(event.data.callID)
         tools.set(event.data.callID, {
           id: current?.id ?? partID(event.id),
@@ -264,7 +264,7 @@ export async function runNonInteractivePrompt(input: Input) {
         })
         continue
       }
-      if (event.type === "tool.success") {
+      if (event.type === "session.tool.success") {
         const current = tools.get(event.data.callID) ?? fallbackTool(event)
         const part: ToolPart = {
           id: current.id,
@@ -297,7 +297,7 @@ export async function runNonInteractivePrompt(input: Input) {
         if (!emit("tool_use", time, { part })) await input.renderTool(part)
         continue
       }
-      if (event.type === "tool.failed") {
+      if (event.type === "session.tool.failed") {
         const current = tools.get(event.data.callID) ?? fallbackTool(event)
         const error = event.data.error.message
         const part: ToolPart = {
@@ -328,7 +328,7 @@ export async function runNonInteractivePrompt(input: Input) {
         continue
       }
 
-      if (event.type === "step.ended") {
+      if (event.type === "session.step.ended") {
         const part: StepFinishPart = {
           id: partID(event.id),
           sessionID: input.sessionID,
@@ -342,14 +342,14 @@ export async function runNonInteractivePrompt(input: Input) {
         emit("step_finish", time, { part })
         continue
       }
-      if (event.type === "step.failed") {
+      if (event.type === "session.step.failed") {
         if (interrupted || permissionRejected || questionRejected || formCancelled) continue
         emittedError = true
         process.exitCode = 1
         if (!emit("error", time, { error: event.data.error })) UI.error(event.data.error.message)
         continue
       }
-      if (event.type === "execution.settled") {
+      if (event.type === "session.execution.settled") {
         if (event.data.outcome === "failure" && !emittedError && !questionRejected && !formCancelled) {
           emittedError = true
           process.exitCode = 1
diff --git a/packages/opencode/src/cli/cmd/run/session-data.ts b/packages/opencode/src/cli/cmd/run/session-data.ts
index 9450f6cf78..ffce45bc94 100644
--- a/packages/opencode/src/cli/cmd/run/session-data.ts
+++ b/packages/opencode/src/cli/cmd/run/session-data.ts
@@ -62,7 +62,7 @@ type SessionCommit = StreamCommit
 // - sent:   part ID → byte offset of last flushed text (for incremental output)
 // - visible: part ID → rendered text for an active part after display transforms
 // - end:    part IDs whose time.end has arrived (part is finished)
-// - shell:  shell call ID → chosen transcript source for direct shell calls
+// - shell:  shell ID → chosen transcript source for direct shell calls
 // - echo:   message ID → bash outputs to strip from the next assistant chunk
 type ShellCall = {
   source: "shell" | "tool"
@@ -607,12 +607,12 @@ function toolCommit(
   }
 }
 
-function shellPartID(callID: string): string {
-  return `shell:${callID}`
+function shellPartID(shellID: string): string {
+  return `shell:${shellID}`
 }
 
-function claimShell(data: SessionData, callID: string, source: ShellCall["source"], command?: string): ShellCall {
-  const current = data.shell.get(callID)
+function claimShell(data: SessionData, shellID: string, source: ShellCall["source"], command?: string): ShellCall {
+  const current = data.shell.get(shellID)
   if (current) {
     if (command && !current.command) {
       current.command = command
@@ -625,7 +625,7 @@ function claimShell(data: SessionData, callID: string, source: ShellCall["source
     source,
     ...(command ? { command } : {}),
   } satisfies ShellCall
-  data.shell.set(callID, next)
+  data.shell.set(shellID, next)
   return next
 }
 
@@ -728,37 +728,37 @@ export function reduceSessionData(input: SessionDataInput): SessionDataOutput {
   const data = input.data
   const event = input.event
 
-  if (event.type === "shell.started") {
+  if (event.type === "session.shell.started") {
     if (event.properties.sessionID !== input.sessionID) {
       return out(data, commits)
     }
 
-    const shell = claimShell(data, event.properties.callID, "shell", event.properties.command)
+    const shell = claimShell(data, event.properties.shell.id, "shell", event.properties.shell.command)
     if (shell.source !== "shell") {
       return out(data, commits)
     }
 
-    const partID = shellPartID(event.properties.callID)
+    const partID = shellPartID(event.properties.shell.id)
     if (data.ids.has(partID) || data.tools.has(partID)) {
       return out(data, commits, patch({ status: "running shell" }))
     }
 
     data.tools.add(partID)
-    commits.push(startShell(event.properties.callID, shell.command ?? event.properties.command))
+    commits.push(startShell(event.properties.shell.id, shell.command ?? event.properties.shell.command))
     return out(data, commits, patch({ status: "running shell" }))
   }
 
-  if (event.type === "shell.ended") {
+  if (event.type === "session.shell.ended") {
     if (event.properties.sessionID !== input.sessionID) {
       return out(data, commits)
     }
 
-    const shell = claimShell(data, event.properties.callID, "shell")
+    const shell = claimShell(data, event.properties.shell.id, "shell")
     if (shell.source !== "shell") {
       return out(data, commits)
     }
 
-    const partID = shellPartID(event.properties.callID)
+    const partID = shellPartID(event.properties.shell.id)
     const seen = data.tools.has(partID)
     const command = shell.command ?? ""
     data.tools.delete(partID)
@@ -767,11 +767,11 @@ export function reduceSessionData(input: SessionDataInput): SessionDataOutput {
     }
 
     if (!seen && command) {
-      commits.push(startShell(event.properties.callID, command))
+      commits.push(startShell(event.properties.shell.id, command))
     }
 
     data.ids.add(partID)
-    commits.push(doneShell(event.properties.callID, command, event.properties.output))
+    commits.push(doneShell(event.properties.shell.id, command, event.properties.output.output))
     return out(data, commits)
   }
 
diff --git a/packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts b/packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts
index ac652423a1..1e7b039fd8 100644
--- a/packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts
+++ b/packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts
@@ -424,21 +424,21 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
   }
 
   const reduce = (child: ChildState, event: V2Event) => {
-    if (event.type === "prompt.promoted") {
+    if (event.type === "session.prompt.promoted") {
       if (userFrame(child, event.data.inputID, "")) {
         touch(child, event.created)
         notifyDetail(child)
       }
       return
     }
-    if (event.type === "step.started") {
+    if (event.type === "session.step.started") {
       touch(child, event.created)
       if (child.label === FALLBACK_LABEL && event.data.agent) child.label = Locale.titlecase(event.data.agent)
       if (child.status !== "running") child.status = "running"
       input.emit()
       return
     }
-    if (event.type === "text.delta") {
+    if (event.type === "session.text.delta") {
       const projected = child.projectedText.get(event.data.textID)
       const covered = projected?.indexOf(event.data.delta) ?? -1
       if (projected && covered >= 0) {
@@ -459,7 +459,7 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
       notifyDetail(child)
       return
     }
-    if (event.type === "text.ended") {
+    if (event.type === "session.text.ended") {
       child.text.set(event.data.textID, event.data.text)
       child.projectedText.delete(event.data.textID)
       setFrame(child, `text:${event.data.textID}`, {
@@ -474,7 +474,7 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
       notifyDetail(child)
       return
     }
-    if (event.type === "reasoning.delta") {
+    if (event.type === "session.reasoning.delta") {
       const projected = child.projectedReasoning.get(event.data.reasoningID)
       const covered = projected?.indexOf(event.data.delta) ?? -1
       if (projected && covered >= 0) {
@@ -495,7 +495,7 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
       notifyDetail(child)
       return
     }
-    if (event.type === "reasoning.ended") {
+    if (event.type === "session.reasoning.ended") {
       child.reasoning.set(event.data.reasoningID, event.data.text)
       child.projectedReasoning.delete(event.data.reasoningID)
       if (!input.thinking) return
@@ -510,11 +510,11 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
       notifyDetail(child)
       return
     }
-    if (event.type === "tool.input.started") {
+    if (event.type === "session.tool.input.started") {
       child.tools.set(event.data.callID, { name: event.data.name, input: {}, started: event.created })
       return
     }
-    if (event.type === "tool.called") {
+    if (event.type === "session.tool.called") {
       const current = child.tools.get(event.data.callID)
       child.tools.set(event.data.callID, {
         name: event.data.tool,
@@ -537,10 +537,10 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
       notifyDetail(child)
       return
     }
-    if (event.type === "tool.success" || event.type === "tool.failed") {
+    if (event.type === "session.tool.success" || event.type === "session.tool.failed") {
       if (child.finishedTools.has(event.data.callID)) return
       const current = child.tools.get(event.data.callID)
-      const failed = event.type === "tool.failed"
+      const failed = event.type === "session.tool.failed"
       childTool(
         child,
         {
@@ -577,7 +577,7 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
       notifyDetail(child)
       return
     }
-    if (event.type === "step.failed") {
+    if (event.type === "session.step.failed") {
       setFrame(child, `error:step:${event.data.assistantMessageID}`, {
         kind: "error",
         source: "system",
@@ -589,7 +589,7 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
       notifyDetail(child)
       return
     }
-    if (event.type === "execution.settled") {
+    if (event.type === "session.execution.settled") {
       child.status =
         event.data.outcome === "success" ? "completed" : event.data.outcome === "interrupted" ? "cancelled" : "error"
       touch(child, event.created)
@@ -613,15 +613,15 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
 
   return {
     main(event) {
-      if (event.type === "tool.called") {
+      if (event.type === "session.tool.called") {
         if (event.data.tool === "subagent") pendingCalls.set(event.data.callID, event.data.input)
         return
       }
-      if (event.type === "tool.failed") {
+      if (event.type === "session.tool.failed") {
         pendingCalls.delete(event.data.callID)
         return
       }
-      if (event.type !== "tool.success") return
+      if (event.type !== "session.tool.success") return
       const pending = pendingCalls.get(event.data.callID)
       pendingCalls.delete(event.data.callID)
       const found = childSessionID(record(event.data.structured))
diff --git a/packages/opencode/src/cli/cmd/run/stream-v2.transport.ts b/packages/opencode/src/cli/cmd/run/stream-v2.transport.ts
index c15ed48e5b..42e2c7bd53 100644
--- a/packages/opencode/src/cli/cmd/run/stream-v2.transport.ts
+++ b/packages/opencode/src/cli/cmd/run/stream-v2.transport.ts
@@ -213,7 +213,9 @@ function promptAgents(next: SessionTurnInput) {
       ? [
           {
             name: part.name,
-            source: part.source ? { start: part.source.start, end: part.source.end, text: part.source.value } : undefined,
+            source: part.source
+              ? { start: part.source.start, end: part.source.end, text: part.source.value }
+              : undefined,
           },
         ]
       : [],
@@ -404,27 +406,39 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       return
     }
     if (message.type === "shell") {
-      state.shellCommands.set(message.callID, message.command)
+      state.shellCommands.set(message.shell.id, message.shell.command)
       const completed = message.time.completed !== undefined
       if (!render) {
         // Suppressed history: mark settled shells rendered so live redelivery
         // stays silent. A still-running shell stays unmarked and renders in
         // full when its live shell.ended event arrives.
         if (completed) {
-          state.shellStarted.add(message.callID)
-          state.shellEnded.add(message.callID)
+          state.shellStarted.add(message.shell.id)
+          state.shellEnded.add(message.shell.id)
         }
         return
       }
-      if (!state.shellStarted.has(message.callID)) {
-        state.shellStarted.add(message.callID)
-        write([shellCommit(message.callID, message.command, { text: "running shell", phase: "start", toolState: "running" })])
+      if (!state.shellStarted.has(message.shell.id)) {
+        state.shellStarted.add(message.shell.id)
+        write([
+          shellCommit(message.shell.id, message.shell.command, {
+            text: "running shell",
+            phase: "start",
+            toolState: "running",
+          }),
+        ])
       }
-      if (completed && !state.shellEnded.has(message.callID)) {
-        state.shellEnded.add(message.callID)
-        write([shellCommit(message.callID, message.command, { text: message.output, phase: "progress", toolState: "completed" })])
+      if (completed && message.output && !state.shellEnded.has(message.shell.id)) {
+        state.shellEnded.add(message.shell.id)
+        write([
+          shellCommit(message.shell.id, message.shell.command, {
+            text: message.output.output,
+            phase: "progress",
+            toolState: "completed",
+          }),
+        ])
       }
-      if (completed && state.shellWait?.callID === message.callID) state.shellWait.resolve()
+      if (completed && state.shellWait?.callID === message.shell.id) state.shellWait.resolve()
       return
     }
     if (message.type !== "assistant") return
@@ -515,17 +529,17 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
     }
     input.trace?.write("recv.event", event)
     subagents.main(event)
-    if (event.type === "prompt.promoted") {
+    if (event.type === "session.prompt.promoted") {
       if (state.wait?.messageID === event.data.inputID) state.wait.promoted = true
       state.messageIDs.add(event.data.inputID)
       write([], { phase: "running", status: "waiting for assistant" })
       return
     }
-    if (event.type === "step.started") {
+    if (event.type === "session.step.started") {
       write([], { phase: "running", status: "assistant responding" })
       return
     }
-    if (event.type === "skill.activated") {
+    if (event.type === "session.skill.activated") {
       const messageID = event.id.replace(/^evt_/, "msg_")
       if (state.wait) state.wait.promoted = true
       if (state.skillMessages.has(messageID)) return
@@ -533,38 +547,56 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       write([skillCommit(messageID, event.data.name)])
       return
     }
-    if (event.type === "shell.started") {
-      state.shellCommands.set(event.data.callID, event.data.command)
+    if (event.type === "session.shell.started") {
+      state.shellCommands.set(event.data.shell.id, event.data.shell.command)
       const wait = state.shellWait
-      if (wait && wait.callID === undefined) wait.callID = event.data.callID
-      if (state.shellStarted.has(event.data.callID)) return
-      state.shellStarted.add(event.data.callID)
-      write([shellCommit(event.data.callID, event.data.command, { text: "running shell", phase: "start", toolState: "running" })], {
-        phase: "running",
-        status: "running shell",
-      })
+      if (wait && wait.callID === undefined) wait.callID = event.data.shell.id
+      if (state.shellStarted.has(event.data.shell.id)) return
+      state.shellStarted.add(event.data.shell.id)
+      write(
+        [
+          shellCommit(event.data.shell.id, event.data.shell.command, {
+            text: "running shell",
+            phase: "start",
+            toolState: "running",
+          }),
+        ],
+        {
+          phase: "running",
+          status: "running shell",
+        },
+      )
       return
     }
-    if (event.type === "shell.ended") {
-      const command = state.shellCommands.get(event.data.callID) ?? ""
+    if (event.type === "session.shell.ended") {
+      const command = state.shellCommands.get(event.data.shell.id) ?? event.data.shell.command
       const commits: StreamCommit[] = []
-      if (!state.shellStarted.has(event.data.callID)) {
-        state.shellStarted.add(event.data.callID)
-        if (command) commits.push(shellCommit(event.data.callID, command, { text: "running shell", phase: "start", toolState: "running" }))
+      if (!state.shellStarted.has(event.data.shell.id)) {
+        state.shellStarted.add(event.data.shell.id)
+        if (command)
+          commits.push(
+            shellCommit(event.data.shell.id, command, { text: "running shell", phase: "start", toolState: "running" }),
+          )
       }
-      if (!state.shellEnded.has(event.data.callID)) {
-        state.shellEnded.add(event.data.callID)
-        commits.push(shellCommit(event.data.callID, command, { text: event.data.output, phase: "progress", toolState: "completed" }))
+      if (!state.shellEnded.has(event.data.shell.id)) {
+        state.shellEnded.add(event.data.shell.id)
+        commits.push(
+          shellCommit(event.data.shell.id, command, {
+            text: event.data.output.output,
+            phase: "progress",
+            toolState: "completed",
+          }),
+        )
       }
       const wait = state.shellWait
       // An unset callID means shell.started has not been observed yet (event
       // delivery lag); mini serializes its own shells, so adopt this ended.
-      const owned = wait !== undefined && (wait.callID === undefined || wait.callID === event.data.callID)
+      const owned = wait !== undefined && (wait.callID === undefined || wait.callID === event.data.shell.id)
       write(commits, owned || state.wait ? undefined : { phase: "idle", status: "" })
       if (owned) wait.resolve()
       return
     }
-    if (event.type === "text.delta") {
+    if (event.type === "session.text.delta") {
       const key = streamPartKey(event.data.assistantMessageID, event.data.textID)
       const projected = state.projectedText.get(key)
       const covered = projected?.indexOf(event.data.delta) ?? -1
@@ -586,7 +618,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       ])
       return
     }
-    if (event.type === "text.ended") {
+    if (event.type === "session.text.ended") {
       const key = streamPartKey(event.data.assistantMessageID, event.data.textID)
       const previous = state.text.get(key) ?? ""
       if (event.data.text.length > previous.length)
@@ -604,7 +636,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       state.projectedText.delete(key)
       return
     }
-    if (event.type === "reasoning.delta") {
+    if (event.type === "session.reasoning.delta") {
       const key = streamPartKey(event.data.assistantMessageID, event.data.reasoningID)
       const projected = state.projectedReasoning.get(key)
       const covered = projected?.indexOf(event.data.delta) ?? -1
@@ -627,7 +659,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
         ])
       return
     }
-    if (event.type === "reasoning.ended") {
+    if (event.type === "session.reasoning.ended") {
       const key = streamPartKey(event.data.assistantMessageID, event.data.reasoningID)
       const previous = state.reasoning.get(key) ?? ""
       if (input.thinking && event.data.text.length > previous.length)
@@ -645,7 +677,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       state.projectedReasoning.delete(key)
       return
     }
-    if (event.type === "tool.input.started") {
+    if (event.type === "session.tool.input.started") {
       state.tools.set(event.data.callID, {
         messageID: event.data.assistantMessageID,
         name: event.data.name,
@@ -655,7 +687,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       })
       return
     }
-    if (event.type === "tool.called") {
+    if (event.type === "session.tool.called") {
       if (state.finishedTools.has(event.data.callID)) return
       const current = state.tools.get(event.data.callID)
       const item: SessionMessageAssistantTool = {
@@ -669,10 +701,10 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       renderTool(event.data.assistantMessageID, item)
       return
     }
-    if (event.type === "tool.progress") return
-    if (event.type === "tool.success" || event.type === "tool.failed") {
+    if (event.type === "session.tool.progress") return
+    if (event.type === "session.tool.success" || event.type === "session.tool.failed") {
       const current = state.tools.get(event.data.callID)
-      const failed = event.type === "tool.failed"
+      const failed = event.type === "session.tool.failed"
       const item: SessionMessageAssistantTool = {
         type: "tool",
         id: event.data.callID,
@@ -720,7 +752,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       syncBlockers()
       return
     }
-    if (event.type === "step.ended") {
+    if (event.type === "session.step.ended") {
       const total =
         event.data.tokens.input +
         event.data.tokens.output +
@@ -734,13 +766,13 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       })
       return
     }
-    if (event.type === "step.failed") {
+    if (event.type === "session.step.failed") {
       state.errors.add(event.data.assistantMessageID)
       if (state.wait) state.wait.failureRendered = true
       write([{ kind: "error", source: "system", text: errorMessage(event.data.error), phase: "start" }])
       return
     }
-    if (event.type === "execution.settled") {
+    if (event.type === "session.execution.settled") {
       write([], { phase: "idle", status: "" })
       const current = state.wait
       if (!current || (!current.promoted && !current.interrupted)) return
@@ -977,10 +1009,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
               sessionID: input.sessionID,
               id: messageID,
               prompt: {
-                text: [
-                  next.prompt.text,
-                  ...prepared.flatMap((file) => (file.text ? [file.text] : [])),
-                ].join("\n\n"),
+                text: [next.prompt.text, ...prepared.flatMap((file) => (file.text ? [file.text] : []))].join("\n\n"),
                 files: attachments.length ? attachments : undefined,
                 agents: agents.length ? agents : undefined,
               },
diff --git a/packages/opencode/test/cli/run/noninteractive.test.ts b/packages/opencode/test/cli/run/noninteractive.test.ts
index 839b99656b..4462c53a97 100644
--- a/packages/opencode/test/cli/run/noninteractive.test.ts
+++ b/packages/opencode/test/cli/run/noninteractive.test.ts
@@ -25,7 +25,7 @@ function prompted(inputID: string): V2Event {
   return {
     id: "evt_prompted",
     created: 0,
-    type: "prompt.promoted",
+    type: "session.prompt.promoted",
     durable: { aggregateID: "ses_1", seq: 0, version: 1 },
     data: { sessionID: "ses_1", inputID },
   }
@@ -35,7 +35,7 @@ function settled(outcome: "success" | "interrupted" = "success"): V2Event {
   return {
     id: "evt_settled",
     created: 0,
-    type: "execution.settled",
+    type: "session.execution.settled",
     data: { sessionID: "ses_1", outcome },
   }
 }
diff --git a/packages/opencode/test/cli/run/session-data.test.ts b/packages/opencode/test/cli/run/session-data.test.ts
index 89a6751d1b..805bcd486f 100644
--- a/packages/opencode/test/cli/run/session-data.test.ts
+++ b/packages/opencode/test/cli/run/session-data.test.ts
@@ -329,7 +329,7 @@ describe("run session data", () => {
   test("renders direct shell mode from first-class shell events", () => {
     let data = createSessionData()
     const started = reduce(data, {
-      type: "shell.started",
+      type: "session.shell.started",
       properties: {
         sessionID: "session-1",
         timestamp: 1,
@@ -353,7 +353,7 @@ describe("run session data", () => {
 
     data = started.data
     const ended = reduce(data, {
-      type: "shell.ended",
+      type: "session.shell.ended",
       properties: {
         sessionID: "session-1",
         timestamp: 2,
@@ -380,7 +380,7 @@ describe("run session data", () => {
 
   test("suppresses legacy bash part updates once shell events claim the call", () => {
     let data = reduce(createSessionData(), {
-      type: "shell.started",
+      type: "session.shell.started",
       properties: {
         sessionID: "session-1",
         timestamp: 1,
@@ -409,7 +409,7 @@ describe("run session data", () => {
     ).toEqual([])
 
     data = reduce(data, {
-      type: "shell.ended",
+      type: "session.shell.ended",
       properties: {
         sessionID: "session-1",
         timestamp: 2,
@@ -463,7 +463,7 @@ describe("run session data", () => {
 
     expect(
       reduce(data, {
-        type: "shell.started",
+        type: "session.shell.started",
         properties: {
           sessionID: "session-1",
           timestamp: 1,
@@ -497,7 +497,7 @@ describe("run session data", () => {
 
     expect(
       reduce(data, {
-        type: "shell.ended",
+        type: "session.shell.ended",
         properties: {
           sessionID: "session-1",
           timestamp: 2,
diff --git a/packages/opencode/test/cli/run/stream-v2.transport.test.ts b/packages/opencode/test/cli/run/stream-v2.transport.test.ts
index e43e88f934..cd2d131642 100644
--- a/packages/opencode/test/cli/run/stream-v2.transport.test.ts
+++ b/packages/opencode/test/cli/run/stream-v2.transport.test.ts
@@ -200,7 +200,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_prompted",
       created: 0,
-      type: "prompt.promoted",
+      type: "session.prompt.promoted",
       durable: durable("ses_1"),
       data: {
         sessionID: "ses_1",
@@ -210,7 +210,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_text",
       created: 0,
-      type: "text.delta",
+      type: "session.text.delta",
       data: {
         sessionID: "ses_1",
         assistantMessageID: "msg_assistant",
@@ -221,7 +221,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_settled",
       created: 0,
-      type: "execution.settled",
+      type: "session.execution.settled",
       data: { sessionID: "ses_1", outcome: "success" },
     })
     await turn
@@ -259,7 +259,7 @@ describe("V2 mini transport", () => {
         events.push({
           id: "evt_prompted",
           created: 0,
-          type: "prompt.promoted",
+          type: "session.prompt.promoted",
           durable: durable("ses_1"),
           data: {
             sessionID: "ses_1",
@@ -269,7 +269,7 @@ describe("V2 mini transport", () => {
         events.push({
           id: "evt_settled",
           created: 0,
-          type: "execution.settled",
+          type: "session.execution.settled",
           data: { sessionID: "ses_1", outcome: "success" },
         })
       })
@@ -353,7 +353,7 @@ describe("V2 mini transport", () => {
         events.push({
           id: "evt_prompted",
           created: 0,
-          type: "prompt.promoted",
+          type: "session.prompt.promoted",
           durable: durable("ses_1"),
           data: {
             sessionID: "ses_1",
@@ -363,7 +363,7 @@ describe("V2 mini transport", () => {
         events.push({
           id: "evt_settled",
           created: 0,
-          type: "execution.settled",
+          type: "session.execution.settled",
           data: { sessionID: "ses_1", outcome: "success" },
         })
       })
@@ -450,7 +450,7 @@ describe("V2 mini transport", () => {
         events.push({
           id: "evt_prompted",
           created: 0,
-          type: "prompt.promoted",
+          type: "session.prompt.promoted",
           durable: durable("ses_1"),
           data: {
             sessionID: "ses_1",
@@ -460,7 +460,7 @@ describe("V2 mini transport", () => {
         events.push({
           id: "evt_settled",
           created: 0,
-          type: "execution.settled",
+          type: "session.execution.settled",
           data: { sessionID: "ses_1", outcome: "success" },
         })
       })
@@ -724,7 +724,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_text",
       created: 0,
-      type: "text.delta",
+      type: "session.text.delta",
       data: {
         sessionID: "ses_1",
         assistantMessageID: "msg_assistant",
@@ -809,7 +809,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_reasoning",
       created: 0,
-      type: "reasoning.ended",
+      type: "session.reasoning.ended",
       durable: durable("ses_1"),
       data: {
         sessionID: "ses_1",
@@ -865,7 +865,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_settled",
       created: 0,
-      type: "execution.settled",
+      type: "session.execution.settled",
       data: { sessionID: "ses_1", outcome: "success" },
     })
     await turn
@@ -921,7 +921,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_prompted",
       created: 0,
-      type: "prompt.promoted",
+      type: "session.prompt.promoted",
       durable: durable("ses_1"),
       data: {
         sessionID: "ses_1",
@@ -931,7 +931,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_settled",
       created: 0,
-      type: "execution.settled",
+      type: "session.execution.settled",
       data: { sessionID: "ses_1", outcome: "success" },
     })
     await turn
@@ -981,7 +981,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_prompted",
       created: 0,
-      type: "prompt.promoted",
+      type: "session.prompt.promoted",
       durable: durable("ses_1"),
       data: {
         sessionID: "ses_1",
@@ -993,7 +993,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_settled",
       created: 0,
-      type: "execution.settled",
+      type: "session.execution.settled",
       data: { sessionID: "ses_1", outcome: "success" },
     })
     await turn
@@ -1021,16 +1021,42 @@ describe("V2 mini transport", () => {
         events.push({
           id: "evt_shell_start",
           created: 0,
-          type: "shell.started",
+          type: "session.shell.started",
           durable: durable("ses_1"),
-          data: { sessionID: "ses_1", callID: "call_shell", command: "ls" },
+          data: {
+            sessionID: "ses_1",
+            shell: {
+              id: "sh_shell",
+              status: "running",
+              command: "ls",
+              cwd: "/tmp",
+              shell: "/bin/sh",
+              file: "/tmp/opencode-shell",
+              metadata: {},
+              time: { started: 0 },
+            },
+          },
         })
         events.push({
           id: "evt_shell_end",
           created: 0,
-          type: "shell.ended",
+          type: "session.shell.ended",
           durable: durable("ses_1", 1),
-          data: { sessionID: "ses_1", callID: "call_shell", output: "file.txt" },
+          data: {
+            sessionID: "ses_1",
+            shell: {
+              id: "sh_shell",
+              status: "exited",
+              command: "ls",
+              cwd: "/tmp",
+              shell: "/bin/sh",
+              file: "/tmp/opencode-shell",
+              exit: 0,
+              metadata: {},
+              time: { started: 0, completed: 1 },
+            },
+            output: { output: "file.txt", cursor: 8, size: 8, truncated: false },
+          },
         })
       })
       return ok(undefined) as never
@@ -1047,8 +1073,8 @@ describe("V2 mini transport", () => {
 
     expect(request).toMatchObject({ sessionID: "ses_1", command: "ls" })
     expect(ui.commits.filter((item) => item.shell)).toMatchObject([
-      { phase: "start", tool: "bash", toolState: "running", shell: { callID: "call_shell", command: "ls" } },
-      { phase: "progress", text: "file.txt", toolState: "completed", shell: { callID: "call_shell", command: "ls" } },
+      { phase: "start", tool: "bash", toolState: "running", shell: { callID: "sh_shell", command: "ls" } },
+      { phase: "progress", text: "file.txt", toolState: "completed", shell: { callID: "sh_shell", command: "ls" } },
     ])
     expect(ui.events).toContainEqual({ type: "stream.patch", patch: { phase: "running", status: "running shell" } })
     await transport.close()
@@ -1107,9 +1133,18 @@ describe("V2 mini transport", () => {
           {
             id: "msg_shell",
             type: "shell" as const,
-            callID: "call_1",
-            command: "ls",
-            output: "file.txt",
+            shell: {
+              id: "sh_1",
+              status: "exited",
+              command: "ls",
+              cwd: "/tmp",
+              shell: "/bin/sh",
+              file: "/tmp/opencode-shell",
+              exit: 0,
+              metadata: {},
+              time: { started: 0, completed: 1 },
+            },
+            output: { output: "file.txt", cursor: 8, size: 8, truncated: false },
             time: { created: 1, completed: 2 },
           },
         ],
@@ -1127,15 +1162,29 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_shell_end",
       created: 0,
-      type: "shell.ended",
+      type: "session.shell.ended",
       durable: durable("ses_1", 1),
-      data: { sessionID: "ses_1", callID: "call_1", output: "file.txt" },
+      data: {
+        sessionID: "ses_1",
+        shell: {
+          id: "sh_1",
+          status: "exited",
+          command: "ls",
+          cwd: "/tmp",
+          shell: "/bin/sh",
+          file: "/tmp/opencode-shell",
+          exit: 0,
+          metadata: {},
+          time: { started: 0, completed: 1 },
+        },
+        output: { output: "file.txt", cursor: 8, size: 8, truncated: false },
+      },
     })
     await Bun.sleep(0)
     await Bun.sleep(0)
 
     expect(ui.commits.filter((item) => item.shell)).toMatchObject([
-      { phase: "start", shell: { callID: "call_1", command: "ls" } },
+      { phase: "start", shell: { callID: "sh_1", command: "ls" } },
       { phase: "progress", text: "file.txt", toolState: "completed" },
     ])
     await transport.close()
@@ -1160,7 +1209,7 @@ describe("V2 mini transport", () => {
         events.push({
           id: "evt_prompted",
           created: 0,
-          type: "prompt.promoted",
+          type: "session.prompt.promoted",
           durable: durable("ses_1"),
           data: {
             sessionID: "ses_1",
@@ -1170,7 +1219,7 @@ describe("V2 mini transport", () => {
         events.push({
           id: "evt_settled",
           created: 0,
-          type: "execution.settled",
+          type: "session.execution.settled",
           data: { sessionID: "ses_1", outcome: "success" },
         })
       })
@@ -1236,7 +1285,7 @@ describe("V2 mini transport", () => {
         events.push({
           id: "evt_skill",
           created: 0,
-          type: "skill.activated",
+          type: "session.skill.activated",
           durable: durable("ses_1"),
           data: {
             sessionID: "ses_1",
@@ -1247,7 +1296,7 @@ describe("V2 mini transport", () => {
         events.push({
           id: "evt_settled",
           created: 0,
-          type: "execution.settled",
+          type: "session.execution.settled",
           data: { sessionID: "ses_1", outcome: "success" },
         })
       })
@@ -1317,7 +1366,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_unrelated_settled",
       created: 0,
-      type: "execution.settled",
+      type: "session.execution.settled",
       data: { sessionID: "ses_1", outcome: "success" },
     })
     await Bun.sleep(0)
@@ -1327,7 +1376,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_skill",
       created: 0,
-      type: "skill.activated",
+      type: "session.skill.activated",
       durable: durable("ses_1"),
       data: {
         sessionID: "ses_1",
@@ -1338,7 +1387,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_skill_settled",
       created: 0,
-      type: "execution.settled",
+      type: "session.execution.settled",
       data: { sessionID: "ses_1", outcome: "success" },
     })
     await turn
@@ -1376,7 +1425,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_skill",
       created: 0,
-      type: "skill.activated",
+      type: "session.skill.activated",
       durable: durable("ses_1"),
       data: {
         sessionID: "ses_1",
@@ -1438,7 +1487,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_child_step",
       created: 0,
-      type: "step.started",
+      type: "session.step.started",
       durable: durable("ses_child"),
       data: {
         sessionID: "ses_child",
@@ -1456,7 +1505,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_child_text",
       created: 0,
-      type: "text.delta",
+      type: "session.text.delta",
       data: {
         sessionID: "ses_child",
         assistantMessageID: "msg_child_a",
@@ -1470,7 +1519,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_child_settled",
       created: 0,
-      type: "execution.settled",
+      type: "session.execution.settled",
       data: { sessionID: "ses_child", outcome: "success" },
     })
     while (!states().some((state) => state.tabs.some((tab) => tab.status === "completed"))) await Bun.sleep(0)
@@ -1515,7 +1564,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_child_step",
       created: 0,
-      type: "step.started",
+      type: "session.step.started",
       durable: durable("ses_child"),
       data: {
         sessionID: "ses_child",
@@ -1527,7 +1576,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_child_settled",
       created: 0,
-      type: "execution.settled",
+      type: "session.execution.settled",
       data: { sessionID: "ses_child", outcome: "interrupted" },
     })
     await Bun.sleep(0)
@@ -1574,7 +1623,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_child_step",
       created: 0,
-      type: "step.started",
+      type: "session.step.started",
       durable: durable("ses_child"),
       data: {
         sessionID: "ses_child",
@@ -1587,7 +1636,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_parent_call",
       created: 0,
-      type: "tool.called",
+      type: "session.tool.called",
       durable: durable("ses_1"),
       data: {
         sessionID: "ses_1",
@@ -1601,7 +1650,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_parent_success",
       created: 0,
-      type: "tool.success",
+      type: "session.tool.success",
       durable: durable("ses_1", 1),
       data: {
         sessionID: "ses_1",
@@ -1616,7 +1665,7 @@ describe("V2 mini transport", () => {
     events.push({
       id: "evt_child_settled",
       created: 0,
-      type: "execution.settled",
+      type: "session.execution.settled",
       data: { sessionID: "ses_child", outcome: "interrupted" },
     })
     while (!states().some((state) => state.tabs.some((tab) => tab.status === "cancelled"))) await Bun.sleep(0)
diff --git a/packages/opencode/test/server/httpapi-pty.test.ts b/packages/opencode/test/server/httpapi-pty.test.ts
index 3eec0c9682..ac18a8a2cf 100644
--- a/packages/opencode/test/server/httpapi-pty.test.ts
+++ b/packages/opencode/test/server/httpapi-pty.test.ts
@@ -99,10 +99,10 @@ describe("pty HttpApi bridge", () => {
       const updated = await app().request(PtyPaths.update.replace(":ptyID", info.id), {
         method: "PUT",
         headers: { ...headers, "content-type": "application/json" },
-        body: JSON.stringify({ title: "renamed", size: { cols: 80, rows: 24 } }),
+        body: JSON.stringify({ title: "session.renamed", size: { cols: 80, rows: 24 } }),
       })
       expect(updated.status).toBe(200)
-      expect(await updated.json()).toMatchObject({ id: info.id, title: "renamed" })
+      expect(await updated.json()).toMatchObject({ id: info.id, title: "session.renamed" })
     } finally {
       await app().request(PtyPaths.remove.replace(":ptyID", info.id), { method: "DELETE", headers })
     }
diff --git a/packages/opencode/test/server/httpapi-sdk.test.ts b/packages/opencode/test/server/httpapi-sdk.test.ts
index c81b3b771b..0af92ae382 100644
--- a/packages/opencode/test/server/httpapi-sdk.test.ts
+++ b/packages/opencode/test/server/httpapi-sdk.test.ts
@@ -573,7 +573,7 @@ describe("HttpApi SDK", () => {
         const child = yield* capture(() => sdk.session.create({ title: "child", parentID }))
         const childID = String(record(child.data).id)
         const get = yield* capture(() => sdk.session.get({ sessionID: parentID }))
-        const update = yield* capture(() => sdk.session.update({ sessionID: parentID, title: "renamed" }))
+        const update = yield* capture(() => sdk.session.update({ sessionID: parentID, title: "session.renamed" }))
         const roots = yield* capture(() => sdk.session.list({ roots: true, limit: 10 }))
         const all = yield* capture(() => sdk.session.list({ roots: false, limit: 10 }))
         const children = yield* capture(() => sdk.session.children({ sessionID: parentID }))
diff --git a/packages/opencode/test/tool/apply_patch.test.ts b/packages/opencode/test/tool/apply_patch.test.ts
index e394d8084f..57febfa06e 100644
--- a/packages/opencode/test/tool/apply_patch.test.ts
+++ b/packages/opencode/test/tool/apply_patch.test.ts
@@ -271,7 +271,7 @@ describe("tool.apply_patch freeform", () => {
 
       yield* execute({ patchText }, ctx)
 
-      const moved = path.join(test.directory, "renamed", "dir", "name.txt")
+      const moved = path.join(test.directory, "session.renamed", "dir", "name.txt")
       yield* expectReadFailure(original)
       expect(yield* readText(moved)).toBe("new content\n")
     }),
@@ -282,7 +282,7 @@ describe("tool.apply_patch freeform", () => {
       const test = yield* TestInstance
       const { ctx } = makeCtx()
       const original = path.join(test.directory, "old", "name.txt")
-      const destination = path.join(test.directory, "renamed", "dir", "name.txt")
+      const destination = path.join(test.directory, "session.renamed", "dir", "name.txt")
       yield* makeDir(path.dirname(original))
       yield* makeDir(path.dirname(destination))
       yield* writeText(original, "from\n")
diff --git a/packages/opencode/test/tool/fixtures/models-api.json b/packages/opencode/test/tool/fixtures/models-api.json
index 6302a951dd..9432ee6635 100644
--- a/packages/opencode/test/tool/fixtures/models-api.json
+++ b/packages/opencode/test/tool/fixtures/models-api.json
@@ -79593,8 +79593,8 @@
       }
     }
   },
-  "synthetic": {
-    "id": "synthetic",
+  "session.synthetic": {
+    "id": "session.synthetic",
     "env": ["SYNTHETIC_API_KEY"],
     "npm": "@ai-sdk/openai-compatible",
     "api": "https://api.synthetic.new/openai/v1",
diff --git a/packages/opencode/test/v2/session-message-updater.test.ts b/packages/opencode/test/v2/session-message-updater.test.ts
index 4da4dc9d13..1fc3dda0df 100644
--- a/packages/opencode/test/v2/session-message-updater.test.ts
+++ b/packages/opencode/test/v2/session-message-updater.test.ts
@@ -22,7 +22,7 @@ test.skip("step snapshots carry over to assistant messages", () => {
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       created: DateTime.makeUnsafe(0),
-      type: "step.started",
+      type: "session.step.started",
       durable: durable(sessionID),
       data: {
         sessionID,
@@ -44,7 +44,7 @@ test.skip("step snapshots carry over to assistant messages", () => {
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       created: DateTime.makeUnsafe(0),
-      type: "step.ended",
+      type: "session.step.ended",
       durable: durable(sessionID, 1, 2),
       data: {
         sessionID,
@@ -77,7 +77,7 @@ test.skip("text ended populates assistant text content", () => {
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       created: DateTime.makeUnsafe(0),
-      type: "step.started",
+      type: "session.step.started",
       durable: durable(sessionID),
       data: {
         sessionID,
@@ -96,7 +96,7 @@ test.skip("text ended populates assistant text content", () => {
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       created: DateTime.makeUnsafe(0),
-      type: "text.started",
+      type: "session.text.started",
       durable: durable(sessionID, 1),
       data: {
         sessionID,
@@ -110,7 +110,7 @@ test.skip("text ended populates assistant text content", () => {
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       created: DateTime.makeUnsafe(0),
-      type: "text.ended",
+      type: "session.text.ended",
       durable: durable(sessionID, 2),
       data: {
         sessionID,
@@ -136,7 +136,7 @@ test.skip("tool completion stores completed timestamp", () => {
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       created: DateTime.makeUnsafe(0),
-      type: "step.started",
+      type: "session.step.started",
       durable: durable(sessionID),
       data: {
         sessionID,
@@ -155,7 +155,7 @@ test.skip("tool completion stores completed timestamp", () => {
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       created: DateTime.makeUnsafe(0),
-      type: "tool.input.started",
+      type: "session.tool.input.started",
       durable: durable(sessionID, 1),
       data: {
         sessionID,
@@ -170,7 +170,7 @@ test.skip("tool completion stores completed timestamp", () => {
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       created: DateTime.makeUnsafe(0),
-      type: "tool.called",
+      type: "session.tool.called",
       durable: durable(sessionID, 2),
       data: {
         sessionID,
@@ -187,7 +187,7 @@ test.skip("tool completion stores completed timestamp", () => {
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       created: DateTime.makeUnsafe(0),
-      type: "tool.success",
+      type: "session.tool.success",
       durable: durable(sessionID, 3),
       data: {
         sessionID,
@@ -218,7 +218,7 @@ test("compaction events reduce to compaction message only when completed", () =>
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id,
       created: DateTime.makeUnsafe(0),
-      type: "compaction.started",
+      type: "session.compaction.started",
       durable: durable(sessionID),
       data: {
         sessionID,
@@ -233,7 +233,7 @@ test("compaction events reduce to compaction message only when completed", () =>
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       created: DateTime.makeUnsafe(0),
-      type: "compaction.delta",
+      type: "session.compaction.delta",
       data: {
         sessionID,
         text: "hello ",
@@ -245,7 +245,7 @@ test("compaction events reduce to compaction message only when completed", () =>
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: EventV2.ID.create(),
       created: DateTime.makeUnsafe(0),
-      type: "compaction.delta",
+      type: "session.compaction.delta",
       data: {
         sessionID,
         text: "summary",
@@ -257,7 +257,7 @@ test("compaction events reduce to compaction message only when completed", () =>
     SessionMessageUpdater.update(SessionMessageUpdater.memory(state), {
       id: endedID,
       created: DateTime.makeUnsafe(0),
-      type: "compaction.ended",
+      type: "session.compaction.ended",
       durable: durable(sessionID, 1),
       data: {
         sessionID,
diff --git a/packages/schema/src/session-event.ts b/packages/schema/src/session-event.ts
index fce091545a..824b1690db 100644
--- a/packages/schema/src/session-event.ts
+++ b/packages/schema/src/session-event.ts
@@ -12,6 +12,7 @@ import { SessionID } from "./session-id.js"
 import { Location } from "./location.js"
 import { SessionMessage } from "./session-message.js"
 import { Revert } from "./revert.js"
+import { Shell as ShellSchema } from "./shell.js"
 
 export { FileAttachment }
 
@@ -51,7 +52,7 @@ export const UnknownError = SessionMessage.UnknownError
 export type UnknownError = SessionMessage.UnknownError
 
 export const AgentSelected = Event.durable({
-  type: "agent.selected",
+  type: "session.agent.selected",
   ...options,
   schema: {
     ...Base,
@@ -61,7 +62,7 @@ export const AgentSelected = Event.durable({
 export type AgentSelected = typeof AgentSelected.Type
 
 export const ModelSelected = Event.durable({
-  type: "model.selected",
+  type: "session.model.selected",
   ...options,
   schema: {
     ...Base,
@@ -82,7 +83,7 @@ export const Moved = Event.durable({
 export type Moved = typeof Moved.Type
 
 export const Renamed = Event.durable({
-  type: "renamed",
+  type: "session.renamed",
   ...options,
   schema: {
     ...Base,
@@ -92,7 +93,7 @@ export const Renamed = Event.durable({
 export type Renamed = typeof Renamed.Type
 
 export const Forked = Event.durable({
-  type: "forked",
+  type: "session.forked",
   ...options,
   schema: {
     ...Base,
@@ -103,7 +104,7 @@ export const Forked = Event.durable({
 export type Forked = typeof Forked.Type
 
 export const PromptPromoted = Event.durable({
-  type: "prompt.promoted",
+  type: "session.prompt.promoted",
   ...options,
   schema: {
     sessionID: SessionID,
@@ -113,14 +114,14 @@ export const PromptPromoted = Event.durable({
 export type PromptPromoted = typeof PromptPromoted.Type
 
 export const PromptAdmitted = Event.durable({
-  type: "prompt.admitted",
+  type: "session.prompt.admitted",
   ...options,
   schema: PromptFields,
 })
 export type PromptAdmitted = typeof PromptAdmitted.Type
 
 export const ExecutionSettled = Event.ephemeral({
-  type: "execution.settled",
+  type: "session.execution.settled",
   schema: {
     ...Base,
     outcome: Schema.Literals(["success", "failure", "interrupted"]),
@@ -140,7 +141,7 @@ export const ContextUpdated = Event.durable({
 export type ContextUpdated = typeof ContextUpdated.Type
 
 export const Synthetic = Event.durable({
-  type: "synthetic",
+  type: "session.synthetic",
   ...options,
   schema: {
     ...Base,
@@ -153,7 +154,7 @@ export type Synthetic = typeof Synthetic.Type
 
 export namespace Skill {
   export const Activated = Event.durable({
-    type: "skill.activated",
+    type: "session.skill.activated",
     ...options,
     schema: {
       ...Base,
@@ -166,23 +167,22 @@ export namespace Skill {
 
 export namespace Shell {
   export const Started = Event.durable({
-    type: "shell.started",
+    type: "session.shell.started",
     ...options,
     schema: {
       ...Base,
-      callID: Schema.String,
-      command: Schema.String,
+      shell: ShellSchema.Info,
     },
   })
   export type Started = typeof Started.Type
 
   export const Ended = Event.durable({
-    type: "shell.ended",
+    type: "session.shell.ended",
     ...options,
     schema: {
       ...Base,
-      callID: Schema.String,
-      output: Schema.String,
+      shell: ShellSchema.Info,
+      output: ShellSchema.Output,
     },
   })
   export type Ended = typeof Ended.Type
@@ -190,7 +190,7 @@ export namespace Shell {
 
 export namespace Step {
   export const Started = Event.durable({
-    type: "step.started",
+    type: "session.step.started",
     ...options,
     schema: {
       ...Base,
@@ -203,7 +203,7 @@ export namespace Step {
   export type Started = typeof Started.Type
 
   export const Ended = Event.durable({
-    type: "step.ended",
+    type: "session.step.ended",
     ...stepSettlementOptions,
     schema: {
       ...Base,
@@ -226,7 +226,7 @@ export namespace Step {
   export type Ended = typeof Ended.Type
 
   export const Failed = Event.durable({
-    type: "step.failed",
+    type: "session.step.failed",
     ...stepSettlementOptions,
     schema: {
       ...Base,
@@ -239,7 +239,7 @@ export namespace Step {
 
 export namespace Text {
   export const Started = Event.durable({
-    type: "text.started",
+    type: "session.text.started",
     ...options,
     schema: {
       ...Base,
@@ -251,7 +251,7 @@ export namespace Text {
 
   // Stream fragments are live-only; Text.Ended is the replayable full-value boundary.
   export const Delta = Event.ephemeral({
-    type: "text.delta",
+    type: "session.text.delta",
     schema: {
       ...Base,
       assistantMessageID: SessionMessage.ID,
@@ -262,7 +262,7 @@ export namespace Text {
   export type Delta = typeof Delta.Type
 
   export const Ended = Event.durable({
-    type: "text.ended",
+    type: "session.text.ended",
     ...options,
     schema: {
       ...Base,
@@ -276,7 +276,7 @@ export namespace Text {
 
 export namespace Reasoning {
   export const Started = Event.durable({
-    type: "reasoning.started",
+    type: "session.reasoning.started",
     ...options,
     schema: {
       ...Base,
@@ -289,7 +289,7 @@ export namespace Reasoning {
 
   // Stream fragments are live-only; Reasoning.Ended is the replayable full-value boundary.
   export const Delta = Event.ephemeral({
-    type: "reasoning.delta",
+    type: "session.reasoning.delta",
     schema: {
       ...Base,
       assistantMessageID: SessionMessage.ID,
@@ -300,7 +300,7 @@ export namespace Reasoning {
   export type Delta = typeof Delta.Type
 
   export const Ended = Event.durable({
-    type: "reasoning.ended",
+    type: "session.reasoning.ended",
     ...options,
     schema: {
       ...Base,
@@ -322,7 +322,7 @@ export namespace Tool {
 
   export namespace Input {
     export const Started = Event.durable({
-      type: "tool.input.started",
+      type: "session.tool.input.started",
       ...options,
       schema: {
         ...ToolBase,
@@ -333,7 +333,7 @@ export namespace Tool {
 
     // Stream fragments are live-only; Input.Ended is the replayable raw-input boundary.
     export const Delta = Event.ephemeral({
-      type: "tool.input.delta",
+      type: "session.tool.input.delta",
       schema: {
         ...ToolBase,
         delta: Schema.String,
@@ -342,7 +342,7 @@ export namespace Tool {
     export type Delta = typeof Delta.Type
 
     export const Ended = Event.durable({
-      type: "tool.input.ended",
+      type: "session.tool.input.ended",
       ...options,
       schema: {
         ...ToolBase,
@@ -353,7 +353,7 @@ export namespace Tool {
   }
 
   export const Called = Event.durable({
-    type: "tool.called",
+    type: "session.tool.called",
     ...options,
     schema: {
       ...ToolBase,
@@ -372,7 +372,7 @@ export namespace Tool {
    * transitions or at a bounded cadence, not persist every stdout/stderr chunk.
    */
   export const Progress = Event.durable({
-    type: "tool.progress",
+    type: "session.tool.progress",
     ...options,
     schema: {
       ...ToolBase,
@@ -383,7 +383,7 @@ export namespace Tool {
   export type Progress = typeof Progress.Type
 
   export const Success = Event.durable({
-    type: "tool.success",
+    type: "session.tool.success",
     ...options,
     schema: {
       ...ToolBase,
@@ -400,7 +400,7 @@ export namespace Tool {
   export type Success = typeof Success.Type
 
   export const Failed = Event.durable({
-    type: "tool.failed",
+    type: "session.tool.failed",
     ...options,
     schema: {
       ...ToolBase,
@@ -428,7 +428,7 @@ export const RetryError = Schema.Struct({
 export interface RetryError extends Schema.Schema.Type<typeof RetryError> {}
 
 export const Retried = Event.durable({
-  type: "retried",
+  type: "session.retried",
   ...options,
   schema: {
     ...Base,
@@ -440,7 +440,7 @@ export type Retried = typeof Retried.Type
 
 export namespace Compaction {
   export const Started = Event.durable({
-    type: "compaction.started",
+    type: "session.compaction.started",
     ...options,
     schema: {
       ...Base,
@@ -450,7 +450,7 @@ export namespace Compaction {
   export type Started = typeof Started.Type
 
   export const Delta = Event.ephemeral({
-    type: "compaction.delta",
+    type: "session.compaction.delta",
     schema: {
       ...Base,
       text: Schema.String,
@@ -459,7 +459,7 @@ export namespace Compaction {
   export type Delta = typeof Delta.Type
 
   export const Ended = Event.durable({
-    type: "compaction.ended",
+    type: "session.compaction.ended",
     ...options,
     schema: {
       ...Base,
@@ -473,13 +473,13 @@ export namespace Compaction {
 
 export namespace RevertEvent {
   export const Staged = Event.durable({
-    type: "revert.staged",
+    type: "session.revert.staged",
     ...options,
     schema: { ...Base, revert: Revert.State },
   })
-  export const Cleared = Event.durable({ type: "revert.cleared", ...options, schema: Base })
+  export const Cleared = Event.durable({ type: "session.revert.cleared", ...options, schema: Base })
   export const Committed = Event.durable({
-    type: "revert.committed",
+    type: "session.revert.committed",
     ...options,
     schema: { ...Base, messageID: SessionMessage.ID },
   })
diff --git a/packages/schema/src/session-message.ts b/packages/schema/src/session-message.ts
index 349d04d06e..e3d81a31d7 100644
--- a/packages/schema/src/session-message.ts
+++ b/packages/schema/src/session-message.ts
@@ -9,6 +9,7 @@ import { DateTimeUtcFromMillis, RelativePath, statics } from "./schema.js"
 import { SessionID } from "./session-id.js"
 import { ascending } from "./identifier.js"
 import { Event } from "./event.js"
+import { Shell as ShellSchema } from "./shell.js"
 
 export const ID = Schema.String.check(Schema.isStartsWith("msg_")).pipe(
   Schema.brand("Session.Message.ID"),
@@ -82,9 +83,8 @@ export interface Shell extends Schema.Schema.Type<typeof Shell> {}
 export const Shell = Schema.Struct({
   ...Base,
   type: Schema.Literal("shell"),
-  callID: Schema.String,
-  command: Schema.String,
-  output: Schema.String,
+  shell: ShellSchema.Info,
+  output: ShellSchema.Output.pipe(optional),
   time: Schema.Struct({
     created: DateTimeUtcFromMillis,
     completed: DateTimeUtcFromMillis.pipe(optional),
diff --git a/packages/schema/test/event-manifest.test.ts b/packages/schema/test/event-manifest.test.ts
index 4fa23e75f7..873e415c61 100644
--- a/packages/schema/test/event-manifest.test.ts
+++ b/packages/schema/test/event-manifest.test.ts
@@ -53,7 +53,7 @@ describe("public event manifest", () => {
     expect(Session.Event.Definitions).toBe(SessionEvent.Definitions)
     expect(Workspace.Event).toBe(WorkspaceEvent)
     expect(Workspace.Event.Definitions).toBe(WorkspaceEvent.Definitions)
-    expect(EventManifest.Latest.get("step.ended")).toBe(SessionEvent.Step.Ended)
+    expect(EventManifest.Latest.get("session.step.ended")).toBe(SessionEvent.Step.Ended)
     expect(EventManifest.Latest.get("todo.updated")).toBe(SessionTodo.Event.Updated)
     expect(EventManifest.Latest.get("agent.updated")).toBe(Agent.Event.Updated)
     expect(EventManifest.Latest.get("project.updated")).toBe(Project.Event.Updated)
@@ -74,8 +74,8 @@ describe("public event manifest", () => {
       SessionV1.Event.Diff,
       SessionV1.Event.Error,
     ])
-    expect(EventManifest.Durable.get("step.ended.1")).toBe(SessionEvent.Step.Ended)
-    expect(EventManifest.Durable.has("step.ended.2")).toBe(false)
+    expect(EventManifest.Durable.get("session.step.ended.1")).toBe(SessionEvent.Step.Ended)
+    expect(EventManifest.Durable.has("session.step.ended.2")).toBe(false)
   })
 
   test("derives durable definitions from explicit definition durability", () => {
@@ -88,37 +88,37 @@ describe("public event manifest", () => {
         "message.removed.1",
         "message.part.updated.1",
         "message.part.removed.1",
-        "agent.selected.1",
-        "model.selected.1",
+        "session.agent.selected.1",
+        "session.model.selected.1",
         "session.moved.1",
-        "renamed.1",
-        "forked.1",
-        "prompt.promoted.1",
-        "prompt.admitted.1",
+        "session.renamed.1",
+        "session.forked.1",
+        "session.prompt.promoted.1",
+        "session.prompt.admitted.1",
         "session.context.updated.1",
-        "synthetic.1",
-        "skill.activated.1",
-        "shell.started.1",
-        "shell.ended.1",
-        "step.started.1",
-        "step.ended.1",
-        "step.failed.1",
-        "text.started.1",
-        "text.ended.1",
-        "tool.input.started.1",
-        "tool.input.ended.1",
-        "tool.called.1",
-        "tool.progress.1",
-        "tool.success.1",
-        "tool.failed.1",
-        "reasoning.started.1",
-        "reasoning.ended.1",
-        "retried.1",
-        "compaction.started.1",
-        "compaction.ended.1",
-        "revert.staged.1",
-        "revert.cleared.1",
-        "revert.committed.1",
+        "session.synthetic.1",
+        "session.skill.activated.1",
+        "session.shell.started.1",
+        "session.shell.ended.1",
+        "session.step.started.1",
+        "session.step.ended.1",
+        "session.step.failed.1",
+        "session.text.started.1",
+        "session.text.ended.1",
+        "session.tool.input.started.1",
+        "session.tool.input.ended.1",
+        "session.tool.called.1",
+        "session.tool.progress.1",
+        "session.tool.success.1",
+        "session.tool.failed.1",
+        "session.reasoning.started.1",
+        "session.reasoning.ended.1",
+        "session.retried.1",
+        "session.compaction.started.1",
+        "session.compaction.ended.1",
+        "session.revert.staged.1",
+        "session.revert.cleared.1",
+        "session.revert.committed.1",
       ].toSorted(),
     )
     expect(SessionEvent.DurableDefinitions).toEqual(
diff --git a/packages/sdk-next/test/embedded.test.ts b/packages/sdk-next/test/embedded.test.ts
index 5419b7e838..4ac31b70ab 100644
--- a/packages/sdk-next/test/embedded.test.ts
+++ b/packages/sdk-next/test/embedded.test.ts
@@ -78,7 +78,7 @@ it.live(
           prompt: fixture.sdk.Prompt.make({ text: "Promote this input" }),
         })
         const prompted = yield* opencode.sessions.log({ sessionID: id, follow: true }).pipe(
-          Stream.filter((event) => event.type === "prompt.promoted" && event.data.inputID === wake.id),
+          Stream.filter((event) => event.type === "session.prompt.promoted" && event.data.inputID === wake.id),
           Stream.runHead,
           Effect.timeout("10 seconds"),
           Effect.map(Option.getOrThrow),
@@ -119,7 +119,7 @@ it.live(
         expect(page.data.some((session) => session.id === id)).toBe(true)
         expect(active).toEqual({ data: {}, watermarks: {} })
         expect(admitted.sessionID).toBe(id)
-        expect(prompted.type).toBe("prompt.promoted")
+        expect(prompted.type).toBe("session.prompt.promoted")
         expect(wakeContext).toContainEqual(expect.objectContaining({ id: wake.id, type: "user" }))
         expect(contextEntries).toEqual([
           { key: "deploy-target", value: "production" },
@@ -127,7 +127,7 @@ it.live(
         ])
         expect(remainingContextEntries).toEqual([{ key: "deploy-target", value: "production" }])
         expect(context.some((message) => message.type === "model-switched")).toBe(true)
-        expect(event).toMatchObject({ type: "model.selected", durable: { seq: 1 } })
+        expect(event).toMatchObject({ type: "session.model.selected", durable: { seq: 1 } })
         expect(message).toEqual(modelMessage)
         expect(missing.map((error) => error._tag)).toEqual([
           "SessionNotFoundError",
@@ -149,13 +149,13 @@ it.live(
         const opencode = yield* fixture.sdk.OpenCode.create()
         const id = sessionID(fixture)
         const connected = yield* Latch.make(false)
-        const prompted = yield* Deferred.make<Extract<OpenCodeEvent, { type: "prompt.promoted" }>>()
+        const prompted = yield* Deferred.make<Extract<OpenCodeEvent, { type: "session.prompt.promoted" }>>()
 
         yield* opencode.events.subscribe().pipe(
           Stream.runForEach((event) =>
             event.type === "server.connected"
               ? connected.open
-              : event.type === "prompt.promoted" && event.data.sessionID === id
+              : event.type === "session.prompt.promoted" && event.data.sessionID === id
                 ? Deferred.succeed(prompted, event).pipe(Effect.asVoid)
                 : Effect.void,
           ),
@@ -191,7 +191,7 @@ it.live(
           Stream.runForEach((notification: OpenCodeEvent) =>
             notification.type === "server.connected"
               ? ready.open
-              : notification.type === "agent.selected" && notification.data.sessionID === id
+              : notification.type === "session.agent.selected" && notification.data.sessionID === id
                 ? event.open
                 : Effect.void,
           )
diff --git a/packages/sdk/js/script/build.ts b/packages/sdk/js/script/build.ts
index d87f8bf98a..220bf43da3 100755
--- a/packages/sdk/js/script/build.ts
+++ b/packages/sdk/js/script/build.ts
@@ -60,7 +60,7 @@ if (schemas) {
   visit({ ...document, components: { ...document.components, schemas: undefined } })
   for (const name of Object.keys(schemas)) {
     if (
-      /^(AgentSelected|ModelSelected|SessionMoved|Renamed|Forked|PromptPromoted|PromptAdmitted|ExecutionSettled|ContextUpdated|Synthetic|SkillActivated|ShellStarted|ShellEnded|StepStarted|StepEnded|StepFailed|TextStarted|TextDelta|TextEnded|ReasoningStarted|ReasoningDelta|ReasoningEnded|ToolInputStarted|ToolInputDelta|ToolInputEnded|ToolCalled|ToolProgress|ToolSuccess|ToolFailed|Retried|CompactionStarted|CompactionDelta|CompactionEnded|RevertStaged|RevertCleared|RevertCommitted)1$/.test(
+      /^(SessionAgentSelected|SessionModelSelected|SessionMoved|SessionRenamed|SessionForked|SessionPromptPromoted|SessionPromptAdmitted|SessionExecutionSettled|SessionContextUpdated|SessionSynthetic|SessionSkillActivated|SessionShellStarted|SessionShellEnded|SessionStepStarted|SessionStepEnded|SessionStepFailed|SessionTextStarted|SessionTextDelta|SessionTextEnded|SessionReasoningStarted|SessionReasoningDelta|SessionReasoningEnded|SessionToolInputStarted|SessionToolInputDelta|SessionToolInputEnded|SessionToolCalled|SessionToolProgress|SessionToolSuccess|SessionToolFailed|SessionRetried|SessionCompactionStarted|SessionCompactionDelta|SessionCompactionEnded|SessionRevertStaged|SessionRevertCleared|SessionRevertCommitted)1$/.test(
         name,
       ) &&
       !reachable.has(name)
@@ -100,7 +100,7 @@ await createClient({
 const generatedTypesPath = "./src/v2/gen/types.gen.ts"
 const generatedTypes = await Bun.file(generatedTypesPath).text()
 if (
-  /export type (AgentSelected|ModelSelected|SessionMoved|Renamed|Forked|PromptPromoted|PromptAdmitted|ExecutionSettled|ContextUpdated|Synthetic|SkillActivated|ShellStarted|ShellEnded|StepStarted|StepEnded|StepFailed|TextStarted|TextDelta|TextEnded|ReasoningStarted|ReasoningDelta|ReasoningEnded|ToolInputStarted|ToolInputDelta|ToolInputEnded|ToolCalled|ToolProgress|ToolSuccess|ToolFailed|Retried|CompactionStarted|CompactionDelta|CompactionEnded|RevertStaged|RevertCleared|RevertCommitted)1 =/.test(
+  /export type (SessionAgentSelected|SessionModelSelected|SessionMoved|SessionRenamed|SessionForked|SessionPromptPromoted|SessionPromptAdmitted|SessionExecutionSettled|SessionContextUpdated|SessionSynthetic|SessionSkillActivated|SessionShellStarted|SessionShellEnded|SessionStepStarted|SessionStepEnded|SessionStepFailed|SessionTextStarted|SessionTextDelta|SessionTextEnded|SessionReasoningStarted|SessionReasoningDelta|SessionReasoningEnded|SessionToolInputStarted|SessionToolInputDelta|SessionToolInputEnded|SessionToolCalled|SessionToolProgress|SessionToolSuccess|SessionToolFailed|SessionRetried|SessionCompactionStarted|SessionCompactionDelta|SessionCompactionEnded|SessionRevertStaged|SessionRevertCleared|SessionRevertCommitted)1 =/.test(
     generatedTypes,
   )
 ) {
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index 56cdccf087..27ca0f00cd 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -17,42 +17,42 @@ export type Event =
   | EventMessageRemoved
   | EventMessagePartUpdated
   | EventMessagePartRemoved
-  | EventAgentSelected
-  | EventModelSelected
+  | EventSessionAgentSelected
+  | EventSessionModelSelected
   | EventSessionMoved
-  | EventRenamed
-  | EventForked
-  | EventPromptPromoted
-  | EventPromptAdmitted
-  | EventExecutionSettled
+  | EventSessionRenamed
+  | EventSessionForked
+  | EventSessionPromptPromoted
+  | EventSessionPromptAdmitted
+  | EventSessionExecutionSettled
   | EventSessionContextUpdated
-  | EventSynthetic
-  | EventSkillActivated
-  | EventShellStarted
-  | EventShellEnded
-  | EventStepStarted
-  | EventStepEnded
-  | EventStepFailed
-  | EventTextStarted
-  | EventTextDelta
-  | EventTextEnded
-  | EventReasoningStarted
-  | EventReasoningDelta
-  | EventReasoningEnded
-  | EventToolInputStarted
-  | EventToolInputDelta
-  | EventToolInputEnded
-  | EventToolCalled
-  | EventToolProgress
-  | EventToolSuccess
-  | EventToolFailed
-  | EventRetried
-  | EventCompactionStarted
-  | EventCompactionDelta
-  | EventCompactionEnded
-  | EventRevertStaged
-  | EventRevertCleared
-  | EventRevertCommitted
+  | EventSessionSynthetic
+  | EventSessionSkillActivated
+  | EventSessionShellStarted
+  | EventSessionShellEnded
+  | EventSessionStepStarted
+  | EventSessionStepEnded
+  | EventSessionStepFailed
+  | EventSessionTextStarted
+  | EventSessionTextDelta
+  | EventSessionTextEnded
+  | EventSessionReasoningStarted
+  | EventSessionReasoningDelta
+  | EventSessionReasoningEnded
+  | EventSessionToolInputStarted
+  | EventSessionToolInputDelta
+  | EventSessionToolInputEnded
+  | EventSessionToolCalled
+  | EventSessionToolProgress
+  | EventSessionToolSuccess
+  | EventSessionToolFailed
+  | EventSessionRetried
+  | EventSessionCompactionStarted
+  | EventSessionCompactionDelta
+  | EventSessionCompactionEnded
+  | EventSessionRevertStaged
+  | EventSessionRevertCleared
+  | EventSessionRevertCommitted
   | EventMessagePartDelta
   | EventSessionDiff
   | EventSessionError
@@ -657,17 +657,6 @@ export type Prompt = {
   agents?: Array<PromptAgentAttachment>
 }
 
-export type Pty = {
-  id: string
-  title: string
-  command: string
-  args: Array<string>
-  cwd: string
-  status: "running" | "exited"
-  pid: number
-  exitCode?: number
-}
-
 export type Shell = {
   id: string
   status: "running" | "exited" | "timeout" | "killed"
@@ -686,6 +675,17 @@ export type Shell = {
   }
 }
 
+export type Pty = {
+  id: string
+  title: string
+  command: string
+  args: Array<string>
+  cwd: string
+  status: "running" | "exited"
+  pid: number
+  exitCode?: number
+}
+
 export type Todo = {
   /**
    * Brief description of the task
@@ -858,7 +858,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "agent.selected"
+        type: "session.agent.selected"
         properties: {
           sessionID: string
           agent: string
@@ -866,7 +866,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "model.selected"
+        type: "session.model.selected"
         properties: {
           sessionID: string
           model: ModelRef
@@ -883,7 +883,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "renamed"
+        type: "session.renamed"
         properties: {
           sessionID: string
           title: string
@@ -891,7 +891,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "forked"
+        type: "session.forked"
         properties: {
           sessionID: string
           parentID: string
@@ -900,7 +900,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "prompt.promoted"
+        type: "session.prompt.promoted"
         properties: {
           sessionID: string
           inputID: string
@@ -908,7 +908,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "prompt.admitted"
+        type: "session.prompt.admitted"
         properties: {
           sessionID: string
           inputID: string
@@ -918,7 +918,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "execution.settled"
+        type: "session.execution.settled"
         properties: {
           sessionID: string
           outcome: "success" | "failure" | "interrupted"
@@ -935,7 +935,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "synthetic"
+        type: "session.synthetic"
         properties: {
           sessionID: string
           text: string
@@ -947,7 +947,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "skill.activated"
+        type: "session.skill.activated"
         properties: {
           sessionID: string
           name: string
@@ -956,25 +956,29 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "shell.started"
+        type: "session.shell.started"
         properties: {
           sessionID: string
-          callID: string
-          command: string
+          shell: Shell
         }
       }
     | {
         id: string
-        type: "shell.ended"
+        type: "session.shell.ended"
         properties: {
           sessionID: string
-          callID: string
-          output: string
+          shell: Shell
+          output: {
+            output: string
+            cursor: number
+            size: number
+            truncated: boolean
+          }
         }
       }
     | {
         id: string
-        type: "step.started"
+        type: "session.step.started"
         properties: {
           sessionID: string
           assistantMessageID: string
@@ -985,7 +989,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "step.ended"
+        type: "session.step.ended"
         properties: {
           sessionID: string
           assistantMessageID: string
@@ -1006,7 +1010,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "step.failed"
+        type: "session.step.failed"
         properties: {
           sessionID: string
           assistantMessageID: string
@@ -1015,7 +1019,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "text.started"
+        type: "session.text.started"
         properties: {
           sessionID: string
           assistantMessageID: string
@@ -1024,7 +1028,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "text.delta"
+        type: "session.text.delta"
         properties: {
           sessionID: string
           assistantMessageID: string
@@ -1034,7 +1038,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "text.ended"
+        type: "session.text.ended"
         properties: {
           sessionID: string
           assistantMessageID: string
@@ -1044,7 +1048,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "reasoning.started"
+        type: "session.reasoning.started"
         properties: {
           sessionID: string
           assistantMessageID: string
@@ -1054,7 +1058,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "reasoning.delta"
+        type: "session.reasoning.delta"
         properties: {
           sessionID: string
           assistantMessageID: string
@@ -1064,7 +1068,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "reasoning.ended"
+        type: "session.reasoning.ended"
         properties: {
           sessionID: string
           assistantMessageID: string
@@ -1075,7 +1079,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "tool.input.started"
+        type: "session.tool.input.started"
         properties: {
           sessionID: string
           assistantMessageID: string
@@ -1085,7 +1089,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "tool.input.delta"
+        type: "session.tool.input.delta"
         properties: {
           sessionID: string
           assistantMessageID: string
@@ -1095,7 +1099,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "tool.input.ended"
+        type: "session.tool.input.ended"
         properties: {
           sessionID: string
           assistantMessageID: string
@@ -1105,7 +1109,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "tool.called"
+        type: "session.tool.called"
         properties: {
           sessionID: string
           assistantMessageID: string
@@ -1122,7 +1126,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "tool.progress"
+        type: "session.tool.progress"
         properties: {
           sessionID: string
           assistantMessageID: string
@@ -1135,7 +1139,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "tool.success"
+        type: "session.tool.success"
         properties: {
           sessionID: string
           assistantMessageID: string
@@ -1154,7 +1158,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "tool.failed"
+        type: "session.tool.failed"
         properties: {
           sessionID: string
           assistantMessageID: string
@@ -1169,7 +1173,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "retried"
+        type: "session.retried"
         properties: {
           sessionID: string
           attempt: number
@@ -1178,7 +1182,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "compaction.started"
+        type: "session.compaction.started"
         properties: {
           sessionID: string
           reason: "auto" | "manual"
@@ -1186,7 +1190,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "compaction.delta"
+        type: "session.compaction.delta"
         properties: {
           sessionID: string
           text: string
@@ -1194,7 +1198,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "compaction.ended"
+        type: "session.compaction.ended"
         properties: {
           sessionID: string
           reason: "auto" | "manual"
@@ -1204,7 +1208,7 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "revert.staged"
+        type: "session.revert.staged"
         properties: {
           sessionID: string
           revert: RevertState
@@ -1212,14 +1216,14 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "revert.cleared"
+        type: "session.revert.cleared"
         properties: {
           sessionID: string
         }
       }
     | {
         id: string
-        type: "revert.committed"
+        type: "session.revert.committed"
         properties: {
           sessionID: string
           messageID: string
@@ -1704,37 +1708,37 @@ export type GlobalEvent = {
     | SyncEventMessageRemoved
     | SyncEventMessagePartUpdated
     | SyncEventMessagePartRemoved
-    | SyncEventAgentSelected
-    | SyncEventModelSelected
+    | SyncEventSessionAgentSelected
+    | SyncEventSessionModelSelected
     | SyncEventSessionMoved
-    | SyncEventRenamed
-    | SyncEventForked
-    | SyncEventPromptPromoted
-    | SyncEventPromptAdmitted
+    | SyncEventSessionRenamed
+    | SyncEventSessionForked
+    | SyncEventSessionPromptPromoted
+    | SyncEventSessionPromptAdmitted
     | SyncEventSessionContextUpdated
-    | SyncEventSynthetic
-    | SyncEventSkillActivated
-    | SyncEventShellStarted
-    | SyncEventShellEnded
-    | SyncEventStepStarted
-    | SyncEventStepEnded
-    | SyncEventStepFailed
-    | SyncEventTextStarted
-    | SyncEventTextEnded
-    | SyncEventReasoningStarted
-    | SyncEventReasoningEnded
-    | SyncEventToolInputStarted
-    | SyncEventToolInputEnded
-    | SyncEventToolCalled
-    | SyncEventToolProgress
-    | SyncEventToolSuccess
-    | SyncEventToolFailed
-    | SyncEventRetried
-    | SyncEventCompactionStarted
-    | SyncEventCompactionEnded
-    | SyncEventRevertStaged
-    | SyncEventRevertCleared
-    | SyncEventRevertCommitted
+    | SyncEventSessionSynthetic
+    | SyncEventSessionSkillActivated
+    | SyncEventSessionShellStarted
+    | SyncEventSessionShellEnded
+    | SyncEventSessionStepStarted
+    | SyncEventSessionStepEnded
+    | SyncEventSessionStepFailed
+    | SyncEventSessionTextStarted
+    | SyncEventSessionTextEnded
+    | SyncEventSessionReasoningStarted
+    | SyncEventSessionReasoningEnded
+    | SyncEventSessionToolInputStarted
+    | SyncEventSessionToolInputEnded
+    | SyncEventSessionToolCalled
+    | SyncEventSessionToolProgress
+    | SyncEventSessionToolSuccess
+    | SyncEventSessionToolFailed
+    | SyncEventSessionRetried
+    | SyncEventSessionCompactionStarted
+    | SyncEventSessionCompactionEnded
+    | SyncEventSessionRevertStaged
+    | SyncEventSessionRevertCleared
+    | SyncEventSessionRevertCommitted
 }
 
 /**
@@ -2854,120 +2858,56 @@ export type UnknownError1 = {
   ref?: string
 }
 
-export type Renamed = {
+export type Shell1 = {
   id: string
-  created: number
-  metadata?: {
+  status: "running" | "exited" | "timeout" | "killed"
+  command: string
+  cwd: string
+  shell: string
+  file: string
+  pid?: number
+  exit?: number | "NaN" | "Infinity" | "-Infinity"
+  metadata: {
     [key: string]: unknown
   }
-  type: "renamed"
-  durable: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
-  location?: LocationRef
-  data: {
-    sessionID: string
-    title: string
-  }
-}
-
-export type Forked = {
-  id: string
-  created: number
-  metadata?: {
-    [key: string]: unknown
-  }
-  type: "forked"
-  durable: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
-  location?: LocationRef
-  data: {
-    sessionID: string
-    parentID: string
-    from?: string
-  }
-}
-
-export type Synthetic = {
-  id: string
-  created: number
-  metadata?: {
-    [key: string]: unknown
-  }
-  type: "synthetic"
-  durable: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
-  location?: LocationRef
-  data: {
-    sessionID: string
-    text: string
-    description?: string
-    metadata?: {
-      [key: string]: unknown
-    }
-  }
-}
-
-export type Retried = {
-  id: string
-  created: number
-  metadata?: {
-    [key: string]: unknown
-  }
-  type: "retried"
-  durable: {
-    aggregateID: string
-    seq: number
-    version: number
-  }
-  location?: LocationRef
-  data: {
-    sessionID: string
-    attempt: number
-    error: SessionRetryError
+  time: {
+    started: number | "NaN" | "Infinity" | "-Infinity"
+    completed?: number | "NaN" | "Infinity" | "-Infinity"
   }
 }
 
 export type SessionDurableEvent =
-  | AgentSelected
-  | ModelSelected
+  | SessionAgentSelected
+  | SessionModelSelected
   | SessionMoved
-  | Renamed
-  | Forked
-  | PromptPromoted
-  | PromptAdmitted
+  | SessionRenamed
+  | SessionForked
+  | SessionPromptPromoted
+  | SessionPromptAdmitted
   | SessionContextUpdated
-  | Synthetic
-  | SkillActivated
-  | ShellStarted
-  | ShellEnded
-  | StepStarted
-  | StepEnded
-  | StepFailed
-  | TextStarted
-  | TextEnded
-  | ReasoningStarted
-  | ReasoningEnded
-  | ToolInputStarted
-  | ToolInputEnded
-  | ToolCalled
-  | ToolProgress
-  | ToolSuccess
-  | ToolFailed
-  | Retried
-  | CompactionStarted
-  | CompactionEnded
-  | RevertStaged
-  | RevertCleared
-  | RevertCommitted
+  | SessionSynthetic
+  | SessionSkillActivated
+  | SessionShellStarted
+  | SessionShellEnded
+  | SessionStepStarted
+  | SessionStepEnded
+  | SessionStepFailed
+  | SessionTextStarted
+  | SessionTextEnded
+  | SessionReasoningStarted
+  | SessionReasoningEnded
+  | SessionToolInputStarted
+  | SessionToolInputEnded
+  | SessionToolCalled
+  | SessionToolProgress
+  | SessionToolSuccess
+  | SessionToolFailed
+  | SessionRetried
+  | SessionCompactionStarted
+  | SessionCompactionEnded
+  | SessionRevertStaged
+  | SessionRevertCleared
+  | SessionRevertCommitted
 
 export type SessionLogItem = SessionDurableEvent | EventLogSynced
 
@@ -3022,24 +2962,6 @@ export type OutputFormat1 =
       retryCount?: number
     }
 
-export type Shell1 = {
-  id: string
-  status: "running" | "exited" | "timeout" | "killed"
-  command: string
-  cwd: string
-  shell: string
-  file: string
-  pid?: number
-  exit?: number | "NaN" | "Infinity" | "-Infinity"
-  metadata: {
-    [key: string]: unknown
-  }
-  time: {
-    started: number | "NaN" | "Infinity" | "-Infinity"
-    completed?: number | "NaN" | "Infinity" | "-Infinity"
-  }
-}
-
 export type SessionStatus2 = {
   id: string
   created: number
@@ -3096,42 +3018,42 @@ export type V2Event =
   | MessageRemoved
   | MessagePartUpdated
   | MessagePartRemoved
-  | AgentSelected
-  | ModelSelected
+  | SessionAgentSelected
+  | SessionModelSelected
   | SessionMoved
-  | Renamed
-  | Forked
-  | PromptPromoted
-  | PromptAdmitted
-  | ExecutionSettled
+  | SessionRenamed
+  | SessionForked
+  | SessionPromptPromoted
+  | SessionPromptAdmitted
+  | SessionExecutionSettled
   | SessionContextUpdated
-  | Synthetic
-  | SkillActivated
-  | ShellStarted
-  | ShellEnded
-  | StepStarted
-  | StepEnded
-  | StepFailed
-  | TextStarted
-  | TextDelta
-  | TextEnded
-  | ReasoningStarted
-  | ReasoningDelta
-  | ReasoningEnded
-  | ToolInputStarted
-  | ToolInputDelta
-  | ToolInputEnded
-  | ToolCalled
-  | ToolProgress
-  | ToolSuccess
-  | ToolFailed
-  | Retried
-  | CompactionStarted
-  | CompactionDelta
-  | CompactionEnded
-  | RevertStaged
-  | RevertCleared
-  | RevertCommitted
+  | SessionSynthetic
+  | SessionSkillActivated
+  | SessionShellStarted
+  | SessionShellEnded
+  | SessionStepStarted
+  | SessionStepEnded
+  | SessionStepFailed
+  | SessionTextStarted
+  | SessionTextDelta
+  | SessionTextEnded
+  | SessionReasoningStarted
+  | SessionReasoningDelta
+  | SessionReasoningEnded
+  | SessionToolInputStarted
+  | SessionToolInputDelta
+  | SessionToolInputEnded
+  | SessionToolCalled
+  | SessionToolProgress
+  | SessionToolSuccess
+  | SessionToolFailed
+  | SessionRetried
+  | SessionCompactionStarted
+  | SessionCompactionDelta
+  | SessionCompactionEnded
+  | SessionRevertStaged
+  | SessionRevertCleared
+  | SessionRevertCommitted
   | MessagePartDelta
   | SessionDiff
   | SessionError
@@ -3689,11 +3611,11 @@ export type SyncEventMessagePartRemoved = {
   }
 }
 
-export type SyncEventAgentSelected = {
+export type SyncEventSessionAgentSelected = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "agent.selected.1"
+    type: "session.agent.selected.1"
     id: string
     seq: number
     aggregateID: string
@@ -3704,11 +3626,11 @@ export type SyncEventAgentSelected = {
   }
 }
 
-export type SyncEventModelSelected = {
+export type SyncEventSessionModelSelected = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "model.selected.1"
+    type: "session.model.selected.1"
     id: string
     seq: number
     aggregateID: string
@@ -3735,11 +3657,11 @@ export type SyncEventSessionMoved = {
   }
 }
 
-export type SyncEventRenamed = {
+export type SyncEventSessionRenamed = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "renamed.1"
+    type: "session.renamed.1"
     id: string
     seq: number
     aggregateID: string
@@ -3750,11 +3672,11 @@ export type SyncEventRenamed = {
   }
 }
 
-export type SyncEventForked = {
+export type SyncEventSessionForked = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "forked.1"
+    type: "session.forked.1"
     id: string
     seq: number
     aggregateID: string
@@ -3766,11 +3688,11 @@ export type SyncEventForked = {
   }
 }
 
-export type SyncEventPromptPromoted = {
+export type SyncEventSessionPromptPromoted = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "prompt.promoted.1"
+    type: "session.prompt.promoted.1"
     id: string
     seq: number
     aggregateID: string
@@ -3781,11 +3703,11 @@ export type SyncEventPromptPromoted = {
   }
 }
 
-export type SyncEventPromptAdmitted = {
+export type SyncEventSessionPromptAdmitted = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "prompt.admitted.1"
+    type: "session.prompt.admitted.1"
     id: string
     seq: number
     aggregateID: string
@@ -3813,11 +3735,11 @@ export type SyncEventSessionContextUpdated = {
   }
 }
 
-export type SyncEventSynthetic = {
+export type SyncEventSessionSynthetic = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "synthetic.1"
+    type: "session.synthetic.1"
     id: string
     seq: number
     aggregateID: string
@@ -3832,11 +3754,11 @@ export type SyncEventSynthetic = {
   }
 }
 
-export type SyncEventSkillActivated = {
+export type SyncEventSessionSkillActivated = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "skill.activated.1"
+    type: "session.skill.activated.1"
     id: string
     seq: number
     aggregateID: string
@@ -3848,43 +3770,47 @@ export type SyncEventSkillActivated = {
   }
 }
 
-export type SyncEventShellStarted = {
+export type SyncEventSessionShellStarted = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "shell.started.1"
+    type: "session.shell.started.1"
     id: string
     seq: number
     aggregateID: string
     data: {
       sessionID: string
-      callID: string
-      command: string
+      shell: Shell
     }
   }
 }
 
-export type SyncEventShellEnded = {
+export type SyncEventSessionShellEnded = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "shell.ended.1"
+    type: "session.shell.ended.1"
     id: string
     seq: number
     aggregateID: string
     data: {
       sessionID: string
-      callID: string
-      output: string
+      shell: Shell
+      output: {
+        output: string
+        cursor: number
+        size: number
+        truncated: boolean
+      }
     }
   }
 }
 
-export type SyncEventStepStarted = {
+export type SyncEventSessionStepStarted = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "step.started.1"
+    type: "session.step.started.1"
     id: string
     seq: number
     aggregateID: string
@@ -3898,11 +3824,11 @@ export type SyncEventStepStarted = {
   }
 }
 
-export type SyncEventStepEnded = {
+export type SyncEventSessionStepEnded = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "step.ended.1"
+    type: "session.step.ended.1"
     id: string
     seq: number
     aggregateID: string
@@ -3926,11 +3852,11 @@ export type SyncEventStepEnded = {
   }
 }
 
-export type SyncEventStepFailed = {
+export type SyncEventSessionStepFailed = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "step.failed.1"
+    type: "session.step.failed.1"
     id: string
     seq: number
     aggregateID: string
@@ -3942,11 +3868,11 @@ export type SyncEventStepFailed = {
   }
 }
 
-export type SyncEventTextStarted = {
+export type SyncEventSessionTextStarted = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "text.started.1"
+    type: "session.text.started.1"
     id: string
     seq: number
     aggregateID: string
@@ -3958,11 +3884,11 @@ export type SyncEventTextStarted = {
   }
 }
 
-export type SyncEventTextEnded = {
+export type SyncEventSessionTextEnded = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "text.ended.1"
+    type: "session.text.ended.1"
     id: string
     seq: number
     aggregateID: string
@@ -3975,11 +3901,11 @@ export type SyncEventTextEnded = {
   }
 }
 
-export type SyncEventReasoningStarted = {
+export type SyncEventSessionReasoningStarted = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "reasoning.started.1"
+    type: "session.reasoning.started.1"
     id: string
     seq: number
     aggregateID: string
@@ -3992,11 +3918,11 @@ export type SyncEventReasoningStarted = {
   }
 }
 
-export type SyncEventReasoningEnded = {
+export type SyncEventSessionReasoningEnded = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "reasoning.ended.1"
+    type: "session.reasoning.ended.1"
     id: string
     seq: number
     aggregateID: string
@@ -4010,11 +3936,11 @@ export type SyncEventReasoningEnded = {
   }
 }
 
-export type SyncEventToolInputStarted = {
+export type SyncEventSessionToolInputStarted = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "tool.input.started.1"
+    type: "session.tool.input.started.1"
     id: string
     seq: number
     aggregateID: string
@@ -4027,11 +3953,11 @@ export type SyncEventToolInputStarted = {
   }
 }
 
-export type SyncEventToolInputEnded = {
+export type SyncEventSessionToolInputEnded = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "tool.input.ended.1"
+    type: "session.tool.input.ended.1"
     id: string
     seq: number
     aggregateID: string
@@ -4044,11 +3970,11 @@ export type SyncEventToolInputEnded = {
   }
 }
 
-export type SyncEventToolCalled = {
+export type SyncEventSessionToolCalled = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "tool.called.1"
+    type: "session.tool.called.1"
     id: string
     seq: number
     aggregateID: string
@@ -4068,11 +3994,11 @@ export type SyncEventToolCalled = {
   }
 }
 
-export type SyncEventToolProgress = {
+export type SyncEventSessionToolProgress = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "tool.progress.1"
+    type: "session.tool.progress.1"
     id: string
     seq: number
     aggregateID: string
@@ -4088,11 +4014,11 @@ export type SyncEventToolProgress = {
   }
 }
 
-export type SyncEventToolSuccess = {
+export type SyncEventSessionToolSuccess = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "tool.success.1"
+    type: "session.tool.success.1"
     id: string
     seq: number
     aggregateID: string
@@ -4114,11 +4040,11 @@ export type SyncEventToolSuccess = {
   }
 }
 
-export type SyncEventToolFailed = {
+export type SyncEventSessionToolFailed = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "tool.failed.1"
+    type: "session.tool.failed.1"
     id: string
     seq: number
     aggregateID: string
@@ -4136,11 +4062,11 @@ export type SyncEventToolFailed = {
   }
 }
 
-export type SyncEventRetried = {
+export type SyncEventSessionRetried = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "retried.1"
+    type: "session.retried.1"
     id: string
     seq: number
     aggregateID: string
@@ -4152,11 +4078,11 @@ export type SyncEventRetried = {
   }
 }
 
-export type SyncEventCompactionStarted = {
+export type SyncEventSessionCompactionStarted = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "compaction.started.1"
+    type: "session.compaction.started.1"
     id: string
     seq: number
     aggregateID: string
@@ -4167,11 +4093,11 @@ export type SyncEventCompactionStarted = {
   }
 }
 
-export type SyncEventCompactionEnded = {
+export type SyncEventSessionCompactionEnded = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "compaction.ended.1"
+    type: "session.compaction.ended.1"
     id: string
     seq: number
     aggregateID: string
@@ -4184,11 +4110,11 @@ export type SyncEventCompactionEnded = {
   }
 }
 
-export type SyncEventRevertStaged = {
+export type SyncEventSessionRevertStaged = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "revert.staged.1"
+    type: "session.revert.staged.1"
     id: string
     seq: number
     aggregateID: string
@@ -4199,11 +4125,11 @@ export type SyncEventRevertStaged = {
   }
 }
 
-export type SyncEventRevertCleared = {
+export type SyncEventSessionRevertCleared = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "revert.cleared.1"
+    type: "session.revert.cleared.1"
     id: string
     seq: number
     aggregateID: string
@@ -4213,11 +4139,11 @@ export type SyncEventRevertCleared = {
   }
 }
 
-export type SyncEventRevertCommitted = {
+export type SyncEventSessionRevertCommitted = {
   type: "sync"
   id: string
   syncEvent: {
-    type: "revert.committed.1"
+    type: "session.revert.committed.1"
     id: string
     seq: number
     aggregateID: string
@@ -4449,9 +4375,13 @@ export type SessionMessageShell = {
     completed?: number
   }
   type: "shell"
-  callID: string
-  command: string
-  output: string
+  shell: Shell
+  output?: {
+    output: string
+    cursor: number
+    size: number
+    truncated: boolean
+  }
 }
 
 export type SessionMessageAssistantText = {
@@ -4600,13 +4530,13 @@ export type SessionContextEntryInfo = {
   value: unknown
 }
 
-export type AgentSelected = {
+export type SessionAgentSelected = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "agent.selected"
+  type: "session.agent.selected"
   durable: {
     aggregateID: string
     seq: number
@@ -4619,13 +4549,13 @@ export type AgentSelected = {
   }
 }
 
-export type ModelSelected = {
+export type SessionModelSelected = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "model.selected"
+  type: "session.model.selected"
   durable: {
     aggregateID: string
     seq: number
@@ -4658,13 +4588,52 @@ export type SessionMoved = {
   }
 }
 
-export type PromptPromoted = {
+export type SessionRenamed = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "prompt.promoted"
+  type: "session.renamed"
+  durable: {
+    aggregateID: string
+    seq: number
+    version: number
+  }
+  location?: LocationRef
+  data: {
+    sessionID: string
+    title: string
+  }
+}
+
+export type SessionForked = {
+  id: string
+  created: number
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "session.forked"
+  durable: {
+    aggregateID: string
+    seq: number
+    version: number
+  }
+  location?: LocationRef
+  data: {
+    sessionID: string
+    parentID: string
+    from?: string
+  }
+}
+
+export type SessionPromptPromoted = {
+  id: string
+  created: number
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "session.prompt.promoted"
   durable: {
     aggregateID: string
     seq: number
@@ -4677,13 +4646,13 @@ export type PromptPromoted = {
   }
 }
 
-export type PromptAdmitted = {
+export type SessionPromptAdmitted = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "prompt.admitted"
+  type: "session.prompt.admitted"
   durable: {
     aggregateID: string
     seq: number
@@ -4717,13 +4686,36 @@ export type SessionContextUpdated = {
   }
 }
 
-export type SkillActivated = {
+export type SessionSynthetic = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "skill.activated"
+  type: "session.synthetic"
+  durable: {
+    aggregateID: string
+    seq: number
+    version: number
+  }
+  location?: LocationRef
+  data: {
+    sessionID: string
+    text: string
+    description?: string
+    metadata?: {
+      [key: string]: unknown
+    }
+  }
+}
+
+export type SessionSkillActivated = {
+  id: string
+  created: number
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "session.skill.activated"
   durable: {
     aggregateID: string
     seq: number
@@ -4737,13 +4729,13 @@ export type SkillActivated = {
   }
 }
 
-export type ShellStarted = {
+export type SessionShellStarted = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "shell.started"
+  type: "session.shell.started"
   durable: {
     aggregateID: string
     seq: number
@@ -4752,18 +4744,17 @@ export type ShellStarted = {
   location?: LocationRef
   data: {
     sessionID: string
-    callID: string
-    command: string
+    shell: Shell1
   }
 }
 
-export type ShellEnded = {
+export type SessionShellEnded = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "shell.ended"
+  type: "session.shell.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -4772,18 +4763,23 @@ export type ShellEnded = {
   location?: LocationRef
   data: {
     sessionID: string
-    callID: string
-    output: string
+    shell: Shell1
+    output: {
+      output: string
+      cursor: number
+      size: number
+      truncated: boolean
+    }
   }
 }
 
-export type StepStarted = {
+export type SessionStepStarted = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "step.started"
+  type: "session.step.started"
   durable: {
     aggregateID: string
     seq: number
@@ -4799,13 +4795,13 @@ export type StepStarted = {
   }
 }
 
-export type StepEnded = {
+export type SessionStepEnded = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "step.ended"
+  type: "session.step.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -4831,13 +4827,13 @@ export type StepEnded = {
   }
 }
 
-export type StepFailed = {
+export type SessionStepFailed = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "step.failed"
+  type: "session.step.failed"
   durable: {
     aggregateID: string
     seq: number
@@ -4851,13 +4847,13 @@ export type StepFailed = {
   }
 }
 
-export type TextStarted = {
+export type SessionTextStarted = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "text.started"
+  type: "session.text.started"
   durable: {
     aggregateID: string
     seq: number
@@ -4871,13 +4867,13 @@ export type TextStarted = {
   }
 }
 
-export type TextEnded = {
+export type SessionTextEnded = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "text.ended"
+  type: "session.text.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -4892,13 +4888,13 @@ export type TextEnded = {
   }
 }
 
-export type ReasoningStarted = {
+export type SessionReasoningStarted = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "reasoning.started"
+  type: "session.reasoning.started"
   durable: {
     aggregateID: string
     seq: number
@@ -4913,13 +4909,13 @@ export type ReasoningStarted = {
   }
 }
 
-export type ReasoningEnded = {
+export type SessionReasoningEnded = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "reasoning.ended"
+  type: "session.reasoning.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -4935,13 +4931,13 @@ export type ReasoningEnded = {
   }
 }
 
-export type ToolInputStarted = {
+export type SessionToolInputStarted = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "tool.input.started"
+  type: "session.tool.input.started"
   durable: {
     aggregateID: string
     seq: number
@@ -4956,13 +4952,13 @@ export type ToolInputStarted = {
   }
 }
 
-export type ToolInputEnded = {
+export type SessionToolInputEnded = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "tool.input.ended"
+  type: "session.tool.input.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -4977,13 +4973,13 @@ export type ToolInputEnded = {
   }
 }
 
-export type ToolCalled = {
+export type SessionToolCalled = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "tool.called"
+  type: "session.tool.called"
   durable: {
     aggregateID: string
     seq: number
@@ -5005,13 +5001,13 @@ export type ToolCalled = {
   }
 }
 
-export type ToolProgress = {
+export type SessionToolProgress = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "tool.progress"
+  type: "session.tool.progress"
   durable: {
     aggregateID: string
     seq: number
@@ -5029,13 +5025,13 @@ export type ToolProgress = {
   }
 }
 
-export type ToolSuccess = {
+export type SessionToolSuccess = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "tool.success"
+  type: "session.tool.success"
   durable: {
     aggregateID: string
     seq: number
@@ -5059,13 +5055,13 @@ export type ToolSuccess = {
   }
 }
 
-export type ToolFailed = {
+export type SessionToolFailed = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "tool.failed"
+  type: "session.tool.failed"
   durable: {
     aggregateID: string
     seq: number
@@ -5085,13 +5081,33 @@ export type ToolFailed = {
   }
 }
 
-export type CompactionStarted = {
+export type SessionRetried = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "compaction.started"
+  type: "session.retried"
+  durable: {
+    aggregateID: string
+    seq: number
+    version: number
+  }
+  location?: LocationRef
+  data: {
+    sessionID: string
+    attempt: number
+    error: SessionRetryError
+  }
+}
+
+export type SessionCompactionStarted = {
+  id: string
+  created: number
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "session.compaction.started"
   durable: {
     aggregateID: string
     seq: number
@@ -5104,13 +5120,13 @@ export type CompactionStarted = {
   }
 }
 
-export type CompactionEnded = {
+export type SessionCompactionEnded = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "compaction.ended"
+  type: "session.compaction.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -5125,13 +5141,13 @@ export type CompactionEnded = {
   }
 }
 
-export type RevertStaged = {
+export type SessionRevertStaged = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "revert.staged"
+  type: "session.revert.staged"
   durable: {
     aggregateID: string
     seq: number
@@ -5144,13 +5160,13 @@ export type RevertStaged = {
   }
 }
 
-export type RevertCleared = {
+export type SessionRevertCleared = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "revert.cleared"
+  type: "session.revert.cleared"
   durable: {
     aggregateID: string
     seq: number
@@ -5162,13 +5178,13 @@ export type RevertCleared = {
   }
 }
 
-export type RevertCommitted = {
+export type SessionRevertCommitted = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "revert.committed"
+  type: "session.revert.committed"
   durable: {
     aggregateID: string
     seq: number
@@ -5708,13 +5724,13 @@ export type MessagePartRemoved = {
   }
 }
 
-export type ExecutionSettled = {
+export type SessionExecutionSettled = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "execution.settled"
+  type: "session.execution.settled"
   location?: LocationRef
   data: {
     sessionID: string
@@ -5723,13 +5739,13 @@ export type ExecutionSettled = {
   }
 }
 
-export type TextDelta = {
+export type SessionTextDelta = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "text.delta"
+  type: "session.text.delta"
   location?: LocationRef
   data: {
     sessionID: string
@@ -5739,13 +5755,13 @@ export type TextDelta = {
   }
 }
 
-export type ReasoningDelta = {
+export type SessionReasoningDelta = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "reasoning.delta"
+  type: "session.reasoning.delta"
   location?: LocationRef
   data: {
     sessionID: string
@@ -5755,13 +5771,13 @@ export type ReasoningDelta = {
   }
 }
 
-export type ToolInputDelta = {
+export type SessionToolInputDelta = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "tool.input.delta"
+  type: "session.tool.input.delta"
   location?: LocationRef
   data: {
     sessionID: string
@@ -5771,13 +5787,13 @@ export type ToolInputDelta = {
   }
 }
 
-export type CompactionDelta = {
+export type SessionCompactionDelta = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "compaction.delta"
+  type: "session.compaction.delta"
   location?: LocationRef
   data: {
     sessionID: string
@@ -6730,18 +6746,18 @@ export type EventMessagePartRemoved = {
   }
 }
 
-export type EventAgentSelected = {
+export type EventSessionAgentSelected = {
   id: string
-  type: "agent.selected"
+  type: "session.agent.selected"
   properties: {
     sessionID: string
     agent: string
   }
 }
 
-export type EventModelSelected = {
+export type EventSessionModelSelected = {
   id: string
-  type: "model.selected"
+  type: "session.model.selected"
   properties: {
     sessionID: string
     model: ModelRef
@@ -6758,18 +6774,18 @@ export type EventSessionMoved = {
   }
 }
 
-export type EventRenamed = {
+export type EventSessionRenamed = {
   id: string
-  type: "renamed"
+  type: "session.renamed"
   properties: {
     sessionID: string
     title: string
   }
 }
 
-export type EventForked = {
+export type EventSessionForked = {
   id: string
-  type: "forked"
+  type: "session.forked"
   properties: {
     sessionID: string
     parentID: string
@@ -6777,18 +6793,18 @@ export type EventForked = {
   }
 }
 
-export type EventPromptPromoted = {
+export type EventSessionPromptPromoted = {
   id: string
-  type: "prompt.promoted"
+  type: "session.prompt.promoted"
   properties: {
     sessionID: string
     inputID: string
   }
 }
 
-export type EventPromptAdmitted = {
+export type EventSessionPromptAdmitted = {
   id: string
-  type: "prompt.admitted"
+  type: "session.prompt.admitted"
   properties: {
     sessionID: string
     inputID: string
@@ -6797,9 +6813,9 @@ export type EventPromptAdmitted = {
   }
 }
 
-export type EventExecutionSettled = {
+export type EventSessionExecutionSettled = {
   id: string
-  type: "execution.settled"
+  type: "session.execution.settled"
   properties: {
     sessionID: string
     outcome: "success" | "failure" | "interrupted"
@@ -6816,9 +6832,9 @@ export type EventSessionContextUpdated = {
   }
 }
 
-export type EventSynthetic = {
+export type EventSessionSynthetic = {
   id: string
-  type: "synthetic"
+  type: "session.synthetic"
   properties: {
     sessionID: string
     text: string
@@ -6829,9 +6845,9 @@ export type EventSynthetic = {
   }
 }
 
-export type EventSkillActivated = {
+export type EventSessionSkillActivated = {
   id: string
-  type: "skill.activated"
+  type: "session.skill.activated"
   properties: {
     sessionID: string
     name: string
@@ -6839,29 +6855,33 @@ export type EventSkillActivated = {
   }
 }
 
-export type EventShellStarted = {
+export type EventSessionShellStarted = {
   id: string
-  type: "shell.started"
+  type: "session.shell.started"
   properties: {
     sessionID: string
-    callID: string
-    command: string
+    shell: Shell2
   }
 }
 
-export type EventShellEnded = {
+export type EventSessionShellEnded = {
   id: string
-  type: "shell.ended"
+  type: "session.shell.ended"
   properties: {
     sessionID: string
-    callID: string
-    output: string
+    shell: Shell2
+    output: {
+      output: string
+      cursor: number
+      size: number
+      truncated: boolean
+    }
   }
 }
 
-export type EventStepStarted = {
+export type EventSessionStepStarted = {
   id: string
-  type: "step.started"
+  type: "session.step.started"
   properties: {
     sessionID: string
     assistantMessageID: string
@@ -6871,9 +6891,9 @@ export type EventStepStarted = {
   }
 }
 
-export type EventStepEnded = {
+export type EventSessionStepEnded = {
   id: string
-  type: "step.ended"
+  type: "session.step.ended"
   properties: {
     sessionID: string
     assistantMessageID: string
@@ -6893,9 +6913,9 @@ export type EventStepEnded = {
   }
 }
 
-export type EventStepFailed = {
+export type EventSessionStepFailed = {
   id: string
-  type: "step.failed"
+  type: "session.step.failed"
   properties: {
     sessionID: string
     assistantMessageID: string
@@ -6903,9 +6923,9 @@ export type EventStepFailed = {
   }
 }
 
-export type EventTextStarted = {
+export type EventSessionTextStarted = {
   id: string
-  type: "text.started"
+  type: "session.text.started"
   properties: {
     sessionID: string
     assistantMessageID: string
@@ -6913,9 +6933,9 @@ export type EventTextStarted = {
   }
 }
 
-export type EventTextDelta = {
+export type EventSessionTextDelta = {
   id: string
-  type: "text.delta"
+  type: "session.text.delta"
   properties: {
     sessionID: string
     assistantMessageID: string
@@ -6924,9 +6944,9 @@ export type EventTextDelta = {
   }
 }
 
-export type EventTextEnded = {
+export type EventSessionTextEnded = {
   id: string
-  type: "text.ended"
+  type: "session.text.ended"
   properties: {
     sessionID: string
     assistantMessageID: string
@@ -6935,9 +6955,9 @@ export type EventTextEnded = {
   }
 }
 
-export type EventReasoningStarted = {
+export type EventSessionReasoningStarted = {
   id: string
-  type: "reasoning.started"
+  type: "session.reasoning.started"
   properties: {
     sessionID: string
     assistantMessageID: string
@@ -6946,9 +6966,9 @@ export type EventReasoningStarted = {
   }
 }
 
-export type EventReasoningDelta = {
+export type EventSessionReasoningDelta = {
   id: string
-  type: "reasoning.delta"
+  type: "session.reasoning.delta"
   properties: {
     sessionID: string
     assistantMessageID: string
@@ -6957,9 +6977,9 @@ export type EventReasoningDelta = {
   }
 }
 
-export type EventReasoningEnded = {
+export type EventSessionReasoningEnded = {
   id: string
-  type: "reasoning.ended"
+  type: "session.reasoning.ended"
   properties: {
     sessionID: string
     assistantMessageID: string
@@ -6969,9 +6989,9 @@ export type EventReasoningEnded = {
   }
 }
 
-export type EventToolInputStarted = {
+export type EventSessionToolInputStarted = {
   id: string
-  type: "tool.input.started"
+  type: "session.tool.input.started"
   properties: {
     sessionID: string
     assistantMessageID: string
@@ -6980,9 +7000,9 @@ export type EventToolInputStarted = {
   }
 }
 
-export type EventToolInputDelta = {
+export type EventSessionToolInputDelta = {
   id: string
-  type: "tool.input.delta"
+  type: "session.tool.input.delta"
   properties: {
     sessionID: string
     assistantMessageID: string
@@ -6991,9 +7011,9 @@ export type EventToolInputDelta = {
   }
 }
 
-export type EventToolInputEnded = {
+export type EventSessionToolInputEnded = {
   id: string
-  type: "tool.input.ended"
+  type: "session.tool.input.ended"
   properties: {
     sessionID: string
     assistantMessageID: string
@@ -7002,9 +7022,9 @@ export type EventToolInputEnded = {
   }
 }
 
-export type EventToolCalled = {
+export type EventSessionToolCalled = {
   id: string
-  type: "tool.called"
+  type: "session.tool.called"
   properties: {
     sessionID: string
     assistantMessageID: string
@@ -7020,9 +7040,9 @@ export type EventToolCalled = {
   }
 }
 
-export type EventToolProgress = {
+export type EventSessionToolProgress = {
   id: string
-  type: "tool.progress"
+  type: "session.tool.progress"
   properties: {
     sessionID: string
     assistantMessageID: string
@@ -7034,9 +7054,9 @@ export type EventToolProgress = {
   }
 }
 
-export type EventToolSuccess = {
+export type EventSessionToolSuccess = {
   id: string
-  type: "tool.success"
+  type: "session.tool.success"
   properties: {
     sessionID: string
     assistantMessageID: string
@@ -7054,9 +7074,9 @@ export type EventToolSuccess = {
   }
 }
 
-export type EventToolFailed = {
+export type EventSessionToolFailed = {
   id: string
-  type: "tool.failed"
+  type: "session.tool.failed"
   properties: {
     sessionID: string
     assistantMessageID: string
@@ -7070,9 +7090,9 @@ export type EventToolFailed = {
   }
 }
 
-export type EventRetried = {
+export type EventSessionRetried = {
   id: string
-  type: "retried"
+  type: "session.retried"
   properties: {
     sessionID: string
     attempt: number
@@ -7080,27 +7100,27 @@ export type EventRetried = {
   }
 }
 
-export type EventCompactionStarted = {
+export type EventSessionCompactionStarted = {
   id: string
-  type: "compaction.started"
+  type: "session.compaction.started"
   properties: {
     sessionID: string
     reason: "auto" | "manual"
   }
 }
 
-export type EventCompactionDelta = {
+export type EventSessionCompactionDelta = {
   id: string
-  type: "compaction.delta"
+  type: "session.compaction.delta"
   properties: {
     sessionID: string
     text: string
   }
 }
 
-export type EventCompactionEnded = {
+export type EventSessionCompactionEnded = {
   id: string
-  type: "compaction.ended"
+  type: "session.compaction.ended"
   properties: {
     sessionID: string
     reason: "auto" | "manual"
@@ -7109,26 +7129,26 @@ export type EventCompactionEnded = {
   }
 }
 
-export type EventRevertStaged = {
+export type EventSessionRevertStaged = {
   id: string
-  type: "revert.staged"
+  type: "session.revert.staged"
   properties: {
     sessionID: string
     revert: RevertState
   }
 }
 
-export type EventRevertCleared = {
+export type EventSessionRevertCleared = {
   id: string
-  type: "revert.cleared"
+  type: "session.revert.cleared"
   properties: {
     sessionID: string
   }
 }
 
-export type EventRevertCommitted = {
+export type EventSessionRevertCommitted = {
   id: string
-  type: "revert.committed"
+  type: "session.revert.committed"
   properties: {
     sessionID: string
     messageID: string
@@ -7999,6 +8019,24 @@ export type SessionMessageSkill2 = {
   text: string
 }
 
+export type ShellV2 = {
+  id: string
+  status: "running" | "exited" | "timeout" | "killed"
+  command: string
+  cwd: string
+  shell: string
+  file: string
+  pid?: number
+  exit?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+  metadata: {
+    [key: string]: unknown
+  }
+  time: {
+    started: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+    completed?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
+  }
+}
+
 export type SessionMessageShell2 = {
   id: string
   metadata?: {
@@ -8009,9 +8047,13 @@ export type SessionMessageShell2 = {
     completed?: number
   }
   type: "shell"
-  callID: string
-  command: string
-  output: string
+  shell: ShellV2
+  output?: {
+    output: string
+    cursor: number
+    size: number
+    truncated: boolean
+  }
 }
 
 export type SessionMessageAssistantText2 = {
@@ -8188,13 +8230,13 @@ export type SessionContextEntryInfo2 = {
   value: unknown
 }
 
-export type AgentSelected2 = {
+export type SessionAgentSelected2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "agent.selected"
+  type: "session.agent.selected"
   durable: {
     aggregateID: string
     seq: number
@@ -8207,13 +8249,13 @@ export type AgentSelected2 = {
   }
 }
 
-export type ModelSelected2 = {
+export type SessionModelSelected2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "model.selected"
+  type: "session.model.selected"
   durable: {
     aggregateID: string
     seq: number
@@ -8246,13 +8288,13 @@ export type SessionMoved2 = {
   }
 }
 
-export type RenamedV2 = {
+export type SessionRenamed2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "renamed"
+  type: "session.renamed"
   durable: {
     aggregateID: string
     seq: number
@@ -8265,13 +8307,13 @@ export type RenamedV2 = {
   }
 }
 
-export type ForkedV2 = {
+export type SessionForked2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "forked"
+  type: "session.forked"
   durable: {
     aggregateID: string
     seq: number
@@ -8285,13 +8327,13 @@ export type ForkedV2 = {
   }
 }
 
-export type PromptPromoted2 = {
+export type SessionPromptPromoted2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "prompt.promoted"
+  type: "session.prompt.promoted"
   durable: {
     aggregateID: string
     seq: number
@@ -8304,13 +8346,13 @@ export type PromptPromoted2 = {
   }
 }
 
-export type PromptAdmitted2 = {
+export type SessionPromptAdmitted2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "prompt.admitted"
+  type: "session.prompt.admitted"
   durable: {
     aggregateID: string
     seq: number
@@ -8344,13 +8386,13 @@ export type SessionContextUpdated2 = {
   }
 }
 
-export type SyntheticV2 = {
+export type SessionSynthetic2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "synthetic"
+  type: "session.synthetic"
   durable: {
     aggregateID: string
     seq: number
@@ -8367,13 +8409,13 @@ export type SyntheticV2 = {
   }
 }
 
-export type SkillActivated2 = {
+export type SessionSkillActivated2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "skill.activated"
+  type: "session.skill.activated"
   durable: {
     aggregateID: string
     seq: number
@@ -8387,13 +8429,31 @@ export type SkillActivated2 = {
   }
 }
 
-export type ShellStarted2 = {
+export type Shell1V2 = {
+  id: string
+  status: "running" | "exited" | "timeout" | "killed"
+  command: string
+  cwd: string
+  shell: string
+  file: string
+  pid?: number
+  exit?: number | "NaN" | "Infinity" | "-Infinity"
+  metadata: {
+    [key: string]: unknown
+  }
+  time: {
+    started: number | "NaN" | "Infinity" | "-Infinity"
+    completed?: number | "NaN" | "Infinity" | "-Infinity"
+  }
+}
+
+export type SessionShellStarted2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "shell.started"
+  type: "session.shell.started"
   durable: {
     aggregateID: string
     seq: number
@@ -8402,18 +8462,17 @@ export type ShellStarted2 = {
   location?: LocationRef2
   data: {
     sessionID: string
-    callID: string
-    command: string
+    shell: Shell1V2
   }
 }
 
-export type ShellEnded2 = {
+export type SessionShellEnded2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "shell.ended"
+  type: "session.shell.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -8422,18 +8481,23 @@ export type ShellEnded2 = {
   location?: LocationRef2
   data: {
     sessionID: string
-    callID: string
-    output: string
+    shell: Shell1V2
+    output: {
+      output: string
+      cursor: number
+      size: number
+      truncated: boolean
+    }
   }
 }
 
-export type StepStarted2 = {
+export type SessionStepStarted2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "step.started"
+  type: "session.step.started"
   durable: {
     aggregateID: string
     seq: number
@@ -8449,13 +8513,13 @@ export type StepStarted2 = {
   }
 }
 
-export type StepEnded2 = {
+export type SessionStepEnded2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "step.ended"
+  type: "session.step.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -8481,13 +8545,13 @@ export type StepEnded2 = {
   }
 }
 
-export type StepFailed2 = {
+export type SessionStepFailed2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "step.failed"
+  type: "session.step.failed"
   durable: {
     aggregateID: string
     seq: number
@@ -8501,13 +8565,13 @@ export type StepFailed2 = {
   }
 }
 
-export type TextStarted2 = {
+export type SessionTextStarted2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "text.started"
+  type: "session.text.started"
   durable: {
     aggregateID: string
     seq: number
@@ -8521,13 +8585,13 @@ export type TextStarted2 = {
   }
 }
 
-export type TextEnded2 = {
+export type SessionTextEnded2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "text.ended"
+  type: "session.text.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -8548,13 +8612,13 @@ export type LlmProviderMetadata3 = {
   }
 }
 
-export type ReasoningStarted2 = {
+export type SessionReasoningStarted2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "reasoning.started"
+  type: "session.reasoning.started"
   durable: {
     aggregateID: string
     seq: number
@@ -8575,13 +8639,13 @@ export type LlmProviderMetadata4 = {
   }
 }
 
-export type ReasoningEnded2 = {
+export type SessionReasoningEnded2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "reasoning.ended"
+  type: "session.reasoning.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -8597,13 +8661,13 @@ export type ReasoningEnded2 = {
   }
 }
 
-export type ToolInputStarted2 = {
+export type SessionToolInputStarted2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "tool.input.started"
+  type: "session.tool.input.started"
   durable: {
     aggregateID: string
     seq: number
@@ -8618,13 +8682,13 @@ export type ToolInputStarted2 = {
   }
 }
 
-export type ToolInputEnded2 = {
+export type SessionToolInputEnded2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "tool.input.ended"
+  type: "session.tool.input.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -8645,13 +8709,13 @@ export type LlmProviderMetadata5 = {
   }
 }
 
-export type ToolCalled2 = {
+export type SessionToolCalled2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "tool.called"
+  type: "session.tool.called"
   durable: {
     aggregateID: string
     seq: number
@@ -8673,13 +8737,13 @@ export type ToolCalled2 = {
   }
 }
 
-export type ToolProgress2 = {
+export type SessionToolProgress2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "tool.progress"
+  type: "session.tool.progress"
   durable: {
     aggregateID: string
     seq: number
@@ -8703,13 +8767,13 @@ export type LlmProviderMetadata6 = {
   }
 }
 
-export type ToolSuccess2 = {
+export type SessionToolSuccess2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "tool.success"
+  type: "session.tool.success"
   durable: {
     aggregateID: string
     seq: number
@@ -8739,13 +8803,13 @@ export type LlmProviderMetadata7 = {
   }
 }
 
-export type ToolFailed2 = {
+export type SessionToolFailed2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "tool.failed"
+  type: "session.tool.failed"
   durable: {
     aggregateID: string
     seq: number
@@ -8778,13 +8842,13 @@ export type SessionRetryError2 = {
   }
 }
 
-export type RetriedV2 = {
+export type SessionRetried2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "retried"
+  type: "session.retried"
   durable: {
     aggregateID: string
     seq: number
@@ -8798,13 +8862,13 @@ export type RetriedV2 = {
   }
 }
 
-export type CompactionStarted2 = {
+export type SessionCompactionStarted2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "compaction.started"
+  type: "session.compaction.started"
   durable: {
     aggregateID: string
     seq: number
@@ -8817,13 +8881,13 @@ export type CompactionStarted2 = {
   }
 }
 
-export type CompactionEnded2 = {
+export type SessionCompactionEnded2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "compaction.ended"
+  type: "session.compaction.ended"
   durable: {
     aggregateID: string
     seq: number
@@ -8838,13 +8902,13 @@ export type CompactionEnded2 = {
   }
 }
 
-export type RevertStaged2 = {
+export type SessionRevertStaged2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "revert.staged"
+  type: "session.revert.staged"
   durable: {
     aggregateID: string
     seq: number
@@ -8857,13 +8921,13 @@ export type RevertStaged2 = {
   }
 }
 
-export type RevertCleared2 = {
+export type SessionRevertCleared2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "revert.cleared"
+  type: "session.revert.cleared"
   durable: {
     aggregateID: string
     seq: number
@@ -8875,13 +8939,13 @@ export type RevertCleared2 = {
   }
 }
 
-export type RevertCommitted2 = {
+export type SessionRevertCommitted2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "revert.committed"
+  type: "session.revert.committed"
   durable: {
     aggregateID: string
     seq: number
@@ -8895,37 +8959,37 @@ export type RevertCommitted2 = {
 }
 
 export type SessionDurableEventV2 =
-  | AgentSelected2
-  | ModelSelected2
+  | SessionAgentSelected2
+  | SessionModelSelected2
   | SessionMoved2
-  | RenamedV2
-  | ForkedV2
-  | PromptPromoted2
-  | PromptAdmitted2
+  | SessionRenamed2
+  | SessionForked2
+  | SessionPromptPromoted2
+  | SessionPromptAdmitted2
   | SessionContextUpdated2
-  | SyntheticV2
-  | SkillActivated2
-  | ShellStarted2
-  | ShellEnded2
-  | StepStarted2
-  | StepEnded2
-  | StepFailed2
-  | TextStarted2
-  | TextEnded2
-  | ReasoningStarted2
-  | ReasoningEnded2
-  | ToolInputStarted2
-  | ToolInputEnded2
-  | ToolCalled2
-  | ToolProgress2
-  | ToolSuccess2
-  | ToolFailed2
-  | RetriedV2
-  | CompactionStarted2
-  | CompactionEnded2
-  | RevertStaged2
-  | RevertCleared2
-  | RevertCommitted2
+  | SessionSynthetic2
+  | SessionSkillActivated2
+  | SessionShellStarted2
+  | SessionShellEnded2
+  | SessionStepStarted2
+  | SessionStepEnded2
+  | SessionStepFailed2
+  | SessionTextStarted2
+  | SessionTextEnded2
+  | SessionReasoningStarted2
+  | SessionReasoningEnded2
+  | SessionToolInputStarted2
+  | SessionToolInputEnded2
+  | SessionToolCalled2
+  | SessionToolProgress2
+  | SessionToolSuccess2
+  | SessionToolFailed2
+  | SessionRetried2
+  | SessionCompactionStarted2
+  | SessionCompactionEnded2
+  | SessionRevertStaged2
+  | SessionRevertCleared2
+  | SessionRevertCommitted2
 
 /**
  * Marker emitted once when a log read reaches its captured watermark. The reader holds every event committed at or below seq.
@@ -10138,13 +10202,13 @@ export type MessagePartRemoved2 = {
   }
 }
 
-export type ExecutionSettled2 = {
+export type SessionExecutionSettled2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "execution.settled"
+  type: "session.execution.settled"
   location?: LocationRef2
   data: {
     sessionID: string
@@ -10153,13 +10217,13 @@ export type ExecutionSettled2 = {
   }
 }
 
-export type TextDelta2 = {
+export type SessionTextDelta2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "text.delta"
+  type: "session.text.delta"
   location?: LocationRef2
   data: {
     sessionID: string
@@ -10169,13 +10233,13 @@ export type TextDelta2 = {
   }
 }
 
-export type ReasoningDelta2 = {
+export type SessionReasoningDelta2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "reasoning.delta"
+  type: "session.reasoning.delta"
   location?: LocationRef2
   data: {
     sessionID: string
@@ -10185,13 +10249,13 @@ export type ReasoningDelta2 = {
   }
 }
 
-export type ToolInputDelta2 = {
+export type SessionToolInputDelta2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "tool.input.delta"
+  type: "session.tool.input.delta"
   location?: LocationRef2
   data: {
     sessionID: string
@@ -10201,13 +10265,13 @@ export type ToolInputDelta2 = {
   }
 }
 
-export type CompactionDelta2 = {
+export type SessionCompactionDelta2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "compaction.delta"
+  type: "session.compaction.delta"
   location?: LocationRef2
   data: {
     sessionID: string
@@ -10413,24 +10477,6 @@ export type PtyDeleted2 = {
   }
 }
 
-export type ShellV2 = {
-  id: string
-  status: "running" | "exited" | "timeout" | "killed"
-  command: string
-  cwd: string
-  shell: string
-  file: string
-  pid?: number
-  exit?: number | "NaN" | "Infinity" | "-Infinity"
-  metadata: {
-    [key: string]: unknown
-  }
-  time: {
-    started: number | "NaN" | "Infinity" | "-Infinity"
-    completed?: number | "NaN" | "Infinity" | "-Infinity"
-  }
-}
-
 export type ShellCreated2 = {
   id: string
   created: number
@@ -10440,7 +10486,7 @@ export type ShellCreated2 = {
   type: "shell.created"
   location?: LocationRef2
   data: {
-    info: ShellV2
+    info: Shell1V2
   }
 }
 
@@ -11080,42 +11126,42 @@ export type V2EventV2 =
   | MessageRemoved2
   | MessagePartUpdated2
   | MessagePartRemoved2
-  | AgentSelected2
-  | ModelSelected2
+  | SessionAgentSelected2
+  | SessionModelSelected2
   | SessionMoved2
-  | RenamedV2
-  | ForkedV2
-  | PromptPromoted2
-  | PromptAdmitted2
-  | ExecutionSettled2
+  | SessionRenamed2
+  | SessionForked2
+  | SessionPromptPromoted2
+  | SessionPromptAdmitted2
+  | SessionExecutionSettled2
   | SessionContextUpdated2
-  | SyntheticV2
-  | SkillActivated2
-  | ShellStarted2
-  | ShellEnded2
-  | StepStarted2
-  | StepEnded2
-  | StepFailed2
-  | TextStarted2
-  | TextDelta2
-  | TextEnded2
-  | ReasoningStarted2
-  | ReasoningDelta2
-  | ReasoningEnded2
-  | ToolInputStarted2
-  | ToolInputDelta2
-  | ToolInputEnded2
-  | ToolCalled2
-  | ToolProgress2
-  | ToolSuccess2
-  | ToolFailed2
-  | RetriedV2
-  | CompactionStarted2
-  | CompactionDelta2
-  | CompactionEnded2
-  | RevertStaged2
-  | RevertCleared2
-  | RevertCommitted2
+  | SessionSynthetic2
+  | SessionSkillActivated2
+  | SessionShellStarted2
+  | SessionShellEnded2
+  | SessionStepStarted2
+  | SessionStepEnded2
+  | SessionStepFailed2
+  | SessionTextStarted2
+  | SessionTextDelta2
+  | SessionTextEnded2
+  | SessionReasoningStarted2
+  | SessionReasoningDelta2
+  | SessionReasoningEnded2
+  | SessionToolInputStarted2
+  | SessionToolInputDelta2
+  | SessionToolInputEnded2
+  | SessionToolCalled2
+  | SessionToolProgress2
+  | SessionToolSuccess2
+  | SessionToolFailed2
+  | SessionRetried2
+  | SessionCompactionStarted2
+  | SessionCompactionDelta2
+  | SessionCompactionEnded2
+  | SessionRevertStaged2
+  | SessionRevertCleared2
+  | SessionRevertCommitted2
   | FileEdited2
   | ReferenceUpdated2
   | PermissionV2Asked2
@@ -11195,24 +11241,6 @@ export type ForbiddenErrorV2 = {
   message: string
 }
 
-export type Shell1V2 = {
-  id: string
-  status: "running" | "exited" | "timeout" | "killed"
-  command: string
-  cwd: string
-  shell: string
-  file: string
-  pid?: number
-  exit?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
-  metadata: {
-    [key: string]: unknown
-  }
-  time: {
-    started: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
-    completed?: number | "NaN" | "Infinity" | "-Infinity" | "Infinity" | "-Infinity" | "NaN"
-  }
-}
-
 export type ShellNotFoundErrorV2 = {
   _tag: "ShellNotFoundError"
   id: string
@@ -18444,7 +18472,7 @@ export type V2ShellListResponses = {
    */
   200: {
     location: LocationInfo2
-    data: Array<Shell1V2>
+    data: Array<ShellV2>
   }
 }
 
@@ -18488,7 +18516,7 @@ export type V2ShellCreateResponses = {
    */
   200: {
     location: LocationInfo2
-    data: Shell1V2
+    data: ShellV2
   }
 }
 
@@ -18571,7 +18599,7 @@ export type V2ShellGetResponses = {
    */
   200: {
     location: LocationInfo2
-    data: Shell1V2
+    data: ShellV2
   }
 }
 
diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json
index b30c3beb35..e136ef6836 100644
--- a/packages/sdk/openapi.json
+++ b/packages/sdk/openapi.json
@@ -16410,7 +16410,7 @@
           "text": {
             "type": "string"
           },
-          "synthetic": {
+          "session.synthetic": {
             "type": "boolean"
           },
           "ignored": {
@@ -23071,7 +23071,7 @@
           "text": {
             "type": "string"
           },
-          "synthetic": {
+          "session.synthetic": {
             "type": "boolean"
           },
           "ignored": {
@@ -27479,7 +27479,7 @@
           },
           "type": {
             "type": "string",
-            "enum": ["synthetic"]
+            "enum": ["session.synthetic"]
           }
         },
         "required": ["id", "time", "sessionID", "text", "type"],
diff --git a/packages/tui/src/context/data.tsx b/packages/tui/src/context/data.tsx
index cc9378dbac..0ed464e561 100644
--- a/packages/tui/src/context/data.tsx
+++ b/packages/tui/src/context/data.tsx
@@ -126,8 +126,8 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
         const item = position === undefined ? undefined : messages[position]
         return item?.type === "assistant" ? item : undefined
       },
-      activeShell(messages: SessionMessage[], callID: string) {
-        const item = messages.findLast((item) => item.type === "shell" && item.callID === callID)
+      shell(messages: SessionMessage[], shellID: string) {
+        const item = messages.findLast((item) => item.type === "shell" && item.shell.id === shellID)
         return item?.type === "shell" ? item : undefined
       },
       latestTool(assistant: SessionMessageAssistant | undefined, callID?: string) {
@@ -220,7 +220,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
         case "skill.updated":
           void result.location.skill.refresh(event.location)
           break
-        case "agent.selected":
+        case "session.agent.selected":
           if (store.session.info[event.data.sessionID])
             setStore("session", "info", event.data.sessionID, "agent", event.data.agent)
           message.update(event.data.sessionID, (draft, index) => {
@@ -232,7 +232,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             })
           })
           break
-        case "model.selected":
+        case "session.model.selected":
           if (store.session.info[event.data.sessionID])
             setStore("session", "info", event.data.sessionID, "model", event.data.model)
           message.update(event.data.sessionID, (draft, index) => {
@@ -244,11 +244,11 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             })
           })
           break
-        case "renamed":
+        case "session.renamed":
           if (store.session.info[event.data.sessionID])
             setStore("session", "info", event.data.sessionID, "title", event.data.title)
           break
-        case "prompt.promoted": {
+        case "session.prompt.promoted": {
           setStore("session", "status", event.data.sessionID, "running")
           message.update(event.data.sessionID, (draft, index) => {
             const position = index.get(event.data.inputID)
@@ -264,7 +264,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
           })
           break
         }
-        case "prompt.admitted":
+        case "session.prompt.admitted":
           message.update(event.data.sessionID, (draft, index) => {
             message.append(draft, index, {
               id: event.data.inputID,
@@ -287,7 +287,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             })
           })
           break
-        case "synthetic":
+        case "session.synthetic":
           message.update(event.data.sessionID, (draft, index) => {
             message.append(draft, index, {
               id: messageIDFromEvent(event.id),
@@ -299,29 +299,28 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             })
           })
           break
-        case "shell.started":
+        case "session.shell.started":
           setStore("session", "status", event.data.sessionID, "running")
           message.update(event.data.sessionID, (draft, index) => {
             message.append(draft, index, {
               id: messageIDFromEvent(event.id),
               type: "shell",
-              callID: event.data.callID,
-              command: event.data.command,
-              output: "",
+              shell: event.data.shell,
               time: { created: event.created },
             })
           })
           break
-        case "shell.ended":
+        case "session.shell.ended":
           setStore("session", "status", event.data.sessionID, "idle")
-          message.update(event.data.sessionID, (draft, index) => {
-            const match = message.activeShell(draft, event.data.callID)
+          message.update(event.data.sessionID, (draft) => {
+            const match = message.shell(draft, event.data.shell.id)
             if (!match) return
+            match.shell = event.data.shell
             match.output = event.data.output
             match.time.completed = event.created
           })
           break
-        case "step.started":
+        case "session.step.started":
           setStore("session", "status", event.data.sessionID, "running")
           message.update(event.data.sessionID, (draft, index) => {
             if (index.has(event.data.assistantMessageID)) return
@@ -338,7 +337,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             })
           })
           break
-        case "step.ended":
+        case "session.step.ended":
           setStore("session", "status", event.data.sessionID, "running")
           message.update(event.data.sessionID, (draft, index) => {
             const currentAssistant = message.assistant(draft, index, event.data.assistantMessageID)
@@ -351,7 +350,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
               currentAssistant.snapshot = { ...currentAssistant.snapshot, end: event.data.snapshot }
           })
           break
-        case "step.failed":
+        case "session.step.failed":
           message.update(event.data.sessionID, (draft, index) => {
             const currentAssistant = message.assistant(draft, index, event.data.assistantMessageID)
             if (!currentAssistant) return
@@ -360,7 +359,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             currentAssistant.error = event.data.error
           })
           break
-        case "text.started":
+        case "session.text.started":
           message.update(event.data.sessionID, (draft, index) => {
             message.assistant(draft, index, event.data.assistantMessageID)?.content.push({
               type: "text",
@@ -369,7 +368,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             })
           })
           break
-        case "text.delta":
+        case "session.text.delta":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestText(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -378,7 +377,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             if (match) match.text += event.data.delta
           })
           break
-        case "text.ended":
+        case "session.text.ended":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestText(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -387,7 +386,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             if (match) match.text = event.data.text
           })
           break
-        case "tool.input.started":
+        case "session.tool.input.started":
           message.update(event.data.sessionID, (draft, index) => {
             message.assistant(draft, index, event.data.assistantMessageID)?.content.push({
               type: "tool",
@@ -398,7 +397,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             })
           })
           break
-        case "tool.input.delta":
+        case "session.tool.input.delta":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestTool(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -407,7 +406,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             if (match?.state.status === "pending") match.state.input += event.data.delta
           })
           break
-        case "tool.input.ended":
+        case "session.tool.input.ended":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestTool(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -416,7 +415,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             if (match?.state.status === "pending") match.state.input = event.data.text
           })
           break
-        case "tool.called":
+        case "session.tool.called":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestTool(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -428,7 +427,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             match.state = { status: "running", input: event.data.input, structured: {}, content: [] }
           })
           break
-        case "tool.progress":
+        case "session.tool.progress":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestTool(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -439,7 +438,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             match.state.content = [...event.data.content]
           })
           break
-        case "tool.success":
+        case "session.tool.success":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestTool(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -461,7 +460,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             match.time.completed = event.created
           })
           break
-        case "tool.failed":
+        case "session.tool.failed":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestTool(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -484,7 +483,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             match.time.completed = event.created
           })
           break
-        case "reasoning.started":
+        case "session.reasoning.started":
           message.update(event.data.sessionID, (draft, index) => {
             message.assistant(draft, index, event.data.assistantMessageID)?.content.push({
               type: "reasoning",
@@ -495,7 +494,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             })
           })
           break
-        case "reasoning.delta":
+        case "session.reasoning.delta":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestReasoning(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -504,7 +503,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             if (match) match.text += event.data.delta
           })
           break
-        case "reasoning.ended":
+        case "session.reasoning.ended":
           message.update(event.data.sessionID, (draft, index) => {
             const match = message.latestReasoning(
               message.assistant(draft, index, event.data.assistantMessageID),
@@ -517,25 +516,25 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             }
           })
           break
-        case "retried":
-        case "compaction.started":
+        case "session.retried":
+        case "session.compaction.started":
           setStore("session", "status", event.data.sessionID, "running")
           break
-        case "execution.settled":
+        case "session.execution.settled":
           setStore("session", "status", event.data.sessionID, "idle")
           break
-        case "revert.staged":
+        case "session.revert.staged":
           if (store.session.info[event.data.sessionID])
             setStore("session", "info", event.data.sessionID, "revert", event.data.revert)
           break
-        case "revert.cleared":
-        case "revert.committed":
+        case "session.revert.cleared":
+        case "session.revert.committed":
           if (store.session.info[event.data.sessionID])
             setStore("session", "info", event.data.sessionID, "revert", undefined)
           break
-        case "compaction.delta":
+        case "session.compaction.delta":
           break
-        case "compaction.ended":
+        case "session.compaction.ended":
           message.update(event.data.sessionID, (draft, index) => {
             message.append(draft, index, {
               id: messageIDFromEvent(event.id),
diff --git a/packages/tui/src/feature-plugins/system/notifications.ts b/packages/tui/src/feature-plugins/system/notifications.ts
index aa8dcace19..416ba8c466 100644
--- a/packages/tui/src/feature-plugins/system/notifications.ts
+++ b/packages/tui/src/feature-plugins/system/notifications.ts
@@ -74,17 +74,17 @@ const tui: TuiPlugin = async (api) => {
     notify(api, sessionID, "Session done", session?.parentID ? "subagent_done" : "done")
   }
 
-  api.event.on("prompt.promoted", (event) => started(event.data.sessionID))
-  api.event.on("shell.started", (event) => started(event.data.sessionID))
-  api.event.on("step.started", (event) => started(event.data.sessionID))
-  api.event.on("retried", (event) => started(event.data.sessionID))
-  api.event.on("compaction.started", (event) => started(event.data.sessionID))
-  api.event.on("shell.ended", (event) => ended(event.data.sessionID))
-  api.event.on("step.ended", (event) => {
+  api.event.on("session.prompt.promoted", (event) => started(event.data.sessionID))
+  api.event.on("session.shell.started", (event) => started(event.data.sessionID))
+  api.event.on("session.step.started", (event) => started(event.data.sessionID))
+  api.event.on("session.retried", (event) => started(event.data.sessionID))
+  api.event.on("session.compaction.started", (event) => started(event.data.sessionID))
+  api.event.on("session.shell.ended", (event) => ended(event.data.sessionID))
+  api.event.on("session.step.ended", (event) => {
     if (event.data.finish === "tool-calls") return
     ended(event.data.sessionID)
   })
-  api.event.on("step.failed", (event) => {
+  api.event.on("session.step.failed", (event) => {
     const sessionID = event.data.sessionID
     if (!active.has(sessionID)) return
     errored.add(sessionID)
diff --git a/packages/tui/src/routes/session/index.tsx b/packages/tui/src/routes/session/index.tsx
index b0f337c2d4..b968f13cd3 100644
--- a/packages/tui/src/routes/session/index.tsx
+++ b/packages/tui/src/routes/session/index.tsx
@@ -1346,7 +1346,7 @@ function RevertMessage(props: {
 
 function ShellMessage(props: { message: Extract<SessionMessage, { type: "shell" }> }) {
   const { theme } = useTheme()
-  const output = createMemo(() => stripAnsi(props.message.output.trim()))
+  const output = createMemo(() => stripAnsi(props.message.output?.output.trim() ?? ""))
 
   return (
     <box
@@ -1359,7 +1359,7 @@ function ShellMessage(props: { message: Extract<SessionMessage, { type: "shell"
       customBorderChars={SplitBorder.customBorderChars}
       borderColor={theme.background}
     >
-      <text fg={theme.text}>$ {props.message.command}</text>
+      <text fg={theme.text}>$ {props.message.shell.command}</text>
       <Show when={output()}>
         <text fg={theme.textMuted}>{output()}</text>
       </Show>
@@ -1408,13 +1408,7 @@ function UserMessage(props: { message: SessionMessageUser }) {
         >
           <text fg={theme.text}>{props.message.text}</text>
           <Show when={files().length}>
-            <box
-              flexDirection="row"
-              paddingBottom={metadataVisible() ? 1 : 0}
-              paddingTop={1}
-              gap={1}
-              flexWrap="wrap"
-            >
+            <box flexDirection="row" paddingBottom={metadataVisible() ? 1 : 0} paddingTop={1} gap={1} flexWrap="wrap">
               <For each={files()}>
                 {(file) => {
                   const directory = file.mime === "application/x-directory"
@@ -1744,7 +1738,8 @@ function ToolPart(props: { part: SessionMessageAssistantTool }) {
       return Boolean(shellID && data.shell.get(shellID))
     }
     if (display() === "subagent") {
-      const sessionID = stringValue(props.part.state.structured.sessionID) ?? stringValue(props.part.state.structured.sessionId)
+      const sessionID =
+        stringValue(props.part.state.structured.sessionID) ?? stringValue(props.part.state.structured.sessionId)
       return Boolean(sessionID && data.session.status(sessionID) === "running")
     }
     return false
@@ -2660,7 +2655,8 @@ function formatSessionTranscript(
 ) {
   const body = messages.flatMap((message) => {
     if (message.type === "user") return [`## User\n\n${message.text}`]
-    if (message.type === "shell") return [`## Shell\n\n\`\`\`\n$ ${message.command}\n${message.output}\n\`\`\``]
+    if (message.type === "shell")
+      return [`## Shell\n\n\`\`\`\n$ ${message.shell.command}\n${message.output?.output ?? ""}\n\`\`\``]
     if (message.type !== "assistant") return []
     const content = message.content.flatMap((item) => {
       if (item.type === "text") return [item.text]
diff --git a/packages/tui/src/routes/session/rows.ts b/packages/tui/src/routes/session/rows.ts
index 23b43c3b17..783b2805f4 100644
--- a/packages/tui/src/routes/session/rows.ts
+++ b/packages/tui/src/routes/session/rows.ts
@@ -133,42 +133,42 @@ export function createSessionRows(sessionID: Accessor<string>) {
     if (event.data.sessionID === sessionID()) appendMessage(event.data.inputID)
   }
   const subscriptions = [
-    data.on("prompt.admitted", input),
-    data.on("prompt.promoted", input),
+    data.on("session.prompt.admitted", input),
+    data.on("session.prompt.promoted", input),
     data.on("session.context.updated", message),
-    data.on("synthetic", (event) => {
+    data.on("session.synthetic", (event) => {
       if (event.data.sessionID === sessionID() && event.data.description?.trim())
         appendMessage(event.id.replace(/^evt_/, "msg_"))
     }),
-    data.on("shell.started", message),
-    data.on("agent.selected", message),
-    data.on("model.selected", message),
-    data.on("compaction.ended", message),
-    data.on("text.delta", (event) => {
+    data.on("session.shell.started", message),
+    data.on("session.agent.selected", message),
+    data.on("session.model.selected", message),
+    data.on("session.compaction.ended", message),
+    data.on("session.text.delta", (event) => {
       if (event.data.sessionID === sessionID())
         appendPart({ messageID: event.data.assistantMessageID, partID: event.data.textID })
     }),
-    data.on("text.ended", (event) => {
+    data.on("session.text.ended", (event) => {
       if (event.data.sessionID === sessionID() && event.data.text.trim())
         appendPart({ messageID: event.data.assistantMessageID, partID: event.data.textID })
     }),
-    data.on("reasoning.delta", (event) => {
+    data.on("session.reasoning.delta", (event) => {
       if (event.data.sessionID === sessionID())
         appendPart({ messageID: event.data.assistantMessageID, partID: event.data.reasoningID })
     }),
-    data.on("reasoning.ended", (event) => {
+    data.on("session.reasoning.ended", (event) => {
       if (event.data.sessionID === sessionID() && event.data.text.trim())
         appendPart({ messageID: event.data.assistantMessageID, partID: event.data.reasoningID })
     }),
-    data.on("tool.input.started", (event) => {
+    data.on("session.tool.input.started", (event) => {
       if (event.data.sessionID === sessionID())
         appendPart({ messageID: event.data.assistantMessageID, partID: event.data.callID }, event.data.name)
     }),
-    data.on("step.ended", (event) => {
+    data.on("session.step.ended", (event) => {
       if (event.data.sessionID !== sessionID() || ["tool-calls", "unknown"].includes(event.data.finish)) return
       appendFooter(event.data.assistantMessageID)
     }),
-    data.on("step.failed", (event) => {
+    data.on("session.step.failed", (event) => {
       if (event.data.sessionID === sessionID()) appendFooter(event.data.assistantMessageID)
     }),
   ]
diff --git a/packages/tui/test/cli/cmd/tui/notifications.test.ts b/packages/tui/test/cli/cmd/tui/notifications.test.ts
index 5f1c6355b3..44cd98b133 100644
--- a/packages/tui/test/cli/cmd/tui/notifications.test.ts
+++ b/packages/tui/test/cli/cmd/tui/notifications.test.ts
@@ -91,7 +91,7 @@ function stepStarted(id: string, sessionID = "session"): V2Event {
   return {
     id,
     created: 0,
-    type: "step.started",
+    type: "session.step.started",
     durable: durable(sessionID),
     data: {
       sessionID,
@@ -106,7 +106,7 @@ function stepEnded(id: string, sessionID = "session", finish = "stop"): V2Event
   return {
     id,
     created: 0,
-    type: "step.ended",
+    type: "session.step.ended",
     durable: durable(sessionID),
     data: {
       sessionID,
@@ -122,7 +122,7 @@ function stepFailed(id: string, sessionID = "session"): V2Event {
   return {
     id,
     created: 0,
-    type: "step.failed",
+    type: "session.step.failed",
     durable: durable(sessionID),
     data: {
       sessionID,
diff --git a/packages/tui/test/cli/tui/data.test.tsx b/packages/tui/test/cli/tui/data.test.tsx
index a71bdc47d8..0587662dc3 100644
--- a/packages/tui/test/cli/tui/data.test.tsx
+++ b/packages/tui/test/cli/tui/data.test.tsx
@@ -269,7 +269,7 @@ test("tracks session status from active sessions and execution events", async ()
     emitEvent(events, {
       id: "evt_step_started",
       created: 0,
-      type: "step.started",
+      type: "session.step.started",
       durable: durable("session-live"),
       data: {
         sessionID: "session-live",
@@ -283,7 +283,7 @@ test("tracks session status from active sessions and execution events", async ()
     emitEvent(events, {
       id: "evt_step_ended",
       created: 0,
-      type: "step.ended",
+      type: "session.step.ended",
       durable: durable("session-live", 1, 2),
       data: {
         sessionID: "session-live",
@@ -302,7 +302,7 @@ test("tracks session status from active sessions and execution events", async ()
     emitEvent(events, {
       id: "evt_execution_settled",
       created: 0,
-      type: "execution.settled",
+      type: "session.execution.settled",
       data: {
         sessionID: "session-live",
         outcome: "success",
@@ -313,7 +313,7 @@ test("tracks session status from active sessions and execution events", async ()
     emitEvent(events, {
       id: "evt_failed_step_started",
       created: 0,
-      type: "step.started",
+      type: "session.step.started",
       durable: durable("session-failed"),
       data: {
         sessionID: "session-failed",
@@ -327,7 +327,7 @@ test("tracks session status from active sessions and execution events", async ()
     emitEvent(events, {
       id: "evt_step_failed",
       created: 0,
-      type: "step.failed",
+      type: "session.step.failed",
       durable: durable("session-failed", 1, 2),
       data: {
         sessionID: "session-failed",
@@ -344,7 +344,7 @@ test("tracks session status from active sessions and execution events", async ()
     emitEvent(events, {
       id: "evt_failed_execution_settled",
       created: 0,
-      type: "execution.settled",
+      type: "session.execution.settled",
       data: {
         sessionID: "session-failed",
         outcome: "failure",
@@ -797,14 +797,14 @@ test("settles pending tools when a live failure arrives", async () => {
     emitEvent(events, {
       id: "evt_agent_1",
       created: 0,
-      type: "agent.selected",
+      type: "session.agent.selected",
       durable: durable("session-1"),
       data: { sessionID: "session-1", agent: "build" },
     })
     emitEvent(events, {
       id: "evt_model_1",
       created: 0,
-      type: "model.selected",
+      type: "session.model.selected",
       durable: durable("session-1", 1),
       data: {
         sessionID: "session-1",
@@ -814,7 +814,7 @@ test("settles pending tools when a live failure arrives", async () => {
     emitEvent(events, {
       id: "evt_step_started_1",
       created: 0,
-      type: "step.started",
+      type: "session.step.started",
       durable: durable("session-1", 2),
       data: {
         sessionID: "session-1",
@@ -826,7 +826,7 @@ test("settles pending tools when a live failure arrives", async () => {
     emitEvent(events, {
       id: "evt_input_1",
       created: 0,
-      type: "tool.input.started",
+      type: "session.tool.input.started",
       durable: durable("session-1", 3),
       data: {
         sessionID: "session-1",
@@ -838,7 +838,7 @@ test("settles pending tools when a live failure arrives", async () => {
     emitEvent(events, {
       id: "evt_called_1",
       created: 0,
-      type: "tool.called",
+      type: "session.tool.called",
       durable: durable("session-1", 4),
       data: {
         sessionID: "session-1",
@@ -852,7 +852,7 @@ test("settles pending tools when a live failure arrives", async () => {
     emitEvent(events, {
       id: "evt_failed_1",
       created: 0,
-      type: "tool.failed",
+      type: "session.tool.failed",
       durable: durable("session-1", 5),
       data: {
         sessionID: "session-1",
@@ -942,7 +942,7 @@ test("renders admitted prompts immediately with queued marker and clears when pr
     emitEvent(events, {
       id: "evt_admitted_1",
       created: 0,
-      type: "prompt.admitted",
+      type: "session.prompt.admitted",
       durable: durable(sessionID),
       data: {
         sessionID,
@@ -961,7 +961,7 @@ test("renders admitted prompts immediately with queued marker and clears when pr
     emitEvent(events, {
       id: "evt_prompted_1",
       created: 0,
-      type: "prompt.promoted",
+      type: "session.prompt.promoted",
       durable: durable(sessionID, 1),
       data: {
         sessionID,
@@ -969,8 +969,8 @@ test("renders admitted prompts immediately with queued marker and clears when pr
       },
     })
 
-    await wait(() => received.at(-1) === "prompt.promoted")
-    expect(received.slice(-2)).toEqual(["prompt.admitted", "prompt.promoted"])
+    await wait(() => received.at(-1) === "session.prompt.promoted")
+    expect(received.slice(-2)).toEqual(["session.prompt.admitted", "session.prompt.promoted"])
     unsubscribe()
     const message = sync.session.message.list(sessionID)?.[0]
     expect(message?.type).toBe("user")
diff --git a/packages/ui/src/components/provider-icon.tsx b/packages/ui/src/components/provider-icon.tsx
index 7c0eb3d047..46fb7fb6f2 100644
--- a/packages/ui/src/components/provider-icon.tsx
+++ b/packages/ui/src/components/provider-icon.tsx
@@ -9,7 +9,7 @@ export type ProviderIconProps = JSX.SVGElementTags["svg"] & {
 
 export const ProviderIcon: Component<ProviderIconProps> = (props) => {
   const [local, rest] = splitProps(props, ["id", "class", "classList"])
-  const resolved = createMemo(() => (iconNames.includes(local.id as IconName) ? local.id : "synthetic"))
+  const resolved = createMemo(() => (iconNames.includes(local.id as IconName) ? local.id : "session.synthetic"))
   return (
     <svg
       data-component="provider-icon"
diff --git a/specs/v2/schema-changelog.md b/specs/v2/schema-changelog.md
index 466cc73a8a..3fd4fb4a17 100644
--- a/specs/v2/schema-changelog.md
+++ b/specs/v2/schema-changelog.md
@@ -908,7 +908,7 @@ Compatibility:
 ## 2026-07-03: Normalize Session Event Names And Envelope Time
 
 - Drop the experimental `session.next.` prefix from current Session event names.
-- Rename `agent.switched` to `agent.selected`, `model.switched` to `model.selected`, and `prompted` to `prompt.promoted`; add `prompt.admitted` as the durable prompt admission record.
+- Rename `agent.switched` to `session.agent.selected`, `model.switched` to `session.model.selected`, and `prompted` to `session.prompt.promoted`; add `session.prompt.admitted` as the durable prompt admission record.
 - Add an envelope-level `created` timestamp stored on each event row; payload-level `timestamp` fields are removed.
 - Remove projection-only `messageID` fields from selected/message-producing events; projected message IDs derive from the event ID. `revert.committed.messageID` remains, and `forked.messageID` is now `forked.from`.
 - Rename `session.moved.subdirectory` to `subpath` and normalize event-related schema identifiers.
@@ -918,3 +918,24 @@ Compatibility:
 - V2 durable events and projections are experimental and are reset by `20260703090000_reset_v2_event_rename_sweep`; existing V2 event rows, event sequences, projected session messages, and admitted inputs are wiped.
 - All renamed durable event types restart at version 1 under their normalized names.
 - Generated Promise, Effect, and legacy JavaScript SDK surfaces were regenerated from the normalized schemas.
+
+## 2026-07-03: Restore Session Event Prefix
+
+- Restore the `session.` prefix on current Session event names; the prior rename intended to drop only the `.next.` segment from `session.next.*` names.
+- Payloads are unchanged. For example, `step.ended` is now `session.step.ended`, while already-correct names such as `session.moved` and `session.context.updated` are unchanged.
+
+Compatibility:
+
+- Covered by the existing `20260703190000_reset_v2_shell_event_payloads` V2 reset; no additional migration or column change is required.
+
+## 2026-07-03: Align Session Shell Payloads With Shell Service
+
+- Change durable `session.shell.started` to carry `shell: Shell.Info`.
+- Change durable `session.shell.ended` to carry the final `shell: Shell.Info` snapshot and structured `output: Shell.Output`.
+- Project `SessionMessage.Shell` with the same nested Shell service objects so consumers can render command, exit status, truncation, and paged output consistently.
+- Remove the transitional `callID` correlation field from shell events and projected shell messages; shell records now key by `shell.id`.
+- Publish `session.shell.started` after the shell process is created so `Shell.Info` reflects the real process. A failed spawn publishes no shell events; the failure surfaces as an error on the shell request itself, so the durable ledger never records a `session.shell.started` without a process that existed.
+
+Compatibility:
+
+- V2 durable events and projections are experimental and are reset by `20260703190000_reset_v2_shell_event_payloads`; existing V2 event rows, event sequences, projected session messages, and admitted inputs are wiped.
diff --git a/specs/v2/session.md b/specs/v2/session.md
index b4b91ace09..c4307b6897 100644
--- a/specs/v2/session.md
+++ b/specs/v2/session.md
@@ -114,7 +114,7 @@ Before each step, the runner estimates the complete model-visible request and co
 
 Compaction keeps the full transcript durable while replacing its active model representation with one hidden checkpoint containing a structured rolling summary and token-bounded serialized recent context. Provider-native assistant, reasoning, and tool messages never survive across the boundary, avoiding signature and encrypted-reasoning failures when the earlier prefix changes.
 
-`compaction.started.1` durably identifies the attempt. Compaction deltas are live-only progress. `compaction.ended.1` durably stores the final summary and serialized recent context; only this completed event projects a model-visible compaction message. On the next physical attempt, the runner observes that completed compaction and directly renders a fresh Context Epoch baseline. A failed or interrupted attempt therefore leaves the previous history boundary active.
+`session.compaction.started.1` durably identifies the attempt. Compaction deltas are live-only progress. `session.compaction.ended.1` durably stores the final summary and serialized recent context; only this completed event projects a model-visible compaction message. On the next physical attempt, the runner observes that completed compaction and directly renders a fresh Context Epoch baseline. A failed or interrupted attempt therefore leaves the previous history boundary active.
 
 Repeated compactions update the previous structured summary with newly compacted messages. The runner then reloads projected history and executes the original pending step.
 

From 6ae2fa51961d7d42c8b8d82d7b6f9eddd1d58437 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Fri, 3 Jul 2026 18:10:24 -0400
Subject: [PATCH 33/82] feat(plugin): align hooks with client APIs

---
 bun.lock                                      |   2 +
 packages/client/package.json                  |  20 +-
 packages/client/script/build-package.ts       |   9 +
 packages/client/script/build.ts               |   4 +-
 packages/client/script/publish.ts             |  45 +++++
 packages/client/src/effect/api.ts             |   8 +
 .../src/effect/api}/.httpapi-codegen.json     |   0
 .../src/effect/api}/api.ts                    |   2 +-
 packages/client/src/effect/index.ts           |  16 ++
 packages/client/src/promise/api.ts            |  39 ++++
 packages/client/src/promise/index.ts          |  12 ++
 packages/client/test/api.types.ts             |  10 +
 packages/client/tsconfig.build.json           |  11 ++
 packages/client/tsconfig.json                 |   2 +
 packages/core/src/config/plugin/agent.ts      | 110 +++++------
 packages/core/src/config/plugin/command.ts    |  54 +++--
 packages/core/src/config/plugin/provider.ts   | 185 +++++++++---------
 packages/core/src/config/plugin/reference.ts  |  64 +++---
 packages/core/src/config/plugin/skill.ts      |  58 +++---
 packages/core/src/plugin/host.ts              |  79 ++++++--
 packages/core/src/plugin/models-dev.ts        | 109 ++++++-----
 packages/core/src/plugin/promise.ts           |  46 ++++-
 .../src/plugin/provider/amazon-bedrock.ts     |  30 ++-
 .../core/src/plugin/provider/anthropic.ts     |  22 +--
 packages/core/src/plugin/provider/azure.ts    |  54 +++--
 packages/core/src/plugin/provider/cerebras.ts |  20 +-
 .../plugin/provider/cloudflare-workers-ai.ts  |  22 +--
 .../src/plugin/provider/github-copilot.ts     |  20 +-
 .../core/src/plugin/provider/google-vertex.ts |  92 +++++----
 packages/core/src/plugin/provider/kilo.ts     |  24 ++-
 .../core/src/plugin/provider/llmgateway.ts    |  31 ++-
 packages/core/src/plugin/provider/nvidia.ts   |  26 ++-
 packages/core/src/plugin/provider/openai.ts   |  54 +++--
 .../core/src/plugin/provider/openrouter.ts    |  34 ++--
 packages/core/src/plugin/provider/vercel.ts   |  22 +--
 packages/core/src/plugin/provider/zenmux.ts   |  24 ++-
 packages/core/test/config/command.test.ts     |  10 +-
 packages/core/test/config/skill.test.ts       |   2 +-
 packages/core/test/plugin/command.test.ts     |   6 +-
 packages/core/test/plugin/host.ts             |  34 ++++
 packages/core/test/plugin/promise.test.ts     |  29 +++
 packages/core/test/plugin/skill.test.ts       |  10 +-
 packages/plugin/package.json                  |   1 +
 packages/plugin/src/v2/effect/agent.ts        |  15 +-
 packages/plugin/src/v2/effect/catalog.ts      |  11 +-
 packages/plugin/src/v2/effect/command.ts      |  11 +-
 packages/plugin/src/v2/effect/context.ts      |  19 +-
 packages/plugin/src/v2/effect/index.ts        |  11 +-
 packages/plugin/src/v2/effect/integration.ts  |   7 +-
 packages/plugin/src/v2/effect/plugin.ts       |   3 +-
 packages/plugin/src/v2/effect/reference.ts    |  11 +-
 packages/plugin/src/v2/effect/registration.ts |   6 +-
 packages/plugin/src/v2/effect/runtime.ts      |   5 +-
 packages/plugin/src/v2/effect/skill.ts        |  11 +-
 packages/plugin/src/v2/promise/agent.ts       |  10 +-
 packages/plugin/src/v2/promise/catalog.ts     |  10 +-
 packages/plugin/src/v2/promise/command.ts     |  10 +-
 packages/plugin/src/v2/promise/context.ts     |  15 +-
 packages/plugin/src/v2/promise/index.ts       |   2 +-
 packages/plugin/src/v2/promise/integration.ts |   7 +-
 packages/plugin/src/v2/promise/plugin.ts      |   3 +-
 packages/plugin/src/v2/promise/reference.ts   |  10 +-
 .../plugin/src/v2/promise/registration.ts     |   6 +-
 packages/plugin/src/v2/promise/runtime.ts     |   3 +
 packages/plugin/src/v2/promise/skill.ts       |  10 +-
 65 files changed, 981 insertions(+), 667 deletions(-)
 create mode 100644 packages/client/script/build-package.ts
 create mode 100644 packages/client/script/publish.ts
 create mode 100644 packages/client/src/effect/api.ts
 rename packages/{plugin/src/v2/effect/generated => client/src/effect/api}/.httpapi-codegen.json (100%)
 rename packages/{plugin/src/v2/effect/generated => client/src/effect/api}/api.ts (99%)
 create mode 100644 packages/client/src/promise/api.ts
 create mode 100644 packages/client/test/api.types.ts
 create mode 100644 packages/client/tsconfig.build.json
 create mode 100644 packages/plugin/src/v2/promise/runtime.ts

diff --git a/bun.lock b/bun.lock
index 6522800a13..cdc7518d8a 100644
--- a/bun.lock
+++ b/bun.lock
@@ -122,6 +122,7 @@
     },
     "packages/client": {
       "name": "@opencode-ai/client",
+      "version": "1.17.13",
       "dependencies": {
         "@opencode-ai/protocol": "workspace:*",
         "@opencode-ai/schema": "workspace:*",
@@ -695,6 +696,7 @@
       "version": "1.17.13",
       "dependencies": {
         "@ai-sdk/provider": "3.0.8",
+        "@opencode-ai/client": "workspace:*",
         "@opencode-ai/llm": "workspace:*",
         "@opencode-ai/protocol": "workspace:*",
         "@opencode-ai/schema": "workspace:*",
diff --git a/packages/client/package.json b/packages/client/package.json
index 1314239d41..5ee201c819 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,16 +1,30 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/client",
-  "private": true,
+  "version": "1.17.13",
   "type": "module",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anomalyco/opencode.git",
+    "directory": "packages/client"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "files": [
+    "dist"
+  ],
   "exports": {
     "./promise": "./src/promise/index.ts",
-    "./effect": "./src/effect/index.ts"
+    "./promise/api": "./src/promise/api.ts",
+    "./effect": "./src/effect/index.ts",
+    "./effect/api": "./src/effect/api.ts"
   },
   "scripts": {
+    "build": "bun run script/build-package.ts",
     "generate": "bun run script/build.ts",
-    "check:generated": "bun run generate && git diff --exit-code -- src/promise/generated src/effect/generated",
+    "check:generated": "bun run generate && git diff --exit-code -- src/promise/generated src/effect/generated src/effect/api",
     "test": "bun test --timeout 5000",
     "typecheck": "tsgo --noEmit"
   },
diff --git a/packages/client/script/build-package.ts b/packages/client/script/build-package.ts
new file mode 100644
index 0000000000..323a63ddf9
--- /dev/null
+++ b/packages/client/script/build-package.ts
@@ -0,0 +1,9 @@
+#!/usr/bin/env bun
+
+import { $ } from "bun"
+import { fileURLToPath } from "node:url"
+
+process.chdir(fileURLToPath(new URL("..", import.meta.url)))
+
+await $`rm -rf dist`
+await $`bun tsc -p tsconfig.build.json`
diff --git a/packages/client/script/build.ts b/packages/client/script/build.ts
index 2ba1dbc9c2..6a83d52b99 100644
--- a/packages/client/script/build.ts
+++ b/packages/client/script/build.ts
@@ -32,8 +32,8 @@ await Effect.runPromise(
         fileURLToPath(new URL("../src/effect/generated", import.meta.url)),
       ),
       write(
-        emitEffectShape(effectContract, { module: "@opencode-ai/protocol/client", api: "ClientApi" }),
-        fileURLToPath(new URL("../../plugin/src/v2/effect/generated", import.meta.url)),
+        emitEffectShape(effectContract, { module: "../../contract", api: "ClientApi" }),
+        fileURLToPath(new URL("../src/effect/api", import.meta.url)),
       ),
     ],
     { concurrency: 3, discard: true },
diff --git a/packages/client/script/publish.ts b/packages/client/script/publish.ts
new file mode 100644
index 0000000000..8e37674b64
--- /dev/null
+++ b/packages/client/script/publish.ts
@@ -0,0 +1,45 @@
+#!/usr/bin/env bun
+
+import { Script } from "@opencode-ai/script"
+import { $ } from "bun"
+import { rm } from "node:fs/promises"
+import { fileURLToPath } from "node:url"
+
+process.chdir(fileURLToPath(new URL("..", import.meta.url)))
+
+const originalText = await Bun.file("package.json").text()
+const pkg = JSON.parse(originalText) as {
+  name: string
+  version: string
+  exports: Record<string, string | { import: string; types: string }>
+}
+const tarball = `${pkg.name.replace("@", "").replace("/", "-")}-${pkg.version}.tgz`
+
+if ((await $`npm view ${pkg.name}@${pkg.version} version`.nothrow()).exitCode === 0) {
+  console.log(`already published ${pkg.name}@${pkg.version}`)
+  process.exit(0)
+}
+
+try {
+  await $`bun run typecheck`
+  await $`bun run build`
+  pkg.exports = Object.fromEntries(
+    Object.entries(pkg.exports).map(([key, value]) => {
+      if (typeof value !== "string") return [key, value]
+      return [
+        key,
+        {
+          import: value.replace("./src/", "./dist/").replace(/\.ts$/, ".js"),
+          types: value.replace("./src/", "./dist/").replace(/\.ts$/, ".d.ts"),
+        },
+      ]
+    }),
+  )
+  await Bun.write("package.json", JSON.stringify(pkg, null, 2) + "\n")
+  await rm(tarball, { force: true })
+  await $`bun pm pack`
+  await $`npm publish ${tarball} --tag ${Script.channel} --access public`
+} finally {
+  await Bun.write("package.json", originalText)
+  await rm(tarball, { force: true })
+}
diff --git a/packages/client/src/effect/api.ts b/packages/client/src/effect/api.ts
new file mode 100644
index 0000000000..e7cb2012f5
--- /dev/null
+++ b/packages/client/src/effect/api.ts
@@ -0,0 +1,8 @@
+import type { ModelApi, ProviderApi } from "./api/api.js"
+
+export type * from "./api/api.js"
+
+export interface CatalogApi<E = never> {
+  readonly provider: ProviderApi<E>
+  readonly model: ModelApi<E>
+}
diff --git a/packages/plugin/src/v2/effect/generated/.httpapi-codegen.json b/packages/client/src/effect/api/.httpapi-codegen.json
similarity index 100%
rename from packages/plugin/src/v2/effect/generated/.httpapi-codegen.json
rename to packages/client/src/effect/api/.httpapi-codegen.json
diff --git a/packages/plugin/src/v2/effect/generated/api.ts b/packages/client/src/effect/api/api.ts
similarity index 99%
rename from packages/plugin/src/v2/effect/generated/api.ts
rename to packages/client/src/effect/api/api.ts
index 8e764daa82..3f4c852be1 100644
--- a/packages/plugin/src/v2/effect/generated/api.ts
+++ b/packages/client/src/effect/api/api.ts
@@ -1,7 +1,7 @@
 // Generated by @opencode-ai/httpapi-codegen. Do not edit.
 import type { Effect, Stream } from "effect"
 import type { HttpApiClient } from "effect/unstable/httpapi"
-import type { ClientApi } from "@opencode-ai/protocol/client"
+import type { ClientApi } from "../../contract"
 
 type RawClient = HttpApiClient.ForApi<typeof ClientApi>
 type EffectValue<A> = A extends Effect.Effect<infer Success, any, any> ? Success : never
diff --git a/packages/client/src/effect/index.ts b/packages/client/src/effect/index.ts
index 23e6d55c74..50b85da627 100644
--- a/packages/client/src/effect/index.ts
+++ b/packages/client/src/effect/index.ts
@@ -1,6 +1,21 @@
 // TODO: Keep additional network capabilities inside Schema and Protocol as the client grows; /effect must never import
 // Core or Server. Preserve these datatype exports so internal model reorganizations do not require caller migrations.
+import type { Effect } from "effect"
+
 export * from "./generated/index"
+export type {
+  AgentApi,
+  AppApi,
+  CatalogApi,
+  CommandApi,
+  IntegrationApi,
+  ModelApi,
+  PluginApi,
+  ProviderApi,
+  ReferenceApi,
+  SessionApi,
+  SkillApi,
+} from "./api.js"
 export { Service } from "./service.js"
 export { Agent } from "@opencode-ai/schema/agent"
 export { Command } from "@opencode-ai/schema/command"
@@ -27,3 +42,4 @@ export { SessionMessage } from "@opencode-ai/schema/session-message"
 export { Skill } from "@opencode-ai/schema/skill"
 export { Prompt } from "@opencode-ai/schema/prompt"
 export type { OpenCodeEvent } from "@opencode-ai/protocol/groups/event"
+export type OpenCodeClient = Effect.Success<ReturnType<typeof import("./generated/client").make>>
diff --git a/packages/client/src/promise/api.ts b/packages/client/src/promise/api.ts
new file mode 100644
index 0000000000..a080156942
--- /dev/null
+++ b/packages/client/src/promise/api.ts
@@ -0,0 +1,39 @@
+import type {
+  AgentApi as EffectAgentApi,
+  CommandApi as EffectCommandApi,
+  IntegrationApi as EffectIntegrationApi,
+  ModelApi as EffectModelApi,
+  PluginApi as EffectPluginApi,
+  ProviderApi as EffectProviderApi,
+  ReferenceApi as EffectReferenceApi,
+  SessionApi as EffectSessionApi,
+  SkillApi as EffectSkillApi,
+} from "../effect/api/api.js"
+import type { Effect, Stream } from "effect"
+
+type PromisifyOperation<Operation> = Operation extends (
+  ...args: infer Args
+) => Effect.Effect<infer Success, unknown, unknown>
+  ? (...args: Args) => Promise<Success>
+  : Operation extends (...args: infer Args) => Stream.Stream<infer Success, unknown, unknown>
+    ? (...args: Args) => AsyncIterable<Success>
+    : Operation
+
+type PromisifyApi<Api> = {
+  readonly [Name in keyof Api]: PromisifyOperation<Api[Name]>
+}
+
+export type AgentApi = PromisifyApi<EffectAgentApi<unknown>>
+export type CommandApi = PromisifyApi<EffectCommandApi<unknown>>
+export type IntegrationApi = PromisifyApi<EffectIntegrationApi<unknown>>
+export type ModelApi = PromisifyApi<EffectModelApi<unknown>>
+export type PluginApi = PromisifyApi<EffectPluginApi<unknown>>
+export type ProviderApi = PromisifyApi<EffectProviderApi<unknown>>
+export type ReferenceApi = PromisifyApi<EffectReferenceApi<unknown>>
+export type SessionApi = PromisifyApi<EffectSessionApi<unknown>>
+export type SkillApi = PromisifyApi<EffectSkillApi<unknown>>
+
+export interface CatalogApi {
+  readonly provider: ProviderApi
+  readonly model: ModelApi
+}
diff --git a/packages/client/src/promise/index.ts b/packages/client/src/promise/index.ts
index e9e848b160..9203fe5477 100644
--- a/packages/client/src/promise/index.ts
+++ b/packages/client/src/promise/index.ts
@@ -1,3 +1,15 @@
 export * from "./generated/index"
+export type {
+  AgentApi,
+  CatalogApi,
+  CommandApi,
+  IntegrationApi,
+  ModelApi,
+  PluginApi,
+  ProviderApi,
+  ReferenceApi,
+  SessionApi,
+  SkillApi,
+} from "./api.js"
 export type { EventSubscribeOutput as OpenCodeEvent } from "./generated/types"
 export type OpenCodeClient = ReturnType<typeof import("./generated/client").make>
diff --git a/packages/client/test/api.types.ts b/packages/client/test/api.types.ts
new file mode 100644
index 0000000000..5b17b23c09
--- /dev/null
+++ b/packages/client/test/api.types.ts
@@ -0,0 +1,10 @@
+import { Effect } from "effect"
+import { OpenCode as EffectOpenCode, type AppApi as EffectApi } from "../src/effect"
+
+type EffectClient = Effect.Success<ReturnType<typeof EffectOpenCode.make>>
+
+declare const effectClient: EffectClient
+
+const effectApi: EffectApi<unknown> = effectClient
+
+void effectApi
diff --git a/packages/client/tsconfig.build.json b/packages/client/tsconfig.build.json
new file mode 100644
index 0000000000..e235ae78cf
--- /dev/null
+++ b/packages/client/tsconfig.build.json
@@ -0,0 +1,11 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist",
+    "noEmit": false,
+    "declaration": true
+  },
+  "include": ["src"]
+}
diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json
index 47fc90bc55..a7ef7a1fa3 100644
--- a/packages/client/tsconfig.json
+++ b/packages/client/tsconfig.json
@@ -3,6 +3,8 @@
   "extends": "@tsconfig/bun/tsconfig.json",
   "compilerOptions": {
     "lib": ["ESNext", "DOM", "DOM.Iterable"],
+    "allowImportingTsExtensions": false,
+    "allowJs": false,
     "noUncheckedIndexedAccess": false
   },
   "include": ["src"]
diff --git a/packages/core/src/config/plugin/agent.ts b/packages/core/src/config/plugin/agent.ts
index 48efe75804..9c6c958025 100644
--- a/packages/core/src/config/plugin/agent.ts
+++ b/packages/core/src/config/plugin/agent.ts
@@ -38,65 +38,63 @@ export const Plugin = define({
   effect: Effect.fn(function* (ctx) {
     const config = yield* Config.Service
     const fs = yield* FSUtil.Service
-    yield* ctx.agent.transform(
-      Effect.fn(function* (draft) {
-        const documents = yield* Effect.forEach(yield* config.entries(), (entry) => {
-          if (entry.type === "document") return Effect.succeed([entry])
-          return Effect.gen(function* () {
-            const files = yield* discover(fs, entry.path)
-            return yield* Effect.forEach(files, (file) =>
-              fs.readFileStringSafe(file.filepath).pipe(
-                Effect.map((content) => content && decode(file, content)),
-                Effect.catch(() => Effect.succeed(undefined)),
-              ),
-            ).pipe(
-              Effect.map((documents) =>
-                documents.filter((document): document is Config.Document => document !== undefined),
-              ),
-            )
-          })
-        }).pipe(Effect.map((documents) => documents.flat()))
-        const global = documents.flatMap((document) => document.info.permissions ?? [])
-        const configuredDefault = Config.latest(documents, "default_agent")
-        if (configuredDefault !== undefined) draft.default(AgentV2.ID.make(configuredDefault))
-        for (const current of draft.list()) {
-          draft.update(current.id, (agent) => agent.permissions.push(...global))
-        }
+    const documents = yield* Effect.forEach(yield* config.entries(), (entry) => {
+      if (entry.type === "document") return Effect.succeed([entry])
+      return Effect.gen(function* () {
+        const files = yield* discover(fs, entry.path)
+        return yield* Effect.forEach(files, (file) =>
+          fs.readFileStringSafe(file.filepath).pipe(
+            Effect.map((content) => content && decode(file, content)),
+            Effect.catch(() => Effect.succeed(undefined)),
+          ),
+        ).pipe(
+          Effect.map((documents) =>
+            documents.filter((document): document is Config.Document => document !== undefined),
+          ),
+        )
+      })
+    }).pipe(Effect.map((documents) => documents.flat()))
+    const global = documents.flatMap((document) => document.info.permissions ?? [])
+    const configuredDefault = Config.latest(documents, "default_agent")
+    yield* ctx.agent.transform((draft) => {
+      if (configuredDefault !== undefined) draft.default(AgentV2.ID.make(configuredDefault))
+      for (const current of draft.list()) {
+        draft.update(current.id, (agent) => agent.permissions.push(...global))
+      }
 
-        for (const document of documents) {
-          for (const [id, item] of Object.entries(document.info.agents ?? {})) {
-            const agentID = AgentV2.ID.make(id)
-            if (item.disabled) {
-              draft.remove(agentID)
-              continue
-            }
-
-            const exists = draft.get(agentID) !== undefined
-            draft.update(agentID, (agent) => {
-              if (!exists) agent.permissions.push(...global)
-              if (item.model !== undefined) {
-                const model = ModelV2.parse(item.model)
-                agent.model = { id: model.modelID, providerID: model.providerID, variant: agent.model?.variant }
-              }
-              if (item.variant !== undefined && agent.model !== undefined) {
-                agent.model.variant = ModelV2.VariantID.make(item.variant)
-              }
-              if (item.request !== undefined) {
-                Object.assign(agent.request.headers, item.request.headers ?? {})
-                Object.assign(agent.request.body, item.request.body ?? {})
-              }
-              if (item.system !== undefined) agent.system = item.system
-              if (item.description !== undefined) agent.description = item.description
-              if (item.mode !== undefined) agent.mode = item.mode
-              if (item.hidden !== undefined) agent.hidden = item.hidden
-              if (item.color !== undefined) agent.color = item.color
-              if (item.steps !== undefined) agent.steps = item.steps
-              if (item.permissions !== undefined) agent.permissions.push(...item.permissions)
-            })
+      for (const document of documents) {
+        for (const [id, item] of Object.entries(document.info.agents ?? {})) {
+          const agentID = AgentV2.ID.make(id)
+          if (item.disabled) {
+            draft.remove(agentID)
+            continue
           }
+
+          const exists = draft.get(agentID) !== undefined
+          draft.update(agentID, (agent) => {
+            if (!exists) agent.permissions.push(...global)
+            if (item.model !== undefined) {
+              const model = ModelV2.parse(item.model)
+              agent.model = { id: model.modelID, providerID: model.providerID, variant: agent.model?.variant }
+            }
+            if (item.variant !== undefined && agent.model !== undefined) {
+              agent.model.variant = ModelV2.VariantID.make(item.variant)
+            }
+            if (item.request !== undefined) {
+              Object.assign(agent.request.headers, item.request.headers ?? {})
+              Object.assign(agent.request.body, item.request.body ?? {})
+            }
+            if (item.system !== undefined) agent.system = item.system
+            if (item.description !== undefined) agent.description = item.description
+            if (item.mode !== undefined) agent.mode = item.mode
+            if (item.hidden !== undefined) agent.hidden = item.hidden
+            if (item.color !== undefined) agent.color = item.color
+            if (item.steps !== undefined) agent.steps = item.steps
+            if (item.permissions !== undefined) agent.permissions.push(...item.permissions)
+          })
         }
-      }),
-    )
+      }
+    })
   }),
 })
 
diff --git a/packages/core/src/config/plugin/command.ts b/packages/core/src/config/plugin/command.ts
index f9b31f8e45..bb7a030cbb 100644
--- a/packages/core/src/config/plugin/command.ts
+++ b/packages/core/src/config/plugin/command.ts
@@ -17,35 +17,33 @@ export const Plugin = define({
   effect: Effect.fn(function* (ctx) {
     const config = yield* Config.Service
     const fs = yield* FSUtil.Service
-    yield* ctx.command.transform(
-      Effect.fn(function* (draft) {
-        const documents = yield* Effect.forEach(yield* config.entries(), (entry) => {
-          if (entry.type === "document") return Effect.succeed([{ commands: entry.info.commands }])
-          return loadDirectory(fs, entry.path).pipe(
-            Effect.map((commands) => [
-              { commands: Object.fromEntries(commands.map((command) => [command.name, command.info])) },
-            ]),
-          )
-        }).pipe(Effect.map((documents) => documents.flat()))
-        for (const document of documents) {
-          for (const [name, command] of Object.entries(document.commands ?? {})) {
-            draft.update(name, (item) => {
-              item.template = command.template
-              if (command.description !== undefined) item.description = command.description
-              if (command.agent !== undefined) item.agent = command.agent
-              if (command.model !== undefined) {
-                const model = ModelV2.parse(command.model)
-                item.model = { id: model.modelID, providerID: model.providerID, variant: item.model?.variant }
-              }
-              if (command.variant !== undefined && item.model !== undefined) {
-                item.model.variant = ModelV2.VariantID.make(command.variant)
-              }
-              if (command.subtask !== undefined) item.subtask = command.subtask
-            })
-          }
+    const documents = yield* Effect.forEach(yield* config.entries(), (entry) => {
+      if (entry.type === "document") return Effect.succeed([{ commands: entry.info.commands }])
+      return loadDirectory(fs, entry.path).pipe(
+        Effect.map((commands) => [
+          { commands: Object.fromEntries(commands.map((command) => [command.name, command.info])) },
+        ]),
+      )
+    }).pipe(Effect.map((documents) => documents.flat()))
+    yield* ctx.command.transform((draft) => {
+      for (const document of documents) {
+        for (const [name, command] of Object.entries(document.commands ?? {})) {
+          draft.update(name, (item) => {
+            item.template = command.template
+            if (command.description !== undefined) item.description = command.description
+            if (command.agent !== undefined) item.agent = command.agent
+            if (command.model !== undefined) {
+              const model = ModelV2.parse(command.model)
+              item.model = { id: model.modelID, providerID: model.providerID, variant: item.model?.variant }
+            }
+            if (command.variant !== undefined && item.model !== undefined) {
+              item.model.variant = ModelV2.VariantID.make(command.variant)
+            }
+            if (command.subtask !== undefined) item.subtask = command.subtask
+          })
         }
-      }),
-    )
+      }
+    })
   }),
 })
 
diff --git a/packages/core/src/config/plugin/provider.ts b/packages/core/src/config/plugin/provider.ts
index d8ec3a58ae..4992233a1f 100644
--- a/packages/core/src/config/plugin/provider.ts
+++ b/packages/core/src/config/plugin/provider.ts
@@ -9,108 +9,101 @@ export const Plugin = define({
   id: "config-provider",
   effect: Effect.fn(function* (ctx) {
     const config = yield* Config.Service
-    yield* ctx.integration.transform(
-      Effect.fn(function* (integrations) {
-        const files = (yield* config.entries()).filter((entry): entry is Config.Document => entry.type === "document")
-        const configuredIntegrations = new Set(
-          files.flatMap((file) =>
-            Object.entries(file.info.providers ?? {}).flatMap(([id, provider]) =>
-              provider.env === undefined ? [] : [id],
-            ),
-          ),
-        )
-        for (const file of files) {
-          for (const [id, item] of Object.entries(file.info.providers ?? {})) {
-            const integrationID = id
-            if (!configuredIntegrations.has(id) && !integrations.get(integrationID)) continue
-            integrations.update(integrationID, (integration) => {
-              integration.name = item.name ?? integration.name
+    const entries = yield* config.entries()
+    const files = entries.filter((entry): entry is Config.Document => entry.type === "document")
+    const configuredIntegrations = new Set(
+      files.flatMap((file) =>
+        Object.entries(file.info.providers ?? {}).flatMap(([id, provider]) => (provider.env === undefined ? [] : [id])),
+      ),
+    )
+    yield* ctx.integration.transform((integrations) => {
+      for (const file of files) {
+        for (const [id, item] of Object.entries(file.info.providers ?? {})) {
+          const integrationID = id
+          if (!configuredIntegrations.has(id) && !integrations.get(integrationID)) continue
+          integrations.update(integrationID, (integration) => {
+            integration.name = item.name ?? integration.name
+          })
+          if (item.env !== undefined) {
+            integrations.method.update({
+              integrationID,
+              method: { type: "env", names: [...item.env] },
             })
-            if (item.env !== undefined) {
-              integrations.method.update({
-                integrationID,
-                method: { type: "env", names: [...item.env] },
-              })
-            }
           }
         }
-      }),
-    )
+      }
+    })
 
-    yield* ctx.catalog.transform(
-      Effect.fn(function* (catalog) {
-        const entries = yield* config.entries()
-        const files = entries.filter((entry): entry is Config.Document => entry.type === "document")
-        const configuredDefault = Config.latest(entries, "model")
-        if (configuredDefault !== undefined) {
-          const model = ModelV2.parse(configuredDefault)
-          catalog.model.default.set(model.providerID, model.modelID)
-        }
-        for (const file of files) {
-          for (const [id, item] of Object.entries(file.info.providers ?? {})) {
-            const providerID = id
-            catalog.provider.update(providerID, (provider) => {
-              if (item.name !== undefined) provider.name = item.name
-              if (item.api !== undefined) provider.api = { ...item.api }
-              if (item.request !== undefined) {
-                Object.assign(provider.request.settings, item.request.settings)
-                Object.assign(provider.request.headers, item.request.headers)
-                Object.assign(provider.request.body, item.request.body)
-              }
-            })
-            for (const [id, config] of Object.entries(item.models ?? {})) {
-              catalog.model.update(providerID, id, (model) => {
-                if (config.family !== undefined) model.family = config.family
-                if (config.name !== undefined) model.name = config.name
-                if (config.api !== undefined) model.api = { ...model.api, ...config.api }
-                if (config.capabilities !== undefined) {
-                  model.capabilities = {
-                    tools: config.capabilities.tools,
-                    input: [...config.capabilities.input],
-                    output: [...config.capabilities.output],
-                  }
-                }
-                if (config.request !== undefined) {
-                  Object.assign(model.request.settings, config.request.settings)
-                  Object.assign(model.request.headers, config.request.headers)
-                  Object.assign(model.request.body, config.request.body)
-                  if (config.request.variant !== undefined) model.request.variant = config.request.variant
-                }
-                if (config.variants !== undefined) {
-                  for (const variant of config.variants) {
-                    let existing = model.variants.find((item) => item.id === variant.id)
-                    if (!existing) {
-                      existing = {
-                        id: variant.id,
-                        settings: {},
-                        headers: {},
-                        body: {},
-                      }
-                      model.variants.push(existing)
-                    }
-                    Object.assign(existing.settings, variant.settings)
-                    Object.assign(existing.headers, variant.headers)
-                    Object.assign(existing.body, variant.body)
-                  }
-                }
-                if (config.cost !== undefined) {
-                  model.cost = (Array.isArray(config.cost) ? config.cost : [config.cost]).map((cost) => ({
-                    tier: cost.tier && { ...cost.tier },
-                    input: cost.input,
-                    output: cost.output,
-                    cache: {
-                      read: cost.cache?.read ?? 0,
-                      write: cost.cache?.write ?? 0,
-                    },
-                  }))
-                }
-                if (config.disabled !== undefined) model.enabled = !config.disabled
-                if (config.limit !== undefined) model.limit = { ...model.limit, ...config.limit }
-              })
+    const configuredDefault = Config.latest(entries, "model")
+    yield* ctx.catalog.transform((catalog) => {
+      if (configuredDefault !== undefined) {
+        const model = ModelV2.parse(configuredDefault)
+        catalog.model.default.set(model.providerID, model.modelID)
+      }
+      for (const file of files) {
+        for (const [id, item] of Object.entries(file.info.providers ?? {})) {
+          const providerID = id
+          catalog.provider.update(providerID, (provider) => {
+            if (item.name !== undefined) provider.name = item.name
+            if (item.api !== undefined) provider.api = { ...item.api }
+            if (item.request !== undefined) {
+              Object.assign(provider.request.settings, item.request.settings)
+              Object.assign(provider.request.headers, item.request.headers)
+              Object.assign(provider.request.body, item.request.body)
             }
+          })
+          for (const [id, config] of Object.entries(item.models ?? {})) {
+            catalog.model.update(providerID, id, (model) => {
+              if (config.family !== undefined) model.family = config.family
+              if (config.name !== undefined) model.name = config.name
+              if (config.api !== undefined) model.api = { ...model.api, ...config.api }
+              if (config.capabilities !== undefined) {
+                model.capabilities = {
+                  tools: config.capabilities.tools,
+                  input: [...config.capabilities.input],
+                  output: [...config.capabilities.output],
+                }
+              }
+              if (config.request !== undefined) {
+                Object.assign(model.request.settings, config.request.settings)
+                Object.assign(model.request.headers, config.request.headers)
+                Object.assign(model.request.body, config.request.body)
+                if (config.request.variant !== undefined) model.request.variant = config.request.variant
+              }
+              if (config.variants !== undefined) {
+                for (const variant of config.variants) {
+                  let existing = model.variants.find((item) => item.id === variant.id)
+                  if (!existing) {
+                    existing = {
+                      id: variant.id,
+                      settings: {},
+                      headers: {},
+                      body: {},
+                    }
+                    model.variants.push(existing)
+                  }
+                  Object.assign(existing.settings, variant.settings)
+                  Object.assign(existing.headers, variant.headers)
+                  Object.assign(existing.body, variant.body)
+                }
+              }
+              if (config.cost !== undefined) {
+                model.cost = (Array.isArray(config.cost) ? config.cost : [config.cost]).map((cost) => ({
+                  tier: cost.tier && { ...cost.tier },
+                  input: cost.input,
+                  output: cost.output,
+                  cache: {
+                    read: cost.cache?.read ?? 0,
+                    write: cost.cache?.write ?? 0,
+                  },
+                }))
+              }
+              if (config.disabled !== undefined) model.enabled = !config.disabled
+              if (config.limit !== undefined) model.limit = { ...model.limit, ...config.limit }
+            })
           }
         }
-      }),
-    )
+      }
+    })
   }),
 })
diff --git a/packages/core/src/config/plugin/reference.ts b/packages/core/src/config/plugin/reference.ts
index d5fa53c411..1c599dab7f 100644
--- a/packages/core/src/config/plugin/reference.ts
+++ b/packages/core/src/config/plugin/reference.ts
@@ -16,41 +16,35 @@ export const Plugin = define({
     const config = yield* Config.Service
     const location = yield* Location.Service
     const global = yield* Global.Service
-    yield* ctx.reference.transform(
-      Effect.fn(function* (draft) {
-        const entries = new Map<string, Reference.Source>()
-        for (const doc of (yield* config.entries()).filter(
-          (entry): entry is Config.Document => entry.type === "document",
-        )) {
-          const directory = doc.path ? path.dirname(doc.path) : location.directory
-          for (const [name, entry] of Object.entries(doc.info.references ?? {})) {
-            if (!validAlias(name)) continue
-            const description = typeof entry === "string" ? undefined : entry.description
-            const hidden = typeof entry === "string" ? undefined : entry.hidden
-            entries.set(
-              name,
-              local(entry)
-                ? Reference.LocalSource.make({
-                    type: "local",
-                    path: AbsolutePath.make(
-                      localPath(directory, global.home, typeof entry === "string" ? entry : entry.path),
-                    ),
-                    ...(description === undefined ? {} : { description }),
-                    ...(hidden === undefined ? {} : { hidden }),
-                  })
-                : Reference.GitSource.make({
-                    type: "git",
-                    repository: typeof entry === "string" ? entry : entry.repository,
-                    ...(entry.branch === undefined ? {} : { branch: entry.branch }),
-                    ...(description === undefined ? {} : { description }),
-                    ...(hidden === undefined ? {} : { hidden }),
-                  }),
-            )
-          }
-        }
-        for (const [name, source] of entries) draft.add(name, source)
-      }),
-    )
+    const entries = new Map<string, Reference.Source>()
+    for (const doc of (yield* config.entries()).filter((entry): entry is Config.Document => entry.type === "document")) {
+      const directory = doc.path ? path.dirname(doc.path) : location.directory
+      for (const [name, entry] of Object.entries(doc.info.references ?? {})) {
+        if (!validAlias(name)) continue
+        const description = typeof entry === "string" ? undefined : entry.description
+        const hidden = typeof entry === "string" ? undefined : entry.hidden
+        entries.set(
+          name,
+          local(entry)
+            ? Reference.LocalSource.make({
+                type: "local",
+                path: AbsolutePath.make(localPath(directory, global.home, typeof entry === "string" ? entry : entry.path)),
+                ...(description === undefined ? {} : { description }),
+                ...(hidden === undefined ? {} : { hidden }),
+              })
+            : Reference.GitSource.make({
+                type: "git",
+                repository: typeof entry === "string" ? entry : entry.repository,
+                ...(entry.branch === undefined ? {} : { branch: entry.branch }),
+                ...(description === undefined ? {} : { description }),
+                ...(hidden === undefined ? {} : { hidden }),
+              }),
+        )
+      }
+    }
+    yield* ctx.reference.transform((draft) => {
+      for (const [name, source] of entries) draft.add(name, source)
+    })
   }),
 })
 
diff --git a/packages/core/src/config/plugin/skill.ts b/packages/core/src/config/plugin/skill.ts
index 765992a765..c4b7ba95c1 100644
--- a/packages/core/src/config/plugin/skill.ts
+++ b/packages/core/src/config/plugin/skill.ts
@@ -15,36 +15,34 @@ export const Plugin = define({
     const config = yield* Config.Service
     const global = yield* Global.Service
     const location = yield* Location.Service
-    yield* ctx.skill.transform(
-      Effect.fn(function* (draft) {
-        const entries = yield* config.entries()
-        const directories = entries.flatMap((entry) => (entry.type === "directory" ? [entry.path] : []))
-        const items = entries.flatMap((entry) => (entry.type === "document" ? (entry.info.skills ?? []) : []))
-        for (const directory of directories) {
-          draft.source(
-            SkillV2.DirectorySource.make({ type: "directory", path: AbsolutePath.make(path.join(directory, "skill")) }),
-          )
-          draft.source(
-            SkillV2.DirectorySource.make({
-              type: "directory",
-              path: AbsolutePath.make(path.join(directory, "skills")),
-            }),
-          )
+    const entries = yield* config.entries()
+    const directories = entries.flatMap((entry) => (entry.type === "directory" ? [entry.path] : []))
+    const items = entries.flatMap((entry) => (entry.type === "document" ? (entry.info.skills ?? []) : []))
+    yield* ctx.skill.transform((draft) => {
+      for (const directory of directories) {
+        draft.source(
+          SkillV2.DirectorySource.make({ type: "directory", path: AbsolutePath.make(path.join(directory, "skill")) }),
+        )
+        draft.source(
+          SkillV2.DirectorySource.make({
+            type: "directory",
+            path: AbsolutePath.make(path.join(directory, "skills")),
+          }),
+        )
+      }
+      for (const item of items) {
+        if (URL.canParse(item) && /^(https?:)$/.test(new URL(item).protocol)) {
+          draft.source(SkillV2.UrlSource.make({ type: "url", url: item }))
+          continue
         }
-        for (const item of items) {
-          if (URL.canParse(item) && /^(https?:)$/.test(new URL(item).protocol)) {
-            draft.source(SkillV2.UrlSource.make({ type: "url", url: item }))
-            continue
-          }
-          const expanded = item.startsWith("~/") ? path.join(global.home, item.slice(2)) : item
-          draft.source(
-            SkillV2.DirectorySource.make({
-              type: "directory",
-              path: AbsolutePath.make(path.isAbsolute(expanded) ? expanded : path.join(location.directory, expanded)),
-            }),
-          )
-        }
-      }),
-    )
+        const expanded = item.startsWith("~/") ? path.join(global.home, item.slice(2)) : item
+        draft.source(
+          SkillV2.DirectorySource.make({
+            type: "directory",
+            path: AbsolutePath.make(path.isAbsolute(expanded) ? expanded : path.join(location.directory, expanded)),
+          }),
+        )
+      }
+    })
   }),
 })
diff --git a/packages/core/src/plugin/host.ts b/packages/core/src/plugin/host.ts
index d07ba6f0fd..bf3420a023 100644
--- a/packages/core/src/plugin/host.ts
+++ b/packages/core/src/plugin/host.ts
@@ -52,6 +52,8 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: PluginV2.Int
         })
   const isCurrentLocation = (ref: Location.Ref) =>
     ref.directory === location.directory && ref.workspaceID === location.workspaceID
+  const response = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
+    effect.pipe(Effect.map((data) => ({ location: locationInfo(), data })))
 
   return {
     options: {},
@@ -63,15 +65,15 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: PluginV2.Int
       },
       reload: agents.reload,
       transform: (callback) =>
-        agents.transform((draft) =>
+        agents.transform((draft) => {
           callback({
             list: () => mutable(draft.list()),
             get: (id) => mutable(draft.get(AgentV2.ID.make(id))),
             default: (id) => draft.default(id === undefined ? undefined : AgentV2.ID.make(id)),
             update: (id, update) => draft.update(AgentV2.ID.make(id), update),
             remove: (id) => draft.remove(AgentV2.ID.make(id)),
-          }),
-        ),
+          })
+        }),
     },
     aisdk: {
       sdk: (callback) =>
@@ -102,9 +104,26 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: PluginV2.Int
         }),
     },
     catalog: {
+      provider: {
+        list: () => response(catalog.provider.available()),
+        get: (input) =>
+          catalog.provider
+            .get(ProviderV2.ID.make(input.providerID))
+            .pipe(
+              Effect.flatMap((provider) =>
+                provider === undefined
+                  ? Effect.fail(new Error(`Provider not found: ${input.providerID}`))
+                  : response(Effect.succeed(provider)),
+              ),
+            ),
+      },
+      model: {
+        list: () => response(catalog.model.available()),
+        default: () => response(catalog.model.default()),
+      },
       reload: catalog.reload,
       transform: (callback) =>
-        catalog.transform((draft) =>
+        catalog.transform((draft) => {
           callback({
             provider: {
               list: () => mutable(draft.provider.list()),
@@ -125,14 +144,39 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: PluginV2.Int
                   draft.model.default.set(ProviderV2.ID.make(providerID), ModelV2.ID.make(modelID)),
               },
             },
-          }),
-        ),
+          })
+        }),
     },
     command: {
+      list: () => response(commands.list()),
       reload: commands.reload,
-      transform: commands.transform,
+      transform: (callback) =>
+        commands.transform((draft) => {
+          callback(draft)
+        }),
     },
     integration: {
+      list: () => response(integration.list()),
+      get: (input) => response(integration.get(Integration.ID.make(input.integrationID))),
+      connectKey: (input) =>
+        integration.connection.key({
+          integrationID: Integration.ID.make(input.integrationID),
+          key: input.key,
+          label: input.label,
+        }),
+      connectOauth: (input) =>
+        response(
+          integration.connection.oauth({
+            integrationID: Integration.ID.make(input.integrationID),
+            methodID: Integration.MethodID.make(input.methodID),
+            inputs: input.inputs,
+            label: input.label,
+          }),
+        ),
+      attemptStatus: (input) => response(integration.attempt.status(Integration.AttemptID.make(input.attemptID))),
+      attemptComplete: (input) =>
+        integration.attempt.complete({ attemptID: Integration.AttemptID.make(input.attemptID), code: input.code }),
+      attemptCancel: (input) => integration.attempt.cancel(Integration.AttemptID.make(input.attemptID)),
       reload: integration.reload,
       connection: {
         active: (id) => integration.connection.active(Integration.ID.make(id)),
@@ -142,7 +186,7 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: PluginV2.Int
           ),
       },
       transform: (callback) =>
-        integration.transform((draft) =>
+        integration.transform((draft) => {
           callback({
             list: () => mutable(draft.list()),
             get: (id) => mutable(draft.get(Integration.ID.make(id))),
@@ -219,33 +263,36 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: PluginV2.Int
               remove: (id, method) =>
                 draft.method.remove(Integration.ID.make(id), Schema.decodeUnknownSync(Integration.Method)(method)),
             },
-          }),
-        ),
+          })
+        }),
     },
     plugin: {
+      list: () => response(plugin.list()),
       add: (input) => plugin.add(PluginV2.ID.make(input.id), input.effect),
       remove: (id) => plugin.remove(PluginV2.ID.make(id)),
     },
     reference: {
+      list: () => response(reference.list()),
       reload: reference.reload,
       transform: (callback) =>
-        reference.transform((draft) =>
+        reference.transform((draft) => {
           callback({
             add: (name, source) => draft.add(name, Schema.decodeUnknownSync(Reference.Source)(source)),
             remove: draft.remove,
             list: draft.list,
-          }),
-        ),
+          })
+        }),
     },
     skill: {
+      list: () => response(skill.list()),
       reload: skill.reload,
       transform: (callback) =>
-        skill.transform((draft) =>
+        skill.transform((draft) => {
           callback({
             source: (source) => draft.source(Schema.decodeUnknownSync(SkillV2.Source)(source)),
             list: draft.list,
-          }),
-        ),
+          })
+        }),
     },
     tool: {
       register: (input) => tools.register(input),
diff --git a/packages/core/src/plugin/models-dev.ts b/packages/core/src/plugin/models-dev.ts
index 2ab445b248..27c176ed67 100644
--- a/packages/core/src/plugin/models-dev.ts
+++ b/packages/core/src/plugin/models-dev.ts
@@ -201,64 +201,65 @@ export const ModelsDevPlugin = define({
   effect: Effect.fn(function* (ctx) {
     const modelsDev = yield* ModelsDev.Service
     const events = yield* EventV2.Service
-    yield* ctx.integration.transform(
-      Effect.fn(function* (integrations) {
-        const data = yield* modelsDev.get()
-        for (const item of Object.values(data)) {
-          if (item.env.length === 0) continue
-          const integrationID = item.id
-          integrations.update(integrationID, (integration) => (integration.name = item.name))
-          integrations.method.update({
-            integrationID,
-            method: { type: "key" },
-          })
-          integrations.method.update({
-            integrationID,
-            method: { type: "env", names: [...item.env] },
-          })
-        }
-      }),
-    )
-    yield* ctx.catalog.transform(
-      Effect.fn(function* (catalog) {
-        const data = yield* modelsDev.get()
-        for (const item of Object.values(data)) {
-          const providerID = ProviderV2.ID.make(item.id)
-          catalog.provider.update(providerID, (provider) => {
-            provider.name = item.name
-            provider.api = item.npm
-              ? {
-                  type: "aisdk",
-                  package: item.npm,
-                  url: item.api,
-                }
-              : {
-                  type: "native",
-                  url: item.api,
-                  settings: {},
-                }
-          })
+    const loaded = { data: yield* modelsDev.get() }
+    yield* ctx.integration.transform((integrations) => {
+      for (const item of Object.values(loaded.data)) {
+        if (item.env.length === 0) continue
+        const integrationID = item.id
+        integrations.update(integrationID, (integration) => (integration.name = item.name))
+        integrations.method.update({
+          integrationID,
+          method: { type: "key" },
+        })
+        integrations.method.update({
+          integrationID,
+          method: { type: "env", names: [...item.env] },
+        })
+      }
+    })
+    yield* ctx.catalog.transform((catalog) => {
+      for (const item of Object.values(loaded.data)) {
+        const providerID = ProviderV2.ID.make(item.id)
+        catalog.provider.update(providerID, (provider) => {
+          provider.name = item.name
+          provider.api = item.npm
+            ? {
+                type: "aisdk",
+                package: item.npm,
+                url: item.api,
+              }
+            : {
+                type: "native",
+                url: item.api,
+                settings: {},
+              }
+        })
 
-          for (const model of Object.values(item.models)) {
-            const baseCost = cost(model.cost)
-            const variants = reasoningVariants(item, model)
-            catalog.model.update(providerID, model.id, (draft) => applyModel(draft, model, { cost: baseCost, variants }))
-            for (const [mode, options] of Object.entries(model.experimental?.modes ?? {})) {
-              catalog.model.update(providerID, `${model.id}-${mode}`, (draft) =>
-                applyModel(draft, model, {
-                  name: modeName(model, mode),
-                  cost: mergeCost(baseCost, options.cost),
-                  request: options.provider,
-                  variants,
-                }),
-              )
-            }
+        for (const model of Object.values(item.models)) {
+          const baseCost = cost(model.cost)
+          const variants = reasoningVariants(item, model)
+          catalog.model.update(providerID, model.id, (draft) => applyModel(draft, model, { cost: baseCost, variants }))
+          for (const [mode, options] of Object.entries(model.experimental?.modes ?? {})) {
+            catalog.model.update(providerID, `${model.id}-${mode}`, (draft) =>
+              applyModel(draft, model, {
+                name: modeName(model, mode),
+                cost: mergeCost(baseCost, options.cost),
+                request: options.provider,
+                variants,
+              }),
+            )
           }
         }
-      }),
-    )
+      }
+    })
     yield* events.subscribe(ModelsDev.Event.Refreshed).pipe(
-      Stream.runForEach(() => ctx.integration.reload().pipe(Effect.andThen(ctx.catalog.reload()))),
+      Stream.runForEach(() =>
+        modelsDev.get().pipe(
+          Effect.tap((data) => Effect.sync(() => (loaded.data = data))),
+          Effect.andThen(ctx.integration.reload()),
+          Effect.andThen(ctx.catalog.reload()),
+        ),
+      ),
       Effect.forkScoped({ startImmediately: true }),
     )
   }),
diff --git a/packages/core/src/plugin/promise.ts b/packages/core/src/plugin/promise.ts
index d0bf82c2a0..956c530176 100644
--- a/packages/core/src/plugin/promise.ts
+++ b/packages/core/src/plugin/promise.ts
@@ -1,12 +1,11 @@
 export * as PluginPromise from "./promise"
 
 import { define } from "@opencode-ai/plugin/v2/effect"
-import type { Plugin, PluginContext, Registration } from "@opencode-ai/plugin/v2/promise"
+import type { Plugin, PluginContext } from "@opencode-ai/plugin/v2/promise"
 import { Effect, Scope } from "effect"
 
-// The Effect host hands back this registration shape; mirror it structurally so
-// we do not have to alias the Effect package's `Registration` against the Promise one.
 type HostRegistration = { readonly dispose: Effect.Effect<void> }
+type Registration = { readonly dispose: () => Promise<void> }
 
 /**
  * Adapts a Promise plugin into an Effect plugin so the existing Effect-only
@@ -31,20 +30,23 @@ export function fromPromise(plugin: Plugin) {
             dispose: () => Effect.runPromiseWith(context)(registration.dispose),
           }))
 
-        const run = (effect: Effect.Effect<void>) => Effect.runPromiseWith(context)(effect)
+        const run = <A, E>(effect: Effect.Effect<A, E>) => Effect.runPromiseWith(context)(effect)
 
         const transform =
           <Draft>(domain: {
-            transform: (
-              callback: (draft: Draft) => Effect.Effect<void> | void,
-            ) => Effect.Effect<HostRegistration, never, Scope.Scope>
+            transform: (callback: (draft: Draft) => void) => Effect.Effect<HostRegistration, never, Scope.Scope>
           }) =>
-          (callback: (draft: Draft) => Promise<void> | void) =>
-            register(domain.transform((draft) => Effect.promise(() => Promise.resolve(callback(draft)))))
+          (callback: (draft: Draft) => void) =>
+            register(
+              domain.transform((draft) => {
+                callback(draft)
+              }),
+            )
 
         const context2: PluginContext = {
           options: host.options,
           agent: {
+            list: (input) => run(host.agent.list(input)),
             transform: transform(host.agent),
             reload: () => run(host.agent.reload()),
           },
@@ -55,14 +57,30 @@ export function fromPromise(plugin: Plugin) {
               register(host.aisdk.language((event) => Effect.promise(() => Promise.resolve(callback(event))))),
           },
           catalog: {
+            provider: {
+              list: (input) => run(host.catalog.provider.list(input)),
+              get: (input) => run(host.catalog.provider.get(input)),
+            },
+            model: {
+              list: (input) => run(host.catalog.model.list(input)),
+              default: (input) => run(host.catalog.model.default(input)),
+            },
             transform: transform(host.catalog),
             reload: () => run(host.catalog.reload()),
           },
           command: {
+            list: (input) => run(host.command.list(input)),
             transform: transform(host.command),
             reload: () => run(host.command.reload()),
           },
           integration: {
+            list: (input) => run(host.integration.list(input)),
+            get: (input) => run(host.integration.get(input)),
+            connectKey: (input) => run(host.integration.connectKey(input)),
+            connectOauth: (input) => run(host.integration.connectOauth(input)),
+            attemptStatus: (input) => run(host.integration.attemptStatus(input)),
+            attemptComplete: (input) => run(host.integration.attemptComplete(input)),
+            attemptCancel: (input) => run(host.integration.attemptCancel(input)),
             transform: transform(host.integration),
             reload: () => run(host.integration.reload()),
             connection: {
@@ -71,6 +89,7 @@ export function fromPromise(plugin: Plugin) {
             },
           },
           plugin: {
+            list: (input) => run(host.plugin.list(input)),
             add: (input) => {
               const child = fromPromise(input)
               return run(host.plugin.add(child))
@@ -78,13 +97,22 @@ export function fromPromise(plugin: Plugin) {
             remove: (id) => run(host.plugin.remove(id)),
           },
           reference: {
+            list: (input) => run(host.reference.list(input)),
             transform: transform(host.reference),
             reload: () => run(host.reference.reload()),
           },
           skill: {
+            list: (input) => run(host.skill.list(input)),
             transform: transform(host.skill),
             reload: () => run(host.skill.reload()),
           },
+          session: {
+            create: (input) => run(host.session.create(input)),
+            get: (input) => run(host.session.get(input)),
+            prompt: (input) => run(host.session.prompt(input)),
+            command: (input) => run(host.session.command(input)),
+            interrupt: (input) => run(host.session.interrupt(input)),
+          },
         }
 
         yield* Effect.promise(() => Promise.resolve(plugin.setup(context2)))
diff --git a/packages/core/src/plugin/provider/amazon-bedrock.ts b/packages/core/src/plugin/provider/amazon-bedrock.ts
index 0995cf1c17..cbf9defc09 100644
--- a/packages/core/src/plugin/provider/amazon-bedrock.ts
+++ b/packages/core/src/plugin/provider/amazon-bedrock.ts
@@ -62,22 +62,20 @@ function selectMantleModel(sdk: MantleSDK, modelID: string) {
 export const AmazonBedrockPlugin = define({
   id: "amazon-bedrock",
   effect: Effect.fn(function* (ctx) {
-    yield* ctx.catalog.transform(
-      Effect.fn(function* (evt) {
-        for (const item of evt.provider.list()) {
-          if (item.provider.api.type !== "aisdk") continue
-          if (item.provider.api.package !== "@ai-sdk/amazon-bedrock") continue
-          evt.provider.update(item.provider.id, (provider) => {
-            if (provider.api.type !== "aisdk") return
-            if (typeof provider.request.body.endpoint !== "string") return
-            // The AI SDK expects a base URL, but users configure Bedrock private/VPC
-            // endpoints as `endpoint`; move it into the catalog endpoint URL once.
-            provider.api.url = provider.request.body.endpoint
-            delete provider.request.body.endpoint
-          })
-        }
-      }),
-    )
+    yield* ctx.catalog.transform((evt) => {
+      for (const item of evt.provider.list()) {
+        if (item.provider.api.type !== "aisdk") continue
+        if (item.provider.api.package !== "@ai-sdk/amazon-bedrock") continue
+        evt.provider.update(item.provider.id, (provider) => {
+          if (provider.api.type !== "aisdk") return
+          if (typeof provider.request.body.endpoint !== "string") return
+          // The AI SDK expects a base URL, but users configure Bedrock private/VPC
+          // endpoints as `endpoint`; move it into the catalog endpoint URL once.
+          provider.api.url = provider.request.body.endpoint
+          delete provider.request.body.endpoint
+        })
+      }
+    })
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
         if (!["@ai-sdk/amazon-bedrock", "@ai-sdk/amazon-bedrock/mantle"].includes(evt.package)) return
diff --git a/packages/core/src/plugin/provider/anthropic.ts b/packages/core/src/plugin/provider/anthropic.ts
index cf883a0687..efbd50b818 100644
--- a/packages/core/src/plugin/provider/anthropic.ts
+++ b/packages/core/src/plugin/provider/anthropic.ts
@@ -4,18 +4,16 @@ import { define } from "../internal"
 export const AnthropicPlugin = define({
   id: "anthropic",
   effect: Effect.fn(function* (ctx) {
-    yield* ctx.catalog.transform(
-      Effect.fn(function* (evt) {
-        for (const item of evt.provider.list()) {
-          if (item.provider.api.type !== "aisdk") continue
-          if (item.provider.api.package !== "@ai-sdk/anthropic") continue
-          evt.provider.update(item.provider.id, (provider) => {
-            provider.request.headers["anthropic-beta"] =
-              "interleaved-thinking-2025-05-14,fine-grained-tool-streaming-2025-05-14"
-          })
-        }
-      }),
-    )
+    yield* ctx.catalog.transform((evt) => {
+      for (const item of evt.provider.list()) {
+        if (item.provider.api.type !== "aisdk") continue
+        if (item.provider.api.package !== "@ai-sdk/anthropic") continue
+        evt.provider.update(item.provider.id, (provider) => {
+          provider.request.headers["anthropic-beta"] =
+            "interleaved-thinking-2025-05-14,fine-grained-tool-streaming-2025-05-14"
+        })
+      }
+    })
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
         if (evt.package !== "@ai-sdk/anthropic") return
diff --git a/packages/core/src/plugin/provider/azure.ts b/packages/core/src/plugin/provider/azure.ts
index 2e1f9d9b48..2e73e620bf 100644
--- a/packages/core/src/plugin/provider/azure.ts
+++ b/packages/core/src/plugin/provider/azure.ts
@@ -13,21 +13,19 @@ function selectLanguage(sdk: any, modelID: string, useChat: boolean) {
 export const AzurePlugin = define({
   id: "azure",
   effect: Effect.fn(function* (ctx) {
-    yield* ctx.catalog.transform(
-      Effect.fn(function* (evt) {
-        for (const item of evt.provider.list()) {
-          if (item.provider.api.type !== "aisdk") continue
-          if (item.provider.api.package !== "@ai-sdk/azure") continue
-          const configured = item.provider.request.body.resourceName
-          const resourceName =
-            typeof configured === "string" && configured.trim() !== "" ? configured : process.env.AZURE_RESOURCE_NAME
-          if (!resourceName) continue
-          evt.provider.update(item.provider.id, (provider) => {
-            provider.request.body.resourceName = resourceName
-          })
-        }
-      }),
-    )
+    yield* ctx.catalog.transform((evt) => {
+      for (const item of evt.provider.list()) {
+        if (item.provider.api.type !== "aisdk") continue
+        if (item.provider.api.package !== "@ai-sdk/azure") continue
+        const configured = item.provider.request.body.resourceName
+        const resourceName =
+          typeof configured === "string" && configured.trim() !== "" ? configured : process.env.AZURE_RESOURCE_NAME
+        if (!resourceName) continue
+        evt.provider.update(item.provider.id, (provider) => {
+          provider.request.body.resourceName = resourceName
+        })
+      }
+    })
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
         if (evt.package !== "@ai-sdk/azure") return
@@ -58,20 +56,18 @@ export const AzurePlugin = define({
 export const AzureCognitiveServicesPlugin = define({
   id: "azure-cognitive-services",
   effect: Effect.fn(function* (ctx) {
-    yield* ctx.catalog.transform(
-      Effect.fn(function* (evt) {
-        const resourceName = process.env.AZURE_COGNITIVE_SERVICES_RESOURCE_NAME
-        if (!resourceName) return
-        for (const item of evt.provider.list()) {
-          if (item.provider.api.type !== "aisdk") continue
-          if (item.provider.api.package !== "@ai-sdk/openai-compatible") continue
-          if (!item.provider.id.includes("azure-cognitive-services")) continue
-          evt.provider.update(item.provider.id, (provider) => {
-            provider.request.body.baseURL = `https://${resourceName}.cognitiveservices.azure.com/openai`
-          })
-        }
-      }),
-    )
+    yield* ctx.catalog.transform((evt) => {
+      const resourceName = process.env.AZURE_COGNITIVE_SERVICES_RESOURCE_NAME
+      if (!resourceName) return
+      for (const item of evt.provider.list()) {
+        if (item.provider.api.type !== "aisdk") continue
+        if (item.provider.api.package !== "@ai-sdk/openai-compatible") continue
+        if (!item.provider.id.includes("azure-cognitive-services")) continue
+        evt.provider.update(item.provider.id, (provider) => {
+          provider.request.body.baseURL = `https://${resourceName}.cognitiveservices.azure.com/openai`
+        })
+      }
+    })
     yield* ctx.aisdk.language(
       Effect.fn(function* (evt) {
         if (evt.model.providerID !== ProviderV2.ID.make("azure-cognitive-services")) return
diff --git a/packages/core/src/plugin/provider/cerebras.ts b/packages/core/src/plugin/provider/cerebras.ts
index 0fd651160f..57029cfba7 100644
--- a/packages/core/src/plugin/provider/cerebras.ts
+++ b/packages/core/src/plugin/provider/cerebras.ts
@@ -4,17 +4,15 @@ import { define } from "../internal"
 export const CerebrasPlugin = define({
   id: "cerebras",
   effect: Effect.fn(function* (ctx) {
-    yield* ctx.catalog.transform(
-      Effect.fn(function* (evt) {
-        for (const item of evt.provider.list()) {
-          if (item.provider.api.type !== "aisdk") continue
-          if (item.provider.api.package !== "@ai-sdk/cerebras") continue
-          evt.provider.update(item.provider.id, (provider) => {
-            provider.request.headers["X-Cerebras-3rd-Party-Integration"] = "opencode"
-          })
-        }
-      }),
-    )
+    yield* ctx.catalog.transform((evt) => {
+      for (const item of evt.provider.list()) {
+        if (item.provider.api.type !== "aisdk") continue
+        if (item.provider.api.package !== "@ai-sdk/cerebras") continue
+        evt.provider.update(item.provider.id, (provider) => {
+          provider.request.headers["X-Cerebras-3rd-Party-Integration"] = "opencode"
+        })
+      }
+    })
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
         if (evt.package !== "@ai-sdk/cerebras") return
diff --git a/packages/core/src/plugin/provider/cloudflare-workers-ai.ts b/packages/core/src/plugin/provider/cloudflare-workers-ai.ts
index 1a1c533eb5..762ceb4d96 100644
--- a/packages/core/src/plugin/provider/cloudflare-workers-ai.ts
+++ b/packages/core/src/plugin/provider/cloudflare-workers-ai.ts
@@ -9,18 +9,16 @@ const providerID = ProviderV2.ID.make("cloudflare-workers-ai")
 export const CloudflareWorkersAIPlugin = define({
   id: "cloudflare-workers-ai",
   effect: Effect.fn(function* (ctx) {
-    yield* ctx.catalog.transform(
-      Effect.fn(function* (evt) {
-        const item = evt.provider.get(providerID)
-        if (!item) return
-        evt.provider.update(item.provider.id, (provider) => {
-          if (provider.api.type !== "aisdk") return
-          if (provider.api.url) return
-          const accountId = resolveAccountId(provider.request.body)
-          if (accountId) provider.api.url = workersEndpoint(accountId)
-        })
-      }),
-    )
+    yield* ctx.catalog.transform((evt) => {
+      const item = evt.provider.get(providerID)
+      if (!item) return
+      evt.provider.update(item.provider.id, (provider) => {
+        if (provider.api.type !== "aisdk") return
+        if (provider.api.url) return
+        const accountId = resolveAccountId(provider.request.body)
+        if (accountId) provider.api.url = workersEndpoint(accountId)
+      })
+    })
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
         if (evt.model.providerID !== providerID) return
diff --git a/packages/core/src/plugin/provider/github-copilot.ts b/packages/core/src/plugin/provider/github-copilot.ts
index 682579d7a9..d116058493 100644
--- a/packages/core/src/plugin/provider/github-copilot.ts
+++ b/packages/core/src/plugin/provider/github-copilot.ts
@@ -14,17 +14,15 @@ function shouldUseResponses(modelID: string) {
 export const GithubCopilotPlugin = define({
   id: "github-copilot",
   effect: Effect.fn(function* (ctx) {
-    yield* ctx.catalog.transform(
-      Effect.fn(function* (evt) {
-        const item = evt.provider.get(ProviderV2.ID.githubCopilot)
-        if (!item || !item.models.has(ModelV2.ID.make("gpt-5-chat-latest"))) return
-        evt.model.update(item.provider.id, ModelV2.ID.make("gpt-5-chat-latest"), (model) => {
-          // This chat-only alias conflicts with the Copilot GPT-5 Responses route,
-          // so hide it only for Copilot rather than for every provider catalog.
-          model.enabled = false
-        })
-      }),
-    )
+    yield* ctx.catalog.transform((evt) => {
+      const item = evt.provider.get(ProviderV2.ID.githubCopilot)
+      if (!item || !item.models.has(ModelV2.ID.make("gpt-5-chat-latest"))) return
+      evt.model.update(item.provider.id, ModelV2.ID.make("gpt-5-chat-latest"), (model) => {
+        // This chat-only alias conflicts with the Copilot GPT-5 Responses route,
+        // so hide it only for Copilot rather than for every provider catalog.
+        model.enabled = false
+      })
+    })
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
         if (evt.package !== "@ai-sdk/github-copilot") return
diff --git a/packages/core/src/plugin/provider/google-vertex.ts b/packages/core/src/plugin/provider/google-vertex.ts
index 4e643c9f51..b87fe61a32 100644
--- a/packages/core/src/plugin/provider/google-vertex.ts
+++ b/packages/core/src/plugin/provider/google-vertex.ts
@@ -57,33 +57,31 @@ function authFetch(fetchWithRuntimeOptions?: unknown) {
 export const GoogleVertexPlugin = define({
   id: "google-vertex",
   effect: Effect.fn(function* (ctx) {
-    yield* ctx.catalog.transform(
-      Effect.fn(function* (evt) {
-        for (const item of evt.provider.list()) {
-          if (item.provider.api.type !== "aisdk") continue
-          if (
-            item.provider.api.package !== "@ai-sdk/google-vertex" &&
-            !(
-              item.provider.id === ProviderV2.ID.googleVertex &&
-              item.provider.api.package.includes("@ai-sdk/openai-compatible")
-            )
+    yield* ctx.catalog.transform((evt) => {
+      for (const item of evt.provider.list()) {
+        if (item.provider.api.type !== "aisdk") continue
+        if (
+          item.provider.api.package !== "@ai-sdk/google-vertex" &&
+          !(
+            item.provider.id === ProviderV2.ID.googleVertex &&
+            item.provider.api.package.includes("@ai-sdk/openai-compatible")
           )
-            continue
-          const project = resolveProject(item.provider.request.body)
-          const location = String(resolveLocation(item.provider.request.body))
-          evt.provider.update(item.provider.id, (provider) => {
-            if (project) provider.request.body.project = project
-            provider.request.body.location = location
-            if (provider.api.type === "aisdk" && provider.api.url) {
-              provider.api.url = replaceVertexVars(provider.api.url, project, location)
-            }
-            if (provider.api.type === "aisdk" && provider.api.package.includes("@ai-sdk/openai-compatible")) {
-              provider.request.body.fetch = authFetch(provider.request.body.fetch)
-            }
-          })
-        }
-      }),
-    )
+        )
+          continue
+        const project = resolveProject(item.provider.request.body)
+        const location = String(resolveLocation(item.provider.request.body))
+        evt.provider.update(item.provider.id, (provider) => {
+          if (project) provider.request.body.project = project
+          provider.request.body.location = location
+          if (provider.api.type === "aisdk" && provider.api.url) {
+            provider.api.url = replaceVertexVars(provider.api.url, project, location)
+          }
+          if (provider.api.type === "aisdk" && provider.api.package.includes("@ai-sdk/openai-compatible")) {
+            provider.request.body.fetch = authFetch(provider.request.body.fetch)
+          }
+        })
+      }
+    })
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
         if (evt.model.providerID === ProviderV2.ID.googleVertex && evt.package.includes("@ai-sdk/openai-compatible")) {
@@ -115,28 +113,26 @@ export const GoogleVertexPlugin = define({
 export const GoogleVertexAnthropicPlugin = define({
   id: "google-vertex-anthropic",
   effect: Effect.fn(function* (ctx) {
-    yield* ctx.catalog.transform(
-      Effect.fn(function* (evt) {
-        for (const item of evt.provider.list()) {
-          if (item.provider.api.type !== "aisdk") continue
-          if (item.provider.api.package !== "@ai-sdk/google-vertex/anthropic") continue
-          const project =
-            item.provider.request.body.project ??
-            process.env.GOOGLE_CLOUD_PROJECT ??
-            process.env.GCP_PROJECT ??
-            process.env.GCLOUD_PROJECT
-          const location =
-            item.provider.request.body.location ??
-            process.env.GOOGLE_CLOUD_LOCATION ??
-            process.env.VERTEX_LOCATION ??
-            "global"
-          evt.provider.update(item.provider.id, (provider) => {
-            if (project) provider.request.body.project = project
-            provider.request.body.location = location
-          })
-        }
-      }),
-    )
+    yield* ctx.catalog.transform((evt) => {
+      for (const item of evt.provider.list()) {
+        if (item.provider.api.type !== "aisdk") continue
+        if (item.provider.api.package !== "@ai-sdk/google-vertex/anthropic") continue
+        const project =
+          item.provider.request.body.project ??
+          process.env.GOOGLE_CLOUD_PROJECT ??
+          process.env.GCP_PROJECT ??
+          process.env.GCLOUD_PROJECT
+        const location =
+          item.provider.request.body.location ??
+          process.env.GOOGLE_CLOUD_LOCATION ??
+          process.env.VERTEX_LOCATION ??
+          "global"
+        evt.provider.update(item.provider.id, (provider) => {
+          if (project) provider.request.body.project = project
+          provider.request.body.location = location
+        })
+      }
+    })
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
         if (evt.package !== "@ai-sdk/google-vertex/anthropic") return
diff --git a/packages/core/src/plugin/provider/kilo.ts b/packages/core/src/plugin/provider/kilo.ts
index 6ee6670ee5..5d4c0d65d8 100644
--- a/packages/core/src/plugin/provider/kilo.ts
+++ b/packages/core/src/plugin/provider/kilo.ts
@@ -4,18 +4,16 @@ import { define } from "../internal"
 export const KiloPlugin = define({
   id: "kilo",
   effect: Effect.fn(function* (ctx) {
-    yield* ctx.catalog.transform(
-      Effect.fn(function* (evt) {
-        for (const item of evt.provider.list()) {
-          if (item.provider.api.type !== "aisdk") continue
-          if (item.provider.api.package !== "@ai-sdk/openai-compatible") continue
-          if (item.provider.api.url !== "https://api.kilo.ai/api/gateway") continue
-          evt.provider.update(item.provider.id, (provider) => {
-            provider.request.headers["HTTP-Referer"] = "https://opencode.ai/"
-            provider.request.headers["X-Title"] = "opencode"
-          })
-        }
-      }),
-    )
+    yield* ctx.catalog.transform((evt) => {
+      for (const item of evt.provider.list()) {
+        if (item.provider.api.type !== "aisdk") continue
+        if (item.provider.api.package !== "@ai-sdk/openai-compatible") continue
+        if (item.provider.api.url !== "https://api.kilo.ai/api/gateway") continue
+        evt.provider.update(item.provider.id, (provider) => {
+          provider.request.headers["HTTP-Referer"] = "https://opencode.ai/"
+          provider.request.headers["X-Title"] = "opencode"
+        })
+      }
+    })
   }),
 })
diff --git a/packages/core/src/plugin/provider/llmgateway.ts b/packages/core/src/plugin/provider/llmgateway.ts
index eafc5edd6c..005880c6f3 100644
--- a/packages/core/src/plugin/provider/llmgateway.ts
+++ b/packages/core/src/plugin/provider/llmgateway.ts
@@ -6,21 +6,20 @@ export const LLMGatewayPlugin = define({
   id: "llmgateway",
   effect: Effect.fn(function* (ctx) {
     const integrations = yield* Integration.Service
-    yield* ctx.catalog.transform(
-      Effect.fn(function* (evt) {
-        for (const item of evt.provider.list()) {
-          if (item.provider.disabled) continue
-          if (item.provider.api.type !== "aisdk") continue
-          if (item.provider.api.package !== "@ai-sdk/openai-compatible") continue
-          if (item.provider.api.url !== "https://api.llmgateway.io/v1") continue
-          if (!(yield* integrations.get(Integration.ID.make(item.provider.id)))) continue
-          evt.provider.update(item.provider.id, (provider) => {
-            provider.request.headers["HTTP-Referer"] = "https://opencode.ai/"
-            provider.request.headers["X-Title"] = "opencode"
-            provider.request.headers["X-Source"] = "opencode"
-          })
-        }
-      }),
-    )
+    const configured = new Set((yield* integrations.list()).map((integration) => integration.id))
+    yield* ctx.catalog.transform((evt) => {
+      for (const item of evt.provider.list()) {
+        if (item.provider.disabled) continue
+        if (item.provider.api.type !== "aisdk") continue
+        if (item.provider.api.package !== "@ai-sdk/openai-compatible") continue
+        if (item.provider.api.url !== "https://api.llmgateway.io/v1") continue
+        if (!configured.has(Integration.ID.make(item.provider.id))) continue
+        evt.provider.update(item.provider.id, (provider) => {
+          provider.request.headers["HTTP-Referer"] = "https://opencode.ai/"
+          provider.request.headers["X-Title"] = "opencode"
+          provider.request.headers["X-Source"] = "opencode"
+        })
+      }
+    })
   }),
 })
diff --git a/packages/core/src/plugin/provider/nvidia.ts b/packages/core/src/plugin/provider/nvidia.ts
index 449599727c..b1b9c9b117 100644
--- a/packages/core/src/plugin/provider/nvidia.ts
+++ b/packages/core/src/plugin/provider/nvidia.ts
@@ -4,19 +4,17 @@ import { define } from "../internal"
 export const NvidiaPlugin = define({
   id: "nvidia",
   effect: Effect.fn(function* (ctx) {
-    yield* ctx.catalog.transform(
-      Effect.fn(function* (evt) {
-        for (const item of evt.provider.list()) {
-          if (item.provider.api.type !== "aisdk") continue
-          if (item.provider.api.package !== "@ai-sdk/openai-compatible") continue
-          if (item.provider.api.url !== "https://integrate.api.nvidia.com/v1") continue
-          evt.provider.update(item.provider.id, (provider) => {
-            provider.request.headers["HTTP-Referer"] = "https://opencode.ai/"
-            provider.request.headers["X-Title"] = "opencode"
-            provider.request.headers["X-BILLING-INVOKE-ORIGIN"] ??= "OpenCode"
-          })
-        }
-      }),
-    )
+    yield* ctx.catalog.transform((evt) => {
+      for (const item of evt.provider.list()) {
+        if (item.provider.api.type !== "aisdk") continue
+        if (item.provider.api.package !== "@ai-sdk/openai-compatible") continue
+        if (item.provider.api.url !== "https://integrate.api.nvidia.com/v1") continue
+        evt.provider.update(item.provider.id, (provider) => {
+          provider.request.headers["HTTP-Referer"] = "https://opencode.ai/"
+          provider.request.headers["X-Title"] = "opencode"
+          provider.request.headers["X-BILLING-INVOKE-ORIGIN"] ??= "OpenCode"
+        })
+      }
+    })
   }),
 })
diff --git a/packages/core/src/plugin/provider/openai.ts b/packages/core/src/plugin/provider/openai.ts
index e8974195a6..990a82554e 100644
--- a/packages/core/src/plugin/provider/openai.ts
+++ b/packages/core/src/plugin/provider/openai.ts
@@ -177,34 +177,32 @@ export const OpenAIPlugin = define({
       draft.method.update(browser)
       draft.method.update(headless)
     })
-    yield* ctx.catalog.transform(
-      Effect.fn(function* (evt) {
-        for (const item of evt.provider.list()) {
-          if (item.provider.api.type !== "aisdk") continue
-          if (item.provider.api.package !== "@ai-sdk/openai") continue
-          if (!item.models.has(ModelV2.ID.make("gpt-5-chat-latest"))) continue
-          evt.model.update(item.provider.id, ModelV2.ID.make("gpt-5-chat-latest"), (model) => {
-            // OpenAIPlugin sends OpenAI models through Responses; this alias is a
-            // chat-completions-only model, so hide it only from OpenAI's catalog.
-            model.enabled = false
-          })
-        }
-        if (!chatgpt) return
-        const item = evt.provider.get(ProviderV2.ID.openai)
-        if (!item) return
-        for (const model of item.models.values()) {
-          // ChatGPT-plan tokens only authorize codex-eligible models, and the
-          // subscription covers usage, so hide the rest and zero the cost.
-          evt.model.update(item.provider.id, model.id, (draft) => {
-            if (!OpenAICodex.eligible(draft.api.id)) {
-              draft.enabled = false
-              return
-            }
-            draft.cost = []
-          })
-        }
-      }),
-    )
+    yield* ctx.catalog.transform((evt) => {
+      for (const item of evt.provider.list()) {
+        if (item.provider.api.type !== "aisdk") continue
+        if (item.provider.api.package !== "@ai-sdk/openai") continue
+        if (!item.models.has(ModelV2.ID.make("gpt-5-chat-latest"))) continue
+        evt.model.update(item.provider.id, ModelV2.ID.make("gpt-5-chat-latest"), (model) => {
+          // OpenAIPlugin sends OpenAI models through Responses; this alias is a
+          // chat-completions-only model, so hide it only from OpenAI's catalog.
+          model.enabled = false
+        })
+      }
+      if (!chatgpt) return
+      const item = evt.provider.get(ProviderV2.ID.openai)
+      if (!item) return
+      for (const model of item.models.values()) {
+        // ChatGPT-plan tokens only authorize codex-eligible models, and the
+        // subscription covers usage, so hide the rest and zero the cost.
+        evt.model.update(item.provider.id, model.id, (draft) => {
+          if (!OpenAICodex.eligible(draft.api.id)) {
+            draft.enabled = false
+            return
+          }
+          draft.cost = []
+        })
+      }
+    })
 
     const refresh = () => loading.withPermit(load().pipe(Effect.andThen(ctx.catalog.reload())))
     yield* events.subscribe(Integration.Event.ConnectionUpdated).pipe(
diff --git a/packages/core/src/plugin/provider/openrouter.ts b/packages/core/src/plugin/provider/openrouter.ts
index 0f295fb095..458ea1cd9b 100644
--- a/packages/core/src/plugin/provider/openrouter.ts
+++ b/packages/core/src/plugin/provider/openrouter.ts
@@ -5,26 +5,24 @@ import { define } from "../internal"
 export const OpenRouterPlugin = define({
   id: "openrouter",
   effect: Effect.fn(function* (ctx) {
-    yield* ctx.catalog.transform(
-      Effect.fn(function* (evt) {
-        for (const item of evt.provider.list()) {
-          if (item.provider.api.type !== "aisdk") continue
-          if (item.provider.api.package !== "@openrouter/ai-sdk-provider") continue
-          evt.provider.update(item.provider.id, (provider) => {
-            provider.request.headers["HTTP-Referer"] = "https://opencode.ai/"
-            provider.request.headers["X-Title"] = "opencode"
+    yield* ctx.catalog.transform((evt) => {
+      for (const item of evt.provider.list()) {
+        if (item.provider.api.type !== "aisdk") continue
+        if (item.provider.api.package !== "@openrouter/ai-sdk-provider") continue
+        evt.provider.update(item.provider.id, (provider) => {
+          provider.request.headers["HTTP-Referer"] = "https://opencode.ai/"
+          provider.request.headers["X-Title"] = "opencode"
+        })
+        for (const modelID of [ModelV2.ID.make("gpt-5-chat-latest"), ModelV2.ID.make("openai/gpt-5-chat")]) {
+          if (!item.models.has(modelID)) continue
+          evt.model.update(item.provider.id, modelID, (model) => {
+            // These are OpenRouter-specific OpenAI chat aliases that do not work
+            // on the generic path. Keep custom providers with matching IDs untouched.
+            model.enabled = false
           })
-          for (const modelID of [ModelV2.ID.make("gpt-5-chat-latest"), ModelV2.ID.make("openai/gpt-5-chat")]) {
-            if (!item.models.has(modelID)) continue
-            evt.model.update(item.provider.id, modelID, (model) => {
-              // These are OpenRouter-specific OpenAI chat aliases that do not work
-              // on the generic path. Keep custom providers with matching IDs untouched.
-              model.enabled = false
-            })
-          }
         }
-      }),
-    )
+      }
+    })
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
         if (evt.package !== "@openrouter/ai-sdk-provider") return
diff --git a/packages/core/src/plugin/provider/vercel.ts b/packages/core/src/plugin/provider/vercel.ts
index 00f5601430..8ff4d14098 100644
--- a/packages/core/src/plugin/provider/vercel.ts
+++ b/packages/core/src/plugin/provider/vercel.ts
@@ -4,18 +4,16 @@ import { define } from "../internal"
 export const VercelPlugin = define({
   id: "vercel",
   effect: Effect.fn(function* (ctx) {
-    yield* ctx.catalog.transform(
-      Effect.fn(function* (evt) {
-        for (const item of evt.provider.list()) {
-          if (item.provider.api.type !== "aisdk") continue
-          if (item.provider.api.package !== "@ai-sdk/vercel") continue
-          evt.provider.update(item.provider.id, (provider) => {
-            provider.request.headers["http-referer"] = "https://opencode.ai/"
-            provider.request.headers["x-title"] = "opencode"
-          })
-        }
-      }),
-    )
+    yield* ctx.catalog.transform((evt) => {
+      for (const item of evt.provider.list()) {
+        if (item.provider.api.type !== "aisdk") continue
+        if (item.provider.api.package !== "@ai-sdk/vercel") continue
+        evt.provider.update(item.provider.id, (provider) => {
+          provider.request.headers["http-referer"] = "https://opencode.ai/"
+          provider.request.headers["x-title"] = "opencode"
+        })
+      }
+    })
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
         if (evt.package !== "@ai-sdk/vercel") return
diff --git a/packages/core/src/plugin/provider/zenmux.ts b/packages/core/src/plugin/provider/zenmux.ts
index 29adebc0ee..4562d6bd2e 100644
--- a/packages/core/src/plugin/provider/zenmux.ts
+++ b/packages/core/src/plugin/provider/zenmux.ts
@@ -4,18 +4,16 @@ import { define } from "../internal"
 export const ZenmuxPlugin = define({
   id: "zenmux",
   effect: Effect.fn(function* (ctx) {
-    yield* ctx.catalog.transform(
-      Effect.fn(function* (evt) {
-        for (const item of evt.provider.list()) {
-          if (item.provider.api.type !== "aisdk") continue
-          if (item.provider.api.package !== "@ai-sdk/openai-compatible") continue
-          if (item.provider.api.url !== "https://zenmux.ai/api/v1") continue
-          evt.provider.update(item.provider.id, (provider) => {
-            provider.request.headers["HTTP-Referer"] ??= "https://opencode.ai/"
-            provider.request.headers["X-Title"] ??= "opencode"
-          })
-        }
-      }),
-    )
+    yield* ctx.catalog.transform((evt) => {
+      for (const item of evt.provider.list()) {
+        if (item.provider.api.type !== "aisdk") continue
+        if (item.provider.api.package !== "@ai-sdk/openai-compatible") continue
+        if (item.provider.api.url !== "https://zenmux.ai/api/v1") continue
+        evt.provider.update(item.provider.id, (provider) => {
+          provider.request.headers["HTTP-Referer"] ??= "https://opencode.ai/"
+          provider.request.headers["X-Title"] ??= "opencode"
+        })
+      }
+    })
   }),
 })
diff --git a/packages/core/test/config/command.test.ts b/packages/core/test/config/command.test.ts
index 362a8e5da5..6c7f2ecc02 100644
--- a/packages/core/test/config/command.test.ts
+++ b/packages/core/test/config/command.test.ts
@@ -53,7 +53,15 @@ Review files`,
           })
 
           const command = yield* CommandV2.Service
-          yield* ConfigCommandPlugin.Plugin.effect(host({ command: { ...command, reload: command.reload } })).pipe(
+          yield* ConfigCommandPlugin.Plugin.effect(
+            host({
+              command: {
+                list: () => Effect.die("unused command.list"),
+                transform: command.transform,
+                reload: command.reload,
+              },
+            }),
+          ).pipe(
             Effect.provideService(
               Config.Service,
               Config.Service.of({
diff --git a/packages/core/test/config/skill.test.ts b/packages/core/test/config/skill.test.ts
index 0dc5e3b4d7..28ae7956dc 100644
--- a/packages/core/test/config/skill.test.ts
+++ b/packages/core/test/config/skill.test.ts
@@ -36,7 +36,7 @@ describe("ConfigSkillPlugin.Plugin", () => {
 
       yield* ConfigSkillPlugin.Plugin.effect(
         host({
-          skill: { transform, reload: () => Effect.void },
+          skill: { list: () => Effect.die("unused skill.list"), transform, reload: () => Effect.void },
         }),
       ).pipe(
         Effect.provideService(Global.Service, Global.Service.of({ ...Global.make(), home: "/home/test" })),
diff --git a/packages/core/test/plugin/command.test.ts b/packages/core/test/plugin/command.test.ts
index be84975f64..65848dbd72 100644
--- a/packages/core/test/plugin/command.test.ts
+++ b/packages/core/test/plugin/command.test.ts
@@ -23,7 +23,11 @@ describe("CommandPlugin.Plugin", () => {
       const command = yield* CommandV2.Service
       yield* CommandPlugin.Plugin.effect(
         host({
-          command: { transform: command.transform, reload: command.reload },
+          command: {
+            list: () => Effect.die("unused command.list"),
+            transform: command.transform,
+            reload: command.reload,
+          },
         }),
       ).pipe(
         Effect.provideService(
diff --git a/packages/core/test/plugin/host.ts b/packages/core/test/plugin/host.ts
index b9fc03b9c9..c5f168f265 100644
--- a/packages/core/test/plugin/host.ts
+++ b/packages/core/test/plugin/host.ts
@@ -23,14 +23,30 @@ export function host(overrides: Overrides = {}): PluginContext {
       language: () => Effect.die("unused aisdk.language"),
     },
     catalog: overrides.catalog ?? {
+      provider: {
+        list: () => Effect.die("unused catalog.provider.list"),
+        get: () => Effect.die("unused catalog.provider.get"),
+      },
+      model: {
+        list: () => Effect.die("unused catalog.model.list"),
+        default: () => Effect.die("unused catalog.model.default"),
+      },
       transform: () => Effect.die("unused catalog.transform"),
       reload: () => Effect.die("unused catalog.reload"),
     },
     command: overrides.command ?? {
+      list: () => Effect.die("unused command.list"),
       transform: () => Effect.die("unused command.transform"),
       reload: () => Effect.die("unused command.reload"),
     },
     integration: overrides.integration ?? {
+      list: () => Effect.die("unused integration.list"),
+      get: () => Effect.die("unused integration.get"),
+      connectKey: () => Effect.die("unused integration.connectKey"),
+      connectOauth: () => Effect.die("unused integration.connectOauth"),
+      attemptStatus: () => Effect.die("unused integration.attemptStatus"),
+      attemptComplete: () => Effect.die("unused integration.attemptComplete"),
+      attemptCancel: () => Effect.die("unused integration.attemptCancel"),
       transform: () => Effect.die("unused integration.transform"),
       reload: () => Effect.die("unused integration.reload"),
       connection: {
@@ -39,14 +55,17 @@ export function host(overrides: Overrides = {}): PluginContext {
       },
     },
     plugin: overrides.plugin ?? {
+      list: () => Effect.die("unused plugin.list"),
       add: () => Effect.die("unused plugin.add"),
       remove: () => Effect.die("unused plugin.remove"),
     },
     reference: overrides.reference ?? {
+      list: () => Effect.die("unused reference.list"),
       transform: () => Effect.die("unused reference.transform"),
       reload: () => Effect.die("unused reference.reload"),
     },
     skill: overrides.skill ?? {
+      list: () => Effect.die("unused skill.list"),
       transform: () => Effect.die("unused skill.transform"),
       reload: () => Effect.die("unused skill.reload"),
     },
@@ -94,6 +113,14 @@ export function agentHost(agent: AgentV2.Interface): PluginContext["agent"] {
 
 export function catalogHost(catalog: Catalog.Interface): PluginContext["catalog"] {
   return {
+    provider: {
+      list: () => Effect.die("unused catalog.provider.list"),
+      get: () => Effect.die("unused catalog.provider.get"),
+    },
+    model: {
+      list: () => Effect.die("unused catalog.model.list"),
+      default: () => Effect.die("unused catalog.model.default"),
+    },
     reload: catalog.reload,
     transform: (callback) =>
       catalog.transform((draft) =>
@@ -158,6 +185,13 @@ export function catalogHost(catalog: Catalog.Interface): PluginContext["catalog"
 
 export function integrationHost(integration: Integration.Interface): PluginContext["integration"] {
   return {
+    list: () => Effect.die("unused integration.list"),
+    get: () => Effect.die("unused integration.get"),
+    connectKey: () => Effect.die("unused integration.connectKey"),
+    connectOauth: () => Effect.die("unused integration.connectOauth"),
+    attemptStatus: () => Effect.die("unused integration.attemptStatus"),
+    attemptComplete: () => Effect.die("unused integration.attemptComplete"),
+    attemptCancel: () => Effect.die("unused integration.attemptCancel"),
     reload: integration.reload,
     connection: {
       active: (id) => integration.connection.active(Integration.ID.make(id)),
diff --git a/packages/core/test/plugin/promise.test.ts b/packages/core/test/plugin/promise.test.ts
index 41a6641946..fbe4029c3a 100644
--- a/packages/core/test/plugin/promise.test.ts
+++ b/packages/core/test/plugin/promise.test.ts
@@ -11,6 +11,35 @@ import { PluginTestLayer } from "./fixture"
 const it = testEffect(PluginTestLayer)
 
 describe("fromPromise", () => {
+  it.effect("forwards standard client reads", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const host = yield* PluginHost.make(plugin)
+      const seen: string[] = []
+      const promisePlugin = define({
+        id: "promise-client-reads",
+        setup: async (ctx) => {
+          const results = await Promise.all([
+            ctx.agent.list(),
+            ctx.catalog.provider.list(),
+            ctx.catalog.model.list(),
+            ctx.command.list(),
+            ctx.integration.list(),
+            ctx.plugin.list(),
+            ctx.reference.list(),
+            ctx.skill.list(),
+          ])
+          seen.push(...results.map((result) => result.location.directory))
+        },
+      })
+
+      yield* PluginPromise.fromPromise(promisePlugin).effect(host)
+
+      expect(seen).toHaveLength(8)
+      expect(new Set(seen).size).toBe(1)
+    }),
+  )
+
   it.effect("loads a promise plugin and registers a transform hook", () =>
     Effect.gen(function* () {
       const agents = yield* AgentV2.Service
diff --git a/packages/core/test/plugin/skill.test.ts b/packages/core/test/plugin/skill.test.ts
index 1bc49f3716..1a2ba5009d 100644
--- a/packages/core/test/plugin/skill.test.ts
+++ b/packages/core/test/plugin/skill.test.ts
@@ -19,7 +19,15 @@ describe("SkillPlugin.Plugin", () => {
   it.effect("registers built-in skills", () =>
     Effect.gen(function* () {
       const skill = yield* SkillV2.Service
-      yield* SkillPlugin.Plugin.effect(host({ skill: { ...skill, reload: skill.reload } })).pipe(
+      yield* SkillPlugin.Plugin.effect(
+        host({
+          skill: {
+            list: () => Effect.die("unused skill.list"),
+            transform: skill.transform,
+            reload: skill.reload,
+          },
+        }),
+      ).pipe(
         Effect.provideService(Config.Service, Config.Service.of({ entries: () => Effect.succeed([]) })),
         Effect.provideService(
           Location.Service,
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index e5f9c43dfc..d97f655253 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -23,6 +23,7 @@
   ],
   "dependencies": {
     "@ai-sdk/provider": "3.0.8",
+    "@opencode-ai/client": "workspace:*",
     "@opencode-ai/llm": "workspace:*",
     "@opencode-ai/protocol": "workspace:*",
     "@opencode-ai/schema": "workspace:*",
diff --git a/packages/plugin/src/v2/effect/agent.ts b/packages/plugin/src/v2/effect/agent.ts
index 3c9e6d4210..ce56cbe777 100644
--- a/packages/plugin/src/v2/effect/agent.ts
+++ b/packages/plugin/src/v2/effect/agent.ts
@@ -1,6 +1,7 @@
 import type { AgentV2Info } from "@opencode-ai/sdk/v2/types"
-import type { AgentApi } from "./generated/api.js"
-import type { Hooks } from "./registration.js"
+import type { AgentApi } from "@opencode-ai/client/effect/api"
+import type { Effect } from "effect"
+import type { TransformHook } from "./registration.js"
 
 export interface AgentDraft {
   list(): readonly AgentV2Info[]
@@ -10,9 +11,7 @@ export interface AgentDraft {
   remove(id: string): void
 }
 
-export type AgentHooks = Hooks<{
-  transform: AgentDraft
-}>
-
-export type AgentPluginApi = AgentHooks
-export type AgentDomain = AgentApi & AgentPluginApi
+export interface AgentHooks extends AgentApi<unknown> {
+  readonly transform: TransformHook<AgentDraft>
+  readonly reload: () => Effect.Effect<void>
+}
diff --git a/packages/plugin/src/v2/effect/catalog.ts b/packages/plugin/src/v2/effect/catalog.ts
index 704ef16bf6..4cc5e55227 100644
--- a/packages/plugin/src/v2/effect/catalog.ts
+++ b/packages/plugin/src/v2/effect/catalog.ts
@@ -1,5 +1,7 @@
 import type { ModelV2Info, ProviderV2Info } from "@opencode-ai/sdk/v2/types"
-import type { Hooks } from "./registration.js"
+import type { CatalogApi } from "@opencode-ai/client/effect/api"
+import type { Effect } from "effect"
+import type { TransformHook } from "./registration.js"
 
 export interface CatalogProviderRecord {
   readonly provider: ProviderV2Info
@@ -24,6 +26,7 @@ export interface CatalogDraft {
   }
 }
 
-export type CatalogHooks = Hooks<{
-  transform: CatalogDraft
-}>
+export interface CatalogHooks extends CatalogApi<unknown> {
+  readonly transform: TransformHook<CatalogDraft>
+  readonly reload: () => Effect.Effect<void>
+}
diff --git a/packages/plugin/src/v2/effect/command.ts b/packages/plugin/src/v2/effect/command.ts
index 0afd4bafe0..2faaa91fa9 100644
--- a/packages/plugin/src/v2/effect/command.ts
+++ b/packages/plugin/src/v2/effect/command.ts
@@ -1,5 +1,7 @@
 import type { CommandV2Info } from "@opencode-ai/sdk/v2/types"
-import type { Hooks } from "./registration.js"
+import type { CommandApi } from "@opencode-ai/client/effect/api"
+import type { Effect } from "effect"
+import type { TransformHook } from "./registration.js"
 
 export interface CommandDraft {
   list(): readonly CommandV2Info[]
@@ -8,6 +10,7 @@ export interface CommandDraft {
   remove(name: string): void
 }
 
-export type CommandHooks = Hooks<{
-  transform: CommandDraft
-}>
+export interface CommandHooks extends CommandApi<unknown> {
+  readonly transform: TransformHook<CommandDraft>
+  readonly reload: () => Effect.Effect<void>
+}
diff --git a/packages/plugin/src/v2/effect/context.ts b/packages/plugin/src/v2/effect/context.ts
index 3f77fcd48d..db2f4c0ee6 100644
--- a/packages/plugin/src/v2/effect/context.ts
+++ b/packages/plugin/src/v2/effect/context.ts
@@ -1,5 +1,5 @@
 import type { PluginOptions } from "../options.js"
-import type { AgentDomain } from "./agent.js"
+import type { AgentHooks } from "./agent.js"
 import type { AISDKHooks } from "./aisdk.js"
 import type { CatalogHooks } from "./catalog.js"
 import type { CommandHooks } from "./command.js"
@@ -7,20 +7,19 @@ import type { IntegrationHooks } from "./integration.js"
 import type { PluginDomain } from "./plugin.js"
 import type { ReferenceHooks } from "./reference.js"
 import type { SkillHooks } from "./skill.js"
-import type { Reload } from "./registration.js"
 import type { ToolDomain } from "./tool.js"
-import type { SessionDomain } from "./runtime.js"
+import type { SessionHooks } from "./runtime.js"
 
 export interface PluginContext {
   readonly options: PluginOptions
-  readonly agent: AgentDomain & Reload
+  readonly agent: AgentHooks
   readonly aisdk: AISDKHooks
-  readonly catalog: CatalogHooks & Reload
-  readonly command: CommandHooks & Reload
-  readonly integration: IntegrationHooks & Reload
+  readonly catalog: CatalogHooks
+  readonly command: CommandHooks
+  readonly integration: IntegrationHooks
   readonly plugin: PluginDomain
-  readonly reference: ReferenceHooks & Reload
-  readonly skill: SkillHooks & Reload
+  readonly reference: ReferenceHooks
+  readonly skill: SkillHooks
   readonly tool: ToolDomain
-  readonly session: SessionDomain
+  readonly session: SessionHooks
 }
diff --git a/packages/plugin/src/v2/effect/index.ts b/packages/plugin/src/v2/effect/index.ts
index 295c948766..12b5971fef 100644
--- a/packages/plugin/src/v2/effect/index.ts
+++ b/packages/plugin/src/v2/effect/index.ts
@@ -1,6 +1,13 @@
 export type { PluginContext } from "./context.js"
 export { define } from "./plugin.js"
-export type { Plugin } from "./plugin.js"
+export type { Plugin, PluginDomain } from "./plugin.js"
+export type { AgentDraft, AgentHooks } from "./agent.js"
+export type { AISDKHooks } from "./aisdk.js"
+export type { CatalogDraft, CatalogHooks, CatalogProviderRecord } from "./catalog.js"
+export type { CommandDraft, CommandHooks } from "./command.js"
+export type { IntegrationDraft, IntegrationHooks, IntegrationMethodRegistration } from "./integration.js"
+export type { ReferenceDraft, ReferenceHooks } from "./reference.js"
+export type { SkillDraft, SkillHooks } from "./skill.js"
 export * as Tool from "./tool.js"
 export type { ToolDomain, ToolExecuteBeforeEvent, ToolExecuteAfterEvent } from "./tool.js"
-export type { SessionDomain } from "./runtime.js"
+export type { SessionHooks } from "./runtime.js"
diff --git a/packages/plugin/src/v2/effect/integration.ts b/packages/plugin/src/v2/effect/integration.ts
index 64052b1506..1433786634 100644
--- a/packages/plugin/src/v2/effect/integration.ts
+++ b/packages/plugin/src/v2/effect/integration.ts
@@ -9,8 +9,9 @@ import type {
   IntegrationOAuthMethod,
   IntegrationRef,
 } from "@opencode-ai/sdk/v2/types"
+import type { IntegrationApi } from "@opencode-ai/client/effect/api"
 import type { Effect, Scope } from "effect"
-import type { Hooks } from "./registration.js"
+import type { TransformHook } from "./registration.js"
 
 export type IntegrationOAuthAuthorization = {
   readonly url: string
@@ -55,7 +56,9 @@ export interface IntegrationDraft {
   }
 }
 
-export interface IntegrationHooks extends Hooks<{ transform: IntegrationDraft }> {
+export interface IntegrationHooks extends IntegrationApi<unknown> {
+  readonly transform: TransformHook<IntegrationDraft>
+  readonly reload: () => Effect.Effect<void>
   readonly connection: {
     readonly active: (integrationID: string) => Effect.Effect<ConnectionInfo | undefined>
     readonly resolve: (connection: ConnectionInfo) => Effect.Effect<CredentialValue | undefined, unknown>
diff --git a/packages/plugin/src/v2/effect/plugin.ts b/packages/plugin/src/v2/effect/plugin.ts
index 54224fa831..77629bdfca 100644
--- a/packages/plugin/src/v2/effect/plugin.ts
+++ b/packages/plugin/src/v2/effect/plugin.ts
@@ -1,3 +1,4 @@
+import type { PluginApi } from "@opencode-ai/client/effect/api"
 import type { Effect, Scope } from "effect"
 import type { PluginContext } from "./context.js"
 
@@ -10,7 +11,7 @@ export function define<R = Scope.Scope>(plugin: Plugin<R>) {
   return plugin
 }
 
-export interface PluginDomain {
+export interface PluginDomain extends PluginApi<unknown> {
   readonly add: (plugin: Plugin) => Effect.Effect<void>
   readonly remove: (id: string) => Effect.Effect<void>
 }
diff --git a/packages/plugin/src/v2/effect/reference.ts b/packages/plugin/src/v2/effect/reference.ts
index c1e2630476..1216d3c0b8 100644
--- a/packages/plugin/src/v2/effect/reference.ts
+++ b/packages/plugin/src/v2/effect/reference.ts
@@ -1,5 +1,7 @@
 import type { ReferenceGitSource, ReferenceLocalSource } from "@opencode-ai/sdk/v2/types"
-import type { Hooks } from "./registration.js"
+import type { ReferenceApi } from "@opencode-ai/client/effect/api"
+import type { Effect } from "effect"
+import type { TransformHook } from "./registration.js"
 
 export interface ReferenceDraft {
   add(name: string, source: ReferenceLocalSource | ReferenceGitSource): void
@@ -7,6 +9,7 @@ export interface ReferenceDraft {
   list(): readonly (readonly [string, ReferenceLocalSource | ReferenceGitSource])[]
 }
 
-export type ReferenceHooks = Hooks<{
-  transform: ReferenceDraft
-}>
+export interface ReferenceHooks extends ReferenceApi<unknown> {
+  readonly transform: TransformHook<ReferenceDraft>
+  readonly reload: () => Effect.Effect<void>
+}
diff --git a/packages/plugin/src/v2/effect/registration.ts b/packages/plugin/src/v2/effect/registration.ts
index dfe5626397..1ddb9e3489 100644
--- a/packages/plugin/src/v2/effect/registration.ts
+++ b/packages/plugin/src/v2/effect/registration.ts
@@ -4,12 +4,10 @@ export interface Registration {
   readonly dispose: Effect.Effect<void>
 }
 
-export interface Reload {
-  readonly reload: () => Effect.Effect<void>
-}
-
 export type Hooks<Spec> = {
   readonly [Name in keyof Spec]: (
     callback: (input: Spec[Name]) => Effect.Effect<void> | void,
   ) => Effect.Effect<Registration, never, Scope.Scope>
 }
+
+export type TransformHook<Input> = (callback: (input: Input) => void) => Effect.Effect<Registration, never, Scope.Scope>
diff --git a/packages/plugin/src/v2/effect/runtime.ts b/packages/plugin/src/v2/effect/runtime.ts
index ca2074a977..0358330210 100644
--- a/packages/plugin/src/v2/effect/runtime.ts
+++ b/packages/plugin/src/v2/effect/runtime.ts
@@ -1,3 +1,4 @@
-import type { SessionApi } from "./generated/api.js"
+import type { SessionApi } from "@opencode-ai/client/effect/api"
 
-export type SessionDomain = Pick<SessionApi<unknown>, "create" | "get" | "prompt" | "command" | "interrupt">
+export interface SessionHooks
+  extends Pick<SessionApi<unknown>, "create" | "get" | "prompt" | "command" | "interrupt"> {}
diff --git a/packages/plugin/src/v2/effect/skill.ts b/packages/plugin/src/v2/effect/skill.ts
index cac658a083..b01b81bc3b 100644
--- a/packages/plugin/src/v2/effect/skill.ts
+++ b/packages/plugin/src/v2/effect/skill.ts
@@ -1,11 +1,14 @@
 import type { SkillV2Source } from "@opencode-ai/sdk/v2/types"
-import type { Hooks } from "./registration.js"
+import type { SkillApi } from "@opencode-ai/client/effect/api"
+import type { Effect } from "effect"
+import type { TransformHook } from "./registration.js"
 
 export interface SkillDraft {
   source(source: SkillV2Source): void
   list(): readonly SkillV2Source[]
 }
 
-export type SkillHooks = Hooks<{
-  transform: SkillDraft
-}>
+export interface SkillHooks extends SkillApi<unknown> {
+  readonly transform: TransformHook<SkillDraft>
+  readonly reload: () => Effect.Effect<void>
+}
diff --git a/packages/plugin/src/v2/promise/agent.ts b/packages/plugin/src/v2/promise/agent.ts
index bec589146a..d9313838cb 100644
--- a/packages/plugin/src/v2/promise/agent.ts
+++ b/packages/plugin/src/v2/promise/agent.ts
@@ -1,8 +1,10 @@
+import type { AgentApi } from "@opencode-ai/client/promise/api"
 import type { AgentDraft } from "../effect/agent.js"
-import type { Hooks } from "./registration.js"
+import type { TransformHook } from "./registration.js"
 
 export type { AgentDraft }
 
-export type AgentHooks = Hooks<{
-  transform: AgentDraft
-}>
+export interface AgentHooks extends AgentApi {
+  readonly transform: TransformHook<AgentDraft>
+  readonly reload: () => Promise<void>
+}
diff --git a/packages/plugin/src/v2/promise/catalog.ts b/packages/plugin/src/v2/promise/catalog.ts
index 70842e94b7..f6b0f649f8 100644
--- a/packages/plugin/src/v2/promise/catalog.ts
+++ b/packages/plugin/src/v2/promise/catalog.ts
@@ -1,8 +1,10 @@
+import type { CatalogApi } from "@opencode-ai/client/promise/api"
 import type { CatalogDraft, CatalogProviderRecord } from "../effect/catalog.js"
-import type { Hooks } from "./registration.js"
+import type { TransformHook } from "./registration.js"
 
 export type { CatalogDraft, CatalogProviderRecord }
 
-export type CatalogHooks = Hooks<{
-  transform: CatalogDraft
-}>
+export interface CatalogHooks extends CatalogApi {
+  readonly transform: TransformHook<CatalogDraft>
+  readonly reload: () => Promise<void>
+}
diff --git a/packages/plugin/src/v2/promise/command.ts b/packages/plugin/src/v2/promise/command.ts
index cdc5f8268a..d042259c47 100644
--- a/packages/plugin/src/v2/promise/command.ts
+++ b/packages/plugin/src/v2/promise/command.ts
@@ -1,8 +1,10 @@
+import type { CommandApi } from "@opencode-ai/client/promise/api"
 import type { CommandDraft } from "../effect/command.js"
-import type { Hooks } from "./registration.js"
+import type { TransformHook } from "./registration.js"
 
 export type { CommandDraft }
 
-export type CommandHooks = Hooks<{
-  transform: CommandDraft
-}>
+export interface CommandHooks extends CommandApi {
+  readonly transform: TransformHook<CommandDraft>
+  readonly reload: () => Promise<void>
+}
diff --git a/packages/plugin/src/v2/promise/context.ts b/packages/plugin/src/v2/promise/context.ts
index 9089334ee3..652deee9bb 100644
--- a/packages/plugin/src/v2/promise/context.ts
+++ b/packages/plugin/src/v2/promise/context.ts
@@ -6,17 +6,18 @@ import type { CommandHooks } from "./command.js"
 import type { IntegrationHooks } from "./integration.js"
 import type { PluginDomain } from "./plugin.js"
 import type { ReferenceHooks } from "./reference.js"
+import type { SessionHooks } from "./runtime.js"
 import type { SkillHooks } from "./skill.js"
-import type { Reload } from "./registration.js"
 
 export interface PluginContext {
   readonly options: PluginOptions
-  readonly agent: AgentHooks & Reload
+  readonly agent: AgentHooks
   readonly aisdk: AISDKHooks
-  readonly catalog: CatalogHooks & Reload
-  readonly command: CommandHooks & Reload
-  readonly integration: IntegrationHooks & Reload
+  readonly catalog: CatalogHooks
+  readonly command: CommandHooks
+  readonly integration: IntegrationHooks
   readonly plugin: PluginDomain
-  readonly reference: ReferenceHooks & Reload
-  readonly skill: SkillHooks & Reload
+  readonly reference: ReferenceHooks
+  readonly session: SessionHooks
+  readonly skill: SkillHooks
 }
diff --git a/packages/plugin/src/v2/promise/index.ts b/packages/plugin/src/v2/promise/index.ts
index 8287955657..1050463e70 100644
--- a/packages/plugin/src/v2/promise/index.ts
+++ b/packages/plugin/src/v2/promise/index.ts
@@ -2,11 +2,11 @@ export type { PluginContext } from "./context.js"
 export type { PluginOptions } from "../options.js"
 export { define } from "./plugin.js"
 export type { Plugin, PluginDomain } from "./plugin.js"
-export type { Registration, Reload } from "./registration.js"
 export type { AgentDraft, AgentHooks } from "./agent.js"
 export type { AISDKHooks } from "./aisdk.js"
 export type { CatalogDraft, CatalogHooks, CatalogProviderRecord } from "./catalog.js"
 export type { CommandDraft, CommandHooks } from "./command.js"
 export type { IntegrationDraft, IntegrationHooks, IntegrationMethodRegistration } from "./integration.js"
 export type { ReferenceDraft, ReferenceHooks } from "./reference.js"
+export type { SessionHooks } from "./runtime.js"
 export type { SkillDraft, SkillHooks } from "./skill.js"
diff --git a/packages/plugin/src/v2/promise/integration.ts b/packages/plugin/src/v2/promise/integration.ts
index 6a798a0291..bd133e889e 100644
--- a/packages/plugin/src/v2/promise/integration.ts
+++ b/packages/plugin/src/v2/promise/integration.ts
@@ -1,10 +1,13 @@
+import type { IntegrationApi } from "@opencode-ai/client/promise/api"
 import type { IntegrationDraft, IntegrationMethodRegistration } from "../effect/integration.js"
 import type { CredentialValue } from "@opencode-ai/sdk/v2/types"
-import type { Hooks } from "./registration.js"
+import type { TransformHook } from "./registration.js"
 
 export type { IntegrationDraft, IntegrationMethodRegistration }
 
-export interface IntegrationHooks extends Hooks<{ transform: IntegrationDraft }> {
+export interface IntegrationHooks extends IntegrationApi {
+  readonly transform: TransformHook<IntegrationDraft>
+  readonly reload: () => Promise<void>
   readonly connection: {
     readonly active: (integrationID: string) => Promise<import("@opencode-ai/sdk/v2/types").ConnectionInfo | undefined>
     readonly resolve: (
diff --git a/packages/plugin/src/v2/promise/plugin.ts b/packages/plugin/src/v2/promise/plugin.ts
index ab59fb95fc..afb6c16f0e 100644
--- a/packages/plugin/src/v2/promise/plugin.ts
+++ b/packages/plugin/src/v2/promise/plugin.ts
@@ -1,3 +1,4 @@
+import type { PluginApi } from "@opencode-ai/client/promise/api"
 import type { PluginContext } from "./context.js"
 
 export interface Plugin {
@@ -9,7 +10,7 @@ export function define(plugin: Plugin) {
   return plugin
 }
 
-export interface PluginDomain {
+export interface PluginDomain extends PluginApi {
   readonly add: (plugin: Plugin) => Promise<void>
   readonly remove: (id: string) => Promise<void>
 }
diff --git a/packages/plugin/src/v2/promise/reference.ts b/packages/plugin/src/v2/promise/reference.ts
index f4b7f8b839..66bd5b4874 100644
--- a/packages/plugin/src/v2/promise/reference.ts
+++ b/packages/plugin/src/v2/promise/reference.ts
@@ -1,8 +1,10 @@
+import type { ReferenceApi } from "@opencode-ai/client/promise/api"
 import type { ReferenceDraft } from "../effect/reference.js"
-import type { Hooks } from "./registration.js"
+import type { TransformHook } from "./registration.js"
 
 export type { ReferenceDraft }
 
-export type ReferenceHooks = Hooks<{
-  transform: ReferenceDraft
-}>
+export interface ReferenceHooks extends ReferenceApi {
+  readonly transform: TransformHook<ReferenceDraft>
+  readonly reload: () => Promise<void>
+}
diff --git a/packages/plugin/src/v2/promise/registration.ts b/packages/plugin/src/v2/promise/registration.ts
index 5e0ae7f480..76be0982b8 100644
--- a/packages/plugin/src/v2/promise/registration.ts
+++ b/packages/plugin/src/v2/promise/registration.ts
@@ -2,10 +2,8 @@ export interface Registration {
   readonly dispose: () => Promise<void>
 }
 
-export interface Reload {
-  readonly reload: () => Promise<void>
-}
-
 export type Hooks<Spec> = {
   readonly [Name in keyof Spec]: (callback: (input: Spec[Name]) => Promise<void> | void) => Promise<Registration>
 }
+
+export type TransformHook<Input> = (callback: (input: Input) => void) => Promise<Registration>
diff --git a/packages/plugin/src/v2/promise/runtime.ts b/packages/plugin/src/v2/promise/runtime.ts
new file mode 100644
index 0000000000..b89b6e8abf
--- /dev/null
+++ b/packages/plugin/src/v2/promise/runtime.ts
@@ -0,0 +1,3 @@
+import type { SessionApi } from "@opencode-ai/client/promise/api"
+
+export interface SessionHooks extends Pick<SessionApi, "create" | "get" | "prompt" | "command" | "interrupt"> {}
diff --git a/packages/plugin/src/v2/promise/skill.ts b/packages/plugin/src/v2/promise/skill.ts
index 2efc35f818..a1e62fc544 100644
--- a/packages/plugin/src/v2/promise/skill.ts
+++ b/packages/plugin/src/v2/promise/skill.ts
@@ -1,8 +1,10 @@
+import type { SkillApi } from "@opencode-ai/client/promise/api"
 import type { SkillDraft } from "../effect/skill.js"
-import type { Hooks } from "./registration.js"
+import type { TransformHook } from "./registration.js"
 
 export type { SkillDraft }
 
-export type SkillHooks = Hooks<{
-  transform: SkillDraft
-}>
+export interface SkillHooks extends SkillApi {
+  readonly transform: TransformHook<SkillDraft>
+  readonly reload: () => Promise<void>
+}

From 7bd3f8ac832efc5466ea632d7fd0b5305eed4696 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Fri, 3 Jul 2026 18:11:39 -0400
Subject: [PATCH 34/82] chore(client): remove cyclic test dependencies

---
 bun.lock                     | 2 --
 packages/client/package.json | 2 --
 2 files changed, 4 deletions(-)

diff --git a/bun.lock b/bun.lock
index cdc7518d8a..46382ce955 100644
--- a/bun.lock
+++ b/bun.lock
@@ -129,9 +129,7 @@
       },
       "devDependencies": {
         "@effect/platform-node": "catalog:",
-        "@opencode-ai/core": "workspace:*",
         "@opencode-ai/httpapi-codegen": "workspace:*",
-        "@opencode-ai/server": "workspace:*",
         "@tsconfig/bun": "catalog:",
         "@types/bun": "catalog:",
         "@typescript/native-preview": "catalog:",
diff --git a/packages/client/package.json b/packages/client/package.json
index 5ee201c819..85b550779e 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -42,9 +42,7 @@
   },
   "devDependencies": {
     "@effect/platform-node": "catalog:",
-    "@opencode-ai/core": "workspace:*",
     "@opencode-ai/httpapi-codegen": "workspace:*",
-    "@opencode-ai/server": "workspace:*",
     "@tsconfig/bun": "catalog:",
     "@types/bun": "catalog:",
     "@typescript/native-preview": "catalog:",

From b04d8d53e6c915e96302d19c6c3651f0f2c15e2d Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Fri, 3 Jul 2026 18:19:16 -0500
Subject: [PATCH 35/82] fix(tui): expand MCP server errors in dialog (#35243)

---
 .../client/src/promise/generated/types.ts     |  2 +-
 packages/core/src/mcp/index.ts                |  2 +-
 packages/schema/src/mcp.ts                    |  6 +-
 packages/sdk/js/src/v2/gen/types.gen.ts       | 12 +--
 packages/tui/src/component/dialog-mcp.tsx     | 98 ++++++++++++++-----
 packages/tui/src/ui/dialog-select.tsx         | 11 ++-
 6 files changed, 93 insertions(+), 38 deletions(-)

diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts
index 6d1db75b5e..e0372cd57e 100644
--- a/packages/client/src/promise/generated/types.ts
+++ b/packages/client/src/promise/generated/types.ts
@@ -2427,7 +2427,7 @@ export type ServerMcpListOutput = {
     readonly name: string
     readonly status:
       | { readonly status: "connected" }
-      | { readonly status: "disconnected" }
+      | { readonly status: "pending" }
       | { readonly status: "disabled" }
       | { readonly status: "failed"; readonly error: string }
       | { readonly status: "needs_auth" }
diff --git a/packages/core/src/mcp/index.ts b/packages/core/src/mcp/index.ts
index d4935dc512..ffc7a247fd 100644
--- a/packages/core/src/mcp/index.ts
+++ b/packages/core/src/mcp/index.ts
@@ -205,7 +205,7 @@ export const layer = Layer.effect(
       for (const [name, server] of Object.entries(entry.info.mcp?.servers ?? {})) {
         runtime.set(ServerName.make(name), {
           config: { ...server, timeout: { ...timeout, ...server.timeout } },
-          status: { status: "disconnected" },
+          status: { status: "pending" },
           startup: Deferred.makeUnsafe<void>(),
         })
       }
diff --git a/packages/schema/src/mcp.ts b/packages/schema/src/mcp.ts
index 421b5aee95..4a7ce15618 100644
--- a/packages/schema/src/mcp.ts
+++ b/packages/schema/src/mcp.ts
@@ -7,8 +7,8 @@ import { IntegrationID } from "./integration-id.js"
 const Connected = Schema.Struct({ status: Schema.Literal("connected") }).annotate({
   identifier: "Mcp.Status.Connected",
 })
-const Disconnected = Schema.Struct({ status: Schema.Literal("disconnected") }).annotate({
-  identifier: "Mcp.Status.Disconnected",
+const Pending = Schema.Struct({ status: Schema.Literal("pending") }).annotate({
+  identifier: "Mcp.Status.Pending",
 })
 const Disabled = Schema.Struct({ status: Schema.Literal("disabled") }).annotate({
   identifier: "Mcp.Status.Disabled",
@@ -27,7 +27,7 @@ const NeedsClientRegistration = Schema.Struct({
 export type Status = typeof Status.Type
 export const Status = Schema.Union([
   Connected,
-  Disconnected,
+  Pending,
   Disabled,
   Failed,
   NeedsAuth,
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index 27ca0f00cd..c693369281 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -5418,8 +5418,8 @@ export type McpStatusConnected2 = {
   status: "connected"
 }
 
-export type McpStatusDisconnected = {
-  status: "disconnected"
+export type McpStatusPending = {
+  status: "pending"
 }
 
 export type McpStatusDisabled2 = {
@@ -5444,7 +5444,7 @@ export type McpServer = {
   name: string
   status:
     | McpStatusConnected2
-    | McpStatusDisconnected
+    | McpStatusPending
     | McpStatusDisabled2
     | McpStatusFailed2
     | McpStatusNeedsAuth2
@@ -9242,8 +9242,8 @@ export type McpStatusConnected3 = {
   status: "connected"
 }
 
-export type McpStatusDisconnected2 = {
-  status: "disconnected"
+export type McpStatusPending2 = {
+  status: "pending"
 }
 
 export type McpStatusDisabled3 = {
@@ -9268,7 +9268,7 @@ export type McpServer2 = {
   name: string
   status:
     | McpStatusConnected3
-    | McpStatusDisconnected2
+    | McpStatusPending2
     | McpStatusDisabled3
     | McpStatusFailed3
     | McpStatusNeedsAuth3
diff --git a/packages/tui/src/component/dialog-mcp.tsx b/packages/tui/src/component/dialog-mcp.tsx
index f5f82f2202..004e4a6e15 100644
--- a/packages/tui/src/component/dialog-mcp.tsx
+++ b/packages/tui/src/component/dialog-mcp.tsx
@@ -1,54 +1,102 @@
-import { createMemo, createSignal } from "solid-js"
+import { createEffect, createMemo, createSignal, onMount, Show } from "solid-js"
+import { createStore } from "solid-js/store"
 import { useData } from "../context/data"
-import { map, pipe, sortBy } from "remeda"
+import { pipe, sortBy } from "remeda"
 import { DialogSelect, type DialogSelectRef } from "../ui/dialog-select"
-import { useTheme } from "../context/theme"
+import { useDialog } from "../ui/dialog"
+import { useTheme, type Theme } from "../context/theme"
 import { TextAttributes } from "@opentui/core"
 import type { McpServer } from "@opencode-ai/sdk/v2"
 
-function Status(props: { status: McpServer["status"] }) {
-  const { theme } = useTheme()
-  switch (props.status.status) {
-    case "connected":
-      return <span style={{ fg: theme.success, attributes: TextAttributes.BOLD }}>✓ Connected</span>
-    case "failed":
-      return <span style={{ fg: theme.error }}>✗ {props.status.error}</span>
+// Sort by how much attention a server needs: auth prompts first, then failures,
+// then healthy servers, and intentionally-off servers last.
+function statusMeta(status: McpServer["status"], theme: Theme) {
+  switch (status.status) {
     case "needs_auth":
-      return <span style={{ fg: theme.warning }}>! Needs authentication</span>
+      return { rank: 0, icon: "!", label: "Needs authentication", color: theme.warning, error: undefined, bold: false }
     case "needs_client_registration":
-      return <span style={{ fg: theme.error }}>✗ {props.status.error}</span>
-    case "disabled":
-      return <span style={{ fg: theme.textMuted }}>○ Disabled</span>
+      return { rank: 1, icon: "✗", label: "Needs registration", color: theme.error, error: status.error, bold: false }
+    case "failed":
+      return { rank: 2, icon: "✗", label: "Failed", color: theme.error, error: status.error, bold: false }
+    case "connected":
+      return { rank: 3, icon: "✓", label: "Connected", color: theme.success, error: undefined, bold: true }
+    case "pending":
+      return { rank: 4, icon: "◌", label: "Pending", color: theme.textMuted, error: undefined, bold: false }
     default:
-      return <span style={{ fg: theme.textMuted }}>○ Disconnected</span>
+      return { rank: 5, icon: "○", label: "Disabled", color: theme.textMuted, error: undefined, bold: false }
   }
 }
 
 export function DialogMcp() {
   const data = useData()
+  const dialog = useDialog()
+  const { theme } = useTheme()
+  const [expanded, setExpanded] = createStore<Record<string, boolean>>({})
+  const [focused, setFocused] = createSignal<string>()
   const [, setRef] = createSignal<DialogSelectRef<unknown>>()
 
-  const options = createMemo(() =>
+  onMount(() => {
+    dialog.setSize("large")
+  })
+
+  const servers = createMemo(() =>
     pipe(
       data.location.mcp.list() ?? [],
-      sortBy((server) => server.name),
-      map((server) => ({
-        value: server.name,
-        title: server.name,
-        footer: <Status status={server.status} />,
-        category: undefined,
-      })),
+      sortBy(
+        (server) => statusMeta(server.status, theme).rank,
+        (server) => server.name,
+      ),
     ),
   )
 
+  createEffect(() => {
+    if (focused()) return
+    const first = servers()[0]
+    if (first) setFocused(first.name)
+  })
+
+  const options = createMemo(() =>
+    servers().map((server) => {
+      const meta = statusMeta(server.status, theme)
+      return {
+        value: server.name,
+        title: server.name,
+        footer: (
+          <span style={{ fg: meta.color, attributes: meta.bold ? TextAttributes.BOLD : undefined }}>
+            {meta.icon} {meta.label}
+          </span>
+        ),
+        details: meta.error && expanded[server.name] ? [meta.error] : undefined,
+        detailsColor: theme.error,
+        detailsWrap: true,
+      }
+    }),
+  )
+
+  const focusedError = createMemo(() => {
+    const name = focused()
+    const server = servers().find((entry) => entry.name === name)
+    return server ? statusMeta(server.status, theme).error : undefined
+  })
+
   return (
     <DialogSelect
       ref={setRef}
       title="MCPs"
       options={options()}
-      onSelect={() => {
-        // Read-only view: selection does nothing, the dialog closes on escape.
+      preserveSelection
+      onMove={(option) => setFocused(option.value as string)}
+      onSelect={(option) => {
+        const name = option.value as string
+        const server = servers().find((entry) => entry.name === name)
+        if (!server || !statusMeta(server.status, theme).error) return
+        setExpanded(name, (open) => !open)
       }}
+      footer={
+        <Show when={focusedError()}>
+          <text fg={theme.textMuted}>enter to {expanded[focused()!] ? "hide" : "view"} error</text>
+        </Show>
+      }
     />
   )
 }
diff --git a/packages/tui/src/ui/dialog-select.tsx b/packages/tui/src/ui/dialog-select.tsx
index dab9103d24..28235531e2 100644
--- a/packages/tui/src/ui/dialog-select.tsx
+++ b/packages/tui/src/ui/dialog-select.tsx
@@ -59,6 +59,8 @@ export interface DialogSelectOption<T = any> {
   value: T
   description?: string
   details?: string[]
+  detailsColor?: RGBA
+  detailsWrap?: boolean
   footer?: JSX.Element | string
   titleWidth?: number
   truncateTitle?: boolean | "left"
@@ -697,8 +699,13 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
                           <For each={option.details}>
                             {(detail) => (
                               <box paddingLeft={3} paddingRight={3}>
-                                <text fg={theme.textMuted} wrapMode="none">
-                                  {Locale.truncateMiddle(detail, Math.max(1, Math.min(76, dimensions().width - 12)))}
+                                <text
+                                  fg={option.detailsColor ?? theme.textMuted}
+                                  wrapMode={option.detailsWrap ? "word" : "none"}
+                                >
+                                  {option.detailsWrap
+                                    ? detail
+                                    : Locale.truncateMiddle(detail, Math.max(1, Math.min(76, dimensions().width - 12)))}
                                 </text>
                               </box>
                             )}

From c9b24ef027dbe5b338123e43ae395892650f8cd3 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Fri, 3 Jul 2026 20:34:29 -0400
Subject: [PATCH 36/82] feat(core): reload config on filesystem changes

---
 packages/app/src/context/file/watcher.test.ts |  10 +-
 packages/app/src/context/file/watcher.ts      |   2 +-
 packages/app/src/pages/session.tsx            |   2 +-
 packages/client/src/effect/index.ts           |   1 +
 packages/client/src/promise/api.ts            |   2 +
 .../client/src/promise/generated/types.ts     |  10 +-
 packages/client/src/promise/index.ts          |   1 +
 packages/core/src/catalog.ts                  |  15 +-
 packages/core/src/config.ts                   | 120 ++++++----
 packages/core/src/config/experimental.ts      |  20 --
 packages/core/src/config/plugin/command.ts    |  33 ++-
 .../core/src/filesystem/location-watcher.ts   |  83 +++++++
 packages/core/src/filesystem/watcher.ts       | 220 ++++++++++--------
 packages/core/src/location-services.ts        |   6 +-
 packages/core/src/plugin/host.ts              |   9 +-
 packages/core/src/plugin/promise.ts           |   5 +-
 packages/core/src/policy.ts                   |  48 ----
 packages/core/src/skill.ts                    |   4 +-
 packages/core/src/v1/config/config.ts         |   4 -
 packages/core/src/v1/config/migrate.ts        |   1 -
 packages/core/test/catalog.test.ts            |  20 +-
 packages/core/test/config/command.test.ts     |  19 +-
 packages/core/test/config/config.test.ts      |  96 ++++----
 packages/core/test/filesystem/watcher.test.ts |  28 ++-
 packages/core/test/location-layer.test.ts     |  27 +--
 packages/core/test/plugin.test.ts             |  23 +-
 packages/core/test/plugin/host.ts             |   5 +-
 packages/core/test/policy.test.ts             |  85 -------
 packages/core/test/skill.test.ts              |   4 +-
 packages/opencode/src/tool/apply_patch.ts     |   3 +-
 packages/opencode/src/tool/edit.ts            |   5 +-
 packages/opencode/src/tool/write.ts           |   3 +-
 .../test/server/httpapi-v2-location.test.ts   |   2 +-
 packages/plugin/src/v2/effect/context.ts      |   2 +
 packages/plugin/src/v2/effect/event.ts        |  11 +-
 packages/plugin/src/v2/effect/index.ts        |   1 +
 packages/plugin/src/v2/promise/context.ts     |   2 +
 packages/plugin/src/v2/promise/event.ts       |   3 +
 packages/plugin/src/v2/promise/index.ts       |   1 +
 packages/schema/src/config.ts                 |  10 +
 packages/schema/src/event-manifest.ts         |   6 +-
 packages/schema/src/filesystem-v1.ts          |   1 +
 packages/schema/src/filesystem-watcher.ts     |  13 --
 packages/schema/src/filesystem.ts             |  11 +-
 packages/schema/src/index.ts                  |   1 +
 packages/schema/src/v1/filesystem.ts          |  11 +
 packages/schema/test/event-manifest.test.ts   |   6 +-
 packages/sdk/js/src/v2/gen/types.gen.ts       | 143 +++++++-----
 48 files changed, 612 insertions(+), 526 deletions(-)
 delete mode 100644 packages/core/src/config/experimental.ts
 create mode 100644 packages/core/src/filesystem/location-watcher.ts
 delete mode 100644 packages/core/src/policy.ts
 delete mode 100644 packages/core/test/policy.test.ts
 create mode 100644 packages/plugin/src/v2/promise/event.ts
 create mode 100644 packages/schema/src/config.ts
 create mode 100644 packages/schema/src/filesystem-v1.ts
 delete mode 100644 packages/schema/src/filesystem-watcher.ts
 create mode 100644 packages/schema/src/v1/filesystem.ts

diff --git a/packages/app/src/context/file/watcher.test.ts b/packages/app/src/context/file/watcher.test.ts
index 9536b52536..dbe745ff7d 100644
--- a/packages/app/src/context/file/watcher.test.ts
+++ b/packages/app/src/context/file/watcher.test.ts
@@ -7,7 +7,7 @@ describe("file watcher invalidation", () => {
     const refresh: string[] = []
     invalidateFromWatcher(
       {
-        type: "file.watcher.updated",
+        type: "filesystem.changed",
         properties: {
           file: "src/new.ts",
           event: "add",
@@ -32,7 +32,7 @@ describe("file watcher invalidation", () => {
 
     invalidateFromWatcher(
       {
-        type: "file.watcher.updated",
+        type: "filesystem.changed",
         properties: {
           file: "src/open.ts",
           event: "change",
@@ -63,7 +63,7 @@ describe("file watcher invalidation", () => {
 
     invalidateFromWatcher(
       {
-        type: "file.watcher.updated",
+        type: "filesystem.changed",
         properties: {
           file: "src",
           event: "change",
@@ -81,7 +81,7 @@ describe("file watcher invalidation", () => {
 
     invalidateFromWatcher(
       {
-        type: "file.watcher.updated",
+        type: "filesystem.changed",
         properties: {
           file: "src/file.ts",
           event: "change",
@@ -111,7 +111,7 @@ describe("file watcher invalidation", () => {
 
     invalidateFromWatcher(
       {
-        type: "file.watcher.updated",
+        type: "filesystem.changed",
         properties: {
           file: ".git/index.lock",
           event: "change",
diff --git a/packages/app/src/context/file/watcher.ts b/packages/app/src/context/file/watcher.ts
index fbf7199279..1dcaeffd25 100644
--- a/packages/app/src/context/file/watcher.ts
+++ b/packages/app/src/context/file/watcher.ts
@@ -16,7 +16,7 @@ type WatcherOps = {
 }
 
 export function invalidateFromWatcher(event: WatcherEvent, ops: WatcherOps) {
-  if (event.type !== "file.watcher.updated") return
+  if (event.type !== "filesystem.changed") return
   const props =
     typeof event.properties === "object" && event.properties ? (event.properties as Record<string, unknown>) : undefined
   const rawPath = typeof props?.file === "string" ? props.file : undefined
diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx
index 36be14546b..25b2459954 100644
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -820,7 +820,7 @@ export default function Page() {
   )
 
   const stopVcs = sdk().event.listen((evt) => {
-    if (evt.details.type !== "file.watcher.updated") return
+    if (evt.details.type !== "filesystem.changed") return
     const props =
       typeof evt.details.properties === "object" && evt.details.properties
         ? (evt.details.properties as Record<string, unknown>)
diff --git a/packages/client/src/effect/index.ts b/packages/client/src/effect/index.ts
index 50b85da627..8cde84695c 100644
--- a/packages/client/src/effect/index.ts
+++ b/packages/client/src/effect/index.ts
@@ -8,6 +8,7 @@ export type {
   AppApi,
   CatalogApi,
   CommandApi,
+  EventApi,
   IntegrationApi,
   ModelApi,
   PluginApi,
diff --git a/packages/client/src/promise/api.ts b/packages/client/src/promise/api.ts
index a080156942..e7d1c27d25 100644
--- a/packages/client/src/promise/api.ts
+++ b/packages/client/src/promise/api.ts
@@ -1,6 +1,7 @@
 import type {
   AgentApi as EffectAgentApi,
   CommandApi as EffectCommandApi,
+  EventApi as EffectEventApi,
   IntegrationApi as EffectIntegrationApi,
   ModelApi as EffectModelApi,
   PluginApi as EffectPluginApi,
@@ -25,6 +26,7 @@ type PromisifyApi<Api> = {
 
 export type AgentApi = PromisifyApi<EffectAgentApi<unknown>>
 export type CommandApi = PromisifyApi<EffectCommandApi<unknown>>
+export type EventApi = PromisifyApi<EffectEventApi<unknown>>
 export type IntegrationApi = PromisifyApi<EffectIntegrationApi<unknown>>
 export type ModelApi = PromisifyApi<EffectModelApi<unknown>>
 export type PluginApi = PromisifyApi<EffectPluginApi<unknown>>
diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts
index e0372cd57e..ff06963036 100644
--- a/packages/client/src/promise/generated/types.ts
+++ b/packages/client/src/promise/generated/types.ts
@@ -4923,9 +4923,9 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "file.edited"
+      readonly type: "filesystem.changed"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly file: string }
+      readonly data: { readonly file: string; readonly event: "add" | "change" | "unlink" }
     }
   | {
       readonly id: string
@@ -4991,7 +4991,7 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "skill.updated"
+      readonly type: "config.updated"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: {}
     }
@@ -4999,9 +4999,9 @@ export type EventSubscribeOutput =
       readonly id: string
       readonly created: number
       readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "file.watcher.updated"
+      readonly type: "skill.updated"
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly file: string; readonly event: "add" | "change" | "unlink" }
+      readonly data: {}
     }
   | {
       readonly id: string
diff --git a/packages/client/src/promise/index.ts b/packages/client/src/promise/index.ts
index 9203fe5477..fd889c64e5 100644
--- a/packages/client/src/promise/index.ts
+++ b/packages/client/src/promise/index.ts
@@ -3,6 +3,7 @@ export type {
   AgentApi,
   CatalogApi,
   CommandApi,
+  EventApi,
   IntegrationApi,
   ModelApi,
   PluginApi,
diff --git a/packages/core/src/catalog.ts b/packages/core/src/catalog.ts
index 78688ce12c..ab34db8ea4 100644
--- a/packages/core/src/catalog.ts
+++ b/packages/core/src/catalog.ts
@@ -1,12 +1,11 @@
 export * as Catalog from "./catalog"
 
 import { makeLocationNode } from "./effect/app-node"
-import { Array, Context, Effect, Layer, Option, Order, pipe, Schema } from "effect"
+import { Array, Context, Effect, Layer, Option, Order, pipe } from "effect"
 import { Catalog } from "@opencode-ai/schema/catalog"
 import { ModelV2 } from "./model"
 import { ProviderV2 } from "./provider"
 import { EventV2 } from "./event"
-import { Policy } from "./policy"
 import { State } from "./state"
 import { Integration } from "./integration"
 
@@ -17,8 +16,6 @@ export type ProviderRecord = {
 
 export type DefaultModel = { providerID: ProviderV2.ID; modelID: ModelV2.ID }
 
-export const PolicyActions = Schema.Literals(["provider.use"])
-
 export const Event = Catalog.Event
 
 type Data = {
@@ -65,7 +62,6 @@ const layer = Layer.effect(
   Service,
   Effect.gen(function* () {
     const events = yield* EventV2.Service
-    const policy = yield* Policy.Service
     const integrations = yield* Integration.Service
 
     const available = (provider: ProviderV2.Info, integration: Integration.Info | undefined) => {
@@ -159,13 +155,6 @@ const layer = Layer.effect(
         return result
       },
       finalize: Effect.fn("CatalogV2.finalize")(function* (catalog) {
-        if (policy.hasStatements()) {
-          for (const record of [...catalog.provider.list()]) {
-            if ((yield* policy.evaluate("provider.use", record.provider.id, "allow")) === "deny") {
-              catalog.provider.remove(record.provider.id)
-            }
-          }
-        }
         yield* events.publish(Event.Updated, {})
       }),
     })
@@ -294,4 +283,4 @@ const layer = Layer.effect(
 
 const SMALL_MODEL_RE = /\b(nano|flash|lite|mini|haiku|small|fast)\b/
 
-export const node = makeLocationNode({ service: Service, layer, deps: [EventV2.node, Policy.node, Integration.node] })
+export const node = makeLocationNode({ service: Service, layer, deps: [EventV2.node, Integration.node] })
diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
index 9d03d09c38..9e829fb740 100644
--- a/packages/core/src/config.ts
+++ b/packages/core/src/config.ts
@@ -3,18 +3,19 @@ export * as Config from "./config"
 import { makeLocationNode } from "./effect/app-node"
 import path from "path"
 import { type ParseError, parse } from "jsonc-parser"
-import { Context, Effect, Layer, Option, Schema } from "effect"
+import { Context, Effect, Fiber, Layer, Option, PubSub, Schema, Stream } from "effect"
 import { Permission } from "@opencode-ai/schema/permission"
+import { Config as ConfigSchema } from "@opencode-ai/schema/config"
+import { EventV2 } from "./event"
+import { Watcher } from "./filesystem/watcher"
 import { FSUtil } from "./fs-util"
 import { Global } from "./global"
 import { Location } from "./location"
-import { Policy } from "./policy"
 import { AbsolutePath } from "./schema"
 import { ConfigAgent } from "./config/agent"
 import { ConfigAttachments } from "./config/attachments"
 import { ConfigCompaction } from "./config/compaction"
 import { ConfigCommand } from "./config/command"
-import { ConfigExperimental } from "./config/experimental"
 import { ConfigFormatter } from "./config/formatter"
 import { ConfigLSP } from "./config/lsp"
 import { ConfigMCP } from "./config/mcp"
@@ -102,7 +103,6 @@ export class Info extends Schema.Class<Info>("Config.Info")({
   plugins: ConfigPlugin.Plugins.pipe(Schema.optional).annotate({
     description: "Ordered external plugin packages to load",
   }),
-  experimental: ConfigExperimental.Experimental.pipe(Schema.optional),
   providers: Schema.Record(Schema.String, ConfigProvider.Info).pipe(Schema.optional),
 }) {}
 
@@ -138,7 +138,8 @@ const layer = Layer.effect(
     const fs = yield* FSUtil.Service
     const global = yield* Global.Service
     const location = yield* Location.Service
-    const policy = yield* Policy.Service
+    const watcher = yield* Watcher.Service
+    const events = yield* EventV2.Service
     const names = ["opencode.json", "opencode.jsonc"]
     const decodeOptions = { errors: "all", onExcessProperty: "ignore", propertyOrder: "original" } as const
     const decodeInfo = Schema.decodeUnknownOption(Info, decodeOptions)
@@ -170,45 +171,78 @@ const layer = Layer.effect(
       ]
     })
 
-    const globalDirectory = AbsolutePath.make(global.config)
-    const locationIsGlobal = path.resolve(location.directory) === path.resolve(global.config)
-    // Read configuration once when this location opens. Later calls reuse these
-    // values until the location is reopened.
-    const discovered = locationIsGlobal
-      ? []
-      : yield* fs
-          .up({
-            targets: [".opencode", ...names.toReversed()],
-            start: location.directory,
-            stop: location.project.directory,
-          })
-          .pipe(Effect.orDie)
-    const directories = [
-      globalDirectory,
-      ...discovered
-        .filter((item) => path.basename(item) === ".opencode")
-        .toReversed()
-        .map((directory) => AbsolutePath.make(directory)),
+    const discover = Effect.fn("Config.discover")(function* () {
+      const globalDirectory = AbsolutePath.make(global.config)
+      const locationIsGlobal = path.resolve(location.directory) === path.resolve(global.config)
+      const discovered = locationIsGlobal
+        ? []
+        : yield* fs
+            .up({
+              targets: [".opencode", ...names.toReversed()],
+              start: location.directory,
+              stop: location.project.directory,
+            })
+            .pipe(Effect.orDie)
+      const directories = [
+        globalDirectory,
+        ...discovered
+          .filter((item) => path.basename(item) === ".opencode")
+          .toReversed()
+          .map((directory) => AbsolutePath.make(directory)),
+      ]
+      const directPaths = discovered.filter((item) => path.basename(item) !== ".opencode").toReversed()
+      const direct = yield* Effect.forEach(directPaths, loadFile).pipe(
+        Effect.orDie,
+        Effect.map((configs) => configs.filter((config): config is Document => config !== undefined)),
+      )
+      const supplementary = yield* Effect.forEach(directories, loadDirectory).pipe(Effect.orDie)
+      return {
+        entries: [...(supplementary[0] ?? []), ...direct, ...supplementary.slice(1).flat()],
+        directories,
+        files: directPaths,
+      }
+    })
+
+    const initial = yield* discover()
+    let configs = initial.entries
+    const updates = yield* PubSub.unbounded<Watcher.Update>()
+    const subscriptions = new Map<string, Effect.Effect<unknown>>()
+    const targets = (snapshot: typeof initial) => [
+      ...snapshot.directories.map((path) => ({ path, type: "directory" as const })),
+      ...snapshot.files
+        .filter((file) => !snapshot.directories.some((directory) => FSUtil.contains(directory, file)))
+        .map((path) => ({ path, type: "file" as const })),
     ]
-    // A config closer to the opened directory should win over one higher up.
-    // Search starts nearby, so reverse the results before applying them.
-    const directPaths = discovered.filter((item) => path.basename(item) !== ".opencode").toReversed()
-    const direct = yield* Effect.forEach(directPaths, loadFile).pipe(
-      Effect.orDie,
-      Effect.map((configs) => configs.filter((config): config is Document => config !== undefined)),
-    )
-    const supplementary = yield* Effect.forEach(directories, loadDirectory).pipe(Effect.orDie)
-    // Apply general settings first and more specific settings last:
-    // global config, project files, then `.opencode` files.
-    const configs = [...(supplementary[0] ?? []), ...direct, ...supplementary.slice(1).flat()]
-    // Rules use the opposite order so a user-global rule can override a
-    // repository rule. Statement order inside each file stays unchanged.
-    yield* policy.load(
-      configs
-        .filter((config): config is Document => config.type === "document")
-        .toReversed()
-        .flatMap((config) => config.info.experimental?.policies ?? []),
+    const reconcile = Effect.fn("Config.reconcileWatches")(function* (snapshot: typeof initial) {
+      const next = new Map(targets(snapshot).map((target) => [JSON.stringify(target), target]))
+      for (const [key, stop] of subscriptions) {
+        if (next.has(key)) continue
+        yield* stop
+        subscriptions.delete(key)
+      }
+      for (const [key, target] of next) {
+        if (subscriptions.has(key)) continue
+        const fiber = yield* watcher.subscribe(target).pipe(
+          Stream.runForEach((update) => PubSub.publish(updates, update)),
+          Effect.forkScoped({ startImmediately: true }),
+        )
+        subscriptions.set(key, Fiber.interrupt(fiber))
+      }
+    })
+
+    yield* Stream.fromPubSub(updates).pipe(
+      Stream.debounce("100 millis"),
+      Stream.runForEach((update) =>
+        Effect.gen(function* () {
+          const next = yield* discover()
+          configs = next.entries
+          yield* reconcile(next)
+          yield* events.publish(ConfigSchema.Event.Updated, {})
+        }).pipe(Effect.catchCause((cause) => Effect.logError("failed to reload config", { path: update.path, cause }))),
+      ),
+      Effect.forkScoped({ startImmediately: true }),
     )
+    yield* reconcile(initial)
 
     return Service.of({
       entries: Effect.fn("Config.entries")(function* () {
@@ -221,5 +255,5 @@ const layer = Layer.effect(
 export const node = makeLocationNode({
   service: Service,
   layer,
-  deps: [FSUtil.node, Global.node, Location.node, Policy.node],
+  deps: [Watcher.node, EventV2.node, FSUtil.node, Global.node, Location.node],
 })
diff --git a/packages/core/src/config/experimental.ts b/packages/core/src/config/experimental.ts
deleted file mode 100644
index 8b38a225b4..0000000000
--- a/packages/core/src/config/experimental.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-export * as ConfigExperimental from "./experimental"
-
-import { Schema } from "effect"
-import { Catalog } from "../catalog"
-import { Policy } from "../policy"
-
-// Each core domain exports the policy actions it supports. Adding an action to
-// this union makes it valid in authored config while keeping Policy generic.
-export const PolicyAction = Schema.Union([Catalog.PolicyActions])
-
-class PolicyConfig extends Schema.Class<PolicyConfig>("ConfigV2.Experimental.Policy")({
-  ...Policy.Info.fields,
-  action: PolicyAction,
-}) {}
-
-export { PolicyConfig as Policy }
-
-export class Experimental extends Schema.Class<Experimental>("ConfigV2.Experimental")({
-  policies: PolicyConfig.pipe(Schema.Array, Schema.optional),
-}) {}
diff --git a/packages/core/src/config/plugin/command.ts b/packages/core/src/config/plugin/command.ts
index bb7a030cbb..43ba4cd375 100644
--- a/packages/core/src/config/plugin/command.ts
+++ b/packages/core/src/config/plugin/command.ts
@@ -2,7 +2,7 @@ export * as ConfigCommandPlugin from "./command"
 
 import { define } from "../../plugin/internal"
 import path from "path"
-import { Effect, Option, Schema } from "effect"
+import { Effect, Option, Schema, Stream } from "effect"
 import { CommandV2 } from "../../command"
 import { Config } from "../../config"
 import { FSUtil } from "../../fs-util"
@@ -17,16 +17,19 @@ export const Plugin = define({
   effect: Effect.fn(function* (ctx) {
     const config = yield* Config.Service
     const fs = yield* FSUtil.Service
-    const documents = yield* Effect.forEach(yield* config.entries(), (entry) => {
-      if (entry.type === "document") return Effect.succeed([{ commands: entry.info.commands }])
-      return loadDirectory(fs, entry.path).pipe(
-        Effect.map((commands) => [
-          { commands: Object.fromEntries(commands.map((command) => [command.name, command.info])) },
-        ]),
-      )
-    }).pipe(Effect.map((documents) => documents.flat()))
+    const load = Effect.fn("ConfigCommandPlugin.load")(function* () {
+      return yield* Effect.forEach(yield* config.entries(), (entry) => {
+        if (entry.type === "document") return Effect.succeed([{ commands: entry.info.commands }])
+        return loadDirectory(fs, entry.path).pipe(
+          Effect.map((commands) => [
+            { commands: Object.fromEntries(commands.map((command) => [command.name, command.info])) },
+          ]),
+        )
+      }).pipe(Effect.map((documents) => documents.flat()))
+    })
+    const loaded = { documents: yield* load() }
     yield* ctx.command.transform((draft) => {
-      for (const document of documents) {
+      for (const document of loaded.documents) {
         for (const [name, command] of Object.entries(document.commands ?? {})) {
           draft.update(name, (item) => {
             item.template = command.template
@@ -44,6 +47,16 @@ export const Plugin = define({
         }
       }
     })
+    yield* ctx.event.subscribe().pipe(
+      Stream.filter((event) => event.type === "config.updated"),
+      Stream.runForEach(() =>
+        load().pipe(
+          Effect.tap((documents) => Effect.sync(() => (loaded.documents = documents))),
+          Effect.andThen(ctx.command.reload()),
+        ),
+      ),
+      Effect.forkScoped({ startImmediately: true }),
+    )
   }),
 })
 
diff --git a/packages/core/src/filesystem/location-watcher.ts b/packages/core/src/filesystem/location-watcher.ts
new file mode 100644
index 0000000000..1566d3d8ff
--- /dev/null
+++ b/packages/core/src/filesystem/location-watcher.ts
@@ -0,0 +1,83 @@
+export * as LocationWatcher from "./location-watcher"
+
+import { makeLocationNode } from "../effect/app-node"
+import { Context, Effect, Layer, Stream } from "effect"
+import { FileSystem } from "@opencode-ai/schema/filesystem"
+import os from "os"
+import path from "path"
+import { Config } from "../config"
+import { EventV2 } from "../event"
+import { FSUtil } from "../fs-util"
+import { Git } from "../git"
+import { Location } from "../location"
+import { Watcher } from "./watcher"
+import { Ignore } from "./ignore"
+import { Protected } from "./protected"
+
+function protecteds(dir: string) {
+  return Protected.paths().filter((item) => {
+    const relative = path.relative(dir, item)
+    return relative !== "" && !relative.startsWith("..") && !path.isAbsolute(relative)
+  })
+}
+
+export interface Interface {}
+
+export class Service extends Context.Service<Service, Interface>()("@opencode/LocationWatcher") {}
+
+const layer = Layer.effect(
+  Service,
+  Effect.gen(function* () {
+    const location = yield* Location.Service
+    const watcher = yield* Watcher.Service
+    const events = yield* EventV2.Service
+    const fs = yield* FSUtil.Service
+    const git = yield* Git.Service
+    const configService = yield* Config.Service
+    const config = (yield* configService.entries())
+      .filter((entry): entry is Config.Document => entry.type === "document")
+      .flatMap((item) => item.info.watcher?.ignore ?? [])
+    const publish = (update: { type: "create" | "update" | "delete"; path: string }) =>
+      events.publish(FileSystem.Event.Changed, {
+        file: update.path,
+        event: update.type === "create" ? "add" : update.type === "update" ? "change" : "unlink",
+      })
+
+    if (path.resolve(location.directory) !== path.resolve(os.homedir())) {
+      yield* watcher
+        .subscribe({
+          path: location.directory,
+          type: "directory",
+          ignore: [...Ignore.PATTERNS, ...config, ...protecteds(location.directory)],
+        })
+        .pipe(Stream.runForEach(publish), Effect.forkScoped({ startImmediately: true }))
+    } else {
+      yield* Effect.logInfo("location watcher skipped home directory", { directory: location.directory })
+    }
+
+    if (location.vcs?.type === "git") {
+      const resolved = (yield* git.repo.discover(location.directory))?.gitDirectory
+      const vcs = resolved ? yield* fs.realPath(resolved).pipe(Effect.catch(() => Effect.succeed(resolved))) : undefined
+      if (vcs && !config.includes(".git") && !config.includes(vcs) && (!resolved || !config.includes(resolved))) {
+        const ignore = (yield* fs.readDirectoryEntries(vcs).pipe(Effect.catch(() => Effect.succeed([])))).flatMap(
+          (entry) => (entry.name === "HEAD" ? [] : [entry.name]),
+        )
+        yield* watcher
+          .subscribe({ path: vcs, type: "directory", ignore })
+          .pipe(Stream.runForEach(publish), Effect.forkScoped({ startImmediately: true }))
+      }
+    }
+
+    return Service.of({})
+  }).pipe(
+    Effect.catchCause((cause) =>
+      Effect.logError("failed to init location watcher service", { cause }).pipe(Effect.as(Service.of({}))),
+    ),
+  ),
+)
+
+export const node = makeLocationNode({
+  service: Service,
+  layer,
+  deps: [Watcher.node, FSUtil.node, Location.node, Config.node, Git.node, EventV2.node],
+})
diff --git a/packages/core/src/filesystem/watcher.ts b/packages/core/src/filesystem/watcher.ts
index 1efc9d6907..2febe93b76 100644
--- a/packages/core/src/filesystem/watcher.ts
+++ b/packages/core/src/filesystem/watcher.ts
@@ -3,26 +3,20 @@ export * as Watcher from "./watcher"
 // @ts-ignore
 import { createWrapper } from "@parcel/watcher/wrapper"
 import type ParcelWatcher from "@parcel/watcher"
-import { makeLocationNode } from "../effect/app-node"
-import { Cause, Context, Effect, Layer } from "effect"
-import { FileSystemWatcher } from "@opencode-ai/schema/filesystem-watcher"
-import os from "os"
-import path from "path"
-import { Config } from "../config"
-import { EventV2 } from "../event"
+import { FileSystem } from "@opencode-ai/schema/filesystem"
+import { makeGlobalNode } from "../effect/app-node"
+import { Cause, Context, Effect, Layer, PubSub, Scope, Stream } from "effect"
+import { KeyedMutex } from "../effect/keyed-mutex"
 import { Flag } from "../flag/flag"
-import { FSUtil } from "../fs-util"
-import { Git } from "../git"
-import { Location } from "../location"
 import { lazy } from "../util/lazy"
-import { Ignore } from "./ignore"
-import { Protected } from "./protected"
+import { watch as watchFileSystem } from "node:fs"
+import path from "path"
 
 declare const OPENCODE_LIBC: string | undefined
 
 const SUBSCRIBE_TIMEOUT_MS = 10_000
 
-export const Event = FileSystemWatcher.Event
+export const Event = { Updated: FileSystem.Event.Changed }
 
 const watcher = lazy((): typeof import("@parcel/watcher") | undefined => {
   try {
@@ -42,108 +36,132 @@ function getBackend() {
   if (process.platform === "linux") return "inotify"
 }
 
-function protecteds(dir: string) {
-  return Protected.paths().filter((item) => {
-    const relative = path.relative(dir, item)
-    return relative !== "" && !relative.startsWith("..") && !path.isAbsolute(relative)
-  })
+export const hasNativeBinding = () => !!watcher()
+export type Update = ParcelWatcher.Event
+
+export type WatchInput =
+  | { readonly path: string; readonly type: "file" }
+  | { readonly path: string; readonly type: "directory"; readonly ignore?: readonly string[] }
+
+export interface Interface {
+  readonly subscribe: (input: WatchInput) => Stream.Stream<Update>
 }
 
-export const hasNativeBinding = () => !!watcher()
-
-export interface Interface {}
-
-export class Service extends Context.Service<Service, Interface>()("@opencode/v2/FileWatcher") {}
+export class Service extends Context.Service<Service, Interface>()("@opencode/Watcher") {}
 
 const layer = Layer.effect(
   Service,
   Effect.gen(function* () {
-    if (Flag.OPENCODE_DISABLE_FILEWATCHER) return Service.of({})
-
     const backend = getBackend()
-    const location = yield* Location.Service
-    if (path.resolve(location.directory) === path.resolve(os.homedir())) {
-      yield* Effect.logInfo("watcher skipped home directory", { directory: location.directory })
-      return Service.of({})
-    }
-    if (!backend) {
-      yield* Effect.logError("watcher backend not supported", {
-        directory: location.directory,
-        platform: process.platform,
-      })
-      return Service.of({})
+    const native = watcher()
+    if (Flag.OPENCODE_DISABLE_FILEWATCHER) {
+      return Service.of({ subscribe: () => Stream.empty })
     }
 
-    const w = watcher()
-    if (!w) return Service.of({})
-
-    yield* Effect.logInfo("watcher backend", { directory: location.directory, platform: process.platform, backend })
-    const events = yield* EventV2.Service
-    const fs = yield* FSUtil.Service
-    const git = yield* Git.Service
-    const context = yield* Effect.context()
-    const runFork = Effect.runForkWith(context)
-    const subscriptions: ParcelWatcher.AsyncSubscription[] = []
-    yield* Effect.addFinalizer(() =>
-      Effect.promise(() => Promise.allSettled(subscriptions.map((subscription) => subscription.unsubscribe()))),
-    )
-
-    const callback: ParcelWatcher.SubscribeCallback = (_error, updates) => {
-      if (_error) runFork(Effect.logError("watcher callback failed", { error: _error }))
-      for (const update of updates) {
-        if (update.type === "create") runFork(events.publish(Event.Updated, { file: update.path, event: "add" }))
-        if (update.type === "update") runFork(events.publish(Event.Updated, { file: update.path, event: "change" }))
-        if (update.type === "delete") runFork(events.publish(Event.Updated, { file: update.path, event: "unlink" }))
-      }
+    type Entry = {
+      readonly pubsub: PubSub.PubSub<Update>
+      readonly subscription: { readonly unsubscribe: () => Promise<void> }
+      refs: number
     }
+    const entries = new Map<string, Entry>()
+    const locks = KeyedMutex.makeUnsafe<string>()
 
-    const subscribe = (directory: string, ignore: string[]) => {
-      const pending = w.subscribe(directory, callback, { ignore, backend })
-      return Effect.promise(() => pending).pipe(
-        Effect.tap((subscription) =>
-          Effect.sync(() => subscriptions.push(subscription)).pipe(
-            Effect.andThen(Effect.logInfo("watcher subscribed", { directory, backend, ignores: ignore.length })),
-          ),
-        ),
-        Effect.timeout(SUBSCRIBE_TIMEOUT_MS),
-        Effect.catchCause((cause) => {
-          pending.then((subscription) => subscription.unsubscribe()).catch(() => {})
-          return Effect.logError("failed to subscribe", { directory, cause: Cause.pretty(cause) })
+    const acquire = Effect.fn("Watcher.acquire")(function* (input: WatchInput) {
+      const scope = yield* Scope.Scope
+      const target = path.resolve(input.path)
+      const directory = input.type === "file" ? path.dirname(target) : target
+      const ignore = [...new Set(input.type === "directory" ? (input.ignore ?? []) : [])].toSorted()
+      const id = JSON.stringify([input.type, target, ignore])
+      const pubsub = yield* locks.withLock(id)(
+        Effect.gen(function* () {
+          const existing = entries.get(id)
+          if (existing) {
+            existing.refs++
+            return existing.pubsub
+          }
+          const pubsub = yield* PubSub.unbounded<Update>()
+          const subscription = yield* input.type === "file"
+            ? Effect.sync(() => {
+                const subscription = watchFileSystem(directory, { recursive: false }, (_event, file) => {
+                  if (file && path.resolve(directory, file.toString()) !== target) return
+                  PubSub.publishUnsafe(pubsub, {
+                    path: target,
+                    type: "update",
+                  } satisfies Update)
+                })
+                subscription.on("error", (error) =>
+                  Effect.runFork(Effect.logError("watcher callback failed", { path: target, error })),
+                )
+                return { unsubscribe: () => Promise.resolve(subscription.close()) }
+              })
+            : subscribeDirectory(native, backend, directory, ignore, pubsub)
+          if (subscription) {
+            entries.set(id, { pubsub, subscription, refs: 1 })
+            yield* Effect.logInfo("watcher started", {
+              path: target,
+              type: input.type,
+              backend: input.type === "file" ? "node" : backend,
+              ignores: ignore.length,
+            })
+            return pubsub
+          }
+          yield* PubSub.shutdown(pubsub)
+          return pubsub
         }),
       )
-    }
 
-    const configService = yield* Config.Service
-    const config = (yield* configService.entries())
-      .filter((entry): entry is Config.Document => entry.type === "document")
-      .flatMap((item) => item.info.watcher?.ignore ?? [])
-    yield* Effect.forkScoped(
-      subscribe(location.directory, [...Ignore.PATTERNS, ...config, ...protecteds(location.directory)]),
-    )
-
-    if (location.vcs?.type === "git") {
-      const resolved = (yield* git.repo.discover(location.directory))?.gitDirectory
-      const vcs = resolved ? yield* fs.realPath(resolved).pipe(Effect.catch(() => Effect.succeed(resolved))) : undefined
-      if (vcs && !config.includes(".git") && !config.includes(vcs) && (!resolved || !config.includes(resolved))) {
-        const ignore = (yield* fs.readDirectoryEntries(vcs).pipe(Effect.catch(() => Effect.succeed([])))).flatMap(
-          (entry) => (entry.name === "HEAD" ? [] : [entry.name]),
-        )
-        yield* Effect.forkScoped(subscribe(vcs, ignore))
-      }
-    }
-
-    return Service.of({})
-  }).pipe(
-    Effect.catchCause((cause) => {
-      return Effect.logError("failed to init watcher service", { cause: Cause.pretty(cause) }).pipe(
-        Effect.as(Service.of({})),
+      yield* Scope.addFinalizer(
+        scope,
+        locks.withLock(id)(
+          Effect.gen(function* () {
+            const entry = entries.get(id)
+            if (!entry) return
+            entry.refs--
+            if (entry.refs > 0) return
+            entries.delete(id)
+            yield* Effect.promise(() => entry.subscription.unsubscribe()).pipe(Effect.ignore)
+            yield* PubSub.shutdown(entry.pubsub)
+            yield* Effect.logInfo("watcher stopped", { path: target, type: input.type })
+          }),
+        ),
       )
-    }),
-  ),
+      return pubsub
+    })
+
+    const subscribe = (input: WatchInput) =>
+      Stream.unwrap(acquire(input).pipe(Effect.map((pubsub) => Stream.fromPubSub(pubsub))))
+
+    return Service.of({ subscribe })
+  }),
 )
 
-export const node = makeLocationNode({
-  service: Service,
-  layer,
-  deps: [FSUtil.node, Location.node, Config.node, Git.node, EventV2.node],
-})
+export const node = makeGlobalNode({ service: Service, layer, deps: [] })
+
+function subscribeDirectory(
+  native: typeof import("@parcel/watcher") | undefined,
+  backend: ParcelWatcher.BackendType | undefined,
+  directory: string,
+  ignore: string[],
+  pubsub: PubSub.PubSub<Update>,
+) {
+  if (!native || !backend) {
+    return Effect.logError("watcher backend not supported", { directory, platform: process.platform }).pipe(
+      Effect.as(undefined),
+    )
+  }
+  const callback: ParcelWatcher.SubscribeCallback = (error, updates) => {
+    if (error) Effect.runFork(Effect.logError("watcher callback failed", { error }))
+    for (const update of updates) PubSub.publishUnsafe(pubsub, update)
+  }
+  const pending = native.subscribe(directory, callback, { ignore, backend })
+  return Effect.promise(() => pending).pipe(
+    Effect.timeout(SUBSCRIBE_TIMEOUT_MS),
+    Effect.catchCause((cause) => {
+      pending.then((subscription) => subscription.unsubscribe()).catch(() => {})
+      return Effect.logError("failed to subscribe", {
+        directory,
+        cause: Cause.pretty(cause),
+      }).pipe(Effect.as(undefined))
+    }),
+  )
+}
diff --git a/packages/core/src/location-services.ts b/packages/core/src/location-services.ts
index f0f2d63e7f..2a4e0d6ef6 100644
--- a/packages/core/src/location-services.ts
+++ b/packages/core/src/location-services.ts
@@ -11,7 +11,7 @@ import { FileSystem } from "./filesystem"
 import { FileSystemSearch } from "./filesystem/search"
 import { Generate } from "./generate"
 import { Form } from "./form"
-import { Watcher } from "./filesystem/watcher"
+import { LocationWatcher } from "./filesystem/location-watcher"
 import { Image } from "./image"
 import { Integration } from "./integration"
 import { Location } from "./location"
@@ -21,7 +21,6 @@ import { MCP } from "./mcp/index"
 import { PermissionV2 } from "./permission"
 import { PluginV2 } from "./plugin"
 import { PluginInternal } from "./plugin/internal"
-import { Policy } from "./policy"
 import { ProjectCopy } from "./project/copy"
 import { Pty } from "./pty"
 import { QuestionV2 } from "./question"
@@ -50,7 +49,6 @@ export { LocationServiceMap } from "./location-service-map"
 
 const locationServiceNodes = [
   Location.node,
-  Policy.node,
   Config.node,
   AgentV2.node,
   CommandV2.node,
@@ -64,7 +62,7 @@ const locationServiceNodes = [
   ProjectCopy.refreshNode,
   FileSystemSearch.node,
   FileSystem.node,
-  Watcher.node,
+  LocationWatcher.node,
   Pty.node,
   Shell.node,
   SkillV2.node,
diff --git a/packages/core/src/plugin/host.ts b/packages/core/src/plugin/host.ts
index bf3420a023..d25555eb37 100644
--- a/packages/core/src/plugin/host.ts
+++ b/packages/core/src/plugin/host.ts
@@ -1,12 +1,14 @@
 export * as PluginHost from "./host"
 
 import type { PluginContext } from "@opencode-ai/plugin/v2/effect"
-import { Effect, Schema } from "effect"
+import { EventManifest } from "@opencode-ai/schema/event-manifest"
+import { Effect, Schema, Stream } from "effect"
 import { AgentV2 } from "../agent"
 import { AISDK } from "../aisdk"
 import { Catalog } from "../catalog"
 import { CommandV2 } from "../command"
 import { Credential } from "../credential"
+import { EventV2 } from "../event"
 import { Integration } from "../integration"
 import { Location } from "../location"
 import { ModelV2 } from "../model"
@@ -21,12 +23,14 @@ import { ToolHooks } from "../tool/hooks"
 import { WorkspaceV2 } from "../workspace"
 
 const mutable = <T>(value: T) => value as DeepMutable<T>
+const isEvent = Schema.is(Schema.Union(EventManifest.ServerDefinitions))
 
 export const make = Effect.fn("PluginHost.make")(function* (plugin: PluginV2.Interface) {
   const agents = yield* AgentV2.Service
   const aisdk = yield* AISDK.Service
   const catalog = yield* Catalog.Service
   const commands = yield* CommandV2.Service
+  const events = yield* EventV2.Service
   const integration = yield* Integration.Service
   const location = yield* Location.Service
   const reference = yield* Reference.Service
@@ -155,6 +159,9 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: PluginV2.Int
           callback(draft)
         }),
     },
+    event: {
+      subscribe: () => events.live().pipe(Stream.filter(isEvent)),
+    },
     integration: {
       list: () => response(integration.list()),
       get: (input) => response(integration.get(Integration.ID.make(input.integrationID))),
diff --git a/packages/core/src/plugin/promise.ts b/packages/core/src/plugin/promise.ts
index 956c530176..b315d3214a 100644
--- a/packages/core/src/plugin/promise.ts
+++ b/packages/core/src/plugin/promise.ts
@@ -2,7 +2,7 @@ export * as PluginPromise from "./promise"
 
 import { define } from "@opencode-ai/plugin/v2/effect"
 import type { Plugin, PluginContext } from "@opencode-ai/plugin/v2/promise"
-import { Effect, Scope } from "effect"
+import { Effect, Scope, Stream } from "effect"
 
 type HostRegistration = { readonly dispose: Effect.Effect<void> }
 type Registration = { readonly dispose: () => Promise<void> }
@@ -73,6 +73,9 @@ export function fromPromise(plugin: Plugin) {
             transform: transform(host.command),
             reload: () => run(host.command.reload()),
           },
+          event: {
+            subscribe: () => Stream.toAsyncIterable(host.event.subscribe()),
+          },
           integration: {
             list: (input) => run(host.integration.list(input)),
             get: (input) => run(host.integration.get(input)),
diff --git a/packages/core/src/policy.ts b/packages/core/src/policy.ts
deleted file mode 100644
index d1dbb3e37c..0000000000
--- a/packages/core/src/policy.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-export * as Policy from "./policy"
-
-import { makeLocationNode } from "./effect/app-node"
-import { Context, Effect, Layer, Schema } from "effect"
-import { Wildcard } from "./util/wildcard"
-import { Location } from "./location"
-
-const PolicyEffect = Schema.Literals(["allow", "deny"]).annotate({ identifier: "Policy.Effect" })
-export { PolicyEffect as Effect }
-export type Effect = typeof PolicyEffect.Type
-
-export class Info extends Schema.Class<Info>("Policy.Info")({
-  action: Schema.String,
-  effect: PolicyEffect,
-  resource: Schema.String,
-}) {}
-
-export interface Interface {
-  readonly load: (statements: Info[]) => Effect.Effect<void>
-  readonly evaluate: (action: string, resource: string, fallback: Effect) => Effect.Effect<Effect>
-  readonly hasStatements: () => boolean
-}
-
-export class Service extends Context.Service<Service, Interface>()("@opencode/v2/Policy") {}
-
-const layer = Layer.effect(
-  Service,
-  Effect.gen(function* () {
-    let statements: Info[] = []
-    yield* Location.Service
-
-    return Service.of({
-      load: Effect.fn("Policy.load")(function* (input) {
-        statements = input
-      }),
-      hasStatements: () => statements.length > 0,
-      evaluate: Effect.fn("Policy.evaluate")(function* (action, resource, fallback) {
-        return (
-          statements.findLast(
-            (statement) => Wildcard.match(action, statement.action) && Wildcard.match(resource, statement.resource),
-          )?.effect ?? fallback
-        )
-      }),
-    })
-  }),
-)
-
-export const node = makeLocationNode({ service: Service, layer, deps: [Location.node] })
diff --git a/packages/core/src/skill.ts b/packages/core/src/skill.ts
index c448eae549..511e02af87 100644
--- a/packages/core/src/skill.ts
+++ b/packages/core/src/skill.ts
@@ -3,7 +3,7 @@ export * as SkillV2 from "./skill"
 import { makeLocationNode } from "./effect/app-node"
 import path from "path"
 import { Context, Effect, Layer, Schema, Stream, Types } from "effect"
-import { FileSystemWatcher } from "@opencode-ai/schema/filesystem-watcher"
+import { FileSystem } from "@opencode-ai/schema/filesystem"
 import { Skill } from "@opencode-ai/schema/skill"
 import { AgentV2 } from "./agent"
 import { ConfigMarkdown } from "./config/markdown"
@@ -153,7 +153,7 @@ const layer = Layer.effect(
       yield* events.publish(Event.Updated, {}).pipe(Effect.asVoid)
     })
 
-    yield* events.subscribe(FileSystemWatcher.Event.Updated).pipe(
+    yield* events.subscribe(FileSystem.Event.Changed).pipe(
       Stream.runForEach((event) => invalidate(event.data.file)),
       Effect.forkScoped({ startImmediately: true }),
     )
diff --git a/packages/core/src/v1/config/config.ts b/packages/core/src/v1/config/config.ts
index 2e773f71e2..d32af99812 100644
--- a/packages/core/src/v1/config/config.ts
+++ b/packages/core/src/v1/config/config.ts
@@ -2,7 +2,6 @@ export * as ConfigV1 from "./config"
 
 import { Schema } from "effect"
 import { NonNegativeInt, PositiveInt, type DeepMutable } from "../../schema"
-import { ConfigExperimental } from "../../config/experimental"
 import { ConfigReference } from "../../config/reference"
 import { ConfigAgentV1 } from "./agent"
 import { ConfigAttachmentV1 } from "./attachment"
@@ -179,9 +178,6 @@ export const Info = Schema.Struct({
       mcp_timeout: Schema.optional(PositiveInt).annotate({
         description: "Timeout in milliseconds for model context protocol (MCP) requests",
       }),
-      policies: Schema.optional(Schema.mutable(Schema.Array(ConfigExperimental.Policy))).annotate({
-        description: "Policy statements applied to supported resources, such as provider access",
-      }),
     }),
   ),
 }).annotate({ identifier: "Config" })
diff --git a/packages/core/src/v1/config/migrate.ts b/packages/core/src/v1/config/migrate.ts
index 2a9e1c7383..046f29c431 100644
--- a/packages/core/src/v1/config/migrate.ts
+++ b/packages/core/src/v1/config/migrate.ts
@@ -78,7 +78,6 @@ export function migrate(info: typeof ConfigV1.Info.Type) {
     plugins: info.plugin?.map((plugin) =>
       typeof plugin === "string" ? plugin : { package: plugin[0], options: plugin[1] },
     ),
-    experimental: info.experimental?.policies && { policies: info.experimental.policies },
     providers: providers(info.provider),
   }
 }
diff --git a/packages/core/test/catalog.test.ts b/packages/core/test/catalog.test.ts
index 6c736cde1e..04bc006888 100644
--- a/packages/core/test/catalog.test.ts
+++ b/packages/core/test/catalog.test.ts
@@ -8,7 +8,6 @@ import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { EventV2 } from "@opencode-ai/core/event"
 import { Location } from "@opencode-ai/core/location"
 import { ModelV2 } from "@opencode-ai/core/model"
-import { Policy } from "@opencode-ai/core/policy"
 import { ProviderV2 } from "@opencode-ai/core/provider"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { location } from "./fixture/location"
@@ -24,7 +23,7 @@ const locationLayer = Layer.succeed(
   Location.Service.of(location({ directory: AbsolutePath.make("test") })),
 )
 const catalogLayer = AppNodeBuilder.build(
-  LayerNode.group([Catalog.node, EventV2.node, Credential.node, Integration.node, Policy.node]),
+  LayerNode.group([Catalog.node, EventV2.node, Credential.node, Integration.node]),
   [[Location.node, locationLayer]],
 )
 const it = testEffect(catalogLayer)
@@ -333,21 +332,4 @@ describe("CatalogV2", () => {
       expect((yield* catalog.model.small(providerID))?.id).toMatch("expensive-mini")
     }),
   )
-
-  it.effect("removes providers denied by policy after loading", () =>
-    Effect.gen(function* () {
-      const catalog = yield* Catalog.Service
-      const policy = yield* Policy.Service
-      const providerID = ProviderV2.ID.make("blocked")
-      yield* policy.load([new Policy.Info({ effect: "deny", action: "provider.use", resource: "blocked" })])
-      yield* catalog.transform((catalog) => {
-        catalog.provider.update(providerID, () => {})
-        catalog.model.update(providerID, ModelV2.ID.make("model"), () => {})
-      })
-
-      expect(yield* catalog.provider.all()).toEqual([])
-      expect(yield* catalog.model.all()).toEqual([])
-      expect(yield* catalog.provider.get(providerID)).toBeUndefined()
-    }),
-  )
 })
diff --git a/packages/core/test/config/command.test.ts b/packages/core/test/config/command.test.ts
index 6c7f2ecc02..a8126d00f6 100644
--- a/packages/core/test/config/command.test.ts
+++ b/packages/core/test/config/command.test.ts
@@ -1,13 +1,15 @@
 import fs from "fs/promises"
 import path from "path"
 import { describe, expect } from "bun:test"
-import { Effect, Schema } from "effect"
+import { Effect, PubSub, Schema, Stream } from "effect"
+import { Config as ConfigSchema } from "@opencode-ai/schema/config"
 import { CommandV2 } from "@opencode-ai/core/command"
 import { Config } from "@opencode-ai/core/config"
 import { ConfigCommandPlugin } from "@opencode-ai/core/config/plugin/command"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { FSUtil } from "@opencode-ai/core/fs-util"
+import { EventV2 } from "@opencode-ai/core/event"
 import { Location } from "@opencode-ai/core/location"
 import { MCP } from "@opencode-ai/core/mcp/index"
 import { ModelV2 } from "@opencode-ai/core/model"
@@ -19,7 +21,7 @@ import { testEffect } from "../lib/effect"
 import { host } from "../plugin/host"
 
 const it = testEffect(
-  AppNodeBuilder.build(LayerNode.group([CommandV2.node, FSUtil.node]), [
+  AppNodeBuilder.build(LayerNode.group([CommandV2.node, EventV2.node, FSUtil.node]), [
     [MCP.node, emptyMcpLayer],
     [Config.node, emptyConfigLayer],
     [Location.node, testLocationLayer],
@@ -53,6 +55,9 @@ Review files`,
           })
 
           const command = yield* CommandV2.Service
+          const events = yield* EventV2.Service
+          const update = yield* events.publish(ConfigSchema.Event.Updated, {})
+          const updates = yield* PubSub.unbounded<typeof update>()
           yield* ConfigCommandPlugin.Plugin.effect(
             host({
               command: {
@@ -60,6 +65,7 @@ Review files`,
                 transform: command.transform,
                 reload: command.reload,
               },
+              event: { subscribe: () => Stream.fromPubSub(updates) },
             }),
           ).pipe(
             Effect.provideService(
@@ -93,6 +99,15 @@ Review files`,
             CommandV2.Info.make({ name: "empty", template: "" }),
             CommandV2.Info.make({ name: "nested/docs", template: "Write docs" }),
           ])
+
+          yield* Effect.promise(() => fs.writeFile(path.join(tmp.path, "commands", "review.md"), "Review again"))
+          yield* Effect.sleep("10 millis")
+          yield* PubSub.publish(updates, update)
+          for (let attempt = 0; attempt < 100; attempt++) {
+            if ((yield* command.get("review"))?.template === "Review again") break
+            yield* Effect.sleep("10 millis")
+          }
+          expect((yield* command.get("review"))?.template).toBe("Review again")
         }),
       ),
     ),
diff --git a/packages/core/test/config/config.test.ts b/packages/core/test/config/config.test.ts
index e46644abae..f3c7b20909 100644
--- a/packages/core/test/config/config.test.ts
+++ b/packages/core/test/config/config.test.ts
@@ -1,18 +1,20 @@
 import path from "path"
 import fs from "fs/promises"
 import { describe, expect } from "bun:test"
-import { Effect, Layer, Schema } from "effect"
+import { Effect, Fiber, Layer, PubSub, Schema, Stream } from "effect"
 import { FastCheck } from "effect/testing"
 import { Config } from "@opencode-ai/core/config"
+import { Config as ConfigSchema } from "@opencode-ai/schema/config"
 import { ConfigProvider } from "@opencode-ai/core/config/provider"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { ConfigMigrateV1 } from "@opencode-ai/core/v1/config/migrate"
 import { ConfigV1 } from "@opencode-ai/core/v1/config/config"
 import { FSUtil } from "@opencode-ai/core/fs-util"
+import { Watcher } from "@opencode-ai/core/filesystem/watcher"
+import { EventV2 } from "@opencode-ai/core/event"
 import { Global } from "@opencode-ai/core/global"
 import { Location } from "@opencode-ai/core/location"
-import { Policy } from "@opencode-ai/core/policy"
 import { Project } from "@opencode-ai/core/project"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { location } from "../fixture/location"
@@ -26,6 +28,7 @@ function testLayer(
   globalDirectory = path.join(directory, "global"),
   projectDirectory = directory,
   vcs?: Project.Vcs,
+  watcher?: Layer.Layer<Watcher.Service>,
 ) {
   const locationLayer = Layer.succeed(
     Location.Service,
@@ -36,9 +39,10 @@ function testLayer(
       ),
     ),
   )
-  return AppNodeBuilder.build(LayerNode.group([Config.node, Policy.node]), [
+  return AppNodeBuilder.build(LayerNode.group([Config.node, EventV2.node]), [
     [Location.node, locationLayer],
     [Global.node, Global.layerWith({ config: globalDirectory })],
+    ...(watcher ? ([[Watcher.node, watcher]] as const) : []),
   ])
 }
 
@@ -52,6 +56,52 @@ const provider = {
 }
 
 describe("Config", () => {
+  it.live("reloads external config and publishes directory updates", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          const global = path.join(tmp.path, "global")
+          const project = path.join(tmp.path, "project")
+          const file = path.join(global, "opencode.json")
+          yield* Effect.promise(async () => {
+            await fs.mkdir(global, { recursive: true })
+            await fs.mkdir(project, { recursive: true })
+            await fs.writeFile(file, JSON.stringify({ shell: "first" }))
+          })
+          const updates = yield* PubSub.unbounded<Watcher.Update>()
+          const watcher = Layer.succeed(
+            Watcher.Service,
+            Watcher.Service.of({
+              subscribe: () => Stream.fromPubSub(updates),
+            }),
+          )
+
+          return yield* Effect.gen(function* () {
+            const config = yield* Config.Service
+            const events = yield* EventV2.Service
+            const changed = yield* events
+              .subscribe(ConfigSchema.Event.Updated)
+              .pipe(Stream.take(1), Stream.runCollect, Effect.forkScoped)
+            yield* Effect.sleep("10 millis")
+
+            yield* PubSub.publish(updates, {
+              type: "update",
+              path: path.join(global, "commands", "review.md"),
+            } satisfies Watcher.Update)
+            yield* Effect.promise(() => fs.writeFile(file, JSON.stringify({ shell: "second" })))
+            yield* PubSub.publish(updates, { type: "update", path: file } satisfies Watcher.Update)
+
+            expect(yield* Fiber.join(changed)).toHaveLength(1)
+            expect(Config.latest(yield* config.entries(), "shell")).toBe("second")
+          }).pipe(Effect.provide(testLayer(project, global, project, undefined, watcher)))
+        }),
+      ),
+    ),
+  )
+
   it.effect("returns the latest defined scalar from priority-ordered documents", () =>
     Effect.sync(() => {
       const entries = [
@@ -274,7 +324,6 @@ describe("Config", () => {
           const file = path.join(tmp.path, "opencode.json")
           const contents = JSON.stringify({
             shell: "/bin/zsh",
-            experimental: { policies: [{ effect: "deny", action: "provider.use", resource: "openai" }] },
             providers: { local: provider },
           })
           yield* Effect.promise(() => fs.writeFile(file, contents))
@@ -285,11 +334,6 @@ describe("Config", () => {
 
             expect(documents[0]?.info.$schema).toBeUndefined()
             expect(documents[0]?.info.shell).toBe("/bin/zsh")
-            expect(documents[0]?.info.experimental?.policies?.[0]).toEqual({
-              effect: "deny",
-              action: "provider.use",
-              resource: "openai",
-            })
             expect(yield* Effect.promise(() => fs.readFile(file, "utf8"))).toBe(contents)
           }).pipe(Effect.provide(testLayer(tmp.path)))
         }),
@@ -723,40 +767,6 @@ describe("Config", () => {
     ),
   )
 
-  it.live("loads policy statements in reverse config order", () =>
-    Effect.acquireRelease(
-      Effect.promise(() => tmpdir()),
-      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
-    ).pipe(
-      Effect.flatMap((tmp) => {
-        const global = path.join(tmp.path, "global")
-        return Effect.gen(function* () {
-          yield* Effect.promise(async () => {
-            await fs.mkdir(global, { recursive: true })
-            await fs.writeFile(
-              path.join(global, "opencode.json"),
-              JSON.stringify({
-                experimental: { policies: [{ effect: "deny", action: "provider.use", resource: "openai" }] },
-              }),
-            )
-            await fs.writeFile(
-              path.join(tmp.path, "opencode.json"),
-              JSON.stringify({
-                experimental: { policies: [{ effect: "allow", action: "provider.use", resource: "openai" }] },
-              }),
-            )
-          })
-
-          return yield* Effect.gen(function* () {
-            const policy = yield* Policy.Service
-
-            expect(yield* policy.evaluate("provider.use", "openai", "allow")).toBe("deny")
-          }).pipe(Effect.provide(testLayer(tmp.path, global)))
-        })
-      }),
-    ),
-  )
-
   it.live("loads global, ancestor, and .opencode configuration up to the project boundary", () =>
     Effect.acquireRelease(
       Effect.promise(() => tmpdir()),
diff --git a/packages/core/test/filesystem/watcher.test.ts b/packages/core/test/filesystem/watcher.test.ts
index 2139520468..323ba4c4ba 100644
--- a/packages/core/test/filesystem/watcher.test.ts
+++ b/packages/core/test/filesystem/watcher.test.ts
@@ -8,7 +8,9 @@ import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { EventV2 } from "@opencode-ai/core/event"
 import { FSUtil } from "@opencode-ai/core/fs-util"
+import { LocationWatcher } from "@opencode-ai/core/filesystem/location-watcher"
 import { Watcher } from "@opencode-ai/core/filesystem/watcher"
+import { FileSystem } from "@opencode-ai/schema/filesystem"
 import { Location } from "@opencode-ai/core/location"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { location } from "../fixture/location"
@@ -34,7 +36,7 @@ function provide(directory: string, vcs?: Location.Interface["vcs"]) {
     Location.Service.of(location({ directory: AbsolutePath.make(directory) }, { vcs })),
   )
   return Effect.provide(
-    AppNodeBuilder.build(Watcher.node, [
+    AppNodeBuilder.build(LocationWatcher.node, [
       [Config.node, configLayer],
       [Location.node, locationLayer],
     ]),
@@ -66,7 +68,7 @@ function wait(check: (event: WatcherEvent) => boolean) {
   return Effect.gen(function* () {
     const events = yield* EventV2.Service
     const deferred = yield* Deferred.make<WatcherEvent>()
-    const fiber = yield* events.subscribe(Watcher.Event.Updated).pipe(
+    const fiber = yield* events.subscribe(FileSystem.Event.Changed).pipe(
       Stream.runForEach((event) => {
         if (!check(event.data)) return Effect.void
         return Deferred.succeed(deferred, event.data).pipe(Effect.asVoid)
@@ -136,7 +138,27 @@ function ready(directory: string) {
   })
 }
 
-describeWatcher("Watcher", () => {
+describeWatcher("LocationWatcher", () => {
+  it.live("limits file watches to the exact target", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const watcher = yield* Watcher.Service
+        const target = path.join(directory, "opencode.json")
+        const sibling = path.join(directory, "other.json")
+        const update = yield* watcher
+          .subscribe({ path: target, type: "file" })
+          .pipe(Stream.take(1), Stream.runHead, Effect.forkScoped({ startImmediately: true }))
+        yield* Effect.yieldNow
+
+        yield* fs.writeFileString(sibling, "sibling")
+        yield* fs.writeFileString(target, "target")
+
+        expect((yield* Fiber.join(update)).valueOrUndefined?.path).toBe(target)
+      }).pipe(Effect.provide(AppNodeBuilder.build(Watcher.node))),
+    ),
+  )
+
   it.live("publishes root create, update, and delete events", () =>
     withTmp(
       (directory) =>
diff --git a/packages/core/test/location-layer.test.ts b/packages/core/test/location-layer.test.ts
index 77b7207c42..0f17b0dd2b 100644
--- a/packages/core/test/location-layer.test.ts
+++ b/packages/core/test/location-layer.test.ts
@@ -51,27 +51,18 @@ describe("LocationServiceMap", () => {
     ),
   )
 
-  it.live("isolates location state while sharing location policy with catalog", () =>
+  it.live("isolates catalog state by location", () =>
     Effect.acquireRelease(
       Effect.promise(() => Promise.all([tmpdir(), tmpdir()])),
       (dirs) => Effect.promise(() => Promise.all(dirs.map((dir) => dir[Symbol.asyncDispose]())).then(() => undefined)),
     ).pipe(
       Effect.flatMap(([blocked, allowed]) =>
         Effect.gen(function* () {
-          yield* Effect.promise(() =>
-            fs.writeFile(
-              path.join(blocked.path, "opencode.json"),
-              JSON.stringify({
-                experimental: { policies: [{ effect: "deny", action: "provider.use", resource: "test" }] },
-              }),
-            ),
-          )
-
-          const update = (directory: string) =>
+          const update = (directory: string, providerID: ProviderV2.ID) =>
             Effect.gen(function* () {
               yield* Reference.Service
               const catalog = yield* Catalog.Service
-              yield* catalog.transform((editor) => editor.provider.update(ProviderV2.ID.make("test"), () => {}))
+              yield* catalog.transform((editor) => editor.provider.update(providerID, () => {}))
               const registry = yield* ToolRegistry.Service
               // Tool plugins register during the forked PluginInternal boot; wait for
               // every expected tool rather than relying on batch ordering.
@@ -103,8 +94,11 @@ describe("LocationServiceMap", () => {
               ),
             )
 
-          const blockedState = yield* update(blocked.path)
-          expect(blockedState.providers.some((provider) => provider.id === ProviderV2.ID.make("test"))).toBe(false)
+          const blockedID = ProviderV2.ID.make("blocked-location")
+          const allowedID = ProviderV2.ID.make("allowed-location")
+          const blockedState = yield* update(blocked.path, blockedID)
+          expect(blockedState.providers.some((provider) => provider.id === blockedID)).toBe(true)
+          expect(blockedState.providers.some((provider) => provider.id === allowedID)).toBe(false)
           expect(blockedState.tools.map((tool) => tool.name).sort()).toEqual([
             "edit",
             "glob",
@@ -119,8 +113,9 @@ describe("LocationServiceMap", () => {
             "websearch",
             "write",
           ])
-          const allowedState = yield* update(allowed.path)
-          expect(allowedState.providers.some((provider) => provider.id === ProviderV2.ID.make("test"))).toBe(true)
+          const allowedState = yield* update(allowed.path, allowedID)
+          expect(allowedState.providers.some((provider) => provider.id === allowedID)).toBe(true)
+          expect(allowedState.providers.some((provider) => provider.id === blockedID)).toBe(false)
           expect(allowedState.tools.map((tool) => tool.name).sort()).toEqual([
             "edit",
             "glob",
diff --git a/packages/core/test/plugin.test.ts b/packages/core/test/plugin.test.ts
index 27f1d04061..42f2a768ec 100644
--- a/packages/core/test/plugin.test.ts
+++ b/packages/core/test/plugin.test.ts
@@ -1,8 +1,11 @@
 import { describe, expect } from "bun:test"
-import { Effect, Exit, Fiber, Schema } from "effect"
+import { Effect, Exit, Fiber, Schema, Stream } from "effect"
 import { define } from "@opencode-ai/plugin/v2/effect"
+import { Config as ConfigSchema } from "@opencode-ai/schema/config"
 import { AgentV2 } from "@opencode-ai/core/agent"
+import { EventV2 } from "@opencode-ai/core/event"
 import { PluginV2 } from "@opencode-ai/core/plugin"
+import { PluginHost } from "@opencode-ai/core/plugin/host"
 import { SessionV2 } from "@opencode-ai/core/session"
 import { SessionMessage } from "@opencode-ai/core/session/message"
 import { Tool } from "@opencode-ai/core/tool/tool"
@@ -14,6 +17,24 @@ import { PluginTestLayer } from "./plugin/fixture"
 const it = testEffect(PluginTestLayer)
 
 describe("PluginV2", () => {
+  it.live("exposes public events through the plugin context", () =>
+    Effect.gen(function* () {
+      const plugins = yield* PluginV2.Service
+      const events = yield* EventV2.Service
+      const host = yield* PluginHost.make(plugins)
+      const received = yield* host.event.subscribe().pipe(
+        Stream.filter((event) => event.type === "config.updated"),
+        Stream.runHead,
+        Effect.forkScoped({ startImmediately: true }),
+      )
+      yield* Effect.sleep("10 millis")
+
+      yield* events.publish(ConfigSchema.Event.Updated, {})
+
+      expect((yield* Fiber.join(received)).valueOrUndefined?.type).toBe("config.updated")
+    }),
+  )
+
   it.effect("waits for a plugin and returns immediately once active", () =>
     Effect.gen(function* () {
       const plugins = yield* PluginV2.Service
diff --git a/packages/core/test/plugin/host.ts b/packages/core/test/plugin/host.ts
index c5f168f265..63ac18e31e 100644
--- a/packages/core/test/plugin/host.ts
+++ b/packages/core/test/plugin/host.ts
@@ -6,7 +6,7 @@ import { Integration } from "@opencode-ai/core/integration"
 import { ModelV2 } from "@opencode-ai/core/model"
 import { ProviderV2 } from "@opencode-ai/core/provider"
 import type { IntegrationEnvMethod, IntegrationKeyMethod, IntegrationOAuthMethod } from "@opencode-ai/sdk/v2/types"
-import { Effect } from "effect"
+import { Effect, Stream } from "effect"
 
 type Overrides = Partial<Omit<PluginContext, "options">>
 
@@ -39,6 +39,9 @@ export function host(overrides: Overrides = {}): PluginContext {
       transform: () => Effect.die("unused command.transform"),
       reload: () => Effect.die("unused command.reload"),
     },
+    event: overrides.event ?? {
+      subscribe: () => Stream.empty,
+    },
     integration: overrides.integration ?? {
       list: () => Effect.die("unused integration.list"),
       get: () => Effect.die("unused integration.get"),
diff --git a/packages/core/test/policy.test.ts b/packages/core/test/policy.test.ts
deleted file mode 100644
index 1428c1b830..0000000000
--- a/packages/core/test/policy.test.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { describe, expect } from "bun:test"
-import { Effect, Layer } from "effect"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { Location } from "@opencode-ai/core/location"
-import { Policy } from "@opencode-ai/core/policy"
-import { AbsolutePath } from "@opencode-ai/core/schema"
-import { location } from "./fixture/location"
-import { testEffect } from "./lib/effect"
-
-const it = testEffect(
-  AppNodeBuilder.build(Policy.node, [
-    [
-      Location.node,
-      Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make("test") }))),
-    ],
-  ]),
-)
-
-describe("Policy", () => {
-  it.effect("returns the caller's fallback when no statement matches", () =>
-    Effect.gen(function* () {
-      const policy = yield* Policy.Service
-
-      expect(yield* policy.evaluate("provider.use", "anthropic", "allow")).toBe("allow")
-      expect(yield* policy.evaluate("provider.use", "anthropic", "deny")).toBe("deny")
-    }),
-  )
-
-  it.effect("evaluates wildcard provider rules in written order", () =>
-    Effect.gen(function* () {
-      const policy = yield* Policy.Service
-      yield* policy.load([
-        new Policy.Info({
-          effect: "deny",
-          action: "provider.*",
-          resource: "*",
-        }),
-        new Policy.Info({
-          effect: "allow",
-          action: "provider.use",
-          resource: "anthropic",
-        }),
-      ])
-
-      expect(yield* policy.evaluate("provider.use", "anthropic", "allow")).toBe("allow")
-      expect(yield* policy.evaluate("provider.use", "openai", "allow")).toBe("deny")
-    }),
-  )
-
-  it.effect("matches action and resource independently", () =>
-    Effect.gen(function* () {
-      const policy = yield* Policy.Service
-      yield* policy.load([
-        new Policy.Info({
-          effect: "deny",
-          action: "provider.*",
-          resource: "company-*",
-        }),
-      ])
-
-      expect(yield* policy.evaluate("provider.use", "company-stable", "allow")).toBe("deny")
-      expect(yield* policy.evaluate("plugin.load", "company-stable", "allow")).toBe("allow")
-    }),
-  )
-
-  it.effect("uses the last matching loaded statement", () =>
-    Effect.gen(function* () {
-      const policy = yield* Policy.Service
-      yield* policy.load([
-        new Policy.Info({
-          effect: "allow",
-          action: "provider.use",
-          resource: "openai",
-        }),
-        new Policy.Info({
-          effect: "deny",
-          action: "provider.use",
-          resource: "openai",
-        }),
-      ])
-
-      expect(yield* policy.evaluate("provider.use", "openai", "allow")).toBe("deny")
-    }),
-  )
-})
diff --git a/packages/core/test/skill.test.ts b/packages/core/test/skill.test.ts
index 38ca4cfb92..7e57610afa 100644
--- a/packages/core/test/skill.test.ts
+++ b/packages/core/test/skill.test.ts
@@ -10,7 +10,7 @@ import { FSUtil } from "@opencode-ai/core/fs-util"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { SkillV2 } from "@opencode-ai/core/skill"
 import { SkillDiscovery } from "@opencode-ai/core/skill/discovery"
-import { FileSystemWatcher } from "@opencode-ai/schema/filesystem-watcher"
+import { FileSystem } from "@opencode-ai/schema/filesystem"
 import { tmpdir } from "./fixture/tmpdir"
 import { testEffect } from "./lib/effect"
 
@@ -206,7 +206,7 @@ metadata:
             waitForSkillUpdate(),
             ({ deferred }) =>
               events
-                .publish(FileSystemWatcher.Event.Updated, { file, event: "change" })
+                .publish(FileSystem.Event.Changed, { file, event: "change" })
                 .pipe(Effect.andThen(Deferred.await(deferred)), Effect.timeout("1 second")),
             ({ fiber }) => Fiber.interrupt(fiber),
           )
diff --git a/packages/opencode/src/tool/apply_patch.ts b/packages/opencode/src/tool/apply_patch.ts
index f9201be8a7..312bef9f4f 100644
--- a/packages/opencode/src/tool/apply_patch.ts
+++ b/packages/opencode/src/tool/apply_patch.ts
@@ -12,6 +12,7 @@ import { LSP } from "@/lsp/lsp"
 import { FSUtil } from "@opencode-ai/core/fs-util"
 import DESCRIPTION from "./apply_patch.txt"
 import { FileSystem } from "@opencode-ai/core/filesystem"
+import { FileSystemV1 } from "@opencode-ai/schema/filesystem-v1"
 import { Format } from "../format"
 import * as Bom from "@/util/bom"
 
@@ -253,7 +254,7 @@ export const ApplyPatchTool = Tool.define(
           if (yield* format.file(edited)) {
             yield* Bom.syncFile(afs, edited, change.bom)
           }
-          yield* events.publish(FileSystem.Event.Edited, { file: edited })
+          yield* events.publish(FileSystemV1.Event.Edited, { file: edited })
         }
       }
 
diff --git a/packages/opencode/src/tool/edit.ts b/packages/opencode/src/tool/edit.ts
index a92e4720c0..7e13b85997 100644
--- a/packages/opencode/src/tool/edit.ts
+++ b/packages/opencode/src/tool/edit.ts
@@ -10,6 +10,7 @@ import { LSP } from "@/lsp/lsp"
 import { createTwoFilesPatch, diffLines } from "diff"
 import DESCRIPTION from "./edit.txt"
 import { FileSystem } from "@opencode-ai/core/filesystem"
+import { FileSystemV1 } from "@opencode-ai/schema/filesystem-v1"
 import { Watcher } from "@opencode-ai/core/filesystem/watcher"
 import { EventV2Bridge } from "@/event-v2-bridge"
 import { Format } from "../format"
@@ -112,7 +113,7 @@ export const EditTool = Tool.define(
                 if (yield* format.file(filePath)) {
                   contentNew = yield* Bom.syncFile(afs, filePath, desiredBom)
                 }
-                yield* events.publish(FileSystem.Event.Edited, { file: filePath })
+                yield* events.publish(FileSystemV1.Event.Edited, { file: filePath })
                 yield* events.publish(Watcher.Event.Updated, {
                   file: filePath,
                   event: "add",
@@ -156,7 +157,7 @@ export const EditTool = Tool.define(
               if (yield* format.file(filePath)) {
                 contentNew = yield* Bom.syncFile(afs, filePath, desiredBom)
               }
-              yield* events.publish(FileSystem.Event.Edited, { file: filePath })
+              yield* events.publish(FileSystemV1.Event.Edited, { file: filePath })
               yield* events.publish(Watcher.Event.Updated, {
                 file: filePath,
                 event: "change",
diff --git a/packages/opencode/src/tool/write.ts b/packages/opencode/src/tool/write.ts
index 37be6d8c47..7d9aa8326a 100644
--- a/packages/opencode/src/tool/write.ts
+++ b/packages/opencode/src/tool/write.ts
@@ -7,6 +7,7 @@ import { createTwoFilesPatch } from "diff"
 import DESCRIPTION from "./write.txt"
 import { EventV2Bridge } from "@/event-v2-bridge"
 import { FileSystem } from "@opencode-ai/core/filesystem"
+import { FileSystemV1 } from "@opencode-ai/schema/filesystem-v1"
 import { Watcher } from "@opencode-ai/core/filesystem/watcher"
 import { Format } from "../format"
 import { FSUtil } from "@opencode-ai/core/fs-util"
@@ -65,7 +66,7 @@ export const WriteTool = Tool.define(
           if (yield* format.file(filepath)) {
             yield* Bom.syncFile(fs, filepath, desiredBom)
           }
-          yield* events.publish(FileSystem.Event.Edited, { file: filepath })
+          yield* events.publish(FileSystemV1.Event.Edited, { file: filepath })
           yield* events.publish(Watcher.Event.Updated, {
             file: filepath,
             event: exists ? "change" : "add",
diff --git a/packages/opencode/test/server/httpapi-v2-location.test.ts b/packages/opencode/test/server/httpapi-v2-location.test.ts
index cf009812b8..1de6007b79 100644
--- a/packages/opencode/test/server/httpapi-v2-location.test.ts
+++ b/packages/opencode/test/server/httpapi-v2-location.test.ts
@@ -82,7 +82,7 @@ describe("v2 location HttpApi", () => {
     expect(
       Schema.decodeUnknownSync(Event)({
         id: "evt_test",
-        type: "file.watcher.updated",
+        type: "filesystem.changed",
         location: { directory: "/tmp/project" },
         data: {},
       }),
diff --git a/packages/plugin/src/v2/effect/context.ts b/packages/plugin/src/v2/effect/context.ts
index db2f4c0ee6..219dc16581 100644
--- a/packages/plugin/src/v2/effect/context.ts
+++ b/packages/plugin/src/v2/effect/context.ts
@@ -3,6 +3,7 @@ import type { AgentHooks } from "./agent.js"
 import type { AISDKHooks } from "./aisdk.js"
 import type { CatalogHooks } from "./catalog.js"
 import type { CommandHooks } from "./command.js"
+import type { EventHooks } from "./event.js"
 import type { IntegrationHooks } from "./integration.js"
 import type { PluginDomain } from "./plugin.js"
 import type { ReferenceHooks } from "./reference.js"
@@ -16,6 +17,7 @@ export interface PluginContext {
   readonly aisdk: AISDKHooks
   readonly catalog: CatalogHooks
   readonly command: CommandHooks
+  readonly event: EventHooks
   readonly integration: IntegrationHooks
   readonly plugin: PluginDomain
   readonly reference: ReferenceHooks
diff --git a/packages/plugin/src/v2/effect/event.ts b/packages/plugin/src/v2/effect/event.ts
index e6ea7cf0ce..49ad375d67 100644
--- a/packages/plugin/src/v2/effect/event.ts
+++ b/packages/plugin/src/v2/effect/event.ts
@@ -1,10 +1,3 @@
-import type { Event as SDKEvent } from "@opencode-ai/sdk/v2/types"
-import type { Stream } from "effect"
+import type { EventApi } from "@opencode-ai/client/effect/api"
 
-export type EventMap = {
-  [Item in SDKEvent as Item["type"]]: Item
-}
-
-export interface Event {
-  subscribe<Type extends keyof EventMap>(type: Type): Stream.Stream<EventMap[Type]>
-}
+export interface EventHooks extends Pick<EventApi<unknown>, "subscribe"> {}
diff --git a/packages/plugin/src/v2/effect/index.ts b/packages/plugin/src/v2/effect/index.ts
index 12b5971fef..2ebd0215b5 100644
--- a/packages/plugin/src/v2/effect/index.ts
+++ b/packages/plugin/src/v2/effect/index.ts
@@ -5,6 +5,7 @@ export type { AgentDraft, AgentHooks } from "./agent.js"
 export type { AISDKHooks } from "./aisdk.js"
 export type { CatalogDraft, CatalogHooks, CatalogProviderRecord } from "./catalog.js"
 export type { CommandDraft, CommandHooks } from "./command.js"
+export type { EventHooks } from "./event.js"
 export type { IntegrationDraft, IntegrationHooks, IntegrationMethodRegistration } from "./integration.js"
 export type { ReferenceDraft, ReferenceHooks } from "./reference.js"
 export type { SkillDraft, SkillHooks } from "./skill.js"
diff --git a/packages/plugin/src/v2/promise/context.ts b/packages/plugin/src/v2/promise/context.ts
index 652deee9bb..5e67e44961 100644
--- a/packages/plugin/src/v2/promise/context.ts
+++ b/packages/plugin/src/v2/promise/context.ts
@@ -3,6 +3,7 @@ import type { AgentHooks } from "./agent.js"
 import type { AISDKHooks } from "./aisdk.js"
 import type { CatalogHooks } from "./catalog.js"
 import type { CommandHooks } from "./command.js"
+import type { EventHooks } from "./event.js"
 import type { IntegrationHooks } from "./integration.js"
 import type { PluginDomain } from "./plugin.js"
 import type { ReferenceHooks } from "./reference.js"
@@ -15,6 +16,7 @@ export interface PluginContext {
   readonly aisdk: AISDKHooks
   readonly catalog: CatalogHooks
   readonly command: CommandHooks
+  readonly event: EventHooks
   readonly integration: IntegrationHooks
   readonly plugin: PluginDomain
   readonly reference: ReferenceHooks
diff --git a/packages/plugin/src/v2/promise/event.ts b/packages/plugin/src/v2/promise/event.ts
new file mode 100644
index 0000000000..5330f70c7c
--- /dev/null
+++ b/packages/plugin/src/v2/promise/event.ts
@@ -0,0 +1,3 @@
+import type { EventApi } from "@opencode-ai/client/promise/api"
+
+export interface EventHooks extends Pick<EventApi, "subscribe"> {}
diff --git a/packages/plugin/src/v2/promise/index.ts b/packages/plugin/src/v2/promise/index.ts
index 1050463e70..594ff7da3c 100644
--- a/packages/plugin/src/v2/promise/index.ts
+++ b/packages/plugin/src/v2/promise/index.ts
@@ -6,6 +6,7 @@ export type { AgentDraft, AgentHooks } from "./agent.js"
 export type { AISDKHooks } from "./aisdk.js"
 export type { CatalogDraft, CatalogHooks, CatalogProviderRecord } from "./catalog.js"
 export type { CommandDraft, CommandHooks } from "./command.js"
+export type { EventHooks } from "./event.js"
 export type { IntegrationDraft, IntegrationHooks, IntegrationMethodRegistration } from "./integration.js"
 export type { ReferenceDraft, ReferenceHooks } from "./reference.js"
 export type { SessionHooks } from "./runtime.js"
diff --git a/packages/schema/src/config.ts b/packages/schema/src/config.ts
new file mode 100644
index 0000000000..92b07b0e39
--- /dev/null
+++ b/packages/schema/src/config.ts
@@ -0,0 +1,10 @@
+export * as Config from "./config.js"
+
+import { ephemeral, inventory } from "./event.js"
+
+const Updated = ephemeral({
+  type: "config.updated",
+  schema: {},
+})
+
+export const Event = { Updated, Definitions: inventory(Updated) }
diff --git a/packages/schema/src/event-manifest.ts b/packages/schema/src/event-manifest.ts
index e17ff96bc9..6b2b806f81 100644
--- a/packages/schema/src/event-manifest.ts
+++ b/packages/schema/src/event-manifest.ts
@@ -3,10 +3,11 @@ export * as EventManifest from "./event-manifest.js"
 import { Agent } from "./agent.js"
 import { Catalog } from "./catalog.js"
 import { Command } from "./command.js"
+import { Config } from "./config.js"
 import { Durable } from "./durable-event-manifest.js"
 import { Event } from "./event.js"
 import { FileSystem } from "./filesystem.js"
-import { FileSystemWatcher } from "./filesystem-watcher.js"
+import { FileSystemV1 } from "./filesystem-v1.js"
 import { Form } from "./form.js"
 import { InstallationEvent } from "./installation-event.js"
 import { Integration } from "./integration.js"
@@ -60,8 +61,8 @@ const featureDefinitions = Event.inventory(
   ...Plugin.Event.Definitions,
   ...ProjectDirectories.Event.Definitions,
   ...Command.Event.Definitions,
+  ...Config.Event.Definitions,
   ...Skill.Event.Definitions,
-  ...FileSystemWatcher.Event.Definitions,
   ...Pty.Event.Definitions,
   ...Shell.Event.Definitions,
   ...Question.Event.Definitions,
@@ -97,6 +98,7 @@ export const Definitions = Event.inventory(
   ...TuiEvent.Definitions,
   ...McpEvent.Definitions,
   ...LegacyEvent.Definitions,
+  ...FileSystemV1.Event.Definitions,
   ...Project.Event.Definitions,
   ...SessionStatusEvent.Definitions,
   ...QuestionV1.Event.Definitions,
diff --git a/packages/schema/src/filesystem-v1.ts b/packages/schema/src/filesystem-v1.ts
new file mode 100644
index 0000000000..60e1a91853
--- /dev/null
+++ b/packages/schema/src/filesystem-v1.ts
@@ -0,0 +1 @@
+export * from "./v1/filesystem.js"
diff --git a/packages/schema/src/filesystem-watcher.ts b/packages/schema/src/filesystem-watcher.ts
deleted file mode 100644
index debe0914d1..0000000000
--- a/packages/schema/src/filesystem-watcher.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export * as FileSystemWatcher from "./filesystem-watcher.js"
-
-import { Schema } from "effect"
-import { ephemeral, inventory } from "./event.js"
-
-const Updated = ephemeral({
-  type: "file.watcher.updated",
-  schema: {
-    file: Schema.String,
-    event: Schema.Literals(["add", "change", "unlink"]),
-  },
-})
-export const Event = { Updated, Definitions: inventory(Updated) }
diff --git a/packages/schema/src/filesystem.ts b/packages/schema/src/filesystem.ts
index 3599e48c7c..3f95e97a5b 100644
--- a/packages/schema/src/filesystem.ts
+++ b/packages/schema/src/filesystem.ts
@@ -5,11 +5,14 @@ import { optional } from "./schema.js"
 import { ephemeral, inventory } from "./event.js"
 import { NonNegativeInt, PositiveInt, RelativePath } from "./schema.js"
 
-const Edited = ephemeral({
-  type: "file.edited",
-  schema: { file: Schema.String },
+const Changed = ephemeral({
+  type: "filesystem.changed",
+  schema: {
+    file: Schema.String,
+    event: Schema.Literals(["add", "change", "unlink"]),
+  },
 })
-export const Event = { Edited, Definitions: inventory(Edited) }
+export const Event = { Changed, Definitions: inventory(Changed) }
 
 export interface Entry extends Schema.Schema.Type<typeof Entry> {}
 export const Entry = Schema.Struct({
diff --git a/packages/schema/src/index.ts b/packages/schema/src/index.ts
index fb2ef17b96..1454fab1cf 100644
--- a/packages/schema/src/index.ts
+++ b/packages/schema/src/index.ts
@@ -1,5 +1,6 @@
 export { Agent } from "./agent.js"
 export { Command } from "./command.js"
+export { Config } from "./config.js"
 export { Connection } from "./connection.js"
 export { Credential } from "./credential.js"
 export { Event } from "./event.js"
diff --git a/packages/schema/src/v1/filesystem.ts b/packages/schema/src/v1/filesystem.ts
new file mode 100644
index 0000000000..a1756fefd3
--- /dev/null
+++ b/packages/schema/src/v1/filesystem.ts
@@ -0,0 +1,11 @@
+export * as FileSystemV1 from "./filesystem.js"
+
+import { Schema } from "effect"
+import { ephemeral, inventory } from "../event.js"
+
+const Edited = ephemeral({
+  type: "file.edited",
+  schema: { file: Schema.String },
+})
+
+export const Event = { Edited, Definitions: inventory(Edited) }
diff --git a/packages/schema/test/event-manifest.test.ts b/packages/schema/test/event-manifest.test.ts
index 873e415c61..487a942d9a 100644
--- a/packages/schema/test/event-manifest.test.ts
+++ b/packages/schema/test/event-manifest.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, test } from "bun:test"
 import {
   Agent,
+  Config,
   FileSystem,
   Form,
   Integration,
@@ -11,6 +12,7 @@ import {
   Workspace,
 } from "../src/index.js"
 import { EventManifest } from "../src/event-manifest.js"
+import { FileSystemV1 } from "../src/filesystem-v1.js"
 import { IdeEvent } from "../src/ide-event.js"
 import { McpEvent } from "../src/mcp-event.js"
 import { SessionEvent } from "../src/session-event.js"
@@ -59,7 +61,9 @@ describe("public event manifest", () => {
     expect(EventManifest.Latest.get("project.updated")).toBe(Project.Event.Updated)
     expect(Agent.Event.Definitions).toEqual([Agent.Event.Updated])
     expect(Project.Event.Definitions).toEqual([Project.Event.Updated])
-    expect(FileSystem.Event.Definitions).toEqual([FileSystem.Event.Edited])
+    expect(Config.Event.Definitions).toEqual([Config.Event.Updated])
+    expect(FileSystem.Event.Definitions).toEqual([FileSystem.Event.Changed])
+    expect(FileSystemV1.Event.Definitions).toEqual([FileSystemV1.Event.Edited])
     expect(Integration.Event.Definitions).toEqual([Integration.Event.Updated, Integration.Event.ConnectionUpdated])
     expect(Permission.Event.Definitions).toEqual([Permission.Event.Asked, Permission.Event.Replied])
     expect(Form.Event.Definitions).toEqual([Form.Event.Created, Form.Event.Replied, Form.Event.Cancelled])
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index c693369281..524d7ea854 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -58,15 +58,15 @@ export type Event =
   | EventSessionError
   | EventInstallationUpdated
   | EventInstallationUpdateAvailable
-  | EventFileEdited
+  | EventFilesystemChanged
   | EventReferenceUpdated
   | EventPermissionV2Asked
   | EventPermissionV2Replied
   | EventPluginAdded
   | EventProjectDirectoriesUpdated
   | EventCommandUpdated
+  | EventConfigUpdated
   | EventSkillUpdated
-  | EventFileWatcherUpdated
   | EventPtyCreated
   | EventPtyUpdated
   | EventPtyExited
@@ -91,6 +91,7 @@ export type Event =
   | EventMcpToolsChanged
   | EventMcpStatusChanged
   | EventCommandExecuted
+  | EventFileEdited
   | EventProjectUpdated
   | EventSessionStatus
   | EventSessionIdle
@@ -1280,9 +1281,10 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "file.edited"
+        type: "filesystem.changed"
         properties: {
           file: string
+          event: "add" | "change" | "unlink"
         }
       }
     | {
@@ -1339,17 +1341,16 @@ export type GlobalEvent = {
       }
     | {
         id: string
-        type: "skill.updated"
+        type: "config.updated"
         properties: {
           [key: string]: unknown
         }
       }
     | {
         id: string
-        type: "file.watcher.updated"
+        type: "skill.updated"
         properties: {
-          file: string
-          event: "add" | "change" | "unlink"
+          [key: string]: unknown
         }
       }
     | {
@@ -1576,6 +1577,13 @@ export type GlobalEvent = {
           messageID: string
         }
       }
+    | {
+        id: string
+        type: "file.edited"
+        properties: {
+          file: string
+        }
+      }
     | {
         id: string
         type: "project.updated"
@@ -2123,7 +2131,6 @@ export type Config = {
     primary_tools?: Array<string>
     continue_loop_on_deny?: boolean
     mcp_timeout?: number
-    policies?: Array<ConfigV2ExperimentalPolicy>
   }
 }
 
@@ -3059,15 +3066,15 @@ export type V2Event =
   | SessionError
   | InstallationUpdated
   | InstallationUpdateAvailable
-  | FileEdited
+  | FilesystemChanged
   | ReferenceUpdated
   | PermissionV2Asked
   | PermissionV2Replied
   | PluginAdded
   | ProjectDirectoriesUpdated
   | CommandUpdated
+  | ConfigUpdated
   | SkillUpdated
-  | FileWatcherUpdated
   | PtyCreated
   | PtyUpdated
   | PtyExited
@@ -3092,6 +3099,7 @@ export type V2Event =
   | McpToolsChanged
   | McpStatusChanged
   | CommandExecuted
+  | FileEdited
   | ProjectUpdated
   | SessionStatus2
   | SessionIdle
@@ -4167,14 +4175,6 @@ export type ConfigV2ReferenceLocal = {
   hidden?: boolean
 }
 
-export type PolicyEffect = "allow" | "deny"
-
-export type ConfigV2ExperimentalPolicy = {
-  action: "provider.use"
-  effect: PolicyEffect
-  resource: string
-}
-
 export type ProjectDirectory = {
   directory: string
   strategy?: string
@@ -5880,16 +5880,17 @@ export type InstallationUpdateAvailable = {
   }
 }
 
-export type FileEdited = {
+export type FilesystemChanged = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "file.edited"
+  type: "filesystem.changed"
   location?: LocationRef
   data: {
     file: string
+    event: "add" | "change" | "unlink"
   }
 }
 
@@ -5981,6 +5982,19 @@ export type CommandUpdated = {
   }
 }
 
+export type ConfigUpdated = {
+  id: string
+  created: number
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "config.updated"
+  location?: LocationRef
+  data: {
+    [key: string]: unknown
+  }
+}
+
 export type SkillUpdated = {
   id: string
   created: number
@@ -5994,20 +6008,6 @@ export type SkillUpdated = {
   }
 }
 
-export type FileWatcherUpdated = {
-  id: string
-  created: number
-  metadata?: {
-    [key: string]: unknown
-  }
-  type: "file.watcher.updated"
-  location?: LocationRef
-  data: {
-    file: string
-    event: "add" | "change" | "unlink"
-  }
-}
-
 export type PtyCreated = {
   id: string
   created: number
@@ -6408,6 +6408,19 @@ export type CommandExecuted = {
   }
 }
 
+export type FileEdited = {
+  id: string
+  created: number
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "file.edited"
+  location?: LocationRef
+  data: {
+    file: string
+  }
+}
+
 export type ProjectUpdated = {
   id: string
   created: number
@@ -7209,11 +7222,12 @@ export type EventInstallationUpdateAvailable = {
   }
 }
 
-export type EventFileEdited = {
+export type EventFilesystemChanged = {
   id: string
-  type: "file.edited"
+  type: "filesystem.changed"
   properties: {
     file: string
+    event: "add" | "change" | "unlink"
   }
 }
 
@@ -7275,20 +7289,19 @@ export type EventCommandUpdated = {
   }
 }
 
-export type EventSkillUpdated = {
+export type EventConfigUpdated = {
   id: string
-  type: "skill.updated"
+  type: "config.updated"
   properties: {
     [key: string]: unknown
   }
 }
 
-export type EventFileWatcherUpdated = {
+export type EventSkillUpdated = {
   id: string
-  type: "file.watcher.updated"
+  type: "skill.updated"
   properties: {
-    file: string
-    event: "add" | "change" | "unlink"
+    [key: string]: unknown
   }
 }
 
@@ -7508,6 +7521,14 @@ export type EventCommandExecuted = {
   }
 }
 
+export type EventFileEdited = {
+  id: string
+  type: "file.edited"
+  properties: {
+    file: string
+  }
+}
+
 export type EventProjectUpdated = {
   id: string
   type: "project.updated"
@@ -10279,16 +10300,17 @@ export type SessionCompactionDelta2 = {
   }
 }
 
-export type FileEdited2 = {
+export type FilesystemChanged2 = {
   id: string
   created: number
   metadata?: {
     [key: string]: unknown
   }
-  type: "file.edited"
+  type: "filesystem.changed"
   location?: LocationRef2
   data: {
     file: string
+    event: "add" | "change" | "unlink"
   }
 }
 
@@ -10384,6 +10406,21 @@ export type CommandUpdated2 = {
     | Array<unknown>
 }
 
+export type ConfigUpdated2 = {
+  id: string
+  created: number
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "config.updated"
+  location?: LocationRef2
+  data:
+    | {
+        [key: string]: unknown
+      }
+    | Array<unknown>
+}
+
 export type SkillUpdated2 = {
   id: string
   created: number
@@ -10399,20 +10436,6 @@ export type SkillUpdated2 = {
     | Array<unknown>
 }
 
-export type FileWatcherUpdated2 = {
-  id: string
-  created: number
-  metadata?: {
-    [key: string]: unknown
-  }
-  type: "file.watcher.updated"
-  location?: LocationRef2
-  data: {
-    file: string
-    event: "add" | "change" | "unlink"
-  }
-}
-
 export type PtyV2 = {
   id: string
   title: string
@@ -11162,15 +11185,15 @@ export type V2EventV2 =
   | SessionRevertStaged2
   | SessionRevertCleared2
   | SessionRevertCommitted2
-  | FileEdited2
+  | FilesystemChanged2
   | ReferenceUpdated2
   | PermissionV2Asked2
   | PermissionV2Replied2
   | PluginAdded2
   | ProjectDirectoriesUpdated2
   | CommandUpdated2
+  | ConfigUpdated2
   | SkillUpdated2
-  | FileWatcherUpdated2
   | PtyCreated2
   | PtyUpdated2
   | PtyExited2

From 9751615651e3e776ec8e57122160e3661f3393ba Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Fri, 3 Jul 2026 20:41:33 -0400
Subject: [PATCH 37/82] fix(core): reload all config plugins

---
 packages/core/src/config/plugin/agent.ts     |  53 +++++---
 packages/core/src/config/plugin/external.ts  |  39 ++++--
 packages/core/src/config/plugin/provider.ts  |  32 +++--
 packages/core/src/config/plugin/reference.ts |  67 ++++++----
 packages/core/src/config/plugin/skill.ts     |  18 ++-
 packages/core/test/config/reload.test.ts     | 125 +++++++++++++++++++
 6 files changed, 264 insertions(+), 70 deletions(-)
 create mode 100644 packages/core/test/config/reload.test.ts

diff --git a/packages/core/src/config/plugin/agent.ts b/packages/core/src/config/plugin/agent.ts
index 9c6c958025..3aebf88fbe 100644
--- a/packages/core/src/config/plugin/agent.ts
+++ b/packages/core/src/config/plugin/agent.ts
@@ -2,7 +2,7 @@ export * as ConfigAgentPlugin from "./agent"
 
 import { define } from "../../plugin/internal"
 import path from "path"
-import { Effect, Option, Schema } from "effect"
+import { Effect, Option, Schema, Stream } from "effect"
 import { AgentV2 } from "../../agent"
 import { Config } from "../../config"
 import { ConfigAgent } from "../agent"
@@ -38,31 +38,34 @@ export const Plugin = define({
   effect: Effect.fn(function* (ctx) {
     const config = yield* Config.Service
     const fs = yield* FSUtil.Service
-    const documents = yield* Effect.forEach(yield* config.entries(), (entry) => {
-      if (entry.type === "document") return Effect.succeed([entry])
-      return Effect.gen(function* () {
-        const files = yield* discover(fs, entry.path)
-        return yield* Effect.forEach(files, (file) =>
-          fs.readFileStringSafe(file.filepath).pipe(
-            Effect.map((content) => content && decode(file, content)),
-            Effect.catch(() => Effect.succeed(undefined)),
-          ),
-        ).pipe(
-          Effect.map((documents) =>
-            documents.filter((document): document is Config.Document => document !== undefined),
-          ),
-        )
-      })
-    }).pipe(Effect.map((documents) => documents.flat()))
-    const global = documents.flatMap((document) => document.info.permissions ?? [])
-    const configuredDefault = Config.latest(documents, "default_agent")
+    const load = Effect.fn("ConfigAgentPlugin.load")(function* () {
+      return yield* Effect.forEach(yield* config.entries(), (entry) => {
+        if (entry.type === "document") return Effect.succeed([entry])
+        return Effect.gen(function* () {
+          const files = yield* discover(fs, entry.path)
+          return yield* Effect.forEach(files, (file) =>
+            fs.readFileStringSafe(file.filepath).pipe(
+              Effect.map((content) => content && decode(file, content)),
+              Effect.catch(() => Effect.succeed(undefined)),
+            ),
+          ).pipe(
+            Effect.map((documents) =>
+              documents.filter((document): document is Config.Document => document !== undefined),
+            ),
+          )
+        })
+      }).pipe(Effect.map((documents) => documents.flat()))
+    })
+    const loaded = { documents: yield* load() }
     yield* ctx.agent.transform((draft) => {
+      const global = loaded.documents.flatMap((document) => document.info.permissions ?? [])
+      const configuredDefault = Config.latest(loaded.documents, "default_agent")
       if (configuredDefault !== undefined) draft.default(AgentV2.ID.make(configuredDefault))
       for (const current of draft.list()) {
         draft.update(current.id, (agent) => agent.permissions.push(...global))
       }
 
-      for (const document of documents) {
+      for (const document of loaded.documents) {
         for (const [id, item] of Object.entries(document.info.agents ?? {})) {
           const agentID = AgentV2.ID.make(id)
           if (item.disabled) {
@@ -95,6 +98,16 @@ export const Plugin = define({
         }
       }
     })
+    yield* ctx.event.subscribe().pipe(
+      Stream.filter((event) => event.type === "config.updated"),
+      Stream.runForEach(() =>
+        load().pipe(
+          Effect.tap((documents) => Effect.sync(() => (loaded.documents = documents))),
+          Effect.andThen(ctx.agent.reload()),
+        ),
+      ),
+      Effect.forkScoped({ startImmediately: true }),
+    )
   }),
 })
 
diff --git a/packages/core/src/config/plugin/external.ts b/packages/core/src/config/plugin/external.ts
index 22f49bbf16..c67f67d481 100644
--- a/packages/core/src/config/plugin/external.ts
+++ b/packages/core/src/config/plugin/external.ts
@@ -2,7 +2,7 @@ export * as ConfigExternalPlugin from "./external"
 
 import type { Plugin as EffectPlugin } from "@opencode-ai/plugin/v2/effect"
 import type { Plugin as PromisePlugin } from "@opencode-ai/plugin/v2/promise"
-import { Effect, Schema } from "effect"
+import { Effect, Schema, Stream } from "effect"
 import path from "path"
 import { fileURLToPath, pathToFileURL } from "url"
 import { Config } from "../../config"
@@ -42,8 +42,9 @@ export const Plugin = define({
     const fs = yield* FSUtil.Service
     const location = yield* Location.Service
     const npm = yield* Npm.Service
-    yield* Effect.gen(function* () {
-      const configured: { package: string; options?: Record<string, any> }[] = []
+    const active = new Set<string>()
+    const load = Effect.fn("ConfigExternalPlugin.load")(function* () {
+      const configured: { package: string; options?: Record<string, unknown> }[] = []
 
       for (const entry of yield* config.entries()) {
         if (entry.type === "document") {
@@ -98,8 +99,8 @@ export const Plugin = define({
         }
       }
 
-      for (const ref of configured) {
-        yield* Effect.gen(function* () {
+      return yield* Effect.forEach(configured, (ref) =>
+        Effect.gen(function* () {
           const entrypoint = path.isAbsolute(ref.package)
             ? pathToFileURL(ref.package).href
             : (yield* npm.add(ref.package)).entrypoint
@@ -108,13 +109,31 @@ export const Plugin = define({
           const mod = yield* Effect.promise(() => import(entrypoint))
           const value = (yield* Schema.decodeUnknownEffect(PluginModule)(mod)).default
           const plugin = "effect" in value ? value : PluginPromise.fromPromise(value)
-          yield* ctx.plugin.add({
+          return {
             id: plugin.id,
-            effect: (host) => plugin.effect({ ...host, options: ref.options ?? {} }),
-          })
-        }).pipe(Effect.ignoreCause)
-      }
+            effect: (host: Parameters<typeof plugin.effect>[0]) =>
+              plugin.effect({ ...host, options: ref.options ?? {} }),
+          }
+        }).pipe(Effect.catchCause(() => Effect.succeed(undefined))),
+      ).pipe(Effect.map((plugins) => plugins.filter((plugin) => plugin !== undefined)))
     })
+    const reconcile = Effect.fn("ConfigExternalPlugin.reconcile")(function* () {
+      const plugins = yield* load()
+      const next = new Set(plugins.map((plugin) => plugin.id))
+      for (const id of active) {
+        if (!next.has(id)) yield* ctx.plugin.remove(id)
+      }
+      for (const plugin of plugins) yield* ctx.plugin.add(plugin)
+      active.clear()
+      for (const id of next) active.add(id)
+    })
+
+    yield* reconcile()
+    yield* ctx.event.subscribe().pipe(
+      Stream.filter((event) => event.type === "config.updated"),
+      Stream.runForEach(() => reconcile()),
+      Effect.forkScoped({ startImmediately: true }),
+    )
   }),
 })
 
diff --git a/packages/core/src/config/plugin/provider.ts b/packages/core/src/config/plugin/provider.ts
index 4992233a1f..d2d6a26029 100644
--- a/packages/core/src/config/plugin/provider.ts
+++ b/packages/core/src/config/plugin/provider.ts
@@ -1,7 +1,7 @@
 export * as ConfigProviderPlugin from "./provider"
 
 import { define } from "../../plugin/internal"
-import { Effect } from "effect"
+import { Effect, Stream } from "effect"
 import { Config } from "../../config"
 import { ModelV2 } from "../../model"
 
@@ -9,14 +9,16 @@ export const Plugin = define({
   id: "config-provider",
   effect: Effect.fn(function* (ctx) {
     const config = yield* Config.Service
-    const entries = yield* config.entries()
-    const files = entries.filter((entry): entry is Config.Document => entry.type === "document")
-    const configuredIntegrations = new Set(
-      files.flatMap((file) =>
-        Object.entries(file.info.providers ?? {}).flatMap(([id, provider]) => (provider.env === undefined ? [] : [id])),
-      ),
-    )
+    const loaded = { entries: yield* config.entries() }
     yield* ctx.integration.transform((integrations) => {
+      const files = loaded.entries.filter((entry): entry is Config.Document => entry.type === "document")
+      const configuredIntegrations = new Set(
+        files.flatMap((file) =>
+          Object.entries(file.info.providers ?? {}).flatMap(([id, provider]) =>
+            provider.env === undefined ? [] : [id],
+          ),
+        ),
+      )
       for (const file of files) {
         for (const [id, item] of Object.entries(file.info.providers ?? {})) {
           const integrationID = id
@@ -34,8 +36,9 @@ export const Plugin = define({
       }
     })
 
-    const configuredDefault = Config.latest(entries, "model")
     yield* ctx.catalog.transform((catalog) => {
+      const files = loaded.entries.filter((entry): entry is Config.Document => entry.type === "document")
+      const configuredDefault = Config.latest(loaded.entries, "model")
       if (configuredDefault !== undefined) {
         const model = ModelV2.parse(configuredDefault)
         catalog.model.default.set(model.providerID, model.modelID)
@@ -105,5 +108,16 @@ export const Plugin = define({
         }
       }
     })
+    yield* ctx.event.subscribe().pipe(
+      Stream.filter((event) => event.type === "config.updated"),
+      Stream.runForEach(() =>
+        config.entries().pipe(
+          Effect.tap((entries) => Effect.sync(() => (loaded.entries = entries))),
+          Effect.andThen(ctx.integration.reload()),
+          Effect.andThen(ctx.catalog.reload()),
+        ),
+      ),
+      Effect.forkScoped({ startImmediately: true }),
+    )
   }),
 })
diff --git a/packages/core/src/config/plugin/reference.ts b/packages/core/src/config/plugin/reference.ts
index 1c599dab7f..d33332f92d 100644
--- a/packages/core/src/config/plugin/reference.ts
+++ b/packages/core/src/config/plugin/reference.ts
@@ -2,7 +2,7 @@ export * as ConfigReferencePlugin from "./reference"
 
 import { define } from "../../plugin/internal"
 import path from "path"
-import { Effect } from "effect"
+import { Effect, Stream } from "effect"
 import { Config } from "../../config"
 import { ConfigReference } from "../reference"
 import { Reference } from "../../reference"
@@ -16,35 +16,48 @@ export const Plugin = define({
     const config = yield* Config.Service
     const location = yield* Location.Service
     const global = yield* Global.Service
-    const entries = new Map<string, Reference.Source>()
-    for (const doc of (yield* config.entries()).filter((entry): entry is Config.Document => entry.type === "document")) {
-      const directory = doc.path ? path.dirname(doc.path) : location.directory
-      for (const [name, entry] of Object.entries(doc.info.references ?? {})) {
-        if (!validAlias(name)) continue
-        const description = typeof entry === "string" ? undefined : entry.description
-        const hidden = typeof entry === "string" ? undefined : entry.hidden
-        entries.set(
-          name,
-          local(entry)
-            ? Reference.LocalSource.make({
-                type: "local",
-                path: AbsolutePath.make(localPath(directory, global.home, typeof entry === "string" ? entry : entry.path)),
-                ...(description === undefined ? {} : { description }),
-                ...(hidden === undefined ? {} : { hidden }),
-              })
-            : Reference.GitSource.make({
-                type: "git",
-                repository: typeof entry === "string" ? entry : entry.repository,
-                ...(entry.branch === undefined ? {} : { branch: entry.branch }),
-                ...(description === undefined ? {} : { description }),
-                ...(hidden === undefined ? {} : { hidden }),
-              }),
-        )
-      }
-    }
+    const loaded = { entries: yield* config.entries() }
     yield* ctx.reference.transform((draft) => {
+      const entries = new Map<string, Reference.Source>()
+      for (const doc of loaded.entries.filter((entry): entry is Config.Document => entry.type === "document")) {
+        const directory = doc.path ? path.dirname(doc.path) : location.directory
+        for (const [name, entry] of Object.entries(doc.info.references ?? {})) {
+          if (!validAlias(name)) continue
+          const description = typeof entry === "string" ? undefined : entry.description
+          const hidden = typeof entry === "string" ? undefined : entry.hidden
+          entries.set(
+            name,
+            local(entry)
+              ? Reference.LocalSource.make({
+                  type: "local",
+                  path: AbsolutePath.make(
+                    localPath(directory, global.home, typeof entry === "string" ? entry : entry.path),
+                  ),
+                  ...(description === undefined ? {} : { description }),
+                  ...(hidden === undefined ? {} : { hidden }),
+                })
+              : Reference.GitSource.make({
+                  type: "git",
+                  repository: typeof entry === "string" ? entry : entry.repository,
+                  ...(entry.branch === undefined ? {} : { branch: entry.branch }),
+                  ...(description === undefined ? {} : { description }),
+                  ...(hidden === undefined ? {} : { hidden }),
+                }),
+          )
+        }
+      }
       for (const [name, source] of entries) draft.add(name, source)
     })
+    yield* ctx.event.subscribe().pipe(
+      Stream.filter((event) => event.type === "config.updated"),
+      Stream.runForEach(() =>
+        config.entries().pipe(
+          Effect.tap((entries) => Effect.sync(() => (loaded.entries = entries))),
+          Effect.andThen(ctx.reference.reload()),
+        ),
+      ),
+      Effect.forkScoped({ startImmediately: true }),
+    )
   }),
 })
 
diff --git a/packages/core/src/config/plugin/skill.ts b/packages/core/src/config/plugin/skill.ts
index c4b7ba95c1..ff83c53ff1 100644
--- a/packages/core/src/config/plugin/skill.ts
+++ b/packages/core/src/config/plugin/skill.ts
@@ -2,7 +2,7 @@ export * as ConfigSkillPlugin from "./skill"
 
 import { define } from "../../plugin/internal"
 import path from "path"
-import { Effect } from "effect"
+import { Effect, Stream } from "effect"
 import { Config } from "../../config"
 import { AbsolutePath } from "../../schema"
 import { SkillV2 } from "../../skill"
@@ -15,10 +15,10 @@ export const Plugin = define({
     const config = yield* Config.Service
     const global = yield* Global.Service
     const location = yield* Location.Service
-    const entries = yield* config.entries()
-    const directories = entries.flatMap((entry) => (entry.type === "directory" ? [entry.path] : []))
-    const items = entries.flatMap((entry) => (entry.type === "document" ? (entry.info.skills ?? []) : []))
+    const loaded = { entries: yield* config.entries() }
     yield* ctx.skill.transform((draft) => {
+      const directories = loaded.entries.flatMap((entry) => (entry.type === "directory" ? [entry.path] : []))
+      const items = loaded.entries.flatMap((entry) => (entry.type === "document" ? (entry.info.skills ?? []) : []))
       for (const directory of directories) {
         draft.source(
           SkillV2.DirectorySource.make({ type: "directory", path: AbsolutePath.make(path.join(directory, "skill")) }),
@@ -44,5 +44,15 @@ export const Plugin = define({
         )
       }
     })
+    yield* ctx.event.subscribe().pipe(
+      Stream.filter((event) => event.type === "config.updated"),
+      Stream.runForEach(() =>
+        config.entries().pipe(
+          Effect.tap((entries) => Effect.sync(() => (loaded.entries = entries))),
+          Effect.andThen(ctx.skill.reload()),
+        ),
+      ),
+      Effect.forkScoped({ startImmediately: true }),
+    )
   }),
 })
diff --git a/packages/core/test/config/reload.test.ts b/packages/core/test/config/reload.test.ts
new file mode 100644
index 0000000000..0ee2f0467e
--- /dev/null
+++ b/packages/core/test/config/reload.test.ts
@@ -0,0 +1,125 @@
+import path from "path"
+import { describe, expect } from "bun:test"
+import { Config as ConfigSchema } from "@opencode-ai/schema/config"
+import { AgentV2 } from "@opencode-ai/core/agent"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { CommandV2 } from "@opencode-ai/core/command"
+import { Config } from "@opencode-ai/core/config"
+import { ConfigAgentPlugin } from "@opencode-ai/core/config/plugin/agent"
+import { ConfigCommandPlugin } from "@opencode-ai/core/config/plugin/command"
+import { ConfigExternalPlugin } from "@opencode-ai/core/config/plugin/external"
+import { ConfigProviderPlugin } from "@opencode-ai/core/config/plugin/provider"
+import { ConfigReferencePlugin } from "@opencode-ai/core/config/plugin/reference"
+import { ConfigSkillPlugin } from "@opencode-ai/core/config/plugin/skill"
+import { EventV2 } from "@opencode-ai/core/event"
+import { Global } from "@opencode-ai/core/global"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { PluginHost } from "@opencode-ai/core/plugin/host"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { Reference } from "@opencode-ai/core/reference"
+import { SkillV2 } from "@opencode-ai/core/skill"
+import { Effect, Schema } from "effect"
+import { testEffect } from "../lib/effect"
+import { PluginTestLayer } from "../plugin/fixture"
+
+const it = testEffect(PluginTestLayer)
+const decode = Schema.decodeUnknownSync(Config.Info)
+const document = path.join(import.meta.dir, "opencode.json")
+
+describe("config plugin reloads", () => {
+  it.live("reloads every config-backed domain", () =>
+    Effect.gen(function* () {
+      const agents = yield* AgentV2.Service
+      const catalog = yield* Catalog.Service
+      const commands = yield* CommandV2.Service
+      const events = yield* EventV2.Service
+      const plugins = yield* PluginV2.Service
+      const references = yield* Reference.Service
+      const skills = yield* SkillV2.Service
+      const host = yield* PluginHost.make(plugins)
+      let entries: Config.Entry[] = [config("first", "First plugin")]
+      const service = Config.Service.of({ entries: () => Effect.sync(() => entries) })
+      const setup = <R>(effect: Effect.Effect<void, never, R>) =>
+        effect.pipe(Effect.provideService(Config.Service, service))
+
+      yield* setup(ConfigAgentPlugin.Plugin.effect(host))
+      yield* setup(ConfigCommandPlugin.Plugin.effect(host))
+      yield* setup(ConfigSkillPlugin.Plugin.effect(host))
+      yield* setup(ConfigReferencePlugin.Plugin.effect(host))
+      yield* setup(ConfigProviderPlugin.Plugin.effect(host))
+      yield* setup(ConfigExternalPlugin.Plugin.effect(host))
+
+      expect((yield* agents.get(AgentV2.ID.make("first")))?.description).toBe("First agent")
+      expect((yield* commands.get("first"))?.description).toBe("First command")
+      expect(
+        (yield* skills.sources()).some((source) => source.type === "directory" && source.path === "/skills/first"),
+      ).toBe(true)
+      expect((yield* references.list()).map((reference) => reference.name)).toEqual(["first"])
+      expect(yield* catalog.provider.get(ProviderV2.ID.make("first"))).toBeDefined()
+      expect((yield* agents.get(AgentV2.ID.make("configured")))?.description).toBe("First plugin")
+
+      entries = [config("second", "Second plugin")]
+      yield* events.publish(ConfigSchema.Event.Updated, {})
+      yield* waitUntil(
+        Effect.gen(function* () {
+          return (
+            (yield* agents.get(AgentV2.ID.make("first"))) === undefined &&
+            (yield* agents.get(AgentV2.ID.make("second")))?.description === "Second agent" &&
+            (yield* commands.get("first")) === undefined &&
+            (yield* commands.get("second"))?.description === "Second command" &&
+            (yield* references.list()).some((reference) => reference.name === "second") &&
+            (yield* catalog.provider.get(ProviderV2.ID.make("first"))) === undefined &&
+            (yield* catalog.provider.get(ProviderV2.ID.make("second"))) !== undefined &&
+            (yield* agents.get(AgentV2.ID.make("configured")))?.description === "Second plugin"
+          )
+        }),
+      )
+
+      expect(
+        (yield* skills.sources()).some((source) => source.type === "directory" && source.path === "/skills/first"),
+      ).toBe(false)
+      expect(
+        (yield* skills.sources()).some((source) => source.type === "directory" && source.path === "/skills/second"),
+      ).toBe(true)
+
+      entries = [config("second")]
+      yield* events.publish(ConfigSchema.Event.Updated, {})
+      yield* waitUntil(agents.get(AgentV2.ID.make("configured")).pipe(Effect.map((agent) => agent === undefined)))
+    }).pipe(Effect.provideService(Global.Service, Global.Service.of(Global.make()))),
+  )
+})
+
+function config(name: string, pluginDescription?: string) {
+  return new Config.Document({
+    type: "document",
+    path: document,
+    info: decode({
+      agents: { [name]: { description: `${title(name)} agent`, mode: "subagent" } },
+      commands: { [name]: { template: `${title(name)} command`, description: `${title(name)} command` } },
+      skills: [`/skills/${name}`],
+      references: { [name]: `/references/${name}` },
+      providers: { [name]: { models: { chat: { name: `${title(name)} model` } } } },
+      plugins:
+        pluginDescription === undefined
+          ? []
+          : [
+              {
+                package: "../plugin/fixtures/config-promise-plugin.ts",
+                options: { description: pluginDescription },
+              },
+            ],
+    }),
+  })
+}
+
+function title(value: string) {
+  return value.charAt(0).toUpperCase() + value.slice(1)
+}
+
+const waitUntil = Effect.fnUntraced(function* (condition: Effect.Effect<boolean>) {
+  for (let attempt = 0; attempt < 100; attempt++) {
+    if (yield* condition) return
+    yield* Effect.sleep("10 millis")
+  }
+  return yield* Effect.die("Timed out waiting for config plugin reloads")
+})

From 35ed09ff37ec23c5b8dd62de41af76f8d6c0999b Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Fri, 3 Jul 2026 22:26:54 -0400
Subject: [PATCH 38/82] fix(tui): improve MCP error details (#35263)

---
 packages/tui/src/app.tsx                  |   4 +-
 packages/tui/src/component/dialog-mcp.tsx | 132 +++++++++++++++++-----
 2 files changed, 108 insertions(+), 28 deletions(-)

diff --git a/packages/tui/src/app.tsx b/packages/tui/src/app.tsx
index d5cf93c2c7..a3b2c31973 100644
--- a/packages/tui/src/app.tsx
+++ b/packages/tui/src/app.tsx
@@ -409,8 +409,8 @@ function App(props: { onSnapshot?: () => Promise<string[]>; pluginHost: TuiPlugi
       else
         toast.show({
           variant: "error",
-          title: "MCP server failed to connect",
-          message: `${server.name}: ${status.error}`,
+          title: `MCP server failed: ${server.name}`,
+          message: "Open MCPs to view details.",
         })
     }
   })
diff --git a/packages/tui/src/component/dialog-mcp.tsx b/packages/tui/src/component/dialog-mcp.tsx
index 004e4a6e15..003c207be0 100644
--- a/packages/tui/src/component/dialog-mcp.tsx
+++ b/packages/tui/src/component/dialog-mcp.tsx
@@ -1,12 +1,17 @@
 import { createEffect, createMemo, createSignal, onMount, Show } from "solid-js"
-import { createStore } from "solid-js/store"
 import { useData } from "../context/data"
 import { pipe, sortBy } from "remeda"
-import { DialogSelect, type DialogSelectRef } from "../ui/dialog-select"
+import { DialogSelect } from "../ui/dialog-select"
 import { useDialog } from "../ui/dialog"
 import { useTheme, type Theme } from "../context/theme"
-import { TextAttributes } from "@opentui/core"
+import { TextAttributes, type ScrollBoxRenderable } from "@opentui/core"
 import type { McpServer } from "@opencode-ai/sdk/v2"
+import { useClipboard } from "../context/clipboard"
+import { useToast } from "../ui/toast"
+import { useKeyboard, useTerminalDimensions } from "@opentui/solid"
+import { useTuiConfig } from "../config"
+import { getScrollAcceleration } from "../util/scroll"
+import { useBindings } from "../keymap"
 
 // Sort by how much attention a server needs: auth prompts first, then failures,
 // then healthy servers, and intentionally-off servers last.
@@ -31,9 +36,8 @@ export function DialogMcp() {
   const data = useData()
   const dialog = useDialog()
   const { theme } = useTheme()
-  const [expanded, setExpanded] = createStore<Record<string, boolean>>({})
   const [focused, setFocused] = createSignal<string>()
-  const [, setRef] = createSignal<DialogSelectRef<unknown>>()
+  const [detail, setDetail] = createSignal<McpServer>()
 
   onMount(() => {
     dialog.setSize("large")
@@ -66,9 +70,6 @@ export function DialogMcp() {
             {meta.icon} {meta.label}
           </span>
         ),
-        details: meta.error && expanded[server.name] ? [meta.error] : undefined,
-        detailsColor: theme.error,
-        detailsWrap: true,
       }
     }),
   )
@@ -79,24 +80,103 @@ export function DialogMcp() {
     return server ? statusMeta(server.status, theme).error : undefined
   })
 
+  const open = (name: string | undefined) => {
+    const server = servers().find((entry) => entry.name === name)
+    if (!server || !statusMeta(server.status, theme).error) return
+    setDetail(server)
+  }
+
   return (
-    <DialogSelect
-      ref={setRef}
-      title="MCPs"
-      options={options()}
-      preserveSelection
-      onMove={(option) => setFocused(option.value as string)}
-      onSelect={(option) => {
-        const name = option.value as string
-        const server = servers().find((entry) => entry.name === name)
-        if (!server || !statusMeta(server.status, theme).error) return
-        setExpanded(name, (open) => !open)
-      }}
-      footer={
-        <Show when={focusedError()}>
-          <text fg={theme.textMuted}>enter to {expanded[focused()!] ? "hide" : "view"} error</text>
-        </Show>
-      }
-    />
+    <box>
+      <Show
+        when={detail()}
+        fallback={
+          <DialogSelect
+            title="MCPs"
+            options={options()}
+            current={focused()}
+            preserveSelection
+            onMove={(option) => setFocused(option.value as string)}
+            onSelect={(option) => open(option.value as string)}
+            footer={
+              <Show when={focusedError()}>
+                <text fg={theme.textMuted}>enter to view error</text>
+              </Show>
+            }
+          />
+        }
+      >
+        {(server) => <DialogMcpError server={server()} onBack={() => setDetail()} />}
+      </Show>
+    </box>
+  )
+}
+
+function DialogMcpError(props: { server: McpServer; onBack: () => void }) {
+  const dialog = useDialog()
+  const clipboard = useClipboard()
+  const toast = useToast()
+  const { theme } = useTheme()
+  const dimensions = useTerminalDimensions()
+  const tuiConfig = useTuiConfig()
+  const [copied, setCopied] = createSignal(false)
+  const error = () => statusMeta(props.server.status, theme).error ?? "Unknown MCP connection error"
+  const height = createMemo(() => Math.max(3, Math.floor(dimensions().height / 2) - 5))
+  let scroll: ScrollBoxRenderable | undefined
+
+  onMount(() => dialog.setSize("large"))
+
+  const copy = () => {
+    if (!clipboard.write) return
+    void clipboard
+      .write(error())
+      .then(() => setCopied(true))
+      .catch(toast.error)
+  }
+
+  useBindings(() => ({
+    bindings: [{ key: "escape", desc: "Back to MCP servers", group: "Dialog", cmd: props.onBack }],
+  }))
+
+  useKeyboard((event) => {
+    if (event.name === "c") return copy()
+    if (event.name === "up") return scroll?.scrollBy(-1)
+    if (event.name === "down") return scroll?.scrollBy(1)
+    if (event.name === "pageup") return scroll?.scrollBy(-height())
+    if (event.name === "pagedown") return scroll?.scrollBy(height())
+    if (event.name === "home") return scroll?.scrollTo(0)
+    if (event.name === "end" && scroll) return scroll.scrollTo(scroll.scrollHeight)
+  })
+
+  return (
+    <box paddingLeft={4} paddingRight={4} paddingBottom={1} gap={1}>
+      <box flexDirection="row" justifyContent="space-between">
+        <text attributes={TextAttributes.BOLD} fg={theme.text}>
+          MCP / {props.server.name}
+        </text>
+        <text fg={theme.textMuted} onMouseUp={props.onBack}>
+          esc back
+        </text>
+      </box>
+      <text fg={theme.error}>✗ Failed</text>
+      <box backgroundColor={theme.backgroundElement} paddingLeft={2} paddingRight={2} paddingTop={1} paddingBottom={1}>
+        <scrollbox
+          ref={(element: ScrollBoxRenderable) => (scroll = element)}
+          height={height()}
+          scrollbarOptions={{ visible: false }}
+          scrollAcceleration={getScrollAcceleration(tuiConfig)}
+        >
+          <text fg={theme.text} wrapMode="word">
+            {error()}
+          </text>
+        </scrollbox>
+      </box>
+      <box flexDirection="row" justifyContent="space-between">
+        <text fg={theme.textMuted}>↑↓ scroll</text>
+        <text fg={theme.textMuted} onMouseUp={copy}>
+          {copied() ? "✓ copied" : "c copy details"}
+        </text>
+      </box>
+    </box>
   )
 }

From e2faeb84e528514c4ff4c5848deff0541568f3c2 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Fri, 3 Jul 2026 22:37:42 -0400
Subject: [PATCH 39/82] fix(core): tolerate minimal FSWatcher typings (#35264)

---
 packages/core/src/filesystem/watcher.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/filesystem/watcher.ts b/packages/core/src/filesystem/watcher.ts
index 2febe93b76..9a72903d84 100644
--- a/packages/core/src/filesystem/watcher.ts
+++ b/packages/core/src/filesystem/watcher.ts
@@ -89,9 +89,11 @@ const layer = Layer.effect(
                     type: "update",
                   } satisfies Update)
                 })
-                subscription.on("error", (error) =>
-                  Effect.runFork(Effect.logError("watcher callback failed", { path: target, error })),
-                )
+                if ("on" in subscription && typeof subscription.on === "function") {
+                  subscription.on("error", (error: unknown) =>
+                    Effect.runFork(Effect.logError("watcher callback failed", { path: target, error })),
+                  )
+                }
                 return { unsubscribe: () => Promise.resolve(subscription.close()) }
               })
             : subscribeDirectory(native, backend, directory, ignore, pubsub)

From afe3ebbc35731131893b98893e8fadfbcf4562dd Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Fri, 3 Jul 2026 23:12:06 -0400
Subject: [PATCH 40/82] fix(core): bust external plugin import cache

---
 packages/core/src/config/plugin/external.ts | 19 +++++-
 packages/core/test/config/plugin.test.ts    | 73 +++++++++++++++++++++
 2 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/config/plugin/external.ts b/packages/core/src/config/plugin/external.ts
index c67f67d481..29a63396a9 100644
--- a/packages/core/src/config/plugin/external.ts
+++ b/packages/core/src/config/plugin/external.ts
@@ -3,6 +3,7 @@ export * as ConfigExternalPlugin from "./external"
 import type { Plugin as EffectPlugin } from "@opencode-ai/plugin/v2/effect"
 import type { Plugin as PromisePlugin } from "@opencode-ai/plugin/v2/promise"
 import { Effect, Schema, Stream } from "effect"
+import { createRequire } from "node:module"
 import path from "path"
 import { fileURLToPath, pathToFileURL } from "url"
 import { Config } from "../../config"
@@ -35,6 +36,9 @@ const PluginPackage = Schema.Struct({
   module: Schema.optional(Schema.String),
 })
 
+let importGeneration = 0
+const moduleCache = createRequire(import.meta.url).cache
+
 export const Plugin = define({
   id: "config-plugin",
   effect: Effect.fn(function* (ctx) {
@@ -106,7 +110,7 @@ export const Plugin = define({
             : (yield* npm.add(ref.package)).entrypoint
           if (!entrypoint) return
           yield* Effect.log({ msg: "loading plugin", id: ref.package, entrypoint })
-          const mod = yield* Effect.promise(() => import(entrypoint))
+          const mod = yield* Effect.promise(() => import(cacheBust(entrypoint)))
           const value = (yield* Schema.decodeUnknownEffect(PluginModule)(mod)).default
           const plugin = "effect" in value ? value : PluginPromise.fromPromise(value)
           return {
@@ -114,7 +118,11 @@ export const Plugin = define({
             effect: (host: Parameters<typeof plugin.effect>[0]) =>
               plugin.effect({ ...host, options: ref.options ?? {} }),
           }
-        }).pipe(Effect.catchCause(() => Effect.succeed(undefined))),
+        }).pipe(
+          Effect.catchCause((cause) =>
+            Effect.logError("failed to load plugin", { package: ref.package, cause }).pipe(Effect.as(undefined)),
+          ),
+        ),
       ).pipe(Effect.map((plugins) => plugins.filter((plugin) => plugin !== undefined)))
     })
     const reconcile = Effect.fn("ConfigExternalPlugin.reconcile")(function* () {
@@ -137,6 +145,13 @@ export const Plugin = define({
   }),
 })
 
+function cacheBust(entrypoint: string) {
+  const url = path.isAbsolute(entrypoint) ? pathToFileURL(entrypoint) : new URL(entrypoint)
+  if (url.protocol === "file:") delete moduleCache[fileURLToPath(url)]
+  url.searchParams.set("opencode-reload", String(++importGeneration))
+  return url.href
+}
+
 const resolvePackageEntrypoint = Effect.fnUntraced(function* (fs: FSUtil.Interface, directory: string) {
   const pkg = yield* fs.readJson(path.join(directory, "package.json")).pipe(
     Effect.flatMap(Schema.decodeUnknownEffect(PluginPackage)),
diff --git a/packages/core/test/config/plugin.test.ts b/packages/core/test/config/plugin.test.ts
index b72a62df8a..8a28077c3e 100644
--- a/packages/core/test/config/plugin.test.ts
+++ b/packages/core/test/config/plugin.test.ts
@@ -1,15 +1,19 @@
+import fs from "fs/promises"
 import path from "path"
 import { describe, expect } from "bun:test"
+import { Config as ConfigSchema } from "@opencode-ai/schema/config"
 import { Effect, Schema } from "effect"
 import { AgentV2 } from "@opencode-ai/core/agent"
 import { Config } from "@opencode-ai/core/config"
 import { ConfigExternalPlugin } from "@opencode-ai/core/config/plugin/external"
+import { EventV2 } from "@opencode-ai/core/event"
 import { FSUtil } from "@opencode-ai/core/fs-util"
 import { Location } from "@opencode-ai/core/location"
 import { Npm } from "@opencode-ai/core/npm"
 import { PluginV2 } from "@opencode-ai/core/plugin"
 import { PluginHost } from "@opencode-ai/core/plugin/host"
 import { AbsolutePath } from "@opencode-ai/core/schema"
+import { tmpdir } from "../fixture/tmpdir"
 import { testEffect } from "../lib/effect"
 import { PluginTestLayer } from "../plugin/fixture"
 
@@ -240,6 +244,49 @@ describe("ConfigExternalPlugin", () => {
       })
     }),
   )
+
+  it.live("reloads changed plugin source from the same entrypoint", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          const plugins = yield* PluginV2.Service
+          const agents = yield* AgentV2.Service
+          const events = yield* EventV2.Service
+          const fsUtil = yield* FSUtil.Service
+          const location = yield* Location.Service
+          const npm = yield* Npm.Service
+          const host = yield* PluginHost.make(plugins)
+          const plugin = path.join(tmp.path, "plugin.ts")
+          const config = Config.Service.of({
+            entries: () =>
+              Effect.succeed([
+                new Config.Document({
+                  type: "document",
+                  info: decode({ plugins: [plugin] }),
+                }),
+              ]),
+          })
+
+          yield* Effect.promise(() => fs.writeFile(plugin, pluginSource("First source")))
+          yield* ConfigExternalPlugin.Plugin.effect(host).pipe(
+            Effect.provideService(PluginV2.Service, plugins),
+            Effect.provideService(FSUtil.Service, fsUtil),
+            Effect.provideService(Location.Service, location),
+            Effect.provideService(Npm.Service, npm),
+            Effect.provideService(Config.Service, config),
+          )
+          expect((yield* waitForAgent(agents, "hot-reload"))?.description).toBe("First source")
+
+          yield* Effect.promise(() => fs.writeFile(plugin, pluginSource("Second source")))
+          yield* events.publish(ConfigSchema.Event.Updated, {})
+          expect(yield* waitForAgentDescription(agents, "hot-reload", "Second source")).toBe(true)
+        }),
+      ),
+    ),
+  )
 })
 
 const waitForAgent = Effect.fnUntraced(function* (agents: AgentV2.Interface, id: string) {
@@ -250,3 +297,29 @@ const waitForAgent = Effect.fnUntraced(function* (agents: AgentV2.Interface, id:
   }
   return yield* Effect.die(`Timed out waiting for agent ${id}`)
 })
+
+const waitForAgentDescription = Effect.fnUntraced(function* (
+  agents: AgentV2.Interface,
+  id: string,
+  description: string,
+) {
+  for (let attempt = 0; attempt < 100; attempt++) {
+    if ((yield* agents.get(AgentV2.ID.make(id)))?.description === description) return true
+    yield* Effect.sleep("10 millis")
+  }
+  return false
+})
+
+function pluginSource(description: string) {
+  return `export default {
+  id: "source-hot-reload",
+  setup: async (ctx) => {
+    await ctx.agent.transform((agents) => {
+      agents.update("hot-reload", (agent) => {
+        agent.description = ${JSON.stringify(description)}
+        agent.mode = "subagent"
+      })
+    })
+  },
+}`
+}

From 3baaabede864451a8152ead3654b87ccea28866f Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Fri, 3 Jul 2026 23:00:10 -0500
Subject: [PATCH 41/82] fix(core): resolve mcp header env placeholders (#35236)

---
 packages/core/src/config.ts              |  4 +-
 packages/core/src/config/variable.ts     | 85 ++++++++++++++++++++++++
 packages/core/test/config/config.test.ts | 66 ++++++++++++++++++
 3 files changed, 154 insertions(+), 1 deletion(-)
 create mode 100644 packages/core/src/config/variable.ts

diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
index 9e829fb740..48c380aef3 100644
--- a/packages/core/src/config.ts
+++ b/packages/core/src/config.ts
@@ -23,6 +23,7 @@ import { ConfigPlugin } from "./config/plugin"
 import { ConfigProvider } from "./config/provider"
 import { ConfigReference } from "./config/reference"
 import { ConfigToolOutput } from "./config/tool-output"
+import { ConfigVariable } from "./config/variable"
 import { ConfigWatcher } from "./config/watcher"
 import { ConfigV1 } from "./v1/config/config"
 import { ConfigMigrateV1 } from "./v1/config/migrate"
@@ -148,9 +149,10 @@ const layer = Layer.effect(
     const loadFile = Effect.fnUntraced(function* (filepath: string) {
       const text = yield* fs.readFileStringSafe(filepath)
       if (!text) return
+      const substituted = yield* ConfigVariable.substitute({ type: "path", path: filepath, text })
 
       const errors: ParseError[] = []
-      const input: unknown = parse(text, errors, { allowTrailingComma: true })
+      const input: unknown = parse(substituted, errors, { allowTrailingComma: true })
       if (errors.length) return
 
       const info = Option.getOrUndefined(
diff --git a/packages/core/src/config/variable.ts b/packages/core/src/config/variable.ts
new file mode 100644
index 0000000000..3bb1d22dd3
--- /dev/null
+++ b/packages/core/src/config/variable.ts
@@ -0,0 +1,85 @@
+export * as ConfigVariable from "./variable"
+
+import os from "os"
+import path from "path"
+import { Effect } from "effect"
+import { FSUtil } from "../fs-util"
+import { InvalidError } from "../v1/config/error"
+
+type ParseSource =
+  | {
+      type: "path"
+      path: string
+    }
+  | {
+      type: "virtual"
+      source: string
+      dir: string
+    }
+
+type SubstituteInput = ParseSource & {
+  text: string
+  missing?: "error" | "empty"
+  env?: Record<string, string>
+}
+
+/** Apply {env:VAR} and {file:path} substitutions to config text. */
+export const substitute = Effect.fn("ConfigVariable.substitute")(function* (input: SubstituteInput) {
+  const text = input.text.replace(
+    /\{env:([^}]+)\}/g,
+    (_, varName: string) => (input.env?.[varName] ?? process.env[varName]) || "",
+  )
+  if (!text.includes("{file:")) return text
+  return yield* substituteFiles(input, text)
+})
+
+const substituteFiles = Effect.fnUntraced(function* (input: SubstituteInput, text: string) {
+  const fs = yield* FSUtil.Service
+  const configDir = input.type === "path" ? path.dirname(input.path) : input.dir
+  const configSource = input.type === "path" ? input.path : input.source
+  const matches = Array.from(text.matchAll(/\{file:[^}]+\}/g))
+  let out = ""
+  let cursor = 0
+
+  for (const match of matches) {
+    const token = match[0]
+    const index = match.index
+    out += text.slice(cursor, index)
+
+    const lineStart = text.lastIndexOf("\n", index - 1) + 1
+    const prefix = text.slice(lineStart, index).trimStart()
+    if (prefix.startsWith("//")) {
+      out += token
+      cursor = index + token.length
+      continue
+    }
+
+    const filePath = token.replace(/^\{file:/, "").replace(/\}$/, "")
+    const expandedPath = filePath.startsWith("~/") ? path.join(os.homedir(), filePath.slice(2)) : filePath
+    const resolvedPath = path.isAbsolute(expandedPath) ? expandedPath : path.resolve(configDir, expandedPath)
+    const fileContent = yield* fs.readFileString(resolvedPath).pipe(
+      Effect.catch((error) => {
+        if (input.missing === "empty") return Effect.succeed("")
+
+        const message = `bad file reference: "${token}"`
+        return Effect.fail(
+          new InvalidError(
+            {
+              path: configSource,
+              message:
+                error._tag === "PlatformError" && error.reason._tag === "NotFound"
+                  ? `${message} ${resolvedPath} does not exist`
+                  : message,
+            },
+            { cause: error },
+          ),
+        )
+      }),
+    )
+
+    out += JSON.stringify(fileContent.trim()).slice(1, -1)
+    cursor = index + token.length
+  }
+
+  return out + text.slice(cursor)
+})
diff --git a/packages/core/test/config/config.test.ts b/packages/core/test/config/config.test.ts
index f3c7b20909..edf18d5add 100644
--- a/packages/core/test/config/config.test.ts
+++ b/packages/core/test/config/config.test.ts
@@ -292,6 +292,72 @@ describe("Config", () => {
     ),
   )
 
+  it.live("substitutes environment variables and relative file contents", () =>
+    Effect.acquireUseRelease(
+      Effect.sync(() => {
+        const previous = {
+          token: process.env.OPENCODE_TEST_MCP_TOKEN,
+          missing: process.env.OPENCODE_TEST_MISSING,
+        }
+        process.env.OPENCODE_TEST_MCP_TOKEN = "secret"
+        delete process.env.OPENCODE_TEST_MISSING
+        return previous
+      }),
+      () =>
+        Effect.acquireUseRelease(
+          Effect.promise(() => tmpdir()),
+          (tmp) =>
+            Effect.gen(function* () {
+              yield* Effect.promise(() =>
+                Promise.all([
+                  fs.writeFile(path.join(tmp.path, "token.txt"), 'file\n"token"\n'),
+                  fs.writeFile(
+                    path.join(tmp.path, "opencode.jsonc"),
+                    `{
+                      // Ignored reference: {file:missing.txt}
+                      "username": "user-{env:OPENCODE_TEST_MISSING}",
+                      "mcp": {
+                        "servers": {
+                          "remote": {
+                            "type": "remote",
+                            "url": "https://example.com/mcp",
+                            "headers": {
+                              "Authorization": "Bearer {env:OPENCODE_TEST_MCP_TOKEN}",
+                              "X-Token": "{file:token.txt}"
+                            }
+                          }
+                        }
+                      }
+                    }`,
+                  ),
+                ]),
+              )
+
+              return yield* Effect.gen(function* () {
+                const config = yield* Config.Service
+                const document = (yield* config.entries()).find((entry) => entry.type === "document")
+                expect(document?.info.username).toBe("user-")
+                const remote = document?.info.mcp?.servers?.remote
+                expect(remote?.type).toBe("remote")
+                if (remote?.type !== "remote") return
+                expect(remote.headers).toEqual({
+                  Authorization: "Bearer secret",
+                  "X-Token": 'file\n"token"',
+                })
+              }).pipe(Effect.provide(testLayer(tmp.path)))
+            }),
+          (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+        ),
+      (previous) =>
+        Effect.sync(() => {
+          if (previous.token === undefined) delete process.env.OPENCODE_TEST_MCP_TOKEN
+          else process.env.OPENCODE_TEST_MCP_TOKEN = previous.token
+          if (previous.missing === undefined) delete process.env.OPENCODE_TEST_MISSING
+          else process.env.OPENCODE_TEST_MISSING = previous.missing
+        }),
+    ),
+  )
+
   it.live("does not load legacy config.json files", () =>
     Effect.acquireRelease(
       Effect.promise(() => tmpdir()),

From f66c8292316184e536fc1b725469f026a0357594 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Sat, 4 Jul 2026 01:54:30 -0400
Subject: [PATCH 42/82] Revert "fix(core): bust external plugin import cache"

This reverts commit afe3ebbc35731131893b98893e8fadfbcf4562dd.
---
 packages/core/src/config/plugin/external.ts | 19 +-----
 packages/core/test/config/plugin.test.ts    | 73 ---------------------
 2 files changed, 2 insertions(+), 90 deletions(-)

diff --git a/packages/core/src/config/plugin/external.ts b/packages/core/src/config/plugin/external.ts
index 29a63396a9..c67f67d481 100644
--- a/packages/core/src/config/plugin/external.ts
+++ b/packages/core/src/config/plugin/external.ts
@@ -3,7 +3,6 @@ export * as ConfigExternalPlugin from "./external"
 import type { Plugin as EffectPlugin } from "@opencode-ai/plugin/v2/effect"
 import type { Plugin as PromisePlugin } from "@opencode-ai/plugin/v2/promise"
 import { Effect, Schema, Stream } from "effect"
-import { createRequire } from "node:module"
 import path from "path"
 import { fileURLToPath, pathToFileURL } from "url"
 import { Config } from "../../config"
@@ -36,9 +35,6 @@ const PluginPackage = Schema.Struct({
   module: Schema.optional(Schema.String),
 })
 
-let importGeneration = 0
-const moduleCache = createRequire(import.meta.url).cache
-
 export const Plugin = define({
   id: "config-plugin",
   effect: Effect.fn(function* (ctx) {
@@ -110,7 +106,7 @@ export const Plugin = define({
             : (yield* npm.add(ref.package)).entrypoint
           if (!entrypoint) return
           yield* Effect.log({ msg: "loading plugin", id: ref.package, entrypoint })
-          const mod = yield* Effect.promise(() => import(cacheBust(entrypoint)))
+          const mod = yield* Effect.promise(() => import(entrypoint))
           const value = (yield* Schema.decodeUnknownEffect(PluginModule)(mod)).default
           const plugin = "effect" in value ? value : PluginPromise.fromPromise(value)
           return {
@@ -118,11 +114,7 @@ export const Plugin = define({
             effect: (host: Parameters<typeof plugin.effect>[0]) =>
               plugin.effect({ ...host, options: ref.options ?? {} }),
           }
-        }).pipe(
-          Effect.catchCause((cause) =>
-            Effect.logError("failed to load plugin", { package: ref.package, cause }).pipe(Effect.as(undefined)),
-          ),
-        ),
+        }).pipe(Effect.catchCause(() => Effect.succeed(undefined))),
       ).pipe(Effect.map((plugins) => plugins.filter((plugin) => plugin !== undefined)))
     })
     const reconcile = Effect.fn("ConfigExternalPlugin.reconcile")(function* () {
@@ -145,13 +137,6 @@ export const Plugin = define({
   }),
 })
 
-function cacheBust(entrypoint: string) {
-  const url = path.isAbsolute(entrypoint) ? pathToFileURL(entrypoint) : new URL(entrypoint)
-  if (url.protocol === "file:") delete moduleCache[fileURLToPath(url)]
-  url.searchParams.set("opencode-reload", String(++importGeneration))
-  return url.href
-}
-
 const resolvePackageEntrypoint = Effect.fnUntraced(function* (fs: FSUtil.Interface, directory: string) {
   const pkg = yield* fs.readJson(path.join(directory, "package.json")).pipe(
     Effect.flatMap(Schema.decodeUnknownEffect(PluginPackage)),
diff --git a/packages/core/test/config/plugin.test.ts b/packages/core/test/config/plugin.test.ts
index 8a28077c3e..b72a62df8a 100644
--- a/packages/core/test/config/plugin.test.ts
+++ b/packages/core/test/config/plugin.test.ts
@@ -1,19 +1,15 @@
-import fs from "fs/promises"
 import path from "path"
 import { describe, expect } from "bun:test"
-import { Config as ConfigSchema } from "@opencode-ai/schema/config"
 import { Effect, Schema } from "effect"
 import { AgentV2 } from "@opencode-ai/core/agent"
 import { Config } from "@opencode-ai/core/config"
 import { ConfigExternalPlugin } from "@opencode-ai/core/config/plugin/external"
-import { EventV2 } from "@opencode-ai/core/event"
 import { FSUtil } from "@opencode-ai/core/fs-util"
 import { Location } from "@opencode-ai/core/location"
 import { Npm } from "@opencode-ai/core/npm"
 import { PluginV2 } from "@opencode-ai/core/plugin"
 import { PluginHost } from "@opencode-ai/core/plugin/host"
 import { AbsolutePath } from "@opencode-ai/core/schema"
-import { tmpdir } from "../fixture/tmpdir"
 import { testEffect } from "../lib/effect"
 import { PluginTestLayer } from "../plugin/fixture"
 
@@ -244,49 +240,6 @@ describe("ConfigExternalPlugin", () => {
       })
     }),
   )
-
-  it.live("reloads changed plugin source from the same entrypoint", () =>
-    Effect.acquireRelease(
-      Effect.promise(() => tmpdir()),
-      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
-    ).pipe(
-      Effect.flatMap((tmp) =>
-        Effect.gen(function* () {
-          const plugins = yield* PluginV2.Service
-          const agents = yield* AgentV2.Service
-          const events = yield* EventV2.Service
-          const fsUtil = yield* FSUtil.Service
-          const location = yield* Location.Service
-          const npm = yield* Npm.Service
-          const host = yield* PluginHost.make(plugins)
-          const plugin = path.join(tmp.path, "plugin.ts")
-          const config = Config.Service.of({
-            entries: () =>
-              Effect.succeed([
-                new Config.Document({
-                  type: "document",
-                  info: decode({ plugins: [plugin] }),
-                }),
-              ]),
-          })
-
-          yield* Effect.promise(() => fs.writeFile(plugin, pluginSource("First source")))
-          yield* ConfigExternalPlugin.Plugin.effect(host).pipe(
-            Effect.provideService(PluginV2.Service, plugins),
-            Effect.provideService(FSUtil.Service, fsUtil),
-            Effect.provideService(Location.Service, location),
-            Effect.provideService(Npm.Service, npm),
-            Effect.provideService(Config.Service, config),
-          )
-          expect((yield* waitForAgent(agents, "hot-reload"))?.description).toBe("First source")
-
-          yield* Effect.promise(() => fs.writeFile(plugin, pluginSource("Second source")))
-          yield* events.publish(ConfigSchema.Event.Updated, {})
-          expect(yield* waitForAgentDescription(agents, "hot-reload", "Second source")).toBe(true)
-        }),
-      ),
-    ),
-  )
 })
 
 const waitForAgent = Effect.fnUntraced(function* (agents: AgentV2.Interface, id: string) {
@@ -297,29 +250,3 @@ const waitForAgent = Effect.fnUntraced(function* (agents: AgentV2.Interface, id:
   }
   return yield* Effect.die(`Timed out waiting for agent ${id}`)
 })
-
-const waitForAgentDescription = Effect.fnUntraced(function* (
-  agents: AgentV2.Interface,
-  id: string,
-  description: string,
-) {
-  for (let attempt = 0; attempt < 100; attempt++) {
-    if ((yield* agents.get(AgentV2.ID.make(id)))?.description === description) return true
-    yield* Effect.sleep("10 millis")
-  }
-  return false
-})
-
-function pluginSource(description: string) {
-  return `export default {
-  id: "source-hot-reload",
-  setup: async (ctx) => {
-    await ctx.agent.transform((agents) => {
-      agents.update("hot-reload", (agent) => {
-        agent.description = ${JSON.stringify(description)}
-        agent.mode = "subagent"
-      })
-    })
-  },
-}`
-}

From 8e0856c43bf7143cc646cccd8e3c512f49e6c8bc Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Sat, 4 Jul 2026 01:58:17 -0400
Subject: [PATCH 43/82] fix(core): disable external plugin hot reload

---
 packages/core/src/config/plugin/external.ts | 21 ++-------------------
 packages/core/test/config/reload.test.ts    | 10 +++-------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/packages/core/src/config/plugin/external.ts b/packages/core/src/config/plugin/external.ts
index c67f67d481..70271dec23 100644
--- a/packages/core/src/config/plugin/external.ts
+++ b/packages/core/src/config/plugin/external.ts
@@ -2,7 +2,7 @@ export * as ConfigExternalPlugin from "./external"
 
 import type { Plugin as EffectPlugin } from "@opencode-ai/plugin/v2/effect"
 import type { Plugin as PromisePlugin } from "@opencode-ai/plugin/v2/promise"
-import { Effect, Schema, Stream } from "effect"
+import { Effect, Schema } from "effect"
 import path from "path"
 import { fileURLToPath, pathToFileURL } from "url"
 import { Config } from "../../config"
@@ -42,7 +42,6 @@ export const Plugin = define({
     const fs = yield* FSUtil.Service
     const location = yield* Location.Service
     const npm = yield* Npm.Service
-    const active = new Set<string>()
     const load = Effect.fn("ConfigExternalPlugin.load")(function* () {
       const configured: { package: string; options?: Record<string, unknown> }[] = []
 
@@ -117,23 +116,7 @@ export const Plugin = define({
         }).pipe(Effect.catchCause(() => Effect.succeed(undefined))),
       ).pipe(Effect.map((plugins) => plugins.filter((plugin) => plugin !== undefined)))
     })
-    const reconcile = Effect.fn("ConfigExternalPlugin.reconcile")(function* () {
-      const plugins = yield* load()
-      const next = new Set(plugins.map((plugin) => plugin.id))
-      for (const id of active) {
-        if (!next.has(id)) yield* ctx.plugin.remove(id)
-      }
-      for (const plugin of plugins) yield* ctx.plugin.add(plugin)
-      active.clear()
-      for (const id of next) active.add(id)
-    })
-
-    yield* reconcile()
-    yield* ctx.event.subscribe().pipe(
-      Stream.filter((event) => event.type === "config.updated"),
-      Stream.runForEach(() => reconcile()),
-      Effect.forkScoped({ startImmediately: true }),
-    )
+    for (const plugin of yield* load()) yield* ctx.plugin.add(plugin)
   }),
 })
 
diff --git a/packages/core/test/config/reload.test.ts b/packages/core/test/config/reload.test.ts
index 0ee2f0467e..3550bddb95 100644
--- a/packages/core/test/config/reload.test.ts
+++ b/packages/core/test/config/reload.test.ts
@@ -27,7 +27,7 @@ const decode = Schema.decodeUnknownSync(Config.Info)
 const document = path.join(import.meta.dir, "opencode.json")
 
 describe("config plugin reloads", () => {
-  it.live("reloads every config-backed domain", () =>
+  it.live("reloads config-backed domains without reloading external plugins", () =>
     Effect.gen(function* () {
       const agents = yield* AgentV2.Service
       const catalog = yield* Catalog.Service
@@ -69,8 +69,7 @@ describe("config plugin reloads", () => {
             (yield* commands.get("second"))?.description === "Second command" &&
             (yield* references.list()).some((reference) => reference.name === "second") &&
             (yield* catalog.provider.get(ProviderV2.ID.make("first"))) === undefined &&
-            (yield* catalog.provider.get(ProviderV2.ID.make("second"))) !== undefined &&
-            (yield* agents.get(AgentV2.ID.make("configured")))?.description === "Second plugin"
+            (yield* catalog.provider.get(ProviderV2.ID.make("second"))) !== undefined
           )
         }),
       )
@@ -81,10 +80,7 @@ describe("config plugin reloads", () => {
       expect(
         (yield* skills.sources()).some((source) => source.type === "directory" && source.path === "/skills/second"),
       ).toBe(true)
-
-      entries = [config("second")]
-      yield* events.publish(ConfigSchema.Event.Updated, {})
-      yield* waitUntil(agents.get(AgentV2.ID.make("configured")).pipe(Effect.map((agent) => agent === undefined)))
+      expect((yield* agents.get(AgentV2.ID.make("configured")))?.description).toBe("First plugin")
     }).pipe(Effect.provideService(Global.Service, Global.Service.of(Global.make()))),
   )
 })

From a15afbe8f21fb60ec9167e140c5619df86903b9a Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Sat, 4 Jul 2026 02:04:58 -0400
Subject: [PATCH 44/82] bye bye orchestrator

---
 .opencode/plugins/orchestrator.ts | 36 -------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 .opencode/plugins/orchestrator.ts

diff --git a/.opencode/plugins/orchestrator.ts b/.opencode/plugins/orchestrator.ts
deleted file mode 100644
index 10d4173ff5..0000000000
--- a/.opencode/plugins/orchestrator.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-export default {
-  id: "Orchestrator",
-  setup: async (ctx) => {
-    await ctx.agent.transform((agents) => {
-      agents.update("orchestrator", (agent) => {
-        agent.description = "Coordinates work by delegating implementation tasks to the minion subagent."
-        agent.mode = "primary"
-        agent.system = [
-          "You are Orchestrator, the primary coordinating agent for this repository. You do meta work only: you coordinate, brief, and synthesize — you do not perform the work itself.",
-          "Delegate ALL actual work to the minion subagent — implementation, exploration, discovery, searching the codebase, reading files to understand a problem, and even trivial one-line edits. Task size is never a reason to do it yourself, and there is no 'final integration' exception.",
-          "You are not hard-banned from tools, but direct tool use is reserved for coordination overhead: a quick peek to phrase a better brief, a fast read-only check to verify a minion's reported result, or answering a question about coordination state. If a tool call is producing the answer or the artifact the user asked for, that call belongs to a minion, not you.",
-          "Exploration is work. If the user asks how something works or where something lives, delegate the investigation to a minion rather than exploring yourself.",
-          "Always start minion subagents in the background. Even if you have nothing else to coordinate right now, the user may assign you new work while a Minion runs, and you must stay free to receive it. Never poll; you will be notified when they finish.",
-          "Give each minion a clear, self-contained brief: the goal, constraints, expected output, and any files or context already known from the user or previous minion reports.",
-          "Synthesize minion results, decide next steps, and report back concisely.",
-        ].join("\n")
-      })
-
-      agents.update("minion", (agent) => {
-        agent.description = "Subagent that executes focused tasks delegated by Orchestrator."
-        agent.mode = "subagent"
-        agent.model = { providerID: "opencode", id: "glm-5.2" }
-        agent.system = [
-          "You are minion, a focused execution subagent for this repository.",
-          "Complete the specific task delegated to you by Orchestrator using the available tools.",
-          "Inspect the codebase before making assumptions, make targeted changes when requested, and verify your work when feasible.",
-          "Follow the repository's AGENTS.md conventions: respect the style guide, run `bun typecheck` from the affected package directory after code changes, never run tests from the repo root, and do not modify packages/opencode unless the task explicitly says V1 work.",
-          "If the task is ambiguous or you hit a blocker, stop and report your findings instead of guessing.",
-          "Keep your final response concise: summarize what you did, list important files changed or findings, and call out blockers or verification gaps.",
-          "Do not delegate to other subagents; execute the assigned work yourself.",
-        ].join("\n")
-        agent.permissions.push({ action: "subagent", resource: "*", effect: "deny" })
-      })
-    })
-  },
-}

From 5b44e5bf41ed3503b8d1633762e7fd42aa4a0f03 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Sat, 4 Jul 2026 10:54:34 -0400
Subject: [PATCH 45/82] test(core): release shell test locations (#35271)

---
 packages/core/test/tool-shell.test.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/core/test/tool-shell.test.ts b/packages/core/test/tool-shell.test.ts
index 6fd43ee2a2..217414aa2c 100644
--- a/packages/core/test/tool-shell.test.ts
+++ b/packages/core/test/tool-shell.test.ts
@@ -171,9 +171,11 @@ const withSession = <A, E, R>(directory: string, body: (registry: ToolRegistry.I
     })
     const locations = yield* LocationServiceMap.Service
     const locationLayer = locations.get(location)
-    const registry = yield* ToolRegistry.Service.pipe(Effect.provide(locationLayer))
-    yield* waitForTool(registry, ShellTool.name)
-    return yield* body(registry).pipe(Effect.provide(locationLayer))
+    return yield* Effect.gen(function* () {
+      const registry = yield* ToolRegistry.Service
+      yield* waitForTool(registry, ShellTool.name)
+      return yield* body(registry)
+    }).pipe(Effect.provide(locationLayer), Effect.ensuring(locations.invalidate(location)))
   })
 
 describe("ShellTool", () => {

From 62af66a74fb9b01bbcea1fe5369ccd24c56085ff Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Sat, 4 Jul 2026 10:58:56 -0400
Subject: [PATCH 46/82] fix(tui): distinguish variant switch notices (#35315)

---
 AGENTS.md                                     |  1 +
 .../client/src/promise/generated/types.ts     |  3 ++
 packages/core/src/session.ts                  |  6 ++--
 packages/core/src/session/message-updater.ts  | 32 +++++++++++++------
 packages/core/src/session/projector.ts        | 14 +++++++-
 packages/core/test/session-create.test.ts     |  6 ++--
 packages/core/test/session-projector.test.ts  |  3 ++
 packages/schema/src/session-message.ts        |  1 +
 packages/sdk/js/src/v2/gen/types.gen.ts       |  2 ++
 packages/tui/src/context/data.tsx             | 11 +++++++
 packages/tui/src/routes/session/index.tsx     |  3 +-
 packages/tui/src/util/model.ts                |  5 +--
 packages/tui/test/cli/tui/data.test.tsx       | 20 ++++++++++--
 packages/tui/test/util/model.test.ts          | 12 +++++++
 14 files changed, 98 insertions(+), 21 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index 8c72fe65a8..0ea4055ce2 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -151,6 +151,7 @@ const table = sqliteTable("session", {
 
 ## V2 Session Core
 
+- Keep durable events minimal: record irreducible new facts and do not repeat state derivable by folding the ordered aggregate history. Enrich projections and read models with previous or derived state when consumers need self-contained views.
 - Keep durable prompt admission separate from model execution. `SessionV2.prompt(...)` admits one durable `session_input` row before scheduling advisory `SessionExecution.wake(sessionID)` unless `resume: false` requests admit-only behavior. The serialized runner promotes admitted inputs into visible user messages at safe boundaries.
 - Reusing a Session ID adopts the existing Session. Reusing a prompt message ID reconciles an exact retry only when Session, prompt, and delivery mode match; conflicting reuse fails. Historical projected prompts lazily synthesize promoted inbox records during exact retry.
 - Keep `SessionExecution` process-global and Session-ID based. Its local implementation owns the process-local Session coordinator and discovers placement through `SessionStore` plus `LocationServiceMap.get(session.location)` only when a drain starts; no layer should take a Session ID. V2 interruption targets the active process-local ownership chain for that Session; idle or missing interruption is a no-op.
diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts
index ff06963036..151f0ff03f 100644
--- a/packages/client/src/promise/generated/types.ts
+++ b/packages/client/src/promise/generated/types.ts
@@ -928,6 +928,7 @@ export type SessionContextOutput = {
         readonly time: { readonly created: number }
         readonly type: "model-switched"
         readonly model: { readonly id: string; readonly providerID: string; readonly variant?: string }
+        readonly previous?: { readonly id: string; readonly providerID: string; readonly variant?: string }
       }
     | {
         readonly id: string
@@ -1621,6 +1622,7 @@ export type SessionMessageOutput = {
         readonly time: { readonly created: number }
         readonly type: "model-switched"
         readonly model: { readonly id: string; readonly providerID: string; readonly variant?: string }
+        readonly previous?: { readonly id: string; readonly providerID: string; readonly variant?: string }
       }
     | {
         readonly id: string
@@ -1820,6 +1822,7 @@ export type MessageListOutput = {
         readonly time: { readonly created: number }
         readonly type: "model-switched"
         readonly model: { readonly id: string; readonly providerID: string; readonly variant?: string }
+        readonly previous?: { readonly id: string; readonly providerID: string; readonly variant?: string }
       }
     | {
         readonly id: string
diff --git a/packages/core/src/session.ts b/packages/core/src/session.ts
index e8928a7520..05d64c8efb 100644
--- a/packages/core/src/session.ts
+++ b/packages/core/src/session.ts
@@ -540,7 +540,8 @@ const layer = Layer.effect(
             const started = yield* Effect.gen(function* () {
               const shell = yield* Shell.Service
               return yield* shell.create({ command: input.command, cwd: session.location.directory })
-            }).pipe(Effect.provide(locations.get(session.location)))
+            })
+              .pipe(Effect.provide(locations.get(session.location)))
             yield* events.publish(
               SessionEvent.Shell.Started,
               {
@@ -563,8 +564,7 @@ const layer = Layer.effect(
                     .pipe(Effect.catchTag("Shell.NotFoundError", () => Effect.succeed(missingShellOutput())))
                 : missingShellOutput()
               return { shell: terminal.info, output }
-            })
-              .pipe(Effect.provide(locations.get(session.location)))
+            }).pipe(Effect.provide(locations.get(session.location)))
             yield* events.publish(SessionEvent.Shell.Ended, {
               sessionID: input.sessionID,
               shell: completed.shell,
diff --git a/packages/core/src/session/message-updater.ts b/packages/core/src/session/message-updater.ts
index 3658e67c0f..2a8ade7b1a 100644
--- a/packages/core/src/session/message-updater.ts
+++ b/packages/core/src/session/message-updater.ts
@@ -8,6 +8,7 @@ export type MemoryState = {
 }
 
 export interface Adapter {
+  readonly getModel: () => Effect.Effect<SessionMessage.ModelSelected["model"] | undefined, never, never>
   readonly getCurrentAssistant: () => Effect.Effect<SessionMessage.Assistant | undefined, never, never>
   readonly getAssistant: (
     messageID: SessionMessage.ID,
@@ -29,6 +30,15 @@ export function memory(state: MemoryState): Adapter {
   const latestAssistantIndex = () => state.messages.findLastIndex((message) => message.type === "assistant")
 
   return {
+    getModel() {
+      return Effect.sync(
+        () =>
+          state.messages.findLast(
+            (message): message is SessionMessage.ModelSelected | SessionMessage.Assistant =>
+              message.type === "model-switched" || message.type === "assistant",
+          )?.model,
+      )
+    },
     getCurrentAssistant() {
       return Effect.sync(() => {
         const index = latestAssistantIndex()
@@ -115,15 +125,19 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
         )
       },
       "session.model.selected": (event) => {
-        return adapter.appendMessage(
-          SessionMessage.ModelSelected.make({
-            id: SessionMessage.ID.fromEvent(event.id),
-            type: "model-switched",
-            metadata: event.metadata,
-            model: event.data.model,
-            time: { created: event.created },
-          }),
-        )
+        return Effect.gen(function* () {
+          const previous = yield* adapter.getModel()
+          yield* adapter.appendMessage(
+            SessionMessage.ModelSelected.make({
+              id: SessionMessage.ID.fromEvent(event.id),
+              type: "model-switched",
+              metadata: event.metadata,
+              model: event.data.model,
+              previous,
+              time: { created: event.created },
+            }),
+          )
+        })
       },
       "session.moved": () => Effect.void,
       "session.renamed": () => Effect.void,
diff --git a/packages/core/src/session/projector.ts b/packages/core/src/session/projector.ts
index 746e448a3b..f265aa6fc9 100644
--- a/packages/core/src/session/projector.ts
+++ b/packages/core/src/session/projector.ts
@@ -5,6 +5,7 @@ import { DateTime, Effect, Layer, Schema } from "effect"
 import { Database } from "../database/database"
 import { EventV2 } from "../event"
 import { makeGlobalNode } from "../effect/app-node"
+import { ModelV2 } from "../model"
 import { SessionEvent } from "./event"
 import { SessionV1 } from "../v1/session"
 import { WorkspaceTable } from "../control-plane/workspace.sql"
@@ -356,6 +357,17 @@ function run(db: DatabaseService, event: MessageEvent) {
     }
     const appendMessage = (message: SessionMessage.Message) => insertMessage(db, event, message)
     const adapter: SessionMessageUpdater.Adapter = {
+      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(ModelV2.Ref)(row.model) : undefined)),
+          )
+      },
       getCurrentAssistant() {
         return Effect.gen(function* () {
           // A newer step supersedes stale incomplete rows; never resume an older assistant projection.
@@ -570,13 +582,13 @@ const layer = Layer.effectDiscard(
     )
     yield* events.project(SessionEvent.ModelSelected, (event) =>
       Effect.gen(function* () {
+        yield* run(db, event)
         yield* db
           .update(SessionTable)
           .set({ model: event.data.model, time_updated: DateTime.toEpochMillis(event.created) })
           .where(eq(SessionTable.id, event.data.sessionID))
           .run()
           .pipe(Effect.orDie)
-        yield* run(db, event)
       }),
     )
     yield* events.project(SessionEvent.Renamed, (event) =>
diff --git a/packages/core/test/session-create.test.ts b/packages/core/test/session-create.test.ts
index d18c2c8e81..5408030c1a 100644
--- a/packages/core/test/session-create.test.ts
+++ b/packages/core/test/session-create.test.ts
@@ -562,9 +562,9 @@ describe("SessionV2.create", () => {
       yield* session.switchModel({ sessionID: created.id, model })
 
       expect(yield* session.get(created.id)).toMatchObject({ model })
-      expect(
-        Array.from(yield* logEvents(session, created.id, true).pipe(Stream.take(1), Stream.runCollect)),
-      ).toMatchObject([{ type: "session.model.selected", data: { model } }])
+      const events = Array.from(yield* logEvents(session, created.id, true).pipe(Stream.take(1), Stream.runCollect))
+      expect(events).toMatchObject([{ type: "session.model.selected" }])
+      expect(events[0]?.data).toEqual({ sessionID: created.id, model })
     }),
   )
 
diff --git a/packages/core/test/session-projector.test.ts b/packages/core/test/session-projector.test.ts
index c17b979076..1d77303d43 100644
--- a/packages/core/test/session-projector.test.ts
+++ b/packages/core/test/session-projector.test.ts
@@ -34,6 +34,7 @@ const sessionsLayer = AppNodeBuilder.build(SessionV2.node, [[SessionExecution.no
 const sessionID = SessionV2.ID.make("ses_projector_test")
 const created = DateTime.makeUnsafe(0)
 const model = { id: ModelV2.ID.make("model"), providerID: ProviderV2.ID.make("provider") }
+const previousModel = { ...model, variant: ModelV2.VariantID.make("medium") }
 const encodeMessage = Schema.encodeSync(SessionMessage.Message)
 
 const assistantRow = (
@@ -238,6 +239,7 @@ describe("SessionProjector", () => {
           directory: "/project",
           title: "test",
           version: "test",
+          model: previousModel,
         })
         .run()
         .pipe(Effect.orDie)
@@ -337,6 +339,7 @@ describe("SessionProjector", () => {
         text: "synthetic context",
         metadata: { source: "projector-test" },
       })
+      expect(messages.find((message) => message.type === "model-switched")).toMatchObject({ previous: previousModel })
       expect(messages.find((message) => message.type === "shell")).toMatchObject({
         shell: { command: "pwd", status: "exited", exit: 0 },
         output: { output: "/project", truncated: false },
diff --git a/packages/schema/src/session-message.ts b/packages/schema/src/session-message.ts
index e3d81a31d7..c9f39193a5 100644
--- a/packages/schema/src/session-message.ts
+++ b/packages/schema/src/session-message.ts
@@ -44,6 +44,7 @@ export const ModelSelected = Schema.Struct({
   ...Base,
   type: Schema.Literal("model-switched"),
   model: Model.Ref,
+  previous: Model.Ref.pipe(optional),
 }).annotate({ identifier: "Session.Message.ModelSelected" })
 
 export interface User extends Schema.Schema.Type<typeof User> {}
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index 524d7ea854..2b6e1d031f 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -4310,6 +4310,7 @@ export type SessionMessageModelSelected = {
   }
   type: "model-switched"
   model: ModelRef
+  previous?: ModelRef
 }
 
 export type SessionMessageUser = {
@@ -7985,6 +7986,7 @@ export type SessionMessageModelSelected2 = {
   }
   type: "model-switched"
   model: ModelRef2
+  previous?: ModelRef2
 }
 
 export type SessionMessageUser2 = {
diff --git a/packages/tui/src/context/data.tsx b/packages/tui/src/context/data.tsx
index 0ed464e561..5815bc2f20 100644
--- a/packages/tui/src/context/data.tsx
+++ b/packages/tui/src/context/data.tsx
@@ -235,6 +235,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
         case "session.model.selected":
           if (store.session.info[event.data.sessionID])
             setStore("session", "info", event.data.sessionID, "model", event.data.model)
+          if (!store.session.message[event.data.sessionID]) break
           message.update(event.data.sessionID, (draft, index) => {
             message.append(draft, index, {
               id: messageIDFromEvent(event.id),
@@ -243,6 +244,16 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
               time: { created: event.created },
             })
           })
+          void sdk.api.session
+            .message({ sessionID: event.data.sessionID, messageID: messageIDFromEvent(event.id) })
+            .then((item) => {
+              message.update(event.data.sessionID, (draft, index) => {
+                const position = index.get(item.id)
+                if (position === undefined) return message.append(draft, index, mutable(item))
+                draft[position] = mutable(item)
+              })
+            })
+            .catch((error) => console.error("Failed to load projected model switch message", error))
           break
         case "session.renamed":
           if (store.session.info[event.data.sessionID])
diff --git a/packages/tui/src/routes/session/index.tsx b/packages/tui/src/routes/session/index.tsx
index b968f13cd3..604cd95e89 100644
--- a/packages/tui/src/routes/session/index.tsx
+++ b/packages/tui/src/routes/session/index.tsx
@@ -1231,7 +1231,8 @@ function SessionSwitchMessageV2(props: { message: SessionMessage }) {
   const { theme } = useTheme()
   const text = () => {
     if (props.message.type === "agent-switched") return `Switched agent to ${props.message.agent}`
-    if (props.message.type === "model-switched") return switchLabel(props.message.model, ctx.models())
+    if (props.message.type === "model-switched")
+      return switchLabel(props.message.model, ctx.models(), props.message.previous)
     return ""
   }
   return <text fg={theme.textMuted}>{text()}</text>
diff --git a/packages/tui/src/util/model.ts b/packages/tui/src/util/model.ts
index 64d8636406..275112d33d 100644
--- a/packages/tui/src/util/model.ts
+++ b/packages/tui/src/util/model.ts
@@ -34,11 +34,12 @@ export function formatRef(model: { providerID: string; id: string; variant?: str
 export function switchLabel(
   model: { providerID: string; id: string; variant?: string },
   models?: readonly { providerID: string; id: string; name: string }[],
+  previous?: { providerID: string; id: string; variant?: string },
 ) {
+  if (previous?.providerID === model.providerID && previous.id === model.id)
+    return `Switched variant to ${model.variant ?? "default"}`
   const display = models?.find((item) => item.providerID === model.providerID && item.id === model.id)?.name
   if (display === undefined) return `Switched model to ${formatRef(model)}`
-  // Variant-only switches publish the same model id; without the variant the
-  // notice would look like a redundant model switch.
   const variant = model.variant && model.variant !== "default" ? ` (${model.variant})` : ""
   return `Switched model to ${display}${variant}`
 }
diff --git a/packages/tui/test/cli/tui/data.test.tsx b/packages/tui/test/cli/tui/data.test.tsx
index 0587662dc3..1bc975b9bc 100644
--- a/packages/tui/test/cli/tui/data.test.tsx
+++ b/packages/tui/test/cli/tui/data.test.tsx
@@ -767,7 +767,18 @@ test("adds and dismisses question requests from live events", async () => {
 
 test("settles pending tools when a live failure arrives", async () => {
   const events = createEventStream()
-  const calls = createFetch(undefined, events)
+  const calls = createFetch((url) => {
+    if (url.pathname === "/api/session/session-1/message/msg_model_1")
+      return json({
+        data: {
+          id: "msg_model_1",
+          type: "model-switched",
+          previous: { id: "model-1", providerID: "provider-1", variant: "medium" },
+          model: { id: "model-1", providerID: "provider-1", variant: "high" },
+          time: { created: 0 },
+        },
+      })
+  }, events)
   let sync!: ReturnType<typeof useData>
   let ready!: () => void
   const mounted = new Promise<void>((resolve) => {
@@ -808,7 +819,7 @@ test("settles pending tools when a live failure arrives", async () => {
       durable: durable("session-1", 1),
       data: {
         sessionID: "session-1",
-        model: { id: "model-1", providerID: "provider-1" },
+        model: { id: "model-1", providerID: "provider-1", variant: "high" },
       },
     })
     emitEvent(events, {
@@ -895,6 +906,11 @@ test("settles pending tools when a live failure arrives", async () => {
       "model-switched",
       "assistant",
     ])
+    expect(sync.session.message.get("session-1", "msg_model_1")).toMatchObject({
+      type: "model-switched",
+      previous: { id: "model-1", providerID: "provider-1", variant: "medium" },
+      model: { id: "model-1", providerID: "provider-1", variant: "high" },
+    })
   } finally {
     app.renderer.destroy()
   }
diff --git a/packages/tui/test/util/model.test.ts b/packages/tui/test/util/model.test.ts
index ad4ea87c88..888b102013 100644
--- a/packages/tui/test/util/model.test.ts
+++ b/packages/tui/test/util/model.test.ts
@@ -34,4 +34,16 @@ describe("util.model", () => {
       "Switched model to removed/gone/high",
     )
   })
+
+  test("distinguishes variant-only switches from model switches", () => {
+    const previous = { providerID: "openai", id: "gpt-5.5", variant: "medium" }
+
+    expect(switchLabel({ ...previous, variant: "high" }, undefined, previous)).toBe("Switched variant to high")
+    expect(switchLabel({ providerID: "openai", id: "gpt-5.5" }, undefined, previous)).toBe(
+      "Switched variant to default",
+    )
+    expect(switchLabel({ providerID: "anthropic", id: "sonnet", variant: "high" }, undefined, previous)).toBe(
+      "Switched model to anthropic/sonnet/high",
+    )
+  })
 })

From 9daa4d85a427a67cd43917d5580dd837bca69e2d Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Sat, 4 Jul 2026 11:05:41 -0400
Subject: [PATCH 47/82] fix(tui): reconcile session state after reconnect
 (#35262)

---
 .opencode/skills/debug-opencode/SKILL.md |  19 ++++
 packages/tui/src/context/data.tsx        |  68 +++++++++-----
 packages/tui/src/routes/session/rows.ts  |  43 +++++++--
 packages/tui/test/cli/tui/data.test.tsx  | 111 ++++++++++++++++++++++-
 4 files changed, 207 insertions(+), 34 deletions(-)

diff --git a/.opencode/skills/debug-opencode/SKILL.md b/.opencode/skills/debug-opencode/SKILL.md
index fd7cae09d2..01e0ca3523 100644
--- a/.opencode/skills/debug-opencode/SKILL.md
+++ b/.opencode/skills/debug-opencode/SKILL.md
@@ -104,6 +104,25 @@ bun dev api <operationId> --param key=value
 - If no compatible background server is registered, `bun dev api` starts one through the daemon service. Use `bun dev service status`, `bun dev service restart`, and `bun dev service stop` when you need explicit lifecycle control.
 - Prefer raw method/path calls for quick server debugging and operation IDs when exercising documented OpenAPI routes with path or query parameters.
 
+## Auditing installed `opencode2` sessions
+
+Installed next-channel sessions normally use `~/.local/share/opencode/opencode-next.db` and `~/.local/share/opencode/log/opencode.log`; `OPENCODE_DB` can override the database. Before calling `opencode2 api`, inspect `~/.local/state/opencode/service.json` because the command may start a daemon when none is healthy.
+
+For a supplied `ses_...` ID, compare three sources:
+
+- `opencode2 api get /api/session/active` and the Session/message endpoints for live server state.
+- The database's ordered `event` rows for durable history.
+- `packages/tui/src/context/data.tsx` and the relevant route for client projection and rendering.
+
+Locate an uncertain database without modifying it:
+
+```bash
+SESSION=ses_...
+for db in ~/.local/share/opencode/*.db; do
+  sqlite3 "file:$db?mode=ro" "select 1 from session where id='$SESSION' limit 1" 2>/dev/null | grep -q 1 && printf '%s\n' "$db"
+done
+```
+
 ## Logs
 
 - Log files live under `~/.local/share/opencode/log/`. In a local/dev checkout the active file is `opencode-local.log`; `opencode.log` is used for non-local (released) channel installs. Both are append-only, shared across every CLI and server process on the machine.
diff --git a/packages/tui/src/context/data.tsx b/packages/tui/src/context/data.tsx
index 5815bc2f20..82a7150c9e 100644
--- a/packages/tui/src/context/data.tsx
+++ b/packages/tui/src/context/data.tsx
@@ -20,7 +20,7 @@ import type {
   SkillV2Info,
   V2Event,
 } from "@opencode-ai/sdk/v2"
-import { createStore, produce } from "solid-js/store"
+import { createStore, produce, reconcile } from "solid-js/store"
 import { createSimpleContext } from "./helper"
 import { useSDK } from "./sdk"
 import { createSignal, onCleanup } from "solid-js"
@@ -100,8 +100,15 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
       directory: process.cwd(),
     })
     const messageIndex = new Map<string, Map<string, number>>()
+    let connectionGeneration = 0
+    let statusChanges: Set<string> | undefined
     let bootstrapping: Promise<void> | undefined
 
+    function setSessionStatus(sessionID: string, status: DataSessionStatus) {
+      statusChanges?.add(sessionID)
+      setStore("session", "status", sessionID, status)
+    }
+
     const message = {
       update(sessionID: string, fn: (messages: SessionMessage[], index: Map<string, number>) => void) {
         setStore(
@@ -260,16 +267,19 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             setStore("session", "info", event.data.sessionID, "title", event.data.title)
           break
         case "session.prompt.promoted": {
-          setStore("session", "status", event.data.sessionID, "running")
+          setSessionStatus(event.data.sessionID, "running")
           message.update(event.data.sessionID, (draft, index) => {
             const position = index.get(event.data.inputID)
-            const existing = position === undefined ? undefined : draft[position]
-            if (existing?.type === "user") {
+            if (position === undefined) return
+            const existing = draft[position]
+            if (existing?.type === "user" && existing.metadata?.queued === true) {
               existing.time.created = event.created
-              if (existing.metadata?.queued === true) {
-                delete existing.metadata.queued
-                if (Object.keys(existing.metadata).length === 0) existing.metadata = undefined
-              }
+              delete existing.metadata.queued
+              if (Object.keys(existing.metadata).length === 0) existing.metadata = undefined
+              draft.splice(position, 1)
+              draft.push(existing)
+              index.clear()
+              draft.forEach((message, indexValue) => index.set(message.id, indexValue))
               return
             }
           })
@@ -311,7 +321,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
           })
           break
         case "session.shell.started":
-          setStore("session", "status", event.data.sessionID, "running")
+          setSessionStatus(event.data.sessionID, "running")
           message.update(event.data.sessionID, (draft, index) => {
             message.append(draft, index, {
               id: messageIDFromEvent(event.id),
@@ -322,7 +332,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
           })
           break
         case "session.shell.ended":
-          setStore("session", "status", event.data.sessionID, "idle")
+          setSessionStatus(event.data.sessionID, "idle")
           message.update(event.data.sessionID, (draft) => {
             const match = message.shell(draft, event.data.shell.id)
             if (!match) return
@@ -332,7 +342,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
           })
           break
         case "session.step.started":
-          setStore("session", "status", event.data.sessionID, "running")
+          setSessionStatus(event.data.sessionID, "running")
           message.update(event.data.sessionID, (draft, index) => {
             if (index.has(event.data.assistantMessageID)) return
             const currentAssistant = message.activeAssistant(draft)
@@ -349,7 +359,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
           })
           break
         case "session.step.ended":
-          setStore("session", "status", event.data.sessionID, "running")
+          setSessionStatus(event.data.sessionID, "running")
           message.update(event.data.sessionID, (draft, index) => {
             const currentAssistant = message.assistant(draft, index, event.data.assistantMessageID)
             if (!currentAssistant) return
@@ -529,10 +539,10 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
           break
         case "session.retried":
         case "session.compaction.started":
-          setStore("session", "status", event.data.sessionID, "running")
+          setSessionStatus(event.data.sessionID, "running")
           break
         case "session.execution.settled":
-          setStore("session", "status", event.data.sessionID, "idle")
+          setSessionStatus(event.data.sessionID, "idle")
           break
         case "session.revert.staged":
           if (store.session.info[event.data.sessionID])
@@ -869,15 +879,6 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             )
             for (const session of response.data) registerSession(session.id)
           }),
-        sdk.api.session
-          .active()
-          .then((active) =>
-            setStore(
-              "session",
-              "status",
-              Object.fromEntries(Object.keys(active.data).map((sessionID) => [sessionID, "running" as const])),
-            ),
-          ),
         result.location.refresh(),
         result.location.agent.refresh(),
         result.location.integration.refresh(),
@@ -899,9 +900,30 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
       return bootstrapping
     }
 
+    function refreshActive() {
+      const generation = ++connectionGeneration
+      const changed = new Set<string>()
+      statusChanges = changed
+      void sdk.api.session
+        .active()
+        .then((active) => {
+          if (generation !== connectionGeneration) return
+          const status: Record<string, DataSessionStatus> = Object.fromEntries(
+            Object.keys(active.data).map((sessionID) => [sessionID, "running" as const]),
+          )
+          for (const sessionID of changed) status[sessionID] = store.session.status[sessionID]
+          setStore("session", "status", reconcile(status))
+        })
+        .catch(() => undefined)
+        .finally(() => {
+          if (statusChanges === changed) statusChanges = undefined
+        })
+    }
+
     onCleanup(
       sdk.event.listen(({ details }) => {
         if (details.type === "server.connected") {
+          refreshActive()
           void bootstrap()
           return
         }
diff --git a/packages/tui/src/routes/session/rows.ts b/packages/tui/src/routes/session/rows.ts
index 783b2805f4..fc0b38b1ad 100644
--- a/packages/tui/src/routes/session/rows.ts
+++ b/packages/tui/src/routes/session/rows.ts
@@ -28,23 +28,24 @@ export function createSessionRows(sessionID: Accessor<string>) {
   function reduce() {
     const messages = data.session.message.list(sessionID())
     const boundary = revertBoundary()
-    return reduceSessionRows(boundary ? messages.filter((message) => message.id < boundary) : messages)
+    const rows = reduceSessionRows(boundary ? messages.filter((message) => message.id < boundary) : messages)
+    partitionPending(rows, pendingPermissions())
+    return rows
   }
 
-  createEffect(() => {
-    const pending = new Set(
+  function pendingPermissions() {
+    return new Set(
       (data.session.permission.list(sessionID()) ?? []).flatMap((request) =>
         request.source?.type === "tool" ? [request.source.callID] : [],
       ),
     )
+  }
+
+  createEffect(() => {
+    const pending = pendingPermissions()
     setRows(
       produce((draft) => {
-        draft.forEach((row) => {
-          if (row.type !== "group") return
-          const refs = [...row.refs, ...row.pending]
-          row.refs = refs.filter((ref) => !pending.has(ref.partID))
-          row.pending = refs.filter((ref) => pending.has(ref.partID))
-        })
+        partitionPending(draft, pending)
       }),
     )
   })
@@ -69,6 +70,20 @@ export function createSessionRows(sessionID: Accessor<string>) {
     }),
   )
 
+  createEffect(
+    on(
+      () =>
+        data.session.message
+          .list(sessionID())
+          .flatMap((message) =>
+            message.type === "user"
+              ? [{ id: message.id, created: message.time.created, queued: message.metadata?.queued === true }]
+              : [],
+          ),
+      () => setRows(reconcile(reduce())),
+    ),
+  )
+
   const appendMessage = (messageID: string) =>
     setRows(
       produce((draft) => {
@@ -134,7 +149,6 @@ export function createSessionRows(sessionID: Accessor<string>) {
   }
   const subscriptions = [
     data.on("session.prompt.admitted", input),
-    data.on("session.prompt.promoted", input),
     data.on("session.context.updated", message),
     data.on("session.synthetic", (event) => {
       if (event.data.sessionID === sessionID() && event.data.description?.trim())
@@ -225,6 +239,15 @@ function completePrevious(rows: SessionRow[], index = rows.length) {
   if (previous?.type === "group") previous.completed = true
 }
 
+function partitionPending(rows: SessionRow[], pending: Set<string>) {
+  rows.forEach((row) => {
+    if (row.type !== "group") return
+    const refs = [...row.refs, ...row.pending]
+    row.refs = refs.filter((ref) => !pending.has(ref.partID))
+    row.pending = refs.filter((ref) => pending.has(ref.partID))
+  })
+}
+
 function exploration(name: string) {
   return ["read", "glob", "grep"].includes(name.toLowerCase())
 }
diff --git a/packages/tui/test/cli/tui/data.test.tsx b/packages/tui/test/cli/tui/data.test.tsx
index 1bc975b9bc..d9e82c2d3c 100644
--- a/packages/tui/test/cli/tui/data.test.tsx
+++ b/packages/tui/test/cli/tui/data.test.tsx
@@ -8,6 +8,7 @@ import { onMount } from "solid-js"
 import { ProjectProvider } from "../../../src/context/project"
 import { SDKProvider } from "../../../src/context/sdk"
 import { DataProvider, useData } from "../../../src/context/data"
+import { createSessionRows } from "../../../src/routes/session/rows"
 import { createApi, createClient, createEventStream, createFetch, directory, json } from "../../fixture/tui-sdk"
 import { TestTuiContexts } from "../../fixture/tui-environment"
 
@@ -109,12 +110,20 @@ test("refreshes resources into reactive getters", async () => {
 
 test("reconnects the event stream and bootstraps fresh data", async () => {
   const events = createEventStream()
-  const requests = { event: 0, model: 0 }
+  const requests = { active: 0, event: 0, model: 0 }
+  let resolveActive!: (response: Response) => void
   const calls = createFetch((url) => {
     if (url.pathname === "/api/event") {
       requests.event++
       return events.v2()
     }
+    if (url.pathname === "/api/session/active") {
+      requests.active++
+      if (requests.active === 1) return json({ data: { "session-stale": { type: "running" } }, watermarks: {} })
+      return new Promise<Response>((resolve) => {
+        resolveActive = resolve
+      })
+    }
     if (url.pathname !== "/api/model") return
     requests.model++
     return json({
@@ -157,6 +166,7 @@ test("reconnects the event stream and bootstraps fresh data", async () => {
 
   try {
     await wait(() => data.location.model.list()?.[0]?.id === "model-1")
+    await wait(() => data.session.status("session-stale") === "running")
     expect(data.connection.status()).toBe("connected")
     expect(data.connection.attempt()).toBe(0)
 
@@ -165,7 +175,25 @@ test("reconnects the event stream and bootstraps fresh data", async () => {
     expect(data.connection.attempt()).toBe(1)
     expect(data.connection.error()).toBe("Event stream disconnected")
 
+    await wait(() => requests.active === 2 && data.connection.status() === "connected", 4000)
+    emitEvent(events, {
+      id: "evt_step_started_after_reconnect",
+      created: 1,
+      type: "session.step.started",
+      durable: durable("session-new"),
+      data: {
+        sessionID: "session-new",
+        assistantMessageID: "message-new",
+        agent: "build",
+        model: { id: "model", providerID: "provider" },
+      },
+    })
+    await wait(() => data.session.status("session-new") === "running")
+    resolveActive(json({ data: {}, watermarks: {} }))
+
     await wait(() => data.location.model.list()?.[0]?.id === "model-2", 4000)
+    await wait(() => data.session.status("session-stale") === "idle")
+    expect(data.session.status("session-new")).toBe("running")
     expect(requests.event).toBe(2)
     expect(data.connection.status()).toBe("connected")
     expect(data.connection.attempt()).toBe(0)
@@ -175,6 +203,87 @@ test("reconnects the event stream and bootstraps fresh data", async () => {
   }
 })
 
+test("completes exploration when a queued prompt is promoted", async () => {
+  const events = createEventStream()
+  const sessionID = "session-promotion"
+  const calls = createFetch((url) => {
+    if (url.pathname === `/api/session/${sessionID}/message`) return json({ data: [], cursor: {} })
+  }, events)
+  let rows!: ReturnType<typeof createSessionRows>
+
+  function Probe() {
+    rows = createSessionRows(() => sessionID)
+    return <box />
+  }
+
+  const app = await testRender(() => (
+    <TestTuiContexts>
+      <SDKProvider client={createClient(calls.fetch)} api={createApi(calls.fetch)}>
+        <ProjectProvider>
+          <DataProvider>
+            <Probe />
+          </DataProvider>
+        </ProjectProvider>
+      </SDKProvider>
+    </TestTuiContexts>
+  ))
+
+  try {
+    emitEvent(events, {
+      id: "evt_step_started",
+      created: 1,
+      type: "session.step.started",
+      durable: durable(sessionID),
+      data: {
+        sessionID,
+        assistantMessageID: "message-assistant",
+        agent: "build",
+        model: { id: "model", providerID: "provider" },
+      },
+    })
+    emitEvent(events, {
+      id: "evt_tool_started",
+      created: 2,
+      type: "session.tool.input.started",
+      durable: durable(sessionID, 1),
+      data: {
+        sessionID,
+        assistantMessageID: "message-assistant",
+        callID: "call-read",
+        name: "read",
+      },
+    })
+    await wait(() => rows.some((row) => row.type === "group" && !row.completed))
+
+    emitEvent(events, {
+      id: "evt_prompt_admitted",
+      created: 3,
+      type: "session.prompt.admitted",
+      durable: durable(sessionID, 2),
+      data: {
+        sessionID,
+        inputID: "message-user",
+        prompt: { text: "Continue" },
+        delivery: "steer",
+      },
+    })
+    await wait(() => rows.at(-1)?.type === "message")
+    expect(rows.find((row) => row.type === "group")?.completed).toBe(false)
+
+    emitEvent(events, {
+      id: "evt_prompt_promoted",
+      created: 4,
+      type: "session.prompt.promoted",
+      durable: durable(sessionID, 3),
+      data: { sessionID, inputID: "message-user" },
+    })
+    await wait(() => rows.find((row) => row.type === "group")?.completed === true)
+    expect(rows.at(-1)).toEqual({ type: "message", messageID: "message-user" })
+  } finally {
+    app.renderer.destroy()
+  }
+})
+
 test("connectedOnce is false until first connect and persists across disconnect", async () => {
   const encoder = new TextEncoder()
   let stream: ReadableStreamDefaultController<Uint8Array> | undefined

From 610e618bc5419b2d646adfeca185fd6fef0e803f Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Sat, 4 Jul 2026 11:33:45 -0400
Subject: [PATCH 48/82] fix(tui): clear completed background shell status
 (#35320)

---
 packages/core/src/tool/shell.ts           |  8 +++++---
 packages/core/test/tool-shell.test.ts     |  8 ++++++--
 packages/tui/src/routes/session/index.tsx | 15 +++++++++++----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/packages/core/src/tool/shell.ts b/packages/core/src/tool/shell.ts
index cb7edb3113..c3644e4810 100644
--- a/packages/core/src/tool/shell.ts
+++ b/packages/core/src/tool/shell.ts
@@ -18,8 +18,9 @@ export const DEFAULT_TIMEOUT_MS = 2 * 60 * 1_000
 export const MAX_TIMEOUT_MS = 10 * 60 * 1_000
 export const MAX_CAPTURE_BYTES = 1024 * 1024
 
-const BACKGROUND_STARTED =
-  "The command has not completed; it is now running in the background."
+const BACKGROUND_STARTED = "The command was moved to the background."
+const BACKGROUND_INSTRUCTION =
+  "You will be notified automatically when the command finishes. DO NOT sleep, poll, or proactively check on its progress."
 
 export const Input = Schema.Struct({
   command: Schema.String.annotate({ description: "Shell command string to execute" }),
@@ -54,10 +55,11 @@ const Output = Schema.Struct({
 type Output = typeof Output.Type
 
 const modelOutput = (output: Output): string | undefined => {
-  if (output.status === "running") return undefined
   const warnings = output.warnings?.length
     ? `\n\nWarnings:\n${output.warnings.map((warning) => `- ${warning}`).join("\n")}`
     : ""
+  if (output.status === "running")
+    return `${warnings.trimStart()}${warnings ? "\n\n" : ""}${BACKGROUND_INSTRUCTION}`
   if (output.timeout) return `${warnings.trimStart()}${warnings ? "\n\n" : ""}Command timed out before completion.`
   return `${warnings.trimStart()}${warnings ? "\n\n" : ""}Command exited with code ${output.exit}.`
 }
diff --git a/packages/core/test/tool-shell.test.ts b/packages/core/test/tool-shell.test.ts
index 217414aa2c..117eba27f1 100644
--- a/packages/core/test/tool-shell.test.ts
+++ b/packages/core/test/tool-shell.test.ts
@@ -480,9 +480,13 @@ describe("ShellTool", () => {
             const structured = settled.output?.structured as Record<string, unknown> | undefined
             const shellID = typeof structured?.shellID === "string" ? structured.shellID : undefined
             expect(settled.output?.structured).toMatchObject({ truncated: false })
-            expect(settled.output?.content[0]).toMatchObject({
+            expect(settled.output?.content[0]).toEqual({
               type: "text",
-              text: expect.stringContaining("running in the background"),
+              text: "The command was moved to the background.",
+            })
+            expect(settled.output?.content[1]).toMatchObject({
+              type: "text",
+              text: expect.stringContaining("DO NOT sleep, poll"),
             })
             expect(shellID).toStartWith("sh_")
 
diff --git a/packages/tui/src/routes/session/index.tsx b/packages/tui/src/routes/session/index.tsx
index 604cd95e89..dd9fd34d07 100644
--- a/packages/tui/src/routes/session/index.tsx
+++ b/packages/tui/src/routes/session/index.tsx
@@ -2080,14 +2080,16 @@ function Shell(props: ToolProps) {
     return request?.source?.type === "tool" && request.source.callID === props.part.id
   })
   const color = createMemo(() => (permission() ? theme.warning : theme.text))
-  const isRunning = createMemo(() => {
-    if (props.part.state.status === "running") return true
-    const shellID = stringValue(props.metadata.shellID)
-    return Boolean(shellID && data.shell.get(shellID))
+  const shellID = createMemo(() => stringValue(props.metadata.shellID))
+  const backgroundRunning = createMemo(() => {
+    const id = shellID()
+    return Boolean(id && data.shell.get(id))
   })
+  const isRunning = createMemo(() => props.part.state.status === "running" || backgroundRunning())
   const command = createMemo(() => stringValue(props.input.command))
   const output = createMemo(() => {
     if (props.part.state.status === "pending") return ""
+    if (shellID()) return ""
     const content = props.part.state.content[0]
     return stripAnsi(content?.type === "text" ? content.text.trim() : "")
   })
@@ -2130,6 +2132,11 @@ function Shell(props: ToolProps) {
             </Spinner>
           </Show>
         </Show>
+        <Show when={shellID()}>
+          <text>
+            <span style={{ bg: theme.backgroundElement, fg: theme.textMuted }}> Backgrounded </span>
+          </text>
+        </Show>
         <Show when={collapsed().overflow}>
           <text fg={theme.textMuted}>{expanded() ? "Click to collapse" : "Click to expand"}</text>
         </Show>

From 945d1c8cb28b66732dfaefffc9631af78f83a8a0 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Sat, 4 Jul 2026 11:55:05 -0400
Subject: [PATCH 49/82] fix(core): bound recursive file watching (#35323)

---
 packages/core/src/filesystem/ignore.ts        |  2 +-
 packages/core/test/filesystem/ignore.test.ts  | 29 ++++++++++++++++++
 packages/core/test/filesystem/watcher.test.ts | 30 +++++++++++++++----
 packages/web/src/content/docs/config.mdx      |  4 +--
 4 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/packages/core/src/filesystem/ignore.ts b/packages/core/src/filesystem/ignore.ts
index 2f5f52bf25..4d88eb5e87 100644
--- a/packages/core/src/filesystem/ignore.ts
+++ b/packages/core/src/filesystem/ignore.ts
@@ -45,7 +45,7 @@ const FILES = [
   "**/.nyc_output/**",
 ]
 
-export const PATTERNS = [...FILES, ...FOLDERS]
+export const PATTERNS = [...FILES, ...FOLDERS, `**/{${Array.from(FOLDERS).join(",")}}/**`]
 
 export function match(filepath: string, opts?: { extra?: string[]; whitelist?: string[] }) {
   for (const pattern of opts?.whitelist || []) {
diff --git a/packages/core/test/filesystem/ignore.test.ts b/packages/core/test/filesystem/ignore.test.ts
index 87b07eacb9..d734ed16b2 100644
--- a/packages/core/test/filesystem/ignore.test.ts
+++ b/packages/core/test/filesystem/ignore.test.ts
@@ -1,5 +1,7 @@
 import { expect, test } from "bun:test"
 import { Ignore } from "@opencode-ai/core/filesystem/ignore"
+// @ts-ignore
+import { createWrapper } from "@parcel/watcher/wrapper"
 
 test("match nested and non-nested", () => {
   expect(Ignore.match("node_modules/index.js")).toBe(true)
@@ -8,3 +10,30 @@ test("match nested and non-nested", () => {
   expect(Ignore.match("node_modules/bar")).toBe(true)
   expect(Ignore.match("node_modules/bar/")).toBe(true)
 })
+
+test("parcel patterns ignore built-in folders at any depth", async () => {
+  let ignoreGlobs: string[] = []
+  const watcher = createWrapper({
+    subscribe: async (
+      _directory: string,
+      _callback: (...args: unknown[]) => unknown,
+      options: { ignoreGlobs?: string[] },
+    ) => {
+      ignoreGlobs = options.ignoreGlobs ?? []
+    },
+  })
+  await watcher.subscribe("/tmp/project", () => {}, { ignore: Ignore.PATTERNS })
+  const patterns = ignoreGlobs.map((source) => new RegExp(source))
+
+  for (const path of [
+    "nested/node_modules",
+    "nested/node_modules/package/index.js",
+    "nested/.git",
+    "nested/.git/HEAD",
+    "nested/dist",
+    "nested/dist/index.js",
+  ]) {
+    expect(patterns.some((pattern) => pattern.test(path))).toBe(true)
+  }
+  expect(patterns.some((pattern) => pattern.test("nested/src/index.ts"))).toBe(false)
+})
diff --git a/packages/core/test/filesystem/watcher.test.ts b/packages/core/test/filesystem/watcher.test.ts
index 323ba4c4ba..360c4c70db 100644
--- a/packages/core/test/filesystem/watcher.test.ts
+++ b/packages/core/test/filesystem/watcher.test.ts
@@ -2,7 +2,7 @@ import { $ } from "bun"
 import { describe, expect } from "bun:test"
 import fs from "fs/promises"
 import path from "path"
-import { Deferred, Duration, Effect, Fiber, Layer, Option, Stream } from "effect"
+import { Deferred, Duration, Effect, Fiber, Layer, Option, Schedule, Stream } from "effect"
 import { Config } from "@opencode-ai/core/config"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { LayerNode } from "@opencode-ai/core/effect/layer-node"
@@ -149,12 +149,14 @@ describeWatcher("LocationWatcher", () => {
         const update = yield* watcher
           .subscribe({ path: target, type: "file" })
           .pipe(Stream.take(1), Stream.runHead, Effect.forkScoped({ startImmediately: true }))
-        yield* Effect.yieldNow
-
         yield* fs.writeFileString(sibling, "sibling")
-        yield* fs.writeFileString(target, "target")
+        const writes = yield* Effect.suspend(() => fs.writeFileString(target, `target-${Math.random()}`)).pipe(
+          Effect.repeat(Schedule.spaced("10 millis")),
+          Effect.forkScoped,
+        )
+        const event = yield* Fiber.join(update).pipe(Effect.ensuring(Fiber.interrupt(writes)))
 
-        expect((yield* Fiber.join(update)).valueOrUndefined?.path).toBe(target)
+        expect(event.valueOrUndefined?.path).toBe(target)
       }).pipe(Effect.provide(AppNodeBuilder.build(Watcher.node))),
     ),
   )
@@ -197,6 +199,24 @@ describeWatcher("LocationWatcher", () => {
     ),
   )
 
+  it.live("ignores dependency, VCS, and build directories at any depth", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const afs = yield* FSUtil.Service
+        yield* ready(directory)
+        const roots = ["node_modules", ".git", "dist"].map((name) => path.join(directory, "nested", name))
+        const files = roots.map((root) => path.join(root, "package", "index.js"))
+        yield* noUpdate(
+          (event) => roots.some((root) => event.file === root || event.file.startsWith(`${root}${path.sep}`)),
+          Effect.forEach(files, (file) => afs.writeWithDirs(file, "ignored"), {
+            concurrency: "unbounded",
+            discard: true,
+          }),
+        )
+      }),
+    ),
+  )
+
   it.live("cleanup stops publishing events", () =>
     Effect.gen(function* () {
       const events = yield* EventV2.Service
diff --git a/packages/web/src/content/docs/config.mdx b/packages/web/src/content/docs/config.mdx
index c1a69f5a86..fbf41d4fe9 100644
--- a/packages/web/src/content/docs/config.mdx
+++ b/packages/web/src/content/docs/config.mdx
@@ -749,12 +749,12 @@ You can configure file watcher ignore patterns through the `watcher` option.
 {
   "$schema": "https://opencode.ai/config.json",
   "watcher": {
-    "ignore": ["node_modules/**", "dist/**", ".git/**"]
+    "ignore": ["**/generated/**"]
   }
 }
 ```
 
-Patterns follow glob syntax. Use this to exclude noisy directories from file watching.
+Patterns follow glob syntax. Common dependency, VCS, build, and cache directories are ignored automatically at any depth.
 
 ---
 

From 8f4b62eb49d52d6930f24895a2ccecac955a2125 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Sat, 4 Jul 2026 12:12:56 -0400
Subject: [PATCH 50/82] fix(core): report missing search paths (#35337)

---
 packages/core/src/tool/glob.ts         | 15 ++++-
 packages/core/src/tool/grep.ts         | 16 ++++-
 packages/core/test/tool-search.test.ts | 87 ++++++++++++++++++++++++++
 3 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 packages/core/test/tool-search.test.ts

diff --git a/packages/core/src/tool/glob.ts b/packages/core/src/tool/glob.ts
index d4412ae302..dcea52120f 100644
--- a/packages/core/src/tool/glob.ts
+++ b/packages/core/src/tool/glob.ts
@@ -5,6 +5,7 @@ import type { PluginContext } from "@opencode-ai/plugin/v2/effect"
 import { Effect, Schema } from "effect"
 import path from "path"
 import { FileSystem } from "../filesystem"
+import { FSUtil } from "../fs-util"
 import { Location } from "../location"
 import { Ripgrep } from "../ripgrep"
 import { RelativePath } from "../schema"
@@ -36,6 +37,7 @@ export const toModelOutput = (output: ModelOutput) => {
 export const Plugin = {
   id: "core-glob-tool",
   effect: Effect.fn("GlobTool.Plugin")(function* (ctx: PluginContext) {
+    const fs = yield* FSUtil.Service
     const ripgrep = yield* Ripgrep.Service
     const location = yield* Location.Service
     const permission = yield* PermissionV2.Service
@@ -71,6 +73,13 @@ export const Plugin = {
                 source: { type: "tool", messageID: context.assistantMessageID, callID: context.toolCallID },
               })
               const cwd = path.resolve(location.directory, input.path ?? ".")
+              yield* fs
+                .stat(cwd)
+                .pipe(
+                  Effect.catchReason("PlatformError", "NotFound", () =>
+                    Effect.fail(new ToolFailure({ message: `Search path does not exist: ${input.path ?? "."}` })),
+                  ),
+                )
               return yield* ripgrep
                 .glob({
                   cwd,
@@ -88,7 +97,11 @@ export const Plugin = {
                   ),
                 )
             }).pipe(
-              Effect.mapError(() => new ToolFailure({ message: `Unable to find files matching ${input.pattern}` })),
+              Effect.mapError((error) =>
+                error instanceof ToolFailure
+                  ? error
+                  : new ToolFailure({ message: `Unable to find files matching ${input.pattern}` }),
+              ),
             ),
         }),
       })
diff --git a/packages/core/src/tool/grep.ts b/packages/core/src/tool/grep.ts
index e525606609..35ac537c91 100644
--- a/packages/core/src/tool/grep.ts
+++ b/packages/core/src/tool/grep.ts
@@ -91,7 +91,13 @@ export const Plugin = {
                 source: { type: "tool", messageID: context.assistantMessageID, callID: context.toolCallID },
               })
               const target = path.resolve(location.directory, input.path ?? ".")
-              const info = yield* fs.stat(target).pipe(Effect.catch(() => Effect.succeed(undefined)))
+              const info = yield* fs
+                .stat(target)
+                .pipe(
+                  Effect.catchReason("PlatformError", "NotFound", () =>
+                    Effect.fail(new ToolFailure({ message: `Search path does not exist: ${input.path ?? "."}` })),
+                  ),
+                )
               return yield* ripgrep
                 .grep({
                   cwd: info?.type === "Directory" ? target : path.dirname(target),
@@ -121,7 +127,13 @@ export const Plugin = {
                     ),
                   ),
                 )
-            }).pipe(Effect.mapError(() => new ToolFailure({ message: `Unable to grep for ${input.pattern}` }))),
+            }).pipe(
+              Effect.mapError((error) =>
+                error instanceof ToolFailure
+                  ? error
+                  : new ToolFailure({ message: `Unable to grep for ${input.pattern}` }),
+              ),
+            ),
         }),
       })
       .pipe(Effect.orDie)
diff --git a/packages/core/test/tool-search.test.ts b/packages/core/test/tool-search.test.ts
new file mode 100644
index 0000000000..b1bad34102
--- /dev/null
+++ b/packages/core/test/tool-search.test.ts
@@ -0,0 +1,87 @@
+import { describe, expect } from "bun:test"
+import { Effect, Layer } from "effect"
+import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
+import { makeLocationNode } from "@opencode-ai/core/effect/app-node"
+import { LayerNode } from "@opencode-ai/core/effect/layer-node"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { Location } from "@opencode-ai/core/location"
+import { PermissionV2 } from "@opencode-ai/core/permission"
+import { Ripgrep } from "@opencode-ai/core/ripgrep"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { SessionV2 } from "@opencode-ai/core/session"
+import { GlobTool } from "@opencode-ai/core/tool/glob"
+import { GrepTool } from "@opencode-ai/core/tool/grep"
+import { ToolRegistry } from "@opencode-ai/core/tool/registry"
+import { ToolOutputStore } from "@opencode-ai/core/tool-output-store"
+import { location } from "./fixture/location"
+import { tmpdir } from "./fixture/tmpdir"
+import { testEffect } from "./lib/effect"
+import { executeTool, registerToolPlugin, toolIdentity } from "./lib/tool"
+
+const globToolNode = makeLocationNode({
+  name: "test/glob-tool-plugin",
+  layer: Layer.effectDiscard(registerToolPlugin(GlobTool.Plugin)),
+  deps: [ToolRegistry.toolsNode, FSUtil.node, Ripgrep.node, Location.node, PermissionV2.node],
+})
+const grepToolNode = makeLocationNode({
+  name: "test/grep-tool-plugin",
+  layer: Layer.effectDiscard(registerToolPlugin(GrepTool.Plugin)),
+  deps: [ToolRegistry.toolsNode, FSUtil.node, Ripgrep.node, Location.node, PermissionV2.node],
+})
+const permission = Layer.succeed(
+  PermissionV2.Service,
+  PermissionV2.Service.of({
+    assert: () => Effect.void,
+    ask: () => Effect.die("unused"),
+    reply: () => Effect.die("unused"),
+    get: () => Effect.die("unused"),
+    forSession: () => Effect.die("unused"),
+    list: () => Effect.die("unused"),
+  }),
+)
+const sessionID = SessionV2.ID.make("ses_search_tool_test")
+
+const withTools = <A, E, R>(directory: string, body: (registry: ToolRegistry.Interface) => Effect.Effect<A, E, R>) =>
+  Effect.gen(function* () {
+    return yield* body(yield* ToolRegistry.Service)
+  }).pipe(
+    Effect.provide(
+      AppNodeBuilder.build(LayerNode.group([ToolRegistry.node, ToolRegistry.toolsNode, globToolNode, grepToolNode]), [
+        [
+          Location.node,
+          Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make(directory) }))),
+        ],
+        [PermissionV2.node, permission],
+        [ToolOutputStore.node, ToolOutputStore.nodeWithoutConfig],
+      ]),
+    ),
+  )
+
+const call = (name: "glob" | "grep", input: unknown) => ({
+  sessionID,
+  ...toolIdentity,
+  call: { type: "tool-call" as const, id: `call-${name}`, name, input },
+})
+
+const it = testEffect(Layer.empty)
+
+describe("search tools", () => {
+  for (const name of ["glob", "grep"] as const) {
+    it.live(`${name} reports a missing search path`, () =>
+      Effect.acquireUseRelease(
+        Effect.promise(() => tmpdir()),
+        (tmp) =>
+          withTools(tmp.path, (registry) =>
+            Effect.gen(function* () {
+              const result = yield* executeTool(
+                registry,
+                call(name, { path: "missing", pattern: name === "glob" ? "*" : "needle" }),
+              )
+              expect(result).toEqual({ type: "error", value: "Search path does not exist: missing" })
+            }),
+          ),
+        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+      ),
+    )
+  }
+})

From c590e276398bfd3fbadbf2113144e0bece9bfaa8 Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Sat, 4 Jul 2026 11:49:24 -0500
Subject: [PATCH 51/82] feat(core): add grouped and deferred tool registration
 (#35232)

---
 packages/core/src/plugin/host.ts      |   2 +-
 packages/core/src/tool/AGENTS.md      |   3 +-
 packages/core/src/tool/mcp.ts         | 111 +++++++++++++-------------
 packages/core/src/tool/registry.ts    |  70 +++++++++++-----
 packages/core/src/tool/tools.ts       |   3 +
 packages/core/test/mcp.test.ts        |   5 ++
 packages/core/test/plugin.test.ts     |  32 ++++++++
 packages/plugin/src/v2/effect/tool.ts |  23 +++++-
 8 files changed, 170 insertions(+), 79 deletions(-)

diff --git a/packages/core/src/plugin/host.ts b/packages/core/src/plugin/host.ts
index d25555eb37..585c254a78 100644
--- a/packages/core/src/plugin/host.ts
+++ b/packages/core/src/plugin/host.ts
@@ -302,7 +302,7 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: PluginV2.Int
         }),
     },
     tool: {
-      register: (input) => tools.register(input),
+      register: (input, options) => tools.register(input, options),
       execute: {
         before: (callback) =>
           toolHooks.hook.before((event) => {
diff --git a/packages/core/src/tool/AGENTS.md b/packages/core/src/tool/AGENTS.md
index 3719322fa1..4b427f9835 100644
--- a/packages/core/src/tool/AGENTS.md
+++ b/packages/core/src/tool/AGENTS.md
@@ -28,7 +28,8 @@ Leaves own resolution, permission, and side-effect ordering. Translate only expe
 
 ## Registration
 
-Built-ins and plugin tools register through `Tools.Service.register({ [name]: tool })`.
+Built-ins and plugin tools register through `Tools.Service.register({ [name]: tool })`. Registrations may provide a
+group, which flattens direct model names to `<group>_<tool>`, and may be deferred from direct model exposure.
 
 Registrations are scoped:
 
diff --git a/packages/core/src/tool/mcp.ts b/packages/core/src/tool/mcp.ts
index 571b747bab..7867fc6571 100644
--- a/packages/core/src/tool/mcp.ts
+++ b/packages/core/src/tool/mcp.ts
@@ -1,6 +1,5 @@
 export * as McpTool from "./mcp"
 
-import { createHash } from "node:crypto"
 import { ToolFailure } from "@opencode-ai/llm"
 import { McpEvent } from "@opencode-ai/schema/mcp-event"
 import { Effect, Exit, type JsonSchema, Layer, Scope, Semaphore, Stream } from "effect"
@@ -11,35 +10,11 @@ import { Tool } from "./tool"
 import { Tools } from "./tools"
 import { ToolRegistry } from "./registry"
 
-const MAX_NAME_LENGTH = 64
-const HASH_LENGTH = 8
-
-const sanitize = (value: string) => value.replace(/[^A-Za-z0-9_-]/g, "_")
-
-// Deterministic short suffix used to keep overlong or colliding names unique and stable across restarts.
-const hashSuffix = (raw: string) => "_" + createHash("sha1").update(raw).digest("hex").slice(0, HASH_LENGTH)
-
-const fit = (base: string, raw: string) => base.slice(0, MAX_NAME_LENGTH - HASH_LENGTH - 1) + hashSuffix(raw)
-
 /**
- * Registry/permission action name for an MCP tool: V1-compatible `<server>_<tool>` so existing deny
- * rules keep working. Sanitized to a valid tool name, prefixed when it would not start with a letter,
- * and hashed down when it would exceed the 64-char limit.
+ * Registry and permission action name for an MCP tool.
  */
-export const name = (server: string, tool: string) => {
-  const joined = sanitize(server) + "_" + sanitize(tool)
-  const base = /^[A-Za-z]/.test(joined) ? joined : "mcp_" + joined
-  return base.length > MAX_NAME_LENGTH ? fit(base, `${server}\u0000${tool}`) : base
-}
-
-const toContent = (part: MCP.ToolResultContent): Tool.Content =>
-  part.type === "text" ? { type: "text", text: part.text } : { type: "file", data: part.data, mime: part.mimeType }
-
-const errorText = (content: ReadonlyArray<MCP.ToolResultContent>) =>
-  content
-    .flatMap((part) => (part.type === "text" ? [part.text] : []))
-    .join("\n")
-    .trim()
+export const name = (server: string, tool: string) =>
+  `${server.replace(/[^a-zA-Z0-9_-]/g, "_")}_${tool.replace(/[^a-zA-Z0-9_-]/g, "_")}`
 
 export const layer = Layer.effectDiscard(
   Effect.gen(function* () {
@@ -50,47 +25,71 @@ export const layer = Layer.effectDiscard(
     const lock = Semaphore.makeUnsafe(1)
     let current: Scope.Closeable | undefined
 
-    const make = (server: MCP.ServerName, tool: MCP.Tool) =>
-      Tool.make({
-        description: tool.description ?? "",
-        jsonSchema: (tool.inputSchema as JsonSchema.JsonSchema | undefined) ?? { type: "object", properties: {} },
-        execute: (input) =>
-          Effect.gen(function* () {
-            const result = yield* mcp.callTool({ server, name: tool.name, args: (input ?? {}) as Record<string, unknown> }).pipe(
-              Effect.catchTags({
-                "MCP.NotFoundError": (error) => new ToolFailure({ message: `MCP server "${error.server}" is not available` }),
-                "MCP.ToolCallError": (error) => new ToolFailure({ message: error.message }),
-              }),
-            )
-            if (result.isError)
-              return yield* new ToolFailure({ message: errorText(result.content) || "MCP tool returned an error" })
-            return { structured: result.structured ?? {}, content: result.content.map(toContent) }
-          }),
-      })
-
     // Register the current tool set under a fresh child scope, then close the previous one so the
     // registry never has a gap where MCP tools disappear mid-swap.
     const reconcile = lock.withPermit(
       Effect.gen(function* () {
-        const used = new Set<string>()
-        const record: Record<string, Tool.AnyTool> = {}
+        const groups = new Map<string, Record<string, Tool.AnyTool>>()
         for (const tool of yield* mcp.tools()) {
-          const initial = name(tool.server, tool.name)
-          const key = used.has(initial) ? fit(initial, `${tool.server}\u0000${tool.name}`) : initial
-          used.add(key)
-          record[key] = make(tool.server, tool)
+          const group = groups.get(tool.server) ?? {}
+          const schema = (tool.inputSchema ?? {}) as JsonSchema.JsonSchema
+          group[tool.name] = Tool.make({
+            description: tool.description ?? "",
+            jsonSchema: {
+              ...schema,
+              type: "object",
+              properties: schema.properties ?? {},
+              additionalProperties: false,
+            },
+            execute: (input) =>
+              Effect.gen(function* () {
+                const result = yield* mcp
+                  .callTool({
+                    server: tool.server,
+                    name: tool.name,
+                    args: (input ?? {}) as Record<string, unknown>,
+                  })
+                  .pipe(
+                    Effect.catchTags({
+                      "MCP.NotFoundError": (error) =>
+                        new ToolFailure({ message: `MCP server "${error.server}" is not available` }),
+                      "MCP.ToolCallError": (error) => new ToolFailure({ message: error.message }),
+                    }),
+                  )
+                if (result.isError)
+                  return yield* new ToolFailure({
+                    message:
+                      result.content
+                        .flatMap((part) => (part.type === "text" ? [part.text] : []))
+                        .join("\n")
+                        .trim() || "MCP tool returned an error",
+                  })
+                return {
+                  structured: result.structured ?? {},
+                  content: result.content.map((part) =>
+                    part.type === "text"
+                      ? { type: "text" as const, text: part.text }
+                      : { type: "file" as const, data: part.data, mime: part.mimeType },
+                  ),
+                }
+              }),
+          })
+          groups.set(tool.server, group)
         }
         const next = yield* Scope.fork(scope)
-        yield* tools.register(record).pipe(Scope.provide(next), Effect.orDie)
+        yield* Effect.forEach(groups, ([group, record]) => tools.register(record, { group }), {
+          discard: true,
+        }).pipe(Scope.provide(next), Effect.orDie)
         if (current) yield* Scope.close(current, Exit.void)
         current = next
       }),
     )
 
     yield* reconcile.pipe(Effect.forkScoped)
-    yield* events
-      .subscribe(McpEvent.ToolsChanged)
-      .pipe(Stream.runForEach(() => reconcile), Effect.forkScoped({ startImmediately: true }))
+    yield* events.subscribe(McpEvent.ToolsChanged).pipe(
+      Stream.runForEach(() => reconcile),
+      Effect.forkScoped({ startImmediately: true }),
+    )
   }),
 )
 
diff --git a/packages/core/src/tool/registry.ts b/packages/core/src/tool/registry.ts
index 1dc7478c11..dcdbb1c888 100644
--- a/packages/core/src/tool/registry.ts
+++ b/packages/core/src/tool/registry.ts
@@ -23,7 +23,10 @@ export type ExecuteInput = {
 export interface Interface {
   readonly materialize: (input: MaterializeInput) => Effect.Effect<Materialization>
   /** Internal registration capability exposed publicly only through Tools.Service. */
-  readonly register: (tools: Readonly<Record<string, AnyTool>>) => Effect.Effect<void, RegistrationError, Scope.Scope>
+  readonly register: (
+    tools: Readonly<Record<string, AnyTool>>,
+    options?: Tools.RegisterOptions,
+  ) => Effect.Effect<void, RegistrationError, Scope.Scope>
 }
 
 export interface MaterializeInput {
@@ -49,7 +52,13 @@ const registryLayer = Layer.effect(
   Effect.gen(function* () {
     const resources = yield* ToolOutputStore.Service
     const toolHooks = yield* ToolHooks.Service
-    type Registration = { readonly identity: object; readonly tool: AnyTool }
+    type Registration = {
+      readonly identity: object
+      readonly tool: AnyTool
+      readonly name: string
+      readonly group?: string
+      readonly deferred: boolean
+    }
     const local = new Map<string, Array<{ readonly token: object; readonly registration: Registration }>>()
 
     const settleWith = Effect.fn("ToolRegistry.settle")(function* (input: ExecuteInput, advertised?: object) {
@@ -73,12 +82,16 @@ const registryLayer = Layer.effect(
         input: input.call.input,
       }
       yield* toolHooks.runBefore(beforeEvent)
-      const pending = yield* settle(registration.tool, { ...input.call, input: beforeEvent.input }, {
-        sessionID: input.sessionID,
-        agent: input.agent,
-        assistantMessageID: input.assistantMessageID,
-        toolCallID: input.call.id,
-      }).pipe(
+      const pending = yield* settle(
+        registration.tool,
+        { ...input.call, input: beforeEvent.input },
+        {
+          sessionID: input.sessionID,
+          agent: input.agent,
+          assistantMessageID: input.assistantMessageID,
+          toolCallID: input.call.id,
+        },
+      ).pipe(
         Effect.map((output) => ({ output })),
         Effect.catchTag("LLM.ToolFailure", (failure) =>
           Effect.succeed({ result: { type: "error" as const, value: failure.message } }),
@@ -88,7 +101,11 @@ const registryLayer = Layer.effect(
       if ("result" in pending) {
         settlement = pending
       } else {
-        const bounded = yield* resources.bound({ sessionID: input.sessionID, toolCallID: input.call.id, output: pending.output })
+        const bounded = yield* resources.bound({
+          sessionID: input.sessionID,
+          toolCallID: input.call.id,
+          output: pending.output,
+        })
         const result = ToolOutput.toResultValue(bounded.output)
         settlement =
           result.type === "error"
@@ -119,20 +136,33 @@ const registryLayer = Layer.effect(
     })
 
     return Service.of({
-      register: Effect.fn("ToolRegistry.register")(function* (tools) {
-        const entries = registrationEntries(tools)
+      register: Effect.fn("ToolRegistry.register")(function* (tools, options) {
+        const entries = registrationEntries(tools, options?.group)
         if (entries.length === 0) return
         yield* Effect.uninterruptible(
           Effect.gen(function* () {
             const token = {}
-            for (const [name, tool] of entries)
-              local.set(name, [...(local.get(name) ?? []), { token, registration: { identity: {}, tool } }])
+            for (const entry of entries)
+              local.set(entry.key, [
+                ...(local.get(entry.key) ?? []),
+                {
+                  token,
+                  registration: {
+                    identity: {},
+                    tool: entry.tool,
+                    name: entry.name,
+                    group: entry.group,
+                    deferred: options?.deferred ?? false,
+                  },
+                },
+              ])
             yield* Effect.addFinalizer(() =>
               Effect.sync(() => {
-                for (const [name] of entries) {
-                  const registrations = local.get(name)?.filter((registration) => registration.token !== token) ?? []
-                  if (registrations.length > 0) local.set(name, registrations)
-                  else local.delete(name)
+                for (const entry of entries) {
+                  const registrations =
+                    local.get(entry.key)?.filter((registration) => registration.token !== token) ?? []
+                  if (registrations.length > 0) local.set(entry.key, registrations)
+                  else local.delete(entry.key)
                 }
               }),
             )
@@ -149,7 +179,11 @@ const registryLayer = Layer.effect(
         const usePatch = input.model.provider.toLowerCase() === "openai" || input.model.id.toLowerCase().includes("gpt")
         for (const [name, registration] of registrations) {
           const wrongEditTool = name === "apply_patch" ? !usePatch : (name === "edit" || name === "write") && usePatch
-          if (wrongEditTool || whollyDisabled(permission(registration.tool, name), input.permissions ?? []))
+          if (
+            registration.deferred ||
+            wrongEditTool ||
+            whollyDisabled(permission(registration.tool, name), input.permissions ?? [])
+          )
             registrations.delete(name)
         }
         return {
diff --git a/packages/core/src/tool/tools.ts b/packages/core/src/tool/tools.ts
index 0939ce957b..06b920a484 100644
--- a/packages/core/src/tool/tools.ts
+++ b/packages/core/src/tool/tools.ts
@@ -3,9 +3,12 @@ export * as Tools from "./tools"
 import { Context, Effect, Scope } from "effect"
 import { Tool } from "./tool"
 
+export type RegisterOptions = Tool.RegisterOptions
+
 export interface Interface {
   readonly register: (
     tools: Readonly<Record<string, Tool.AnyTool>>,
+    options?: Tool.RegisterOptions,
   ) => Effect.Effect<void, Tool.RegistrationError, Scope.Scope>
 }
 
diff --git a/packages/core/test/mcp.test.ts b/packages/core/test/mcp.test.ts
index 15ff95a28f..7c62032784 100644
--- a/packages/core/test/mcp.test.ts
+++ b/packages/core/test/mcp.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, test } from "bun:test"
 import { MCP } from "@opencode-ai/core/mcp/index"
 import { MCPClient } from "@opencode-ai/core/mcp/client"
+import { McpTool } from "@opencode-ai/core/tool/mcp"
 
 describe("MCP errors", () => {
   test("expose useful messages", () => {
@@ -12,3 +13,7 @@ describe("MCP errors", () => {
     expect(new MCPClient.ConnectError({ server: "demo", message: "offline" }).message).toBe("offline")
   })
 })
+
+test("MCP tool names match V1 sanitization", () => {
+  expect(McpTool.name("context 7", "resolve.library/id")).toBe("context_7_resolve_library_id")
+})
diff --git a/packages/core/test/plugin.test.ts b/packages/core/test/plugin.test.ts
index 42f2a768ec..1a60decb0b 100644
--- a/packages/core/test/plugin.test.ts
+++ b/packages/core/test/plugin.test.ts
@@ -126,6 +126,38 @@ describe("PluginV2", () => {
     }),
   )
 
+  it.effect("groups tool names and defers registrations from direct exposure", () =>
+    Effect.gen(function* () {
+      const plugins = yield* PluginV2.Service
+      const registry = yield* ToolRegistry.Service
+      const tool = (description: string) =>
+        Tool.make({
+          description,
+          input: Schema.Struct({}),
+          output: Schema.Struct({ ok: Schema.Boolean }),
+          execute: () => Effect.succeed({ ok: true }),
+        })
+      const plugin = define({
+        id: "grouped-tools",
+        effect: (ctx) =>
+          Effect.gen(function* () {
+            yield* ctx.tool.register({ plain: tool("Plain") }).pipe(Effect.orDie)
+            yield* ctx.tool.register({ "look/up": tool("Lookup") }, { group: "context 7" }).pipe(Effect.orDie)
+            yield* ctx.tool
+              .register({ search: tool("Search") }, { group: "context 7", deferred: true })
+              .pipe(Effect.orDie)
+          }),
+      })
+
+      yield* plugins.add(PluginV2.ID.make(plugin.id), plugin.effect)
+
+      expect((yield* registry.materialize({ model: testModel })).definitions.map((tool) => tool.name)).toEqual([
+        "plain",
+        "context_7_look_up",
+      ])
+    }),
+  )
+
   it.effect("fires before/after tool hooks with mutable events around settlement", () =>
     Effect.gen(function* () {
       const plugins = yield* PluginV2.Service
diff --git a/packages/plugin/src/v2/effect/tool.ts b/packages/plugin/src/v2/effect/tool.ts
index c25f79c58b..98efaa3ce2 100644
--- a/packages/plugin/src/v2/effect/tool.ts
+++ b/packages/plugin/src/v2/effect/tool.ts
@@ -186,8 +186,17 @@ export const validateName = (name: string) =>
     ? Effect.void
     : Effect.fail(new RegistrationError({ name, message: `Invalid tool name: ${name}` }))
 
-export const registrationEntries = (tools: Readonly<Record<string, AnyTool>>) =>
-  Object.entries(tools).map(([name, tool]) => [name.replace(/[^a-zA-Z0-9_-]/g, "_"), tool] as const)
+export const registrationEntries = (tools: Readonly<Record<string, AnyTool>>, group?: string) =>
+  Object.entries(tools).map(([name, tool]) => {
+    const normalized = name.replace(/[^a-zA-Z0-9_-]/g, "_")
+    const parent = group?.replace(/[^a-zA-Z0-9_-]/g, "_")
+    return {
+      key: parent === undefined ? normalized : `${parent}_${normalized}`,
+      name: normalized,
+      group: parent,
+      tool,
+    }
+  })
 
 export const withPermission = <Input extends SchemaType<any>, Output extends SchemaType<any>>(
   tool: Definition<Input, Output>,
@@ -235,7 +244,15 @@ export interface ToolExecuteAfterEvent {
   outputPaths?: ReadonlyArray<string>
 }
 
+export interface RegisterOptions {
+  readonly group?: string
+  readonly deferred?: boolean
+}
+
 export interface ToolDomain {
-  readonly register: (tools: Readonly<Record<string, AnyTool>>) => Effect.Effect<void, RegistrationError, Scope.Scope>
+  readonly register: (
+    tools: Readonly<Record<string, AnyTool>>,
+    options?: RegisterOptions,
+  ) => Effect.Effect<void, RegistrationError, Scope.Scope>
   readonly execute: Hooks<{ before: ToolExecuteBeforeEvent; after: ToolExecuteAfterEvent }>
 }

From b99759c7defbd7ade26ef220380888e2767995b0 Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Sat, 4 Jul 2026 13:03:40 -0500
Subject: [PATCH 52/82] fix(core): enforce mcp tool permissions (#35345)

---
 packages/core/src/tool/mcp.ts  |  27 ++++++++-
 packages/core/test/mcp.test.ts | 108 +++++++++++++++++++++++++++++++++
 2 files changed, 132 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/tool/mcp.ts b/packages/core/src/tool/mcp.ts
index 7867fc6571..23d11d06a0 100644
--- a/packages/core/src/tool/mcp.ts
+++ b/packages/core/src/tool/mcp.ts
@@ -6,6 +6,7 @@ import { Effect, Exit, type JsonSchema, Layer, Scope, Semaphore, Stream } from "
 import { makeLocationNode } from "../effect/app-node"
 import { EventV2 } from "../event"
 import { MCP } from "../mcp"
+import { PermissionV2 } from "../permission"
 import { Tool } from "./tool"
 import { Tools } from "./tools"
 import { ToolRegistry } from "./registry"
@@ -21,6 +22,7 @@ export const layer = Layer.effectDiscard(
     const mcp = yield* MCP.Service
     const tools = yield* Tools.Service
     const events = yield* EventV2.Service
+    const permission = yield* PermissionV2.Service
     const scope = yield* Scope.Scope
     const lock = Semaphore.makeUnsafe(1)
     let current: Scope.Closeable | undefined
@@ -41,8 +43,21 @@ export const layer = Layer.effectDiscard(
               properties: schema.properties ?? {},
               additionalProperties: false,
             },
-            execute: (input) =>
+            execute: (input, context) =>
               Effect.gen(function* () {
+                yield* permission.assert({
+                  action: name(tool.server, tool.name),
+                  resources: ["*"],
+                  save: ["*"],
+                  metadata: {},
+                  sessionID: context.sessionID,
+                  agent: context.agent,
+                  source: {
+                    type: "tool",
+                    messageID: context.assistantMessageID,
+                    callID: context.toolCallID,
+                  },
+                })
                 const result = yield* mcp
                   .callTool({
                     server: tool.server,
@@ -72,7 +87,13 @@ export const layer = Layer.effectDiscard(
                       : { type: "file" as const, data: part.data, mime: part.mimeType },
                   ),
                 }
-              }),
+              }).pipe(
+                Effect.mapError((error) =>
+                  error instanceof ToolFailure
+                    ? error
+                    : new ToolFailure({ message: `Unable to execute ${name(tool.server, tool.name)}` }),
+                ),
+              ),
           })
           groups.set(tool.server, group)
         }
@@ -96,5 +117,5 @@ export const layer = Layer.effectDiscard(
 export const node = makeLocationNode({
   name: "mcp-tools",
   layer,
-  deps: [ToolRegistry.toolsNode, MCP.node, EventV2.node],
+  deps: [ToolRegistry.toolsNode, MCP.node, EventV2.node, PermissionV2.node],
 })
diff --git a/packages/core/test/mcp.test.ts b/packages/core/test/mcp.test.ts
index 7c62032784..f52b223dce 100644
--- a/packages/core/test/mcp.test.ts
+++ b/packages/core/test/mcp.test.ts
@@ -1,7 +1,61 @@
 import { describe, expect, test } from "bun:test"
+import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
+import { LayerNode } from "@opencode-ai/core/effect/layer-node"
+import { EventV2 } from "@opencode-ai/core/event"
 import { MCP } from "@opencode-ai/core/mcp/index"
 import { MCPClient } from "@opencode-ai/core/mcp/client"
+import { PermissionV2 } from "@opencode-ai/core/permission"
+import { SessionV2 } from "@opencode-ai/core/session"
 import { McpTool } from "@opencode-ai/core/tool/mcp"
+import { ToolRegistry } from "@opencode-ai/core/tool/registry"
+import { ToolOutputStore } from "@opencode-ai/core/tool-output-store"
+import { Deferred, Effect, Fiber, Layer, Stream } from "effect"
+import { testEffect } from "./lib/effect"
+import { settleTool, toolIdentity, waitForTool } from "./lib/tool"
+
+let assertion: Deferred.Deferred<PermissionV2.AssertInput> | undefined
+let decision: Effect.Effect<void, PermissionV2.Error> = Effect.void
+let calls = 0
+
+const mcp = Layer.mock(MCP.Service, {
+  tools: () =>
+    Effect.succeed([
+      new MCP.Tool({
+        server: MCP.ServerName.make("demo"),
+        name: "search",
+        description: "Search",
+        inputSchema: { type: "object", properties: {} },
+      }),
+    ]),
+  callTool: (input) =>
+    Effect.sync(() => {
+      calls += 1
+      return new MCP.ToolResult({
+        server: MCP.ServerName.make(input.server),
+        tool: input.name,
+        isError: false,
+        structured: { ok: true },
+        content: [],
+      })
+    }),
+})
+const permissions = Layer.mock(PermissionV2.Service, {
+  assert: (input) =>
+    Effect.gen(function* () {
+      if (!assertion) return yield* Effect.die("Permission test is not initialized")
+      yield* Deferred.succeed(assertion, input)
+      yield* decision
+    }),
+})
+const events = Layer.mock(EventV2.Service, { subscribe: () => Stream.never })
+const it = testEffect(
+  AppNodeBuilder.build(LayerNode.group([ToolRegistry.node, ToolRegistry.toolsNode, McpTool.node]), [
+    [MCP.node, mcp],
+    [PermissionV2.node, permissions],
+    [EventV2.node, events],
+    [ToolOutputStore.node, ToolOutputStore.nodeWithoutConfig],
+  ]),
+)
 
 describe("MCP errors", () => {
   test("expose useful messages", () => {
@@ -17,3 +71,57 @@ describe("MCP errors", () => {
 test("MCP tool names match V1 sanitization", () => {
   expect(McpTool.name("context 7", "resolve.library/id")).toBe("context_7_resolve_library_id")
 })
+
+it.effect("waits for permission before calling an MCP tool", () =>
+  Effect.gen(function* () {
+    calls = 0
+    assertion = yield* Deferred.make<PermissionV2.AssertInput>()
+    const permission = yield* Deferred.make<void>()
+    decision = Deferred.await(permission)
+    const registry = yield* ToolRegistry.Service
+    yield* waitForTool(registry, "demo_search")
+
+    const fiber = yield* settleTool(registry, {
+      sessionID: SessionV2.ID.make("ses_mcp_permission"),
+      ...toolIdentity,
+      call: { type: "tool-call", id: "call_mcp_permission", name: "demo_search", input: {} },
+    }).pipe(Effect.forkScoped)
+    expect(yield* Deferred.await(assertion)).toEqual({
+      action: "demo_search",
+      resources: ["*"],
+      save: ["*"],
+      metadata: {},
+      sessionID: SessionV2.ID.make("ses_mcp_permission"),
+      agent: toolIdentity.agent,
+      source: {
+        type: "tool",
+        messageID: toolIdentity.assistantMessageID,
+        callID: "call_mcp_permission",
+      },
+    })
+    expect(calls).toBe(0)
+
+    yield* Deferred.succeed(permission, undefined)
+    yield* Fiber.join(fiber)
+    expect(calls).toBe(1)
+  }),
+)
+
+it.effect("does not call MCP when permission is rejected", () =>
+  Effect.gen(function* () {
+    calls = 0
+    assertion = yield* Deferred.make<PermissionV2.AssertInput>()
+    decision = Effect.fail(new PermissionV2.RejectedError())
+    const registry = yield* ToolRegistry.Service
+    yield* waitForTool(registry, "demo_search")
+
+    expect(
+      yield* settleTool(registry, {
+        sessionID: SessionV2.ID.make("ses_mcp_rejected"),
+        ...toolIdentity,
+        call: { type: "tool-call", id: "call_mcp_rejected", name: "demo_search", input: {} },
+      }),
+    ).toEqual({ result: { type: "error", value: "Unable to execute demo_search" } })
+    expect(calls).toBe(0)
+  }),
+)

From ba07481b59d012c9c708d092e169ec97f75309b0 Mon Sep 17 00:00:00 2001
From: Simon Klee <hello@simonklee.dk>
Date: Sat, 4 Jul 2026 15:21:37 +0200
Subject: [PATCH 53/82] fix(run): restore subprocess output contracts

---
 .../server/routes/instance/httpapi/server.ts  |  3 +-
 .../test/cli/run/session-data.test.ts         | 93 ++++++++-----------
 packages/opencode/test/lib/llm-server.ts      |  3 +-
 3 files changed, 42 insertions(+), 57 deletions(-)

diff --git a/packages/opencode/src/server/routes/instance/httpapi/server.ts b/packages/opencode/src/server/routes/instance/httpapi/server.ts
index 7edefdacd4..108888d4f6 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/server.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/server.ts
@@ -294,8 +294,6 @@ export function createRoutes(
       HttpServer.layerServices,
     ]),
     Layer.provide(Layer.succeed(CorsConfig)(corsOptions)),
-    Layer.provideMerge(Observability.layer),
-
     Layer.provide(formLocationLayer),
     Layer.provide(sessionLocationLayer),
     Layer.provide(locationLayer),
@@ -312,6 +310,7 @@ export function createRoutes(
     Layer.provide(locationServiceMapV2),
 
     Layer.provide(AppNodeBuilderV1.build(app)),
+    Layer.provideMerge(Observability.layer),
   )
 }
 
diff --git a/packages/opencode/test/cli/run/session-data.test.ts b/packages/opencode/test/cli/run/session-data.test.ts
index 805bcd486f..1483356986 100644
--- a/packages/opencode/test/cli/run/session-data.test.ts
+++ b/packages/opencode/test/cli/run/session-data.test.ts
@@ -110,6 +110,39 @@ function tool(input: { id: string; messageID: string; tool: string; state: Recor
   }
 }
 
+function shellInfo(id: string, status: "running" | "exited", completed?: number) {
+  return {
+    id,
+    status,
+    command: "pwd",
+    cwd: "/tmp/demo",
+    shell: "/bin/sh",
+    file: `/tmp/${id}.log`,
+    ...(status === "exited" ? { exit: 0 } : {}),
+    metadata: {},
+    time: { started: 1, ...(completed === undefined ? {} : { completed }) },
+  }
+}
+
+function shellStarted(id = "call-1") {
+  return {
+    type: "session.shell.started",
+    properties: { sessionID: "session-1", shell: shellInfo(id, "running") },
+  }
+}
+
+function shellEnded(id = "call-1") {
+  const output = "/tmp/demo\n"
+  return {
+    type: "session.shell.ended",
+    properties: {
+      sessionID: "session-1",
+      shell: shellInfo(id, "exited", 2),
+      output: { output, cursor: Buffer.byteLength(output), size: Buffer.byteLength(output), truncated: false },
+    },
+  }
+}
+
 describe("run session data", () => {
   test("buffers delayed assistant text until the role is known", () => {
     let data = createSessionData()
@@ -328,15 +361,7 @@ describe("run session data", () => {
 
   test("renders direct shell mode from first-class shell events", () => {
     let data = createSessionData()
-    const started = reduce(data, {
-      type: "session.shell.started",
-      properties: {
-        sessionID: "session-1",
-        timestamp: 1,
-        callID: "call-1",
-        command: "pwd",
-      },
-    })
+    const started = reduce(data, shellStarted())
 
     expect(started.commits).toEqual([
       expect.objectContaining({
@@ -352,15 +377,7 @@ describe("run session data", () => {
     ])
 
     data = started.data
-    const ended = reduce(data, {
-      type: "session.shell.ended",
-      properties: {
-        sessionID: "session-1",
-        timestamp: 2,
-        callID: "call-1",
-        output: "/tmp/demo\n",
-      },
-    })
+    const ended = reduce(data, shellEnded())
 
     expect(ended.commits).toEqual([
       expect.objectContaining({
@@ -379,15 +396,7 @@ describe("run session data", () => {
   })
 
   test("suppresses legacy bash part updates once shell events claim the call", () => {
-    let data = reduce(createSessionData(), {
-      type: "session.shell.started",
-      properties: {
-        sessionID: "session-1",
-        timestamp: 1,
-        callID: "call-1",
-        command: "pwd",
-      },
-    }).data
+    let data = reduce(createSessionData(), shellStarted()).data
 
     expect(
       reduce(
@@ -408,15 +417,7 @@ describe("run session data", () => {
       ).commits,
     ).toEqual([])
 
-    data = reduce(data, {
-      type: "session.shell.ended",
-      properties: {
-        sessionID: "session-1",
-        timestamp: 2,
-        callID: "call-1",
-        output: "/tmp/demo\n",
-      },
-    }).data
+    data = reduce(data, shellEnded()).data
 
     expect(
       reduce(
@@ -462,15 +463,7 @@ describe("run session data", () => {
     ).data
 
     expect(
-      reduce(data, {
-        type: "session.shell.started",
-        properties: {
-          sessionID: "session-1",
-          timestamp: 1,
-          callID: "call-1",
-          command: "pwd",
-        },
-      }).commits,
+      reduce(data, shellStarted()).commits,
     ).toEqual([])
 
     data = reduce(
@@ -496,15 +489,7 @@ describe("run session data", () => {
     ).data
 
     expect(
-      reduce(data, {
-        type: "session.shell.ended",
-        properties: {
-          sessionID: "session-1",
-          timestamp: 2,
-          callID: "call-1",
-          output: "/tmp/demo\n",
-        },
-      }).commits,
+      reduce(data, shellEnded()).commits,
     ).toEqual([])
   })
 
diff --git a/packages/opencode/test/lib/llm-server.ts b/packages/opencode/test/lib/llm-server.ts
index 245acc7280..aa16fdb9a6 100644
--- a/packages/opencode/test/lib/llm-server.ts
+++ b/packages/opencode/test/lib/llm-server.ts
@@ -606,7 +606,8 @@ function hit(url: string, body: unknown) {
 
 function isTitleRequest(body: unknown): boolean {
   if (!body || typeof body !== "object") return false
-  return JSON.stringify(body).includes("Generate a title for this conversation")
+  const value = JSON.stringify(body)
+  return value.includes("Generate a title for this conversation") || value.includes("You are a title generator")
 }
 
 namespace TestLLMServer {

From 57fb3e5cc585a4d26297db61635703a610abf99f Mon Sep 17 00:00:00 2001
From: Simon Klee <hello@simonklee.dk>
Date: Sat, 4 Jul 2026 21:14:01 +0200
Subject: [PATCH 54/82] fix(run): align mini with current session contracts
 (#35354)

---
 packages/core/src/session.ts                  |  14 +-
 packages/core/test/session-skill.test.ts      |  70 +++
 .../opencode/src/cli/cmd/run/runtime.boot.ts  |   4 +
 packages/opencode/src/cli/cmd/run/runtime.ts  | 116 ++--
 .../src/cli/cmd/run/stream-v2.subagent.ts     |  49 +-
 .../src/cli/cmd/run/stream-v2.transport.ts    |  88 ++-
 packages/opencode/src/cli/cmd/run/tool.ts     |   9 +
 .../opencode/test/cli/run/entry.body.test.ts  |  17 +
 .../opencode/test/cli/run/runtime.test.ts     | 187 +++++-
 .../test/cli/run/stream-v2.transport.test.ts  | 589 +++++++++++++++++-
 10 files changed, 1063 insertions(+), 80 deletions(-)
 create mode 100644 packages/core/test/session-skill.test.ts

diff --git a/packages/core/src/session.ts b/packages/core/src/session.ts
index 05d64c8efb..57ae67ce34 100644
--- a/packages/core/src/session.ts
+++ b/packages/core/src/session.ts
@@ -585,11 +585,15 @@ const layer = Layer.effect(
         const skills = yield* SkillV2.Service.pipe(Effect.provide(locations.get(session.location)))
         const skill = (yield* skills.list()).find((item) => item.name === input.skill)
         if (!skill) return yield* new SkillNotFoundError({ skill: input.skill })
-        yield* events.publish(SessionEvent.Skill.Activated, {
-          sessionID: input.sessionID,
-          name: skill.name,
-          text: skill.content,
-        })
+        yield* events.publish(
+          SessionEvent.Skill.Activated,
+          {
+            sessionID: input.sessionID,
+            name: skill.name,
+            text: skill.content,
+          },
+          { id: input.id ? EventV2.ID.make(input.id.replace(/^msg_/, "evt_")) : undefined },
+        )
         if (input.resume !== false)
           yield* execution
             .resume(input.sessionID)
diff --git a/packages/core/test/session-skill.test.ts b/packages/core/test/session-skill.test.ts
new file mode 100644
index 0000000000..8f9803ef4a
--- /dev/null
+++ b/packages/core/test/session-skill.test.ts
@@ -0,0 +1,70 @@
+import path from "path"
+import { describe, expect } from "bun:test"
+import { Effect, Layer, LayerMap } from "effect"
+import { Database } from "@opencode-ai/core/database/database"
+import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
+import { LayerNode } from "@opencode-ai/core/effect/layer-node"
+import { EventV2 } from "@opencode-ai/core/event"
+import { Location } from "@opencode-ai/core/location"
+import { LocationServiceMap } from "@opencode-ai/core/location-service-map"
+import type { LocationServices } from "@opencode-ai/core/location-services"
+import { ProjectV2 } from "@opencode-ai/core/project"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { SessionV2 } from "@opencode-ai/core/session"
+import { SessionExecution } from "@opencode-ai/core/session/execution"
+import { SessionMessage } from "@opencode-ai/core/session/message"
+import { SessionProjector } from "@opencode-ai/core/session/projector"
+import { SessionStore } from "@opencode-ai/core/session/store"
+import { SkillV2 } from "@opencode-ai/core/skill"
+import { testEffect } from "./lib/effect"
+
+const location = Location.Ref.make({ directory: AbsolutePath.make("/project") })
+const projects = Layer.mock(ProjectV2.Service, {
+  resolve: (directory) => Effect.succeed({ id: ProjectV2.ID.global, directory }),
+})
+const skills = Layer.mock(SkillV2.Service, {
+  list: () =>
+    Effect.succeed([
+      SkillV2.Info.make({
+        name: "effect",
+        description: "Effect guidance",
+        location: AbsolutePath.make(path.resolve("/skills/effect/SKILL.md")),
+        content: "Use Effect",
+      }),
+    ]),
+})
+const locations = Layer.effect(
+  LocationServiceMap.Service,
+  LayerMap.make(
+    () =>
+      // The skill endpoint only needs the location-scoped Skill service.
+      // oxlint-disable-next-line typescript-eslint/no-unsafe-type-assertion
+      skills as unknown as Layer.Layer<LocationServices>,
+  ),
+)
+const it = testEffect(
+  AppNodeBuilder.build(
+    LayerNode.group([Database.node, EventV2.node, SessionProjector.node, SessionStore.node, SessionV2.node]),
+    [
+      [LocationServiceMap.node, locations],
+      [ProjectV2.node, projects],
+      [SessionExecution.node, SessionExecution.noopLayer],
+    ],
+  ),
+)
+
+describe("SessionV2.skill", () => {
+  it.effect("projects the caller-supplied message ID", () =>
+    Effect.gen(function* () {
+      const sessions = yield* SessionV2.Service
+      const session = yield* sessions.create({ location })
+      const id = SessionMessage.ID.make("msg_caller_skill")
+
+      yield* sessions.skill({ id, sessionID: session.id, skill: "effect", resume: false })
+
+      expect(yield* sessions.messages({ sessionID: session.id })).toContainEqual(
+        expect.objectContaining({ id, type: "skill", name: "effect", text: "Use Effect" }),
+      )
+    }),
+  )
+})
diff --git a/packages/opencode/src/cli/cmd/run/runtime.boot.ts b/packages/opencode/src/cli/cmd/run/runtime.boot.ts
index 4753adaae2..2933ce5fdd 100644
--- a/packages/opencode/src/cli/cmd/run/runtime.boot.ts
+++ b/packages/opencode/src/cli/cmd/run/runtime.boot.ts
@@ -174,6 +174,10 @@ export async function resolveModelInfo(
   return runtime.runPromise((svc) => svc.resolveModelInfo(sdk, directory, model)).catch(() => emptyModelInfo())
 }
 
+export function resolveModelInfoStrict(sdk: RunInput["sdk"], directory: string, model: RunInput["model"]) {
+  return runtime.runPromise((svc) => svc.resolveModelInfo(sdk, directory, model))
+}
+
 // Fetches session messages to determine if this is the first turn and build prompt history.
 export async function resolveSessionInfo(
   sdk: RunInput["sdk"],
diff --git a/packages/opencode/src/cli/cmd/run/runtime.ts b/packages/opencode/src/cli/cmd/run/runtime.ts
index e340a89cc3..5c6ede1582 100644
--- a/packages/opencode/src/cli/cmd/run/runtime.ts
+++ b/packages/opencode/src/cli/cmd/run/runtime.ts
@@ -17,7 +17,7 @@ import { Flag } from "@opencode-ai/core/flag/flag"
 import { MessageID } from "@/session/schema"
 import { loadRunAgents, loadRunCommands, loadRunReferences } from "./catalog.shared"
 import { createRunDemo } from "./demo"
-import { resolveModelInfo, resolveRunTuiConfig, resolveSessionInfo } from "./runtime.boot"
+import { resolveModelInfo, resolveModelInfoStrict, resolveRunTuiConfig, resolveSessionInfo } from "./runtime.boot"
 import { createRuntimeLifecycle } from "./runtime.lifecycle"
 import { trace } from "./trace"
 import { cycleVariant, formatModelLabel, resolveSavedVariant, resolveVariant, saveVariant } from "./variant.shared"
@@ -378,32 +378,89 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
     state.localRows = [...state.localRows, { commit, after }].slice(-LOCAL_REPLAY_ROW_LIMIT)
   }
 
-  const loadCatalog = async (): Promise<void> => {
+  const applyCatalog = (catalog: {
+    agents: Awaited<ReturnType<typeof loadRunAgents>>
+    references: Awaited<ReturnType<typeof loadRunReferences>>
+    commands: Awaited<ReturnType<typeof loadRunCommands>>
+  }) => {
     if (footer.isClosed) {
       return
     }
-
-    const [agents, references, commands] = await Promise.all([
-      loadRunAgents(ctx.sdk, ctx.directory).catch(() => []),
-      loadRunReferences(ctx.sdk, ctx.directory).catch(() => []),
-      loadRunCommands(ctx.sdk, ctx.directory).catch(() => []),
-    ])
-    if (footer.isClosed) {
-      return
-    }
-
     footer.event({
       type: "catalog",
-      agents,
-      references,
-      commands,
+      agents: catalog.agents,
+      references: catalog.references,
+      commands: catalog.commands,
     })
   }
 
-  void footer
+  const fetchCatalog = async () => {
+    const [agents, references, commands] = await Promise.all([
+      loadRunAgents(ctx.sdk, ctx.directory),
+      loadRunReferences(ctx.sdk, ctx.directory),
+      loadRunCommands(ctx.sdk, ctx.directory),
+    ])
+    return { agents, references, commands }
+  }
+
+  const loadCatalog = async () => {
+    applyCatalog(
+      await Promise.all([
+        loadRunAgents(ctx.sdk, ctx.directory).catch(() => []),
+        loadRunReferences(ctx.sdk, ctx.directory).catch(() => []),
+        loadRunCommands(ctx.sdk, ctx.directory).catch(() => []),
+      ]).then(([agents, references, commands]) => ({ agents, references, commands })),
+    )
+  }
+
+  const applyModelInfo = (
+    info: Awaited<ReturnType<typeof resolveModelInfo>>,
+    current: string | undefined,
+    boot = false,
+  ) => {
+    state.providers = info.providers
+    state.variants = variantsFor(state.providers, state.model)
+    state.limits = info.limits
+    state.activeVariant = boot
+      ? resolveVariant(ctx.variant, current, savedVariant, state.variants)
+      : current && !state.variants.includes(current)
+        ? undefined
+        : current
+    if (footer.isClosed) return
+    footer.event({ type: "models", providers: info.providers })
+    footer.event({ type: "variants", variants: state.variants, current: state.activeVariant })
+    if (state.model)
+      footer.event({ type: "model", model: formatModelLabel(state.model, state.activeVariant, state.providers) })
+  }
+
+  let catalogRefresh: Promise<void> | undefined
+  let catalogRefreshQueued = false
+  const requestCatalogRefresh = () => {
+    catalogRefreshQueued = true
+    if (catalogRefresh || footer.isClosed) return
+    catalogRefresh = (async () => {
+      await Promise.all([modelTask, initialCatalog])
+      while (catalogRefreshQueued && !footer.isClosed) {
+        catalogRefreshQueued = false
+        const [catalog, info] = await Promise.allSettled([
+          fetchCatalog(),
+          resolveModelInfoStrict(ctx.sdk, ctx.directory, state.model),
+        ])
+        if (catalog.status === "fulfilled") applyCatalog(catalog.value)
+        if (info.status === "fulfilled") applyModelInfo(info.value, state.activeVariant)
+      }
+    })().finally(() => {
+      catalogRefresh = undefined
+      if (catalogRefreshQueued) requestCatalogRefresh()
+    })
+    void catalogRefresh.catch(() => {})
+  }
+
+  const initialCatalog = footer
     .idle()
     .then(loadCatalog)
     .catch(() => {})
+  void initialCatalog
 
   if (Flag.OPENCODE_SHOW_TTFD) {
     footer.append({
@@ -428,31 +485,7 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
     void Promise.resolve(input.afterPaint(ctx)).catch(() => {})
   }
 
-  void modelTask.then((info) => {
-    state.providers = info.providers
-    state.variants = variantsFor(state.providers, state.model)
-    state.limits = info.limits
-
-    const next = resolveVariant(ctx.variant, session.variant, savedVariant, state.variants)
-    if (next !== state.activeVariant) {
-      state.activeVariant = next
-    }
-
-    if (footer.isClosed) {
-      return
-    }
-
-    footer.event({ type: "models", providers: info.providers })
-    footer.event({ type: "variants", variants: state.variants, current: state.activeVariant })
-    if (!state.model) {
-      return
-    }
-
-    footer.event({
-      type: "model",
-      model: formatModelLabel(state.model, state.activeVariant, state.providers),
-    })
-  })
+  void modelTask.then((info) => applyModelInfo(info, session.variant, true))
 
   const streamTask = deps.streamTransport ?? import("./stream-v2.transport")
   const ensureStream = () => {
@@ -484,6 +517,7 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
         providers: () => state.providers,
         footer,
         trace: log,
+        onCatalogRefresh: requestCatalogRefresh,
       })
       if (footer.isClosed) {
         await handle.close()
diff --git a/packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts b/packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts
index 1e7b039fd8..00de6490c4 100644
--- a/packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts
+++ b/packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts
@@ -27,7 +27,7 @@ import type { FooterSubagentDetail, FooterSubagentState, FooterSubagentTab, Stre
 
 const CHILD_MESSAGE_LIMIT = 80
 const CHILD_FRAME_LIMIT = 80
-const DISCOVERY_BUFFER_LIMIT = 64
+const CHILD_EVENT_BUFFER_LIMIT = 64
 const FAMILY_LIST_LIMIT = 100
 const FALLBACK_LABEL = "Subagent"
 
@@ -160,6 +160,7 @@ type ChildState = {
   tools: Map<string, ToolTrack>
   finishedTools: Set<string>
   messageIDs: Set<string>
+  prompts: Map<string, string>
   hydrated: boolean
 }
 
@@ -223,6 +224,8 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
   // Foreign events buffered while a session.get discovery is in flight, so a
   // fast child (including its settled event) is not lost mid-discovery.
   const pendingEvents = new Map<string, V2Event[]>()
+  const hydrationEvents = new Map<string, V2Event[]>()
+  const hydrationOverflow = new Set<string>()
   const hydrations = new Map<string, Promise<void>>()
   let selected: string | undefined
 
@@ -244,6 +247,7 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
       tools: new Map(),
       finishedTools: new Set(),
       messageIDs: new Set(),
+      prompts: new Map(),
       hydrated: false,
     }
     if (!existing) children.set(sessionID, child)
@@ -332,6 +336,7 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
     child.callIDs.clear()
     for (const message of messages) {
       if (message.type === "user") {
+        child.prompts.delete(message.id)
         userFrame(child, message.id, message.text)
         continue
       }
@@ -382,16 +387,38 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
   const hydrateChild = (child: ChildState): Promise<void> => {
     const existing = hydrations.get(child.sessionID)
     if (existing) return existing
+    const pendingPrompts = new Map(child.prompts)
+    const pendingTools = new Map(child.tools)
+    let retry = false
     const task = input.sdk.v2.session
       .messages({ sessionID: child.sessionID, limit: CHILD_MESSAGE_LIMIT, order: "desc" }, { throwOnError: true })
       .then((response) => {
+        const buffered = hydrationEvents.get(child.sessionID) ?? []
+        hydrationEvents.delete(child.sessionID)
+        if (hydrationOverflow.delete(child.sessionID)) {
+          child.hydrated = false
+          retry = true
+          notifyDetail(child)
+          return
+        }
+        for (const [id, prompt] of pendingPrompts) {
+          if (!child.prompts.has(id)) child.prompts.set(id, prompt)
+        }
         rebuild(child, response.data.data.toReversed())
+        for (const [id, tool] of pendingTools) {
+          if (!child.finishedTools.has(id) && !child.tools.has(id)) child.tools.set(id, tool)
+        }
+        for (const event of buffered) reduce(child, event)
         child.hydrated = true
         notifyDetail(child)
       })
-      .catch(() => {})
+      .catch(() => {
+        hydrationEvents.delete(child.sessionID)
+        hydrationOverflow.delete(child.sessionID)
+      })
       .finally(() => {
         hydrations.delete(child.sessionID)
+        if (retry) queueMicrotask(() => void hydrateChild(child))
       })
     hydrations.set(child.sessionID, task)
     return task
@@ -424,8 +451,14 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
   }
 
   const reduce = (child: ChildState, event: V2Event) => {
+    if (event.type === "session.prompt.admitted") {
+      child.prompts.set(event.data.inputID, event.data.prompt.text)
+      return
+    }
     if (event.type === "session.prompt.promoted") {
-      if (userFrame(child, event.data.inputID, "")) {
+      const prompt = child.prompts.get(event.data.inputID) ?? ""
+      child.prompts.delete(event.data.inputID)
+      if (userFrame(child, event.data.inputID, prompt)) {
         touch(child, event.created)
         notifyDetail(child)
       }
@@ -511,10 +544,12 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
       return
     }
     if (event.type === "session.tool.input.started") {
+      if (child.finishedTools.has(event.data.callID)) return
       child.tools.set(event.data.callID, { name: event.data.name, input: {}, started: event.created })
       return
     }
     if (event.type === "session.tool.called") {
+      if (child.finishedTools.has(event.data.callID)) return
       const current = child.tools.get(event.data.callID)
       child.tools.set(event.data.callID, {
         name: event.data.tool,
@@ -640,12 +675,18 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
     foreign(sessionID, event) {
       const child = children.get(sessionID)
       if (child) {
+        if (hydrations.has(sessionID)) {
+          const buffered = hydrationEvents.get(sessionID) ?? []
+          if (buffered.length < CHILD_EVENT_BUFFER_LIMIT) buffered.push(event)
+          else hydrationOverflow.add(sessionID)
+          hydrationEvents.set(sessionID, buffered)
+        }
         reduce(child, event)
         return
       }
       discover(sessionID)
       const buffered = pendingEvents.get(sessionID)
-      if (buffered && buffered.length < DISCOVERY_BUFFER_LIMIT) buffered.push(event)
+      if (buffered && buffered.length < CHILD_EVENT_BUFFER_LIMIT) buffered.push(event)
     },
     async hydrate(next) {
       for (const message of next.messages) {
diff --git a/packages/opencode/src/cli/cmd/run/stream-v2.transport.ts b/packages/opencode/src/cli/cmd/run/stream-v2.transport.ts
index 42e2c7bd53..8b80b0b64e 100644
--- a/packages/opencode/src/cli/cmd/run/stream-v2.transport.ts
+++ b/packages/opencode/src/cli/cmd/run/stream-v2.transport.ts
@@ -9,6 +9,7 @@ import type {
   SessionMessageAssistantTool,
   V2Event,
 } from "@opencode-ai/sdk/v2"
+import { Event } from "@opencode-ai/schema/event"
 import { blockerStatus, pickBlockerView } from "./session-data"
 import { writeSessionOutput } from "./stream"
 import { createSubagentTracker, legacyTool, toolCommit } from "./stream-v2.subagent"
@@ -41,6 +42,7 @@ type StreamInput = {
   footer: FooterApi
   trace?: Trace
   signal?: AbortSignal
+  onCatalogRefresh?: () => void
 }
 
 export type SessionTurnInput = {
@@ -81,6 +83,8 @@ type Wait = {
 // callID correlates the live shell events once shell.started is observed, and
 // abort cancels the blocking request when the user interrupts the turn.
 type ShellWait = {
+  eventID: string
+  messageID: string
   callID?: string
   resolve: () => void
   abort: () => void
@@ -232,7 +236,7 @@ function streamPartKey(messageID: string, partID: string) {
 function shellCommit(
   callID: string,
   command: string,
-  next: { text: string; phase: "start" | "progress"; toolState: "running" | "completed" },
+  next: Pick<StreamCommit, "text" | "phase" | "toolState" | "toolError">,
 ): StreamCommit {
   return {
     kind: "tool",
@@ -244,6 +248,41 @@ function shellCommit(
   }
 }
 
+function shellTerminal(
+  callID: string,
+  command: string,
+  shell: { status: string; exit?: number | string },
+  output: { output: string; cursor: number; size: number; truncated: boolean },
+) {
+  const incomplete = output.truncated || output.cursor < output.size
+  const text = `${output.output}${incomplete ? `${output.output.endsWith("\n") || !output.output ? "" : "\n"}[output truncated]` : ""}`
+  const error =
+    shell.status === "exited" && shell.exit === 0
+      ? undefined
+      : shell.status === "exited"
+        ? `Shell exited with code ${shell.exit ?? "unknown"}`
+        : `Shell ${shell.status}`
+  if (!error)
+    return [shellCommit(callID, command, { text, phase: "progress", toolState: "completed" })]
+  return [
+    ...(text ? [shellCommit(callID, command, { text, phase: "progress", toolState: "running" })] : []),
+    shellCommit(callID, command, { text: error, phase: "final", toolState: "error", toolError: error }),
+  ]
+}
+
+function messageIDFromEvent(id: string) {
+  return id.replace(/^evt_/, "msg_")
+}
+
+const catalogEvents = new Set([
+  "catalog.updated",
+  "integration.updated",
+  "agent.updated",
+  "command.updated",
+  "skill.updated",
+  "reference.updated",
+])
+
 // session.shell resolves after the command settled server-side; the matching
 // live shell.ended event usually lands within the same tick, but hold the turn
 // briefly so the output commit renders inside it.
@@ -407,6 +446,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
     }
     if (message.type === "shell") {
       state.shellCommands.set(message.shell.id, message.shell.command)
+      if (state.shellWait?.messageID === message.id) state.shellWait.callID = message.shell.id
       const completed = message.time.completed !== undefined
       if (!render) {
         // Suppressed history: mark settled shells rendered so live redelivery
@@ -430,13 +470,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       }
       if (completed && message.output && !state.shellEnded.has(message.shell.id)) {
         state.shellEnded.add(message.shell.id)
-        write([
-          shellCommit(message.shell.id, message.shell.command, {
-            text: message.output.output,
-            phase: "progress",
-            toolState: "completed",
-          }),
-        ])
+        write(shellTerminal(message.shell.id, message.shell.command, message.shell, message.output))
       }
       if (completed && state.shellWait?.callID === message.shell.id) state.shellWait.resolve()
       return
@@ -522,6 +556,11 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
   }
 
   const apply = (event: RunV2Event) => {
+    if (catalogEvents.has(event.type)) {
+      if (input.directory && event.location?.directory && event.location.directory !== input.directory) return
+      input.onCatalogRefresh?.()
+      return
+    }
     const source = sessionID(event)
     if (source !== input.sessionID) {
       if (source) subagents.foreign(source, event)
@@ -540,8 +579,8 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       return
     }
     if (event.type === "session.skill.activated") {
-      const messageID = event.id.replace(/^evt_/, "msg_")
-      if (state.wait) state.wait.promoted = true
+      const messageID = messageIDFromEvent(event.id)
+      if (state.wait?.messageID === messageID) state.wait.promoted = true
       if (state.skillMessages.has(messageID)) return
       state.skillMessages.add(messageID)
       write([skillCommit(messageID, event.data.name)])
@@ -550,7 +589,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
     if (event.type === "session.shell.started") {
       state.shellCommands.set(event.data.shell.id, event.data.shell.command)
       const wait = state.shellWait
-      if (wait && wait.callID === undefined) wait.callID = event.data.shell.id
+      if (wait?.eventID === event.id) wait.callID = event.data.shell.id
       if (state.shellStarted.has(event.data.shell.id)) return
       state.shellStarted.add(event.data.shell.id)
       write(
@@ -580,19 +619,11 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       }
       if (!state.shellEnded.has(event.data.shell.id)) {
         state.shellEnded.add(event.data.shell.id)
-        commits.push(
-          shellCommit(event.data.shell.id, command, {
-            text: event.data.output.output,
-            phase: "progress",
-            toolState: "completed",
-          }),
-        )
+        commits.push(...shellTerminal(event.data.shell.id, command, event.data.shell, event.data.output))
       }
       const wait = state.shellWait
-      // An unset callID means shell.started has not been observed yet (event
-      // delivery lag); mini serializes its own shells, so adopt this ended.
-      const owned = wait !== undefined && (wait.callID === undefined || wait.callID === event.data.shell.id)
-      write(commits, owned || state.wait ? undefined : { phase: "idle", status: "" })
+      const owned = wait?.callID === event.data.shell.id
+      write(commits, owned || state.wait || state.shellWait ? undefined : { phase: "idle", status: "" })
       if (owned) wait.resolve()
       return
     }
@@ -828,6 +859,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
           })()
           void consume.catch(() => {})
           await hydrate({ render: state.initial ? input.replay === true : true, reuseVisibleWait: !state.initial })
+          input.onCatalogRefresh?.()
           state.initial = false
           booting = false
           for (const event of buffered.splice(0)) apply(event)
@@ -867,13 +899,19 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
     const output = new Promise<void>((resolve) => {
       rendered = resolve
     })
-    const active: ShellWait = { resolve: rendered, abort: () => abort.abort() }
+    const eventID = Event.ID.create()
+    const active: ShellWait = {
+      eventID,
+      messageID: messageIDFromEvent(eventID),
+      resolve: rendered,
+      abort: () => abort.abort(),
+    }
     state.shellWait = active
-    input.trace?.write("send.shell", { sessionID: input.sessionID, command: next.prompt.text })
+    input.trace?.write("send.shell", { sessionID: input.sessionID, id: eventID, command: next.prompt.text })
     write([], { phase: "running", status: "running shell" })
     try {
       await input.sdk.v2.session.shell(
-        { sessionID: input.sessionID, command: next.prompt.text },
+        { sessionID: input.sessionID, id: eventID, command: next.prompt.text },
         { throwOnError: true, signal: abort.signal },
       )
       await Promise.race([output, wait(SHELL_OUTPUT_GRACE_MS, abort.signal)])
diff --git a/packages/opencode/src/cli/cmd/run/tool.ts b/packages/opencode/src/cli/cmd/run/tool.ts
index 9a717ba4e6..181ab7dc7c 100644
--- a/packages/opencode/src/cli/cmd/run/tool.ts
+++ b/packages/opencode/src/cli/cmd/run/tool.ts
@@ -671,6 +671,10 @@ function scrollBashProgress(p: ToolProps<typeof BashTool>): string {
 }
 
 function scrollBashFinal(p: ToolProps<typeof BashTool>): string {
+  if (p.frame.status === "error") {
+    return fail(p.frame)
+  }
+
   const code = p.metadata.exit ?? num(p.frame.meta.exitCode) ?? num(p.frame.meta.exit_code)
   const time = span(p.frame.state)
   if (code === undefined) {
@@ -1427,6 +1431,11 @@ export function toolEntryBody(commit: StreamCommit, raw: string): RunEntryBody |
       return textBody(shellOutput(commit.shell.command, raw) ?? "")
     }
 
+    if (commit.toolState === "error") {
+      const ctx = toolFrame(commit, raw)
+      return textBody(toolScroll("final", ctx))
+    }
+
     return undefined
   }
 
diff --git a/packages/opencode/test/cli/run/entry.body.test.ts b/packages/opencode/test/cli/run/entry.body.test.ts
index 17659113c5..f393350381 100644
--- a/packages/opencode/test/cli/run/entry.body.test.ts
+++ b/packages/opencode/test/cli/run/entry.body.test.ts
@@ -50,6 +50,23 @@ function structured(next: StreamCommit) {
 }
 
 describe("run entry body", () => {
+  test("renders a failed direct shell as an error instead of completed success", () => {
+    expect(
+      entryBody(
+        commit({
+          kind: "tool",
+          text: "Shell exited with code 7",
+          phase: "final",
+          source: "tool",
+          tool: "bash",
+          toolState: "error",
+          toolError: "Shell exited with code 7",
+          shell: { callID: "sh_failed", command: "false" },
+        }),
+      ),
+    ).toEqual({ type: "text", content: "✖ bash failed: Shell exited with code 7" })
+  })
+
   test("renders assistant, reasoning, and user entries in their display formats", () => {
     expect(
       entryBody(
diff --git a/packages/opencode/test/cli/run/runtime.test.ts b/packages/opencode/test/cli/run/runtime.test.ts
index 9ad7e003b2..702d82d769 100644
--- a/packages/opencode/test/cli/run/runtime.test.ts
+++ b/packages/opencode/test/cli/run/runtime.test.ts
@@ -1,7 +1,7 @@
 import { afterEach, describe, expect, mock, spyOn, test } from "bun:test"
 import { OpencodeClient } from "@opencode-ai/sdk/v2"
 import { runInteractiveMode } from "@/cli/cmd/run/runtime"
-import type { FooterApi, RunProvider } from "@/cli/cmd/run/types"
+import type { FooterApi, FooterEvent, RunProvider } from "@/cli/cmd/run/types"
 
 const provider: RunProvider = {
   id: "openai",
@@ -53,7 +53,7 @@ function ok<T>(data: T) {
   })
 }
 
-function footer(): FooterApi {
+function footer(events: FooterEvent[] = []): FooterApi {
   let closed = false
   const closes = new Set<() => void>()
 
@@ -78,7 +78,9 @@ function footer(): FooterApi {
         closes.delete(fn)
       }
     },
-    event() {},
+    event(value) {
+      events.push(value)
+    },
     append() {},
     idle() {
       return Promise.resolve()
@@ -296,4 +298,183 @@ describe("run interactive runtime", () => {
     expect(legacyAgents).not.toHaveBeenCalled()
     expect(legacyCommands).not.toHaveBeenCalled()
   })
+
+  test("retains last-known-good state across failed coalesced refreshes and retries later", async () => {
+    const sdk = new OpencodeClient()
+    const refreshGate = defer<void>()
+    let providerCalls = 0
+    let modelCalls = 0
+    let agentCalls = 0
+    let referenceCalls = 0
+    const events: FooterEvent[] = []
+    const api = footer(events)
+    spyOn(sdk.v2.provider, "list").mockImplementation(async () => {
+      providerCalls++
+      if (providerCalls === 2) {
+        await refreshGate.promise
+        throw new Error("provider refresh failed")
+      }
+      return ok({
+        location: { directory: "/tmp" },
+        data: [
+          {
+            id: "openai",
+            name: providerCalls >= 3 ? "OpenAI refreshed" : "OpenAI",
+            api: { type: "native", settings: {} },
+            request: { headers: {}, body: {} },
+          },
+        ],
+      }) as never
+    })
+    spyOn(sdk.v2.model, "list").mockImplementation(() => {
+      modelCalls++
+      return ok({
+        location: { directory: "/tmp" },
+        data: [
+          {
+            id: "gpt-5",
+            providerID: "openai",
+            name: "Little Frank",
+            api: { id: "openai", type: "native", settings: {} },
+            capabilities: { tools: true, input: ["text"], output: ["text"] },
+            request: { headers: {}, body: {} },
+            variants:
+              modelCalls >= 4
+                ? []
+                : [{ id: modelCalls >= 3 ? "high" : "low", settings: {}, headers: {}, body: {} }],
+            time: { released: 1 },
+            cost: [{ input: 0, output: 0, cache: { read: 0, write: 0 } }],
+            status: "active",
+            enabled: true,
+            limit: { context: modelCalls >= 3 ? 256000 : 128000, output: 8192 },
+          },
+        ],
+      }) as never
+    })
+    spyOn(sdk.v2.agent, "list").mockImplementation(async () => {
+      agentCalls++
+      if (agentCalls === 2) throw new Error("agent refresh failed")
+      return ok({
+        location: { directory: "/tmp" },
+        data: [{ id: "build", description: agentCalls >= 3 ? "Refreshed agent" : "Agent", mode: "primary" }],
+      }) as never
+    })
+    spyOn(sdk.v2.reference, "list").mockImplementation(() => {
+      referenceCalls++
+      return ok({
+        location: { directory: "/tmp" },
+        data: [
+          { name: "effect", path: "/effect", description: referenceCalls >= 3 ? "Refreshed reference" : "Reference" },
+        ],
+      }) as never
+    })
+    spyOn(sdk.v2.command, "list").mockImplementation(() =>
+      ok({ location: { directory: "/tmp" }, data: [{ name: "check", description: "Check" }] }) as never,
+    )
+    spyOn(sdk.v2.skill, "list").mockImplementation(() =>
+      ok({ location: { directory: "/tmp" }, data: [] }) as never,
+    )
+    let finalProviders: RunProvider[] = []
+    let finalLimits: Record<string, number> = {}
+    let retainedProviders: RunProvider[] = []
+    let retainedLimits: Record<string, number> = {}
+    let retainedCatalog: FooterEvent | undefined
+    let selectedDefault: unknown
+    let selectDefault: (() => unknown) | undefined
+    let selectVariant: ((variant: string | undefined) => unknown) | undefined
+    let defaultRefreshVariants: FooterEvent | undefined
+
+    await runInteractiveMode(
+      {
+        sdk,
+        directory: "/tmp",
+        sessionID: "ses-1",
+        sessionTitle: "Session",
+        resume: false,
+        agent: "build",
+        model: { providerID: "openai", modelID: "gpt-5" },
+        variant: "low",
+        files: [],
+        thinking: false,
+        backgroundSubagents: false,
+      },
+      {
+        createRuntimeLifecycle: async (input) => {
+          selectDefault = () => input.onVariantSelect?.(undefined)
+          selectVariant = (variant) => input.onVariantSelect?.(variant)
+          return {
+            footer: api,
+            onResize: () => () => {},
+            refreshTheme: () => {},
+            resetForReplay: () => Promise.resolve(),
+            close: () => Promise.resolve(),
+          }
+        },
+        streamTransport: Promise.resolve({
+          createSessionTransport: async (input) => {
+            while (
+              !events.some(
+                (event) => event.type === "variants" && event.variants.includes("low") && event.current === "low",
+              )
+            )
+              await Bun.sleep(0)
+            selectedDefault = await Promise.resolve(selectDefault?.())
+            input.onCatalogRefresh?.()
+            input.onCatalogRefresh?.()
+            input.onCatalogRefresh?.()
+            while (providerCalls < 2) await Bun.sleep(0)
+            refreshGate.resolve()
+            await new Promise((resolve) => setTimeout(resolve, 0))
+            retainedProviders = input.providers?.() ?? []
+            retainedLimits = input.limits()
+            retainedCatalog = events.filter((event) => event.type === "catalog").at(-1)
+            input.onCatalogRefresh?.()
+            input.onCatalogRefresh?.()
+            while (providerCalls < 3 || modelCalls < 3 || agentCalls < 3) await Bun.sleep(0)
+            await new Promise((resolve) => setTimeout(resolve, 0))
+            defaultRefreshVariants = events.filter((event) => event.type === "variants").at(-1)
+            await Promise.resolve(selectVariant?.("high"))
+            input.onCatalogRefresh?.()
+            while (providerCalls < 4 || modelCalls < 4) await Bun.sleep(0)
+            await new Promise((resolve) => setTimeout(resolve, 0))
+            finalProviders = input.providers?.() ?? []
+            finalLimits = input.limits()
+            setTimeout(() => input.footer.close(), 0)
+            return {
+              runPromptTurn: async () => {},
+              interruptActiveTurn: async () => {},
+              selectSubagent: () => {},
+              replayOnResize: async () => false,
+              close: async () => {},
+            }
+          },
+          formatUnknownError: (error: unknown) => (error instanceof Error ? error.message : String(error)),
+        }),
+      },
+    )
+
+    expect(providerCalls).toBe(4)
+    expect(modelCalls).toBe(4)
+    expect(retainedProviders[0]?.name).toBe("OpenAI")
+    expect(retainedProviders[0]?.models["gpt-5"]?.variants).toEqual({ low: {} })
+    expect(retainedLimits["openai/gpt-5"]).toBe(128000)
+    expect(retainedCatalog).toMatchObject({
+      agents: [{ name: "build", description: "Agent" }],
+      references: [{ name: "effect", description: "Reference" }],
+    })
+    expect(selectedDefault).toMatchObject({ variant: undefined })
+    expect(defaultRefreshVariants).toMatchObject({ variants: ["high"], current: undefined })
+    expect(finalProviders[0]?.name).toBe("OpenAI refreshed")
+    expect(finalProviders[0]?.models["gpt-5"]?.variants).toEqual({})
+    expect(finalLimits["openai/gpt-5"]).toBe(256000)
+    expect(events.filter((event) => event.type === "variants").at(-1)).toMatchObject({
+      variants: [],
+      current: undefined,
+    })
+    expect(events.filter((event) => event.type === "catalog").at(-1)).toMatchObject({
+      agents: [{ name: "build", description: "Refreshed agent" }],
+      references: [{ name: "effect", description: "Refreshed reference" }],
+      commands: [{ name: "check", description: "Check" }],
+    })
+  })
 })
diff --git a/packages/opencode/test/cli/run/stream-v2.transport.test.ts b/packages/opencode/test/cli/run/stream-v2.transport.test.ts
index cd2d131642..cd43fda2de 100644
--- a/packages/opencode/test/cli/run/stream-v2.transport.test.ts
+++ b/packages/opencode/test/cli/run/stream-v2.transport.test.ts
@@ -1019,7 +1019,7 @@ describe("V2 mini transport", () => {
       request = input
       queueMicrotask(() => {
         events.push({
-          id: "evt_shell_start",
+          id: input.id ?? "evt_missing",
           created: 0,
           type: "session.shell.started",
           durable: durable("ses_1"),
@@ -1071,7 +1071,7 @@ describe("V2 mini transport", () => {
       includeFiles: true,
     })
 
-    expect(request).toMatchObject({ sessionID: "ses_1", command: "ls" })
+    expect(request).toMatchObject({ sessionID: "ses_1", command: "ls", id: expect.stringMatching(/^evt_/) })
     expect(ui.commits.filter((item) => item.shell)).toMatchObject([
       { phase: "start", tool: "bash", toolState: "running", shell: { callID: "sh_shell", command: "ls" } },
       { phase: "progress", text: "file.txt", toolState: "completed", shell: { callID: "sh_shell", command: "ls" } },
@@ -1123,6 +1123,133 @@ describe("V2 mini transport", () => {
     await transport.close()
   })
 
+  test("does not resolve an owned shell output wait from an unrelated shell", async () => {
+    const events = feed()
+    events.push(connected())
+    const client = sdk({ streams: [events] })
+    const ui = footer()
+    const transport = await createSessionTransport({
+      sdk: client,
+      sessionID: "ses_1",
+      thinking: false,
+      limits: () => ({}),
+      footer: ui.api,
+    })
+    let request: Parameters<OpencodeClient["v2"]["session"]["shell"]>[0] | undefined
+    let complete!: () => void
+    spyOn(client.v2.session, "shell").mockImplementation((input) => {
+      request = input
+      return new Promise<void>((resolve) => {
+        complete = resolve
+      }) as never
+    })
+
+    let done = false
+    const turn = transport
+      .runPromptTurn({
+        agent: undefined,
+        model: undefined,
+        variant: undefined,
+        prompt: { text: "pwd", parts: [], mode: "shell" },
+        files: [],
+        includeFiles: true,
+      })
+      .then(() => {
+        done = true
+      })
+    while (!request) await Bun.sleep(0)
+    events.push({
+      id: "evt_unrelated_shell",
+      created: 0,
+      type: "session.shell.started",
+      durable: durable("ses_1"),
+      data: {
+        sessionID: "ses_1",
+        shell: {
+          id: "sh_unrelated",
+          status: "running",
+          command: "other",
+          cwd: "/tmp",
+          shell: "/bin/sh",
+          file: "/tmp/unrelated",
+          metadata: {},
+          time: { started: 0 },
+        },
+      },
+    })
+    events.push({
+      id: "evt_unrelated_end",
+      created: 0,
+      type: "session.shell.ended",
+      durable: durable("ses_1", 1),
+      data: {
+        sessionID: "ses_1",
+        shell: {
+          id: "sh_unrelated",
+          status: "exited",
+          command: "other",
+          cwd: "/tmp",
+          shell: "/bin/sh",
+          file: "/tmp/unrelated",
+          exit: 0,
+          metadata: {},
+          time: { started: 0, completed: 1 },
+        },
+        output: { output: "wrong", cursor: 5, size: 5, truncated: false },
+      },
+    })
+    await Bun.sleep(0)
+    complete()
+    await Bun.sleep(0)
+    expect(done).toBe(false)
+
+    events.push({
+      id: request.id ?? "evt_missing",
+      created: 0,
+      type: "session.shell.started",
+      durable: durable("ses_1", 2),
+      data: {
+        sessionID: "ses_1",
+        shell: {
+          id: "sh_owned",
+          status: "running",
+          command: "pwd",
+          cwd: "/tmp",
+          shell: "/bin/sh",
+          file: "/tmp/owned",
+          metadata: {},
+          time: { started: 0 },
+        },
+      },
+    })
+    events.push({
+      id: "evt_owned_end",
+      created: 0,
+      type: "session.shell.ended",
+      durable: durable("ses_1", 3),
+      data: {
+        sessionID: "ses_1",
+        shell: {
+          id: "sh_owned",
+          status: "exited",
+          command: "pwd",
+          cwd: "/tmp",
+          shell: "/bin/sh",
+          file: "/tmp/owned",
+          exit: 0,
+          metadata: {},
+          time: { started: 0, completed: 1 },
+        },
+        output: { output: "/tmp", cursor: 4, size: 4, truncated: false },
+      },
+    })
+    await turn
+
+    expect(request.id).toMatch(/^evt_/)
+    expect(ui.commits.some((item) => item.shell?.callID === "sh_owned" && item.text === "/tmp")).toBe(true)
+    await transport.close()
+  })
+
   test("hydrates projected shell transcripts once and dedupes live redelivery", async () => {
     const events = feed()
     events.push(connected())
@@ -1190,6 +1317,91 @@ describe("V2 mini transport", () => {
     await transport.close()
   })
 
+  test("renders failed projected shells as errors and marks truncated live output", async () => {
+    const events = feed()
+    events.push(connected())
+    const client = sdk({
+      streams: [events],
+      messages: {
+        ses_1: [
+          {
+            id: "msg_failed_shell",
+            type: "shell" as const,
+            shell: {
+              id: "sh_failed",
+              status: "exited",
+              command: "false",
+              cwd: "/tmp",
+              shell: "/bin/sh",
+              file: "/tmp/failed",
+              exit: 7,
+              metadata: {},
+              time: { started: 0, completed: 1 },
+            },
+            output: { output: "failure output", cursor: 14, size: 14, truncated: false },
+            time: { created: 1, completed: 2 },
+          },
+        ],
+      },
+    })
+    const ui = footer()
+    const transport = await createSessionTransport({
+      sdk: client,
+      sessionID: "ses_1",
+      thinking: false,
+      replay: true,
+      limits: () => ({}),
+      footer: ui.api,
+    })
+    events.push({
+      id: "evt_truncated_start",
+      created: 0,
+      type: "session.shell.started",
+      durable: durable("ses_1"),
+      data: {
+        sessionID: "ses_1",
+        shell: {
+          id: "sh_truncated",
+          status: "running",
+          command: "long",
+          cwd: "/tmp",
+          shell: "/bin/sh",
+          file: "/tmp/truncated",
+          metadata: {},
+          time: { started: 0 },
+        },
+      },
+    })
+    events.push({
+      id: "evt_truncated_end",
+      created: 0,
+      type: "session.shell.ended",
+      durable: durable("ses_1", 1),
+      data: {
+        sessionID: "ses_1",
+        shell: {
+          id: "sh_truncated",
+          status: "exited",
+          command: "long",
+          cwd: "/tmp",
+          shell: "/bin/sh",
+          file: "/tmp/truncated",
+          exit: 0,
+          metadata: {},
+          time: { started: 0, completed: 1 },
+        },
+        output: { output: "partial", cursor: 7, size: 20, truncated: false },
+      },
+    })
+    await Bun.sleep(0)
+
+    expect(ui.commits).toContainEqual(
+      expect.objectContaining({ toolState: "error", toolError: "Shell exited with code 7" }),
+    )
+    expect(ui.commits).toContainEqual(expect.objectContaining({ text: "partial\n[output truncated]" }))
+    await transport.close()
+  })
+
   test("routes command prompts through v2.session.command", async () => {
     const events = feed()
     events.push(connected())
@@ -1363,6 +1575,17 @@ describe("V2 mini transport", () => {
         done = true
       })
     while (!sent) await Bun.sleep(0)
+    events.push({
+      id: "evt_other",
+      created: 0,
+      type: "session.skill.activated",
+      durable: durable("ses_1"),
+      data: {
+        sessionID: "ses_1",
+        name: "other",
+        text: "other instructions",
+      },
+    })
     events.push({
       id: "evt_unrelated_settled",
       created: 0,
@@ -1396,6 +1619,46 @@ describe("V2 mini transport", () => {
     await transport.close()
   })
 
+  test("refreshes catalogs on connection and location-scoped invalidations", async () => {
+    const events = feed()
+    events.push(connected())
+    const client = sdk({ streams: [events] })
+    const ui = footer()
+    let refreshes = 0
+    const transport = await createSessionTransport({
+      sdk: client,
+      directory: "/project",
+      sessionID: "ses_1",
+      thinking: false,
+      limits: () => ({}),
+      footer: ui.api,
+      onCatalogRefresh: () => refreshes++,
+    })
+    expect(refreshes).toBe(1)
+
+    for (const type of [
+      "catalog.updated",
+      "integration.updated",
+      "agent.updated",
+      "command.updated",
+      "skill.updated",
+      "reference.updated",
+    ] as const)
+      events.push({ id: `evt_${type}`, created: 0, type, location: { directory: "/project" }, data: {} })
+    events.push({
+      id: "evt_foreign_catalog",
+      created: 0,
+      type: "catalog.updated",
+      location: { directory: "/other" },
+      data: {},
+    })
+    while (refreshes < 7) await Bun.sleep(0)
+    await Bun.sleep(0)
+
+    expect(refreshes).toBe(7)
+    await transport.close()
+  })
+
   test("hydrates skill activation messages once and dedupes live redelivery", async () => {
     const events = feed()
     events.push(connected())
@@ -1526,6 +1789,328 @@ describe("V2 mini transport", () => {
     await transport.close()
   })
 
+  test("reveals an admitted child prompt only when it is promoted after hydration", async () => {
+    const events = feed()
+    events.push(connected())
+    const client = sdk({
+      streams: [events],
+      messages: { ses_child: [] },
+      sessions: [{ id: "ses_child", parentID: "ses_1", time: { updated: 1 } }],
+    })
+    const ui = footer()
+    const transport = await createSessionTransport({
+      sdk: client,
+      sessionID: "ses_1",
+      thinking: false,
+      limits: () => ({}),
+      footer: ui.api,
+    })
+    const states = () => ui.events.flatMap((event) => (event.type === "stream.subagent" ? [event.state] : []))
+    transport.selectSubagent("ses_child")
+    while (!states().some((state) => state.details.ses_child)) await Bun.sleep(0)
+
+    events.push({
+      id: "evt_child_admitted",
+      created: 1,
+      type: "session.prompt.admitted",
+      durable: durable("ses_child"),
+      data: {
+        sessionID: "ses_child",
+        inputID: "msg_child_prompt",
+        prompt: { text: "actual child prompt" },
+        delivery: "steer",
+      },
+    })
+    await Bun.sleep(0)
+    expect(
+      states().at(-1)?.details.ses_child?.commits.some((item) => item.messageID === "msg_child_prompt"),
+    ).toBe(false)
+
+    events.push({
+      id: "evt_child_promoted",
+      created: 2,
+      type: "session.prompt.promoted",
+      durable: durable("ses_child", 1),
+      data: { sessionID: "ses_child", inputID: "msg_child_prompt" },
+    })
+    while (
+      !states()
+        .at(-1)
+        ?.details.ses_child?.commits.some(
+          (item) => item.messageID === "msg_child_prompt" && item.text === "actual child prompt",
+        )
+    )
+      await Bun.sleep(0)
+
+    await transport.close()
+  })
+
+  test("preserves a pre-hydration admission promoted during stale hydration", async () => {
+    const events = feed()
+    events.push(connected())
+    const client = sdk({
+      streams: [events],
+      sessions: [{ id: "ses_child", parentID: "ses_1", time: { updated: 1 } }],
+    })
+    let childHydrating = false
+    let releaseHydration!: () => void
+    const hydration = new Promise<void>((resolve) => {
+      releaseHydration = resolve
+    })
+    spyOn(client.v2.session, "messages").mockImplementation(async (request) => {
+      if (request.sessionID === "ses_child") {
+        childHydrating = true
+        await hydration
+      }
+      return ok({ data: [], cursor: {} })
+    })
+    const ui = footer()
+    const transport = await createSessionTransport({
+      sdk: client,
+      sessionID: "ses_1",
+      thinking: false,
+      limits: () => ({}),
+      footer: ui.api,
+    })
+    const states = () => ui.events.flatMap((event) => (event.type === "stream.subagent" ? [event.state] : []))
+    events.push({
+      id: "evt_child_admitted_race",
+      created: 1,
+      type: "session.prompt.admitted",
+      durable: durable("ses_child"),
+      data: {
+        sessionID: "ses_child",
+        inputID: "msg_child_race",
+        prompt: { text: "prompt admitted before hydration" },
+        delivery: "steer",
+      },
+    })
+    await Bun.sleep(0)
+    transport.selectSubagent("ses_child")
+    while (!childHydrating) await Bun.sleep(0)
+    events.push({
+      id: "evt_child_promoted_race",
+      created: 2,
+      type: "session.prompt.promoted",
+      durable: durable("ses_child", 1),
+      data: { sessionID: "ses_child", inputID: "msg_child_race" },
+    })
+    await Bun.sleep(0)
+    releaseHydration()
+    await Bun.sleep(0)
+    await Bun.sleep(0)
+    while (
+      !states()
+        .at(-1)
+        ?.details.ses_child?.commits.some(
+          (item) => item.messageID === "msg_child_race" && item.text === "prompt admitted before hydration",
+        )
+    )
+      await Bun.sleep(0)
+
+    await transport.close()
+  })
+
+  test("retries child hydration after a bounded live-event overflow", async () => {
+    const events = feed()
+    events.push(connected())
+    const client = sdk({
+      streams: [events],
+      sessions: [{ id: "ses_child", parentID: "ses_1", time: { updated: 1 } }],
+    })
+    let childRequests = 0
+    let releaseStale!: () => void
+    let releaseRetry!: () => void
+    const stale = new Promise<void>((resolve) => {
+      releaseStale = resolve
+    })
+    const retry = new Promise<void>((resolve) => {
+      releaseRetry = resolve
+    })
+    spyOn(client.v2.session, "messages").mockImplementation(async (request) => {
+      if (request.sessionID !== "ses_child") return ok({ data: [], cursor: {} })
+      childRequests++
+      if (childRequests === 1) {
+        await stale
+        return ok({ data: [], cursor: {} })
+      }
+      await retry
+      return ok({
+        data: [
+          {
+            id: "msg_overflow_assistant",
+            type: "assistant" as const,
+            agent: "explore",
+            model: { providerID: "test", id: "model" },
+            content: [{ type: "text" as const, id: "txt_overflow_64", text: "live 64" }],
+            time: { created: 2, completed: 3 },
+          },
+          {
+            id: "msg_overflow_baseline",
+            type: "user" as const,
+            text: "baseline history",
+            files: [],
+            agents: [],
+            time: { created: 1 },
+          },
+        ],
+        cursor: {},
+      })
+    })
+    const ui = footer()
+    const transport = await createSessionTransport({
+      sdk: client,
+      sessionID: "ses_1",
+      thinking: false,
+      limits: () => ({}),
+      footer: ui.api,
+    })
+    const states = () => ui.events.flatMap((event) => (event.type === "stream.subagent" ? [event.state] : []))
+    transport.selectSubagent("ses_child")
+    while (childRequests < 1) await Bun.sleep(0)
+
+    for (let index = 0; index < 65; index++)
+      events.push({
+        id: `evt_overflow_${index}`,
+        created: index,
+        type: "session.text.delta",
+        data: {
+          sessionID: "ses_child",
+          assistantMessageID: "msg_overflow_assistant",
+          textID: `txt_overflow_${index}`,
+          delta: `live ${index}`,
+        },
+      })
+    while (!states().at(-1)?.details.ses_child?.commits.some((item) => item.text === "live 64")) await Bun.sleep(0)
+    releaseStale()
+    while (childRequests < 2) await Bun.sleep(0)
+    expect(states().at(-1)?.details.ses_child?.commits.some((item) => item.text === "live 64")).toBe(true)
+
+    releaseRetry()
+    while (!states().at(-1)?.details.ses_child?.commits.some((item) => item.text === "baseline history"))
+      await Bun.sleep(0)
+    expect(states().at(-1)?.details.ses_child?.commits.some((item) => item.text === "live 64")).toBe(true)
+    expect(childRequests).toBe(2)
+    await transport.close()
+  })
+
+  test("reconciles pre-hydration tool metadata without downgrading projected completion", async () => {
+    const events = feed()
+    events.push(connected())
+    const client = sdk({
+      streams: [events],
+      sessions: [{ id: "ses_child", parentID: "ses_1", time: { updated: 1 } }],
+    })
+    let childHydrating = false
+    let releaseHydration!: () => void
+    const hydration = new Promise<void>((resolve) => {
+      releaseHydration = resolve
+    })
+    spyOn(client.v2.session, "messages").mockImplementation(async (request) => {
+      if (request.sessionID !== "ses_child") return ok({ data: [], cursor: {} })
+      childHydrating = true
+      await hydration
+      return ok({
+        data: [
+          {
+            id: "msg_tool_projected",
+            type: "assistant" as const,
+            agent: "explore",
+            model: { providerID: "test", id: "model" },
+            content: [
+              {
+                type: "tool" as const,
+                id: "call_overlap",
+                name: "bash",
+                state: {
+                  status: "completed" as const,
+                  input: { command: "projected" },
+                  content: [{ type: "text" as const, text: "projected result" }],
+                  structured: {},
+                },
+                time: { created: 1, ran: 1, completed: 2 },
+              },
+            ],
+            time: { created: 1, completed: 2 },
+          },
+        ],
+        cursor: {},
+      })
+    })
+    const ui = footer()
+    const transport = await createSessionTransport({
+      sdk: client,
+      sessionID: "ses_1",
+      thinking: false,
+      limits: () => ({}),
+      footer: ui.api,
+    })
+    const states = () => ui.events.flatMap((event) => (event.type === "stream.subagent" ? [event.state] : []))
+    const inputStarted = (callID: string, name: string, seq: number) =>
+      events.push({
+        id: `evt_started_${callID}`,
+        created: seq,
+        type: "session.tool.input.started",
+        durable: durable("ses_child", seq),
+        data: { sessionID: "ses_child", assistantMessageID: "msg_tool_projected", callID, name },
+      })
+    const called = (callID: string, tool: string, input: Record<string, unknown>, seq: number) =>
+      events.push({
+        id: `evt_called_${callID}`,
+        created: seq,
+        type: "session.tool.called",
+        durable: durable("ses_child", seq),
+        data: {
+          sessionID: "ses_child",
+          assistantMessageID: "msg_tool_projected",
+          callID,
+          tool,
+          input,
+          provider: { executed: true },
+        },
+      })
+
+    inputStarted("call_terminal", "grep", 0)
+    called("call_terminal", "grep", { pattern: "needle" }, 1)
+    await Bun.sleep(0)
+    transport.selectSubagent("ses_child")
+    while (!childHydrating) await Bun.sleep(0)
+    events.push({
+      id: "evt_success_terminal",
+      created: 2,
+      type: "session.tool.success",
+      durable: durable("ses_child", 2),
+      data: {
+        sessionID: "ses_child",
+        assistantMessageID: "msg_tool_projected",
+        callID: "call_terminal",
+        structured: {},
+        content: [{ type: "text", text: "found" }],
+        provider: { executed: true },
+      },
+    })
+    inputStarted("call_overlap", "bash", 3)
+    called("call_overlap", "bash", { command: "stale" }, 4)
+    await Bun.sleep(0)
+    const beforeHydration = states().length
+    releaseHydration()
+    while (states().length === beforeHydration) await Bun.sleep(0)
+    await Bun.sleep(0)
+
+    const commits = states().at(-1)?.details.ses_child?.commits ?? []
+    expect(commits.find((item) => item.partID === "prt_call_terminal")).toMatchObject({
+      tool: "grep",
+      toolState: "completed",
+      part: { state: { input: { pattern: "needle" } } },
+    })
+    expect(commits.find((item) => item.partID === "prt_call_overlap")).toMatchObject({
+      tool: "bash",
+      toolState: "completed",
+      part: { state: { input: { command: "projected" } } },
+    })
+    await transport.close()
+  })
+
   test("keeps child terminal state observed during discovery", async () => {
     const events = feed()
     events.push(connected())

From d65ecd4a90cf3927bd38f72987a6ac8b0d857545 Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Sat, 4 Jul 2026 16:20:56 -0500
Subject: [PATCH 55/82] feat(core): expose deferred tools through execute
 (#35361)

---
 bun.lock                           |   1 +
 packages/codemode/codemode.md      |   6 +
 packages/core/package.json         |   1 +
 packages/core/src/flag/flag.ts     |   3 +
 packages/core/src/mcp/guidance.ts  |  12 +-
 packages/core/src/tool/execute.ts  | 211 +++++++++++++++++++++++++++++
 packages/core/src/tool/mcp.ts      | 130 ++++++++++--------
 packages/core/src/tool/registry.ts |  58 +++++---
 packages/core/test/mcp.test.ts     |  33 +++--
 packages/core/test/plugin.test.ts  |   1 +
 10 files changed, 367 insertions(+), 89 deletions(-)
 create mode 100644 packages/core/src/tool/execute.ts

diff --git a/bun.lock b/bun.lock
index 46382ce955..3ca6fd949d 100644
--- a/bun.lock
+++ b/bun.lock
@@ -321,6 +321,7 @@
         "@modelcontextprotocol/sdk": "1.29.0",
         "@npmcli/arborist": "9.4.0",
         "@npmcli/config": "10.8.1",
+        "@opencode-ai/codemode": "workspace:*",
         "@opencode-ai/effect-drizzle-sqlite": "workspace:*",
         "@opencode-ai/effect-sqlite-node": "workspace:*",
         "@opencode-ai/llm": "workspace:*",
diff --git a/packages/codemode/codemode.md b/packages/codemode/codemode.md
index 41b801044d..14fe18b875 100644
--- a/packages/codemode/codemode.md
+++ b/packages/codemode/codemode.md
@@ -1132,6 +1132,12 @@ Post-MVP (logged, not blocking an experimental flag):
 - [ ] Reviewer observation worth keeping: MCP server instructions (`sys.mcp`,
       `session/system.ts:110-126`) still inject prose referencing server-native tool
       names that are no longer directly callable under code mode.
+- [ ] Tool-tree path segments named `__proto__`, `constructor`, or `prototype` are included
+      in discovery but rejected by `ToolRuntime` resolution even when supplied as safe own
+      properties on null-prototype host records. Hosts should preserve registered names rather
+      than invent incompatible aliases. CodeMode should own a consistent policy: safely admit
+      these names as own tool-tree members, reject them before catalog generation with a clear
+      diagnostic, or define one canonical escaping contract.
 
 ### Backlog / loose ends (non-blocking, any order)
 
diff --git a/packages/core/package.json b/packages/core/package.json
index 56bcbb53ba..84a51e61d2 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -90,6 +90,7 @@
     "@ff-labs/fff-bun": "0.9.4",
     "@npmcli/arborist": "9.4.0",
     "@npmcli/config": "10.8.1",
+    "@opencode-ai/codemode": "workspace:*",
     "@opencode-ai/effect-drizzle-sqlite": "workspace:*",
     "@opencode-ai/effect-sqlite-node": "workspace:*",
     "@opencode-ai/llm": "workspace:*",
diff --git a/packages/core/src/flag/flag.ts b/packages/core/src/flag/flag.ts
index 1c975040dc..b33c20c1ab 100644
--- a/packages/core/src/flag/flag.ts
+++ b/packages/core/src/flag/flag.ts
@@ -52,6 +52,9 @@ export const Flag = {
   get OPENCODE_EXPERIMENTAL_REFERENCES() {
     return enabledByExperimental("OPENCODE_EXPERIMENTAL_REFERENCES")
   },
+  get CODEMODE_ENABLED() {
+    return process.env["CODEMODE_ENABLED"] === undefined || truthy("CODEMODE_ENABLED")
+  },
   get OPENCODE_TUI_CONFIG() {
     return process.env["OPENCODE_TUI_CONFIG"]
   },
diff --git a/packages/core/src/mcp/guidance.ts b/packages/core/src/mcp/guidance.ts
index eed26170b0..0963a69d23 100644
--- a/packages/core/src/mcp/guidance.ts
+++ b/packages/core/src/mcp/guidance.ts
@@ -1,6 +1,7 @@
 export * as McpGuidance from "./guidance"
 
 import { makeLocationNode } from "../effect/app-node"
+import { Flag } from "../flag/flag"
 import { Context, Effect, Layer, Schema } from "effect"
 import { AgentV2 } from "../agent"
 import { PermissionV2 } from "../permission"
@@ -17,6 +18,11 @@ type Summary = typeof Summary.Type
 const entries = (servers: ReadonlyArray<Summary>) =>
   servers.flatMap((server) => [
     `  <server name="${server.server}">`,
+    ...(Flag.CODEMODE_ENABLED
+      ? [
+          `    Use tools from this server through \`execute\` under \`tools[${JSON.stringify(McpTool.group(server.server))}]\`.`,
+        ]
+      : []),
     ...server.instructions.split("\n").map((line) => `    ${line}`),
     "  </server>",
   ])
@@ -64,15 +70,17 @@ export const layer = Layer.effect(
       load: Effect.fn("McpGuidance.load")(function* (selection) {
         const agent = selection.info
         if (!agent) return SystemContext.empty
+        if (Flag.CODEMODE_ENABLED && PermissionV2.evaluate("execute", "*", agent.permissions).effect === "deny")
+          return SystemContext.empty
         const [instructions, tools] = yield* Effect.all([mcp.instructions(), mcp.tools()], {
           concurrency: "unbounded",
         })
-        // Hide a server only when every tool it contributes is wholly denied for this agent.
+        // Instructions are useful only when this agent can reach at least one server tool.
         const visible = instructions
           .filter((item) => {
             const owned = tools.filter((tool) => tool.server === item.server)
             return (
-              owned.length === 0 ||
+              (!Flag.CODEMODE_ENABLED && owned.length === 0) ||
               owned.some(
                 (tool) =>
                   PermissionV2.evaluate(McpTool.name(tool.server, tool.name), "*", agent.permissions).effect !== "deny",
diff --git a/packages/core/src/tool/execute.ts b/packages/core/src/tool/execute.ts
new file mode 100644
index 0000000000..67d1b21eaf
--- /dev/null
+++ b/packages/core/src/tool/execute.ts
@@ -0,0 +1,211 @@
+export * as ExecuteTool from "./execute"
+
+import {
+  CodeMode,
+  ExecuteInputSchema,
+  Tool,
+  toolError,
+  type DataValue,
+  type ExecuteResult,
+  type ToolCallHooks,
+  type ToolDefinition,
+} from "@opencode-ai/codemode"
+import { ToolOutput } from "@opencode-ai/llm"
+import { Effect, Ref, Schema } from "effect"
+import { definition, make, settle, type AnyTool } from "./tool"
+
+const ExecuteFile = Schema.Struct({
+  data: Schema.String,
+  mime: Schema.String,
+  name: Schema.optionalKey(Schema.String),
+})
+
+const ExecuteCall = Schema.Struct({
+  tool: Schema.String,
+  status: Schema.Literals(["running", "completed", "error"]),
+  input: Schema.optionalKey(Schema.Record(Schema.String, Schema.Unknown)),
+})
+
+type ExecuteCall = typeof ExecuteCall.Type
+
+const ExecuteMetadata = Schema.Struct({
+  toolCalls: Schema.Array(ExecuteCall),
+  error: Schema.optionalKey(Schema.Literal(true)),
+})
+
+const ExecuteOutput = Schema.Struct({
+  output: Schema.String,
+  toolCalls: Schema.Array(ExecuteCall),
+  error: Schema.optionalKey(Schema.Literal(true)),
+  files: Schema.Array(ExecuteFile),
+})
+
+type CollectedFiles = {
+  readonly index: number
+  readonly files: Array<typeof ExecuteFile.Type>
+}
+
+export interface Registration {
+  readonly identity: object
+  readonly tool: AnyTool
+  readonly name: string
+  readonly group?: string
+}
+
+export const create = (options: {
+  readonly registrations: ReadonlyMap<string, Registration>
+  readonly current: (name: string) => Registration | undefined
+}) => {
+  const runtime = (
+    invoke: (name: string, registration: Registration, input: unknown) => Effect.Effect<unknown, unknown>,
+    hooks?: ToolCallHooks,
+  ) => {
+    const tools: Record<string, ToolDefinition<never> | Record<string, ToolDefinition<never>>> = {}
+    for (const [name, registration] of options.registrations) {
+      const child = definition(name, registration.tool)
+      const value = Tool.make({
+        description: child.description,
+        input: child.inputSchema,
+        output: child.outputSchema,
+        run: (input) => invoke(name, registration, input),
+      })
+      if (registration.group === undefined) {
+        const path = registration.name
+        if (Object.hasOwn(tools, path)) throw new TypeError(`Deferred tool namespace conflict: ${path}`)
+        tools[path] = value
+        continue
+      }
+      const path = registration.name
+      const namespace = registration.group
+      const group = tools[namespace]
+      if (group && Tool.isDefinition(group)) throw new TypeError(`Deferred tool namespace conflict: ${namespace}`)
+      if (group) {
+        if (Object.hasOwn(group, path)) throw new TypeError(`Deferred tool namespace conflict: ${namespace}.${path}`)
+        group[path] = value
+        continue
+      }
+      const entries: Record<string, ToolDefinition<never>> = {}
+      entries[path] = value
+      tools[namespace] = entries
+    }
+    return CodeMode.make<typeof tools>({ tools, ...hooks })
+  }
+  const discovery = runtime(() => Effect.fail(toolError("Execute context is unavailable")))
+  return make({
+    description: discovery.instructions(),
+    input: ExecuteInputSchema,
+    output: ExecuteOutput,
+    structured: ExecuteMetadata,
+    toStructuredOutput: ({ output }) => ({
+      toolCalls: output.toolCalls,
+      ...(output.error ? { error: true as const } : {}),
+    }),
+    toModelOutput: ({ output }) => [
+      { type: "text" as const, text: output.output },
+      ...output.files.map((file) => ({
+        type: "file" as const,
+        data: file.data,
+        mime: file.mime,
+        ...(file.name === undefined ? {} : { name: file.name }),
+      })),
+    ],
+    execute: ({ code }, context) =>
+      Effect.gen(function* () {
+        const callIndex = yield* Ref.make(0)
+        const files = yield* Ref.make<Array<CollectedFiles>>([])
+        const calls = yield* Ref.make<Array<ExecuteCall>>([])
+        // TODO: Publish live call-list updates once V2 has a generic tool progress API.
+        const finalCalls = Ref.get(calls).pipe(
+          Effect.map((items) =>
+            items.map((call) => (call.status === "running" ? { ...call, status: "error" as const } : call)),
+          ),
+        )
+        const result = yield* runtime(
+          (name, registration, input) =>
+            Effect.gen(function* () {
+              const index = yield* Ref.getAndUpdate(callIndex, (index) => index + 1)
+              const current = options.current(name)
+              if (!current || current.identity !== registration.identity)
+                return yield* Effect.fail(toolError(`Stale tool call: ${name}`))
+              const output = yield* settle(
+                current.tool,
+                { type: "tool-call", id: context.toolCallID, name, input },
+                {
+                  sessionID: context.sessionID,
+                  agent: context.agent,
+                  assistantMessageID: context.assistantMessageID,
+                  toolCallID: context.toolCallID,
+                },
+              ).pipe(Effect.mapError((failure) => toolError(failure.message, failure)))
+              const outputFileParts = outputFiles(output)
+              if (outputFileParts.length > 0)
+                yield* Ref.update(files, (items) => [...items, { index, files: outputFileParts }])
+              return output.structured
+            }),
+          {
+            onToolCallStart: ({ index, name, input }) =>
+              Effect.gen(function* () {
+                const shown = displayInput(input)
+                yield* Ref.update(calls, (items) => {
+                  const next = [...items]
+                  next[index] = { tool: name, status: "running", ...(shown ? { input: shown } : {}) }
+                  return next
+                })
+              }),
+            onToolCallEnd: ({ index, outcome }) =>
+              Ref.update(calls, (items) => {
+                const current = items[index]
+                if (!current) return items
+                const next = [...items]
+                next[index] = { ...current, status: outcome === "success" ? "completed" : "error" }
+                return next
+              }),
+          },
+        ).execute(code)
+        const toolCalls = yield* finalCalls
+        const collected = (yield* Ref.get(files))
+          .toSorted((left, right) => left.index - right.index)
+          .flatMap((item) => item.files)
+        const output = formatResult(result)
+        return { output, toolCalls, files: collected, ...(result.ok ? {} : { error: true as const }) }
+      }),
+  })
+}
+
+function displayInput(input: unknown): Record<string, unknown> | undefined {
+  if (input === null || input === undefined) return
+  if (typeof input !== "object" || Array.isArray(input)) return { input }
+  if (Object.keys(input).length === 0) return
+  return input as Record<string, unknown>
+}
+
+function formatResult(result: ExecuteResult) {
+  const output = result.ok
+    ? formatValue(result.value)
+    : [result.error.message, ...(result.error.suggestions ?? []).filter((hint) => !result.error.message.includes(hint))]
+        .join("\n")
+        .trim()
+  if (!result.logs || result.logs.length === 0) return output
+  const logs = `Logs:\n${result.logs.join("\n")}`
+  return output === "" ? logs : `${output}\n\n${logs}`
+}
+
+function formatValue(value: DataValue) {
+  if (typeof value === "string") return value
+  return JSON.stringify(value, null, 2) ?? String(value)
+}
+
+function outputFiles(output: ToolOutput): Array<typeof ExecuteFile.Type> {
+  return output.content.flatMap((part) => {
+    if (part.type !== "file") return []
+    const prefix = `data:${part.mime};base64,`
+    if (!part.uri.startsWith(prefix)) return []
+    return [
+      {
+        data: part.uri.slice(prefix.length),
+        mime: part.mime,
+        ...(part.name === undefined ? {} : { name: part.name }),
+      },
+    ]
+  })
+}
diff --git a/packages/core/src/tool/mcp.ts b/packages/core/src/tool/mcp.ts
index 23d11d06a0..8cb0117ebb 100644
--- a/packages/core/src/tool/mcp.ts
+++ b/packages/core/src/tool/mcp.ts
@@ -5,6 +5,7 @@ import { McpEvent } from "@opencode-ai/schema/mcp-event"
 import { Effect, Exit, type JsonSchema, Layer, Scope, Semaphore, Stream } from "effect"
 import { makeLocationNode } from "../effect/app-node"
 import { EventV2 } from "../event"
+import { Flag } from "../flag/flag"
 import { MCP } from "../mcp"
 import { PermissionV2 } from "../permission"
 import { Tool } from "./tool"
@@ -12,10 +13,10 @@ import { Tools } from "./tools"
 import { ToolRegistry } from "./registry"
 
 /**
- * Registry and permission action name for an MCP tool.
+ * Registry group and permission action names for MCP tools.
  */
-export const name = (server: string, tool: string) =>
-  `${server.replace(/[^a-zA-Z0-9_-]/g, "_")}_${tool.replace(/[^a-zA-Z0-9_-]/g, "_")}`
+export const group = (server: string) => server.replace(/[^a-zA-Z0-9_-]/g, "_")
+export const name = (server: string, tool: string) => `${group(server)}_${tool.replace(/[^a-zA-Z0-9_-]/g, "_")}`
 
 export const layer = Layer.effectDiscard(
   Effect.gen(function* () {
@@ -35,72 +36,81 @@ export const layer = Layer.effectDiscard(
         for (const tool of yield* mcp.tools()) {
           const group = groups.get(tool.server) ?? {}
           const schema = (tool.inputSchema ?? {}) as JsonSchema.JsonSchema
-          group[tool.name] = Tool.make({
-            description: tool.description ?? "",
-            jsonSchema: {
-              ...schema,
-              type: "object",
-              properties: schema.properties ?? {},
-              additionalProperties: false,
-            },
-            execute: (input, context) =>
-              Effect.gen(function* () {
-                yield* permission.assert({
-                  action: name(tool.server, tool.name),
-                  resources: ["*"],
-                  save: ["*"],
-                  metadata: {},
-                  sessionID: context.sessionID,
-                  agent: context.agent,
-                  source: {
-                    type: "tool",
-                    messageID: context.assistantMessageID,
-                    callID: context.toolCallID,
-                  },
-                })
-                const result = yield* mcp
-                  .callTool({
-                    server: tool.server,
-                    name: tool.name,
-                    args: (input ?? {}) as Record<string, unknown>,
+          group[tool.name] = Tool.withPermission(
+            Tool.make({
+              description: tool.description ?? "",
+              jsonSchema: {
+                ...schema,
+                type: "object",
+                properties: schema.properties ?? {},
+                additionalProperties: false,
+              },
+              execute: (input, context) =>
+                Effect.gen(function* () {
+                  yield* permission.assert({
+                    action: name(tool.server, tool.name),
+                    resources: ["*"],
+                    save: ["*"],
+                    metadata: {},
+                    sessionID: context.sessionID,
+                    agent: context.agent,
+                    source: {
+                      type: "tool",
+                      messageID: context.assistantMessageID,
+                      callID: context.toolCallID,
+                    },
                   })
-                  .pipe(
-                    Effect.catchTags({
-                      "MCP.NotFoundError": (error) =>
-                        new ToolFailure({ message: `MCP server "${error.server}" is not available` }),
-                      "MCP.ToolCallError": (error) => new ToolFailure({ message: error.message }),
-                    }),
-                  )
-                if (result.isError)
-                  return yield* new ToolFailure({
-                    message:
-                      result.content
-                        .flatMap((part) => (part.type === "text" ? [part.text] : []))
-                        .join("\n")
-                        .trim() || "MCP tool returned an error",
-                  })
-                return {
-                  structured: result.structured ?? {},
-                  content: result.content.map((part) =>
+                  const result = yield* mcp
+                    .callTool({
+                      server: tool.server,
+                      name: tool.name,
+                      args: (input ?? {}) as Record<string, unknown>,
+                    })
+                    .pipe(
+                      Effect.catchTags({
+                        "MCP.NotFoundError": (error) =>
+                          new ToolFailure({ message: `MCP server "${error.server}" is not available` }),
+                        "MCP.ToolCallError": (error) => new ToolFailure({ message: error.message }),
+                      }),
+                    )
+                  if (result.isError)
+                    return yield* new ToolFailure({
+                      message:
+                        result.content
+                          .flatMap((part) => (part.type === "text" ? [part.text] : []))
+                          .join("\n")
+                          .trim() || "MCP tool returned an error",
+                    })
+                  const content = result.content.map((part) =>
                     part.type === "text"
                       ? { type: "text" as const, text: part.text }
                       : { type: "file" as const, data: part.data, mime: part.mimeType },
+                  )
+                  const text = content.flatMap((part) => (part.type === "text" ? [part.text] : [])).join("\n")
+                  return {
+                    structured: result.structured ?? (text === "" ? null : text),
+                    content,
+                  }
+                }).pipe(
+                  Effect.mapError((error) =>
+                    error instanceof ToolFailure
+                      ? error
+                      : new ToolFailure({ message: `Unable to execute ${name(tool.server, tool.name)}` }),
                   ),
-                }
-              }).pipe(
-                Effect.mapError((error) =>
-                  error instanceof ToolFailure
-                    ? error
-                    : new ToolFailure({ message: `Unable to execute ${name(tool.server, tool.name)}` }),
                 ),
-              ),
-          })
+            }),
+            name(tool.server, tool.name),
+          )
           groups.set(tool.server, group)
         }
         const next = yield* Scope.fork(scope)
-        yield* Effect.forEach(groups, ([group, record]) => tools.register(record, { group }), {
-          discard: true,
-        }).pipe(Scope.provide(next), Effect.orDie)
+        yield* Effect.forEach(
+          groups,
+          ([group, record]) => tools.register(record, { group, deferred: Flag.CODEMODE_ENABLED }),
+          {
+            discard: true,
+          },
+        ).pipe(Scope.provide(next), Effect.orDie)
         if (current) yield* Scope.close(current, Exit.void)
         current = next
       }),
diff --git a/packages/core/src/tool/registry.ts b/packages/core/src/tool/registry.ts
index dcdbb1c888..de11c10e6f 100644
--- a/packages/core/src/tool/registry.ts
+++ b/packages/core/src/tool/registry.ts
@@ -3,12 +3,14 @@ export * as ToolRegistry from "./registry"
 import { ToolOutput, type ToolCall, type ToolDefinition, type ToolResultValue } from "@opencode-ai/llm"
 import { Context, Effect, Layer, Scope } from "effect"
 import type { AgentV2 } from "../agent"
+import { Flag } from "../flag/flag"
 import { PermissionV2 } from "../permission"
 import { SessionMessage } from "../session/message"
 import { SessionSchema } from "../session/schema"
 import { ToolOutputStore } from "../tool-output-store"
 import { Wildcard } from "../util/wildcard"
-import { definition, permission, registrationEntries, settle, type AnyTool, type RegistrationError } from "./tool"
+import { ExecuteTool } from "./execute"
+import { definition, permission, registrationEntries, RegistrationError, settle, type AnyTool } from "./tool"
 import { Tools } from "./tools"
 import { ToolHooks } from "./hooks"
 import { makeLocationNode } from "../effect/app-node"
@@ -61,18 +63,8 @@ const registryLayer = Layer.effect(
     }
     const local = new Map<string, Array<{ readonly token: object; readonly registration: Registration }>>()
 
-    const settleWith = Effect.fn("ToolRegistry.settle")(function* (input: ExecuteInput, advertised?: object) {
-      const registration = local.get(input.call.name)?.at(-1)?.registration
-      if (!registration)
-        return {
-          result: {
-            type: "error" as const,
-            value: advertised ? `Stale tool call: ${input.call.name}` : `Unknown tool: ${input.call.name}`,
-          },
-        }
-      if (advertised && registration.identity !== advertised)
-        return { result: { type: "error" as const, value: `Stale tool call: ${input.call.name}` } }
-      // Hooks fire only for hosted/local tools; provider-executed calls never reach settleWith.
+    const settleTool = Effect.fn("ToolRegistry.settleTool")(function* (input: ExecuteInput, tool: AnyTool) {
+      // Hooks fire only for hosted/local tools; provider-executed calls never reach settleTool.
       const beforeEvent: ToolHooks.BeforeEvent = {
         tool: input.call.name,
         sessionID: input.sessionID,
@@ -83,7 +75,7 @@ const registryLayer = Layer.effect(
       }
       yield* toolHooks.runBefore(beforeEvent)
       const pending = yield* settle(
-        registration.tool,
+        tool,
         { ...input.call, input: beforeEvent.input },
         {
           sessionID: input.sessionID,
@@ -135,10 +127,29 @@ const registryLayer = Layer.effect(
       }
     })
 
+    const settleWith = Effect.fn("ToolRegistry.settle")(function* (input: ExecuteInput, advertised: object) {
+      const registration = local.get(input.call.name)?.at(-1)?.registration
+      if (!registration)
+        return {
+          result: {
+            type: "error" as const,
+            value: `Stale tool call: ${input.call.name}`,
+          },
+        }
+      if (registration.identity !== advertised)
+        return { result: { type: "error" as const, value: `Stale tool call: ${input.call.name}` } }
+      return yield* settleTool(input, registration.tool)
+    })
+
     return Service.of({
       register: Effect.fn("ToolRegistry.register")(function* (tools, options) {
         const entries = registrationEntries(tools, options?.group)
         if (entries.length === 0) return
+        const reserved = options?.deferred ? undefined : entries.find((entry) => entry.key === "execute")
+        if (reserved)
+          return yield* Effect.fail(
+            new RegistrationError({ name: reserved.key, message: 'Tool name "execute" is reserved for CodeMode' }),
+          )
         yield* Effect.uninterruptible(
           Effect.gen(function* () {
             const token = {}
@@ -180,16 +191,29 @@ const registryLayer = Layer.effect(
         for (const [name, registration] of registrations) {
           const wrongEditTool = name === "apply_patch" ? !usePatch : (name === "edit" || name === "write") && usePatch
           if (
-            registration.deferred ||
             wrongEditTool ||
+            (registration.deferred && !Flag.CODEMODE_ENABLED) ||
             whollyDisabled(permission(registration.tool, name), input.permissions ?? [])
           )
             registrations.delete(name)
         }
+        const direct = new Map(Array.from(registrations).filter(([, registration]) => !registration.deferred))
+        const deferred = new Map(Array.from(registrations).filter(([, registration]) => registration.deferred))
+        const execute =
+          deferred.size > 0 && !whollyDisabled("execute", input.permissions ?? [])
+            ? ExecuteTool.create({
+                registrations: deferred,
+                current: (name) => local.get(name)?.at(-1)?.registration,
+              })
+            : undefined
         return {
-          definitions: Array.from(registrations, ([name, registration]) => definition(name, registration.tool)),
+          definitions: [
+            ...Array.from(direct, ([name, registration]) => definition(name, registration.tool)),
+            ...(execute ? [definition("execute", execute)] : []),
+          ],
           settle: (input) => {
-            const registration = registrations.get(input.call.name)
+            if (input.call.name === "execute" && execute) return settleTool(input, execute)
+            const registration = direct.get(input.call.name)
             if (registration) return settleWith(input, registration.identity)
             return Effect.succeed({ result: { type: "error", value: `Unknown tool: ${input.call.name}` } })
           },
diff --git a/packages/core/test/mcp.test.ts b/packages/core/test/mcp.test.ts
index f52b223dce..ffcc2d3b89 100644
--- a/packages/core/test/mcp.test.ts
+++ b/packages/core/test/mcp.test.ts
@@ -79,12 +79,17 @@ it.effect("waits for permission before calling an MCP tool", () =>
     const permission = yield* Deferred.make<void>()
     decision = Deferred.await(permission)
     const registry = yield* ToolRegistry.Service
-    yield* waitForTool(registry, "demo_search")
+    yield* waitForTool(registry, "execute")
 
     const fiber = yield* settleTool(registry, {
       sessionID: SessionV2.ID.make("ses_mcp_permission"),
       ...toolIdentity,
-      call: { type: "tool-call", id: "call_mcp_permission", name: "demo_search", input: {} },
+      call: {
+        type: "tool-call",
+        id: "call_mcp_permission",
+        name: "execute",
+        input: { code: "return await tools.demo.search({})" },
+      },
     }).pipe(Effect.forkScoped)
     expect(yield* Deferred.await(assertion)).toEqual({
       action: "demo_search",
@@ -113,15 +118,23 @@ it.effect("does not call MCP when permission is rejected", () =>
     assertion = yield* Deferred.make<PermissionV2.AssertInput>()
     decision = Effect.fail(new PermissionV2.RejectedError())
     const registry = yield* ToolRegistry.Service
-    yield* waitForTool(registry, "demo_search")
+    yield* waitForTool(registry, "execute")
 
-    expect(
-      yield* settleTool(registry, {
-        sessionID: SessionV2.ID.make("ses_mcp_rejected"),
-        ...toolIdentity,
-        call: { type: "tool-call", id: "call_mcp_rejected", name: "demo_search", input: {} },
-      }),
-    ).toEqual({ result: { type: "error", value: "Unable to execute demo_search" } })
+    const settlement = yield* settleTool(registry, {
+      sessionID: SessionV2.ID.make("ses_mcp_rejected"),
+      ...toolIdentity,
+      call: {
+        type: "tool-call",
+        id: "call_mcp_rejected",
+        name: "execute",
+        input: { code: "return await tools.demo.search({})" },
+      },
+    })
+    expect(settlement.result).toEqual({ type: "text", value: "Unable to execute demo_search" })
+    expect(settlement.output?.structured).toEqual({
+      toolCalls: [{ tool: "demo.search", status: "error" }],
+      error: true,
+    })
     expect(calls).toBe(0)
   }),
 )
diff --git a/packages/core/test/plugin.test.ts b/packages/core/test/plugin.test.ts
index 1a60decb0b..266d487862 100644
--- a/packages/core/test/plugin.test.ts
+++ b/packages/core/test/plugin.test.ts
@@ -154,6 +154,7 @@ describe("PluginV2", () => {
       expect((yield* registry.materialize({ model: testModel })).definitions.map((tool) => tool.name)).toEqual([
         "plain",
         "context_7_look_up",
+        "execute",
       ])
     }),
   )

From b8efb33cde6d35c6013d2682c2701ed789debd9d Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Sat, 4 Jul 2026 16:28:11 -0500
Subject: [PATCH 56/82] feat(codemode): add OpenAPI tool adapter (#35362)

---
 packages/codemode/AGENTS.md                   |     8 +
 packages/codemode/README.md                   |    27 +
 packages/codemode/src/index.ts                |     1 +
 packages/codemode/src/openapi/TODO.md         |    19 +
 packages/codemode/src/openapi/index.ts        |   130 +
 packages/codemode/src/openapi/runtime.ts      |   324 +
 packages/codemode/src/openapi/spec.ts         |   507 +
 packages/codemode/src/openapi/types.ts        |   112 +
 packages/codemode/src/token.ts                |    10 -
 packages/codemode/src/tool-runtime.ts         |    80 +-
 packages/codemode/src/tool.ts                 |    72 +-
 .../test/fixtures/openapi-happy-path.json     |   245 +
 .../test/fixtures/opencode-v2-openapi.json    | 26962 ++++++++++++++++
 packages/codemode/test/openapi.test.ts        |   958 +
 packages/codemode/test/signature.test.ts      |    67 +-
 packages/protocol/src/groups/pty.ts           |     1 +
 16 files changed, 29461 insertions(+), 62 deletions(-)
 create mode 100644 packages/codemode/src/openapi/TODO.md
 create mode 100644 packages/codemode/src/openapi/index.ts
 create mode 100644 packages/codemode/src/openapi/runtime.ts
 create mode 100644 packages/codemode/src/openapi/spec.ts
 create mode 100644 packages/codemode/src/openapi/types.ts
 delete mode 100644 packages/codemode/src/token.ts
 create mode 100644 packages/codemode/test/fixtures/openapi-happy-path.json
 create mode 100644 packages/codemode/test/fixtures/opencode-v2-openapi.json
 create mode 100644 packages/codemode/test/openapi.test.ts

diff --git a/packages/codemode/AGENTS.md b/packages/codemode/AGENTS.md
index 88dd9c81d9..df812c6d86 100644
--- a/packages/codemode/AGENTS.md
+++ b/packages/codemode/AGENTS.md
@@ -5,6 +5,14 @@
 - Keep Code Mode unaware of host session, channel, and conversation models. The hosting application supplies trusted execution scope around it.
 - Tool schemas are the model-facing Interface. Keep arguments minimal and natural to the operation; never add unrelated IDs as ambient capability tokens.
 
+## OpenAPI
+
+- Generate an operation only when its transport semantics are supported; otherwise return a precise `skipped` reason.
+- Never guess parameter serialization or malformed security semantics. Unsupported serialization is skipped and malformed security fails closed.
+- Render unresolved schema constructs as `unknown`, never as invented TypeScript names.
+- Keep network reads bounded and map expected encoding, transport, and decoding failures to model-safe `ToolError` values.
+- Test supported behavior directly; do not reproduce adapter algorithms in tests.
+
 ## Future Design Notes
 
 - If a captured user-visible output channel returns (an earlier `output.text`/`output.file`/`output.image` API was removed from v1), keep `output` as its name, distinct from the program return value: `return` stays the structured result for the model, while `output.*` describes artifacts the host may render into a conversation or UI after execution. Keep this host-neutral and let applications decide how captured output is delivered. In v1, hosts collect media host-side (outside the sandbox) instead.
diff --git a/packages/codemode/README.md b/packages/codemode/README.md
index 3f1f641b3f..bd14a24fb0 100644
--- a/packages/codemode/README.md
+++ b/packages/codemode/README.md
@@ -152,6 +152,33 @@ interface ExecuteFailure {
 
 `onToolCallEnd` receives `{ index, name, input, durationMs, outcome, message? }` when an admitted call settles. `outcome` is `"success"` or `"failure"`; `message` is the model-safe failure message and is present only on failure. Interrupted calls (for example when the execution timeout fires) do not produce an end event. Both hooks are Effect-returning and must not fail.
 
+### OpenAPI tools
+
+`OpenAPI.fromSpec` turns an OpenAPI 3.x document into a tool subtree - one tool per operation. Dotted `operationId` values form namespaces such as `v2.session.get`. Missing IDs receive a flat method/path fallback such as `getUsersById`; names are sanitized and deduplicated. The host places the subtree under a key in its `tools` tree; that key is the model-visible namespace.
+
+```ts
+import { CodeMode, OpenAPI } from "@opencode-ai/codemode"
+import { Effect } from "effect"
+import { FetchHttpClient } from "effect/unstable/http"
+
+const api = OpenAPI.fromSpec({
+  spec: await Bun.file("openapi.json").json(), // parsed document (no YAML)
+  auth: {
+    resolve: ({ name, scopes, operation }) =>
+      name === "BearerAuth"
+        ? Effect.succeed({ type: "bearer", token })
+        : Effect.succeed(undefined),
+  },
+})
+
+const runtime = CodeMode.make({ tools: { opencode: api.tools } })
+const result = await Effect.runPromise(runtime.execute(code).pipe(Effect.provide(FetchHttpClient.layer)))
+```
+
+`fromSpec` is synchronous and returns `{ tools, skipped }`. The initial adapter supports query `form`/`deepObject`, path/header `simple`, JSON request bodies, JSON responses, and text responses; unsupported parameter encodings, non-JSON request bodies, binary responses, and streaming operations land in `skipped` instead of producing broken tools. Operation and path servers take precedence over document servers unless `baseUrl` explicitly overrides all of them. Tool inputs flatten path, query, header, and closed object-body fields into one model-facing object while retaining their HTTP locations internally. Cross-location name collisions receive a location prefix such as `path_id` and `query_id`; composed, nullable, dictionary, conditionally-required, and non-object JSON bodies remain under `body`. Auth is never model-visible. Responses are limited to 50 MiB, and non-2xx responses become safe tool failures carrying the status and a size-capped body summary. Deferred capabilities are tracked in `src/openapi/TODO.md`.
+
+Supported bearer, basic, header, and query authentication follows OpenAPI `security` semantics and is resolved host-side via `auth.resolve` - credential storage, OAuth flows, and token refresh never enter the compiler. Cookie authentication alternatives are discarded; an operation is skipped when it has no supported alternative. See the option docstrings in `src/openapi/types.ts` for the full semantics. Generated tools require `HttpClient.HttpClient` (from `effect/unstable/http`) in the Effect environment - provide `FetchHttpClient.layer` or a custom/test client layer at execution. The supplied client owns redirect policy; credentialed hosts should reject redirects or strip credentials when the origin changes.
+
 ## Discovery
 
 The agent-tool instructions use a budgeted catalog. Every tool namespace is always listed with its tool count regardless of budget, and as many complete tool signatures (each with a one-line description) as fit an estimated-token budget are inlined. Selection is round-robin across namespaces for fairness: in each round (namespaces alphabetical), every namespace still holding un-inlined tools attempts to place its next-cheapest signature line against the shared budget, and a namespace whose next line does not fit drops out while the others keep going - so every namespace gets some representation before any namespace gets everything. The instructions state exactly how comprehensive the list is, both overall (`COMPLETE list` vs `PARTIAL - N of M shown`) and per namespace (`(3 tools)`, `(3 tools, 1 shown)`, `(3 tools, none shown)`).
diff --git a/packages/codemode/src/index.ts b/packages/codemode/src/index.ts
index 96629f486e..1aea6644da 100644
--- a/packages/codemode/src/index.ts
+++ b/packages/codemode/src/index.ts
@@ -1,5 +1,6 @@
 export { ToolError, CodeMode, ExecuteInputSchema, ExecuteResultSchema, toolError } from "./codemode.js"
 export { Tool } from "./tool.js"
+export * as OpenAPI from "./openapi/index.js"
 export type { Definition as ToolDefinition, JsonSchema, ToolSchema } from "./tool.js"
 export type { ToolCallEnded, ToolCallHooks } from "./tool-runtime.js"
 export type {
diff --git a/packages/codemode/src/openapi/TODO.md b/packages/codemode/src/openapi/TODO.md
new file mode 100644
index 0000000000..cbcfe81a68
--- /dev/null
+++ b/packages/codemode/src/openapi/TODO.md
@@ -0,0 +1,19 @@
+# OpenAPI Follow-ups
+
+The initial adapter intentionally skips operations it cannot execute correctly. Future work may add:
+
+- Cookie parameters, authentication, and cookie-header merging.
+- Matrix, label, space-delimited, pipe-delimited, `allowReserved`, and parameter `content` serialization.
+- External references and complete nested `$defs` support.
+- Relative or templated server URLs and server variables.
+- Base URLs containing query strings or fragments.
+- Runtime response-schema validation and full content negotiation.
+- Binary response values and explicit byte-oriented return types.
+- Request/response projection for `readOnly` and `writeOnly` properties.
+- SSE, WebSocket, and other streaming transports.
+- Recovery of responses rejected by a status-filtering `HttpClient`.
+- Configurable request and response size limits.
+- Adapter-enforced redirect policy independent of the supplied `HttpClient`.
+- Strict UTF-8 and empty-body validation for JSON responses.
+- Compile-time rejection of parameter schemas with nested values unsupported by their serialization style; runtime rejects them before auth resolution.
+- Complete malformed-security-scheme validation and broader auth-combination coverage.
diff --git a/packages/codemode/src/openapi/index.ts b/packages/codemode/src/openapi/index.ts
new file mode 100644
index 0000000000..4ceda5eef0
--- /dev/null
+++ b/packages/codemode/src/openapi/index.ts
@@ -0,0 +1,130 @@
+import { HttpClient } from "effect/unstable/http"
+import { Tool, type Definition } from "../tool.js"
+import { invoke } from "./runtime.js"
+import {
+  componentDefinitions,
+  inputSchema,
+  isRecord,
+  methods,
+  nonEmptyString,
+  operationInput,
+  operationOutput,
+  operationPath,
+  operationSecurityRequirements,
+  securityRequirements,
+  securitySchemes,
+  specServerUrl,
+  validateBaseUrl,
+} from "./spec.js"
+import type { Operation, Options, Result, Skipped, Tools } from "./types.js"
+
+export type {
+  AuthResolver,
+  Credential,
+  Document,
+  Operation,
+  Options,
+  Result,
+  SecurityScheme,
+  Skipped,
+  Tools,
+} from "./types.js"
+
+/**
+ * Builds a CodeMode tool subtree from an OpenAPI 3.x document, one tool per
+ * operation. Auth is resolved host-side via `auth.resolve` and never
+ * model-visible. Tools require `HttpClient.HttpClient`; unrepresentable
+ * operations land in `skipped`.
+ */
+export const fromSpec = (options: Options): Result => {
+  const document = options.spec
+  const schemes = securitySchemes(document)
+  const defaultSecurity = securityRequirements(document.security)
+  const definitions = componentDefinitions(document)
+  const paths = isRecord(document.paths) ? document.paths : {}
+  const used = new Set<string>()
+  const namespaces = new Set<string>()
+  const skipped: Array<Skipped> = []
+  const tools = Object.create(null) as Tools
+
+  for (const [path, pathValue] of Object.entries(paths)) {
+    if (!isRecord(pathValue)) continue
+    for (const [method, operationValue] of Object.entries(pathValue)) {
+      if (!methods.has(method) || !isRecord(operationValue)) continue
+      const segments = operationPath(method, path, operationValue, used, namespaces)
+      const operation: Operation = {
+        operationId: nonEmptyString(operationValue.operationId),
+        method: method.toUpperCase(),
+        path,
+        summary: nonEmptyString(operationValue.summary),
+        description: nonEmptyString(operationValue.description),
+      }
+      const output = operationOutput(document, operationValue, definitions)
+      if (!output.ok) {
+        skipped.push({ method: operation.method, path, reason: output.reason })
+        continue
+      }
+
+      const resolvedBaseUrl = (() => {
+        if (options.baseUrl !== undefined) return validateBaseUrl(options.baseUrl)
+        if (operationValue.servers !== undefined) return specServerUrl(operationValue)
+        if (pathValue.servers !== undefined) return specServerUrl(pathValue)
+        return specServerUrl(document)
+      })()
+      if (!resolvedBaseUrl.ok) {
+        skipped.push({ method: operation.method, path, reason: resolvedBaseUrl.reason })
+        continue
+      }
+      const parsedInput = operationInput(document, pathValue, operationValue)
+      if (!parsedInput.ok) {
+        skipped.push({ method: operation.method, path, reason: parsedInput.reason })
+        continue
+      }
+      const input = parsedInput.value
+
+      const security = operationSecurityRequirements(operationValue.security, defaultSecurity, schemes)
+      if (!security.ok) {
+        skipped.push({ method: operation.method, path, reason: security.reason })
+        continue
+      }
+      const plan = {
+        operation,
+        url: `${resolvedBaseUrl.value.replace(/\/+$/, "")}${path}`,
+        fields: input.fields,
+        body: input.body,
+        security: security.value,
+        schemes,
+        auth: options.auth,
+        headers: options.headers ?? {},
+      }
+      used.add(segments.join("."))
+      for (const index of segments.slice(0, -1).keys()) namespaces.add(segments.slice(0, index + 1).join("."))
+      setTool(
+        tools,
+        segments,
+        Tool.make({
+          description: operation.description ?? operation.summary ?? `${operation.method} ${path}`,
+          input: inputSchema(input.fields, definitions),
+          output: output.value,
+          run: (input) => invoke(plan, input),
+        }),
+      )
+    }
+  }
+
+  return { tools, skipped }
+}
+
+const setTool = (tools: Tools, path: ReadonlyArray<string>, definition: Definition<HttpClient.HttpClient>): void => {
+  const [head, ...rest] = path
+  if (head === undefined) return
+  if (rest.length === 0) {
+    tools[head] = definition
+    return
+  }
+  const child = tools[head]
+  if (child === undefined || !isRecord(child) || child._tag === "CodeModeTool") {
+    tools[head] = Object.create(null) as Tools
+  }
+  setTool(tools[head] as Tools, rest, definition)
+}
diff --git a/packages/codemode/src/openapi/runtime.ts b/packages/codemode/src/openapi/runtime.ts
new file mode 100644
index 0000000000..47312ae162
--- /dev/null
+++ b/packages/codemode/src/openapi/runtime.ts
@@ -0,0 +1,324 @@
+import { Effect, Option, Schema, Stream } from "effect"
+import { HttpClient, HttpClientRequest, HttpClientResponse, type HttpMethod } from "effect/unstable/http"
+import { ToolError, toolError } from "../tool-error.js"
+import { isRecord, own } from "./spec.js"
+import type { AppliedAuth, Credential, Plan, SecurityScheme } from "./types.js"
+
+const decodeJson = Schema.decodeUnknownOption(Schema.UnknownFromJsonString)
+const maxErrorBodyChars = 1_024
+const maxResponseBodyBytes = 50 * 1024 * 1024
+
+export const invoke = (plan: Plan, input: unknown): Effect.Effect<unknown, unknown, HttpClient.HttpClient> =>
+  Effect.gen(function* () {
+    const value = isRecord(input) ? input : {}
+
+    let request = yield* buildRequest(plan, value)
+
+    const auth = yield* resolveAuth(plan)
+    for (const [name, item] of Object.entries(auth.query)) {
+      request = HttpClientRequest.setUrlParam(request, name, item)
+    }
+    request = HttpClientRequest.setHeaders(request, auth.headers)
+
+    const client = yield* HttpClient.HttpClient
+    const response = yield* client
+      .execute(request)
+      .pipe(
+        Effect.catch((cause) =>
+          Effect.fail(toolError(`${plan.operation.method} ${plan.operation.path} failed: transport error`, cause)),
+        ),
+      )
+    const text = yield* readResponseBody(response, plan)
+    const mediaType = response.headers["content-type"]?.split(";")[0]?.trim().toLowerCase()
+    const json = mediaType === "application/json" || mediaType?.endsWith("+json") === true
+    const decoded = text === "" ? Option.some(null) : json ? decodeJson(text) : Option.none()
+    const parsed = json ? Option.getOrElse(decoded, () => text) : text === "" ? null : text
+    if (response.status < 200 || response.status >= 300) {
+      const rendered = typeof parsed === "string" ? parsed : (JSON.stringify(parsed) ?? "")
+      const summary =
+        rendered === "" || rendered === "null"
+          ? "no response body"
+          : rendered.length > maxErrorBodyChars
+            ? `${rendered.slice(0, maxErrorBodyChars)}...`
+            : rendered
+      return yield* Effect.fail(
+        toolError(`${plan.operation.method} ${plan.operation.path} failed with HTTP ${response.status}: ${summary}`),
+      )
+    }
+    if (json && Option.isNone(decoded)) {
+      return yield* Effect.fail(
+        toolError(`${plan.operation.method} ${plan.operation.path} returned malformed JSON.`),
+      )
+    }
+    return parsed
+  })
+
+const buildRequest = (
+  plan: Plan,
+  input: Readonly<Record<string, unknown>>,
+): Effect.Effect<HttpClientRequest.HttpClientRequest, ToolError> =>
+  Effect.gen(function* () {
+    // Validate every model-controlled value before auth resolution, which may refresh tokens.
+    const url = buildUrl(plan, input)
+    if (url instanceof ToolError) return yield* Effect.fail(url)
+    const missing = plan.fields.find(
+      (field) => field.required && field.location !== "path" && own(input, field.inputName) === undefined,
+    )
+    if (missing !== undefined) {
+      const label = missing.location === "body" ? "body field" : `${missing.location} parameter`
+      return yield* Effect.fail(toolError(`Missing required ${label} '${missing.inputName}'.`))
+    }
+
+    let request = HttpClientRequest.make(plan.operation.method as HttpMethod.HttpMethod)(url)
+    for (const field of plan.fields) {
+      if (field.location !== "query") continue
+      const item = own(input, field.inputName)
+      if (item === undefined) continue
+      const serialized = serializeQuery(request, field, item)
+      if (serialized instanceof ToolError) return yield* Effect.fail(serialized)
+      request = serialized
+    }
+
+    // Host headers first, then declared header parameters.
+    request = HttpClientRequest.setHeaders(request, plan.headers)
+    for (const field of plan.fields) {
+      if (field.location !== "header") continue
+      const item = own(input, field.inputName)
+      if (item === undefined) continue
+      const serialized = serializeSimple(field, item, String)
+      if (serialized instanceof ToolError) return yield* Effect.fail(serialized)
+      request = HttpClientRequest.setHeader(request, field.name, serialized)
+    }
+
+    const setBody = (value: unknown, mediaType: string) =>
+      HttpClientRequest.bodyJson(request, value).pipe(
+        Effect.map((next) => HttpClientRequest.setHeader(next, "content-type", mediaType)),
+        Effect.mapError((cause) =>
+          toolError(`Invalid JSON body for ${plan.operation.method} ${plan.operation.path}.`, cause),
+        ),
+      )
+    if (plan.body?.mode === "value") {
+      const field = plan.fields.find((field) => field.location === "body")
+      const body = field === undefined ? undefined : own(input, field.inputName)
+      if (body !== undefined) request = yield* setBody(body, plan.body.mediaType)
+    }
+    if (plan.body?.mode === "object") {
+      const entries = plan.fields.flatMap((field) => {
+        if (field.location !== "body") return []
+        const item = own(input, field.inputName)
+        return item === undefined ? [] : [[field.name, item] as const]
+      })
+      if (plan.body.required || entries.length > 0) {
+        request = yield* setBody(Object.fromEntries(entries), plan.body.mediaType)
+      }
+    }
+    return request
+  })
+
+const resolveAuth = (plan: Plan): Effect.Effect<AppliedAuth, unknown> =>
+  Effect.gen(function* () {
+    const none: AppliedAuth = { headers: {}, query: {} }
+    if (plan.security.length === 0) return none
+
+    const unavailable: Array<string> = []
+    alternatives: for (const requirement of plan.security) {
+      const names = Object.keys(requirement)
+      if (names.length === 0) return none
+      const credentials: Array<readonly [string, SecurityScheme, Credential]> = []
+      for (const name of names) {
+        const scheme = own(plan.schemes, name)
+        if (scheme === undefined || plan.auth === undefined) {
+          unavailable.push(name)
+          continue alternatives
+        }
+        const credential = yield* plan.auth.resolve({
+          name,
+          definition: scheme,
+          scopes: requirement[name] ?? [],
+          operation: plan.operation,
+        })
+        if (credential === undefined) {
+          unavailable.push(name)
+          continue alternatives
+        }
+        credentials.push([name, scheme, credential])
+      }
+      const applied = applyCredentials(credentials)
+      return applied instanceof ToolError ? yield* Effect.fail(applied) : applied
+    }
+
+    return yield* Effect.fail(
+      toolError(
+        `${plan.operation.method} ${plan.operation.path} requires authentication; no credential available for: ${[...new Set(unavailable)].join(", ")}.`,
+      ),
+    )
+  })
+
+const applyCredentials = (
+  credentials: ReadonlyArray<readonly [string, SecurityScheme, Credential]>,
+): AppliedAuth | ToolError => {
+  const headers = new Map<string, string>()
+  const query = new Map<string, string>()
+  const add = (carrier: "header" | "query", name: string, value: string): ToolError | undefined => {
+    const target = carrier === "header" ? headers : query
+    if (target.has(name)) return toolError(`Authentication resolves multiple credentials for ${carrier} '${name}'.`)
+    target.set(name, value)
+  }
+  for (const [name, definition, credential] of credentials) {
+    if (credential.type === "bearer") {
+      const duplicate = add("header", "authorization", `Bearer ${credential.token}`)
+      if (duplicate !== undefined) return duplicate
+      continue
+    }
+    if (credential.type === "basic") {
+      // Buffer instead of btoa: btoa throws on non-Latin-1 credentials.
+      const duplicate = add(
+        "header",
+        "authorization",
+        `Basic ${Buffer.from(`${credential.username}:${credential.password}`, "utf8").toString("base64")}`,
+      )
+      if (duplicate !== undefined) return duplicate
+      continue
+    }
+    if (credential.type === "header") {
+      const duplicate = add("header", credential.name.toLowerCase(), credential.value)
+      if (duplicate !== undefined) return duplicate
+      continue
+    }
+    // apiKey: the carrier comes from the scheme declaration.
+    if (definition.type !== "apiKey") {
+      return toolError(
+        `Security scheme '${name}' is not an apiKey scheme; resolve a bearer, basic, or header credential for it.`,
+      )
+    }
+    if (definition.in === "cookie") return toolError(`Cookie authentication '${name}' is not supported.`)
+    const parameter = definition.in === "header" ? definition.name.toLowerCase() : definition.name
+    const duplicate = add(definition.in, parameter, credential.value)
+    if (duplicate !== undefined) return duplicate
+  }
+  return { headers: Object.fromEntries(headers), query: Object.fromEntries(query) }
+}
+
+const buildUrl = (plan: Plan, input: Readonly<Record<string, unknown>>): string | ToolError => {
+  let url = plan.url
+  for (const field of plan.fields) {
+    if (field.location !== "path") continue
+    const item = own(input, field.inputName)
+    if (item === undefined) {
+      return toolError(`Missing required path parameter '${field.inputName}'.`)
+    }
+    const fieldValue = serializeSimple(field, item, (value) =>
+      encodeURIComponent(value).replace(/[!'()*]/g, (character) =>
+        `%${character.charCodeAt(0).toString(16).toUpperCase()}`,
+      ),
+    )
+    if (fieldValue instanceof ToolError) return fieldValue
+    // '.'/'..' survive encoding and URL normalization collapses them, letting a
+    // model-supplied value retarget the request to a different endpoint.
+    if (fieldValue === "" || fieldValue === "." || fieldValue === "..") {
+      return toolError(`Invalid path parameter '${field.inputName}'.`)
+    }
+    url = url.replaceAll(`{${field.name}}`, fieldValue)
+  }
+  const unresolved = url.match(/\{[^{}]+\}/)
+  if (unresolved !== null) return toolError(`Unresolved path parameter ${unresolved[0]}.`)
+  return url
+}
+
+const serializeSimple = (
+  field: Plan["fields"][number],
+  value: unknown,
+  encode: (value: string) => string,
+): string | ToolError => {
+  const scalar = (item: unknown): string | ToolError =>
+    item !== null && typeof item !== "string" && typeof item !== "number" && typeof item !== "boolean"
+      ? toolError(`Parameter '${field.inputName}' contains an unsupported nested value.`)
+      : encode(String(item))
+  if (Array.isArray(value)) {
+    const items = value.map(scalar)
+    const invalid = items.find((item): item is ToolError => item instanceof ToolError)
+    return invalid ?? items.join(",")
+  }
+  if (!isRecord(value)) return scalar(value)
+  const entries = Object.entries(value).flatMap<string | ToolError>(([name, item]) => {
+    const rendered = scalar(item)
+    if (rendered instanceof ToolError) return [rendered]
+    return field.explode ? [`${encode(name)}=${rendered}`] : [encode(name), rendered]
+  })
+  const invalid = entries.find((item): item is ToolError => item instanceof ToolError)
+  return invalid ?? entries.join(",")
+}
+
+const serializeQuery = (
+  request: HttpClientRequest.HttpClientRequest,
+  field: Plan["fields"][number],
+  value: unknown,
+): HttpClientRequest.HttpClientRequest | ToolError => {
+  if (field.style === "deepObject") {
+    if (!isRecord(value)) return toolError(`Deep-object parameter '${field.inputName}' must be an object.`)
+    return Object.entries(value).reduce<HttpClientRequest.HttpClientRequest | ToolError>((current, [name, item]) => {
+      if (current instanceof ToolError) return current
+      if (item === undefined || (item !== null && typeof item === "object")) {
+        return toolError(`Deep-object parameter '${field.inputName}' contains an unsupported nested value.`)
+      }
+      return HttpClientRequest.appendUrlParam(current, `${field.name}[${name}]`, String(item))
+    }, request)
+  }
+  if (Array.isArray(value)) {
+    const rendered = serializeSimple(field, value, String)
+    if (rendered instanceof ToolError) return rendered
+    if (!field.explode) return HttpClientRequest.appendUrlParam(request, field.name, rendered)
+    if (value.some((item) => item === undefined || (item !== null && typeof item === "object"))) {
+      return toolError(`Query parameter '${field.inputName}' contains an unsupported nested value.`)
+    }
+    return value.reduce(
+      (current, item) => HttpClientRequest.appendUrlParam(current, field.name, String(item)),
+      request,
+    )
+  }
+  if (isRecord(value) && field.explode) {
+    return Object.entries(value).reduce<HttpClientRequest.HttpClientRequest | ToolError>((current, [name, item]) => {
+      if (current instanceof ToolError) return current
+      if (item === undefined || (item !== null && typeof item === "object")) {
+        return toolError(`Query parameter '${field.inputName}' contains an unsupported nested value.`)
+      }
+      return HttpClientRequest.appendUrlParam(current, name, String(item))
+    }, request)
+  }
+  const rendered = serializeSimple(field, value, String)
+  return rendered instanceof ToolError ? rendered : HttpClientRequest.appendUrlParam(request, field.name, rendered)
+}
+
+const readResponseBody = (response: HttpClientResponse.HttpClientResponse, plan: Plan): Effect.Effect<string, ToolError> =>
+  Effect.gen(function* () {
+    const contentLength = response.headers["content-length"]
+    const parsedSize = contentLength === undefined ? undefined : Number.parseInt(contentLength, 10)
+    const declaredSize = parsedSize !== undefined && Number.isSafeInteger(parsedSize) && parsedSize >= 0 ? parsedSize : undefined
+    if (declaredSize !== undefined && declaredSize > maxResponseBodyBytes) {
+      return yield* Effect.fail(toolError(`${plan.operation.method} ${plan.operation.path} response exceeds 50 MiB.`))
+    }
+    let body = Buffer.allocUnsafe(Math.min(maxResponseBodyBytes, declaredSize ?? 64 * 1024))
+    let size = 0
+    yield* Stream.runForEach(response.stream, (chunk) => {
+      if (size + chunk.byteLength > maxResponseBodyBytes) {
+        return Effect.fail(toolError(`${plan.operation.method} ${plan.operation.path} response exceeds 50 MiB.`))
+      }
+      if (size + chunk.byteLength > body.byteLength) {
+        const grown = Buffer.allocUnsafe(Math.min(maxResponseBodyBytes, Math.max(size + chunk.byteLength, body.byteLength * 2)))
+        body.copy(grown, 0, 0, size)
+        body = grown
+      }
+      body.set(chunk, size)
+      size += chunk.byteLength
+      return Effect.void
+    }).pipe(
+      Effect.catch((cause) => {
+        if (cause instanceof ToolError) return Effect.fail(cause)
+        if (cause.reason._tag === "EmptyBodyError") return Effect.void
+        return Effect.fail(
+          toolError(`${plan.operation.method} ${plan.operation.path} failed while reading the response body.`, cause),
+        )
+      }),
+    )
+    return new TextDecoder().decode(body.subarray(0, size))
+  })
diff --git a/packages/codemode/src/openapi/spec.ts b/packages/codemode/src/openapi/spec.ts
new file mode 100644
index 0000000000..22cf1535a8
--- /dev/null
+++ b/packages/codemode/src/openapi/spec.ts
@@ -0,0 +1,507 @@
+import { fromSchemaOpenApi3_0, fromSchemaOpenApi3_1 } from "effect/JsonSchema"
+import type { JsonSchema } from "../tool.js"
+import { isBlockedMember } from "../tool-runtime.js"
+import type {
+  Body,
+  Document,
+  InputField,
+  OperationInput,
+  Parsed,
+  SecurityRequirement,
+  SecurityScheme,
+} from "./types.js"
+
+export const methods = new Set(["get", "put", "post", "delete", "options", "head", "patch", "trace"])
+const parameterLocations = ["path", "query", "header"] as const
+const ignoredHeaderParameters = new Set(["accept", "content-type", "authorization"])
+
+export const isRecord = (value: unknown): value is Record<string, unknown> =>
+  typeof value === "object" && value !== null && !Array.isArray(value)
+
+const asArray = (value: unknown): ReadonlyArray<unknown> => (Array.isArray(value) ? value : [])
+
+export const nonEmptyString = (value: unknown): string | undefined =>
+  typeof value === "string" && value !== "" ? value : undefined
+
+// Guards record lookups keyed by spec- or model-controlled names against
+// prototype-inherited values (e.g. a parameter named `toString`).
+export const own = <T>(record: Readonly<Record<string, T>>, key: string): T | undefined =>
+  Object.hasOwn(record, key) ? record[key] : undefined
+
+export const resolve = (document: Document, value: unknown): unknown => {
+  const next = (current: unknown, seen: ReadonlySet<string>): unknown => {
+    if (!isRecord(current)) return current
+    const ref = nonEmptyString(current.$ref)
+    if (ref === undefined || !ref.startsWith("#/") || seen.has(ref)) return current
+    const target = ref
+      .slice(2)
+      .split("/")
+      .map((segment) => segment.replaceAll("~1", "/").replaceAll("~0", "~"))
+      .reduce<unknown>((item, segment) => (isRecord(item) ? own(item, segment) : undefined), document)
+    return target === undefined ? current : next(target, new Set([...seen, ref]))
+  }
+  return next(value, new Set())
+}
+
+const projectSchema = (document: Document, value: unknown): JsonSchema => {
+  if (!isRecord(value)) return {}
+  const normalized = nonEmptyString(document.openapi)?.startsWith("3.0")
+    ? fromSchemaOpenApi3_0(value)
+    : fromSchemaOpenApi3_1(value)
+  return Object.keys(normalized.definitions).length === 0
+    ? normalized.schema
+    : { ...normalized.schema, $defs: normalized.definitions }
+}
+
+export const componentDefinitions = (document: Document): Readonly<Record<string, JsonSchema>> => {
+  const components = isRecord(document.components) ? document.components : {}
+  const schemas = isRecord(components.schemas) ? components.schemas : {}
+  return Object.fromEntries(Object.entries(schemas).map(([name, value]) => [name, projectSchema(document, value)]))
+}
+
+const withDefinitions = (schema: JsonSchema, definitions: Readonly<Record<string, JsonSchema>>): JsonSchema => {
+  if (Object.keys(definitions).length === 0) return schema
+  const local = isRecord(schema.$defs) ? schema.$defs : {}
+  return { ...schema, $defs: { ...definitions, ...local } }
+}
+
+const isJsonMediaType = (mediaType: string): boolean => {
+  const normalized = mediaType.split(";")[0]?.trim().toLowerCase() ?? ""
+  return normalized === "application/json" || normalized.endsWith("+json")
+}
+
+const isBinaryMediaType = (document: Document, mediaType: string, value: unknown): boolean => {
+  const normalized = mediaType.split(";")[0]?.trim().toLowerCase() ?? ""
+  if (!isJsonMediaType(normalized) && !normalized.startsWith("text/")) return true
+  if (!isRecord(value)) return false
+  const schema = resolve(document, value.schema)
+  return isRecord(schema) && schema.format === "binary"
+}
+
+const jsonContent = (content: Record<string, unknown>): { readonly mediaType: string; readonly schema: unknown } | undefined => {
+  const entry = Object.entries(content).find(([mediaType]) => isJsonMediaType(mediaType))
+  return entry !== undefined && isRecord(entry[1]) ? { mediaType: entry[0], schema: entry[1].schema } : undefined
+}
+
+const isFlattenableObjectBody = (
+  schema: unknown,
+  requestRequired: boolean,
+): schema is Record<string, unknown> & { readonly properties: Record<string, unknown> } =>
+  isRecord(schema) &&
+  requestRequired &&
+  schema.type === "object" &&
+  isRecord(schema.properties) &&
+  schema.additionalProperties === false &&
+  schema.nullable !== true &&
+  schema.allOf === undefined &&
+  schema.anyOf === undefined &&
+  schema.oneOf === undefined
+
+type PlannedField = Omit<InputField, "inputName">
+
+const operationParameters = (
+  document: Document,
+  pathItem: Record<string, unknown>,
+  operation: Record<string, unknown>,
+): Parsed<ReadonlyArray<PlannedField>> => {
+  // Operation-level parameters override path-level ones sharing (location, name).
+  const declared = new Map<
+    string,
+    { readonly name: string; readonly location: string; readonly parameter: Record<string, unknown> }
+  >()
+  for (const raw of [...asArray(pathItem.parameters), ...asArray(operation.parameters)]) {
+    const resolved = resolve(document, raw)
+    if (!isRecord(resolved)) return { ok: false, reason: "parameter declaration is invalid or unresolved" }
+    const name = nonEmptyString(resolved.name)
+    const location = nonEmptyString(resolved.in)
+    if (name === undefined || location === undefined)
+      return { ok: false, reason: "parameter declaration is missing name or location" }
+    declared.set(`${location}:${name}`, { name, location, parameter: resolved })
+  }
+  const unordered: Array<PlannedField> = []
+  for (const item of declared.values()) {
+    const name = item.name
+    const location = item.location
+    const resolved = item.parameter
+    if (location === "cookie") return { ok: false, reason: `cookie parameter '${name}' is not supported` }
+    if (location !== "path" && location !== "query" && location !== "header") {
+      return { ok: false, reason: `parameter '${name}' uses unsupported location '${location}'` }
+    }
+    if (location === "header" && ignoredHeaderParameters.has(name.toLowerCase())) continue
+    if (resolved.schema === undefined && resolved.content === undefined) {
+      return { ok: false, reason: `parameter '${name}' declares neither schema nor content` }
+    }
+    if (resolved.content !== undefined)
+      return { ok: false, reason: `parameter '${name}' uses unsupported content encoding` }
+    if (resolved.style !== undefined && nonEmptyString(resolved.style) === undefined) {
+      return { ok: false, reason: `parameter '${name}' has an invalid style` }
+    }
+    if (resolved.explode !== undefined && typeof resolved.explode !== "boolean") {
+      return { ok: false, reason: `parameter '${name}' has an invalid explode value` }
+    }
+    if (resolved.allowReserved !== undefined && typeof resolved.allowReserved !== "boolean") {
+      return { ok: false, reason: `parameter '${name}' has an invalid allowReserved value` }
+    }
+    if (resolved.allowReserved === true)
+      return { ok: false, reason: `parameter '${name}' uses unsupported allowReserved encoding` }
+    const declaredStyle = nonEmptyString(resolved.style) ?? (location === "query" ? "form" : "simple")
+    if (location === "query" && declaredStyle !== "form" && declaredStyle !== "deepObject") {
+      return { ok: false, reason: `query parameter '${name}' uses unsupported style '${declaredStyle}'` }
+    }
+    if (location !== "query" && declaredStyle !== "simple") {
+      return { ok: false, reason: `${location} parameter '${name}' uses unsupported style '${declaredStyle}'` }
+    }
+    const style = declaredStyle === "deepObject" ? "deepObject" : declaredStyle === "form" ? "form" : "simple"
+    const explode = typeof resolved.explode === "boolean" ? resolved.explode : style === "form"
+    if (style === "deepObject" && !explode) {
+      return { ok: false, reason: `query parameter '${name}' uses deepObject with explode=false` }
+    }
+    const base = projectSchema(document, resolved.schema)
+    const description = nonEmptyString(resolved.description)
+    unordered.push({
+      name,
+      location,
+      required: resolved.required === true || location === "path",
+      style,
+      explode,
+      schema: {
+        ...base,
+        ...(base.description === undefined && description !== undefined ? { description } : {}),
+      },
+    })
+  }
+  return {
+    ok: true,
+    value: parameterLocations.flatMap((location) => unordered.filter((field) => field.location === location)),
+  }
+}
+
+const operationBody = (
+  document: Document,
+  operation: Record<string, unknown>,
+): Parsed<{ readonly fields: ReadonlyArray<PlannedField>; readonly body: Body | undefined }> => {
+  const resolved = resolve(document, operation.requestBody)
+  if (!isRecord(resolved)) return { ok: true, value: { fields: [], body: undefined } }
+  const content = isRecord(resolved.content) ? resolved.content : {}
+  const selected = jsonContent(content)
+  if (selected === undefined) {
+    return {
+      ok: false,
+      reason: `request body has no JSON content (declared: ${Object.keys(content).join(", ") || "none"})`,
+    }
+  }
+  const schema = resolve(document, selected.schema)
+  const required = resolved.required === true
+  if (!isFlattenableObjectBody(schema, required)) {
+    return {
+      ok: true,
+      value: {
+        fields: [
+          {
+            name: "body",
+            location: "body",
+            required,
+            schema: projectSchema(document, selected.schema),
+            style: undefined,
+            explode: undefined,
+          },
+        ],
+        body: { required, mode: "value", mediaType: selected.mediaType },
+      },
+    }
+  }
+  const requiredProperties = new Set(
+    Array.isArray(schema.required) ? schema.required.filter((item): item is string => typeof item === "string") : [],
+  )
+  return {
+    ok: true,
+    value: {
+      fields: Object.entries(schema.properties).map(([name, value]) => ({
+        name,
+        location: "body" as const,
+        required: required && requiredProperties.has(name),
+        schema: projectSchema(document, value),
+        style: undefined,
+        explode: undefined,
+      })),
+      body: { required, mode: "object", mediaType: selected.mediaType },
+    },
+  }
+}
+
+export const operationInput = (
+  document: Document,
+  pathItem: Record<string, unknown>,
+  operation: Record<string, unknown>,
+): Parsed<OperationInput> => {
+  const parameters = operationParameters(document, pathItem, operation)
+  if (!parameters.ok) return parameters
+  const requestBody = operationBody(document, operation)
+  if (!requestBody.ok) return requestBody
+  const fields = [...parameters.value, ...requestBody.value.fields]
+
+  const conflicts = new Set(
+    [...Map.groupBy(fields, (field) => field.name)]
+      .filter(([, matches]) => new Set(matches.map((field) => field.location)).size > 1)
+      .map(([name]) => name),
+  )
+  const used = new Set<string>()
+  return {
+    ok: true,
+    value: {
+      fields: fields.map((field) => {
+        const visibleName = isBlockedMember(field.name) ? `${field.name}_2` : field.name
+        const base = conflicts.has(field.name) ? `${field.location}_${visibleName}` : visibleName
+        const next = (index: number): string => {
+          const candidate = index === 1 ? base : `${base}_${index}`
+          return used.has(candidate) ? next(index + 1) : candidate
+        }
+        const inputName = next(1)
+        used.add(inputName)
+        return { ...field, inputName }
+      }),
+      body: requestBody.value.body,
+    },
+  }
+}
+
+export const inputSchema = (
+  fields: ReadonlyArray<InputField>,
+  definitions: Readonly<Record<string, JsonSchema>>,
+): JsonSchema => {
+  const required = fields.filter((field) => field.required).map((field) => field.inputName)
+  return withDefinitions(
+    {
+      type: "object",
+      properties: Object.fromEntries(fields.map((field) => [field.inputName, field.schema])),
+      ...(required.length === 0 ? {} : { required }),
+    },
+    definitions,
+  )
+}
+
+const successfulResponses = (
+  document: Document,
+  operation: Record<string, unknown>,
+): Parsed<ReadonlyArray<Record<string, unknown>>> => {
+  if (!isRecord(operation.responses)) return { ok: true, value: [] }
+  const entries = Object.entries(operation.responses)
+  const selected = [
+    ...entries.filter(([status]) => /^2\d\d$/.test(status)).sort(([a], [b]) => a.localeCompare(b)),
+    ...entries.filter(([status]) => status.toUpperCase() === "2XX"),
+  ]
+  const responses: Array<Record<string, unknown>> = []
+  for (const [, value] of selected) {
+    const resolved = resolve(document, value)
+    if (!isRecord(resolved) || nonEmptyString(resolved.$ref) !== undefined) {
+      return { ok: false, reason: "successful response declaration is invalid or unresolved" }
+    }
+    responses.push(resolved)
+  }
+  return { ok: true, value: responses }
+}
+
+export const operationOutput = (
+  document: Document,
+  operation: Record<string, unknown>,
+  definitions: Readonly<Record<string, JsonSchema>>,
+): Parsed<JsonSchema | undefined> => {
+  if (operation["x-websocket"] === true) return { ok: false, reason: "WebSocket operations are not supported" }
+  const responses = successfulResponses(document, operation)
+  if (!responses.ok) return responses
+  const streams = responses.value.some(
+    (response) =>
+      isRecord(response.content) &&
+      Object.keys(response.content).some(
+        (mediaType) => mediaType.split(";")[0]?.trim().toLowerCase() === "text/event-stream",
+      ),
+  )
+  if (streams) return { ok: false, reason: "SSE operations are not supported" }
+  const binary = responses.value.some(
+    (response) =>
+      isRecord(response.content) &&
+      Object.entries(response.content).some(([mediaType, value]) => isBinaryMediaType(document, mediaType, value)),
+  )
+  if (binary) return { ok: false, reason: "binary responses are not supported" }
+
+  const outcomes: Array<JsonSchema> = []
+  for (const response of responses.value) {
+    if (response.content !== undefined && !isRecord(response.content)) return { ok: true, value: undefined }
+    const content = isRecord(response.content) ? response.content : {}
+    if (Object.keys(content).length === 0) {
+      outcomes.push({ type: "null" })
+      continue
+    }
+    for (const [mediaType, value] of Object.entries(content)) {
+      if (!isJsonMediaType(mediaType)) {
+        outcomes.push({ type: "string" })
+        continue
+      }
+      if (!isRecord(value) || value.schema === undefined) return { ok: true, value: undefined }
+      outcomes.push(projectSchema(document, value.schema))
+    }
+  }
+  if (outcomes.length === 0) return { ok: true, value: undefined }
+  return {
+    ok: true,
+    value: withDefinitions(outcomes.length === 1 ? outcomes[0] ?? {} : { anyOf: outcomes }, definitions),
+  }
+}
+
+const sanitizeOperationSegment = (raw: string): string => {
+  const base =
+    raw
+      .replaceAll(/[^A-Za-z0-9_$]+/g, "_")
+      .replace(/^_+|_+$/g, "")
+      .replace(/^([0-9])/, "_$1") || "operation"
+  return isBlockedMember(base) ? `${base}_2` : base
+}
+
+const fallbackOperationId = (method: string, path: string): string =>
+  [
+    method,
+    ...path
+      .split("/")
+      .filter((part) => part !== "")
+      .flatMap((part) => (part.startsWith("{") && part.endsWith("}") ? ["by", part.slice(1, -1)] : [part]))
+      .flatMap((part) => part.split(/[^A-Za-z0-9]+/).filter((word) => word !== "")),
+  ]
+    .map((word, index) => {
+      const lower = word.toLowerCase()
+      return index === 0 ? lower : `${lower.charAt(0).toUpperCase()}${lower.slice(1)}`
+    })
+    .join("")
+
+export const operationPath = (
+  method: string,
+  path: string,
+  operation: Record<string, unknown>,
+  used: ReadonlySet<string>,
+  namespaces: ReadonlySet<string>,
+): ReadonlyArray<string> => {
+  const raw = nonEmptyString(operation.operationId)
+  const segments = (raw === undefined ? [fallbackOperationId(method, path)] : raw.split(".")).map(sanitizeOperationSegment)
+  if (isOperationPathAvailable(segments, used, namespaces)) return segments
+  const conflict = segments.slice(0, -1).findIndex((_, index) => used.has(segments.slice(0, index + 1).join(".")))
+  if (conflict >= 0 && conflict + 1 < segments.length) {
+    const collapsed = segments.flatMap((segment, index) => {
+      if (index === conflict) {
+        const next = segments[index + 1] ?? ""
+        return [`${segment}${next.charAt(0).toUpperCase()}${next.slice(1)}`]
+      }
+      return index === conflict + 1 ? [] : [segment]
+    })
+    if (isOperationPathAvailable(collapsed, used, namespaces)) return collapsed
+  }
+  const fallback = segments.join("_")
+  const next = (index: number): string => {
+    const candidate = `${fallback}_${index}`
+    return isOperationPathAvailable([candidate], used, namespaces) ? candidate : next(index + 1)
+  }
+  return [next(2)]
+}
+
+const isOperationPathAvailable = (
+  segments: ReadonlyArray<string>,
+  used: ReadonlySet<string>,
+  namespaces: ReadonlySet<string>,
+): boolean => {
+  const key = segments.join(".")
+  if (used.has(key) || namespaces.has(key)) return false
+  return segments.slice(0, -1).every((_, index) => !used.has(segments.slice(0, index + 1).join(".")))
+}
+
+export const specServerUrl = (source: Record<string, unknown>): Parsed<string> => {
+  const server = asArray(source.servers).find(isRecord)
+  const url = server === undefined ? undefined : nonEmptyString(server.url)
+  if (url === undefined) return { ok: false, reason: "spec declares no servers; pass baseUrl" }
+  if (/\{[^{}]+\}/.test(url)) {
+    return { ok: false, reason: `server URL '${url}' is not an absolute URL; pass baseUrl` }
+  }
+  return validateBaseUrl(url)
+}
+
+export const validateBaseUrl = (value: string): Parsed<string> => {
+  if (!/^https?:\/\//i.test(value)) return { ok: false, reason: `server URL '${value}' is not an absolute HTTP(S) URL` }
+  const url = URL.parse(value)
+  if (url === null || (url.protocol !== "http:" && url.protocol !== "https:")) {
+    return { ok: false, reason: `server URL '${value}' is not an absolute HTTP(S) URL` }
+  }
+  if (url.search !== "" || url.hash !== "") {
+    return { ok: false, reason: `server URL '${value}' contains an unsupported query string or fragment` }
+  }
+  return { ok: true, value }
+}
+
+export const securityRequirements = (value: unknown): Parsed<ReadonlyArray<SecurityRequirement>> => {
+  if (value === undefined) return { ok: true, value: [] }
+  if (!Array.isArray(value)) return { ok: false, reason: "security declaration is not an array" }
+  const requirements: Array<SecurityRequirement> = []
+  for (const item of value) {
+    if (!isRecord(item)) return { ok: false, reason: "security requirement is not an object" }
+    const requirement = Object.create(null) as Record<string, ReadonlyArray<string>>
+    for (const [name, scopes] of Object.entries(item)) {
+      if (!Array.isArray(scopes)) return { ok: false, reason: "security requirement scopes are not string arrays" }
+      const parsed = scopes.filter((scope): scope is string => typeof scope === "string")
+      if (parsed.length !== scopes.length) {
+        return { ok: false, reason: "security requirement scopes are not string arrays" }
+      }
+      requirement[name] = parsed
+    }
+    requirements.push(requirement)
+  }
+  return { ok: true, value: requirements }
+}
+
+export const operationSecurityRequirements = (
+  value: unknown,
+  defaults: Parsed<ReadonlyArray<SecurityRequirement>>,
+  schemes: Readonly<Record<string, SecurityScheme>>,
+): Parsed<ReadonlyArray<SecurityRequirement>> => {
+  const parsed = value === undefined ? defaults : securityRequirements(value)
+  if (!parsed.ok) return parsed
+  const supported = parsed.value.filter((requirement) =>
+    Object.keys(requirement).every((name) => {
+      const scheme = own(schemes, name)
+      return scheme !== undefined && !(scheme.type === "apiKey" && scheme.in === "cookie")
+    }),
+  )
+  if (parsed.value.length === 0 || supported.length > 0) return { ok: true, value: supported }
+
+  const names = [...new Set(parsed.value.flatMap((requirement) => Object.keys(requirement)))]
+  const cookieScheme = names.find((name) => {
+    const definition = own(schemes, name)
+    return definition?.type === "apiKey" && definition.in === "cookie"
+  })
+  return {
+    ok: false,
+    reason:
+      cookieScheme === undefined
+        ? `security requirement references missing or malformed scheme: ${names.join(", ")}`
+        : `cookie authentication '${cookieScheme}' is not supported`,
+  }
+}
+
+export const securitySchemes = (document: Document): Readonly<Record<string, SecurityScheme>> => {
+  const components = isRecord(document.components) ? document.components : {}
+  const declared = isRecord(components.securitySchemes) ? components.securitySchemes : {}
+  return Object.fromEntries(
+    Object.entries(declared).flatMap<readonly [string, SecurityScheme]>(([name, value]) => {
+      const resolved = resolve(document, value)
+      if (!isRecord(resolved)) return []
+      const type = nonEmptyString(resolved.type)
+      if (type === "apiKey") {
+        const carrier = nonEmptyString(resolved.in)
+        const parameter = nonEmptyString(resolved.name)
+        if (parameter === undefined || (carrier !== "header" && carrier !== "query" && carrier !== "cookie")) return []
+        return [[name, { type, name: parameter, in: carrier }] as const]
+      }
+      if (type === "http") {
+        const scheme = nonEmptyString(resolved.scheme)?.toLowerCase()
+        return scheme === undefined ? [] : [[name, { type, scheme }] as const]
+      }
+      if (type === "oauth2" || type === "openIdConnect") return [[name, { type }] as const]
+      return []
+    }),
+  )
+}
diff --git a/packages/codemode/src/openapi/types.ts b/packages/codemode/src/openapi/types.ts
new file mode 100644
index 0000000000..cab772e701
--- /dev/null
+++ b/packages/codemode/src/openapi/types.ts
@@ -0,0 +1,112 @@
+import { Effect } from "effect"
+import { HttpClient } from "effect/unstable/http"
+import type { Definition, JsonSchema } from "../tool.js"
+
+/** A parsed OpenAPI 3.x document. YAML must be parsed by the host. */
+export type Document = Record<string, unknown>
+
+/** The operation identity handed to auth resolution and errors. */
+export type Operation = {
+  readonly operationId: string | undefined
+  readonly method: string
+  readonly path: string
+  readonly summary: string | undefined
+  readonly description: string | undefined
+}
+
+/** A resolved OpenAPI security scheme from `components.securitySchemes`. */
+export type SecurityScheme =
+  | { readonly type: "apiKey"; readonly name: string; readonly in: "header" | "query" | "cookie" }
+  | { readonly type: "http"; readonly scheme: string }
+  | { readonly type: "oauth2" }
+  | { readonly type: "openIdConnect" }
+
+/**
+ * Credential material returned by a host auth resolver. The carrier for `apiKey`
+ * comes from the scheme definition, not the credential. `header` is the escape
+ * hatch for nonstandard schemes.
+ */
+export type Credential =
+  | { readonly type: "bearer"; readonly token: string }
+  | { readonly type: "basic"; readonly username: string; readonly password: string }
+  | { readonly type: "apiKey"; readonly value: string }
+  | { readonly type: "header"; readonly name: string; readonly value: string }
+
+/**
+ * Resolves credential material for one named security scheme at call time.
+ * `undefined` means unavailable, try the next OR alternative; a failure aborts
+ * the call rather than falling through.
+ */
+export type AuthResolver = (context: {
+  readonly name: string
+  readonly definition: SecurityScheme
+  readonly scopes: ReadonlyArray<string>
+  readonly operation: Operation
+}) => Effect.Effect<Credential | undefined, unknown>
+
+export type Options = {
+  readonly spec: Document
+  /** Overrides all document, path, and operation `servers`. Required when no applicable absolute server URL exists. */
+  readonly baseUrl?: string | undefined
+  /** Host credential resolution, keyed by security scheme name. */
+  readonly auth?: { readonly resolve: AuthResolver } | undefined
+  /** Static headers on every request. Not model-visible; declared header params may override them, auth always wins. */
+  readonly headers?: Readonly<Record<string, string>> | undefined
+}
+
+/** An operation that could not be represented as a tool, and why. */
+export type Skipped = {
+  readonly method: string
+  readonly path: string
+  readonly reason: string
+}
+
+export type Tools = { [name: string]: Definition<HttpClient.HttpClient> | Tools }
+
+export type Result = {
+  /** Tool subtree; the host places it under a key in its `tools` tree. */
+  readonly tools: Tools
+  readonly skipped: ReadonlyArray<Skipped>
+}
+
+export type Parsed<T> = { readonly ok: true; readonly value: T } | { readonly ok: false; readonly reason: string }
+
+export type InputLocation = "path" | "query" | "header" | "body"
+
+export type InputField = {
+  /** Model-visible field name after cross-location collision handling. */
+  readonly inputName: string
+  /** Original parameter or body-property name used on the wire. */
+  readonly name: string
+  readonly location: InputLocation
+  readonly required: boolean
+  readonly schema: JsonSchema
+  readonly style: "simple" | "form" | "deepObject" | undefined
+  readonly explode: boolean | undefined
+}
+
+export type Body = { readonly required: boolean; readonly mode: "object" | "value"; readonly mediaType: string }
+
+export type OperationInput = {
+  readonly fields: ReadonlyArray<InputField>
+  readonly body: Body | undefined
+}
+
+/** One OR alternative: scheme name -> required scopes. Empty object = unauthenticated is acceptable. */
+export type SecurityRequirement = Readonly<Record<string, ReadonlyArray<string>>>
+
+export type Plan = {
+  readonly operation: Operation
+  readonly url: string
+  readonly fields: ReadonlyArray<InputField>
+  readonly body: Body | undefined
+  readonly security: ReadonlyArray<SecurityRequirement>
+  readonly schemes: Readonly<Record<string, SecurityScheme>>
+  readonly auth: { readonly resolve: AuthResolver } | undefined
+  readonly headers: Readonly<Record<string, string>>
+}
+
+export type AppliedAuth = {
+  readonly headers: Readonly<Record<string, string>>
+  readonly query: Readonly<Record<string, string>>
+}
diff --git a/packages/codemode/src/token.ts b/packages/codemode/src/token.ts
deleted file mode 100644
index 1e06bec1e4..0000000000
--- a/packages/codemode/src/token.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Token estimation for budgeting model-facing text. Copied from
- * `@opencode-ai/core/util/token` (chars / 4) so this package stays
- * dependency-free; keep the two in sync if the heuristic ever changes.
- */
-export * as Token from "./token.js"
-
-const CHARS_PER_TOKEN = 4
-
-export const estimate = (input: string) => Math.max(0, Math.round(input.length / CHARS_PER_TOKEN))
diff --git a/packages/codemode/src/tool-runtime.ts b/packages/codemode/src/tool-runtime.ts
index d79d0182b5..339737375c 100644
--- a/packages/codemode/src/tool-runtime.ts
+++ b/packages/codemode/src/tool-runtime.ts
@@ -10,27 +10,32 @@ import {
   outputTypeScript,
   type Definition,
 } from "./tool.js"
-import { estimate } from "./token.js"
 import { SandboxDate, SandboxMap, SandboxPromise, SandboxRegExp, SandboxSet } from "./values.js"
 
+const estimateTokens = (input: string) => Math.max(0, Math.round(input.length / 4))
+
 export type HostTool<R = never> = (...args: Array<unknown>) => Effect.Effect<unknown, unknown, R>
 
 export type HostTools<R = never> = {
   [name: string]: HostTool<R> | Definition<R> | HostTools<R>
 }
 
-export type Services<Tools> = Tools extends (...args: Array<unknown>) => Effect.Effect<unknown, unknown, infer R>
-  ? R
-  : Tools extends {
-        readonly _tag: "CodeModeTool"
-        readonly run: (input: unknown) => Effect.Effect<unknown, unknown, infer R>
-      }
+export type Services<Tools> = ServicesOf<Tools, []>
+
+type ServicesOf<Tools, Depth extends ReadonlyArray<unknown>> = Depth["length"] extends 8
+  ? never
+  : Tools extends (...args: Array<unknown>) => Effect.Effect<unknown, unknown, infer R>
     ? R
-    : Tools extends object
-      ? string extends keyof Tools
-        ? never
-        : Services<Tools[keyof Tools]>
-      : never
+    : Tools extends {
+          readonly _tag: "CodeModeTool"
+          readonly run: (input: unknown) => Effect.Effect<unknown, unknown, infer R>
+        }
+      ? R
+      : Tools extends object
+        ? string extends keyof Tools
+          ? ServicesOf<Tools[string], [...Depth, unknown]>
+          : ServicesOf<Tools[keyof Tools], [...Depth, unknown]>
+        : never
 
 /** Minimal audit record retained for each admitted tool call. */
 export type ToolCall = {
@@ -290,17 +295,16 @@ const definitions = <R>(
   return entries
 }
 
-const describeDefinition = <R>(path: string, definition: Definition<R>): ToolDescription => ({
-  path,
-  description: definition.description,
-  signature: `${toolExpression(path)}(input: ${inputTypeScript(definition)}): Promise<${outputTypeScript(definition)}>`,
-})
-
 const visibleDefinitions = <R>(tools: HostTools<R>) =>
-  definitions(tools).flatMap(({ path, definition }) => {
-    const description = describeDefinition(path, definition)
-    return [{ path, definition, description }]
-  })
+  definitions(tools).map(({ path, definition }) => ({
+    path,
+    definition,
+    description: {
+      path,
+      description: definition.description,
+      signature: `${toolExpression(path)}(input: ${inputTypeScript(definition)}): Promise<${outputTypeScript(definition)}>`,
+    },
+  }))
 
 export const catalog = <R>(tools: HostTools<R>): ReadonlyArray<ToolDescription> =>
   visibleDefinitions(tools).map(({ description }) => description)
@@ -351,16 +355,10 @@ const termForms = (term: string): Array<string> => {
   return forms
 }
 
-const firstLine = (text: string) => text.split("\n", 1)[0]!.trim()
-
-/** One-line description used on inline catalog lines; the full text stays in search results. */
-const brief = (text: string, max = 120) => {
-  const line = firstLine(text)
-  return line.length > max ? line.slice(0, max - 1) + "..." : line
-}
-
 const catalogLine = (tool: ToolDescription) => {
-  const description = brief(tool.description)
+  // Inline catalog lines use only a compact first line; full text stays in search results.
+  const line = tool.description.split("\n", 1)[0]!.trim()
+  const description = line.length > 120 ? line.slice(0, 119) + "..." : line
   return description === "" ? `  - ${tool.signature}` : `  - ${tool.signature} // ${description}`
 }
 
@@ -430,7 +428,7 @@ export const discoveryPlan = <R>(
     picked: new Set<ToolDescription>(),
     queue: [...group].sort(
       (left, right) =>
-        estimate(catalogLine(left)) - estimate(catalogLine(right)) || left.path.localeCompare(right.path),
+        estimateTokens(catalogLine(left)) - estimateTokens(catalogLine(right)) || left.path.localeCompare(right.path),
     ),
   }))
   let used = 0
@@ -439,7 +437,7 @@ export const discoveryPlan = <R>(
     const stillActive: typeof active = []
     for (const selection of active) {
       const tool = selection.queue[0]!
-      const cost = estimate(catalogLine(tool))
+      const cost = estimateTokens(catalogLine(tool))
       if (used + cost > maxInlineCatalogTokens) continue
       selection.queue.shift()
       selection.picked.add(tool)
@@ -636,9 +634,6 @@ export type ToolRuntime<R = never> = {
   readonly keys: (path: ReadonlyArray<string>) => ReadonlyArray<string>
 }
 
-const failureMessage = (error: unknown): string =>
-  error instanceof ToolError || error instanceof ToolRuntimeError ? error.message : "Tool execution failed"
-
 export const make = <R>(
   tools: HostTools<R>,
   /** Undefined means unlimited tool calls. */
@@ -657,9 +652,16 @@ export const make = <R>(
     const startedAt = Date.now()
     return effect.pipe(
       Effect.tap(() => onEnd({ ...call, durationMs: Date.now() - startedAt, outcome: "success" })),
-      Effect.tapError((error) =>
-        onEnd({ ...call, durationMs: Date.now() - startedAt, outcome: "failure", message: failureMessage(error) }),
-      ),
+      Effect.tapError((error) => {
+        const message =
+          error instanceof ToolError || error instanceof ToolRuntimeError ? error.message : "Tool execution failed"
+        return onEnd({
+          ...call,
+          durationMs: Date.now() - startedAt,
+          outcome: "failure",
+          message,
+        })
+      }),
     )
   }
 
diff --git a/packages/codemode/src/tool.ts b/packages/codemode/src/tool.ts
index 5a0d84ad52..e89f3d39d6 100644
--- a/packages/codemode/src/tool.ts
+++ b/packages/codemode/src/tool.ts
@@ -1,4 +1,4 @@
-import { Effect, Schema } from "effect"
+import { Effect, JsonPointer, Schema } from "effect"
 
 /**
  * JSON Schema subset accepted for render-only tool schemas.
@@ -13,6 +13,7 @@ export type JsonSchema = {
   readonly const?: unknown
   readonly anyOf?: ReadonlyArray<JsonSchema>
   readonly oneOf?: ReadonlyArray<JsonSchema>
+  readonly allOf?: ReadonlyArray<JsonSchema>
   readonly properties?: Readonly<Record<string, JsonSchema>>
   readonly required?: ReadonlyArray<string>
   readonly items?: JsonSchema
@@ -76,6 +77,13 @@ const effectNumberSentinel = (schema: JsonSchema) =>
   schema.enum.length === 1 &&
   (schema.enum[0] === "NaN" || schema.enum[0] === "Infinity" || schema.enum[0] === "-Infinity")
 
+const intersection = (members: ReadonlyArray<string>): string => {
+  const concrete = members.filter((member) => member !== "unknown")
+  if (concrete.length === 0) return "unknown"
+  if (concrete.length === 1) return concrete[0] ?? "unknown"
+  return concrete.map((member) => (member.includes(" | ") ? `(${member})` : member)).join(" & ")
+}
+
 /**
  * Recursion ceiling for schema rendering. Object, array, and union recursion all increment
  * depth, so this bounds every recursion path - pathological or structurally cyclic schemas
@@ -89,6 +97,30 @@ type RenderContext = {
   readonly pretty: boolean
 }
 
+const hasUnresolvedRef = (
+  schema: JsonSchema,
+  definitions: Readonly<Record<string, JsonSchema>>,
+  seen: ReadonlySet<string> = new Set(),
+  visited: ReadonlySet<JsonSchema> = new Set(),
+): boolean => {
+  if (visited.has(schema)) return false
+  const nextVisited = new Set([...visited, schema])
+  if (schema.$ref !== undefined) {
+    const segment = schema.$ref.match(/^#\/(?:\$defs|definitions)\/([^/]+)$/)?.[1]
+    const name = segment === undefined ? undefined : JsonPointer.unescapeToken(segment)
+    if (name === undefined || definitions[name] === undefined || seen.has(name)) return true
+    if (hasUnresolvedRef(definitions[name], definitions, new Set([...seen, name]), nextVisited)) return true
+  }
+  return [
+    ...(schema.anyOf ?? []),
+    ...(schema.oneOf ?? []),
+    ...(schema.allOf ?? []),
+    ...Object.values(schema.properties ?? {}),
+    ...(schema.items === undefined ? [] : [schema.items]),
+    ...(typeof schema.additionalProperties === "object" ? [schema.additionalProperties] : []),
+  ].some((item) => hasUnresolvedRef(item, definitions, seen, nextVisited))
+}
+
 /**
  * Schema constraints a TypeScript type cannot express natively but a model benefits from,
  * surfaced as JSDoc tags (`@deprecated`, `@default`, `@format`, `@minItems`, `@maxItems`).
@@ -136,11 +168,18 @@ const renderSchema = (
   seen: ReadonlySet<string> = new Set(),
 ): string => {
   if (depth > MAX_RENDER_DEPTH) return "unknown"
+  const nested =
+    schema.definitions === undefined && schema.$defs === undefined
+      ? ctx
+      : { ...ctx, definitions: { ...ctx.definitions, ...(schema.definitions ?? {}), ...(schema.$defs ?? {}) } }
   if (schema.$ref) {
-    const name = schema.$ref.split("/").pop()
-    if (!name || !ctx.definitions[name]) return name ?? "unknown"
-    if (seen.has(name)) return name // recursive type: reference by name rather than loop
-    return renderSchema(ctx.definitions[name], ctx, depth, new Set([...seen, name]))
+    const segment = schema.$ref.match(/^#\/(?:\$defs|definitions)\/([^/]+)$/)?.[1]
+    const name = segment === undefined ? undefined : JsonPointer.unescapeToken(segment)
+    if (!name || !nested.definitions[name] || seen.has(name)) return "unknown"
+    return intersection([
+      renderSchema(nested.definitions[name], nested, depth, new Set([...seen, name])),
+      renderSchema({ ...schema, $ref: undefined }, nested, depth + 1, seen),
+    ])
   }
   if (schema.const !== undefined) return renderLiteral(schema.const)
   if (schema.enum) return schema.enum.map(renderLiteral).join(" | ")
@@ -166,24 +205,34 @@ const renderSchema = (
     ) {
       return "{}"
     }
-    return alternatives.map((item) => renderSchema(item, ctx, depth + 1, seen)).join(" | ")
+    const members = alternatives.map((item) => renderSchema(item, nested, depth + 1, seen))
+    if (members.some((member) => member === "unknown")) return "unknown"
+    return intersection([
+      members.join(" | "),
+      renderSchema({ ...schema, anyOf: undefined, oneOf: undefined }, nested, depth + 1, seen),
+    ])
+  }
+  if (schema.allOf) {
+    const members = schema.allOf.map((item) => renderSchema(item, nested, depth + 1, seen))
+    if (schema.allOf.some((item) => hasUnresolvedRef(item, nested.definitions))) return "unknown"
+    return intersection([renderSchema({ ...schema, allOf: undefined }, nested, depth + 1, seen), ...members])
   }
   if (Array.isArray(schema.type)) {
-    return schema.type.map((item) => renderSchema({ type: item }, ctx, depth + 1, seen)).join(" | ")
+    return schema.type.map((item) => renderSchema({ ...schema, type: item }, nested, depth + 1, seen)).join(" | ")
   }
   if (schema.type === "string") return "string"
   if (schema.type === "number" || schema.type === "integer") return "number"
   if (schema.type === "boolean") return "boolean"
   if (schema.type === "null") return "null"
-  if (schema.type === "array") return `Array<${renderSchema(schema.items ?? {}, ctx, depth + 1, seen)}>`
+  if (schema.type === "array") return `Array<${renderSchema(schema.items ?? {}, nested, depth + 1, seen)}>`
   if (schema.type === "object" || schema.properties) {
     const required = new Set(schema.required ?? [])
     const properties = Object.entries(schema.properties ?? {})
     const additional = schema.additionalProperties
     const indexType =
-      additional && typeof additional === "object" ? renderSchema(additional, ctx, depth + 1, seen) : undefined
+      additional && typeof additional === "object" ? renderSchema(additional, nested, depth + 1, seen) : undefined
     const field = ([name, value]: readonly [string, JsonSchema]) =>
-      `${renderKey(name)}${required.has(name) ? "" : "?"}: ${renderSchema(value, ctx, depth + 1, seen)}`
+      `${renderKey(name)}${required.has(name) ? "" : "?"}: ${renderSchema(value, nested, depth + 1, seen)}`
 
     if (!ctx.pretty) {
       const fields = properties.map(field)
@@ -253,7 +302,8 @@ export const inputProperties = <R>(definition: Definition<R>): Array<InputProper
     const definitions = document.definitions ?? {}
     let schema = document.schema
     if (schema.$ref !== undefined) {
-      const name = schema.$ref.split("/").pop()
+      const segment = schema.$ref.match(/^#\/(?:\$defs|definitions)\/([^/]+)$/)?.[1]
+      const name = segment === undefined ? undefined : JsonPointer.unescapeToken(segment)
       const resolved = name === undefined ? undefined : definitions[name]
       if (resolved === undefined) return []
       schema = resolved
diff --git a/packages/codemode/test/fixtures/openapi-happy-path.json b/packages/codemode/test/fixtures/openapi-happy-path.json
new file mode 100644
index 0000000000..dc3cbe5f8f
--- /dev/null
+++ b/packages/codemode/test/fixtures/openapi-happy-path.json
@@ -0,0 +1,245 @@
+{
+  "openapi": "3.1.0",
+  "info": {
+    "title": "CodeMode Happy Path",
+    "version": "1.0.0"
+  },
+  "servers": [
+    {
+      "url": "https://api.example.test/v1"
+    }
+  ],
+  "security": [
+    {
+      "BearerAuth": []
+    }
+  ],
+  "paths": {
+    "/users/{userId}": {
+      "parameters": [
+        {
+          "$ref": "#/components/parameters/UserId"
+        }
+      ],
+      "get": {
+        "operationId": "users.get",
+        "summary": "Get a user",
+        "parameters": [
+          {
+            "name": "include",
+            "in": "query",
+            "style": "form",
+            "explode": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "verbose",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "X-Trace-ID",
+            "in": "header",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/UserResponse"
+          }
+        }
+      },
+      "delete": {
+        "operationId": "users.remove",
+        "summary": "Remove a user",
+        "responses": {
+          "204": {
+            "description": "Removed"
+          }
+        }
+      }
+    },
+    "/users": {
+      "post": {
+        "operationId": "users.create",
+        "summary": "Create a user",
+        "security": [
+          {
+            "ApiKey": []
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "type": "string"
+                  },
+                  "email": {
+                    "type": "string",
+                    "format": "email"
+                  },
+                  "role": {
+                    "type": "string",
+                    "enum": [
+                      "admin",
+                      "member"
+                    ]
+                  }
+                },
+                "required": [
+                  "name",
+                  "email"
+                ],
+                "additionalProperties": false
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Created",
+            "content": {
+              "application/vnd.example+json": {
+                "schema": {
+                  "$ref": "#/components/schemas/User"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/search": {
+      "get": {
+        "operationId": "search.run",
+        "summary": "Search users",
+        "security": [],
+        "parameters": [
+          {
+            "name": "filter",
+            "in": "query",
+            "style": "deepObject",
+            "explode": true,
+            "schema": {
+              "type": "object",
+              "properties": {
+                "query": {
+                  "type": "string"
+                },
+                "page": {
+                  "type": "integer"
+                }
+              },
+              "required": [
+                "query"
+              ],
+              "additionalProperties": false
+            }
+          },
+          {
+            "name": "tags",
+            "in": "query",
+            "style": "form",
+            "explode": true,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Summary",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "parameters": {
+      "UserId": {
+        "name": "userId",
+        "in": "path",
+        "required": true,
+        "schema": {
+          "type": "string"
+        }
+      }
+    },
+    "responses": {
+      "UserResponse": {
+        "description": "A user",
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/User"
+            }
+          }
+        }
+      }
+    },
+    "schemas": {
+      "User": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "email": {
+            "type": "string",
+            "format": "email"
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "admin",
+              "member"
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "name",
+          "email"
+        ],
+        "additionalProperties": false
+      }
+    },
+    "securitySchemes": {
+      "BearerAuth": {
+        "type": "http",
+        "scheme": "bearer"
+      },
+      "ApiKey": {
+        "type": "apiKey",
+        "in": "query",
+        "name": "api_key"
+      }
+    }
+  }
+}
diff --git a/packages/codemode/test/fixtures/opencode-v2-openapi.json b/packages/codemode/test/fixtures/opencode-v2-openapi.json
new file mode 100644
index 0000000000..4d1d3af708
--- /dev/null
+++ b/packages/codemode/test/fixtures/opencode-v2-openapi.json
@@ -0,0 +1,26962 @@
+{
+  "openapi": "3.1.0",
+  "info": {
+    "title": "opencode HttpApi",
+    "version": "0.0.1",
+    "description": "Experimental HttpApi surface for selected instance routes."
+  },
+  "paths": {
+    "/api/health": {
+      "get": {
+        "tags": [
+          "server.health"
+        ],
+        "operationId": "v2.health.get",
+        "parameters": [],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "healthy": {
+                      "type": "boolean",
+                      "enum": [
+                        true
+                      ]
+                    }
+                  },
+                  "required": [
+                    "healthy"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Check whether the API server is ready to accept requests.",
+        "summary": "Check server health"
+      }
+    },
+    "/api/location": {
+      "get": {
+        "tags": [
+          "server.location"
+        ],
+        "operationId": "v2.location.get",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Location.Info",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Location.Info"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Resolve the requested location or the server default location.",
+        "summary": "Get location"
+      }
+    },
+    "/api/agent": {
+      "get": {
+        "tags": [
+          "server.agent"
+        ],
+        "operationId": "v2.agent.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/AgentV2.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve currently registered agents.",
+        "summary": "List agents"
+      }
+    },
+    "/api/plugin": {
+      "get": {
+        "tags": [
+          "plugins"
+        ],
+        "operationId": "v2.plugin.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Plugin.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve currently loaded plugins.",
+        "summary": "List plugins"
+      }
+    },
+    "/api/session": {
+      "get": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.list",
+        "parameters": [
+          {
+            "name": "workspace",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "allOf": [
+                    {
+                      "pattern": "^wrk"
+                    }
+                  ]
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "description": "Maximum number of sessions to return. Defaults to the newest 50 sessions."
+            },
+            "required": false
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "enum": [
+                    "asc",
+                    "desc"
+                  ]
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "description": "Session order for the first page. Use desc for newest first or asc for oldest first."
+            },
+            "required": false
+          },
+          {
+            "name": "search",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          },
+          {
+            "name": "parentID",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "anyOf": [
+                    {
+                      "type": "string",
+                      "allOf": [
+                        {
+                          "pattern": "^ses"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "string",
+                      "enum": [
+                        "null"
+                      ]
+                    }
+                  ],
+                  "description": "Filter by parent session. Use null to return only root sessions."
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          },
+          {
+            "name": "directory",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          },
+          {
+            "name": "project",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          },
+          {
+            "name": "subpath",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          },
+          {
+            "name": "cursor",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "description": "Opaque pagination cursor returned as cursor.previous or cursor.next in the previous response."
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "SessionsResponse",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionsResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidCursorError | InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/InvalidCursorError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError1"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve sessions in the requested order. Items keep that order across pages; use cursor.next or cursor.previous to move through the ordered list.",
+        "summary": "List sessions"
+      },
+      "post": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.create",
+        "parameters": [],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "$ref": "#/components/schemas/SessionV2.Info"
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Create a session at the requested location.",
+        "summary": "Create session",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "anyOf": [
+                      {
+                        "type": "string",
+                        "allOf": [
+                          {
+                            "pattern": "^ses"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "agent": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "model": {
+                    "anyOf": [
+                      {
+                        "$ref": "#/components/schemas/Model.Ref"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "location": {
+                    "anyOf": [
+                      {
+                        "$ref": "#/components/schemas/Location.Ref"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/active": {
+      "get": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.active",
+        "parameters": [],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "object",
+                      "patternProperties": {
+                        "^ses": {
+                          "$ref": "#/components/schemas/SessionActive"
+                        }
+                      }
+                    },
+                    "watermarks": {
+                      "$ref": "#/components/schemas/SessionWatermarks"
+                    }
+                  },
+                  "required": [
+                    "data",
+                    "watermarks"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve foreground Session drains currently owned by this OpenCode process. Sessions absent from the result are inactive. Watermarks are the durable log positions read alongside the activity snapshot; activity itself is process state, so the pairing is advisory rather than transactional.",
+        "summary": "List active sessions"
+      }
+    },
+    "/api/session/{sessionID}": {
+      "get": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.get",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "$ref": "#/components/schemas/SessionV2.Info"
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve a session by ID.",
+        "summary": "Get session"
+      }
+    },
+    "/api/session/{sessionID}/fork": {
+      "post": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.fork",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "$ref": "#/components/schemas/SessionV2.Info"
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | MessageNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/MessageNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Create a child session by copying projected history from the parent. When messageID is supplied, copy messages before that boundary.",
+        "summary": "Fork session",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "messageID": {
+                    "anyOf": [
+                      {
+                        "type": "string",
+                        "allOf": [
+                          {
+                            "pattern": "^msg_"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/agent": {
+      "post": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.switchAgent",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Switch the agent used by subsequent provider turns.",
+        "summary": "Switch session agent",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "agent": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "agent"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/model": {
+      "post": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.switchModel",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Switch the model used by subsequent provider turns.",
+        "summary": "Switch session model",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "model": {
+                    "$ref": "#/components/schemas/Model.Ref"
+                  }
+                },
+                "required": [
+                  "model"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/rename": {
+      "post": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.rename",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Update the session title.",
+        "summary": "Rename session",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "title": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "title"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/prompt": {
+      "post": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.prompt",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "$ref": "#/components/schemas/SessionInput.Admitted"
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "ConflictError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConflictError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Durably admit one session input and schedule agent-loop execution unless resume is false.",
+        "summary": "Send message",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "anyOf": [
+                      {
+                        "type": "string",
+                        "allOf": [
+                          {
+                            "pattern": "^msg_"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "prompt": {
+                    "$ref": "#/components/schemas/PromptInput"
+                  },
+                  "delivery": {
+                    "anyOf": [
+                      {
+                        "type": "string",
+                        "enum": [
+                          "steer",
+                          "queue"
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "resume": {
+                    "anyOf": [
+                      {
+                        "type": "boolean"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "prompt"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/command": {
+      "post": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.command",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "$ref": "#/components/schemas/SessionInput.Admitted"
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | CommandNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/CommandNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "ConflictError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConflictError"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "CommandEvaluationError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CommandEvaluationError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Resolve a slash command into prompt input, admit it durably, and schedule execution unless resume is false.",
+        "summary": "Run command",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "anyOf": [
+                      {
+                        "type": "string",
+                        "allOf": [
+                          {
+                            "pattern": "^msg_"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "command": {
+                    "type": "string"
+                  },
+                  "arguments": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "agent": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "model": {
+                    "anyOf": [
+                      {
+                        "$ref": "#/components/schemas/Model.Ref"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "files": {
+                    "type": "array",
+                    "items": {
+                      "$ref": "#/components/schemas/PromptInput.FileAttachment"
+                    }
+                  },
+                  "agents": {
+                    "type": "array",
+                    "items": {
+                      "$ref": "#/components/schemas/Prompt.AgentAttachment"
+                    }
+                  },
+                  "delivery": {
+                    "anyOf": [
+                      {
+                        "type": "string",
+                        "enum": [
+                          "steer",
+                          "queue"
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "resume": {
+                    "anyOf": [
+                      {
+                        "type": "boolean"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "command"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/skill": {
+      "post": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.skill",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | SkillNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SkillNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Activate a skill for a session by appending a skill message and resuming execution.",
+        "summary": "Activate skill",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "anyOf": [
+                      {
+                        "type": "string",
+                        "allOf": [
+                          {
+                            "pattern": "^msg_"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "skill": {
+                    "type": "string"
+                  },
+                  "resume": {
+                    "anyOf": [
+                      {
+                        "type": "boolean"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "skill"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/synthetic": {
+      "post": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.synthetic",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Append a synthetic message to a session and resume execution.",
+        "summary": "Add synthetic message",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "text": {
+                    "type": "string"
+                  },
+                  "description": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "metadata": {
+                    "type": "object"
+                  }
+                },
+                "required": [
+                  "text"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/compact": {
+      "post": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.compact",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "SessionBusyError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionBusyError"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "UnknownError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnknownError"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "ServiceUnavailableError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ServiceUnavailableError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Compact a session conversation.",
+        "summary": "Compact session"
+      }
+    },
+    "/api/session/{sessionID}/wait": {
+      "post": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.wait",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "ServiceUnavailableError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ServiceUnavailableError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Wait for a session agent loop to become idle.",
+        "summary": "Wait for session"
+      }
+    },
+    "/api/session/{sessionID}/revert/stage": {
+      "post": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.revert.stage",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "$ref": "#/components/schemas/Revert.State"
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "MessageNotFoundError | SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/MessageNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "SessionBusyError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionBusyError"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "UnknownError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnknownError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Stage or move a reversible session boundary and optionally apply its file changes.",
+        "summary": "Stage session revert",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "messageID": {
+                    "type": "string",
+                    "allOf": [
+                      {
+                        "pattern": "^msg_"
+                      }
+                    ]
+                  },
+                  "files": {
+                    "anyOf": [
+                      {
+                        "type": "boolean"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "messageID"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/revert/clear": {
+      "post": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.revert.clear",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "SessionBusyError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionBusyError"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "UnknownError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnknownError"
+                }
+              }
+            }
+          }
+        },
+        "summary": "Clear staged revert"
+      }
+    },
+    "/api/session/{sessionID}/revert/commit": {
+      "post": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.revert.commit",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "SessionBusyError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionBusyError"
+                }
+              }
+            }
+          }
+        },
+        "summary": "Commit staged revert"
+      }
+    },
+    "/api/session/{sessionID}/context": {
+      "get": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.context",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Session.Message"
+                      }
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "UnknownError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnknownError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve the active context messages for a session (all messages after the last compaction).",
+        "summary": "Get session context"
+      }
+    },
+    "/api/session/{sessionID}/context-entry": {
+      "get": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.context.entry.list",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/SessionContextEntry.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "List API-managed context entries attached to the session's system context.",
+        "summary": "List context entries"
+      }
+    },
+    "/api/session/{sessionID}/context-entry/{key}": {
+      "put": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.context.entry.put",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "key",
+            "in": "path",
+            "schema": {
+              "$ref": "#/components/schemas/SessionContextEntry.Key"
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Attach or replace one durable context entry. The value is rendered into the session's system context; changes announce as updates at the next turn boundary.",
+        "summary": "Put context entry",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "value": {}
+                },
+                "required": [
+                  "value"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      },
+      "delete": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.context.entry.remove",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "key",
+            "in": "path",
+            "schema": {
+              "$ref": "#/components/schemas/SessionContextEntry.Key"
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Remove one context entry; the removal is announced to the model at the next turn boundary.",
+        "summary": "Remove context entry"
+      }
+    },
+    "/api/session/{sessionID}/log": {
+      "get": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.log",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          },
+          {
+            "name": "follow",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "enum": [
+                    "true",
+                    "false"
+                  ]
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "text/event-stream": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "event": {
+                      "type": "string"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/SessionLogItemStream"
+                    }
+                  },
+                  "required": [
+                    "id",
+                    "event",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                },
+                "x-effect-stream": {
+                  "encoding": "sse",
+                  "causeSchema": {
+                    "type": "array",
+                    "items": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "_tag": {
+                              "type": "string",
+                              "enum": [
+                                "Fail"
+                              ]
+                            },
+                            "error": {
+                              "not": {}
+                            }
+                          },
+                          "required": [
+                            "_tag",
+                            "error"
+                          ],
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "object",
+                          "properties": {
+                            "_tag": {
+                              "type": "string",
+                              "enum": [
+                                "Die"
+                              ]
+                            },
+                            "defect": {}
+                          },
+                          "required": [
+                            "_tag",
+                            "defect"
+                          ],
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "object",
+                          "properties": {
+                            "_tag": {
+                              "type": "string",
+                              "enum": [
+                                "Interrupt"
+                              ]
+                            },
+                            "fiberId": {
+                              "anyOf": [
+                                {
+                                  "type": "number"
+                                },
+                                {
+                                  "type": "null"
+                                }
+                              ]
+                            }
+                          },
+                          "required": [
+                            "_tag",
+                            "fiberId"
+                          ],
+                          "additionalProperties": false
+                        }
+                      ]
+                    }
+                  },
+                  "errorSchema": {
+                    "not": {}
+                  },
+                  "failureEvent": "effect/httpapi/stream/failure"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Durable, ordered, gap-free read of public session events after an exclusive aggregate sequence. Emits a synced marker once replay reaches the captured watermark, then completes; with follow=true it continues with live events instead. The only event API that promises reliability: attach after a snapshot watermark to compose fetch and stream without a race window.",
+        "summary": "Read the session log"
+      }
+    },
+    "/api/session/{sessionID}/interrupt": {
+      "post": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.interrupt",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Interrupt active execution owned by this OpenCode process. Idle interruption is a no-op.",
+        "summary": "Interrupt session execution"
+      }
+    },
+    "/api/session/{sessionID}/background": {
+      "post": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.background",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Move active foreground backgroundable tools for this session into background observation. Idle requests are a no-op.",
+        "summary": "Background blocking session tools"
+      }
+    },
+    "/api/session/{sessionID}/message/{messageID}": {
+      "get": {
+        "tags": [
+          "sessions"
+        ],
+        "operationId": "v2.session.message",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "messageID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^msg_"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "$ref": "#/components/schemas/Session.Message"
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | MessageNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/MessageNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve one projected message owned by the Session.",
+        "summary": "Get session message"
+      }
+    },
+    "/api/session/{sessionID}/message": {
+      "get": {
+        "tags": [
+          "messages"
+        ],
+        "operationId": "v2.session.messages",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "description": "Maximum number of messages to return. When omitted, the endpoint returns its default page size."
+            },
+            "required": false
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "enum": [
+                    "asc",
+                    "desc"
+                  ]
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "description": "Message order for the first page. Use desc for newest first or asc for oldest first."
+            },
+            "required": false
+          },
+          {
+            "name": "cursor",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "description": "Opaque pagination cursor returned as cursor.previous or cursor.next in the previous response. Do not combine with order."
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "SessionMessagesResponse",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionMessagesResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidCursorError | InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/InvalidCursorError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "UnknownError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnknownError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve projected messages for a session. Items keep the requested order across pages; use cursor.next or cursor.previous to move through the ordered timeline.",
+        "summary": "Get session messages"
+      }
+    },
+    "/api/model": {
+      "get": {
+        "tags": [
+          "models"
+        ],
+        "operationId": "v2.model.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/ModelV2.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "ServiceUnavailableError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ServiceUnavailableError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve available models ordered by release date.",
+        "summary": "List models"
+      }
+    },
+    "/api/model/default": {
+      "get": {
+        "tags": [
+          "models"
+        ],
+        "operationId": "v2.model.default",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "anyOf": [
+                        {
+                          "$ref": "#/components/schemas/ModelV2.Info"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "ServiceUnavailableError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ServiceUnavailableError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve the model used when a session has no explicit model selection.",
+        "summary": "Get default model"
+      }
+    },
+    "/api/generate": {
+      "post": {
+        "tags": [
+          "generate"
+        ],
+        "operationId": "v2.generate.text",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "GenerateTextResponse",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GenerateTextResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError1"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "ServiceUnavailableError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ServiceUnavailableError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Run one stateless model generation at the requested location and return the assistant text. Uses the location's default model when none is specified.",
+        "summary": "Generate text",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "prompt": {
+                    "type": "string"
+                  },
+                  "model": {
+                    "anyOf": [
+                      {
+                        "$ref": "#/components/schemas/Model.Ref"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "prompt"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/provider": {
+      "get": {
+        "tags": [
+          "providers"
+        ],
+        "operationId": "v2.provider.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/ProviderV2.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "ServiceUnavailableError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ServiceUnavailableError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve active AI providers so clients can show provider availability and configuration.",
+        "summary": "List providers"
+      }
+    },
+    "/api/provider/{providerID}": {
+      "get": {
+        "tags": [
+          "providers"
+        ],
+        "operationId": "v2.provider.get",
+        "parameters": [
+          {
+            "name": "providerID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/ProviderV2.Info"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "ProviderNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProviderNotFoundError"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "ServiceUnavailableError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ServiceUnavailableError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve a single AI provider so clients can inspect its availability and endpoint settings.",
+        "summary": "Get provider"
+      }
+    },
+    "/api/integration": {
+      "get": {
+        "tags": [
+          "integrations"
+        ],
+        "operationId": "v2.integration.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Integration.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve available integrations and their authentication methods.",
+        "summary": "List integrations"
+      }
+    },
+    "/api/integration/{integrationID}": {
+      "get": {
+        "tags": [
+          "integrations"
+        ],
+        "operationId": "v2.integration.get",
+        "parameters": [
+          {
+            "name": "integrationID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "anyOf": [
+                        {
+                          "$ref": "#/components/schemas/Integration.Info"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve one integration and its authentication methods.",
+        "summary": "Get integration"
+      }
+    },
+    "/api/integration/{integrationID}/connect/key": {
+      "post": {
+        "tags": [
+          "integrations"
+        ],
+        "operationId": "v2.integration.connect.key",
+        "parameters": [
+          {
+            "name": "integrationID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError1"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Run a key authentication method and store the resulting credential.",
+        "summary": "Connect with key",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "key": {
+                    "type": "string"
+                  },
+                  "label": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "key"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/integration/{integrationID}/connect/oauth": {
+      "post": {
+        "tags": [
+          "integrations"
+        ],
+        "operationId": "v2.integration.connect.oauth",
+        "parameters": [
+          {
+            "name": "integrationID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/Integration.Attempt"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError1"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Start an OAuth attempt and return the authorization details.",
+        "summary": "Begin OAuth connection",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "methodID": {
+                    "type": "string"
+                  },
+                  "inputs": {
+                    "type": "object",
+                    "additionalProperties": {
+                      "type": "string"
+                    }
+                  },
+                  "label": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "methodID",
+                  "inputs"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/integration/attempt/{attemptID}": {
+      "get": {
+        "tags": [
+          "integrations"
+        ],
+        "operationId": "v2.integration.attempt.status",
+        "parameters": [
+          {
+            "name": "attemptID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/Integration.AttemptStatus"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Poll the current status of an OAuth attempt.",
+        "summary": "Get OAuth attempt status"
+      },
+      "delete": {
+        "tags": [
+          "integrations"
+        ],
+        "operationId": "v2.integration.attempt.cancel",
+        "parameters": [
+          {
+            "name": "attemptID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Cancel an OAuth attempt and release its resources.",
+        "summary": "Cancel OAuth connection"
+      }
+    },
+    "/api/integration/attempt/{attemptID}/complete": {
+      "post": {
+        "tags": [
+          "integrations"
+        ],
+        "operationId": "v2.integration.attempt.complete",
+        "parameters": [
+          {
+            "name": "attemptID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError1"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Complete a code-based OAuth attempt and store the resulting credential.",
+        "summary": "Complete OAuth connection",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "code": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/mcp": {
+      "get": {
+        "tags": [
+          "mcp"
+        ],
+        "operationId": "v2.mcp.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Mcp.Server"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve configured MCP servers and their connection status.",
+        "summary": "List MCP servers"
+      }
+    },
+    "/api/credential/{credentialID}": {
+      "patch": {
+        "tags": [
+          "server.credential"
+        ],
+        "operationId": "v2.credential.update",
+        "parameters": [
+          {
+            "name": "credentialID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Update a stored credential label.",
+        "summary": "Update credential",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "label": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "label"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      },
+      "delete": {
+        "tags": [
+          "server.credential"
+        ],
+        "operationId": "v2.credential.remove",
+        "parameters": [
+          {
+            "name": "credentialID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Remove a stored integration credential.",
+        "summary": "Remove credential"
+      }
+    },
+    "/api/project/current": {
+      "get": {
+        "tags": [
+          "projects"
+        ],
+        "operationId": "v2.project.current",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Project.Current",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Project.Current"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Resolve the project for the requested location.",
+        "summary": "Get current project"
+      }
+    },
+    "/api/project/{projectID}/directories": {
+      "get": {
+        "tags": [
+          "projects"
+        ],
+        "operationId": "v2.project.directories",
+        "parameters": [
+          {
+            "name": "projectID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Project.Directories",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Project.Directories"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "List known local absolute directories for a project.",
+        "summary": "List project directories"
+      }
+    },
+    "/api/form/request": {
+      "get": {
+        "tags": [
+          "forms"
+        ],
+        "operationId": "v2.form.request.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "anyOf": [
+                          {
+                            "$ref": "#/components/schemas/Form.FormInfo"
+                          },
+                          {
+                            "$ref": "#/components/schemas/Form.UrlInfo"
+                          }
+                        ]
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve pending forms for a location.",
+        "summary": "List pending form requests"
+      }
+    },
+    "/api/session/{sessionID}/form": {
+      "get": {
+        "tags": [
+          "forms"
+        ],
+        "operationId": "v2.session.form.list",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "anyOf": [
+                          {
+                            "$ref": "#/components/schemas/Form.FormInfo"
+                          },
+                          {
+                            "$ref": "#/components/schemas/Form.UrlInfo"
+                          }
+                        ]
+                      }
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve pending forms for a session.",
+        "summary": "List session forms"
+      },
+      "post": {
+        "tags": [
+          "forms"
+        ],
+        "operationId": "v2.session.form.create",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "anyOf": [
+                        {
+                          "$ref": "#/components/schemas/Form.FormInfo"
+                        },
+                        {
+                          "$ref": "#/components/schemas/Form.UrlInfo"
+                        }
+                      ]
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError1"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "ConflictError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConflictError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Create a form for a session.",
+        "summary": "Create session form",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Form.CreatePayload"
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/form/{formID}": {
+      "get": {
+        "tags": [
+          "forms"
+        ],
+        "operationId": "v2.session.form.get",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "formID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^frm_"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "anyOf": [
+                        {
+                          "$ref": "#/components/schemas/Form.FormInfo"
+                        },
+                        {
+                          "$ref": "#/components/schemas/Form.UrlInfo"
+                        }
+                      ]
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | FormNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/FormNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve a form for a session.",
+        "summary": "Get session form"
+      }
+    },
+    "/api/session/{sessionID}/form/{formID}/state": {
+      "get": {
+        "tags": [
+          "forms"
+        ],
+        "operationId": "v2.session.form.state",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "formID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^frm_"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "$ref": "#/components/schemas/Form.State"
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | FormNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/FormNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve the current state for a form.",
+        "summary": "Get form state"
+      }
+    },
+    "/api/session/{sessionID}/form/{formID}/reply": {
+      "post": {
+        "tags": [
+          "forms"
+        ],
+        "operationId": "v2.session.form.reply",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "formID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^frm_"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "FormInvalidAnswerError | InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/FormInvalidAnswerError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | FormNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/FormNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "FormAlreadySettledError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/FormAlreadySettledError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Submit an answer to a pending form.",
+        "summary": "Reply to form",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Form.Reply"
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/form/{formID}/cancel": {
+      "post": {
+        "tags": [
+          "forms"
+        ],
+        "operationId": "v2.session.form.cancel",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "formID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^frm_"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | FormNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/FormNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "FormAlreadySettledError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/FormAlreadySettledError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Cancel a pending form.",
+        "summary": "Cancel form"
+      }
+    },
+    "/api/permission/request": {
+      "get": {
+        "tags": [
+          "permissions"
+        ],
+        "operationId": "v2.permission.request.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/PermissionV2.Request"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve pending permission requests for a location.",
+        "summary": "List pending permission requests"
+      }
+    },
+    "/api/permission/saved": {
+      "get": {
+        "tags": [
+          "permissions"
+        ],
+        "operationId": "v2.permission.saved.list",
+        "parameters": [
+          {
+            "name": "projectID",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/PermissionSaved.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve saved permissions, optionally filtered by project.",
+        "summary": "List saved permissions"
+      }
+    },
+    "/api/permission/saved/{id}": {
+      "delete": {
+        "tags": [
+          "permissions"
+        ],
+        "operationId": "v2.permission.saved.remove",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Remove a saved permission by ID.",
+        "summary": "Remove saved permission"
+      }
+    },
+    "/api/session/{sessionID}/permission": {
+      "post": {
+        "tags": [
+          "permissions"
+        ],
+        "operationId": "v2.session.permission.create",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "object",
+                      "properties": {
+                        "id": {
+                          "type": "string",
+                          "allOf": [
+                            {
+                              "pattern": "^per"
+                            }
+                          ]
+                        },
+                        "effect": {
+                          "$ref": "#/components/schemas/PermissionV2.Effect"
+                        }
+                      },
+                      "required": [
+                        "id",
+                        "effect"
+                      ],
+                      "additionalProperties": false
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Evaluate and, when approval is required, create a permission request for a session.",
+        "summary": "Create permission request",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "anyOf": [
+                      {
+                        "type": "string",
+                        "allOf": [
+                          {
+                            "pattern": "^per"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "action": {
+                    "type": "string"
+                  },
+                  "resources": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
+                  "save": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
+                  "metadata": {
+                    "type": "object"
+                  },
+                  "source": {
+                    "$ref": "#/components/schemas/PermissionV2.Source"
+                  },
+                  "agent": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "action",
+                  "resources"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      },
+      "get": {
+        "tags": [
+          "permissions"
+        ],
+        "operationId": "v2.session.permission.list",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/PermissionV2.Request"
+                      }
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve pending permission requests owned by a session.",
+        "summary": "List session permission requests"
+      }
+    },
+    "/api/session/{sessionID}/permission/{requestID}": {
+      "get": {
+        "tags": [
+          "permissions"
+        ],
+        "operationId": "v2.session.permission.get",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "requestID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^per"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "$ref": "#/components/schemas/PermissionV2.Request"
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | PermissionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/PermissionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve a pending permission request owned by a session.",
+        "summary": "Get permission request"
+      }
+    },
+    "/api/session/{sessionID}/permission/{requestID}/reply": {
+      "post": {
+        "tags": [
+          "permissions"
+        ],
+        "operationId": "v2.session.permission.reply",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "requestID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^per"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | PermissionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/PermissionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Respond to a pending permission request owned by a session.",
+        "summary": "Reply to pending permission request",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "reply": {
+                    "$ref": "#/components/schemas/PermissionV2.Reply"
+                  },
+                  "message": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "reply"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/fs/read/*": {
+      "get": {
+        "tags": [
+          "filesystem"
+        ],
+        "operationId": "v2.fs.read",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/octet-stream": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Serve one file relative to the requested location.",
+        "summary": "Read file"
+      }
+    },
+    "/api/fs/list": {
+      "get": {
+        "tags": [
+          "filesystem"
+        ],
+        "operationId": "v2.fs.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          },
+          {
+            "name": "path",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/FileSystem.Entry"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "List direct children of one directory relative to the requested location.",
+        "summary": "List directory"
+      }
+    },
+    "/api/fs/find": {
+      "get": {
+        "tags": [
+          "filesystem"
+        ],
+        "operationId": "v2.fs.find",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          },
+          {
+            "name": "query",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "type",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "enum": [
+                "file",
+                "directory"
+              ]
+            },
+            "required": false
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/FileSystem.Entry"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Find recursively ranked filesystem entries relative to the requested location.",
+        "summary": "Find files"
+      }
+    },
+    "/api/command": {
+      "get": {
+        "tags": [
+          "commands"
+        ],
+        "operationId": "v2.command.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/CommandV2.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve currently registered commands.",
+        "summary": "List commands"
+      }
+    },
+    "/api/skill": {
+      "get": {
+        "tags": [
+          "skills"
+        ],
+        "operationId": "v2.skill.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/SkillV2.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve currently registered skills.",
+        "summary": "List skills"
+      }
+    },
+    "/api/event": {
+      "get": {
+        "tags": [
+          "events"
+        ],
+        "operationId": "v2.event.subscribe",
+        "parameters": [],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "text/event-stream": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "event": {
+                      "type": "string"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/V2EventStream"
+                    }
+                  },
+                  "required": [
+                    "id",
+                    "event",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                },
+                "x-effect-stream": {
+                  "encoding": "sse",
+                  "causeSchema": {
+                    "type": "array",
+                    "items": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "_tag": {
+                              "type": "string",
+                              "enum": [
+                                "Fail"
+                              ]
+                            },
+                            "error": {
+                              "not": {}
+                            }
+                          },
+                          "required": [
+                            "_tag",
+                            "error"
+                          ],
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "object",
+                          "properties": {
+                            "_tag": {
+                              "type": "string",
+                              "enum": [
+                                "Die"
+                              ]
+                            },
+                            "defect": {}
+                          },
+                          "required": [
+                            "_tag",
+                            "defect"
+                          ],
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "object",
+                          "properties": {
+                            "_tag": {
+                              "type": "string",
+                              "enum": [
+                                "Interrupt"
+                              ]
+                            },
+                            "fiberId": {
+                              "anyOf": [
+                                {
+                                  "type": "number"
+                                },
+                                {
+                                  "type": "null"
+                                }
+                              ]
+                            }
+                          },
+                          "required": [
+                            "_tag",
+                            "fiberId"
+                          ],
+                          "additionalProperties": false
+                        }
+                      ]
+                    }
+                  },
+                  "errorSchema": {
+                    "not": {}
+                  },
+                  "failureEvent": "effect/httpapi/stream/failure"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Subscribe to native event payloads for the server. Volatile by contract: a slow consumer overflows and fails the stream, and events during disconnection are missed. Consumers that need reliability should combine the changes feed with durable session log reads.",
+        "summary": "Subscribe to events"
+      }
+    },
+    "/api/event/changes": {
+      "get": {
+        "tags": [
+          "events"
+        ],
+        "operationId": "v2.event.changes",
+        "parameters": [],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "text/event-stream": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "event": {
+                      "type": "string"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/EventLog.ChangeStream"
+                    }
+                  },
+                  "required": [
+                    "id",
+                    "event",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                },
+                "x-effect-stream": {
+                  "encoding": "sse",
+                  "causeSchema": {
+                    "type": "array",
+                    "items": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "_tag": {
+                              "type": "string",
+                              "enum": [
+                                "Fail"
+                              ]
+                            },
+                            "error": {
+                              "not": {}
+                            }
+                          },
+                          "required": [
+                            "_tag",
+                            "error"
+                          ],
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "object",
+                          "properties": {
+                            "_tag": {
+                              "type": "string",
+                              "enum": [
+                                "Die"
+                              ]
+                            },
+                            "defect": {}
+                          },
+                          "required": [
+                            "_tag",
+                            "defect"
+                          ],
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "object",
+                          "properties": {
+                            "_tag": {
+                              "type": "string",
+                              "enum": [
+                                "Interrupt"
+                              ]
+                            },
+                            "fiberId": {
+                              "anyOf": [
+                                {
+                                  "type": "number"
+                                },
+                                {
+                                  "type": "null"
+                                }
+                              ]
+                            }
+                          },
+                          "required": [
+                            "_tag",
+                            "fiberId"
+                          ],
+                          "additionalProperties": false
+                        }
+                      ]
+                    }
+                  },
+                  "errorSchema": {
+                    "not": {}
+                  },
+                  "failureEvent": "effect/httpapi/stream/failure"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Payload-free hint channel: after an event commits, a subscriber eventually receives a hint for that aggregate with seq at or beyond the event, or a sweep-required marker. Hints coalesce to the latest seq per aggregate under backpressure and the stream never fails from overflow. No consumer may derive correctness from receiving a hint; correctness always comes from durable log reads plus the consumer's own checkpoint. A sweep-required marker is emitted first on every (re)subscribe and whenever hint retention is exceeded: treat every aggregate as potentially dirty and recover via bounded sweep plus log reads.",
+        "summary": "Subscribe to change hints"
+      }
+    },
+    "/api/pty": {
+      "get": {
+        "tags": [
+          "pty"
+        ],
+        "operationId": "v2.pty.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Pty"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "List PTY sessions for a location, including exited sessions retained until removal.",
+        "summary": "List PTY sessions"
+      },
+      "post": {
+        "tags": [
+          "pty"
+        ],
+        "operationId": "v2.pty.create",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/Pty"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Create a pseudo-terminal session for a location.",
+        "summary": "Create PTY session",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "command": {
+                    "type": "string"
+                  },
+                  "args": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
+                  "cwd": {
+                    "type": "string"
+                  },
+                  "title": {
+                    "type": "string"
+                  },
+                  "env": {
+                    "type": "object",
+                    "additionalProperties": {
+                      "type": "string"
+                    }
+                  }
+                },
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/pty/{ptyID}": {
+      "get": {
+        "tags": [
+          "pty"
+        ],
+        "operationId": "v2.pty.get",
+        "parameters": [
+          {
+            "name": "ptyID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^pty"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/Pty"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "PtyNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PtyNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Get one PTY session, including its exit code once exited.",
+        "summary": "Get PTY session"
+      },
+      "put": {
+        "tags": [
+          "pty"
+        ],
+        "operationId": "v2.pty.update",
+        "parameters": [
+          {
+            "name": "ptyID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^pty"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/Pty"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "PtyNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PtyNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Update the title or viewport size of one PTY session.",
+        "summary": "Update PTY session",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "title": {
+                    "type": "string"
+                  },
+                  "size": {
+                    "type": "object",
+                    "properties": {
+                      "rows": {
+                        "type": "integer",
+                        "allOf": [
+                          {
+                            "exclusiveMinimum": 0
+                          }
+                        ]
+                      },
+                      "cols": {
+                        "type": "integer",
+                        "allOf": [
+                          {
+                            "exclusiveMinimum": 0
+                          }
+                        ]
+                      }
+                    },
+                    "required": [
+                      "rows",
+                      "cols"
+                    ],
+                    "additionalProperties": false
+                  }
+                },
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      },
+      "delete": {
+        "tags": [
+          "pty"
+        ],
+        "operationId": "v2.pty.remove",
+        "parameters": [
+          {
+            "name": "ptyID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^pty"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "PtyNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PtyNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Terminate and remove one PTY session.",
+        "summary": "Remove PTY session"
+      }
+    },
+    "/api/pty/{ptyID}/connect-token": {
+      "post": {
+        "tags": [
+          "pty"
+        ],
+        "operationId": "v2.pty.connectToken",
+        "parameters": [
+          {
+            "name": "ptyID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^pty"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/PtyTicket.ConnectToken"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "ForbiddenError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ForbiddenError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "PtyNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PtyNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Create a short-lived single-use ticket for opening a PTY WebSocket connection.",
+        "summary": "Create PTY WebSocket token"
+      }
+    },
+    "/api/pty/{ptyID}/connect": {
+      "get": {
+        "tags": [
+          "pty"
+        ],
+        "operationId": "v2.pty.connect",
+        "x-websocket": true,
+        "parameters": [
+          {
+            "name": "ptyID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^pty"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "in": "query",
+            "name": "location[directory]",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "location[workspace]",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "cursor",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "ticket",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "ForbiddenError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ForbiddenError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "PtyNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PtyNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Establish a WebSocket connection streaming PTY output and accepting terminal input.",
+        "summary": "Connect to PTY session"
+      }
+    },
+    "/api/shell": {
+      "get": {
+        "tags": [
+          "shell"
+        ],
+        "operationId": "v2.shell.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Shell1"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "List currently running shell commands for a location. Exited commands are not included.",
+        "summary": "List running shell commands"
+      },
+      "post": {
+        "tags": [
+          "shell"
+        ],
+        "operationId": "v2.shell.create",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/Shell1"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Spawn one non-interactive shell command for a location. Combined stdout/stderr is captured to a file pageable via output.",
+        "summary": "Run shell command",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "command": {
+                    "type": "string"
+                  },
+                  "cwd": {
+                    "type": "string"
+                  },
+                  "timeout": {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  },
+                  "metadata": {
+                    "type": "object"
+                  }
+                },
+                "required": [
+                  "command"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/shell/{id}": {
+      "get": {
+        "tags": [
+          "shell"
+        ],
+        "operationId": "v2.shell.get",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^sh_"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/Shell1"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "ShellNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ShellNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Get one shell command, including its status and exit code once exited.",
+        "summary": "Get shell command"
+      },
+      "delete": {
+        "tags": [
+          "shell"
+        ],
+        "operationId": "v2.shell.remove",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^sh_"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "ShellNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ShellNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Terminate and remove one shell command and its retained output.",
+        "summary": "Remove shell command"
+      }
+    },
+    "/api/shell/{id}/output": {
+      "get": {
+        "tags": [
+          "shell"
+        ],
+        "operationId": "v2.shell.output",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^sh_"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          },
+          {
+            "name": "cursor",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^[+-]?\\d*\\.?\\d+(?:[Ee][+-]?\\d+)?$"
+                }
+              ]
+            },
+            "required": false
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^[+-]?\\d*\\.?\\d+(?:[Ee][+-]?\\d+)?$"
+                }
+              ]
+            },
+            "required": false
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "object",
+                      "properties": {
+                        "output": {
+                          "type": "string"
+                        },
+                        "cursor": {
+                          "type": "integer",
+                          "allOf": [
+                            {
+                              "minimum": 0
+                            }
+                          ]
+                        },
+                        "size": {
+                          "type": "integer",
+                          "allOf": [
+                            {
+                              "minimum": 0
+                            }
+                          ]
+                        },
+                        "truncated": {
+                          "type": "boolean"
+                        }
+                      },
+                      "required": [
+                        "output",
+                        "cursor",
+                        "size",
+                        "truncated"
+                      ],
+                      "additionalProperties": false
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "ShellNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ShellNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Page through captured combined output by absolute byte cursor.",
+        "summary": "Read shell output"
+      }
+    },
+    "/api/question/request": {
+      "get": {
+        "tags": [
+          "session questions"
+        ],
+        "operationId": "v2.question.request.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/QuestionV2.Request"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve pending question requests for a location.",
+        "summary": "List pending question requests"
+      }
+    },
+    "/api/session/{sessionID}/question": {
+      "get": {
+        "tags": [
+          "session questions"
+        ],
+        "operationId": "v2.session.question.list",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/QuestionV2.Request"
+                      }
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve pending question requests owned by a session.",
+        "summary": "List session question requests"
+      }
+    },
+    "/api/session/{sessionID}/question/{requestID}/reply": {
+      "post": {
+        "tags": [
+          "session questions"
+        ],
+        "operationId": "v2.session.question.reply",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "requestID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^que"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | QuestionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/QuestionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Answer a pending question request owned by a session.",
+        "summary": "Reply to pending question request",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/QuestionV2.Reply"
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/question/{requestID}/reject": {
+      "post": {
+        "tags": [
+          "session questions"
+        ],
+        "operationId": "v2.session.question.reject",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "requestID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^que"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | QuestionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/QuestionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Reject a pending question request owned by a session.",
+        "summary": "Reject pending question request"
+      }
+    },
+    "/api/reference": {
+      "get": {
+        "tags": [
+          "reference"
+        ],
+        "operationId": "v2.reference.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Reference.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "List references available in the requested location.",
+        "summary": "List references"
+      }
+    },
+    "/experimental/project/{projectID}/copy": {
+      "post": {
+        "tags": [
+          "projectCopy"
+        ],
+        "operationId": "v2.projectCopy.create",
+        "parameters": [
+          {
+            "name": "projectID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "ProjectCopy.Copy",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectCopy.Copy"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "ProjectCopyError | InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/ProjectCopyError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "strategy": {
+                    "type": "string"
+                  },
+                  "directory": {
+                    "type": "string"
+                  },
+                  "name": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "strategy",
+                  "directory"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      },
+      "delete": {
+        "tags": [
+          "projectCopy"
+        ],
+        "operationId": "v2.projectCopy.remove",
+        "parameters": [
+          {
+            "name": "projectID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "ProjectCopyError | InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/ProjectCopyError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "directory": {
+                    "type": "string"
+                  },
+                  "force": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "directory",
+                  "force"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/experimental/project/{projectID}/copy/refresh": {
+      "post": {
+        "tags": [
+          "projectCopy"
+        ],
+        "operationId": "v2.projectCopy.refresh",
+        "parameters": [
+          {
+            "name": "projectID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "ProjectCopyError | InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/ProjectCopyError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/vcs/status": {
+      "get": {
+        "tags": [
+          "vcs"
+        ],
+        "operationId": "v2.vcs.status",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Vcs.FileStatus"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "List uncommitted working-copy changes relative to the requested location.",
+        "summary": "VCS status"
+      }
+    },
+    "/api/vcs/diff": {
+      "get": {
+        "tags": [
+          "vcs"
+        ],
+        "operationId": "v2.vcs.diff",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          },
+          {
+            "name": "mode",
+            "in": "query",
+            "schema": {
+              "$ref": "#/components/schemas/Vcs.Mode"
+            },
+            "required": true
+          },
+          {
+            "name": "context",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/SnapshotFileDiff"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Diff the working copy against HEAD (mode git) or the default-branch merge base (mode branch) for the requested location.",
+        "summary": "VCS diff"
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "UnauthorizedError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "UnauthorizedError"
+            ]
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "InvalidRequestError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "InvalidRequestError"
+            ]
+          },
+          "message": {
+            "type": "string"
+          },
+          "kind": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "field": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "_tag",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "Location.Info": {
+        "type": "object",
+        "properties": {
+          "directory": {
+            "type": "string"
+          },
+          "workspaceID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^wrk"
+              }
+            ]
+          },
+          "project": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string"
+              },
+              "directory": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "id",
+              "directory"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "directory",
+          "project"
+        ],
+        "additionalProperties": false
+      },
+      "Model.Ref": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "providerID": {
+            "type": "string"
+          },
+          "variant": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "providerID"
+        ],
+        "additionalProperties": false
+      },
+      "Provider.Settings": {
+        "type": "object"
+      },
+      "Provider.Request": {
+        "type": "object",
+        "properties": {
+          "settings": {
+            "$ref": "#/components/schemas/Provider.Settings"
+          },
+          "headers": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "body": {
+            "type": "object"
+          }
+        },
+        "required": [
+          "settings",
+          "headers",
+          "body"
+        ],
+        "additionalProperties": false
+      },
+      "Agent.Color": {
+        "anyOf": [
+          {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^#[0-9a-fA-F]{6}$"
+              }
+            ]
+          },
+          {
+            "type": "string",
+            "enum": [
+              "primary",
+              "secondary",
+              "accent",
+              "success",
+              "warning",
+              "error",
+              "info"
+            ]
+          }
+        ]
+      },
+      "PermissionV2.Effect": {
+        "type": "string",
+        "enum": [
+          "allow",
+          "deny",
+          "ask"
+        ]
+      },
+      "PermissionV2.Rule": {
+        "type": "object",
+        "properties": {
+          "action": {
+            "type": "string"
+          },
+          "resource": {
+            "type": "string"
+          },
+          "effect": {
+            "$ref": "#/components/schemas/PermissionV2.Effect"
+          }
+        },
+        "required": [
+          "action",
+          "resource",
+          "effect"
+        ],
+        "additionalProperties": false
+      },
+      "PermissionV2.Ruleset": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/PermissionV2.Rule"
+        }
+      },
+      "AgentV2.Info": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "model": {
+            "$ref": "#/components/schemas/Model.Ref"
+          },
+          "request": {
+            "$ref": "#/components/schemas/Provider.Request"
+          },
+          "system": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "mode": {
+            "type": "string",
+            "enum": [
+              "subagent",
+              "primary",
+              "all"
+            ]
+          },
+          "hidden": {
+            "type": "boolean"
+          },
+          "color": {
+            "$ref": "#/components/schemas/Agent.Color"
+          },
+          "steps": {
+            "type": "integer",
+            "allOf": [
+              {
+                "exclusiveMinimum": 0
+              }
+            ]
+          },
+          "permissions": {
+            "$ref": "#/components/schemas/PermissionV2.Ruleset"
+          }
+        },
+        "required": [
+          "id",
+          "request",
+          "mode",
+          "hidden",
+          "permissions"
+        ],
+        "additionalProperties": false
+      },
+      "Plugin.Info": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id"
+        ],
+        "additionalProperties": false
+      },
+      "Location.Ref": {
+        "type": "object",
+        "properties": {
+          "directory": {
+            "type": "string"
+          },
+          "workspaceID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^wrk"
+              }
+            ]
+          }
+        },
+        "required": [
+          "directory"
+        ],
+        "additionalProperties": false
+      },
+      "File.Diff": {
+        "type": "object",
+        "properties": {
+          "path": {
+            "type": "string"
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "added",
+              "modified",
+              "deleted"
+            ]
+          },
+          "additions": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "deletions": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "patch": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "path",
+          "status",
+          "additions",
+          "deletions",
+          "patch"
+        ],
+        "additionalProperties": false
+      },
+      "Revert.State": {
+        "type": "object",
+        "properties": {
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "partID": {
+            "type": "string"
+          },
+          "snapshot": {
+            "type": "string"
+          },
+          "diff": {
+            "type": "string"
+          },
+          "files": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/File.Diff"
+            }
+          }
+        },
+        "required": [
+          "messageID"
+        ],
+        "additionalProperties": false
+      },
+      "SessionV2.Info": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "parentID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "projectID": {
+            "type": "string"
+          },
+          "agent": {
+            "type": "string"
+          },
+          "model": {
+            "$ref": "#/components/schemas/Model.Ref"
+          },
+          "cost": {
+            "type": "number"
+          },
+          "tokens": {
+            "type": "object",
+            "properties": {
+              "input": {
+                "type": "number"
+              },
+              "output": {
+                "type": "number"
+              },
+              "reasoning": {
+                "type": "number"
+              },
+              "cache": {
+                "type": "object",
+                "properties": {
+                  "read": {
+                    "type": "number"
+                  },
+                  "write": {
+                    "type": "number"
+                  }
+                },
+                "required": [
+                  "read",
+                  "write"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "input",
+              "output",
+              "reasoning",
+              "cache"
+            ],
+            "additionalProperties": false
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              },
+              "updated": {
+                "type": "number"
+              },
+              "archived": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created",
+              "updated"
+            ],
+            "additionalProperties": false
+          },
+          "title": {
+            "type": "string"
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "subpath": {
+            "type": "string"
+          },
+          "revert": {
+            "$ref": "#/components/schemas/Revert.State"
+          }
+        },
+        "required": [
+          "id",
+          "projectID",
+          "cost",
+          "tokens",
+          "time",
+          "title",
+          "location"
+        ],
+        "additionalProperties": false
+      },
+      "SessionWatermarks": {
+        "type": "object",
+        "patternProperties": {
+          "^ses": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          }
+        },
+        "description": "Durable log seq each session's snapshot was computed at. Attach a live log read after the watermark to compose fetch and stream gap-free; apply a snapshot only where its watermark is at or beyond already-applied events. Sessions without durable events are absent."
+      },
+      "SessionsResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SessionV2.Info"
+            }
+          },
+          "watermarks": {
+            "$ref": "#/components/schemas/SessionWatermarks"
+          },
+          "cursor": {
+            "type": "object",
+            "properties": {
+              "previous": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "next": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "data",
+          "watermarks",
+          "cursor"
+        ],
+        "additionalProperties": false
+      },
+      "InvalidCursorError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "InvalidCursorError"
+            ]
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "InvalidRequestError1": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "InvalidRequestError"
+            ]
+          },
+          "message": {
+            "type": "string"
+          },
+          "kind": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "field": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "_tag",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "SessionActive": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "running"
+            ]
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "SessionNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "SessionNotFoundError"
+            ]
+          },
+          "sessionID": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "sessionID",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "MessageNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "MessageNotFoundError"
+            ]
+          },
+          "sessionID": {
+            "type": "string"
+          },
+          "messageID": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "sessionID",
+          "messageID",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "Prompt.Source": {
+        "type": "object",
+        "properties": {
+          "start": {
+            "type": "number"
+          },
+          "end": {
+            "type": "number"
+          },
+          "text": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "start",
+          "end",
+          "text"
+        ],
+        "additionalProperties": false
+      },
+      "PromptInput.FileAttachment": {
+        "type": "object",
+        "properties": {
+          "uri": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "source": {
+            "$ref": "#/components/schemas/Prompt.Source"
+          }
+        },
+        "required": [
+          "uri"
+        ],
+        "additionalProperties": false
+      },
+      "Prompt.AgentAttachment": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "source": {
+            "$ref": "#/components/schemas/Prompt.Source"
+          }
+        },
+        "required": [
+          "name"
+        ],
+        "additionalProperties": false
+      },
+      "PromptInput": {
+        "type": "object",
+        "properties": {
+          "text": {
+            "type": "string"
+          },
+          "files": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PromptInput.FileAttachment"
+            }
+          },
+          "agents": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Prompt.AgentAttachment"
+            }
+          }
+        },
+        "required": [
+          "text"
+        ],
+        "additionalProperties": false
+      },
+      "Prompt.FileAttachment": {
+        "type": "object",
+        "properties": {
+          "uri": {
+            "type": "string"
+          },
+          "mime": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "source": {
+            "$ref": "#/components/schemas/Prompt.Source"
+          }
+        },
+        "required": [
+          "uri",
+          "mime"
+        ],
+        "additionalProperties": false
+      },
+      "Prompt": {
+        "type": "object",
+        "properties": {
+          "text": {
+            "type": "string"
+          },
+          "files": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Prompt.FileAttachment"
+            }
+          },
+          "agents": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Prompt.AgentAttachment"
+            }
+          }
+        },
+        "required": [
+          "text"
+        ],
+        "additionalProperties": false
+      },
+      "SessionInput.Admitted": {
+        "type": "object",
+        "properties": {
+          "admittedSeq": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "prompt": {
+            "$ref": "#/components/schemas/Prompt"
+          },
+          "delivery": {
+            "type": "string",
+            "enum": [
+              "steer",
+              "queue"
+            ]
+          },
+          "timeCreated": {
+            "type": "number"
+          },
+          "promotedSeq": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          }
+        },
+        "required": [
+          "admittedSeq",
+          "id",
+          "sessionID",
+          "prompt",
+          "delivery",
+          "timeCreated"
+        ],
+        "additionalProperties": false
+      },
+      "ConflictError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "ConflictError"
+            ]
+          },
+          "message": {
+            "type": "string"
+          },
+          "resource": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "_tag",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "CommandNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "CommandNotFoundError"
+            ]
+          },
+          "command": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "command",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "CommandEvaluationError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "CommandEvaluationError"
+            ]
+          },
+          "command": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "command",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "SkillNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "SkillNotFoundError"
+            ]
+          },
+          "skill": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "skill",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "SessionBusyError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "SessionBusyError"
+            ]
+          },
+          "sessionID": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "sessionID",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "ServiceUnavailableError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "ServiceUnavailableError"
+            ]
+          },
+          "message": {
+            "type": "string"
+          },
+          "service": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "_tag",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "UnknownError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "UnknownError"
+            ]
+          },
+          "message": {
+            "type": "string"
+          },
+          "ref": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "_tag",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.AgentSwitched": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent-switched"
+            ]
+          },
+          "agent": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "time",
+          "type",
+          "agent"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.ModelSwitched": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "model-switched"
+            ]
+          },
+          "model": {
+            "$ref": "#/components/schemas/Model.Ref"
+          }
+        },
+        "required": [
+          "id",
+          "time",
+          "type",
+          "model"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.User": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "text": {
+            "type": "string"
+          },
+          "files": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Prompt.FileAttachment"
+            }
+          },
+          "agents": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Prompt.AgentAttachment"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "user"
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "time",
+          "text",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.Synthetic": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "text": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "synthetic"
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "time",
+          "sessionID",
+          "text",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.System": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "system"
+            ]
+          },
+          "text": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "time",
+          "type",
+          "text"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.Skill": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "skill"
+            ]
+          },
+          "name": {
+            "type": "string"
+          },
+          "text": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "time",
+          "type",
+          "name",
+          "text"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.Shell": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              },
+              "completed": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell"
+            ]
+          },
+          "callID": {
+            "type": "string"
+          },
+          "command": {
+            "type": "string"
+          },
+          "output": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "time",
+          "type",
+          "callID",
+          "command",
+          "output"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.Assistant.Text": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "text"
+            ]
+          },
+          "id": {
+            "type": "string"
+          },
+          "text": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "text"
+        ],
+        "additionalProperties": false
+      },
+      "LLM.ProviderMetadata": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object"
+        }
+      },
+      "Session.Message.Assistant.Reasoning": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "reasoning"
+            ]
+          },
+          "id": {
+            "type": "string"
+          },
+          "text": {
+            "type": "string"
+          },
+          "providerMetadata": {
+            "$ref": "#/components/schemas/LLM.ProviderMetadata"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              },
+              "completed": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "text"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.ToolState.Pending": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "pending"
+            ]
+          },
+          "input": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "status",
+          "input"
+        ],
+        "additionalProperties": false
+      },
+      "Tool.TextContent": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "text"
+            ]
+          },
+          "text": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ],
+        "additionalProperties": false
+      },
+      "Tool.FileContent": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file"
+            ]
+          },
+          "uri": {
+            "type": "string"
+          },
+          "mime": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "uri",
+          "mime"
+        ],
+        "additionalProperties": false
+      },
+      "LLM.ToolContent": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/Tool.TextContent"
+          },
+          {
+            "$ref": "#/components/schemas/Tool.FileContent"
+          }
+        ]
+      },
+      "Session.Message.ToolState.Running": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "running"
+            ]
+          },
+          "input": {
+            "type": "object"
+          },
+          "structured": {
+            "type": "object"
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/LLM.ToolContent"
+            }
+          }
+        },
+        "required": [
+          "status",
+          "input",
+          "structured",
+          "content"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.ToolState.Completed": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "completed"
+            ]
+          },
+          "input": {
+            "type": "object"
+          },
+          "attachments": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Prompt.FileAttachment"
+            }
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/LLM.ToolContent"
+            }
+          },
+          "outputPaths": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "structured": {
+            "type": "object"
+          },
+          "result": {}
+        },
+        "required": [
+          "status",
+          "input",
+          "content",
+          "structured"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Error.Unknown": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "unknown"
+            ]
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.ToolState.Error": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "error"
+            ]
+          },
+          "input": {
+            "type": "object"
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/LLM.ToolContent"
+            }
+          },
+          "structured": {
+            "type": "object"
+          },
+          "error": {
+            "$ref": "#/components/schemas/Session.Error.Unknown"
+          },
+          "result": {}
+        },
+        "required": [
+          "status",
+          "input",
+          "content",
+          "structured",
+          "error"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.Assistant.Tool": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool"
+            ]
+          },
+          "id": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "provider": {
+            "type": "object",
+            "properties": {
+              "executed": {
+                "type": "boolean"
+              },
+              "metadata": {
+                "$ref": "#/components/schemas/LLM.ProviderMetadata"
+              },
+              "resultMetadata": {
+                "$ref": "#/components/schemas/LLM.ProviderMetadata"
+              }
+            },
+            "required": [
+              "executed"
+            ],
+            "additionalProperties": false
+          },
+          "state": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Session.Message.ToolState.Pending"
+              },
+              {
+                "$ref": "#/components/schemas/Session.Message.ToolState.Running"
+              },
+              {
+                "$ref": "#/components/schemas/Session.Message.ToolState.Completed"
+              },
+              {
+                "$ref": "#/components/schemas/Session.Message.ToolState.Error"
+              }
+            ]
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              },
+              "ran": {
+                "type": "number"
+              },
+              "completed": {
+                "type": "number"
+              },
+              "pruned": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "name",
+          "state",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.Assistant": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              },
+              "completed": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "assistant"
+            ]
+          },
+          "agent": {
+            "type": "string"
+          },
+          "model": {
+            "$ref": "#/components/schemas/Model.Ref"
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "anyOf": [
+                {
+                  "$ref": "#/components/schemas/Session.Message.Assistant.Text"
+                },
+                {
+                  "$ref": "#/components/schemas/Session.Message.Assistant.Reasoning"
+                },
+                {
+                  "$ref": "#/components/schemas/Session.Message.Assistant.Tool"
+                }
+              ]
+            }
+          },
+          "snapshot": {
+            "type": "object",
+            "properties": {
+              "start": {
+                "type": "string"
+              },
+              "end": {
+                "type": "string"
+              },
+              "files": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          "finish": {
+            "type": "string"
+          },
+          "cost": {
+            "type": "number"
+          },
+          "tokens": {
+            "type": "object",
+            "properties": {
+              "input": {
+                "type": "number"
+              },
+              "output": {
+                "type": "number"
+              },
+              "reasoning": {
+                "type": "number"
+              },
+              "cache": {
+                "type": "object",
+                "properties": {
+                  "read": {
+                    "type": "number"
+                  },
+                  "write": {
+                    "type": "number"
+                  }
+                },
+                "required": [
+                  "read",
+                  "write"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "input",
+              "output",
+              "reasoning",
+              "cache"
+            ],
+            "additionalProperties": false
+          },
+          "error": {
+            "$ref": "#/components/schemas/Session.Error.Unknown"
+          }
+        },
+        "required": [
+          "id",
+          "time",
+          "type",
+          "agent",
+          "model",
+          "content"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.Compaction": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "compaction"
+            ]
+          },
+          "reason": {
+            "type": "string",
+            "enum": [
+              "auto",
+              "manual"
+            ]
+          },
+          "summary": {
+            "type": "string"
+          },
+          "recent": {
+            "type": "string"
+          },
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "type",
+          "reason",
+          "summary",
+          "recent",
+          "id",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/Session.Message.AgentSwitched"
+          },
+          {
+            "$ref": "#/components/schemas/Session.Message.ModelSwitched"
+          },
+          {
+            "$ref": "#/components/schemas/Session.Message.User"
+          },
+          {
+            "$ref": "#/components/schemas/Session.Message.Synthetic"
+          },
+          {
+            "$ref": "#/components/schemas/Session.Message.System"
+          },
+          {
+            "$ref": "#/components/schemas/Session.Message.Skill"
+          },
+          {
+            "$ref": "#/components/schemas/Session.Message.Shell"
+          },
+          {
+            "$ref": "#/components/schemas/Session.Message.Assistant"
+          },
+          {
+            "$ref": "#/components/schemas/Session.Message.Compaction"
+          }
+        ]
+      },
+      "SessionContextEntry.Key": {
+        "type": "string",
+        "allOf": [
+          {
+            "pattern": "^[a-z0-9][a-z0-9._-]*$",
+            "description": "Context entry key (lowercase alphanumerics plus . _ -)"
+          }
+        ]
+      },
+      "SessionContextEntry.Info": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "$ref": "#/components/schemas/SessionContextEntry.Key"
+          },
+          "value": {}
+        },
+        "required": [
+          "key",
+          "value"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.agent.switched": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.agent.switched"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "agent": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "messageID",
+              "agent"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.model.switched": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.model.switched"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "model": {
+                "$ref": "#/components/schemas/Model.Ref"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "messageID",
+              "model"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.moved": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.moved"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "location": {
+                "$ref": "#/components/schemas/Location.Ref"
+              },
+              "subdirectory": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "location"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.renamed": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.renamed"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "title": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "title"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.forked": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.forked"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "parentID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "parentID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.prompted": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.prompted"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "prompt": {
+                "$ref": "#/components/schemas/Prompt"
+              },
+              "delivery": {
+                "type": "string",
+                "enum": [
+                  "steer",
+                  "queue"
+                ]
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "messageID",
+              "prompt",
+              "delivery"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.prompt.admitted": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.prompt.admitted"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "prompt": {
+                "$ref": "#/components/schemas/Prompt"
+              },
+              "delivery": {
+                "type": "string",
+                "enum": [
+                  "steer",
+                  "queue"
+                ]
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "messageID",
+              "prompt",
+              "delivery"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.context.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.context.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "text": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "messageID",
+              "text"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.synthetic": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.synthetic"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "text": {
+                "type": "string"
+              },
+              "description": {
+                "type": "string"
+              },
+              "metadata": {
+                "type": "object"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "messageID",
+              "text"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.skill.activated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.skill.activated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "name": {
+                "type": "string"
+              },
+              "text": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "messageID",
+              "name",
+              "text"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.shell.started": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.shell.started"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "callID": {
+                "type": "string"
+              },
+              "command": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "messageID",
+              "callID",
+              "command"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.shell.ended": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.shell.ended"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "callID": {
+                "type": "string"
+              },
+              "output": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "callID",
+              "output"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.step.started": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.step.started"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "agent": {
+                "type": "string"
+              },
+              "model": {
+                "$ref": "#/components/schemas/Model.Ref"
+              },
+              "snapshot": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "assistantMessageID",
+              "agent",
+              "model"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.step.ended": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.step.ended"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "finish": {
+                "type": "string"
+              },
+              "cost": {
+                "type": "number"
+              },
+              "tokens": {
+                "type": "object",
+                "properties": {
+                  "input": {
+                    "type": "number"
+                  },
+                  "output": {
+                    "type": "number"
+                  },
+                  "reasoning": {
+                    "type": "number"
+                  },
+                  "cache": {
+                    "type": "object",
+                    "properties": {
+                      "read": {
+                        "type": "number"
+                      },
+                      "write": {
+                        "type": "number"
+                      }
+                    },
+                    "required": [
+                      "read",
+                      "write"
+                    ],
+                    "additionalProperties": false
+                  }
+                },
+                "required": [
+                  "input",
+                  "output",
+                  "reasoning",
+                  "cache"
+                ],
+                "additionalProperties": false
+              },
+              "snapshot": {
+                "type": "string"
+              },
+              "files": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "assistantMessageID",
+              "finish",
+              "cost",
+              "tokens"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.step.failed": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.step.failed"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "error": {
+                "$ref": "#/components/schemas/Session.Error.Unknown"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "assistantMessageID",
+              "error"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.text.started": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.text.started"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "textID": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "assistantMessageID",
+              "textID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.text.ended": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.text.ended"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "textID": {
+                "type": "string"
+              },
+              "text": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "assistantMessageID",
+              "textID",
+              "text"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.tool.input.started": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.tool.input.started"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "callID": {
+                "type": "string"
+              },
+              "name": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "assistantMessageID",
+              "callID",
+              "name"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.tool.input.ended": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.tool.input.ended"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "callID": {
+                "type": "string"
+              },
+              "text": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "assistantMessageID",
+              "callID",
+              "text"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "LLM.ProviderMetadata3": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object"
+        }
+      },
+      "session.next.tool.called": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.tool.called"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "callID": {
+                "type": "string"
+              },
+              "tool": {
+                "type": "string"
+              },
+              "input": {
+                "type": "object"
+              },
+              "provider": {
+                "type": "object",
+                "properties": {
+                  "executed": {
+                    "type": "boolean"
+                  },
+                  "metadata": {
+                    "$ref": "#/components/schemas/LLM.ProviderMetadata3"
+                  }
+                },
+                "required": [
+                  "executed"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "assistantMessageID",
+              "callID",
+              "tool",
+              "input",
+              "provider"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.tool.progress": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.tool.progress"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "callID": {
+                "type": "string"
+              },
+              "structured": {
+                "type": "object"
+              },
+              "content": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/LLM.ToolContent"
+                }
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "assistantMessageID",
+              "callID",
+              "structured",
+              "content"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "LLM.ProviderMetadata4": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object"
+        }
+      },
+      "session.next.tool.success": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.tool.success"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "callID": {
+                "type": "string"
+              },
+              "structured": {
+                "type": "object"
+              },
+              "content": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/LLM.ToolContent"
+                }
+              },
+              "outputPaths": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "result": {},
+              "provider": {
+                "type": "object",
+                "properties": {
+                  "executed": {
+                    "type": "boolean"
+                  },
+                  "metadata": {
+                    "$ref": "#/components/schemas/LLM.ProviderMetadata4"
+                  }
+                },
+                "required": [
+                  "executed"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "assistantMessageID",
+              "callID",
+              "structured",
+              "content",
+              "provider"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "LLM.ProviderMetadata5": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object"
+        }
+      },
+      "session.next.tool.failed": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.tool.failed"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "callID": {
+                "type": "string"
+              },
+              "error": {
+                "$ref": "#/components/schemas/Session.Error.Unknown"
+              },
+              "result": {},
+              "provider": {
+                "type": "object",
+                "properties": {
+                  "executed": {
+                    "type": "boolean"
+                  },
+                  "metadata": {
+                    "$ref": "#/components/schemas/LLM.ProviderMetadata5"
+                  }
+                },
+                "required": [
+                  "executed"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "assistantMessageID",
+              "callID",
+              "error",
+              "provider"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "LLM.ProviderMetadata6": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object"
+        }
+      },
+      "session.next.reasoning.started": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.reasoning.started"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "reasoningID": {
+                "type": "string"
+              },
+              "providerMetadata": {
+                "$ref": "#/components/schemas/LLM.ProviderMetadata6"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "assistantMessageID",
+              "reasoningID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "LLM.ProviderMetadata7": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object"
+        }
+      },
+      "session.next.reasoning.ended": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.reasoning.ended"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "reasoningID": {
+                "type": "string"
+              },
+              "text": {
+                "type": "string"
+              },
+              "providerMetadata": {
+                "$ref": "#/components/schemas/LLM.ProviderMetadata7"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "assistantMessageID",
+              "reasoningID",
+              "text"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.retry_error": {
+        "type": "object",
+        "properties": {
+          "message": {
+            "type": "string"
+          },
+          "statusCode": {
+            "type": "number"
+          },
+          "isRetryable": {
+            "type": "boolean"
+          },
+          "responseHeaders": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "responseBody": {
+            "type": "string"
+          },
+          "metadata": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "message",
+          "isRetryable"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.retried": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.retried"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "attempt": {
+                "type": "number"
+              },
+              "error": {
+                "$ref": "#/components/schemas/session.next.retry_error"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "attempt",
+              "error"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.compaction.started": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.compaction.started"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "reason": {
+                "type": "string",
+                "enum": [
+                  "auto",
+                  "manual"
+                ]
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "messageID",
+              "reason"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.compaction.ended": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.compaction.ended"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "reason": {
+                "type": "string",
+                "enum": [
+                  "auto",
+                  "manual"
+                ]
+              },
+              "text": {
+                "type": "string"
+              },
+              "recent": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "messageID",
+              "reason",
+              "text",
+              "recent"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.revert.staged": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.revert.staged"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "revert": {
+                "$ref": "#/components/schemas/Revert.State"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "revert"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.revert.cleared": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.revert.cleared"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.revert.committed": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.revert.committed"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "messageID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "SessionDurableEvent": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/session.next.agent.switched"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.model.switched"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.moved"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.renamed"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.forked"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.prompted"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.prompt.admitted"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.context.updated"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.synthetic"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.skill.activated"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.shell.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.shell.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.step.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.step.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.step.failed"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.text.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.text.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.tool.input.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.tool.input.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.tool.called"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.tool.progress"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.tool.success"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.tool.failed"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.reasoning.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.reasoning.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.retried"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.compaction.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.compaction.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.revert.staged"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.revert.cleared"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.revert.committed"
+          }
+        ]
+      },
+      "EventLog.Synced": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "log.synced"
+            ]
+          },
+          "aggregateID": {
+            "type": "string"
+          },
+          "seq": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "aggregateID"
+        ],
+        "additionalProperties": false,
+        "description": "Marker emitted once when a log read reaches its captured watermark. The reader holds every event committed at or below seq."
+      },
+      "SessionLogItem": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/SessionDurableEvent"
+          },
+          {
+            "$ref": "#/components/schemas/EventLog.Synced"
+          }
+        ]
+      },
+      "SessionLogItemStream": {
+        "type": "string",
+        "contentSchema": {
+          "$ref": "#/components/schemas/SessionLogItem"
+        },
+        "contentMediaType": "application/json"
+      },
+      "SessionMessagesResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Session.Message"
+            }
+          },
+          "watermark": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "cursor": {
+            "type": "object",
+            "properties": {
+              "previous": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "next": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "data",
+          "cursor"
+        ],
+        "additionalProperties": false
+      },
+      "Model.Api": {
+        "anyOf": [
+          {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string"
+              },
+              "type": {
+                "type": "string",
+                "enum": [
+                  "aisdk"
+                ]
+              },
+              "package": {
+                "type": "string"
+              },
+              "url": {
+                "type": "string"
+              },
+              "settings": {
+                "type": "object"
+              }
+            },
+            "required": [
+              "id",
+              "type",
+              "package"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string"
+              },
+              "type": {
+                "type": "string",
+                "enum": [
+                  "native"
+                ]
+              },
+              "url": {
+                "type": "string"
+              },
+              "settings": {
+                "type": "object"
+              }
+            },
+            "required": [
+              "id",
+              "type",
+              "settings"
+            ],
+            "additionalProperties": false
+          }
+        ]
+      },
+      "Model.Capabilities": {
+        "type": "object",
+        "properties": {
+          "tools": {
+            "type": "boolean"
+          },
+          "input": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "output": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "tools",
+          "input",
+          "output"
+        ],
+        "additionalProperties": false
+      },
+      "Model.Cost": {
+        "type": "object",
+        "properties": {
+          "tier": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "context"
+                ]
+              },
+              "size": {
+                "type": "integer"
+              }
+            },
+            "required": [
+              "type",
+              "size"
+            ],
+            "additionalProperties": false
+          },
+          "input": {
+            "type": "number"
+          },
+          "output": {
+            "type": "number"
+          },
+          "cache": {
+            "type": "object",
+            "properties": {
+              "read": {
+                "type": "number"
+              },
+              "write": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "read",
+              "write"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "input",
+          "output",
+          "cache"
+        ],
+        "additionalProperties": false
+      },
+      "ModelV2.Info": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "providerID": {
+            "type": "string"
+          },
+          "family": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "api": {
+            "$ref": "#/components/schemas/Model.Api"
+          },
+          "capabilities": {
+            "$ref": "#/components/schemas/Model.Capabilities"
+          },
+          "request": {
+            "type": "object",
+            "properties": {
+              "settings": {
+                "$ref": "#/components/schemas/Provider.Settings"
+              },
+              "headers": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "string"
+                }
+              },
+              "body": {
+                "type": "object"
+              },
+              "variant": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "settings",
+              "headers",
+              "body"
+            ],
+            "additionalProperties": false
+          },
+          "variants": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "id": {
+                  "type": "string"
+                },
+                "settings": {
+                  "$ref": "#/components/schemas/Provider.Settings"
+                },
+                "headers": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "string"
+                  }
+                },
+                "body": {
+                  "type": "object"
+                }
+              },
+              "required": [
+                "id",
+                "settings",
+                "headers",
+                "body"
+              ],
+              "additionalProperties": false
+            }
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "released": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "released"
+            ],
+            "additionalProperties": false
+          },
+          "cost": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Model.Cost"
+            }
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "alpha",
+              "beta",
+              "deprecated",
+              "active"
+            ]
+          },
+          "enabled": {
+            "type": "boolean"
+          },
+          "limit": {
+            "type": "object",
+            "properties": {
+              "context": {
+                "type": "integer"
+              },
+              "input": {
+                "type": "integer"
+              },
+              "output": {
+                "type": "integer"
+              }
+            },
+            "required": [
+              "context",
+              "output"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "providerID",
+          "name",
+          "api",
+          "capabilities",
+          "request",
+          "variants",
+          "time",
+          "cost",
+          "status",
+          "enabled",
+          "limit"
+        ],
+        "additionalProperties": false
+      },
+      "GenerateTextResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "object",
+            "properties": {
+              "text": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "text"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "Provider.AISDK": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "aisdk"
+            ]
+          },
+          "package": {
+            "type": "string"
+          },
+          "url": {
+            "type": "string"
+          },
+          "settings": {
+            "type": "object"
+          }
+        },
+        "required": [
+          "type",
+          "package"
+        ],
+        "additionalProperties": false
+      },
+      "Provider.Native": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "native"
+            ]
+          },
+          "url": {
+            "type": "string"
+          },
+          "settings": {
+            "type": "object"
+          }
+        },
+        "required": [
+          "type",
+          "settings"
+        ],
+        "additionalProperties": false
+      },
+      "Provider.Api": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/Provider.AISDK"
+          },
+          {
+            "$ref": "#/components/schemas/Provider.Native"
+          }
+        ]
+      },
+      "ProviderV2.Info": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "integrationID": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "disabled": {
+            "type": "boolean"
+          },
+          "api": {
+            "$ref": "#/components/schemas/Provider.Api"
+          },
+          "request": {
+            "$ref": "#/components/schemas/Provider.Request"
+          }
+        },
+        "required": [
+          "id",
+          "name",
+          "api",
+          "request"
+        ],
+        "additionalProperties": false
+      },
+      "ProviderNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "ProviderNotFoundError"
+            ]
+          },
+          "providerID": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "providerID",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "Integration.When": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "op": {
+            "type": "string",
+            "enum": [
+              "eq",
+              "neq"
+            ]
+          },
+          "value": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "key",
+          "op",
+          "value"
+        ],
+        "additionalProperties": false
+      },
+      "Integration.TextPrompt": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "text"
+            ]
+          },
+          "key": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          },
+          "placeholder": {
+            "type": "string"
+          },
+          "when": {
+            "$ref": "#/components/schemas/Integration.When"
+          }
+        },
+        "required": [
+          "type",
+          "key",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "Integration.SelectPrompt": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "select"
+            ]
+          },
+          "key": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "label": {
+                  "type": "string"
+                },
+                "value": {
+                  "type": "string"
+                },
+                "hint": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "label",
+                "value"
+              ],
+              "additionalProperties": false
+            }
+          },
+          "when": {
+            "$ref": "#/components/schemas/Integration.When"
+          }
+        },
+        "required": [
+          "type",
+          "key",
+          "message",
+          "options"
+        ],
+        "additionalProperties": false
+      },
+      "Integration.OAuthMethod": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "oauth"
+            ]
+          },
+          "label": {
+            "type": "string"
+          },
+          "prompts": {
+            "type": "array",
+            "items": {
+              "anyOf": [
+                {
+                  "$ref": "#/components/schemas/Integration.TextPrompt"
+                },
+                {
+                  "$ref": "#/components/schemas/Integration.SelectPrompt"
+                }
+              ]
+            }
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "label"
+        ],
+        "additionalProperties": false
+      },
+      "Integration.KeyMethod": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "key"
+            ]
+          },
+          "label": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Integration.EnvMethod": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "env"
+            ]
+          },
+          "names": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "type",
+          "names"
+        ],
+        "additionalProperties": false
+      },
+      "Integration.Method": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/Integration.OAuthMethod"
+          },
+          {
+            "$ref": "#/components/schemas/Integration.KeyMethod"
+          },
+          {
+            "$ref": "#/components/schemas/Integration.EnvMethod"
+          }
+        ]
+      },
+      "Connection.CredentialInfo": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "credential"
+            ]
+          },
+          "id": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "label"
+        ],
+        "additionalProperties": false
+      },
+      "Connection.EnvInfo": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "env"
+            ]
+          },
+          "name": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "name"
+        ],
+        "additionalProperties": false
+      },
+      "Connection.Info": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/Connection.CredentialInfo"
+          },
+          {
+            "$ref": "#/components/schemas/Connection.EnvInfo"
+          }
+        ]
+      },
+      "Integration.Info": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "methods": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Integration.Method"
+            }
+          },
+          "connections": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Connection.Info"
+            }
+          }
+        },
+        "required": [
+          "id",
+          "name",
+          "methods",
+          "connections"
+        ],
+        "additionalProperties": false
+      },
+      "Integration.Attempt": {
+        "type": "object",
+        "properties": {
+          "attemptID": {
+            "type": "string"
+          },
+          "url": {
+            "type": "string"
+          },
+          "instructions": {
+            "type": "string"
+          },
+          "mode": {
+            "type": "string",
+            "enum": [
+              "auto",
+              "code"
+            ]
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "anyOf": [
+                  {
+                    "anyOf": [
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "NaN"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "-Infinity"
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity",
+                      "-Infinity",
+                      "NaN"
+                    ]
+                  }
+                ]
+              },
+              "expires": {
+                "anyOf": [
+                  {
+                    "anyOf": [
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "NaN"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "-Infinity"
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity",
+                      "-Infinity",
+                      "NaN"
+                    ]
+                  }
+                ]
+              }
+            },
+            "required": [
+              "created",
+              "expires"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "attemptID",
+          "url",
+          "instructions",
+          "mode",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "Integration.AttemptStatus": {
+        "anyOf": [
+          {
+            "type": "object",
+            "properties": {
+              "status": {
+                "type": "string",
+                "enum": [
+                  "pending"
+                ]
+              },
+              "time": {
+                "type": "object",
+                "properties": {
+                  "created": {
+                    "anyOf": [
+                      {
+                        "anyOf": [
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "NaN"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "Infinity"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "-Infinity"
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity",
+                          "-Infinity",
+                          "NaN"
+                        ]
+                      }
+                    ]
+                  },
+                  "expires": {
+                    "anyOf": [
+                      {
+                        "anyOf": [
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "NaN"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "Infinity"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "-Infinity"
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity",
+                          "-Infinity",
+                          "NaN"
+                        ]
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "created",
+                  "expires"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "status",
+              "time"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "status": {
+                "type": "string",
+                "enum": [
+                  "complete"
+                ]
+              },
+              "time": {
+                "type": "object",
+                "properties": {
+                  "created": {
+                    "anyOf": [
+                      {
+                        "anyOf": [
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "NaN"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "Infinity"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "-Infinity"
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity",
+                          "-Infinity",
+                          "NaN"
+                        ]
+                      }
+                    ]
+                  },
+                  "expires": {
+                    "anyOf": [
+                      {
+                        "anyOf": [
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "NaN"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "Infinity"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "-Infinity"
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity",
+                          "-Infinity",
+                          "NaN"
+                        ]
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "created",
+                  "expires"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "status",
+              "time"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "status": {
+                "type": "string",
+                "enum": [
+                  "failed"
+                ]
+              },
+              "message": {
+                "type": "string"
+              },
+              "time": {
+                "type": "object",
+                "properties": {
+                  "created": {
+                    "anyOf": [
+                      {
+                        "anyOf": [
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "NaN"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "Infinity"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "-Infinity"
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity",
+                          "-Infinity",
+                          "NaN"
+                        ]
+                      }
+                    ]
+                  },
+                  "expires": {
+                    "anyOf": [
+                      {
+                        "anyOf": [
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "NaN"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "Infinity"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "-Infinity"
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity",
+                          "-Infinity",
+                          "NaN"
+                        ]
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "created",
+                  "expires"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "status",
+              "message",
+              "time"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "status": {
+                "type": "string",
+                "enum": [
+                  "expired"
+                ]
+              },
+              "time": {
+                "type": "object",
+                "properties": {
+                  "created": {
+                    "anyOf": [
+                      {
+                        "anyOf": [
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "NaN"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "Infinity"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "-Infinity"
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity",
+                          "-Infinity",
+                          "NaN"
+                        ]
+                      }
+                    ]
+                  },
+                  "expires": {
+                    "anyOf": [
+                      {
+                        "anyOf": [
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "NaN"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "Infinity"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "-Infinity"
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity",
+                          "-Infinity",
+                          "NaN"
+                        ]
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "created",
+                  "expires"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "status",
+              "time"
+            ],
+            "additionalProperties": false
+          }
+        ]
+      },
+      "Mcp.Status.Connected": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "connected"
+            ]
+          }
+        },
+        "required": [
+          "status"
+        ],
+        "additionalProperties": false
+      },
+      "Mcp.Status.Disconnected": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "disconnected"
+            ]
+          }
+        },
+        "required": [
+          "status"
+        ],
+        "additionalProperties": false
+      },
+      "Mcp.Status.Disabled": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "disabled"
+            ]
+          }
+        },
+        "required": [
+          "status"
+        ],
+        "additionalProperties": false
+      },
+      "Mcp.Status.Failed": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "failed"
+            ]
+          },
+          "error": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "status",
+          "error"
+        ],
+        "additionalProperties": false
+      },
+      "Mcp.Status.NeedsAuth": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "needs_auth"
+            ]
+          }
+        },
+        "required": [
+          "status"
+        ],
+        "additionalProperties": false
+      },
+      "Mcp.Status.NeedsClientRegistration": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "needs_client_registration"
+            ]
+          },
+          "error": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "status",
+          "error"
+        ],
+        "additionalProperties": false
+      },
+      "Mcp.Server": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "status": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Mcp.Status.Connected"
+              },
+              {
+                "$ref": "#/components/schemas/Mcp.Status.Disconnected"
+              },
+              {
+                "$ref": "#/components/schemas/Mcp.Status.Disabled"
+              },
+              {
+                "$ref": "#/components/schemas/Mcp.Status.Failed"
+              },
+              {
+                "$ref": "#/components/schemas/Mcp.Status.NeedsAuth"
+              },
+              {
+                "$ref": "#/components/schemas/Mcp.Status.NeedsClientRegistration"
+              }
+            ]
+          },
+          "integrationID": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "name",
+          "status"
+        ],
+        "additionalProperties": false
+      },
+      "Project.Current": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "directory": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "directory"
+        ],
+        "additionalProperties": false
+      },
+      "Project.Directory": {
+        "type": "object",
+        "properties": {
+          "directory": {
+            "type": "string"
+          },
+          "strategy": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "directory"
+        ],
+        "additionalProperties": false
+      },
+      "Project.Directories": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/Project.Directory"
+        }
+      },
+      "Form.Metadata": {
+        "type": "object"
+      },
+      "Form.When": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "op": {
+            "type": "string",
+            "enum": [
+              "eq",
+              "neq"
+            ]
+          },
+          "value": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "anyOf": [
+                  {
+                    "anyOf": [
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "NaN"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "-Infinity"
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity",
+                      "-Infinity",
+                      "NaN"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "boolean"
+              }
+            ]
+          }
+        },
+        "required": [
+          "key",
+          "op",
+          "value"
+        ],
+        "additionalProperties": false
+      },
+      "Form.Option": {
+        "type": "object",
+        "properties": {
+          "value": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "value",
+          "label"
+        ],
+        "additionalProperties": false
+      },
+      "Form.StringField": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "string"
+            ]
+          },
+          "format": {
+            "type": "string",
+            "enum": [
+              "email",
+              "uri",
+              "date",
+              "date-time"
+            ]
+          },
+          "minLength": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "maxLength": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "pattern": {
+            "type": "string"
+          },
+          "placeholder": {
+            "type": "string"
+          },
+          "default": {
+            "type": "string"
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.Option"
+            }
+          },
+          "custom": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "key",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Form.NumberField": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "number"
+            ]
+          },
+          "minimum": {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity",
+                  "-Infinity",
+                  "NaN"
+                ]
+              }
+            ]
+          },
+          "maximum": {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity",
+                  "-Infinity",
+                  "NaN"
+                ]
+              }
+            ]
+          },
+          "default": {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity",
+                  "-Infinity",
+                  "NaN"
+                ]
+              }
+            ]
+          }
+        },
+        "required": [
+          "key",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Form.IntegerField": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "integer"
+            ]
+          },
+          "minimum": {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity",
+                  "-Infinity",
+                  "NaN"
+                ]
+              }
+            ]
+          },
+          "maximum": {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity",
+                  "-Infinity",
+                  "NaN"
+                ]
+              }
+            ]
+          },
+          "default": {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity",
+                  "-Infinity",
+                  "NaN"
+                ]
+              }
+            ]
+          }
+        },
+        "required": [
+          "key",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Form.BooleanField": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "boolean"
+            ]
+          },
+          "default": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "key",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Form.MultiselectField": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "multiselect"
+            ]
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.Option"
+            }
+          },
+          "minItems": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "maxItems": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "custom": {
+            "type": "boolean"
+          },
+          "default": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "key",
+          "type",
+          "options"
+        ],
+        "additionalProperties": false
+      },
+      "Form.FormInfo": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^frm_"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Form.Metadata"
+          },
+          "mode": {
+            "type": "string",
+            "enum": [
+              "form"
+            ]
+          },
+          "fields": {
+            "type": "array",
+            "items": {
+              "anyOf": [
+                {
+                  "$ref": "#/components/schemas/Form.StringField"
+                },
+                {
+                  "$ref": "#/components/schemas/Form.NumberField"
+                },
+                {
+                  "$ref": "#/components/schemas/Form.IntegerField"
+                },
+                {
+                  "$ref": "#/components/schemas/Form.BooleanField"
+                },
+                {
+                  "$ref": "#/components/schemas/Form.MultiselectField"
+                }
+              ]
+            }
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "mode",
+          "fields"
+        ],
+        "additionalProperties": false
+      },
+      "Form.UrlInfo": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^frm_"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Form.Metadata"
+          },
+          "mode": {
+            "type": "string",
+            "enum": [
+              "url"
+            ]
+          },
+          "url": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "mode",
+          "url"
+        ],
+        "additionalProperties": false
+      },
+      "Form.CreatePayload": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^frm_"
+                  }
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "title": {
+            "type": "string"
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Form.Metadata"
+          },
+          "mode": {
+            "type": "string",
+            "enum": [
+              "form",
+              "url"
+            ]
+          },
+          "fields": {
+            "anyOf": [
+              {
+                "type": "array",
+                "items": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/Form.StringField"
+                    },
+                    {
+                      "$ref": "#/components/schemas/Form.NumberField"
+                    },
+                    {
+                      "$ref": "#/components/schemas/Form.IntegerField"
+                    },
+                    {
+                      "$ref": "#/components/schemas/Form.BooleanField"
+                    },
+                    {
+                      "$ref": "#/components/schemas/Form.MultiselectField"
+                    }
+                  ]
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "url": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "mode"
+        ],
+        "additionalProperties": false
+      },
+      "FormNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "FormNotFoundError"
+            ]
+          },
+          "id": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "id",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "Form.Value": {
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity",
+                  "-Infinity",
+                  "NaN"
+                ]
+              }
+            ]
+          },
+          {
+            "type": "boolean"
+          },
+          {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        ]
+      },
+      "Form.Answer": {
+        "type": "object",
+        "additionalProperties": {
+          "$ref": "#/components/schemas/Form.Value"
+        }
+      },
+      "Form.State": {
+        "anyOf": [
+          {
+            "type": "object",
+            "properties": {
+              "status": {
+                "type": "string",
+                "enum": [
+                  "pending"
+                ]
+              }
+            },
+            "required": [
+              "status"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "status": {
+                "type": "string",
+                "enum": [
+                  "answered"
+                ]
+              },
+              "answer": {
+                "$ref": "#/components/schemas/Form.Answer"
+              }
+            },
+            "required": [
+              "status",
+              "answer"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "status": {
+                "type": "string",
+                "enum": [
+                  "cancelled"
+                ]
+              }
+            },
+            "required": [
+              "status"
+            ],
+            "additionalProperties": false
+          }
+        ]
+      },
+      "Form.Reply": {
+        "type": "object",
+        "properties": {
+          "answer": {
+            "$ref": "#/components/schemas/Form.Answer"
+          }
+        },
+        "required": [
+          "answer"
+        ],
+        "additionalProperties": false
+      },
+      "FormAlreadySettledError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "FormAlreadySettledError"
+            ]
+          },
+          "id": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "id",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "FormInvalidAnswerError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "FormInvalidAnswerError"
+            ]
+          },
+          "id": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "id",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "PermissionV2.Source": {
+        "anyOf": [
+          {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "tool"
+                ]
+              },
+              "messageID": {
+                "type": "string"
+              },
+              "callID": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "type",
+              "messageID",
+              "callID"
+            ],
+            "additionalProperties": false
+          }
+        ]
+      },
+      "PermissionV2.Request": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^per"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "action": {
+            "type": "string"
+          },
+          "resources": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "save": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "source": {
+            "$ref": "#/components/schemas/PermissionV2.Source"
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "action",
+          "resources"
+        ],
+        "additionalProperties": false
+      },
+      "PermissionSaved.Info": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "projectID": {
+            "type": "string"
+          },
+          "action": {
+            "type": "string"
+          },
+          "resource": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "projectID",
+          "action",
+          "resource"
+        ],
+        "additionalProperties": false
+      },
+      "PermissionNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "PermissionNotFoundError"
+            ]
+          },
+          "requestID": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "requestID",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "PermissionV2.Reply": {
+        "type": "string",
+        "enum": [
+          "once",
+          "always",
+          "reject"
+        ]
+      },
+      "FileSystem.Entry": {
+        "type": "object",
+        "properties": {
+          "path": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "file",
+              "directory"
+            ]
+          }
+        },
+        "required": [
+          "path",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "CommandV2.Info": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "template": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "agent": {
+            "type": "string"
+          },
+          "model": {
+            "$ref": "#/components/schemas/Model.Ref"
+          },
+          "subtask": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "name",
+          "template"
+        ],
+        "additionalProperties": false
+      },
+      "SkillV2.Info": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "slash": {
+            "type": "boolean"
+          },
+          "autoinvoke": {
+            "type": "boolean"
+          },
+          "location": {
+            "type": "string"
+          },
+          "content": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "name",
+          "location",
+          "content"
+        ],
+        "additionalProperties": false
+      },
+      "models-dev.refreshed": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "models-dev.refreshed"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "integration.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "integration.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "integration.connection.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "integration.connection.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "integrationID": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "integrationID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "catalog.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "catalog.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "agent.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "SnapshotFileDiff": {
+        "type": "object",
+        "properties": {
+          "file": {
+            "type": "string"
+          },
+          "patch": {
+            "type": "string"
+          },
+          "additions": {
+            "type": "number"
+          },
+          "deletions": {
+            "type": "number"
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "added",
+              "deleted",
+              "modified"
+            ]
+          }
+        },
+        "required": [
+          "additions",
+          "deletions"
+        ],
+        "additionalProperties": false
+      },
+      "PermissionAction": {
+        "type": "string",
+        "enum": [
+          "allow",
+          "deny",
+          "ask"
+        ]
+      },
+      "PermissionRule": {
+        "type": "object",
+        "properties": {
+          "permission": {
+            "type": "string"
+          },
+          "pattern": {
+            "type": "string"
+          },
+          "action": {
+            "$ref": "#/components/schemas/PermissionAction"
+          }
+        },
+        "required": [
+          "permission",
+          "pattern",
+          "action"
+        ],
+        "additionalProperties": false
+      },
+      "PermissionRuleset": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/PermissionRule"
+        }
+      },
+      "Session": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "slug": {
+            "type": "string"
+          },
+          "projectID": {
+            "type": "string"
+          },
+          "workspaceID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^wrk"
+              }
+            ]
+          },
+          "directory": {
+            "type": "string"
+          },
+          "path": {
+            "type": "string"
+          },
+          "parentID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "summary": {
+            "type": "object",
+            "properties": {
+              "additions": {
+                "type": "number"
+              },
+              "deletions": {
+                "type": "number"
+              },
+              "files": {
+                "type": "number"
+              },
+              "diffs": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/SnapshotFileDiff"
+                }
+              }
+            },
+            "required": [
+              "additions",
+              "deletions",
+              "files"
+            ],
+            "additionalProperties": false
+          },
+          "cost": {
+            "type": "number"
+          },
+          "tokens": {
+            "type": "object",
+            "properties": {
+              "input": {
+                "type": "number"
+              },
+              "output": {
+                "type": "number"
+              },
+              "reasoning": {
+                "type": "number"
+              },
+              "cache": {
+                "type": "object",
+                "properties": {
+                  "read": {
+                    "type": "number"
+                  },
+                  "write": {
+                    "type": "number"
+                  }
+                },
+                "required": [
+                  "read",
+                  "write"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "input",
+              "output",
+              "reasoning",
+              "cache"
+            ],
+            "additionalProperties": false
+          },
+          "share": {
+            "type": "object",
+            "properties": {
+              "url": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "url"
+            ],
+            "additionalProperties": false
+          },
+          "title": {
+            "type": "string"
+          },
+          "agent": {
+            "type": "string"
+          },
+          "model": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string"
+              },
+              "providerID": {
+                "type": "string"
+              },
+              "variant": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "id",
+              "providerID"
+            ],
+            "additionalProperties": false
+          },
+          "version": {
+            "type": "string"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "updated": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "compacting": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "archived": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created",
+              "updated"
+            ],
+            "additionalProperties": false
+          },
+          "permission": {
+            "$ref": "#/components/schemas/PermissionRuleset"
+          },
+          "revert": {
+            "type": "object",
+            "properties": {
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg"
+                  }
+                ]
+              },
+              "partID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^prt"
+                  }
+                ]
+              },
+              "snapshot": {
+                "type": "string"
+              },
+              "diff": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "messageID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "slug",
+          "projectID",
+          "directory",
+          "title",
+          "version",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "session.created": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.created"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "info": {
+                "$ref": "#/components/schemas/Session"
+              }
+            },
+            "required": [
+              "sessionID",
+              "info"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "info": {
+                "$ref": "#/components/schemas/Session"
+              }
+            },
+            "required": [
+              "sessionID",
+              "info"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.deleted": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.deleted"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "info": {
+                "$ref": "#/components/schemas/Session"
+              }
+            },
+            "required": [
+              "sessionID",
+              "info"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "JSONSchema": {
+        "type": "object"
+      },
+      "OutputFormat": {
+        "anyOf": [
+          {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "text"
+                ]
+              }
+            },
+            "required": [
+              "type"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "json_schema"
+                ]
+              },
+              "schema": {
+                "$ref": "#/components/schemas/JSONSchema"
+              },
+              "retryCount": {
+                "anyOf": [
+                  {
+                    "anyOf": [
+                      {
+                        "type": "integer",
+                        "allOf": [
+                          {
+                            "minimum": 0
+                          }
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "type",
+              "schema"
+            ],
+            "additionalProperties": false
+          }
+        ]
+      },
+      "UserMessage": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "user"
+            ]
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "format": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/OutputFormat"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "summary": {
+            "anyOf": [
+              {
+                "type": "object",
+                "properties": {
+                  "title": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "body": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "diffs": {
+                    "type": "array",
+                    "items": {
+                      "$ref": "#/components/schemas/SnapshotFileDiff"
+                    }
+                  }
+                },
+                "required": [
+                  "diffs"
+                ],
+                "additionalProperties": false
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "agent": {
+            "type": "string"
+          },
+          "model": {
+            "type": "object",
+            "properties": {
+              "providerID": {
+                "type": "string"
+              },
+              "modelID": {
+                "type": "string"
+              },
+              "variant": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "providerID",
+              "modelID"
+            ],
+            "additionalProperties": false
+          },
+          "system": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "tools": {
+            "anyOf": [
+              {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "boolean"
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "role",
+          "time",
+          "agent",
+          "model"
+        ],
+        "additionalProperties": false
+      },
+      "ProviderAuthError": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "ProviderAuthError"
+            ]
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "providerID": {
+                "type": "string"
+              },
+              "message": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "providerID",
+              "message"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "name",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "UnknownError1": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "UnknownError"
+            ]
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "message": {
+                "type": "string"
+              },
+              "ref": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "message"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "name",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "MessageOutputLengthError": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "MessageOutputLengthError"
+            ]
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "name",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "MessageAbortedError": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "MessageAbortedError"
+            ]
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "message": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "message"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "name",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "StructuredOutputError": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "StructuredOutputError"
+            ]
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "message": {
+                "type": "string"
+              },
+              "retries": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              }
+            },
+            "required": [
+              "message",
+              "retries"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "name",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "ContextOverflowError": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "ContextOverflowError"
+            ]
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "message": {
+                "type": "string"
+              },
+              "responseBody": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "message"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "name",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "ContentFilterError": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "ContentFilterError"
+            ]
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "message": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "message"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "name",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "APIError": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "APIError"
+            ]
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "message": {
+                "type": "string"
+              },
+              "statusCode": {
+                "anyOf": [
+                  {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "isRetryable": {
+                "type": "boolean"
+              },
+              "responseHeaders": {
+                "anyOf": [
+                  {
+                    "type": "object",
+                    "additionalProperties": {
+                      "type": "string"
+                    }
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "responseBody": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "metadata": {
+                "anyOf": [
+                  {
+                    "type": "object",
+                    "additionalProperties": {
+                      "type": "string"
+                    }
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "message",
+              "isRetryable"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "name",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "AssistantMessage": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "assistant"
+            ]
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "completed": {
+                "anyOf": [
+                  {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "error": {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/ProviderAuthError"
+                  },
+                  {
+                    "$ref": "#/components/schemas/UnknownError1"
+                  },
+                  {
+                    "$ref": "#/components/schemas/MessageOutputLengthError"
+                  },
+                  {
+                    "$ref": "#/components/schemas/MessageAbortedError"
+                  },
+                  {
+                    "$ref": "#/components/schemas/StructuredOutputError"
+                  },
+                  {
+                    "$ref": "#/components/schemas/ContextOverflowError"
+                  },
+                  {
+                    "$ref": "#/components/schemas/ContentFilterError"
+                  },
+                  {
+                    "$ref": "#/components/schemas/APIError"
+                  }
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "parentID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "modelID": {
+            "type": "string"
+          },
+          "providerID": {
+            "type": "string"
+          },
+          "mode": {
+            "type": "string"
+          },
+          "agent": {
+            "type": "string"
+          },
+          "path": {
+            "type": "object",
+            "properties": {
+              "cwd": {
+                "type": "string"
+              },
+              "root": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "cwd",
+              "root"
+            ],
+            "additionalProperties": false
+          },
+          "summary": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "cost": {
+            "type": "number"
+          },
+          "tokens": {
+            "type": "object",
+            "properties": {
+              "total": {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "input": {
+                "type": "number"
+              },
+              "output": {
+                "type": "number"
+              },
+              "reasoning": {
+                "type": "number"
+              },
+              "cache": {
+                "type": "object",
+                "properties": {
+                  "read": {
+                    "type": "number"
+                  },
+                  "write": {
+                    "type": "number"
+                  }
+                },
+                "required": [
+                  "read",
+                  "write"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "input",
+              "output",
+              "reasoning",
+              "cache"
+            ],
+            "additionalProperties": false
+          },
+          "structured": {
+            "anyOf": [
+              {},
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "variant": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "finish": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "role",
+          "time",
+          "parentID",
+          "modelID",
+          "providerID",
+          "mode",
+          "agent",
+          "path",
+          "cost",
+          "tokens"
+        ],
+        "additionalProperties": false
+      },
+      "Message": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/UserMessage"
+          },
+          {
+            "$ref": "#/components/schemas/AssistantMessage"
+          }
+        ]
+      },
+      "message.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "message.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "info": {
+                "$ref": "#/components/schemas/Message"
+              }
+            },
+            "required": [
+              "sessionID",
+              "info"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "message.removed": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "message.removed"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "sessionID",
+              "messageID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "TextPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "text"
+            ]
+          },
+          "text": {
+            "type": "string"
+          },
+          "synthetic": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "ignored": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "time": {
+            "anyOf": [
+              {
+                "type": "object",
+                "properties": {
+                  "start": {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  },
+                  "end": {
+                    "anyOf": [
+                      {
+                        "type": "integer",
+                        "allOf": [
+                          {
+                            "minimum": 0
+                          }
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "start"
+                ],
+                "additionalProperties": false
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "metadata": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "text"
+        ],
+        "additionalProperties": false
+      },
+      "SubtaskPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "subtask"
+            ]
+          },
+          "prompt": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "agent": {
+            "type": "string"
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "object",
+                "properties": {
+                  "providerID": {
+                    "type": "string"
+                  },
+                  "modelID": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "providerID",
+                  "modelID"
+                ],
+                "additionalProperties": false
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "command": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "prompt",
+          "description",
+          "agent"
+        ],
+        "additionalProperties": false
+      },
+      "ReasoningPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "reasoning"
+            ]
+          },
+          "text": {
+            "type": "string"
+          },
+          "metadata": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "start": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "end": {
+                "anyOf": [
+                  {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "start"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "text",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "FilePartSourceText": {
+        "type": "object",
+        "properties": {
+          "value": {
+            "type": "string"
+          },
+          "start": {
+            "type": "number"
+          },
+          "end": {
+            "type": "number"
+          }
+        },
+        "required": [
+          "value",
+          "start",
+          "end"
+        ],
+        "additionalProperties": false
+      },
+      "FileSource": {
+        "type": "object",
+        "properties": {
+          "text": {
+            "$ref": "#/components/schemas/FilePartSourceText"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "file"
+            ]
+          },
+          "path": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "text",
+          "type",
+          "path"
+        ],
+        "additionalProperties": false
+      },
+      "Range": {
+        "type": "object",
+        "properties": {
+          "start": {
+            "type": "object",
+            "properties": {
+              "line": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "character": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              }
+            },
+            "required": [
+              "line",
+              "character"
+            ],
+            "additionalProperties": false
+          },
+          "end": {
+            "type": "object",
+            "properties": {
+              "line": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "character": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              }
+            },
+            "required": [
+              "line",
+              "character"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "start",
+          "end"
+        ],
+        "additionalProperties": false
+      },
+      "SymbolSource": {
+        "type": "object",
+        "properties": {
+          "text": {
+            "$ref": "#/components/schemas/FilePartSourceText"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "symbol"
+            ]
+          },
+          "path": {
+            "type": "string"
+          },
+          "range": {
+            "$ref": "#/components/schemas/Range"
+          },
+          "name": {
+            "type": "string"
+          },
+          "kind": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          }
+        },
+        "required": [
+          "text",
+          "type",
+          "path",
+          "range",
+          "name",
+          "kind"
+        ],
+        "additionalProperties": false
+      },
+      "ResourceSource": {
+        "type": "object",
+        "properties": {
+          "text": {
+            "$ref": "#/components/schemas/FilePartSourceText"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "resource"
+            ]
+          },
+          "clientName": {
+            "type": "string"
+          },
+          "uri": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "text",
+          "type",
+          "clientName",
+          "uri"
+        ],
+        "additionalProperties": false
+      },
+      "FilePartSource": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/FileSource"
+          },
+          {
+            "$ref": "#/components/schemas/SymbolSource"
+          },
+          {
+            "$ref": "#/components/schemas/ResourceSource"
+          }
+        ]
+      },
+      "FilePart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "file"
+            ]
+          },
+          "mime": {
+            "type": "string"
+          },
+          "filename": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "url": {
+            "type": "string"
+          },
+          "source": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/FilePartSource"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "mime",
+          "url"
+        ],
+        "additionalProperties": false
+      },
+      "ToolStatePending": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "pending"
+            ]
+          },
+          "input": {
+            "type": "object"
+          },
+          "raw": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "status",
+          "input",
+          "raw"
+        ],
+        "additionalProperties": false
+      },
+      "ToolStateRunning": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "running"
+            ]
+          },
+          "input": {
+            "type": "object"
+          },
+          "title": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "metadata": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "start": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              }
+            },
+            "required": [
+              "start"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "status",
+          "input",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "ToolStateCompleted": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "completed"
+            ]
+          },
+          "input": {
+            "type": "object"
+          },
+          "output": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "start": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "end": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "compacted": {
+                "anyOf": [
+                  {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "start",
+              "end"
+            ],
+            "additionalProperties": false
+          },
+          "attachments": {
+            "anyOf": [
+              {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/FilePart"
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "status",
+          "input",
+          "output",
+          "title",
+          "metadata",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "ToolStateError": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "error"
+            ]
+          },
+          "input": {
+            "type": "object"
+          },
+          "error": {
+            "type": "string"
+          },
+          "metadata": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "start": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "end": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              }
+            },
+            "required": [
+              "start",
+              "end"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "status",
+          "input",
+          "error",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "ToolState": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/ToolStatePending"
+          },
+          {
+            "$ref": "#/components/schemas/ToolStateRunning"
+          },
+          {
+            "$ref": "#/components/schemas/ToolStateCompleted"
+          },
+          {
+            "$ref": "#/components/schemas/ToolStateError"
+          }
+        ]
+      },
+      "ToolPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool"
+            ]
+          },
+          "callID": {
+            "type": "string"
+          },
+          "tool": {
+            "type": "string"
+          },
+          "state": {
+            "$ref": "#/components/schemas/ToolState"
+          },
+          "metadata": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "callID",
+          "tool",
+          "state"
+        ],
+        "additionalProperties": false
+      },
+      "StepStartPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "step-start"
+            ]
+          },
+          "snapshot": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "StepFinishPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "step-finish"
+            ]
+          },
+          "reason": {
+            "type": "string"
+          },
+          "snapshot": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "cost": {
+            "type": "number"
+          },
+          "tokens": {
+            "type": "object",
+            "properties": {
+              "total": {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "input": {
+                "type": "number"
+              },
+              "output": {
+                "type": "number"
+              },
+              "reasoning": {
+                "type": "number"
+              },
+              "cache": {
+                "type": "object",
+                "properties": {
+                  "read": {
+                    "type": "number"
+                  },
+                  "write": {
+                    "type": "number"
+                  }
+                },
+                "required": [
+                  "read",
+                  "write"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "input",
+              "output",
+              "reasoning",
+              "cache"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "reason",
+          "cost",
+          "tokens"
+        ],
+        "additionalProperties": false
+      },
+      "SnapshotPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "snapshot"
+            ]
+          },
+          "snapshot": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "snapshot"
+        ],
+        "additionalProperties": false
+      },
+      "PatchPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "patch"
+            ]
+          },
+          "hash": {
+            "type": "string"
+          },
+          "files": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "hash",
+          "files"
+        ],
+        "additionalProperties": false
+      },
+      "AgentPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent"
+            ]
+          },
+          "name": {
+            "type": "string"
+          },
+          "source": {
+            "anyOf": [
+              {
+                "type": "object",
+                "properties": {
+                  "value": {
+                    "type": "string"
+                  },
+                  "start": {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  },
+                  "end": {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "value",
+                  "start",
+                  "end"
+                ],
+                "additionalProperties": false
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "name"
+        ],
+        "additionalProperties": false
+      },
+      "RetryPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "retry"
+            ]
+          },
+          "attempt": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "error": {
+            "$ref": "#/components/schemas/APIError"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "attempt",
+          "error",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "CompactionPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "compaction"
+            ]
+          },
+          "auto": {
+            "type": "boolean"
+          },
+          "overflow": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "tail_start_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg"
+                  }
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "auto"
+        ],
+        "additionalProperties": false
+      },
+      "Part": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/TextPart"
+          },
+          {
+            "$ref": "#/components/schemas/SubtaskPart"
+          },
+          {
+            "$ref": "#/components/schemas/ReasoningPart"
+          },
+          {
+            "$ref": "#/components/schemas/FilePart"
+          },
+          {
+            "$ref": "#/components/schemas/ToolPart"
+          },
+          {
+            "$ref": "#/components/schemas/StepStartPart"
+          },
+          {
+            "$ref": "#/components/schemas/StepFinishPart"
+          },
+          {
+            "$ref": "#/components/schemas/SnapshotPart"
+          },
+          {
+            "$ref": "#/components/schemas/PatchPart"
+          },
+          {
+            "$ref": "#/components/schemas/AgentPart"
+          },
+          {
+            "$ref": "#/components/schemas/RetryPart"
+          },
+          {
+            "$ref": "#/components/schemas/CompactionPart"
+          }
+        ]
+      },
+      "message.part.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "message.part.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "part": {
+                "$ref": "#/components/schemas/Part"
+              },
+              "time": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "sessionID",
+              "part",
+              "time"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "message.part.removed": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "message.part.removed"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg"
+                  }
+                ]
+              },
+              "partID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^prt"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "sessionID",
+              "messageID",
+              "partID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.execution.settled": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.execution.settled"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "outcome": {
+                "type": "string",
+                "enum": [
+                  "success",
+                  "failure",
+                  "interrupted"
+                ]
+              },
+              "error": {
+                "$ref": "#/components/schemas/Session.Error.Unknown"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "outcome"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.text.delta": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.text.delta"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "textID": {
+                "type": "string"
+              },
+              "delta": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "assistantMessageID",
+              "textID",
+              "delta"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.reasoning.delta": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.reasoning.delta"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "reasoningID": {
+                "type": "string"
+              },
+              "delta": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "assistantMessageID",
+              "reasoningID",
+              "delta"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.tool.input.delta": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.tool.input.delta"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "callID": {
+                "type": "string"
+              },
+              "delta": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "assistantMessageID",
+              "callID",
+              "delta"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.next.compaction.delta": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.next.compaction.delta"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "timestamp": {
+                "type": "number"
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "text": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "timestamp",
+              "sessionID",
+              "messageID",
+              "text"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "file.edited": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "file.edited"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "file": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "file"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "reference.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "reference.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "permission.v2.asked": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "permission.v2.asked"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^per"
+                  }
+                ]
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "action": {
+                "type": "string"
+              },
+              "resources": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "save": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "metadata": {
+                "type": "object"
+              },
+              "source": {
+                "$ref": "#/components/schemas/PermissionV2.Source"
+              }
+            },
+            "required": [
+              "id",
+              "sessionID",
+              "action",
+              "resources"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "permission.v2.replied": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "permission.v2.replied"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "requestID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^per"
+                  }
+                ]
+              },
+              "reply": {
+                "$ref": "#/components/schemas/PermissionV2.Reply"
+              }
+            },
+            "required": [
+              "sessionID",
+              "requestID",
+              "reply"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "plugin.added": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "plugin.added"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "id"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "project.directories.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "project.directories.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "projectID": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "projectID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "command.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "command.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "skill.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "skill.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "file.watcher.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "file.watcher.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "file": {
+                "type": "string"
+              },
+              "event": {
+                "type": "string",
+                "enum": [
+                  "add",
+                  "change",
+                  "unlink"
+                ]
+              }
+            },
+            "required": [
+              "file",
+              "event"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "Pty": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^pty"
+              }
+            ]
+          },
+          "title": {
+            "type": "string"
+          },
+          "command": {
+            "type": "string"
+          },
+          "args": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "cwd": {
+            "type": "string"
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "running",
+              "exited"
+            ]
+          },
+          "pid": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "exitCode": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "title",
+          "command",
+          "args",
+          "cwd",
+          "status",
+          "pid"
+        ],
+        "additionalProperties": false
+      },
+      "pty.created": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "pty.created"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "info": {
+                "$ref": "#/components/schemas/Pty"
+              }
+            },
+            "required": [
+              "info"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "pty.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "pty.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "info": {
+                "$ref": "#/components/schemas/Pty"
+              }
+            },
+            "required": [
+              "info"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "pty.exited": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "pty.exited"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^pty"
+                  }
+                ]
+              },
+              "exitCode": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              }
+            },
+            "required": [
+              "id",
+              "exitCode"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "pty.deleted": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "pty.deleted"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^pty"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "id"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "Shell": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^sh_"
+              }
+            ]
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "running",
+              "exited",
+              "timeout",
+              "killed"
+            ]
+          },
+          "command": {
+            "type": "string"
+          },
+          "cwd": {
+            "type": "string"
+          },
+          "shell": {
+            "type": "string"
+          },
+          "file": {
+            "type": "string"
+          },
+          "pid": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "exit": {
+            "anyOf": [
+              {
+                "type": "number"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "NaN"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "-Infinity"
+                ]
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "started": {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              "completed": {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              }
+            },
+            "required": [
+              "started"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "status",
+          "command",
+          "cwd",
+          "shell",
+          "file",
+          "metadata",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "shell.created": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell.created"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "info": {
+                "$ref": "#/components/schemas/Shell"
+              }
+            },
+            "required": [
+              "info"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "shell.exited": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell.exited"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^sh_"
+                  }
+                ]
+              },
+              "exit": {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              "status": {
+                "type": "string",
+                "enum": [
+                  "running",
+                  "exited",
+                  "timeout",
+                  "killed"
+                ]
+              }
+            },
+            "required": [
+              "id",
+              "status"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "shell.deleted": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell.deleted"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^sh_"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "id"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionV2.Option": {
+        "type": "object",
+        "properties": {
+          "label": {
+            "type": "string",
+            "description": "Display text (1-5 words, concise)"
+          },
+          "description": {
+            "type": "string",
+            "description": "Explanation of choice"
+          }
+        },
+        "required": [
+          "label",
+          "description"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionV2.Info": {
+        "type": "object",
+        "properties": {
+          "question": {
+            "type": "string",
+            "description": "Complete question"
+          },
+          "header": {
+            "type": "string",
+            "description": "Very short label (max 30 chars)"
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/QuestionV2.Option"
+            },
+            "description": "Available choices"
+          },
+          "multiple": {
+            "type": "boolean"
+          },
+          "custom": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "question",
+          "header",
+          "options"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionV2.Tool": {
+        "type": "object",
+        "properties": {
+          "messageID": {
+            "type": "string"
+          },
+          "callID": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "messageID",
+          "callID"
+        ],
+        "additionalProperties": false
+      },
+      "question.v2.asked": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "question.v2.asked"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^que"
+                  }
+                ]
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "questions": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/QuestionV2.Info"
+                },
+                "description": "Questions to ask"
+              },
+              "tool": {
+                "$ref": "#/components/schemas/QuestionV2.Tool"
+              }
+            },
+            "required": [
+              "id",
+              "sessionID",
+              "questions"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionV2.Answer": {
+        "type": "array",
+        "items": {
+          "type": "string"
+        }
+      },
+      "question.v2.replied": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "question.v2.replied"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "requestID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^que"
+                  }
+                ]
+              },
+              "answers": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/QuestionV2.Answer"
+                }
+              }
+            },
+            "required": [
+              "sessionID",
+              "requestID",
+              "answers"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "question.v2.rejected": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "question.v2.rejected"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "requestID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^que"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "sessionID",
+              "requestID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "Form.Metadata1": {
+        "type": "object"
+      },
+      "Form.When1": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "op": {
+            "type": "string",
+            "enum": [
+              "eq",
+              "neq"
+            ]
+          },
+          "value": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "boolean"
+              }
+            ]
+          }
+        },
+        "required": [
+          "key",
+          "op",
+          "value"
+        ],
+        "additionalProperties": false
+      },
+      "Form.StringField1": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When1"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "string"
+            ]
+          },
+          "format": {
+            "type": "string",
+            "enum": [
+              "email",
+              "uri",
+              "date",
+              "date-time"
+            ]
+          },
+          "minLength": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "maxLength": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "pattern": {
+            "type": "string"
+          },
+          "placeholder": {
+            "type": "string"
+          },
+          "default": {
+            "type": "string"
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.Option"
+            }
+          },
+          "custom": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "key",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Form.NumberField1": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When1"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "number"
+            ]
+          },
+          "minimum": {
+            "anyOf": [
+              {
+                "type": "number"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "NaN"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "-Infinity"
+                ]
+              }
+            ]
+          },
+          "maximum": {
+            "anyOf": [
+              {
+                "type": "number"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "NaN"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "-Infinity"
+                ]
+              }
+            ]
+          },
+          "default": {
+            "anyOf": [
+              {
+                "type": "number"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "NaN"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "-Infinity"
+                ]
+              }
+            ]
+          }
+        },
+        "required": [
+          "key",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Form.IntegerField1": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When1"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "integer"
+            ]
+          },
+          "minimum": {
+            "anyOf": [
+              {
+                "type": "number"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "NaN"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "-Infinity"
+                ]
+              }
+            ]
+          },
+          "maximum": {
+            "anyOf": [
+              {
+                "type": "number"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "NaN"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "-Infinity"
+                ]
+              }
+            ]
+          },
+          "default": {
+            "anyOf": [
+              {
+                "type": "number"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "NaN"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "-Infinity"
+                ]
+              }
+            ]
+          }
+        },
+        "required": [
+          "key",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Form.BooleanField1": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When1"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "boolean"
+            ]
+          },
+          "default": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "key",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Form.MultiselectField1": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When1"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "multiselect"
+            ]
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.Option"
+            }
+          },
+          "minItems": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "maxItems": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "custom": {
+            "type": "boolean"
+          },
+          "default": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "key",
+          "type",
+          "options"
+        ],
+        "additionalProperties": false
+      },
+      "Form.FormInfo1": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^frm_"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Form.Metadata1"
+          },
+          "mode": {
+            "type": "string",
+            "enum": [
+              "form"
+            ]
+          },
+          "fields": {
+            "type": "array",
+            "items": {
+              "anyOf": [
+                {
+                  "$ref": "#/components/schemas/Form.StringField1"
+                },
+                {
+                  "$ref": "#/components/schemas/Form.NumberField1"
+                },
+                {
+                  "$ref": "#/components/schemas/Form.IntegerField1"
+                },
+                {
+                  "$ref": "#/components/schemas/Form.BooleanField1"
+                },
+                {
+                  "$ref": "#/components/schemas/Form.MultiselectField1"
+                }
+              ]
+            }
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "mode",
+          "fields"
+        ],
+        "additionalProperties": false
+      },
+      "Form.UrlInfo1": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^frm_"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Form.Metadata1"
+          },
+          "mode": {
+            "type": "string",
+            "enum": [
+              "url"
+            ]
+          },
+          "url": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "mode",
+          "url"
+        ],
+        "additionalProperties": false
+      },
+      "form.created": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "form.created"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "form": {
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/Form.FormInfo1"
+                  },
+                  {
+                    "$ref": "#/components/schemas/Form.UrlInfo1"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "form"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "Form.Value1": {
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "anyOf": [
+              {
+                "type": "number"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "NaN"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "-Infinity"
+                ]
+              }
+            ]
+          },
+          {
+            "type": "boolean"
+          },
+          {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        ]
+      },
+      "Form.Answer1": {
+        "type": "object",
+        "additionalProperties": {
+          "$ref": "#/components/schemas/Form.Value1"
+        }
+      },
+      "form.replied": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "form.replied"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^frm_"
+                  }
+                ]
+              },
+              "sessionID": {
+                "type": "string"
+              },
+              "answer": {
+                "$ref": "#/components/schemas/Form.Answer1"
+              }
+            },
+            "required": [
+              "id",
+              "sessionID",
+              "answer"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "form.cancelled": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "form.cancelled"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^frm_"
+                  }
+                ]
+              },
+              "sessionID": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "id",
+              "sessionID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "Todo": {
+        "type": "object",
+        "properties": {
+          "content": {
+            "type": "string",
+            "description": "Brief description of the task"
+          },
+          "status": {
+            "type": "string",
+            "description": "Current status of the task: pending, in_progress, completed, cancelled"
+          },
+          "priority": {
+            "type": "string",
+            "description": "Priority level of the task: high, medium, low"
+          }
+        },
+        "required": [
+          "content",
+          "status",
+          "priority"
+        ],
+        "additionalProperties": false
+      },
+      "todo.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "todo.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "todos": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/Todo"
+                }
+              }
+            },
+            "required": [
+              "sessionID",
+              "todos"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "SessionStatus": {
+        "anyOf": [
+          {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "idle"
+                ]
+              }
+            },
+            "required": [
+              "type"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "retry"
+                ]
+              },
+              "attempt": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "message": {
+                "type": "string"
+              },
+              "action": {
+                "type": "object",
+                "properties": {
+                  "reason": {
+                    "type": "string"
+                  },
+                  "provider": {
+                    "type": "string"
+                  },
+                  "title": {
+                    "type": "string"
+                  },
+                  "message": {
+                    "type": "string"
+                  },
+                  "label": {
+                    "type": "string"
+                  },
+                  "link": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "reason",
+                  "provider",
+                  "title",
+                  "message",
+                  "label"
+                ],
+                "additionalProperties": false
+              },
+              "next": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              }
+            },
+            "required": [
+              "type",
+              "attempt",
+              "message",
+              "next"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "busy"
+                ]
+              }
+            },
+            "required": [
+              "type"
+            ],
+            "additionalProperties": false
+          }
+        ]
+      },
+      "session.status": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.status"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "status": {
+                "$ref": "#/components/schemas/SessionStatus"
+              }
+            },
+            "required": [
+              "sessionID",
+              "status"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.idle": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.idle"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "sessionID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "tui.prompt.append": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "tui.prompt.append"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "text": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "text"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "tui.command.execute": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "tui.command.execute"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "command": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "enum": [
+                      "session.list",
+                      "session.new",
+                      "session.share",
+                      "session.interrupt",
+                      "session.background",
+                      "session.compact",
+                      "session.page.up",
+                      "session.page.down",
+                      "session.line.up",
+                      "session.line.down",
+                      "session.half.page.up",
+                      "session.half.page.down",
+                      "session.first",
+                      "session.last",
+                      "prompt.clear",
+                      "prompt.submit",
+                      "agent.cycle"
+                    ]
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "command"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "tui.toast.show": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "tui.toast.show"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "title": {
+                "type": "string"
+              },
+              "message": {
+                "type": "string"
+              },
+              "variant": {
+                "type": "string",
+                "enum": [
+                  "info",
+                  "success",
+                  "warning",
+                  "error"
+                ]
+              },
+              "duration": {
+                "anyOf": [
+                  {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "exclusiveMinimum": 0
+                      }
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "message",
+              "variant"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "tui.session.select": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "tui.session.select"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses",
+                    "description": "Session ID to navigate to"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "sessionID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "installation.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "installation.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "version": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "version"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "installation.update-available": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "installation.update-available"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "version": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "version"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "vcs.branch.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "vcs.branch.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "branch": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "mcp.status.changed": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp.status.changed"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "server": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "server"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "permission.asked": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "permission.asked"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^per"
+                  }
+                ]
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "permission": {
+                "type": "string"
+              },
+              "patterns": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "metadata": {
+                "type": "object"
+              },
+              "always": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "tool": {
+                "anyOf": [
+                  {
+                    "type": "object",
+                    "properties": {
+                      "messageID": {
+                        "type": "string"
+                      },
+                      "callID": {
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "messageID",
+                      "callID"
+                    ],
+                    "additionalProperties": false
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "id",
+              "sessionID",
+              "permission",
+              "patterns",
+              "metadata",
+              "always"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "permission.replied": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "permission.replied"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "requestID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^per"
+                  }
+                ]
+              },
+              "reply": {
+                "type": "string",
+                "enum": [
+                  "once",
+                  "always",
+                  "reject"
+                ]
+              }
+            },
+            "required": [
+              "sessionID",
+              "requestID",
+              "reply"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionOption": {
+        "type": "object",
+        "properties": {
+          "label": {
+            "type": "string",
+            "description": "Display text (1-5 words, concise)"
+          },
+          "description": {
+            "type": "string",
+            "description": "Explanation of choice"
+          }
+        },
+        "required": [
+          "label",
+          "description"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionInfo": {
+        "type": "object",
+        "properties": {
+          "question": {
+            "type": "string",
+            "description": "Complete question"
+          },
+          "header": {
+            "type": "string",
+            "description": "Very short label (max 30 chars)"
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/QuestionOption"
+            },
+            "description": "Available choices"
+          },
+          "multiple": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Allow selecting multiple choices"
+          },
+          "custom": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Allow typing a custom answer (default: true)"
+          }
+        },
+        "required": [
+          "question",
+          "header",
+          "options"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionTool": {
+        "type": "object",
+        "properties": {
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "callID": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "messageID",
+          "callID"
+        ],
+        "additionalProperties": false
+      },
+      "question.asked": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "question.asked"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^que"
+                  }
+                ]
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "questions": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/QuestionInfo"
+                },
+                "description": "Questions to ask"
+              },
+              "tool": {
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/QuestionTool"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "id",
+              "sessionID",
+              "questions"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionAnswer": {
+        "type": "array",
+        "items": {
+          "type": "string"
+        }
+      },
+      "question.replied": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "question.replied"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "requestID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^que"
+                  }
+                ]
+              },
+              "answers": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/QuestionAnswer"
+                }
+              }
+            },
+            "required": [
+              "sessionID",
+              "requestID",
+              "answers"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "question.rejected": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "question.rejected"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "requestID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^que"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "sessionID",
+              "requestID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.error": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.error"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "allOf": [
+                      {
+                        "pattern": "^ses"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "error": {
+                "anyOf": [
+                  {
+                    "anyOf": [
+                      {
+                        "$ref": "#/components/schemas/ProviderAuthError"
+                      },
+                      {
+                        "$ref": "#/components/schemas/UnknownError1"
+                      },
+                      {
+                        "$ref": "#/components/schemas/MessageOutputLengthError"
+                      },
+                      {
+                        "$ref": "#/components/schemas/MessageAbortedError"
+                      },
+                      {
+                        "$ref": "#/components/schemas/StructuredOutputError"
+                      },
+                      {
+                        "$ref": "#/components/schemas/ContextOverflowError"
+                      },
+                      {
+                        "$ref": "#/components/schemas/ContentFilterError"
+                      },
+                      {
+                        "$ref": "#/components/schemas/APIError"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "V2Event.server.connected": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "durable": {
+            "anyOf": [
+              {
+                "type": "object",
+                "properties": {
+                  "aggregateID": {
+                    "type": "string"
+                  },
+                  "seq": {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  },
+                  "version": {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 1
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "aggregateID",
+                  "seq",
+                  "version"
+                ],
+                "additionalProperties": false
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "location": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Location.Ref"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "server.connected"
+            ]
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "V2Event": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/models-dev.refreshed"
+          },
+          {
+            "$ref": "#/components/schemas/integration.updated"
+          },
+          {
+            "$ref": "#/components/schemas/integration.connection.updated"
+          },
+          {
+            "$ref": "#/components/schemas/catalog.updated"
+          },
+          {
+            "$ref": "#/components/schemas/agent.updated"
+          },
+          {
+            "$ref": "#/components/schemas/session.created"
+          },
+          {
+            "$ref": "#/components/schemas/session.updated"
+          },
+          {
+            "$ref": "#/components/schemas/session.deleted"
+          },
+          {
+            "$ref": "#/components/schemas/message.updated"
+          },
+          {
+            "$ref": "#/components/schemas/message.removed"
+          },
+          {
+            "$ref": "#/components/schemas/message.part.updated"
+          },
+          {
+            "$ref": "#/components/schemas/message.part.removed"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.agent.switched"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.model.switched"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.moved"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.renamed"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.forked"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.prompted"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.prompt.admitted"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.execution.settled"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.context.updated"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.synthetic"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.skill.activated"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.shell.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.shell.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.step.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.step.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.step.failed"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.text.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.text.delta"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.text.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.reasoning.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.reasoning.delta"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.reasoning.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.tool.input.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.tool.input.delta"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.tool.input.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.tool.called"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.tool.progress"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.tool.success"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.tool.failed"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.retried"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.compaction.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.compaction.delta"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.compaction.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.revert.staged"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.revert.cleared"
+          },
+          {
+            "$ref": "#/components/schemas/session.next.revert.committed"
+          },
+          {
+            "$ref": "#/components/schemas/file.edited"
+          },
+          {
+            "$ref": "#/components/schemas/reference.updated"
+          },
+          {
+            "$ref": "#/components/schemas/permission.v2.asked"
+          },
+          {
+            "$ref": "#/components/schemas/permission.v2.replied"
+          },
+          {
+            "$ref": "#/components/schemas/plugin.added"
+          },
+          {
+            "$ref": "#/components/schemas/project.directories.updated"
+          },
+          {
+            "$ref": "#/components/schemas/command.updated"
+          },
+          {
+            "$ref": "#/components/schemas/skill.updated"
+          },
+          {
+            "$ref": "#/components/schemas/file.watcher.updated"
+          },
+          {
+            "$ref": "#/components/schemas/pty.created"
+          },
+          {
+            "$ref": "#/components/schemas/pty.updated"
+          },
+          {
+            "$ref": "#/components/schemas/pty.exited"
+          },
+          {
+            "$ref": "#/components/schemas/pty.deleted"
+          },
+          {
+            "$ref": "#/components/schemas/shell.created"
+          },
+          {
+            "$ref": "#/components/schemas/shell.exited"
+          },
+          {
+            "$ref": "#/components/schemas/shell.deleted"
+          },
+          {
+            "$ref": "#/components/schemas/question.v2.asked"
+          },
+          {
+            "$ref": "#/components/schemas/question.v2.replied"
+          },
+          {
+            "$ref": "#/components/schemas/question.v2.rejected"
+          },
+          {
+            "$ref": "#/components/schemas/form.created"
+          },
+          {
+            "$ref": "#/components/schemas/form.replied"
+          },
+          {
+            "$ref": "#/components/schemas/form.cancelled"
+          },
+          {
+            "$ref": "#/components/schemas/todo.updated"
+          },
+          {
+            "$ref": "#/components/schemas/session.status"
+          },
+          {
+            "$ref": "#/components/schemas/session.idle"
+          },
+          {
+            "$ref": "#/components/schemas/tui.prompt.append"
+          },
+          {
+            "$ref": "#/components/schemas/tui.command.execute"
+          },
+          {
+            "$ref": "#/components/schemas/tui.toast.show"
+          },
+          {
+            "$ref": "#/components/schemas/tui.session.select"
+          },
+          {
+            "$ref": "#/components/schemas/installation.updated"
+          },
+          {
+            "$ref": "#/components/schemas/installation.update-available"
+          },
+          {
+            "$ref": "#/components/schemas/vcs.branch.updated"
+          },
+          {
+            "$ref": "#/components/schemas/mcp.status.changed"
+          },
+          {
+            "$ref": "#/components/schemas/permission.asked"
+          },
+          {
+            "$ref": "#/components/schemas/permission.replied"
+          },
+          {
+            "$ref": "#/components/schemas/question.asked"
+          },
+          {
+            "$ref": "#/components/schemas/question.replied"
+          },
+          {
+            "$ref": "#/components/schemas/question.rejected"
+          },
+          {
+            "$ref": "#/components/schemas/session.error"
+          },
+          {
+            "$ref": "#/components/schemas/V2Event.server.connected"
+          }
+        ]
+      },
+      "V2EventStream": {
+        "type": "string",
+        "contentSchema": {
+          "$ref": "#/components/schemas/V2Event"
+        },
+        "contentMediaType": "application/json"
+      },
+      "EventLog.Hint": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "log.hint"
+            ]
+          },
+          "aggregateID": {
+            "type": "string"
+          },
+          "seq": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "aggregateID",
+          "seq"
+        ],
+        "additionalProperties": false,
+        "description": "Payload-free change hint: the aggregate's durable log advanced to at least seq. Hints coalesce under backpressure (latest per aggregate) and are never a delivery guarantee."
+      },
+      "EventLog.SweepRequired": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "log.sweep_required"
+            ]
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Hints may have been lost; treat every aggregate as potentially dirty and recover via bounded sweep plus durable log reads. Emitted first on every (re)subscribe."
+      },
+      "EventLog.Change": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/EventLog.Hint"
+          },
+          {
+            "$ref": "#/components/schemas/EventLog.SweepRequired"
+          }
+        ]
+      },
+      "EventLog.ChangeStream": {
+        "type": "string",
+        "contentSchema": {
+          "$ref": "#/components/schemas/EventLog.Change"
+        },
+        "contentMediaType": "application/json"
+      },
+      "PtyNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "PtyNotFoundError"
+            ]
+          },
+          "ptyID": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "ptyID",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "PtyTicket.ConnectToken": {
+        "type": "object",
+        "properties": {
+          "ticket": {
+            "type": "string"
+          },
+          "expires_in": {
+            "type": "integer",
+            "allOf": [
+              {
+                "exclusiveMinimum": 0
+              }
+            ]
+          }
+        },
+        "required": [
+          "ticket",
+          "expires_in"
+        ],
+        "additionalProperties": false
+      },
+      "ForbiddenError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "ForbiddenError"
+            ]
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "Shell1": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^sh_"
+              }
+            ]
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "running",
+              "exited",
+              "timeout",
+              "killed"
+            ]
+          },
+          "command": {
+            "type": "string"
+          },
+          "cwd": {
+            "type": "string"
+          },
+          "shell": {
+            "type": "string"
+          },
+          "file": {
+            "type": "string"
+          },
+          "pid": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "exit": {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity",
+                  "-Infinity",
+                  "NaN"
+                ]
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "started": {
+                "anyOf": [
+                  {
+                    "anyOf": [
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "NaN"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "-Infinity"
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity",
+                      "-Infinity",
+                      "NaN"
+                    ]
+                  }
+                ]
+              },
+              "completed": {
+                "anyOf": [
+                  {
+                    "anyOf": [
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "NaN"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "-Infinity"
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity",
+                      "-Infinity",
+                      "NaN"
+                    ]
+                  }
+                ]
+              }
+            },
+            "required": [
+              "started"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "status",
+          "command",
+          "cwd",
+          "shell",
+          "file",
+          "metadata",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "ShellNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "ShellNotFoundError"
+            ]
+          },
+          "id": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "id",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionV2.Request": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^que"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "questions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/QuestionV2.Info"
+            },
+            "description": "Questions to ask"
+          },
+          "tool": {
+            "$ref": "#/components/schemas/QuestionV2.Tool"
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "questions"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionV2.Reply": {
+        "type": "object",
+        "properties": {
+          "answers": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/QuestionV2.Answer"
+            },
+            "description": "User answers in order of questions (each answer is an array of selected labels)"
+          }
+        },
+        "required": [
+          "answers"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "QuestionNotFoundError"
+            ]
+          },
+          "requestID": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "requestID",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "Reference.LocalSource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "local"
+            ]
+          },
+          "path": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "hidden": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "type",
+          "path"
+        ],
+        "additionalProperties": false
+      },
+      "Reference.GitSource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "git"
+            ]
+          },
+          "repository": {
+            "type": "string"
+          },
+          "branch": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "hidden": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "type",
+          "repository"
+        ],
+        "additionalProperties": false
+      },
+      "Reference.Source": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/Reference.LocalSource"
+          },
+          {
+            "$ref": "#/components/schemas/Reference.GitSource"
+          }
+        ]
+      },
+      "Reference.Info": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "path": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "hidden": {
+            "type": "boolean"
+          },
+          "source": {
+            "$ref": "#/components/schemas/Reference.Source"
+          }
+        },
+        "required": [
+          "name",
+          "path",
+          "source"
+        ],
+        "additionalProperties": false
+      },
+      "ProjectCopy.Copy": {
+        "type": "object",
+        "properties": {
+          "directory": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "directory"
+        ],
+        "additionalProperties": false
+      },
+      "ProjectCopyError": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "ProjectCopyError"
+            ]
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "message": {
+                "type": "string"
+              },
+              "forceRequired": {
+                "anyOf": [
+                  {
+                    "type": "boolean"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "message"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "name",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "Vcs.FileStatus": {
+        "type": "object",
+        "properties": {
+          "file": {
+            "type": "string"
+          },
+          "additions": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "deletions": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "added",
+              "deleted",
+              "modified"
+            ]
+          }
+        },
+        "required": [
+          "file",
+          "additions",
+          "deletions",
+          "status"
+        ],
+        "additionalProperties": false
+      },
+      "Vcs.Mode": {
+        "type": "string",
+        "enum": [
+          "working",
+          "branch"
+        ]
+      }
+    },
+    "securitySchemes": {}
+  },
+  "security": [],
+  "tags": [
+    {
+      "name": "server.health"
+    },
+    {
+      "name": "server.location"
+    },
+    {
+      "name": "server.agent"
+    },
+    {
+      "name": "plugins",
+      "description": "Experimental plugin routes."
+    },
+    {
+      "name": "sessions",
+      "description": "Experimental session routes."
+    },
+    {
+      "name": "messages",
+      "description": "Experimental message routes."
+    },
+    {
+      "name": "models",
+      "description": "Experimental model routes."
+    },
+    {
+      "name": "generate",
+      "description": "Experimental one-shot generation routes."
+    },
+    {
+      "name": "providers",
+      "description": "Experimental provider routes."
+    },
+    {
+      "name": "integrations",
+      "description": "Integration discovery and authentication routes."
+    },
+    {
+      "name": "mcp",
+      "description": "MCP server status routes."
+    },
+    {
+      "name": "server.credential"
+    },
+    {
+      "name": "projects",
+      "description": "Location-scoped project routes."
+    },
+    {
+      "name": "forms",
+      "description": "Session form routes."
+    },
+    {
+      "name": "permissions",
+      "description": "Experimental permission routes."
+    },
+    {
+      "name": "filesystem",
+      "description": "Experimental location-scoped filesystem routes."
+    },
+    {
+      "name": "commands",
+      "description": "Experimental command routes."
+    },
+    {
+      "name": "skills",
+      "description": "Experimental skill routes."
+    },
+    {
+      "name": "events",
+      "description": "Experimental event stream routes."
+    },
+    {
+      "name": "pty",
+      "description": "Experimental location-scoped PTY routes."
+    },
+    {
+      "name": "shell",
+      "description": "Experimental location-scoped shell command routes."
+    },
+    {
+      "name": "session questions",
+      "description": "Experimental session question routes."
+    },
+    {
+      "name": "reference",
+      "description": "Location-scoped project references."
+    },
+    {
+      "name": "projectCopy",
+      "description": "Project copy management routes."
+    },
+    {
+      "name": "vcs",
+      "description": "Location-scoped version control routes."
+    }
+  ]
+}
diff --git a/packages/codemode/test/openapi.test.ts b/packages/codemode/test/openapi.test.ts
new file mode 100644
index 0000000000..99a0890091
--- /dev/null
+++ b/packages/codemode/test/openapi.test.ts
@@ -0,0 +1,958 @@
+import { describe, expect, test } from "bun:test"
+import { Effect, Layer, Option } from "effect"
+import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
+import { CodeMode, OpenAPI } from "../src/index.js"
+import { inputTypeScript, outputTypeScript, Tool } from "../src/tool.js"
+
+const baseUrl = "http://localhost:4096"
+type Document = OpenAPI.Document
+
+type Recorded = {
+  readonly method: string
+  readonly url: string
+  readonly headers: Record<string, string>
+  readonly body: unknown
+}
+
+const opencodeSpec = async (): Promise<Document> => {
+  return Bun.file(new URL("./fixtures/opencode-v2-openapi.json", import.meta.url)).json() as Promise<Document>
+}
+
+const happyPathSpec = async (): Promise<Document> => {
+  return Bun.file(new URL("./fixtures/openapi-happy-path.json", import.meta.url)).json() as Promise<Document>
+}
+
+const isRecord = (value: unknown): value is Record<string, unknown> =>
+  typeof value === "object" && value !== null && !Array.isArray(value)
+
+const toolAt = (tools: unknown, name: string) =>
+  name.split(".").reduce<unknown>((current, segment) => (isRecord(current) ? current[segment] : undefined), tools)
+
+const recordingClient = (respond: (request: HttpClientRequest.HttpClientRequest) => Response) => {
+  const requests: Array<Recorded> = []
+  const layer = Layer.succeed(HttpClient.HttpClient)(
+    HttpClient.make((request) =>
+      Effect.gen(function* () {
+        const body =
+          request.body._tag === "Uint8Array" ? JSON.parse(new TextDecoder().decode(request.body.body)) : undefined
+        const url = Option.map(HttpClientRequest.toUrl(request), (resolved) => resolved.toString())
+        requests.push({
+          method: request.method,
+          url: Option.getOrElse(url, () => request.url),
+          headers: { ...request.headers },
+          body,
+        })
+        return HttpClientResponse.fromWeb(request, respond(request))
+      }),
+    ),
+  )
+  return { requests, layer }
+}
+
+const json = (value: unknown, status = 200) =>
+  new Response(JSON.stringify(value), { status, headers: { "content-type": "application/json" } })
+
+const singleOperation = (operation: Record<string, unknown>, method = "get"): Document => ({
+  openapi: "3.1.0",
+  paths: { "/test": { [method]: { operationId: "test", responses: { 200: { description: "Success" } }, ...operation } } },
+})
+
+describe("OpenAPI.fromSpec", () => {
+  test("covers a representative API from generation through execution", async () => {
+    const resolutions: Array<string> = []
+    const client = recordingClient((request) => {
+      const url = Option.getOrElse(HttpClientRequest.toUrl(request), () => new URL(request.url))
+      if (request.method === "POST") {
+        return new Response(
+          JSON.stringify({ id: "user-2", name: "Grace", email: "grace@example.test", role: "admin" }),
+          { status: 201, headers: { "content-type": "application/vnd.example+json" } },
+        )
+      }
+      if (request.method === "DELETE") return new Response(null, { status: 204 })
+      if (url.pathname === "/search") {
+        return new Response("2 matches", { headers: { "content-type": "text/plain" } })
+      }
+      return json({ id: "user-1", name: "Ada", email: "ada@example.test", role: "member" })
+    })
+    const api = OpenAPI.fromSpec({
+      spec: await happyPathSpec(),
+      baseUrl,
+      auth: {
+        resolve: ({ name }) => {
+          resolutions.push(name)
+          return Effect.succeed(
+            name === "BearerAuth"
+              ? { type: "bearer", token: "bearer-secret" }
+              : { type: "apiKey", value: "api-secret" },
+          )
+        },
+      },
+    })
+    const get = toolAt(api.tools, "users.get")
+    const create = toolAt(api.tools, "users.create")
+    const search = toolAt(api.tools, "search.run")
+    const remove = toolAt(api.tools, "users.remove")
+
+    expect(api.skipped).toEqual([])
+    if (!Tool.isDefinition(get) || !Tool.isDefinition(create) || !Tool.isDefinition(search) || !Tool.isDefinition(remove)) {
+      throw new Error("happy-path fixture did not generate every operation")
+    }
+    expect(inputTypeScript(get)).toBe(
+      '{ userId: string; include?: Array<string>; verbose?: boolean; "X-Trace-ID"?: string }',
+    )
+    expect(inputTypeScript(create)).toBe('{ name: string; email: string; role?: "admin" | "member" }')
+    expect(inputTypeScript(search)).toBe("{ filter?: { query: string; page?: number }; tags?: Array<string> }")
+    expect(inputTypeScript(remove)).toBe("{ userId: string }")
+    expect(outputTypeScript(get)).toContain("id: string")
+    expect(outputTypeScript(create)).toContain('role?: "admin" | "member"')
+    expect(outputTypeScript(search)).toBe("string")
+    expect(outputTypeScript(remove)).toBe("null")
+
+    const result = await Effect.runPromise(
+      CodeMode.make({ tools: { api: api.tools } })
+        .execute(`
+          const user = await tools.api.users.get({
+            userId: "user-1",
+            include: ["profile", "permissions"],
+            verbose: true,
+            "X-Trace-ID": "trace-1",
+          })
+          const created = await tools.api.users.create({
+            name: "Grace",
+            email: "grace@example.test",
+            role: "admin",
+          })
+          const summary = await tools.api.search.run({
+            filter: { query: "effect", page: 2 },
+            tags: ["typescript", "runtime"],
+          })
+          const removed = await tools.api.users.remove({ userId: "user-1" })
+          return { user, created, summary, removed }
+        `)
+        .pipe(Effect.provide(client.layer)),
+    )
+
+    expect(result).toMatchObject({
+      ok: true,
+      value: {
+        user: { id: "user-1", name: "Ada" },
+        created: { id: "user-2", name: "Grace" },
+        summary: "2 matches",
+        removed: null,
+      },
+    })
+    expect(resolutions).toEqual(["BearerAuth", "ApiKey", "BearerAuth"])
+    expect(client.requests).toHaveLength(4)
+
+    const getUrl = new URL(client.requests[0]!.url)
+    expect(getUrl.pathname).toBe("/users/user-1")
+    expect(getUrl.searchParams.get("include")).toBe("profile,permissions")
+    expect(getUrl.searchParams.get("verbose")).toBe("true")
+    expect(client.requests[0]!.headers["x-trace-id"]).toBe("trace-1")
+    expect(client.requests[0]!.headers.authorization).toBe("Bearer bearer-secret")
+
+    const createUrl = new URL(client.requests[1]!.url)
+    expect(createUrl.searchParams.get("api_key")).toBe("api-secret")
+    expect(client.requests[1]!.body).toEqual({ name: "Grace", email: "grace@example.test", role: "admin" })
+
+    const searchUrl = new URL(client.requests[2]!.url)
+    expect(searchUrl.searchParams.get("filter[query]")).toBe("effect")
+    expect(searchUrl.searchParams.get("filter[page]")).toBe("2")
+    expect(searchUrl.searchParams.getAll("tags")).toEqual(["typescript", "runtime"])
+    expect(client.requests[2]!.headers.authorization).toBeUndefined()
+    expect(new URL(client.requests[3]!.url).pathname).toBe("/users/user-1")
+    expect(client.requests[3]!.headers.authorization).toBe("Bearer bearer-secret")
+  })
+
+  test("converts representative opencode operations into the expected tool shape", async () => {
+    const spec = await opencodeSpec()
+    const result = OpenAPI.fromSpec({ spec, baseUrl })
+
+    expect(result.skipped).toHaveLength(5)
+    expect(result.skipped).toContainEqual({
+      method: "GET",
+      path: "/api/pty/{ptyID}/connect",
+      reason: "WebSocket operations are not supported",
+    })
+    expect(result.skipped.filter((item) => item.reason === "SSE operations are not supported")).toHaveLength(3)
+    expect(result.skipped).toContainEqual({
+      method: "GET",
+      path: "/api/fs/read/*",
+      reason: "binary responses are not supported",
+    })
+    expect(toolAt(result.tools, "v2.health.get")).not.toBeUndefined()
+    expect(toolAt(result.tools, "v2.session.get")).not.toBeUndefined()
+    expect(toolAt(result.tools, "v2.session.create")).not.toBeUndefined()
+
+    const sessionGet = toolAt(result.tools, "v2.session.get")
+    expect(Tool.isDefinition(sessionGet)).toBe(true)
+    if (!Tool.isDefinition(sessionGet)) throw new Error("v2.session.get was not generated")
+    expect(inputTypeScript(sessionGet)).toBe("{ sessionID: string }")
+    expect(outputTypeScript(sessionGet)).toContain("id: string")
+    expect(outputTypeScript(sessionGet)).toContain("additions: number")
+
+    const switchAgent = toolAt(result.tools, "v2.session.switchAgent")
+    expect(Tool.isDefinition(switchAgent)).toBe(true)
+    if (!Tool.isDefinition(switchAgent)) throw new Error("v2.session.switchAgent was not generated")
+    expect(inputTypeScript(switchAgent)).toBe("{ sessionID: string; agent: string }")
+
+    const contextEntryPut = toolAt(result.tools, "v2.session.contextEntry.put")
+    expect(Tool.isDefinition(contextEntryPut)).toBe(true)
+    if (!Tool.isDefinition(contextEntryPut)) throw new Error("v2.session.contextEntry.put was not generated")
+    expect(inputTypeScript(contextEntryPut)).toBe("{ sessionID: string; key: string; value: unknown }")
+    expect(toolAt(result.tools, "v2_session_context_entry_put_2")).toBeUndefined()
+    expect(toolAt(result.tools, "v2.pty.connect")).toBeUndefined()
+    expect(toolAt(result.tools, "v2.session.log")).toBeUndefined()
+    expect(toolAt(result.tools, "v2.event.subscribe")).toBeUndefined()
+    expect(toolAt(result.tools, "v2.event.changes")).toBeUndefined()
+    expect(toolAt(result.tools, "v2.fs.read")).toBeUndefined()
+    expect(toolAt(result.tools, "v2.pty.connectToken")).not.toBeUndefined()
+  })
+
+  test("preserves operation path sanitization and collision handling", () => {
+    const response = { responses: { 200: { description: "Success" } } }
+    const result = OpenAPI.fromSpec({
+      baseUrl,
+      spec: {
+        openapi: "3.1.0",
+        paths: {
+          "/first": { get: { ...response, operationId: "group.item" } },
+          "/second": { get: { ...response, operationId: "group.item" } },
+          "/third": { get: { ...response, operationId: "group..other" } },
+        },
+      },
+    })
+
+    expect(Tool.isDefinition(toolAt(result.tools, "group.item"))).toBe(true)
+    expect(Tool.isDefinition(toolAt(result.tools, "group_item_2"))).toBe(true)
+    expect(Tool.isDefinition(toolAt(result.tools, "group.operation.other"))).toBe(true)
+  })
+
+  test("synthesizes flat operation IDs from methods and paths", () => {
+    const response = { responses: { 200: { description: "Success" } } }
+    const tools = OpenAPI.fromSpec({
+      baseUrl,
+      spec: {
+        openapi: "3.1.0",
+        paths: {
+          "/users": { get: response, post: response },
+          "/users/{id}": { get: response, patch: response, delete: response },
+          "/organizations/{organizationId}/users/{id}": { get: response },
+        },
+      },
+    }).tools
+
+    for (const path of [
+      "getUsers",
+      "postUsers",
+      "getUsersById",
+      "patchUsersById",
+      "deleteUsersById",
+      "getOrganizationsByOrganizationidUsersById",
+    ]) {
+      expect(Tool.isDefinition(toolAt(tools, path))).toBe(true)
+    }
+  })
+
+  test("lets operation parameters override matching path parameters", () => {
+    const tool = toolAt(
+      OpenAPI.fromSpec({
+        baseUrl,
+        spec: {
+          openapi: "3.1.0",
+          paths: {
+            "/test": {
+              parameters: [{ name: "limit", in: "query", schema: { type: "string" } }],
+              get: {
+                operationId: "test",
+                parameters: [{ name: "limit", in: "query", required: true, schema: { type: "number" } }],
+                responses: { 200: { description: "Success" } },
+              },
+            },
+          },
+        },
+      }).tools,
+      "test",
+    )
+
+    if (!Tool.isDefinition(tool)) throw new Error("test was not generated")
+    expect(inputTypeScript(tool)).toBe("{ limit: number }")
+  })
+
+  test("normalizes OpenAPI 3.0 schemas with Effect", () => {
+    const result = OpenAPI.fromSpec({
+      baseUrl,
+      spec: {
+        openapi: "3.0.3",
+        paths: {
+          "/search": {
+            get: {
+              operationId: "search",
+              parameters: [
+                {
+                  in: "query",
+                  name: "value",
+                  schema: { type: "string", nullable: true, minLength: 2 },
+                },
+              ],
+              responses: { 200: { description: "Success" } },
+            },
+          },
+        },
+      },
+    })
+    const search = toolAt(result.tools, "search")
+
+    expect(Tool.isDefinition(search)).toBe(true)
+    if (!Tool.isDefinition(search)) throw new Error("search was not generated")
+    expect(inputTypeScript(search)).toBe("{ value?: string | null }")
+    const schema: unknown = search.input
+    const input = isRecord(schema) ? schema : {}
+    const properties = isRecord(input.properties) ? input.properties : {}
+    const value = isRecord(properties.value) ? properties.value : {}
+    expect(value.minLength).toBe(2)
+  })
+
+  test("preserves schema-local definitions alongside component definitions", () => {
+    const tool = toolAt(
+      OpenAPI.fromSpec({
+        baseUrl,
+        spec: {
+          openapi: "3.1.0",
+          paths: {
+            "/test": {
+              get: {
+                operationId: "test",
+                responses: {
+                  200: {
+                    description: "Success",
+                    content: {
+                      "application/json": {
+                        schema: { $ref: "#/$defs/Local", $defs: { Local: { type: "string" } } },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+          components: { schemas: { Global: { type: "number" } } },
+        },
+      }).tools,
+      "test",
+    )
+
+    if (!Tool.isDefinition(tool) || !isRecord(tool.output)) throw new Error("test output was not generated")
+    expect(tool.output.$defs).toMatchObject({ Local: { type: "string" }, Global: { type: "number" } })
+  })
+
+  test("documents that the opencode fixture is unauthenticated", async () => {
+    const spec = await opencodeSpec()
+    const components = isRecord(spec.components) ? spec.components : {}
+    const result = OpenAPI.fromSpec({ spec, baseUrl })
+
+    expect(spec.security).toStrictEqual([])
+    expect(isRecord(components.securitySchemes) ? Object.keys(components.securitySchemes) : []).toStrictEqual([])
+    const health = toolAt(result.tools, "v2.health.get")
+    const healthInput = isRecord(health) ? health.input : undefined
+    expect(healthInput).toMatchObject({ type: "object", properties: {} })
+    const input = isRecord(healthInput) ? healthInput : {}
+    expect(Object.keys(isRecord(input.properties) ? input.properties : {})).toStrictEqual([])
+  })
+
+  test("exposes real opencode operations through CodeMode discovery", async () => {
+    const { layer } = recordingClient(() => json({}))
+    const runtime = CodeMode.make({
+      tools: { opencode: OpenAPI.fromSpec({ spec: await opencodeSpec(), baseUrl }).tools },
+    })
+    const result = await Effect.runPromise(
+      runtime
+        .execute(
+          `
+        return await tools.$codemode.search({ query: "global health", namespace: "opencode", limit: 1 })
+      `,
+        )
+        .pipe(Effect.provide(layer)),
+    )
+
+    expect(result).toMatchObject({ ok: true })
+    if (!result.ok) return
+    expect(result.value).toMatchObject({
+      items: [
+        {
+          path: "tools.opencode.v2.health.get",
+          description: "Check whether the API server is ready to accept requests.",
+        },
+      ],
+    })
+    expect(JSON.stringify(result.value)).toContain("healthy: true")
+  })
+
+  test("invokes real opencode path parameters and JSON request bodies", async () => {
+    const { requests, layer } = recordingClient((request) => {
+      if (request.method === "GET") return json({ id: "ses_123" })
+      return json({ id: "ses_456" })
+    })
+    const runtime = CodeMode.make({
+      tools: { opencode: OpenAPI.fromSpec({ spec: await opencodeSpec(), baseUrl }).tools },
+    })
+
+    const result = await Effect.runPromise(
+      runtime
+        .execute(
+          `
+          const existing = await tools.opencode.v2.session.get({ sessionID: "ses_123" })
+          const created = await tools.opencode.v2.session.create({ id: "ses_456" })
+          return { existing, created }
+        `,
+        )
+        .pipe(Effect.provide(layer)),
+    )
+
+    expect(result).toMatchObject({ ok: true })
+    expect(requests).toHaveLength(2)
+    expect(requests[0]).toMatchObject({ method: "GET", body: undefined })
+    expect(new URL(requests[0]!.url).pathname).toBe("/api/session/ses_123")
+    expect(requests[1]).toMatchObject({
+      method: "POST",
+      url: "http://localhost:4096/api/session",
+      body: { id: "ses_456" },
+    })
+  })
+
+  test("serializes deep-object query parameters from the opencode fixture", async () => {
+    const client = recordingClient(() => json({ directory: "/tmp" }))
+    const location = toolAt(OpenAPI.fromSpec({ spec: await opencodeSpec(), baseUrl }).tools, "v2.location.get")
+    if (!Tool.isDefinition(location)) throw new Error("v2.location.get was not generated")
+
+    await Effect.runPromise(
+      location.run({ location: { directory: "/tmp", workspace: "workspace-1" } }).pipe(Effect.provide(client.layer)),
+    )
+
+    const url = new URL(client.requests[0]!.url)
+    expect(url.searchParams.get("location[directory]")).toBe("/tmp")
+    expect(url.searchParams.get("location[workspace]")).toBe("workspace-1")
+  })
+
+  test("serializes supported simple and form parameter shapes", async () => {
+    const client = recordingClient(() => json({ ok: true }))
+    const result = OpenAPI.fromSpec({
+      baseUrl,
+      spec: {
+        openapi: "3.1.0",
+        paths: {
+          "/items/{keys}": {
+            get: {
+              operationId: "items",
+              parameters: [
+                { name: "keys", in: "path", required: true, schema: { type: "array", items: { type: "string" } } },
+                { name: "tags", in: "query", style: "form", explode: false, schema: { type: "array" } },
+                { name: "filter", in: "query", style: "form", explode: true, schema: { type: "object" } },
+                { name: "nullable", in: "query", required: true, schema: { type: ["string", "null"] } },
+                { name: "constructor", in: "query", schema: { type: "string" } },
+                { name: "meta", in: "header", style: "simple", explode: true, schema: { type: "object" } },
+              ],
+              responses: { 200: { description: "Success" } },
+            },
+          },
+        },
+      },
+    })
+    const tool = toolAt(result.tools, "items")
+    if (!Tool.isDefinition(tool)) throw new Error("items was not generated")
+
+    await Effect.runPromise(
+      tool
+        .run({
+          keys: ["a!", "b*"],
+          tags: ["x", "y"],
+          filter: { state: "open", page: 2 },
+          nullable: null,
+          constructor_2: "safe",
+          meta: { a: "b", c: "d" },
+        })
+        .pipe(Effect.provide(client.layer)),
+    )
+
+    const url = new URL(client.requests[0]!.url)
+    expect(url.pathname).toBe("/items/a%21,b%2A")
+    expect(url.searchParams.get("tags")).toBe("x,y")
+    expect(url.searchParams.get("state")).toBe("open")
+    expect(url.searchParams.get("page")).toBe("2")
+    expect(url.searchParams.get("nullable")).toBe("null")
+    expect(url.searchParams.get("constructor")).toBe("safe")
+    expect(client.requests[0]!.headers.meta).toBe("a=b,c=d")
+    await expect(
+      Effect.runPromise(tool.run({ keys: [undefined] }).pipe(Effect.provide(client.layer))),
+    ).rejects.toThrow("unsupported nested value")
+  })
+
+  test("skips unsupported parameter encodings and malformed security", () => {
+    const result = OpenAPI.fromSpec({
+      baseUrl,
+      spec: {
+        openapi: "3.1.0",
+        security: [{ bearer: [] }],
+        paths: {
+          "/cookie": {
+            get: {
+              operationId: "cookie",
+              parameters: [{ name: "session", in: "cookie", schema: { type: "string" } }],
+              responses: { 200: { description: "Success" } },
+            },
+          },
+          "/reserved": {
+            get: {
+              operationId: "reserved",
+              parameters: [{ name: "query", in: "query", allowReserved: true, schema: { type: "string" } }],
+              responses: { 200: { description: "Success" } },
+            },
+          },
+          "/invalid-style": {
+            get: {
+              operationId: "invalidStyle",
+              parameters: [{ name: "query", in: "query", style: 42, schema: { type: "string" } }],
+              responses: { 200: { description: "Success" } },
+            },
+          },
+          "/security": {
+            get: { operationId: "security", security: null, responses: { 200: { description: "Success" } } },
+          },
+        },
+      },
+    })
+
+    expect(result.tools).toEqual({})
+    expect(result.skipped.map((item) => item.reason)).toEqual([
+      "cookie parameter 'session' is not supported",
+      "parameter 'query' uses unsupported allowReserved encoding",
+      "parameter 'query' has an invalid style",
+      "security declaration is not an array",
+    ])
+  })
+
+  test("fails closed on prototype-named missing security schemes", () => {
+    const result = OpenAPI.fromSpec({
+      baseUrl,
+      spec: singleOperation({ security: [JSON.parse('{"__proto__":[]}')] }),
+    })
+
+    expect(result.tools).toEqual({})
+    expect(result.skipped[0]?.reason).toBe("security requirement references missing or malformed scheme: __proto__")
+  })
+
+  test("resolves bearer authentication without exposing it as input", async () => {
+    const contexts: Array<Parameters<OpenAPI.AuthResolver>[0]> = []
+    const client = recordingClient(() => json({ ok: true }))
+    const spec = {
+      ...singleOperation({ operationId: undefined }),
+      security: [{ bearer: [] }],
+      components: { securitySchemes: { bearer: { type: "http", scheme: "bearer" } } },
+    } satisfies Document
+    const tool = toolAt(
+      OpenAPI.fromSpec({
+        baseUrl,
+        spec,
+        auth: {
+          resolve: (context) => {
+            contexts.push(context)
+            return Effect.succeed({ type: "bearer", token: "secret" })
+          },
+        },
+      }).tools,
+      "getTest",
+    )
+    if (!Tool.isDefinition(tool)) throw new Error("test was not generated")
+
+    await Effect.runPromise(tool.run({}).pipe(Effect.provide(client.layer)))
+
+    expect(inputTypeScript(tool)).toBe("{}")
+    expect(client.requests[0]!.headers.authorization).toBe("Bearer secret")
+    expect(contexts).toEqual([
+      {
+        name: "bearer",
+        definition: { type: "http", scheme: "bearer" },
+        scopes: [],
+        operation: {
+          operationId: undefined,
+          method: "GET",
+          path: "/test",
+          summary: undefined,
+          description: undefined,
+        },
+      },
+    ])
+  })
+
+  test("applies authentication carriers without prototype or collision loss", async () => {
+    const client = recordingClient(() => json({ ok: true }))
+    const authenticated = (security: ReadonlyArray<Record<string, ReadonlyArray<string>>>, schemes: Record<string, unknown>) =>
+      OpenAPI.fromSpec({
+        baseUrl,
+        spec: { ...singleOperation({}), security, components: { securitySchemes: schemes } },
+        auth: { resolve: () => Effect.succeed({ type: "apiKey", value: "secret" }) },
+      })
+    const prototype = toolAt(
+      authenticated([{ key: [] }], { key: { type: "apiKey", in: "query", name: "__proto__" } }).tools,
+      "test",
+    )
+    if (!Tool.isDefinition(prototype)) throw new Error("prototype auth tool was not generated")
+
+    await Effect.runPromise(prototype.run({}).pipe(Effect.provide(client.layer)))
+    expect(new URL(client.requests[0]!.url).searchParams.get("__proto__")).toBe("secret")
+
+    const duplicate = toolAt(
+      authenticated(
+        [{ first: [], second: [] }],
+        {
+          first: { type: "apiKey", in: "header", name: "x-key" },
+          second: { type: "apiKey", in: "header", name: "x-key" },
+        },
+      ).tools,
+      "test",
+    )
+    if (!Tool.isDefinition(duplicate)) throw new Error("duplicate auth tool was not generated")
+    await expect(Effect.runPromise(duplicate.run({}).pipe(Effect.provide(client.layer)))).rejects.toThrow(
+      "multiple credentials",
+    )
+
+    const cookie = authenticated([{ key: [] }], { key: { type: "apiKey", in: "cookie", name: "session" } })
+    expect(cookie.tools).toEqual({})
+    expect(cookie.skipped[0]?.reason).toBe("cookie authentication 'key' is not supported")
+
+    const alternative = OpenAPI.fromSpec({
+      baseUrl,
+      spec: {
+        ...singleOperation({}),
+        security: [{ cookie: [] }, { bearer: [] }],
+        components: {
+          securitySchemes: {
+            cookie: { type: "apiKey", in: "cookie", name: "session" },
+            bearer: { type: "http", scheme: "bearer" },
+          },
+        },
+      },
+      auth: {
+        resolve: ({ name }) =>
+          Effect.succeed(name === "bearer" ? { type: "bearer", token: "secret" } : undefined),
+      },
+    })
+    const alternativeTool = toolAt(alternative.tools, "test")
+    if (!Tool.isDefinition(alternativeTool)) throw new Error("supported auth alternative was not generated")
+    await Effect.runPromise(alternativeTool.run({}).pipe(Effect.provide(client.layer)))
+    expect(client.requests.at(-1)?.headers.authorization).toBe("Bearer secret")
+  })
+
+  test("honors server precedence and rejects ambiguous base URLs", async () => {
+    const client = recordingClient(() => json({ ok: true }))
+    const spec = {
+      ...singleOperation({ servers: [{ url: "https://operation.example/v1" }] }),
+      servers: [{ url: "https://document.example" }],
+    } satisfies Document
+    const tool = toolAt(OpenAPI.fromSpec({ spec }).tools, "test")
+    if (!Tool.isDefinition(tool)) throw new Error("test was not generated")
+
+    await Effect.runPromise(tool.run({}).pipe(Effect.provide(client.layer)))
+    expect(client.requests[0]?.url).toBe("https://operation.example/v1/test")
+
+    const invalid = OpenAPI.fromSpec({ spec, baseUrl: "https://example.com/api?tenant=one" })
+    expect(invalid.tools).toEqual({})
+    expect(invalid.skipped[0]?.reason).toContain("unsupported query string or fragment")
+
+    const malformed = OpenAPI.fromSpec({ spec, baseUrl: "https:/example.com" })
+    expect(malformed.tools).toEqual({})
+    expect(malformed.skipped[0]?.reason).toContain("not an absolute HTTP(S) URL")
+  })
+
+  test("resolves chained response refs before detecting unsupported transports", () => {
+    const result = OpenAPI.fromSpec({
+      baseUrl,
+      spec: {
+        ...singleOperation({ responses: { 200: { $ref: "#/components/responses/First" } } }),
+        components: {
+          responses: {
+            First: { $ref: "#/components/responses/Stream" },
+            Stream: { content: { "text/event-stream": { schema: { type: "string" } } } },
+          },
+        },
+      },
+    })
+
+    expect(result.tools).toEqual({})
+    expect(result.skipped[0]?.reason).toBe("SSE operations are not supported")
+  })
+
+  test("resolves response schemas before detecting binary output", () => {
+    const result = OpenAPI.fromSpec({
+      baseUrl,
+      spec: {
+        ...singleOperation({
+          responses: {
+            200: {
+              content: { "text/plain": { schema: { $ref: "#/components/schemas/File" } } },
+            },
+          },
+        }),
+        components: { schemas: { File: { type: "string", format: "binary" } } },
+      },
+    })
+
+    expect(result.tools).toEqual({})
+    expect(result.skipped[0]?.reason).toBe("binary responses are not supported")
+  })
+
+  test("validates composite parameters before resolving auth", async () => {
+    const resolutions: Array<string> = []
+    const client = recordingClient(() => json({ ok: true }))
+    const tool = toolAt(
+      OpenAPI.fromSpec({
+        baseUrl,
+        spec: {
+          ...singleOperation({
+            parameters: [{ name: "filter", in: "query", style: "form", explode: true, schema: { type: "object" } }],
+          }),
+          security: [{ bearer: [] }],
+          components: { securitySchemes: { bearer: { type: "http", scheme: "bearer" } } },
+        },
+        auth: {
+          resolve: ({ name }) => {
+            resolutions.push(name)
+            return Effect.succeed({ type: "bearer", token: "secret" })
+          },
+        },
+      }).tools,
+      "test",
+    )
+    if (!Tool.isDefinition(tool)) throw new Error("test was not generated")
+
+    await expect(
+      Effect.runPromise(tool.run({ filter: { value: undefined } }).pipe(Effect.provide(client.layer))),
+    ).rejects.toThrow("unsupported nested value")
+    expect(resolutions).toEqual([])
+    expect(client.requests).toEqual([])
+  })
+
+  test("preserves JSON media types and rejects unencodable bodies", async () => {
+    const client = recordingClient(() => json({ ok: true }))
+    const tool = toolAt(
+      OpenAPI.fromSpec({
+        baseUrl,
+        spec: singleOperation(
+          {
+            requestBody: {
+              required: true,
+              content: { "application/merge-patch+json": { schema: { type: "object" } } },
+            },
+          },
+          "post",
+        ),
+      }).tools,
+      "test",
+    )
+    if (!Tool.isDefinition(tool)) throw new Error("test was not generated")
+
+    await Effect.runPromise(tool.run({ body: { name: "updated" } }).pipe(Effect.provide(client.layer)))
+    expect(client.requests[0]!.headers["content-type"]).toBe("application/merge-patch+json")
+    const cyclic: Record<string, unknown> = {}
+    cyclic.self = cyclic
+    await expect(Effect.runPromise(tool.run({ body: cyclic }).pipe(Effect.provide(client.layer)))).rejects.toThrow(
+      "Invalid JSON body",
+    )
+  })
+
+  test("rejects oversized and malformed JSON responses", async () => {
+    const tool = toolAt(OpenAPI.fromSpec({ baseUrl, spec: singleOperation({}) }).tools, "test")
+    if (!Tool.isDefinition(tool)) throw new Error("test was not generated")
+    const oversized = recordingClient(
+      () => new Response(null, { headers: { "content-length": String(50 * 1024 * 1024 + 1) } }),
+    )
+    const malformed = recordingClient(
+      () => new Response("{", { headers: { "content-type": "application/json" } }),
+    )
+    const chunked = recordingClient(() => new Response(new Uint8Array(50 * 1024 * 1024 + 1)))
+
+    await expect(Effect.runPromise(tool.run({}).pipe(Effect.provide(oversized.layer)))).rejects.toThrow(
+      "response exceeds 50 MiB",
+    )
+    await expect(Effect.runPromise(tool.run({}).pipe(Effect.provide(malformed.layer)))).rejects.toThrow(
+      "returned malformed JSON",
+    )
+    await expect(Effect.runPromise(tool.run({}).pipe(Effect.provide(chunked.layer)))).rejects.toThrow(
+      "response exceeds 50 MiB",
+    )
+  })
+
+  test("keeps non-JSON responses raw and unions every success output", async () => {
+    const spec = singleOperation({
+      responses: {
+        200: { description: "Text", content: { "text/plain": { schema: { type: "string" } } } },
+        204: { description: "Empty" },
+      },
+    })
+    const tool = toolAt(OpenAPI.fromSpec({ baseUrl, spec }).tools, "test")
+    if (!Tool.isDefinition(tool)) throw new Error("test was not generated")
+    const client = recordingClient(() => new Response("123", { headers: { "content-type": "text/plain" } }))
+
+    expect(outputTypeScript(tool)).toBe("string | null")
+    await expect(Effect.runPromise(tool.run({}).pipe(Effect.provide(client.layer)))).resolves.toBe("123")
+  })
+
+  test("fails missing required parameters before auth and network", async () => {
+    const { requests, layer } = recordingClient(() => json({}))
+    const runtime = CodeMode.make({
+      tools: { opencode: OpenAPI.fromSpec({ spec: await opencodeSpec(), baseUrl }).tools },
+    })
+
+    const result = await Effect.runPromise(
+      runtime.execute("return await tools.opencode.v2.session.get({})").pipe(Effect.provide(layer)),
+    )
+
+    expect(result).toMatchObject({ ok: false })
+    expect(JSON.stringify(result)).toContain("Missing required path parameter 'sessionID'")
+    expect(requests).toHaveLength(0)
+  })
+
+  test("prefixes cross-location collisions and reconstructs the HTTP request", async () => {
+    const spec = {
+      openapi: "3.1.0",
+      info: { title: "collision", version: "1.0.0" },
+      paths: {
+        "/echo": {
+          post: {
+            operationId: "echo",
+            requestBody: {
+              required: true,
+              content: { "application/json": { schema: { type: "string" } } },
+            },
+            responses: { "204": { description: "Echoed" } },
+          },
+        },
+        "/things/{id}": {
+          post: {
+            operationId: "things.update",
+            parameters: [
+              { name: "id", in: "path", required: true, schema: { type: "string" } },
+              { name: "id", in: "query", required: true, schema: { type: "string" } },
+              { name: "path_id", in: "query", schema: { type: "string" } },
+              { name: "id", in: "header", required: true, schema: { type: "string" } },
+            ],
+            requestBody: {
+              required: true,
+              content: {
+                "application/json": {
+                  schema: {
+                    type: "object",
+                    properties: { id: { type: "string" } },
+                    required: ["id"],
+                    additionalProperties: false,
+                  },
+                },
+              },
+            },
+            responses: { "204": { description: "Updated" } },
+          },
+        },
+      },
+    } satisfies Document
+    const { requests, layer } = recordingClient(() => new Response(null, { status: 204 }))
+    const tools = OpenAPI.fromSpec({ spec, baseUrl }).tools
+    const update = toolAt(tools, "things.update")
+    const echo = toolAt(tools, "echo")
+
+    expect(Tool.isDefinition(update)).toBe(true)
+    if (!Tool.isDefinition(update)) throw new Error("things.update was not generated")
+    expect(inputTypeScript(update)).toBe(
+      "{ path_id: string; query_id: string; path_id_2?: string; header_id: string; body_id: string }",
+    )
+    expect(Tool.isDefinition(echo)).toBe(true)
+    if (!Tool.isDefinition(echo)) throw new Error("echo was not generated")
+    expect(inputTypeScript(echo)).toBe("{ body: string }")
+
+    const runtime = CodeMode.make({ tools })
+    const result = await Effect.runPromise(
+      runtime
+        .execute(
+          `
+            const updated = await tools.things.update({ path_id: "path", query_id: "query", path_id_2: "literal", header_id: "header", body_id: "body" })
+            const echoed = await tools.echo({ body: "hello" })
+            return { updated, echoed }
+          `,
+        )
+        .pipe(Effect.provide(layer)),
+    )
+
+    expect(result).toMatchObject({ ok: true })
+    expect(requests).toHaveLength(2)
+    expect(new URL(requests[0]!.url).pathname).toBe("/things/path")
+    expect(new URL(requests[0]!.url).searchParams.get("id")).toBe("query")
+    expect(new URL(requests[0]!.url).searchParams.get("path_id")).toBe("literal")
+    expect(requests[0]!.headers.id).toBe("header")
+    expect(requests[0]!.body).toStrictEqual({ id: "body" })
+    expect(requests[1]!.body).toBe("hello")
+  })
+
+  test("keeps bodies nested when flattening would lose schema semantics", () => {
+    const body = (schema: Record<string, unknown>, required = true) => ({
+      required,
+      content: { "application/json": { schema } },
+    })
+    const spec = {
+      openapi: "3.1.0",
+      info: { title: "bodies", version: "1.0.0" },
+      paths: Object.fromEntries(
+        [
+          [
+            "optional",
+            body(
+              {
+                type: "object",
+                properties: { name: { type: "string" } },
+                required: ["name"],
+                additionalProperties: false,
+              },
+              false,
+            ),
+          ],
+          ["dictionary", body({ type: "object", additionalProperties: { type: "string" } })],
+          [
+            "composed",
+            body({
+              type: "object",
+              allOf: [{ type: "object", properties: { name: { type: "string" } }, required: ["name"] }],
+              additionalProperties: false,
+            }),
+          ],
+          [
+            "nullable",
+            body({
+              type: ["object", "null"],
+              properties: { name: { type: "string" } },
+              additionalProperties: false,
+            }),
+          ],
+        ].map(([name, requestBody]) => [
+          `/body/${name}`,
+          {
+            post: {
+              operationId: `body.${name}`,
+              requestBody,
+              responses: { "204": { description: "Accepted" } },
+            },
+          },
+        ]),
+      ),
+    } satisfies Document
+    const tools = OpenAPI.fromSpec({ spec, baseUrl }).tools
+
+    for (const name of ["optional", "dictionary", "composed", "nullable"]) {
+      const tool = toolAt(tools, `body.${name}`)
+      expect(Tool.isDefinition(tool)).toBe(true)
+      if (!Tool.isDefinition(tool)) throw new Error(`body.${name} was not generated`)
+      const input = isRecord(tool.input) ? tool.input : {}
+      expect(Object.keys(isRecord(input.properties) ? input.properties : {})).toStrictEqual(["body"])
+    }
+    const optional = toolAt(tools, "body.optional")
+    if (!Tool.isDefinition(optional)) throw new Error("body.optional was not generated")
+    expect(inputTypeScript(optional)).toBe("{ body?: { name: string } }")
+  })
+})
diff --git a/packages/codemode/test/signature.test.ts b/packages/codemode/test/signature.test.ts
index edf4c442c4..55b8ac020a 100644
--- a/packages/codemode/test/signature.test.ts
+++ b/packages/codemode/test/signature.test.ts
@@ -159,8 +159,8 @@ describe("pretty signature rendering", () => {
       $ref: "#/$defs/Node",
       $defs: { Node: { type: "object", properties: { child: { $ref: "#/$defs/Node" }, name: { type: "string" } } } },
     } as const
-    expect(jsonSchemaToTypeScript(cyclic)).toBe("{ child?: Node; name?: string }")
-    expect(jsonSchemaToTypeScript(cyclic, true)).toContain("child?: Node")
+    expect(jsonSchemaToTypeScript(cyclic)).toBe("{ child?: unknown; name?: string }")
+    expect(jsonSchemaToTypeScript(cyclic, true)).toContain("child?: unknown")
 
     let deep: Record<string, unknown> = { type: "string" }
     for (let level = 0; level < 12; level += 1) deep = { type: "object", properties: { next: deep } }
@@ -170,6 +170,43 @@ describe("pretty signature rendering", () => {
       expect(rendered).toContain("next?:")
     }
   })
+
+  test("intersects ref and union siblings instead of discarding them", () => {
+    expect(
+      jsonSchemaToTypeScript({
+        $ref: "#/$defs/User",
+        properties: { active: { type: "boolean" } },
+        required: ["active"],
+        $defs: {
+          User: { type: "object", properties: { id: { type: "string" } }, required: ["id"] },
+        },
+      }),
+    ).toBe("{ id: string } & { active: boolean }")
+    expect(
+      jsonSchemaToTypeScript({
+        type: "object",
+        properties: { common: { type: "boolean" } },
+        required: ["common"],
+        anyOf: [
+          { type: "object", properties: { name: { type: "string" } }, required: ["name"] },
+          { type: "object", properties: { count: { type: "number" } }, required: ["count"] },
+        ],
+      }),
+    ).toBe("({ name: string } | { count: number }) & { common: boolean }")
+    expect(jsonSchemaToTypeScript({ $ref: "https://example.com/schema.json" })).toBe("unknown")
+    expect(
+      jsonSchemaToTypeScript({
+        $ref: "#/$defs/User/properties/id",
+        $defs: { User: { type: "object" }, id: { type: "string" } },
+      }),
+    ).toBe("unknown")
+    expect(
+      jsonSchemaToTypeScript({
+        type: ["object", "null"],
+        properties: { name: { type: "string" } },
+      }),
+    ).toBe("{ name?: string } | null")
+  })
 })
 
 describe("non-identifier property names render as quoted keys", () => {
@@ -268,6 +305,32 @@ describe("union schemas render every alternative", () => {
     expect(inputTypeScript(tool)).toBe("{ value?: string | number }")
     expect(outputTypeScript(tool)).toBe("number | boolean")
   })
+
+  test("allOf renders intersections with parenthesized union members", () => {
+    const schema = {
+      allOf: [
+        { type: "object", properties: { id: { type: "string" } } },
+        { type: ["string", "null"] },
+      ],
+    } as const
+    expect(jsonSchemaToTypeScript(schema)).toBe("{ id?: string } & (string | null)")
+  })
+
+  test("allOf does not discard an unresolved constraint", () => {
+    expect(jsonSchemaToTypeScript({ allOf: [{ type: "string" }, { $ref: "https://example.com/external.json" }] })).toBe(
+      "unknown",
+    )
+    expect(
+      jsonSchemaToTypeScript({ allOf: [{ type: "string" }, { allOf: [{ $ref: "https://example.com/external.json" }] }] }),
+    ).toBe("unknown")
+    expect(
+      jsonSchemaToTypeScript({
+        type: "string",
+        allOf: [{ $ref: "#/$defs/Constraint" }],
+        $defs: { Constraint: { description: "TypeScript-neutral constraint" } },
+      }),
+    ).toBe("string")
+  })
 })
 
 describe("pretty signatures in search results", () => {
diff --git a/packages/protocol/src/groups/pty.ts b/packages/protocol/src/groups/pty.ts
index 4ac3c5519f..309868189f 100644
--- a/packages/protocol/src/groups/pty.ts
+++ b/packages/protocol/src/groups/pty.ts
@@ -127,6 +127,7 @@ export const PtyGroup = HttpApiGroup.make("server.pty")
         description: "Establish a WebSocket connection streaming PTY output and accepting terminal input.",
         transform: (operation) => ({
           ...operation,
+          "x-websocket": true,
           parameters: [
             ...(operation.parameters ?? []),
             ...["location[directory]", "location[workspace]", "cursor", PTY_CONNECT_TICKET_QUERY].map((name) => ({

From bb3b6a2f65a3c95015fb2461e436288a316d7930 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Sat, 4 Jul 2026 20:47:33 -0400
Subject: [PATCH 57/82] fix(protocol): expose MCP tool change events (#35373)

---
 .../client/src/promise/generated/types.ts     |  8 +++++++
 packages/protocol/test/event.test.ts          | 23 +++++++++++++++++++
 packages/schema/src/event-manifest.ts         |  2 +-
 packages/schema/test/event-manifest.test.ts   |  1 +
 4 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 packages/protocol/test/event.test.ts

diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts
index 151f0ff03f..ba3c1a563b 100644
--- a/packages/client/src/promise/generated/types.ts
+++ b/packages/client/src/promise/generated/types.ts
@@ -5402,6 +5402,14 @@ export type EventSubscribeOutput =
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly branch?: string }
     }
+  | {
+      readonly id: string
+      readonly created: number
+      readonly metadata?: { readonly [x: string]: unknown }
+      readonly type: "mcp.tools.changed"
+      readonly location?: { readonly directory: string; readonly workspaceID?: string }
+      readonly data: { readonly server: string }
+    }
   | {
       readonly id: string
       readonly created: number
diff --git a/packages/protocol/test/event.test.ts b/packages/protocol/test/event.test.ts
new file mode 100644
index 0000000000..52757ad30e
--- /dev/null
+++ b/packages/protocol/test/event.test.ts
@@ -0,0 +1,23 @@
+import { expect, test } from "bun:test"
+import { Event } from "@opencode-ai/schema/event"
+import { AbsolutePath } from "@opencode-ai/schema/schema"
+import { DateTime, Schema } from "effect"
+import { OpenCodeEvent } from "../src/groups/event.js"
+
+test("encodes MCP tool changes emitted by the server", () => {
+  expect(
+    Schema.encodeSync(OpenCodeEvent)({
+      id: Event.ID.make("evt_test"),
+      created: DateTime.makeUnsafe(0),
+      type: "mcp.tools.changed",
+      location: { directory: AbsolutePath.make("/tmp") },
+      data: { server: "example" },
+    }),
+  ).toEqual({
+    id: "evt_test",
+    created: 0,
+    type: "mcp.tools.changed",
+    location: { directory: "/tmp" },
+    data: { server: "example" },
+  })
+})
diff --git a/packages/schema/src/event-manifest.ts b/packages/schema/src/event-manifest.ts
index 6b2b806f81..09a5db8da4 100644
--- a/packages/schema/src/event-manifest.ts
+++ b/packages/schema/src/event-manifest.ts
@@ -78,7 +78,7 @@ export const ServerDefinitions = Event.inventory(
   ...TuiEvent.Definitions,
   ...InstallationEvent.Definitions,
   ...VcsEvent.Definitions,
-  McpEvent.StatusChanged,
+  ...McpEvent.Definitions,
   // Shared transitional: V1 contracts the current TUI still consumes during
   // the migration (permission.asked/replied, question.asked, session.error).
   // Remove when the TUI moves to the current permission/question surfaces.
diff --git a/packages/schema/test/event-manifest.test.ts b/packages/schema/test/event-manifest.test.ts
index 487a942d9a..22003313ba 100644
--- a/packages/schema/test/event-manifest.test.ts
+++ b/packages/schema/test/event-manifest.test.ts
@@ -27,6 +27,7 @@ describe("public event manifest", () => {
       Agent.Event.Updated,
     ])
     expect(EventManifest.Definitions).toContain(Agent.Event.Updated)
+    expect(EventManifest.ServerDefinitions).toContain(McpEvent.ToolsChanged)
     expect(EventManifest.Definitions.filter((definition) => definition.type === "agent.updated")).toEqual([
       Agent.Event.Updated,
     ])

From 905123b9c0716b20c09a03991ff314dd57d08795 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Sat, 4 Jul 2026 21:12:45 -0400
Subject: [PATCH 58/82] fix(protocol): keep internal events off SSE (#35378)

---
 .../client/src/promise/generated/types.ts     |  8 ------
 packages/core/src/event.ts                    | 21 ++++++++++------
 packages/core/src/plugin/host.ts              |  4 +--
 packages/core/test/event.test.ts              | 20 +++++++++++++--
 packages/protocol/src/groups/event.ts         |  2 ++
 packages/protocol/test/event.test.ts          | 25 ++++---------------
 packages/schema/src/event-manifest.ts         |  6 ++++-
 packages/schema/test/event-manifest.test.ts   |  3 ++-
 packages/server/src/handlers/event.ts         |  7 ++++--
 9 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts
index ba3c1a563b..151f0ff03f 100644
--- a/packages/client/src/promise/generated/types.ts
+++ b/packages/client/src/promise/generated/types.ts
@@ -5402,14 +5402,6 @@ export type EventSubscribeOutput =
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly branch?: string }
     }
-  | {
-      readonly id: string
-      readonly created: number
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "mcp.tools.changed"
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly server: string }
-    }
   | {
       readonly id: string
       readonly created: number
diff --git a/packages/core/src/event.ts b/packages/core/src/event.ts
index 587688d814..3e352c6e6b 100644
--- a/packages/core/src/event.ts
+++ b/packages/core/src/event.ts
@@ -160,15 +160,22 @@ export interface Interface {
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/Event") {}
 
-export const liveBounded = (events: Interface, capacity: number) =>
+export const liveBounded = (
+  events: Interface,
+  options: { readonly capacity: number; readonly accept?: (event: Payload) => boolean },
+) =>
   Effect.gen(function* () {
-    const queue = yield* Queue.dropping<Payload, SubscriberOverflowError>(capacity)
+    const queue = yield* Queue.dropping<Payload, SubscriberOverflowError>(options.capacity)
     const unsubscribe = yield* events.listen((event) =>
-      Queue.offer(queue, event).pipe(
-        Effect.flatMap((accepted) =>
-          accepted ? Effect.void : Queue.fail(queue, new SubscriberOverflowError({ capacity })).pipe(Effect.asVoid),
-        ),
-      ),
+      options.accept && !options.accept(event)
+        ? Effect.void
+        : Queue.offer(queue, event).pipe(
+            Effect.flatMap((accepted) =>
+              accepted
+                ? Effect.void
+                : Queue.fail(queue, new SubscriberOverflowError({ capacity: options.capacity })).pipe(Effect.asVoid),
+            ),
+          ),
     )
     yield* Effect.addFinalizer(() => unsubscribe.pipe(Effect.andThen(Queue.shutdown(queue)), Effect.asVoid))
     return Stream.fromQueue(queue)
diff --git a/packages/core/src/plugin/host.ts b/packages/core/src/plugin/host.ts
index 585c254a78..4c7bb8538c 100644
--- a/packages/core/src/plugin/host.ts
+++ b/packages/core/src/plugin/host.ts
@@ -23,8 +23,6 @@ import { ToolHooks } from "../tool/hooks"
 import { WorkspaceV2 } from "../workspace"
 
 const mutable = <T>(value: T) => value as DeepMutable<T>
-const isEvent = Schema.is(Schema.Union(EventManifest.ServerDefinitions))
-
 export const make = Effect.fn("PluginHost.make")(function* (plugin: PluginV2.Interface) {
   const agents = yield* AgentV2.Service
   const aisdk = yield* AISDK.Service
@@ -160,7 +158,7 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: PluginV2.Int
         }),
     },
     event: {
-      subscribe: () => events.live().pipe(Stream.filter(isEvent)),
+      subscribe: () => events.live().pipe(Stream.filter(EventManifest.isServer)),
     },
     integration: {
       list: () => response(integration.list()),
diff --git a/packages/core/test/event.test.ts b/packages/core/test/event.test.ts
index 65c370f1eb..70a8083d16 100644
--- a/packages/core/test/event.test.ts
+++ b/packages/core/test/event.test.ts
@@ -2,6 +2,8 @@ import { describe, expect } from "bun:test"
 import { Cause, DateTime, Deferred, Effect, Exit, Fiber, Layer, Option, Ref, Schema, Stream } from "effect"
 import { EventV2 } from "@opencode-ai/core/event"
 import { Event } from "@opencode-ai/schema/event"
+import { EventManifest } from "@opencode-ai/schema/event-manifest"
+import { McpEvent } from "@opencode-ai/schema/mcp-event"
 import { Session } from "@opencode-ai/schema/session"
 import { SessionEvent } from "@opencode-ai/schema/session-event"
 import { SessionV1 } from "@opencode-ai/schema/session-v1"
@@ -329,8 +331,8 @@ describe("EventV2", () => {
       const events = yield* EventV2.Service
       const consuming = yield* Deferred.make<void>()
       const release = yield* Deferred.make<void>()
-      const slowStream = yield* EventV2.liveBounded(events, 1)
-      const fastStream = yield* EventV2.liveBounded(events, 8)
+      const slowStream = yield* EventV2.liveBounded(events, { capacity: 1 })
+      const fastStream = yield* EventV2.liveBounded(events, { capacity: 8 })
       const slow = yield* slowStream.pipe(
         Stream.runForEach(() => Deferred.succeed(consuming, undefined).pipe(Effect.andThen(Deferred.await(release)))),
         Effect.forkScoped,
@@ -355,6 +357,20 @@ describe("EventV2", () => {
     }),
   )
 
+  it.effect("filters internal events before they enter a bounded server stream", () =>
+    Effect.gen(function* () {
+      const events = yield* EventV2.Service
+      const stream = yield* EventV2.liveBounded(events, { capacity: 1, accept: EventManifest.isServer })
+      const received = yield* stream.pipe(Stream.take(1), Stream.runCollect, Effect.forkScoped)
+
+      yield* events.publish(McpEvent.ToolsChanged, { server: "one" })
+      yield* events.publish(McpEvent.ToolsChanged, { server: "two" })
+      const published = yield* events.publish(McpEvent.StatusChanged, { server: "example" })
+
+      expect(Array.from(yield* Fiber.join(received))).toEqual([published])
+    }),
+  )
+
   it.effect("preserves observer interruption", () =>
     Effect.gen(function* () {
       const events = yield* EventV2.Service
diff --git a/packages/protocol/src/groups/event.ts b/packages/protocol/src/groups/event.ts
index 9860aa0cad..94cedd1a57 100644
--- a/packages/protocol/src/groups/event.ts
+++ b/packages/protocol/src/groups/event.ts
@@ -67,3 +67,5 @@ export const EventGroup = event.group
 export const OpenCodeEvent = event.schema
 export type OpenCodeEvent = typeof OpenCodeEvent.Type
 export type OpenCodeEventEncoded = typeof OpenCodeEvent.Encoded
+export const isOpenCodeEvent = (event: { readonly type: string }): event is OpenCodeEvent =>
+  event.type === "server.connected" || EventManifest.isServer(event)
diff --git a/packages/protocol/test/event.test.ts b/packages/protocol/test/event.test.ts
index 52757ad30e..33ece777c4 100644
--- a/packages/protocol/test/event.test.ts
+++ b/packages/protocol/test/event.test.ts
@@ -1,23 +1,8 @@
 import { expect, test } from "bun:test"
-import { Event } from "@opencode-ai/schema/event"
-import { AbsolutePath } from "@opencode-ai/schema/schema"
-import { DateTime, Schema } from "effect"
-import { OpenCodeEvent } from "../src/groups/event.js"
+import { isOpenCodeEvent } from "../src/groups/event.js"
 
-test("encodes MCP tool changes emitted by the server", () => {
-  expect(
-    Schema.encodeSync(OpenCodeEvent)({
-      id: Event.ID.make("evt_test"),
-      created: DateTime.makeUnsafe(0),
-      type: "mcp.tools.changed",
-      location: { directory: AbsolutePath.make("/tmp") },
-      data: { server: "example" },
-    }),
-  ).toEqual({
-    id: "evt_test",
-    created: 0,
-    type: "mcp.tools.changed",
-    location: { directory: "/tmp" },
-    data: { server: "example" },
-  })
+test("classifies public events by type", () => {
+  expect(isOpenCodeEvent({ type: "server.connected" })).toBe(true)
+  expect(isOpenCodeEvent({ type: "mcp.status.changed" })).toBe(true)
+  expect(isOpenCodeEvent({ type: "mcp.tools.changed" })).toBe(false)
 })
diff --git a/packages/schema/src/event-manifest.ts b/packages/schema/src/event-manifest.ts
index 09a5db8da4..23ed3fd044 100644
--- a/packages/schema/src/event-manifest.ts
+++ b/packages/schema/src/event-manifest.ts
@@ -1,5 +1,6 @@
 export * as EventManifest from "./event-manifest.js"
 
+import { Schema } from "effect"
 import { Agent } from "./agent.js"
 import { Catalog } from "./catalog.js"
 import { Command } from "./command.js"
@@ -78,7 +79,7 @@ export const ServerDefinitions = Event.inventory(
   ...TuiEvent.Definitions,
   ...InstallationEvent.Definitions,
   ...VcsEvent.Definitions,
-  ...McpEvent.Definitions,
+  McpEvent.StatusChanged,
   // Shared transitional: V1 contracts the current TUI still consumes during
   // the migration (permission.asked/replied, question.asked, session.error).
   // Remove when the TUI moves to the current permission/question surfaces.
@@ -86,6 +87,9 @@ export const ServerDefinitions = Event.inventory(
   ...QuestionV1.Event.Definitions,
   SessionV1.Error,
 )
+export const Server = Event.latest(ServerDefinitions)
+export type ServerEvent = Schema.Schema.Type<(typeof ServerDefinitions)[number]>
+export const isServer = (event: { readonly type: string }): event is ServerEvent => Server.has(event.type)
 
 export const Definitions = Event.inventory(
   ...foundationDefinitions,
diff --git a/packages/schema/test/event-manifest.test.ts b/packages/schema/test/event-manifest.test.ts
index 22003313ba..0147c7469b 100644
--- a/packages/schema/test/event-manifest.test.ts
+++ b/packages/schema/test/event-manifest.test.ts
@@ -27,7 +27,6 @@ describe("public event manifest", () => {
       Agent.Event.Updated,
     ])
     expect(EventManifest.Definitions).toContain(Agent.Event.Updated)
-    expect(EventManifest.ServerDefinitions).toContain(McpEvent.ToolsChanged)
     expect(EventManifest.Definitions.filter((definition) => definition.type === "agent.updated")).toEqual([
       Agent.Event.Updated,
     ])
@@ -47,6 +46,8 @@ describe("public event manifest", () => {
       EventManifest.Definitions.map((definition) => definition.type),
     )
     expect(EventManifest.Latest.get("agent.updated")).toBe(Agent.Event.Updated)
+    expect(EventManifest.Server.get("mcp.status.changed")).toBe(McpEvent.StatusChanged)
+    expect(EventManifest.Server.has("mcp.tools.changed")).toBe(false)
     expect(Agent.Event.Updated.durable).toBeUndefined()
     expect(EventManifest.Durable.has("agent.updated")).toBe(false)
   })
diff --git a/packages/server/src/handlers/event.ts b/packages/server/src/handlers/event.ts
index ca9c02620d..1c8b94d124 100644
--- a/packages/server/src/handlers/event.ts
+++ b/packages/server/src/handlers/event.ts
@@ -1,5 +1,5 @@
 import { EventV2 } from "@opencode-ai/core/event"
-import { OpenCodeEvent } from "@opencode-ai/protocol/groups/event"
+import { isOpenCodeEvent, OpenCodeEvent } from "@opencode-ai/protocol/groups/event"
 import { Effect, Schema, Stream } from "effect"
 import { Sse } from "effect/unstable/encoding"
 import { HttpServerResponse } from "effect/unstable/http"
@@ -35,7 +35,10 @@ export const EventHandler = HttpApiBuilder.group(Api, "server.event", (handlers)
           const output = Stream.unwrap(
             Effect.gen(function* () {
               // Acquiring the bounded stream installs its listener before readiness is observable.
-              const live = yield* EventV2.liveBounded(events, subscriberCapacity)
+              const live = yield* EventV2.liveBounded(events, {
+                capacity: subscriberCapacity,
+                accept: isOpenCodeEvent,
+              })
               return Stream.make(connected).pipe(Stream.concat(live))
             }),
           ).pipe(Stream.map(eventData), Stream.pipeThroughChannel(Sse.encode()))

From 44b182fe23f12bc802f02625cb5e485405c6b3e8 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Sat, 4 Jul 2026 21:43:08 -0400
Subject: [PATCH 59/82] fix(core): validate scalar newtypes (#35381)

---
 packages/core/src/schema.ts        | 56 ++++++++++++++++++------------
 packages/core/test/newtype.test.ts | 47 +++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 23 deletions(-)
 create mode 100644 packages/core/test/newtype.test.ts

diff --git a/packages/core/src/schema.ts b/packages/core/src/schema.ts
index 9c25bee19b..338255309f 100644
--- a/packages/core/src/schema.ts
+++ b/packages/core/src/schema.ts
@@ -43,37 +43,47 @@ export type DeepMutable<T> = T extends string | number | boolean | bigint | symb
  * Nominal wrapper for scalar types. The class itself is a valid schema —
  * pass it directly to `Schema.decode`, `Schema.decodeEffect`, etc.
  *
- * Overrides `~type.make` on the derived `Schema.Opaque` so `Schema.Schema.Type`
- * of a field using this newtype resolves to `Self` rather than the underlying
- * branded phantom. Without that override, passing a class instance to code
- * typed against `Schema.Schema.Type<FieldSchema>` would require a cast even
- * though the values are structurally equivalent at runtime.
+ * The runtime value remains an unwrapped primitive. `Schema.brand` supplies
+ * the primitive schema behavior and constructor validation, while the class
+ * supplies the nominal TypeScript identity.
+ * Apply checks and annotations to the underlying schema before wrapping it;
+ * schema rebuild operations intentionally return the underlying schema shape.
  *
  * @example
- *   class QuestionID extends Newtype<QuestionID>()("QuestionID", Schema.String) {
- *     static make(id: string): QuestionID {
- *       return this.make(id)
- *     }
- *   }
+ *   class QuestionID extends Newtype<QuestionID>()("QuestionID", Schema.String) {}
  *
- *   Schema.decodeEffect(QuestionID)(input)
+ *   const id = QuestionID.make("question-1")
+ *   Schema.decodeUnknownEffect(QuestionID)(input)
  */
+type NewtypeSchema<Self, Tag extends string, S extends Schema.Top> = (abstract new (_: never) => {
+  readonly _newtype: Tag
+}) &
+  Schema.Bottom<
+    Self,
+    S["Encoded"],
+    S["DecodingServices"],
+    S["EncodingServices"],
+    S["ast"],
+    S["Rebuild"],
+    S["~type.make.in"],
+    Self,
+    S["~type.parameters"],
+    Self,
+    S["~type.mutability"],
+    S["~type.optionality"],
+    S["~type.constructor.default"],
+    S["~encoded.mutability"],
+    S["~encoded.optionality"]
+  > &
+  Omit<S, keyof Schema.Top>
+
 export function Newtype<Self>() {
-  return <const Tag extends string, S extends Schema.Top>(tag: Tag, schema: S) => {
+  return <const Tag extends string, S extends Schema.Top>(tag: Tag, schema: S): NewtypeSchema<Self, Tag, S> => {
     abstract class Base {
       declare readonly _newtype: Tag
-
-      static make(value: Schema.Schema.Type<S>): Self {
-        return value as unknown as Self
-      }
     }
 
-    Object.setPrototypeOf(Base, schema)
-
-    return Base as unknown as (abstract new (_: never) => { readonly _newtype: Tag }) & {
-      readonly make: (value: Schema.Schema.Type<S>) => Self
-    } & Omit<Schema.Opaque<Self, S, {}>, "make" | "~type.make"> & {
-        readonly "~type.make": Self
-      }
+    Object.setPrototypeOf(Base, schema.pipe(Schema.brand(tag)))
+    return Base as unknown as NewtypeSchema<Self, Tag, S>
   }
 }
diff --git a/packages/core/test/newtype.test.ts b/packages/core/test/newtype.test.ts
new file mode 100644
index 0000000000..1bcba5709d
--- /dev/null
+++ b/packages/core/test/newtype.test.ts
@@ -0,0 +1,47 @@
+import { expect, test } from "bun:test"
+import { Effect, Schema } from "effect"
+import { Newtype } from "../src/schema"
+
+class UserID extends Newtype<UserID>()("Test.UserID", Schema.NonEmptyString) {}
+class ProjectID extends Newtype<ProjectID>()("Test.ProjectID", Schema.NonEmptyString) {}
+class Port extends Newtype<Port>()("Test.Port", Schema.FiniteFromString) {}
+
+const User = Schema.Struct({ id: UserID })
+
+test("constructs nominal values from the underlying type", () => {
+  const id = UserID.make("user-1")
+  const acceptUserID = (_id: UserID) => undefined
+
+  expect(String(id)).toBe("user-1")
+  acceptUserID(id)
+
+  if (false) {
+    // @ts-expect-error distinct newtypes are not interchangeable
+    acceptUserID(ProjectID.make("project-1"))
+  }
+})
+
+test("preserves constructor validation", () => {
+  expect(() => UserID.make("")).toThrow()
+})
+
+test("decodes and encodes as a schema", async () => {
+  const decoded = await Effect.runPromise(Schema.decodeUnknownEffect(User)({ id: "user-1" }))
+  const encoded = await Effect.runPromise(Schema.encodeEffect(User)(decoded))
+
+  expect(String(decoded.id)).toBe("user-1")
+  expect(encoded).toEqual({ id: "user-1" })
+})
+
+test("preserves the underlying schema validation", async () => {
+  const result = await Effect.runPromise(Schema.decodeUnknownEffect(UserID)("").pipe(Effect.result))
+  expect(result._tag).toBe("Failure")
+})
+
+test("preserves transformed encoded and decoded representations", async () => {
+  const decoded = await Effect.runPromise(Schema.decodeUnknownEffect(Port)("8080"))
+  const encoded = await Effect.runPromise(Schema.encodeEffect(Port)(decoded))
+
+  expect(Number(decoded)).toBe(8080)
+  expect(encoded).toBe("8080")
+})

From 29e8502bb0dc6b38764e38fa41c8e1b8873ee87d Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Sun, 5 Jul 2026 09:08:09 -0500
Subject: [PATCH 60/82] fix(tui): align integration empty state (#35414)

---
 packages/tui/src/component/dialog-integration.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/tui/src/component/dialog-integration.tsx b/packages/tui/src/component/dialog-integration.tsx
index cd8780ddfb..52aba6d0e3 100644
--- a/packages/tui/src/component/dialog-integration.tsx
+++ b/packages/tui/src/component/dialog-integration.tsx
@@ -81,7 +81,11 @@ export function DialogIntegration(props: { onConnected?: OnIntegrationConnected
     <DialogSelect
       title="Connect a service"
       options={options()}
-      emptyView={<text fg={theme.textMuted}>No integrations available</text>}
+      emptyView={
+        <box paddingLeft={4} paddingRight={4} paddingTop={1}>
+          <text fg={theme.textMuted}>No integrations available</text>
+        </box>
+      }
     />
   )
 }

From 391aa382810e2eb9d408e92c7e9ffc16d33248fd Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Sun, 5 Jul 2026 10:40:55 -0500
Subject: [PATCH 61/82] test(core): serve skill fixtures locally (#35429)

---
 packages/core/test/skill-discovery.test.ts | 143 +++++++++++----------
 1 file changed, 77 insertions(+), 66 deletions(-)

diff --git a/packages/core/test/skill-discovery.test.ts b/packages/core/test/skill-discovery.test.ts
index e875beb931..28071c926f 100644
--- a/packages/core/test/skill-discovery.test.ts
+++ b/packages/core/test/skill-discovery.test.ts
@@ -1,36 +1,42 @@
 import fs from "fs/promises"
 import path from "path"
 import { describe, expect, test } from "bun:test"
-import { Effect, Layer } from "effect"
-import { HttpClient, HttpClientResponse } from "effect/unstable/http"
+import { Effect } from "effect"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { LayerNodePlatform } from "@opencode-ai/core/effect/app-node-platform"
-import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { Global } from "@opencode-ai/core/global"
 import { SkillDiscovery } from "@opencode-ai/core/skill/discovery"
 import { tmpdir } from "./fixture/tmpdir"
 
-const base = "https://skills.example.test/catalog/"
+type Fixture = {
+  tmp: Awaited<ReturnType<typeof tmpdir>>
+  server: Bun.Server<undefined>
+  state: {
+    skills: unknown[]
+    files: Record<string, string>
+    requests: string[]
+  }
+  base: string
+}
 
-async function pull(skills: unknown[], files: Record<string, string> = {}, cache?: Awaited<ReturnType<typeof tmpdir>>) {
-  const tmp = cache ?? (await tmpdir())
-  const requests: string[] = []
-  const http = Layer.succeed(
-    HttpClient.HttpClient,
-    HttpClient.make((request) =>
-      Effect.sync(() => requests.push(request.url)).pipe(
-        Effect.map(() => {
-          const body = request.url === `${base}index.json` ? JSON.stringify({ skills }) : files[request.url]
-          return HttpClientResponse.fromWeb(
-            request,
-            new Response(body ?? "Not Found", { status: body === undefined ? 404 : 200 }),
-          )
-        }),
-      ),
-    ),
-  )
+async function pull(skills: unknown[], files: Record<string, string> = {}, fixture?: Fixture) {
+  const state = fixture?.state ?? { skills, files, requests: [] }
+  state.skills = skills
+  state.files = files
+  state.requests = []
+  const server =
+    fixture?.server ??
+    Bun.serve({
+      port: 0,
+      fetch(request) {
+        state.requests.push(request.url)
+        const pathname = new URL(request.url).pathname
+        const body = pathname === "/catalog/index.json" ? JSON.stringify({ skills: state.skills }) : state.files[pathname]
+        return new Response(body ?? "Not Found", { status: body === undefined ? 404 : 200 })
+      },
+    })
+  const tmp = fixture?.tmp ?? (await tmpdir())
+  const base = fixture?.base ?? new URL("/catalog/", server.url).href
   const skillDiscoveryLayer = AppNodeBuilder.build(SkillDiscovery.node, [
-    [LayerNodePlatform.httpClient, http],
     [Global.node, Global.layerWith({ cache: tmp.path })],
   ])
   const directories = await Effect.runPromise(
@@ -38,7 +44,12 @@ async function pull(skills: unknown[], files: Record<string, string> = {}, cache
       return yield* (yield* SkillDiscovery.Service).pull(base)
     }).pipe(Effect.provide(skillDiscoveryLayer)),
   )
-  return { tmp, requests, directories }
+  return { tmp, server, state, base, requests: state.requests, directories }
+}
+
+async function dispose(fixture: Fixture) {
+  await fixture.server.stop(true)
+  await fixture.tmp[Symbol.asyncDispose]()
 }
 
 describe("SkillDiscovery.pull", () => {
@@ -46,10 +57,10 @@ describe("SkillDiscovery.pull", () => {
     const result = await pull([{ name: "../outside", files: ["SKILL.md"] }])
     try {
       expect(result.directories).toEqual([])
-      expect(result.requests).toEqual([`${base}index.json`])
+      expect(result.requests).toEqual([`${result.base}index.json`])
       expect(await fs.readdir(result.tmp.path)).toEqual([])
     } finally {
-      await result.tmp[Symbol.asyncDispose]()
+      await dispose(result)
     }
   })
 
@@ -57,10 +68,10 @@ describe("SkillDiscovery.pull", () => {
     const result = await pull([{ name: "deploy", files: ["SKILL.md", "../outside.md"] }])
     try {
       expect(result.directories).toEqual([])
-      expect(result.requests).toEqual([`${base}index.json`])
+      expect(result.requests).toEqual([`${result.base}index.json`])
       expect(await fs.readdir(result.tmp.path)).toEqual([])
     } finally {
-      await result.tmp[Symbol.asyncDispose]()
+      await dispose(result)
     }
   })
 
@@ -68,10 +79,10 @@ describe("SkillDiscovery.pull", () => {
     const result = await pull([{ name: "deploy", files: ["SKILL.md", "/tmp/outside.md"] }])
     try {
       expect(result.directories).toEqual([])
-      expect(result.requests).toEqual([`${base}index.json`])
+      expect(result.requests).toEqual([`${result.base}index.json`])
       expect(await fs.readdir(result.tmp.path)).toEqual([])
     } finally {
-      await result.tmp[Symbol.asyncDispose]()
+      await dispose(result)
     }
   })
 
@@ -79,87 +90,87 @@ describe("SkillDiscovery.pull", () => {
     const result = await pull([{ name: "deploy", files: ["SKILL.md", "https://evil.example.test/outside.md"] }])
     try {
       expect(result.directories).toEqual([])
-      expect(result.requests).toEqual([`${base}index.json`])
+      expect(result.requests).toEqual([`${result.base}index.json`])
       expect(await fs.readdir(result.tmp.path)).toEqual([])
     } finally {
-      await result.tmp[Symbol.asyncDispose]()
+      await dispose(result)
     }
   })
 
   test("downloads safe nested files under the skill root", async () => {
     const result = await pull([{ name: "deploy", files: ["SKILL.md", "references/guide.md"] }], {
-      [`${base}deploy/SKILL.md`]: "# Deploy",
-      [`${base}deploy/references/guide.md`]: "# Guide",
+      "/catalog/deploy/SKILL.md": "# Deploy",
+      "/catalog/deploy/references/guide.md": "# Guide",
     })
     try {
       expect(result.directories).toHaveLength(1)
       expect(result.requests.toSorted()).toEqual(
-        [`${base}index.json`, `${base}deploy/SKILL.md`, `${base}deploy/references/guide.md`].toSorted(),
+        [
+          `${result.base}index.json`,
+          `${result.base}deploy/SKILL.md`,
+          `${result.base}deploy/references/guide.md`,
+        ].toSorted(),
       )
       expect(await fs.readFile(path.join(result.directories[0], "SKILL.md"), "utf8")).toBe("# Deploy")
       expect(await fs.readFile(path.join(result.directories[0], "references", "guide.md"), "utf8")).toBe("# Guide")
     } finally {
-      await result.tmp[Symbol.asyncDispose]()
+      await dispose(result)
     }
   })
 
   test("refreshes cached files when the version changes", async () => {
-    const tmp = await tmpdir()
+    const first = await pull(
+      [{ name: "deploy", version: "1", files: ["SKILL.md"] }],
+      { "/catalog/deploy/SKILL.md": "# Old" },
+    )
     try {
-      const first = await pull(
-        [{ name: "deploy", version: "1", files: ["SKILL.md"] }],
-        {
-          [`${base}deploy/SKILL.md`]: "# Old",
-        },
-        tmp,
-      )
       const second = await pull(
         [{ name: "deploy", version: "2", files: ["SKILL.md"] }],
-        {
-          [`${base}deploy/SKILL.md`]: "# New",
-        },
-        tmp,
+        { "/catalog/deploy/SKILL.md": "# New" },
+        first,
       )
 
       expect(await fs.readFile(path.join(first.directories[0], "SKILL.md"), "utf8")).toBe("# New")
-      expect(second.requests).toContain(`${base}deploy/SKILL.md`)
+      expect(second.requests).toContain(`${first.base}deploy/SKILL.md`)
       const third = await pull(
         [{ name: "deploy", version: "2", files: ["SKILL.md"] }],
-        { [`${base}deploy/SKILL.md`]: "# Ignored" },
-        tmp,
+        { "/catalog/deploy/SKILL.md": "# Ignored" },
+        first,
       )
-      expect(third.requests).toEqual([`${base}index.json`])
+      expect(third.requests).toEqual([`${first.base}index.json`])
     } finally {
-      await tmp[Symbol.asyncDispose]()
+      await dispose(first)
     }
   })
 
   test("publishes complete updates and removes stale files", async () => {
-    const tmp = await tmpdir()
+    const first = await pull(
+      [{ name: "deploy", version: "1", files: ["SKILL.md", "old.md"] }],
+      {
+        "/catalog/deploy/SKILL.md": "# Old",
+        "/catalog/deploy/old.md": "old reference",
+      },
+    )
     try {
-      const first = await pull(
-        [{ name: "deploy", version: "1", files: ["SKILL.md", "old.md"] }],
-        {
-          [`${base}deploy/SKILL.md`]: "# Old",
-          [`${base}deploy/old.md`]: "old reference",
-        },
-        tmp,
-      )
       const root = first.directories[0]
 
       await pull(
         [{ name: "deploy", version: "2", files: ["SKILL.md", "missing.md"] }],
-        { [`${base}deploy/SKILL.md`]: "# Partial" },
-        tmp,
+        { "/catalog/deploy/SKILL.md": "# Partial" },
+        first,
       )
       expect(await fs.readFile(path.join(root, "SKILL.md"), "utf8")).toBe("# Old")
       expect(await fs.readFile(path.join(root, "old.md"), "utf8")).toBe("old reference")
 
-      await pull([{ name: "deploy", version: "3", files: ["SKILL.md"] }], { [`${base}deploy/SKILL.md`]: "# New" }, tmp)
+      await pull(
+        [{ name: "deploy", version: "3", files: ["SKILL.md"] }],
+        { "/catalog/deploy/SKILL.md": "# New" },
+        first,
+      )
       expect(await fs.readFile(path.join(root, "SKILL.md"), "utf8")).toBe("# New")
       expect(await Bun.file(path.join(root, "old.md")).exists()).toBe(false)
     } finally {
-      await tmp[Symbol.asyncDispose]()
+      await dispose(first)
     }
   })
 })

From f9504971737933fde17c0f2f442be08e1316c338 Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Sun, 5 Jul 2026 10:41:21 -0500
Subject: [PATCH 62/82] refactor(codemode): remove generic agent tool (#35420)

---
 packages/codemode/README.md             | 14 +++-------
 packages/codemode/codemode.md           |  4 +--
 packages/codemode/src/codemode.ts       | 35 ++++++-------------------
 packages/codemode/src/index.ts          |  3 +--
 packages/codemode/test/codemode.test.ts | 31 ++++++----------------
 packages/core/src/tool/execute.ts       |  3 +--
 6 files changed, 23 insertions(+), 67 deletions(-)

diff --git a/packages/codemode/README.md b/packages/codemode/README.md
index bd14a24fb0..54d31b4e31 100644
--- a/packages/codemode/README.md
+++ b/packages/codemode/README.md
@@ -4,7 +4,7 @@ Effect-native confined code execution over explicit, schema-described tools.
 
 CodeMode lets a model write a small JavaScript program that can call only the tools supplied by the host. The program can sequence calls, transform plain data, branch, loop, and run independent calls in parallel without receiving ambient filesystem, process, network, module, or application authority.
 
-The package is currently private to this workspace. Its API is designed around three uses:
+The package is currently private to this workspace. Its API is designed around one-shot and reusable execution:
 
 ```ts
 // One execution
@@ -13,9 +13,6 @@ yield * CodeMode.execute({ tools, code })
 // A reusable runtime
 const runtime = CodeMode.make({ tools, limits })
 yield * runtime.execute(code)
-
-// One agent-facing code tool
-const codeTool = runtime.agentTool()
 ```
 
 ## Install
@@ -117,10 +114,9 @@ const runtime = CodeMode.make({
 runtime.catalog() // structured tool descriptions
 runtime.instructions() // model-facing syntax and tool guide
 runtime.execute(source) // ExecuteResult
-runtime.agentTool() // { name, description, input, output, execute }
 ```
 
-`catalog`, `instructions`, and `agentTool` are projections of the same configured tool tree. `agentTool().description` is exactly `instructions()`.
+`CodeMode.Input` and `CodeMode.Result` are Effect schemas for the execution request and result. Hosts can combine them with `runtime.instructions()` and `runtime.execute()` when constructing a framework-specific agent tool.
 
 ### Results
 
@@ -165,9 +161,7 @@ const api = OpenAPI.fromSpec({
   spec: await Bun.file("openapi.json").json(), // parsed document (no YAML)
   auth: {
     resolve: ({ name, scopes, operation }) =>
-      name === "BearerAuth"
-        ? Effect.succeed({ type: "bearer", token })
-        : Effect.succeed(undefined),
+      name === "BearerAuth" ? Effect.succeed({ type: "bearer", token }) : Effect.succeed(undefined),
   },
 })
 
@@ -335,8 +329,6 @@ A program cannot gain authority through prose or generated code. It can only exe
 The public contract is guided by these equivalences:
 
 - `CodeMode.execute({ ...options, code })` is equivalent to `CodeMode.make(options).execute(code)`.
-- `CodeMode.make(options).agentTool().execute({ code })` is equivalent to `CodeMode.make(options).execute(code)`.
-- `CodeMode.make(options).agentTool().description` equals `CodeMode.make(options).instructions()`.
 - A tool implementation is not invoked unless its input has decoded successfully.
 - A tool result is not visible to the program unless its output has decoded and crossed the plain-data boundary successfully.
 - Unknown host failures do not become model-visible diagnostics; `ToolError` is the explicit safe-message channel.
diff --git a/packages/codemode/codemode.md b/packages/codemode/codemode.md
index 14fe18b875..81348a7c8f 100644
--- a/packages/codemode/codemode.md
+++ b/packages/codemode/codemode.md
@@ -246,7 +246,7 @@ maxOutputBytes? }` (defaults 10_000 / 100 / 32_000). This wave kept the other kn
   serialized values become truncated text + ` [result truncated: N bytes exceeds the M-byte
 output limit; return a smaller value]`; logs keep leading lines within the remaining budget
   - `[logs truncated: showing K of N lines]`; result gains `truncated: true` (also added to
-    `ExecuteResultSchema`). UTF-8-safe truncation (no split code points). (The in-sandbox
+    `CodeMode.Result`). UTF-8-safe truncation (no split code points). (The in-sandbox
     `maxDataBytes` check that used to throw first on oversized raw values died in Fix 5 -
     truncation is now the only result-size mechanism.)
 - **Search polish**: default limit 12 -> **10** (`defaultSearchLimit`); exact-path lookup - a
@@ -575,7 +575,7 @@ configurable knobs; the internal limit system dies):
   `maxCollectionLength` (every array-length/object-field-count check - this knob was
   actively harmful: an MCP tool returning 20k rows failed). The `OperationLimitExceeded`
   and `AuditLimitExceeded` diagnostic kinds are gone from the `DiagnosticKind` union and
-  `ExecuteResultSchema` (fine - the package is unreleased).
+  `CodeMode.Result` (fine - the package is unreleased).
 - **Fixed constants, not knobs**: `TOOL_CALL_CONCURRENCY = 8` (codemode.ts; the fork
   semaphore) and `MAX_VALUE_DEPTH = 32` (tool-runtime.ts; the `copyIn` depth check - kept
   only because it produces a clearer error than a native stack-overflow RangeError; still
diff --git a/packages/codemode/src/codemode.ts b/packages/codemode/src/codemode.ts
index f8a01f23b0..6aa030e521 100644
--- a/packages/codemode/src/codemode.ts
+++ b/packages/codemode/src/codemode.ts
@@ -108,14 +108,14 @@ export type ExecuteFailure = {
 /** Result of executing a CodeMode program. Program failures are data, not Effect failures. */
 export type ExecuteResult = ExecuteSuccess | ExecuteFailure
 
-/** Reusable CodeMode configuration shared by `execute` and `agentTool`. */
+/** Configuration shared by `CodeMode.make` and `CodeMode.execute`. */
 export type CodeModeOptions<Tools extends Record<string, unknown> = {}> = Omit<ExecuteOptions<Tools>, "code"> & {
   /** Progressive-disclosure configuration for the agent-facing tool catalog. */
   readonly discovery?: DiscoveryOptions
 }
 
-/** Input schema for the single agent-facing tool produced by `runtime.agentTool()`. */
-export const ExecuteInputSchema = Schema.Struct({ code: Schema.String })
+/** Schema for a CodeMode execution request. */
+const Input = Schema.Struct({ code: Schema.String })
 
 const DiagnosticKindSchema = Schema.Literals([
   "ParseError",
@@ -130,8 +130,8 @@ const DiagnosticKindSchema = Schema.Literals([
   "ExecutionFailure",
 ])
 
-/** Structured success or diagnostic result schema returned by CodeMode execution. */
-export const ExecuteResultSchema = Schema.Union([
+/** Schema for the structured success or diagnostic returned by CodeMode execution. */
+const Result = Schema.Union([
   Schema.Struct({
     ok: Schema.Literal(true),
     value: Schema.Json,
@@ -153,23 +153,12 @@ export const ExecuteResultSchema = Schema.Union([
   }),
 ])
 
-/** Agent-facing projection of a configured CodeMode runtime. */
-export type AgentToolDefinition<R = never> = {
-  readonly name: "code"
-  readonly description: string
-  readonly input: typeof ExecuteInputSchema
-  readonly output: typeof ExecuteResultSchema
-  readonly execute: (input: { readonly code: string }) => Effect.Effect<ExecuteResult, never, R>
-}
-
 /** Reusable confined runtime over one explicit tool tree. */
 export type CodeModeRuntime<R = never> = {
   /** Lists schema-described tool paths provided by the host. */
   readonly catalog: () => ReadonlyArray<ToolDescription>
   /** Builds model-facing syntax guidance and visible tool signatures. */
   readonly instructions: () => string
-  /** Projects the configured runtime as one agent-facing `code` tool. */
-  readonly agentTool: () => AgentToolDefinition<R>
   /** Executes a program using this runtime's configured host tools. */
   readonly execute: (code: string) => Effect.Effect<ExecuteResult, never, R>
 }
@@ -4088,13 +4077,12 @@ export const execute = <const Tools extends Record<string, unknown>>(
 /**
  * Creates an Effect-native runtime over explicit, schema-described tools.
  *
- * Use `execute` for host-driven execution or `agentTool` to expose one confined code tool to an
- * agent framework. Tool requirements remain in the returned Effect environment.
+ * Use `execute` for host-driven execution. Tool requirements remain in the returned Effect environment.
  *
  * @example
  * ```ts
  * const runtime = CodeMode.make({ tools: { orders: { lookup } } })
- * const code = runtime.agentTool()
+ * const result = runtime.execute("return await tools.orders.lookup({ id: 'order_42' })")
  * ```
  */
 export const make = <const Tools extends Record<string, unknown> = {}>(
@@ -4111,16 +4099,9 @@ export const make = <const Tools extends Record<string, unknown> = {}>(
   return {
     catalog: () => catalog,
     instructions: () => instructions,
-    agentTool: () => ({
-      name: "code",
-      description: instructions,
-      input: ExecuteInputSchema,
-      output: ExecuteResultSchema,
-      execute: ({ code }) => executeProgram(code),
-    }),
     execute: executeProgram,
   }
 }
 
 /** Constructors for one-shot and reusable CodeMode execution. */
-export const CodeMode = { make, execute }
+export const CodeMode = { Input, Result, make, execute }
diff --git a/packages/codemode/src/index.ts b/packages/codemode/src/index.ts
index 1aea6644da..9a21e9f640 100644
--- a/packages/codemode/src/index.ts
+++ b/packages/codemode/src/index.ts
@@ -1,10 +1,9 @@
-export { ToolError, CodeMode, ExecuteInputSchema, ExecuteResultSchema, toolError } from "./codemode.js"
+export { ToolError, CodeMode, toolError } from "./codemode.js"
 export { Tool } from "./tool.js"
 export * as OpenAPI from "./openapi/index.js"
 export type { Definition as ToolDefinition, JsonSchema, ToolSchema } from "./tool.js"
 export type { ToolCallEnded, ToolCallHooks } from "./tool-runtime.js"
 export type {
-  AgentToolDefinition,
   CodeModeOptions,
   CodeModeRuntime,
   DataValue,
diff --git a/packages/codemode/test/codemode.test.ts b/packages/codemode/test/codemode.test.ts
index 4fda88b384..9db7739296 100644
--- a/packages/codemode/test/codemode.test.ts
+++ b/packages/codemode/test/codemode.test.ts
@@ -1,13 +1,6 @@
 import { describe, expect, test } from "bun:test"
 import { Cause, Effect, Schema } from "effect"
-import {
-  CodeMode,
-  ExecuteInputSchema,
-  ExecuteResultSchema,
-  Tool,
-  toolError,
-  type ExecutionLimits,
-} from "../src/index.js"
+import { CodeMode, Tool, toolError, type ExecutionLimits } from "../src/index.js"
 import type { Definition } from "../src/tool.js"
 
 const run = (tool: Definition<never>) =>
@@ -235,7 +228,7 @@ describe("CodeMode console capture", () => {
       logs: ['Thread info: {"name":"Demo","count":2}', "[warn] careful"],
       toolCalls: [],
     })
-    expect(Schema.decodeUnknownSync(ExecuteResultSchema)(JSON.parse(JSON.stringify(result)))).toStrictEqual(result)
+    expect(Schema.decodeUnknownSync(CodeMode.Result)(JSON.parse(JSON.stringify(result)))).toStrictEqual(result)
   })
 
   test("keeps logs captured before failures", async () => {
@@ -371,7 +364,7 @@ describe("CodeMode output budget", () => {
     expect(result.value).toMatch(
       /^\{"data":"x+ \[result truncated: \d+ bytes exceeds the 40-byte output limit; return a smaller value\]$/,
     )
-    expect(Schema.decodeUnknownSync(ExecuteResultSchema)(JSON.parse(JSON.stringify(result)))).toStrictEqual(result)
+    expect(Schema.decodeUnknownSync(CodeMode.Result)(JSON.parse(JSON.stringify(result)))).toStrictEqual(result)
   })
 
   test("keeps leading logs within the remaining budget and marks the cut", async () => {
@@ -501,24 +494,16 @@ describe("CodeMode public contract", () => {
   const tools = { orders: { lookup } }
   const source = `return await tools.orders.lookup({ id: "order_42" })`
 
-  test("keeps one-shot, reusable, and agent-tool execution equivalent", async () => {
+  test("keeps one-shot and reusable execution equivalent", async () => {
     const runtime = CodeMode.make({ tools })
-    const agentTool = runtime.agentTool()
-    const [oneShot, reusable, projected] = await Promise.all([
+    const [oneShot, reusable] = await Promise.all([
       Effect.runPromise(CodeMode.execute({ tools, code: source })),
       Effect.runPromise(runtime.execute(source)),
-      Effect.runPromise(agentTool.execute({ code: source })),
     ])
 
     expect(reusable).toStrictEqual(oneShot)
-    expect(projected).toStrictEqual(oneShot)
-    expect(agentTool.name).toBe("code")
-    expect(agentTool.input).toBe(ExecuteInputSchema)
-    expect(agentTool.output).toBe(ExecuteResultSchema)
-    expect(agentTool.description).toBe(runtime.instructions())
-    expect(Schema.decodeUnknownSync(ExecuteResultSchema)(JSON.parse(JSON.stringify(projected)))).toStrictEqual(
-      projected,
-    )
+    expect(Schema.decodeUnknownSync(CodeMode.Input)({ code: source })).toStrictEqual({ code: source })
+    expect(Schema.decodeUnknownSync(CodeMode.Result)(JSON.parse(JSON.stringify(reusable)))).toStrictEqual(reusable)
   })
 
   test("inlines a COMPLETE small catalog and keeps search registered but unadvertised", async () => {
@@ -1035,7 +1020,7 @@ describe("CodeMode public contract", () => {
       value: { top: null, nested: [1, null] },
       toolCalls: [],
     })
-    expect(Schema.decodeUnknownSync(ExecuteResultSchema)(JSON.parse(JSON.stringify(result)))).toStrictEqual(result)
+    expect(Schema.decodeUnknownSync(CodeMode.Result)(JSON.parse(JSON.stringify(result)))).toStrictEqual(result)
   })
 
   test("rejects invalid configuration and discovery limits", async () => {
diff --git a/packages/core/src/tool/execute.ts b/packages/core/src/tool/execute.ts
index 67d1b21eaf..58dc097a0f 100644
--- a/packages/core/src/tool/execute.ts
+++ b/packages/core/src/tool/execute.ts
@@ -2,7 +2,6 @@ export * as ExecuteTool from "./execute"
 
 import {
   CodeMode,
-  ExecuteInputSchema,
   Tool,
   toolError,
   type DataValue,
@@ -93,7 +92,7 @@ export const create = (options: {
   const discovery = runtime(() => Effect.fail(toolError("Execute context is unavailable")))
   return make({
     description: discovery.instructions(),
-    input: ExecuteInputSchema,
+    input: CodeMode.Input,
     output: ExecuteOutput,
     structured: ExecuteMetadata,
     toStructuredOutput: ({ output }) => ({

From f9d1d3b259cf6c1f2195068214941fc7a19cfd11 Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Sun, 5 Jul 2026 11:51:50 -0500
Subject: [PATCH 63/82] refactor(codemode): namespace public types (#35435)

---
 packages/codemode/README.md              |  28 +-
 packages/codemode/codemode.md            |  31 +--
 packages/codemode/src/codemode.ts        | 135 ++++------
 packages/codemode/src/index.ts           |  23 +-
 packages/codemode/src/openapi/index.ts   |   4 +-
 packages/codemode/src/tool-runtime.ts    |   5 +-
 packages/codemode/src/tool-schema.ts     | 301 +++++++++++++++++++++
 packages/codemode/src/tool.ts            | 318 +----------------------
 packages/codemode/test/codemode.test.ts  |  12 +-
 packages/codemode/test/openapi.test.ts   |   4 +-
 packages/codemode/test/parity.test.ts    |   2 +-
 packages/codemode/test/promise.test.ts   |  11 +-
 packages/codemode/test/signature.test.ts |   4 +-
 packages/core/src/tool/execute.ts        |  20 +-
 14 files changed, 423 insertions(+), 475 deletions(-)
 create mode 100644 packages/codemode/src/tool-schema.ts

diff --git a/packages/codemode/README.md b/packages/codemode/README.md
index 54d31b4e31..0be6d769c7 100644
--- a/packages/codemode/README.md
+++ b/packages/codemode/README.md
@@ -60,7 +60,7 @@ const result =
 `)
 ```
 
-`result` is always an `ExecuteResult`. Program, validation, limit, and tool failures are returned as diagnostics rather than failing the Effect. Host interruption remains interruption.
+`result` is always a `CodeMode.Result`. Program, validation, limit, and tool failures are returned as diagnostics rather than failing the Effect. Host interruption remains interruption.
 
 Successful result values are JSON-safe data. A program that returns `undefined`, including by reaching the end without `return`, produces `null`; nested `undefined` values are normalized to `null` as well.
 
@@ -83,6 +83,8 @@ const tool = Tool.make({
 
 The description and schemas are part of the model-visible tool contract. Keep descriptions concrete and put authorization in `run` or in the service it calls.
 
+Public tool types are grouped under the same namespace: `Tool.Definition`, `Tool.Options`, `Tool.SchemaType`, and `Tool.JsonSchema`.
+
 ### `CodeMode.execute`
 
 Use `CodeMode.execute` for a single execution:
@@ -113,30 +115,32 @@ const runtime = CodeMode.make({
 
 runtime.catalog() // structured tool descriptions
 runtime.instructions() // model-facing syntax and tool guide
-runtime.execute(source) // ExecuteResult
+runtime.execute(source) // CodeMode.Result
 ```
 
-`CodeMode.Input` and `CodeMode.Result` are Effect schemas for the execution request and result. Hosts can combine them with `runtime.instructions()` and `runtime.execute()` when constructing a framework-specific agent tool.
+`CodeMode.Input`, `CodeMode.Result`, `CodeMode.Success`, `CodeMode.Failure`, `CodeMode.Diagnostic`, and `CodeMode.DiagnosticKind` are both Effect schemas and their inferred TypeScript types. Hosts can combine `CodeMode.Input` and `CodeMode.Result` with `runtime.instructions()` and `runtime.execute()` when constructing a framework-specific agent tool.
+
+All other CodeMode types use the same namespace: `CodeMode.Options`, `CodeMode.ExecuteOptions`, `CodeMode.Runtime`, `CodeMode.ExecutionLimits`, `CodeMode.DiscoveryOptions`, `CodeMode.DataValue`, `CodeMode.ToolDescription`, and the `CodeMode.ToolCall*` observation types.
 
 ### Results
 
 ```ts
-type ExecuteResult = ExecuteSuccess | ExecuteFailure
+type Result = Success | Failure
 
-interface ExecuteSuccess {
+interface Success {
   readonly ok: true
-  readonly value: Schema.Json
+  readonly value: CodeMode.DataValue
   readonly logs?: ReadonlyArray<string>
   readonly truncated?: boolean
-  readonly toolCalls: ReadonlyArray<ToolCall>
+  readonly toolCalls: ReadonlyArray<CodeMode.ToolCall>
 }
 
-interface ExecuteFailure {
+interface Failure {
   readonly ok: false
-  readonly error: Diagnostic
+  readonly error: CodeMode.Diagnostic
   readonly logs?: ReadonlyArray<string>
   readonly truncated?: boolean
-  readonly toolCalls: ReadonlyArray<ToolCall>
+  readonly toolCalls: ReadonlyArray<CodeMode.ToolCall>
 }
 ```
 
@@ -300,7 +304,7 @@ import { toolError } from "@opencode-ai/codemode"
 run: ({ id }) => (authorized(id) ? loadOrder(id) : Effect.fail(toolError("Order is unavailable")))
 ```
 
-Only the supplied message is model-visible. The optional cause is never returned in `ExecuteResult`; hosts should perform any required internal logging before crossing this boundary.
+Only the supplied message is model-visible. The optional cause is never returned in `CodeMode.Result`; hosts should perform any required internal logging before crossing this boundary.
 
 ## Authority Boundary
 
@@ -332,7 +336,7 @@ The public contract is guided by these equivalences:
 - A tool implementation is not invoked unless its input has decoded successfully.
 - A tool result is not visible to the program unless its output has decoded and crossed the plain-data boundary successfully.
 - Unknown host failures do not become model-visible diagnostics; `ToolError` is the explicit safe-message channel.
-- Host interruption remains interruption rather than an `ExecuteFailure`.
+- Host interruption remains interruption rather than a `CodeMode.Failure`.
 
 ## Non-Goals
 
diff --git a/packages/codemode/codemode.md b/packages/codemode/codemode.md
index 81348a7c8f..a94f1d4eec 100644
--- a/packages/codemode/codemode.md
+++ b/packages/codemode/codemode.md
@@ -220,9 +220,9 @@ wave; both packages typecheck clean.
   (render-only - no validation, values pass through; rendering handles `$defs`/`definitions`
   - `$ref`). `output` is **optional** -> signature renders `Promise<unknown>` and the host
     result is exposed as-is. Discrimination via `Schema.isSchema`. New helpers exported from
-    `tool.ts`: `inputTypeScript`/`outputTypeScript`/`decodeInput`/`decodeOutput`/
+    `tool-schema.ts`: `inputTypeScript`/`outputTypeScript`/`decodeInput`/`decodeOutput`/
     `jsonSchemaToTypeScript`; `tool-runtime.ts` consumes them (no direct `Schema.*` use there
-    anymore). Types `JsonSchema`/`ToolSchema` exported from the index. Note: an empty
+    anymore). Types `Tool.JsonSchema`/`Tool.SchemaType` exported from the index. Note: an empty
     `Schema.Struct({})` renders as `{  } | Array<unknown>` (effect's JSON Schema emission) -
     cosmetic, fixed in Wave 4.
 - **`output.*` API deleted**: `OutputItem`(+Schema), result `output` fields, the `output`
@@ -237,7 +237,7 @@ wave; both packages typecheck clean.
   so failures are typed and observable). `message` is the model-safe failure message
   (`ToolError`/`ToolRuntimeError` message, else "Tool execution failed"). Interrupted calls
   fire no end event (timeout kills the whole execution anyway).
-- **Limits collapse**: public `ExecutionLimits` = `{ timeoutMs?, maxToolCalls?,
+- **Limits collapse**: public `CodeMode.ExecutionLimits` = `{ timeoutMs?, maxToolCalls?,
 maxOutputBytes? }` (defaults 10_000 / 100 / 32_000). This wave kept the other knobs as
   internal defaults reachable through an `@internal` `InternalExecutionLimits` type; Fix 5
   later deleted that type and the internal limit system entirely.
@@ -313,7 +313,7 @@ real MCP config. Package still 101 tests / 0 fail; opencode adapter suites still
 packages typecheck clean.
 
 - **Budgeted catalog** (`discoveryPlan` in `tool-runtime.ts`): the all-or-nothing
-  inline/search modes are gone - `DiscoveryMode` deleted, `DiscoveryOptions` is just
+  inline/search modes are gone - `DiscoveryMode` deleted, `CodeMode.DiscoveryOptions` is just
   `{ maxInlineCatalogBytes? }` (default 16,000 UTF-8 bytes; later converted to
   `maxInlineCatalogTokens`, default 4,000 estimated tokens - see Post-wave fixes). Port of
   the old opencode
@@ -340,7 +340,7 @@ packages typecheck clean.
   read-the-description-before-calling guidance. (The flat prose layout this wave produced
   was later replaced wholesale by the markdown-section restructure - see Post-wave fixes -
   which also deleted this wave's worked example.)
-- **Cosmetic renderer fixes** (`renderSchema` in `tool.ts`): an object schema with no
+- **Cosmetic renderer fixes** (`renderSchema` in `tool-schema.ts`): an object schema with no
   properties renders `{}` (was `{  }`), and the empty `Schema.Struct({})` emission
   (`anyOf: [{ type: "object" }, { type: "array" }]`, no properties/items) collapses to `{}`
   (was `{  } | Array<unknown>`).
@@ -469,7 +469,7 @@ adapter needed **no changes**.
     `rankTools` algorithm in `packages/opencode/src/session/code-mode.ts` at git HEAD),
     replacing the word-set ranker in `tool-runtime.ts`. Searchable text per tool = path +
     description + input-schema property names + their `description` strings - extracted by
-    the new `inputProperties` helper in `tool.ts` (Effect Schemas via
+    the new `inputProperties` helper in `tool-schema.ts` (Effect Schemas via
     `Schema.toJsonSchemaDocument`, the same emission signature rendering uses; JSON Schemas
     read `properties` directly, resolving a trivial top-level `$ref`; try/catch falls back to
     path + description). Queries tokenize on camelCase boundaries + non-alphanumeric
@@ -542,7 +542,7 @@ budget; namespaces must always be present):
 
 - `src/token.ts` added: copy of `@opencode-ai/core/util/token` (`round(chars / 4)`), so
   the package stays dependency-free; keep in sync if the core heuristic changes.
-- `DiscoveryOptions.maxInlineCatalogBytes` -> `maxInlineCatalogTokens` (default 4,000
+- `CodeMode.DiscoveryOptions.maxInlineCatalogBytes` -> `maxInlineCatalogTokens` (default 4,000
   estimated tokens ~ the old 16,000 bytes at 4 chars/token - behavior parity, not a size
   reduction). `discoveryPlan` charges `estimate(catalogLine(tool))` per line; cheapest-first
   - stop-on-first-miss unchanged at the time (stop-on-first-miss replaced by round-robin in
@@ -558,7 +558,7 @@ budget; namespaces must always be present):
 **Fix 5 - internal limits removed** (user direction: only the three PUBLIC limits survive as
 configurable knobs; the internal limit system dies):
 
-- `ExecutionLimits` (`timeoutMs` 10_000 / `maxToolCalls` 100 / `maxOutputBytes` 32_000 at
+- `CodeMode.ExecutionLimits` (`timeoutMs` 10_000 / `maxToolCalls` 100 / `maxOutputBytes` 32_000 at
   the time; Fix 6 later removed the first two defaults. Same validation: safe integers,
   timeoutMs >= 1, others >= 0, RangeError otherwise) is now
   the ENTIRE limit surface - exactly the shape section 2's original locked spec named.
@@ -602,7 +602,7 @@ configurable knobs; the internal limit system dies):
   enumeration operation-budget, codemode maxDataBytes/maxSourceBytes/maxOperations/
   maxConcurrency-RangeError assertions, and the adapter's runaway-loop-via-operation-limit
   test - superseded by the package timeout regression test); rewrote the helpers that used
-  `InternalExecutionLimits` as a convenience to plain `ExecutionLimits`
+  `InternalExecutionLimits` as a convenience to plain `CodeMode.ExecutionLimits`
   (promise/enumeration/stdlib run helpers). Package suite: 154 pass / 0 fail; adapter
   suites: 34 + 16.
 
@@ -633,7 +633,7 @@ Semantics: each described input/output field carries its schema `description` as
 express surface as JSDoc tags - `@deprecated`, `@default <json>` (unserializable defaults
 skipped), `@format`, `@minItems`/`@maxItems`; `*/` inside text is neutralized to `* /`;
 multiline descriptions become `*`-prefixed blocks with blank edges trimmed; undescribed,
-untagged fields get no comment. Implementation: `renderSchema` in `tool.ts` grew a
+untagged fields get no comment. Implementation: `renderSchema` in `tool-schema.ts` grew a
 `RenderContext` (`{ definitions, pretty }`), a `MAX_RENDER_DEPTH = 8` recursion ceiling plus
 a `$ref` `seen` guard (the renderer previously had neither - a cyclic `$defs` would have
 looped; it now degrades to the ref name/`unknown`), and try/catch totality on the public
@@ -849,7 +849,7 @@ section 4 outer-truncation item the OPPOSITE way from "kill the outer one"):
   that relied on the old default now asserts the oversized result reaches the shared
   wrapper un-truncated. Suites: 210 + 50, tsgo clean both.
 
-**Docs polish** (post-API-review): stale `DiscoveryOptions` JSDoc fixed (claimed default
+**Docs polish** (post-API-review): stale `CodeMode.DiscoveryOptions` JSDoc fixed (claimed default
 4,000 and alphabetical cheapest-first - now 2,000 and round-robin, matching Fix 8/9 reality)
 and the README's incorrect "`effect` as a peer dependency" line corrected (`effect` is a
 regular dependency; hosts depend on it themselves because the API surface is Effect-typed).
@@ -949,16 +949,16 @@ child calls" gap):
 **Signature rendering + compound-assignment parity fixes** (externally reported, both
 verified real with failing tests before fixing):
 
-- **Non-identifier property names in rendered signatures** (`src/tool.ts`): `renderSchema`
+- **Non-identifier property names in rendered signatures** (`src/tool-schema.ts`): `renderSchema`
   emitted raw property names, so schema properties like `foo-bar`/`@type`/`x.y`/`123`
   rendered invalid TypeScript (`{ foo-bar?: string }`). Fixed with a `renderKey` helper -
   bare identifiers stay bare, everything else is `JSON.stringify`-quoted - applied in the
   single `field` closure both the compact and pretty renderings share. The
-  `identifierSegment` regex now lives in `tool.ts` (exported) and `tool-runtime.ts`'s
+  `identifierSegment` regex now lives in `tool-schema.ts` (internal) and `tool-runtime.ts`'s
   bracket-notation `toolExpression` imports it: one source of truth for "is this a bare
   identifier" across object keys and tool paths. Tests: `signature.test.ts` +4 (compact,
   pretty with JSDoc on a quoted key, JSON Schema input+output, Effect Schema struct).
-- **Numeric schema unions keep their real alternatives** (`src/tool.ts`): the old
+- **Numeric schema unions keep their real alternatives** (`src/tool-schema.ts`): the old
   `anyOf`/`oneOf` renderer collapsed any union containing `{ type: "number" }` to just
   `number`, dropping real JSON Schema alternatives (`string | number`, `number | null`,
   etc.). The collapse is now restricted to Effect's number-schema artifact
@@ -1209,7 +1209,8 @@ Post-MVP (logged, not blocking an experimental flag):
   the workspace is the implementation source of truth for v4 behavior questions.
 - File map (this package): `src/codemode.ts` - types/limits/parser/Interpreter/execute/make;
   `src/tool-runtime.ts` - tool tree, `copyIn`/`copyOut`, search/discovery, invoke path;
-  `src/tool.ts` - `Tool.make` + JSON-Schema->TS rendering; `src/values.ts` - sandbox value
+  `src/tool.ts` - public `Tool` definitions; `src/tool-schema.ts` - schema rendering and decoding;
+  `src/values.ts` - sandbox value
   types; `src/tool-error.ts` - `ToolError`; tests in `test/{codemode,parity,stdlib}.test.ts`.
 - OpenCode file map (integration points): `src/tool/code-mode.ts` (the adapter, now a
   registry tool service - `CodeModeTool` + `catalogInstructions`; formerly
diff --git a/packages/codemode/src/codemode.ts b/packages/codemode/src/codemode.ts
index 6aa030e521..b207efe46a 100644
--- a/packages/codemode/src/codemode.ts
+++ b/packages/codemode/src/codemode.ts
@@ -19,8 +19,7 @@ import { ToolError } from "./tool-error.js"
 import { isSandboxValue, SandboxDate, SandboxMap, SandboxPromise, SandboxRegExp, SandboxSet } from "./values.js"
 
 /** A tool call admitted during an execution. */
-export type { ToolCall, ToolCallStarted, ToolDescription } from "./tool-runtime.js"
-export { ToolError, toolError } from "./tool-error.js"
+export type { ToolCall, ToolCallEnded, ToolCallHooks, ToolCallStarted, ToolDescription } from "./tool-runtime.js"
 
 /** Resource budgets enforced independently during each CodeMode program execution. */
 export type ExecutionLimits = {
@@ -74,50 +73,20 @@ export type ExecuteOptions<Tools extends Record<string, unknown> = {}> = {
   onToolCallEnd?: (call: ToolRuntime.ToolCallEnded) => Effect.Effect<void, never, Services<Tools>>
 }
 
-/** A normalized program diagnostic safe to return across an agent tool boundary. */
-export type Diagnostic = {
-  readonly kind: DiagnosticKind
-  readonly message: string
-  readonly location?: { readonly line: number; readonly column: number }
-  readonly suggestions?: ReadonlyArray<string>
-}
-
 /** A JSON value that can cross the confined interpreter boundary. */
 export type DataValue = Schema.Json
 
-/** Successful execution after the result has crossed the plain-data boundary. */
-export type ExecuteSuccess = {
-  readonly ok: true
-  readonly value: DataValue
-  readonly logs?: ReadonlyArray<string>
-  /** Present when the value or logs were truncated to fit `maxOutputBytes`. */
-  readonly truncated?: boolean
-  readonly toolCalls: ReadonlyArray<ToolCall>
-}
-
-/** Failed execution with calls admitted before the diagnostic was produced. */
-export type ExecuteFailure = {
-  readonly ok: false
-  readonly error: Diagnostic
-  readonly logs?: ReadonlyArray<string>
-  /** Present when the logs were truncated to fit `maxOutputBytes`. */
-  readonly truncated?: boolean
-  readonly toolCalls: ReadonlyArray<ToolCall>
-}
-
-/** Result of executing a CodeMode program. Program failures are data, not Effect failures. */
-export type ExecuteResult = ExecuteSuccess | ExecuteFailure
-
 /** Configuration shared by `CodeMode.make` and `CodeMode.execute`. */
-export type CodeModeOptions<Tools extends Record<string, unknown> = {}> = Omit<ExecuteOptions<Tools>, "code"> & {
+export type Options<Tools extends Record<string, unknown> = {}> = Omit<ExecuteOptions<Tools>, "code"> & {
   /** Progressive-disclosure configuration for the agent-facing tool catalog. */
   readonly discovery?: DiscoveryOptions
 }
 
-/** Schema for a CodeMode execution request. */
-const Input = Schema.Struct({ code: Schema.String })
+/** Schema for a host tool input containing CodeMode source. */
+export const Input = Schema.Struct({ code: Schema.String })
+export type Input = typeof Input.Type
 
-const DiagnosticKindSchema = Schema.Literals([
+export const DiagnosticKind = Schema.Literals([
   "ParseError",
   "UnsupportedSyntax",
   "UnknownTool",
@@ -129,38 +98,52 @@ const DiagnosticKindSchema = Schema.Literals([
   "ToolFailure",
   "ExecutionFailure",
 ])
+/** Stable categories produced by program, schema, tool, and limit failures. */
+export type DiagnosticKind = typeof DiagnosticKind.Type
+
+export const Diagnostic = Schema.Struct({
+  kind: DiagnosticKind,
+  message: Schema.String,
+  location: Schema.optionalKey(Schema.Struct({ line: Schema.Number, column: Schema.Number })),
+  suggestions: Schema.optionalKey(Schema.Array(Schema.String)),
+})
+/** A normalized program diagnostic safe to return across an agent tool boundary. */
+export type Diagnostic = typeof Diagnostic.Type
+
+const ToolCallSchema = Schema.Struct({ name: Schema.String })
+export const Success = Schema.Struct({
+  ok: Schema.Literal(true),
+  value: Schema.Json,
+  logs: Schema.optionalKey(Schema.Array(Schema.String)),
+  truncated: Schema.optionalKey(Schema.Boolean),
+  toolCalls: Schema.Array(ToolCallSchema),
+})
+/** Successful execution after the result has crossed the plain-data boundary. */
+export type Success = typeof Success.Type
+
+export const Failure = Schema.Struct({
+  ok: Schema.Literal(false),
+  error: Diagnostic,
+  logs: Schema.optionalKey(Schema.Array(Schema.String)),
+  truncated: Schema.optionalKey(Schema.Boolean),
+  toolCalls: Schema.Array(ToolCallSchema),
+})
+/** Failed execution with calls admitted before the diagnostic was produced. */
+export type Failure = typeof Failure.Type
 
 /** Schema for the structured success or diagnostic returned by CodeMode execution. */
-const Result = Schema.Union([
-  Schema.Struct({
-    ok: Schema.Literal(true),
-    value: Schema.Json,
-    logs: Schema.optionalKey(Schema.Array(Schema.String)),
-    truncated: Schema.optionalKey(Schema.Boolean),
-    toolCalls: Schema.Array(Schema.Struct({ name: Schema.String })),
-  }),
-  Schema.Struct({
-    ok: Schema.Literal(false),
-    error: Schema.Struct({
-      kind: DiagnosticKindSchema,
-      message: Schema.String,
-      location: Schema.optionalKey(Schema.Struct({ line: Schema.Number, column: Schema.Number })),
-      suggestions: Schema.optionalKey(Schema.Array(Schema.String)),
-    }),
-    logs: Schema.optionalKey(Schema.Array(Schema.String)),
-    truncated: Schema.optionalKey(Schema.Boolean),
-    toolCalls: Schema.Array(Schema.Struct({ name: Schema.String })),
-  }),
-])
+export const Result = Schema.Union([Success, Failure])
+/** Result of executing a CodeMode program. Program failures are data, not Effect failures. */
+export type Result = typeof Result.Type
 
 /** Reusable confined runtime over one explicit tool tree. */
-export type CodeModeRuntime<R = never> = {
+export type Runtime<R = never> = {
   /** Lists schema-described tool paths provided by the host. */
   readonly catalog: () => ReadonlyArray<ToolDescription>
   /** Builds model-facing syntax guidance and visible tool signatures. */
   readonly instructions: () => string
   /** Executes a program using this runtime's configured host tools. */
-  readonly execute: (code: string) => Effect.Effect<ExecuteResult, never, R>
+  readonly execute: (code: string) => Effect.Effect<Result, never, R>
 }
 
 type SourcePosition = {
@@ -275,19 +258,6 @@ const errorBrandName = (value: unknown): string | undefined =>
     ? ((value as Record<PropertyKey, unknown>)[ErrorBrand] as string | undefined)
     : undefined
 
-/** Stable categories produced by program, schema, tool, and limit failures. */
-export type DiagnosticKind =
-  | "ParseError"
-  | "UnsupportedSyntax"
-  | "UnknownTool"
-  | "InvalidToolInput"
-  | "InvalidToolOutput"
-  | "InvalidDataValue"
-  | "ToolCallLimitExceeded"
-  | "TimeoutExceeded"
-  | "ToolFailure"
-  | "ExecutionFailure"
-
 const arrayMethods = new Set([
   "map",
   "filter",
@@ -3943,7 +3913,7 @@ const executeWithLimits = <const Tools extends Record<string, unknown>>(
   options: ExecuteOptions<Tools>,
   limits: ResolvedExecutionLimits,
   searchIndex: ToolRuntime.DiscoveryPlan["searchIndex"],
-): Effect.Effect<ExecuteResult, never, Services<Tools>> => {
+): Effect.Effect<Result, never, Services<Tools>> => {
   const hooks = {
     ...(options.onToolCallStart === undefined ? {} : { onToolCallStart: options.onToolCallStart }),
     ...(options.onToolCallEnd === undefined ? {} : { onToolCallEnd: options.onToolCallEnd }),
@@ -3975,7 +3945,7 @@ const executeWithLimits = <const Tools extends Record<string, unknown>>(
       value: result,
       ...logged(),
       toolCalls: tools.calls,
-    } satisfies ExecuteResult
+    } satisfies Result
   }).pipe((program) => {
     const timeoutMs = limits.timeoutMs
     if (timeoutMs === undefined) return program
@@ -3988,7 +3958,7 @@ const executeWithLimits = <const Tools extends Record<string, unknown>>(
             error: { kind: "TimeoutExceeded", message: `Execution timed out after ${timeoutMs}ms.` },
             ...logged(),
             toolCalls: tools.calls,
-          } satisfies ExecuteResult),
+          } satisfies Result),
       }),
     )
   })
@@ -4002,7 +3972,7 @@ const executeWithLimits = <const Tools extends Record<string, unknown>>(
             error: normalizeError(Cause.squash(cause)),
             ...logged(),
             toolCalls: tools.calls,
-          } satisfies ExecuteResult),
+          } satisfies Result),
     ),
     Effect.map((result) => (limits.maxOutputBytes === undefined ? result : boundOutput(result, limits.maxOutputBytes))),
   )
@@ -4026,7 +3996,7 @@ const utf8Truncate = (value: string, maxBytes: number): string => {
  * fails the execution; `truncated: true` marks affected results. Only runs when the host set
  * `maxOutputBytes` - with the limit absent, output passes through unbounded.
  */
-const boundOutput = (result: ExecuteResult, maxOutputBytes: number): ExecuteResult => {
+const boundOutput = (result: Result, maxOutputBytes: number): Result => {
   let truncated = false
 
   let value: DataValue = null
@@ -4068,7 +4038,7 @@ const boundOutput = (result: ExecuteResult, maxOutputBytes: number): ExecuteResu
 
 export const execute = <const Tools extends Record<string, unknown>>(
   options: ExecuteOptions<Tools>,
-): Effect.Effect<ExecuteResult, never, Services<Tools>> => {
+): Effect.Effect<Result, never, Services<Tools>> => {
   const tools = (options.tools ?? {}) as HostTools<Services<Tools>>
   ToolRuntime.assertValidTools(tools)
   return executeWithLimits(options, resolveExecutionLimits(options.limits), ToolRuntime.searchIndex(tools))
@@ -4086,8 +4056,8 @@ export const execute = <const Tools extends Record<string, unknown>>(
  * ```
  */
 export const make = <const Tools extends Record<string, unknown> = {}>(
-  options: CodeModeOptions<Tools> = {} as CodeModeOptions<Tools>,
-): CodeModeRuntime<Services<Tools>> => {
+  options: Options<Tools> = {} as Options<Tools>,
+): Runtime<Services<Tools>> => {
   const tools = (options.tools ?? {}) as HostTools<Services<Tools>>
   ToolRuntime.assertValidTools(tools)
   const limits = resolveExecutionLimits(options.limits)
@@ -4102,6 +4072,3 @@ export const make = <const Tools extends Record<string, unknown> = {}>(
     execute: executeProgram,
   }
 }
-
-/** Constructors for one-shot and reusable CodeMode execution. */
-export const CodeMode = { Input, Result, make, execute }
diff --git a/packages/codemode/src/index.ts b/packages/codemode/src/index.ts
index 9a21e9f640..9201982500 100644
--- a/packages/codemode/src/index.ts
+++ b/packages/codemode/src/index.ts
@@ -1,21 +1,4 @@
-export { ToolError, CodeMode, toolError } from "./codemode.js"
-export { Tool } from "./tool.js"
+export * as CodeMode from "./codemode.js"
+export * as Tool from "./tool.js"
 export * as OpenAPI from "./openapi/index.js"
-export type { Definition as ToolDefinition, JsonSchema, ToolSchema } from "./tool.js"
-export type { ToolCallEnded, ToolCallHooks } from "./tool-runtime.js"
-export type {
-  CodeModeOptions,
-  CodeModeRuntime,
-  DataValue,
-  Diagnostic,
-  DiagnosticKind,
-  DiscoveryOptions,
-  ExecuteFailure,
-  ExecuteOptions,
-  ExecuteResult,
-  ExecuteSuccess,
-  ExecutionLimits,
-  ToolCall,
-  ToolCallStarted,
-  ToolDescription,
-} from "./codemode.js"
+export { ToolError, toolError } from "./tool-error.js"
diff --git a/packages/codemode/src/openapi/index.ts b/packages/codemode/src/openapi/index.ts
index 4ceda5eef0..7f1770ef36 100644
--- a/packages/codemode/src/openapi/index.ts
+++ b/packages/codemode/src/openapi/index.ts
@@ -1,5 +1,5 @@
 import { HttpClient } from "effect/unstable/http"
-import { Tool, type Definition } from "../tool.js"
+import { make, type Definition } from "../tool.js"
 import { invoke } from "./runtime.js"
 import {
   componentDefinitions,
@@ -102,7 +102,7 @@ export const fromSpec = (options: Options): Result => {
       setTool(
         tools,
         segments,
-        Tool.make({
+        make({
           description: operation.description ?? operation.summary ?? `${operation.method} ${path}`,
           input: inputSchema(input.fields, definitions),
           output: output.value,
diff --git a/packages/codemode/src/tool-runtime.ts b/packages/codemode/src/tool-runtime.ts
index 339737375c..268953b56a 100644
--- a/packages/codemode/src/tool-runtime.ts
+++ b/packages/codemode/src/tool-runtime.ts
@@ -6,10 +6,9 @@ import {
   identifierSegment,
   inputProperties,
   inputTypeScript,
-  isDefinition as isToolDefinition,
   outputTypeScript,
-  type Definition,
-} from "./tool.js"
+} from "./tool-schema.js"
+import { isDefinition as isToolDefinition, type Definition } from "./tool.js"
 import { SandboxDate, SandboxMap, SandboxPromise, SandboxRegExp, SandboxSet } from "./values.js"
 
 const estimateTokens = (input: string) => Math.max(0, Math.round(input.length / 4))
diff --git a/packages/codemode/src/tool-schema.ts b/packages/codemode/src/tool-schema.ts
new file mode 100644
index 0000000000..65c444083f
--- /dev/null
+++ b/packages/codemode/src/tool-schema.ts
@@ -0,0 +1,301 @@
+import { JsonPointer, Schema } from "effect"
+import type { Definition, JsonSchema, SchemaType } from "./tool.js"
+
+const isEffectSchema = (schema: SchemaType): schema is Schema.Decoder<unknown> & Schema.Top => Schema.isSchema(schema)
+
+const renderLiteral = (value: unknown): string => JSON.stringify(value) ?? "unknown"
+
+/**
+ * Bare TypeScript identifier - usable unquoted as an object key (and, in the tool runtime,
+ * with dot access as a tool-path segment). Anything else must be quoted/bracketed.
+ */
+export const identifierSegment = /^[A-Za-z_$][A-Za-z0-9_$]*$/
+
+/** Renders a property name as a valid TS object key: bare when an identifier, quoted otherwise. */
+const renderKey = (name: string): string => (identifierSegment.test(name) ? name : JSON.stringify(name))
+
+const effectNumberSentinel = (schema: JsonSchema) =>
+  schema.type === "string" &&
+  Array.isArray(schema.enum) &&
+  schema.enum.length === 1 &&
+  (schema.enum[0] === "NaN" || schema.enum[0] === "Infinity" || schema.enum[0] === "-Infinity")
+
+const intersection = (members: ReadonlyArray<string>): string => {
+  const concrete = members.filter((member) => member !== "unknown")
+  if (concrete.length === 0) return "unknown"
+  if (concrete.length === 1) return concrete[0] ?? "unknown"
+  return concrete.map((member) => (member.includes(" | ") ? `(${member})` : member)).join(" & ")
+}
+
+/**
+ * Recursion ceiling for schema rendering. Object, array, and union recursion all increment
+ * depth, so this bounds every recursion path - pathological or structurally cyclic schemas
+ * degrade to `unknown` instead of overflowing the stack (rendering must never throw).
+ */
+const MAX_RENDER_DEPTH = 8
+
+type RenderContext = {
+  readonly definitions: Readonly<Record<string, JsonSchema>>
+  /** Indented, JSDoc-annotated multiline rendering (search results); compact single line otherwise. */
+  readonly pretty: boolean
+}
+
+const hasUnresolvedRef = (
+  schema: JsonSchema,
+  definitions: Readonly<Record<string, JsonSchema>>,
+  seen: ReadonlySet<string> = new Set(),
+  visited: ReadonlySet<JsonSchema> = new Set(),
+): boolean => {
+  if (visited.has(schema)) return false
+  const nextVisited = new Set([...visited, schema])
+  if (schema.$ref !== undefined) {
+    const segment = schema.$ref.match(/^#\/(?:\$defs|definitions)\/([^/]+)$/)?.[1]
+    const name = segment === undefined ? undefined : JsonPointer.unescapeToken(segment)
+    if (name === undefined || definitions[name] === undefined || seen.has(name)) return true
+    if (hasUnresolvedRef(definitions[name], definitions, new Set([...seen, name]), nextVisited)) return true
+  }
+  return [
+    ...(schema.anyOf ?? []),
+    ...(schema.oneOf ?? []),
+    ...(schema.allOf ?? []),
+    ...Object.values(schema.properties ?? {}),
+    ...(schema.items === undefined ? [] : [schema.items]),
+    ...(typeof schema.additionalProperties === "object" ? [schema.additionalProperties] : []),
+  ].some((item) => hasUnresolvedRef(item, definitions, seen, nextVisited))
+}
+
+/**
+ * Schema constraints a TypeScript type cannot express natively but a model benefits from,
+ * surfaced as JSDoc tags (`@deprecated`, `@default`, `@format`, `@minItems`, `@maxItems`).
+ */
+const docTags = (schema: JsonSchema): Array<string> => {
+  const tags: Array<string> = []
+  if (schema.deprecated === true) tags.push("@deprecated")
+  if (schema.default !== undefined) {
+    try {
+      const rendered = JSON.stringify(schema.default)
+      if (rendered !== undefined) tags.push(`@default ${rendered}`)
+    } catch {
+      // unserializable default: skip rather than emit a broken tag
+    }
+  }
+  if (typeof schema.format === "string") tags.push(`@format ${schema.format}`)
+  if (typeof schema.minItems === "number") tags.push(`@minItems ${schema.minItems}`)
+  if (typeof schema.maxItems === "number") tags.push(`@maxItems ${schema.maxItems}`)
+  return tags
+}
+
+/**
+ * Format a schema `description` plus `tags` as a JSDoc comment at the given indent,
+ * preserving multi-line text (a single line stays `/** ... *\/`; multiple lines become a
+ * `*`-prefixed block). `*\/` is neutralized so nothing can close the comment early, and
+ * blank leading/trailing lines are trimmed. Returns "" (else a trailing newline) so
+ * callers can prepend it directly to the field line.
+ */
+const jsdoc = (description: string | undefined, tags: ReadonlyArray<string>, pad: string): string => {
+  const lines = [...(description === undefined ? [] : description.split("\n")), ...tags].map((line) =>
+    line.replaceAll("*/", "* /").replace(/\s+$/, ""),
+  )
+  while (lines.length > 0 && lines[0]!.trim() === "") lines.shift()
+  while (lines.length > 0 && lines[lines.length - 1]!.trim() === "") lines.pop()
+  if (lines.length === 0) return ""
+  if (lines.length === 1) return `${pad}/** ${lines[0]} */\n`
+  const body = lines.map((line) => `${pad} *${line === "" ? "" : ` ${line}`}`).join("\n")
+  return `${pad}/**\n${body}\n${pad} */\n`
+}
+
+const renderSchema = (
+  schema: JsonSchema,
+  ctx: RenderContext,
+  depth = 0,
+  seen: ReadonlySet<string> = new Set(),
+): string => {
+  if (depth > MAX_RENDER_DEPTH) return "unknown"
+  const nested =
+    schema.definitions === undefined && schema.$defs === undefined
+      ? ctx
+      : { ...ctx, definitions: { ...ctx.definitions, ...(schema.definitions ?? {}), ...(schema.$defs ?? {}) } }
+  if (schema.$ref) {
+    const segment = schema.$ref.match(/^#\/(?:\$defs|definitions)\/([^/]+)$/)?.[1]
+    const name = segment === undefined ? undefined : JsonPointer.unescapeToken(segment)
+    if (!name || !nested.definitions[name] || seen.has(name)) return "unknown"
+    return intersection([
+      renderSchema(nested.definitions[name], nested, depth, new Set([...seen, name])),
+      renderSchema({ ...schema, $ref: undefined }, nested, depth + 1, seen),
+    ])
+  }
+  if (schema.const !== undefined) return renderLiteral(schema.const)
+  if (schema.enum) return schema.enum.map(renderLiteral).join(" | ")
+  const alternatives = schema.anyOf ?? schema.oneOf
+  if (alternatives) {
+    // Effect's number schema emits `anyOf: [{ type: "number" }, { const: "NaN" },
+    // { const: "Infinity" }, { const: "-Infinity" }]`. Collapse only that artifact;
+    // real JSON Schema unions such as `string | number` or `number | null` must keep
+    // every branch.
+    if (
+      alternatives.some((item) => item.type === "number") &&
+      alternatives.every((item) => item.type === "number" || effectNumberSentinel(item))
+    )
+      return "number"
+    // An empty Schema.Struct({}) emits `anyOf: [{ type: "object" }, { type: "array" }]`
+    // (no properties/items); render the bare shape as {} instead of `{} | Array<unknown>`.
+    if (
+      alternatives.length === 2 &&
+      alternatives[0]?.type === "object" &&
+      alternatives[0].properties === undefined &&
+      alternatives[1]?.type === "array" &&
+      alternatives[1].items === undefined
+    ) {
+      return "{}"
+    }
+    const members = alternatives.map((item) => renderSchema(item, nested, depth + 1, seen))
+    if (members.some((member) => member === "unknown")) return "unknown"
+    return intersection([
+      members.join(" | "),
+      renderSchema({ ...schema, anyOf: undefined, oneOf: undefined }, nested, depth + 1, seen),
+    ])
+  }
+  if (schema.allOf) {
+    const members = schema.allOf.map((item) => renderSchema(item, nested, depth + 1, seen))
+    if (schema.allOf.some((item) => hasUnresolvedRef(item, nested.definitions))) return "unknown"
+    return intersection([renderSchema({ ...schema, allOf: undefined }, nested, depth + 1, seen), ...members])
+  }
+  if (Array.isArray(schema.type)) {
+    return schema.type.map((item) => renderSchema({ ...schema, type: item }, nested, depth + 1, seen)).join(" | ")
+  }
+  if (schema.type === "string") return "string"
+  if (schema.type === "number" || schema.type === "integer") return "number"
+  if (schema.type === "boolean") return "boolean"
+  if (schema.type === "null") return "null"
+  if (schema.type === "array") return `Array<${renderSchema(schema.items ?? {}, nested, depth + 1, seen)}>`
+  if (schema.type === "object" || schema.properties) {
+    const required = new Set(schema.required ?? [])
+    const properties = Object.entries(schema.properties ?? {})
+    const additional = schema.additionalProperties
+    const indexType =
+      additional && typeof additional === "object" ? renderSchema(additional, nested, depth + 1, seen) : undefined
+    const field = ([name, value]: readonly [string, JsonSchema]) =>
+      `${renderKey(name)}${required.has(name) ? "" : "?"}: ${renderSchema(value, nested, depth + 1, seen)}`
+
+    if (!ctx.pretty) {
+      const fields = properties.map(field)
+      if (indexType !== undefined) fields.push(`[key: string]: ${indexType}`)
+      return fields.length === 0 ? "{}" : `{ ${fields.join("; ")} }`
+    }
+
+    // Pretty: an indented block, each described field preceded by its JSDoc comment.
+    if (properties.length === 0 && indexType === undefined) return "{}"
+    const pad = "  ".repeat(depth + 1)
+    const lines = properties.map(
+      (entry) => `${jsdoc(entry[1].description, docTags(entry[1]), pad)}${pad}${field(entry)}`,
+    )
+    if (indexType !== undefined) lines.push(`${pad}[key: string]: ${indexType}`)
+    return `{\n${lines.join("\n")}\n${"  ".repeat(depth)}}`
+  }
+  return "unknown"
+}
+
+export const toTypeScript = (schema: Schema.Top, decoded = false, pretty = false): string => {
+  try {
+    const visible = decoded ? Schema.toType(schema) : schema
+    const document = Schema.toJsonSchemaDocument(visible) as {
+      readonly schema: JsonSchema
+      readonly definitions?: Readonly<Record<string, JsonSchema>>
+    }
+    return renderSchema(document.schema, { definitions: document.definitions ?? {}, pretty })
+  } catch {
+    return "unknown"
+  }
+}
+
+/** Renders a raw JSON Schema document as a TypeScript type string. */
+export const jsonSchemaToTypeScript = (schema: JsonSchema, pretty = false): string => {
+  try {
+    return renderSchema(schema, { definitions: { ...(schema.definitions ?? {}), ...(schema.$defs ?? {}) }, pretty })
+  } catch {
+    return "unknown"
+  }
+}
+
+/** One input property of a tool, extracted best-effort from its input schema. */
+export type InputProperty = {
+  readonly name: string
+  readonly description: string | undefined
+  readonly required: boolean
+}
+
+/**
+ * The property names, descriptions, and required flags of a tool's input schema - the raw
+ * material for search text. Best-effort: Effect Schemas go through their
+ * JSON Schema document (the same emission signature rendering uses); JSON Schemas are read
+ * directly, resolving a trivial top-level `$ref` into `$defs`/`definitions` when present.
+ * Anything unresolvable yields `[]` (search falls back to path + description).
+ */
+export const inputProperties = <R>(definition: Definition<R>): Array<InputProperty> => {
+  try {
+    const document = isEffectSchema(definition.input)
+      ? (Schema.toJsonSchemaDocument(definition.input) as {
+          readonly schema: JsonSchema
+          readonly definitions?: Readonly<Record<string, JsonSchema>>
+        })
+      : {
+          schema: definition.input,
+          definitions: { ...(definition.input.definitions ?? {}), ...(definition.input.$defs ?? {}) },
+        }
+    const definitions = document.definitions ?? {}
+    let schema = document.schema
+    if (schema.$ref !== undefined) {
+      const segment = schema.$ref.match(/^#\/(?:\$defs|definitions)\/([^/]+)$/)?.[1]
+      const name = segment === undefined ? undefined : JsonPointer.unescapeToken(segment)
+      const resolved = name === undefined ? undefined : definitions[name]
+      if (resolved === undefined) return []
+      schema = resolved
+    }
+    const required = new Set(schema.required ?? [])
+    return Object.entries(schema.properties ?? {}).map(([name, value]) => ({
+      name,
+      description: typeof value.description === "string" ? value.description : undefined,
+      required: required.has(name),
+    }))
+  } catch {
+    return []
+  }
+}
+
+/**
+ * The model-visible TypeScript type of a tool's input. `pretty` renders an indented
+ * multiline block with schema descriptions and constraints as JSDoc comments on the
+ * fields; the default stays the compact single-line form.
+ */
+export const inputTypeScript = <R>(definition: Definition<R>, pretty = false): string =>
+  isEffectSchema(definition.input)
+    ? toTypeScript(definition.input, false, pretty)
+    : jsonSchemaToTypeScript(definition.input, pretty)
+
+/**
+ * The model-visible TypeScript type of a tool's result; tools without an output schema
+ * return `unknown`. `pretty` renders the JSDoc-annotated multiline form, as for inputs.
+ */
+export const outputTypeScript = <R>(definition: Definition<R>, pretty = false): string =>
+  definition.output === undefined
+    ? "unknown"
+    : isEffectSchema(definition.output)
+      ? toTypeScript(definition.output, true, pretty)
+      : jsonSchemaToTypeScript(definition.output, pretty)
+
+/**
+ * Decodes tool input before `run` is invoked. Effect Schemas validate (throwing on failure);
+ * JSON-Schema-described inputs pass through unvalidated (render-only).
+ */
+export const decodeInput = <R>(definition: Definition<R>, value: unknown): unknown =>
+  isEffectSchema(definition.input) ? Schema.decodeUnknownSync(definition.input)(value) : value
+
+/**
+ * Decodes a tool result before it is exposed to the program. Effect Schemas validate and
+ * transform (throwing on failure); JSON Schema outputs and tools without an output schema pass
+ * the host value through unchanged.
+ */
+export const decodeOutput = <R>(definition: Definition<R>, value: unknown): unknown =>
+  definition.output !== undefined && isEffectSchema(definition.output)
+    ? Schema.decodeUnknownSync(definition.output)(value)
+    : value
diff --git a/packages/codemode/src/tool.ts b/packages/codemode/src/tool.ts
index e89f3d39d6..6c6863f99d 100644
--- a/packages/codemode/src/tool.ts
+++ b/packages/codemode/src/tool.ts
@@ -1,4 +1,4 @@
-import { Effect, JsonPointer, Schema } from "effect"
+import { Effect, Schema } from "effect"
 
 /**
  * JSON Schema subset accepted for render-only tool schemas.
@@ -30,25 +30,25 @@ export type JsonSchema = {
 }
 
 /** Either a validating Effect Schema or a render-only JSON Schema document. */
-export type ToolSchema = Schema.Decoder<unknown> | JsonSchema
+export type SchemaType = Schema.Decoder<unknown> | JsonSchema
 
 /** Schema-backed tool definition consumed by a CodeMode tool tree. */
 export type Definition<R = never> = {
   readonly _tag: "CodeModeTool"
   readonly description: string
-  readonly input: ToolSchema
-  readonly output: ToolSchema | undefined
+  readonly input: SchemaType
+  readonly output: SchemaType | undefined
   readonly run: (input: unknown) => Effect.Effect<unknown, unknown, R>
 }
 
 /** The value `run` receives: the decoded type for Effect Schemas, `unknown` for JSON Schemas. */
-export type InputType<S> = S extends Schema.Decoder<unknown> ? S["Type"] : unknown
+type InputType<S> = S extends Schema.Decoder<unknown> ? S["Type"] : unknown
 
 /** The value `run` returns: the encoded type for Effect Schemas, `unknown` otherwise. */
-export type ResultType<S> = S extends Schema.Decoder<unknown> ? S["Encoded"] : unknown
+type ResultType<S> = S extends Schema.Decoder<unknown> ? S["Encoded"] : unknown
 
 /** Options for defining one CodeMode tool. */
-export type Options<I extends ToolSchema, O extends ToolSchema | undefined, R = never> = {
+export type Options<I extends SchemaType, O extends SchemaType | undefined, R = never> = {
   readonly description: string
   readonly input: I
   readonly output?: O
@@ -58,305 +58,6 @@ export type Options<I extends ToolSchema, O extends ToolSchema | undefined, R =
 export const isDefinition = <R = never>(value: unknown): value is Definition<R> =>
   typeof value === "object" && value !== null && "_tag" in value && value._tag === "CodeModeTool"
 
-const isEffectSchema = (schema: ToolSchema): schema is Schema.Decoder<unknown> & Schema.Top => Schema.isSchema(schema)
-
-const renderLiteral = (value: unknown): string => JSON.stringify(value) ?? "unknown"
-
-/**
- * Bare TypeScript identifier - usable unquoted as an object key (and, in the tool runtime,
- * with dot access as a tool-path segment). Anything else must be quoted/bracketed.
- */
-export const identifierSegment = /^[A-Za-z_$][A-Za-z0-9_$]*$/
-
-/** Renders a property name as a valid TS object key: bare when an identifier, quoted otherwise. */
-const renderKey = (name: string): string => (identifierSegment.test(name) ? name : JSON.stringify(name))
-
-const effectNumberSentinel = (schema: JsonSchema) =>
-  schema.type === "string" &&
-  Array.isArray(schema.enum) &&
-  schema.enum.length === 1 &&
-  (schema.enum[0] === "NaN" || schema.enum[0] === "Infinity" || schema.enum[0] === "-Infinity")
-
-const intersection = (members: ReadonlyArray<string>): string => {
-  const concrete = members.filter((member) => member !== "unknown")
-  if (concrete.length === 0) return "unknown"
-  if (concrete.length === 1) return concrete[0] ?? "unknown"
-  return concrete.map((member) => (member.includes(" | ") ? `(${member})` : member)).join(" & ")
-}
-
-/**
- * Recursion ceiling for schema rendering. Object, array, and union recursion all increment
- * depth, so this bounds every recursion path - pathological or structurally cyclic schemas
- * degrade to `unknown` instead of overflowing the stack (rendering must never throw).
- */
-const MAX_RENDER_DEPTH = 8
-
-type RenderContext = {
-  readonly definitions: Readonly<Record<string, JsonSchema>>
-  /** Indented, JSDoc-annotated multiline rendering (search results); compact single line otherwise. */
-  readonly pretty: boolean
-}
-
-const hasUnresolvedRef = (
-  schema: JsonSchema,
-  definitions: Readonly<Record<string, JsonSchema>>,
-  seen: ReadonlySet<string> = new Set(),
-  visited: ReadonlySet<JsonSchema> = new Set(),
-): boolean => {
-  if (visited.has(schema)) return false
-  const nextVisited = new Set([...visited, schema])
-  if (schema.$ref !== undefined) {
-    const segment = schema.$ref.match(/^#\/(?:\$defs|definitions)\/([^/]+)$/)?.[1]
-    const name = segment === undefined ? undefined : JsonPointer.unescapeToken(segment)
-    if (name === undefined || definitions[name] === undefined || seen.has(name)) return true
-    if (hasUnresolvedRef(definitions[name], definitions, new Set([...seen, name]), nextVisited)) return true
-  }
-  return [
-    ...(schema.anyOf ?? []),
-    ...(schema.oneOf ?? []),
-    ...(schema.allOf ?? []),
-    ...Object.values(schema.properties ?? {}),
-    ...(schema.items === undefined ? [] : [schema.items]),
-    ...(typeof schema.additionalProperties === "object" ? [schema.additionalProperties] : []),
-  ].some((item) => hasUnresolvedRef(item, definitions, seen, nextVisited))
-}
-
-/**
- * Schema constraints a TypeScript type cannot express natively but a model benefits from,
- * surfaced as JSDoc tags (`@deprecated`, `@default`, `@format`, `@minItems`, `@maxItems`).
- */
-const docTags = (schema: JsonSchema): Array<string> => {
-  const tags: Array<string> = []
-  if (schema.deprecated === true) tags.push("@deprecated")
-  if (schema.default !== undefined) {
-    try {
-      const rendered = JSON.stringify(schema.default)
-      if (rendered !== undefined) tags.push(`@default ${rendered}`)
-    } catch {
-      // unserializable default: skip rather than emit a broken tag
-    }
-  }
-  if (typeof schema.format === "string") tags.push(`@format ${schema.format}`)
-  if (typeof schema.minItems === "number") tags.push(`@minItems ${schema.minItems}`)
-  if (typeof schema.maxItems === "number") tags.push(`@maxItems ${schema.maxItems}`)
-  return tags
-}
-
-/**
- * Format a schema `description` plus `tags` as a JSDoc comment at the given indent,
- * preserving multi-line text (a single line stays `/** ... *\/`; multiple lines become a
- * `*`-prefixed block). `*\/` is neutralized so nothing can close the comment early, and
- * blank leading/trailing lines are trimmed. Returns "" (else a trailing newline) so
- * callers can prepend it directly to the field line.
- */
-const jsdoc = (description: string | undefined, tags: ReadonlyArray<string>, pad: string): string => {
-  const lines = [...(description === undefined ? [] : description.split("\n")), ...tags].map((line) =>
-    line.replaceAll("*/", "* /").replace(/\s+$/, ""),
-  )
-  while (lines.length > 0 && lines[0]!.trim() === "") lines.shift()
-  while (lines.length > 0 && lines[lines.length - 1]!.trim() === "") lines.pop()
-  if (lines.length === 0) return ""
-  if (lines.length === 1) return `${pad}/** ${lines[0]} */\n`
-  const body = lines.map((line) => `${pad} *${line === "" ? "" : ` ${line}`}`).join("\n")
-  return `${pad}/**\n${body}\n${pad} */\n`
-}
-
-const renderSchema = (
-  schema: JsonSchema,
-  ctx: RenderContext,
-  depth = 0,
-  seen: ReadonlySet<string> = new Set(),
-): string => {
-  if (depth > MAX_RENDER_DEPTH) return "unknown"
-  const nested =
-    schema.definitions === undefined && schema.$defs === undefined
-      ? ctx
-      : { ...ctx, definitions: { ...ctx.definitions, ...(schema.definitions ?? {}), ...(schema.$defs ?? {}) } }
-  if (schema.$ref) {
-    const segment = schema.$ref.match(/^#\/(?:\$defs|definitions)\/([^/]+)$/)?.[1]
-    const name = segment === undefined ? undefined : JsonPointer.unescapeToken(segment)
-    if (!name || !nested.definitions[name] || seen.has(name)) return "unknown"
-    return intersection([
-      renderSchema(nested.definitions[name], nested, depth, new Set([...seen, name])),
-      renderSchema({ ...schema, $ref: undefined }, nested, depth + 1, seen),
-    ])
-  }
-  if (schema.const !== undefined) return renderLiteral(schema.const)
-  if (schema.enum) return schema.enum.map(renderLiteral).join(" | ")
-  const alternatives = schema.anyOf ?? schema.oneOf
-  if (alternatives) {
-    // Effect's number schema emits `anyOf: [{ type: "number" }, { const: "NaN" },
-    // { const: "Infinity" }, { const: "-Infinity" }]`. Collapse only that artifact;
-    // real JSON Schema unions such as `string | number` or `number | null` must keep
-    // every branch.
-    if (
-      alternatives.some((item) => item.type === "number") &&
-      alternatives.every((item) => item.type === "number" || effectNumberSentinel(item))
-    )
-      return "number"
-    // An empty Schema.Struct({}) emits `anyOf: [{ type: "object" }, { type: "array" }]`
-    // (no properties/items); render the bare shape as {} instead of `{} | Array<unknown>`.
-    if (
-      alternatives.length === 2 &&
-      alternatives[0]?.type === "object" &&
-      alternatives[0].properties === undefined &&
-      alternatives[1]?.type === "array" &&
-      alternatives[1].items === undefined
-    ) {
-      return "{}"
-    }
-    const members = alternatives.map((item) => renderSchema(item, nested, depth + 1, seen))
-    if (members.some((member) => member === "unknown")) return "unknown"
-    return intersection([
-      members.join(" | "),
-      renderSchema({ ...schema, anyOf: undefined, oneOf: undefined }, nested, depth + 1, seen),
-    ])
-  }
-  if (schema.allOf) {
-    const members = schema.allOf.map((item) => renderSchema(item, nested, depth + 1, seen))
-    if (schema.allOf.some((item) => hasUnresolvedRef(item, nested.definitions))) return "unknown"
-    return intersection([renderSchema({ ...schema, allOf: undefined }, nested, depth + 1, seen), ...members])
-  }
-  if (Array.isArray(schema.type)) {
-    return schema.type.map((item) => renderSchema({ ...schema, type: item }, nested, depth + 1, seen)).join(" | ")
-  }
-  if (schema.type === "string") return "string"
-  if (schema.type === "number" || schema.type === "integer") return "number"
-  if (schema.type === "boolean") return "boolean"
-  if (schema.type === "null") return "null"
-  if (schema.type === "array") return `Array<${renderSchema(schema.items ?? {}, nested, depth + 1, seen)}>`
-  if (schema.type === "object" || schema.properties) {
-    const required = new Set(schema.required ?? [])
-    const properties = Object.entries(schema.properties ?? {})
-    const additional = schema.additionalProperties
-    const indexType =
-      additional && typeof additional === "object" ? renderSchema(additional, nested, depth + 1, seen) : undefined
-    const field = ([name, value]: readonly [string, JsonSchema]) =>
-      `${renderKey(name)}${required.has(name) ? "" : "?"}: ${renderSchema(value, nested, depth + 1, seen)}`
-
-    if (!ctx.pretty) {
-      const fields = properties.map(field)
-      if (indexType !== undefined) fields.push(`[key: string]: ${indexType}`)
-      return fields.length === 0 ? "{}" : `{ ${fields.join("; ")} }`
-    }
-
-    // Pretty: an indented block, each described field preceded by its JSDoc comment.
-    if (properties.length === 0 && indexType === undefined) return "{}"
-    const pad = "  ".repeat(depth + 1)
-    const lines = properties.map(
-      (entry) => `${jsdoc(entry[1].description, docTags(entry[1]), pad)}${pad}${field(entry)}`,
-    )
-    if (indexType !== undefined) lines.push(`${pad}[key: string]: ${indexType}`)
-    return `{\n${lines.join("\n")}\n${"  ".repeat(depth)}}`
-  }
-  return "unknown"
-}
-
-export const toTypeScript = (schema: Schema.Top, decoded = false, pretty = false): string => {
-  try {
-    const visible = decoded ? Schema.toType(schema) : schema
-    const document = Schema.toJsonSchemaDocument(visible) as {
-      readonly schema: JsonSchema
-      readonly definitions?: Readonly<Record<string, JsonSchema>>
-    }
-    return renderSchema(document.schema, { definitions: document.definitions ?? {}, pretty })
-  } catch {
-    return "unknown"
-  }
-}
-
-/** Renders a raw JSON Schema document as a TypeScript type string. */
-export const jsonSchemaToTypeScript = (schema: JsonSchema, pretty = false): string => {
-  try {
-    return renderSchema(schema, { definitions: { ...(schema.definitions ?? {}), ...(schema.$defs ?? {}) }, pretty })
-  } catch {
-    return "unknown"
-  }
-}
-
-/** One input property of a tool, extracted best-effort from its input schema. */
-export type InputProperty = {
-  readonly name: string
-  readonly description: string | undefined
-  readonly required: boolean
-}
-
-/**
- * The property names, descriptions, and required flags of a tool's input schema - the raw
- * material for search text. Best-effort: Effect Schemas go through their
- * JSON Schema document (the same emission signature rendering uses); JSON Schemas are read
- * directly, resolving a trivial top-level `$ref` into `$defs`/`definitions` when present.
- * Anything unresolvable yields `[]` (search falls back to path + description).
- */
-export const inputProperties = <R>(definition: Definition<R>): Array<InputProperty> => {
-  try {
-    const document = isEffectSchema(definition.input)
-      ? (Schema.toJsonSchemaDocument(definition.input) as {
-          readonly schema: JsonSchema
-          readonly definitions?: Readonly<Record<string, JsonSchema>>
-        })
-      : {
-          schema: definition.input,
-          definitions: { ...(definition.input.definitions ?? {}), ...(definition.input.$defs ?? {}) },
-        }
-    const definitions = document.definitions ?? {}
-    let schema = document.schema
-    if (schema.$ref !== undefined) {
-      const segment = schema.$ref.match(/^#\/(?:\$defs|definitions)\/([^/]+)$/)?.[1]
-      const name = segment === undefined ? undefined : JsonPointer.unescapeToken(segment)
-      const resolved = name === undefined ? undefined : definitions[name]
-      if (resolved === undefined) return []
-      schema = resolved
-    }
-    const required = new Set(schema.required ?? [])
-    return Object.entries(schema.properties ?? {}).map(([name, value]) => ({
-      name,
-      description: typeof value.description === "string" ? value.description : undefined,
-      required: required.has(name),
-    }))
-  } catch {
-    return []
-  }
-}
-
-/**
- * The model-visible TypeScript type of a tool's input. `pretty` renders an indented
- * multiline block with schema descriptions and constraints as JSDoc comments on the
- * fields; the default stays the compact single-line form.
- */
-export const inputTypeScript = <R>(definition: Definition<R>, pretty = false): string =>
-  isEffectSchema(definition.input)
-    ? toTypeScript(definition.input, false, pretty)
-    : jsonSchemaToTypeScript(definition.input, pretty)
-
-/**
- * The model-visible TypeScript type of a tool's result; tools without an output schema
- * return `unknown`. `pretty` renders the JSDoc-annotated multiline form, as for inputs.
- */
-export const outputTypeScript = <R>(definition: Definition<R>, pretty = false): string =>
-  definition.output === undefined
-    ? "unknown"
-    : isEffectSchema(definition.output)
-      ? toTypeScript(definition.output, true, pretty)
-      : jsonSchemaToTypeScript(definition.output, pretty)
-
-/**
- * Decodes tool input before `run` is invoked. Effect Schemas validate (throwing on failure);
- * JSON-Schema-described inputs pass through unvalidated (render-only).
- */
-export const decodeInput = <R>(definition: Definition<R>, value: unknown): unknown =>
-  isEffectSchema(definition.input) ? Schema.decodeUnknownSync(definition.input)(value) : value
-
-/**
- * Decodes a tool result before it is exposed to the program. Effect Schemas validate and
- * transform (throwing on failure); JSON Schema outputs and tools without an output schema pass
- * the host value through unchanged.
- */
-export const decodeOutput = <R>(definition: Definition<R>, value: unknown): unknown =>
-  definition.output !== undefined && isEffectSchema(definition.output)
-    ? Schema.decodeUnknownSync(definition.output)(value)
-    : value
-
 /**
  * Defines one schema-described tool available to a CodeMode program through `tools.*`.
  *
@@ -384,7 +85,7 @@ export const decodeOutput = <R>(definition: Definition<R>, value: unknown): unkn
  * })
  * ```
  */
-export const make = <I extends ToolSchema, const O extends ToolSchema | undefined = undefined, R = never>(
+export const make = <I extends SchemaType, const O extends SchemaType | undefined = undefined, R = never>(
   options: Options<I, O, R>,
 ): Definition<R> => ({
   _tag: "CodeModeTool",
@@ -393,6 +94,3 @@ export const make = <I extends ToolSchema, const O extends ToolSchema | undefine
   output: options.output,
   run: (input) => options.run(input as InputType<I>),
 })
-
-/** Constructors for schema-backed tools exposed inside CodeMode programs. */
-export const Tool = { make, isDefinition }
diff --git a/packages/codemode/test/codemode.test.ts b/packages/codemode/test/codemode.test.ts
index 9db7739296..087678c778 100644
--- a/packages/codemode/test/codemode.test.ts
+++ b/packages/codemode/test/codemode.test.ts
@@ -1,9 +1,8 @@
 import { describe, expect, test } from "bun:test"
 import { Cause, Effect, Schema } from "effect"
-import { CodeMode, Tool, toolError, type ExecutionLimits } from "../src/index.js"
-import type { Definition } from "../src/tool.js"
+import { CodeMode, Tool, toolError } from "../src/index.js"
 
-const run = (tool: Definition<never>) =>
+const run = (tool: Tool.Definition<never>) =>
   Effect.runPromise(CodeMode.make({ tools: { host: { call: tool } } }).execute("return await tools.host.call({})"))
 
 class UnsafeHostError extends Schema.TaggedErrorClass<UnsafeHostError>()("UnsafeHostError", {
@@ -349,7 +348,7 @@ describe("CodeMode output budget", () => {
   })
 
   test("truncates an oversized result value with a marker instead of failing", async () => {
-    const limits: ExecutionLimits = { maxOutputBytes: 40 }
+    const limits: CodeMode.ExecutionLimits = { maxOutputBytes: 40 }
     const result = await Effect.runPromise(
       CodeMode.execute({
         code: `return { data: "${"x".repeat(200)}" }`,
@@ -368,7 +367,7 @@ describe("CodeMode output budget", () => {
   })
 
   test("keeps leading logs within the remaining budget and marks the cut", async () => {
-    const limits: ExecutionLimits = { maxOutputBytes: 40 }
+    const limits: CodeMode.ExecutionLimits = { maxOutputBytes: 40 }
     const result = await Effect.runPromise(
       CodeMode.execute({
         code: `
@@ -502,7 +501,8 @@ describe("CodeMode public contract", () => {
     ])
 
     expect(reusable).toStrictEqual(oneShot)
-    expect(Schema.decodeUnknownSync(CodeMode.Input)({ code: source })).toStrictEqual({ code: source })
+    const input: CodeMode.Input = { code: source }
+    expect(Schema.decodeUnknownSync(CodeMode.Input)(input)).toStrictEqual(input)
     expect(Schema.decodeUnknownSync(CodeMode.Result)(JSON.parse(JSON.stringify(reusable)))).toStrictEqual(reusable)
   })
 
diff --git a/packages/codemode/test/openapi.test.ts b/packages/codemode/test/openapi.test.ts
index 99a0890091..a50460e8da 100644
--- a/packages/codemode/test/openapi.test.ts
+++ b/packages/codemode/test/openapi.test.ts
@@ -1,8 +1,8 @@
 import { describe, expect, test } from "bun:test"
 import { Effect, Layer, Option } from "effect"
 import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
-import { CodeMode, OpenAPI } from "../src/index.js"
-import { inputTypeScript, outputTypeScript, Tool } from "../src/tool.js"
+import { CodeMode, OpenAPI, Tool } from "../src/index.js"
+import { inputTypeScript, outputTypeScript } from "../src/tool-schema.js"
 
 const baseUrl = "http://localhost:4096"
 type Document = OpenAPI.Document
diff --git a/packages/codemode/test/parity.test.ts b/packages/codemode/test/parity.test.ts
index e5c1d83822..dfa8583183 100644
--- a/packages/codemode/test/parity.test.ts
+++ b/packages/codemode/test/parity.test.ts
@@ -3,7 +3,7 @@ import { Effect } from "effect"
 import { CodeMode } from "../src/index.js"
 import { ToolRuntime } from "../src/tool-runtime.js"
 
-// Runs a CodeMode program with no host tools and returns the ExecuteResult. These tests pin the
+// Runs a CodeMode program with no host tools and returns the CodeMode.Result. These tests pin the
 // JS-parity behaviors for the "99% of ordinary defensive JavaScript just works" goal: cases where
 // a strict interpreter would throw but idiomatic JS yields undefined / succeeds.
 //
diff --git a/packages/codemode/test/promise.test.ts b/packages/codemode/test/promise.test.ts
index 952b2fdc50..545d463abf 100644
--- a/packages/codemode/test/promise.test.ts
+++ b/packages/codemode/test/promise.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test"
 import { Effect, Schema } from "effect"
-import { CodeMode, Tool, toolError, type ExecuteResult, type ExecutionLimits } from "../src/index.js"
+import { CodeMode, Tool, toolError } from "../src/index.js"
 
 // Wave 5 acceptance suite: first-class promise values. Un-awaited tool calls start eagerly on
 // supervised fibers, `await` settles them, and Promise.all/allSettled/race/resolve/reject are
@@ -48,7 +48,10 @@ const failingTool = Tool.make({
   run: () => Effect.fail(toolError("Lookup refused")),
 })
 
-const run = (code: string, options: { trace?: Trace; limits?: ExecutionLimits } = {}): Promise<ExecuteResult> => {
+const run = (
+  code: string,
+  options: { trace?: Trace; limits?: CodeMode.ExecutionLimits } = {},
+): Promise<CodeMode.Result> => {
   const trace = options.trace ?? makeTrace()
   return Effect.runPromise(
     CodeMode.execute({
@@ -59,13 +62,13 @@ const run = (code: string, options: { trace?: Trace; limits?: ExecutionLimits }
   )
 }
 
-const value = async (code: string, options: { trace?: Trace; limits?: ExecutionLimits } = {}) => {
+const value = async (code: string, options: { trace?: Trace; limits?: CodeMode.ExecutionLimits } = {}) => {
   const result = await run(code, options)
   if (!result.ok) throw new Error(`expected success, got ${result.error.kind}: ${result.error.message}`)
   return result.value
 }
 
-const error = async (code: string, options: { trace?: Trace; limits?: ExecutionLimits } = {}) => {
+const error = async (code: string, options: { trace?: Trace; limits?: CodeMode.ExecutionLimits } = {}) => {
   const result = await run(code, options)
   if (result.ok) throw new Error(`expected failure, got value ${JSON.stringify(result.value)}`)
   return result.error
diff --git a/packages/codemode/test/signature.test.ts b/packages/codemode/test/signature.test.ts
index 55b8ac020a..47345be7d7 100644
--- a/packages/codemode/test/signature.test.ts
+++ b/packages/codemode/test/signature.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test"
 import { Effect, Schema } from "effect"
-import { CodeMode } from "../src/index.js"
-import { Tool, inputTypeScript, jsonSchemaToTypeScript, outputTypeScript } from "../src/tool.js"
+import { CodeMode, Tool } from "../src/index.js"
+import { inputTypeScript, jsonSchemaToTypeScript, outputTypeScript } from "../src/tool-schema.js"
 
 // A raw JSON Schema tool in the shape an MCP adapter produces: render-only input schema
 // whose property descriptions and constraints must surface as JSDoc in pretty signatures.
diff --git a/packages/core/src/tool/execute.ts b/packages/core/src/tool/execute.ts
index 58dc097a0f..f5bd776e5a 100644
--- a/packages/core/src/tool/execute.ts
+++ b/packages/core/src/tool/execute.ts
@@ -1,14 +1,6 @@
 export * as ExecuteTool from "./execute"
 
-import {
-  CodeMode,
-  Tool,
-  toolError,
-  type DataValue,
-  type ExecuteResult,
-  type ToolCallHooks,
-  type ToolDefinition,
-} from "@opencode-ai/codemode"
+import { CodeMode, Tool, toolError } from "@opencode-ai/codemode"
 import { ToolOutput } from "@opencode-ai/llm"
 import { Effect, Ref, Schema } from "effect"
 import { definition, make, settle, type AnyTool } from "./tool"
@@ -57,9 +49,9 @@ export const create = (options: {
 }) => {
   const runtime = (
     invoke: (name: string, registration: Registration, input: unknown) => Effect.Effect<unknown, unknown>,
-    hooks?: ToolCallHooks,
+    hooks?: CodeMode.ToolCallHooks,
   ) => {
-    const tools: Record<string, ToolDefinition<never> | Record<string, ToolDefinition<never>>> = {}
+    const tools: Record<string, Tool.Definition<never> | Record<string, Tool.Definition<never>>> = {}
     for (const [name, registration] of options.registrations) {
       const child = definition(name, registration.tool)
       const value = Tool.make({
@@ -83,7 +75,7 @@ export const create = (options: {
         group[path] = value
         continue
       }
-      const entries: Record<string, ToolDefinition<never>> = {}
+      const entries: Record<string, Tool.Definition<never>> = {}
       entries[path] = value
       tools[namespace] = entries
     }
@@ -178,7 +170,7 @@ function displayInput(input: unknown): Record<string, unknown> | undefined {
   return input as Record<string, unknown>
 }
 
-function formatResult(result: ExecuteResult) {
+function formatResult(result: CodeMode.Result) {
   const output = result.ok
     ? formatValue(result.value)
     : [result.error.message, ...(result.error.suggestions ?? []).filter((hint) => !result.error.message.includes(hint))]
@@ -189,7 +181,7 @@ function formatResult(result: ExecuteResult) {
   return output === "" ? logs : `${output}\n\n${logs}`
 }
 
-function formatValue(value: DataValue) {
+function formatValue(value: CodeMode.DataValue) {
   if (typeof value === "string") return value
   return JSON.stringify(value, null, 2) ?? String(value)
 }

From a9b7bd9e2f2d3ff4429940dbbd850a62b6f3776d Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Sun, 5 Jul 2026 15:51:15 -0400
Subject: [PATCH 64/82] feat(core): manage configurable plugin generations

---
 packages/core/src/config.ts                   |   2 +-
 packages/core/src/config/plugin/agent.ts      |   4 +-
 packages/core/src/config/plugin/command.ts    |   4 +-
 packages/core/src/config/plugin/external.ts   | 136 ------
 packages/core/src/config/plugin/provider.ts   |   4 +-
 packages/core/src/config/plugin/reference.ts  |   4 +-
 packages/core/src/config/plugin/skill.ts      |   4 +-
 packages/core/src/event.ts                    |  24 +-
 packages/core/src/location-services.ts        |  60 ++-
 packages/core/src/plugin.ts                   | 139 ++----
 packages/core/src/plugin/agent.ts             |   4 +-
 packages/core/src/plugin/command.ts           |   4 +-
 packages/core/src/plugin/host.ts              |   2 -
 packages/core/src/plugin/internal.ts          | 288 +++++-------
 packages/core/src/plugin/models-dev.ts        |   4 +-
 packages/core/src/plugin/promise.ts           |   7 +-
 packages/core/src/plugin/provider.ts          |   3 +-
 packages/core/src/plugin/provider/alibaba.ts  |   4 +-
 .../src/plugin/provider/amazon-bedrock.ts     |   4 +-
 .../core/src/plugin/provider/anthropic.ts     |   4 +-
 packages/core/src/plugin/provider/azure.ts    |   6 +-
 packages/core/src/plugin/provider/cerebras.ts |   4 +-
 .../plugin/provider/cloudflare-ai-gateway.ts  |   4 +-
 .../plugin/provider/cloudflare-workers-ai.ts  |   4 +-
 packages/core/src/plugin/provider/cohere.ts   |   4 +-
 .../core/src/plugin/provider/deepinfra.ts     |   4 +-
 packages/core/src/plugin/provider/dynamic.ts  |   4 +-
 packages/core/src/plugin/provider/gateway.ts  |   4 +-
 .../src/plugin/provider/github-copilot.ts     |   4 +-
 packages/core/src/plugin/provider/gitlab.ts   |   4 +-
 .../core/src/plugin/provider/google-vertex.ts |   6 +-
 packages/core/src/plugin/provider/google.ts   |   4 +-
 packages/core/src/plugin/provider/groq.ts     |   4 +-
 packages/core/src/plugin/provider/kilo.ts     |   4 +-
 .../core/src/plugin/provider/llmgateway.ts    |   4 +-
 packages/core/src/plugin/provider/mistral.ts  |   4 +-
 packages/core/src/plugin/provider/nvidia.ts   |   4 +-
 .../src/plugin/provider/openai-compatible.ts  |   4 +-
 packages/core/src/plugin/provider/openai.ts   |   5 +-
 packages/core/src/plugin/provider/opencode.ts |   2 +-
 .../core/src/plugin/provider/openrouter.ts    |   4 +-
 .../core/src/plugin/provider/perplexity.ts    |   4 +-
 .../core/src/plugin/provider/sap-ai-core.ts   |   4 +-
 .../src/plugin/provider/snowflake-cortex.ts   |   4 +-
 .../core/src/plugin/provider/togetherai.ts    |   4 +-
 packages/core/src/plugin/provider/venice.ts   |   4 +-
 packages/core/src/plugin/provider/vercel.ts   |   4 +-
 packages/core/src/plugin/provider/xai.ts      |   4 +-
 packages/core/src/plugin/provider/zenmux.ts   |   4 +-
 packages/core/src/plugin/sdk.ts               |   6 +-
 packages/core/src/plugin/skill.ts             |   4 +-
 packages/core/src/plugin/supervisor.ts        | 270 +++++++++++
 packages/core/src/plugin/variant.ts           |   4 +-
 packages/core/src/state.ts                    |  29 +-
 packages/core/src/tool/apply-patch.ts         |   2 +-
 packages/core/src/tool/edit.ts                |   2 +-
 packages/core/src/tool/glob.ts                |   2 +-
 packages/core/src/tool/grep.ts                |   2 +-
 packages/core/src/tool/question.ts            |   2 +-
 packages/core/src/tool/read.ts                |   2 +-
 packages/core/src/tool/shell.ts               |   2 +-
 packages/core/src/tool/skill.ts               |   2 +-
 packages/core/src/tool/subagent.ts            |   2 +-
 packages/core/src/tool/todowrite.ts           |   2 +-
 packages/core/src/tool/webfetch.ts            |   2 +-
 packages/core/src/tool/websearch.ts           |   2 +-
 packages/core/src/tool/write.ts               |   2 +-
 packages/core/test/config/plugin.test.ts      | 437 ++++++++----------
 packages/core/test/config/reload.test.ts      |  19 +-
 packages/core/test/location-layer.test.ts     | 126 ++++-
 packages/core/test/plugin.test.ts             | 134 ++++--
 .../test/plugin/fixtures/failing-plugin.ts    |   7 +
 .../plugin/fixtures/variant-source-plugin.ts  |  29 ++
 packages/core/test/plugin/host.ts             |   2 -
 .../core/test/plugin/provider-kilo.test.ts    |   4 +-
 .../test/plugin/provider-llmgateway.test.ts   |   4 +-
 .../core/test/plugin/provider-nvidia.test.ts  |   4 +-
 .../test/plugin/provider-openrouter.test.ts   |   4 +-
 .../plugin/provider-snowflake-cortex.test.ts  |   6 +-
 .../core/test/plugin/provider-zenmux.test.ts  |   4 +-
 packages/opencode/src/agent/agent.ts          |   4 +-
 packages/plugin/src/v2/effect/plugin.ts       |   5 +-
 packages/plugin/src/v2/promise/plugin.ts      |   5 +-
 83 files changed, 1127 insertions(+), 830 deletions(-)
 delete mode 100644 packages/core/src/config/plugin/external.ts
 create mode 100644 packages/core/src/plugin/supervisor.ts
 create mode 100644 packages/core/test/plugin/fixtures/failing-plugin.ts
 create mode 100644 packages/core/test/plugin/fixtures/variant-source-plugin.ts

diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
index 48c380aef3..4bd33ca240 100644
--- a/packages/core/src/config.ts
+++ b/packages/core/src/config.ts
@@ -102,7 +102,7 @@ export class Info extends Schema.Class<Info>("Config.Info")({
     description: "Named local directories or Git repositories available as external context",
   }),
   plugins: ConfigPlugin.Plugins.pipe(Schema.optional).annotate({
-    description: "Ordered external plugin packages to load",
+    description: "Ordered plugin enablement directives and external package declarations",
   }),
   providers: Schema.Record(Schema.String, ConfigProvider.Info).pipe(Schema.optional),
 }) {}
diff --git a/packages/core/src/config/plugin/agent.ts b/packages/core/src/config/plugin/agent.ts
index 3aebf88fbe..fa8b61ce18 100644
--- a/packages/core/src/config/plugin/agent.ts
+++ b/packages/core/src/config/plugin/agent.ts
@@ -1,6 +1,6 @@
 export * as ConfigAgentPlugin from "./agent"
 
-import { define } from "../../plugin/internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import path from "path"
 import { Effect, Option, Schema, Stream } from "effect"
 import { AgentV2 } from "../../agent"
@@ -34,7 +34,7 @@ const agentKeys = new Set([
 ])
 
 export const Plugin = define({
-  id: "config-agent",
+  id: "opencode.config.agent",
   effect: Effect.fn(function* (ctx) {
     const config = yield* Config.Service
     const fs = yield* FSUtil.Service
diff --git a/packages/core/src/config/plugin/command.ts b/packages/core/src/config/plugin/command.ts
index 43ba4cd375..a7babbb5aa 100644
--- a/packages/core/src/config/plugin/command.ts
+++ b/packages/core/src/config/plugin/command.ts
@@ -1,6 +1,6 @@
 export * as ConfigCommandPlugin from "./command"
 
-import { define } from "../../plugin/internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import path from "path"
 import { Effect, Option, Schema, Stream } from "effect"
 import { CommandV2 } from "../../command"
@@ -13,7 +13,7 @@ import { ConfigMarkdown } from "../markdown"
 const decodeCommand = Schema.decodeUnknownOption(ConfigCommand.Info)
 
 export const Plugin = define({
-  id: "config-command",
+  id: "opencode.config.command",
   effect: Effect.fn(function* (ctx) {
     const config = yield* Config.Service
     const fs = yield* FSUtil.Service
diff --git a/packages/core/src/config/plugin/external.ts b/packages/core/src/config/plugin/external.ts
deleted file mode 100644
index 70271dec23..0000000000
--- a/packages/core/src/config/plugin/external.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-export * as ConfigExternalPlugin from "./external"
-
-import type { Plugin as EffectPlugin } from "@opencode-ai/plugin/v2/effect"
-import type { Plugin as PromisePlugin } from "@opencode-ai/plugin/v2/promise"
-import { Effect, Schema } from "effect"
-import path from "path"
-import { fileURLToPath, pathToFileURL } from "url"
-import { Config } from "../../config"
-import { FSUtil } from "../../fs-util"
-import { Location } from "../../location"
-import { Npm } from "../../npm"
-import { define } from "../../plugin/internal"
-import { PluginPromise } from "../../plugin/promise"
-
-const PluginModule = Schema.Struct({
-  default: Schema.Union([
-    Schema.Struct({
-      id: Schema.String,
-      effect: Schema.declare<EffectPlugin["effect"]>(
-        (input): input is EffectPlugin["effect"] => typeof input === "function",
-      ),
-    }),
-    Schema.Struct({
-      id: Schema.String,
-      setup: Schema.declare<PromisePlugin["setup"]>(
-        (input): input is PromisePlugin["setup"] => typeof input === "function",
-      ),
-    }),
-  ]),
-})
-
-const PluginPackage = Schema.Struct({
-  exports: Schema.optional(Schema.Unknown),
-  main: Schema.optional(Schema.String),
-  module: Schema.optional(Schema.String),
-})
-
-export const Plugin = define({
-  id: "config-plugin",
-  effect: Effect.fn(function* (ctx) {
-    const config = yield* Config.Service
-    const fs = yield* FSUtil.Service
-    const location = yield* Location.Service
-    const npm = yield* Npm.Service
-    const load = Effect.fn("ConfigExternalPlugin.load")(function* () {
-      const configured: { package: string; options?: Record<string, unknown> }[] = []
-
-      for (const entry of yield* config.entries()) {
-        if (entry.type === "document") {
-          const directory = entry.path ? path.dirname(entry.path) : location.directory
-          for (const item of entry.info.plugins ?? []) {
-            const ref = typeof item === "string" ? { package: item } : item
-            const packageName = (() => {
-              if (ref.package.startsWith("file://")) return fileURLToPath(ref.package)
-              if (ref.package.startsWith("./") || ref.package.startsWith("../")) {
-                return path.resolve(directory, ref.package)
-              }
-              return ref.package
-            })()
-            configured.push({ package: packageName, options: ref.options })
-          }
-        }
-
-        if (entry.type === "directory") {
-          const files = yield* fs
-            .glob("{plugin,plugins}/*.{ts,js}", {
-              cwd: entry.path,
-              absolute: true,
-              include: "file",
-              dot: true,
-              symlink: true,
-            })
-            .pipe(Effect.orElseSucceed(() => []))
-          const directories = yield* fs
-            .glob("{plugin,plugins}/*", {
-              cwd: entry.path,
-              absolute: true,
-              include: "all",
-              dot: true,
-              symlink: true,
-            })
-            .pipe(
-              Effect.flatMap((items) =>
-                Effect.filter(items, (item) => fs.isDir(item), {
-                  concurrency: "unbounded",
-                }),
-              ),
-              Effect.orElseSucceed(() => []),
-            )
-          const packages = yield* Effect.forEach(
-            directories.sort(),
-            (directory) => resolvePackageEntrypoint(fs, directory),
-            { concurrency: "unbounded" },
-          ).pipe(Effect.map((items) => items.filter((item): item is string => item !== undefined)))
-          files.sort()
-          for (const file of files) configured.push({ package: file })
-          for (const file of packages) configured.push({ package: file })
-        }
-      }
-
-      return yield* Effect.forEach(configured, (ref) =>
-        Effect.gen(function* () {
-          const entrypoint = path.isAbsolute(ref.package)
-            ? pathToFileURL(ref.package).href
-            : (yield* npm.add(ref.package)).entrypoint
-          if (!entrypoint) return
-          yield* Effect.log({ msg: "loading plugin", id: ref.package, entrypoint })
-          const mod = yield* Effect.promise(() => import(entrypoint))
-          const value = (yield* Schema.decodeUnknownEffect(PluginModule)(mod)).default
-          const plugin = "effect" in value ? value : PluginPromise.fromPromise(value)
-          return {
-            id: plugin.id,
-            effect: (host: Parameters<typeof plugin.effect>[0]) =>
-              plugin.effect({ ...host, options: ref.options ?? {} }),
-          }
-        }).pipe(Effect.catchCause(() => Effect.succeed(undefined))),
-      ).pipe(Effect.map((plugins) => plugins.filter((plugin) => plugin !== undefined)))
-    })
-    for (const plugin of yield* load()) yield* ctx.plugin.add(plugin)
-  }),
-})
-
-const resolvePackageEntrypoint = Effect.fnUntraced(function* (fs: FSUtil.Interface, directory: string) {
-  const pkg = yield* fs.readJson(path.join(directory, "package.json")).pipe(
-    Effect.flatMap(Schema.decodeUnknownEffect(PluginPackage)),
-    Effect.catch(() => Effect.succeed(undefined)),
-  )
-  const exported = typeof pkg?.exports === "string" ? pkg.exports : undefined
-  const entries = [exported, pkg?.module, pkg?.main, "index.ts", "index.js"]
-
-  return yield* Effect.forEach(entries, (entry) => {
-    if (!entry) return Effect.succeed(undefined)
-    const file = path.resolve(directory, entry)
-    return fs.isFile(file).pipe(Effect.map((exists) => (exists ? file : undefined)))
-  }).pipe(Effect.map((items) => items.find((item): item is string => item !== undefined)))
-})
diff --git a/packages/core/src/config/plugin/provider.ts b/packages/core/src/config/plugin/provider.ts
index d2d6a26029..320895d128 100644
--- a/packages/core/src/config/plugin/provider.ts
+++ b/packages/core/src/config/plugin/provider.ts
@@ -1,12 +1,12 @@
 export * as ConfigProviderPlugin from "./provider"
 
-import { define } from "../../plugin/internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { Effect, Stream } from "effect"
 import { Config } from "../../config"
 import { ModelV2 } from "../../model"
 
 export const Plugin = define({
-  id: "config-provider",
+  id: "opencode.config.provider",
   effect: Effect.fn(function* (ctx) {
     const config = yield* Config.Service
     const loaded = { entries: yield* config.entries() }
diff --git a/packages/core/src/config/plugin/reference.ts b/packages/core/src/config/plugin/reference.ts
index d33332f92d..75e0cc10e4 100644
--- a/packages/core/src/config/plugin/reference.ts
+++ b/packages/core/src/config/plugin/reference.ts
@@ -1,6 +1,6 @@
 export * as ConfigReferencePlugin from "./reference"
 
-import { define } from "../../plugin/internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import path from "path"
 import { Effect, Stream } from "effect"
 import { Config } from "../../config"
@@ -11,7 +11,7 @@ import { Global } from "../../global"
 import { Location } from "../../location"
 
 export const Plugin = define({
-  id: "core/config-reference",
+  id: "opencode.config.reference",
   effect: Effect.fn(function* (ctx) {
     const config = yield* Config.Service
     const location = yield* Location.Service
diff --git a/packages/core/src/config/plugin/skill.ts b/packages/core/src/config/plugin/skill.ts
index ff83c53ff1..84546b901c 100644
--- a/packages/core/src/config/plugin/skill.ts
+++ b/packages/core/src/config/plugin/skill.ts
@@ -1,6 +1,6 @@
 export * as ConfigSkillPlugin from "./skill"
 
-import { define } from "../../plugin/internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import path from "path"
 import { Effect, Stream } from "effect"
 import { Config } from "../../config"
@@ -10,7 +10,7 @@ import { Global } from "../../global"
 import { Location } from "../../location"
 
 export const Plugin = define({
-  id: "config-skill",
+  id: "opencode.config.skill",
   effect: Effect.fn(function* (ctx) {
     const config = yield* Config.Service
     const global = yield* Global.Service
diff --git a/packages/core/src/event.ts b/packages/core/src/event.ts
index 3e352c6e6b..a5b052b42f 100644
--- a/packages/core/src/event.ts
+++ b/packages/core/src/event.ts
@@ -583,12 +583,32 @@ export const layerWith = (options?: LayerOptions) =>
           .pipe(Effect.orDie)
       }
 
+      const local = <A extends Payload>(stream: Stream.Stream<A>) =>
+        Stream.unwrap(
+          Effect.serviceOption(Location.Service).pipe(
+            Effect.map((location) =>
+              Option.match(location, {
+                onNone: () => stream,
+                onSome: (location) =>
+                  stream.pipe(
+                    Stream.filter(
+                      (event) =>
+                        !event.location ||
+                        (event.location.directory === location.directory &&
+                          event.location.workspaceID === location.workspaceID),
+                    ),
+                  ),
+              }),
+            ),
+          ),
+        )
+
       const subscribe = <D extends Definition>(definition: D): Stream.Stream<Payload<D>> =>
-        Stream.unwrap(getOrCreate(definition).pipe(Effect.map((pubsub) => Stream.fromPubSub(pubsub)))).pipe(
+        local(Stream.unwrap(getOrCreate(definition).pipe(Effect.map((pubsub) => Stream.fromPubSub(pubsub))))).pipe(
           Stream.map((event) => event as Payload<D>),
         )
 
-      const streamLive = (): Stream.Stream<Payload> => Stream.fromPubSub(pubsub.live)
+      const streamLive = (): Stream.Stream<Payload> => local(Stream.fromPubSub(pubsub.live))
 
       const readAfter = (
         aggregateID: string,
diff --git a/packages/core/src/location-services.ts b/packages/core/src/location-services.ts
index 2a4e0d6ef6..bbb60482c1 100644
--- a/packages/core/src/location-services.ts
+++ b/packages/core/src/location-services.ts
@@ -5,12 +5,16 @@ import { Catalog } from "./catalog"
 import { CommandV2 } from "./command"
 import { Config } from "./config"
 import { LayerNode } from "./effect/layer-node"
-import { Node } from "./effect/app-node"
+import { makeLocationNode, Node } from "./effect/app-node"
+import { httpClient } from "./effect/app-node-platform"
+import { EventV2 } from "./event"
 import { FileMutation } from "./file-mutation"
 import { FileSystem } from "./filesystem"
 import { FileSystemSearch } from "./filesystem/search"
+import { FSUtil } from "./fs-util"
 import { Generate } from "./generate"
 import { Form } from "./form"
+import { Global } from "./global"
 import { LocationWatcher } from "./filesystem/location-watcher"
 import { Image } from "./image"
 import { Integration } from "./integration"
@@ -18,15 +22,20 @@ import { Location } from "./location"
 import { LocationMutation } from "./location-mutation"
 import { LocationServiceMap } from "./location-service-map"
 import { MCP } from "./mcp/index"
+import { ModelsDev } from "./models-dev"
+import { Npm } from "./npm"
 import { PermissionV2 } from "./permission"
 import { PluginV2 } from "./plugin"
-import { PluginInternal } from "./plugin/internal"
+import { PluginRuntime } from "./plugin/runtime"
+import { SdkPlugins } from "./plugin/sdk"
+import { PluginSupervisor } from "./plugin/supervisor"
 import { ProjectCopy } from "./project/copy"
 import { Pty } from "./pty"
 import { QuestionV2 } from "./question"
 import { Shell } from "./shell"
 import { Reference } from "./reference"
 import { ReferenceGuidance } from "./reference/guidance"
+import { Ripgrep } from "./ripgrep"
 import { SessionRunnerLLM } from "./session/runner/llm"
 import { SessionRunnerModel } from "./session/runner/model"
 import { SessionCompaction } from "./session/compaction"
@@ -42,11 +51,49 @@ import { SessionInstructions } from "./session/instructions"
 import { McpTool } from "./tool/mcp"
 import { ReadToolFileSystem } from "./tool/read-filesystem"
 import { ToolRegistry } from "./tool/registry"
+import { WebSearchTool } from "./tool/websearch"
 import { ToolOutputStore } from "./tool-output-store"
 import { Vcs } from "./vcs"
 
 export { LocationServiceMap } from "./location-service-map"
 
+const pluginSupervisorNode = makeLocationNode({
+  service: PluginSupervisor.Service,
+  layer: PluginSupervisor.layer,
+  deps: [
+    PluginV2.node,
+    SdkPlugins.node,
+    AgentV2.node,
+    Catalog.node,
+    CommandV2.node,
+    Config.node,
+    EventV2.node,
+    FileMutation.node,
+    FileSystem.node,
+    FSUtil.node,
+    Global.node,
+    httpClient,
+    Image.node,
+    Integration.node,
+    Location.node,
+    LocationMutation.node,
+    ModelsDev.node,
+    Npm.node,
+    PermissionV2.node,
+    PluginRuntime.node,
+    QuestionV2.node,
+    ReadToolFileSystem.node,
+    Reference.node,
+    Ripgrep.node,
+    SessionInstructions.node,
+    SessionTodo.node,
+    Shell.node,
+    SkillV2.node,
+    ToolRegistry.toolsNode,
+    WebSearchTool.configNode,
+  ],
+})
+
 const locationServiceNodes = [
   Location.node,
   Config.node,
@@ -57,12 +104,11 @@ const locationServiceNodes = [
   Catalog.node,
   AISDK.node,
   PluginV2.node,
-  PluginInternal.node,
+  pluginSupervisorNode,
   ProjectCopy.node,
   ProjectCopy.refreshNode,
   FileSystemSearch.node,
   FileSystem.node,
-  LocationWatcher.node,
   Pty.node,
   Shell.node,
   SkillV2.node,
@@ -92,6 +138,8 @@ const locationServiceNodes = [
   Snapshot.node,
   SessionRunnerLLM.node,
   Vcs.node,
+  // Start repository watches only after boot-critical filesystem and Git work.
+  LocationWatcher.node,
 ] as const satisfies readonly Node.LocationNode<unknown, unknown>[]
 
 export const locationServices = LayerNode.group<typeof locationServiceNodes>(locationServiceNodes)
@@ -106,6 +154,7 @@ export function buildLocationServiceMap(
     LocationServiceMap.Service,
     LayerMap.make(
       (ref: Location.Ref) => {
+        const startedAt = performance.now()
         const allReplacements = replacements.concat([[Location.node, Location.boundNode(ref)]])
         // Apply replacements during hoist, not afterward: replacements can
         // introduce new tagged dependencies (Location.boundNode depends on
@@ -116,9 +165,10 @@ export function buildLocationServiceMap(
         return LayerNode.compile(location.node).pipe(
           Layer.fresh,
           Layer.tap(() =>
-            Effect.logInfo("booting location services", {
+            Effect.logInfo("location services booted", {
               directory: ref.directory,
               workspaceID: ref.workspaceID,
+              durationMs: Math.round(performance.now() - startedAt),
             }),
           ),
           Layer.provide(LayerNode.compile(location.hoisted)),
diff --git a/packages/core/src/plugin.ts b/packages/core/src/plugin.ts
index a6ff337c62..8ffdf93ba1 100644
--- a/packages/core/src/plugin.ts
+++ b/packages/core/src/plugin.ts
@@ -1,8 +1,7 @@
 export * as PluginV2 from "./plugin"
 
 import { makeLocationNode } from "./effect/app-node"
-import { Context, Deferred, Effect, Exit, Layer, Scope } from "effect"
-import type { Plugin as PluginDefinition } from "@opencode-ai/plugin/v2/effect"
+import { Context, Effect, Exit, Layer, Scope, Semaphore } from "effect"
 import { Plugin } from "@opencode-ai/schema/plugin"
 import { AgentV2 } from "./agent"
 import { AISDK } from "./aisdk"
@@ -10,7 +9,6 @@ import { Catalog } from "./catalog"
 import { CommandV2 } from "./command"
 import { EventV2 } from "./event"
 import { Integration } from "./integration"
-import { KeyedMutex } from "./effect/keyed-mutex"
 import { Location } from "./location"
 import { PluginHost } from "./plugin/host"
 import { PluginRuntime } from "./plugin/runtime"
@@ -27,9 +25,7 @@ export type Info = Plugin.Info
 export const Event = Plugin.Event
 
 export interface Interface {
-  readonly add: (id: ID, effect: PluginDefinition["effect"]) => Effect.Effect<void>
-  readonly remove: (id: ID) => Effect.Effect<void>
-  readonly wait: (id: ID) => Effect.Effect<void>
+  readonly activate: (plugins: readonly import("@opencode-ai/plugin/v2/effect").Plugin[]) => Effect.Effect<void>
   readonly list: () => Effect.Effect<Info[]>
 }
 
@@ -39,110 +35,73 @@ const layer = Layer.effect(
   Service,
   Effect.gen(function* () {
     const events = yield* EventV2.Service
-    const locks = KeyedMutex.makeUnsafe<ID>()
     const scope = yield* Scope.make()
     const active = new Map<ID, Scope.Closeable>()
-    const loading = new Set<ID>()
-    const waiters = new Map<ID, Set<Deferred.Deferred<void>>>()
-    const failures = new Map<ID, Exit.Exit<void, never>>()
-    let host: Parameters<PluginDefinition["effect"]>[0]
+    const lock = Semaphore.makeUnsafe(1)
+    let generation: readonly ID[] | undefined = []
+    let host: Parameters<import("@opencode-ai/plugin/v2/effect").Plugin["effect"]>[0]
 
-    const add = Effect.fn("Plugin.add")(function* (id: ID, effect: PluginDefinition["effect"]) {
-      if (loading.has(id)) return yield* Effect.die(new Error(`Plugin load cycle detected for ${id}`))
+    const activate = Effect.fn("Plugin.activate")(function* (
+      plugins: readonly import("@opencode-ai/plugin/v2/effect").Plugin[],
+    ) {
+      const definitions = plugins.map((plugin) => ({ ...plugin, id: ID.make(plugin.id) }))
+      const ids = new Set<ID>()
+      for (const definition of definitions) {
+        if (ids.has(definition.id)) return yield* Effect.die(new Error(`Duplicate plugin ID: ${definition.id}`))
+        ids.add(definition.id)
+      }
 
-      yield* locks.withLock(id)(
-        Effect.sync(() => {
-          loading.add(id)
-          failures.delete(id)
-        }).pipe(
-          Effect.andThen(
-            State.batch(
-              Effect.gen(function* () {
-                const existing = active.get(id)
-                active.delete(id)
-                if (existing) yield* Scope.close(existing, Exit.void).pipe(Effect.ignore)
+      yield* lock.withPermit(
+        Effect.gen(function* () {
+          if (
+            generation !== undefined &&
+            generation.length === definitions.length &&
+            generation.every((id, index) => id === definitions[index]?.id)
+          ) {
+            return
+          }
+          generation = undefined
+          const exit = yield* State.batch(
+            Effect.gen(function* () {
+              const scopes = Array.from(active.values()).toReversed()
+              active.clear()
+              const inherit = yield* State.inherit()
+              yield* Effect.forEach(scopes, (scope) => Scope.close(scope, Exit.void).pipe(Effect.ignore), {
+                discard: true,
+              })
 
+              for (const definition of definitions) {
                 const child = yield* Scope.fork(scope)
-                yield* effect(host).pipe(
-                  Scope.provide(child),
-                  Effect.withSpan("Plugin.load", { attributes: { "plugin.id": id } }),
+                const loaded = yield* Effect.suspend(() => definition.effect(host)).pipe(
+                  inherit,
+                  Effect.updateContext((_context: Context.Context<never>) => Context.make(Scope.Scope, child)),
+                  Effect.withSpan("Plugin.load", { attributes: { "plugin.id": definition.id } }),
+                  Effect.andThen(events.publish(Event.Added, { id: definition.id })),
                   Effect.onExit((exit) => (Exit.isFailure(exit) ? Scope.close(child, exit) : Effect.void)),
+                  Effect.exit,
                 )
-                yield* events.publish(Event.Added, { id })
-                active.set(id, child)
-                yield* Effect.forEach(waiters.get(id) ?? [], (waiter) => Deferred.succeed(waiter, undefined), {
-                  discard: true,
-                })
-                waiters.delete(id)
-              }),
-            ),
-          ),
-          Effect.onExit((exit) => {
-            if (Exit.isSuccess(exit)) return Effect.void
-            failures.set(id, exit)
-            return Effect.forEach(waiters.get(id) ?? [], (waiter) => Deferred.done(waiter, exit), {
-              discard: true,
-            }).pipe(Effect.ensuring(Effect.sync(() => waiters.delete(id))))
-          }),
-          Effect.ensuring(Effect.sync(() => loading.delete(id))),
-        ),
-      )
-    })
-
-    const remove = Effect.fn("Plugin.remove")(function* (id: ID) {
-      if (loading.has(id)) return yield* Effect.die(new Error(`Cannot remove plugin ${id} while it is loading`))
-
-      yield* locks.withLock(id)(
-        State.batch(
-          Effect.gen(function* () {
-            const current = active.get(id)
-            active.delete(id)
-            failures.delete(id)
-            if (current) yield* Scope.close(current, Exit.void).pipe(Effect.ignore)
-          }),
-        ),
-      )
-    })
-
-    const wait = Effect.fn("Plugin.wait")(function* (id: ID) {
-      const waiter = yield* Deferred.make<void>()
-      const pending = yield* locks.withLock(id)(
-        Effect.sync(() => {
-          if (active.has(id)) return false
-          const failure = failures.get(id)
-          if (failure) return failure
-          const current = waiters.get(id) ?? new Set()
-          current.add(waiter)
-          waiters.set(id, current)
-          return true
-        }),
-      )
-      if (!pending) return
-      if (typeof pending !== "boolean") return yield* pending
-      yield* Deferred.await(waiter).pipe(
-        Effect.ensuring(
-          locks.withLock(id)(
-            Effect.sync(() => {
-              const current = waiters.get(id)
-              current?.delete(waiter)
-              if (current?.size === 0) waiters.delete(id)
+                if (Exit.isFailure(loaded)) return loaded
+                active.set(definition.id, child)
+              }
+              return Exit.void
             }),
-          ),
-        ),
+          )
+          if (Exit.isFailure(exit)) return yield* exit
+          generation = definitions.map((definition) => definition.id)
+        }),
       )
     })
 
     yield* Effect.addFinalizer((exit) =>
       Effect.gen(function* () {
         active.clear()
+        generation = []
         yield* State.batch(Scope.close(scope, exit))
       }),
     )
 
     const service = Service.of({
-      add,
-      remove,
-      wait,
+      activate,
       list: Effect.fn("Plugin.list")(function* () {
         return Array.from(active.keys()).map((id) => ({ id }))
       }),
diff --git a/packages/core/src/plugin/agent.ts b/packages/core/src/plugin/agent.ts
index a0e3556ce8..7549089bf3 100644
--- a/packages/core/src/plugin/agent.ts
+++ b/packages/core/src/plugin/agent.ts
@@ -1,7 +1,7 @@
 export * as AgentPlugin from "./agent"
 
 import path from "path"
-import { define } from "./internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { Effect } from "effect"
 import { AgentV2 } from "../agent"
 import { Global } from "../global"
@@ -100,7 +100,7 @@ Rules:
 - If the conversation ends with an imperative statement or request to the user (e.g. "Now please run the command and paste the console output"), always include that exact request in the summary`
 
 export const Plugin = define({
-  id: "agent",
+  id: "opencode.agent",
   effect: Effect.fn(function* (ctx) {
     const location = yield* Location.Service
     const worktree = location.directory
diff --git a/packages/core/src/plugin/command.ts b/packages/core/src/plugin/command.ts
index 1989641238..7bb14dad31 100644
--- a/packages/core/src/plugin/command.ts
+++ b/packages/core/src/plugin/command.ts
@@ -1,13 +1,13 @@
 export * as CommandPlugin from "./command"
 
-import { define } from "./internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { Effect } from "effect"
 import { Location } from "../location"
 import PROMPT_INITIALIZE from "./command/initialize.txt"
 import PROMPT_REVIEW from "./command/review.txt"
 
 export const Plugin = define({
-  id: "command",
+  id: "opencode.command",
   effect: Effect.fn(function* (ctx) {
     const location = yield* Location.Service
     yield* ctx.command.transform((draft) => {
diff --git a/packages/core/src/plugin/host.ts b/packages/core/src/plugin/host.ts
index 4c7bb8538c..2e58c6b144 100644
--- a/packages/core/src/plugin/host.ts
+++ b/packages/core/src/plugin/host.ts
@@ -273,8 +273,6 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: PluginV2.Int
     },
     plugin: {
       list: () => response(plugin.list()),
-      add: (input) => plugin.add(PluginV2.ID.make(input.id), input.effect),
-      remove: (id) => plugin.remove(PluginV2.ID.make(id)),
     },
     reference: {
       list: () => response(reference.list()),
diff --git a/packages/core/src/plugin/internal.ts b/packages/core/src/plugin/internal.ts
index 939bb4e731..63637c96b0 100644
--- a/packages/core/src/plugin/internal.ts
+++ b/packages/core/src/plugin/internal.ts
@@ -1,16 +1,14 @@
 export * as PluginInternal from "./internal"
 
-import { makeLocationNode } from "../effect/app-node"
-import { httpClient } from "../effect/app-node-platform"
-import type { PluginContext } from "@opencode-ai/plugin/v2/effect"
-import { Context, Effect, Layer, Scope } from "effect"
+import type { Plugin } from "@opencode-ai/plugin/v2/effect"
+import { Context, Effect, Scope } from "effect"
+import { HttpClient } from "effect/unstable/http"
 import { AgentV2 } from "../agent"
 import { Catalog } from "../catalog"
 import { CommandV2 } from "../command"
 import { Config } from "../config"
 import { ConfigAgentPlugin } from "../config/plugin/agent"
 import { ConfigCommandPlugin } from "../config/plugin/command"
-import { ConfigExternalPlugin } from "../config/plugin/external"
 import { ConfigProviderPlugin } from "../config/plugin/provider"
 import { ConfigReferencePlugin } from "../config/plugin/reference"
 import { ConfigSkillPlugin } from "../config/plugin/skill"
@@ -25,8 +23,6 @@ import { Location } from "../location"
 import { LocationMutation } from "../location-mutation"
 import { ModelsDev } from "../models-dev"
 import { Npm } from "../npm"
-import { PluginV2 } from "../plugin"
-import { PluginRuntime } from "../plugin/runtime"
 import { PermissionV2 } from "../permission"
 import { QuestionV2 } from "../question"
 import { Reference } from "../reference"
@@ -35,177 +31,137 @@ import { SessionInstructions } from "../session/instructions"
 import { SessionTodo } from "../session/todo"
 import { Shell } from "../shell"
 import { SkillV2 } from "../skill"
-import { State } from "../state"
-import { ToolRegistry } from "../tool/registry"
-import { Tools } from "../tool/tools"
-import { HttpClient } from "effect/unstable/http"
-import { AgentPlugin } from "./agent"
-import { CommandPlugin } from "./command"
-import { ModelsDevPlugin } from "./models-dev"
-import { ProviderPlugins } from "./provider"
-import { SdkPlugins } from "./sdk"
-import { SkillPlugin } from "./skill"
-import { VariantPlugin } from "./variant"
 import { ApplyPatchTool } from "../tool/apply-patch"
 import { EditTool } from "../tool/edit"
 import { GlobTool } from "../tool/glob"
 import { GrepTool } from "../tool/grep"
 import { QuestionTool } from "../tool/question"
-import { ReadTool } from "../tool/read"
 import { ReadToolFileSystem } from "../tool/read-filesystem"
+import { ReadTool } from "../tool/read"
 import { ShellTool } from "../tool/shell"
 import { SkillTool } from "../tool/skill"
 import { SubagentTool } from "../tool/subagent"
 import { TodoWriteTool } from "../tool/todowrite"
+import { Tools } from "../tool/tools"
 import { WebFetchTool } from "../tool/webfetch"
 import { WebSearchTool } from "../tool/websearch"
 import { WriteTool } from "../tool/write"
+import { AgentPlugin } from "./agent"
+import { CommandPlugin } from "./command"
+import { ModelsDevPlugin } from "./models-dev"
+import { ProviderPlugins } from "./provider"
+import { PluginRuntime } from "./runtime"
+import { SkillPlugin } from "./skill"
+import { VariantPlugin } from "./variant"
 
-export type Requirements =
-  | AgentV2.Service
-  | Catalog.Service
-  | CommandV2.Service
-  | Config.Service
-  | EventV2.Service
-  | FileMutation.Service
-  | FileSystem.Service
-  | FSUtil.Service
-  | Global.Service
-  | HttpClient.HttpClient
-  | Image.Service
-  | Integration.Service
-  | Location.Service
-  | LocationMutation.Service
-  | ModelsDev.Service
-  | Npm.Service
-  | PermissionV2.Service
-  | PluginRuntime.Service
-  | QuestionV2.Service
-  | ReadToolFileSystem.Service
-  | Reference.Service
-  | Ripgrep.Service
-  | SessionInstructions.Service
-  | SessionTodo.Service
-  | Shell.Service
-  | SkillV2.Service
-  | Tools.Service
-  | WebSearchTool.ConfigService
-
-export interface Plugin<R = never> {
-  readonly id: string
-  readonly effect: (context: PluginContext) => Effect.Effect<void, never, R | Scope.Scope>
-}
-
-export function define<R>(plugin: Plugin<R>) {
-  return plugin
-}
-
-const layer = Layer.effectDiscard(
-  Effect.gen(function* () {
-    const plugin = yield* PluginV2.Service
-    const sdkPlugins = yield* SdkPlugins.Service
-    const services = Context.mergeAll(
-      Context.make(Catalog.Service, yield* Catalog.Service),
-      Context.make(CommandV2.Service, yield* CommandV2.Service),
-      Context.make(Integration.Service, yield* Integration.Service),
-      Context.make(AgentV2.Service, yield* AgentV2.Service),
-      Context.make(Config.Service, yield* Config.Service),
-      Context.make(Location.Service, yield* Location.Service),
-      Context.make(ModelsDev.Service, yield* ModelsDev.Service),
-      Context.make(Npm.Service, yield* Npm.Service),
-      Context.make(EventV2.Service, yield* EventV2.Service),
-      Context.make(FSUtil.Service, yield* FSUtil.Service),
-      Context.make(FileSystem.Service, yield* FileSystem.Service),
-      Context.make(Global.Service, yield* Global.Service),
-      Context.make(HttpClient.HttpClient, yield* HttpClient.HttpClient),
-      Context.make(LocationMutation.Service, yield* LocationMutation.Service),
-      Context.make(FileMutation.Service, yield* FileMutation.Service),
-      Context.make(Image.Service, yield* Image.Service),
-      Context.make(PermissionV2.Service, yield* PermissionV2.Service),
-      Context.make(QuestionV2.Service, yield* QuestionV2.Service),
-      Context.make(ReadToolFileSystem.Service, yield* ReadToolFileSystem.Service),
-      Context.make(SessionInstructions.Service, yield* SessionInstructions.Service),
-      Context.make(SessionTodo.Service, yield* SessionTodo.Service),
-      Context.make(SkillV2.Service, yield* SkillV2.Service),
-      Context.make(Reference.Service, yield* Reference.Service),
-      Context.make(Ripgrep.Service, yield* Ripgrep.Service),
-      Context.make(Shell.Service, yield* Shell.Service),
-      Context.make(Tools.Service, yield* Tools.Service),
-      Context.make(PluginRuntime.Service, yield* PluginRuntime.Service),
-      Context.make(WebSearchTool.ConfigService, yield* WebSearchTool.ConfigService),
-    )
-    const add = (input: Plugin<Requirements | Scope.Scope>) =>
-      plugin.add(PluginV2.ID.make(input.id), (context: PluginContext) =>
-        input.effect(context).pipe(Effect.provide(services)),
-      )
-
-    yield* State.batch(
-      Effect.gen(function* () {
-        yield* add(ConfigReferencePlugin.Plugin)
-        yield* add(AgentPlugin.Plugin)
-        yield* add(CommandPlugin.Plugin)
-        yield* add(SkillPlugin.Plugin)
-        yield* add(ModelsDevPlugin)
-        yield* add(ConfigExternalPlugin.Plugin)
-        yield* add(ApplyPatchTool.Plugin)
-        yield* add(EditTool.Plugin)
-        yield* add(GlobTool.Plugin)
-        yield* add(GrepTool.Plugin)
-        yield* add(QuestionTool.Plugin)
-        yield* add(ReadTool.Plugin)
-        yield* add(ShellTool.Plugin)
-        yield* add(SkillTool.Plugin)
-        yield* add(SubagentTool.Plugin)
-        yield* add(TodoWriteTool.Plugin)
-        yield* add(WebFetchTool.Plugin)
-        yield* add(WebSearchTool.Plugin)
-        yield* add(WriteTool.Plugin)
-        yield* add(ConfigAgentPlugin.Plugin)
-        yield* add(ConfigCommandPlugin.Plugin)
-        yield* add(ConfigSkillPlugin.Plugin)
-        for (const item of ProviderPlugins) yield* add(item)
-        yield* add(ConfigProviderPlugin.Plugin)
-        yield* add(VariantPlugin.Plugin)
-        // Embedder-contributed plugins are added last so they layer over config.
-        for (const plugin of sdkPlugins.all()) yield* add(plugin)
-      }),
-    ).pipe(Effect.withSpan("PluginInternal.boot"), Effect.forkScoped({ startImmediately: true }))
-  }),
-)
-
-export const node = makeLocationNode({
-  name: "plugin-internal",
-  layer,
-  deps: [
-    Catalog.node,
-    CommandV2.node,
-    PluginV2.node,
-    Integration.node,
-    AgentV2.node,
-    Config.node,
-    Location.node,
-    LocationMutation.node,
-    FileMutation.node,
-    Image.node,
-    ModelsDev.node,
-    Npm.node,
-    EventV2.node,
-    FSUtil.node,
-    FileSystem.node,
-    Global.node,
-    httpClient,
-    PermissionV2.node,
-    QuestionV2.node,
-    ReadToolFileSystem.node,
-    SessionInstructions.node,
-    SessionTodo.node,
-    SkillV2.node,
-    Reference.node,
-    Ripgrep.node,
-    Shell.node,
-    ToolRegistry.toolsNode,
-    PluginRuntime.node,
-    SdkPlugins.node,
-    WebSearchTool.configNode,
-  ],
+const services = Effect.fn("PluginInternal.services")(function* () {
+  const agent = yield* AgentV2.Service
+  const catalog = yield* Catalog.Service
+  const command = yield* CommandV2.Service
+  const config = yield* Config.Service
+  const events = yield* EventV2.Service
+  const mutation = yield* FileMutation.Service
+  const filesystem = yield* FileSystem.Service
+  const fs = yield* FSUtil.Service
+  const global = yield* Global.Service
+  const http = yield* HttpClient.HttpClient
+  const image = yield* Image.Service
+  const integration = yield* Integration.Service
+  const location = yield* Location.Service
+  const locationMutation = yield* LocationMutation.Service
+  const models = yield* ModelsDev.Service
+  const npm = yield* Npm.Service
+  const permission = yield* PermissionV2.Service
+  const runtime = yield* PluginRuntime.Service
+  const question = yield* QuestionV2.Service
+  const read = yield* ReadToolFileSystem.Service
+  const reference = yield* Reference.Service
+  const ripgrep = yield* Ripgrep.Service
+  const instructions = yield* SessionInstructions.Service
+  const todo = yield* SessionTodo.Service
+  const shell = yield* Shell.Service
+  const skill = yield* SkillV2.Service
+  const tools = yield* Tools.Service
+  const websearch = yield* WebSearchTool.ConfigService
+  return Context.mergeAll(
+    Context.make(AgentV2.Service, agent),
+    Context.make(Catalog.Service, catalog),
+    Context.make(CommandV2.Service, command),
+    Context.make(Config.Service, config),
+    Context.make(EventV2.Service, events),
+    Context.make(FileMutation.Service, mutation),
+    Context.make(FileSystem.Service, filesystem),
+    Context.make(FSUtil.Service, fs),
+    Context.make(Global.Service, global),
+    Context.make(HttpClient.HttpClient, http),
+    Context.make(Image.Service, image),
+    Context.make(Integration.Service, integration),
+    Context.make(Location.Service, location),
+    Context.make(LocationMutation.Service, locationMutation),
+    Context.make(ModelsDev.Service, models),
+    Context.make(Npm.Service, npm),
+    Context.make(PermissionV2.Service, permission),
+    Context.make(PluginRuntime.Service, runtime),
+    Context.make(QuestionV2.Service, question),
+    Context.make(ReadToolFileSystem.Service, read),
+    Context.make(Reference.Service, reference),
+    Context.make(Ripgrep.Service, ripgrep),
+    Context.make(SessionInstructions.Service, instructions),
+    Context.make(SessionTodo.Service, todo),
+    Context.make(Shell.Service, shell),
+    Context.make(SkillV2.Service, skill),
+    Context.make(Tools.Service, tools),
+    Context.make(WebSearchTool.ConfigService, websearch),
+  )
+})
+
+type ContextServices<A> = A extends Context.Context<infer R> ? R : never
+
+export type Requirements = ContextServices<Effect.Success<ReturnType<typeof services>>>
+
+export type InternalPlugin = Plugin<Requirements | Scope.Scope>
+
+const pre = [
+  AgentPlugin.Plugin,
+  CommandPlugin.Plugin,
+  SkillPlugin.Plugin,
+  ModelsDevPlugin,
+  ...ProviderPlugins,
+  ApplyPatchTool.Plugin,
+  EditTool.Plugin,
+  GlobTool.Plugin,
+  GrepTool.Plugin,
+  QuestionTool.Plugin,
+  ReadTool.Plugin,
+  ShellTool.Plugin,
+  SkillTool.Plugin,
+  SubagentTool.Plugin,
+  TodoWriteTool.Plugin,
+  WebFetchTool.Plugin,
+  WebSearchTool.Plugin,
+  WriteTool.Plugin,
+] as const satisfies readonly InternalPlugin[]
+
+const post = [
+  ConfigReferencePlugin.Plugin,
+  ConfigAgentPlugin.Plugin,
+  ConfigCommandPlugin.Plugin,
+  ConfigSkillPlugin.Plugin,
+  ConfigProviderPlugin.Plugin,
+  VariantPlugin.Plugin,
+] as const satisfies readonly InternalPlugin[]
+
+export const list = Effect.fn("PluginInternal.list")(function* () {
+  const context = yield* services()
+  const resolve = (plugins: readonly InternalPlugin[]) =>
+    plugins.map(
+      (plugin): Plugin => ({
+        id: plugin.id,
+        effect: (host) => plugin.effect(host).pipe(Effect.provide(context)),
+      }),
+    )
+  return {
+    pre: resolve(pre),
+    post: resolve(post),
+  }
 })
diff --git a/packages/core/src/plugin/models-dev.ts b/packages/core/src/plugin/models-dev.ts
index 27c176ed67..23a166e267 100644
--- a/packages/core/src/plugin/models-dev.ts
+++ b/packages/core/src/plugin/models-dev.ts
@@ -1,4 +1,4 @@
-import { define } from "./internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import type { ModelV2Info } from "@opencode-ai/sdk/v2/types"
 import { Effect, Stream } from "effect"
 import { EventV2 } from "../event"
@@ -197,7 +197,7 @@ function applyModel(
 }
 
 export const ModelsDevPlugin = define({
-  id: "models-dev",
+  id: "opencode.models-dev",
   effect: Effect.fn(function* (ctx) {
     const modelsDev = yield* ModelsDev.Service
     const events = yield* EventV2.Service
diff --git a/packages/core/src/plugin/promise.ts b/packages/core/src/plugin/promise.ts
index b315d3214a..bcd3db1323 100644
--- a/packages/core/src/plugin/promise.ts
+++ b/packages/core/src/plugin/promise.ts
@@ -9,7 +9,7 @@ type Registration = { readonly dispose: () => Promise<void> }
 
 /**
  * Adapts a Promise plugin into an Effect plugin so the existing Effect-only
- * loader (`PluginV2` / `PluginInternal`) can run it unchanged.
+ * loader (`PluginV2` / `PluginSupervisor`) can run it unchanged.
  *
  * Hook registrations created during the async `setup` attach to the plugin's
  * scope, so unloading the plugin disposes them. The captured fiber context
@@ -93,11 +93,6 @@ export function fromPromise(plugin: Plugin) {
           },
           plugin: {
             list: (input) => run(host.plugin.list(input)),
-            add: (input) => {
-              const child = fromPromise(input)
-              return run(host.plugin.add(child))
-            },
-            remove: (id) => run(host.plugin.remove(id)),
           },
           reference: {
             list: (input) => run(host.reference.list(input)),
diff --git a/packages/core/src/plugin/provider.ts b/packages/core/src/plugin/provider.ts
index 1749b474ed..7c17bcc4c7 100644
--- a/packages/core/src/plugin/provider.ts
+++ b/packages/core/src/plugin/provider.ts
@@ -31,9 +31,8 @@ import { VenicePlugin } from "./provider/venice"
 import { XAIPlugin } from "./provider/xai"
 import { ZenmuxPlugin } from "./provider/zenmux"
 import type { PluginInternal } from "./internal"
-import type { Scope } from "effect"
 
-export const ProviderPlugins: PluginInternal.Plugin<PluginInternal.Requirements | Scope.Scope>[] = [
+export const ProviderPlugins: PluginInternal.InternalPlugin[] = [
   AlibabaPlugin,
   AmazonBedrockPlugin,
   AnthropicPlugin,
diff --git a/packages/core/src/plugin/provider/alibaba.ts b/packages/core/src/plugin/provider/alibaba.ts
index c5c4be0d0b..607e565d4a 100644
--- a/packages/core/src/plugin/provider/alibaba.ts
+++ b/packages/core/src/plugin/provider/alibaba.ts
@@ -1,8 +1,8 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const AlibabaPlugin = define({
-  id: "alibaba",
+  id: "opencode.provider.alibaba",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
diff --git a/packages/core/src/plugin/provider/amazon-bedrock.ts b/packages/core/src/plugin/provider/amazon-bedrock.ts
index cbf9defc09..0bc3ced462 100644
--- a/packages/core/src/plugin/provider/amazon-bedrock.ts
+++ b/packages/core/src/plugin/provider/amazon-bedrock.ts
@@ -1,6 +1,6 @@
 import { Effect } from "effect"
 import type { LanguageModelV3 } from "@ai-sdk/provider"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { ProviderV2 } from "../../provider"
 
 type MantleSDK = {
@@ -60,7 +60,7 @@ function selectMantleModel(sdk: MantleSDK, modelID: string) {
 }
 
 export const AmazonBedrockPlugin = define({
-  id: "amazon-bedrock",
+  id: "opencode.provider.amazon-bedrock",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.catalog.transform((evt) => {
       for (const item of evt.provider.list()) {
diff --git a/packages/core/src/plugin/provider/anthropic.ts b/packages/core/src/plugin/provider/anthropic.ts
index efbd50b818..3a8a7c8659 100644
--- a/packages/core/src/plugin/provider/anthropic.ts
+++ b/packages/core/src/plugin/provider/anthropic.ts
@@ -1,8 +1,8 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const AnthropicPlugin = define({
-  id: "anthropic",
+  id: "opencode.provider.anthropic",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.catalog.transform((evt) => {
       for (const item of evt.provider.list()) {
diff --git a/packages/core/src/plugin/provider/azure.ts b/packages/core/src/plugin/provider/azure.ts
index 2e73e620bf..3269c7d2d9 100644
--- a/packages/core/src/plugin/provider/azure.ts
+++ b/packages/core/src/plugin/provider/azure.ts
@@ -1,5 +1,5 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { ProviderV2 } from "../../provider"
 
 function selectLanguage(sdk: any, modelID: string, useChat: boolean) {
@@ -11,7 +11,7 @@ function selectLanguage(sdk: any, modelID: string, useChat: boolean) {
 }
 
 export const AzurePlugin = define({
-  id: "azure",
+  id: "opencode.provider.azure",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.catalog.transform((evt) => {
       for (const item of evt.provider.list()) {
@@ -54,7 +54,7 @@ export const AzurePlugin = define({
 })
 
 export const AzureCognitiveServicesPlugin = define({
-  id: "azure-cognitive-services",
+  id: "opencode.provider.azure-cognitive-services",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.catalog.transform((evt) => {
       const resourceName = process.env.AZURE_COGNITIVE_SERVICES_RESOURCE_NAME
diff --git a/packages/core/src/plugin/provider/cerebras.ts b/packages/core/src/plugin/provider/cerebras.ts
index 57029cfba7..20e724d707 100644
--- a/packages/core/src/plugin/provider/cerebras.ts
+++ b/packages/core/src/plugin/provider/cerebras.ts
@@ -1,8 +1,8 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const CerebrasPlugin = define({
-  id: "cerebras",
+  id: "opencode.provider.cerebras",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.catalog.transform((evt) => {
       for (const item of evt.provider.list()) {
diff --git a/packages/core/src/plugin/provider/cloudflare-ai-gateway.ts b/packages/core/src/plugin/provider/cloudflare-ai-gateway.ts
index d416f6f19d..afab0c36df 100644
--- a/packages/core/src/plugin/provider/cloudflare-ai-gateway.ts
+++ b/packages/core/src/plugin/provider/cloudflare-ai-gateway.ts
@@ -1,10 +1,10 @@
 import os from "os"
 import { InstallationVersion } from "../../installation/version"
 import { Effect, Option, Schema } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const CloudflareAIGatewayPlugin = define({
-  id: "cloudflare-ai-gateway",
+  id: "opencode.provider.cloudflare-ai-gateway",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
diff --git a/packages/core/src/plugin/provider/cloudflare-workers-ai.ts b/packages/core/src/plugin/provider/cloudflare-workers-ai.ts
index 762ceb4d96..b2db49e4db 100644
--- a/packages/core/src/plugin/provider/cloudflare-workers-ai.ts
+++ b/packages/core/src/plugin/provider/cloudflare-workers-ai.ts
@@ -1,13 +1,13 @@
 import os from "os"
 import { InstallationVersion } from "../../installation/version"
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { ProviderV2 } from "../../provider"
 
 const providerID = ProviderV2.ID.make("cloudflare-workers-ai")
 
 export const CloudflareWorkersAIPlugin = define({
-  id: "cloudflare-workers-ai",
+  id: "opencode.provider.cloudflare-workers-ai",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.catalog.transform((evt) => {
       const item = evt.provider.get(providerID)
diff --git a/packages/core/src/plugin/provider/cohere.ts b/packages/core/src/plugin/provider/cohere.ts
index 0ca0708577..8b0831604a 100644
--- a/packages/core/src/plugin/provider/cohere.ts
+++ b/packages/core/src/plugin/provider/cohere.ts
@@ -1,8 +1,8 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const CoherePlugin = define({
-  id: "cohere",
+  id: "opencode.provider.cohere",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
diff --git a/packages/core/src/plugin/provider/deepinfra.ts b/packages/core/src/plugin/provider/deepinfra.ts
index 1b23e08ba4..e8316012ad 100644
--- a/packages/core/src/plugin/provider/deepinfra.ts
+++ b/packages/core/src/plugin/provider/deepinfra.ts
@@ -1,8 +1,8 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const DeepInfraPlugin = define({
-  id: "deepinfra",
+  id: "opencode.provider.deepinfra",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
diff --git a/packages/core/src/plugin/provider/dynamic.ts b/packages/core/src/plugin/provider/dynamic.ts
index c84a6ed51f..2e51674ba0 100644
--- a/packages/core/src/plugin/provider/dynamic.ts
+++ b/packages/core/src/plugin/provider/dynamic.ts
@@ -1,10 +1,10 @@
 import { Effect } from "effect"
 import { pathToFileURL } from "url"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { Npm } from "../../npm"
 
 export const DynamicProviderPlugin = define({
-  id: "dynamic-provider",
+  id: "opencode.provider.dynamic",
   effect: Effect.fn(function* (ctx) {
     const npm = yield* Npm.Service
     yield* ctx.aisdk.sdk(
diff --git a/packages/core/src/plugin/provider/gateway.ts b/packages/core/src/plugin/provider/gateway.ts
index f097dcaca3..07249391a0 100644
--- a/packages/core/src/plugin/provider/gateway.ts
+++ b/packages/core/src/plugin/provider/gateway.ts
@@ -1,8 +1,8 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const GatewayPlugin = define({
-  id: "gateway",
+  id: "opencode.provider.gateway",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
diff --git a/packages/core/src/plugin/provider/github-copilot.ts b/packages/core/src/plugin/provider/github-copilot.ts
index d116058493..2a4881edc0 100644
--- a/packages/core/src/plugin/provider/github-copilot.ts
+++ b/packages/core/src/plugin/provider/github-copilot.ts
@@ -1,6 +1,6 @@
 import { Effect } from "effect"
 import { ModelV2 } from "../../model"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { ProviderV2 } from "../../provider"
 
 function shouldUseResponses(modelID: string) {
@@ -12,7 +12,7 @@ function shouldUseResponses(modelID: string) {
 }
 
 export const GithubCopilotPlugin = define({
-  id: "github-copilot",
+  id: "opencode.provider.github-copilot",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.catalog.transform((evt) => {
       const item = evt.provider.get(ProviderV2.ID.githubCopilot)
diff --git a/packages/core/src/plugin/provider/gitlab.ts b/packages/core/src/plugin/provider/gitlab.ts
index 8723cdaac2..5cd4b94858 100644
--- a/packages/core/src/plugin/provider/gitlab.ts
+++ b/packages/core/src/plugin/provider/gitlab.ts
@@ -1,11 +1,11 @@
 import os from "os"
 import { InstallationVersion } from "../../installation/version"
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { ProviderV2 } from "../../provider"
 
 export const GitLabPlugin = define({
-  id: "gitlab",
+  id: "opencode.provider.gitlab",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
diff --git a/packages/core/src/plugin/provider/google-vertex.ts b/packages/core/src/plugin/provider/google-vertex.ts
index b87fe61a32..630e353ef0 100644
--- a/packages/core/src/plugin/provider/google-vertex.ts
+++ b/packages/core/src/plugin/provider/google-vertex.ts
@@ -1,5 +1,5 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { ProviderV2 } from "../../provider"
 
 function resolveProject(options: Record<string, any>) {
@@ -55,7 +55,7 @@ function authFetch(fetchWithRuntimeOptions?: unknown) {
 }
 
 export const GoogleVertexPlugin = define({
-  id: "google-vertex",
+  id: "opencode.provider.google-vertex",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.catalog.transform((evt) => {
       for (const item of evt.provider.list()) {
@@ -111,7 +111,7 @@ export const GoogleVertexPlugin = define({
 })
 
 export const GoogleVertexAnthropicPlugin = define({
-  id: "google-vertex-anthropic",
+  id: "opencode.provider.google-vertex-anthropic",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.catalog.transform((evt) => {
       for (const item of evt.provider.list()) {
diff --git a/packages/core/src/plugin/provider/google.ts b/packages/core/src/plugin/provider/google.ts
index 476af5b912..3d2013a523 100644
--- a/packages/core/src/plugin/provider/google.ts
+++ b/packages/core/src/plugin/provider/google.ts
@@ -1,8 +1,8 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const GooglePlugin = define({
-  id: "google",
+  id: "opencode.provider.google",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
diff --git a/packages/core/src/plugin/provider/groq.ts b/packages/core/src/plugin/provider/groq.ts
index 0bddb44309..d84ece2151 100644
--- a/packages/core/src/plugin/provider/groq.ts
+++ b/packages/core/src/plugin/provider/groq.ts
@@ -1,8 +1,8 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const GroqPlugin = define({
-  id: "groq",
+  id: "opencode.provider.groq",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
diff --git a/packages/core/src/plugin/provider/kilo.ts b/packages/core/src/plugin/provider/kilo.ts
index 5d4c0d65d8..d901474ef2 100644
--- a/packages/core/src/plugin/provider/kilo.ts
+++ b/packages/core/src/plugin/provider/kilo.ts
@@ -1,8 +1,8 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const KiloPlugin = define({
-  id: "kilo",
+  id: "opencode.provider.kilo",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.catalog.transform((evt) => {
       for (const item of evt.provider.list()) {
diff --git a/packages/core/src/plugin/provider/llmgateway.ts b/packages/core/src/plugin/provider/llmgateway.ts
index 005880c6f3..68c319b673 100644
--- a/packages/core/src/plugin/provider/llmgateway.ts
+++ b/packages/core/src/plugin/provider/llmgateway.ts
@@ -1,9 +1,9 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { Integration } from "../../integration"
 
 export const LLMGatewayPlugin = define({
-  id: "llmgateway",
+  id: "opencode.provider.llmgateway",
   effect: Effect.fn(function* (ctx) {
     const integrations = yield* Integration.Service
     const configured = new Set((yield* integrations.list()).map((integration) => integration.id))
diff --git a/packages/core/src/plugin/provider/mistral.ts b/packages/core/src/plugin/provider/mistral.ts
index a731975659..92bc09abec 100644
--- a/packages/core/src/plugin/provider/mistral.ts
+++ b/packages/core/src/plugin/provider/mistral.ts
@@ -1,8 +1,8 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const MistralPlugin = define({
-  id: "mistral",
+  id: "opencode.provider.mistral",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
diff --git a/packages/core/src/plugin/provider/nvidia.ts b/packages/core/src/plugin/provider/nvidia.ts
index b1b9c9b117..4597f3070a 100644
--- a/packages/core/src/plugin/provider/nvidia.ts
+++ b/packages/core/src/plugin/provider/nvidia.ts
@@ -1,8 +1,8 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const NvidiaPlugin = define({
-  id: "nvidia",
+  id: "opencode.provider.nvidia",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.catalog.transform((evt) => {
       for (const item of evt.provider.list()) {
diff --git a/packages/core/src/plugin/provider/openai-compatible.ts b/packages/core/src/plugin/provider/openai-compatible.ts
index d602ed0ff9..3854bdcde2 100644
--- a/packages/core/src/plugin/provider/openai-compatible.ts
+++ b/packages/core/src/plugin/provider/openai-compatible.ts
@@ -1,8 +1,8 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const OpenAICompatiblePlugin = define({
-  id: "openai-compatible",
+  id: "opencode.provider.openai-compatible",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
diff --git a/packages/core/src/plugin/provider/openai.ts b/packages/core/src/plugin/provider/openai.ts
index 990a82554e..1b27511e49 100644
--- a/packages/core/src/plugin/provider/openai.ts
+++ b/packages/core/src/plugin/provider/openai.ts
@@ -2,7 +2,6 @@ import { createServer } from "node:http"
 import type { IntegrationOAuthMethodRegistration } from "@opencode-ai/plugin/v2/effect/integration"
 import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { Deferred, Effect, Option, Schema, Semaphore, Stream } from "effect"
-import type { Scope } from "effect"
 import { Credential } from "../../credential"
 import { EventV2 } from "../../event"
 import { InstallationVersion } from "../../installation/version"
@@ -159,7 +158,7 @@ const headless = {
 } satisfies IntegrationOAuthMethodRegistration
 
 export const OpenAIPlugin = define({
-  id: "openai",
+  id: "opencode.provider.openai",
   effect: Effect.fn(function* (ctx) {
     const events = yield* EventV2.Service
     const loading = Semaphore.makeUnsafe(1)
@@ -225,7 +224,7 @@ export const OpenAIPlugin = define({
       }),
     )
   }),
-} satisfies PluginInternal.Plugin<PluginInternal.Requirements | Scope.Scope>)
+} satisfies PluginInternal.InternalPlugin)
 
 function headers(contentType: string) {
   return { "Content-Type": contentType, "User-Agent": `opencode/${InstallationVersion}` }
diff --git a/packages/core/src/plugin/provider/opencode.ts b/packages/core/src/plugin/provider/opencode.ts
index bfa84ecd78..1316c3e4d0 100644
--- a/packages/core/src/plugin/provider/opencode.ts
+++ b/packages/core/src/plugin/provider/opencode.ts
@@ -75,7 +75,7 @@ function oauth(http: HttpClient.HttpClient) {
 }
 
 export const OpencodePlugin = define<HttpClient.HttpClient | EventV2.Service | Scope.Scope>({
-  id: "opencode",
+  id: "opencode.provider.opencode",
   effect: Effect.fn(function* (ctx) {
     const events = yield* EventV2.Service
     const http = yield* HttpClient.HttpClient
diff --git a/packages/core/src/plugin/provider/openrouter.ts b/packages/core/src/plugin/provider/openrouter.ts
index 458ea1cd9b..a255844fdb 100644
--- a/packages/core/src/plugin/provider/openrouter.ts
+++ b/packages/core/src/plugin/provider/openrouter.ts
@@ -1,9 +1,9 @@
 import { Effect } from "effect"
 import { ModelV2 } from "../../model"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const OpenRouterPlugin = define({
-  id: "openrouter",
+  id: "opencode.provider.openrouter",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.catalog.transform((evt) => {
       for (const item of evt.provider.list()) {
diff --git a/packages/core/src/plugin/provider/perplexity.ts b/packages/core/src/plugin/provider/perplexity.ts
index 44c1ef2fc0..9eb5b1e246 100644
--- a/packages/core/src/plugin/provider/perplexity.ts
+++ b/packages/core/src/plugin/provider/perplexity.ts
@@ -1,8 +1,8 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const PerplexityPlugin = define({
-  id: "perplexity",
+  id: "opencode.provider.perplexity",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
diff --git a/packages/core/src/plugin/provider/sap-ai-core.ts b/packages/core/src/plugin/provider/sap-ai-core.ts
index b6c3a540e6..ede4e31d40 100644
--- a/packages/core/src/plugin/provider/sap-ai-core.ts
+++ b/packages/core/src/plugin/provider/sap-ai-core.ts
@@ -1,11 +1,11 @@
 import { Effect } from "effect"
 import { pathToFileURL } from "url"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { Npm } from "../../npm"
 import { ProviderV2 } from "../../provider"
 
 export const SapAICorePlugin = define({
-  id: "sap-ai-core",
+  id: "opencode.provider.sap-ai-core",
   effect: Effect.fn(function* (ctx) {
     const npm = yield* Npm.Service
     yield* ctx.aisdk.sdk(
diff --git a/packages/core/src/plugin/provider/snowflake-cortex.ts b/packages/core/src/plugin/provider/snowflake-cortex.ts
index 788ac63eb0..2e6cc9f9b4 100644
--- a/packages/core/src/plugin/provider/snowflake-cortex.ts
+++ b/packages/core/src/plugin/provider/snowflake-cortex.ts
@@ -1,5 +1,5 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { ProviderV2 } from "../../provider"
 
 type FetchLike = (url: string | URL | Request, init?: RequestInit) => Promise<Response>
@@ -65,7 +65,7 @@ export function cortexFetch(upstream: FetchLike = fetch) {
 }
 
 export const SnowflakeCortexPlugin = define({
-  id: "snowflake-cortex",
+  id: "opencode.provider.snowflake-cortex",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
diff --git a/packages/core/src/plugin/provider/togetherai.ts b/packages/core/src/plugin/provider/togetherai.ts
index 8022e0de66..d9454cfd24 100644
--- a/packages/core/src/plugin/provider/togetherai.ts
+++ b/packages/core/src/plugin/provider/togetherai.ts
@@ -1,8 +1,8 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const TogetherAIPlugin = define({
-  id: "togetherai",
+  id: "opencode.provider.togetherai",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
diff --git a/packages/core/src/plugin/provider/venice.ts b/packages/core/src/plugin/provider/venice.ts
index 1a602ffd50..c9d5b163ae 100644
--- a/packages/core/src/plugin/provider/venice.ts
+++ b/packages/core/src/plugin/provider/venice.ts
@@ -1,8 +1,8 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const VenicePlugin = define({
-  id: "venice",
+  id: "opencode.provider.venice",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
diff --git a/packages/core/src/plugin/provider/vercel.ts b/packages/core/src/plugin/provider/vercel.ts
index 8ff4d14098..0df949b1be 100644
--- a/packages/core/src/plugin/provider/vercel.ts
+++ b/packages/core/src/plugin/provider/vercel.ts
@@ -1,8 +1,8 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const VercelPlugin = define({
-  id: "vercel",
+  id: "opencode.provider.vercel",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.catalog.transform((evt) => {
       for (const item of evt.provider.list()) {
diff --git a/packages/core/src/plugin/provider/xai.ts b/packages/core/src/plugin/provider/xai.ts
index 8145a3480a..76ec1df1a7 100644
--- a/packages/core/src/plugin/provider/xai.ts
+++ b/packages/core/src/plugin/provider/xai.ts
@@ -1,9 +1,9 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { ProviderV2 } from "../../provider"
 
 export const XAIPlugin = define({
-  id: "xai",
+  id: "opencode.provider.xai",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.aisdk.sdk(
       Effect.fn(function* (evt) {
diff --git a/packages/core/src/plugin/provider/zenmux.ts b/packages/core/src/plugin/provider/zenmux.ts
index 4562d6bd2e..099a3affca 100644
--- a/packages/core/src/plugin/provider/zenmux.ts
+++ b/packages/core/src/plugin/provider/zenmux.ts
@@ -1,8 +1,8 @@
 import { Effect } from "effect"
-import { define } from "../internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const ZenmuxPlugin = define({
-  id: "zenmux",
+  id: "opencode.provider.zenmux",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.catalog.transform((evt) => {
       for (const item of evt.provider.list()) {
diff --git a/packages/core/src/plugin/sdk.ts b/packages/core/src/plugin/sdk.ts
index 78173a50a9..221fb5fae9 100644
--- a/packages/core/src/plugin/sdk.ts
+++ b/packages/core/src/plugin/sdk.ts
@@ -14,9 +14,9 @@ const defaultStore = makeStore()
 
 /**
  * Holds the plugins an embedder (the `@opencode-ai/sdk-next` host) contributes,
- * so `PluginInternal` can add them on every Location boot through the ordinary
- * `ctx.plugin.add` seam — the same path `ConfigExternalPlugin` uses for plugins
- * discovered from config. A plugin registered after a Location has booted only
+ * so `PluginSupervisor` can add them on every Location boot through the ordinary
+ * generation path that `PluginSupervisor` uses for plugins discovered from
+ * config. A plugin registered after a Location has booted only
  * applies to Locations booted afterward, matching config-plugin timing;
  * embedders register at startup before creating Sessions.
  *
diff --git a/packages/core/src/plugin/skill.ts b/packages/core/src/plugin/skill.ts
index c9eca99118..f6ca2ef4af 100644
--- a/packages/core/src/plugin/skill.ts
+++ b/packages/core/src/plugin/skill.ts
@@ -2,7 +2,7 @@
 
 export * as SkillPlugin from "./skill"
 
-import { define } from "./internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { Effect } from "effect"
 import { AbsolutePath } from "../schema"
 import { SkillV2 } from "../skill"
@@ -25,7 +25,7 @@ const REPORT_DESCRIPTION =
   "Use when the user wants to report an opencode issue or bug. Collect standard diagnostics, add user-specific reproduction context, and publish the issue with GitHub CLI."
 
 export const Plugin = define({
-  id: "skill",
+  id: "opencode.skill",
   effect: Effect.fn(function* (ctx) {
     const reportContent = yield* reportContentWithDiagnostics()
     yield* ctx.skill.transform((draft) => {
diff --git a/packages/core/src/plugin/supervisor.ts b/packages/core/src/plugin/supervisor.ts
new file mode 100644
index 0000000000..19410e5001
--- /dev/null
+++ b/packages/core/src/plugin/supervisor.ts
@@ -0,0 +1,270 @@
+export * as PluginSupervisor from "./supervisor"
+
+import type { Plugin } from "@opencode-ai/plugin/v2/effect"
+import { Event } from "@opencode-ai/schema/config"
+import { Context, Effect, Fiber, Layer, Schema, Semaphore, Stream } from "effect"
+import path from "path"
+import { fileURLToPath, pathToFileURL } from "url"
+import { Config } from "../config"
+import { ConfigPlugin } from "../config/plugin"
+import { EventV2 } from "../event"
+import { FSUtil } from "../fs-util"
+import { Location } from "../location"
+import { Npm } from "../npm"
+import { PluginV2 } from "../plugin"
+import { PluginPromise } from "../plugin/promise"
+import { PluginInternal } from "./internal"
+import { SdkPlugins } from "./sdk"
+
+const PluginModule = Schema.Struct({
+  default: Schema.Union([
+    Schema.Struct({
+      id: Schema.String,
+      effect: Schema.declare<Plugin["effect"]>((input): input is Plugin["effect"] => typeof input === "function"),
+    }),
+    Schema.Struct({
+      id: Schema.String,
+      setup: Schema.declare<Parameters<typeof PluginPromise.fromPromise>[0]["setup"]>(
+        (input): input is Parameters<typeof PluginPromise.fromPromise>[0]["setup"] => typeof input === "function",
+      ),
+    }),
+  ]),
+})
+
+const PluginPackage = Schema.Struct({
+  exports: Schema.optional(Schema.Unknown),
+  main: Schema.optional(Schema.String),
+  module: Schema.optional(Schema.String),
+})
+
+type Operation =
+  | {
+      readonly type: "add"
+      readonly target: string
+      readonly options: Record<string, unknown>
+    }
+  | {
+      readonly type: "remove"
+      readonly target: string
+    }
+
+type Candidate =
+  | {
+      readonly type: "definition"
+      readonly definition: Plugin
+    }
+  | {
+      readonly type: "package"
+      readonly specifier: string
+      readonly options: Record<string, unknown>
+    }
+
+type ConfiguredPackage = {
+  readonly operation: Extract<Operation, { type: "add" }>
+  enabled: boolean
+}
+
+function parse(input: ConfigPlugin.Plugin): Operation {
+  if (typeof input !== "string") {
+    return { type: "add", target: input.package, options: input.options ?? {} }
+  }
+  if (!input.startsWith("-")) return { type: "add", target: input, options: {} }
+  if (input.length === 1) throw new Error("Plugin remove operation requires a target")
+  return { type: "remove", target: input.slice(1) }
+}
+
+const scan = Effect.fn("PluginSupervisor.scan")(function* (entries: readonly Config.Entry[]) {
+  const fs = yield* FSUtil.Service
+  const location = yield* Location.Service
+  const discovered = yield* Effect.forEach(
+    entries.filter((entry): entry is Config.Directory => entry.type === "directory"),
+    (entry) => discoverDirectory(fs, entry.path),
+  ).pipe(Effect.map((items) => items.flat()))
+  const configured = entries
+    .filter((entry): entry is Config.Document => entry.type === "document")
+    .flatMap((entry) =>
+      (entry.info.plugins ?? []).map(parse).map((operation) => {
+        const directory = entry.path ? path.dirname(entry.path) : location.directory
+        const target = operation.target.startsWith("file://")
+          ? fileURLToPath(operation.target)
+          : operation.target.startsWith("./") || operation.target.startsWith("../")
+            ? path.resolve(directory, operation.target)
+            : operation.target
+        return operation.type === "add" ? { ...operation, target } : { type: "remove" as const, target }
+      }),
+    )
+  // Explicit config is applied last so it can remove auto-discovered packages.
+  return [...discovered, ...configured]
+})
+
+const resolve = Effect.fn("PluginSupervisor.resolve")(function* (
+  pre: readonly Plugin[],
+  post: readonly Plugin[],
+  operations: readonly Operation[],
+) {
+  const plan = apply(pre, post, operations)
+  return yield* load(plan)
+})
+
+function apply(pre: readonly Plugin[], post: readonly Plugin[], operations: readonly Operation[]) {
+  const matches = (selector: string, target: string) =>
+    selector === "*" || (selector.endsWith(".*") ? target.startsWith(selector.slice(0, -1)) : selector === target)
+  const plugins = [...pre, ...post]
+  const enabled = new Set(plugins.map((plugin) => plugin.id))
+  const packages = new Map<string, ConfiguredPackage>()
+
+  for (const operation of operations) {
+    if (operation.type === "remove") {
+      plugins.filter((plugin) => matches(operation.target, plugin.id)).forEach((plugin) => enabled.delete(plugin.id))
+      packages.forEach((item, target) => {
+        if (matches(operation.target, target)) item.enabled = false
+      })
+      continue
+    }
+
+    const matched = plugins.filter((plugin) => matches(operation.target, plugin.id))
+    const selectsDefinitions =
+      matched.length > 0 ||
+      operation.target === "*" ||
+      operation.target.endsWith(".*") ||
+      operation.target.startsWith("opencode.")
+    if (selectsDefinitions) {
+      matched.forEach((plugin) => enabled.add(plugin.id))
+      packages.forEach((item, target) => {
+        if (matches(operation.target, target)) item.enabled = true
+      })
+      continue
+    }
+
+    packages.set(operation.target, { operation, enabled: true })
+  }
+
+  const definitions: Candidate[] = pre.flatMap((definition) =>
+    enabled.has(definition.id) ? [{ type: "definition", definition }] : [],
+  )
+  const configured: Candidate[] = Array.from(packages.values()).flatMap((item) =>
+    item.enabled ? [{ type: "package", specifier: item.operation.target, options: item.operation.options }] : [],
+  )
+  const posts: Candidate[] = post.flatMap((definition) =>
+    enabled.has(definition.id) ? [{ type: "definition", definition }] : [],
+  )
+  return [...definitions, ...configured, ...posts]
+}
+
+const load = Effect.fn("PluginSupervisor.load")(function* (plan: readonly Candidate[]) {
+  return yield* Effect.forEach(plan, (candidate) => {
+    if (candidate.type === "definition") return Effect.succeed(candidate.definition)
+    return Effect.gen(function* () {
+      const npm = yield* Npm.Service
+      const entrypoint = path.isAbsolute(candidate.specifier)
+        ? pathToFileURL(candidate.specifier).href
+        : (yield* npm.add(candidate.specifier)).entrypoint
+      if (!entrypoint) return
+      yield* Effect.log({ msg: "loading plugin", id: candidate.specifier, entrypoint })
+      const mod = yield* Effect.promise(() => import(entrypoint))
+      const value = (yield* Schema.decodeUnknownEffect(PluginModule)(mod)).default
+      const plugin = "effect" in value ? value : PluginPromise.fromPromise(value)
+      return {
+        id: plugin.id,
+        effect: (host) => plugin.effect({ ...host, options: candidate.options }),
+      } satisfies Plugin
+    }).pipe(Effect.catchCause(() => Effect.succeed(undefined)))
+  }).pipe(Effect.map((plugins) => plugins.filter((plugin) => plugin !== undefined)))
+})
+
+function discoverDirectory(fs: FSUtil.Interface, directory: string) {
+  return Effect.gen(function* () {
+    const files = yield* fs
+      .glob("{plugin,plugins}/*.{ts,js}", {
+        cwd: directory,
+        absolute: true,
+        include: "file",
+        dot: true,
+        symlink: true,
+      })
+      .pipe(Effect.orElseSucceed(() => []))
+    const directories = yield* fs
+      .glob("{plugin,plugins}/*", {
+        cwd: directory,
+        absolute: true,
+        include: "all",
+        dot: true,
+        symlink: true,
+      })
+      .pipe(
+        Effect.flatMap((items) => Effect.filter(items, (item) => fs.isDir(item), { concurrency: "unbounded" })),
+        Effect.orElseSucceed(() => []),
+      )
+    const packages = yield* Effect.forEach(directories.sort(), (directory) => resolvePackageEntrypoint(fs, directory), {
+      concurrency: "unbounded",
+    }).pipe(Effect.map((items) => items.filter((item): item is string => item !== undefined)))
+    return [...files.sort(), ...packages].map((target): Operation => ({ type: "add", target, options: {} }))
+  })
+}
+
+const resolvePackageEntrypoint = Effect.fnUntraced(function* (fs: FSUtil.Interface, directory: string) {
+  const pkg = yield* fs.readJson(path.join(directory, "package.json")).pipe(
+    Effect.flatMap(Schema.decodeUnknownEffect(PluginPackage)),
+    Effect.catch(() => Effect.succeed(undefined)),
+  )
+  const exported = typeof pkg?.exports === "string" ? pkg.exports : undefined
+  const entries = [exported, pkg?.module, pkg?.main, "index.ts", "index.js"]
+
+  return yield* Effect.forEach(entries, (entry) => {
+    if (!entry) return Effect.succeed(undefined)
+    const file = path.resolve(directory, entry)
+    return fs.isFile(file).pipe(Effect.map((exists) => (exists ? file : undefined)))
+  }).pipe(Effect.map((items) => items.find((item): item is string => item !== undefined)))
+})
+
+export interface Interface {
+  readonly ready: Effect.Effect<void>
+}
+
+export class Service extends Context.Service<Service, Interface>()("@opencode/PluginSupervisor") {}
+
+const layer = Layer.effect(
+  Service,
+  Effect.gen(function* () {
+    const registry = yield* PluginV2.Service
+    const sdk = yield* SdkPlugins.Service
+    const config = yield* Config.Service
+    const events = yield* EventV2.Service
+    const lock = Semaphore.makeUnsafe(1)
+    let applied: string | undefined
+    const reload = Effect.fn("PluginSupervisor.reload")(() =>
+      lock.withPermit(
+        Effect.gen(function* () {
+          // Resolve OpenCode's internal plugins with their privileged Location services.
+          const internal = yield* PluginInternal.list()
+          // Combine internal plugins with host-contributed SDK plugins in boot order.
+          const pre = [...internal.pre, ...sdk.all()]
+          // Read the current layered config before resolving plugin directives and packages.
+          const entries = yield* config.entries()
+          // Skip duplicate watcher notifications and config edits unrelated to plugins.
+          const operations = yield* scan(entries)
+          const version = JSON.stringify(operations)
+          if (version === applied) return
+          // Apply config operations and load enabled package plugins into one ordered generation.
+          const plugins = yield* resolve(pre, internal.post, operations)
+          // Replace the active generation in one scoped, batched activation.
+          yield* registry.activate(plugins)
+          applied = version
+        }),
+      ),
+    )
+    yield* events.subscribe(Event.Updated).pipe(
+      Stream.runForEach(() =>
+        reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload plugins", { cause }))),
+      ),
+      Effect.forkScoped({ startImmediately: true }),
+    )
+    const fiber = yield* reload().pipe(
+      Effect.withSpan("PluginSupervisor.boot"),
+      Effect.forkScoped({ startImmediately: true }),
+    )
+    return Service.of({ ready: Fiber.join(fiber) })
+  }),
+)
+
+export { layer }
diff --git a/packages/core/src/plugin/variant.ts b/packages/core/src/plugin/variant.ts
index 7c6e688399..499a2a32bf 100644
--- a/packages/core/src/plugin/variant.ts
+++ b/packages/core/src/plugin/variant.ts
@@ -2,10 +2,10 @@ export * as VariantPlugin from "./variant"
 
 import type { ModelV2Info } from "@opencode-ai/sdk/v2/types"
 import { Effect } from "effect"
-import { define } from "./internal"
+import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 
 export const Plugin = define({
-  id: "variant",
+  id: "opencode.variant",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.catalog.transform((catalog) => {
       for (const record of catalog.provider.list()) {
diff --git a/packages/core/src/state.ts b/packages/core/src/state.ts
index ab3457fc18..93dcdb4e5d 100644
--- a/packages/core/src/state.ts
+++ b/packages/core/src/state.ts
@@ -26,21 +26,32 @@ export interface Transformable<DraftApi> {
   readonly reload: Reload
 }
 
-const CurrentBatch = Context.Reference<Set<Reload> | undefined>("@opencode/State/CurrentBatch", {
+type Batch = {
+  active: boolean
+  readonly reloads: Set<Reload>
+}
+
+const CurrentBatch = Context.Reference<Batch | undefined>("@opencode/State/CurrentBatch", {
   defaultValue: () => undefined,
 })
 
 export function batch<A, E, R>(effect: Effect.Effect<A, E, R>) {
   return Effect.gen(function* () {
     const current = yield* CurrentBatch
-    if (current) return yield* effect
-    const reloads = new Set<Reload>()
-    const result = yield* effect.pipe(Effect.provideService(CurrentBatch, reloads))
-    yield* Effect.forEach(reloads, (reload) => reload(), { discard: true })
-    return result
+    if (current?.active) return yield* effect
+    const batch: Batch = { active: true, reloads: new Set() }
+    const exit = yield* effect.pipe(Effect.provideService(CurrentBatch, batch), Effect.exit)
+    batch.active = false
+    yield* Effect.forEach(batch.reloads, (reload) => reload(), { discard: true })
+    return yield* exit
   })
 }
 
+export const inherit = Effect.fnUntraced(function* () {
+  const batch = yield* CurrentBatch
+  return <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.provideService(effect, CurrentBatch, batch)
+})
+
 export interface Options<State, DraftApi> {
   /** Creates the base value for initial state and every scoped-transform reload. */
   readonly initial: () => State
@@ -100,8 +111,8 @@ export function create<State, DraftApi>(options: Options<State, DraftApi>): Inte
                 transforms = transforms.filter((item) => item !== transform)
                 return Effect.gen(function* () {
                   const batch = yield* CurrentBatch
-                  if (batch) {
-                    batch.add(reload)
+                  if (batch?.active) {
+                    batch.reloads.add(reload)
                     return
                   }
                   yield* materialize()
@@ -116,7 +127,7 @@ export function create<State, DraftApi>(options: Options<State, DraftApi>): Inte
           )
           yield* Scope.addFinalizer(scope, dispose)
           const batch = yield* CurrentBatch
-          if (batch) batch.add(reload)
+          if (batch?.active) batch.reloads.add(reload)
           else yield* reload()
           return { dispose }
         }),
diff --git a/packages/core/src/tool/apply-patch.ts b/packages/core/src/tool/apply-patch.ts
index 2f481d8a0d..6700e6e1ba 100644
--- a/packages/core/src/tool/apply-patch.ts
+++ b/packages/core/src/tool/apply-patch.ts
@@ -55,7 +55,7 @@ type Prepared =
     })
 
 export const Plugin = {
-  id: "core-apply-patch-tool",
+  id: "opencode.tool.apply-patch",
   effect: Effect.fn("ApplyPatchTool.Plugin")(function* (ctx: PluginContext) {
     const mutation = yield* LocationMutation.Service
     const files = yield* FileMutation.Service
diff --git a/packages/core/src/tool/edit.ts b/packages/core/src/tool/edit.ts
index 17ff28cfc1..bb9bb4dee9 100644
--- a/packages/core/src/tool/edit.ts
+++ b/packages/core/src/tool/edit.ts
@@ -86,7 +86,7 @@ export const toModelOutput = (output: Output, oldString: string, newString: stri
 // TODO: Add LSP notification and diagnostics after V2 LSP runtime exists.
 
 export const Plugin = {
-  id: "core-edit-tool",
+  id: "opencode.tool.edit",
   effect: Effect.fn("EditTool.Plugin")(function* (ctx: PluginContext) {
     const mutation = yield* LocationMutation.Service
     const files = yield* FileMutation.Service
diff --git a/packages/core/src/tool/glob.ts b/packages/core/src/tool/glob.ts
index dcea52120f..753e36cab5 100644
--- a/packages/core/src/tool/glob.ts
+++ b/packages/core/src/tool/glob.ts
@@ -35,7 +35,7 @@ export const toModelOutput = (output: ModelOutput) => {
 
 /** Glob leaf that defaults its filesystem root to the active Location. */
 export const Plugin = {
-  id: "core-glob-tool",
+  id: "opencode.tool.glob",
   effect: Effect.fn("GlobTool.Plugin")(function* (ctx: PluginContext) {
     const fs = yield* FSUtil.Service
     const ripgrep = yield* Ripgrep.Service
diff --git a/packages/core/src/tool/grep.ts b/packages/core/src/tool/grep.ts
index 35ac537c91..685925aa04 100644
--- a/packages/core/src/tool/grep.ts
+++ b/packages/core/src/tool/grep.ts
@@ -49,7 +49,7 @@ export const toModelOutput = (output: ModelOutput) => {
 
 /** Grep leaf that defaults its filesystem root to the active Location. */
 export const Plugin = {
-  id: "core-grep-tool",
+  id: "opencode.tool.grep",
   effect: Effect.fn("GrepTool.Plugin")(function* (ctx: PluginContext) {
     const fs = yield* FSUtil.Service
     const ripgrep = yield* Ripgrep.Service
diff --git a/packages/core/src/tool/question.ts b/packages/core/src/tool/question.ts
index 218edb57e9..9bf4249add 100644
--- a/packages/core/src/tool/question.ts
+++ b/packages/core/src/tool/question.ts
@@ -43,7 +43,7 @@ export const toModelOutput = (
 }
 
 export const Plugin = {
-  id: "core-question-tool",
+  id: "opencode.tool.question",
   effect: Effect.fn("QuestionTool.Plugin")(function* (ctx: PluginContext) {
     const question = yield* QuestionV2.Service
     const permission = yield* PermissionV2.Service
diff --git a/packages/core/src/tool/read.ts b/packages/core/src/tool/read.ts
index 16e229d97d..de03a97974 100644
--- a/packages/core/src/tool/read.ts
+++ b/packages/core/src/tool/read.ts
@@ -31,7 +31,7 @@ const Input = LocationInput
 const Output = Schema.Union([FileSystem.Content, ReadToolFileSystem.TextPage, ReadToolFileSystem.ListPage])
 
 export const Plugin = {
-  id: "core-read-tool",
+  id: "opencode.tool.read",
   effect: Effect.fn("ReadTool.Plugin")(function* (ctx: PluginContext) {
     const reader = yield* ReadToolFileSystem.Service
     const mutation = yield* LocationMutation.Service
diff --git a/packages/core/src/tool/shell.ts b/packages/core/src/tool/shell.ts
index c3644e4810..cd0c428a61 100644
--- a/packages/core/src/tool/shell.ts
+++ b/packages/core/src/tool/shell.ts
@@ -99,7 +99,7 @@ const externalCommandDirectories = Effect.fn("ShellTool.externalCommandDirectori
 })
 
 export const Plugin = {
-  id: "core-shell-tool",
+  id: "opencode.tool.shell",
   effect: Effect.fn("ShellTool.Plugin")(function* (ctx: PluginContext) {
     const runtime = yield* PluginRuntime.Service
     const scope = yield* Scope.Scope
diff --git a/packages/core/src/tool/skill.ts b/packages/core/src/tool/skill.ts
index 1c5d23a047..669e36c4c8 100644
--- a/packages/core/src/tool/skill.ts
+++ b/packages/core/src/tool/skill.ts
@@ -53,7 +53,7 @@ const unableToLoad = (name: string, error?: unknown) =>
   new ToolFailure({ message: `Unable to load skill ${name}`, error })
 
 export const Plugin = {
-  id: "core-skill-tool",
+  id: "opencode.tool.skill",
   effect: Effect.fn("SkillTool.Plugin")(function* (ctx: PluginContext) {
     const fs = yield* FSUtil.Service
     const skills = yield* SkillV2.Service
diff --git a/packages/core/src/tool/subagent.ts b/packages/core/src/tool/subagent.ts
index 517d1ce65f..50db674ef2 100644
--- a/packages/core/src/tool/subagent.ts
+++ b/packages/core/src/tool/subagent.ts
@@ -38,7 +38,7 @@ export const description = [
 ].join("\n")
 
 export const Plugin = {
-  id: "core-subagent-tool",
+  id: "opencode.tool.subagent",
   effect: Effect.fn("SubagentTool.Plugin")(function* (ctx: PluginContext) {
     const runtime = yield* PluginRuntime.Service
     const agents = yield* AgentV2.Service
diff --git a/packages/core/src/tool/todowrite.ts b/packages/core/src/tool/todowrite.ts
index 5f34ebd5aa..279792e38a 100644
--- a/packages/core/src/tool/todowrite.ts
+++ b/packages/core/src/tool/todowrite.ts
@@ -21,7 +21,7 @@ export type Output = typeof Output.Type
 export const toModelOutput = (output: Output) => JSON.stringify(output.todos, null, 2)
 
 export const Plugin = {
-  id: "core-todowrite-tool",
+  id: "opencode.tool.todowrite",
   effect: Effect.fn("TodoWriteTool.Plugin")(function* (ctx: PluginContext) {
     const todos = yield* SessionTodo.Service
     const permission = yield* PermissionV2.Service
diff --git a/packages/core/src/tool/webfetch.ts b/packages/core/src/tool/webfetch.ts
index efac4a2a75..b729fb43f7 100644
--- a/packages/core/src/tool/webfetch.ts
+++ b/packages/core/src/tool/webfetch.ts
@@ -113,7 +113,7 @@ const convert = (content: string, contentType: string, format: Format) => {
 }
 
 export const Plugin = {
-  id: "core-webfetch-tool",
+  id: "opencode.tool.webfetch",
   effect: Effect.fn("WebFetchTool.Plugin")(function* (ctx: PluginContext) {
     const http = yield* HttpClient.HttpClient
     const permission = yield* PermissionV2.Service
diff --git a/packages/core/src/tool/websearch.ts b/packages/core/src/tool/websearch.ts
index 80a2422cee..d0c984b89a 100644
--- a/packages/core/src/tool/websearch.ts
+++ b/packages/core/src/tool/websearch.ts
@@ -188,7 +188,7 @@ const Output = Schema.Struct({
 })
 
 export const Plugin = {
-  id: "core-websearch-tool",
+  id: "opencode.tool.websearch",
   effect: Effect.fn("WebSearchTool.Plugin")(function* (ctx: PluginContext) {
     const http = yield* HttpClient.HttpClient
     const config = yield* ConfigService
diff --git a/packages/core/src/tool/write.ts b/packages/core/src/tool/write.ts
index 73885b2187..ca89665be4 100644
--- a/packages/core/src/tool/write.ts
+++ b/packages/core/src/tool/write.ts
@@ -43,7 +43,7 @@ export const toModelOutput = (output: Output) =>
 // TODO: Add LSP notification and diagnostics after V2 LSP runtime exists.
 
 export const Plugin = {
-  id: "core-write-tool",
+  id: "opencode.tool.write",
   effect: Effect.fn("WriteTool.Plugin")(function* (ctx: PluginContext) {
     const mutation = yield* LocationMutation.Service
     const files = yield* FileMutation.Service
diff --git a/packages/core/test/config/plugin.test.ts b/packages/core/test/config/plugin.test.ts
index b72a62df8a..c3c84d8101 100644
--- a/packages/core/test/config/plugin.test.ts
+++ b/packages/core/test/config/plugin.test.ts
@@ -1,252 +1,225 @@
+import fs from "fs/promises"
 import path from "path"
 import { describe, expect } from "bun:test"
-import { Effect, Schema } from "effect"
+import { define } from "@opencode-ai/plugin/v2/effect"
 import { AgentV2 } from "@opencode-ai/core/agent"
-import { Config } from "@opencode-ai/core/config"
-import { ConfigExternalPlugin } from "@opencode-ai/core/config/plugin/external"
-import { FSUtil } from "@opencode-ai/core/fs-util"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
+import { LayerNode } from "@opencode-ai/core/effect/layer-node"
+import { EventV2 } from "@opencode-ai/core/event"
 import { Location } from "@opencode-ai/core/location"
-import { Npm } from "@opencode-ai/core/npm"
+import { LocationServiceMap } from "@opencode-ai/core/location-services"
 import { PluginV2 } from "@opencode-ai/core/plugin"
-import { PluginHost } from "@opencode-ai/core/plugin/host"
+import { SdkPlugins } from "@opencode-ai/core/plugin/sdk"
+import { PluginSupervisor } from "@opencode-ai/core/plugin/supervisor"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { ProviderV2 } from "@opencode-ai/core/provider"
 import { AbsolutePath } from "@opencode-ai/core/schema"
+import { Effect } from "effect"
+import { Database } from "../../src/database/database"
+import { tmpdir } from "../fixture/tmpdir"
 import { testEffect } from "../lib/effect"
-import { PluginTestLayer } from "../plugin/fixture"
 
-const it = testEffect(PluginTestLayer)
-const decode = Schema.decodeUnknownSync(Config.Info)
+const it = testEffect(
+  AppNodeBuilder.build(LayerNode.group([Database.node, EventV2.node, SdkPlugins.node, LocationServiceMap.node])),
+)
 
-describe("ConfigExternalPlugin", () => {
-  it.live("resolves and loads a configured Promise plugin with options", () =>
+describe("PluginSupervisor config", () => {
+  it.live("applies selectors in order", () =>
+    withLocation(
+      { plugins: ["-opencode.provider.*", "opencode.provider.openai"] },
+      Effect.gen(function* () {
+        const plugins = yield* PluginV2.Service
+        yield* ready()
+        expect(
+          (yield* plugins.list()).map((plugin) => plugin.id).filter((id) => id.startsWith("opencode.provider.")),
+        ).toEqual([PluginV2.ID.make("opencode.provider.openai")])
+      }),
+    ),
+  )
+
+  it.live("loads configured Promise plugins with options", () =>
+    withLocation(
+      {
+        plugins: [
+          "-*",
+          {
+            package: path.join(import.meta.dir, "../plugin/fixtures/config-promise-plugin.ts"),
+            options: { description: "Loaded from config" },
+          },
+        ],
+      },
+      Effect.gen(function* () {
+        yield* ready()
+        const agents = yield* AgentV2.Service
+        expect(yield* agents.get(AgentV2.ID.make("configured"))).toMatchObject({
+          description: "Loaded from config",
+          mode: "subagent",
+        })
+      }),
+    ),
+  )
+
+  it.live("loads configured Effect plugins with options", () =>
+    withLocation(
+      {
+        plugins: [
+          "-*",
+          {
+            package: path.join(import.meta.dir, "../plugin/fixtures/config-effect-plugin.ts"),
+            options: { description: "Effect plugin from config" },
+          },
+        ],
+      },
+      Effect.gen(function* () {
+        yield* ready()
+        const agents = yield* AgentV2.Service
+        expect(yield* agents.get(AgentV2.ID.make("effect-configured"))).toMatchObject({
+          description: "Effect plugin from config",
+          mode: "subagent",
+        })
+      }),
+    ),
+  )
+
+  it.live("ignores invalid packages and continues loading", () =>
+    withLocation(
+      {
+        plugins: [
+          "-*",
+          path.join(import.meta.dir, "../plugin/fixtures/missing-plugin.ts"),
+          path.join(import.meta.dir, "../plugin/fixtures/invalid-plugin.ts"),
+          {
+            package: path.join(import.meta.dir, "../plugin/fixtures/config-promise-plugin.ts"),
+            options: { description: "Loaded after invalid plugins" },
+          },
+        ],
+      },
+      Effect.gen(function* () {
+        yield* ready()
+        const agents = yield* AgentV2.Service
+        expect(yield* agents.get(AgentV2.ID.make("configured"))).toMatchObject({
+          description: "Loaded after invalid plugins",
+        })
+      }),
+    ),
+  )
+
+  it.live("loads auto-discovered plugin files and packages", () =>
+    withLocation(
+      undefined,
+      Effect.gen(function* () {
+        yield* ready()
+        const agents = yield* AgentV2.Service
+        expect(yield* agents.get(AgentV2.ID.make("directory"))).toMatchObject({
+          description: "Loaded from plugin directory",
+        })
+        expect(yield* agents.get(AgentV2.ID.make("folder"))).toMatchObject({
+          description: "Loaded from plugin folder",
+        })
+      }),
+      true,
+    ),
+  )
+
+  it.live("applies explicit removals after auto-discovery", () =>
+    withLocation(
+      { plugins: ["-*"] },
+      Effect.gen(function* () {
+        yield* ready()
+        const agents = yield* AgentV2.Service
+        expect(yield* agents.get(AgentV2.ID.make("directory"))).toBeUndefined()
+        expect(yield* agents.get(AgentV2.ID.make("folder"))).toBeUndefined()
+      }),
+      true,
+    ),
+  )
+
+  it.live("loads user plugins before internal post plugins", () =>
     Effect.gen(function* () {
-      const plugins = yield* PluginV2.Service
-      const agents = yield* AgentV2.Service
-      const fs = yield* FSUtil.Service
-      const location = yield* Location.Service
-      const npm = yield* Npm.Service
-      const host = yield* PluginHost.make(plugins)
-      const document = path.join(import.meta.dir, "opencode.json")
+      const sdk = yield* SdkPlugins.Service
+      yield* sdk.register(define({ id: "sdk-order", effect: () => Effect.void }))
+      yield* withLocation(
+        {
+          plugins: [
+            path.join(import.meta.dir, "../plugin/fixtures/config-promise-plugin.ts"),
+            path.join(import.meta.dir, "../plugin/fixtures/variant-source-plugin.ts"),
+          ],
+        },
+        Effect.gen(function* () {
+          yield* ready()
+          const registry = yield* PluginV2.Service
+          const ids = (yield* registry.list()).map((plugin) => String(plugin.id))
+          expect(ids.indexOf("opencode.agent")).toBeLessThan(ids.indexOf("sdk-order"))
+          expect(ids.indexOf("sdk-order")).toBeLessThan(ids.indexOf("config-promise-plugin"))
+          expect(ids.indexOf("config-promise-plugin")).toBeLessThan(ids.indexOf("variant-source"))
+          expect(ids.indexOf("variant-source")).toBeLessThan(ids.indexOf("opencode.config.provider"))
+          expect(ids.indexOf("opencode.config.provider")).toBeLessThan(ids.indexOf("opencode.variant"))
 
-      yield* ConfigExternalPlugin.Plugin.effect(host).pipe(
-        Effect.provideService(PluginV2.Service, plugins),
-        Effect.provideService(FSUtil.Service, fs),
-        Effect.provideService(Location.Service, location),
-        Effect.provideService(Npm.Service, npm),
-        Effect.provideService(
-          Config.Service,
-          Config.Service.of({
-            entries: () =>
-              Effect.succeed([
-                new Config.Document({
-                  type: "document",
-                  path: document,
-                  info: decode({
-                    plugins: [
-                      {
-                        package: "../plugin/fixtures/config-promise-plugin.ts",
-                        options: { description: "Loaded from config" },
-                      },
-                    ],
-                  }),
-                }),
-              ]),
-          }),
-        ),
+          const catalog = yield* Catalog.Service
+          expect(
+            (yield* catalog.model.get(ProviderV2.ID.make("configured"), ModelV2.ID.make("glm-5.2")))?.variants,
+          ).toEqual([
+            expect.objectContaining({ id: "high", headers: { custom: "true" } }),
+            expect.objectContaining({ id: "max", settings: { reasoningEffort: "max" } }),
+          ])
+        }),
       )
-
-      expect(yield* waitForAgent(agents, "configured")).toMatchObject({
-        description: "Loaded from config",
-        mode: "subagent",
-      })
     }),
   )
 
-  it.live("loads a configured Effect plugin with options", () =>
-    Effect.gen(function* () {
-      const plugins = yield* PluginV2.Service
-      const agents = yield* AgentV2.Service
-      const fs = yield* FSUtil.Service
-      const location = yield* Location.Service
-      const npm = yield* Npm.Service
-      const host = yield* PluginHost.make(plugins)
+  it.live("allows variant generation to be disabled", () =>
+    withLocation(
+      {
+        plugins: [path.join(import.meta.dir, "../plugin/fixtures/variant-source-plugin.ts"), "-opencode.variant"],
+      },
+      Effect.gen(function* () {
+        yield* ready()
+        const registry = yield* PluginV2.Service
+        expect((yield* registry.list()).map((plugin) => String(plugin.id))).not.toContain("opencode.variant")
 
-      yield* ConfigExternalPlugin.Plugin.effect(host).pipe(
-        Effect.provideService(PluginV2.Service, plugins),
-        Effect.provideService(FSUtil.Service, fs),
-        Effect.provideService(Location.Service, location),
-        Effect.provideService(Npm.Service, npm),
-        Effect.provideService(
-          Config.Service,
-          Config.Service.of({
-            entries: () =>
-              Effect.succeed([
-                new Config.Document({
-                  type: "document",
-                  path: path.join(import.meta.dir, "opencode.json"),
-                  info: decode({
-                    plugins: [
-                      {
-                        package: "../plugin/fixtures/config-effect-plugin.ts",
-                        options: { description: "Effect plugin from config" },
-                      },
-                    ],
-                  }),
-                }),
-              ]),
-          }),
-        ),
-      )
-
-      expect(yield* waitForAgent(agents, "effect-configured")).toMatchObject({
-        description: "Effect plugin from config",
-        mode: "subagent",
-      })
-    }),
-  )
-
-  it.live("ignores invalid plugins and continues loading", () =>
-    Effect.gen(function* () {
-      const plugins = yield* PluginV2.Service
-      const agents = yield* AgentV2.Service
-      const fs = yield* FSUtil.Service
-      const location = yield* Location.Service
-      const npm = yield* Npm.Service
-      const host = yield* PluginHost.make(plugins)
-
-      yield* ConfigExternalPlugin.Plugin.effect(host).pipe(
-        Effect.provideService(PluginV2.Service, plugins),
-        Effect.provideService(FSUtil.Service, fs),
-        Effect.provideService(Location.Service, location),
-        Effect.provideService(Npm.Service, npm),
-        Effect.provideService(
-          Config.Service,
-          Config.Service.of({
-            entries: () =>
-              Effect.succeed([
-                new Config.Document({
-                  type: "document",
-                  path: path.join(import.meta.dir, "opencode.json"),
-                  info: decode({
-                    plugins: [
-                      "../plugin/fixtures/missing-plugin.ts",
-                      "../plugin/fixtures/invalid-plugin.ts",
-                      {
-                        package: "../plugin/fixtures/config-promise-plugin.ts",
-                        options: { description: "Loaded after invalid plugins" },
-                      },
-                    ],
-                  }),
-                }),
-              ]),
-          }),
-        ),
-      )
-
-      expect(yield* waitForAgent(agents, "configured")).toMatchObject({
-        description: "Loaded after invalid plugins",
-      })
-    }),
-  )
-
-  it.live("installs and resolves npm plugin packages", () =>
-    Effect.gen(function* () {
-      const plugins = yield* PluginV2.Service
-      const agents = yield* AgentV2.Service
-      const fs = yield* FSUtil.Service
-      const location = yield* Location.Service
-      const host = yield* PluginHost.make(plugins)
-      let installed: string | undefined
-      const npm = Npm.Service.of({
-        add: (spec) =>
-          Effect.sync(() => {
-            installed = spec
-            return {
-              directory: import.meta.dir,
-              entrypoint: path.join(import.meta.dir, "../plugin/fixtures/config-promise-plugin.ts"),
-            }
-          }),
-        install: () => Effect.void,
-        which: () => Effect.succeed(undefined),
-      })
-
-      yield* ConfigExternalPlugin.Plugin.effect(host).pipe(
-        Effect.provideService(PluginV2.Service, plugins),
-        Effect.provideService(FSUtil.Service, fs),
-        Effect.provideService(Location.Service, location),
-        Effect.provideService(Npm.Service, npm),
-        Effect.provideService(
-          Config.Service,
-          Config.Service.of({
-            entries: () =>
-              Effect.succeed([
-                new Config.Document({
-                  type: "document",
-                  info: decode({
-                    plugins: [
-                      {
-                        package: "example-plugin@1.0.0",
-                        options: { description: "Installed from npm" },
-                      },
-                    ],
-                  }),
-                }),
-              ]),
-          }),
-        ),
-      )
-
-      expect(yield* waitForAgent(agents, "configured")).toMatchObject({
-        description: "Installed from npm",
-      })
-      expect(installed).toBe("example-plugin@1.0.0")
-    }),
-  )
-
-  it.live("loads plugin files from config directories", () =>
-    Effect.gen(function* () {
-      const plugins = yield* PluginV2.Service
-      const agents = yield* AgentV2.Service
-      const fs = yield* FSUtil.Service
-      const location = yield* Location.Service
-      const npm = yield* Npm.Service
-      const host = yield* PluginHost.make(plugins)
-
-      yield* ConfigExternalPlugin.Plugin.effect(host).pipe(
-        Effect.provideService(PluginV2.Service, plugins),
-        Effect.provideService(FSUtil.Service, fs),
-        Effect.provideService(Location.Service, location),
-        Effect.provideService(Npm.Service, npm),
-        Effect.provideService(
-          Config.Service,
-          Config.Service.of({
-            entries: () =>
-              Effect.succeed([
-                new Config.Directory({
-                  type: "directory",
-                  path: AbsolutePath.make(path.join(import.meta.dir, "fixtures")),
-                }),
-              ]),
-          }),
-        ),
-      )
-
-      expect(yield* waitForAgent(agents, "directory")).toMatchObject({
-        description: "Loaded from plugin directory",
-        mode: "subagent",
-      })
-      expect(yield* waitForAgent(agents, "folder")).toMatchObject({
-        description: "Loaded from plugin folder",
-        mode: "subagent",
-      })
-    }),
+        const catalog = yield* Catalog.Service
+        expect(
+          (yield* catalog.model.get(ProviderV2.ID.make("configured"), ModelV2.ID.make("glm-5.2")))?.variants,
+        ).toEqual([expect.objectContaining({ id: "high", headers: { custom: "true" } })])
+      }),
+    ),
   )
 })
 
-const waitForAgent = Effect.fnUntraced(function* (agents: AgentV2.Interface, id: string) {
-  for (let attempt = 0; attempt < 100; attempt++) {
-    const agent = yield* agents.get(AgentV2.ID.make(id))
-    if (agent) return agent
-    yield* Effect.sleep("10 millis")
-  }
-  return yield* Effect.die(`Timed out waiting for agent ${id}`)
+const ready = Effect.fnUntraced(function* () {
+  const supervisor = yield* PluginSupervisor.Service
+  yield* supervisor.ready
 })
+
+function withLocation<A, E, R>(config: unknown, effect: Effect.Effect<A, E, R>, fixtures = false) {
+  return Effect.acquireRelease(
+    Effect.promise(() => tmpdir()),
+    (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+  ).pipe(
+    Effect.tap((tmp) =>
+      Effect.promise(async () => {
+        if (fixtures) {
+          const directory = path.join(tmp.path, ".opencode")
+          await fs.mkdir(directory, { recursive: true })
+          await Promise.all(
+            ["plugin", "plugins"].map((name) =>
+              fs.symlink(path.join(import.meta.dir, "fixtures", name), path.join(directory, name), "dir"),
+            ),
+          )
+        }
+        if (config !== undefined) {
+          const directory = fixtures ? path.join(tmp.path, ".opencode") : tmp.path
+          await fs.mkdir(directory, { recursive: true })
+          await fs.writeFile(path.join(directory, "opencode.json"), JSON.stringify(config))
+        }
+      }),
+    ),
+    Effect.flatMap((tmp) =>
+      effect.pipe(
+        Effect.scoped,
+        Effect.provide(LocationServiceMap.Service.get(Location.Ref.make({ directory: AbsolutePath.make(tmp.path) }))),
+      ),
+    ),
+  )
+}
diff --git a/packages/core/test/config/reload.test.ts b/packages/core/test/config/reload.test.ts
index 3550bddb95..e5f8bd10fc 100644
--- a/packages/core/test/config/reload.test.ts
+++ b/packages/core/test/config/reload.test.ts
@@ -7,7 +7,6 @@ import { CommandV2 } from "@opencode-ai/core/command"
 import { Config } from "@opencode-ai/core/config"
 import { ConfigAgentPlugin } from "@opencode-ai/core/config/plugin/agent"
 import { ConfigCommandPlugin } from "@opencode-ai/core/config/plugin/command"
-import { ConfigExternalPlugin } from "@opencode-ai/core/config/plugin/external"
 import { ConfigProviderPlugin } from "@opencode-ai/core/config/plugin/provider"
 import { ConfigReferencePlugin } from "@opencode-ai/core/config/plugin/reference"
 import { ConfigSkillPlugin } from "@opencode-ai/core/config/plugin/skill"
@@ -37,7 +36,7 @@ describe("config plugin reloads", () => {
       const references = yield* Reference.Service
       const skills = yield* SkillV2.Service
       const host = yield* PluginHost.make(plugins)
-      let entries: Config.Entry[] = [config("first", "First plugin")]
+      let entries: Config.Entry[] = [config("first")]
       const service = Config.Service.of({ entries: () => Effect.sync(() => entries) })
       const setup = <R>(effect: Effect.Effect<void, never, R>) =>
         effect.pipe(Effect.provideService(Config.Service, service))
@@ -47,7 +46,6 @@ describe("config plugin reloads", () => {
       yield* setup(ConfigSkillPlugin.Plugin.effect(host))
       yield* setup(ConfigReferencePlugin.Plugin.effect(host))
       yield* setup(ConfigProviderPlugin.Plugin.effect(host))
-      yield* setup(ConfigExternalPlugin.Plugin.effect(host))
 
       expect((yield* agents.get(AgentV2.ID.make("first")))?.description).toBe("First agent")
       expect((yield* commands.get("first"))?.description).toBe("First command")
@@ -56,9 +54,8 @@ describe("config plugin reloads", () => {
       ).toBe(true)
       expect((yield* references.list()).map((reference) => reference.name)).toEqual(["first"])
       expect(yield* catalog.provider.get(ProviderV2.ID.make("first"))).toBeDefined()
-      expect((yield* agents.get(AgentV2.ID.make("configured")))?.description).toBe("First plugin")
 
-      entries = [config("second", "Second plugin")]
+      entries = [config("second")]
       yield* events.publish(ConfigSchema.Event.Updated, {})
       yield* waitUntil(
         Effect.gen(function* () {
@@ -80,12 +77,11 @@ describe("config plugin reloads", () => {
       expect(
         (yield* skills.sources()).some((source) => source.type === "directory" && source.path === "/skills/second"),
       ).toBe(true)
-      expect((yield* agents.get(AgentV2.ID.make("configured")))?.description).toBe("First plugin")
     }).pipe(Effect.provideService(Global.Service, Global.Service.of(Global.make()))),
   )
 })
 
-function config(name: string, pluginDescription?: string) {
+function config(name: string) {
   return new Config.Document({
     type: "document",
     path: document,
@@ -95,15 +91,6 @@ function config(name: string, pluginDescription?: string) {
       skills: [`/skills/${name}`],
       references: { [name]: `/references/${name}` },
       providers: { [name]: { models: { chat: { name: `${title(name)} model` } } } },
-      plugins:
-        pluginDescription === undefined
-          ? []
-          : [
-              {
-                package: "../plugin/fixtures/config-promise-plugin.ts",
-                options: { description: pluginDescription },
-              },
-            ],
     }),
   })
 }
diff --git a/packages/core/test/location-layer.test.ts b/packages/core/test/location-layer.test.ts
index 0f17b0dd2b..be6e150680 100644
--- a/packages/core/test/location-layer.test.ts
+++ b/packages/core/test/location-layer.test.ts
@@ -1,7 +1,8 @@
 import fs from "fs/promises"
 import path from "path"
 import { describe, expect } from "bun:test"
-import { DateTime, Effect, Equal, Hash, Schema } from "effect"
+import { Config } from "@opencode-ai/schema/config"
+import { Context, DateTime, Effect, Equal, Hash, Schema, Stream } from "effect"
 import { define } from "@opencode-ai/plugin/v2/effect"
 import { AgentV2 } from "@opencode-ai/core/agent"
 import { Catalog } from "@opencode-ai/core/catalog"
@@ -10,6 +11,7 @@ import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { LocationServiceMap } from "@opencode-ai/core/location-services"
 import { Location } from "@opencode-ai/core/location"
 import { PluginV2 } from "@opencode-ai/core/plugin"
+import { PluginSupervisor } from "@opencode-ai/core/plugin/supervisor"
 import { ModelV2 } from "@opencode-ai/core/model"
 import { ProjectV2 } from "@opencode-ai/core/project"
 import { ProviderV2 } from "@opencode-ai/core/provider"
@@ -27,6 +29,124 @@ import { ToolRegistry } from "../src/tool/registry"
 const it = testEffect(AppNodeBuilder.build(LayerNode.group([Database.node, EventV2.node, LocationServiceMap.node])))
 
 describe("LocationServiceMap", () => {
+  it.live("applies ordered plugin config operations during boot", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (dir) => Effect.promise(() => dir[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((dir) =>
+        Effect.gen(function* () {
+          yield* Effect.promise(() =>
+            fs.writeFile(path.join(dir.path, "opencode.json"), JSON.stringify({ plugins: ["-*", "opencode.agent"] })),
+          )
+          const plugins = yield* Effect.gen(function* () {
+            const plugins = yield* PluginV2.Service
+            yield* (yield* PluginSupervisor.Service).ready
+            return yield* plugins.list()
+          }).pipe(
+            Effect.scoped,
+            Effect.provide(
+              LocationServiceMap.Service.get(Location.Ref.make({ directory: AbsolutePath.make(dir.path) })),
+            ),
+          )
+
+          expect(plugins.map((plugin) => plugin.id)).toEqual([PluginV2.ID.make("opencode.agent")])
+        }),
+      ),
+    ),
+  )
+
+  it.live("reloads the plugin generation after config updates", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (dir) => Effect.promise(() => dir[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((dir) =>
+        Effect.gen(function* () {
+          const file = path.join(dir.path, "opencode.json")
+          yield* Effect.promise(() => fs.writeFile(file, JSON.stringify({ plugins: ["-*", "opencode.agent"] })))
+          yield* Effect.gen(function* () {
+            const registry = yield* PluginV2.Service
+            const supervisor = yield* PluginSupervisor.Service
+            yield* supervisor.ready
+            expect((yield* registry.list()).map((plugin) => String(plugin.id))).toEqual(["opencode.agent"])
+
+            yield* Effect.promise(() => fs.writeFile(file, JSON.stringify({ plugins: ["-*", "opencode.command"] })))
+            for (let attempt = 0; attempt < 100; attempt++) {
+              if ((yield* registry.list()).some((plugin) => plugin.id === "opencode.command")) break
+              yield* Effect.sleep("20 millis")
+            }
+
+            expect((yield* registry.list()).map((plugin) => String(plugin.id))).toEqual(["opencode.command"])
+
+            yield* Effect.promise(() =>
+              fs.writeFile(
+                file,
+                JSON.stringify({
+                  plugins: ["-*", path.join(import.meta.dir, "plugin/fixtures/failing-plugin.ts")],
+                }),
+              ),
+            )
+            for (let attempt = 0; attempt < 100; attempt++) {
+              if ((yield* registry.list()).length === 0) break
+              yield* Effect.sleep("20 millis")
+            }
+            expect(yield* registry.list()).toEqual([])
+
+            yield* Effect.promise(() => fs.writeFile(file, JSON.stringify({ plugins: ["-*", "opencode.agent"] })))
+            for (let attempt = 0; attempt < 100; attempt++) {
+              if ((yield* registry.list()).some((plugin) => plugin.id === "opencode.agent")) break
+              yield* Effect.sleep("20 millis")
+            }
+            expect((yield* registry.list()).map((plugin) => String(plugin.id))).toEqual(["opencode.agent"])
+          }).pipe(
+            Effect.scoped,
+            Effect.provide(
+              LocationServiceMap.Service.get(Location.Ref.make({ directory: AbsolutePath.make(dir.path) })),
+            ),
+          )
+        }),
+      ),
+    ),
+  )
+
+  it.live("routes located events only to their location", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => Promise.all([tmpdir(), tmpdir()])),
+      (dirs) => Effect.promise(() => Promise.all(dirs.map((dir) => dir[Symbol.asyncDispose]())).then(() => undefined)),
+    ).pipe(
+      Effect.flatMap(([first, second]) =>
+        Effect.scoped(
+          Effect.gen(function* () {
+            const locations = yield* LocationServiceMap.Service
+            const events = yield* EventV2.Service
+            const firstRef = Location.Ref.make({ directory: AbsolutePath.make(first.path) })
+            const secondRef = Location.Ref.make({ directory: AbsolutePath.make(second.path) })
+            const firstContext = yield* locations.contextEffect(firstRef)
+            const secondContext = yield* locations.contextEffect(secondRef)
+            const received = { first: 0, second: 0 }
+            yield* events.subscribe(Config.Event.Updated).pipe(
+              Stream.runForEach(() => Effect.sync(() => received.first++)),
+              Effect.provideContext(firstContext),
+              Effect.forkScoped({ startImmediately: true }),
+            )
+            yield* events.subscribe(Config.Event.Updated).pipe(
+              Stream.runForEach(() => Effect.sync(() => received.second++)),
+              Effect.provideContext(secondContext),
+              Effect.forkScoped({ startImmediately: true }),
+            )
+            yield* Effect.sleep("10 millis")
+
+            yield* events.publish(Config.Event.Updated, {}, { location: firstRef })
+            yield* Effect.sleep("10 millis")
+
+            expect(received).toEqual({ first: 1, second: 0 })
+          }),
+        ),
+      ),
+    ),
+  )
+
   it.live("reuses cached services for constructed and decoded location refs", () =>
     Effect.acquireRelease(
       Effect.promise(() => tmpdir()),
@@ -64,7 +184,7 @@ describe("LocationServiceMap", () => {
               const catalog = yield* Catalog.Service
               yield* catalog.transform((editor) => editor.provider.update(providerID, () => {}))
               const registry = yield* ToolRegistry.Service
-              // Tool plugins register during the forked PluginInternal boot; wait for
+              // Tool plugins register during the forked PluginSupervisor boot; wait for
               // every expected tool rather than relying on batch ordering.
               yield* Effect.forEach(
                 [
@@ -257,7 +377,7 @@ describe("LocationServiceMap", () => {
                 })
                 .pipe(Effect.asVoid),
           })
-          yield* plugins.add(PluginV2.ID.make(reviewer.id), reviewer.effect)
+          yield* plugins.activate([{ id: PluginV2.ID.make(reviewer.id), effect: reviewer.effect }])
 
           expect(yield* (yield* AgentV2.Service).get(AgentV2.ID.make("reviewer"))).toMatchObject({
             description: "Reviews code",
diff --git a/packages/core/test/plugin.test.ts b/packages/core/test/plugin.test.ts
index 266d487862..8917171929 100644
--- a/packages/core/test/plugin.test.ts
+++ b/packages/core/test/plugin.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect } from "bun:test"
-import { Effect, Exit, Fiber, Schema, Stream } from "effect"
+import { Context, Effect, Exit, Fiber, Schema, Stream } from "effect"
 import { define } from "@opencode-ai/plugin/v2/effect"
 import { Config as ConfigSchema } from "@opencode-ai/schema/config"
 import { AgentV2 } from "@opencode-ai/core/agent"
@@ -16,6 +16,8 @@ import { PluginTestLayer } from "./plugin/fixture"
 
 const it = testEffect(PluginTestLayer)
 
+class Secret extends Context.Service<Secret, string>()("@opencode/test/PluginSecret") {}
+
 describe("PluginV2", () => {
   it.live("exposes public events through the plugin context", () =>
     Effect.gen(function* () {
@@ -35,43 +37,15 @@ describe("PluginV2", () => {
     }),
   )
 
-  it.effect("waits for a plugin and returns immediately once active", () =>
-    Effect.gen(function* () {
-      const plugins = yield* PluginV2.Service
-      const id = PluginV2.ID.make("waited")
-      const waiting = yield* plugins.wait(id).pipe(Effect.forkChild)
-
-      yield* plugins.add(id, () => Effect.void)
-      yield* Fiber.join(waiting)
-      yield* plugins.wait(id)
-    }),
-  )
-
-  it.effect("propagates plugin activation defects to waiters", () =>
-    Effect.gen(function* () {
-      const plugins = yield* PluginV2.Service
-      const id = PluginV2.ID.make("failed")
-      const waiting = yield* plugins.wait(id).pipe(Effect.exit, Effect.forkChild)
-
-      const added = yield* plugins.add(id, () => Effect.die("boom")).pipe(Effect.exit)
-      const pending = yield* Fiber.join(waiting)
-      const later = yield* plugins.wait(id).pipe(Effect.exit)
-
-      expect(Exit.isFailure(added)).toBe(true)
-      expect(Exit.isFailure(pending)).toBe(true)
-      expect(Exit.isFailure(later)).toBe(true)
-    }),
-  )
-
-  it.effect("adds, replaces, and removes plugins", () =>
+  it.effect("skips identical generations and replaces changed plugin IDs", () =>
     Effect.gen(function* () {
       const plugins = yield* PluginV2.Service
       const agents = yield* AgentV2.Service
       let description = "first"
 
-      const managed = () =>
+      const managed = (id: string) =>
         define({
-          id: "managed",
+          id,
           effect: (ctx) =>
             ctx.agent
               .transform((agents) =>
@@ -82,19 +56,101 @@ describe("PluginV2", () => {
               .pipe(Effect.asVoid),
         })
 
-      yield* plugins.add(PluginV2.ID.make("managed"), managed().effect)
+      yield* plugins.activate([managed("managed")])
 
       expect((yield* agents.get(AgentV2.ID.make("configured")))?.description).toBe("first")
 
       description = "second"
-      yield* plugins.add(PluginV2.ID.make("managed"), managed().effect)
+      yield* plugins.activate([managed("managed")])
+      expect((yield* agents.get(AgentV2.ID.make("configured")))?.description).toBe("first")
+
+      yield* plugins.activate([managed("managed-next")])
       expect((yield* agents.get(AgentV2.ID.make("configured")))?.description).toBe("second")
 
-      yield* plugins.remove(PluginV2.ID.make("managed"))
+      yield* plugins.activate([])
       expect(yield* agents.get(AgentV2.ID.make("configured"))).toBeUndefined()
     }),
   )
 
+  it.effect("rejects duplicate IDs before replacing the active generation", () =>
+    Effect.gen(function* () {
+      const plugins = yield* PluginV2.Service
+      const active = PluginV2.ID.make("active")
+      const duplicate = PluginV2.ID.make("duplicate")
+      yield* plugins.activate([{ id: active, effect: () => Effect.void }])
+
+      const result = yield* plugins
+        .activate([
+          { id: duplicate, effect: () => Effect.void },
+          { id: duplicate, effect: () => Effect.void },
+        ])
+        .pipe(Effect.exit)
+
+      expect(Exit.isFailure(result)).toBe(true)
+      expect(yield* plugins.list()).toEqual([{ id: active }])
+    }),
+  )
+
+  it.effect("retries the same generation after materialization fails", () =>
+    Effect.gen(function* () {
+      const plugins = yield* PluginV2.Service
+      let fail = true
+      const plugin = define({
+        id: "retry",
+        effect: (ctx) =>
+          ctx.agent
+            .transform(() => {
+              if (fail) throw new Error("materialization failed")
+            })
+            .pipe(Effect.asVoid),
+      })
+
+      expect(Exit.isFailure(yield* plugins.activate([plugin]).pipe(Effect.exit))).toBe(true)
+      fail = false
+      yield* plugins.activate([plugin])
+
+      expect(yield* plugins.list()).toEqual([{ id: PluginV2.ID.make("retry") }])
+    }),
+  )
+
+  it.effect("closes the previous generation in reverse order", () =>
+    Effect.gen(function* () {
+      const plugins = yield* PluginV2.Service
+      const closed: string[] = []
+      yield* plugins.activate(
+        ["first", "second"].map((id) => ({
+          id: PluginV2.ID.make(id),
+          effect: () => Effect.addFinalizer(() => Effect.sync(() => closed.push(id))),
+        })),
+      )
+
+      yield* plugins.activate([])
+
+      expect(closed).toEqual(["second", "first"])
+    }),
+  )
+
+  it.effect("isolates plugins from ambient services", () =>
+    Effect.gen(function* () {
+      const plugins = yield* PluginV2.Service
+      let visible = true
+      const plugin = define({
+        id: "isolated",
+        effect: () =>
+          Effect.serviceOption(Secret).pipe(
+            Effect.tap((secret) => Effect.sync(() => (visible = secret._tag === "Some"))),
+            Effect.asVoid,
+          ),
+      })
+
+      yield* plugins
+        .activate([{ id: PluginV2.ID.make(plugin.id), effect: plugin.effect }])
+        .pipe(Effect.provideService(Secret, "secret"))
+
+      expect(visible).toBe(false)
+    }),
+  )
+
   it.effect("registers location tools through the plugin context", () =>
     Effect.gen(function* () {
       const plugins = yield* PluginV2.Service
@@ -114,12 +170,12 @@ describe("PluginV2", () => {
             .pipe(Effect.orDie),
       })
 
-      yield* plugins.add(PluginV2.ID.make(plugin.id), plugin.effect)
+      yield* plugins.activate([{ id: PluginV2.ID.make(plugin.id), effect: plugin.effect }])
       expect((yield* registry.materialize({ model: testModel })).definitions.map((tool) => tool.name)).toContain(
         "plugin_tool",
       )
 
-      yield* plugins.remove(PluginV2.ID.make(plugin.id))
+      yield* plugins.activate([])
       expect((yield* registry.materialize({ model: testModel })).definitions.map((tool) => tool.name)).not.toContain(
         "plugin_tool",
       )
@@ -149,7 +205,7 @@ describe("PluginV2", () => {
           }),
       })
 
-      yield* plugins.add(PluginV2.ID.make(plugin.id), plugin.effect)
+      yield* plugins.activate([{ id: PluginV2.ID.make(plugin.id), effect: plugin.effect }])
 
       expect((yield* registry.materialize({ model: testModel })).definitions.map((tool) => tool.name)).toEqual([
         "plain",
@@ -201,7 +257,7 @@ describe("PluginV2", () => {
           }),
       })
 
-      yield* plugins.add(PluginV2.ID.make(plugin.id), plugin.effect)
+      yield* plugins.activate([{ id: PluginV2.ID.make(plugin.id), effect: plugin.effect }])
 
       const materialized = yield* registry.materialize({ model: testModel })
       const settlement = yield* materialized.settle({
diff --git a/packages/core/test/plugin/fixtures/failing-plugin.ts b/packages/core/test/plugin/fixtures/failing-plugin.ts
new file mode 100644
index 0000000000..4daac0acd0
--- /dev/null
+++ b/packages/core/test/plugin/fixtures/failing-plugin.ts
@@ -0,0 +1,7 @@
+import { define } from "@opencode-ai/plugin/v2/effect"
+import { Effect } from "effect"
+
+export default define({
+  id: "failing-plugin",
+  effect: () => Effect.die("plugin failed"),
+})
diff --git a/packages/core/test/plugin/fixtures/variant-source-plugin.ts b/packages/core/test/plugin/fixtures/variant-source-plugin.ts
new file mode 100644
index 0000000000..087a714227
--- /dev/null
+++ b/packages/core/test/plugin/fixtures/variant-source-plugin.ts
@@ -0,0 +1,29 @@
+import { define } from "@opencode-ai/plugin/v2/effect"
+import { Effect } from "effect"
+
+export default define({
+  id: "variant-source",
+  effect: (ctx) =>
+    ctx.catalog
+      .transform((catalog) => {
+        catalog.provider.update("configured", (provider) => {
+          provider.api = { type: "aisdk", package: "@ai-sdk/openai-compatible" }
+        })
+        catalog.model.update("configured", "glm-5.2", (model) => {
+          model.api = {
+            id: "glm-5.2",
+            type: "aisdk",
+            package: "@ai-sdk/openai-compatible",
+          }
+          model.variants = [
+            {
+              id: "high",
+              settings: {},
+              headers: { custom: "true" },
+              body: {},
+            },
+          ]
+        })
+      })
+      .pipe(Effect.asVoid),
+})
diff --git a/packages/core/test/plugin/host.ts b/packages/core/test/plugin/host.ts
index 63ac18e31e..8ef98c6530 100644
--- a/packages/core/test/plugin/host.ts
+++ b/packages/core/test/plugin/host.ts
@@ -59,8 +59,6 @@ export function host(overrides: Overrides = {}): PluginContext {
     },
     plugin: overrides.plugin ?? {
       list: () => Effect.die("unused plugin.list"),
-      add: () => Effect.die("unused plugin.add"),
-      remove: () => Effect.die("unused plugin.remove"),
     },
     reference: overrides.reference ?? {
       list: () => Effect.die("unused reference.list"),
diff --git a/packages/core/test/plugin/provider-kilo.test.ts b/packages/core/test/plugin/provider-kilo.test.ts
index b34ceb2d5b..bec50272ef 100644
--- a/packages/core/test/plugin/provider-kilo.test.ts
+++ b/packages/core/test/plugin/provider-kilo.test.ts
@@ -19,7 +19,9 @@ const addPlugin = Effect.fn(function* () {
 
 describe("KiloPlugin", () => {
   it.effect("is registered so legacy referer headers can be applied", () =>
-    Effect.sync(() => expect(ProviderPlugins.map((item) => item.id)).toContain(PluginV2.ID.make("kilo"))),
+    Effect.sync(() =>
+      expect(ProviderPlugins.map((item) => item.id)).toContain(PluginV2.ID.make("opencode.provider.kilo")),
+    ),
   )
 
   it.effect("applies legacy referer headers only to kilo", () =>
diff --git a/packages/core/test/plugin/provider-llmgateway.test.ts b/packages/core/test/plugin/provider-llmgateway.test.ts
index 5dce7cdcf7..8cc45c6027 100644
--- a/packages/core/test/plugin/provider-llmgateway.test.ts
+++ b/packages/core/test/plugin/provider-llmgateway.test.ts
@@ -21,7 +21,9 @@ const addPlugin = Effect.fn(function* () {
 
 describe("LLMGatewayPlugin", () => {
   it.effect("is registered so legacy referer headers can be applied", () =>
-    Effect.sync(() => expect(ProviderPlugins.map((item) => item.id)).toContain(PluginV2.ID.make("llmgateway"))),
+    Effect.sync(() =>
+      expect(ProviderPlugins.map((item) => item.id)).toContain(PluginV2.ID.make("opencode.provider.llmgateway")),
+    ),
   )
 
   it.effect("applies legacy referer headers only to enabled llmgateway", () =>
diff --git a/packages/core/test/plugin/provider-nvidia.test.ts b/packages/core/test/plugin/provider-nvidia.test.ts
index 260ffff689..baf763c8d1 100644
--- a/packages/core/test/plugin/provider-nvidia.test.ts
+++ b/packages/core/test/plugin/provider-nvidia.test.ts
@@ -19,7 +19,9 @@ const addPlugin = Effect.fn(function* () {
 
 describe("NvidiaPlugin", () => {
   it.effect("is registered so legacy referer headers can be applied", () =>
-    Effect.sync(() => expect(ProviderPlugins.map((item) => item.id)).toContain(PluginV2.ID.make("nvidia"))),
+    Effect.sync(() =>
+      expect(ProviderPlugins.map((item) => item.id)).toContain(PluginV2.ID.make("opencode.provider.nvidia")),
+    ),
   )
 
   it.effect("applies NVIDIA tracking headers only to nvidia", () =>
diff --git a/packages/core/test/plugin/provider-openrouter.test.ts b/packages/core/test/plugin/provider-openrouter.test.ts
index d611f40363..e0be8b5fa7 100644
--- a/packages/core/test/plugin/provider-openrouter.test.ts
+++ b/packages/core/test/plugin/provider-openrouter.test.ts
@@ -22,7 +22,9 @@ const addPlugin = Effect.fn(function* () {
 
 describe("OpenRouterPlugin", () => {
   it.effect("is registered so legacy OpenRouter behavior can be applied", () =>
-    Effect.sync(() => expect(ProviderPlugins.map((item) => item.id)).toContain(PluginV2.ID.make("openrouter"))),
+    Effect.sync(() =>
+      expect(ProviderPlugins.map((item) => item.id)).toContain(PluginV2.ID.make("opencode.provider.openrouter")),
+    ),
   )
 
   it.effect("applies legacy referer headers only to openrouter", () =>
diff --git a/packages/core/test/plugin/provider-snowflake-cortex.test.ts b/packages/core/test/plugin/provider-snowflake-cortex.test.ts
index cd67feb40e..a1265b6a8f 100644
--- a/packages/core/test/plugin/provider-snowflake-cortex.test.ts
+++ b/packages/core/test/plugin/provider-snowflake-cortex.test.ts
@@ -43,9 +43,11 @@ function withEnv<A, E, R>(vars: Record<string, string | undefined>, effect: () =
 describe("SnowflakeCortexPlugin", () => {
   it.effect("is registered in ProviderPlugins before OpenAICompatiblePlugin", () =>
     Effect.sync(() => {
-      expect(ProviderPlugins.map((item) => item.id)).toContain(PluginV2.ID.make("snowflake-cortex"))
+      expect(ProviderPlugins.map((item) => item.id)).toContain(PluginV2.ID.make("opencode.provider.snowflake-cortex"))
       const ids = ProviderPlugins.map((p) => p.id)
-      expect(ids.indexOf("snowflake-cortex")).toBeLessThan(ids.indexOf("openai-compatible"))
+      expect(ids.indexOf("opencode.provider.snowflake-cortex")).toBeLessThan(
+        ids.indexOf("opencode.provider.openai-compatible"),
+      )
     }),
   )
 
diff --git a/packages/core/test/plugin/provider-zenmux.test.ts b/packages/core/test/plugin/provider-zenmux.test.ts
index b9d34a1f5b..0ce286d612 100644
--- a/packages/core/test/plugin/provider-zenmux.test.ts
+++ b/packages/core/test/plugin/provider-zenmux.test.ts
@@ -24,7 +24,9 @@ function required<T>(value: T | undefined): T {
 
 describe("ZenmuxPlugin", () => {
   it.effect("is registered so legacy referer headers can be applied", () =>
-    Effect.sync(() => expect(ProviderPlugins.map((item) => item.id)).toContain(PluginV2.ID.make("zenmux"))),
+    Effect.sync(() =>
+      expect(ProviderPlugins.map((item) => item.id)).toContain(PluginV2.ID.make("opencode.provider.zenmux")),
+    ),
   )
 
   it.effect("applies the exact legacy Zenmux headers", () =>
diff --git a/packages/opencode/src/agent/agent.ts b/packages/opencode/src/agent/agent.ts
index 536a642fe4..cd0eb32f7c 100644
--- a/packages/opencode/src/agent/agent.ts
+++ b/packages/opencode/src/agent/agent.ts
@@ -29,8 +29,8 @@ import { ProviderV2 } from "@opencode-ai/core/provider"
 import { ModelV2 } from "@opencode-ai/core/model"
 import { LocationServiceMap, locationServiceMapLayer } from "@opencode-ai/core/location-services"
 import { Reference } from "@opencode-ai/core/reference"
+import { PluginSupervisor } from "@opencode-ai/core/plugin/supervisor"
 import { Location } from "@opencode-ai/core/location"
-import { PluginV2 } from "@opencode-ai/core/plugin"
 
 export const Info = Schema.Struct({
   name: Schema.String,
@@ -101,7 +101,7 @@ const layer = Layer.effect(
         const skillDirs = yield* skill.dirs()
         const referenceDirs = Object.keys(cfg.references ?? cfg.reference ?? {}).length
           ? yield* Effect.gen(function* () {
-              yield* (yield* PluginV2.Service).wait(PluginV2.ID.make("core/config-reference"))
+              yield* (yield* PluginSupervisor.Service).ready
               return (yield* (yield* Reference.Service).list()).map((reference) => reference.path)
             }).pipe(Effect.provide(locations.get(Location.Ref.make({ directory: AbsolutePath.make(ctx.directory) }))))
           : []
diff --git a/packages/plugin/src/v2/effect/plugin.ts b/packages/plugin/src/v2/effect/plugin.ts
index 77629bdfca..66f57caf60 100644
--- a/packages/plugin/src/v2/effect/plugin.ts
+++ b/packages/plugin/src/v2/effect/plugin.ts
@@ -11,7 +11,4 @@ export function define<R = Scope.Scope>(plugin: Plugin<R>) {
   return plugin
 }
 
-export interface PluginDomain extends PluginApi<unknown> {
-  readonly add: (plugin: Plugin) => Effect.Effect<void>
-  readonly remove: (id: string) => Effect.Effect<void>
-}
+export interface PluginDomain extends PluginApi<unknown> {}
diff --git a/packages/plugin/src/v2/promise/plugin.ts b/packages/plugin/src/v2/promise/plugin.ts
index afb6c16f0e..eb91b9df53 100644
--- a/packages/plugin/src/v2/promise/plugin.ts
+++ b/packages/plugin/src/v2/promise/plugin.ts
@@ -10,7 +10,4 @@ export function define(plugin: Plugin) {
   return plugin
 }
 
-export interface PluginDomain extends PluginApi {
-  readonly add: (plugin: Plugin) => Promise<void>
-  readonly remove: (id: string) => Promise<void>
-}
+export interface PluginDomain extends PluginApi {}

From c3d26c4912c1664d2371d5fc194cd667e8654f8a Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Sun, 5 Jul 2026 15:53:50 -0400
Subject: [PATCH 65/82] feat(core): improve runtime observability

---
 packages/cli/src/index.ts                     | 14 ++--
 packages/core/src/event-logger.ts             | 24 +++++++
 .../core/src/filesystem/location-watcher.ts   | 65 ++++++++++---------
 packages/core/src/snapshot.ts                 |  2 +-
 packages/core/test/event-logger.test.ts       | 45 +++++++++++++
 packages/server/src/routes.ts                 |  2 +
 6 files changed, 112 insertions(+), 40 deletions(-)
 create mode 100644 packages/core/src/event-logger.ts
 create mode 100644 packages/core/test/event-logger.test.ts

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index 64116b9b76..5514c3816e 100755
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -1,10 +1,10 @@
 #!/usr/bin/env bun
 
-import { NodeFileSystem, NodeRuntime, NodeServices } from "@effect/platform-node"
-import { Effect, Layer, Logger, References } from "effect"
+import { NodeRuntime, NodeServices } from "@effect/platform-node"
+import { Effect } from "effect"
 import { Commands } from "./commands/commands"
 import { Runtime } from "./framework/runtime"
-import { Logging } from "@opencode-ai/core/observability/logging"
+import { Observability } from "@opencode-ai/core/observability"
 import { Updater } from "./services/updater"
 import { InstallationChannel, InstallationVersion, InstallationLocal } from "@opencode-ai/core/installation/version"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
@@ -12,12 +12,6 @@ import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { Global } from "@opencode-ai/core/global"
 import { AppProcess } from "@opencode-ai/core/process"
 
-const LoggingLayer = Logger.layer(Logging.loggers(), { mergeWithExisting: false }).pipe(
-  Layer.provide(NodeFileSystem.layer),
-  Layer.orDie,
-  Layer.merge(Layer.succeed(References.MinimumLogLevel, Logging.minimumLogLevel())),
-)
-
 const Handlers = Runtime.handlers(Commands, {
   $: () => import("./commands/handlers/default"),
   api: () => import("./commands/handlers/api"),
@@ -53,7 +47,7 @@ Effect.logInfo("cli starting", {
   Effect.annotateLogs({ role: "cli" }),
   Effect.provide(Updater.layer),
   Effect.provide(AppNodeBuilder.build(LayerNode.group([Global.node, AppProcess.node]))),
-  Effect.provide(LoggingLayer),
+  Effect.provide(Observability.layer),
   Effect.provide(NodeServices.layer),
   Effect.scoped,
   Effect.tap(() => Effect.sync(() => process.exit(0))),
diff --git a/packages/core/src/event-logger.ts b/packages/core/src/event-logger.ts
new file mode 100644
index 0000000000..f07c96320e
--- /dev/null
+++ b/packages/core/src/event-logger.ts
@@ -0,0 +1,24 @@
+export * as EventLogger from "./event-logger"
+
+import { Effect, Layer } from "effect"
+import { makeGlobalNode } from "./effect/app-node"
+import { EventV2 } from "./event"
+
+const Types = new Set([
+  "agent.updated",
+  "catalog.updated",
+  "command.updated",
+  "config.updated",
+])
+
+export const layer = Layer.effectDiscard(
+  Effect.gen(function* () {
+    const events = yield* EventV2.Service
+    const unsubscribe = yield* events.listen((event) =>
+      Types.has(event.type) ? Effect.logInfo("event", { event }) : Effect.void,
+    )
+    yield* Effect.addFinalizer(() => unsubscribe)
+  }),
+)
+
+export const node = makeGlobalNode({ name: "event-logger", layer, deps: [EventV2.node] })
diff --git a/packages/core/src/filesystem/location-watcher.ts b/packages/core/src/filesystem/location-watcher.ts
index 1566d3d8ff..613b43b5f8 100644
--- a/packages/core/src/filesystem/location-watcher.ts
+++ b/packages/core/src/filesystem/location-watcher.ts
@@ -34,46 +34,53 @@ const layer = Layer.effect(
     const fs = yield* FSUtil.Service
     const git = yield* Git.Service
     const configService = yield* Config.Service
-    const config = (yield* configService.entries())
-      .filter((entry): entry is Config.Document => entry.type === "document")
-      .flatMap((item) => item.info.watcher?.ignore ?? [])
     const publish = (update: { type: "create" | "update" | "delete"; path: string }) =>
       events.publish(FileSystem.Event.Changed, {
         file: update.path,
         event: update.type === "create" ? "add" : update.type === "update" ? "change" : "unlink",
       })
 
-    if (path.resolve(location.directory) !== path.resolve(os.homedir())) {
-      yield* watcher
-        .subscribe({
-          path: location.directory,
-          type: "directory",
-          ignore: [...Ignore.PATTERNS, ...config, ...protecteds(location.directory)],
-        })
-        .pipe(Stream.runForEach(publish), Effect.forkScoped({ startImmediately: true }))
-    } else {
-      yield* Effect.logInfo("location watcher skipped home directory", { directory: location.directory })
-    }
+    yield* Effect.gen(function* () {
+      const config = (yield* configService.entries())
+        .filter((entry): entry is Config.Document => entry.type === "document")
+        .flatMap((item) => item.info.watcher?.ignore ?? [])
+      const home = path.resolve(location.directory) === path.resolve(os.homedir())
 
-    if (location.vcs?.type === "git") {
-      const resolved = (yield* git.repo.discover(location.directory))?.gitDirectory
-      const vcs = resolved ? yield* fs.realPath(resolved).pipe(Effect.catch(() => Effect.succeed(resolved))) : undefined
-      if (vcs && !config.includes(".git") && !config.includes(vcs) && (!resolved || !config.includes(resolved))) {
-        const ignore = (yield* fs.readDirectoryEntries(vcs).pipe(Effect.catch(() => Effect.succeed([])))).flatMap(
-          (entry) => (entry.name === "HEAD" ? [] : [entry.name]),
-        )
+      if (!home) {
         yield* watcher
-          .subscribe({ path: vcs, type: "directory", ignore })
-          .pipe(Stream.runForEach(publish), Effect.forkScoped({ startImmediately: true }))
+          .subscribe({
+            path: location.directory,
+            type: "directory",
+            ignore: [...Ignore.PATTERNS, ...config, ...protecteds(location.directory)],
+          })
+          .pipe(Stream.runForEach(publish), Effect.forkScoped)
       }
-    }
+      if (home) {
+        yield* Effect.logInfo("location watcher skipped home directory", { directory: location.directory })
+      }
+
+      if (location.vcs?.type === "git") {
+        const resolved = (yield* git.repo.discover(location.directory))?.gitDirectory
+        const vcs = resolved
+          ? yield* fs.realPath(resolved).pipe(Effect.catch(() => Effect.succeed(resolved)))
+          : undefined
+        if (vcs && !config.includes(".git") && !config.includes(vcs) && (!resolved || !config.includes(resolved))) {
+          const ignore = (yield* fs.readDirectoryEntries(vcs).pipe(Effect.catch(() => Effect.succeed([])))).flatMap(
+            (entry) => (entry.name === "HEAD" ? [] : [entry.name]),
+          )
+          yield* watcher
+            .subscribe({ path: vcs, type: "directory", ignore })
+            .pipe(Stream.runForEach(publish), Effect.forkScoped)
+        }
+      }
+    }).pipe(
+      Effect.withSpan("LocationWatcher.start", { attributes: { directory: location.directory } }),
+      Effect.catchCause((cause) => Effect.logError("failed to init location watcher service", { cause })),
+      Effect.forkScoped,
+    )
 
     return Service.of({})
-  }).pipe(
-    Effect.catchCause((cause) =>
-      Effect.logError("failed to init location watcher service", { cause }).pipe(Effect.as(Service.of({}))),
-    ),
-  ),
+  }),
 )
 
 export const node = makeLocationNode({
diff --git a/packages/core/src/snapshot.ts b/packages/core/src/snapshot.ts
index 79a2b6cda8..9843e69226 100644
--- a/packages/core/src/snapshot.ts
+++ b/packages/core/src/snapshot.ts
@@ -224,7 +224,7 @@ const layer = Layer.effect(
     })
 
     return Service.of({ capture, files, diff, preview, restore, checkout })
-  }),
+  }).pipe(Effect.withSpan("Snapshot.boot")),
 )
 
 export const node = makeLocationNode({
diff --git a/packages/core/test/event-logger.test.ts b/packages/core/test/event-logger.test.ts
new file mode 100644
index 0000000000..ef48d7abbd
--- /dev/null
+++ b/packages/core/test/event-logger.test.ts
@@ -0,0 +1,45 @@
+import { describe, expect, test } from "bun:test"
+import { Effect, Layer, Logger } from "effect"
+import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
+import { LayerNode } from "@opencode-ai/core/effect/layer-node"
+import { Database } from "@opencode-ai/core/database/database"
+import { EventV2 } from "@opencode-ai/core/event"
+import { EventLogger } from "@opencode-ai/core/event-logger"
+import { Agent } from "@opencode-ai/schema/agent"
+import { Catalog } from "@opencode-ai/schema/catalog"
+import { Command } from "@opencode-ai/schema/command"
+import { Config } from "@opencode-ai/schema/config"
+import { McpEvent } from "@opencode-ai/schema/mcp-event"
+
+const UnlistedUpdated = EventV2.ephemeral({ type: "test.updated", schema: {} })
+
+describe("EventLogger", () => {
+  test("logs explicitly listed updated events", async () => {
+    const output = new Array<ReturnType<typeof Logger.formatStructured.log>>()
+    const logger = Logger.map(Logger.formatStructured, (entry) => {
+      output.push(entry)
+    })
+
+    await Effect.gen(function* () {
+      const events = yield* EventV2.Service
+      yield* events.publish(Agent.Event.Updated, {})
+      yield* events.publish(Catalog.Event.Updated, {})
+      yield* events.publish(Command.Event.Updated, {})
+      yield* events.publish(Config.Event.Updated, {})
+      yield* events.publish(McpEvent.StatusChanged, { server: "example" })
+      yield* events.publish(UnlistedUpdated, {})
+    }).pipe(
+      Effect.provide(AppNodeBuilder.build(LayerNode.group([Database.node, EventV2.node, EventLogger.node]))),
+      Effect.provide(Logger.layer([logger])),
+      Effect.scoped,
+      Effect.runPromise,
+    )
+
+    expect(output.map((entry) => entry.message)).toEqual([
+      ["event", { event: expect.objectContaining({ type: "agent.updated" }) }],
+      ["event", { event: expect.objectContaining({ type: "catalog.updated" }) }],
+      ["event", { event: expect.objectContaining({ type: "command.updated" }) }],
+      ["event", { event: expect.objectContaining({ type: "config.updated" }) }],
+    ])
+  })
+})
diff --git a/packages/server/src/routes.ts b/packages/server/src/routes.ts
index c5e43989d0..da63120bd8 100644
--- a/packages/server/src/routes.ts
+++ b/packages/server/src/routes.ts
@@ -3,6 +3,7 @@ import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { httpClient } from "@opencode-ai/core/effect/app-node-platform"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { EventV2 } from "@opencode-ai/core/event"
+import { EventLogger } from "@opencode-ai/core/event-logger"
 import { Credential } from "@opencode-ai/core/credential"
 import { PermissionSaved } from "@opencode-ai/core/permission/saved"
 import { PtyTicket } from "@opencode-ai/core/pty/ticket"
@@ -31,6 +32,7 @@ import { sessionLocationLayer } from "./middleware/session-location"
 const applicationServices = LayerNode.group([
   Database.node,
   EventV2.node,
+  EventLogger.node,
   httpClient,
   ToolOutputStore.cleanupNode,
   Job.node,

From a75978815a234c93c1049b78a695f93dc98c14db Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Sun, 5 Jul 2026 15:58:43 -0400
Subject: [PATCH 66/82] feat(server): add loaded locations debug endpoint

---
 packages/client/src/effect/api/api.ts         |  8 +++++
 .../client/src/effect/generated/client.ts     |  6 ++++
 .../client/src/promise/generated/client.ts    | 14 +++++++++
 .../client/src/promise/generated/types.ts     |  2 ++
 packages/client/test/promise.test.ts          |  2 ++
 packages/protocol/src/api.ts                  |  3 ++
 packages/protocol/src/client.ts               |  1 +
 packages/protocol/src/groups/debug.ts         | 15 ++++++++++
 packages/sdk/js/src/v2/gen/sdk.gen.ts         | 21 ++++++++++++++
 packages/sdk/js/src/v2/gen/types.gen.ts       | 29 +++++++++++++++++++
 packages/server/src/handlers.ts               |  2 ++
 packages/server/src/handlers/debug.ts         | 14 +++++++++
 packages/server/src/routes.ts                 |  2 +-
 13 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 packages/protocol/src/groups/debug.ts
 create mode 100644 packages/server/src/handlers/debug.ts

diff --git a/packages/client/src/effect/api/api.ts b/packages/client/src/effect/api/api.ts
index 3f4c852be1..866747dafa 100644
--- a/packages/client/src/effect/api/api.ts
+++ b/packages/client/src/effect/api/api.ts
@@ -862,6 +862,13 @@ export interface VcsApi<E = never> {
   readonly diff: VcsDiffOperation<E>
 }
 
+export type Endpoint25_0Output = EffectValue<ReturnType<RawClient["server.debug"]["debug.location"]>>
+export type DebugLocationOperation<E = never> = () => Effect.Effect<Endpoint25_0Output, E>
+
+export interface DebugApi<E = never> {
+  readonly location: DebugLocationOperation<E>
+}
+
 export interface AppApi<E = never> {
   readonly health: HealthApi<E>
   readonly location: LocationApi<E>
@@ -888,4 +895,5 @@ export interface AppApi<E = never> {
   readonly reference: ReferenceApi<E>
   readonly projectCopy: ProjectCopyApi<E>
   readonly vcs: VcsApi<E>
+  readonly debug: DebugApi<E>
 }
diff --git a/packages/client/src/effect/generated/client.ts b/packages/client/src/effect/generated/client.ts
index a9a91eb8c6..2a253cf016 100644
--- a/packages/client/src/effect/generated/client.ts
+++ b/packages/client/src/effect/generated/client.ts
@@ -1043,6 +1043,11 @@ const Endpoint24_1 = (raw: RawClient["server.vcs"]) => (input: Endpoint24_1Input
 
 const adaptGroup24 = (raw: RawClient["server.vcs"]) => ({ status: Endpoint24_0(raw), diff: Endpoint24_1(raw) })
 
+const Endpoint25_0 = (raw: RawClient["server.debug"]) => () =>
+  raw["debug.location"]({}).pipe(Effect.mapError(mapClientError))
+
+const adaptGroup25 = (raw: RawClient["server.debug"]) => ({ location: Endpoint25_0(raw) })
+
 const adaptClient = (raw: RawClient) => ({
   health: adaptGroup0(raw["server.health"]),
   location: adaptGroup1(raw["server.location"]),
@@ -1069,6 +1074,7 @@ const adaptClient = (raw: RawClient) => ({
   reference: adaptGroup22(raw["server.reference"]),
   projectCopy: adaptGroup23(raw["server.projectCopy"]),
   vcs: adaptGroup24(raw["server.vcs"]),
+  debug: adaptGroup25(raw["server.debug"]),
 })
 
 export const make = (options?: { readonly baseUrl?: URL | string }) =>
diff --git a/packages/client/src/promise/generated/client.ts b/packages/client/src/promise/generated/client.ts
index 79368764c7..f5fe29506e 100644
--- a/packages/client/src/promise/generated/client.ts
+++ b/packages/client/src/promise/generated/client.ts
@@ -173,6 +173,7 @@ import type {
   VcsStatusOutput,
   VcsDiffInput,
   VcsDiffOutput,
+  DebugLocationOutput,
 } from "./types"
 import { ClientError } from "./client-error"
 
@@ -1448,6 +1449,19 @@ export function make(options: ClientOptions) {
           requestOptions,
         ),
     },
+    debug: {
+      location: (requestOptions?: RequestOptions) =>
+        request<DebugLocationOutput>(
+          {
+            method: "GET",
+            path: `/api/debug/location`,
+            successStatus: 200,
+            declaredStatuses: [401, 400],
+            empty: false,
+          },
+          requestOptions,
+        ),
+    },
   }
 }
 
diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts
index 151f0ff03f..c4ed970247 100644
--- a/packages/client/src/promise/generated/types.ts
+++ b/packages/client/src/promise/generated/types.ts
@@ -6003,3 +6003,5 @@ export type VcsDiffOutput = {
     readonly status?: "added" | "deleted" | "modified"
   }>
 }
+
+export type DebugLocationOutput = ReadonlyArray<{ readonly directory: string; readonly workspaceID?: string }>
diff --git a/packages/client/test/promise.test.ts b/packages/client/test/promise.test.ts
index d445a69c08..2dbd58a858 100644
--- a/packages/client/test/promise.test.ts
+++ b/packages/client/test/promise.test.ts
@@ -30,7 +30,9 @@ test("exposes every standard HTTP API group", () => {
     "reference",
     "projectCopy",
     "vcs",
+    "debug",
   ])
+  expect(Object.keys(client.debug)).toEqual(["location"])
   expect(Object.keys(client.message)).toEqual(["list"])
   expect(Object.keys(client.integration)).toEqual([
     "list",
diff --git a/packages/protocol/src/api.ts b/packages/protocol/src/api.ts
index 04d60888d7..2f91fae332 100644
--- a/packages/protocol/src/api.ts
+++ b/packages/protocol/src/api.ts
@@ -16,6 +16,7 @@ import type { Definition } from "@opencode-ai/schema/event"
 import { AgentGroup } from "./groups/agent.js"
 import { PluginGroup } from "./groups/plugin.js"
 import { HealthGroup } from "./groups/health.js"
+import { DebugGroup } from "./groups/debug.js"
 import { PtyGroup } from "./groups/pty.js"
 import { ShellGroup } from "./groups/shell.js"
 import { makeQuestionGroup } from "./groups/question.js"
@@ -81,6 +82,7 @@ type ApiGroups<
   Event extends HttpApiGroup.Any,
 > =
   | typeof HealthGroup
+  | typeof DebugGroup
   | LocationGroups<LocationId>
   | FormGroups<LocationId, LocationService, FormLocationId, FormLocationService>
   | SessionGroups<SessionLocationId, SessionLocationService>
@@ -165,6 +167,7 @@ const makeApiFromGroup = <
     .add(ReferenceGroup.middleware(locationMiddleware))
     .add(ProjectCopyGroup.middleware(locationMiddleware))
     .add(VcsGroup.middleware(locationMiddleware))
+    .add(DebugGroup)
     .annotateMerge(
       OpenApi.annotations({
         title: "opencode HttpApi",
diff --git a/packages/protocol/src/client.ts b/packages/protocol/src/client.ts
index 3976289ed9..3d2993a02b 100644
--- a/packages/protocol/src/client.ts
+++ b/packages/protocol/src/client.ts
@@ -34,6 +34,7 @@ export const ClientApi: ClientApiShape = makeDefaultApi({
 
 export const groupNames = {
   "server.health": "health",
+  "server.debug": "debug",
   "server.location": "location",
   "server.agent": "agent",
   "server.plugin": "plugin",
diff --git a/packages/protocol/src/groups/debug.ts b/packages/protocol/src/groups/debug.ts
new file mode 100644
index 0000000000..f41b02b864
--- /dev/null
+++ b/packages/protocol/src/groups/debug.ts
@@ -0,0 +1,15 @@
+import { Location } from "@opencode-ai/schema/location"
+import { Schema } from "effect"
+import { HttpApiEndpoint, HttpApiGroup, OpenApi } from "effect/unstable/httpapi"
+
+export const DebugGroup = HttpApiGroup.make("server.debug").add(
+  HttpApiEndpoint.get("debug.location", "/api/debug/location", {
+    success: Schema.Array(Location.Ref),
+  }).annotateMerge(
+    OpenApi.annotations({
+      identifier: "v2.debug.location",
+      summary: "List loaded locations",
+      description: "List locations currently loaded by the server.",
+    }),
+  ),
+)
diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts
index ae8318d78e..59484dddfb 100644
--- a/packages/sdk/js/src/v2/gen/sdk.gen.ts
+++ b/packages/sdk/js/src/v2/gen/sdk.gen.ts
@@ -276,6 +276,8 @@ import type {
   V2CredentialRemoveResponses,
   V2CredentialUpdateErrors,
   V2CredentialUpdateResponses,
+  V2DebugLocationErrors,
+  V2DebugLocationResponses,
   V2EventChangesErrors,
   V2EventChangesResponses,
   V2EventSubscribeErrors,
@@ -8036,6 +8038,20 @@ export class Vcs2 extends HeyApiClient {
   }
 }
 
+export class Debug extends HeyApiClient {
+  /**
+   * List loaded locations
+   *
+   * List locations currently loaded by the server.
+   */
+  public location<ThrowOnError extends boolean = false>(options?: Options<never, ThrowOnError>) {
+    return (options?.client ?? this.client).get<V2DebugLocationResponses, V2DebugLocationErrors, ThrowOnError>({
+      url: "/api/debug/location",
+      ...options,
+    })
+  }
+}
+
 export class V2 extends HeyApiClient {
   private _health?: Health
   get health(): Health {
@@ -8156,6 +8172,11 @@ export class V2 extends HeyApiClient {
   get vcs(): Vcs2 {
     return (this._vcs ??= new Vcs2({ client: this.client }))
   }
+
+  private _debug?: Debug
+  get debug(): Debug {
+    return (this._debug ??= new Debug({ client: this.client }))
+  }
 }
 
 export class OpencodeClient extends HeyApiClient {
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index 2b6e1d031f..6db6b405b8 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -19054,6 +19054,35 @@ export type V2VcsDiffResponses = {
 
 export type V2VcsDiffResponse = V2VcsDiffResponses[keyof V2VcsDiffResponses]
 
+export type V2DebugLocationData = {
+  body?: never
+  path?: never
+  query?: never
+  url: "/api/debug/location"
+}
+
+export type V2DebugLocationErrors = {
+  /**
+   * InvalidRequestError
+   */
+  400: InvalidRequestErrorV2
+  /**
+   * UnauthorizedError
+   */
+  401: UnauthorizedErrorV2
+}
+
+export type V2DebugLocationError = V2DebugLocationErrors[keyof V2DebugLocationErrors]
+
+export type V2DebugLocationResponses = {
+  /**
+   * Success
+   */
+  200: Array<LocationRef2>
+}
+
+export type V2DebugLocationResponse = V2DebugLocationResponses[keyof V2DebugLocationResponses]
+
 export type PtyConnectData = {
   body?: never
   path: {
diff --git a/packages/server/src/handlers.ts b/packages/server/src/handlers.ts
index bfae813372..896cbbc592 100644
--- a/packages/server/src/handlers.ts
+++ b/packages/server/src/handlers.ts
@@ -13,6 +13,7 @@ import { EventHandler } from "./handlers/event"
 import { AgentHandler } from "./handlers/agent"
 import { PluginHandler } from "./handlers/plugin"
 import { HealthHandler } from "./handlers/health"
+import { DebugHandler } from "./handlers/debug"
 import { PtyHandler } from "./handlers/pty"
 import { ShellHandler } from "./handlers/shell"
 import { QuestionHandler } from "./handlers/question"
@@ -27,6 +28,7 @@ import { VcsHandler } from "./handlers/vcs"
 
 export const handlers = Layer.mergeAll(
   HealthHandler,
+  DebugHandler,
   LocationHandler,
   AgentHandler,
   PluginHandler,
diff --git a/packages/server/src/handlers/debug.ts b/packages/server/src/handlers/debug.ts
new file mode 100644
index 0000000000..f5ffd536e4
--- /dev/null
+++ b/packages/server/src/handlers/debug.ts
@@ -0,0 +1,14 @@
+import { LocationServiceMap } from "@opencode-ai/core/location-service-map"
+import { Effect, Option, RcMap } from "effect"
+import { HttpApiBuilder } from "effect/unstable/httpapi"
+import { Api } from "../api"
+
+export const DebugHandler = HttpApiBuilder.group(Api, "server.debug", (handlers) =>
+  handlers.handle(
+    "debug.location",
+    Effect.fn(function* () {
+      const locations = Option.getOrThrow(yield* Effect.serviceOption(LocationServiceMap.Service))
+      return Array.from(yield* RcMap.keys(locations.rcMap))
+    }),
+  ),
+)
diff --git a/packages/server/src/routes.ts b/packages/server/src/routes.ts
index da63120bd8..f5e616392f 100644
--- a/packages/server/src/routes.ts
+++ b/packages/server/src/routes.ts
@@ -83,7 +83,7 @@ function makeRoutes<AuthError, AuthServices>(
     : AppNodeBuilder.build(applicationServices, replacements)
 
   return HttpApiBuilder.layer(Api, { openapiPath: "/openapi.json" }).pipe(
-    Layer.provide(handlers),
+    Layer.provide(handlers.pipe(Layer.provide(serviceLayer))),
     Layer.provide(formLocationLayer),
     Layer.provide(sessionLocationLayer),
     Layer.provide(layer),

From baacb2e7769cb849790ee435e048672e7e771448 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Sun, 5 Jul 2026 16:14:02 -0400
Subject: [PATCH 67/82] fix(core): tolerate invalid OTLP configuration

---
 packages/core/src/observability.ts            |  8 ++++-
 .../core/test/effect/observability.test.ts    | 36 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/observability.ts b/packages/core/src/observability.ts
index 22285974d8..e99d8919d2 100644
--- a/packages/core/src/observability.ts
+++ b/packages/core/src/observability.ts
@@ -8,6 +8,12 @@ import { OtlpSerialization } from "effect/unstable/observability"
 import { Logging } from "./observability/logging"
 import { Otlp } from "./observability/otlp"
 
+const local = Logger.layer(Logging.loggers(), { mergeWithExisting: false }).pipe(
+  Layer.provide(NodeFileSystem.layer),
+  Layer.orDie,
+  Layer.merge(Layer.succeed(References.MinimumLogLevel, Logging.minimumLogLevel())),
+)
+
 export const layer = Layer.unwrap(
   Effect.gen(function* () {
     const logs = Logger.layer([...Logging.loggers(), ...Otlp.loggers()], { mergeWithExisting: false }).pipe(
@@ -19,6 +25,6 @@ export const layer = Layer.unwrap(
     )
     return Layer.merge(logs, yield* Effect.promise(Otlp.tracingLayer))
   }),
-)
+).pipe(Layer.catchCause(() => local))
 
 export const node = LayerNode.make({ name: "observability", layer, deps: [] })
diff --git a/packages/core/test/effect/observability.test.ts b/packages/core/test/effect/observability.test.ts
index 4758563f28..c075986364 100644
--- a/packages/core/test/effect/observability.test.ts
+++ b/packages/core/test/effect/observability.test.ts
@@ -52,6 +52,42 @@ describe("resource", () => {
   })
 })
 
+test("falls back to local logging when OTLP initialization fails", async () => {
+  const dir = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-observability-test-"))
+  await using _ = {
+    async [Symbol.asyncDispose]() {
+      await fs.rm(dir, { recursive: true, force: true })
+    },
+  }
+  const child = Bun.spawn(
+    [
+      process.execPath,
+      "--eval",
+      `
+        import { Effect } from "effect"
+        import { Observability } from "./src/observability.ts"
+        await Effect.void.pipe(Effect.provide(Observability.layer), Effect.scoped, Effect.runPromise)
+      `,
+    ],
+    {
+      cwd: path.join(import.meta.dir, "../.."),
+      env: {
+        ...process.env,
+        OTEL_EXPORTER_OTLP_ENDPOINT: "://invalid",
+        XDG_CACHE_HOME: path.join(dir, "cache"),
+        XDG_CONFIG_HOME: path.join(dir, "config"),
+        XDG_DATA_HOME: path.join(dir, "data"),
+        XDG_STATE_HOME: path.join(dir, "state"),
+      },
+      stdout: "ignore",
+      stderr: "pipe",
+    },
+  )
+  const [exitCode, stderr] = await Promise.all([child.exited, new Response(child.stderr).text()])
+
+  expect({ exitCode, stderr }).toEqual({ exitCode: 0, stderr: "" })
+})
+
 test("file logger appends concurrent runs with a run on every line", async () => {
   const dir = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-log-test-"))
   await using _ = {

From 08741f6b9357f37948295b9c6f1a42923b3eeab1 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Sun, 5 Jul 2026 16:22:04 -0400
Subject: [PATCH 68/82] fix(core): scope observability to server

---
 packages/cli/src/index.ts     | 14 ++++++++++----
 packages/server/src/routes.ts |  2 ++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index 5514c3816e..64116b9b76 100755
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -1,10 +1,10 @@
 #!/usr/bin/env bun
 
-import { NodeRuntime, NodeServices } from "@effect/platform-node"
-import { Effect } from "effect"
+import { NodeFileSystem, NodeRuntime, NodeServices } from "@effect/platform-node"
+import { Effect, Layer, Logger, References } from "effect"
 import { Commands } from "./commands/commands"
 import { Runtime } from "./framework/runtime"
-import { Observability } from "@opencode-ai/core/observability"
+import { Logging } from "@opencode-ai/core/observability/logging"
 import { Updater } from "./services/updater"
 import { InstallationChannel, InstallationVersion, InstallationLocal } from "@opencode-ai/core/installation/version"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
@@ -12,6 +12,12 @@ import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { Global } from "@opencode-ai/core/global"
 import { AppProcess } from "@opencode-ai/core/process"
 
+const LoggingLayer = Logger.layer(Logging.loggers(), { mergeWithExisting: false }).pipe(
+  Layer.provide(NodeFileSystem.layer),
+  Layer.orDie,
+  Layer.merge(Layer.succeed(References.MinimumLogLevel, Logging.minimumLogLevel())),
+)
+
 const Handlers = Runtime.handlers(Commands, {
   $: () => import("./commands/handlers/default"),
   api: () => import("./commands/handlers/api"),
@@ -47,7 +53,7 @@ Effect.logInfo("cli starting", {
   Effect.annotateLogs({ role: "cli" }),
   Effect.provide(Updater.layer),
   Effect.provide(AppNodeBuilder.build(LayerNode.group([Global.node, AppProcess.node]))),
-  Effect.provide(Observability.layer),
+  Effect.provide(LoggingLayer),
   Effect.provide(NodeServices.layer),
   Effect.scoped,
   Effect.tap(() => Effect.sync(() => process.exit(0))),
diff --git a/packages/server/src/routes.ts b/packages/server/src/routes.ts
index f5e616392f..606fde0b84 100644
--- a/packages/server/src/routes.ts
+++ b/packages/server/src/routes.ts
@@ -4,6 +4,7 @@ import { httpClient } from "@opencode-ai/core/effect/app-node-platform"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { EventV2 } from "@opencode-ai/core/event"
 import { EventLogger } from "@opencode-ai/core/event-logger"
+import { Observability } from "@opencode-ai/core/observability"
 import { Credential } from "@opencode-ai/core/credential"
 import { PermissionSaved } from "@opencode-ai/core/permission/saved"
 import { PtyTicket } from "@opencode-ai/core/pty/ticket"
@@ -91,6 +92,7 @@ function makeRoutes<AuthError, AuthServices>(
     Layer.provide(schemaErrorLayer),
     Layer.provide(auth),
     Layer.provide(serviceLayer),
+    Layer.provide(Observability.layer),
   )
 }
 

From 6ffecf9345bff67fed2dff22173fc88700bd1721 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Sun, 5 Jul 2026 16:54:17 -0400
Subject: [PATCH 69/82] fix(core): reload local plugins on file changes

---
 packages/core/src/plugin.ts                   | 36 +++++----
 packages/core/src/plugin/supervisor.ts        | 51 ++++++++----
 packages/core/test/config/plugin.test.ts      | 77 ++++++++++++++++++-
 packages/core/test/location-layer.test.ts     |  5 +-
 packages/core/test/plugin.test.ts             | 45 +++++------
 .../core/test/plugin/provider-kilo.test.ts    |  4 +-
 .../test/plugin/provider-llmgateway.test.ts   |  4 +-
 .../core/test/plugin/provider-nvidia.test.ts  |  4 +-
 .../test/plugin/provider-openrouter.test.ts   |  4 +-
 .../plugin/provider-snowflake-cortex.test.ts  |  2 +-
 .../core/test/plugin/provider-zenmux.test.ts  |  4 +-
 packages/core/test/shared-schema.test.ts      |  4 -
 12 files changed, 164 insertions(+), 76 deletions(-)

diff --git a/packages/core/src/plugin.ts b/packages/core/src/plugin.ts
index 8ffdf93ba1..1b57d9fc5e 100644
--- a/packages/core/src/plugin.ts
+++ b/packages/core/src/plugin.ts
@@ -1,8 +1,9 @@
 export * as PluginV2 from "./plugin"
 
+import type { Plugin } from "@opencode-ai/plugin/v2/effect"
+import { Event, ID, type Info } from "@opencode-ai/schema/plugin"
 import { makeLocationNode } from "./effect/app-node"
 import { Context, Effect, Exit, Layer, Scope, Semaphore } from "effect"
-import { Plugin } from "@opencode-ai/schema/plugin"
 import { AgentV2 } from "./agent"
 import { AISDK } from "./aisdk"
 import { Catalog } from "./catalog"
@@ -18,14 +19,8 @@ import { State } from "./state"
 import { ToolRegistry } from "./tool/registry"
 import { ToolHooks } from "./tool/hooks"
 
-export const ID = Plugin.ID
-export type ID = typeof ID.Type
-export const Info = Plugin.Info
-export type Info = Plugin.Info
-export const Event = Plugin.Event
-
 export interface Interface {
-  readonly activate: (plugins: readonly import("@opencode-ai/plugin/v2/effect").Plugin[]) => Effect.Effect<void>
+  readonly activate: (plugins: readonly { readonly plugin: Plugin; readonly version?: string }[]) => Effect.Effect<void>
   readonly list: () => Effect.Effect<Info[]>
 }
 
@@ -36,16 +31,20 @@ const layer = Layer.effect(
   Effect.gen(function* () {
     const events = yield* EventV2.Service
     const scope = yield* Scope.make()
-    const active = new Map<ID, Scope.Closeable>()
+    const active = new Map<typeof ID.Type, Scope.Closeable>()
     const lock = Semaphore.makeUnsafe(1)
-    let generation: readonly ID[] | undefined = []
-    let host: Parameters<import("@opencode-ai/plugin/v2/effect").Plugin["effect"]>[0]
+    let generation: readonly { readonly id: typeof ID.Type; readonly version?: string }[] | undefined = []
+    let host: Parameters<Plugin["effect"]>[0]
 
     const activate = Effect.fn("Plugin.activate")(function* (
-      plugins: readonly import("@opencode-ai/plugin/v2/effect").Plugin[],
+      plugins: readonly { readonly plugin: Plugin; readonly version?: string }[],
     ) {
-      const definitions = plugins.map((plugin) => ({ ...plugin, id: ID.make(plugin.id) }))
-      const ids = new Set<ID>()
+      const definitions = plugins.map((entry) => ({
+        ...entry.plugin,
+        id: ID.make(entry.plugin.id),
+        ...(entry.version === undefined ? {} : { version: entry.version }),
+      }))
+      const ids = new Set<typeof ID.Type>()
       for (const definition of definitions) {
         if (ids.has(definition.id)) return yield* Effect.die(new Error(`Duplicate plugin ID: ${definition.id}`))
         ids.add(definition.id)
@@ -56,7 +55,9 @@ const layer = Layer.effect(
           if (
             generation !== undefined &&
             generation.length === definitions.length &&
-            generation.every((id, index) => id === definitions[index]?.id)
+            generation.every(
+              (plugin, index) => plugin.id === definitions[index]?.id && plugin.version === definitions[index]?.version,
+            )
           ) {
             return
           }
@@ -87,7 +88,10 @@ const layer = Layer.effect(
             }),
           )
           if (Exit.isFailure(exit)) return yield* exit
-          generation = definitions.map((definition) => definition.id)
+          generation = definitions.map((definition) => ({
+            id: definition.id,
+            ...(definition.version === undefined ? {} : { version: definition.version }),
+          }))
         }),
       )
     })
diff --git a/packages/core/src/plugin/supervisor.ts b/packages/core/src/plugin/supervisor.ts
index 19410e5001..4d648a7d6f 100644
--- a/packages/core/src/plugin/supervisor.ts
+++ b/packages/core/src/plugin/supervisor.ts
@@ -2,7 +2,7 @@ export * as PluginSupervisor from "./supervisor"
 
 import type { Plugin } from "@opencode-ai/plugin/v2/effect"
 import { Event } from "@opencode-ai/schema/config"
-import { Context, Effect, Fiber, Layer, Schema, Semaphore, Stream } from "effect"
+import { Context, Effect, Fiber, Layer, Option, Schema, Semaphore, Stream } from "effect"
 import path from "path"
 import { fileURLToPath, pathToFileURL } from "url"
 import { Config } from "../config"
@@ -42,6 +42,7 @@ type Operation =
       readonly type: "add"
       readonly target: string
       readonly options: Record<string, unknown>
+      readonly mtime?: number
     }
   | {
       readonly type: "remove"
@@ -57,6 +58,7 @@ type Candidate =
       readonly type: "package"
       readonly specifier: string
       readonly options: Record<string, unknown>
+      readonly mtime?: number
     }
 
 type ConfiguredPackage = {
@@ -94,7 +96,16 @@ const scan = Effect.fn("PluginSupervisor.scan")(function* (entries: readonly Con
       }),
     )
   // Explicit config is applied last so it can remove auto-discovered packages.
-  return [...discovered, ...configured]
+  return yield* Effect.forEach([...discovered, ...configured], (operation) => {
+    if (operation.type === "remove" || !path.isAbsolute(operation.target)) return Effect.succeed(operation)
+    return fs.stat(operation.target).pipe(
+      Effect.map((info) => ({
+        ...operation,
+        mtime: Option.getOrElse(info.mtime, () => new Date(0)).getTime(),
+      })),
+      Effect.catch(() => Effect.succeed(operation)),
+    )
+  })
 })
 
 const resolve = Effect.fn("PluginSupervisor.resolve")(function* (
@@ -143,7 +154,16 @@ function apply(pre: readonly Plugin[], post: readonly Plugin[], operations: read
     enabled.has(definition.id) ? [{ type: "definition", definition }] : [],
   )
   const configured: Candidate[] = Array.from(packages.values()).flatMap((item) =>
-    item.enabled ? [{ type: "package", specifier: item.operation.target, options: item.operation.options }] : [],
+    item.enabled
+      ? [
+          {
+            type: "package",
+            specifier: item.operation.target,
+            options: item.operation.options,
+            ...(item.operation.mtime === undefined ? {} : { mtime: item.operation.mtime }),
+          },
+        ]
+      : [],
   )
   const posts: Candidate[] = post.flatMap((definition) =>
     enabled.has(definition.id) ? [{ type: "definition", definition }] : [],
@@ -153,21 +173,29 @@ function apply(pre: readonly Plugin[], post: readonly Plugin[], operations: read
 
 const load = Effect.fn("PluginSupervisor.load")(function* (plan: readonly Candidate[]) {
   return yield* Effect.forEach(plan, (candidate) => {
-    if (candidate.type === "definition") return Effect.succeed(candidate.definition)
+    if (candidate.type === "definition") return Effect.succeed({ plugin: candidate.definition })
     return Effect.gen(function* () {
       const npm = yield* Npm.Service
       const entrypoint = path.isAbsolute(candidate.specifier)
         ? pathToFileURL(candidate.specifier).href
         : (yield* npm.add(candidate.specifier)).entrypoint
       if (!entrypoint) return
-      yield* Effect.log({ msg: "loading plugin", id: candidate.specifier, entrypoint })
-      const mod = yield* Effect.promise(() => import(entrypoint))
+      // Bun currently ignores query parameters when caching file:// imports.
+      const source =
+        candidate.mtime === undefined
+          ? entrypoint
+          : `${candidate.specifier.replaceAll("\\", "/")}?mtime=${candidate.mtime}`
+      yield* Effect.log({ msg: "loading plugin", id: candidate.specifier, entrypoint: source })
+      const mod = yield* Effect.promise(() => import(source))
       const value = (yield* Schema.decodeUnknownEffect(PluginModule)(mod)).default
       const plugin = "effect" in value ? value : PluginPromise.fromPromise(value)
       return {
-        id: plugin.id,
-        effect: (host) => plugin.effect({ ...host, options: candidate.options }),
-      } satisfies Plugin
+        plugin: {
+          id: plugin.id,
+          effect: (host) => plugin.effect({ ...host, options: candidate.options }),
+        } satisfies Plugin,
+        ...(candidate.mtime === undefined ? {} : { version: String(candidate.mtime) }),
+      }
     }).pipe(Effect.catchCause(() => Effect.succeed(undefined)))
   }).pipe(Effect.map((plugins) => plugins.filter((plugin) => plugin !== undefined)))
 })
@@ -231,7 +259,6 @@ const layer = Layer.effect(
     const config = yield* Config.Service
     const events = yield* EventV2.Service
     const lock = Semaphore.makeUnsafe(1)
-    let applied: string | undefined
     const reload = Effect.fn("PluginSupervisor.reload")(() =>
       lock.withPermit(
         Effect.gen(function* () {
@@ -241,15 +268,11 @@ const layer = Layer.effect(
           const pre = [...internal.pre, ...sdk.all()]
           // Read the current layered config before resolving plugin directives and packages.
           const entries = yield* config.entries()
-          // Skip duplicate watcher notifications and config edits unrelated to plugins.
           const operations = yield* scan(entries)
-          const version = JSON.stringify(operations)
-          if (version === applied) return
           // Apply config operations and load enabled package plugins into one ordered generation.
           const plugins = yield* resolve(pre, internal.post, operations)
           // Replace the active generation in one scoped, batched activation.
           yield* registry.activate(plugins)
-          applied = version
         }),
       ),
     )
diff --git a/packages/core/test/config/plugin.test.ts b/packages/core/test/config/plugin.test.ts
index c3c84d8101..34a69ffbc5 100644
--- a/packages/core/test/config/plugin.test.ts
+++ b/packages/core/test/config/plugin.test.ts
@@ -1,7 +1,10 @@
 import fs from "fs/promises"
 import path from "path"
+import { pathToFileURL } from "url"
 import { describe, expect } from "bun:test"
 import { define } from "@opencode-ai/plugin/v2/effect"
+import { Config as ConfigSchema } from "@opencode-ai/schema/config"
+import { Plugin } from "@opencode-ai/schema/plugin"
 import { AgentV2 } from "@opencode-ai/core/agent"
 import { Catalog } from "@opencode-ai/core/catalog"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
@@ -33,7 +36,7 @@ describe("PluginSupervisor config", () => {
         yield* ready()
         expect(
           (yield* plugins.list()).map((plugin) => plugin.id).filter((id) => id.startsWith("opencode.provider.")),
-        ).toEqual([PluginV2.ID.make("opencode.provider.openai")])
+        ).toEqual([Plugin.ID.make("opencode.provider.openai")])
       }),
     ),
   )
@@ -122,6 +125,43 @@ describe("PluginSupervisor config", () => {
     ),
   )
 
+  it.live("reloads an auto-discovered plugin when its file changes", () =>
+    withLocation(
+      undefined,
+      Effect.gen(function* () {
+        yield* ready()
+        const agents = yield* AgentV2.Service
+        const events = yield* EventV2.Service
+        const location = yield* Location.Service
+        const plugins = yield* PluginV2.Service
+        const file = path.join(location.directory, ".opencode", "plugin", "mutable.ts")
+        const first = (yield* plugins.list()).find((plugin) => plugin.id === "mutable-plugin")?.id
+
+        expect(first).toBeDefined()
+        expect((yield* agents.get(AgentV2.ID.make("mutable")))?.description).toBe("first")
+
+        yield* Effect.promise(async () => {
+          await fs.writeFile(file, mutablePlugin("second"))
+          const modified = new Date(Date.now() + 5_000)
+          await fs.utimes(file, modified, modified)
+        })
+        yield* events.publish(ConfigSchema.Event.Updated, {})
+        yield* waitUntil(
+          Effect.gen(function* () {
+            const current = (yield* plugins.list()).find((plugin) => plugin.id === "mutable-plugin")?.id
+            return current === first && (yield* agents.get(AgentV2.ID.make("mutable")))?.description === "second"
+          }),
+        )
+      }),
+      false,
+      async (directory) => {
+        const plugin = path.join(directory, ".opencode", "plugin")
+        await fs.mkdir(plugin, { recursive: true })
+        await fs.writeFile(path.join(plugin, "mutable.ts"), mutablePlugin("first"))
+      },
+    ),
+  )
+
   it.live("applies explicit removals after auto-discovery", () =>
     withLocation(
       { plugins: ["-*"] },
@@ -192,13 +232,19 @@ const ready = Effect.fnUntraced(function* () {
   yield* supervisor.ready
 })
 
-function withLocation<A, E, R>(config: unknown, effect: Effect.Effect<A, E, R>, fixtures = false) {
+function withLocation<A, E, R>(
+  config: unknown,
+  effect: Effect.Effect<A, E, R>,
+  fixtures = false,
+  prepare?: (directory: string) => Promise<void>,
+) {
   return Effect.acquireRelease(
     Effect.promise(() => tmpdir()),
     (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
   ).pipe(
     Effect.tap((tmp) =>
       Effect.promise(async () => {
+        await prepare?.(tmp.path)
         if (fixtures) {
           const directory = path.join(tmp.path, ".opencode")
           await fs.mkdir(directory, { recursive: true })
@@ -223,3 +269,30 @@ function withLocation<A, E, R>(config: unknown, effect: Effect.Effect<A, E, R>,
     ),
   )
 }
+
+function mutablePlugin(description: string) {
+  const plugin = pathToFileURL(path.join(import.meta.dir, "../../../plugin/src/v2/promise/index.ts")).href
+  return `
+import { define } from ${JSON.stringify(plugin)}
+
+export default define({
+  id: "mutable-plugin",
+  setup: async (ctx) => {
+    await ctx.agent.transform((agents) => {
+      agents.update("mutable", (agent) => {
+        agent.description = ${JSON.stringify(description)}
+        agent.mode = "subagent"
+      })
+    })
+  },
+})
+`
+}
+
+const waitUntil = Effect.fnUntraced(function* (condition: Effect.Effect<boolean>) {
+  for (let attempt = 0; attempt < 200; attempt++) {
+    if (yield* condition) return
+    yield* Effect.sleep("10 millis")
+  }
+  return yield* Effect.die("Timed out waiting for plugin reload")
+})
diff --git a/packages/core/test/location-layer.test.ts b/packages/core/test/location-layer.test.ts
index be6e150680..f0bef9fd32 100644
--- a/packages/core/test/location-layer.test.ts
+++ b/packages/core/test/location-layer.test.ts
@@ -2,6 +2,7 @@ import fs from "fs/promises"
 import path from "path"
 import { describe, expect } from "bun:test"
 import { Config } from "@opencode-ai/schema/config"
+import { Plugin } from "@opencode-ai/schema/plugin"
 import { Context, DateTime, Effect, Equal, Hash, Schema, Stream } from "effect"
 import { define } from "@opencode-ai/plugin/v2/effect"
 import { AgentV2 } from "@opencode-ai/core/agent"
@@ -50,7 +51,7 @@ describe("LocationServiceMap", () => {
             ),
           )
 
-          expect(plugins.map((plugin) => plugin.id)).toEqual([PluginV2.ID.make("opencode.agent")])
+          expect(plugins.map((plugin) => plugin.id)).toEqual([Plugin.ID.make("opencode.agent")])
         }),
       ),
     ),
@@ -377,7 +378,7 @@ describe("LocationServiceMap", () => {
                 })
                 .pipe(Effect.asVoid),
           })
-          yield* plugins.activate([{ id: PluginV2.ID.make(reviewer.id), effect: reviewer.effect }])
+          yield* plugins.activate([{ plugin: reviewer }])
 
           expect(yield* (yield* AgentV2.Service).get(AgentV2.ID.make("reviewer"))).toMatchObject({
             description: "Reviews code",
diff --git a/packages/core/test/plugin.test.ts b/packages/core/test/plugin.test.ts
index 8917171929..6037f4538b 100644
--- a/packages/core/test/plugin.test.ts
+++ b/packages/core/test/plugin.test.ts
@@ -2,6 +2,7 @@ import { describe, expect } from "bun:test"
 import { Context, Effect, Exit, Fiber, Schema, Stream } from "effect"
 import { define } from "@opencode-ai/plugin/v2/effect"
 import { Config as ConfigSchema } from "@opencode-ai/schema/config"
+import { Plugin } from "@opencode-ai/schema/plugin"
 import { AgentV2 } from "@opencode-ai/core/agent"
 import { EventV2 } from "@opencode-ai/core/event"
 import { PluginV2 } from "@opencode-ai/core/plugin"
@@ -37,15 +38,15 @@ describe("PluginV2", () => {
     }),
   )
 
-  it.effect("skips identical generations and replaces changed plugin IDs", () =>
+  it.effect("skips identical generations and replaces changed plugin versions", () =>
     Effect.gen(function* () {
       const plugins = yield* PluginV2.Service
       const agents = yield* AgentV2.Service
       let description = "first"
 
-      const managed = (id: string) =>
+      const managed = () =>
         define({
-          id,
+          id: "managed",
           effect: (ctx) =>
             ctx.agent
               .transform((agents) =>
@@ -56,15 +57,15 @@ describe("PluginV2", () => {
               .pipe(Effect.asVoid),
         })
 
-      yield* plugins.activate([managed("managed")])
+      yield* plugins.activate([{ plugin: managed() }])
 
       expect((yield* agents.get(AgentV2.ID.make("configured")))?.description).toBe("first")
 
       description = "second"
-      yield* plugins.activate([managed("managed")])
+      yield* plugins.activate([{ plugin: managed() }])
       expect((yield* agents.get(AgentV2.ID.make("configured")))?.description).toBe("first")
 
-      yield* plugins.activate([managed("managed-next")])
+      yield* plugins.activate([{ plugin: managed(), version: "next" }])
       expect((yield* agents.get(AgentV2.ID.make("configured")))?.description).toBe("second")
 
       yield* plugins.activate([])
@@ -75,14 +76,14 @@ describe("PluginV2", () => {
   it.effect("rejects duplicate IDs before replacing the active generation", () =>
     Effect.gen(function* () {
       const plugins = yield* PluginV2.Service
-      const active = PluginV2.ID.make("active")
-      const duplicate = PluginV2.ID.make("duplicate")
-      yield* plugins.activate([{ id: active, effect: () => Effect.void }])
+      const active = Plugin.ID.make("active")
+      const duplicate = "duplicate"
+      yield* plugins.activate([{ plugin: { id: active, effect: () => Effect.void } }])
 
       const result = yield* plugins
         .activate([
-          { id: duplicate, effect: () => Effect.void },
-          { id: duplicate, effect: () => Effect.void },
+          { plugin: { id: duplicate, effect: () => Effect.void } },
+          { plugin: { id: duplicate, effect: () => Effect.void } },
         ])
         .pipe(Effect.exit)
 
@@ -105,11 +106,11 @@ describe("PluginV2", () => {
             .pipe(Effect.asVoid),
       })
 
-      expect(Exit.isFailure(yield* plugins.activate([plugin]).pipe(Effect.exit))).toBe(true)
+      expect(Exit.isFailure(yield* plugins.activate([{ plugin }]).pipe(Effect.exit))).toBe(true)
       fail = false
-      yield* plugins.activate([plugin])
+      yield* plugins.activate([{ plugin }])
 
-      expect(yield* plugins.list()).toEqual([{ id: PluginV2.ID.make("retry") }])
+      expect(yield* plugins.list()).toEqual([{ id: Plugin.ID.make("retry") }])
     }),
   )
 
@@ -119,8 +120,10 @@ describe("PluginV2", () => {
       const closed: string[] = []
       yield* plugins.activate(
         ["first", "second"].map((id) => ({
-          id: PluginV2.ID.make(id),
-          effect: () => Effect.addFinalizer(() => Effect.sync(() => closed.push(id))),
+          plugin: {
+            id,
+            effect: () => Effect.addFinalizer(() => Effect.sync(() => closed.push(id))),
+          },
         })),
       )
 
@@ -143,9 +146,7 @@ describe("PluginV2", () => {
           ),
       })
 
-      yield* plugins
-        .activate([{ id: PluginV2.ID.make(plugin.id), effect: plugin.effect }])
-        .pipe(Effect.provideService(Secret, "secret"))
+      yield* plugins.activate([{ plugin }]).pipe(Effect.provideService(Secret, "secret"))
 
       expect(visible).toBe(false)
     }),
@@ -170,7 +171,7 @@ describe("PluginV2", () => {
             .pipe(Effect.orDie),
       })
 
-      yield* plugins.activate([{ id: PluginV2.ID.make(plugin.id), effect: plugin.effect }])
+      yield* plugins.activate([{ plugin }])
       expect((yield* registry.materialize({ model: testModel })).definitions.map((tool) => tool.name)).toContain(
         "plugin_tool",
       )
@@ -205,7 +206,7 @@ describe("PluginV2", () => {
           }),
       })
 
-      yield* plugins.activate([{ id: PluginV2.ID.make(plugin.id), effect: plugin.effect }])
+      yield* plugins.activate([{ plugin }])
 
       expect((yield* registry.materialize({ model: testModel })).definitions.map((tool) => tool.name)).toEqual([
         "plain",
@@ -257,7 +258,7 @@ describe("PluginV2", () => {
           }),
       })
 
-      yield* plugins.activate([{ id: PluginV2.ID.make(plugin.id), effect: plugin.effect }])
+      yield* plugins.activate([{ plugin }])
 
       const materialized = yield* registry.materialize({ model: testModel })
       const settlement = yield* materialized.settle({
diff --git a/packages/core/test/plugin/provider-kilo.test.ts b/packages/core/test/plugin/provider-kilo.test.ts
index bec50272ef..1ff356523c 100644
--- a/packages/core/test/plugin/provider-kilo.test.ts
+++ b/packages/core/test/plugin/provider-kilo.test.ts
@@ -19,9 +19,7 @@ const addPlugin = Effect.fn(function* () {
 
 describe("KiloPlugin", () => {
   it.effect("is registered so legacy referer headers can be applied", () =>
-    Effect.sync(() =>
-      expect(ProviderPlugins.map((item) => item.id)).toContain(PluginV2.ID.make("opencode.provider.kilo")),
-    ),
+    Effect.sync(() => expect(ProviderPlugins.map((item) => item.id)).toContain("opencode.provider.kilo")),
   )
 
   it.effect("applies legacy referer headers only to kilo", () =>
diff --git a/packages/core/test/plugin/provider-llmgateway.test.ts b/packages/core/test/plugin/provider-llmgateway.test.ts
index 8cc45c6027..8f4af57889 100644
--- a/packages/core/test/plugin/provider-llmgateway.test.ts
+++ b/packages/core/test/plugin/provider-llmgateway.test.ts
@@ -21,9 +21,7 @@ const addPlugin = Effect.fn(function* () {
 
 describe("LLMGatewayPlugin", () => {
   it.effect("is registered so legacy referer headers can be applied", () =>
-    Effect.sync(() =>
-      expect(ProviderPlugins.map((item) => item.id)).toContain(PluginV2.ID.make("opencode.provider.llmgateway")),
-    ),
+    Effect.sync(() => expect(ProviderPlugins.map((item) => item.id)).toContain("opencode.provider.llmgateway")),
   )
 
   it.effect("applies legacy referer headers only to enabled llmgateway", () =>
diff --git a/packages/core/test/plugin/provider-nvidia.test.ts b/packages/core/test/plugin/provider-nvidia.test.ts
index baf763c8d1..c176cef4ac 100644
--- a/packages/core/test/plugin/provider-nvidia.test.ts
+++ b/packages/core/test/plugin/provider-nvidia.test.ts
@@ -19,9 +19,7 @@ const addPlugin = Effect.fn(function* () {
 
 describe("NvidiaPlugin", () => {
   it.effect("is registered so legacy referer headers can be applied", () =>
-    Effect.sync(() =>
-      expect(ProviderPlugins.map((item) => item.id)).toContain(PluginV2.ID.make("opencode.provider.nvidia")),
-    ),
+    Effect.sync(() => expect(ProviderPlugins.map((item) => item.id)).toContain("opencode.provider.nvidia")),
   )
 
   it.effect("applies NVIDIA tracking headers only to nvidia", () =>
diff --git a/packages/core/test/plugin/provider-openrouter.test.ts b/packages/core/test/plugin/provider-openrouter.test.ts
index e0be8b5fa7..60dfc67b51 100644
--- a/packages/core/test/plugin/provider-openrouter.test.ts
+++ b/packages/core/test/plugin/provider-openrouter.test.ts
@@ -22,9 +22,7 @@ const addPlugin = Effect.fn(function* () {
 
 describe("OpenRouterPlugin", () => {
   it.effect("is registered so legacy OpenRouter behavior can be applied", () =>
-    Effect.sync(() =>
-      expect(ProviderPlugins.map((item) => item.id)).toContain(PluginV2.ID.make("opencode.provider.openrouter")),
-    ),
+    Effect.sync(() => expect(ProviderPlugins.map((item) => item.id)).toContain("opencode.provider.openrouter")),
   )
 
   it.effect("applies legacy referer headers only to openrouter", () =>
diff --git a/packages/core/test/plugin/provider-snowflake-cortex.test.ts b/packages/core/test/plugin/provider-snowflake-cortex.test.ts
index a1265b6a8f..4de00105b7 100644
--- a/packages/core/test/plugin/provider-snowflake-cortex.test.ts
+++ b/packages/core/test/plugin/provider-snowflake-cortex.test.ts
@@ -43,7 +43,7 @@ function withEnv<A, E, R>(vars: Record<string, string | undefined>, effect: () =
 describe("SnowflakeCortexPlugin", () => {
   it.effect("is registered in ProviderPlugins before OpenAICompatiblePlugin", () =>
     Effect.sync(() => {
-      expect(ProviderPlugins.map((item) => item.id)).toContain(PluginV2.ID.make("opencode.provider.snowflake-cortex"))
+      expect(ProviderPlugins.map((item) => item.id)).toContain("opencode.provider.snowflake-cortex")
       const ids = ProviderPlugins.map((p) => p.id)
       expect(ids.indexOf("opencode.provider.snowflake-cortex")).toBeLessThan(
         ids.indexOf("opencode.provider.openai-compatible"),
diff --git a/packages/core/test/plugin/provider-zenmux.test.ts b/packages/core/test/plugin/provider-zenmux.test.ts
index 0ce286d612..9c44800ebc 100644
--- a/packages/core/test/plugin/provider-zenmux.test.ts
+++ b/packages/core/test/plugin/provider-zenmux.test.ts
@@ -24,9 +24,7 @@ function required<T>(value: T | undefined): T {
 
 describe("ZenmuxPlugin", () => {
   it.effect("is registered so legacy referer headers can be applied", () =>
-    Effect.sync(() =>
-      expect(ProviderPlugins.map((item) => item.id)).toContain(PluginV2.ID.make("opencode.provider.zenmux")),
-    ),
+    Effect.sync(() => expect(ProviderPlugins.map((item) => item.id)).toContain("opencode.provider.zenmux")),
   )
 
   it.effect("applies the exact legacy Zenmux headers", () =>
diff --git a/packages/core/test/shared-schema.test.ts b/packages/core/test/shared-schema.test.ts
index ecdd555fa8..7d227aac19 100644
--- a/packages/core/test/shared-schema.test.ts
+++ b/packages/core/test/shared-schema.test.ts
@@ -22,14 +22,12 @@ import { FileSystem } from "@opencode-ai/schema/filesystem"
 import { Integration } from "@opencode-ai/schema/integration"
 import { LLM } from "@opencode-ai/schema/llm"
 import { Permission } from "@opencode-ai/schema/permission"
-import { Plugin } from "@opencode-ai/schema/plugin"
 import { Pty } from "@opencode-ai/schema/pty"
 import { Reference } from "@opencode-ai/schema/reference"
 import { SessionTodo } from "@opencode-ai/schema/session-todo"
 import { Skill } from "@opencode-ai/schema/skill"
 import { AbsolutePath, DateTimeUtcFromMillis, optional, statics } from "@opencode-ai/schema/schema"
 import { ProviderV2 } from "@opencode-ai/core/provider"
-import { PluginV2 } from "@opencode-ai/core/plugin"
 
 test("Core reuses the canonical shared schemas", async () => {
   const [
@@ -129,8 +127,6 @@ test("Core reuses the canonical shared schemas", async () => {
     [corePermission.Ruleset, Permission.Ruleset],
     [corePermissionV1.Event, PermissionV1.Event],
     [coreProjectCopy.Event, ProjectDirectories.Event],
-    [PluginV2.ID, Plugin.ID],
-    [PluginV2.Event, Plugin.Event],
     [corePty.Info, Pty.Info],
     [corePty.Event, Pty.Event],
     [coreProject.ID, Project.ID],

From 33cb536879be44f15214130b5b65d5c3f170766a Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Sun, 5 Jul 2026 17:21:39 -0400
Subject: [PATCH 70/82] feat(plugin): publish generation updates

---
 .../client/src/promise/generated/types.ts     |  8 ++++
 packages/core/src/plugin.ts                   |  1 +
 packages/core/test/plugin.test.ts             |  5 ++
 packages/schema/src/plugin.ts                 |  6 ++-
 packages/schema/test/event-manifest.test.ts   |  3 ++
 packages/sdk/js/src/v2/gen/types.gen.ts       | 46 +++++++++++++++++++
 packages/tui/src/app.tsx                      |  6 +++
 7 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts
index c4ed970247..f58135023c 100644
--- a/packages/client/src/promise/generated/types.ts
+++ b/packages/client/src/promise/generated/types.ts
@@ -4974,6 +4974,14 @@ export type EventSubscribeOutput =
       readonly location?: { readonly directory: string; readonly workspaceID?: string }
       readonly data: { readonly id: string }
     }
+  | {
+      readonly id: string
+      readonly created: number
+      readonly metadata?: { readonly [x: string]: unknown }
+      readonly type: "plugin.updated"
+      readonly location?: { readonly directory: string; readonly workspaceID?: string }
+      readonly data: {}
+    }
   | {
       readonly id: string
       readonly created: number
diff --git a/packages/core/src/plugin.ts b/packages/core/src/plugin.ts
index 1b57d9fc5e..907920c10e 100644
--- a/packages/core/src/plugin.ts
+++ b/packages/core/src/plugin.ts
@@ -92,6 +92,7 @@ const layer = Layer.effect(
             id: definition.id,
             ...(definition.version === undefined ? {} : { version: definition.version }),
           }))
+          yield* events.publish(Event.Updated, {})
         }),
       )
     })
diff --git a/packages/core/test/plugin.test.ts b/packages/core/test/plugin.test.ts
index 6037f4538b..e437feb066 100644
--- a/packages/core/test/plugin.test.ts
+++ b/packages/core/test/plugin.test.ts
@@ -42,7 +42,11 @@ describe("PluginV2", () => {
     Effect.gen(function* () {
       const plugins = yield* PluginV2.Service
       const agents = yield* AgentV2.Service
+      const events = yield* EventV2.Service
       let description = "first"
+      const updated = yield* events
+        .subscribe(Plugin.Event.Updated)
+        .pipe(Stream.take(2), Stream.runCollect, Effect.forkScoped({ startImmediately: true }))
 
       const managed = () =>
         define({
@@ -67,6 +71,7 @@ describe("PluginV2", () => {
 
       yield* plugins.activate([{ plugin: managed(), version: "next" }])
       expect((yield* agents.get(AgentV2.ID.make("configured")))?.description).toBe("second")
+      expect(yield* Fiber.join(updated)).toHaveLength(2)
 
       yield* plugins.activate([])
       expect(yield* agents.get(AgentV2.ID.make("configured"))).toBeUndefined()
diff --git a/packages/schema/src/plugin.ts b/packages/schema/src/plugin.ts
index 40379e3051..4a003f1199 100644
--- a/packages/schema/src/plugin.ts
+++ b/packages/schema/src/plugin.ts
@@ -15,4 +15,8 @@ const Added = ephemeral({
   type: "plugin.added",
   schema: { id: ID },
 })
-export const Event = { Added, Definitions: inventory(Added) }
+const Updated = ephemeral({
+  type: "plugin.updated",
+  schema: {},
+})
+export const Event = { Added, Updated, Definitions: inventory(Added, Updated) }
diff --git a/packages/schema/test/event-manifest.test.ts b/packages/schema/test/event-manifest.test.ts
index 0147c7469b..da344ba528 100644
--- a/packages/schema/test/event-manifest.test.ts
+++ b/packages/schema/test/event-manifest.test.ts
@@ -15,6 +15,7 @@ import { EventManifest } from "../src/event-manifest.js"
 import { FileSystemV1 } from "../src/filesystem-v1.js"
 import { IdeEvent } from "../src/ide-event.js"
 import { McpEvent } from "../src/mcp-event.js"
+import { Plugin } from "../src/plugin.js"
 import { SessionEvent } from "../src/session-event.js"
 import { SessionTodo } from "../src/session-todo.js"
 import { SessionV1 } from "../src/session-v1.js"
@@ -46,6 +47,7 @@ describe("public event manifest", () => {
       EventManifest.Definitions.map((definition) => definition.type),
     )
     expect(EventManifest.Latest.get("agent.updated")).toBe(Agent.Event.Updated)
+    expect(EventManifest.Latest.get("plugin.updated")).toBe(Plugin.Event.Updated)
     expect(EventManifest.Server.get("mcp.status.changed")).toBe(McpEvent.StatusChanged)
     expect(EventManifest.Server.has("mcp.tools.changed")).toBe(false)
     expect(Agent.Event.Updated.durable).toBeUndefined()
@@ -70,6 +72,7 @@ describe("public event manifest", () => {
     expect(Permission.Event.Definitions).toEqual([Permission.Event.Asked, Permission.Event.Replied])
     expect(Form.Event.Definitions).toEqual([Form.Event.Created, Form.Event.Replied, Form.Event.Cancelled])
     expect(Reference.Event.Definitions).toEqual([Reference.Event.Updated])
+    expect(Plugin.Event.Definitions).toEqual([Plugin.Event.Added, Plugin.Event.Updated])
     expect(McpEvent.Definitions).toEqual([McpEvent.ToolsChanged, McpEvent.StatusChanged])
     expect(EventManifest.Latest.has("mcp.browser.open.failed")).toBe(false)
     expect(EventManifest.Latest.has("ide.installed")).toBe(false)
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index 6db6b405b8..5b9d40cad5 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -63,6 +63,7 @@ export type Event =
   | EventPermissionV2Asked
   | EventPermissionV2Replied
   | EventPluginAdded
+  | EventPluginUpdated
   | EventProjectDirectoriesUpdated
   | EventCommandUpdated
   | EventConfigUpdated
@@ -1325,6 +1326,13 @@ export type GlobalEvent = {
           id: string
         }
       }
+    | {
+        id: string
+        type: "plugin.updated"
+        properties: {
+          [key: string]: unknown
+        }
+      }
     | {
         id: string
         type: "project.directories.updated"
@@ -3071,6 +3079,7 @@ export type V2Event =
   | PermissionV2Asked
   | PermissionV2Replied
   | PluginAdded
+  | PluginUpdated
   | ProjectDirectoriesUpdated
   | CommandUpdated
   | ConfigUpdated
@@ -5957,6 +5966,19 @@ export type PluginAdded = {
   }
 }
 
+export type PluginUpdated = {
+  id: string
+  created: number
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "plugin.updated"
+  location?: LocationRef
+  data: {
+    [key: string]: unknown
+  }
+}
+
 export type ProjectDirectoriesUpdated = {
   id: string
   created: number
@@ -7274,6 +7296,14 @@ export type EventPluginAdded = {
   }
 }
 
+export type EventPluginUpdated = {
+  id: string
+  type: "plugin.updated"
+  properties: {
+    [key: string]: unknown
+  }
+}
+
 export type EventProjectDirectoriesUpdated = {
   id: string
   type: "project.directories.updated"
@@ -10380,6 +10410,21 @@ export type PluginAdded2 = {
   }
 }
 
+export type PluginUpdated2 = {
+  id: string
+  created: number
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "plugin.updated"
+  location?: LocationRef2
+  data:
+    | {
+        [key: string]: unknown
+      }
+    | Array<unknown>
+}
+
 export type ProjectDirectoriesUpdated2 = {
   id: string
   created: number
@@ -11192,6 +11237,7 @@ export type V2EventV2 =
   | PermissionV2Asked2
   | PermissionV2Replied2
   | PluginAdded2
+  | PluginUpdated2
   | ProjectDirectoriesUpdated2
   | CommandUpdated2
   | ConfigUpdated2
diff --git a/packages/tui/src/app.tsx b/packages/tui/src/app.tsx
index a3b2c31973..b769a436a0 100644
--- a/packages/tui/src/app.tsx
+++ b/packages/tui/src/app.tsx
@@ -1040,6 +1040,12 @@ function App(props: { onSnapshot?: () => Promise<string[]>; pluginHost: TuiPlugi
     })
   })
 
+  event.on("plugin.updated", (_evt, { directory, workspace }) => {
+    if (directory !== project.instance.directory()) return
+    if (workspace !== project.workspace.current()) return
+    toast.show({ variant: "success", message: "Plugins reloaded" })
+  })
+
   event.on("tui.session.select", (evt, { workspace }) => {
     if (workspace !== project.workspace.current()) return
     route.navigate({

From 7b88de47c303c428c7b6dbafced21ab920ba5888 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Sun, 5 Jul 2026 18:21:23 -0400
Subject: [PATCH 71/82] chore(client): publish client package

---
 script/publish.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/script/publish.ts b/script/publish.ts
index 5ee296a6cf..4fcf0890ba 100755
--- a/script/publish.ts
+++ b/script/publish.ts
@@ -41,6 +41,9 @@ await $`bun ./packages/schema/script/publish.ts`
 console.log("\n=== protocol ===\n")
 await $`bun ./packages/protocol/script/publish.ts`
 
+console.log("\n=== client ===\n")
+await $`bun ./packages/client/script/publish.ts`
+
 console.log("\n=== cli ===\n")
 await $`bun ./packages/cli/script/publish.ts`
 

From 652e8ff3fbb7bfca0f93b81c2a7215e7188492dd Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Sun, 5 Jul 2026 18:31:15 -0400
Subject: [PATCH 72/82] fix(client): resolve codegen workspace version

---
 bun.lock                              | 1 +
 packages/httpapi-codegen/package.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/bun.lock b/bun.lock
index 3ca6fd949d..7d4a912af1 100644
--- a/bun.lock
+++ b/bun.lock
@@ -530,6 +530,7 @@
     },
     "packages/httpapi-codegen": {
       "name": "@opencode-ai/httpapi-codegen",
+      "version": "0.0.0",
       "dependencies": {
         "effect": "catalog:",
         "prettier": "3.6.2",
diff --git a/packages/httpapi-codegen/package.json b/packages/httpapi-codegen/package.json
index 84aa736531..f2a5e4da79 100644
--- a/packages/httpapi-codegen/package.json
+++ b/packages/httpapi-codegen/package.json
@@ -1,6 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/httpapi-codegen",
+  "version": "0.0.0",
   "private": true,
   "type": "module",
   "exports": {

From 5bcf8d5a0b118652c9a298de68a334b4700bc15a Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Sun, 5 Jul 2026 19:35:30 -0500
Subject: [PATCH 73/82] feat(tui): render session forms (#35421)

---
 packages/tui/src/context/data.tsx             |   31 +
 .../feature-plugins/system/notifications.ts   |   16 +
 packages/tui/src/routes/session/form.tsx      | 1009 +++++++++++++++++
 packages/tui/src/routes/session/index.tsx     |   17 +-
 .../test/cli/cmd/tui/notifications.test.ts    |   70 +-
 packages/tui/test/cli/tui/data.test.tsx       |   70 ++
 packages/tui/test/fixture/tui-sdk.ts          |    7 +-
 7 files changed, 1202 insertions(+), 18 deletions(-)
 create mode 100644 packages/tui/src/routes/session/form.tsx

diff --git a/packages/tui/src/context/data.tsx b/packages/tui/src/context/data.tsx
index 82a7150c9e..1528b83cd0 100644
--- a/packages/tui/src/context/data.tsx
+++ b/packages/tui/src/context/data.tsx
@@ -1,6 +1,8 @@
 import type {
   AgentV2Info,
   CommandV2Info,
+  FormFormInfo,
+  FormUrlInfo,
   IntegrationInfo,
   LocationRef,
   McpServer,
@@ -29,6 +31,8 @@ export type DataSessionStatus = "idle" | "running"
 
 const messageIDFromEvent = (eventID: string) => eventID.replace(/^evt_/, "msg_")
 
+export type FormInfo = FormFormInfo | FormUrlInfo
+
 type LocationData = {
   agent?: AgentV2Info[]
   command?: CommandV2Info[]
@@ -54,6 +58,8 @@ type Data = {
     message: Record<string, SessionMessage[]>
     permission: Record<string, PermissionV2Request[]>
     question: Record<string, QuestionV2Request[]>
+    // Pending forms keyed by session ID.
+    form: Record<string, FormInfo[]>
   }
   project: {
     permission: Record<string, PermissionSavedInfo[]>
@@ -88,6 +94,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
         message: {},
         permission: {},
         question: {},
+        form: {},
       },
       project: {
         permission: {},
@@ -602,6 +609,22 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             ),
           )
           break
+        case "form.created":
+          if (store.session.form[event.data.form.sessionID]?.some((form) => form.id === event.data.form.id)) break
+          setStore("session", "form", event.data.form.sessionID, [
+            ...(store.session.form[event.data.form.sessionID] ?? []),
+            mutable(event.data.form),
+          ])
+          break
+        case "form.replied":
+        case "form.cancelled":
+          setStore(
+            "session",
+            "form",
+            event.data.sessionID,
+            (store.session.form[event.data.sessionID] ?? []).filter((form) => form.id !== event.data.id),
+          )
+          break
         case "shell.created":
           setStore("location", locationKey(event.location ?? defaultLocation()), (data) => ({
             ...data,
@@ -728,6 +751,14 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             setStore("session", "question", sessionID, mutable(await sdk.api.question.list({ sessionID })))
           },
         },
+        form: {
+          list(sessionID: string) {
+            return store.session.form[sessionID]
+          },
+          async refresh(sessionID: string) {
+            setStore("session", "form", sessionID, mutable(await sdk.api.form.list({ sessionID })))
+          },
+        },
       },
       project: {
         permission: {
diff --git a/packages/tui/src/feature-plugins/system/notifications.ts b/packages/tui/src/feature-plugins/system/notifications.ts
index 416ba8c466..a5033b62e0 100644
--- a/packages/tui/src/feature-plugins/system/notifications.ts
+++ b/packages/tui/src/feature-plugins/system/notifications.ts
@@ -29,9 +29,25 @@ function sessionErrorMessage(error: SessionError) {
 const tui: TuiPlugin = async (api) => {
   const active = new Set<string>()
   const errored = new Set<string>()
+  const forms = new Set<string>()
   const questions = new Set<string>()
   const permissions = new Set<string>()
 
+  api.event.on("form.created", (event) => {
+    if (event.data.form.sessionID === "global") return
+    if (forms.has(event.data.form.id)) return
+    forms.add(event.data.form.id)
+    notify(api, event.data.form.sessionID, "Input needs response", "question")
+  })
+
+  api.event.on("form.replied", (event) => {
+    forms.delete(event.data.id)
+  })
+
+  api.event.on("form.cancelled", (event) => {
+    forms.delete(event.data.id)
+  })
+
   api.event.on("question.asked", (event) => {
     if (questions.has(event.data.id)) return
     questions.add(event.data.id)
diff --git a/packages/tui/src/routes/session/form.tsx b/packages/tui/src/routes/session/form.tsx
new file mode 100644
index 0000000000..e6f7a4818c
--- /dev/null
+++ b/packages/tui/src/routes/session/form.tsx
@@ -0,0 +1,1009 @@
+import { createStore } from "solid-js/store"
+import { createMemo, createSignal, For, onCleanup, onMount, Show } from "solid-js"
+import { useRenderer, useTerminalDimensions } from "@opentui/solid"
+import type { ScrollBoxRenderable, TextareaRenderable } from "@opentui/core"
+import open from "open"
+import { selectedForeground, tint, useTheme } from "../../context/theme"
+import type { FormFormInfo, FormValue } from "@opencode-ai/sdk/v2"
+import type { FormInfo } from "../../context/data"
+import { useSDK } from "../../context/sdk"
+import { SplitBorder } from "../../ui/border"
+import { useTuiConfig } from "../../config"
+import { useBindings, useOpencodeModeStack } from "../../keymap"
+
+const FORM_MODE = "form"
+
+type Field = FormFormInfo["fields"][number]
+
+function fieldLabel(field: Field) {
+  return field.title ?? field.key
+}
+
+function truncate(label: string, max: number) {
+  return label.length > max ? label.slice(0, max - 1).trimEnd() + "…" : label
+}
+
+function validateText(field: Field, text: string): string | undefined {
+  if (field.type !== "string") return
+  if (field.minLength !== undefined && text.length < field.minLength)
+    return `Must be at least ${field.minLength} characters`
+  if (field.maxLength !== undefined && text.length > field.maxLength)
+    return `Must be at most ${field.maxLength} characters`
+  if (field.pattern !== undefined) {
+    try {
+      if (!new RegExp(field.pattern).test(text)) return `Must match pattern: ${field.pattern}`
+    } catch {
+      return `Invalid pattern: ${field.pattern}`
+    }
+  }
+  if (field.format === "email" && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(text)) return "Expected an email address"
+  if (field.format === "uri") {
+    try {
+      new URL(text)
+    } catch {
+      return "Expected a URL"
+    }
+  }
+  if (field.format === "date") {
+    const date = new Date(`${text}T00:00:00.000Z`)
+    if (!/^\d{4}-\d{2}-\d{2}$/.test(text) || Number.isNaN(date.getTime()) || date.toISOString().slice(0, 10) !== text)
+      return "Expected a date (YYYY-MM-DD)"
+  }
+  if (field.format === "date-time" && Number.isNaN(new Date(text).getTime())) return "Expected a date and time"
+}
+
+function validateSelection(field: Field, value: FormValue | undefined) {
+  if (field.type !== "multiselect" || value === undefined) return
+  if (!Array.isArray(value)) return "Expected selections"
+  if (field.required && value.length === 0) return "Select at least one option"
+  if (field.minItems !== undefined && value.length < field.minItems) return `Select at least ${field.minItems}`
+  if (field.maxItems !== undefined && value.length > field.maxItems) return `Select at most ${field.maxItems}`
+}
+
+function validateValue(field: Field, value: FormValue | undefined) {
+  if (value === undefined) return field.required ? "Answer required" : undefined
+  if (field.required && (value === "" || (Array.isArray(value) && value.length === 0))) {
+    return field.type === "multiselect" ? "Select at least one option" : "Answer required"
+  }
+  if (field.type === "string") {
+    if (typeof value !== "string") return "Expected text"
+    const invalid = validateText(field, value)
+    if (invalid) return invalid
+    if (field.options && !field.custom && !field.options.some((option) => option.value === value)) {
+      return "Select an available option"
+    }
+    return
+  }
+  if (field.type === "number" || field.type === "integer") {
+    if (typeof value !== "number" || !Number.isFinite(value)) return "Expected a number"
+    if (field.type === "integer" && !Number.isInteger(value)) return "Expected an integer"
+    if (typeof field.minimum === "number" && value < field.minimum) return `Must be at least ${field.minimum}`
+    if (typeof field.maximum === "number" && value > field.maximum) return `Must be at most ${field.maximum}`
+    return
+  }
+  if (field.type === "boolean") return typeof value === "boolean" ? undefined : "Expected yes or no"
+  const invalid = validateSelection(field, value)
+  if (invalid) return invalid
+  if (
+    Array.isArray(value) &&
+    !field.custom &&
+    value.some((item) => !field.options.some((option) => option.value === item))
+  ) {
+    return "Select only available options"
+  }
+}
+
+function fieldRows(field: Field): { value: FormValue; label: string; description?: string }[] {
+  if (field.type === "boolean")
+    return [
+      { value: true, label: "Yes" },
+      { value: false, label: "No" },
+    ]
+  if (field.type === "multiselect" || (field.type === "string" && field.options))
+    return (field.options ?? []).map((option) => ({
+      value: option.value,
+      label: option.label,
+      description: option.description,
+    }))
+  return []
+}
+
+function selectedRow(field: Field | undefined, value: FormValue | undefined) {
+  if (!field || value === undefined || Array.isArray(value)) return 0
+  const rows = fieldRows(field)
+  const index = rows.findIndex((row) => row.value === value)
+  if (index !== -1) return index
+  if (typeof value === "string" && field.type === "string" && field.options && field.custom) return rows.length
+  return 0
+}
+
+function customDefault(field: Field) {
+  if (field.type !== "string" || !field.options || !field.custom || typeof field.default !== "string") return
+  if (!field.options.some((option) => option.value === field.default)) return field.default
+}
+
+function display(field: Field, value: FormValue | undefined) {
+  if (value === undefined) return ""
+  const label = (item: string | number | boolean) =>
+    fieldRows(field).find((row) => row.value === item)?.label ?? String(item)
+  if (Array.isArray(value)) return value.length === 0 ? "(none)" : value.map(label).join(", ")
+  return label(value)
+}
+
+export function FormPrompt(props: { form: FormInfo }) {
+  return props.form.mode === "url" ? <UrlPrompt form={props.form} /> : <FieldsPrompt form={props.form} />
+}
+
+function UrlPrompt(props: { form: FormInfo & { mode: "url" } }) {
+  const sdk = useSDK()
+  const { theme } = useTheme()
+  const modeStack = useOpencodeModeStack()
+  const message = createMemo(() => {
+    const value = props.form.metadata?.["message"]
+    return typeof value === "string" ? value : undefined
+  })
+
+  onMount(() => onCleanup(modeStack.push(FORM_MODE)))
+
+  useBindings(() => ({
+    mode: FORM_MODE,
+    enabled: true,
+    commands: [
+      {
+        name: "app.exit",
+        title: "Dismiss form",
+        category: "Form",
+        run() {
+          void sdk.api.form.cancel({ sessionID: props.form.sessionID, formID: props.form.id })
+        },
+      },
+    ],
+    bindings: [
+      {
+        key: "return",
+        desc: "Open link",
+        group: "Form",
+        cmd: () => {
+          void open(props.form.url)
+        },
+      },
+      {
+        key: "escape",
+        desc: "Dismiss form",
+        group: "Form",
+        cmd: () => {
+          void sdk.api.form.cancel({ sessionID: props.form.sessionID, formID: props.form.id })
+        },
+      },
+    ],
+  }))
+
+  return (
+    <box
+      backgroundColor={theme.backgroundPanel}
+      border={["left"]}
+      borderColor={theme.accent}
+      customBorderChars={SplitBorder.customBorderChars}
+    >
+      <box gap={1} paddingLeft={2} paddingRight={3} paddingTop={1} paddingBottom={1}>
+        <text fg={theme.text}>{props.form.title ?? "Input requested"}</text>
+        <Show when={message()}>
+          <text fg={theme.textMuted}>{message()}</text>
+        </Show>
+        <text fg={theme.secondary}>{props.form.url}</text>
+      </box>
+      <box flexDirection="row" flexShrink={0} gap={2} paddingLeft={2} paddingRight={3} paddingBottom={1}>
+        <text fg={theme.text}>
+          enter <span style={{ fg: theme.textMuted }}>open link</span>
+        </text>
+        <text fg={theme.text}>
+          esc <span style={{ fg: theme.textMuted }}>dismiss</span>
+        </text>
+      </box>
+    </box>
+  )
+}
+
+function FieldsPrompt(props: { form: FormInfo & { mode: "form" } }) {
+  const sdk = useSDK()
+  const { theme } = useTheme()
+  const renderer = useRenderer()
+  const dimensions = useTerminalDimensions()
+  const tuiConfig = useTuiConfig()
+  const modeStack = useOpencodeModeStack()
+
+  const [tabHover, setTabHover] = createSignal<number | "confirm" | null>(null)
+  const [store, setStore] = createStore({
+    tab: 0,
+    answers: Object.fromEntries(
+      props.form.fields.flatMap((field) => (field.default === undefined ? [] : [[field.key, field.default]])),
+    ) as Record<string, FormValue | undefined>,
+    custom: Object.fromEntries(
+      props.form.fields.flatMap((field) => {
+        const value = customDefault(field)
+        return value === undefined ? [] : [[field.key, value]]
+      }),
+    ) as Record<string, string>,
+    selected: selectedRow(props.form.fields[0], props.form.fields[0]?.default),
+    editing: false,
+    error: "",
+  })
+
+  let textarea: TextareaRenderable | undefined
+  let review: ScrollBoxRenderable | undefined
+
+  const fields = createMemo(() => {
+    const answers: Record<string, FormValue | undefined> = {}
+    return props.form.fields.filter((field) => {
+      const active = (field.when ?? []).every((when) => {
+        const value = answers[when.key]
+        if (value === undefined) return false
+        const hit = Array.isArray(value) ? value.some((item) => item === when.value) : value === when.value
+        return when.op === "eq" ? hit : !hit
+      })
+      if (active) answers[field.key] = store.answers[field.key]
+      return active
+    })
+  })
+  const single = createMemo(() => {
+    const list = fields()
+    if (props.form.fields.length !== 1) return false
+    if (list.length !== 1) return false
+    const field = list[0]!
+    return field.type === "boolean" || (field.type === "string" && field.options !== undefined)
+  })
+  const tabs = createMemo(() => (single() ? 1 : fields().length + 1))
+  const tabbed = createMemo(() => {
+    const width = fields().reduce((sum, item) => sum + truncate(fieldLabel(item), 24).length + 3, "Confirm".length + 3)
+    return width <= dimensions().width - 8
+  })
+  const answered = createMemo(
+    () =>
+      fields().filter((item) => {
+        const value = store.answers[item.key]
+        return value !== undefined
+      }).length,
+  )
+  const field = createMemo(() => fields()[Math.min(store.tab, fields().length - 1)])
+  const confirm = createMemo(() => !single() && store.tab >= fields().length)
+  const rows = createMemo(() => {
+    const current = field()
+    if (!current) return []
+    const configured = fieldRows(current)
+    const value = store.answers[current.key]
+    if (current.type !== "multiselect" || !Array.isArray(value)) return configured
+    const known = new Set(configured.map((row) => row.value))
+    return [
+      ...configured,
+      ...value.filter((item) => !known.has(item)).map((item) => ({ value: item, label: item, description: undefined })),
+    ]
+  })
+  const textual = createMemo(() => {
+    if (confirm()) return false
+    const current = field()
+    if (!current) return false
+    if (current.type === "number" || current.type === "integer") return true
+    return current.type === "string" && current.options === undefined
+  })
+  const custom = createMemo(() => {
+    const current = field()
+    if (!current) return false
+    if (current.type === "string" && current.options !== undefined) return current.custom === true
+    if (current.type === "multiselect") return current.custom === true
+    return false
+  })
+  const multi = createMemo(() => field()?.type === "multiselect")
+  const placeholder = createMemo(() => {
+    const current = field()
+    if (current?.type === "string") {
+      if (current.placeholder) return current.placeholder
+      if (current.format === "email") return "name@example.com"
+      if (current.format === "uri") return "https://example.com"
+      if (current.format === "date") return "YYYY-MM-DD"
+      if (current.format === "date-time") return "YYYY-MM-DDTHH:MM:SSZ"
+    }
+    if (current?.type === "number" || current?.type === "integer") {
+      const minimum = typeof current.minimum === "number" ? current.minimum : undefined
+      const maximum = typeof current.maximum === "number" ? current.maximum : undefined
+      if (minimum !== undefined && maximum !== undefined) return `${minimum}-${maximum}`
+      if (minimum !== undefined) return `at least ${minimum}`
+      if (maximum !== undefined) return `at most ${maximum}`
+    }
+    return "Type your answer"
+  })
+  const other = createMemo(() => custom() && store.selected === rows().length)
+  const input = createMemo(() => store.custom[field()?.key ?? ""] ?? "")
+  const customPicked = createMemo(() => {
+    const value = input()
+    if (!value) return false
+    const answer = store.answers[field()?.key ?? ""]
+    if (Array.isArray(answer)) return answer.includes(value)
+    return answer === value
+  })
+
+  function answer(key: string, value: FormValue | undefined) {
+    setStore("answers", { ...store.answers, [key]: value })
+    setStore("error", "")
+  }
+
+  function replySingle(field: Field, value: FormValue) {
+    sdk.api.form
+      .reply({
+        sessionID: props.form.sessionID,
+        formID: props.form.id,
+        answer: { [field.key]: value },
+      })
+      .catch((error: unknown) => {
+        setStore(
+          "error",
+          typeof error === "object" && error !== null && "message" in error && typeof error.message === "string"
+            ? error.message
+            : "Invalid answer",
+        )
+      })
+  }
+
+  function pick(value: FormValue, customValue?: string) {
+    const current = field()
+    if (!current) return
+    const invalid = validateValue(current, value)
+    if (invalid) {
+      setStore("error", invalid)
+      return
+    }
+    answer(current.key, value)
+    if (customValue !== undefined) setStore("custom", { ...store.custom, [current.key]: customValue })
+    if (single()) {
+      replySingle(current, value)
+      return
+    }
+    selectTab(store.tab + 1)
+  }
+
+  function toggle(value: string) {
+    const current = field()
+    if (!current) return
+    const existing = store.answers[current.key]
+    const list = Array.isArray(existing) ? [...existing] : []
+    const index = list.indexOf(value)
+    if (index === -1) list.push(value)
+    if (index !== -1) list.splice(index, 1)
+    answer(current.key, list)
+  }
+
+  function validateCurrent() {
+    if (confirm()) return true
+    const current = field()
+    if (!current) return true
+    const invalid = validateValue(current, store.answers[current.key])
+    if (!invalid) return true
+    setStore("error", invalid)
+    return false
+  }
+
+  function selectTab(index: number) {
+    if (!confirm() && index > store.tab && !validateCurrent()) return
+    const next = fields()[index]
+    setStore("tab", index)
+    setStore("selected", selectedRow(next, next ? store.answers[next.key] : undefined))
+    setStore("editing", false)
+    setStore("error", "")
+  }
+
+  function selectOption() {
+    if (other()) {
+      if (!multi()) {
+        setStore("editing", true)
+        return
+      }
+      const value = input()
+      if (value && customPicked()) {
+        toggle(value)
+        return
+      }
+      setStore("editing", true)
+      return
+    }
+    const row = rows()[store.selected]
+    if (!row) return
+    if (multi()) {
+      toggle(String(row.value))
+      return
+    }
+    pick(row.value)
+  }
+
+  function commitInput(text: string) {
+    const current = field()
+    if (!current) return false
+    const isTextual = textual()
+    const isMulti = multi()
+    if (!text) {
+      const previous = store.custom[current.key]
+      const existing = store.answers[current.key]
+      const values = Array.isArray(existing) ? existing.filter((value) => value !== previous) : []
+      const value = !isTextual && isMulti && Array.isArray(existing) ? values : undefined
+      const invalid = validateValue(current, value)
+      if (invalid) {
+        setStore("error", invalid)
+        return false
+      }
+      answer(current.key, value)
+      setStore("custom", { ...store.custom, [current.key]: "" })
+      setStore("editing", false)
+      return true
+    }
+
+    if (isTextual && (current.type === "number" || current.type === "integer")) {
+      const value = Number(text)
+      const invalid = validateValue(current, value)
+      if (invalid) {
+        setStore("error", invalid)
+        return false
+      }
+      answer(current.key, value)
+    }
+
+    if (isTextual && current.type === "string") {
+      const invalid = validateValue(current, text)
+      if (invalid) {
+        setStore("error", invalid)
+        return false
+      }
+      answer(current.key, text)
+    }
+
+    if (!isTextual && isMulti) {
+      const previous = store.custom[current.key]
+      const existing = store.answers[current.key]
+      const values = Array.isArray(existing) ? [...existing] : []
+      if (previous) {
+        const index = values.indexOf(previous)
+        if (index !== -1) values.splice(index, 1)
+      }
+      if (!values.includes(text)) values.push(text)
+      answer(current.key, values)
+    }
+
+    if (!isTextual && !isMulti) {
+      const invalid = validateValue(current, text)
+      if (invalid) {
+        setStore("error", invalid)
+        return false
+      }
+      answer(current.key, text)
+    }
+
+    const configured = current.type === "string" && current.options?.some((option) => option.value === text)
+    setStore("custom", { ...store.custom, [current.key]: isMulti || configured ? "" : text })
+    setStore("editing", false)
+    return true
+  }
+
+  function submitInput(text: string, direction: 1 | -1 = 1) {
+    if (!commitInput(text)) {
+      if (direction === -1) selectTab((store.tab + direction + tabs()) % tabs())
+      return
+    }
+    if (!single()) selectTab((store.tab + direction + tabs()) % tabs())
+  }
+
+  function selectTabFromMouse(target?: Field) {
+    const targetIndex = () => {
+      const index = target ? fields().findIndex((field) => field.key === target.key) : fields().length
+      return index === -1 ? fields().length : index
+    }
+    const move = () => selectTab(targetIndex())
+    if (!textual() && !store.editing) {
+      move()
+      return
+    }
+    if (!commitInput(textarea?.plainText?.trim() ?? "")) {
+      if (targetIndex() < store.tab) move()
+      return
+    }
+    move()
+  }
+
+  onMount(() => onCleanup(modeStack.push(FORM_MODE)))
+
+  useBindings(() => ({
+    mode: FORM_MODE,
+    enabled: (store.editing || textual()) && !confirm(),
+    commands: [
+      {
+        name: "prompt.clear",
+        title: "Clear answer edit",
+        category: "Form",
+        run() {
+          const text = textarea?.plainText ?? ""
+          if (!text) {
+            setStore("editing", false)
+            return
+          }
+          textarea?.setText("")
+        },
+      },
+    ],
+    bindings: [
+      {
+        key: "escape",
+        desc: "Cancel answer edit",
+        group: "Form",
+        cmd: () => {
+          if (textual()) {
+            void sdk.api.form.cancel({ sessionID: props.form.sessionID, formID: props.form.id })
+            return
+          }
+          setStore("editing", false)
+        },
+      },
+      ...tuiConfig.keybinds.get("prompt.clear"),
+      {
+        key: "tab",
+        desc: "Next field",
+        group: "Form",
+        cmd: () => {
+          const text = textarea?.plainText?.trim() ?? ""
+          submitInput(text)
+        },
+      },
+      {
+        key: "shift+tab",
+        desc: "Previous field",
+        group: "Form",
+        cmd: () => {
+          const text = textarea?.plainText?.trim() ?? ""
+          submitInput(text, -1)
+        },
+      },
+      {
+        key: "return",
+        desc: "Submit answer edit",
+        group: "Form",
+        cmd: () => {
+          const text = textarea?.plainText?.trim() ?? ""
+          const current = field()
+          if (!current) return
+          if (textual()) {
+            submitInput(text)
+            return
+          }
+          const wasMulti = multi()
+          if (!commitInput(text) || wasMulti || !text) return
+          if (single()) {
+            replySingle(current, text)
+            return
+          }
+          selectTab(store.tab + 1)
+        },
+      },
+    ],
+  }))
+
+  useBindings(() => {
+    const total = rows().length + (custom() ? 1 : 0)
+    const max = Math.min(total, 9)
+
+    return {
+      mode: FORM_MODE,
+      enabled: !store.editing && !textual(),
+      commands: [
+        {
+          name: "app.exit",
+          title: "Dismiss form",
+          category: "Form",
+          run() {
+            void sdk.api.form.cancel({ sessionID: props.form.sessionID, formID: props.form.id })
+          },
+        },
+      ],
+      bindings: [
+        {
+          key: "left",
+          desc: "Previous field",
+          group: "Form",
+          cmd: () => selectTab((store.tab - 1 + tabs()) % tabs()),
+        },
+        {
+          key: "h",
+          desc: "Previous field",
+          group: "Form",
+          cmd: () => selectTab((store.tab - 1 + tabs()) % tabs()),
+        },
+        { key: "right", desc: "Next field", group: "Form", cmd: () => selectTab((store.tab + 1) % tabs()) },
+        { key: "l", desc: "Next field", group: "Form", cmd: () => selectTab((store.tab + 1) % tabs()) },
+        {
+          key: "tab",
+          desc: "Next field",
+          group: "Form",
+          cmd: () => selectTab((store.tab + 1) % tabs()),
+        },
+        {
+          key: "shift+tab",
+          desc: "Previous field",
+          group: "Form",
+          cmd: () => selectTab((store.tab - 1 + tabs()) % tabs()),
+        },
+        ...(confirm()
+          ? [
+              {
+                key: "return",
+                desc: "Submit form",
+                group: "Form",
+                cmd: () => {
+                  const invalid = fields().find((field) => validateValue(field, store.answers[field.key]))
+                  if (invalid) {
+                    setStore("error", validateValue(invalid, store.answers[invalid.key]) ?? "Invalid answer")
+                    return
+                  }
+                  sdk.api.form
+                    .reply({
+                      sessionID: props.form.sessionID,
+                      formID: props.form.id,
+                      answer: Object.fromEntries(
+                        fields().flatMap((field) => {
+                          const value = store.answers[field.key]
+                          return value === undefined ? [] : [[field.key, value] as const]
+                        }),
+                      ),
+                    })
+                    .catch((error: unknown) => {
+                      setStore(
+                        "error",
+                        typeof error === "object" &&
+                          error !== null &&
+                          "message" in error &&
+                          typeof error.message === "string"
+                          ? error.message
+                          : "Invalid answer",
+                      )
+                    })
+                },
+              },
+              {
+                key: "escape",
+                desc: "Dismiss form",
+                group: "Form",
+                cmd: () => {
+                  void sdk.api.form.cancel({ sessionID: props.form.sessionID, formID: props.form.id })
+                },
+              },
+              { key: "up", desc: "Scroll review", group: "Form", cmd: () => review?.scrollBy(-1) },
+              { key: "k", desc: "Scroll review", group: "Form", cmd: () => review?.scrollBy(-1) },
+              { key: "down", desc: "Scroll review", group: "Form", cmd: () => review?.scrollBy(1) },
+              { key: "j", desc: "Scroll review", group: "Form", cmd: () => review?.scrollBy(1) },
+              ...tuiConfig.keybinds.get("app.exit"),
+            ]
+          : [
+              ...Array.from({ length: max }, (_, index) => ({
+                key: String(index + 1),
+                desc: `Select answer ${index + 1}`,
+                group: "Form",
+                cmd: () => {
+                  setStore("selected", index)
+                  selectOption()
+                },
+              })),
+              {
+                key: "up",
+                desc: "Previous answer",
+                group: "Form",
+                cmd: () => setStore("selected", (store.selected - 1 + total) % total),
+              },
+              {
+                key: "k",
+                desc: "Previous answer",
+                group: "Form",
+                cmd: () => setStore("selected", (store.selected - 1 + total) % total),
+              },
+              {
+                key: "down",
+                desc: "Next answer",
+                group: "Form",
+                cmd: () => setStore("selected", (store.selected + 1) % total),
+              },
+              {
+                key: "j",
+                desc: "Next answer",
+                group: "Form",
+                cmd: () => setStore("selected", (store.selected + 1) % total),
+              },
+              { key: "return", desc: "Select answer", group: "Form", cmd: () => selectOption() },
+              {
+                key: "escape",
+                desc: "Dismiss form",
+                group: "Form",
+                cmd: () => {
+                  void sdk.api.form.cancel({ sessionID: props.form.sessionID, formID: props.form.id })
+                },
+              },
+              ...tuiConfig.keybinds.get("app.exit"),
+            ]),
+      ],
+    }
+  })
+
+  return (
+    <box
+      backgroundColor={theme.backgroundPanel}
+      border={["left"]}
+      borderColor={theme.accent}
+      customBorderChars={SplitBorder.customBorderChars}
+    >
+      <box gap={1} paddingLeft={1} paddingRight={3} paddingTop={1} paddingBottom={1}>
+        <Show when={props.form.title}>
+          <box paddingLeft={1}>
+            <text fg={theme.textMuted}>{props.form.title}</text>
+          </box>
+        </Show>
+        <Show when={!single() && !tabbed()}>
+          <box flexDirection="row" gap={1} paddingLeft={1}>
+            <text fg={theme.textMuted}>
+              {confirm() ? "Review" : `Field ${Math.min(store.tab, fields().length - 1) + 1} of ${fields().length}`}
+            </text>
+            <text fg={theme.textMuted}>
+              · {answered()}/{fields().length} answered
+            </text>
+          </box>
+        </Show>
+        <Show when={!single() && tabbed()}>
+          <box flexDirection="row" gap={1} paddingLeft={1}>
+            <For each={fields()}>
+              {(item, index) => {
+                const isTab = () => index() === store.tab
+                const isAnswered = () => store.answers[item.key] !== undefined
+                return (
+                  <box
+                    paddingLeft={1}
+                    paddingRight={1}
+                    backgroundColor={
+                      isTab() ? theme.accent : tabHover() === index() ? theme.backgroundElement : theme.backgroundPanel
+                    }
+                    onMouseOver={() => setTabHover(index())}
+                    onMouseOut={() => setTabHover(null)}
+                    onMouseUp={() => {
+                      if (renderer.getSelection()?.getSelectedText()) return
+                      selectTabFromMouse(item)
+                    }}
+                  >
+                    <text
+                      fg={
+                        isTab() ? selectedForeground(theme, theme.accent) : isAnswered() ? theme.text : theme.textMuted
+                      }
+                    >
+                      {truncate(fieldLabel(item), 24)}
+                    </text>
+                  </box>
+                )
+              }}
+            </For>
+            <box
+              paddingLeft={1}
+              paddingRight={1}
+              backgroundColor={
+                confirm() ? theme.accent : tabHover() === "confirm" ? theme.backgroundElement : theme.backgroundPanel
+              }
+              onMouseOver={() => setTabHover("confirm")}
+              onMouseOut={() => setTabHover(null)}
+              onMouseUp={() => {
+                if (renderer.getSelection()?.getSelectedText()) return
+                selectTabFromMouse()
+              }}
+            >
+              <text fg={confirm() ? selectedForeground(theme, theme.accent) : theme.textMuted}>Confirm</text>
+            </box>
+          </box>
+        </Show>
+
+        <Show when={!confirm() && field()}>
+          <box paddingLeft={1} gap={1}>
+            <box>
+              <text fg={theme.text}>
+                {field()!.description ?? fieldLabel(field()!)}
+                {field()!.required ? " (required)" : ""}
+                {multi() ? " (select all that apply)" : ""}
+              </text>
+            </box>
+            <Show when={textual() ? field()!.key : undefined} keyed>
+              <box paddingLeft={1}>
+                <textarea
+                  ref={(val: TextareaRenderable) => {
+                    textarea = val
+                    val.traits = { status: "ANSWER" }
+                    queueMicrotask(() => {
+                      val.focus()
+                      val.gotoLineEnd()
+                    })
+                  }}
+                  initialValue={input() || display(field()!, store.answers[field()!.key])}
+                  placeholder={placeholder()}
+                  placeholderColor={theme.textMuted}
+                  minHeight={1}
+                  maxHeight={6}
+                  textColor={theme.text}
+                  focusedTextColor={theme.text}
+                  cursorColor={theme.primary}
+                />
+              </box>
+            </Show>
+            <Show when={!textual()}>
+              <box>
+                <For each={rows()}>
+                  {(row, i) => {
+                    const active = () => i() === store.selected
+                    const picked = () => {
+                      const value = store.answers[field()?.key ?? ""]
+                      if (Array.isArray(value)) return value.includes(String(row.value))
+                      return value === row.value
+                    }
+                    return (
+                      <box
+                        onMouseOver={() => setStore("selected", i())}
+                        onMouseDown={() => setStore("selected", i())}
+                        onMouseUp={() => {
+                          if (renderer.getSelection()?.getSelectedText()) return
+                          selectOption()
+                        }}
+                      >
+                        <box flexDirection="row">
+                          <box backgroundColor={active() ? theme.backgroundElement : undefined} paddingRight={1}>
+                            <text fg={active() ? tint(theme.textMuted, theme.secondary, 0.6) : theme.textMuted}>
+                              {`${i() + 1}.`}
+                            </text>
+                          </box>
+                          <box backgroundColor={active() ? theme.backgroundElement : undefined}>
+                            <text fg={active() ? theme.secondary : picked() ? theme.success : theme.text}>
+                              {multi() ? `[${picked() ? "✓" : " "}] ${row.label}` : row.label}
+                            </text>
+                          </box>
+                          <Show when={!multi()}>
+                            <text fg={theme.success}>{picked() ? " ✓" : ""}</text>
+                          </Show>
+                        </box>
+                        <Show when={row.description}>
+                          <box paddingLeft={3}>
+                            <text fg={theme.textMuted}>{row.description}</text>
+                          </box>
+                        </Show>
+                      </box>
+                    )
+                  }}
+                </For>
+                <Show when={custom()}>
+                  <box
+                    onMouseOver={() => setStore("selected", rows().length)}
+                    onMouseDown={() => setStore("selected", rows().length)}
+                    onMouseUp={() => {
+                      if (renderer.getSelection()?.getSelectedText()) return
+                      selectOption()
+                    }}
+                  >
+                    <box flexDirection="row">
+                      <box backgroundColor={other() ? theme.backgroundElement : undefined} paddingRight={1}>
+                        <text fg={other() ? tint(theme.textMuted, theme.secondary, 0.6) : theme.textMuted}>
+                          {`${rows().length + 1}.`}
+                        </text>
+                      </box>
+                      <box backgroundColor={other() ? theme.backgroundElement : undefined}>
+                        <text fg={other() ? theme.secondary : customPicked() ? theme.success : theme.text}>
+                          {multi() ? `[${customPicked() ? "✓" : " "}] Type your own answer` : "Type your own answer"}
+                        </text>
+                      </box>
+                      <Show when={!multi()}>
+                        <text fg={theme.success}>{customPicked() ? " ✓" : ""}</text>
+                      </Show>
+                    </box>
+                    <Show when={store.editing}>
+                      <box paddingLeft={3}>
+                        <textarea
+                          ref={(val: TextareaRenderable) => {
+                            textarea = val
+                            val.traits = { status: "ANSWER" }
+                            queueMicrotask(() => {
+                              val.focus()
+                              val.gotoLineEnd()
+                            })
+                          }}
+                          initialValue={input()}
+                          placeholder="Type your own answer"
+                          placeholderColor={theme.textMuted}
+                          minHeight={1}
+                          maxHeight={6}
+                          textColor={theme.text}
+                          focusedTextColor={theme.text}
+                          cursorColor={theme.primary}
+                        />
+                      </box>
+                    </Show>
+                    <Show when={!store.editing && input()}>
+                      <box paddingLeft={3}>
+                        <text fg={theme.textMuted}>{input()}</text>
+                      </box>
+                    </Show>
+                  </box>
+                </Show>
+              </box>
+            </Show>
+          </box>
+        </Show>
+
+        <Show when={confirm()}>
+          <Show when={tabbed()}>
+            <box paddingLeft={1}>
+              <text fg={theme.text}>Review</text>
+            </box>
+          </Show>
+          <scrollbox
+            maxHeight={Math.min(fields().length, Math.max(3, dimensions().height - 14))}
+            scrollbarOptions={{ visible: false }}
+            ref={(r: ScrollBoxRenderable) => (review = r)}
+          >
+            <For each={fields()}>
+              {(item) => {
+                const value = () => display(item, store.answers[item.key])
+                const answered = () => {
+                  const value = store.answers[item.key]
+                  return value !== undefined
+                }
+                const missing = () => !answered() && item.required === true
+                const invalid = () => validateValue(item, store.answers[item.key])
+                return (
+                  <box paddingLeft={1}>
+                    <text>
+                      <span style={{ fg: theme.textMuted }}>{truncate(fieldLabel(item), 40)}:</span>{" "}
+                      <span
+                        style={{ fg: invalid() || missing() ? theme.error : answered() ? theme.text : theme.textMuted }}
+                      >
+                        {invalid() ?? (answered() ? value() : missing() ? "(required)" : "(not answered)")}
+                      </span>
+                    </text>
+                  </box>
+                )
+              }}
+            </For>
+          </scrollbox>
+        </Show>
+      </box>
+      <box
+        flexDirection="row"
+        flexShrink={0}
+        gap={1}
+        paddingLeft={2}
+        paddingRight={3}
+        paddingBottom={1}
+        justifyContent="space-between"
+      >
+        <box flexDirection="row" gap={2}>
+          <Show when={!single()}>
+            <text fg={theme.text}>
+              {"⇆"} <span style={{ fg: theme.textMuted }}>tab</span>
+            </text>
+          </Show>
+          <Show when={!confirm() && !textual()}>
+            <text fg={theme.text}>
+              {"↑↓"} <span style={{ fg: theme.textMuted }}>select</span>
+            </text>
+          </Show>
+          <Show when={confirm()}>
+            <text fg={theme.text}>
+              {"↑↓"} <span style={{ fg: theme.textMuted }}>scroll</span>
+            </text>
+          </Show>
+          <text fg={theme.text}>
+            enter{" "}
+            <span style={{ fg: theme.textMuted }}>
+              {confirm() ? "submit" : multi() ? "toggle" : single() ? "submit" : "confirm"}
+            </span>
+          </text>
+          <text fg={theme.text}>
+            esc <span style={{ fg: theme.textMuted }}>dismiss</span>
+          </text>
+        </box>
+        <Show when={store.error}>
+          <text fg={theme.error}>{store.error}</text>
+        </Show>
+      </box>
+    </box>
+  )
+}
diff --git a/packages/tui/src/routes/session/index.tsx b/packages/tui/src/routes/session/index.tsx
index dd9fd34d07..83f64ba27f 100644
--- a/packages/tui/src/routes/session/index.tsx
+++ b/packages/tui/src/routes/session/index.tsx
@@ -59,6 +59,7 @@ import { useEpilogue } from "../../context/epilogue"
 import { normalizePath } from "../../util/path"
 import { PermissionPrompt } from "./permission"
 import { QuestionPrompt } from "./question"
+import { FormPrompt } from "./form"
 import { DialogExportOptions } from "../../ui/dialog-export-options"
 import { sessionEpilogue } from "../../util/presentation"
 import { useTuiConfig } from "../../config"
@@ -185,11 +186,15 @@ export function Session() {
     if (session()?.parentID) return []
     return data.session.question.list(route.sessionID) ?? []
   })
+  const forms = createMemo(() => {
+    if (session()?.parentID) return []
+    return data.session.form.list(route.sessionID) ?? []
+  })
   const [composer, setComposer] = createStore({
     open: false,
     tab: undefined as string | undefined,
   })
-  const disabled = createMemo(() => permissions().length > 0 || questions().length > 0)
+  const disabled = createMemo(() => permissions().length > 0 || questions().length > 0 || forms().length > 0)
 
   const pending = createMemo(() => {
     const completed = messages().findLast((x) => x.type === "assistant" && x.time.completed)?.id
@@ -247,6 +252,7 @@ export function Session() {
         data.session.refresh(sessionID),
         data.session.permission.refresh(sessionID),
         data.session.question.refresh(sessionID),
+        data.session.form.refresh(sessionID),
       ])
       const info = data.session.get(sessionID)
       if (!info) {
@@ -258,7 +264,6 @@ export function Session() {
         navigate({ type: "home" })
         return
       }
-
       project.workspace.set(info.location.workspaceID)
       editor.reconnect(info.location.directory)
       if (route.sessionID === sessionID && scroll) scroll.scrollBy(100_000)
@@ -942,6 +947,14 @@ export function Session() {
                   <Match when={questions().length > 0}>
                     <QuestionPrompt request={questions()[0]} directory={session()?.location.directory} />
                   </Match>
+                  <Match when={forms().length > 0}>
+                    <Show when={forms()[0]?.id} keyed>
+                      {(_) => {
+                        const form = forms()[0]
+                        return form ? <FormPrompt form={form} /> : null
+                      }}
+                    </Show>
+                  </Match>
                   <Match when={!disabled()}>
                     <pluginRuntime.Slot
                       name="session_prompt"
diff --git a/packages/tui/test/cli/cmd/tui/notifications.test.ts b/packages/tui/test/cli/cmd/tui/notifications.test.ts
index 44cd98b133..0014292d23 100644
--- a/packages/tui/test/cli/cmd/tui/notifications.test.ts
+++ b/packages/tui/test/cli/cmd/tui/notifications.test.ts
@@ -72,6 +72,15 @@ function question(id: string, sessionID = "session"): QuestionRequest {
   }
 }
 
+function form(id: string, sessionID = "session"): Extract<V2Event, { type: "form.created" }>["data"]["form"] {
+  return {
+    id,
+    sessionID,
+    mode: "form",
+    fields: [],
+  }
+}
+
 function permission(id: string, sessionID = "session"): PermissionRequest {
   return {
     id,
@@ -139,6 +148,13 @@ const questionNotification: TuiAttentionNotifyInput = {
   sound: { name: "question", when: "always" },
 }
 
+const formNotification: TuiAttentionNotifyInput = {
+  title: "Demo session",
+  message: "Input needs response",
+  notification: { when: "blurred" },
+  sound: { name: "question", when: "always" },
+}
+
 const permissionNotification: TuiAttentionNotifyInput = {
   title: "Demo session",
   message: "Permission needs input",
@@ -147,39 +163,60 @@ const permissionNotification: TuiAttentionNotifyInput = {
 }
 
 describe("internal notifications TUI plugin", () => {
-  test("notifies for question and permission requests with blurred notifications and always-on sounds", async () => {
+  test("notifies for form, question, and permission requests with blurred notifications and always-on sounds", async () => {
     const harness = await setup()
 
-    harness.emit({ id: "event-1", created: 0, type: "question.asked", data: question("question-1") })
-    harness.emit({ id: "event-2", created: 0, type: "permission.asked", data: permission("permission-1") })
+    harness.emit({ id: "event-1", created: 0, type: "form.created", data: { form: form("form-1") } })
+    harness.emit({ id: "event-2", created: 0, type: "question.asked", data: question("question-1") })
+    harness.emit({ id: "event-3", created: 0, type: "permission.asked", data: permission("permission-1") })
 
-    expect(harness.notifications).toEqual([questionNotification, permissionNotification])
+    expect(harness.notifications).toEqual([formNotification, questionNotification, permissionNotification])
   })
 
-  test("dedupes pending questions and permissions until they are resolved", async () => {
+  test("ignores global forms until the TUI can render them", async () => {
     const harness = await setup()
 
-    harness.emit({ id: "event-1", created: 0, type: "question.asked", data: question("question-1") })
-    harness.emit({ id: "event-2", created: 0, type: "question.asked", data: question("question-1") })
+    harness.emit({ id: "event-1", created: 0, type: "form.created", data: { form: form("form-1", "global") } })
+
+    expect(harness.notifications).toEqual([])
+  })
+
+  test("dedupes pending forms, questions, and permissions until they are resolved", async () => {
+    const harness = await setup()
+
+    harness.emit({ id: "event-1", created: 0, type: "form.created", data: { form: form("form-1") } })
+    harness.emit({ id: "event-2", created: 0, type: "form.created", data: { form: form("form-1") } })
     harness.emit({
       id: "event-3",
       created: 0,
+      type: "form.cancelled",
+      data: { sessionID: "session", id: "form-1" },
+    })
+    harness.emit({ id: "event-4", created: 0, type: "form.created", data: { form: form("form-1") } })
+
+    harness.emit({ id: "event-5", created: 0, type: "question.asked", data: question("question-1") })
+    harness.emit({ id: "event-6", created: 0, type: "question.asked", data: question("question-1") })
+    harness.emit({
+      id: "event-7",
+      created: 0,
       type: "question.replied",
       data: { sessionID: "session", requestID: "question-1", answers: [] },
     })
-    harness.emit({ id: "event-4", created: 0, type: "question.asked", data: question("question-1") })
+    harness.emit({ id: "event-8", created: 0, type: "question.asked", data: question("question-1") })
 
-    harness.emit({ id: "event-5", created: 0, type: "permission.asked", data: permission("permission-1") })
-    harness.emit({ id: "event-6", created: 0, type: "permission.asked", data: permission("permission-1") })
+    harness.emit({ id: "event-9", created: 0, type: "permission.asked", data: permission("permission-1") })
+    harness.emit({ id: "event-10", created: 0, type: "permission.asked", data: permission("permission-1") })
     harness.emit({
-      id: "event-7",
+      id: "event-11",
       created: 0,
       type: "permission.replied",
       data: { sessionID: "session", requestID: "permission-1", reply: "once" },
     })
-    harness.emit({ id: "event-8", created: 0, type: "permission.asked", data: permission("permission-1") })
+    harness.emit({ id: "event-12", created: 0, type: "permission.asked", data: permission("permission-1") })
 
     expect(harness.notifications).toEqual([
+      formNotification,
+      formNotification,
       questionNotification,
       questionNotification,
       permissionNotification,
@@ -207,14 +244,19 @@ describe("internal notifications TUI plugin", () => {
   test("uses sound-only notifications and subagent_done sound for subagent sessions", async () => {
     const harness = await setup()
 
-    harness.emit({ id: "event-1", created: 0, type: "question.asked", data: question("question-1", "subagent") })
+    harness.emit({
+      id: "event-1",
+      created: 0,
+      type: "form.created",
+      data: { form: form("form-1", "subagent") },
+    })
     harness.emit(stepStarted("event-2", "subagent"))
     harness.emit(stepEnded("event-3", "subagent"))
 
     expect(harness.notifications).toEqual([
       {
         title: "Subagent session",
-        message: "Question needs input",
+        message: "Input needs response",
         notification: false,
         sound: { name: "question", when: "always" },
       },
diff --git a/packages/tui/test/cli/tui/data.test.tsx b/packages/tui/test/cli/tui/data.test.tsx
index d9e82c2d3c..b14b8a2124 100644
--- a/packages/tui/test/cli/tui/data.test.tsx
+++ b/packages/tui/test/cli/tui/data.test.tsx
@@ -807,6 +807,76 @@ test("adds and dismisses permission requests from live events", async () => {
   }
 })
 
+test("adds, dismisses, and refreshes form requests", async () => {
+  const events = createEventStream()
+  const calls = createFetch((url) => {
+    if (url.pathname !== "/api/session/ses_1/form") return
+    return json({ data: [{ id: "frm_remote", sessionID: "ses_1", mode: "form", fields: [] }] })
+  }, events)
+  let data!: ReturnType<typeof useData>
+
+  function Probe() {
+    data = useData()
+    return <box />
+  }
+
+  const app = await testRender(() => (
+    <TestTuiContexts>
+      <SDKProvider client={createClient(calls.fetch)} api={createApi(calls.fetch)}>
+        <ProjectProvider>
+          <DataProvider>
+            <Probe />
+          </DataProvider>
+        </ProjectProvider>
+      </SDKProvider>
+    </TestTuiContexts>
+  ))
+
+  try {
+    await wait(() => data.connection.status() === "connected")
+    emitEvent(events, {
+      id: "evt_form_created_1",
+      created: 0,
+      type: "form.created",
+      data: { form: { id: "frm_1", sessionID: "ses_1", mode: "form", fields: [] } },
+    })
+    emitEvent(events, {
+      id: "evt_form_created_duplicate",
+      created: 1,
+      type: "form.created",
+      data: { form: { id: "frm_1", sessionID: "ses_1", mode: "form", fields: [] } },
+    })
+    await wait(() => data.session.form.list("ses_1")?.length === 1)
+
+    emitEvent(events, {
+      id: "evt_form_replied_1",
+      created: 2,
+      type: "form.replied",
+      data: { sessionID: "ses_1", id: "frm_1", answer: {} },
+    })
+    await wait(() => data.session.form.list("ses_1")?.length === 0)
+
+    emitEvent(events, {
+      id: "evt_form_created_2",
+      created: 3,
+      type: "form.created",
+      data: { form: { id: "frm_2", sessionID: "ses_1", mode: "form", fields: [] } },
+    })
+    emitEvent(events, {
+      id: "evt_form_cancelled_2",
+      created: 4,
+      type: "form.cancelled",
+      data: { sessionID: "ses_1", id: "frm_2" },
+    })
+    await wait(() => data.session.form.list("ses_1")?.length === 0)
+
+    await data.session.form.refresh("ses_1")
+    expect(data.session.form.list("ses_1")?.map((form) => form.id)).toEqual(["frm_remote"])
+  } finally {
+    app.renderer.destroy()
+  }
+})
+
 test("adds and dismisses question requests from live events", async () => {
   const events = createEventStream()
   const calls = createFetch(undefined, events)
diff --git a/packages/tui/test/fixture/tui-sdk.ts b/packages/tui/test/fixture/tui-sdk.ts
index a486e6445d..5ebe0a63f4 100644
--- a/packages/tui/test/fixture/tui-sdk.ts
+++ b/packages/tui/test/fixture/tui-sdk.ts
@@ -95,10 +95,13 @@ export function createFetch(override?: FetchHandler, events?: ReturnType<typeof
     if (url.pathname === "/api/location") return json({ directory, project: { id: "proj_test", directory: worktree } })
     if (url.pathname === "/api/project/current") return json({ id: "proj_test", directory: worktree })
     if (url.pathname === "/api/project/proj_test/directories") return json([{ directory: worktree }])
-    if (url.pathname === "/api/shell") return json({ location: { directory, project: { id: "proj_test", directory: worktree } }, data: [] })
-    if (url.pathname === "/api/mcp") return json({ location: { directory, project: { id: "proj_test", directory: worktree } }, data: [] })
+    if (url.pathname === "/api/shell")
+      return json({ location: { directory, project: { id: "proj_test", directory: worktree } }, data: [] })
+    if (url.pathname === "/api/mcp")
+      return json({ location: { directory, project: { id: "proj_test", directory: worktree } }, data: [] })
     if (url.pathname === "/api/session") return json({ data: [], cursor: {} })
     if (url.pathname === "/api/session/active") return json({ data: {}, watermarks: {} })
+    if (/^\/api\/session\/[^/]+\/form$/.test(url.pathname)) return json({ data: [] })
     if (
       ["/api/agent", "/api/model", "/api/provider", "/api/integration", "/api/command", "/api/skill"].includes(
         url.pathname,

From 780c99bc2e64cc318985ae43c35def0bec106dbe Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Sun, 5 Jul 2026 22:28:05 -0500
Subject: [PATCH 74/82] refactor(core): route questions through forms (#35422)

---
 packages/core/src/form.ts                    |  11 +-
 packages/core/src/location-services.ts       |   2 +-
 packages/core/src/plugin/internal.ts         |   6 +-
 packages/core/src/session/runner/llm.ts      |  14 +-
 packages/core/src/tool/question.ts           |  44 +-
 packages/core/test/form.test.ts              |  23 +-
 packages/core/test/session-runner.test.ts    |  17 +-
 packages/core/test/tool-question.test.ts     |  86 +++-
 packages/tui/src/context/data.tsx            |  29 --
 packages/tui/src/routes/session/index.tsx    |  11 +-
 packages/tui/src/routes/session/question.tsx | 514 -------------------
 packages/tui/test/cli/tui/data.test.tsx      |  67 ---
 12 files changed, 150 insertions(+), 674 deletions(-)
 delete mode 100644 packages/tui/src/routes/session/question.tsx

diff --git a/packages/core/src/form.ts b/packages/core/src/form.ts
index d49129b3b8..7cdda87b4c 100644
--- a/packages/core/src/form.ts
+++ b/packages/core/src/form.ts
@@ -21,6 +21,7 @@ export type When = Form.When
 
 export const State = Form.State
 export type State = typeof State.Type
+export type TerminalState = Exclude<State, { readonly status: "pending" }>
 
 export const Answer = Form.Answer
 export type Answer = typeof Answer.Type
@@ -78,7 +79,7 @@ export interface ListInput {
 
 export interface Interface {
   readonly create: (input: CreateInput) => Effect.Effect<Info, AlreadyExistsError | InvalidFormError>
-  readonly ask: (input: CreateInput) => Effect.Effect<State, AlreadyExistsError | InvalidFormError>
+  readonly ask: (input: CreateInput) => Effect.Effect<TerminalState, AlreadyExistsError | InvalidFormError>
   readonly get: (id: ID) => Effect.Effect<Info, NotFoundError>
   readonly list: (input?: ListInput) => Effect.Effect<ReadonlyArray<Info>>
   readonly state: (id: ID) => Effect.Effect<State, NotFoundError>
@@ -91,7 +92,7 @@ export class Service extends Context.Service<Service, Interface>()("@opencode/Fo
 interface Entry {
   readonly form: Info
   readonly state: State
-  readonly deferred: Deferred.Deferred<State>
+  readonly deferred: Deferred.Deferred<TerminalState>
 }
 
 export const layer = Layer.effect(
@@ -141,7 +142,7 @@ export const layer = Layer.effect(
           const entry: Entry = {
             form,
             state: { status: "pending" },
-            deferred: yield* Deferred.make<State>(),
+            deferred: yield* Deferred.make<TerminalState>(),
           }
           yield* Cache.set(forms, id, entry)
           yield* events.publish(Event.Created, { form }).pipe(Effect.onError(() => Cache.invalidate(forms, id)))
@@ -185,7 +186,7 @@ export const layer = Layer.effect(
           if (entry.state.status !== "pending") return yield* new AlreadySettledError({ id: input.id })
           const invalid = validateAnswer(entry.form, input.answer)
           if (invalid) return yield* new InvalidAnswerError({ id: input.id, message: invalid })
-          const next: State = { status: "answered", answer: input.answer }
+          const next: TerminalState = { status: "answered", answer: input.answer }
           yield* events.publish(Event.Replied, { id: input.id, sessionID: entry.form.sessionID, answer: input.answer })
           yield* Cache.set(forms, input.id, { ...entry, state: next })
           yield* Deferred.succeed(entry.deferred, next)
@@ -198,7 +199,7 @@ export const layer = Layer.effect(
         Effect.gen(function* () {
           const entry = yield* find(id)
           if (entry.state.status !== "pending") return yield* new AlreadySettledError({ id })
-          const next: State = { status: "cancelled" }
+          const next: TerminalState = { status: "cancelled" }
           yield* events.publish(Event.Cancelled, { id, sessionID: entry.form.sessionID })
           yield* Cache.set(forms, id, { ...entry, state: next })
           yield* Deferred.succeed(entry.deferred, next)
diff --git a/packages/core/src/location-services.ts b/packages/core/src/location-services.ts
index bbb60482c1..21823f583b 100644
--- a/packages/core/src/location-services.ts
+++ b/packages/core/src/location-services.ts
@@ -81,7 +81,7 @@ const pluginSupervisorNode = makeLocationNode({
     Npm.node,
     PermissionV2.node,
     PluginRuntime.node,
-    QuestionV2.node,
+    Form.node,
     ReadToolFileSystem.node,
     Reference.node,
     Ripgrep.node,
diff --git a/packages/core/src/plugin/internal.ts b/packages/core/src/plugin/internal.ts
index 63637c96b0..2789cc3c2e 100644
--- a/packages/core/src/plugin/internal.ts
+++ b/packages/core/src/plugin/internal.ts
@@ -14,6 +14,7 @@ import { ConfigReferencePlugin } from "../config/plugin/reference"
 import { ConfigSkillPlugin } from "../config/plugin/skill"
 import { EventV2 } from "../event"
 import { FileMutation } from "../file-mutation"
+import { Form } from "../form"
 import { FileSystem } from "../filesystem"
 import { FSUtil } from "../fs-util"
 import { Global } from "../global"
@@ -24,7 +25,6 @@ import { LocationMutation } from "../location-mutation"
 import { ModelsDev } from "../models-dev"
 import { Npm } from "../npm"
 import { PermissionV2 } from "../permission"
-import { QuestionV2 } from "../question"
 import { Reference } from "../reference"
 import { Ripgrep } from "../ripgrep"
 import { SessionInstructions } from "../session/instructions"
@@ -73,7 +73,7 @@ const services = Effect.fn("PluginInternal.services")(function* () {
   const npm = yield* Npm.Service
   const permission = yield* PermissionV2.Service
   const runtime = yield* PluginRuntime.Service
-  const question = yield* QuestionV2.Service
+  const form = yield* Form.Service
   const read = yield* ReadToolFileSystem.Service
   const reference = yield* Reference.Service
   const ripgrep = yield* Ripgrep.Service
@@ -102,7 +102,7 @@ const services = Effect.fn("PluginInternal.services")(function* () {
     Context.make(Npm.Service, npm),
     Context.make(PermissionV2.Service, permission),
     Context.make(PluginRuntime.Service, runtime),
-    Context.make(QuestionV2.Service, question),
+    Context.make(Form.Service, form),
     Context.make(ReadToolFileSystem.Service, read),
     Context.make(Reference.Service, reference),
     Context.make(Ripgrep.Service, ripgrep),
diff --git a/packages/core/src/session/runner/llm.ts b/packages/core/src/session/runner/llm.ts
index 0aeaa0e052..d4b2c5250c 100644
--- a/packages/core/src/session/runner/llm.ts
+++ b/packages/core/src/session/runner/llm.ts
@@ -16,7 +16,6 @@ import { Config } from "../../config"
 import { Database } from "../../database/database"
 import { EventV2 } from "../../event"
 import { Location } from "../../location"
-import { QuestionV2 } from "../../question"
 import { SystemContext } from "../../system-context/index"
 import { SystemContextBuiltIns } from "../../system-context/builtins"
 import { InstructionContext } from "../../instruction-context"
@@ -24,6 +23,7 @@ import { SkillGuidance } from "../../skill/guidance"
 import { ReferenceGuidance } from "../../reference/guidance"
 import { McpGuidance } from "../../mcp/guidance"
 import { SessionContextEntry } from "../context-entry"
+import { QuestionTool } from "../../tool/question"
 import { ToolRegistry } from "../../tool/registry"
 import { ToolOutputStore } from "../../tool-output-store"
 import { SessionContextCheckpoint } from "../context-checkpoint"
@@ -149,9 +149,8 @@ const layer = Layer.effect(
     const awaitToolFibers = (fibers: FiberSet.FiberSet<void, ToolOutputStore.Error>) =>
       Effect.raceFirst(FiberSet.join(fibers), FiberSet.awaitEmpty(fibers))
 
-    // Match V1: dismissing a question halts the loop instead of becoming model-facing tool output.
-    const isQuestionRejected = (cause: Cause.Cause<unknown>) =>
-      cause.reasons.some((reason) => Cause.isDieReason(reason) && reason.defect instanceof QuestionV2.RejectedError)
+    const isQuestionCancelled = (cause: Cause.Cause<unknown>) =>
+      cause.reasons.some((reason) => Cause.isDieReason(reason) && reason.defect instanceof QuestionTool.CancelledError)
 
     const loadSystemContext = (agent: AgentV2.Selection, sessionID: SessionSchema.ID) =>
       Effect.all(
@@ -341,14 +340,13 @@ const layer = Layer.effect(
           if (streamInterrupted) yield* FiberSet.clear(toolFibers)
           const settled = yield* restore(awaitToolFibers(toolFibers)).pipe(Effect.exit)
           const toolsInterrupted = settled._tag === "Failure" && Cause.hasInterrupts(settled.cause)
-          const questionDismissed = settled._tag === "Failure" && isQuestionRejected(settled.cause)
+          const questionCancelled = settled._tag === "Failure" && isQuestionCancelled(settled.cause)
 
-          if (questionDismissed || streamInterrupted || toolsInterrupted) {
+          if (questionCancelled || streamInterrupted || toolsInterrupted) {
             yield* FiberSet.clear(toolFibers)
             yield* serialized(publisher.failUnsettledTools("Tool execution interrupted"))
             yield* serialized(publisher.failAssistant("Step interrupted"))
-            // Match V1: dismissing a question halts the loop like an interruption.
-            if (questionDismissed) return yield* Effect.interrupt
+            if (questionCancelled) return yield* Effect.interrupt
           }
           // A settled tool fiber failure is one of two things. A defect from a tool
           // implementation becomes a failed tool call the model can read, and the step still
diff --git a/packages/core/src/tool/question.ts b/packages/core/src/tool/question.ts
index 9bf4249add..dbabb01747 100644
--- a/packages/core/src/tool/question.ts
+++ b/packages/core/src/tool/question.ts
@@ -3,6 +3,7 @@ export * as QuestionTool from "./question"
 import type { PluginContext } from "@opencode-ai/plugin/v2/effect"
 import { ToolFailure } from "@opencode-ai/llm"
 import { Effect, Schema } from "effect"
+import { Form } from "../form"
 import { PermissionV2 } from "../permission"
 import { QuestionV2 } from "../question"
 import { Tool } from "./tool"
@@ -29,6 +30,12 @@ export const Output = Schema.Struct({
 })
 export type Output = typeof Output.Type
 
+export class CancelledError extends Schema.TaggedErrorClass<CancelledError>()("QuestionTool.CancelledError", {}) {
+  override get message() {
+    return "The user dismissed this question"
+  }
+}
+
 export const toModelOutput = (
   questions: ReadonlyArray<QuestionV2.Prompt>,
   answers: ReadonlyArray<QuestionV2.Answer>,
@@ -45,7 +52,7 @@ export const toModelOutput = (
 export const Plugin = {
   id: "opencode.tool.question",
   effect: Effect.fn("QuestionTool.Plugin")(function* (ctx: PluginContext) {
-    const question = yield* QuestionV2.Service
+    const forms = yield* Form.Service
     const permission = yield* PermissionV2.Service
 
     yield* ctx.tool
@@ -69,15 +76,42 @@ export const Plugin = {
               .pipe(
                 Effect.mapError(() => new ToolFailure({ message: "Permission denied: question" })),
                 Effect.andThen(
-                  question
+                  forms
                     .ask({
                       sessionID: context.sessionID,
-                      questions: input.questions,
-                      tool: { messageID: context.assistantMessageID, callID: context.toolCallID },
+                      metadata: {
+                        kind: "question",
+                        tool: { messageID: context.assistantMessageID, callID: context.toolCallID },
+                      },
+                      mode: "form",
+                      fields: input.questions.map(
+                        (question, index): Form.Field => ({
+                          key: `q${index}`,
+                          title: question.header,
+                          description: question.question,
+                          type: question.multiple === true ? "multiselect" : "string",
+                          options: question.options.map((option) => ({
+                            value: option.label,
+                            label: option.label,
+                            description: option.description,
+                          })),
+                        custom: true,
+                        }),
+                      ),
                     })
                     .pipe(Effect.orDie),
                 ),
-                Effect.map((answers) => ({ answers })),
+                Effect.flatMap((state) => {
+                  if (state.status === "cancelled") return Effect.die(new CancelledError())
+                  return Effect.succeed({
+                    answers: input.questions.map((_, index): QuestionV2.Answer => {
+                      const value = state.answer[`q${index}`]
+                      if (value === undefined) return []
+                      if (typeof value === "object") return Array.from(value)
+                      return [String(value)]
+                    }),
+                  })
+                }),
               ),
         }),
       })
diff --git a/packages/core/test/form.test.ts b/packages/core/test/form.test.ts
index e032cf6c71..8defff611f 100644
--- a/packages/core/test/form.test.ts
+++ b/packages/core/test/form.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect } from "bun:test"
-import { Effect, Exit } from "effect"
+import { Deferred, Effect, Exit, Fiber } from "effect"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { EventV2 } from "@opencode-ai/core/event"
@@ -19,6 +19,27 @@ const input = {
 } satisfies Form.CreateInput
 
 describe("Form", () => {
+  it.effect("returns a terminal cancelled state from ask", () =>
+    Effect.gen(function* () {
+      const service = yield* Form.Service
+      const events = yield* EventV2.Service
+      const created = yield* Deferred.make<Form.Info>()
+      const unsubscribe = yield* events.listen((event) =>
+        event.type === Form.Event.Created.type
+          ? Deferred.succeed(created, (event.data as { readonly form: Form.Info }).form).pipe(Effect.asVoid)
+          : Effect.void,
+      )
+      yield* Effect.addFinalizer(() => unsubscribe)
+      const fiber = yield* service.ask(input).pipe(Effect.forkScoped)
+      const form = yield* Deferred.await(created)
+
+      yield* service.cancel(form.id)
+
+      expect(yield* Fiber.join(fiber)).toEqual({ status: "cancelled" })
+      expect(yield* service.state(form.id)).toEqual({ status: "cancelled" })
+    }),
+  )
+
   it.effect("supports the temporary global mcp elicitation owner", () =>
     Effect.gen(function* () {
       const service = yield* Form.Service
diff --git a/packages/core/test/session-runner.test.ts b/packages/core/test/session-runner.test.ts
index 6856b6a7ce..cdf1ae37d4 100644
--- a/packages/core/test/session-runner.test.ts
+++ b/packages/core/test/session-runner.test.ts
@@ -21,7 +21,7 @@ import { PermissionV2 } from "@opencode-ai/core/permission"
 import { EventTable } from "@opencode-ai/core/event/sql"
 import { Project } from "@opencode-ai/core/project"
 import { ProjectTable } from "@opencode-ai/core/project/sql"
-import { QuestionV2 } from "@opencode-ai/core/question"
+import { Form } from "@opencode-ai/core/form"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { SessionV2 } from "@opencode-ai/core/session"
 import { Snapshot } from "@opencode-ai/core/snapshot"
@@ -39,6 +39,7 @@ import * as SessionRunnerLLM from "@opencode-ai/core/session/runner/llm"
 import { SessionRunnerModel } from "@opencode-ai/core/session/runner/model"
 import { SessionRunnerSystemPrompt } from "@opencode-ai/core/session/runner/system-prompt"
 import { ToolRegistry } from "@opencode-ai/core/tool/registry"
+import { QuestionTool } from "@opencode-ai/core/tool/question"
 import { ToolOutputStore } from "@opencode-ai/core/tool-output-store"
 import { AgentV2 } from "@opencode-ai/core/agent"
 import { Config } from "@opencode-ai/core/config"
@@ -276,7 +277,7 @@ const it = testEffect(
     LayerNode.group([
       Database.node,
       EventV2.node,
-      QuestionV2.node,
+      Form.node,
       SessionProjector.node,
       SessionStore.node,
       AgentV2.node,
@@ -2822,19 +2823,17 @@ describe("SessionRunnerLLM", () => {
     }),
   )
 
-  it.effect("interrupts runner continuation when a question is dismissed", () =>
+  it.effect("interrupts runner continuation when a question is cancelled", () =>
     Effect.gen(function* () {
       yield* setup
       const session = yield* SessionV2.Service
       const registry = yield* ToolRegistry.Service
-      const questions = yield* QuestionV2.Service
       yield* registry.register({
         question: Tool.make({
           description: "Ask the user",
           input: Schema.Struct({}),
           output: Schema.Struct({}),
-          execute: (_, context) =>
-            questions.ask({ sessionID: context.sessionID, questions: [] }).pipe(Effect.as({}), Effect.orDie),
+          execute: () => Effect.die(new QuestionTool.CancelledError()),
         }),
       })
       yield* session.prompt({ sessionID, prompt: Prompt.make({ text: "Ask then stop" }), resume: false })
@@ -2851,12 +2850,6 @@ describe("SessionRunnerLLM", () => {
       ]
 
       const run = yield* session.resume(sessionID).pipe(Effect.exit, Effect.forkChild)
-      let pending = yield* questions.list()
-      while (pending.length === 0) {
-        yield* Effect.yieldNow
-        pending = yield* questions.list()
-      }
-      yield* questions.reject(pending[0]!.id)
       const exit = yield* Fiber.join(run)
 
       expect(exit._tag).toBe("Failure")
diff --git a/packages/core/test/tool-question.test.ts b/packages/core/test/tool-question.test.ts
index dc01563022..b9d49e892e 100644
--- a/packages/core/test/tool-question.test.ts
+++ b/packages/core/test/tool-question.test.ts
@@ -1,9 +1,9 @@
 import { describe, expect } from "bun:test"
-import { Effect, Exit, Fiber, Layer } from "effect"
+import { Cause, Effect, Exit, Fiber, Layer } from "effect"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { LayerNode } from "@opencode-ai/core/effect/layer-node"
+import { Form } from "@opencode-ai/core/form"
 import { PermissionV2 } from "@opencode-ai/core/permission"
-import { QuestionV2 } from "@opencode-ai/core/question"
 import { SessionV2 } from "@opencode-ai/core/session"
 import { ToolRegistry } from "@opencode-ai/core/tool/registry"
 import { QuestionTool } from "@opencode-ai/core/tool/question"
@@ -14,7 +14,7 @@ import { toolIdentity, executeTool, registerToolPlugin, settleTool, toolDefiniti
 
 const sessionID = SessionV2.ID.make("ses_question_tool_test")
 const assertions: PermissionV2.AssertInput[] = []
-let captured: QuestionV2.AskInput | undefined
+let captured: Form.CreateInput | undefined
 let reject = false
 let deny = false
 const capturedInput = () => captured
@@ -32,28 +32,38 @@ const permission = Layer.succeed(
     list: () => Effect.die("unused"),
   }),
 )
-const question = Layer.succeed(
-  QuestionV2.Service,
-  QuestionV2.Service.of({
-    ask: (input: QuestionV2.AskInput) =>
+const form = Layer.succeed(
+  Form.Service,
+  Form.Service.of({
+    ask: (input: Form.CreateInput) =>
       Effect.sync(() => {
         captured = input
-      }).pipe(Effect.andThen(reject ? Effect.fail(new QuestionV2.RejectedError()) : Effect.succeed([["Build"], []]))),
-    reply: () => Effect.die("unused"),
-    reject: () => Effect.die("unused"),
+      }).pipe(
+        Effect.andThen(
+          Effect.sync(
+            (): Form.TerminalState =>
+              reject ? { status: "cancelled" } : { status: "answered", answer: { q0: "Build", q1: ["Dev"] } },
+          ),
+        ),
+      ),
+    create: () => Effect.die("unused"),
+    get: () => Effect.die("unused"),
     list: () => Effect.die("unused"),
+    state: () => Effect.die("unused"),
+    reply: () => Effect.die("unused"),
+    cancel: () => Effect.die("unused"),
   }),
 )
 const questionToolNode = makeLocationNode({
   name: "test/question-tool-plugin",
   layer: Layer.effectDiscard(registerToolPlugin(QuestionTool.Plugin)),
-  deps: [ToolRegistry.toolsNode, PermissionV2.node, QuestionV2.node],
+  deps: [ToolRegistry.toolsNode, PermissionV2.node, Form.node],
 })
 
 const it = testEffect(
   AppNodeBuilder.build(LayerNode.group([ToolRegistry.node, ToolRegistry.toolsNode, questionToolNode]), [
     [PermissionV2.node, permission],
-    [QuestionV2.node, question],
+    [Form.node, form],
     [ToolOutputStore.node, ToolOutputStore.nodeWithoutConfig],
   ]),
 )
@@ -95,6 +105,12 @@ describe("QuestionTool", () => {
           question: "Which environment?",
           header: "Environment",
           options: [{ label: "Dev", description: "Development" }],
+          multiple: true,
+        },
+        {
+          question: "Anything else?",
+          header: "Optional",
+          options: [],
         },
       ]
 
@@ -109,14 +125,14 @@ describe("QuestionTool", () => {
         result: {
           type: "text",
           value:
-            'User has answered your questions: "What should happen?"="Build", "Which environment?"="Unanswered". You can now continue with the user\'s answers in mind.',
+            'User has answered your questions: "What should happen?"="Build", "Which environment?"="Dev", "Anything else?"="Unanswered". You can now continue with the user\'s answers in mind.',
         },
         output: {
-          structured: { answers: [["Build"], []] },
+          structured: { answers: [["Build"], ["Dev"], []] },
           content: [
             {
               type: "text",
-              text: 'User has answered your questions: "What should happen?"="Build", "Which environment?"="Unanswered". You can now continue with the user\'s answers in mind.',
+              text: 'User has answered your questions: "What should happen?"="Build", "Which environment?"="Dev", "Anything else?"="Unanswered". You can now continue with the user\'s answers in mind.',
             },
           ],
         },
@@ -124,8 +140,34 @@ describe("QuestionTool", () => {
       expect(assertions).toMatchObject([{ sessionID, action: "question", resources: ["*"] }])
       expect(capturedInput()).toEqual({
         sessionID,
-        questions,
-        tool: { messageID: toolIdentity.assistantMessageID, callID: "call-question" },
+        metadata: { kind: "question", tool: { messageID: toolIdentity.assistantMessageID, callID: "call-question" } },
+        mode: "form",
+        fields: [
+          {
+            key: "q0",
+            title: "Action",
+            description: "What should happen?",
+            options: [{ value: "Build", label: "Build", description: "Build it" }],
+            custom: true,
+            type: "string",
+          },
+          {
+            key: "q1",
+            title: "Environment",
+            description: "Which environment?",
+            options: [{ value: "Dev", label: "Dev", description: "Development" }],
+            custom: true,
+            type: "multiselect",
+          },
+          {
+            key: "q2",
+            title: "Optional",
+            description: "Anything else?",
+            options: [],
+            custom: true,
+            type: "string",
+          },
+        ],
       })
     }),
   )
@@ -144,8 +186,9 @@ describe("QuestionTool", () => {
       })
       expect(capturedInput()).toEqual({
         sessionID,
-        questions: [],
-        tool: { messageID: toolIdentity.assistantMessageID, callID: "call-question" },
+        metadata: { kind: "question", tool: { messageID: toolIdentity.assistantMessageID, callID: "call-question" } },
+        mode: "form",
+        fields: [],
       })
     }),
   )
@@ -164,6 +207,11 @@ describe("QuestionTool", () => {
 
       const exit = yield* Fiber.await(fiber)
       expect(Exit.isFailure(exit)).toBe(true)
+      if (Exit.isFailure(exit)) {
+        const error = Cause.squash(exit.cause)
+        expect(error).toBeInstanceOf(QuestionTool.CancelledError)
+        expect(error).toHaveProperty("message", "The user dismissed this question")
+      }
     }),
   )
 })
diff --git a/packages/tui/src/context/data.tsx b/packages/tui/src/context/data.tsx
index 1528b83cd0..d9b29c1fdd 100644
--- a/packages/tui/src/context/data.tsx
+++ b/packages/tui/src/context/data.tsx
@@ -10,7 +10,6 @@ import type {
   PermissionSavedInfo,
   PermissionV2Request,
   ProviderV2Info,
-  QuestionV2Request,
   ReferenceInfo,
   SessionMessage,
   SessionMessageAssistant,
@@ -57,7 +56,6 @@ type Data = {
     status: Record<string, DataSessionStatus>
     message: Record<string, SessionMessage[]>
     permission: Record<string, PermissionV2Request[]>
-    question: Record<string, QuestionV2Request[]>
     // Pending forms keyed by session ID.
     form: Record<string, FormInfo[]>
   }
@@ -93,7 +91,6 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
         status: {},
         message: {},
         permission: {},
-        question: {},
         form: {},
       },
       project: {
@@ -591,24 +588,6 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             ),
           )
           break
-        case "question.v2.asked":
-          if (store.session.question[event.data.sessionID]?.some((request) => request.id === event.data.id)) break
-          setStore("session", "question", event.data.sessionID, [
-            ...(store.session.question[event.data.sessionID] ?? []),
-            event.data,
-          ])
-          break
-        case "question.v2.replied":
-        case "question.v2.rejected":
-          setStore(
-            "session",
-            "question",
-            event.data.sessionID,
-            (store.session.question[event.data.sessionID] ?? []).filter(
-              (request) => request.id !== event.data.requestID,
-            ),
-          )
-          break
         case "form.created":
           if (store.session.form[event.data.form.sessionID]?.some((form) => form.id === event.data.form.id)) break
           setStore("session", "form", event.data.form.sessionID, [
@@ -743,14 +722,6 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             setStore("session", "permission", sessionID, mutable(await sdk.api.permission.list({ sessionID })))
           },
         },
-        question: {
-          list(sessionID: string) {
-            return store.session.question[sessionID]
-          },
-          async refresh(sessionID: string) {
-            setStore("session", "question", sessionID, mutable(await sdk.api.question.list({ sessionID })))
-          },
-        },
         form: {
           list(sessionID: string) {
             return store.session.form[sessionID]
diff --git a/packages/tui/src/routes/session/index.tsx b/packages/tui/src/routes/session/index.tsx
index 83f64ba27f..93bffbeb7c 100644
--- a/packages/tui/src/routes/session/index.tsx
+++ b/packages/tui/src/routes/session/index.tsx
@@ -58,7 +58,6 @@ import { usePromptRef } from "../../context/prompt"
 import { useEpilogue } from "../../context/epilogue"
 import { normalizePath } from "../../util/path"
 import { PermissionPrompt } from "./permission"
-import { QuestionPrompt } from "./question"
 import { FormPrompt } from "./form"
 import { DialogExportOptions } from "../../ui/dialog-export-options"
 import { sessionEpilogue } from "../../util/presentation"
@@ -182,10 +181,6 @@ export function Session() {
       (sessionID) => data.session.permission.list(sessionID) ?? [],
     )
   })
-  const questions = createMemo(() => {
-    if (session()?.parentID) return []
-    return data.session.question.list(route.sessionID) ?? []
-  })
   const forms = createMemo(() => {
     if (session()?.parentID) return []
     return data.session.form.list(route.sessionID) ?? []
@@ -194,7 +189,7 @@ export function Session() {
     open: false,
     tab: undefined as string | undefined,
   })
-  const disabled = createMemo(() => permissions().length > 0 || questions().length > 0 || forms().length > 0)
+  const disabled = createMemo(() => permissions().length > 0 || forms().length > 0)
 
   const pending = createMemo(() => {
     const completed = messages().findLast((x) => x.type === "assistant" && x.time.completed)?.id
@@ -251,7 +246,6 @@ export function Session() {
       await Promise.all([
         data.session.refresh(sessionID),
         data.session.permission.refresh(sessionID),
-        data.session.question.refresh(sessionID),
         data.session.form.refresh(sessionID),
       ])
       const info = data.session.get(sessionID)
@@ -944,9 +938,6 @@ export function Session() {
                   <Match when={permissions().length > 0}>
                     <PermissionPrompt request={permissions()[0]} directory={session()?.location.directory} />
                   </Match>
-                  <Match when={questions().length > 0}>
-                    <QuestionPrompt request={questions()[0]} directory={session()?.location.directory} />
-                  </Match>
                   <Match when={forms().length > 0}>
                     <Show when={forms()[0]?.id} keyed>
                       {(_) => {
diff --git a/packages/tui/src/routes/session/question.tsx b/packages/tui/src/routes/session/question.tsx
deleted file mode 100644
index 8659884a45..0000000000
--- a/packages/tui/src/routes/session/question.tsx
+++ /dev/null
@@ -1,514 +0,0 @@
-import { createStore } from "solid-js/store"
-import { createMemo, createSignal, For, onCleanup, onMount, Show } from "solid-js"
-import { useRenderer } from "@opentui/solid"
-import type { TextareaRenderable } from "@opentui/core"
-import { selectedForeground, tint, useTheme } from "../../context/theme"
-import type { QuestionV2Answer, QuestionV2Request } from "@opencode-ai/sdk/v2"
-import { useSDK } from "../../context/sdk"
-import { SplitBorder } from "../../ui/border"
-import { useTuiConfig } from "../../config"
-import { useBindings, useOpencodeModeStack } from "../../keymap"
-
-const QUESTION_MODE = "question"
-
-export function QuestionPrompt(props: { request: QuestionV2Request; directory?: string }) {
-  const sdk = useSDK()
-  const { theme } = useTheme()
-  const renderer = useRenderer()
-  const tuiConfig = useTuiConfig()
-  const modeStack = useOpencodeModeStack()
-
-  const questions = createMemo(() => props.request.questions)
-  const single = createMemo(() => questions().length === 1 && questions()[0]?.multiple !== true)
-  const tabs = createMemo(() => (single() ? 1 : questions().length + 1)) // questions + confirm tab (no confirm for single select)
-  const [tabHover, setTabHover] = createSignal<number | "confirm" | null>(null)
-  const [store, setStore] = createStore({
-    tab: 0,
-    answers: [] as QuestionV2Answer[],
-    custom: [] as string[],
-    selected: 0,
-    editing: false,
-  })
-
-  let textarea: TextareaRenderable | undefined
-
-  const question = createMemo(() => questions()[store.tab])
-  const confirm = createMemo(() => !single() && store.tab === questions().length)
-  const options = createMemo(() => question()?.options ?? [])
-  const custom = createMemo(() => question()?.custom !== false)
-  const other = createMemo(() => custom() && store.selected === options().length)
-  const input = createMemo(() => store.custom[store.tab] ?? "")
-  const multi = createMemo(() => question()?.multiple === true)
-  const customPicked = createMemo(() => {
-    const value = input()
-    if (!value) return false
-    return store.answers[store.tab]?.includes(value) ?? false
-  })
-
-  function submit() {
-    const answers = questions().map((_, i) => store.answers[i] ?? [])
-    void sdk.api.question.reply({
-      sessionID: props.request.sessionID,
-      requestID: props.request.id,
-      answers,
-    })
-  }
-
-  function reject() {
-    void sdk.api.question.reject({
-      sessionID: props.request.sessionID,
-      requestID: props.request.id,
-    })
-  }
-
-  function pick(answer: string, custom: boolean = false) {
-    const answers = [...store.answers]
-    answers[store.tab] = [answer]
-    setStore("answers", answers)
-    if (custom) {
-      const inputs = [...store.custom]
-      inputs[store.tab] = answer
-      setStore("custom", inputs)
-    }
-    if (single()) {
-      void sdk.api.question.reply({
-        sessionID: props.request.sessionID,
-        requestID: props.request.id,
-        answers: [[answer]],
-      })
-      return
-    }
-    setStore("tab", store.tab + 1)
-    setStore("selected", 0)
-  }
-
-  function toggle(answer: string) {
-    const existing = store.answers[store.tab] ?? []
-    const next = [...existing]
-    const index = next.indexOf(answer)
-    if (index === -1) next.push(answer)
-    if (index !== -1) next.splice(index, 1)
-    const answers = [...store.answers]
-    answers[store.tab] = next
-    setStore("answers", answers)
-  }
-
-  function moveTo(index: number) {
-    setStore("selected", index)
-  }
-
-  function selectTab(index: number) {
-    setStore("tab", index)
-    setStore("selected", 0)
-  }
-
-  function selectOption() {
-    if (other()) {
-      if (!multi()) {
-        setStore("editing", true)
-        return
-      }
-      const value = input()
-      if (value && customPicked()) {
-        toggle(value)
-        return
-      }
-      setStore("editing", true)
-      return
-    }
-    const opt = options()[store.selected]
-    if (!opt) return
-    if (multi()) {
-      toggle(opt.label)
-      return
-    }
-    pick(opt.label)
-  }
-
-  onMount(() => {
-    const popMode = modeStack.push(QUESTION_MODE)
-    onCleanup(popMode)
-  })
-
-  useBindings(() => ({
-    mode: QUESTION_MODE,
-    enabled: store.editing && !confirm(),
-    commands: [
-      {
-        name: "prompt.clear",
-        title: "Clear answer edit",
-        category: "Question",
-        run() {
-          const text = textarea?.plainText ?? ""
-          if (!text) {
-            setStore("editing", false)
-            return
-          }
-          textarea?.setText("")
-        },
-      },
-    ],
-    bindings: [
-      {
-        key: "escape",
-        desc: "Cancel answer edit",
-        group: "Question",
-        cmd: () => {
-          setStore("editing", false)
-        },
-      },
-      ...tuiConfig.keybinds.get("prompt.clear"),
-      {
-        key: "return",
-        desc: "Submit answer edit",
-        group: "Question",
-        cmd: () => {
-          const text = textarea?.plainText?.trim() ?? ""
-          const prev = store.custom[store.tab]
-
-          if (!text) {
-            if (prev) {
-              const inputs = [...store.custom]
-              inputs[store.tab] = ""
-              setStore("custom", inputs)
-
-              const answers = [...store.answers]
-              answers[store.tab] = (answers[store.tab] ?? []).filter((x) => x !== prev)
-              setStore("answers", answers)
-            }
-            setStore("editing", false)
-            return
-          }
-
-          if (multi()) {
-            const inputs = [...store.custom]
-            inputs[store.tab] = text
-            setStore("custom", inputs)
-
-            const existing = store.answers[store.tab] ?? []
-            const next = [...existing]
-            if (prev) {
-              const index = next.indexOf(prev)
-              if (index !== -1) next.splice(index, 1)
-            }
-            if (!next.includes(text)) next.push(text)
-            const answers = [...store.answers]
-            answers[store.tab] = next
-            setStore("answers", answers)
-            setStore("editing", false)
-            return
-          }
-
-          pick(text, true)
-          setStore("editing", false)
-        },
-      },
-    ],
-  }))
-
-  useBindings(() => {
-    const opts = options()
-    const total = opts.length + (custom() ? 1 : 0)
-    const max = Math.min(total, 9)
-
-    return {
-      mode: QUESTION_MODE,
-      enabled: !store.editing,
-      commands: [
-        {
-          name: "app.exit",
-          title: "Reject question",
-          category: "Question",
-          run() {
-            reject()
-          },
-        },
-      ],
-      bindings: [
-        {
-          key: "left",
-          desc: "Previous question",
-          group: "Question",
-          cmd: () => selectTab((store.tab - 1 + tabs()) % tabs()),
-        },
-        {
-          key: "h",
-          desc: "Previous question",
-          group: "Question",
-          cmd: () => selectTab((store.tab - 1 + tabs()) % tabs()),
-        },
-        { key: "right", desc: "Next question", group: "Question", cmd: () => selectTab((store.tab + 1) % tabs()) },
-        { key: "l", desc: "Next question", group: "Question", cmd: () => selectTab((store.tab + 1) % tabs()) },
-        {
-          key: "tab",
-          desc: "Next question",
-          group: "Question",
-          cmd: ({ event }: { event: { shift: boolean } }) => {
-            selectTab((store.tab + (event.shift ? -1 : 1) + tabs()) % tabs())
-          },
-        },
-        ...(confirm()
-          ? [
-              { key: "return", desc: "Submit answer", group: "Question", cmd: () => submit() },
-              { key: "escape", desc: "Reject question", group: "Question", cmd: () => reject() },
-              ...tuiConfig.keybinds.get("app.exit"),
-            ]
-          : [
-              ...Array.from({ length: max }, (_, index) => ({
-                key: String(index + 1),
-                desc: `Select answer ${index + 1}`,
-                group: "Question",
-                cmd: () => {
-                  moveTo(index)
-                  selectOption()
-                },
-              })),
-              {
-                key: "up",
-                desc: "Previous answer",
-                group: "Question",
-                cmd: () => moveTo((store.selected - 1 + total) % total),
-              },
-              {
-                key: "k",
-                desc: "Previous answer",
-                group: "Question",
-                cmd: () => moveTo((store.selected - 1 + total) % total),
-              },
-              { key: "down", desc: "Next answer", group: "Question", cmd: () => moveTo((store.selected + 1) % total) },
-              { key: "j", desc: "Next answer", group: "Question", cmd: () => moveTo((store.selected + 1) % total) },
-              { key: "return", desc: "Select answer", group: "Question", cmd: () => selectOption() },
-              { key: "escape", desc: "Reject question", group: "Question", cmd: () => reject() },
-              ...tuiConfig.keybinds.get("app.exit"),
-            ]),
-      ],
-    }
-  })
-
-  return (
-    <box
-      backgroundColor={theme.backgroundPanel}
-      border={["left"]}
-      borderColor={theme.accent}
-      customBorderChars={SplitBorder.customBorderChars}
-    >
-      <box gap={1} paddingLeft={1} paddingRight={3} paddingTop={1} paddingBottom={1}>
-        <Show when={!single()}>
-          <box flexDirection="row" gap={1} paddingLeft={1}>
-            <For each={questions()}>
-              {(q, index) => {
-                const isActive = () => index() === store.tab
-                const isAnswered = () => {
-                  return (store.answers[index()]?.length ?? 0) > 0
-                }
-                return (
-                  <box
-                    paddingLeft={1}
-                    paddingRight={1}
-                    backgroundColor={
-                      isActive()
-                        ? theme.accent
-                        : tabHover() === index()
-                          ? theme.backgroundElement
-                          : theme.backgroundPanel
-                    }
-                    onMouseOver={() => setTabHover(index())}
-                    onMouseOut={() => setTabHover(null)}
-                    onMouseUp={() => {
-                      if (renderer.getSelection()?.getSelectedText()) return
-                      selectTab(index())
-                    }}
-                  >
-                    <text
-                      fg={
-                        isActive()
-                          ? selectedForeground(theme, theme.accent)
-                          : isAnswered()
-                            ? theme.text
-                            : theme.textMuted
-                      }
-                    >
-                      {q.header}
-                    </text>
-                  </box>
-                )
-              }}
-            </For>
-            <box
-              paddingLeft={1}
-              paddingRight={1}
-              backgroundColor={
-                confirm() ? theme.accent : tabHover() === "confirm" ? theme.backgroundElement : theme.backgroundPanel
-              }
-              onMouseOver={() => setTabHover("confirm")}
-              onMouseOut={() => setTabHover(null)}
-              onMouseUp={() => {
-                if (renderer.getSelection()?.getSelectedText()) return
-                selectTab(questions().length)
-              }}
-            >
-              <text fg={confirm() ? selectedForeground(theme, theme.accent) : theme.textMuted}>Confirm</text>
-            </box>
-          </box>
-        </Show>
-
-        <Show when={!confirm()}>
-          <box paddingLeft={1} gap={1}>
-            <box>
-              <text fg={theme.text}>
-                {question()?.question}
-                {multi() ? " (select all that apply)" : ""}
-              </text>
-            </box>
-            <box>
-              <For each={options()}>
-                {(opt, i) => {
-                  const active = () => i() === store.selected
-                  const picked = () => store.answers[store.tab]?.includes(opt.label) ?? false
-                  return (
-                    <box
-                      onMouseOver={() => moveTo(i())}
-                      onMouseDown={() => moveTo(i())}
-                      onMouseUp={() => {
-                        if (renderer.getSelection()?.getSelectedText()) return
-                        selectOption()
-                      }}
-                    >
-                      <box flexDirection="row">
-                        <box backgroundColor={active() ? theme.backgroundElement : undefined} paddingRight={1}>
-                          <text fg={active() ? tint(theme.textMuted, theme.secondary, 0.6) : theme.textMuted}>
-                            {`${i() + 1}.`}
-                          </text>
-                        </box>
-                        <box backgroundColor={active() ? theme.backgroundElement : undefined}>
-                          <text fg={active() ? theme.secondary : picked() ? theme.success : theme.text}>
-                            {multi() ? `[${picked() ? "✓" : " "}] ${opt.label}` : opt.label}
-                          </text>
-                        </box>
-                        <Show when={!multi()}>
-                          <text fg={theme.success}>{picked() ? " ✓" : ""}</text>
-                        </Show>
-                      </box>
-
-                      <box paddingLeft={3}>
-                        <text fg={theme.textMuted}>{opt.description}</text>
-                      </box>
-                    </box>
-                  )
-                }}
-              </For>
-              <Show when={custom()}>
-                <box
-                  onMouseOver={() => moveTo(options().length)}
-                  onMouseDown={() => moveTo(options().length)}
-                  onMouseUp={() => {
-                    if (renderer.getSelection()?.getSelectedText()) return
-                    selectOption()
-                  }}
-                >
-                  <box flexDirection="row">
-                    <box backgroundColor={other() ? theme.backgroundElement : undefined} paddingRight={1}>
-                      <text fg={other() ? tint(theme.textMuted, theme.secondary, 0.6) : theme.textMuted}>
-                        {`${options().length + 1}.`}
-                      </text>
-                    </box>
-                    <box backgroundColor={other() ? theme.backgroundElement : undefined}>
-                      <text fg={other() ? theme.secondary : customPicked() ? theme.success : theme.text}>
-                        {multi() ? `[${customPicked() ? "✓" : " "}] Type your own answer` : "Type your own answer"}
-                      </text>
-                    </box>
-
-                    <Show when={!multi()}>
-                      <text fg={theme.success}>{customPicked() ? " ✓" : ""}</text>
-                    </Show>
-                  </box>
-                  <Show when={store.editing}>
-                    <box paddingLeft={3}>
-                      <textarea
-                        ref={(val: TextareaRenderable) => {
-                          textarea = val
-                          val.traits = { status: "ANSWER" }
-                          queueMicrotask(() => {
-                            val.focus()
-                            val.gotoLineEnd()
-                          })
-                        }}
-                        initialValue={input()}
-                        placeholder="Type your own answer"
-                        placeholderColor={theme.textMuted}
-                        minHeight={1}
-                        maxHeight={6}
-                        textColor={theme.text}
-                        focusedTextColor={theme.text}
-                        cursorColor={theme.primary}
-                      />
-                    </box>
-                  </Show>
-                  <Show when={!store.editing && input()}>
-                    <box paddingLeft={3}>
-                      <text fg={theme.textMuted}>{input()}</text>
-                    </box>
-                  </Show>
-                </box>
-              </Show>
-            </box>
-          </box>
-        </Show>
-
-        <Show when={confirm() && !single()}>
-          <box paddingLeft={1}>
-            <text fg={theme.text}>Review</text>
-          </box>
-          <For each={questions()}>
-            {(q, index) => {
-              const value = () => store.answers[index()]?.join(", ") ?? ""
-              const answered = () => Boolean(value())
-              return (
-                <box paddingLeft={1}>
-                  <text>
-                    <span style={{ fg: theme.textMuted }}>{q.header}:</span>{" "}
-                    <span style={{ fg: answered() ? theme.text : theme.error }}>
-                      {answered() ? value() : "(not answered)"}
-                    </span>
-                  </text>
-                </box>
-              )
-            }}
-          </For>
-        </Show>
-      </box>
-      <box
-        flexDirection="row"
-        flexShrink={0}
-        gap={1}
-        paddingLeft={2}
-        paddingRight={3}
-        paddingBottom={1}
-        justifyContent="space-between"
-      >
-        <box flexDirection="row" gap={2}>
-          <Show when={!single()}>
-            <text fg={theme.text}>
-              {"⇆"} <span style={{ fg: theme.textMuted }}>tab</span>
-            </text>
-          </Show>
-          <Show when={!confirm()}>
-            <text fg={theme.text}>
-              {"↑↓"} <span style={{ fg: theme.textMuted }}>select</span>
-            </text>
-          </Show>
-          <text fg={theme.text}>
-            enter{" "}
-            <span style={{ fg: theme.textMuted }}>
-              {confirm() ? "submit" : multi() ? "toggle" : single() ? "submit" : "confirm"}
-            </span>
-          </text>
-
-          <text fg={theme.text}>
-            esc <span style={{ fg: theme.textMuted }}>dismiss</span>
-          </text>
-        </box>
-      </box>
-    </box>
-  )
-}
diff --git a/packages/tui/test/cli/tui/data.test.tsx b/packages/tui/test/cli/tui/data.test.tsx
index b14b8a2124..6c33f8496f 100644
--- a/packages/tui/test/cli/tui/data.test.tsx
+++ b/packages/tui/test/cli/tui/data.test.tsx
@@ -877,73 +877,6 @@ test("adds, dismisses, and refreshes form requests", async () => {
   }
 })
 
-test("adds and dismisses question requests from live events", async () => {
-  const events = createEventStream()
-  const calls = createFetch(undefined, events)
-  let data!: ReturnType<typeof useData>
-
-  function Probe() {
-    data = useData()
-    return <box />
-  }
-
-  const app = await testRender(() => (
-    <TestTuiContexts>
-      <SDKProvider client={createClient(calls.fetch)} api={createApi(calls.fetch)}>
-        <ProjectProvider>
-          <DataProvider>
-            <Probe />
-          </DataProvider>
-        </ProjectProvider>
-      </SDKProvider>
-    </TestTuiContexts>
-  ))
-
-  try {
-    await wait(() => data.connection.status() === "connected")
-    emitEvent(events, {
-      id: "evt_question_asked_1",
-      created: 0,
-      type: "question.v2.asked",
-      data: {
-        id: "que_1",
-        sessionID: "ses_1",
-        questions: [{ question: "Which option?", header: "Option", options: [], multiple: false }],
-      },
-    })
-    emitEvent(events, {
-      id: "evt_question_asked_2",
-      created: 0,
-      type: "question.v2.asked",
-      data: {
-        id: "que_2",
-        sessionID: "ses_1",
-        questions: [{ question: "Which environment?", header: "Environment", options: [], multiple: false }],
-      },
-    })
-    await wait(() => data.session.question.list("ses_1")?.length === 2)
-
-    emitEvent(events, {
-      id: "evt_question_replied_1",
-      created: 0,
-      type: "question.v2.replied",
-      data: { sessionID: "ses_1", requestID: "que_1", answers: [["First"]] },
-    })
-    await wait(() => data.session.question.list("ses_1")?.length === 1)
-    expect(data.session.question.list("ses_1")?.[0]?.id).toBe("que_2")
-
-    emitEvent(events, {
-      id: "evt_question_rejected_2",
-      created: 0,
-      type: "question.v2.rejected",
-      data: { sessionID: "ses_1", requestID: "que_2" },
-    })
-    await wait(() => data.session.question.list("ses_1")?.length === 0)
-  } finally {
-    app.renderer.destroy()
-  }
-})
-
 test("settles pending tools when a live failure arrives", async () => {
   const events = createEventStream()
   const calls = createFetch((url) => {

From 50a762e7b98d5e73a05e7539f70f97a614cf7057 Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Sun, 5 Jul 2026 22:51:08 -0500
Subject: [PATCH 75/82] fix(mcp): preserve metadata across paginated tools
 (#35500)

---
 packages/core/test/mcp.test.ts                | 61 ++++++++++++++++++
 packages/opencode/test/mcp/catalog.test.ts    | 62 ++++++++++++++++++-
 .../@modelcontextprotocol%2Fsdk@1.29.0.patch  | 50 +++++++++++++++
 3 files changed, 172 insertions(+), 1 deletion(-)

diff --git a/packages/core/test/mcp.test.ts b/packages/core/test/mcp.test.ts
index ffcc2d3b89..2e5822f4ff 100644
--- a/packages/core/test/mcp.test.ts
+++ b/packages/core/test/mcp.test.ts
@@ -1,4 +1,8 @@
 import { describe, expect, test } from "bun:test"
+import { Client } from "@modelcontextprotocol/sdk/client/index.js"
+import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js"
+import { Server } from "@modelcontextprotocol/sdk/server/index.js"
+import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { EventV2 } from "@opencode-ai/core/event"
@@ -72,6 +76,63 @@ test("MCP tool names match V1 sanitization", () => {
   expect(McpTool.name("context 7", "resolve.library/id")).toBe("context_7_resolve_library_id")
 })
 
+test("preserves output schema validation across paginated tool discovery", async () => {
+  const server = new Server({ name: "pagination", version: "1.0.0" }, { capabilities: { tools: {} } })
+  server.setRequestHandler(ListToolsRequestSchema, ({ params }) =>
+    Promise.resolve(
+      params?.cursor === "page-2"
+        ? {
+            tools: [
+              {
+                name: "second",
+                inputSchema: { type: "object" },
+                outputSchema: {
+                  type: "object",
+                  properties: { value: { type: "number" } },
+                  required: ["value"],
+                },
+              },
+            ],
+          }
+        : {
+            tools: [
+              {
+                name: "first",
+                inputSchema: { type: "object" },
+                outputSchema: {
+                  type: "object",
+                  properties: { value: { type: "string" } },
+                  required: ["value"],
+                },
+              },
+            ],
+            nextCursor: "page-2",
+          },
+    ),
+  )
+  server.setRequestHandler(CallToolRequestSchema, ({ params }) =>
+    Promise.resolve({
+      content: [],
+      structuredContent: { value: params.name === "first" ? 42 : 1 },
+    }),
+  )
+
+  const client = new Client({ name: "pagination-test", version: "1.0.0" })
+  const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair()
+  await Promise.all([client.connect(clientTransport), server.connect(serverTransport)])
+
+  try {
+    const first = await client.listTools()
+    const second = await client.listTools({ cursor: first.nextCursor })
+    expect([...first.tools, ...second.tools].map((tool) => tool.name)).toEqual(["first", "second"])
+    await expect(client.callTool({ name: "first", arguments: {} })).rejects.toThrow(
+      "Structured content does not match the tool's output schema",
+    )
+  } finally {
+    await Promise.all([client.close(), server.close()])
+  }
+})
+
 it.effect("waits for permission before calling an MCP tool", () =>
   Effect.gen(function* () {
     calls = 0
diff --git a/packages/opencode/test/mcp/catalog.test.ts b/packages/opencode/test/mcp/catalog.test.ts
index 55cabaef76..7b0d6403bb 100644
--- a/packages/opencode/test/mcp/catalog.test.ts
+++ b/packages/opencode/test/mcp/catalog.test.ts
@@ -1,6 +1,10 @@
 import { describe, expect, test } from "bun:test"
-import type { Client } from "@modelcontextprotocol/sdk/client/index.js"
+import { Client } from "@modelcontextprotocol/sdk/client/index.js"
+import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js"
+import { Server } from "@modelcontextprotocol/sdk/server/index.js"
+import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js"
 import { McpCatalog } from "@/mcp/catalog"
+import { Effect } from "effect"
 
 const options = { toolCallId: "call_mcp", abortSignal: new AbortController().signal } as any
 
@@ -45,3 +49,59 @@ describe("McpCatalog.convertTool", () => {
     })
   })
 })
+
+test("preserves output schema validation across paginated tool discovery", async () => {
+  const server = new Server({ name: "pagination", version: "1.0.0" }, { capabilities: { tools: {} } })
+  server.setRequestHandler(ListToolsRequestSchema, ({ params }) =>
+    Promise.resolve(
+      params?.cursor === "page-2"
+        ? {
+            tools: [
+              {
+                name: "second",
+                inputSchema: { type: "object" },
+                outputSchema: {
+                  type: "object",
+                  properties: { value: { type: "number" } },
+                  required: ["value"],
+                },
+              },
+            ],
+          }
+        : {
+            tools: [
+              {
+                name: "first",
+                inputSchema: { type: "object" },
+                outputSchema: {
+                  type: "object",
+                  properties: { value: { type: "string" } },
+                  required: ["value"],
+                },
+              },
+            ],
+            nextCursor: "page-2",
+          },
+    ),
+  )
+  server.setRequestHandler(CallToolRequestSchema, ({ params }) =>
+    Promise.resolve({
+      content: [],
+      structuredContent: { value: params.name === "first" ? 42 : 1 },
+    }),
+  )
+
+  const client = new Client({ name: "pagination-test", version: "1.0.0" })
+  const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair()
+  await Promise.all([client.connect(clientTransport), server.connect(serverTransport)])
+
+  try {
+    const tools = await Effect.runPromise(McpCatalog.defs(client))
+    expect(tools?.map((tool) => tool.name)).toEqual(["first", "second"])
+    await expect(client.callTool({ name: "first", arguments: {} })).rejects.toThrow(
+      "Structured content does not match the tool's output schema",
+    )
+  } finally {
+    await Promise.all([client.close(), server.close()])
+  }
+})
diff --git a/patches/@modelcontextprotocol%2Fsdk@1.29.0.patch b/patches/@modelcontextprotocol%2Fsdk@1.29.0.patch
index e38e68e75d..13b8000a01 100644
--- a/patches/@modelcontextprotocol%2Fsdk@1.29.0.patch
+++ b/patches/@modelcontextprotocol%2Fsdk@1.29.0.patch
@@ -112,6 +112,31 @@ index 6ac1da14dc7f6211ae70f7711c124b76098816d8..adb5b7bd45514a406a0f7e40b64631c1
      /**
       * After initialization has completed, this will be populated with the server's reported capabilities.
       */
+@@ -541,9 +547,11 @@ class Client extends protocol_js_1.Protocol {
+      * Called after listTools() to pre-compile validators for better performance.
+      */
+-    cacheToolMetadata(tools) {
+-        this._cachedToolOutputValidators.clear();
+-        this._cachedKnownTaskTools.clear();
+-        this._cachedRequiredTaskTools.clear();
++    cacheToolMetadata(tools, reset = true) {
++        if (reset) {
++            this._cachedToolOutputValidators.clear();
++            this._cachedKnownTaskTools.clear();
++            this._cachedRequiredTaskTools.clear();
++        }
+         for (const tool of tools) {
+             // If the tool has an outputSchema, create and cache the validator
+             if (tool.outputSchema) {
+@@ -569,7 +577,7 @@ class Client extends protocol_js_1.Protocol {
+     async listTools(params, options) {
+         const result = await this.request({ method: 'tools/list', params }, types_js_1.ListToolsResultSchema, options);
+         // Cache the tools and their output schemas for future validation
+-        this.cacheToolMetadata(result.tools);
++        this.cacheToolMetadata(result.tools, params?.cursor === undefined);
+         return result;
+     }
+     /**
 diff --git a/dist/cjs/client/streamableHttp.js b/dist/cjs/client/streamableHttp.js
 index a29a7d3a0f14d9cd800ef5b296485237350c666f..c362ae5fe6c62c8c8eae7e2e61de1eedff5443c9 100644
 --- a/dist/cjs/client/streamableHttp.js
@@ -461,6 +486,31 @@ index 49b12c6cd918c457420fef7ad5528a9443d1a191..2afe2e22e960f26c9d516ef135d89f8e
      /**
       * After initialization has completed, this will be populated with the server's reported capabilities.
       */
+@@ -537,9 +543,11 @@ export class Client extends Protocol {
+      * Called after listTools() to pre-compile validators for better performance.
+      */
+-    cacheToolMetadata(tools) {
+-        this._cachedToolOutputValidators.clear();
+-        this._cachedKnownTaskTools.clear();
+-        this._cachedRequiredTaskTools.clear();
++    cacheToolMetadata(tools, reset = true) {
++        if (reset) {
++            this._cachedToolOutputValidators.clear();
++            this._cachedKnownTaskTools.clear();
++            this._cachedRequiredTaskTools.clear();
++        }
+         for (const tool of tools) {
+             // If the tool has an outputSchema, create and cache the validator
+             if (tool.outputSchema) {
+@@ -565,7 +573,7 @@ export class Client extends Protocol {
+     async listTools(params, options) {
+         const result = await this.request({ method: 'tools/list', params }, ListToolsResultSchema, options);
+         // Cache the tools and their output schemas for future validation
+-        this.cacheToolMetadata(result.tools);
++        this.cacheToolMetadata(result.tools, params?.cursor === undefined);
+         return result;
+     }
+     /**
 diff --git a/dist/esm/client/streamableHttp.js b/dist/esm/client/streamableHttp.js
 index 624172aa24ae255a67c083f9c19053343e4a0581..ac75b14545fda44aff7ff4d97cc5da884fcc627a 100644
 --- a/dist/esm/client/streamableHttp.js

From 4e019ba5d9d7dd430764fe66feb8adab37dbb023 Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Sun, 5 Jul 2026 23:12:45 -0500
Subject: [PATCH 76/82] fix(core): expose MCP output schemas to code mode
 (#35502)

---
 packages/core/src/mcp/client.ts               |  2 +
 packages/core/src/mcp/index.ts                |  9 ++-
 packages/core/src/tool/mcp.ts                 |  1 +
 .../core/test/fixture/mcp-output-schema.ts    | 40 +++++++++++++
 packages/core/test/mcp.test.ts                | 56 ++++++++++++++++++-
 5 files changed, 106 insertions(+), 2 deletions(-)
 create mode 100644 packages/core/test/fixture/mcp-output-schema.ts

diff --git a/packages/core/src/mcp/client.ts b/packages/core/src/mcp/client.ts
index 84ccbd70bb..02362f6428 100644
--- a/packages/core/src/mcp/client.ts
+++ b/packages/core/src/mcp/client.ts
@@ -61,6 +61,7 @@ export interface ToolDefinition {
   readonly name: string
   readonly description: string | undefined
   readonly inputSchema: unknown
+  readonly outputSchema: unknown
 }
 
 export interface PromptDefinition {
@@ -235,6 +236,7 @@ export const connect = Effect.fnUntraced(function* (
             name: tool.name,
             description: tool.description,
             inputSchema: tool.inputSchema,
+            outputSchema: "outputSchema" in tool ? tool.outputSchema : undefined,
           }))
         }),
       prompts: () =>
diff --git a/packages/core/src/mcp/index.ts b/packages/core/src/mcp/index.ts
index ffc7a247fd..1ce8c3d3ec 100644
--- a/packages/core/src/mcp/index.ts
+++ b/packages/core/src/mcp/index.ts
@@ -42,6 +42,7 @@ export class Tool extends Schema.Class<Tool>("MCP.Tool")({
   name: Schema.String,
   description: Schema.String.pipe(Schema.optional),
   inputSchema: Schema.Unknown.pipe(Schema.optional),
+  outputSchema: Schema.Unknown.pipe(Schema.optional),
 }) {}
 
 export const ToolResultContent = Schema.Union([
@@ -391,7 +392,13 @@ export const layer = Layer.effect(
     } satisfies MCPClient.ElicitationHandler
 
     const toTool = (server: ServerName, def: MCPClient.ToolDefinition) =>
-      new Tool({ server, name: def.name, description: def.description, inputSchema: def.inputSchema })
+      new Tool({
+        server,
+        name: def.name,
+        description: def.description,
+        inputSchema: def.inputSchema,
+        outputSchema: def.outputSchema,
+      })
 
     const toPrompt = (server: ServerName, def: MCPClient.PromptDefinition) =>
       new Prompt({
diff --git a/packages/core/src/tool/mcp.ts b/packages/core/src/tool/mcp.ts
index 8cb0117ebb..7503e4e94e 100644
--- a/packages/core/src/tool/mcp.ts
+++ b/packages/core/src/tool/mcp.ts
@@ -45,6 +45,7 @@ export const layer = Layer.effectDiscard(
                 properties: schema.properties ?? {},
                 additionalProperties: false,
               },
+              outputSchema: tool.outputSchema as JsonSchema.JsonSchema | undefined,
               execute: (input, context) =>
                 Effect.gen(function* () {
                   yield* permission.assert({
diff --git a/packages/core/test/fixture/mcp-output-schema.ts b/packages/core/test/fixture/mcp-output-schema.ts
new file mode 100644
index 0000000000..cb853be002
--- /dev/null
+++ b/packages/core/test/fixture/mcp-output-schema.ts
@@ -0,0 +1,40 @@
+import { Server } from "@modelcontextprotocol/sdk/server/index.js"
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
+import { ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js"
+
+const server = new Server({ name: "output-schema", version: "1.0.0" }, { capabilities: { tools: {} } })
+
+server.setRequestHandler(ListToolsRequestSchema, ({ params }) =>
+  Promise.resolve(
+    params?.cursor === "page-2"
+      ? {
+          tools: [
+            {
+              name: "second",
+              inputSchema: { type: "object" },
+              outputSchema: {
+                type: "object",
+                properties: { value: { type: "number" } },
+                required: ["value"],
+              },
+            },
+          ],
+        }
+      : {
+          tools: [
+            {
+              name: "first",
+              inputSchema: { type: "object" },
+              outputSchema: {
+                type: "object",
+                properties: { value: { type: "string" } },
+                required: ["value"],
+              },
+            },
+          ],
+          nextCursor: "page-2",
+        },
+  ),
+)
+
+await server.connect(new StdioServerTransport())
diff --git a/packages/core/test/mcp.test.ts b/packages/core/test/mcp.test.ts
index 2e5822f4ff..e40e8dfb2c 100644
--- a/packages/core/test/mcp.test.ts
+++ b/packages/core/test/mcp.test.ts
@@ -1,8 +1,10 @@
+import path from "node:path"
 import { describe, expect, test } from "bun:test"
 import { Client } from "@modelcontextprotocol/sdk/client/index.js"
 import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js"
 import { Server } from "@modelcontextprotocol/sdk/server/index.js"
 import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js"
+import { ConfigMCP } from "@opencode-ai/core/config/mcp"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { EventV2 } from "@opencode-ai/core/event"
@@ -15,7 +17,7 @@ import { ToolRegistry } from "@opencode-ai/core/tool/registry"
 import { ToolOutputStore } from "@opencode-ai/core/tool-output-store"
 import { Deferred, Effect, Fiber, Layer, Stream } from "effect"
 import { testEffect } from "./lib/effect"
-import { settleTool, toolIdentity, waitForTool } from "./lib/tool"
+import { settleTool, toolDefinitions, toolIdentity, waitForTool } from "./lib/tool"
 
 let assertion: Deferred.Deferred<PermissionV2.AssertInput> | undefined
 let decision: Effect.Effect<void, PermissionV2.Error> = Effect.void
@@ -29,6 +31,11 @@ const mcp = Layer.mock(MCP.Service, {
         name: "search",
         description: "Search",
         inputSchema: { type: "object", properties: {} },
+        outputSchema: {
+          type: "object",
+          properties: { ok: { type: "boolean" } },
+          required: ["ok"],
+        },
       }),
     ]),
   callTool: (input) =>
@@ -133,6 +140,53 @@ test("preserves output schema validation across paginated tool discovery", async
   }
 })
 
+test("retains output schemas across paginated MCP discovery", async () => {
+  const tools = await Effect.runPromise(
+    Effect.scoped(
+      Effect.gen(function* () {
+        const connection = yield* MCPClient.connect(
+          "pagination",
+          new ConfigMCP.Local({
+            type: "local",
+            command: [process.execPath, path.join(import.meta.dir, "fixture/mcp-output-schema.ts")],
+          }),
+          import.meta.dir,
+        )
+        return yield* connection.tools()
+      }),
+    ),
+  )
+
+  expect(tools.map((tool) => ({ name: tool.name, outputSchema: tool.outputSchema }))).toEqual([
+    {
+      name: "first",
+      outputSchema: {
+        type: "object",
+        properties: { value: { type: "string" } },
+        required: ["value"],
+      },
+    },
+    {
+      name: "second",
+      outputSchema: {
+        type: "object",
+        properties: { value: { type: "number" } },
+        required: ["value"],
+      },
+    },
+  ])
+})
+
+it.effect("advertises MCP output schemas to Code Mode", () =>
+  Effect.gen(function* () {
+    const registry = yield* ToolRegistry.Service
+    yield* waitForTool(registry, "execute")
+    const execute = (yield* toolDefinitions(registry)).find((tool) => tool.name === "execute")
+
+    expect(execute?.description).toContain("tools.demo.search(input: {}): Promise<{ ok: boolean }>")
+  }),
+)
+
 it.effect("waits for permission before calling an MCP tool", () =>
   Effect.gen(function* () {
     calls = 0

From e6e951b252759cf171133422d53b494d686291e7 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Mon, 6 Jul 2026 00:57:23 -0400
Subject: [PATCH 77/82] docs: rebuild v2 documentation

---
 packages/docs/LICENSE                         |  21 -
 packages/docs/README.md                       |  48 +-
 packages/docs/ai-tools/claude-code.mdx        |  83 ----
 packages/docs/ai-tools/cursor.mdx             | 423 ------------------
 packages/docs/ai-tools/windsurf.mdx           |  96 ----
 packages/docs/assets/favicon.svg              |   5 +
 packages/docs/assets/logo-dark.svg            |  10 +
 packages/docs/assets/logo-light.svg           |  10 +
 packages/docs/development.mdx                 |  96 ----
 packages/docs/docs.json                       |  46 +-
 packages/docs/essentials/code.mdx             |  35 --
 packages/docs/essentials/images.mdx           |  56 ---
 packages/docs/essentials/markdown.mdx         |  88 ----
 packages/docs/essentials/navigation.mdx       |  87 ----
 .../docs/essentials/reusable-snippets.mdx     | 112 -----
 packages/docs/essentials/settings.mdx         | 316 -------------
 packages/docs/favicon-v3.svg                  |  19 -
 packages/docs/favicon.svg                     |  19 -
 packages/docs/images/checks-passed.png        | Bin 160724 -> 0 bytes
 packages/docs/images/hero-dark.png            | Bin 110614 -> 0 bytes
 packages/docs/images/hero-light.png           | Bin 104264 -> 0 bytes
 packages/docs/index.mdx                       | 232 ++++++++--
 packages/docs/logo/dark.svg                   |  21 -
 packages/docs/logo/light.svg                  |  21 -
 packages/docs/quickstart.mdx                  |  81 ----
 packages/docs/sdk/index.mdx                   |   4 +
 packages/docs/snippets/snippet-intro.mdx      |   4 -
 27 files changed, 254 insertions(+), 1679 deletions(-)
 delete mode 100644 packages/docs/LICENSE
 delete mode 100644 packages/docs/ai-tools/claude-code.mdx
 delete mode 100644 packages/docs/ai-tools/cursor.mdx
 delete mode 100644 packages/docs/ai-tools/windsurf.mdx
 create mode 100644 packages/docs/assets/favicon.svg
 create mode 100644 packages/docs/assets/logo-dark.svg
 create mode 100644 packages/docs/assets/logo-light.svg
 delete mode 100644 packages/docs/development.mdx
 delete mode 100644 packages/docs/essentials/code.mdx
 delete mode 100644 packages/docs/essentials/images.mdx
 delete mode 100644 packages/docs/essentials/markdown.mdx
 delete mode 100644 packages/docs/essentials/navigation.mdx
 delete mode 100644 packages/docs/essentials/reusable-snippets.mdx
 delete mode 100644 packages/docs/essentials/settings.mdx
 delete mode 100644 packages/docs/favicon-v3.svg
 delete mode 100644 packages/docs/favicon.svg
 delete mode 100644 packages/docs/images/checks-passed.png
 delete mode 100644 packages/docs/images/hero-dark.png
 delete mode 100644 packages/docs/images/hero-light.png
 delete mode 100644 packages/docs/logo/dark.svg
 delete mode 100644 packages/docs/logo/light.svg
 delete mode 100644 packages/docs/quickstart.mdx
 create mode 100644 packages/docs/sdk/index.mdx
 delete mode 100644 packages/docs/snippets/snippet-intro.mdx

diff --git a/packages/docs/LICENSE b/packages/docs/LICENSE
deleted file mode 100644
index 5411374274..0000000000
--- a/packages/docs/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 Mintlify
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/packages/docs/README.md b/packages/docs/README.md
index 17956df329..792f64b3f8 100644
--- a/packages/docs/README.md
+++ b/packages/docs/README.md
@@ -1,44 +1,24 @@
-# Mintlify Starter Kit
+# OpenCode documentation
 
-Use the starter kit to get your docs deployed and ready to customize.
+The V2 documentation is a Mintlify site deployed from `packages/docs` on the `dev` branch.
 
-Click the green **Use this template** button at the top of this repo to copy the Mintlify starter kit. The starter kit contains examples with
+## Local preview
 
-- Guide pages
-- Navigation
-- Customizations
-- API reference pages
-- Use of popular components
+The Mintlify CLI requires Node.js 20 through 24.
 
-**[Follow the full quickstart guide](https://starter.mintlify.com/quickstart)**
+From this directory, run:
 
-## Development
-
-Install the [Mintlify CLI](https://www.npmjs.com/package/mint) to preview your documentation changes locally. To install, use the following command:
-
-```
-npm i -g mint
+```bash
+npx mint dev
 ```
 
-Run the following command at the root of your documentation, where your `docs.json` is located:
+The preview opens at `http://localhost:3000` and reloads when MDX or `docs.json` changes.
 
-```
-mint dev
+Validate changes before opening a pull request:
+
+```bash
+npx mint validate
+npx mint broken-links
 ```
 
-View your local preview at `http://localhost:3000`.
-
-## Publishing changes
-
-Install our GitHub app from your [dashboard](https://dashboard.mintlify.com/settings/organization/github-app) to propagate changes from your repo to your deployment. Changes are deployed to production automatically after pushing to the default branch.
-
-## Need help?
-
-### Troubleshooting
-
-- If your dev environment isn't running: Run `mint update` to ensure you have the most recent version of the CLI.
-- If a page loads as a 404: Make sure you are running in a folder with a valid `docs.json`.
-
-### Resources
-
-- [Mintlify documentation](https://mintlify.com/docs)
+The hosted preview is available at [opencode.mintlify.site](https://opencode.mintlify.site).
diff --git a/packages/docs/ai-tools/claude-code.mdx b/packages/docs/ai-tools/claude-code.mdx
deleted file mode 100644
index 4039c6e0ea..0000000000
--- a/packages/docs/ai-tools/claude-code.mdx
+++ /dev/null
@@ -1,83 +0,0 @@
----
-title: "Claude Code setup"
-description: "Configure Claude Code for your documentation workflow"
-icon: "asterisk"
----
-
-Claude Code is Anthropic's official CLI tool. This guide will help you set up Claude Code to help you write and maintain your documentation.
-
-## Prerequisites
-
-- Active Claude subscription (Pro, Max, or API access)
-
-## Setup
-
-1. Install Claude Code globally:
-
-```bash
-npm install -g @anthropic-ai/claude-code
-```
-
-2. Navigate to your docs directory.
-3. (Optional) Add the `CLAUDE.md` file below to your project.
-4. Run `claude` to start.
-
-## Create `CLAUDE.md`
-
-Create a `CLAUDE.md` file at the root of your documentation repository to train Claude Code on your specific documentation standards:
-
-```markdown
-# Mintlify documentation
-
-## Working relationship
-
-- You can push back on ideas-this can lead to better documentation. Cite sources and explain your reasoning when you do so
-- ALWAYS ask for clarification rather than making assumptions
-- NEVER lie, guess, or make up information
-
-## Project context
-
-- Format: MDX files with YAML frontmatter
-- Config: docs.json for navigation, theme, settings
-- Components: Mintlify components
-
-## Content strategy
-
-- Document just enough for user success - not too much, not too little
-- Prioritize accuracy and usability of information
-- Make content evergreen when possible
-- Search for existing information before adding new content. Avoid duplication unless it is done for a strategic reason
-- Check existing patterns for consistency
-- Start by making the smallest reasonable changes
-
-## Frontmatter requirements for pages
-
-- title: Clear, descriptive page title
-- description: Concise summary for SEO/navigation
-
-## Writing standards
-
-- Second-person voice ("you")
-- Prerequisites at start of procedural content
-- Test all code examples before publishing
-- Match style and formatting of existing pages
-- Include both basic and advanced use cases
-- Language tags on all code blocks
-- Alt text on all images
-- Relative paths for internal links
-
-## Git workflow
-
-- NEVER use --no-verify when committing
-- Ask how to handle uncommitted changes before starting
-- Create a new branch when no clear branch exists for changes
-- Commit frequently throughout development
-- NEVER skip or disable pre-commit hooks
-
-## Do not
-
-- Skip frontmatter on any MDX file
-- Use absolute URLs for internal links
-- Include untested code examples
-- Make assumptions - always ask for clarification
-```
diff --git a/packages/docs/ai-tools/cursor.mdx b/packages/docs/ai-tools/cursor.mdx
deleted file mode 100644
index d05882919f..0000000000
--- a/packages/docs/ai-tools/cursor.mdx
+++ /dev/null
@@ -1,423 +0,0 @@
----
-title: "Cursor setup"
-description: "Configure Cursor for your documentation workflow"
-icon: "arrow-pointer"
----
-
-Use Cursor to help write and maintain your documentation. This guide shows how to configure Cursor for better results on technical writing tasks and using Mintlify components.
-
-## Prerequisites
-
-- Cursor editor installed
-- Access to your documentation repository
-
-## Project rules
-
-Create project rules that all team members can use. In your documentation repository root:
-
-```bash
-mkdir -p .cursor
-```
-
-Create `.cursor/rules.md`:
-
-````markdown
-# Mintlify technical writing rule
-
-You are an AI writing assistant specialized in creating exceptional technical documentation using Mintlify components and following industry-leading technical writing practices.
-
-## Core writing principles
-
-### Language and style requirements
-
-- Use clear, direct language appropriate for technical audiences
-- Write in second person ("you") for instructions and procedures
-- Use active voice over passive voice
-- Employ present tense for current states, future tense for outcomes
-- Avoid jargon unless necessary and define terms when first used
-- Maintain consistent terminology throughout all documentation
-- Keep sentences concise while providing necessary context
-- Use parallel structure in lists, headings, and procedures
-
-### Content organization standards
-
-- Lead with the most important information (inverted pyramid structure)
-- Use progressive disclosure: basic concepts before advanced ones
-- Break complex procedures into numbered steps
-- Include prerequisites and context before instructions
-- Provide expected outcomes for each major step
-- Use descriptive, keyword-rich headings for navigation and SEO
-- Group related information logically with clear section breaks
-
-### User-centered approach
-
-- Focus on user goals and outcomes rather than system features
-- Anticipate common questions and address them proactively
-- Include troubleshooting for likely failure points
-- Write for scannability with clear headings, lists, and white space
-- Include verification steps to confirm success
-
-## Mintlify component reference
-
-### Callout components
-
-#### Note - Additional helpful information
-
-<Note>
-Supplementary information that supports the main content without interrupting flow
-</Note>
-
-#### Tip - Best practices and pro tips
-
-<Tip>
-Expert advice, shortcuts, or best practices that enhance user success
-</Tip>
-
-#### Warning - Important cautions
-
-<Warning>
-Critical information about potential issues, breaking changes, or destructive actions
-</Warning>
-
-#### Info - Neutral contextual information
-
-<Info>
-Background information, context, or neutral announcements
-</Info>
-
-#### Check - Success confirmations
-
-<Check>
-Positive confirmations, successful completions, or achievement indicators
-</Check>
-
-### Code components
-
-#### Single code block
-
-Example of a single code block:
-
-```javascript config.js
-const apiConfig = {
-  baseURL: "https://api.example.com",
-  timeout: 5000,
-  headers: {
-    Authorization: `Bearer ${process.env.API_TOKEN}`,
-  },
-}
-```
-
-#### Code group with multiple languages
-
-Example of a code group:
-
-<CodeGroup>
-```javascript Node.js
-const response = await fetch('/api/endpoint', {
-  headers: { Authorization: `Bearer ${apiKey}` }
-});
-```
-
-```python Python
-import requests
-response = requests.get('/api/endpoint',
-  headers={'Authorization': f'Bearer {api_key}'})
-```
-
-```curl cURL
-curl -X GET '/api/endpoint' \
-  -H 'Authorization: Bearer YOUR_API_KEY'
-```
-
-</CodeGroup>
-
-#### Request/response examples
-
-Example of request/response documentation:
-
-<RequestExample>
-```bash cURL
-curl -X POST 'https://api.example.com/users' \
-  -H 'Content-Type: application/json' \
-  -d '{"name": "John Doe", "email": "john@example.com"}'
-```
-</RequestExample>
-
-<ResponseExample>
-```json Success
-{
-  "id": "user_123",
-  "name": "John Doe", 
-  "email": "john@example.com",
-  "created_at": "2024-01-15T10:30:00Z"
-}
-```
-</ResponseExample>
-
-### Structural components
-
-#### Steps for procedures
-
-Example of step-by-step instructions:
-
-<Steps>
-<Step title="Install dependencies">
-  Run `npm install` to install required packages.
-  
-  <Check>
-  Verify installation by running `npm list`.
-  </Check>
-</Step>
-
-<Step title="Configure environment">
-  Create a `.env` file with your API credentials.
-  
-  ```bash
-  API_KEY=your_api_key_here
-  ```
-  
-  <Warning>
-  Never commit API keys to version control.
-  </Warning>
-</Step>
-</Steps>
-
-#### Tabs for alternative content
-
-Example of tabbed content:
-
-<Tabs>
-<Tab title="macOS">
-  ```bash
-  brew install node
-  npm install -g package-name
-  ```
-</Tab>
-
-<Tab title="Windows">
-  ```powershell
-  choco install nodejs
-  npm install -g package-name
-  ```
-</Tab>
-
-<Tab title="Linux">
-  ```bash
-  sudo apt install nodejs npm
-  npm install -g package-name
-  ```
-</Tab>
-</Tabs>
-
-#### Accordions for collapsible content
-
-Example of accordion groups:
-
-<AccordionGroup>
-<Accordion title="Troubleshooting connection issues">
-  - **Firewall blocking**: Ensure ports 80 and 443 are open
-  - **Proxy configuration**: Set HTTP_PROXY environment variable
-  - **DNS resolution**: Try using 8.8.8.8 as DNS server
-</Accordion>
-
-<Accordion title="Advanced configuration">
-  ```javascript
-  const config = {
-    performance: { cache: true, timeout: 30000 },
-    security: { encryption: 'AES-256' }
-  };
-  ```
-</Accordion>
-</AccordionGroup>
-
-### Cards and columns for emphasizing information
-
-Example of cards and card groups:
-
-<Card title="Getting started guide" icon="rocket" href="/quickstart">
-Complete walkthrough from installation to your first API call in under 10 minutes.
-</Card>
-
-<CardGroup cols={2}>
-<Card title="Authentication" icon="key" href="/auth">
-  Learn how to authenticate requests using API keys or JWT tokens.
-</Card>
-
-<Card title="Rate limiting" icon="clock" href="/rate-limits">
-  Understand rate limits and best practices for high-volume usage.
-</Card>
-</CardGroup>
-
-### API documentation components
-
-#### Parameter fields
-
-Example of parameter documentation:
-
-<ParamField path="user_id" type="string" required>
-Unique identifier for the user. Must be a valid UUID v4 format.
-</ParamField>
-
-<ParamField body="email" type="string" required>
-User's email address. Must be valid and unique within the system.
-</ParamField>
-
-<ParamField query="limit" type="integer" default="10">
-Maximum number of results to return. Range: 1-100.
-</ParamField>
-
-<ParamField header="Authorization" type="string" required>
-Bearer token for API authentication. Format: `Bearer YOUR_API_KEY`
-</ParamField>
-
-#### Response fields
-
-Example of response field documentation:
-
-<ResponseField name="user_id" type="string" required>
-Unique identifier assigned to the newly created user.
-</ResponseField>
-
-<ResponseField name="created_at" type="timestamp">
-ISO 8601 formatted timestamp of when the user was created.
-</ResponseField>
-
-<ResponseField name="permissions" type="array">
-List of permission strings assigned to this user.
-</ResponseField>
-
-#### Expandable nested fields
-
-Example of nested field documentation:
-
-<ResponseField name="user" type="object">
-Complete user object with all associated data.
-
-<Expandable title="User properties">
-  <ResponseField name="profile" type="object">
-  User profile information including personal details.
-  
-  <Expandable title="Profile details">
-    <ResponseField name="first_name" type="string">
-    User's first name as entered during registration.
-    </ResponseField>
-    
-    <ResponseField name="avatar_url" type="string | null">
-    URL to user's profile picture. Returns null if no avatar is set.
-    </ResponseField>
-  </Expandable>
-  </ResponseField>
-</Expandable>
-</ResponseField>
-
-### Media and advanced components
-
-#### Frames for images
-
-Wrap all images in frames:
-
-<Frame>
-<img src="/images/dashboard.png" alt="Main dashboard showing analytics overview" />
-</Frame>
-
-<Frame caption="The analytics dashboard provides real-time insights">
-<img src="/images/analytics.png" alt="Analytics dashboard with charts" />
-</Frame>
-
-#### Videos
-
-Use the HTML video element for self-hosted video content:
-
-<video
-controls
-className="w-full aspect-video rounded-xl"
-src="link-to-your-video.com"
-
-> </video>
-
-Embed YouTube videos using iframe elements:
-
-<iframe
-  className="w-full aspect-video rounded-xl"
-  src="https://www.youtube.com/embed/4KzFe50RQkQ"
-  title="YouTube video player"
-  frameBorder="0"
-  allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
-  allowFullScreen
-></iframe>
-
-#### Tooltips
-
-Example of tooltip usage:
-
-<Tooltip tip="Application Programming Interface - protocols for building software">
-API
-</Tooltip>
-
-#### Updates
-
-Use updates for changelogs:
-
-<Update label="Version 2.1.0" description="Released March 15, 2024">
-## New features
-- Added bulk user import functionality
-- Improved error messages with actionable suggestions
-
-## Bug fixes
-
-- Fixed pagination issue with large datasets
-- Resolved authentication timeout problems
-  </Update>
-
-## Required page structure
-
-Every documentation page must begin with YAML frontmatter:
-
-```yaml
----
-title: "Clear, specific, keyword-rich title"
-description: "Concise description explaining page purpose and value"
----
-```
-
-## Content quality standards
-
-### Code examples requirements
-
-- Always include complete, runnable examples that users can copy and execute
-- Show proper error handling and edge case management
-- Use realistic data instead of placeholder values
-- Include expected outputs and results for verification
-- Test all code examples thoroughly before publishing
-- Specify language and include filename when relevant
-- Add explanatory comments for complex logic
-- Never include real API keys or secrets in code examples
-
-### API documentation requirements
-
-- Document all parameters including optional ones with clear descriptions
-- Show both success and error response examples with realistic data
-- Include rate limiting information with specific limits
-- Provide authentication examples showing proper format
-- Explain all HTTP status codes and error handling
-- Cover complete request/response cycles
-
-### Accessibility requirements
-
-- Include descriptive alt text for all images and diagrams
-- Use specific, actionable link text instead of "click here"
-- Ensure proper heading hierarchy starting with H2
-- Provide keyboard navigation considerations
-- Use sufficient color contrast in examples and visuals
-- Structure content for easy scanning with headers and lists
-
-## Component selection logic
-
-- Use **Steps** for procedures and sequential instructions
-- Use **Tabs** for platform-specific content or alternative approaches
-- Use **CodeGroup** when showing the same concept in multiple programming languages
-- Use **Accordions** for progressive disclosure of information
-- Use **RequestExample/ResponseExample** specifically for API endpoint documentation
-- Use **ParamField** for API parameters, **ResponseField** for API responses
-- Use **Expandable** for nested object properties or hierarchical information
-````
diff --git a/packages/docs/ai-tools/windsurf.mdx b/packages/docs/ai-tools/windsurf.mdx
deleted file mode 100644
index 310c81d5f7..0000000000
--- a/packages/docs/ai-tools/windsurf.mdx
+++ /dev/null
@@ -1,96 +0,0 @@
----
-title: "Windsurf setup"
-description: "Configure Windsurf for your documentation workflow"
-icon: "water"
----
-
-Configure Windsurf's Cascade AI assistant to help you write and maintain documentation. This guide shows how to set up Windsurf specifically for your Mintlify documentation workflow.
-
-## Prerequisites
-
-- Windsurf editor installed
-- Access to your documentation repository
-
-## Workspace rules
-
-Create workspace rules that provide Windsurf with context about your documentation project and standards.
-
-Create `.windsurf/rules.md` in your project root:
-
-````markdown
-# Mintlify technical writing rule
-
-## Project context
-
-- This is a documentation project on the Mintlify platform
-- We use MDX files with YAML frontmatter
-- Navigation is configured in `docs.json`
-- We follow technical writing best practices
-
-## Writing standards
-
-- Use second person ("you") for instructions
-- Write in active voice and present tense
-- Start procedures with prerequisites
-- Include expected outcomes for major steps
-- Use descriptive, keyword-rich headings
-- Keep sentences concise but informative
-
-## Required page structure
-
-Every page must start with frontmatter:
-
-```yaml
----
-title: "Clear, specific title"
-description: "Concise description for SEO and navigation"
----
-```
-
-## Mintlify components
-
-### Callouts
-
-- `<Note>` for helpful supplementary information
-- `<Warning>` for important cautions and breaking changes
-- `<Tip>` for best practices and expert advice
-- `<Info>` for neutral contextual information
-- `<Check>` for success confirmations
-
-### Code examples
-
-- When appropriate, include complete, runnable examples
-- Use `<CodeGroup>` for multiple language examples
-- Specify language tags on all code blocks
-- Include realistic data, not placeholders
-- Use `<RequestExample>` and `<ResponseExample>` for API docs
-
-### Procedures
-
-- Use `<Steps>` component for sequential instructions
-- Include verification steps with `<Check>` components when relevant
-- Break complex procedures into smaller steps
-
-### Content organization
-
-- Use `<Tabs>` for platform-specific content
-- Use `<Accordion>` for progressive disclosure
-- Use `<Card>` and `<CardGroup>` for highlighting content
-- Wrap images in `<Frame>` components with descriptive alt text
-
-## API documentation requirements
-
-- Document all parameters with `<ParamField>`
-- Show response structure with `<ResponseField>`
-- Include both success and error examples
-- Use `<Expandable>` for nested object properties
-- Always include authentication examples
-
-## Quality standards
-
-- Test all code examples before publishing
-- Use relative paths for internal links
-- Include alt text for all images
-- Ensure proper heading hierarchy (start with h2)
-- Check existing patterns for consistency
-````
diff --git a/packages/docs/assets/favicon.svg b/packages/docs/assets/favicon.svg
new file mode 100644
index 0000000000..1beb80483d
--- /dev/null
+++ b/packages/docs/assets/favicon.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M18 18H6V6H18V18Z" fill="#F5F5F5"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M3 3H21V21H3V3ZM8 8V16H16V8H8Z" fill="#3B7DD8"/>
+  <path d="M16 8H20V12H16V8Z" fill="#FAB283"/>
+</svg>
diff --git a/packages/docs/assets/logo-dark.svg b/packages/docs/assets/logo-dark.svg
new file mode 100644
index 0000000000..9812b2308d
--- /dev/null
+++ b/packages/docs/assets/logo-dark.svg
@@ -0,0 +1,10 @@
+<svg width="234" height="42" viewBox="0 0 234 42" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M18 30H6V18H18V30Z" fill="#4B4646"/><path d="M18 12H6V30H18V12ZM24 36H0V6H24V36Z" fill="#B7B1B1"/>
+  <path d="M48 30H36V18H48V30Z" fill="#4B4646"/><path d="M36 30H48V12H36V30ZM54 36H36V42H30V6H54V36Z" fill="#B7B1B1"/>
+  <path d="M84 24V30H66V24H84Z" fill="#4B4646"/><path d="M84 24H66V30H84V36H60V6H84V24ZM66 18H78V12H66V18Z" fill="#B7B1B1"/>
+  <path d="M108 36H96V18H108V36Z" fill="#4B4646"/><path d="M108 12H96V36H90V6H108V12ZM114 36H108V12H114V36Z" fill="#B7B1B1"/>
+  <path d="M144 30H126V18H144V30Z" fill="#4B4646"/><path d="M144 12H126V30H144V36H120V6H144V12Z" fill="#F1ECEC"/>
+  <path d="M168 30H156V18H168V30Z" fill="#4B4646"/><path d="M168 12H156V30H168V12ZM174 36H150V6H174V36Z" fill="#F1ECEC"/>
+  <path d="M198 30H186V18H198V30Z" fill="#4B4646"/><path d="M198 12H186V30H198V12ZM204 36H180V6H198V0H204V36Z" fill="#F1ECEC"/>
+  <path d="M234 24V30H216V24H234Z" fill="#4B4646"/><path d="M216 12V18H228V12H216ZM234 24H216V30H234V36H210V6H234V24Z" fill="#F1ECEC"/>
+</svg>
diff --git a/packages/docs/assets/logo-light.svg b/packages/docs/assets/logo-light.svg
new file mode 100644
index 0000000000..0fa652b24b
--- /dev/null
+++ b/packages/docs/assets/logo-light.svg
@@ -0,0 +1,10 @@
+<svg width="234" height="42" viewBox="0 0 234 42" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M18 30H6V18H18V30Z" fill="#CFCECD"/><path d="M18 12H6V30H18V12ZM24 36H0V6H24V36Z" fill="#656363"/>
+  <path d="M48 30H36V18H48V30Z" fill="#CFCECD"/><path d="M36 30H48V12H36V30ZM54 36H36V42H30V6H54V36Z" fill="#656363"/>
+  <path d="M84 24V30H66V24H84Z" fill="#CFCECD"/><path d="M84 24H66V30H84V36H60V6H84V24ZM66 18H78V12H66V18Z" fill="#656363"/>
+  <path d="M108 36H96V18H108V36Z" fill="#CFCECD"/><path d="M108 12H96V36H90V6H108V12ZM114 36H108V12H114V36Z" fill="#656363"/>
+  <path d="M144 30H126V18H144V30Z" fill="#CFCECD"/><path d="M144 12H126V30H144V36H120V6H144V12Z" fill="#211E1E"/>
+  <path d="M168 30H156V18H168V30Z" fill="#CFCECD"/><path d="M168 12H156V30H168V12ZM174 36H150V6H174V36Z" fill="#211E1E"/>
+  <path d="M198 30H186V18H198V30Z" fill="#CFCECD"/><path d="M198 12H186V30H198V12ZM204 36H180V6H198V0H204V36Z" fill="#211E1E"/>
+  <path d="M234 24V30H216V24H234Z" fill="#CFCECD"/><path d="M216 12V18H228V12H216ZM234 24H216V30H234V36H210V6H234V24Z" fill="#211E1E"/>
+</svg>
diff --git a/packages/docs/development.mdx b/packages/docs/development.mdx
deleted file mode 100644
index 432ef80e4f..0000000000
--- a/packages/docs/development.mdx
+++ /dev/null
@@ -1,96 +0,0 @@
----
-title: "Development"
-description: "Preview changes locally to update your docs"
----
-
-<Info>**Prerequisites**: - Node.js version 19 or higher - A docs repository with a `docs.json` file</Info>
-
-Follow these steps to install and run Mintlify on your operating system.
-
-<Steps>
-<Step title="Install the Mintlify CLI">
-
-```bash
-npm i -g mint
-```
-
-</Step>
-
-<Step title="Preview locally">
-
-Navigate to your docs directory where your `docs.json` file is located, and run the following command:
-
-```bash
-mint dev
-```
-
-A local preview of your documentation will be available at `http://localhost:3000`.
-
-</Step>
-</Steps>
-
-## Custom ports
-
-By default, Mintlify uses port 3000. You can customize the port Mintlify runs on by using the `--port` flag. For example, to run Mintlify on port 3333, use this command:
-
-```bash
-mint dev --port 3333
-```
-
-If you attempt to run Mintlify on a port that's already in use, it will use the next available port:
-
-```md
-Port 3000 is already in use. Trying 3001 instead.
-```
-
-## Mintlify versions
-
-Please note that each CLI release is associated with a specific version of Mintlify. If your local preview does not align with the production version, please update the CLI:
-
-```bash
-npm mint update
-```
-
-## Validating links
-
-The CLI can assist with validating links in your documentation. To identify any broken links, use the following command:
-
-```bash
-mint broken-links
-```
-
-## Deployment
-
-If the deployment is successful, you should see the following:
-
-<Frame>
-  <img
-    src="/images/checks-passed.png"
-    alt="Screenshot of a deployment confirmation message that says All checks have passed."
-    style={{ borderRadius: "0.5rem" }}
-  />
-</Frame>
-
-## Code formatting
-
-We suggest using extensions on your IDE to recognize and format MDX. If you're a VSCode user, consider the [MDX VSCode extension](https://marketplace.visualstudio.com/items?itemName=unifiedjs.vscode-mdx) for syntax highlighting, and [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) for code formatting.
-
-## Troubleshooting
-
-<AccordionGroup>
-  <Accordion title='Error: Could not load the "sharp" module using the darwin-arm64 runtime'>
-
-    This may be due to an outdated version of node. Try the following:
-    1. Remove the currently-installed version of the CLI: `npm remove -g mint`
-    2. Upgrade to Node v19 or higher.
-    3. Reinstall the CLI: `npm i -g mint`
-
-  </Accordion>
-
-  <Accordion title="Issue: Encountering an unknown error">
-  
-    Solution: Go to the root of your device and delete the `~/.mintlify` folder. Then run `mint dev` again.
-  </Accordion>
-</AccordionGroup>
-
-Curious about what changed in the latest CLI version? Check out the [CLI changelog](https://www.npmjs.com/package/mintlify?activeTab=versions).
diff --git a/packages/docs/docs.json b/packages/docs/docs.json
index 1bf8b3700b..a8319876dc 100644
--- a/packages/docs/docs.json
+++ b/packages/docs/docs.json
@@ -1,53 +1,51 @@
 {
   "$schema": "https://mintlify.com/docs.json",
   "theme": "mint",
-  "name": "@opencode-ai/docs",
+  "name": "OpenCode",
+  "description": "OpenCode documentation.",
   "colors": {
-    "primary": "#16A34A",
-    "light": "#07C983",
-    "dark": "#15803D"
+    "primary": "#3B7DD8",
+    "light": "#3B7DD8",
+    "dark": "#FAB283"
+  },
+  "favicon": "/assets/favicon.svg",
+  "logo": {
+    "light": "/assets/logo-light.svg",
+    "dark": "/assets/logo-dark.svg"
   },
-  "favicon": "/favicon-v3.svg",
   "navigation": {
     "tabs": [
+      {
+        "tab": "Docs",
+        "pages": ["index"]
+      },
       {
         "tab": "SDK",
-        "groups": [
-          {
-            "group": "Getting started",
-            "pages": ["index", "quickstart", "development"],
-            "openapi": "https://opencode.ai/openapi.json"
-          }
-        ]
+        "pages": ["sdk/index"]
       }
     ],
     "global": {}
   },
-  "logo": {
-    "light": "/logo/light.svg",
-    "dark": "/logo/dark.svg"
-  },
   "navbar": {
     "links": [
       {
-        "label": "Support",
-        "href": "mailto:hi@mintlify.com"
+        "label": "Discord",
+        "href": "https://opencode.ai/discord"
       }
     ],
     "primary": {
       "type": "button",
-      "label": "Dashboard",
-      "href": "https://dashboard.mintlify.com"
+      "label": "GitHub",
+      "href": "https://github.com/anomalyco/opencode"
     }
   },
   "contextual": {
-    "options": ["copy", "view", "chatgpt", "claude", "perplexity", "mcp", "cursor", "vscode"]
+    "options": ["copy", "view", "chatgpt", "claude", "mcp", "cursor", "vscode"]
   },
   "footer": {
     "socials": {
-      "x": "https://x.com/mintlify",
-      "github": "https://github.com/mintlify",
-      "linkedin": "https://linkedin.com/company/mintlify"
+      "github": "https://github.com/anomalyco/opencode",
+      "x": "https://x.com/opencode"
     }
   }
 }
diff --git a/packages/docs/essentials/code.mdx b/packages/docs/essentials/code.mdx
deleted file mode 100644
index 7a04654470..0000000000
--- a/packages/docs/essentials/code.mdx
+++ /dev/null
@@ -1,35 +0,0 @@
----
-title: "Code blocks"
-description: "Display inline code and code blocks"
-icon: "code"
----
-
-## Inline code
-
-To denote a `word` or `phrase` as code, enclose it in backticks (`).
-
-```
-To denote a `word` or `phrase` as code, enclose it in backticks (`).
-```
-
-## Code blocks
-
-Use [fenced code blocks](https://www.markdownguide.org/extended-syntax/#fenced-code-blocks) by enclosing code in three backticks and follow the leading ticks with the programming language of your snippet to get syntax highlighting. Optionally, you can also write the name of your code after the programming language.
-
-```java HelloWorld.java
-class HelloWorld {
-    public static void main(String[] args) {
-        System.out.println("Hello, World!");
-    }
-}
-```
-
-````md
-```java HelloWorld.java
-class HelloWorld {
-    public static void main(String[] args) {
-        System.out.println("Hello, World!");
-    }
-}
-```
-````
diff --git a/packages/docs/essentials/images.mdx b/packages/docs/essentials/images.mdx
deleted file mode 100644
index f2a10d2538..0000000000
--- a/packages/docs/essentials/images.mdx
+++ /dev/null
@@ -1,56 +0,0 @@
----
-title: "Images and embeds"
-description: "Add image, video, and other HTML elements"
-icon: "image"
----
-
-<img style={{ borderRadius: "0.5rem" }} src="https://mintlify-assets.b-cdn.net/bigbend.jpg" />
-
-## Image
-
-### Using Markdown
-
-The [markdown syntax](https://www.markdownguide.org/basic-syntax/#images) lets you add images using the following code
-
-```md
-![title](/path/image.jpg)
-```
-
-Note that the image file size must be less than 5MB. Otherwise, we recommend hosting on a service like [Cloudinary](https://cloudinary.com/) or [S3](https://aws.amazon.com/s3/). You can then use that URL and embed.
-
-### Using embeds
-
-To get more customizability with images, you can also use [embeds](/writing-content/embed) to add images
-
-```html
-<img height="200" src="/path/image.jpg" />
-```
-
-## Embeds and HTML elements
-
-<iframe
-  width="560"
-  height="315"
-  src="https://www.youtube.com/embed/4KzFe50RQkQ"
-  title="YouTube video player"
-  frameBorder="0"
-  allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
-  allowFullScreen
-  style={{ width: "100%", borderRadius: "0.5rem" }}
-></iframe>
-
-<br />
-
-<Tip>
-
-Mintlify supports [HTML tags in Markdown](https://www.markdownguide.org/basic-syntax/#html). This is helpful if you prefer HTML tags to Markdown syntax, and lets you create documentation with infinite flexibility.
-
-</Tip>
-
-### iFrames
-
-Loads another HTML page within the document. Most commonly used for embedding videos.
-
-```html
-<iframe src="https://www.youtube.com/embed/4KzFe50RQkQ"> </iframe>
-```
diff --git a/packages/docs/essentials/markdown.mdx b/packages/docs/essentials/markdown.mdx
deleted file mode 100644
index 0ca5b82509..0000000000
--- a/packages/docs/essentials/markdown.mdx
+++ /dev/null
@@ -1,88 +0,0 @@
----
-title: "Markdown syntax"
-description: "Text, title, and styling in standard markdown"
-icon: "text-size"
----
-
-## Titles
-
-Best used for section headers.
-
-```md
-## Titles
-```
-
-### Subtitles
-
-Best used for subsection headers.
-
-```md
-### Subtitles
-```
-
-<Tip>
-
-Each **title** and **subtitle** creates an anchor and also shows up on the table of contents on the right.
-
-</Tip>
-
-## Text formatting
-
-We support most markdown formatting. Simply add `**`, `_`, or `~` around text to format it.
-
-| Style         | How to write it   | Result          |
-| ------------- | ----------------- | --------------- |
-| Bold          | `**bold**`        | **bold**        |
-| Italic        | `_italic_`        | _italic_        |
-| Strikethrough | `~strikethrough~` | ~strikethrough~ |
-
-You can combine these. For example, write `**_bold and italic_**` to get **_bold and italic_** text.
-
-You need to use HTML to write superscript and subscript text. That is, add `<sup>` or `<sub>` around your text.
-
-| Text Size   | How to write it          | Result                 |
-| ----------- | ------------------------ | ---------------------- |
-| Superscript | `<sup>superscript</sup>` | <sup>superscript</sup> |
-| Subscript   | `<sub>subscript</sub>`   | <sub>subscript</sub>   |
-
-## Linking to pages
-
-You can add a link by wrapping text in `[]()`. You would write `[link to google](https://google.com)` to [link to google](https://google.com).
-
-Links to pages in your docs need to be root-relative. Basically, you should include the entire folder path. For example, `[link to text](/writing-content/text)` links to the page "Text" in our components section.
-
-Relative links like `[link to text](../text)` will open slower because we cannot optimize them as easily.
-
-## Blockquotes
-
-### Singleline
-
-To create a blockquote, add a `>` in front of a paragraph.
-
-> Dorothy followed her through many of the beautiful rooms in her castle.
-
-```md
-> Dorothy followed her through many of the beautiful rooms in her castle.
-```
-
-### Multiline
-
-> Dorothy followed her through many of the beautiful rooms in her castle.
->
-> The Witch bade her clean the pots and kettles and sweep the floor and keep the fire fed with wood.
-
-```md
-> Dorothy followed her through many of the beautiful rooms in her castle.
->
-> The Witch bade her clean the pots and kettles and sweep the floor and keep the fire fed with wood.
-```
-
-### LaTeX
-
-Mintlify supports [LaTeX](https://www.latex-project.org) through the Latex component.
-
-<Latex>8 x (vk x H1 - H2) = (0,1)</Latex>
-
-```md
-<Latex>8 x (vk x H1 - H2) = (0,1)</Latex>
-```
diff --git a/packages/docs/essentials/navigation.mdx b/packages/docs/essentials/navigation.mdx
deleted file mode 100644
index a6a3090046..0000000000
--- a/packages/docs/essentials/navigation.mdx
+++ /dev/null
@@ -1,87 +0,0 @@
----
-title: "Navigation"
-description: "The navigation field in docs.json defines the pages that go in the navigation menu"
-icon: "map"
----
-
-The navigation menu is the list of links on every website.
-
-You will likely update `docs.json` every time you add a new page. Pages do not show up automatically.
-
-## Navigation syntax
-
-Our navigation syntax is recursive which means you can make nested navigation groups. You don't need to include `.mdx` in page names.
-
-<CodeGroup>
-
-```json Regular Navigation
-"navigation": {
-  "tabs": [
-    {
-      "tab": "Docs",
-      "groups": [
-        {
-          "group": "Getting Started",
-          "pages": ["quickstart"]
-        }
-      ]
-    }
-  ]
-}
-```
-
-```json Nested Navigation
-"navigation": {
-  "tabs": [
-    {
-      "tab": "Docs",
-      "groups": [
-        {
-          "group": "Getting Started",
-          "pages": [
-            "quickstart",
-            {
-              "group": "Nested Reference Pages",
-              "pages": ["nested-reference-page"]
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
-```
-
-</CodeGroup>
-
-## Folders
-
-Simply put your MDX files in folders and update the paths in `docs.json`.
-
-For example, to have a page at `https://yoursite.com/your-folder/your-page` you would make a folder called `your-folder` containing an MDX file called `your-page.mdx`.
-
-<Warning>
-
-You cannot use `api` for the name of a folder unless you nest it inside another folder. Mintlify uses Next.js which reserves the top-level `api` folder for internal server calls. A folder name such as `api-reference` would be accepted.
-
-</Warning>
-
-```json Navigation With Folder
-"navigation": {
-  "tabs": [
-    {
-      "tab": "Docs",
-      "groups": [
-        {
-          "group": "Group Name",
-          "pages": ["your-folder/your-page"]
-        }
-      ]
-    }
-  ]
-}
-```
-
-## Hidden pages
-
-MDX files not included in `docs.json` will not show up in the sidebar but are accessible through the search bar and by linking directly to them.
diff --git a/packages/docs/essentials/reusable-snippets.mdx b/packages/docs/essentials/reusable-snippets.mdx
deleted file mode 100644
index a26ab89a35..0000000000
--- a/packages/docs/essentials/reusable-snippets.mdx
+++ /dev/null
@@ -1,112 +0,0 @@
----
-title: "Reusable snippets"
-description: "Reusable, custom snippets to keep content in sync"
-icon: "recycle"
----
-
-import SnippetIntro from "/snippets/snippet-intro.mdx"
-
-<SnippetIntro />
-
-## Creating a custom snippet
-
-**Pre-condition**: You must create your snippet file in the `snippets` directory.
-
-<Note>
-  Any page in the `snippets` directory will be treated as a snippet and will not be rendered into a standalone page. If
-  you want to create a standalone page from the snippet, import the snippet into another file and call it as a
-  component.
-</Note>
-
-### Default export
-
-1. Add content to your snippet file that you want to re-use across multiple
-   locations. Optionally, you can add variables that can be filled in via props
-   when you import the snippet.
-
-```mdx snippets/my-snippet.mdx
-Hello world! This is my content I want to reuse across pages. My keyword of the
-day is {word}.
-```
-
-<Warning>
-  The content that you want to reuse must be inside the `snippets` directory in order for the import to work.
-</Warning>
-
-2. Import the snippet into your destination file.
-
-```mdx destination-file.mdx
----
-title: My title
-description: My Description
----
-
-import MySnippet from "/snippets/path/to/my-snippet.mdx"
-
-## Header
-
-Lorem impsum dolor sit amet.
-
-<MySnippet word="bananas" />
-```
-
-### Reusable variables
-
-1. Export a variable from your snippet file:
-
-```mdx snippets/path/to/custom-variables.mdx
-export const myName = "my name"
-
-export const myObject = { fruit: "strawberries" }
-
-;
-```
-
-2. Import the snippet from your destination file and use the variable:
-
-```mdx destination-file.mdx
----
-title: My title
-description: My Description
----
-
-import { myName, myObject } from "/snippets/path/to/custom-variables.mdx"
-
-Hello, my name is {myName} and I like {myObject.fruit}.
-```
-
-### Reusable components
-
-1. Inside your snippet file, create a component that takes in props by exporting
-   your component in the form of an arrow function.
-
-```mdx snippets/custom-component.mdx
-export const MyComponent = ({ title }) => (
-  <div>
-    <h1>{title}</h1>
-    <p>... snippet content ...</p>
-  </div>
-)
-
-;
-```
-
-<Warning>
-  MDX does not compile inside the body of an arrow function. Stick to HTML syntax when you can or use a default export
-  if you need to use MDX.
-</Warning>
-
-2. Import the snippet into your destination file and pass in the props
-
-```mdx destination-file.mdx
----
-title: My title
-description: My Description
----
-
-import { MyComponent } from "/snippets/custom-component.mdx"
-
-Lorem ipsum dolor sit amet.
-
-<MyComponent title={"Custom title"} />
-```
diff --git a/packages/docs/essentials/settings.mdx b/packages/docs/essentials/settings.mdx
deleted file mode 100644
index 2cc202ed1f..0000000000
--- a/packages/docs/essentials/settings.mdx
+++ /dev/null
@@ -1,316 +0,0 @@
----
-title: "Global Settings"
-description: "Mintlify gives you complete control over the look and feel of your documentation using the docs.json file"
-icon: "gear"
----
-
-Every Mintlify site needs a `docs.json` file with the core configuration settings. Learn more about the [properties](#properties) below.
-
-## Properties
-
-<ResponseField name="name" type="string" required>
-Name of your project. Used for the global title.
-
-Example: `mintlify`
-
-</ResponseField>
-
-<ResponseField name="navigation" type="Navigation[]" required>
-  An array of groups with all the pages within that group
-  <Expandable title="Navigation">
-    <ResponseField name="group" type="string">
-    The name of the group.
-
-    Example: `Settings`
-
-    </ResponseField>
-    <ResponseField name="pages" type="string[]">
-    The relative paths to the markdown files that will serve as pages.
-
-    Example: `["customization", "page"]`
-
-    </ResponseField>
-
-  </Expandable>
-</ResponseField>
-
-<ResponseField name="logo" type="string or object">
-  Path to logo image or object with path to "light" and "dark" mode logo images
-  <Expandable title="Logo">
-    <ResponseField name="light" type="string">
-      Path to the logo in light mode
-    </ResponseField>
-    <ResponseField name="dark" type="string">
-      Path to the logo in dark mode
-    </ResponseField>
-    <ResponseField name="href" type="string" default="/">
-      Where clicking on the logo links you to
-    </ResponseField>
-  </Expandable>
-</ResponseField>
-
-<ResponseField name="favicon" type="string">
-  Path to the favicon image
-</ResponseField>
-
-<ResponseField name="colors" type="Colors">
-  Hex color codes for your global theme
-  <Expandable title="Colors">
-    <ResponseField name="primary" type="string" required>
-      The primary color. Used most often for highlighted content, section headers, accents, in light mode
-    </ResponseField>
-    <ResponseField name="light" type="string">
-      The primary color for dark mode. Used most often for highlighted content, section headers, accents, in dark mode
-    </ResponseField>
-    <ResponseField name="dark" type="string">
-      The primary color for important buttons
-    </ResponseField>
-    <ResponseField name="background" type="object">
-      The color of the background in both light and dark mode
-      <Expandable title="Object">
-        <ResponseField name="light" type="string" required>
-          The hex color code of the background in light mode
-        </ResponseField>
-        <ResponseField name="dark" type="string" required>
-          The hex color code of the background in dark mode
-        </ResponseField>
-      </Expandable>
-    </ResponseField>
-  </Expandable>
-</ResponseField>
-
-<ResponseField name="topbarLinks" type="TopbarLink[]">
-  Array of `name`s and `url`s of links you want to include in the topbar
-  <Expandable title="TopbarLink">
-    <ResponseField name="name" type="string">
-    The name of the button.
-
-    Example: `Contact us`
-    </ResponseField>
-    <ResponseField name="url" type="string">
-    The url once you click on the button. Example: `https://mintlify.com/docs`
-    </ResponseField>
-
-  </Expandable>
-</ResponseField>
-
-<ResponseField name="topbarCtaButton" type="Call to Action">
-  <Expandable title="Topbar Call to Action">
-    <ResponseField name="type" type={'"link" or "github"'} default="link">
-    Link shows a button. GitHub shows the repo information at the url provided including the number of GitHub stars.
-    </ResponseField>
-    <ResponseField name="url" type="string">
-    If `link`: What the button links to.
-    
-    If `github`: Link to the repository to load GitHub information from.
-    </ResponseField>
-    <ResponseField name="name" type="string">
-    Text inside the button. Only required if `type` is a `link`.
-    </ResponseField>
-
-  </Expandable>
-</ResponseField>
-
-<ResponseField name="versions" type="string[]">
-  Array of version names. Only use this if you want to show different versions of docs with a dropdown in the navigation
-  bar.
-</ResponseField>
-
-<ResponseField name="anchors" type="Anchor[]">
-  An array of the anchors, includes the `icon`, `color`, and `url`.
-  <Expandable title="Anchor">
-    <ResponseField name="icon" type="string">
-    The [Font Awesome](https://fontawesome.com/search?q=heart) icon used to feature the anchor.
-
-    Example: `comments`
-    </ResponseField>
-    <ResponseField name="name" type="string">
-    The name of the anchor label.
-
-    Example: `Community`
-    </ResponseField>
-    <ResponseField name="url" type="string">
-      The start of the URL that marks what pages go in the anchor. Generally, this is the name of the folder you put your pages in.
-    </ResponseField>
-    <ResponseField name="color" type="string">
-      The hex color of the anchor icon background. Can also be a gradient if you pass an object with the properties `from` and `to` that are each a hex color.
-    </ResponseField>
-    <ResponseField name="version" type="string">
-      Used if you want to hide an anchor until the correct docs version is selected.
-    </ResponseField>
-    <ResponseField name="isDefaultHidden" type="boolean" default="false">
-      Pass `true` if you want to hide the anchor until you directly link someone to docs inside it.
-    </ResponseField>
-    <ResponseField name="iconType" default="duotone" type="string">
-      One of: "brands", "duotone", "light", "sharp-solid", "solid", or "thin"
-    </ResponseField>
-
-  </Expandable>
-</ResponseField>
-
-<ResponseField name="topAnchor" type="Object">
-  Override the default configurations for the top-most anchor.
-  <Expandable title="Object">
-    <ResponseField name="name" default="Documentation" type="string">
-      The name of the top-most anchor
-    </ResponseField>
-    <ResponseField name="icon" default="book-open" type="string">
-      Font Awesome icon.
-    </ResponseField>
-    <ResponseField name="iconType" default="duotone" type="string">
-      One of: "brands", "duotone", "light", "sharp-solid", "solid", or "thin"
-    </ResponseField>
-  </Expandable>
-</ResponseField>
-
-<ResponseField name="tabs" type="Tabs[]">
-  An array of navigational tabs.
-  <Expandable title="Tabs">
-    <ResponseField name="name" type="string">
-      The name of the tab label.
-    </ResponseField>
-    <ResponseField name="url" type="string">
-      The start of the URL that marks what pages go in the tab. Generally, this is the name of the folder you put your
-      pages in.
-    </ResponseField>
-  </Expandable>
-</ResponseField>
-
-<ResponseField name="api" type="API">
-  Configuration for API settings. Learn more about API pages at [API Components](/api-playground/demo).
-  <Expandable title="API">
-    <ResponseField name="baseUrl" type="string">
-      The base url for all API endpoints. If `baseUrl` is an array, it will enable for multiple base url
-      options that the user can toggle.
-    </ResponseField>
-
-    <ResponseField name="auth" type="Auth">
-      <Expandable title="Auth">
-        <ResponseField name="method" type='"bearer" | "basic" | "key"'>
-          The authentication strategy used for all API endpoints.
-        </ResponseField>
-        <ResponseField name="name" type="string">
-        The name of the authentication parameter used in the API playground.
-
-        If method is `basic`, the format should be `[usernameName]:[passwordName]`
-        </ResponseField>
-        <ResponseField name="inputPrefix" type="string">
-        The default value that's designed to be a prefix for the authentication input field.
-
-        E.g. If an `inputPrefix` of `AuthKey` would inherit the default input result of the authentication field as `AuthKey`.
-        </ResponseField>
-      </Expandable>
-    </ResponseField>
-
-    <ResponseField name="playground" type="Playground">
-      Configurations for the API playground
-
-      <Expandable title="Playground">
-        <ResponseField name="mode" default="show" type='"show" | "simple" | "hide"'>
-          Whether the playground is showing, hidden, or only displaying the endpoint with no added user interactivity `simple`
-
-          Learn more at the [playground guides](/api-playground/demo)
-        </ResponseField>
-      </Expandable>
-    </ResponseField>
-
-    <ResponseField name="maintainOrder" type="boolean">
-      Enabling this flag ensures that key ordering in OpenAPI pages matches the key ordering defined in the OpenAPI file.
-
-      <Warning>This behavior will soon be enabled by default, at which point this field will be deprecated.</Warning>
-    </ResponseField>
-
-  </Expandable>
-</ResponseField>
-
-<ResponseField name="openapi" type="string | string[]">
-  A string or an array of strings of URL(s) or relative path(s) pointing to your
-  OpenAPI file.
-  
-  Examples:
-  <CodeGroup>
-    ```json Absolute
-    "openapi": "https://example.com/openapi.json"
-    ```
-    ```json Relative
-    "openapi": "/openapi.json"
-    ```
-    ```json Multiple
-    "openapi": ["https://example.com/openapi1.json", "/openapi2.json", "/openapi3.json"]
-    ```
-  </CodeGroup>
-
-</ResponseField>
-
-<ResponseField name="footerSocials" type="FooterSocials">
-  An object of social media accounts where the key:property pair represents the social media platform and the account url.
-  
-  Example: 
-  ```json
-  {
-    "x": "https://x.com/mintlify",
-    "website": "https://mintlify.com"
-  }
-  ```
-  <Expandable title="FooterSocials">
-    <ResponseField name="[key]" type="string">
-    One of the following values `website`, `facebook`, `x`, `discord`, `slack`, `github`, `linkedin`, `instagram`, `hacker-news`
-    
-    Example: `x`
-    </ResponseField>
-    <ResponseField name="property" type="string">
-    The URL to the social platform.
-    
-    Example: `https://x.com/mintlify`
-    </ResponseField>
-  </Expandable>
-</ResponseField>
-
-<ResponseField name="feedback" type="Feedback">
-  Configurations to enable feedback buttons
-
-  <Expandable title="Feedback">
-    <ResponseField name="suggestEdit" type="boolean" default="false">
-    Enables a button to allow users to suggest edits via pull requests
-    </ResponseField>
-    <ResponseField name="raiseIssue" type="boolean" default="false">
-    Enables a button to allow users to raise an issue about the documentation
-    </ResponseField>
-  </Expandable>
-</ResponseField>
-
-<ResponseField name="modeToggle" type="ModeToggle">
-  Customize the dark mode toggle.
-  <Expandable title="ModeToggle">
-    <ResponseField name="default" type={'"light" or "dark"'}>
-      Set if you always want to show light or dark mode for new users. When not
-      set, we default to the same mode as the user's operating system.
-    </ResponseField>
-    <ResponseField name="isHidden" type="boolean" default="false">
-      Set to true to hide the dark/light mode toggle. You can combine `isHidden` with `default` to force your docs to only use light or dark mode. For example:
-      
-      <CodeGroup>
-      ```json Only Dark Mode
-      "modeToggle": {
-        "default": "dark",
-        "isHidden": true
-      }
-      ```
-
-      ```json Only Light Mode
-      "modeToggle": {
-        "default": "light",
-        "isHidden": true
-      }
-      ```
-      </CodeGroup>
-
-    </ResponseField>
-
-  </Expandable>
-</ResponseField>
-
-<ResponseField name="backgroundImage" type="string">
-  A background image to be displayed behind every page. See example with [Infisical](https://infisical.com/docs) and
-  [FRPC](https://frpc.io).
-</ResponseField>
diff --git a/packages/docs/favicon-v3.svg b/packages/docs/favicon-v3.svg
deleted file mode 100644
index b785c738bf..0000000000
--- a/packages/docs/favicon-v3.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.06145 23.1079C5.26816 22.3769 -3.39077 20.6274 1.4173 5.06384C9.6344 6.09939 16.9728 14.0644 9.06145 23.1079Z" fill="url(#paint0_linear_17557_2021)"/>
-<path d="M8.91928 23.0939C5.27642 21.2223 0.78371 4.20891 17.0071 0C20.7569 7.19341 19.6212 16.5452 8.91928 23.0939Z" fill="url(#paint1_linear_17557_2021)"/>
-<path d="M8.91388 23.0788C8.73534 19.8817 10.1585 9.08525 23.5699 13.1107C23.1812 20.1229 18.984 26.4182 8.91388 23.0788Z" fill="url(#paint2_linear_17557_2021)"/>
-<defs>
-<linearGradient id="paint0_linear_17557_2021" x1="3.77557" y1="5.91571" x2="5.23185" y2="21.5589" gradientUnits="userSpaceOnUse">
-<stop stop-color="#18E299"/>
-<stop offset="1" stop-color="#15803D"/>
-</linearGradient>
-<linearGradient id="paint1_linear_17557_2021" x1="12.1711" y1="-0.718425" x2="10.1897" y2="22.9832" gradientUnits="userSpaceOnUse">
-<stop stop-color="#16A34A"/>
-<stop offset="1" stop-color="#4ADE80"/>
-</linearGradient>
-<linearGradient id="paint2_linear_17557_2021" x1="23.1327" y1="15.353" x2="9.33841" y2="18.5196" gradientUnits="userSpaceOnUse">
-<stop stop-color="#4ADE80"/>
-<stop offset="1" stop-color="#0D9373"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/packages/docs/favicon.svg b/packages/docs/favicon.svg
deleted file mode 100644
index b785c738bf..0000000000
--- a/packages/docs/favicon.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.06145 23.1079C5.26816 22.3769 -3.39077 20.6274 1.4173 5.06384C9.6344 6.09939 16.9728 14.0644 9.06145 23.1079Z" fill="url(#paint0_linear_17557_2021)"/>
-<path d="M8.91928 23.0939C5.27642 21.2223 0.78371 4.20891 17.0071 0C20.7569 7.19341 19.6212 16.5452 8.91928 23.0939Z" fill="url(#paint1_linear_17557_2021)"/>
-<path d="M8.91388 23.0788C8.73534 19.8817 10.1585 9.08525 23.5699 13.1107C23.1812 20.1229 18.984 26.4182 8.91388 23.0788Z" fill="url(#paint2_linear_17557_2021)"/>
-<defs>
-<linearGradient id="paint0_linear_17557_2021" x1="3.77557" y1="5.91571" x2="5.23185" y2="21.5589" gradientUnits="userSpaceOnUse">
-<stop stop-color="#18E299"/>
-<stop offset="1" stop-color="#15803D"/>
-</linearGradient>
-<linearGradient id="paint1_linear_17557_2021" x1="12.1711" y1="-0.718425" x2="10.1897" y2="22.9832" gradientUnits="userSpaceOnUse">
-<stop stop-color="#16A34A"/>
-<stop offset="1" stop-color="#4ADE80"/>
-</linearGradient>
-<linearGradient id="paint2_linear_17557_2021" x1="23.1327" y1="15.353" x2="9.33841" y2="18.5196" gradientUnits="userSpaceOnUse">
-<stop stop-color="#4ADE80"/>
-<stop offset="1" stop-color="#0D9373"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/packages/docs/images/checks-passed.png b/packages/docs/images/checks-passed.png
deleted file mode 100644
index 3303c773646ca12fb6852356663540e3ed048115..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 160724
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
C1V-)v

diff --git a/packages/docs/images/hero-dark.png b/packages/docs/images/hero-dark.png
deleted file mode 100644
index a61cbb12528f786ae756dd330da5e60ab4b98ccb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 110614
zcmYg%2RzjO|M>ejBNECgn@UMW8JUMdOCo1vUHPbFWp55CnfWS;tSIBkofNX}5GvUj
zWk$019(VVDz3=*be*gF5(WA$`->=u}x%bPXt5*y-*bcEl5X5oe{5cZ{V&#G$<W*K?
z@Wxh3-U|G;=iYfsPY4n}1OG$lB`aXSON6J1fi6_kDl`RtAaCm!>OfF&0{iX_CJ2GY
zT{x#>>W7#mTPC?U28ga}F8n-uWx~{f!_ZU(v5pWF(^hog`RBQ-s!TB^=5hT2v0ts(
ztfly1L<r;m%xgZqT{s`i@Wt0Giu;b;nL6$Y?bCHH#U64yKl}%G7BbGmwSIA2sJ0!y
z9*B3mouT?rb2ntr^5a9Lx%7#D9L85dGo>0bRLRpnrvCBRb>>-e$o1n>t;xLhf{(jx
zd94fAlEDN}hDgH4^z|-lY3_mgkSlJj_U@{jS?eX+nW}OqgY6&Q99z^to3j+l-^;i8
zS7I`?s9)MLnnW%X*B25<zkY9Wnj{jxIV|<}%B?rQSayUDgft#2O5c>$hDglE<ZdbK
ztV>|aQal1Oa&{f1NA1qVXa2_Rc4bn3w}tSj-_2t{qA??P0#>`%aNE)ot2^0Av@;g_
zOrj&&GLeu*DUKL$(BGJO@kUY1EUM*rNU8^gm|>Sr{U@b@$2l0A#l|5NYZMYhKE1hM
z@YRk^(}U+Bl*1-JrydX>=kl%QW{Vd#O!qiFC||s%$f$VBtt6L)D}<-0;+}M7eFMAk
zmz$E=2pBG=%McZ~zko{&8gc*qF7`+7?cPjJXv3NJ=;l@^MUHCeoc(tD(OL{XWX1Aw
zOz2~e?T4!4T{MjQ7?QfijvdW`uubyRbqPNH5=i8GTM=#v^{9C{)A^ct_*+)4prr-!
zAM-?g>iIG{JVC<@5q<YFdmz6%{xwlJd>ez`x#JW|nXlB%3F>ZJ$bLcB97bd~BMgEh
zE08JlY0~cywAfxmnRfWCcaX%K-zfNd*GO6QJRuRmP)k2FB{u%3LWqX|wD_2B!dxNL
z{UGT<K{&ExH+0}r2eTlr*ybp1I4C)<LDbIfyC{-&cD#V_m7BY!SP1(tsrl5cwl;53
ztf5()a=8rk%TcC1`o-cko7KbH1_j3`Ki1M#9cVPqK7N9eMd|}U_xR*wb6%We=(}Ur
zc#K>xh1$GQwYfsvBsMYot?omvm50CF%<EOjq>E?Y#T<#(nHfO3_ciQ3b@$#zI6uv7
zKyOth491OgsBygrS({x=BChpP+Y&peuPOv-&?==T00ZDncfEAh7DO<(7p}T0;RaLM
ziw)+)Eg8cY>gslXj~fe(AdzPw>xWI2CJk>O`rKDiQi{)1vSDzV*HywLMEc~&Wa5f}
z<EiayzvwK>{M~u+Dl~5{+YEFT;aq)JhmuL@BvQ+$H#7(=!Z#KNhj)I78hoXmF%g1Y
z0z?uyXsDmqn4pa2!)g-z+z*aBbCa%|xtvHbHwvA@r`N#Lw~dBroF~divco&D!75s+
zQ5{Q)(1@04I?JtLTO=W{C}tbgVm=<a$R)`!AADbjS0u`DNve)6Z>{E-Q(*D$7xp1O
zyd>9(q7R{#-2*c}cQh+|p;})G#Vz>x(HvBD&6W%d09v<@^@K>lK-u>c*3RQ9C{#yu
zL_(mK8zNjTWZ@wdBQ#~?@imV|F=2wo2P)_MC^G{g2s<91rp`2E1}y~=w>U>LVn;<x
ze}&C7Q*S4Z%F|BHk4pgCd>z-<ES2iTu+{E15k{elzgaTLvkjTlablFZ&jcb|S%bEi
zL;^Z`{1t?)B%C2eFMEiPv??;WYSWon@6$vB*}gsV?3^@`723SlJsG}L#_w(9iLo0D
zjv8qVF(J1OQ{T!pB~lLO1s$TDHz4mHAkgsZFf?)&{VS}YK?Y0qu~`h&YFnxdUCN|3
zXEq8S8{HSQ)a|BqK!mo#uiE<hQ8v=U6LPoe7`5lN^P0QdqfrHS*WFpP&S+n?`~05k
z@4|?xV~mj2In9cZS!w7HIx4I1$FN@1NCYF&@%nCFZzkPGLiksV2uSqq((*+yj`Eh0
znV;m){i2f*49H<}wJ2q2EuoSqOoLpN7|scaO0@ma=ZElKHkH)nN-BkudPa+MY^ckZ
z+DpwreRbGMpvf0omgE_0w2uKALf24yKhN^>uMsanwqpiT#PuyXTgsLl1vRFb>&Mv^
zvYT_;-<IO&|MAR8xg+T`NJBlVB~ppe8{6G7P@pqq`4r!6bHw7&UX-I&oB8;{?ygkm
zdWoOGf>NDW+j8c)D|roGLSuOk70A06$RD3o`JScYP<{17CNtJIvDw5A@^exhRRmV_
zdlh#(Zz+E0<0y3&wcUZLpsccxn@lbm#~LW8z4$IVwe8cbbtL6_J`IsoH1X000d}mf
z!p`=$Nrn-dV1<K5oOZigcDuJ1-gT+3eJM2H|F%pF=$~788QZWWQ>eg#J_Scw2s0e_
zucuOum4&p<TT<rRs9Txj-!3YldECrvli|LP^&8eW>sS=Xvxkr7H8sy88v+dtX@L9o
z_}^eU4!Jb}pb@+csNj^A;R>T3mmKyXJ>H|o_BAS~W%QI?yY6$0zFZ|I#}Oi>3D`gb
zVO_9?3Rs#5T}mqZvH4bCplW6^ybR66`t^qdpBz3G#CY(mH?FQoC3dPCK4ZeP!TX-h
zWU6IO;Ff(uC`qWDA8Dn*IDdxmH@i*loP}4A-4=|J``~@p>YED3A^Z(5#J!ZF&{d6=
zuF-_yTm35f)(f~D(u|DkEn_p$5<Pe+G@JURtNz$NDFjsZaT}MSAI9j5mkHgVdH>}K
z!=b8yP(G@nh(-6Ktm*Ue<kj2^rq?IvCVa`GfC+5F>GQL4LK`=qP&(3-{askXZ&N!G
zYQCycFF0eD@7nqvv9NBX2^*7!j>&H{;$(!j3p<$1soM_FK$?n|xF5NbBII^iOykK-
zwfH3i18?*2X%;7&JurG$m#1-VOe1_H6BCGg_@Va5k*C6}$^|<l+>>6^KfN}4ics(}
zs8s)=`{Gs-gw<E7z_|PHLL2i+HmtTEV~O9!6YT4GlZ*%BvZgP}tEsj>rETcjr)mJ)
zmG+UgKXr_xdVfRya4U5#jh&^0jB!hfd2wW+D-vxUZo*FUK$r+aEw$KD%zkLL%sLt9
z1+d$ZTI;98?Ul^kA8kFNHQrxBR8LUdoeMgC(G;Z!*<0p)ga%64*mhDI(*86${&W#q
zTzuV-;1;;qGaV4Ux^c7lm2t6<+v1N4WXs2Nybed}L8dkzaPvPQ&Xan(9aH9QS9(Q>
z#^})X(9MnnoKf*vAZzsFtm(^F2Whdu&-sUd8MfLiPWD-*4HL=!Gk2arSDxKlREVc#
zNOUNddf~I!WZ;vRn47Ns<*LE8WDquIPv@{>o07YB6M951k=5yTo=ip0CKjH&>>t8A
zKA>_3Mrz~+EiE~ZAca_3_rCrkC(AfeY-61syu2%g3LF{`m8~U4<8QW^N^%^{6mX-_
zp;4ug#sclUI%GqTuYmfvSXc~D^TVRdtUi80wP|}B1%<A}s?b)>+t>=&Lj*Sv^d$xD
z8J(kemUf&rQZmS!&0QMmn`-&!)3?9=xTzZYT5*WBp**nr=IgsR4nR9MD9a`r2+Y`O
zlYm$A>_itn-0TqV8s|b++m&h25!^mnxQBd?xA6hg^Ba4Bo~BLS*<Qu{@evd|=DDkL
z4<~(IURARQRoG8E+Bf@q-64#e>0r_AVOwUB{>2r1YMKjHOmBN`<U^q>60H(Gl_wQW
z&siQe{}6J<YF<tFW-IWV!};}#t_78{YikL&QIw7njb^H}pH#QXHV7DBWBk*FXeQui
zo^<zqA=4#D-N`+KcZI(KAT&2RJ)1Ov+WN8Lz!L7i<*?Y=nIE<EMF%9sMd}A~U$VlO
zVSSBT`4J@7LcT27)*=Q>m++N%YSy-f?U11z)56JDrU{DqT7~gQZ^1*tbi*lo%nysW
z@W+a0&Ry)=$I;d*!WPV|9@}#>p-9mybZztFAHU4PfVEK!^|wr@XYONG9WBGPjg6<@
zy|2SIf91g8{E$sMYbtwPD2-&O?CaJx_2ax38_D$;F7h>qGFFGjO?}1A1Kk;S%n%L|
z9yp=H03$qtJ}N4#?=HUwDz)oQuMn}x+JOiTvPG?02b*>mFO9L!+bJB>a}ThlHov_1
z0!?>ZkhK3V-}g}E&2{!)2#mU6d_pE~;;7{!2Ifdt{j-n&lLWeJyn2VBj{~Gti4!$>
zjQx&^F>*1V8ITD&bh7RU1hWyy%g(mG+01>{k7w-R(l|v&D{ET&aft#m)GwXl@U5nL
zFZONn=uX30-U3U)UzV(=CHF%8PL!5NcSTZ9vudabQc#b6?D{q3MhJ7F#m@GS9^>qN
ziO!7}p)E^-JCeq64AJ5v8zFevStO<e2lX+jj+(NBb4Z<sxdH9ePNT7N{{yKltXHxH
z49K?dxL)KQ5L1jV>(l({Y;qx^POB=^w{OKw)++(w({fsvwe&KtNWLzz+dw*K3qA*v
z@*C$55w`xw$$7^keE!F_np_x;g!R1$NmomP;Ib|dsiC<oD5iiTth^)S{GsDlF2%z7
z+s&or!i+MSCOYTcRl*@&Lut6edecD`$mc0k8_#tZhJl^S6ILeOO4CFoR9%fg_@sa@
z1po)X2)%AC0|r`%DZSL1*ep~4T*9sA#Bz|%_}FsKz5s<+kVYJ^5brGbAgE7d>#hjo
zoZPV0z1AcH`J_X&`*0CRBTgnd$6}s%+V6#wFDNMoz^LwMV=<hHI^kcY+;i(vgy0jD
zEo=6RL47=EKg{}Wm53Z8fzvc;<GjMbhSicJwaa33?xq!3KS?an<s}`ps49;QA_pJD
z*yT$sWZ!+E!+TgDU5Ir*d=`oMt7n5Wwn;hE|6okBKQw!wdrVVVE2HuEYW_YRcm<Ru
z*%qq+`CT3#*MRdGf*X=`-5R)*^AZ1<Jwf~;f&ps)subV{88D)IxUM>dBfB3K(|qw_
zImjzT3|duTZ<eA8t#_Qs%A3}`8VrJNv7bLWZx#lFW%02g6-JxG{HwPFC|6w-M69R0
z`ZG|-#(nupLaY*PmBIh;f53w0#Hu&^77Vke5e&8k2c19=J{<k!7;VKv`&h8xxZDI>
zUSNZzv`K<!8vlfko{vPGg4Zl^!5HZ)wfa*=B_J-b5n<D@y{|LVKTZA?qn)vXZW(D+
zWq~&Gwzbp)LqtBVlKHYEv`OlMqDC{t%;+q56;zIbMLCe!0Mca)JN5{IVd#=lPu3wv
z%p02a4u}Ft&bRH3JIKf~eSo%2L$<^kX$drm{KcFB32oc}9uKw*%y}$U{l?#2)gHz@
zD<2W%>i)KkyA2M|y(9?X+h{>k(el8pi-9iKN}AQYV1df6jgPl>+jD4XD)-QEn%7o6
z-3X1ynhM*%?3ViqjrcGi2NItAEM~6YhL@0bnqk<!H<p$`f;qxr>hsaO+ahA>w$xwT
z0;TaWHr<7m(9kf9dh2ZjX{KOuS*);_IjJjW`!syWqU&<E2IPl|S;4`DJmhv%n-oz{
z!EKt(>Lm#;!1`Wmh1Ev%FA<AAjR?*+)4K9%0!_O?W^IBrk7z4rw}%U=!dWLP?EC@e
z1ty2BoH2=BT2chH=%hY;5af1M_UmUL3%9)O3{@bDt?eBt$jxXx*#I4<^en_@e@;>a
zZK3T+yH-YQS;^+QE}%=3m5acg>WXamho;6P!|?$D@KpgQI(zmB>;{l#V}1p!S@x^H
z<xLW4_)I>5S>tB%kOc%3?1m&*b5PVUStq>y0u96^^oe=vKY*p<<JJHM;~p+TB1nor
z62E33y{iDnR_sN81$M~wtHZ$+eh{4=8b5c)LEEq%%`^DR{tq6vfPz*?Ysd$N6kTE`
z33G{I#-`}BUINh1s!llgVT_p}(JM;HZ?gqysuZ|TarNjqsQtMn3KUf3XBm*ryo0nT
z*yjr?;kj>i*5@+VIiZ0gycVS<U2$2@VrdkuKiY?cxM{^UsPug=VX<$~-jdH=h%`-J
z=#CSkWdpMj(%M&BcA5Lk{}rdN5m=|9mHJ(WL6QTeypMmYQ-BeJdfGcog>xP3PWI^6
zD=`01>W@0U=)h}8ML_fV3}^z^gYJbQS^JKUjX7RMX?DcH-?8bX?O{;g>5nq@>n&Sr
zw<WEi`6THR>Unee_cZ8GE~w7vLbGvd8jHIc%P)cPq(BIDryvimq=W>zUSXuhPuQ?x
z2U9%xL?AzHY2564kRgAWGLD7wb?{W4V*wuMTd24O=(PY8{JYObfH*0jsTymVOGCrv
zDidqr(~nT)UCOAg1=~m%kfKVXK@wn!pd-A3)cQH4Q2?rRgiE-I5|HZ^<i0Zpat1Nw
zrk4j7yoNCM<{Oibv9JhmGLT3Hga~v5ZvIQtUnvv1`P8@|^;_;CM*tpCrba)kK(PnR
z2X04!2mAI(i7b-T3I`y{=qbogg8@1F;cjm2@72EZG)pfv^LNxg10r@+Y{R8r2yD|)
zZKzntQJ(z!)87SG{6Ps!81%4goaLuA#TLs=FWop27ZZ?MJ9&@h-U%m{Un&BjT=(`H
z+4{H$ksfe~VKV@j&8h4}nsau38l=RDb?JJ*!sh@H4kB4c_<(0Oic^HK#HfQL-B}Po
zZ^>0-!(a85l<%Zr?*drp(L)jJ+t<Bu0{(nh8`M_0Gy(L#)W~Eay|#M5(h8aj%1<Cf
zRV2VjN}uNW2p_+KVC`H1d}iVVXsV=LRN@&jIV5Lrh$qPyKAZGf0U+!J;{8qc<FiP@
z7l4v5oJHp~{XHQO_!Z^uT|HirMNKwL*B&lXV7~sL%UW8e=*Y$0j71P0fo#BDd<040
zHAVf><n40T?9`5;;cj>Xe0H2(B>g}`1YuLHUyR^%n)3&3Jn#_qyxSTDj1qzRv>1^0
zSQ@2R6e=jRtxcun?MH?Df&kwA7qHO$=S{yuT}D@8Y0Mfie!2o|WW;z6C*&;m^h)_z
zN9#|&SC2&(6R*R&HU9S^P5}~$15)t0Hhy0{8Se3_K7zYX;2BW>3BSgJhAmJJk&+LH
zVFORWt*NAX_#^fqa2bp3g(IDCJRl4LmWae9991CyK5X&}Ps5t?*u=3mZ*dUSghe*j
zC7`~L!qj_ho#jzqrV_bma^WnjN@XDh1NYH)QaW`J0{P=qUK1$DX?mb>-=kE%5h^za
zv{f2lA(4w06<`F`X#F7#r2Ss(j)Vq8NCU9LK<i0itNf7TW15SZPf}ne1;hNZVL&dj
zMo*mqvPxtN1%)siBY`FP8u~$)vI5&W$qP9Wz!MtBl9k}(d4%!=WEA)Kfu8teem$b`
zQtjO0mkY7+ps@v>jqGV%XfYdnT#tYd&RCHD$I?sNks>sLL7ZXaEGS-PIS~wfT)@x7
zX3*P!10R+>_@ITe03?x>i^L2Z_|5Gv7jo<D4B=DfTSsq-KnoYaXKKDl-Gd8bFh;sC
zI?zBmETW-DKm;Ks+4nh~=r?oeD6E^q5d>RF%O}c!Um*}prEZ+<77sT9?tt#OHm{;t
z!e4koRjs4D@X-lCD<25Lz2R+|HEW$$Y8(mTgYc(7{8`~oL69i>#jq#kwKCXfL3yzj
zHj9DRY@7n#3|K(zBk6PUTbsxJ#-$+xrN*omDTsC{4M_Ve7AifjAl&qOZ0vj_u>wZC
zDl^D27SYZv0%aNT?k~N3h+jcfbH4=qX{7pF8xt$`2<WQz6lmA+U6d53Np0v_>)J6!
z3=wGSJ;82+J`;2lW_!w=$38R;=Dwdw%uJm)f%s?G8Zi0ZiKhmAw~jabPD%nzY5IP%
z?l7?lArhsao-sxLIdo4Q$N>Sjv(!{+fyvM6Rd*A?ys*7}cI){f1mTZpL+T(G=B1<c
z_N43tV)o%tjjP_G2y8F67*<%~9E>oj|7(ni0{6PMY_poi;|T}Q9|B^eW!rSe=a&?z
zz)a{${uSm4h#E?T5VKiuhe1?SPuhfb0?t&JwXo+8Y2LA(5mZgk5b)2l`EZ<QYNAWJ
z>Uyg&&@OcYKM1=4BPJ6UgN`EEdBgi%RZy8s1oc99rV@M`P(MGp!f3+SG*|7vrc{Qj
z;QGdga3+F6_7?F>jP)Ty2GWkP@qNw5`hU;=IXdnD^}l7~{6?$>rZEzcf3z-xi%vSa
za350jgj!u`D#&8%8G(+Q?!S@1N>>Ewap0Hw^Vm3LcF9a5@%a*U8Qk=3$}20+Wsw92
z5Ptzu<=3R62oDRnYFELGqp^k-$O-@Rd;;Q?vK{aG^H5K2_R!mia{I!E1iVS~mjb#M
zNMF7yLb`>kV=S4tU0lusFq<zBs?$0^1Cf>Y;^Z_Z=JYsi&XNf8KKQEA{a`7YV6+qb
zrwPx2<6K$!40ClpAzECF{sni){_2PGEXoGm?pgC1Vj2)h^V&&d@_m{jSRD5j$Ho<x
zKWhMSD)CaS2sEF0QM~;xRX=xwUb6%11|y+op@G1<ND;<IkPqlvKdXLSv4j#}Zg?>w
zM#2iX7*zJq_%vHx=%TiGhOVBA$4ptm`u~3TP<0F*d-$E{o_vhM+cl1wU|FzD*{4{m
zQfVw8*;-Xq?H##6A12X=v^VBO+8WWq1I7(4%<3hM-7$}31_|^`t0=Vi%oG`>Vin11
z^2-YLm86=ENHCZ1S55dK2Zy*m*1|ASf5BPgUoR5)8WhycLZm^f7j_M^X`Z1?P@jNw
z7|H5VjxHSr=gC$8q7p8;R`@Bd2!f?4BFvYr{)A9I{*})^*c{8*yN6$Gsqn*Y2kKLl
z#*)<OQtCV1%hYC4d_c=Ww)vSRDyCsv2ErUDpdc1rv2*9b3XIukX}ev)MPji4L0Gb_
z8NwO@9j___?sch{&IGOYNNC6^qs1P~4}M1i^Gq|uLYrbBWNqf;(9f9Cg%(^vfntuH
z2<sdchLkfQ#9}QdvuOQF;1PxM*b!ApTQM;+2>^tPxHdHK2pFQi5nXsb>9WYhTiwHn
zTPhR9<&+%;sQ(-mDnC7zb0PK$=&{2m0MS>O0WyMv`QY-CRLU&|&41tYlcwnvVGOXT
zf875dXmuv?18r0Wh3~wzu*8`cNEk=;i~J1bH{2Cs{tDtQ1CmrNfYOY;NpEKRB*`M%
zL8%xE1{#T%LZzTSS9rzqpdg-xzOsWb2I;x%i0|U5Fp7)52&{1SJC=dWCpULHjC1SC
z;K+)#0V{T7;MRy1V6_H>G0&eyY)HpNKYKy<-Lr>nSo^N|D<}K_h5^Pyn3ViU#75CR
z?jUQRGccY6D=%@(uuLm{6vPIsFpz~tl%njkJ1z3g3V`jBpjhY?O+i4F7qO6^JSbXn
zq#nY4nB>|KiM25&Z)L!eUd!}``Wyfa5r;rj`<sf+a)ASGfV6vdrsUY|7=W=908kE!
zDE)^?FnEmbq%KMJI!HCwV@hZkih@yk!p+@P`RHOd9e9cQS$+neZ=l=*?kdWftq~%i
zOc$^Qr&TrMO*fTcW)n{QxosZ(*15Vcsd0A8QU-Yw>N_j#OB%ay9K_GWXgEefvk&ez
zC_B^2xosKHw};?f0F(eTD=3K8yqJBke79)xtC_Uigtwm<C{MA$Fgq#~Wp9Eq3_hce
zBPJyU(f>~f`L@q`%SUb@XjT)!fRT&^3D4iq0@`O`+WZWqpfv<+^d{UV0Wp)H)7aGY
zH#}kIRKUa+lQa%`crsi*2y8s~Zro_J@1?*_4~?9;Le*t6?~(#A6@Eq@eM9kNgS<?q
zur2>HiAAYJn{KYtR{^5EWBmFK1NnGAjJ4h_*#pg(PGaMd;OtF{HZm!-hGPlo!Dk1c
zr?-pGfI15fh8W3L?%e-M(Fa$_Wiizv*<9lPEhE!F)d~qM!rIzMlOsKcDDB@(TfsKH
z0~0zNUEd)*kfif_kof#fjtSL;=wY*vm3EI-1?nFOxDtc>)Zuf|fKC@I&cO&_(pres
z`Ro;oTySYHQvzlU44|}@_8|Sa1Z0JdqE~(W1$Ra5GHjRz${HHp?Bf)$grJ2hSg4Q9
z(e&RwNT2P>isf$;eujAi&37XW4e$CRQMaK*TO=#?Ef_n|2Hyanb3q{~&}JaA(kwy7
zFN80~6HHe@ZpH;!Ie^mbZvpO{2O<xc$lf#m+PvlQPwl{G259ptK)nYxM}Rs!k;Pbb
zpZrt8w-Qu-_n%teI^l!j^GS$)saOA@EhYE$SX&XpP)Z`;GYUrKNuwT56AR5+d{Q%Q
zER|XVzm$xBX2_8T(GBRIl~a)7zj=1w6>y`1aY#?;-N^Ju_yjxn1kmx)S6F|$7e+x4
zed05}{=r4QSQ(IbXHPRbm(l%!1TDt)HyvXf`UH^oI|CzsDMvzIiVmCa>yKlMwqM{+
z7U0trczpjiJuEf)@UE)r1&d-~B9pltQSluFi97=uc^VWK#<9UxaE{ogU*aYwaU1vT
zk=kXGIGN8YrvUg@oy@aO!2IX0eK|i5cv7oJAQnOwl-^<1;{XAR7Jz{C|LN<+W{S}K
zNq=5ds-OcQ4}b#dsLuzHBoBx|K371-2wzkHkF#jb-u1T8-LC-EJ}wy5L!w4G0y}&x
z;3L61_EewX+UIa^@q{wkNn29rL~^}&yirv6Z-PazDKusVeJhOb_>Zc2HG=#*21q#?
z&{G16iqTCm7)YPiO34Xar>`l@=`H`?kpNeMBaExER_cG6^Bf%*=wm>OV>kmo5QRWl
z)#negdEkB3!6{gmYps0x2WO*}JyhRiZKpCoX_xdk`ht%)Z06L%U@$x1>};jg+={Ke
z|L5n<UE<anmkVJ}ifKc$kvC68cO0N)yI2=R>iSFBb0s#*Rc|Wy!96X=nFZLW8}KUL
zkKuzrCz{_u#@3p--yV*6cEmSCABeQhB?hg3-JH6S`&ar7AlfwiKofqzwzXyXjY$i1
zzk!Yg9*K)S7SBnGYICPimC+uqdONQREB2X6vcrxLJ9ikMlz#U~?Iecg2%Vq5u&01F
zNS=^$eARY^sSS(AloO~cF9QZ#YBpxBVS>+cPOCa*pRGx0{9NKc=#2q4fdIt?8Hk<Z
zuLMH91YpFSGeH&#I<vK71(o}%%A<hq@XluhZWIW1Ncw1wfUps)Uf8+QAl(242&PbS
zDK;!H3ugHM3-F+t(}!aruwyt*HVbLIXxKtq2a`>D5m29T;Vn|g>96p2j1yXK7KGYq
zpX~v>wJot1_+GeqfgJ=cd{#3DHXo?ey!%RMc78Cvu!ynyGlQfg$VTEAu>ntX{1xy?
z-{B?BDF9=WL^ys8q)+=gfLb5P0&1p7ZRn~39TKjkt>`5%7~dQ=he<UsD=@%9n1*9?
zLX^P;rmr9OC5cK*2*LNGLddp%PO(4)V9HPc(9D9xw{VV#Iq^1nm~D6=Z+b+22bWUZ
z{sjT8CrcmH&IHXh@K~Lc`wH?WoO$Pp&vX%^ob1h`K?o?&2tbOXuK@Ww_qR}Ykt$1i
zqD0dhpj!9X|I%uuYV~QiKW4<ous00m`v?P+^-_)bp5Wi_L!&qOKs2j;T*L^GaIuV7
zE2W&ha2FkbC;6n}L&{F8sYV5xdkg0?@P@-{fY+?jSNfV&^-K?pV!=a5zt3uB!%|bN
zSOluFlahNO+q^>#i{I(Ia50Z$T`%tXr`sC?TG>SznV<y-x#cn<NP;||=h2!4GGTBC
zc1|hO-=Ex^!IM*eVV2Q`1@vb@^N3`XU%{0-LoJ769i|e5jVK@)pXV^PJ0R8aV|O$?
z=UzoTy$oaG^F{U{>(^%gZ{VVnOslW@VFWb53Gf-}+`O}YYgGE{$M4Eu8L1Sfi!}ZN
z)XttCXf+>Ne$+z*#Fk570^=(m0PaA6XZ8Vn1<X3sxf0Al-pyb^0=gLH1t79C{9~He
z$^Vx{>uLCqw$o}qYL=dYt|6sG?@5UsDASq1w82*q_-ucLN($$Dx;+tH_HqMwg?h3f
z227w23S)-8Xe{JrCjnms!I}fKR@~%ncG2?5+u#n?aSd>msxT`wR1Z_&@mdo;iL}qs
z+L~H(yCw=$i@@)u9i9+!;PsHdegG;r08PEByd`>922-YZVpqk{JCvpzaEW_w0chaR
zHBf#3?W$BBkxLd22ls6f3Z~WML*2Q}K}q4n0F}EjAR$pqkj7xSj}Od`pmLC#xA@E0
z+BVwf*Ri8}!@#W!5G1~yf&4;`>$wMU#ei-yjNN=eBQuy*=o{@T3gz{pvR?p>Xg4he
zPW-@)HGp4G)>6m6!;n71m>A1Jjx4tQ12g`u_~{i;%R>ozSZHM5zbW`2I!>{CyH{@B
zAy+3OMIkVR540yXL_pr^Ck$9PuiYJn@j6q`H3_3RTjY~l`$Z>rv|j(v?-w)Lb)y3d
zPatdyY!e3hO<l+Ee@sT<h3ZAu&zZy>6tJUe<)3-+X$QD3Fj{=04z7(kvjOR;gMdXA
zjfH0);K7ukBdI^i_!Ux54iyOMfN&7%Y0Sa}MqP0bf+SpMGBMszMd8$e*ZSCX#{oZx
z50x|Z&JUU^oiJY;Js>QDpp`iHQcR*dz9{|y7rEfIff5tX;1U}-HZ#n@%Tiy=3~s&g
zg8?ZYxUd5kJR|XO`=pGE{*1t^C7`B@nTLVwL++^dh?#tP$;S7hjR7PCz$OPGrcqqY
z6ToKz5l{-64q1ohN*pu?)I61d$~}S7hQa^|L{JZ6T_gcJjQ&<h;B9Fnph6S0z5s{d
zRX`bCV2&k#d^MnleoF~*Rs(F=d1Ast&)LBmLy-L4Yx5GPZ=s`6R>)qvq(gs0Itt>t
z9|X!N5G<|f@03&S@{t%1qPipLzp*XAH7{y|p4{K@7-04R5Uw<`Iv&Z=cmzl|3LvwX
zdW(UQkoI5=L9ALN{Rf%0LEeUy{<ZHM(A@-(e$#)_L?rotTLJBh=l|Q91bC;h|G%w=
z;jQQY+Y0kVvhzQv;$Z9N|F#~0x1RcMD-vuK{12)~8raJGA5^$GP7wch>xcrN(3$n$
zt$vr`t+{_|M$m|52J~{AQhRZZ-Yx<XJqtM5Ctm?H4t^E|fEg=)+w?1BN6_DJg2Wip
zl?y7t|L->=D3ECnefv2ye|UuZzi+s~fma)T(R#ZOG?ER7an8SKeNN#Z6McyW62?OL
zZ$$&FjTOf7&9rvbe?W8q(0X2$G5QAV4ou`PP}7~)W23(+Hv)UoWM9$lD$!nTfcy!=
z9t&R${J-CVreOY*Lw^CfxZso{e{)vwZbJ|3xC9zz|8cJd#x-%2o~A(1JyF1o($8R`
z07kR)LwtehVAB4N9UHpfcQX$Qt=a^dTM1+85d9^e);5P<0EHq%g1$ZN87YG0lMPx0
zf7_d&D+{tmlJdn1|Ek737#on1rS~2E7a|QyaAk@7?+chYF$eAGCz5Pne%}Pa?Qfn2
zJnAvPUzcQ)+(fr=`l6sSXesPTmH#*nS09j7(X-h9@QMI<&0<ICvlE~P;(&4=Z3SUC
zF9uH#D>zd4YMes87X8IYFuWlO5J!7REFfF#;|AI5-`{Wy?c+WEAC`fznu#~m((h|P
zBf)^vvycCOJ`6ntbjw~i-ubzV78f9BC|&vh=zjjIo1{wkOofKpJ^@BLl%eNfOVNen
zz{cq>Mr`0?v+Dj^kO&s+lWqiEQ~H9c1Aq>je`5c#a^XB+r2*jWU#$CK2*&?E1khq7
z6<vgp^8X7n{_B3yKEc1OV1VQU7z7Tq`e_fTA7+HZalQYvz3LHI5Z@I^|Bfva2l_A;
zT>$+>0gR8q@6LQMfuKED6&MFbpv-@Nw)Y;waGKix&7Fd>9J!aK6h~9yC8(V`x%k`M
z)CMAa2cwS(h%_+k(2d8@JRiS-!>e+ndWl+FPm?}}j-Bb0VoA&^2$l|Y=b0jI>wSuW
zsUelZLOI~gA0A@~e!8`L9n9BdBzjcs<uWyie&Gqyqj8JiqIXCl`NAjam>lf(O49)~
z86bB8jD|=jOtZs8HR3h}n-Wpa_0<IQzH?N0<i4LhbM+xhVZWh0-V`OU#bP8uj=_Tg
z4Fq9kV6AyHI<jp=DFZkv)|`pme3kQgZK7UHsGW1qZ-ICST%SPS6B{2d1p|ml*v*ix
zz%1qOCC<L7;G$(gq@lt(2BL?F@1ZEEq>4?uCWcgJ?JgIwlLkCqd%~1j>Q(isoAH`)
zG$)BYDFrxe(D@G!;5_JHI_ff_6N!h=?I~tCds2})M>Z-r6m6JaKH~lzkf(P2@q-;Y
zR2p+6!RV3}sj=y0hm5#TyJwaUb1*Wzbr1~G;mY#gOztlrPn-m|=^lnGDvlC2d%4XW
zV3gr*U7ut(YlLa;X9pmjK2@Ve@02hva-va%oqujfE$Wqnd6*R=6Sqn|g1j>~5N^J(
zU52uaKLvJUPr^Rq_OvV#T-yhIx~p-AH*34j52GIKHW-tyx>6ET|3_U*fAP{q@m{d~
zM?>2|!<LrGaAx;QSF*~2-Kb&1+h<0J+mW;==M3&<U^SB(^#E2qJEQWQZs|SQVP5hT
zMdK5tf9xiZ+Z@bhkHV{z?~8Tb%TYf6*v#Or)`abytP8xWl>)hwbx3qpHXHY@Da}8X
zCcxq^P~$ph4J^tzeP%SMFnR^05%+90yjZo&KdhgbD;Iq=%U=V3lewUJxW9&jZ8iSc
z0~?N)q2IO#91mW(qb9ODH#4)7LNjYZFz_?$m%*JH1KUl9qo6W*Ijy`np66W_X3IgG
z=X(58fx*TLQ@y2K;SlqFJxFA>8>N3YkpDLij-VY{|J_OdUbVxA4n<l#BALNlKilBN
z6XS^h%BpNJ=rXce!4*n&zxrO1?Yd((pV-NI$bq_bOHpU7?{0>U?ckM`sPF;3J=0k2
zvK48G$7bnlJ^GU8_RddqGq$*=ZtYp~0~t4vNogz~TtvDt$Kn%6PBCLaz>u1aB!V}}
zWw(7L8DFL;wId<3gmKWTNqrc&<6Xk?l0!&F<t_uOYBZXJIRlB~w|U+)3Y&h3pxg*Z
z-;<nxE{k!cPOZ(^1s+<WZo%aP#tQac*}yvbiNp2`5aD>CD<g5;_!Ax#w>qUmZhzO4
z`Ln-SBE)<s;X}K2<ub}+_2-^98Ewt>N;YiU_ADN6)HvQ0WX{wf$%d)8i{xz92u$5w
z`~M?AtAg_C7Px2!H{l?SROvH|^<CSNM$y~ZrC+q&N>*Qwz5f;Fpb|bFmYf|{m~59@
zRIhD|x^qD0{GeyEEc0Adge(_<?d0nG`YGm*<bnI5o%{xgc+@DkjtlVb*9P9y=+)Ai
z+#M#6G5PK7)mt0wMO`myw>vpXJbAc1mhDaeGB;}IYFK%PiWt6vL6K>9d+W86&UJ73
z$)CJlO?OIdyt&Tfo@jf%p(x2NY~0-EG{!Ui&|~9nq5Iw~DsYuRi+x~sa1Az0FdzXl
zldbs<Zyj>iv6{dt>EBIRXG!lChn<6LYV3Ib%;<*9N3S2RaPdS1J&qnP4;Sz`bti(!
z=~2Wl<>G01!q1%EL`-myZnR<_amwT|^Uj;bgVw~J!Y*Cwr!YlnaPnh>2E_n0qVp!4
zu|WE@xlWjmcWBLz3t1=;4Eh=V;)0E{m~U7ZdNa$!tm)gJXN!BKEOT`Yqmz`2`XSTa
z<Oe&P30;FCpEyl=yD@~7LKmIww_Tr6WH|k&CAtKBVK+KQV!7_(F^~-y6gKkg_B17G
zX*!!PZkSJT>LMM{e-_GkEWAZ6w2}kM%+r1sJ<BxfH&|HGkqVy~OEF{*M`N>pWKChY
zj=$wpDffS|&QqXu>y5s|z)%aud*@*uH+A_V-5F@W&cN)lLGhW5OP2vOGhU%%ArmE0
zQf1Vi;)5ReliyS%*^@UU%p$ivx@|BAwFUMa_)I=mJB`sp8FDo%Fzb1~K&NK!k$+$N
zz^75CHzR8g|7wDni&cX8q}>I#N}s*DE7nSNBfVPDU;+Rr#LyCp;+q=Ldf$K@&DY_=
z84ZtDTMiG~b!Ia651w+xygG<(7n0h@xZ*S+&<L5}H;J<v?OrGH7w`;wJ`O+1QZ>3B
zuVnFnG1*|!&Mo*&w{oJV+pNy~Q9;F;(08+Ngn$Gu134wUg0I1iL<Daf)2Gh!b4!i+
z%xb&pbN>$66Y8MEFNW9OqiE02X_Zm5hhbGoa?f^?wU)@BP`K@PvA2|z-u1U-hrCqp
z?EB7s@J*ab{xu}dsW86y>mfx>x#1+acnQ1EPi<{*;-L&DDk7J1UQ#}@+XKz;;~ds3
zRNt37)8?Y2*>qA8k=(qL!nA%z<zj&a)86H{vt<sHQX6gjX>Ij)S%ZF?*1pGaPLBAO
zHA#{^l2G$RVDG>K_D+`xXImrRfdM2_z>V<nX6tJ4ZpqNG!|!N$0*$^lkf+E1cL_QL
zXpC5QZP?fy^P#ft)q%Gw3%-*1l;QV`7MiwyY`H_w1q=L(IX^VsuFp;E-7ZV<M80$k
zXxADbCfc`8VS=k_M=a_G1Nyzr@}-_|3ulcWom;uyGZe8}rWL*0MT{<AUV-mo!wpGH
z8|dVNbkHp0^2^N*-<O+|q;7#Q2l49Ope!lxgjYi)xPG)wwJ=Njo9}MEa}})bRlZI(
za{UgP8Rv~CVi~M4B#3dyzN=W47}ej1pkVJih=$Ah$?xU&%1p6(^<LTR2G`;8p&bm*
zR4*!e*G>!6=n$>S3Y0a(h4R8drmFLO)aXLc{;7w(qP=C6+)OscHDK6RiX1L#b?YUo
zBnz|uM6eXty>?^alrf*n`|iZp&MEPRl4#z~d15=F2T>5(_f&#+t}kr<>os-Ptif#Q
z-HF=R`|DfdGj_ITr@ar~QIpRd()-ZDU$_X$GFY9!Bns2Un<HW3PHz4I`fJb|ptcPQ
zL1qtGe})IGC7@eEg1tkDzS^PQA-#!NJ0DB-9Q-}`cFm~To6;bCj<9WK+oEG}i|xS}
z!vkS16U~d+q4Bj1jdx9TJzH=C+P&47zLPiZEe>cBgG4=iTR+bvhW)w|F-_q&SYwUa
z9ZrX{Zs$Y5Z%f2Qe;${Bpe%2j-y-DJ+r16*V>j%vjbifh-%rjG9lR;mC&Ftju(y!f
z^V2|nqBbL0p|gLM#>uWh+S4B-J{$Ij+4_dpHea-vxKD{J)xmy8HJxg2KPtV=-&w=I
z^(Sz(!T3I%=<`?zdwxvfChTRkzk|O;L~T1IhLCg8rm$$Sk;ZcD#n6AW<JTTB;hs_q
zv$CwpGq)>;P94wE9Q;|3!ujf#YVVbgAt&&*^)1|tI1yIE+Yx`le-<$vXU<`-u=y#Y
zJ8y^SKayQtSy58;xe!-BYDAR=WMaBN(Bo?G<B5631e%?1Ma&o7Liilj?l$f7I?Yyi
zG5|N*|I*Lg)a}w*LGQaP^Cf%}ckT@wHDINx#_s*Z6za+L#J7*QFT)n2q7nbpjU0Jz
zlsAOlP&;gzpfbj3a#}ZgkH+tz{K)bSa+WahaRpYlza=a4NqI;pxbFhM!xcW4BRn)+
zH&=R%S#=AQ8tsa3{iJPmY(aXsxqEeR?)6pM;mhQgLHrE)3Fd#$?wWXAWJjiIJ8l;L
zb*{xREh%?sta`4;$0=rYa5JLZxH2I`?8ZrdLeD3Rw{SslF#1H8@;~kKNi32aseyCK
z<YJbB;K;;~O;8vB3<M2ez5`t=-foZu9LPBYb3mklxb&rPu|{T5C3tH_!f!r#bK=80
ze;ZairhNg%;o~Ut6I9REh<PSQm)%;-(-6VSlT_;pir;BY@dveG8Sk~OXH)yKYIVHH
z4a+^4PrB3b{R^dBPR}1~dzQHb1`-zT{iA!}T)wX0_}Y#rJ!gG=i~)K%tt)no86p^U
zZp7Q~ifYBI`d$gtqv+d4GEAS$u`4igal#HT?=`7>k9v8~=CRwGWuqDMc30sDj4nP<
zXW^O48S#l<;+>0rWf@0bS#4aXHe;RZ&i!x&8L`eZH$I@z6!1)ZSm=5Cu!_+&9wNmZ
z&`&yQe3Bt6`P^3^fqEV8oY0NR#2RYuTU=QKB_zAL%!Am%zsg6I%e2tyix-Nz(<Cb6
zM8<h<xTJ*ZSB!hk$7x5^YLT0EBzbQVTwGC{z@%H0%9kXzQ{D$<t5#rYN4%SUQX+)T
zMptZUw~|x36g|o{t*?3?^;<vumAX6wP{103(m?y|vv_-VEq2gnGk3Qk$Wn%UB@I)i
zIzoOCJ2XmDFJ2vX4QEotpZsjc`#G(`|1@*f57}3WcgUIjd=x{YFiIzRzIa?A5WVs1
zR=u`Pr3?R^^SDLb;FA$Q7^}~|WnnWL6G%N#ka<vJxN?y5Xs)Y<&U}Ky`Dzts%{T2Y
zMq_dUV(-(cRJch9-F3_bcgRSs6|yD?l%b86em<RAPh2g(5QD0Q6GxKmU&#u!^K4ZH
z_XLntyvawS<j?4L-4I)gFFq8?HIpE>z~AfpRVM|Tt?c!9XN>znHa0DNZx8VF_doq)
zUx?)H8T#-+ht)}#b2-kR`R%A%u+TX55-q`3j=0MWeUR1$RV3(nCa+eHJ=^_-U$0}d
zQ3-n$BzcT5t9GxsI3S(%Cz@J4kvh>o8ZsSU=K4cCOWoYHk|kI07uH8Z7k_!!y1u1@
z)v^7H*kAzV#zl;O&3L5Z7=P#W#Vn#5b=#!NDmxub*vsjKvYHt3nQ_zoo^u#B$7_>7
z5;!*Q-yR_B%wh{?NYu@hW0Y2@YL*=)Y9W+aF&gCdk9IG|h>u<(a~nQ^r`*zu=qS&Z
zy^rI~L&Sqf>bP?E`gmbGs*3V!9XHQxC@=0Sd|-RR1z$R>nXPq?y0+IqU~lEgH=;R$
zPK2KUN@#J;_}&^~_f(A&tu2stmW2Vj?l@})G(r7WNqxl(X>xe;y-mk(oJ{_JwaxJG
z>nYiG&7Pn)jnHq`RUMmW2?9l5-8LQ#)sQDDoF>iYn@-e0gRJ*MAWU!?Md4u^hn>AI
zm=z}5aHaN&MD)HeS=I9W750AGOg_k92NAg&Eue=wR;&Rox&aPA%3&9|p|>|RfJZ8|
z;yv_?@(ZMAN!uaBsKGdaJJ)x7nKsspp}~tgYomU5D-km0Yn&TyX4}5~_@{k=zan}q
zMIYU>GPs|X9ceC{r%qiip7%U(`A*#)mz0RfNIvE!!J7H?4;-z<0SPbT#NRXW_Av6S
z?a(_Sf_1EnfOH9M2qJvg7yWE^NX{T=!_V@~6&yndzO#Ckr+v^h`j7vIPod?fLO%@N
zT?_5*A@*?ct+Fk)B$Wx<R|jhM{>lo?n7=;#l)U9F$-SMv|E2G@5ckmF%%kP^R-V<j
zBJul<dg<I3no8b#j^FR|;K4wAwPR^}^=%xccCGgtt#hLswhsxt2Lo03+A^jxcLCh^
zL+y5-?~R<?My;B&kM^3+;i>zxEO@J8ZhZ)f7R1d-rZQ|!7f*&WcFb^HeSd=dP><{*
zq%EiM*i5QW7QYoWv{s}-H7dB%Dny=VA{*~1OHe-VbmPImjzw?v=8cD8iUY5S3)2p~
z$2sDMIW6AUSy6@bb{<R!kQ?ES7RerTN-$aQr5A$cbRrYAa=~D!!^?6rp7IR)D?i-o
z0W{!u*kG?di%dO3!`mYpMI)h=e*&gY{yfUmJkOxl6*iK5le%1`w~(4jBHeqhLq#j6
zbEdi@XCkR-IgC99Y`=%pdqO#1YWBWez<9TQ7sd};iZ^VlKK$8>CNJzr!GR*71xSZ^
z8me^$XgI^y1cs^O$7*~#-%g9h9?pL)pm>6u79L>EEC*s{B?4I>dv~Jfh_<3tE=9Q@
z(6xMB%QarkB3L&1mWGZJhq&JJ<`5hfZABH}SxvjSOK{G7*soNA1a>`mCVYIN+o^4k
zLRMf=&HK>7)}hr~lVa@6UcTi=-RiGnvXP23*ORH>w+r$SnA&zqm7~SdktLAwkhBl&
zn1dnO>r0u!4Xd2gTRfrUf4cRFc9$217v>IlcL#T?5e4Fp+_|+s*HuRQ+WrNz-8?iY
zi|wck`)EU9z4mo=%V?e%-2BcMPihhCTq^m48MR>USo;g_$4YlZ?L<xw`_&8{<*1Zf
zt>iz~uaw3A%wo_8H?f_*H+50lQ~fQm*S+6fW%%Kmi}}Kp-;VBNZ%vS-gTLZY<AUTd
z_kmZvB}i^;QrIpd=9}Zpf0mNF(}PML5AjvvfF7AyhUqkgzrQ{`tTFt6b-D;qU^6-F
z!)zf;JefM-n%Nycr;tMoK$%oxQ21zS3%6&#xcG)X%Rp%WO7G+P&6y&$YI`qyb?;!-
zM$iGZ&kD2Q?Tz9+x=8ZGc9WahelLaS*OfXOUmuj2<L|E3_>3JaRA4repipV!l?1(~
ztXKqa|JW8KN?FZ;F?@~rLzbT=ULt&-b_yq=Yrm4ee^_vno++-04w)-=`I!}>n3^>H
zVdc&KJ=Fx#wC7zBTeFok?mZt5GPT<Vi&)<d47~b&A$q4<{pvtp&CFqW){Ey3@L7mH
zXt%kI*QuKh!4oncwCOE8D-J;Qx09sh+I>)ygY&-E&*L^;Qk4qo!~y3PpMmKlP=2o5
zyIL;K83A%vnV1`i8z+o|7B+3xqrc0oa^8ZxRCZ=Y13lS)zVx-lJ>yj8^wL`|jnVlO
z*S+nMT~#o>5y3P^c394u3uu2)IrX4@<{$a;*SB^AtpBX7<Cc)_%`<m~(v%O&2fYa;
z*K>1h=|9T~-EvV057~Ulc4;;BNbU!11J4)R*QIifX`!N)<>cT}OeDhLH8cQ^4M=~^
z8-bhI^+f;E8uAveP}U!YHL58Vp*#A;J;}tm!(1xtYxUKEddnYXEQj$YpX3dRo1xcU
z3+i-r5=Bk!By_V2DK=fIp5L=(P~ztK4eg8NF_gb?@B5I_z9zQcQGPa0d{kSr*)Q%@
z=Xt}#8z3nu(TPj=p?+n1{sO>*WN!@aWP{-fV9sML_2?;4%3U5Kspg&PI)7qANW5!z
z$o06R`7yt$i=deumE{x7<9KPmiJ=lldEIP5g~ja=UGv;FCj|D-#}D^NZ*l9MRF7o5
zq{_$pXlo3bl;HD3+xID%!de{7Z`vkjAep-^(D2jmen?+-Xw_tOhW^LWP~X?t1A#76
zJ4SG~N+gDx85(%p2wK8Wg3GEP;EdhwT9I(bn@D89iOn6Cl{A-}UJ>G+gP*1aW^lV{
zyp*-PfhQF!BNj6|C)qd2=-v7i{F<16h6(TFN`P?nK}oKy?jMngLMiP+9}Zq?7s~D}
z9BG`n?36B;DyG}}Tg+hLV)7vSw5M#@b*&mTrz;T_+Jdqc)Bwfafegn@zn#goxzUyS
zsEC=&Cb?#SA@<>GT_lMEe;wpJq<R6W)$pS)3n2?V+zc*U7<8_y`R|RgFN3V%K6Rw&
zkCb(rB{j~r$J^;h6DvP_J(DVDk<*!rVn6q>c33rtR=?bBSs7fPwsnyg&-(Zvs`g_K
z`zE)|y_;m`f~hO*3jtgmm4m$0YxtyELWHgtB1)O3-TUI_kHf*@9CqKPgIp%<ub*4`
zaf2pEE-`52fg(JrO0eHW?Y!K_W$G%^xxinR!nrpCH-5u7bnR+hZ$}o<=Gt%9p02XU
zMIM(j?7)doU!5>P@2%1i+ai5duU>c0+`5r9?^mmW`0UDbw_v+M&*bX<8UF5Bbq%`(
z&*@0XpBtw(7#RIGw^NO|751KbV;9ITKbc@Zsc)DYQXkpv9&?*^c||0GCQ3G8Q22{n
zR}<*|71rSvR23k`aedan%~|ISO8HFt$tK(WJa)F#vZ>NJU)f2~cPOo_Zn<(58*Vcf
zN{sn^CKLSP&;$O8AFL58t9I0^LF!K>bo9_%ZOu%7Pw$T!?0R*1$0M9C@%*4b)a%na
zKahKW&h6|pzIE#uA+(f7eHZ0$58kMxhanx1AGsEWgsCp$S%Dl)B3WJ&sWSRR|DT%A
z0-c83*g4;n`jf-DT1Yz76(=97;UYT?w=%2Y*T)z0`b9-Q`(O2QyH4gTUGTnS!OR{#
zR7i0>N5Xv9z82d?t_wQE%;s^xZc;dOv(UAwXKje7*_Ewh=J~zTSdb&QSE79*ZZ2Lg
z3bkC>(jnib>3Zrk7gTo9o=8A~N#fL$;%n;8g2DEz{7@fDVOa%bU7mD(hk7eh=Mv>R
z??PoR>22O6d|}YAMFDE_y-?U<#avpG$7%U&#|@&-knL5>+RY02bMr$FZ+)*@K4P1)
zKI4k0Zr2;oD!p;9MWs<8*Uwu+lDIsCd4D!A*UC1;jTq7kdI<}tJwSc@?f{D$kls>3
zLZoVN)0_n`Cb}(QddK_V$K$CgdXq2nGaW^(+**cx_$`EQyd{ScF*REHSu>b+^`ULQ
z@JV4xa+BM~e%mIOoqcQ@)uSPA)VLJKIDYP9#LcCi*S%8zz7D60IKI{-nX7Ek?%Z3W
zQoXX5@j!1Io_D<~03U9va^DrHBjRN~$--2zAvq`@-hsNc_Rms!J>BLskfgV<^5Ab%
z?7*Kzac1ak-}%Xxl$N|n9`&<*+nMm*EGnU#TX{0n^(?Ylcw3TtI)~3Ga^pkW;Ge1P
zi3+oUPNwWjyl+0NExh7bUOZf!%pvgLV2|0_Mq4lHPm7ZsJIn91ex>w79<5~=M5^uU
z$poXx>eo7c*@47VPyE9J%>C<`mfqLS+tDsDYbbV$L#|*-5B_3qx|j*@sx#@!y{!=2
zr^#+p>6!f#9yXhHe6K4Fy8_q?Y%fvX|0EJm)o7Wjg8m>+`wr96QRl1teK~erZS@m5
z#~<L!#@bva?yqT+<|OySZI^}hxUyGTzVRw?*9GFQm0P|~u$2m<kpFn+u2)a#9~n^d
z$Q~N~^Wn|VwqTo#Xq$@qS!==I3Hi>jOmJNa++?I&;=x*h_5d`H@OniX<a-~G)lU7Q
z)rSH*_&%8Lti^O2DyWq`j0%|wAoPXsYTPlaoX{!3zQ$=2b9B54A}G%yZkA8iRQA~#
zgy}4bxqh{o6f=8E>F@nMueeufZ_$U!u1fEc$<VPNr@--`OS(Dzj`!3zik6=0L{74(
zzMQdcpY0VoQ8AC?cI3J;>1wdCRY@C~ED}r~LgnbLRz5IZ?utKIP8m3%+8a6l((as5
zvxg_~Rmin8J7$i6g7EKdQKAuCI@Q6`>odM8lMnZ94|4o`uXDiUSTfV%lN@!5^qt26
zEO*&PTC@zGW%)Y?%V<w~ADLvEQIP4}FrSzRk&2jfoM82;#j1E6o}3>pHSFl0-~Jh+
zLY+R07cHcEI~k?-sBwH6src!N?C=f%*(iLE2>$CssN80a{fan<i0a@k?6gvgo^Frn
zvu63rzbe(!*(tF+^k#cuu6y<Kf(bK@OS|M}^^9)&3*zzFJoK*`Ed#t3>R4>vFZ-FW
z`+qQV_PCYbl;-KO?KYcVsJC$!?nE$ft2FWr?Cx1h-iIV#VRdQ})CjSX47a^~zgB52
z;e*dkqtaRg!&3B&O<?ZU&sFu4xortFXYoJKbHT&a4rx#z_M`w$?lrl~?VOA<)WjW~
zFpa$&1Nmq3=Fd1@m2taBE>QP#`=;F$hWSxMRB^z}Es}$DSAu%aiG2usf8&0)e#?>7
zde${%y#;Ojl+fb<sf!)zSKJgyBMgB}j+H`hz>VN*55sSL(xz&V@99bsZw}P;$Da4o
z(|+k+6i~G}D+V|<B3`f;v3L=V)1s~iMK-(DGziwu>{hS;;LJgixtT!MDUe9D2$k2q
z`*pB+d7E%-a9HYQpPg7h4vUH0UM`#3nlB=&m4fek6K#zVZ5>YX?eWG@liff1h0Y$*
z3Xz05DxW_%7*@4DBqPXKB_ZFw;Mb1wITX(~x&COLNilN=v;`7~K5yQa&TW%{zRo{2
zSU7~I`pQR-dIH&jkQ4uv3&JM@F><zZa(>@1KQN!RPBxsO=oo80h*?f+nwj|7^Z=Fr
z3hkiT(1NM^$=eY395^e_uA?AC9^%_F=NFEMi5@x=KIEPTojYW0?v`e&FSfDI#x1S4
zLLt{xQP&oAS+1-7zEH*gqv|W;qUxWwX^=*`OAwT9B$fshq@)|9OF%l72B`&=MnFJN
z>5c`KkdQ{{Mp9~l1(w)&(BJ>|zMnVy*|YoR%$b>MuBq=i!gHQjW~)5R46?wOiK6_x
zEU<j=LWtni*R{my6l*6IPtVS(huzobzE)*t9dB=ME<BDy;kF6=OX1e!P+z7u;(P<F
z@Af{!o*V;@BMmNHlX0&X#Z^zkKFFSzuTL`DHKID2^#Hybc(!scY78%}sH<*nNCo*k
z95jPtE{}FyH)w)l;11?WXKl0%=cny{yyf?AaFM9@ul7-a)63Sr9jcR-a5kO^#`09#
z%V*E~Q0;qIHA@Y^BD$2fyP?7hvnxrToff%EG&*z%qK><-4=?NmA=Z74alg|yGF5wm
zaHHD}<?ZgcRsfrU9Z^R5X1tl<Nm-a;+h>Pr!u3NB<Z*Wp@=+UuZ@s=xmV{=FDQ-cr
zk)2iLnP=j`WDN11g(1GNmG~-@hI}+1S>&(csi_RpAWqm+tsVsma!ovys<6~~n_)bv
zGpI!yD-keJdBob}70>uO+L9TPsS;n63b|m=gCr{6JOU3hwtFIB5+E99q&?XwMXP_l
zAxkXPsZ06UmG14`b}8%9W35g9Za1t9Zvs&r`#n(atpEefu|Rj#u!sJO#4f*_-8;}<
zbUK>IJ1Yy|3zQ|6p`kUVfY=yl7<&gK0Dxx`nY$i-6t*|Eyvox?jiBhIM*Etyf5SNg
zWxy6pylE45?Mb|S3eU#~%H4BQ?nskahJY<Z>DVQivAmDuZ3715!)D{A9AxnpV5IPU
zM@HMj3D@en%<NrXUSnUtCl62+n#myI_x42q!2@NCcD>t@$;$L56s4yb1{0exsuWbm
zF7dmkXjG`J^)}qp=qc3bV{Xy)g0_>ERAFU0d;z{X2k;0PEBC_H0wb0Hh{9pTy+@2H
zMkA~OYf!_RvWqr7v`A((K(ab0HH$9k#cmt%tA|&Mv(hbHHYS}(jT1@`qV9!rS|pVk
zpkXqXb~5y^Z3nin6crM@@_|UY<mh~0LA+s<#_(pVdpF8*aP8Oc8rK^8ZN>Ze$?b70
z811>YyYNUbu(ES`=EF@yxB*vS%NsfPgOSeyZq3YBvyphq+gdgqtasx*;_~d|h$ego
zJ@IL#`VjV*GVok#;x>9Q^<8_M3|#0`M@oBJ>G>p~79&bA_QNP%iDDx9NbB1$GT}(v
zci?aUBeq$OQiracaT$GTt){ZKL)kWfZ&fbl##s|G*-NgRV2M%OJnj;$bmT8FIJsXm
zapNP5=$+`Onik%x>4m5KNw*?@g8`Syt-Ja4Ly&=*sQbgm3Km#a28Tafe1p#(Z3#9z
zmo&93`Q3FQ9E<uH=wY@jdE;A*(Kd}9P4-wudN+pdRn~dV9#uax2I&~P7vSM1*l<Q|
z(`k8u=gZ*cRxbTCUq`1e_S0cY;EOPYBK`^WS5SMOkH`jvBY6@R7%v`F6}H`EL4voQ
zIBh9S_K1TxKe0i6*k=05`tW?SMSM;7%yQVeU2)I<jd9E)!(z%?`t=9LBEQ_;diw9G
zX1k@qn%t#-=d5d^)mg%_mU_fg<FzLkvx5JXmE5x18zbaN?wi0P$%jsr)Q9>B=LKut
zM;FjoT4G7Ms{QdOWZS@v0n~D<6Jmk(qtw}Lax>cBF{^4tTb3MQ8TOqyd8(tS%8@<^
zD=iV{;}$#NQ)tJ%7~Z0rAk`;_uFxvS)C0O#lDlv@V={mW6gAphMjL57s;1HLjAB$O
z;p~5Di1P0=r13WI#t7&*n-n8OORj>}+u&8QolImxe0!3I7e?^dJ_J>i2hQhAk=^Dl
z)&?|a>Y>i+!E4CMG8;+xuR}^C9u{&M6}8rNi&%>-{xYiz1ppG6J7=KAuu)f&=!?cJ
zOFHWbOEx$me6-b8isl2lzwu6TJYB^#WJ^R3w&%HTIuQ){v4G@us=4rWeU^h~1*cjb
zj6A=mQic9qD(zC%p~hM}*Sj?b!e7=@>gev(q@Tr6Emu)LzVKLyZS62MqhF>kHeDQY
zy2c!EN2ks<Ijdod#T;%IAO{wM0*~Iy`Gd+BanH7Vx0zfwh-R?xI%emB3yD}trXV>e
z?%rDBsC;a#R2w>{!O=a$l!X->D@gDQe0y_S%a|EVq_WwjtTJ88R<;P?_&neE>zxkN
z>`aLODW$rH%W+-ZNTj#91kC-uFiqOa)v6_NHue&^Q*k@)eCvZRSNm^yK&|`$&Fx7F
z=rXkXS5JiZS0Id*!ZCBU0PXF2V;cw#N>Ud`TA{p4%6`~?XsObwMjt$<j!0ZNe4_u=
z(qlC}0c;yQ%U0OB%4nY&bVD}wF1Yg22y{*~%R4hJBIN^NRAgCk-~XxgsgN<I264Ls
zpvHDad)2&n@#QeEW4dR-Rl9r=Q<@BqsKOHHpR|YaUJO(Ckmyv>gj6`{2wx|9;tGO;
zrKhUPR(!7lvsHI3oR7w8{XQPvG%S_HZ@W&%DtzZxOt{edevI6I&mQVWbu!BL8(-va
zIqR|MExvSde(Av;h#MYHU%l#nX%N83*MdS=q0t<uQ`%u`OfuVRe;_Y6K<beHP}@EC
zChSC3wNuy4)9_Mof3!T(*C)x+pq2L%*_X>^n!cNdzraLJMh9iNeW$Wck8Av<mZs|$
zv4ZL?pbeuZ;7J^$tEUo)MPECs_wGtD9o0D4=xto}m(Fc&&D5aTG><ds-9C;s$L|Y$
zWLDE_CyMbBTUBKWlpKSTVaq@G)elw<k1Q&CaaxJ)H5knyBAlV{C{~M04!P-wTam(V
z?%xLbeQI8eaP?yupy<y}E{PDsdq<UTo&h(i`4hVgy4F^2-d~(tdZKRPAqeiD5R_+T
zMC6{RzYC%n@cJA2EOWsYXhHSN0(|Xf5C*;mHr91k;#ITO29<t#x~g>&6q=-{U-@j3
zjG7oU8TPC<{a_T;+I-si@Qq~O{uc6qylLqQA<|MZs>%Rpx_@^9fIjwv$rCT2cUB6v
zERCYN4~;uKeRDpr-qYxqQ1ow?Xh@x1eQShEIkUPph5In*#&5PQKW|Wyv>?cby$wa!
z0pnlf<U_YtU=e7+V_)rO)(1lq#>sx8?9uIjFGh9Q?HP}<DS|*DbLRY6qNKpe_$6vN
zm>}@}_v(<cBjcKPh8BdV#dtLQe86h=`7!(L&J#X*43773e}4dtf3b4t+<fq8pK)V(
zz~eFhXI}-qVJhpV{m(EZ?sdn0(OG|~Xz+zCHSzg_&-c)ZEyJoFr-Cujx%Za(*i#=Y
zmSEKq-<!)&;BUNM0>jtMI9I{jOm?z%Bj-nzM=Pry^GHNa$12>ym8Cz=waRc~C);ie
z!uRf&^Xic*Vgy4-f6C0^!Lj>6VjPAh!4C7GgP9?Q)>6!|Tpw_Ly=tQSz{pDyP`cS{
z@8+yjWAMD-5u|A{*2&Uuqd2jP%^`w7zogoP**b4U{2txJ>53D5706&%0C*=#Y5Zc%
zgncND9E+KEJBu!P?{Ow4-Ja}LK;IW$o*Rq&_PoxEH{?nL?9snJBuPkcZolLw5dOZF
zr$)?0zP7w(wO8hv?wbz^1_+`+K&=C}2bcR05s&thszGRnye4k`=Wtod4*#c?*D?S>
zZ}^P-_#&P<+2s-HGjVZhCtA*b%+B!k_}Hgt&+1leOa4C3Z&1}xj~@T|lYB=m1%KWw
zv-#8lFXN{W&%`^5g`rR-GX!e7UbO4_xe%q;I@2glXy+@M@F;dan5t$+cqc12DXtIx
z3%*b5Q52XYxOE|rOQi=n_-_2H+<4GeNkGwuqO1GR>A+~r{|ObHN{jJ-Vx1CT-%7dJ
z=R<Q1xgJ7HMr)+CRWc`G+u!&JQ;sli<Jq1YRV|{2XhoiO<CDdutx2M{1`QRIyV-X}
zu*;0blss~<8V+s!b+0!$LJ^hU-Lbr;y7{8M*JiwV;|`|i_HTDR3ZM0+2^R$MqRLkC
z9WbcsIl1SySoa;H7`<OU4{s{QFD0--;QZhVUy0SZ%zTHT2QqfbX1q7RY(lEiE1fEH
zDF?%JpfcW}8rK)vM=Hm2aQ%n?={lC;%X-*A=}WsR#zMvT>?(~P*OI5%AHY2hfd}j9
z|0)pof0B+}p)rD=^|odI{$~^Sq#XD}NtVxfMKKU}MD<0V1@scKob?d{st6WbWps#K
z)_IA%8SqR*jKNjI_N|h}>$}%P$KG3AeOW?%G=f9DRKg3_a<N(*8R?9)sA9YxceDEU
zK+((g)2w<;eRgUXyZ1-2etcPzxlrZA?t8P25#yGg#QO?ix{^>sQcCb6o|hPV`1?~I
zW$6cs+RlD84>DNAsq*PZQ5$r3gtXR}Zom}cnhC<}$r!O^yz%h@>fA5<u*%_fLGHrF
zh4TvH`>|F(OZwv1wT%j^W&PIMR%nkV6cql?XgAe9M1+$o4c1ShfL&a-b~~6{mw1Vf
z7tX8G(|^oNGI@446V<##Iy5rwgBJ}efFPc3T%ck29FTLtYBb_u8Y_geK>REn?2QHl
zR3>!jTZ}banMQBSkps3+LL`Ijyx;x4+L?y&g69*ZKg_B0`v5+MDx4LDQb!PD_7$;p
zssmEQdE_xjyq1SmxWjkX5H~m!qjzgKt$I_fO~w~-Cs%gF{eOWKZOvs`vn-d0ePmsP
zSF_W)?;YX=w5t<d6>BGUlC4t5%mW4&$k|8seBU#Pm-HP|j8}B--Q|8OtzA~VoOw9F
z`o}4M3+=7{NBYg|1A2nnBIK=(1BLTIG*YZKFY){$H%@SPG+16|zx0=gw5=GdOE)je
zdK5F;F*>^EcMd@M%mO?4PYY1gX_71S>dc632*Usif?_960<{GZO$qvhRiClEZ(nwU
zcxprHBN-$wy3{A|2E2tNh+bN*dMT^G61)cfu}`>*hpkx&Sd_PEb$CR+IuGi{dI&zy
z@(D)fEC5-uG4>m?NbfE7E?>yA?rhvGBKanU5g5|_XpGP9WkYzzYcERGq!y;^m%l8s
z$88olz};c+cjweq;55apxp*C7Vqs5)?bte&E@N`n10w&Je+<0!u@f8HAE=5>E#L|}
zS>zQe7NYNQ+(m9Q6Mgv<a~%e^i0?Zbr}Z-&N7=%BB=3dOwbMSzWkOw7TcWRE9G)Y^
zq^M?ea0rTG^T-Mjn`bFa)J$lCJ5~~YP=pv%n%JSgfVn#04Zga@lc#Xyj$uc{$%fW&
zzc^|J97>9h5J+gTgOB-Mnk!L$(Vt_TZQ^cw`r?_!4<-Ka0iw$QTS!<6_MWMLwGf*V
zpNFUzsfKi4_jZh!?a0-_aNZg?;=MAsz&eLYB4P;(-&3Q&Ra5xoi@Q<*14B$sSI@Je
zD2k^!X>c?tW>>Yv$o~p$^GE1Y&9j+vH2a0H{-1vYqpgtow3?XMhf3V23M;>eGvf)S
zt^O1*qh1TT_f`g^3mJUi*?Jr9%crxzFl44m*y)(m-kK!piZy!#$3N`Kp!MdV74@r^
zUBm-rN55beh>W`6c6p7==pQW+kGb24<#$|I2EDW1ua!9I(W%A0WmHZH<%}HW3zDEh
z3a=~~faodv=cpIzY#HJ=C~)ALj3Z`aZ>%j;*TWcW+3t<IV60$%Bk&Fp`0=p9479q|
zx|wyYay~-F@k`}6gwVO(DV;MlkJGF^mPdv3u&PYT9Pp#M<KF*td+WnmO4$G4H-hgZ
zadiyJo}ciJ4`U<pY<VQmLc|~<7)v4bqTvQy6ZD8i6y#@AcI;f<ypGtIHc~;I3ML{y
zTG7bm-WgM8LI^^5PdEHG$vCfvELv}%KxG<Qb!%1GS-(w%(y!yoH+ra)e1}j9F-E!r
z%}j1TxMP%B^!K_UMa}(2f&AHJq|<}0{e@_M*KO?d!)sGIdTXY0A#6JJhO|;l)+3FY
zROF7{sI)vawie4OImLdh5L7J(nJyjh{vHROf4uKTmpR$@{S94my={X+t#p@d-fW)j
zd%MeK|3uyBrF(yr9mst{U;X<5v<8lCM`S{$U6-YF8q{f{zyY%9I_QL+N<&PTcT-eY
zXhKC*L8K6~Gh8_}JuQ2!8ksO?1wp}X0C%qnfcl%kt7v6=?tovOh!f;)WT##GK}+*_
zju?f7qFevICG_sOCG}LT)zb6|NQKV6F3f##p~YL%uZ5X)@yUi_!l|z$q<;Zh7a&6X
zwJG>SaABNoPV}KhKFyk1l7yqp61hbMzrZ$`4UlE8(7NrUX$pMYY%e1e9e<WYFr6wi
z;JMEDNev5RGfpfbXk}~^O44_8GsOIVv6x)R<1PciKgjJEV}-mj7@RF0|6tk{-pb-S
z(YH#a>D3&t?i|)Vr{}JEIhsnP;=XS-q}quzNJC$HCOr$=C`blCV4+tg+bg#YycBc@
zvreU(g_{tZSdxBUX~v%$q7qfw>k$GjG=_Ee+m1D6OMVroz#eTWRRGPCKc7v}EA%}7
zn5$MZ<^<gx#G(2&e5%g`7JxMjUrLD39pEJ`(-!*<0F(St`5f)gU+O1T!wKmb6x}3r
z9tk?1xnIkpvc?>ogpL_Bm7}h22<aKdAk>=ooJz<oNC<S*{Pl+~#yJ0#7VD3+xBSTW
z?r(j!V}zYFmJwXJ%lPn&6}oMV?X_^5l)YW7UpIAC_9435?QxOSFRL<{U$>krkW7P|
zJ>3{*gvKMt&;#Qy3?u6mf}yjB-N;9tNW!Bd)>UoxtXbwQy%d&D^h_lO4j}n2eyd?T
z2iMI}J?<SE2~&@%lP^<7u;#~Vbqn2=GN~3Sv&s794)?uZLkY-F&CUm()MVK{&+zp7
zd>&6K7R2;!+LeRrMv>J~82_E2JsC|hajpD465cR?eB3!(681~g=mEOFu%!4OEXM7;
zPS|BdKRTGf)Ae)f7^|ysT^>H-owWl8i_%cxHWBqNs2Elv!wD=pNHU4<G(KbD0fkzi
z&-Z9mP~{NePINzj_G%S<HLhtGIgVV0#uw5p`Teq!z*=pUPaNAIEO~)DXyPBSkmHne
zSO6*bN<vp0MmQTg&teS^6G+gRU8H+Kv0!oij58wrkzK{i-UcaBcSH+MeH#<qz+L1h
zBVTq-fal6WPdkwqVbdnCCrlU!Jn4yNIyk6?BmL_!2*z>-evVtU>Glrrg+4o_cNXS3
z%UC)V-v3&}aJX{45IP@*_=j*rr{;#^VclwTe7oegPE#4T!K)rSV^LkZ3mdk?gZuY=
z*@Fqs<G>v^zHgONLhwFb>zd(@W`#?w>>U8&G%V}xB9K5?V%&ne{=hBQqUxn|su{AW
zUw4i+Gq0FOv40l9`3}KTjctI!#`*hnWEV1`?>no>&YU$#<V5d`pq@7Pk%v*P!EDQS
zR}-YHhAaCcsO6kV%&9~elW<wM@4RiJ1Xi^Qd0d7D@OjAZsuNoSJZwLKo<Cg-`&jK;
zu)*}@S?)j!@R2dc%GWyupy!Ed3=}0HPwQiHsn?cm{z&!*h9wF9M<z*-*tge%qp)%S
zK%Pu|uE~M{H;nd+<f>XS+~O5+x_Gm1CjY|xvkZ4zz*lOSK8udn3j^U8NC^ShjUq01
zWmfuOH}Gm!1yu~x-fTu&rJ>K8t#(iFHg+RDV~u6iF&AeXcYS6<-^)ZmE%@Z`ZcnDC
zsbK@f7Pg1C>xVBYzOMC0)#a{06#JtlzSib}@GXdfbIax(R`v%(Dqs=9-Q-W+i|G?2
z4G_7QfU`cZYtc+cr^0sa8#`F%ss<7Zq{rvq0?T7@g!tF$kD!Od!pXSHYlYHfZye%;
z#NQd=?(AQ~SpJCm2bVlZ|L3x~KOX<S_U;XVn;BTEkBU`^`-(Q`wpfN>Xw4at_bMJI
zNAGzEbzzXc^6oP>)pT$&{<IybG=FXxNpm&ykOO!=o($M2CPAS9^z(N-vTlG|J1Wps
z7vUb#vnwBpVMUWMi!;-{Uls#Uwa7eU+)3n!L*OWlZs-i&)*=aB-MjM0AOLCc3s#|}
z4ydagD)gAHqk`H_arI;sM3)6K8G3AyYae#NJNu=!Yb5^-N%!y#?Ch$FsGYT5$0e>6
zyV_w=-X9AuArHU0zPsc6eC|4@MvNlwf|&kqkR4U{9b{7-i~eWETeMb`fmfCt+X-77
zk2b{1Igs31c2$wE3GK=zAnLdRm!tg1v`SpDv3dDM#;ro!eR0Vh5+ed8>JGkTmFR21
z*NBAznk#h(=P4svb2Au_n!9!+2vj{nAZUxxObLd%VF|6+bD>q={dUNN!3Wo5>8<0G
zVgUcXf}+Zk(66|m611<OU#%RM`p&P2zIswFjTX3*>dL7Gxjz*e;ig4Bq)>&85EgP7
zvL<f%p=RR76=`7~w6%UHi(~G(ftv!Ds)tO6NJUAf0tW-%FDueNbifufDU86Blad>b
zcp_=3!9bYxJ6HIl=RuNxDMrXb2z=4L`Q|};^S;IMbCWY&?O;m-4W5QwgztSnf)Vc#
zTb4PyIYX|7W>$-l_a`59SKrG+3$YNc5Ghm$^o9ey0SK#7i}ZTcEs3+!<-fNfrn<X_
zBBF|_B*9Y!-l2@_pHSi*8!(FYeI1Zs$U0o;X;om0jEJ#rsC?>n?yQ`<RmFGTl9){O
zC<T7sBpJ(DEZz-op)a7^Cl0Rp;r4`z0Lvj+W6|olh*q1?Xg2kFDp)wo0HmDyy$J*v
z{}@SM`eq-iAo$QRG$!P>@;~x#c7$j1%;h&$sc1j=!z~oY=m`WqVn`*P^3W9<ua;jL
zIx_xRvcvE2ZB{`4fF?tOp7SlJiAI&QCCzrYxlzI|OOk5`*i2}K^MGMHW*k5$pc4ga
z9;hW7j|hfbXi0Z?SI7ULiL5Ktc`vEoK+4X9b5T0|FwYmN%uAafW4*EnbZLr<tOJu5
zTCV&!8lwBzdZvkm=iSmHaeXqN)8Y?{dT<e+_9T6h`pJ~udN73*hlKKs_o}Gy8lsgB
z<fSq~$2n%!Abu0WwZ$FFS<!B8c;hnuOqFxL`?F@4!-r$X@Iz)snT9Mvp<-1!z>$~W
zAMM_Lq~=DUA<urxuIBtFYw$>dP2#SG9x4prh_@vkJvH@jvDc<m1Jyd3`=3CL%*R{w
z+$wh_62F$7xksT(YraUbZY9F=1+t08d@hzDav~H6ZB_thxAaZdvQ?OY`9VxRm)}RQ
z)FIrw#L8!6R-{wrwyqVS#feo~Q4QmNY1LQHo-}n~_G&x#JoA1$%-Nuj6~tH1&P1{m
z64K=tmZ9oZ@IHn>{=vJeuFJ_eA^c5{1unWy=<Yi)l!cijzq(LT68=VTH7G3MBpcSm
zq>7=>3UkjK{yLpK-Su<%leCP&DLno|)mgVHi8;}E{A*{dbqc(HyxW7^;cu>_{nnPH
zYk3R?x9RjXOOXCFSv?&j*IT)^)%+e8T^!btKWIao0CBv)RQ6@4_T-kcQ*<A90dJv3
zx?YZH9Iqny(;)C>c|*0^*nEFA8!Le43LIdG{q6BNkfY%j;js$w<RF4rF(}Mv?tL{+
zp>}=uBxz9Q$2c`mWN5NL&w0zX;e|#Sbp5&tU3$YPma%bSaWdd4jN>s}_uX$H^Hf-f
zr@S?ab*J3q@tz#P%qaFU)5}iMnT-A5GFt_5&mS{w&azVL8%b_hZ>AIGaduSp-|`*?
zX}U*yzjnS)*YTfP0N$Tkz#j{c*ZO&hMKy5v%eU<g1_^HLY$?SW!k1C0Ga|k^)a=~S
zo(@0ZQo1^35M(y3Z2T-DP!jJ9IcprIr}sn9?)1A4Q=vEL!mego<JbyekX9X{7{+jf
zIyKsx#O3PINgSZ2{e)z7ml@L5!Z4(8-o_RqDpBqV{*fb%g>yA|?#Ajj6$N6$xp)xY
ztB9?u{iGE4ZRrlJ7?{65mPW?oDz0r`)tF3}Ot0**Pf9~W1k8!6S6L3PE3Ud%NJj<9
zpf0e}fWhb5t(h_K#zsT@nTEsd*$uJdkPOGval~ND+W0u6;B3<feleCU`meo*tN&(a
zSDz=$?$?%U{r>$l?`q8T+<!8!z~<guVTBk)*j@04G7J`(8~Yqwq2|uSCcg=m{yGy6
z3!^z|&rtFV_wtI3?4b%<KP;+*LxoHla+9Zvu!U;m&r296Ons9TL3vv@Naq~GI_R*v
ziG5e2n<}U;Zf~Zu&-uI;H8AQ%iTzaA*e1l+!~38&m2I>Jvj=U9q5E1BcL9%+XL;7K
zu--DHVEp^f`6rKAA_j1>B!~#JXjNuvI*_Vol1}$V$nbp_25^!lQ}(${9^CwL<xj$}
zZtZe}fLi%lU<eZvGGq4Z7>}alyAyfi@ygy|Tsz-$Ei-Vw79_KDQ2%54gRqFdH0G*7
z3i=LxVWf~IXC*6vMRlzR-8u+-n{&TonX=WIc((vqHr(Xua$)=E82l81U$i4(x2&_(
zWPqUNwGBl1z3usw_xYgusu7w3K(C>xuHw*{gHdrGM}vW=eedg^9lWGu-SjWcwkV>x
zl=eSa-~H*p+}0!lt4~}~O%fdPGn~nD&HV1$pO^+#v<bl2Zj>TZ%w1O;8u=*@NIN;~
zN&iz?_UL=wo``6Trn*DK+cNQ&^^r<U%Nn)N_BcDCF-{js)(z2v$}m9RD?!63Lx$_4
z+0h9G&fOozK`Jl|+2PywTZwpjy^2w|nHgdD(MJvsNctynPGyYzV-UZyk-@UQW=O{E
znN8ezxg~9M1++&65$}$4n+Q(uIXasoAfT!!w>^&PbUUI7gA5nhEa9z_J98xl8{w5+
z7w<1zjKi3TS$?nqVXM?vp6H{&CqmMWtSvX?Rt1%h&pz8%_*6G<>te8cvCZ@e=~R@{
z``-L{?372B=+mI@kmzVfgCje>qS$1x;Y>^EKBwM+`9~JoaNX^SDg66f=YSmi5uBkZ
zZuJLY?f%vpuLs`038KRx)*{^)=B2tw5=$}AY0vSRE;p=~(8zhb_hP3OOWvw&L>sES
zSWDrNpNg28+-N&x6srC=p5IFT9|O2d2hd~H#>S`M=I}s(l@EaNSAJ}3W?`)MO%7@b
zlwI$%5|2Sce(Ba^F=Mta8WF48{_eQ$q9(EQC*4q6;+nj;r3HD_5E9|ln1j$TOJw9A
z5XG8+fTQR0&(~4az=xWc0!?Khx!ah(`f*1)P&5YG`{W@N`Uj+#fngvT@sF@miv|H~
zF-ir;y+{cG4mlA_V`qH9E2)G_W~@*g$!$Y3b9!7R%tCRTNiG^!?_fICLMGBaEeUzh
z^oWohK`(~<{XEgZo<ezAhJMU_yYET8#TWkFLsAprm<;G2`B56qXmfap>2~1-$RWPA
z^qK$v;@xim@D}|S9SdkyueK4k*{?BTZc-{&mHl3&iTg={*}^&-#ZNkc(^QwWp3iM`
z=lrRuMVN_2F;aSa>oUAqRG-tA;*qy}^tcoVb$sJ5MDYra`GSilcfy~uduQux75TfU
z5~7+w(cNdCPTpK@ThO9uzG>6P{LACPM4K{jMiHjqE_Sh?oGh_y`5dPH7z7<(DM%)o
z*XIGb<djCdv9+>(U|^bYM^de@(N-Q-V=&lV*GN7+4PwiRY{|f{5)y17P!Z}@80&U>
zDjZ2~RAK)*nkJwjQXNyD7IswIy-x`bP0lNVGL&fmSr_HxjCD>@9A2E~tAU+_Qg8lK
zNTc^4`i+VDg=PC_&iy}S^Uc7Mbiw%c>!F|ymY@{LQ|zyHb6I=_#sx~du{*um=A6@p
zp1L19$YUjcbTG!F8h`Nyn9UoIJ@IEITTxbpBkWxJ#=UMD#PpRCpcLVJPmaX}At<zB
zO-}QUY_x)vx)|ZXmTxE@m;eNG`#3Ma_%Oa_gR;2U+Y|B0m7^~>8!wz+1jC6jJYv5q
z=XLi0uz?6zL6$Cp{V}}1{$*4wv~7HooME|8us4}tG2|J2z0!_P1q__2EB3G<yKdfV
zOx2GGR!HwMQu3IOFDk2o)YVU9hh=+gsLg$K1Nr@zd#$s=C-;G%)=SjJr#}(l57p0&
zr2kul`LQOm%22??57}%?4RWWAm$7q%OfPSvWPBjAeq8?Vav$qQlZ{~O%x|CI3t)g`
z=7I5pwypZhh1#Emv(8VR_$rqWCP($BK3Nj@Vuy#*d)12afi6pKUi88ptk?_($|Tl}
zT<Fm$Uf`}|lFv}X*=^PE3Y<P9JO2A@5YNy}`U#u&RDK<+K78Pv%b3<;FN@VRWzY3h
zd}ZmhcHiwA_8N#k?LMM9!w+Z|(fs1Xq{9;hYYLmq%e~URe$hsuvhD@vq<Ql8V}1fb
zkSAjLkz*FmQ><i~nT&TDj0OE6U~RUHNyXerC(z$ENh|xml?&}CXeT#2aXvu83>PVt
z!6umQ`iZ-ZSK(9&lNMIV`jot=4d}sp@i60Cil{jF>$9sOdsA9zvjUDt-iyX1{m<%z
z0aAFQ3OcbHPnEH+$vB=7oPKNuvbAY!k&At4;d%4aRpSF`mfZCT$%ngwp%H^DixXug
z7|Fza@rBlS8nAH5Pd=ofa5;e-KC2R^ZcPHz!>X}u>VY6BK7RcT&=26JC(=)P)=r!y
zjWy(5B(bO(mv_oXZ5sIXlJPHPpO=5b-gxJYfjd$mP+R&MTe)tRbd*AhRvO>5O`x}q
z2BHvR-}))fvi0HL$f)%v<@=KYg)oHd<o1yZDd@7|oL_3b4bLT&6~##Cu=j7!tYwMz
zGcvC%-{N8+-(Oy`P9<UY@YHK^B096fgR5D{$PQUQsbcHj>35Ba{dl(JxLp3KSTSrt
zA{q&XB8|^Ziu>esM(EjM;qP}<sWS6TtPvl->~BH~Op|eh%_*N}f!YaMROOQH67F@D
zRvd1L5AA->Yf>#5#aL4#h^bQz(q?_!5a+WyP7-IHPe8C|xRCY;rDyySLxk3|)uGaO
zfzXs(=vjBMe9k^*z09W~cje5mo_m;D?+h&aU4}Q9LkH8U+2t1@Tz|O{W7OY(5I7mK
zMZ|I24{+8i{NSZf5|7GHfgE9bLMof=&hx^_RX;Yw$n1b$D=2`Q>-J?94{%|Zkzz7*
z9!!9ElBy5Cx^iOzPl9Md9U)IAg0oL{J~pHIOV;9wafFcVFG^!p7!uk7Yr?5!)iN{7
zC-Qh0NPD!{%D;6HDKDu;6l_sZyYWSdG+D(K6DS?3>kr6FmQ6rO7Nm!a*ZiMeYGD>E
zt1-(yV;kT~+!fGze!Fq7_Uh9+7#>C+Z|~f5vyo%Il<>}j@8Uq>iNN=Q?zI*#?<i<E
ztxRk&|E-<p3;u<?!Nl#x>I2r9I-=(ht4eUWs5?`-d~hlh&x|@V`B9=U+t8B?xZii-
zm)*ufAPpWR2)}!NJxQT_m0mJtf_wiZ=3r3xN!%FY3GZ3*Rz2iaw<>2Ry;KFGxSq>9
zPIzKq6aQ5^%*qE1Q&XrWr*U;X!Gu%c$3Y*8#JevG^R5DFM`Rhg4{4^Y+4)f}LUbGf
z)bNiZ%1@AnBe?qStYq%gM}JF`_v9E&Eez`u;mZ|>kyDP$_^b`-MwA1%&AI6!(%U%u
z&um`7m1d@!@c5EMr6m)P&hJ52cvObysM7foF>5i3zXeI*f8CmPwBUx4mpD$1?E4q1
z#Zt^JXsZ*8Du2VMMF^idULIPBg0i}JE<f^EK);BT1o`2m6+``uLu-oHQ}KJ3S>S{=
z*4Gn{aEg@(Z#=l?N=Skjm`>ryX7p&*9rvPrs*>Snmz^8HXEipfgy#xbM&u#54(IW0
z_dCJ}XY?t|?6>Fv@_g<akNW78mH-bN>tf@_=WTiI`D*)EMra7taQo&|kD>97Gm0{i
zxnx6pc`wKGhpjS-3M*~6GAQYYQ|fs58iVb)Zo0Z*k+tc!$(z!I?e{LjW9drmPSBs8
z?r(n%T=_S&3+BvrJ}~&;uJp(yP4}KEiY+>r0`Lf<o?%lMlan(XZjg+}vkgC7Im`;b
zve5k^F2)%@bwDuhzkB*pGs2e>lYxOa-Q7);1bgOsNczdxJidp8T<53r?R&#|v^!2O
z1e`)ODWvp|8Am2B?>l^P%Vv$mQMT!rQjY+0cMY(ezq&h(-MX|x4`ij5X=5q!pD`GG
zpaUYy+8}*<CyBy;D_Eveeus1H_`3Jo$Q=j#rf{LOsWwwQ@!Ou5WYWi~-I=Jp>qmY*
zDNXwe40%9~y9ckDptGT$i*5Rn=@YWa8mc+}SF^coW?%W3{o~Z_QkHEpDMAXhEMxVO
zwF0k?B&SBPK0WHkCzySta*>*+d@w~Wq^x9sYxC-;uDMFC*u|8ADY7kGgLr^sjqda^
z^0}!p-3<15;}zwZ2DyJXLlSkLj?iM@ulKAOyRKBBovI?B5K<*YD#6g{gu7)FEecGv
zPe;bRw>wtx(^yD2S0McT#Jmo8<@#@Xc_^N|z@!_mn(fpKlGzIyZCSo#-)|SERFrrS
zXB!~<_JWUU=w>yIzKDNZ_6Td60<TENcwNzHYMKG0luX&brA86;?5E+>>p&kLOwH_m
zj&J7&%A;k)jV!;(`yV2wEcCY{)~?YB8%3=6qvNtj9=uqr1o$m@PO7}i18<D~y3yau
zE6Amul<xGLK+V4*|5+LnFyFV8Dp@^T9LV;T-047L6}TZxEYPOJ8cR>SU~Dg`WK0n;
z9B?d!PnEP|d;~#LO3MWXSYzx0Z_MS*vJEQdv1LoB63h8K*_bwtkRA$Ipw$j0cX+Ep
zTX2jW(@zI;_{yQs(e0rF{GNBvOeC^5O3Dh^IIS=D$@2gYe_nn*sMAjCY~er<;0V!Y
z&BaLVz%`?U3*NHeBw%;>*Ts2ovGjdG&X3YPXWRZ+8E#JX5@0!C*wjh(H)z3P{sr$e
zL{D=`nKD^~MgNWmIl=kMH52TFui!0V+=QJ0Fx}x{yywu01O3}6)B5E}xud22dpCF-
zNH@_WOo0Z5gO#yjQmTjaVe0kD3`}Y?IIC&zh5G|^tmM1O4##c)ua|Gy=CBoNQyxlZ
zP&8+Z56*?dT__FKj4I3?37!v-!s$%4n#jkZu_x(L$c?oyIRZ+;&o2rs31=<qSaNF^
z9wO*_nWnlno$tcq_n-HLiRpi}3bdJDw_;?fbjdL~%^zaWq`oXBky0w8qrOK%5XxUd
zuP|KyfQIt0e7x&9+sCC(`P@|1pRJ$m!c_k;b6M?xzq2g2nnzAwZMDC(R8mo?H6KVe
z;hWZ`h3We-ty-K(QgtfkRqF*3o~P{p{9+grm`JiX`DUTrS~Rphe2}FR!);(@|0!5+
z_~x=lC0v~=>)q%Lw~)cr#zirFbF7$*LxMKrL@J!CFRV9%6JK*eg^eRlsny2ePE63G
zQ6(rgO7y;*lUX@VrT$#!i;}Dyzh5K;)G4FK)jj|p7GYmBYN^*=WHBE^Q)+Rn5U%@t
z-II5JYG4{fFXR~ld3m=|ypVNRZ71?UKZf}|_1VcTYp!r<f9vRYOcP2J%z{oniOKW%
zS3W8s2OwTRLY!mEgadc#g4|yRu=@|(y|KDf3o9UWBiN0#g+Qap>?OnuOzxRd^{HNa
zoEL=#nSBT+#T1h$u;ZFN!Sz2bo-3!Q&mrm+ICY)O{lPzRyDR30b3IXN2(lS1rY5$_
zwM!5NwZT`=k3Uu7fxlH|V^pBh?er~hHnVoPgJxHA0NO!?mwvn<Tk~9BD1O$ENMgOS
zfK6bQ$R3NY?|0o+O8Q0f4`bN78WIkr)P&etKCuosd_^dfCSE0pkcOaWH5tOryFPKW
zX=cb$8*3W_g~`r}0yHBO73G{TW(uufCm?v4$;0g&;&Lq6>H?3y0}t%1WdF8HRZoak
z`R1{d_~I<~OuxG6i0g{x*(>3%fVeRx?~V|peNfPK)vB#K{3sAqp+FU5QNGL(3htqK
zHC>VRd9LxozC)L_xI0~%dvsq_MzvQl2>$}5t<CbS1K%^oI8pfV@T0=xOeg`FjpbxW
zME@NVm0wJ}@6H`wF;ECFD+}TJNV+f`H5U{GU(?Ps5&I3m9Suum8_*A?Ze;UBb(2cJ
z>#W&b3<&!z-PB?>V!LCtv9e>nH4#<3w34!t3+~k)xhov|gHOQet8)*6Db5jlZf9*1
z*{G25`mNA+ItFEg>btDG1N^;gR``dt_N?)ycJyW8g+w=o?eMVjUso{tPl)exwR&wa
zkibzCaeN04YbnjbUU}|`2m5T9zcr;0@mx3F0abjj?8KRAgj5~$!EnC-sv{-c)so3S
z7tCvY&>}GTV()_d;zxA2I_&{m?1oB=Yvjl(2<{umz2K;_#)DbOyxu7AqE`S-bu8*9
z{iW<&3Tw4Jg*#QsK_NCQ&mGVgJ;C~F{xAhEK8G8U;+S}%;&!uoA2SA!jI+$N*4JC|
z^5sa6B4i=v8aql2v^bl_ob6V`Qjyjowf+4iG9R!A^V`sxdsLHKe7p63-Xh0Of>J78
z$5^!o&23sggDn>W|F$arGY!$s6Skgv;ycbj{-mYrSrDy|{euRdOp$napLKXoIZ^Zc
z0sAedzd38_cO<;9QQ;veJvRM0C}UsN)THs;MJ6mdqN&NiW~V89+a=IVIWyZA{6+?}
z@-Q@JjfkE?!H=e$xlSO9;K@Y<2jUrf5UR&#U)?WO9^Zszn7Ur!HSZ{Xr=jNJI_YSZ
zwHC(s8)*$0y#<RSz<U=)uhl1yJp~N6e=4K}9z>XzBy8Hzh!Uw}2=89z?XeczkRv~i
z_=XgC1>z-~e)*cG1U-?PO+X)VgFwn=&hr%VC$<;ItCx`<PP+cVeS%ir-{t#1mz#aZ
z3+0?7p}LDCN!ZGC%UnGqs!BYNvfAdLz~>~G=jOCA-`l|RbtJ=Td;LMf%d;6?+bQme
ze)}nxCuX%tcivSBhrdZ-KZ>SvlfEBpwiv^_1>5V0gMO<#e4H>>nKYt_&-<je>ULMZ
z&p)cw(jU$mW-$~Ss90Z}*q@T!p^)qRp&>^2Dqv*$yT*o6{6VT#;XwHhcM(nEi8%Pq
z_%Dof2}o8W=1pMEuBG2mK`EpM;HbGSJhAX;z}@<#ut~v=`3Dd3uGadW;b}#ax#MQC
z^<`ju(t7E4{XbgXKn`141TR)R+Hq#bZ`Qg0c>sg|%hpm05+2z8W&xX=u)Q5P04z`U
zb6Yd<=w}&_mWo#KWu}Mx@$w<>?zq;`Po-i{V|hne1+NuVBigIm4zbAH22ITQSO)}_
zU6$|j92OTne^4>K5+5qK7f`O^F6tUJTOL^h+W6=XBoKa_(53%%Kohh6XCBq41u9D%
zvz{=X?_7Xrz`Y7|)R=_J(?WZ~0H{Xi(I_i0kjYAngp-ddjS${;VO1=6%Ct27Db=WZ
zL29NuH5PrZQ_Wi>Hogq_Q88P9+CFViqziR_oiiX!BGXy5u5x6y62yz_96w)w6v<X!
zraMp~Kb(m6O&(uNfiCvm|3~l9OE~|@X4cHCA}r8%9WdXC#?e((Aq8za<D)SZkMk9B
zZJv-jQ4$p%C!QZFVBy(yIq^l`c)1RruDjOQ%6@V_t7KpmBYlK%GLvweP)Z1?m?(k@
z0<6HW-KgwP1;cgLI(EAFO&fvZtE3U!{YfGV41w7NUy4>Irj{v(nOt|~1JnThgG!zt
z_O;J#-95<|MRAXDQ%10jfvCapjt)u{YqkSd*<reYAJMQnwbR^;huR-TS8op@**S!0
zPwEn!FDUVji-0tQjKf<}yyYAZvVGZRfwjIZlh`86g`bNTc>ck-)ZDm#*$xGwM^b@K
zoq}})D?ky!6CU{a;CMU<d)p)GGQTM3)qTAfl+gVy)%I9>#EwI)Xh@$(sR2=jn8xL?
ztY{An1U~Mb`@vY4^pdVoLc})07#ez+0jC0A-FO5^(!R4ma}1LPLyc;yG{jj)q=F1%
zo<{n0h{f2UQ+jGQ+Xa35RhXNs{I_>f;2etORB{Zn7Qh$w74lZc!P!LLG%+~bn*lF;
zd5VG=qZ0RcKE+K4w2j#JbDH$$d&tCdia#sUxn3-`>R;Q(o7Ds=9ihF76?3={S3!>R
znbp6%^OQs*-yIOim$6#j`5WUY{}baQXFKbFBgsc;v4HOtab_5OXlIVO90g{XcJVsO
zPu)lMyPS`x@4zC^LUZW_VkhTI@Fd|BvAQKK{+H3=u0OW1ny14MVFc)#L-(VE=A}jt
zDMPV4m*@Qb(!r@_Mxd>gsAimxmk-WO3HEpwhWU)ttu(QDR>oYj`?{)CBb=%e4(oKH
zZvu`Us25&s2rWkJacmZURxIH71h=@J0ZFGaxB_O_3K*wwh1*#m6AO1=J7T59VUQ8t
zhzTY6<{vs!u2gD$sFp&I*wyFxC>uaj><*FP!A}iioRJFHD(!{z36Pt7>SETo@Q3UL
z-|{@OVaWKunrD~nb^rZT!UzvsD1SRc2v+C03k5NLRk-WC36NWLLzBc)t71UxCYBJa
zap0FSV;=pE>KAMfW2uinl^p}eu$;Y2nhkEGE*mUPIpt?TK$>i{9xN<QJSh%hQF!ey
zj@NP)ymNAc6=kIo%w*?gDCvf4OHJ+tYOp(uV=VFNVhir(`SOvN@NC7<+$f$Zg@p$^
zkCZtwZKkT~Sos{kpHoXM9P<9t+x*h`o}cmzL<u&VT`J*rL%&?OaX<G*ep(&kU)9o6
z03@K8Kqk)UH`4vyAM8tGdG}`h2ej@J8iiCLqzJ|XK6r0pn~Y$(YXvZ6e^7kF$#v5g
zl3DQcuSqD$Q~V16TCjz34#DMlNNl?sTSc*Rmw9Y6)pKROGjG#{At-};;@YoYH2oNY
z)ZlhF)DFKr@vR4z0<)NZ%(zBKRLix$tJm~3mvY45+~brUxb%uUl@zcj-et|wY2j6T
zryvBqF*UA5s)Zv((;nv#2^(;xSb*hc-1%(bOb=$6Irp;f5cUiZ>*}nx6ko(H#!py~
zD<$vQfs5d4)d<2c-9OZ%ynXli#)cN*25|&Pef5@8Z_hehQz(QNwgZ0T&B{h9C4Mf<
z!U{55sJt)g7bUsB)~dE-m^o$RfOTlK-}2ol;)vR8FK9j=*-f;d{I`Ak{}u5iM>8R*
z;JEQZDS-bKBhTFDRoe^9cg&T$J)!p@K!493a@7-+pe6DAuT?;IaFY*bFtrhh7TJU&
zy&Yq?6UAF~f3`wXn$H`b*9)D1Hz(NA7IN|zMAnK?uJa)$goU+5&FkyMnCw*%n2KcA
zg9QsYvG?(_@r2ym*r8@q&tN@bAhC_dlJ{T8I6omUSyc5KO~Rj#y(3FwLbI;)tS$c;
zZ8A~q4Z5&0->Yy|RUdPuS4y14G#78YRL6Guqc*mFoVjKHq+jPpm?zU)M@FeZ9^IeK
z!|L}BrvEZKa&P57D6ly%r2gR62Ts3TUI8ScJ?B1xdJyD%CvUds5A~NvI|k~j>{|WJ
zaK~%l-#@>JYm)WPR93>Ah_1d_F_`x;Gh3$j*k$WN9&0V7?|P4GhR;Jofg#Xf&%pXQ
ziWH?Vv|t)Xyp<1neX+Hkm2t)n9S+TDp4SzYE7Upic_3Y8IORu&aV8mO>`7g$Udc*N
zo}-iElMqXW0Ot~WyHvcO=?WZ{))h(?dmE8!q%^{EKHc}~n<JHS_BQqio!7j%&Hx@@
zsH4nYlE*FyDld{fZdVC~cG+rn@!|2~QQdSv0)M4GrKc9#_OB)xSJ>H4k0p6n8l}4e
z@r24!{S*E+xeI>}tPF}uqgi3Ued6>^z@Y*8bTgH>mt!zNf{6a5(OV2e{1@ei?;$(>
zRM3u&rPqh>FLMkZ6#B8}H@><C7<PPQSJXMEUTpWLcvT+BL%64UKy6~DmvxW)S1r^h
z*Pj()=6AaTG{R**5ks;=F^%|qRL#5bG`YQ*sMC--1aUOpluegXQ}*j%a?HyCOU|vD
zML4{a?AN&>U-KM2=;F>NqdYd}86mp(#$ue?SA&X0vM_Ol1MV#X4$y3VnovkX;8do|
z;#I+TP^flE4j<{YU?`oj&eC(tZ9*|g<8KN=E2Uhp@W(GG)`97Nu<n-Yv^xK_ht%Bd
z-0J=@)Eh1~92LPi5RF2_!c66v>TxHkHbS^-uk^G7hv0fegZ6RoO!&lAA59FHj@Uu&
z`99K;WgxZo@%%@Y>rnIIEPhoZkiA4uXApW_#v7~Nj^$3Ot<X@<?&B_$`Gj09r+3c4
z*vrv9eW6u+ouS~5bAhDe4>XA{58Bj1tW^egFl{1_laThNVQy60DqhzqF;Fqyq|-up
z6h1p{kl5p|qKa=7-9uJGtukIpe_<Q$tH-2Nq?iUT79m(_3*0O)QBO&);g4CzWp_A_
za+n!u)-d0jNgcYoB|hdzqD(MRnz^`!NgLCQ$p15ExTz-nN8`k9i+>0q>s!x`2j1wE
z7fP6^;)#I@N)xh<yvASW$WJUZec3I)uz6Z&8j=?(J}Ef&`!?m)S{B*kPMDwFwoH>Y
z=is)rlH`tVR2<R0JywZZdS$+UDUqZ<>iO{xotI<s$0(}vhYa6=#u!fuQJ}b8Zp?Q%
zFm$imRzX-m)Dy}rae%EdN>`e%dM@XM`5uhnLvI_oP_YIB-t(tS9p!r4$DIH>g3ZD)
zdF~O?HMMuV?;fI9tm=+JsyYrPDe&f+h+tRxMx5d6>zJYTFBp51)An5?S(x5YCsq4I
zGWb|j3O_dKZ6VF@^F5h)r!(e8_Gb+G4=HHn{f`}NPLB^50iMeDT{~cr&$%;|Vy2O+
zE~|vw-#g!Fvoqa(7Eo@2-;;$Q)3lxwkqTLz=Hs*uAei^{ynXwTSNI);g)#StmeV(n
z8woBAUSBEMMJ8@FSFsFts6!7|we4KP)^*AYHts}4#Nt{LHo*#D+T@wHd-Zc4tL%*+
z%?vVg;;iM4mIPodmzkOkd1A%~HQZtzG_}n4M;45WYd55&>a)Lfmu%cSuO`9+J|sYB
zEBli0i98Db#8OI%iLLaU&VP0p@c?irj2#MxXn&qon(pwLqN&(W7FFe!MOm^KB0mNN
zJhT=4oAF04vB~!QlLUIa0h|w*<^bRK1SDJwxR}kK9%f@Zs9{1x`}B=wi>ow+SyM<}
zvYS24^{_p5ow$(bds+>-N^yCt=s&9;>{m4MB%GsSl#{yOv5BJ1Nf7XzDqiA*8svOj
z%r>?Zc*^#5Ce@298a78>^<6SnvX5@4r-S_<s>OBT$lu0<EP5lyOhKEWl!SJ$`PV%K
z?8p`q#ianupUsa=WaRv)=6pir<MdeKSqI4Xb$*b0p?0W#Uh-LSw~tvB{GgW0=O2ZJ
zs{M#(A6-i=3Y9H$P#C1;0O=m94OB{~i>QRfgt?P;X5nPmB!@i<QUYr{{7!4bz?LCl
zW{Af+ejx!8`oE<Qa&MnMRnSyNpYsv)L!sX$B5+b^q&&CO{r>vRY=!ykTn8i(%5&D6
zf*2%Sleu=hue#bCB-Z7m{X)*At4qUL-|0NKH!s!8g&x}@OJdjG>7yCpVuo7O?&3WW
z8sb{>pO2)N+b79Q$I<O)yYKVphXa+9X-2VIi<i;6b&J6=Lab~37Y33|eD?*uHggCp
zlut=hOJNmK&AJg?ODA5I&Cg{2;B^G}LuctkTq8D*fKg!%Og5Skzv9Ds&hCDACtut%
z36Js$qzu};yL+hib^tAxKu@4)FI+I96gj|CQp<KzKF=(+LSf|@G*Pe{gixXrYmm<r
zQ8D+Q@Bmz3uKv=?_}jd_HIRSF5sB?8LgYX-_BrAwxbz1TxjNBTFRT@f<&%mBsU+43
z$CK<$5fRVp6`c9L+La^Y35FJVOAKL{3{<Zeu$}<yZu}BzO=G+yNn0?xHHTz*$9kI%
zx5fr&Z<mY^YVk07--P{X+0+jvt*p)m{QKKNjZ@l`J<h^>8o4XvzxuRD*-Gq8P8twc
z^=WoqR(-rU9=w}kCL@7WV45H13g>eetSTy;a>G~*0u_9+1kwws-mHrQ(ht2}C;s}r
zTO>npWula_+aJRx7&lwXQZ;K!LmuKN8W0u4fp3CqtJtmdCWt92eo!|S8yXxO_n!yA
z^ydKta{D#@p^Wl)g3HvQzsBaW-FWq&#w@ODVAwL1kSFMrtG-J@1lx`6ESG;C$Gk|*
zM{&2UMj1>{$Th4;DU!KbcQDAp9X>)@D1=AbaNE-_i+qeRP?Y~#!H2e~nN}@!A9y5t
zr8B{o+Jm4Pr5=`HqlYuE2?5F<D{yer2G?%OkI^UapVtgeN0Y;C+j+jbzE&P$Dq*v#
zV^yKSE6An#)Uh&`45(rpah8)Wd~(>wSEx6NOIR9z_vy+2x7YiJEi%Mm8+o>1>5@m8
zwC&hLS>M?D(8rn;Tjwn{=7OE_oWqJ!W~2Ch;f1E#k2G<<6mc<)22?{Q{~h(@{&)Dz
zBf;kabHWB*jH?r}T6$?tILbWdKHTywN^w5ZZQqMPU@k5IWP+bVZ!NeQ9Res~OTx<8
zfvEpKs;(-a&UIJfE(>>ecPsAhl;U38-Q5ZlD_&fSyA^keySo>67Jex`d!KV(c;Joj
z{gY%enLM_){JbI9@~QjgAZ3Ef92c~@-9sI_&9+i(v)D1dE*rC+ShLEn_L~u?uDK$p
zsD<&niUd7}5OUq!QdMp|u1O<{5~@5EJ`J{Of}9wv<>II|?k9bBr_y%i$&WdzDLmfw
zMVTa6hAh+q6(CZ8j$>#KIf^3J@_^~e42lFOc1I-zpCd_)PNznjaS!BHUJbh*5TCv?
zAt8@YXM)RvHjFaR!uoe!MXJbN3-}(Qb)^|oxYvHeK1A|1RqI+9``!DF#h>bd=RIp&
z%H6I8{>h#92i`}+BukGM5I*y5p#rv_?_Lzp9uX11-ACo2%>^cY*cq}9Ue2*XOTk=`
zxCCwr?SJCJL-^`M2L)L_iw^KwmW2Xm=IQh^ZjvV1issHCA{uw)h-UI9SUvp4<M-RB
z^v9MXif<Qt>^w*BDfuWA)FNS3AG1u81|xKTOyO)x_L?ADK}Y1t^AfPyMKyfx!GeA;
zMc(?CWtEY<`@DsYlEq6>onm^7Gk^vM@dHg+<#Sl3odKgi3jq!ly)JFJE{!IrgyygP
zlB+iD!x=?uqJ6Rv6qQG`^v5OVeiD^ATQ0&GPB!4xJl+2^4MG3yrMZHie+jBXimeOt
zi{Cpi#BiOjr?MOPE;hvDbSkZ6&7M1HVdT?oSkR`J`j?-WF!n<sl5l~|)4F0_1<Fn5
zEVAllJWHog?=^84tC+L7U3#&J&m})93WVnr<QU%WFTJibGY~^PGQRBo0I^#YcXd;9
z_tFJZ=c5-QCJX3m6{e17FrOLKbK%f6$XePig968zja<+bWoSF$SLhN%fTi{{?i5h0
zEi-EvY~a}XwIDYX2Q`_JP=w0{vxq07d2@<LDgGH8t@n36$%0n{f;XePwdhl(aSRqD
zVT*qNSwF^B+h82pMz8|tubN$!1S}(l_C}|Y*L|FEjeyE3B8RFr`G1FJZ?fR`E_=MU
zB8BpgCgfhj`~GTsS{_UlJ*w_pRmv@Hh7B4)cseQL7m1M8G@VVP?^v+%Myr=#gY&1&
z^~<dh2!rM@-`e<MVon3QdwxVvu$I1pG^jmDc$f9h1_#S*_%P=6Z0!JrwvNT!3@Rdt
z$Io0XTj)7c87JR!qUa1GU{IFew-MY>)~k%*T4;u>_(^l}(K_3eGumG~M2;Z%WC63Q
zAWAl1fHQhytAM_6r5Y~(9LUP%;!b&J$rGul?g$XS1X$4hdQ%~PYjBkBaOy0~$mxsp
zF)N)2@E6geLJEh?VDthGPc8yWPL<$tdEM+}8@S~*pYaUUsK<ZQlzq}SUTr!Lf7Mm^
zhh8=PU+l2+r4je4Hi8o(Q8oSY^z&3reF5`p%V;@F2hBrRIxZ9>+KSFuDnR0SBrscp
zGFTn!W}l;y%oggv6q>t`q(|gcG@|$_)W{U_N4An(ubt!Fp--2`aK=8W2*W`Gi|x$w
zcUOHQx)l0QFn(t6UIn0|?mWRU3i;_|7Hv!YdPD^bdgB1h5p8uYhm|bV#^-TL$exQZ
z8jvORC%J8L4)FX`;$dMygEvDWUkc+sWp_=!29OTpTd46DdjS!WIT}WmuGHgHz)p6?
z2cmnbT7P<{atp?AGvmeT+j?S^QBY5NU8i5^uY4W^^8)Wh=AXXm={*30Y+YAh-m7la
z%TcBxLi3tqlUw$e?Z)~%SaR2!$7hm$1q=3QI2cX7@BQtVeqbhml;nEM*yg*AQ>2)T
z`y^I7lpDxsRH<zcQ{B#XQZG=r$9RX2lY+Gr>C0`;JEF~>+2VZiE0KR;KLlL^ciAK(
z+d<H~pBuBy`9gN9Y51tB@laYb1MKN-Dh#x01$lsmN4i<t4)p@k452~Rt1%cUf;y~W
zj>P5ToMkhWq2OE@39%eRlBT$w+%`0kC%HmrN5gKLMW8}#-$Rh8<QTPBQQa$>D<t75
z*m}#>Ii6bAhPs=Mv}%mdYX-@4Kl>Em2|2b2t-F`w;Xk$WoBR*|H2ls#WrqAsFy1C_
zYHFHXL+PH1kN9O;IiEeS7<HMD`CY?{Q!0EqEaj89g7h(4s_qJB`#g}DN8xh7jS&h-
zDoit|vAe5~VQLw6m`z)8QM&zX{j+VTE2CXc`R@$~hy7bRH|>I;s%g%&IYzJy;q2>Q
zpI#>n4S9^=Sn4Db$02+N^wSEAk<@biW)cjkcP~6v^j@7m2;>qEl*SfpX|W47|K1SU
zR*{Fe@a~I&ws#5$R)#<X^AXrF=ffJVcYVgWUz&W78m?X2KZO`C!e!{s{K8}A)b`V&
zYrkg{ao-Bh6vO<;BSjT`X>8%Hden&<bK3tG>tVW}UEdHIjngvWH3r-Ntm3}!j|{T?
zU6a}|1`J@y%}ybVfbVB%o1kKAMC8{#0eVUBgpQB7ig|k(*zFW;i7b|ki#kH>JFGH@
z7b2P$zMPC`XA%e>;@qGpCN$#5++*i3#c@Yxzl0j2JBpq2yevGmHu6Vl_Rd@YU`C2V
z{k>EWr^Uv&UND&v1_7JKt+W<kKUklB#Cxqh`f+$%yLhAKa>)P#dz8N9;jrp~3V*Qr
z(SRgw0PTmdR`6wh5+nsoM@`Uz!7PpygsN3$lhlBo=Aww2s6&m+SWF(le|wsA&nyXy
z=7_RA%t0g<vCj}w)L)-SUqP!@EguIe(^nvvdi&1JILx3Q!D1I-4ym=rP;T%hNR{Bq
z`Fa1aJnSE`;@?G9TGu}I;<vmzIABC*2q+$9fV}F}DTv8pWGD$YIDA3>UR$O)*BE4F
zuCRazA4&;Acf#l(od(L<U_tE<Zz*qLgIg-CTn&i`y4W$hK+!U=ps<{{Qaup(LmjPi
zBI~1x^hYK`W~El-z`D{Fs#(A@<e_kp0d8!%->*Edh^O*_z?QpgKr16BI4n`{y}Oy9
zIQ=|jx7GJh*}8jCClJ&4!J4_H*;^WlpiUhN6*<ri9Tsn9m3jAQ3`ma<jueOJ6a`Y|
z^@bFhsqiYnHxK%xPZEz;m>O)9H$X5ZWK*<J)1Dvxdy#`C0ITUV%>sJG3pt#9zXmtL
z_X_k6qB?#%f47=Y?EBlfM?Si-`g8=?|Ma@@HoHcbdShb1S>}bx(sTI_D)TBZ;(nSQ
z-x(u9xb~aTx7U6MmIsypRFeVtxw>G`wCu%hL~B2~9TyI9442Do%Pb!ZJf+BH0f&4(
zy*0c=*=puM)KRTbPsl5^Kf@YwfMb67b_OL$1nO!sDU?RZUTLPkPmiFLN%es0&Ab$a
z<3q1WxF=!%%RB{YB!5I2ZY?RdxeEw6=kNYZkN#1lGt6IwB>6)RN08|0-dQNPc0~Z6
z{=;-?H`qY9gIViM3Z$TVXRYOC9Faf~H@Y3|JfO8FzA#KczZui%WJj3@*C%B+9hh--
z0c&eX9U91UvGzP0Bk-1H|03-U<=;<7(aiWAYj%t;Mwu!VS{d9_2G+Kfik0)_E(Ck0
zJ@5lXoTyb=ta0|c>_kE9pZ$ifs6o$avGGjs1^pdch_sca&Lrut!emT{VR{1KPp2oD
zU0v)PyaP07FV$z=4`eSK>wNAG4RP*XbU&xUV<&EmolDspP}^zGRw|<>eOM$Z3+w5g
zGefWeRycgObguV~+L%lLNV4`4MNXM>o{!fE7%cOJ9<V8wC|<123;AMM<c(>3ZsyC4
z0>-Ep_S*W2x~y&J(UmrZ*VThNISDWtNH;U%eR5MVcvN4WpJvB^5&L?D48LUX^+yE`
zQm#C9RubpuR6=&5;AY}EUOq`?x`iI98Xut8e**Kit`z*<*6?M}{U!XxPS-J--OOGs
zt9Dz`{RwFxh5Fd(aOsBDNr}(3PxB?ngz7=$CUx?$(IoPynYI<I=jE>aUTY7nmmypy
zwU0Rlbf?4>Ln~Mx1LV=bB)+d=U&n0Y;lPx!TQRs|7jLvScODtppI%n@^fifIC!q(6
zuGn&*hw>i%*jpggZQpszgr{EGQ?5D5kJZaQ4WWU&5f^Mfn7uYixM9PA=LoX~SUyY4
z_L(ZvZYZlmK-n@Qag#G?xQHT<`RGPav^vcU<fBy_UzV-}0&aZ)#TG+KBHCV!H{}%i
z^%aW7FQeE+z@A)*um_#-z?lXUYiOtU%r=T#X6ws8{MTDVLjOht<4JJiPfT`-cE0Pw
zIjE_k5JG`s)rtPV&n>6R4V5`8GiDsqMte&_YR7t%qfqg8c{X^Opif#lYg=Zx$o*MB
z!c@o!6OfupT0#dwqv{|B`ALso#0EEwjc+U}dE<`E6mE8P50QjmMV^eVcFdIh1gHrd
z_2%bCtwQ|F((DTTC^V=-aI8SZsyyGT-wBwcBgPIABfj4&GC#{20`9DSAv7$=nLhYT
zn#<;`ez2waRD~b_&0Dq|isg4Iu>XS4t<O9U;Pg?kL5lh5+q#(!KMdOgch#JwK=u2Z
z?XIEFs(ax@!oGXSpuQRJe4(%=3d0p#&zE}EAt~Op&9t!p;RN^omMN;$bcBX~0_APe
ze%%as`Fz@dtoe3x^oeVQL_mCncEu~lBO3(fLiGA;N$ty0Sn|c{gfE98^I#sbj>IRx
zGUO8Bi8eNfx1_iKK7<q-sRkkK#{T44mU&=G7oK<K>q^5w<kIPWpO>Ho96(dd;KzJ5
zH(@S5CiC)1%{lExq*O6ZKd5w`sN79!7?{Ik|C<#4C$_9F&6dDSm*KoMC{3uggS`;K
zeU&kYt-r%^D7tDuAAdU4=+uN664E|X)}qcM*jb1vui@a}aA}-KXI-`d84I1Hcsj9{
zP+gHG)8jeS!ERj?)3Ak{*;g_0eTDvNSg@1sw>hfr(89=++WEoV8p^+zQusG0(=2~5
zW>9k1ni!_5^+mNp8?H*6fK&5@iyNY!dKqGZyPud1ANzWHeli{4V-?KND+i2rXyVE~
z7$Ls4qWNY-6VXVD*|ORL!m{1H?sI%sNtm!cCarjt2H)Y{C^HKN#?la^iBN+`-<XCn
zW$%DqU570s7CO$(PrnvUI%L&Sk<uWHj4R&Nv3XOEE!3ZZezJ@&;zwh51lST6Dzme4
zEV+csna#s#r8scv-}vyeQC090ns6HCIh4Q^JCxWQ2)!jGzhRJBK<ClNjd@fnIoftL
zpnW$?aGb2Ez6N1(5_eYXOTfQa`j1@`+}{F)D9Fyo;#DfAEe(RTuS4APm9}$i+%?$W
zb-L^Rj`IZurkk=^SG$O$6A_FAx2JxPaRNdPtD20H3w~rl1g_px!JbX%NsdIPJYwL5
z;41`JDqd>`KX{jQFY(y!$iqS(;-{Qp+A^Y|ZvzwRK_Ivo>_&Hs6MgCvM$JN%aZ|OJ
zI3K{vphC}4&F8+{vcD#1>O(jI=|$XKdFLkZS<0v?kGFtOsjT+F%5X&3&e^J)m9z3H
zo?&Ltg#lIjKu;xeJ3Yl5LQ{oFwMk0q{-jl0Y{(=zn7Pm(r?Ainsk@D@+JtsF8lZ@n
zl%M|PykI;)|J&q_<2-H+lVlFmQ&tSPNC!;FL)MC*y!Ln#Ps+{f<(14U(|8rA9w(x|
z4p+mHEEH9DA%b8#afr!%anr7a-eL5i;hiuR5Tao0;5f=^uH}!{c1&!UqJUf>je2w&
zG?@_JWK7d`fk(gY<ONJQp)_&42!jF_yt55hr9kmpxSCv@*@cLN$I262b+8+!Y<(pS
zy>Yx=b62f%NFuzTq5zxXMZ~s!=E{d@Nv>hP`-rLn??jOYh!$~Hs5fet`Zuk*Vvwb3
zCAnytei6%KueDdY^!*BQ14Ilc)e;a@4n6?A3AV8dQsGT|kt<Ce&;Qu|{7tD`qkk)P
zu>U**g6FCIqNlK}$`Lv!qx^`oDrB1}4(D<sH*DzqU)4}x4<n<eMt(E%shNb^lgGTn
z+bj@s2rwU?*@vSs9$-K_&Yl|9)@BU3j)t1UU-!eJL9=R+)fnbV0F3fwvkjkgbLdyX
zS&9p=%ldkhFYd#5BrZDSS(HM~dNNLJ@yxYay4N|LJM@K#K;R}V@a%(RmN4uwEK(Jt
zp!P-gTU+di3zetE0xnyJEJneIp|6a56m*)xqJ3rnu7n@60pCP6w)LWBturW6jvvY}
z_HZ*Ju~Xnp+wi3s*~^guSuz5(&Xfiw_b*wUb$NX4|B&N@@ImjXLZ{zU#^g_6o~~Cq
zoSyd^#Bf~~%JEyC#*?k_cpnRJz{FJOL)MK4uFb7^TswtotxN8hAvD+z%$k-PFwjKI
zD=wB*G(wFb^G%TKQ80|HTykF%bXq{(4l#rVXf8>#x}C%|37x#=J8URD=#j4hmM~bs
zu}zFp9`2Z723K(O9w(X!o~f+@>eoqCTze$(ikoCt#n*dJXywgTrxZ=uVom7}=DpRe
zbuDtk+IEp`<hRqxxBHDT3V94G9(6udwHFBr#egyUso&$xBhe?^4_h+dcTQ(BpOtH(
zu-8)gFH)R+?~K6kgXR}#0jOGth@Cef2Gu7^B;BJd;+a&4CQ=FJ|98bb^6wrb)}lG#
z9|m3E!#dCrE{`-8j9*+DT~n1<-eD~ULFw1J_%J$P@9t3>EfkH;XV?~B2}?Or$<jW`
zUmBO_p~7wD`K04w?Z!`3L*knx^G-FiyN>W=A(?DIqLtfmwKF=zCG8e%_)R_g0)dz;
zD8p+)TI}04F^I+peDU|NP=a-`K0nTwFl_%KP~1{BqMHF`q!BbFEMtI<og|!F;xMEs
z>AuLYXM;MN_V6#rpkQeNuhuuAEuKmi9<CsS95#z<2utvW9{7+kK7FRRy6u&NuL6}h
zwJv!eG8Ws%omhUhkbZxKtApTGd;6g&7Vlq=0+PGBnP<b>>wf==#bdER-#s1}YcGI*
z%sY0-ocuD;xn9k#wU(i~R61b{NRZOXX?EIRa?h!bWDC6pMnJA&L<Yi)_@B<&wx|wj
zZ4H!w1o5@IcJq#kq6Hzka|Z6_Ea|lb#s0z~#6evgMMto$#)=VR+K}oAHIXZ)DE<B=
z#L@F|6M-8dyq=t8AGq@m=1F{yJTu!QvAXSfgF7p=XG;s}=!m`VL=m#N=VHuU>uO41
zyT77n&dGe|c|l)^jN775*j5Ig2tB)<ugUE9$?{?+cOT_u6`BI(>=HT~pPTs5h|j^`
zHzX;tn`AeWd}Yz10)@k_`#sM86{$9k8K=pxs2_q8=g0h>YkyPQv(mrSCRW!wYA`x{
z{`0xS#td?`Cx|rfo}ON?g<LnmwM4s3dY-CPw&WYXIvcK}{+@YmpCtn$l?~9ZM=u+Y
zu=u+Ek@QX>`?X?O)Oi(ODV$|gp!~49+G<&gFyv^xarXi>Av7EQ>yI+D9TjUnD99ej
zsIzRnIZkWol8qC$r+baLP&FV$UbpwyzBKiCG2*WfS5+FC6C1c`T$|nWh~yaR$2xPI
z+@zLSVt{eGiHH<cr;Z!<C#&(mypP^YhsQwg!W@tqv$DyrpTR%d>u|0@x!a3!kpMri
z`yrbJ<n16ugo2<rhj;Sr@XbYG-~`~|JLA%j*95rlqn=%-p7hXpjF2Jx6OC5lzkR*<
z@!KrsJscy?yxY^>pBn9?TxY%E9?q8wr6Nhak4^PvPt0pGA2aWC2Axq*W9Y)&)kq(^
zgs~Q(2{{br`s1NOn&ovZDIuiec%miV_S~-0#=03b%yfSpgI~oc8lu=aq+NIKm+gmw
ztz7uz#~24Svk{8BGEiJ8K$SQ^c6=`Vl9ZD@SPqaS%9X<SiP*oL3Xs#*9OYpiu5Xl^
z!M78Lw$Pbaj5S<&HZ+hOIKuMtfC3K^__U}mLzEnSOsxnvrf|>?&ebNilXe?Ij{pTy
z-Vg59h3@4){wsZB+S|W`<EMN4fyjjS)XUfdoA>3z<3DL6xRv^yG<S@1k}>@AOK<jL
zJbgIO3CIU_D2-VpVZMPp2-0UiLA?!ncU-tv;vsEc%O^$mBR{OOMr!S;RbxJ4M)*43
z2z626elxa^_Q1tXnJ1Deteyaq5p%wj!()CgzM~ie(F6vOO7zKAg*1OsrktUo``p<t
zvOnuor$=P(D@q1z2%yNo9P4+0KSxfCc&^EsgI2W{1u@Fuwxh$2EY5r0#wN~ICpq#L
zTASD)TyDU4H0;`2Nt7D}oZ(G;asfPUsKlRvYBBp*W*38w#7(9Y9m&Sjt%Bd?lKNUp
z*|opO{OTn!nBb0C&Gt$kzUm1q#)P38I5=D9_$284&y-PQF!JyIFxEdjkG-7<v4+Y+
z<NBQ2`8dPG;k-^9#B}HVo$1l5Ko}wZgBLDFl0bPPv|SKqY9m)}{0*CKM@ZFiA@qo4
z)m_M4wJ3}MuQuLob-=~O&nJdv+CWE%2Bh=L3TL$@L_0OerXL#xh5*+BPY~11mnJW-
zX0o+2E*9Mw+UR>nP_L1O#QTF>uU^%_)Js14c=QS3o7=3awdk*)wdKr-QUr9^8Vb{5
zRlRvGgPu<ZGFeCDvfmqRKfugOJ*v_sHLcJa8WNrJVxC0K0o5izSY&3m>4)g_-tIWN
zsZc~=+X623Zw~I(|CybT?1(%3i<*2~*Rol3E!Wdh*$kgOPs5^DSBalW3(Qk(tUm^4
zKA2lC#EcF%eG?@ARTe5@4fDO>uy(?pKoS#1^P{S>tFh2xMn*;$vA&qPk~;sF=ii>K
zjk^wZBsIJvnMFe1yB`>9L~+plu)YbS1(o9=eDHi~0iq!t_C5LEcV>&2-|tQ~DP`S>
zOjX9%7ZZszY9hkUTA2@iwzoQ>j_#N!Yi}%u9<{I;NW7}XTjxu^z^na~5_MbFVBDl`
zgl}$r9^pc%@M5dWOd+;%;j1<*fh4)vvR>cQoc3u;PcxDS<K{>3mCwm%j(&5e)6A!H
z@W18MTb|TIe>YIsAzj|4``c3NybyGifx__&shTuAIgNVk`@ofLdlC`>5-;-z^f%Te
zp+HK9EFLS)Q@aa=bta&%Q&lVpTe1O)gg(JGFfh9d6~Wxc#vj9H`_6bT#dKIDm`A<q
zC>YOh6F@;V9s}SqOl3NGM>YHhK(1?wcPe#f5g<_CF7PaAMoXVF%`Htn`I_qumLCVw
zybL=*N(-3SFhle<CG$OU%dNOE**x`_Z*&9W6GWAj?s$Hg9S%@8U2Lh1;ZKYNZ_ID}
zfI25-*GaE*Gghy|1!1-l&5(_`xh#<p1#S2!+siAc9fr}G+~IkYqx1jr!(S`WXpf~N
zhCgV4e^rqDwmE1f0<}U9=?>V6nSR=SeJNDZpV`hGH2eN>e};5!9O=S11(BF65FNY|
zQ(rdA5T@#!k$6c|9J-5@lkU=Hb&(&pBkxn+0pMAx4IusWQM4+<)3I3j;cf;vk=FlW
z_sx-B2&;WlMA`=V6a3G)qr0RApACVc2i3YD&xSAfFZ1a}!jNcU6%FZed6>kp;eE?f
ze1)VVkc%~VU^NBkb8Y(i-xycEZ&rg@q`>5X$R)?{WEOZ5;QKn6mC1^h1c}BZ___H>
zjfIV+O7(<v<Clzku^5j?eg6excJk}!>|g%wlJsv!NwSP)O7vbivFbmqyyU1d6Yc+0
z)SSe0@tK%99w(YrVlK^<ew)gyxmt9buzo_<RMu=@=Qa?$iFLIb5}E09*d(&*z;Mlt
z0hUMgOr#K-mtYT_Gqm9191b&H-QNUO9Np=(d|XJ(<b82@sh|Wq6BR``J*n8eqK>#(
zEK%!fT^BvpIAv<NeCG01tR_5dQC}U7iH1Ob=sVBRSVY7jPN1{CSM2Gx9!$FcJBD#d
zS6@PzoMJLf8O(!X<s2uB9iTP0u=s$o0Ru&oiaS()Es)Sa`V<c-Hs{6M{Vk?FA?v8;
zDZ~G0c*;M7m-qSH%kE#7(SKsV@-9ce4_~+kf=L^CqlAbajIYk!072j{1YH}nSHFG@
zg#c#*IfWg+EwRXkyVj^2+QkhlPxNZQ7X;B2@x#^KNKp|xsV)N2Q$$~(Kz%f}X&Jb<
zjMG9ARFub_ThL|vJl&k?-(cmS<6pGl7VrVW4yzXVrJ7l8#*el2VY%{V-G|_J2_KP)
z>vGGs2-E8L{rMLSHf94?(58xruTmr0e3fbk^$El3ko|>#AdmF4ZqHU^me55Jd_U&)
zBX(3N{JxFhnGU=tvJl^N#_7muD&Q@!sQ>JRXd3QwT{{`P=I!6C|K3rx8vM<I;ryn5
z2}-iJhfnUtBOAWOh<Q3P0`Xb$vTITp?)S!|bF4@koGC6d;Nprq&{QQBHN1?JDh2D-
zbE1&oV>LVZ$T|g{$aQI$aov?NEb*3B3U&Y4TLAb4d?KWUlvdiwRj{6yM5>UsL3XC^
z&Inb=O{=WI#f`02Jt>0}bmpHjXzp?@)ctsjHfa_S)xUK;w8|fIw{)qE=$gBsL7Flg
z44}-2`%V;U(y2yjd{OKH#Nt5auhALzPHK(Hu{@4!qjnDFaI~M(m}j`DMoA+@VY$nj
z@#22Qh~Z_XffZm(6;@NMX?vC;eEnbS`)fwY)64k}3%Lr5va*MC3Yc-L)=AsY>&R`e
zTjq2f4LT*DSv1Q5+N#rT-=rz%k%lgS5(N5SoRy~Wi7O8JXUhlcBS2BywDdt;mYJqv
zfb8|YwkIi84%?yxC9ST-Uh1i%sF!X%sgX{DM@goEAmSYu*ZM5dtPcS>Kv%hkX<P}3
zbd^rYFs%o+IRlI#3>c$1EX+S`f9JQ!<P%`_bAOy(n%aX4cA<|sjU?+4fqBr>|C~YP
zhDtw<McEuJ0r~MoKxK5So7~@LMpe?l=i%xWcRC<GRisk`)iiC6ts)tLCCpp*?Crb%
z;|lR!23_VhGyI{DK>tyb;6C(?2iQ~7R0aBfsPBJX(-d0oJxu+LiJ_vwHM3h3>tVtd
zE`-p#E)M}Qf3;qex=IYGt5j3Zv6mx6pX2JuQD0DHL=?|^q#RYzeVu|fuWXkU!vq4}
z_oJLS%LkQtM^np6P!VlJvUP2m!k%#29bnvNbnat1sedT^=If0IGmcyB(R}fwu*?1B
z>MZV5-^r4^&j$bXLwtJj&zN<QK`xFeHl37VrwdgEGTRR{o*jGsh>X(Tkw?jh=N_y)
z{F-OdghA!$%NfU%8@~CtBfzl`^cy7|T|IfE&9_EtcuRnvpVExM);*qk3I3N)6YoKQ
zcnbs4I|#msCl;{uF~<b}C1l<NE#Ho+p^CU0S0fCCMnr@Vbsh9Rt>f_f1+@_`qpsYi
z2eymorzt>p<w3|Sr*(+#gtpsT?=r$2HY9#1VER>kdU-bzY=6i86*-Nl{!6T1B%p##
z-2b*11y-2PH!#9Z2}oV;y?*1HAiaSKr#;FhDikpn0S|V#BUM#?1&e{Hy}_awU|M>=
zV2T-GUiABDP~536YB7^l(8iOT4Y~7KX$u*wL8}6v2Q+J!+rPl*Otyr&l4EU_8{|Sf
zQODoVJXTL{+4J0r^oTr4k%_1f{%z^29=H?sKhU517y5_pU&F`WJA~L6(1`P9Di3*M
zTavV_7+UN!ic?#tZvh(kk+JovyOP@h-KTrvEeIqy%ONQ_H<Lr0rJwbgn><#(f@)tI
zj?ydD>2+Z4<7lwZ9HWfYG@i%|d6)P%9h-u-mc>;Q_i6^z<fdv7Lg;rCX_-nmXOvU(
zhoynjExBOKW3cgs2T0jX#o$qs)-^7xybScaWF^p8(~ZO=-+0jEwtnV?@_9%HPC~Hw
zPW--V3N~iziq8--^ff%SFOwCl88gJ`2&nGdhaT|B(KD%?n1haD;{81@A^76E$wG?t
z8o9_kIG1fI@7IAo*2zt!+~oNf$M>=c{oj_r{2dHyswVl~$!5OxYsc_=(egEw^Xu`^
zt<u~a;vo%~Di^HRR%B0Km|j(E&T$3*J&-c8Jh_JD@o$YdTS-R6O*mbo0s+S8u05Sw
z!YR*q*!UaMD`n;e&i1N(PiL{qo{6Ky>=(_y+lXT&4<9KD!=j@D9ZD`7MuaeaJ=>{G
z%6^LvbmAa#haCX{(40mteJzCGZPKS|Jlq)v+Hoct$qcSO3aD$=pMZZ8TH!42_cs;b
z<}^@S7UM!qu<z<6R%)MVF<~D>LOQ!&8k8N_OQ<o;A4^^DJjTM3a3rCI{07-yTmWny
zmwbJA?}^{LLIK3Te|q;e{Ch(f(tcTk|KoRH&F+GDTL`K4X>;c(DH+UJ^^p$pVb@(b
z5f*dDcYjbJa(R%+q!4M4-798r=dyw5+{ziwY>gChwN8UrC>XoPr15~Ci8&1}B8EDL
zQW(37C9^>nLdJ}djEHG=*l?X1vHMH1bE-6~ZV?L%9}?pOiJstj<^ZY6Mgo|t%Dws(
zSRAcuJ%)_kJTQlbloL^^lWm)y_iH|kE;#tIW)3H;0$u5cB~2j)2?KmAcqBkVJilTm
z8>2kjMOR3G>#`Eg>}xNNE%3cb(1Yt?&yF_l*8b%Ycc%Z^n!?`#W&VWV(xK|Jq}#FY
ztyMeODi^_bbVGhdEqS*y-bG{R4(lr|_EtZuOZ&P{(aKeGF{$`KLIVT?nJRRz(gWLa
z{sSu(iZT+@<DliDQh;`gR7Lg*5$r+5Z3XO}Rrj-sXrE#RHfcM-%oIB^wl(f}9!h=+
zbW$Fq!HSJ)OYfNLFk!VmxM&}WmNlNb(fMOj%PWK=jEUUO@I^AT(2Z;)*WDN|ZT#h&
zVg4RPlxs;Teu*su>!l^JZ=kpz=;5zFxSIs}d8Wq8cOjxd8w;U{%+QSMOsgsP>&28#
zc-~5!82bu5w7LBU_1`2w?0;qU-LC(zA#aGMJp#_S)Ds6*+o?%UxCk~juXUT{=qx<9
zINX@=au0tb$1tUGK0o!O`qD@!2NLn-RPYKV3A%Gb2D;E~Uj=(weD{-9C0cEv7WshE
z9OMTj7-C0vJI>3N212mm=<RMi2vgvPI!lb*n4v5lc@|)P>Bh=em;#=}G#`-H%-si|
z0}^_S9`&|%pB)#{h7OKtHuuLI9~SE$2^lXA&uW$T)i4ghVn`MObTpKa-!dN{&{+uO
z!F)%J88vKFvB*L~!((u0M-K6mxjhlC^!Sr<QkC|aVnzU^sp3;GhAvMrFE_mZZ~mwl
zwEXA8cjo+OvUIwR!UKRE@7~dz;X?(?hKODfk>=2cWf!x(9f8%*eG0}C&7Yr~Lw~5P
zy`cu7lkms<o(&WX(Z4#|XQIL(ZTr+_>j92}>3Rj<-x7JK{Z-h$b^kTya26Yt_MtsQ
z*TB=j>Zv-lbAvEio^0>QrkpT*SWnUAH(8Brlh7JzQ&q9A_^N*P=YgMHP2yTaX;wM-
z3;+Tm{C$6`in`+JOw!kYy({5>RT<0(j_II*z<D3tEv+G!To(q*uP6ES$ab%TRW-t<
zQAV!J+<ILQQ4q$c7%DRKR+s|-<6j=(>&bFp_B$e)#L(OPjW_3R?%x0UrYR!7%jjwh
z{xfMHO7*fOKHr9;cU=g(jHY=Z0Fa2H-&u+FC9l-^5G#$bR?89vzbLa1fYAWVT4=`f
zC3;p2NF0xRg9H70kt~07QAI%y&?zGehTU!M%qrJqiWa9Gk<O31vt4x_2vCYnU~cS2
zoFb9+TD=(-qyHFnw7vC}^%CT7QuV!7mWQFp5rLwvCh}dAj9c&X_<kDHXU1an80{tK
zNwQz==4QCI&*!p9Fp!u^prSP2qeng@seR;FJYZMXthF@VAh4w4fd^E$wg%(J%&LT+
zOFZ80G*QlE8|lnj_xiWdk5z<!mz|@(S&uL9OT9y$zb^Xr=;2pg)jITywkXaJ=ht-;
zF8pAnw7}LIGPnp0JDQC*m;K}$Lm+WfTD_pk!?>;K9O%Ko8Pfo3Lc2XB{bN=t=IKGA
z6q;@F>hHs?2O2q$7rZ0)wwp)v>Q(n@*(NF&L>s)>>j2)FM-EZ6FVrym15PnGV2+;0
zBB{r>2OV>mc>x2E-OU>l-rxdohk!`W5|9vXrOLZo2szMDM^9Y%4Kr9~*PARY&6KeC
zy>-?-{48`~edi3eH~v1B_S);wus<C21{ky^xunqQS6ofhw@Ha<zW-~PXlR?Lo#`I{
z7%YN(*O;p?6Y9SwI{M>Crmw40-{F5aHMYo?&j{`EMaKOkIJH!yxXwM~7Hp)Ae>1q8
zIIzOnV>^3YGKJZ~deAXi5aavWsz%n!P21%*DOezXEn~i@!YC@s2p<1gF05&z9Po|P
z@R=Nl?|h5#`@szD(E$+K2ZG9@!;K^?Yobod#cW4?u!>1~sam9G73BF_;>)k3%V*F2
z`Bw0a-}ah({SLnEob;#;Ph!RJk`#4ocO8c1pBum#UNF#)Y+k0*;_?Wdl{rth<+9wA
zg#3)coKRjsn9+dEDCXRqDM{NX^hd^~VFh&ZP65eY*OjS0|4vVe;NQ7%xZB{rJ<oR4
zQONfK8sfTRl9f{2@LtT8`@D)*YdGgw7S(h7dFw?V8`F<~3d?g}pChm$esMKhTo;|J
z=k&Uhs(vzDl_Dm@>x>m6mkl=sZSOO%Hlc6SsC2I8nuH+-Z-auUfj%3oU*q!%wb9?9
zO=F13?^s}w77<|=6!Y)ST)}CIUt6llJN7N5dV1nu`(&-u9J-zc#Wq^@-{y8+s~2A1
zO%nmH7=(DCv;2hFn^s)H1}g?N(vM%0+^AW_g}%@2lg`QbRPucj@sn5#z#m_gUUDF_
zQ0ufZWUM-dA6Q&8=3pp<seIkYYG?fK{~z{m0QUcK!j~-WySvZE={$mc&$?>$sSpOV
zUm4Gfe$sp{@<lOJHK~VR4L!%}_Rh1;!a7*aeR(2PnYtdPg^T<SO)h5QEYKuZx==~v
zvw;II<Uihw`erjvaf|QcLb8Bf=acNMoTLkcRu#!gW`^#>uxK-XY?0h7aCHiQ4FubT
zfr?SxUpilm;AudgESHG?e(Mx%)SO+#Xn}ry7PyC6+;Uo9RtcU58L@4id%mv$MW+dU
zNGSJdW!$x(cPFKwTBJo;-2UWf^En0js2`Tj`0&nH&oru#<;&62=GztJDE{eQiw3`V
z2ge=n)BSBuzRRmN7vSZPJ`i%UBUaKe-Q#la@j}FwNFeE?>&fZ)d8PCICGqv&m2?4;
z_u(teUo)CZ*pwm5!ahY3M@gqJH<<SQGDs@^Ic=NO-^cSVoanhVL-9Eq`QzLY21)o}
zhs8R0A`OWNS0uz<(1H3-DG&kZrwvgB`dVD(r7K`voNn3hI@9Nr=6HA044^cCnDaT$
zwTfg{yr3@E3#U{DF&k#1^!yQ3Jj}ZItCa7DKJA~sNRuN{FYSx#5Qn*HT~A_ZV6lp&
zSC;Y2UXf-$+A9_nneY!<SoSDsM(+-0mnsQXW@sgWU6>(}#hZFgz_1U@)Z&DHbP^BE
z8_uKC#5<m&cQNCFK5)g&a%>ln1E-J;VnWUsz&6Kg!V2*t@!tIO8oW{4gU02YI&HBN
zn~vuN)FAA*53oii{PHH`A#A&Ew<Z#Zr<$K9eBKE<vWnU5A!_||k>*b|B{E3yUQntS
z{O1#k!y7Slb62GnrL0@wITi6T4{CA}#E?pb9&hX~lK`=poL#n@3no#sBX!4oUK_^@
zg}@r+`03E>nz$p|@;$^J*ElXEMecWuaVG5txCb{yvw-$f)KB6LypT8PV7f(!`;-!7
zu{YT<J5R^`s<=*IaBfkokdKy_2Z7EQXGhA&22es)A|G$XhivaW$I1InX37R?`Oj=C
z_Ykm)3P4Tt{f2AO0{Kd2+cS~nh{+mem8u964Y0e7*w0foSWc`qX58+r)VnVVEc%we
zpMBDPTq`0XQPOL~-Y!34a;tbvkE!OS18zSmT~QGBTtfwe=BmbgOmR3Jx32iYN}>cU
z2lI@LkRIe{(9`Pi(@*l$?@Bgrg=RVOJ|$?iFm5CL*T&O5aP)5X;!S04^-l~1THeR~
z<O>xI7k)shKT(z3PkbbyErbaNbAmgr!0K196rJQ=tVL@YI&FzHlfDKyrf?-ehw#FR
zn5^G0qQ^yRt-<;N)wY0nBK^h~Q1<^|%#Arq^%bZLL$GY$_P({DLCJDX1MHBu8+Q<m
z`jfKCT(~Q8xJ94U%g-Hy$zO3y|H$fgWSC(<Z<FI-iaH==5l%{T)5UMFZmxqKM;iiq
zZzG7^10q?#zVbLbcq;H-r*_vzBzbZ7tTkv7YASyv0i1UK*lsx#ej)r=r;eW)$pe<?
z?k6TUH-a(QS5_K!*S!Ex^?dyBawNE1el*V8V%W(ByD{R~!8#wGaF3x;dfynHbn_dB
zvJAp%_TFEE%W=UL>5CiOKCeLQxHt4LFYD{BljrZ~)~74|bv$5qmWRCkvkh|QU=UGj
zv!5^UnQM3RZhfg1i`nU)g2$Wlz5JExK7M!l9~kJfPc_n|?!W)dn-oS_`q|9yAhoK+
zheyBw?#fp#5QlOuc?BZ_G+>ZPypJ(7=tmuFNgT<Eh&tE;Jp;AQ_gR7ZEN}zp?y8TQ
z4<qGA*dt1XXI@RJ)(l{FpyPE}>qBB3M8W0jr7tUP@kDr#5<c|bB?81x646~&<#H&)
zS{^0IQcKp6`n8uww%O`nmoDh*#8q4lvGaOioC}A?t-&eV^H#IWD(2%>vrXBmeh-Bo
z<55C8rCIUjUHz;<^6Dp#7=OZEj@jk@4tc8Umw9{EqTE;ZSxiaTPVTngygdiV#3H~|
zQRd<l?aa+%B==!?tlJ#_%VL(p{RPGODR8UH>aZa+$Rcvz3gDLX;XAy58z+{IzUS_^
zH~fQ|$E$uT<8qkd&hxsDuE5jFa*z2rC>!QKUpdj=&m48(Kcj<zyoemhmM`NiN5bRl
zsxbMBoi}b=$Rk-Foe`Nt5{raSvV1x#>=Ep5F?chTH|lX8DID~cvqwrMyvsBi8ia{v
z9XCI`XoK+<GLQ-@FN$BQMmAYB_&$?cd^jL|yVSH!GvTRiY;8Q;DgsSOb1E6(j+g6+
z9{GFDvI?Y&(1)^u%vkFgNO;jV)7O{~VaPdz8m!5Zm@drV((Mdz%Gi!{^~P%T2l9P|
zz;?Tk^DoY+!@}j0E6K;{+h%4K>kVhm+TMJ=r?+V#b9K>fxZ1xV!g|&PG@7<!pDm|T
zU4!=0seXlvI8#NCG0?lp4)_*bhP!u@yZE!gF{;@&32T_ommO@7?^1XQ-62zu$PTHr
zox#_sAuhQTW$)>3-*@xqaeq-`161ItYeeb%?P<2HKgaO_U$ogV{tc+nJ8q&{fBH*A
zyDzlyUcvwPanE8We}hziL4cL594^<T!&yq&ChOnyZDE|V@ffU61>9kdjj(A&H(E4h
zv}hf~wNmyr$kDX0HH$Q#ik0~&jT%9Zbu-{|S<zYrjEQ#V+gUv8G6#7>ZLx<6XMSK(
zIikY!ssR+T%w#w*>1rKFx7FOQ3UsS6!)&*_<5Mnki+ja7b`peuHdvruzC^retmRgC
zb6u38GRFX9=?!k0VmDTHX`A7bV2t)%9?LB~L~NXpse0g^Rrp!zN#}a04w0|laz&-?
zYV*t4Qmw^?9`)WZ+ucp^qJRBD%Yc#d`aD7f><Fr|pg8+_0nCEcmkkHZ(6?)xiS_Xp
zi!W!1)9j+wDe}S(3lxZuCA*VabVW*Q+fiF-P~lFy$?eadn_ribcM=63)4ZSUqK}AP
zy0kBWqsTkY7S!%%UX}kap0R@Xe-U-@ugBPBb+a2Uq_x!m21F8Eb`G|kxEjN<e_m5S
zQZu2hzivW_skpxaC{KvJ9a#+K#FA1kxk@cr9WdMd(+A!3)q#WVLO5*X&`!?}AM-k;
zj<Sj$$@p9SwFpH7Ps_$V2#T*E<xp*r!r!DUP`zVTfa1J1))IC|^X3}rm-445&7Zw7
zTXvWTwShTRS)@OM{TUgI1Eg@7#aPiq;AO-fJWF{W$`hrpIvX^XN!Is>F(Ki8YjfZT
z?FChg(@}4v)~rWd7^Fa*{`xkM`dJ9Wk$$Ilml{E0&q~XQ;Lt)LZT3aH>zHjlnR&TM
z`R&NyR94G<!Z8kF5>L3jLx>5zIj6m-gg|2Yv<@2QR|woI|3yAh0q^kw0iuB_>&N7;
z-E4lpm-XY5eNSaC`vf1$f84!v04Htfxy@+Y&)oEr=}c+<GeC~b`g^C0mHSL%=iQNi
zkV;~?NOcSc8Pxf8lOheLGs)F>{=+Q_*h7*^UXDR(%@#9<dBhiz6+7aD@pv}Q5bSLY
zh;lG;xU9*-x;&6Vql$_4RR1c$rFI4y*9U&AOa}u?tv%x5qbSj3Z<$$Mvoce2LUW4?
zNY#~~5E7B!U$?J@j4{0>WDXzeAlYH(WWqIRInGm5)e1zzp%697!iR6#331_{w3ygD
z<(-63S|JgkKWa!Q^GYBtqHcLQC}2myX2xV@GbNS|ye0FM#L^R2ob|Q90q+f&K^L$%
ziwtD<V=x|&OVVg5E8ez|@PR|VEX!A;HYhE_4WBl`#s^L6SWc7Lp8^naT#F%H)Q8?#
z`>I_ZtBGb~UoD3o41_c~=C^T-_{T>`^?_sayYTDJKfRwTecjGpg4X?137_8H>#g8(
z03YzVac2_mUy43fk?6foJ+@Z-kERJn)j(W%MM=mFO(^0bh-T$vmZ8@}QJU~;>fq#<
z?>vUCf!HEvh}glvGQETByw6b)2Pj7rL=x!_LkjJZvz8Y5r1lvT7I|~DsXX~s5CR~#
z>L}*CRsj&VibGzt$C-Wy5y$LTo)jJqQnoOIB#i-MfH#~r8-xZ<)~O@~_DbLW{_a>c
zbw3EllXP;iuyMc+S@&+x7si^^4_{5ESTPSm6tnOcDAA7b=1nkGt?;b!fy+CGzid37
z&MB%-=GgthuT`PP(%F~QPdG#I&EqEboe<GLQ$P>3Mv|Tg#95wo-2E!5uR7`hXXtud
z9-Q}lv!%etN^{thUA_iPLHZ+Vyi^R+PTFRGw@>jFu7#ah>iARgNBrT<j`2ky(-EfE
zmE=1?{reli=6TOQ2;1`}iduU*IU9al_tMQ|7X7yfpnXRIlYz|hzXGXmMtCqD#7q6p
z3yxW&yNt^LGDnga!IMJy_+KV!s>eB9unri4ZBVLfgzsA=n_*gN9sAw8V3dY1RfC0>
zoysi5XV{-Wvq)IEMz3|YZh!S+veZkhJDRhn@Qz+_4NX#O%zM!|D~fi;W!k8SJ7_}A
zBxr6PKYBob50+3+uB^s{G4<+G+GLtO#<r0zmyIJlqS~-w!$bJZ4{VY;naKMa6Ejcy
zk6DA5quYyyogHQgvgNi}j@uF!Si@azkAIV7`n4T)*RSAl0)?h?K)HET6~*;L40bkg
z-*(BO6|n=QjvTOhvyT7+rO9khaJ#NvA?tNUjz}M081ys$Tz4uCC7Y{oL0#Zp!}y#D
z#Lt9Eqj%dwD`65igYD&4Nh%t4V;1Q|fXo?f{-g7;QuEG9@UEow>4a&xwBv>9)(ZJ$
zL*C=eOE8|x?+AMSjd=Obj42ii{Jqt5ea~tl0wl!hnH3@Z4AJO=V2re(3zh>a_mg&5
z0u-)NF+0G_Awf1oDK_vy!i8UsVJs016P^SklYpYPZf6<?`&8g=ob_eY2vddp&Q*8A
zCJ&l~6~gM*!MQsq>?D?-?1_`G?5A3L9P+|UH)E;r1LD}TK%g}Yq&+*bbDlpze(Krg
zrZS30tI$|wm$lT<WY#ZfRpMlGXs@w*%MWfWjrp+^!;H?}YA^XZb?R|FZ|dGmBxVHQ
z{_HpH%Y!c28r{{<P@6P11yY}5w(z#)dv63Nwz-8U{V8IU9^@;bh~qVh)BG5`z^i-%
zdixxLtlJcL?bi$tC-tA1g~S0aCd8MKG5V0vda=0k-j$YxA$6eiuePZ-EKY$2ZP?on
zD;()Kz-TMIvpY*R6sF6maUV^+huh>`t9>%$3ZCyUYY*i_gDvw}`+3Ok9oE~A6@>Tp
zbg`Q59VKEF<xG%M_5y0OH4VZlvF<YFsWr4P%!(FbEEWa|MqAQtgwRkF`|C$p8w!jx
zgF6Hg!s}&X>POg_HQFj|onsl9jdo2nQancOva%^k!5lC~yz25^q>pTY_~2u5NlX@Z
zIaW;Ha+?z#A8no82}>NUA*g?r?mZokA|<Ln*CG!{A{rL)6K{)t1DC0DdB{d7&Ao<^
z-+$;^-MgX=`|;(9@}y;47NJE>Dn${!_Yi#Y@#*oRr{yt=O3`+=)~R~ktn*y!g#Hk_
zl}q4`S-<&MC<V(qnLZOyE->8Hf*{0&8O{Sb!eO?sKMj(tS8vTR4p^mtI&LGEEsaa-
zx%^YEy=%cI%G@D5M;sqV=F^kmkI!@BC0%CM->)(elPz$ZT<!72{c_sRBlVNV{qBw)
z?<DP7na+IABroUeUb`|2HX;TH{wc(q{_f54{v(Q^>PlK?6zX5xGQ$)VR#h|pR-32-
zr3tCjX(i9tU9LZanL0*rWlQ}-qynRQPKoANBwHgvpAAor4FWEw`J<LdzMZ8>3L^Rd
z5-A%3^(dI?%W*$MToSE*sX5#tnz}@pC7e1a3c4&LX{54+6%?dJI6=rEZAf1C&tV{&
z06W}BJPGY%s|7s(TvUiEhBPISVZJD78;-SmQnCSucLg#Fb|h}k?ajCZ^3x){o2`|q
z$Mtz8pQk;t91HQozypY~*5T3&4>S0-kQj(6933MYbb_Z!`}Q`qM4U#FQ?7UG<0Oo&
zbX5wG{=?E&s3hYkGRVCajO~RD3dTLstRrtI?iZH3_~73{6wxNJ>}oLBj7F^tSN>i4
ztLf99E^WuS>#>X+cnMOV-+Y!h#^+CcZm#D21gP{=2ME$@QJ)ToUMgB|wAZoz8Mb91
zyg%8&{=ZEamD&8J(C;aZMDOrd**;ALi9)}VyV5lQ7ankuI$R8;1%{Rs@yjNVBeQ}$
z;`EYLQhs9@uis#NaL-PyDS;p%qq*IL{<vh}d(`oBbx`)fLhSIr4+}DFDv4`8<?#2(
z%?C%q(5n;mUeY+22z`-d{w_Kv9mfr==ciEHO<I?0;Dx*Xd>_EPJg_6!vp{m<hR`Pu
zNrQT%)Un-_E<~;`50|oP=$dPhUBy%AMEX^dXzg1V^68fm2N;<BXX^0S*V!S*o;%_`
z_o$8syd)~Fc~hO9`VdX*4fEi1IJ&d4(KvdepF3;;)36fo`|Cxwr`^17SHJ3rvVU!E
zwACE4oztUbCK@0h#{@~S1%08fq{5{$$`qIF(phx+>TdzVMu7kx*7Tb5azyqp>^8Zf
zm377B{q}zC-edUZ#qN9)eP8)T`77Ybgr~vQasjiRbE&T22?{@IB*|#)YTkh|I-oBG
zej%+X6VV=WPwLPWgYIf1tlTiNK@(M;j6^EKY@`wQ^a3PH2ClTvQkiltQ&vUvHjB2U
zK#R$CgO^)6&A17(N>iXAB7_Fk+;BU!PsI}36!~@7&5P9b*XqwKWySM_cJd0Nw4#tC
zw_=a#Ot|LbrBKOP3A!H(V^cXV^4N;26Y_c6e<Jj?_gmMkgd3M2f2df5;p{RaAQ|&C
zDC&xq1l6THDYNZS4dq76e0+IX?Am###6eEMK<L-bDrPjiPj0Im9r~ci255a<drdcP
zJ`Xp3fw<z3!sf2iCcKpcrTV=nkl*@Rp1F%#%lUy_EZ;%ch>)z}Wkr0hURA#u6*I~2
z(tqHe%Z`Irf9HUI)%6~P2(#x8uQnu81czNvQ|0CJx{(mgs5MYc%ocIJtq0{`-F|V1
z;+RE&@IPx$4(x2<=YAjrmT00_mvci}a(U5zKRY}XX-Tq=&|08WU{WBDNS(gkm~Qu*
z)14g<u}V~LljDiuPXqbF4snAX%TnGU#*y%`J_VK@L-Y3l<MoZPOO4F+D)H85bwm6@
zkl+p0D<=zjBY}ur$(XH`%mNmXPQc{;{>Zn1#@!${{rHnZh`dfY1RC!!;<Lg~m`ejC
zmW2z{uk`?Am)GdN?dOYK^SLP6SRdgPr|cV?Affhw;$cwuT**kqZfJl6B#o%0B;JU0
z{qIhmjCH^2g|4hKzXlqg)y@`6pQznb?e?8v4M#B^Gk5af;OZO`_Be;yr<O_+SAV}s
zg9VNSP7lqyky+?}_frP1HvZW13tVCUwXn&AXLLWM&rL4v61~2fxo>}*cRL6*HQkC1
zn7Ec9Y7o|h$6y!%ncys(My|JMsHCW4c#LLUw9~of)ZK6vo^_<x+g~Y6M*Jp@LkD-r
z^X=n91<D|#u=+5+6@?3pwTnt^k_dZ+&)644M7-cRz*F7|dIrZ8UsQ9azG_1KNG@Oz
z9Vuyoaq6^jdZj82x+=+(uO?!_gCNW=fwm)8Lr~3%M#O!+>deWF6RGuXZhv=`OMh(?
z+yP(A{OO48YBmRG)cG`1qzieK1}ZEfdIt};uGo%SJ|2-+Z5*YwC!KsZ55Y<oo|tiC
zh&j|v()&1xQZ0~giWfctF^Sb14w~?&6$RIPt=zjll%DWqiX8<8`-?LR`3`<)PM0NS
zFmoDT2s72<|1ot{VNq{gpY9mCTN(zCmTn}ayJ2XQ?(POfKuVDA?(QxTkVZO$p@-%}
zJm<XM&HrMax!TX(d#$~G)jf`?LD7EN@lV}By4m`x@%hWl-i40ZD^BVyl+8OQ08mDs
zCEM=@I_<!Kkj}oxA|ecgc<Ob%f^tMkN}+bP)SLBz>dBQOmoom~0)t`EP>QH(LV@@!
zQ6yr?@{A{&&zvov4Nf|8`gwO>z;Lo-&`$Z@4OM~=P8|+@@f7EdDD4AzBPCUtEh!cy
zzmj@~gg${sn6tar$m4>F`iPSZP0?G5gEpJQ6PgmIZujzBPjR>y4Dz+h-G*YHlVe{`
z2>sVjgP8A!UEb?IQM^(*;USHlmf7s$)}u!n5MIMHvZd;2O!mF^M3apBnTBK}<s=Y;
zQ~0(pvKwvi-7ev-tI(C`5*9R~Ck?KtgS^bhZ57jUu61rI-IRdwY2}wQrC-iL{_}kY
z&NPwpQ(PEbV@NJ)cX&D*F^9^Y512-}{}vVsq8C8-t7F5U^2;D~61rR<ZSzoY{=ThQ
zWah>@hY9~!%U7laTvrigJUjHRFTD03|8w#FFIsm%Y1j}^82l`DdOB<y2bWL?Ru{b4
zkTiRTrAfc~89N3q<@Ij)jMc(SqfDigMMm{F$Dop%eBx}LlB!|pYYU<ChmRa$EgOc5
zWZazF!pV9ulwR4+C3){qO_`&L$i*j0A;m-!`iOIjZ`YfTDRPeiz1&%AOy-pwmCns^
z`(xqYwM0blN~;4z-8ACot}~9dTZ-4!n^Yl_;<hy_Iw)QwZJd1j<V*|G@>1YoW6P^`
zcMf%P!rjLS9dsUE4v*hfuTLz>VdkKiL2-ni7X;(Pa_`!B!#M@Xr0Ocq@d>1Tb~*58
zVw0|NtHxZn9KFU)DvKRYlXftMv_A;nZv964eztmj8^Td1h5s~CgbH)q%3-?fe_{5Y
z%Sys7^dHsLkR_@2KSYt;o+V6kQfT%cWi9f$-*Ev;A-muvt_twSpFB^H1<lzqaFi0&
zN*+0tF*mK?GH*oTp_}KjXc|IQWyEM1Awip6;-t!6{~MJzozHQ%&$t}&-84*;bT}ih
zArm4a4UKCJFSS>b?-?mBz7B-U@79oFO^s;qH#V$KLJ5%*%YA4l&yF8-L`eHqYbjYI
zaK!E9jz!dOqfe7HOId@2TWx4-r-CYJ!Qkxb`q6#$I-~7r;z0;D5EAa%AY|d!uzl(w
zDa7p`HSvI~*K8;)Lh!xj+_0?Rg5vm-w!rDa0NzS-Gt`_P*grb)IU8&|{6{U*_1!xK
z*3(t8=b%!(WC#5kpA^ScJHMS%;_G{3j8otFH!d;Fpp&6oI<5iMbBn7~n<|yoPA}C*
z4b2LR_nLl2z9-uMcJDq;e;!2%lYC2Nf7|z61SE4QQ&%xVH3l>>iV-5D-(g`;Z_S{h
zPJy@NM9>A~X{{dU?&9)Hj#fNXxn@Z3hNJ??pPl|29Vn&0Dgqj^W-3N~bT|lP>v*L6
zS!?_a2^h_QVNjp>fL;EDb0w6?!AQhCPT!)7o;{{mUl$KYfyNj%<b_@t3(1MGU7<L+
zTjv_px(&vwe0Z31-`ONB9x3^p&XwcaP`U~v-(>d_@p!6ed&r#}-jr#~o0NXCpHdl%
z*7y{W{SHkU=Bf4I>J&Rn8^|dQn;SUcO2$EmvO#R0*S&RpBVKt@e6lq|n8RdE;n*8c
zky99%E!6*@3RLHU_F%-_(tw-m>~A_53g+>=VPhHZ4+1}(y@wi&@+b>_@}2;#gHkUg
zqY`^}pBVD`xq|DuMLhqP>m!KyGRyNBsHWHYa|a~sis4L78u2g&(H|oKK~RZ+`x@H7
zGI&M|%L7P}rm&fNwSQ0%n_(jnL7%9{@1SqLD)tt&t`K=g;;!!F%n|{WX4(7{mVsD!
z{nue<A};jhL`|hpyH)bmm8ppLjU!oZs}d{%W$2+lbzsMc$Qwl{P>0_f?wkCeHVrF9
zqzU1O7gm}^jA`{v2D4u~QPkl5Sgj!j1rBj+zt>>pY%wTqJKyp3#2$cVMo9J`u*=(I
z^E$zuSE<sPxn0gS5_ywbH@!h&YYY@1_%V4@_Zz3<ShaibuD*X_)upcTRQv{;yvMzQ
zQNO#lk8*p3z=K@323LDv&-Q?_q^3a%e^ZGAbIkGX&B<Xd`XOsnyuzql1EHGdHx#N#
zzaL9lM#{v8Xr-6#mt&yAyEVkey;#W09r^qjqJJ@BzCm-w=lxd~wA<55e<y>~uNHv=
z@KNzOl!j7&uX3FpE2rXZAr#hi=z3Z;WY3vggL=bgWfz{zMLQI@zAS0K=1MAFNjg-C
z;OKz>(;2tPh*A|*XNN@f2z+R&YQE}>C_ZZG^5vr3a`0h1r!4tW4t)pwl*BQ}x6Fqn
z?l>n8P3#t+htlBNq4J$|CT3HP`$^ndXHor~i^0hN=$=T(1045!kXH_$I(`6J>SG1s
zO{W%hT#8J?ZJp;ZsmRA@L5MOusTXBLui<U=?>q&iG3e%jtAjiWN?sow_1}8?yT;Og
zEtS-}_PcJ23pb#Nb7i}^Z|{1oY&;T?PkVIpD^)3F&3}?lWi?;B_S}Fsa~SY_IKcKT
z<XXv?beIUY_|RbF{w*i2)qN}WlLo-`)mq~JoTw6ZVg7VK36tzsAv@52TJz@96GyC0
zwSdvd2XM!yIj2IlERhPoNvH7204mWOhiBrBV89>^14Gx(LeZ}bx@HP1KLbvau9twv
zd|Ae6R8@A?I5P*~lxw>sj>f8@Bt41hEe$`$;B;+s{c~f8O77yWaRpf8(E&dj?PmqQ
zhl4vG>~33Tj0z}AEqr9c0IU#DZ+>Nq^ZhlLv~xQ)!nKureMzK)4cy`SJ{6IDf;6Y;
z`goH}8lS;njEcX}ZU2k6gp;R^0yA`7CU!%-6o-r-FC5Z@t)IiV;M6Yd9oV&%F~=1I
zOr0+bn4|*l1@c=wddqN+0X<ftuw*vk#gWJ(<j6?xZJAnI*-tIt`#)CQcC0rB`@?_c
z?tCn*={t1xy8Nq7{BskY3BEwYH)yp&Uetd!qo)$#Zxjcc^mOEV!87#;HGQqX%qjUL
z{PIx#b>n&8sPLk`{=x4ca%XmhQ0;<rOhJ8KU`Tm)|GMVj==G(+dFwIa%s~8axF$9K
z&jhn+4U7+@ZpFU66@HAZ8NbwK5>$x!en|M{A)2wUdNW<mT<-FGQ%_LEqZv9ZK&<ig
z27pwTKIU2qJu=O=*-@laW&%YANdr96-Sd?`j^u{ZKleG1=ZPkx*=H^lQMhxr%ywVi
zPSG}pm;n1dl!{o3`SuN;dc<eu-id1lIJMFCp!!QviuFJ%(&P1Oor?U^nAdkhsi;0r
z+;h+_>`(2#9^nn<F82^>iLC^^D-Sad^y$M8UX`Ek$MbKTU4FaqNo$86D0@9gU_JRw
zm%K(#;5R0sKhTNE0iN{>_Qq?a^a|VC|35I^h5cKh3I7)DEE=$%w&XtG7M`njhykke
z*Gz+3CHU&=d`Se`v{6#<+AfbuSMT%dQU_*Ct|5Rr8|ZcS6NU8D!$)(_@HK^YRInPS
z;wcF+#9P88skaVthjEK4Fj(5NCnGGIu2+;UXO}pRr+{d<T18Uq{C!(Xh+(%=4=&n+
zbc3g8eY&wk+jdeUTt!OlA~d3w5njb>wXxv6w*W`Y@6%xS_oL||K8$0q+fCt&PI}Q(
zoR~4LMH@2ITb!xBqG|pTr@F5e8G^4!KFYjh0msW?Ro<OzujU2EU}Rrx+BLjC#Kf~d
zKR7Bsnm0rz{z1IyW4U2~RUU@I`zoWBmI3MZv@+xI@$l?;9VZ4tIj2N4o#8Ng(q&~r
zFv3{Yt=;H!Un$G)L3#}i4gcQ*=I_ww&tB|!5r_#==rg3;G)Hv18Dk(xbO8j-ct0=;
zOz0Uci3yQ*Hl4&%=jfm;HB0D7Uj<4vC7DW!26w4Eosy{b-=&T?SV>?l8T%;i;Q`3F
zr5*^QqjRyn3hFkfvRjAOx4zXyPiG;EiEUh-@gpx(dcN0u_3MX?)_$X0nSpsq(&x>V
zWXDY~Uz})K(r>z`^CyAKccwrim#B`NRTwEO9ZLarZZ#HZ*x@WzV>QoRddPM=FF4jw
z$x^!Pp=l3?BlO`piN*M%X`?%;_=OdW4fBK^F@9I%M>?3|Q?@Te`T#@|1LG7Q^SQlG
zk>G||?!EDH?y|k}>Wr#{Efr|Z$B~{nR%T6Ce>|W1TY*Z-W7{!Tqf!pcnhsPfV4RAH
zFG(BbCC3DhGwbI0v3-LK?TnV{aSqY11L%0Re_^5B7fsa}k%jlzUsmyMq>ztl-x6SW
z`4yCBqd{Hpq9a+T;Bqkuq!6H61B(=KVz4d(IE~H@@8M0(G-374iQ;_<@n|#Ay&sc(
zx3rM<4oS|2At}6YFnmg9mmhw#HXu$KmVhxAanxXv;TF6BL}QLi8?q+i=$|`w&SAV!
z<|daqoNi23o@_nl$P_&h_Rr8CN*M_>U%3syc2h5jL-azIfQ?#v+y?~<ReVAIHT-#m
zM8xN<um>cWbgy;$W>yA8hyDA}M^k~QAq(Ge6+_u0kv?ZuTlN79?*5MG9Zi_5Nh=Yz
z9=T=YiRut4@w`sU$My;(<^r4y*wT0<bL-k&LJoG48<8e;TXmVuCQ$m}TxF0LeU{0X
zS_6KfsAmSYM|8g6uPd9o&O5Y0B(@rn#+^Z;T>D@(53c{2;bu|%*`h<1xPSS2f<_m;
zgK7cJCO`TgBGVBXSTA1V?w(!;WQBG`A&Z)(_@u(*4QFV&U)bQ>wkr}iO!Fm32TzMe
zocn?8uz!{yi;5vjC#s9x9|d_4ljjwsP$?hKGPbLh7K-|->!!auUYq_vSw*rOi&l}7
zOBmzj9HZbH0tl5Oi7q?_tE^k1EI8=$6$@Kj$bY=w)&oO>DUhc$S~NW`WVgrty^Y94
zN__VN9dk&G<``_AzWE*n?ThE7>b@2bi#q={?!nR6J*afIk${vhayvnT#d6Eej<N;T
z#4vXw7(FKzl%G}|_-f5NnH{nActrIu1pS1l8$j%~PFv0XHXx<AW01NE$ynOk4c)_?
zs;4FH%0u~*?8{EbwL2ORRT~VFIfUCh<*QlErSShx-kOE^clDBvsQ!9JOn!D3VSz~_
zPld&GTXXwGA$9wc2!jZgs{{?2B3}MvG7&l(L`b*;HFa3P4;8A%%;YoY`l-9awt0mY
zpoty}yDOfaj#Dt5ZBCv_eSh<~5V7uRFR#IQD@Vm|Zj5`EUvOFZ44E|bx$AV~o_0kg
zQlU0cnR=j(JZJIwx{7%rSP&ZhE<<qiY)G*jpg?Za0K}Ccek9w>W$px#(5E&sAr8te
zeQvwz_HNv!f7<B~^mO{TxRk*tkTnCCp%Q?NS_f2>dAYrJyvUGovZEy#&<F8@j6|#u
zrt}d}e3{3f2O3cpI5GNX>9@UE2(%CTn`Znr+lsdD*xpI>ut0%Zp3+YB>I`VkJtN16
zsiQ?iZ`pTml|KbW0+|cr#ud3?IAZu_pSWM;>y0f!4{FJ}ec{X-7lf*e|ErUEDcbih
z6dK{&pa0m!O{RZ*Yiw95p7q(bL(RRj(f;SVx!#qIv`fLyo~dX%zL)ZPD4yIMOusRq
zvHL_nU4QDadBi!${8f#Vdn6S0!=~^=3myG(5B|%BBT85N*NZ@#ujUy-*1TqJ3RAe*
zAKT5}-j@y1H5Ga5>Vos?e1#FZqmanN?LIC0>O0UyJlY9%aS>@Fb$&50I=|@?yu63?
ztP4^|oJ)?7`hcN)9)W<{GugT3dl=VtncG@pU#flV%yNX~sqh_*9?0}{AxfMjkySL;
z?%B*D9}rv0)Vl1SzFl)l`lN=1s7Tte>-BqpH1k~5D+n^OxLs56fslRGRJDsx(61V{
znfx_p1Q1+cgtsR$7k8~%#ZJts&6y)A__)N$&?P$O%6c9F2-PS!v4ca$J;6x-%s(^d
zPL#S9KB`PEi2v`<ViNJs3vi2b$gQ62i2~!rlJWEl5z@P~%aut#A;~9%<1mbBJ7-6u
z8jJ{kh7ZI=+a5r#f|N??4y924y3mbHE|H%+3J9jNdFwgZ#bPdah~*TclpOe>j$yL<
zJFpSeg`e3<UisY$74J4MuMTn~qapA?G(Ri-UK+*k#*LCXG%%lMXLoT9s#`;eD(y~<
zD*BxT)m?`9h*mmf&*`_E4~94)uqePf0I|S#x03=Q&8*-KPc3nl_)s1xuL!m@TrP{P
z@E~nFsR-p-aqjR}RAHlHx4yl^3}d@qa}41E=evS+3fR|6wSe_g=$ksRJuQD2{*x2s
zq~W5?kHO3xhGkZl?BI`J|3?8@Lw{|8qct+s!B9}-sqR+qArW>>s886&LrL;Hi=x~K
zxa>7PdT&H!;i-xqSURrI@%X8mqK)z2m(0KC9pK&fx9+5Ot$HTFkfvR3@J4Jfj7W?;
z8ALCs=Ak8W)xhU@Fi`dA5W-8UW}sHD-6KIWpN4LAq%4W!vN{G+M*4c_@S;nWeM&?(
z86YKgi@F1zmS|8dPlmG<ALkk*Sr;-PFQ9N`5(jNKMI=v2;_Y+8+XWxOTrM^GL3HNP
zd%n~4Yc^}jui%z+hkYPhL;k)OUL{PgS6@(t`B@-NxQbo-x5NY@>1s^lS`*FlipqS4
z%T0h0aqms956pu>({;wn8r3!j(Xe~aSv0mv=}&*1<B#4ek2-{5mY0jDN~cg{`8FNc
zKp(XeX@|3uePI^u;Gd+CGe*{TG?4bF6no~E1Rcj(dF_axI>1~*o=b_1xpY8N_64o1
zY@es>9umn=rp5>&8Iz`*7Vg-bY6LM(W`B@`;OYBzy@=vo4tv|*!yarG@A;w{aKhQc
z{XICbvrHCq>yCvnUMcpBe!#*OEHAu<A&vZDMJW4gF<XCRZhIBiS|wprTk>Gl;jPKf
zS8*&SW;o(m{VV;iYw6bGHlDLaP%|E~7^D%_>gDtKowQgTE&Ux1!VPBL4Ag!$*ik$=
zA}&BZJJpNdB!@;*@n`Dcmha~9T7LGGD8F#lSFTUP+E}n9KLv=_7i8b<9J+5mG#(>?
z?5e0W=CjPo2&97-(0lf#HqnIEoLCkI@IYVc8<T$2W&+dPZv-k7p5Xz*>_9PjP}Jxo
zCj8SmL~RrVuqPT5)%o5M!`Nwl-{kkOFdPagysA{85U3U|OoOz1fhzgz-`ZDLK=mq(
z18LIEQ`1_!$l~(*N1L`M@Av;IsuOk*|DfJyM1AC(FR+XgP1~s<N_;DzA(DdTom#x*
z4pbZYn;d`f+lwC;EQ<|*^Kz6vO||91Zc6y?=HwLFoIDblSNHSyj<ON0bfqDg-%L=7
z=eYb(^Bbe1R{K8D;|rv+9fl`#806ir6g#~~88o<vA)7Jbkv(05-)W}R74P{f9V8_?
zV0(TOqRW;Y*OE{<h&9iQpA$kQ28{SQRZqS=>(;+9vqf)t-X+lZYO<}7Hn`8@mbkY^
z$Dp{D%(h`@QWwtB+Ct4PyxFKVqBvO?lv;U=y6^l<=_Cpd8e%<Fn*a7t{*ygbc0T^=
zXlc{>q_@x3&+(H~%*cB60E;N_dp1IuG+Ayj50Mnj1snIOh;s&f=FdBe*oj%&l-M+V
zo#Aqg-_aSCVE;l^FQc0mUiul4S?l7)?-yeuK}&LBM(=d)I#q%zv6vLx%VmXZ%KP{-
zxS~2+JobJmo*@=<2iyd!`6}Pa5*?n`<f2Q~f<x0*cU+&C5GIx1&nRLuin!$lirwfA
z_&8kj82VfiVP7YG6f=%UC{1V{Iq#SIpf6qcv6#V-cfXAcYbuJ1MvO--Pn%Cc7#)qB
zvh=Q-?frDc07{Bm{mP)x?%n&xlPsT;iE?attl>!+`gJImh~{c?$~r^$m2Q!IGb5QG
zVN^U39x;sAS4UB9OK@p?Wo^#dC?Bmos?olcff=3H%tT?|wL2sAC4d5w8KI3{M~JLG
zfq3>!Ti(t|^$xPE_B0aqZ-fDSzMcizC}G5qGxZ#r+?a|hID70`mR*Cnw4eEK==ScQ
z=}$H~N)-3q>HijytsAjFo6TpSO6ISH-ZCNBj}WG#|7w9sFfD&Q9Y)A%j8b%QrvM5N
zSx)W@*cJ<sa3oq9??qLu8gt&r$;c0(Ai^FyzyPr$H3blxjTfm^NuR^SaE46KW!+BU
zxjnX8Q@U!1ykFUNti*IGKpsk$atqg#lN~LTw1*eF)p5Ea^;{bkMu3JaCrx=}Ne$eK
z>h=3TVKJp)RvpC@?lAKa_Pb{C`g>?Sci5W6^yRJR_YRcTSII3gMiZ3~?h;!}gY`Mh
zMiPCm2kNoACGNFGsr4)O8Uuq47uYD9G{<!v5YgzRPNB#sOIW;h0#u;yQ_E%cy|B4z
zgn$eP5Z%mP20zIWPgrc9G-aQ8=rd!MI0wNnVj72xx3iyuGuWj~+OKvzNghIRo7^65
z_F^&rEgD1TFL?h=OtsKoN2z9x)te7~`{IOlo!nDF=?<jQ0qp3qc7Bt$no@pN-UPEb
zZQU4V^VjEo1FEW#66rks$}!G1UeR2Y?3(B^fnB(S7XtB$q5@r9w04L#R48Lug_?<m
zcMx`4bunM7PI@-&R|_hN+Yz~BJ4K&&xMLgUbb_!Lf67dpS|w^>zL~k4SzpyxUmUSD
z=YX0Kx7OPpr&vjZtTh{i>XvRM@<{7fBEo}67>#zZd8){_l+JKh3*W7QT=i3Yv?PJ4
zP)^H<#74Gn6{?M-Ek8Ols-iQva!@4enAwE;UVHDeVXuZnd6m!w64r5@b`pWsbA94j
zu)go%Sk-WS>%VyQaR)WpHUC4M<oKHn*E%JmdhQ4jJzLvxT^4|N<WcaN<qNC-Wm=Q<
z0#|+I_$Rn)84#a^G}Hr|{;e3itToRNp2r))DLA<tbrLT}V-u_UzTdSin{^ZV(NR$+
z-DdAir&w~J3vtu5SPxu)6xT-b4+6_zEZC@`DMOIRP?LnrpwBjIe*5^%#mdhpfqvR?
zgzS__5B1m1;>T0cfdaSM=D#vj#ursv*aHPh>+}Wo&K$HpFA2qp)zOV}Uo%(=>2+tY
zh>))zeO*q5_&Lb~8K)#d*qB>T?pbR^v3v^&*Ou7zA<l&Kvo#|RegkIw1>}XY!ynft
zIZ`TqC9Hen&0SLF3-27Cy!H^ua`euVO61ixW5@_*gxZYew(?DNW=;8xhCNA26XlP|
zcy<3&3#n92wvb7t*zw~moq{TumdLhDOX|y!%#H2C{HQ?p-Ks$Ow$DH4iAZsy_Z8<C
zbLlUyMig?hh@ym6diNc;rrzTQl)#`A!IUsDuYJKHs`S=(JYG2NSe}ez5oF?|p`Nb<
zc!Gu8MSQ@u%GuAxz8$=|L&5_+<>$8fF-&RHF1dlHt#8+F!g+k?&QjwYlC35`$wB-@
z>+@qDPMiP37!O`5`YLt7IcoLr%MqwV@crQ8aXAJx*T?x(5%I%;1uzdDIDW8330&nB
zv@N--8CnERfc)_lK~m9I^;Wazodiv8{GQEJ)W^CyxC@Q~!sOBHz<$2G=&_x&Gj&ep
zrX+8j<Bg3Hf35CA#)%enn|<vF1sKK#AlaajwLkLbS#f=%1KDva%BD|3@Q!Ra0xL2^
zdQ#;JVY1v@qHKCFB{q2AdUH)tN4ybhe>Q5$Ca*DN^5xI;5b&JGd|-e3K8HyGqQta^
zi$<uUo!OT`+>e(|4~n#X>@Kp$O@k3Fb%tD?_Ap#OM(P=<zPCbCX0;P0#2r$%%o3%l
zqkWBT(zPStz{g39g$LNr5$0c6uwn!^*Z92N7&P|%CMG^(UVYzjx=TT?IuIng1f7OD
zLdM}Sz;&mo9eyKVb>~;GFVh8pIg(i8!(<coWcl|R>3H*k=`<n<EWJ?R45`jl#6E44
z8yyCf1YCWwzSHUvM)|aX5WEa86qt-3L}d>5GqOxl7B)9X>xyi|&=N5yFDGGN8V=xq
zNd!xW+Yj&Ne|P;#0Ru4*TS}Z)u#W6$CPcg*%D{0}QKb=_oI<_1Sc0BpeVB-e4+^5*
z{w8aaE!?`_W%n7Yo5p!2sJzc3LY>ylx-grZRb55XTw*!-l6^^V%wO2M?wQn~yWz1^
zVVLI_>}{<zKdZTLK#@Dfjzb#fSmbNHlv$ytH?8HX%?<3jM>fxh7(+_4osPD$<+4<q
zC+lIzBaO}W1W!#ufuj?l7sVZyy_D@A%$sr7v<}6L7v)QkLUB0GiX!h<au91LUyD%h
zk;>AD&UN~D<cEXUJBf0(z&LFpFrA+k`5NNzzm#@dr@oBK|E%Oq$%`w&^Zs=Hi;QWF
zEQJ27{WJuXKz+!L(v-aS?H<bgv~{0S(g(2RQr9XGXm2;)zlm}Z<BAuYIcp7r#LpJu
zi+joWnxMS>sRS5bO@vE))JnP^)Y$Ucp$5AQe#d;VFuR>G?)^K-h0DeduJ-(Utq;9n
zP{jutu4?(1)kb0s8b0+uzmQ48?oF%h*hV^}66K*(R3B25y|RiH_0$`^j(S)>*^S=J
z6uiH8i0Y$GcMiDt<^5%cf}yPMy$%W1$%7nUBWWu#%7ay5AWthHIuZ4W^8hE@`NwML
z%};Iq$&*$n`?@mLht>JASr6CRr;o0mM7b<4sX@p?PHucK;<vBs$+aF=hj%+C>cbBQ
zFs2Rm<x9}Bzt^aEbZe{qA}EqZJ3^0Z{!;e%sN?AQaPh19zw>SLcm42po+y=H8ql)?
z{-x-OSKXo3X&bk4=A2WhgA>P@eUA?S;EMJ-<Deq@_RV#*6eZk>8g;){Dz55%-^`SX
z3lA;?{;pJ@q5nHW!h_=U&M%=p0vXyq2tU!?11{LR<*^9}^96c`t|1Pt=q~Ma%mvq>
zGb3Yj(GBIcX7Nh}dGa2}n0Uh(D|j<a@+z2iGY~J9xR%<AgT>fKM;IM}iC~w>$mcB1
zg;QMe{an%^?ujk`0^B&(a}W`0b!+PJp^?Sr>K!raOlWfT=ZV2^_72%7u=Y^@!y^mv
zfXZ_|Yl2q#KxIvGnQI6>68tBz0oGqFLq9dxy~9O1X&;^lC5ai}I`oLgUCk^yq(<M#
zm+RxFm3x7pZ8=dfBDv7DV`$B0u2%=KAb4|`2G#3^KKFm5z%Q%lQ~y%e-XqVzkH5%-
z4n-*hWy;%rPblZS9|9$2ioS}4zvK?l_{rb){Yv~f9O*W<7|Ozd<eML<m@(C6WVgtw
zbmEZAPZZ*B@2Lh>7Aocmu<)ZMeOpyv+~t&UBEqY@DcmD-lZvn+!m7I}bAP{Ae7Ayo
zWpRjV5a(uPRG86fBPv?(nI+R%P47gyzFuYNY+@NVXyZVG4u%)`8dB@IUi-D3=1wT;
z(nB4_t&;nKAvmaISYw7SXT8+*$76*#Y1Om1nr&~c-C^9}aAX7X*K1|=dFs>VG+14=
zT)8y&TUqqmV&)kh`EQY8HU1fDPkz26@)xOOxfjr3kz>ZwG}^*uJcw++&dKBRhD*L;
znR^y!w2VW&j*H=@+nN8h5O#H6k$3oZt0Y%Af#9p)e}*bXtS|F6y&kTw!wP@edacRe
z-Eac?jRP@uM5;AA+NZZ~-TfFiBPjycZA#`9PkF8m<&ML70bqk6C8F7Q>LIdqwPP6f
zO90+mtVED>)jMx{LM+h;a_O+<L1cG%J#`(<#ZJDjnv9FS4kHsj#jOP?btt-v&XER<
zs-^N*ISf<Mi$1^g#QTn<Ls+dn?Gd`ZwynB9*%sTD3n!6O7ghXta9j>*01`~!tkQ#r
zZkprJ5Sr&yd!=btvbU-4WWE4Ocpdh155lKIq0nD9jz|w6YpbR97@hfnco2rUMaJ+<
zes)`+O*h*ayr!g-5{(Zp@H2{gJ7mc<uq8Fkmpx8+_WA@rUij9>`zpS4@w+3MScQhs
z9nBRoNUC+ZXD!$yyD2;mgj?OV^Yu^#kJ^e5yShBUHe<>Vf|arA|DR5`L-%hnfoo0u
zTcZPKd}Vv112FdQ(mfoQ9m(PmMH3aBw2p^}vlZQEtmxg{S|LzN5ZqtkdtuL(t!tZD
zWh_|UARa>hRJ>{~cdqyb_;|SluP`rjlLVWD1h0_5B!dZtAJToLP93A348zPSc$-7x
z6KOC!d4wN07DaNsBG>GtbBqem3ae>oO4d5c=p?IE{DyXmJ4Soij)(T&mTSRn(Cyrk
zosOoJ16lQXgd<60T<`)#b-LB>a@Uzq1Ga8^SxD84#>#V#4cMEk`bACIor;+{e>6{4
z;>wVcF{L4l{Ir|ZT(OQ{+c|wzT74nLC`s|q+x}xwYndMR+`d?E2XSZSh_qghwbQ>#
z8mp6hgXo+st+^}u2j4@>ZKYJCv>kWZbXh~o=wY-n`G36gO8l3J8f#a<+XCmm77uM0
z7c=zH>jxrcgN`<?ek`KOPg&oVsLSNj;NBr6(ba|Vc8kL4KWP)Z8;2KXzLY`CU1}?!
zVZi&r8?Dad$<q6MFhn|#5hk|8`Ci~HzxU%>-5QS&s3s6sxwJTYC{{R{>ihf{Jhny4
z1jTM`JcUS)m=`|<XB~4%;xv?$G44w5{CXJtKB8b(D!g=w=aE*wdx3~&)2Bhm@sM0M
zo`Ll&KMxxfmGPb3-Na);RJWOm14nWqZc%R?Gzi*=v$a8QHJ<WA_2M1Ir`U?!S1xuD
zxovD=nLgw-XdTe75*6xi&n4P-*5FFG)e!oet-5ieZw2-nrSgTJMwe$fc2uBiO29;K
zk`>^Izi{0X2AjSa(!=Js1GC3A7fpXz6a7kG{so(TQ_7HJ5{`5@!4_^@0U#TrwRLl6
z^zWURP)YvJqE7r(qdfmtxgY)x@J?n9Y7*mJ9y`H_fl+*UJ9pqUwI&<5)DAhyh+w~`
zE}<X))RovknKq7m$pOjB`95oBxh7{%GRG*i1Ct|-i|U;*3*Z6ZVu>+Gcum;4gC5M8
z;Di%;g;#M?8dWy3YdcArpo4q>X-4(w3)ra4;bW5GleT{|hCJQCB@rB^(ml5AZ7m&f
z=}o%U-#n5#36_=WkJ>`#=tpFU{Q~oDYuwR<dn~Sc#juqfI5DnZ%uq$1H0$j!r2rn(
z^=~>9qIF9}4CNWgTbC=1&AsXVI=Y=HW#<?JgW<ZF3e}slQxin!!|DY+#E$j(%=J=|
zun&~w+e_ISHVeulW^RZp{^=7ZSdQ4hYVb&5c6w)hR1hm_I$r#=ik*SYe|w$tUs*o*
zTb5z2{vwW*c-|janyK9J_r=x;V5!#n!6tx&`X901(!j5;oR?Had4Jxp8H)pI8=Q62
zmLVPJ6M2ZWy;O9coH{(sHK*npWpRAP2tzsNgeKY=E`se9aJE#mkteZRA@e%$HLnWZ
zfHy1}eql9$c}CJ*el2BRB=1A%O(?);H5iN<=Mj>(m7&x0oq3WH1jsd7O!67B8GjmK
z^Y?<B=$cIwDe}~)74e|2j53tr8H~qteZDM1DRbAE#j17Ez>AZfvN6_nn<j{CRzisR
z9*clN7ngAu<J6OF?~TSY2B)g<3SW^(a7_nsAoNI&d}E!UQn&Pmx#vV8z9NZxZ*4wN
z3=1n34Q^JJQVTBd)GDrBB#%TonCYI4g6`atR0L!l_m06ff63VW=JCG!-$M;Jn|)z9
zx559s3H`IETbDVQS<$lc-S$UAL5{3$IhfsRJ^Bd(p}sPWKpP*t%lxSBpACmGsZQkX
z%9V<UkC}a?Vs;&7*Hg-*Z;b)1<^7U+ag0b3Fa!3+Ay7)n5DSUgCl>K4)1p+QUvfOJ
z6s=$tky@D6;xVQG^Q{a<B87cf?uER>)MeVt!E$U!#~ttVt;t193L<vg!zbf~*M@J1
z@_Gk(3ye_!d&(tH=$B57ZQXqJQJX<KNM+AaSlaSyuJ?4aKaDjKze*^p#RPGfaK{R{
zLm|*%J)PO4PvR!4v0)ZuyxG$oW#3_#kuhA-5yBMC+Q2QIi>y&n$g8~e6bdn<7~dj%
z%^Yk_((oYr<!LntD~Trsfp%`zCekEhHE6bqR{=@4M=xt_GoIq#rTh2jCUa&Q^<jwo
z85y<Fk(07kR=^G(TN0&tYapAQm*-;{V}+>IX#wno(3?@OW-_+B@Poy&$g)1}XTXcW
z)0+J59GHd)eKdjGB{yA{B3<X}y`QhtYg5XC&q3N-kmbgeeJkScs_V}<i1r+=WViTD
zzuB@~wzx2T5V47$k`tzkcE1Eoo;f$1=9P415O!IorizbBggry`B>B<SX|SJ5H~S~a
zbeQU774iKt9oy~39n^W-UayLJy_{JMRv}17xZXDe6B3AuqXO}f#j~W2Q3iSIx`K<p
z2!tQ6#5<X!?WQxZbjFr~8V&)Tc@IDpchX7Y#UcqMKZ0*}=)zBzD>~OMUJrp<Fn`bc
zLcepfsEOz@(_Y$4$dCOvPW}2#k$*c;*4pT<NXH+!{maGI;q_95^(I_K{%REtr76e?
zt3ZAgcW1Rj76>rKq1IiYV!SXRFa)~7zkgzKlp{CSR3j3P;9~)A6R37#wdPOT4z6L{
z4cr6y?ua*uf=W`NSB5F;c5Y5IcQ!VBMubIuz~b(*eN8kJW6%aT^%dRGk~WZ86(oB*
zsm9gUc(O~h_Sg&9@3z*+#g60`ACk1W=`_xis(E5jord0=oUA(35**?~eO?}43o#7N
z-0@@c*83FQ?`t1{I_nwJwdf1|0FtDQ05%ui(0NDhQZtMGCNdf)hML41D~<Z$s@Zt7
z`$md0kd3l@v#b7VqFtHAI0247@cvZ!lh{N~c)@l(Y0A30E!?kpyGwvNswhRN$WxT9
z1T8tcK82Nyb~@wY?lb~OEaH;m_TUTFhmq9(yjBd!UV1^+K_K0WD}?P%cj7Y)iZ+cW
z`Gjjbhy`zq&knfY4w-tZ>ZOi6s}`0gc#GT(G)%X8BMg>QT_+gUUcX(=PbZ#2%K6z*
zrU=96Q~=OJgVEeRv`))AymXFy@WW<w;#OEE^z?P@=IP(9B5R5(abWpy%Cj^$et=@*
z5H*}e7dX9lg@ygWUS5Js+$(D8Crq5VuYrsm2ka38yxrj{y*nmdP&p0J+z#TW*OMfh
zB^vb&CVYkU(b~%GK^N>?BYhQK+MldJ)wtt1zr6%}uZ)CwIRkiO&eJ$z@Oa0N4F|Hl
zz8Lw3$z&YXqd*MIC59+2*UwDQ6|Kf(ImKKeCy;+Wh`b@f3>whB_dpF?<3_+B9GfuK
zv?E@Kt!pORiS#NH=PumZ!yy?!Wi`6yK)T@{we)5aekm6(o6r#N?>Y_upK|YAI$mTn
zZJ-I@(=*GqxCzh#h28AxIAaVcmrrmT(toyPx;tJiz_hVNFj{)MPt_B~VErHvS$6|W
zyFK1y7mQ(Jb<49gq}bRqSBuJPV)jzu$c@bmklmMtRpa-a=46P?lJg1xE<lKFfAQ=N
z!yDSJmE<k^-WaOYRmhOXU<1!U^d_oZ;NBrh7#TJzn-1zyvVD7ryO9{cBEL`8n#jEm
zJzLgYecL35E}-2YKsiTCUW6f7M%Pn^byb^Wg|CW<aP3OK)IMJ>(t9D&p-KsNz|@0;
zgTcrlsFZ4)h9=n|3oFnPNHYOxA#Rle#@$S2ZV1lZjKm<y{}zVu8-17@8v)*D37K+#
zFp6j@C@G+rbkM0aRyc{lYT}VHVMVUUyjH!>S_caTD{b%-nSH!|FlFcYoFX)jf=Ts1
zhKkk;Oyd+?&6$Syyvzx_p?+6f@Gb<8VhRv29Xote>i!68RGJkjpg4$}7*Rh+ZEx}p
zqgw5il*>?1cD0^QDq+`Hc6sUd=2_e`M=t1y&>4n+jgrrP((R-ER|I?sxVQwF*izEC
z!HPU9xLUuJD2(KE5tj|AjKikvO<EhV3j*eNT{wC41`lsrOd7n3#n}nb*E#LjMSi>y
zA@Dr8A=|gPtuoqb2|gUXmnUMJki|fTGe4wJzsA`}Nkbm}mT4d8p}~{P6ft|sN^UUa
zb~%`rSKU95#x?3{>Wkabv9yree;Y&ikcDotI@<h}Qu-i1Eu5CP6QjUnr+5L&iB{ST
zd-(0JXHs%M%vZ>wyLz_*)<RJeY=6V?xk;=8MI<!q7UX1XAT7*sM`(zDH0%&8z!(M>
zefl@>>(3SG>H6|eZcKd`ewi<Bp`V^;tJ|@P1g8q;l2kV5`cpk_Xu3V_S}yN@4a)6T
zGO<H-k7hHilT&O4((<66L)Y2QdH`V0SzyXLaXkvB=U(Mxqi7l}c4}L^3!;G)_tA&D
z!d(krHj1O)8|iSkMs^B!`8+L_fSyy^Kub-V@0X%!AUimI?TaV~qC3$FU8Gel(v3mN
zEmsz9LJjhdg~i0ywkVi-Y)2Y76h6ME=hQGqW;Nv=fk;sRu^_XZz&sM=2%<QNP2Dlp
zsDref1i-#od(7*E@~*iVa){%hO^i3ofL%Qid$z71PTC=GNqra%J{Qq|gov63PS{@+
z9mDj2FJM|cU8D{2O>fZLL+FVNCp4w`BD$aSTfP#Xp*gbzv|uSdcXTz<LMPwui$ea-
zp?*%s34HdXa$r7>lm1KWY2&!~rLs^Q`|X2WhrLa{5vGd1c|<_?!;H?9E}4HP!>wsP
z#af&l)fMYNfXS;=I>tZ@GtpEWQR%s}mXE2u_r_C3KKAlg(ALhs9%MNw^)r<16Nm?4
zjUW0cre3{&=U~Elu{V(o_4_s+4J!L8MN6o!a>}TIAeW$xhQmlPLdq;?_Czz^XUw(W
zJk3(X!^hv9-;znoR3pR?5)A>B`WayAxvC)!IMHeGF38YIN#Y0JHdSzkf)ztM!VKK2
z<Way4m!#IdELwwZT!<r!qP4_wgzVp<FF0f?NB|=m^XCow(g2+=D(fmh0?`Y$f`Hj&
z5~OQ2Kil>Kqp@66Q;s;d@6x}11tj)T!W`PdBiI}Ulf+rSgn9fqo?0k>P*o@S9M3;i
zUY@;zg82OH+N&hwiV5P6@0KOHl&K89WyN@bZWct##_ZN>i9`p0d--t{7YoY|rHAF$
z3!Uk3EQ-)lKkNsfkb46|h8)Tjd+m^edJZFImdKo4Z#Q5dbn<yF6q~7PB@ir^g-*X>
z6UhWqT&U@}HhW~DI`iakeoU%5T|PKEl8`50;0|U(b}A!ug&98brS_mu+F{1msO2Yx
zXv|lpVZR{Yng>lkGvq6t@j0RGILFAlV1cvq$JxvIrD#tz+^cRbO2+0CB%Xmz;N0;Y
z!#lHQhNr58RhjdG>V?d*hRdLzv!8)JTLHqg^SQLHeQATh#`k1{Z-abUY+U&)wjIf8
zP2OLmpgJe7ruK3K$ml*sFlE_a;6`rI6z6CDHu?qKXT(40@1y)uK%PHse`nKrBU?f6
ze~R%cnx*%&%wTxtBcf*OCsugB#F`l|eLhmx1ekQvRmO;0puh&u3Z5p&z9=ClR%yye
z6H$fp;yaT$bMo6>*ny2|GQ*tmUS_LA#{zykV@T?RC1+ki%zi_N!4=nmOQfdh;M0Le
zK#pwd$uSY4zTirzp^hS8A7{wmDSGd>5c9>SL5AlXintP&wg&EMMnI)K*64jf)$Pf-
zfa%>zOH{zGu6cB>uOR4BY2?Hjo_xt#rExH|N5*?LVBOvL+>qhATaYPXm&h!*9B-QM
zaB~r7Uk7bNr`r-0{K?|Z)p$1JonCBmm-ckr0U_D;!B|5b?-qe71=|-E7eWFriVinl
zKeHpfR*Db7_A%(2l4=1us7m#O2;YPS0a;Y}VF-}r#Z<glLI8akroVA+W|?k`;Q44R
zh5tVT!e`(7e|nqHzfvvRE=y%z7YTwDlfj1ALm*1rYv4tWw#XBwBIQ(g-d>Q?@%1GS
zefl?%&JJ^&Mh*Q`D&w?x-aXZWh<aiY(V!4v(;pwkO@CXz0qCK&5ER}4uq%1Qt%}2?
z!&#a&Dh(kJe%(p;cUyXZ5BU+D)%;{AbHCvwy0qXog9dh&!^xaD^*^P3$xfwF&l1k?
zca!2WR8AQV^NXHtK!c*TbzM%^T|;M4$4n&@II~}5(ObK1ITvU>pOR5v5=s~2#wsdu
zh*ccX?Iv0!g%`xJt~wDtcwqMc3+(u=Sn065o>M}3By60AbPs&mBtl=u;u=*6$$^n^
zErODvOx?Z@o~E2jynaa07no*y4$eTG)gPVK<zcd(;tQebxH40)IIUwrf;o!Oq$`~~
z*Wc@>kN>y39x8poU7JG{b_q=H-oD(6py|o1d}B6=6U6+5&^xDB&`8~-D?f6}GlPEE
zWw{!o^w%DCE*e^boJBz>0sil+e(No96VM1%IBh}qeYtef_myd#lzDG7a9La1-ee4v
zaG9s$yS2;TY9-%Sa&^YIy}zCWN*X6RC?QpAlz?;x@)@JQ0a(%`>ga~TiNw^h=j`)E
zR#~Vkh8~pNH>2h}>U2f)`=r_p^)@XyJ7+m`Fff7!A&YMHW}~_#NvCEwW)HWEOs8Zq
z?3yu5zHs?RCJELOiDLr+n%Mr*u9rS@KOPxJ4gt+6@$w{~1xxEU;uCfRX5ypH@udZ0
zIddH5erV`8u#0c*bs{kxKml$boR4cW#g88Yca6-%`pbz>E1wx>Y;(P9GRXxn!6=Uc
zEPj}`yVF@D78#ZzE%bMr&i`)7v%k2W1Jw-j-zKL5{@H=uQeKmi;2J$?S;~mnre@vE
zKu`{9wBO;;;Y|YWhHC1k&!TKp*)|brCeqItWGsll51K@7%<%W7L9%K=(Fs&wTM~g(
zCb_%K+lB4UNd`B6EAzHJAaE?`2?Gv77`;w(j@|l@zQy?P8xm3KqXqw=ZPjI!0q3j6
znO}@&R}B155f7vRcWot2`{gI~?Ry1dtrqhzsHQamD_lXO(&i6h^Kz2!CRyg<q9;95
z45k{;b&Td7P*Z6&IT62h@nL`SRY;n>vz!VOqnL6d#ROn`w1=yW8k&S*1e{S{-)r9$
z>{@q?k<SfAT#APf>`5(g%>|U0z;<%KJy*5oRsK=6eM1BRqQPn+E{&7AerUJU8P`e0
zKpU5!nSqW|JLA~_$Fw01{x5T|lJsT9h5wJh&9=vm+`|J7MjORT>P<}DzP;AP^@P+B
z(}so#?&P~ln6>Z8=+*V+=%Uk}XC7xBflkR@A!dw9mTFWnnrZ=M1M3eZSB{d?y%f8>
z9@X`|M&CNh-E8EKntc+fOXeQG+2hvJx|P`8IP|rBp%s<CQ)#?h1QkYJX{iVZh-i3v
zyeD9tBinTqOik`ggVBWD`+lK0uY+*x+%T&^TwsCJB&|<4hyxaTk3l0>2ma=qYAI+7
zbCqLQ)@Q4@g&_e$sBlZT0##!n$cP!*we0Ym^!gYJ*{Ie@({FpaUmek%ajkqOrnT+U
z=cq15*6-nV?$_kC<{$k7ksI7L*yQtL(U1_aq*~Io9piylgYZ42S@7W5R;38uzm$`I
zrmV>vNA!O?7=4<H&A}VPy2!#Ww<49nN|q9`WV+ktUv#>pdTS)+mkG07cQ35Y6EvWH
z*pA_|17)!;a?n|K!X43>QkqQKqJN@N7e;sH9vSGTIF1G0%x(5dX4g>th`(}g9sP>?
z#+~v^X2%U+k!uf~Xw>RaMy15o`t<NM<KxXO?&+c2W5X4(uM9s?YsVnz@Z7Qmt9|)+
zrIAlT%F`-+P%*MX*AJ>~R!QR%ethwLMmh2D=zucE_kz;ViMuT2`Pbam@2s(Ouk6h@
zlAY%6L>-0tcUSGFJJ7SRhC!RnKS*oAV{5n%68m9Fjbp-CaLdCDMW=fqtD;14LDoHO
z-1<Za;JPx1HK~T_JKS0l?bW@-X3_Hx?Wvk|6A6<v#Hinhg6r!qKkR-XYCc9_dx>Cr
zDb0rbf8TayUXCxGU(LdMxdakL&w*e!!g}(K!fs1)#}z=vN&9-5CHSRTKTC;erKqSf
z-8=cP<sxk=sp0-*N=iN@EIrw8v^3Df#3faRt_CE#mAj1&38|$W9)1mr9OVf-YoBFV
zsox|qf1<X=O%2b6395+sjb_czMT5XT+@U;e2UTUIWR^rL47T%4IY{NH&?^lre{N?4
zeXD}`r-qW>9q8GQt}RK6xY9Qd;Po~P_$)C^&20c4>LJeqya}Do!O?l$K08<(3DO*6
z#@{67^i%kWc0L0{aaSMs(hyRa#eS_Y*T2!AXjC+l5K@IkOkXjM5$^nHdBdU2HWep=
zvx=_({the5`D-4k_M>QMO_#BOc1Tr^f68aig*2l!5I@_bpO5m@;O@VhZ);Zk54O4d
zx`6Ya&BrY4?^b+mC~5OZ?T1N(IVm$p)?Fl|q=s`O;|d!(uZR*3(Y%YWLsX5IWB`RS
zh6-@O<*69g?aNSUqeMJg2ou7<)zJ4f@=NOt|CHBrMu36OF&e=_dq>Dg8?!P+3)`#j
zu=`$()F@5STU1_>k{Djk<@#Gr=sbd8Z-Cqa6-7|}WNxYzvO3KO7fsPMS$gHlojIa-
zC!$)Y_U|)`{qu*C@*2PoWqYf1usa{mj0pyj4zE|r2Z~1On&7vzoZ5X4AJn2+kT3>`
zBGQqnsD_1kDmKq4OU=-}pBhhlX$`i=pn&88=qvGK2PsC-X`fE&S?z}he6Fuu&)>eb
zn&;W293!OMNEhost3A7j3UCzDiY*@(ax9$w@CgBvYyRgBsj2@$vis9krT>3ySwo?}
zyRV1tpGB0ppvN>XN}z0!??~&LhT(C8$miV{g|x58l8K;N;}FA&isF?9`2q}riZG4_
zcOwR)V#)w}Tc8jtguCJ>YGN86(#26}w9!L2$IPz=0nciKDy_E~x|M*!+ALfZ{64Qy
zN6#q4PXz|L$8%Zn@<VR<ZJ5^Tw6#(U+OPvEC=N9zWLFLz?-XYO#1Ur$D4j0Uw-(Ic
z#g^qVU~(@y$|5=_lN+tSXK7L_NnjDDu-9?ujQk#L(Lo&%Cip4wHJ1ezggG3^aHzdu
z3}75o^;o9dBjAMtMV*jzoMx0cg9z(BJ%sB>r|a|{2s)%;o;*s15(gh(kgr_X1#=85
za$N36_hT!+Ro?)YYwjm?xC)8D<XGxF2_;NMl*J&)kA)#12M?GFcdY-1wtHUweE~=8
zU%YHhr-!NduV`dtWCkCuott?=6`rLfeaDBMmJlvhaAD$GO0K3MI;fIkJ3asbf<Z=#
z0+qud=L)Si@T;JMC8AOJ0S{*&1gv`W>)ia*0PD6e1BZYsJ}axBiroH2cJtub9PQ_#
z0iJv9XX9pmD1a7v^xpTv1L;dNs^ItI&y(kN44Uqe@nA%An*)1tD2|k;Z5e^R$+quj
z?PcMwv{v_P7ERk(FHQ4NqOLV<G)_Au%Vu8z3Q|?5+*)|41mnOFl_jTC^8`p&pc?EO
zbnN@!Qv}@W6k?+jze>>L92k8!FJ|1-!CNC#L}-UyEJ<cz;FK80X8(IU)lfaxaZ=BN
zwIeWImeW---5yvy(;RcGn|UpMa*fKS^4emLu<$KMsTD7^)v5&9<peqD@HxfWOY+K}
zVe3Ee68;N~5#Xfg>EgpT044QwGw#D8cCci7>I*6aX5^}5BWG`N7C_v8VTZ1f4dpc0
zm|ZOO&(SGZ6422`2c~1+*Zy!MGK_90vD%9&iid32vCa6Em{tY22)Vpvp2u~&3+_X1
zU3&1nz_96P$h;9oEb1GOWr3flF(Ys6@(#tOUv_XI3^<7!B;T_-KlS~5K4bTN7iG70
z<dKqCA{Y3<9h(1rkR0jnDM>%;ATNR*f@wbZ^(H#4+#_eKPtWcd?Kp3tSJvLw6CG-E
zu=<hfU~M!|ghSa9`0$de*J+SZ&F%DaT3AiIVkxHHOXmjn02WO0x4eGrL~}IBz#srd
zo8ac5Cvx(pO=j8jZ6B^K16CqQ$l%b(wi^g1lqMS2ofGMT$C#^q{2qm0xCt*!bIS{*
z%K`cP6n^H$@Xt?9=*_r2m%mQM%$Lw}fEKc-r>y;uW!KeM7`#?hK`D-D5y(n^{^U0V
zkUlkK*=@x^L+-MadfRbJNpzeEaIfsP(qclX@ViEwO8(nsYDzB|d6aotW)^`~sk1hi
zNP`~^P)KS}saQMnnG{k1LBM4h&ZQO&sf&R_s+HSkPc#Ha|5N$$poSr)Xy}S?I>buJ
z?UZUc#YzS#2vp0k@p-TOt?ruMJ(oX$j8ja#X~&gV(cqg>jJ68YWt5;c)Va+9!_S$N
zN^g*=eO$OZigd7f(iy%GeL%LZqw4QdMWg;M1M0osSd$j5H{wOR&_g*2aEI{<_6nOx
zMF>2glC2&6W!pP7a2^kW)86Wr12|fSO#0uyz(y})E1|!K7Va<mxPo8A*TW;S49Z}P
zI|-3BAEXz3P;{k3;4&^g)LRpEDK{6u%@AVK>em!D2p`eE3+R?X2;BAumMLNF+WBPo
ztBZaJO|5#GA+XGuE<lEI%RL0TN;Bjg4H_fX4Rj^HH}3TP{cRu-!vB9%eN|K(TGK4<
zG6Z)gxVvj0NFca7gS)#+aDuxA2=4A4+}*+uAi>??5;*5O|9zRYm^b$9?p<A7T}@51
zFOx3j6@n0Min%x7g<Tuqw@7=W!`&u$C;IC^{LiLvca$d>-(Ki1()7fGJbbjf(63~~
zE7tu}^l^?{J5D1;IRb^32z3SxU6JT~vdxw5YK~KLEb6ZEO`JNTP%lh8juL@<;1|D&
zb{u)b)iHt`d%Y5}N&!Lh(BQ7~PLr#+IXH=VSMgk%G4;tzDtErR-<N5H;M&P8mk*}+
zscWL&?mwO^Cj4^I;D5h1TlLi5aB=eB{i?$H8=~9Jufe(c?r%>7AX>q7_X9ody!}F8
zk0vKZNVa70xOEG<f*5af?dp$cA;(g6UDU$4$)7?9TgPJ0_+N1_bm##&RRki+&K_bp
zpLA4vW#cxaaQA<o-s0>7Xmp}f<w(y;o-q2SFhn1t5D!R^Vvc7%`F)l-sHlJyk(zZu
z_m?8d1>~_8<PF}~jYC77huJAVZ(*NgiX8X)O-i`V+UvC-DIi88dPg;c>)RFoqIW%&
z!R*82E#JZLicu?1A*IrazJFO>n@0?uj}R0Fxxm_wriS~8-tSkBv9rKWoGPLQY(cOw
z`<##9AN2w!W^gdmD0AZJnQmqK1bXoni6U$Ji6=UTEZVWf!slHY@m7WtYU<awaB)wu
z*+S|}oyyYluaAE$1(N@-Ci8d;Oz<~@p=NM`Xcjj#zFxIdaFogsVu9d08@Q<%<;r{0
zI^=_`eNvq?lk|>Wy|YIYj5&-p@|39w_GiRUskjjxX5A+paWzpvpy<ij*Hk#G@1|lG
zYJr0O`9<#;p3q7WCm83koH=&kxJp4)!#f8VVCHG|qY<-zO805^UA$qrfYb_|oZ?$I
zg5pMF?t}pkwS%;~MVlf38Y-B`@~|Bk5nMdBKli+0m(@7?&C3eC0wGPiTJ^e$m2F~k
z9pm&zF4woE{VT2tT3l(^z3!8oC}TWa8mVA)Hm5Q7c!w4OW@0~i2YwB*Y@)&U|IQf$
zFbj&$LyU;@Pa%*TfKExhZ}<+c;fctOZ6Vk~FPf*L?n~4G17IHzMm9b#*N}&8w~fJs
zzW06nw`B=9yZh(l{!z0dT@31NM{E6NwIb4*j6ofm{b~Qx&U&|`jSEOqN4(9odW+ni
zOJS)`ePRTy9V_dvB~8ruR1URQSW~DTrGZgmAY#1@HtGCuet#a1_(kWZ4F-TgH#iaD
zD6Kq?CkHF8LL+)WxfG~_MAXi(;64~5k_kuWl6Re@%Ik6kuYm+S@@+wB09H({OV=gN
z)OumVek=>$DY&tDDyOMoI3=v1+XHy3UGnGnjCHLTFzN-y_1`Idwd|{Mi1=<yegXvA
z6CQc@p;$`>rtN@hi@|`#kl<Ctpl71z82gaPh*}amOq4vawI;F<kK=-S*zd#>b=6>y
zXeJJoBf(+HWh(lIz{nUN;<7mMCAh<z{Bwy*!8#)b)X83c2KO_rzaZ|lni$%D-D=Pb
zeV~`|dXzR`*I5yn(a#%4T5AmP9j#`E_z{n_i1`|n4RA7Qil_XpkW+fh=->x`TtyVi
z>Zk7L0xZy7=W+<(CL0nBNW~YvC;WE4y8rkoX2L=UBtNGU)@*{^=_~lssTcxJbb$hA
z-!r-<4$j(A_p=hpfXQ#eg{uvp(|N}v7oZ(u^vAGv=)8z*a3bkC-g<7Ttw`9|<>cB%
zdXF#~wK;+x*qDOXP-=jC{Qb)$HE;otpCwrsdnFWnT+K)_5>zt(BXWox>Zaa~34|-!
z>o*&Tui6oId*vK6Vb}*@FH@JiZ=!L$c#!Zje74@KS@XqQ96R*a@<()e!F`3Yeq)oc
zCKMxtyP&9z7t>CVD~@Aj2oJmyXbEc%-$xRDb^i0tcKo2j)#m>!S=t0&d%gJMPPfE!
z)<UoIJT_qGEHFaeP=-r@v!YdZOY4Y6!f_wTIPdTIpXZ@vAVJ{9uwj|cHS68{>!Bn(
zB0~DyCljsJ@h_v>aP{-yfG~(6zgX{LHh)1gtU;>ck6$(hx%K$KA^r0>=~5}X2l~%w
zt-D?pteon%xKop*s)BW@+QAp}r1I5K3RNb!0+d;pt%utNocbp~_m}F>T91n*47F6U
zgYRRVN1#N~JXhm%rPY56@xIf*mE#W#m?JWY2P%9XsWDR%F%aCyH!zrG#zD<%-g%&m
z;ZvZ_SEppfzWI7GfwoMooGrmL1GJyz@I5B?yWBN$iH8CzE)HuOddG%3xI=YKQ&yPL
zK|D?`Fh>#`8R<xlWMK8{@s8Y;S!!648?Ay|(Xki?dA3*Gm?V$?4=u{{T2LUH{#(xS
z>@j5(X6%0mAQL6(_&BA9>2k2eXtQda9Uye{un}9CzrkN3Tw>lmpNb+nUhmV<-Y@iR
zf?&Wu6ET<CyOs9H+G2Q2Vx!H=)x(Lg`uD0Tv>}R4MxPP3-MPz9aav*E>X;AiZbkGs
zU5j#NV(1W^CAg5w1Xs0lJ-&}u<udfj!Sj~vuPK4%7Gy4jGANCeKNghy`QJ&AASRO{
zw$@_(1_|{&>vfYpEUj?TZSse2YtCr8;c)jvDni)()DgC`?RWU`%L8q1#i865h*{;O
z3i6S6ZuCyza>7wAF<X~Tu}N5CCKG?03JAD2=8u2MNZ4Sr!BDU*A-YuXhGF34l7GS7
zxB8-DMp>&AvyxgzF+wp<KC926zE^So#4Mb9`zspZ%J^;dx}~LAWYv@L?4+qAW7_2q
zb;|ZE^Cn+=PFBP)yNzb#eBg7H>m0_NW=ZKR``%(3;Zsk_86^&4mvJl=%*{A5S}(PN
zQcCIO(SBIJDDk*Et~G&xfcag44MOUp*JXX=(U{pesaYQ<afF|u>4D<Hw*={qEfjZ5
zfLVSyZHs3^z*h!gR=_H?psDB0fzfxrf#_=!tV~N<H=QwmXK>$s?xXHM9N_uV)?>qq
z^HHwk5z+T+P`{(ND-?=rHA}{qA`$O)c48w{R8RG88??`TTuSyu58Xv_g<KwNWg|pe
zbFY&x^{4ow(VecaLNFnN%qk=mwn1vb;{H@n{XTLJy4_;2bE{w8Ilhzs#D7e=0sXX&
z&>OO?86AmaCokDt3oCiH6+ifv?fz<j-dF(rmsy6l3U*caB3T~V^>7zv--96vQgv9J
zjX3CzaU^=rtR~{Dyz<rzD%iT~5+^`nF+C)%OAeVYkvfJdK=vmiWqg3|Rj1dTJrb?+
zbz{s(@C+cENhq5rbGVKR$(OoJw>W${T$C{^+kVz>=acE>#l=^2RgUF49Gt64A519q
zF@Y7cPk_U(_f;%Gdy&%T4v$-++cz{9!HonKzc7p^5L$<3oN}5A|4eR)ec{Q6$W)iP
z^093OqQ-vZF#3WUbYi3YyX$&{fv7#06q;P-TvX4|=2T$_$^RNwru4_MpT7nSKYE~4
z#Z++{p0Hs4&1!%@`JGxywtXe@z9<W2!td(2n{Qzkni8H8h!A}<^U4>2*ZQKMNyEb8
zrzqazC&oe`PTGS;<c4RO{S7s!IO+5;zVlZ6_1$>+X!Ci?exptfujr-OeJ|!XB8y2Q
zNRhv9?WW38&msGgzUpw`esL+HC8zs#YqFwj_}BW`O^GQc7|U8(F&~?p4b(~AWOn0>
z%K&zq%ahHgXF(IYbtX3qel-6!ZeC36s$QtcaSkbaLgTGG7flxYpx@xT0~1-H&9vd~
zIXTv~(0p<uxA_;|;S~lBS!@DBK5zXdkDHmnQ9wH?^=qvQER3N2b>*sas;Ys^p(%Ib
zv!~#O+(~VsNKc%vGf-0Rs+0MHgtT_wVtzn?@VfoF-3H$9B1Gh20cp#DrtlVG|L%Nu
zAQaHYWmH*Pq^~`N6V>NnDNxTfY2l9YCrVxma#rOq#>2hEf%A09ysrm_Eldcz1FKw+
zt8_zRtqSZk+1XHa{)_92%IQUV@juf(_s6&RP5GTMi2XOHxxS7(qb_(3%6+Ri{>;g-
zsNy|&CM#Ag)9Hr^&e(V3L`iSBR)>S8SZr-b73O(E9+HY0B8(T}zx-)Hv2vo4?-@Am
zvuSwJZRNKEL1&cWtIIDCrAjq|1YfO#>%tSk-i+bmfXd+nHx)qZI^OC08GB%w6)!9&
zhoP!ed%85IWj^F(IO6gbWVSEAES6&bO*!X-TabgX1Ve*4(n)>dc@tFTAPG*2oP}r8
zRa<$-T@@<!PZ@0>ja_5P`zCnZ;ox8FGG-drh7DOHOr108w3lY^JY@npUw+TaLRiCC
zF~klopH=r8am}?h`K+#}8(1}oYZfBwo&Rx+7+D)+js(MfA9e*pm~6MoZ=hep!n`*-
z*k4)<TpPLsu-pw#GLtl!Q`uaqdpgD!b-K};o_~H#dw*}8F5lbpVZsYKg?{;aNDeqI
zY6qB-5H7$*TV3L-pz|6i?{Hj$hq}hN(=TFr*bj*Chy7WB4=E~~1dx2Or&>Z5VTM*-
zAxcM@nl0%zs9+m2A4Z<Z(=uCk#uhjz>3lfb`xyR(j~zaTPh{FjpQ!T+LJngdD2}tx
z6S;X^KvPI#OqYV4#QC5eR5Q}*+{xo;)R8TO$-}21{aZS+^0*wXon{h9gK=7VvwvJ~
zVj{&BAU%`Kvgj2d!$}W5a;@~e-1<q4VXnF-#gM-JDQs@wzC1~(AVd}nq??M%FK2{g
zQuGk=8Ei0Mi~pjOat%V$lVW%F%=?sl6ZV`%D#}PZW8hKpS!@i<U}<pAj_y2A@;hh<
zoJ+GTdSGu~O-49hD9ZWwL~^=fkNW4Gb!23$i81W|8W^^(&br$nteIzT&gLJ^`{VYo
z2LoCUk&PDtr;o!yc_az-h57+BBn2umEV`0}d+?*MtgIN3ZiOHJES*TuVDY!MXWXKE
z@cZFFzn&c07TCq{l9H=oEgU?&sI>5V>c7-dIVU?xjAZi$Xas$>u1%-epFslLKce>h
z86Sf+Q>;q6dLjYSGH)?v5nh{nzw@)5cK`<mskb0}7y&d0B2z^DkS}iO!Xf|FavEy6
z-(!BbR5_QRR*Kp<MIB#%p8#RL=UvqZF_b-Xt2kkXt!=kr$%o#^<IPG?7mL|!?~r&|
z8Ix^)mwMn~(rt@jhc}CUDd}S8Hc`EQkEa_4oh5}~fF8LZSCfzZ`d!;q*zj=yQR9|3
z(FgFg{*=>C6Nd!tzW=qwao@7u&;#-L_4`+LIW~Rl=n+;fs7y5X@&K%1D8h#!2E&i_
zGtUY=HbwtaAlR4Ts$3*gnm;T?e#^{kvsU0sYJ@Q@!f>a}>b%X>BIl9r6Ad}sOv$#_
zyPiBAUhnu?kufhMRw@lkzA+v@`B}^|1I}v;eCHXr2c$}GMfE!zAbtw`nX>N-z(f}_
zrfqt#bD=%kJ8vVNcQUnJ`x4*|w!7%MbM1Z{?x^Mu-G9Z~ktMnz%|_+T)OpOV$9Oc%
zEiKY%rgqu+^+$vbxTv-+MkK^3iP<{PU(!N1&`427e6S1?_m2xwGgdWzu)X?kwYs)2
z5ffy4!ugdDdy){V^hPGoj9dh`>=!KZam@0*>p9uFDIz4sa!$2X0ra6T2+J2Ys=Y_1
z|JDY!iM$<KSmxm?snY1DCy3dMF#sJ2K{~6o_DIm<8s@B$&H0_LbtJ^*JacKi0&$Aw
zzJ(@-woGR)L0R|bgq4i3GePgq){ok2a-Xr05xyE8anF+upb>u0Aj<B!385{e&KjYe
zYrT^I*on>4CmW48!SzyB3nwgNNz^|oEeDZfZ)FbJGJi|<o*2Y-`pIuNd$-<M$C(|m
z7?H=ELTbgpZyPZ=x3|eRy?-~Of*d1h<RgNM693^)T?W!Y!k9*PclzvJC|Y~c%LQdD
z3ja$gt90$26Ei%z<WWy2S<;i0duK-wMHI_#=B{0}-0yBRY;8{usPQ5Thcg)Y=EWMN
zmtPBmo)i%Ij~bc*7y|`W(We|cI%m~fwrpEOAaSGEB-O1}$^VP<9N*pvz#HpigW7sc
z9O9D7T5m*SCX<Hvz#-uZkg_(0J2`%jE-RO{RhmF}$Om2hZe^@$3orcese~jUNqU_t
zvR42q)V|1rk@_9+a->YC|Ip06<j74PzC3>R2Y(F3DUvD|>^%jL*zDlP=-j>GQNOqf
zmlDsl&olSB5r;`EW&?u09nXlkxVUWsmi6<MiWm0CJS~MY6Es~qXE!>3Mp}j=r(TvV
zn86*Ea1hy_suutyaW)cBsWT8~e|TWYhyB>$!O~)>WR-~=U*+4fiL?h9GDKgZTlOr+
zVKD6AMI_a0boA!G+XN<*A*;$Es1A@_CLmX1{5kb+C~uxWdyxEq7G@HfD&Rr?wbPSc
z)io1xf^16(slIRPdU5Dv3JH(f)D$)P?*)5B$gx~Vugag^lo+Oz@zlSnDY#~aJy=wU
z@hd}XEjP@yHGp5hV-w?u-a$)Hde1&tWC+%wb2;9-LK%O-XtZK~sqjtvY9Maa0pGpU
zHw_gfD@ie^utb{vBATvy=eUcD+mCRE0C*fQde=Zt&!s9qQN}res?P=6D%cx)9m-P~
z$J`PktyT!xUFv=&r5`+bI?&@m<bj?Eh719P@EHCqI{-_{C{njpg`RpM+b@4;tFa3w
zEVLF)tyQ@0_qI<Vje@9$lfUuwJEHj@p301k>sKdyO99_p^yB@6$OgX3O;2)D&{sRF
zq+hp`I3F6#g3028gJy_QA_V3!dfFuxs{uKUOmb?RiVPCfIUcbmGpFdmsTI<eS3{Ej
zwu(p`lOytx<!bm8_P<#TuGb}p4!w)S*>7bm+OFr4_X+dWpWy+U$G}g#g86N`0eetD
zKM60Qyl24AQ@Eg2^vLO|A1c51YHJG{#qhup1I1L+`q#Lzx*fDNfIJl>%Q%0o9L8FQ
z)<)RwBR)nG5m!djG${*w8%i`OZSc9ZYyzVQRu2TX-S5=r1boC)&;R&*y1%@vCD>9|
zakex;8ipLFV%ccF5s^}Mn<nbT!5!o-K5v~5-IcajLA&3a%!#coxDK+Yr7PW)-Tq1V
z=wo;VHAfi9P)oYmwpF6C`eFo3+Jj6Rj;fRTtbC%>x8Ro5*W#{k<bs^V6%QoxuYfYT
zxas1Y-1SYE`i$C}$e9twB8$CPF@K%r+KVp-8chblP`B;QL#$}RXFvKrz4GLLD~UFZ
zw`?}x^p7FEwb8h!zNu0gY}ua$340{Dby0m~b4f(FgD|4(({{w68*EX2Jn&lL?aweS
zi{CP|n%ik)yzAB96%=SUwm|c5jn#s*<{<#qm;;Uv+x-A>kunZ~%ezOJU>%mF1lBbv
z5)P0E!o_mh{-2Vhea^n!NO%vT<7@$zkB$=K6ckz12cj!FK`xM{q6P7x`2@m1CN$M}
zQG_Ylnsuj6`${za780ndCWuN^T6m%egUN7ljWHYw6my(~c`A51M>vR<i2&=-zyxS~
zhHp#4T;dn(+1vJH-atdn{fy==-JPaNd4>f8m03@=EMn_J_bb#0*y-d-A|xD`$ANRf
zx!WJ^6^}8`<!S*Y8!RX*b{w02j68RnSs6nASr*y84OqdjWa@<-zW<Bdh8SMX?Br+f
zjhQ}z9hSZA!6G&tj6Xe$MaD12GYcpwr5-0{x)ith01a;0RJA-}s~M848*ozm7@4lx
zC6&4YRW&Q-AagnpwGsXyk$?}Hbp^X88aI=m>u1|9H8P{Bm<~56ASoUJ-Y)>CX!tJP
zC0*6;0#TV~MrT<<XgqvBc-JB(ZL2@7Ygx@SjAG<h<tq3>n^bT*ZOo2%XK4yeM<GxL
zh;dKfbq`PGMBx)JQEO7q8%|){9u`Lc)r-sZz0u_B^$kY-)GN|D%U6hWA%fil4O=*s
zwoRirhzCF85DDd7K7qU&c?+>*amaS^r&Q_G1hj*Jk3?I?<ZJvLMz?JV!o4A8TCm}V
zO#Dx^Z*li>xnj9cU(;7$%BQ#4zQ%YSME@*#nz__6@hg6&cIs*xUc95B21D^77v$x#
z))f{^A)5ji9@dT%5Il<YCm-zq@#hZmJ3y#E_r8$gh$qnbfyn5bb}%N!WLX|IN;$Nt
z6o1R=s7tRy!$o`H*i|Cc*3fYR6V=fDpmcro{YItAsncgujv)I^e^epZTx_jbjIYSN
zdd}_d7DE@KK!NE&j?27}K3o#6oyqxQUQB3O<-qpey(&UJU37gnhGXUr8f>5XhOi)!
zbTKqiVZ!~0PPh2$H2mt7quHC<YI+m!T8Q)p+S}-Gamw1ZJ&v7?zN_QV$xbg;u{v!!
zs`=n{IorXMWwDsSs$G9I$f<C>iJ~wlQn3E;K8haAKp9|eQdY<3%VA37cCkzRny&uO
zv5BR)!X3(wzoCqT^Y%SYJ*3YYX*Bv$E**i3b%gMKyQNxTZD!&_d8)|pUnMcri-%K4
zNsuA!iS8!*tflQ2jOj}KRD!3^2rdJ`4JZ{>Z~`zhRlfm^xjiz>$0GoIRMtzv6%s<I
zVj{C*=l%#3^imvr(=f&sZi%vDs96C`Ib>r~VBj{!d?(qa^8BA7d4km}m+i*+8o1B!
z)URxPh(c!dJwF6Zn=c7OL&gK5W+EYsLOiLc=mLX92xK^;qK-iIO8`5r*13GvtsM<6
zB)Gosy{)-t)AUFk>*V)-{oGWR`?X=$EOqK5?o2-mKdw)hm=}B{9)wuLj9PAqVd#_=
zl(vEC9w0I6-xV^7s;9zXdLUy#G>T9c;QdDAJ$ZLtv*u*y{`>a+KR@5g*S!YKq>D>$
z-N4o<RN^m0dVcF>{a{slel7q#qiaSupIjys9lR)TF<MzPtiEnQmgGHY3uh+#xDKow
ze<ae*DI<qIvE$Mby#&VflL!fCgnh}k@8I`*K28K^3|qd~J0^XbgHTdL<~d_dV3lqR
z(9?NQh&D7_vkL;0t<vLE%A$dyU#`x!Y6q!y-{1252@@8s_idBR-%2@bwhEu#{2B(n
zHMyY4QBm+PP=cbp)2r!!L8h;x?U`>V##L!Zp(>r5`weQ*(yXFuNLb&Dx%j-Jt+=wn
z!mEq*tLsOZ$|><5+c_x%LaSJ5RB&cL<akWfjXrD8KG4N{8h0FbW`QeHREwNLIP9Jd
zWs!tTbr#O`)s`i)VmaJ~jO~n}xO?2ner$gQ8GkVa(HlJbrzyCOa&e!H;@>KhNW<I0
zUEZ|T1poX;=<8P#spRjsVwvnnWf!15u@HX|G8F4~?BU7gRye03AeukR%aLFVSQ>Ll
zvQROC-ef88!mEoUTHT%ru?V_dPC4dHC)bRzv?<72vTo<Bt@fzw;y^i$c8l+d!MYfq
zc0Eu98xy~iIY=Wx`t?}vz4Ik(oR7(yR=R36TgMk6Rc~Ln5HV)LnczjjxI3Sa%k-Ts
z)pW-^TAQp+TVfdOF44uqWrYN95h_T9E8s^Bhe6W%^&yt5L8~1VnA)xHtli_5g<<Ft
z|B3&Z&Qvr)=a0J9^*8!ugokyT3QD&Q%lV+<R7)Kb6PS|^R%L5u#5?21Big^Fvb`xx
zQDgpXpAP+VxxhzvA3p7l3jf_A-G;d;r0dfsO4dl4k*|(#cyq&JmaY^Y*OX4=>@J43
zk(Q$cCCXzA2IsG2%og(P(VPXgiA0n2y{tJufSFWQ2I2k}bs$w<!zh#?P1VHZHMS>@
zkC(P<lqIIB=bab!-FZuQ^vS7_%5#I6Wdb&MoC{n#DXB~fio;;DIAP3MYu{d$P=moc
zyEwJ{4lcO#@pG4`Ts1afm!l9gJF*0i<*hCx@T?Z!Z;~>Jm0X;4gW6JTjK(lX-!({b
zXjgC9dHsHiYayA8F21X94HnD|lNRtG@AFBKVQ;$e_^|@7!N>{1F{);O{NP?<h|^*L
zOikpbD)@5IY{S9^F1UC(H(8fcPRFj>6=tYHTk)w3h;NBLiXUQ6FWdWtZNdBD|D?73
z*OgcfkSWm<ukh9u^{)3`g5TNR2kk-WLEaw^N@Y<%TRvR=R0vxBdD&sG{nu`>fSkEF
zj;)h1hEz8;^d_9HvLekD5)^3(>d)$<{DGADjpnw;hp8zC<i1;b1Lekg(JaW2am7V(
zM-huGBjbKI0Ee-&Y>%0wPOb{PK}+GZ-a5Z8nS;xgH{;`{Dx;3D6CMr;D@OcXN<@RS
zhtZ~-sSjqYpDE>Fo|^GgWrypm>H`g1O?0v=n+)Y9lP{OMIZTq4$i+)?DOBqa3KnA0
z6w@wEhoB;fi86ayBxQsPSGnAXHSqMo5R4){gHq=B{>Wg=Tm1HooT$}L$b~QCGE;05
z*gup?K)nWg3ZJY}?9<Gsl&ys~i-ct}zVP_=s9vxS3y9*EB=)kuc_kxXJ{-K?8iHVN
zWJjCM-Xk^{u^>b)pzqVi`l~8WAzeAUh3e)mR5AgCN_VSnjAfIf`SD0FQk(Fyz9*{{
zMd`Iw>nKq>gdU<8WHC`3+%{CUu$deN0b`Od9PJHM7S5+3Fh5!s+eD?MT=<-Xxx)|n
zu@xUWS*ao|&*uiOi&W^Ibk4by0|!1_+W@H>!B}y^*df1M`J^+`f4j#K!G7ZEt+qbp
z=35^x0eI&Lwi~c@lT-6ER{FujP$p<!n_pBV`q`|F=cMX^d4#;17hL$We-7&;@ac5d
zz<4`$wYjqlvh-Uy;Vrnc!4O$&6xbM@mTO%a>U=~V@pT+9<PcvyIxDumyW1Cai1fbe
z?fU#hUY7xX4VjvEWZ&=pE24I(zMq1OtNs3EP0<A$#Q5|pK<Z`b+voQj5?n;|8~Z;U
z2`~XmFq`V&=SJ`$dl3lr$2$Z2)OT8IzPgd{<S$aA0|BgrebAko_tS|~;W^Fp0e+BD
zqQ+#|9G6G_if}lS{t_WF5J7oWY-)ijgAqB<+sGV#Wnx~Y-86<|1stwdm8t&{C)Qf3
z8)kO~JG2XM@C}$0Tlk!&oVrdv&RJIxm7J$oqYw$FC;($md`D}EJMaq_&7QU0jzYSj
zf0Py{QGeaYu(PW;xd*nw$}IR|CGWevV;NsQVmhL_?mo&*?6bgNIM;U22$uc)D@vJt
zL3z}X^POWAzt^M@M$q6?Ugoc6<pUr-`>1;Q`6-`;509tQn-THfbia-F+BVR3y!wao
zX^fSz_qukyhH~9Vwt@hvm}Nav5BSkGF)c7(wkBpS4S94nmaSaMf&=%TK4=8iv<uN|
ziCdfQFMGMCZQV<Dda>Vq`px5_W!WKrI5#5fcjIGTW|PJBJG^Dn#bRTM=uq#;mg|m7
zVSD8E5_Eadx7{CCChj-~WVbtg8KI?NoM*Ry{E4M}MLp}R7syz(_Uminspp+%JS}Tw
z@|31{3<rlI4!vU@0CN4@MM(0yRA=WO1aW6(LpQA(!9Wh?Xt+L7`}3qou=?_K@u?f<
zAG)N>(cG#AUfGA9XlD9eiTiV=1Et${SpN5*#viLsU?E8z!XNbdUj&=E07Y#;hG2vs
z#VCcQPb0;l0Kc~0LoM-3PJewEWB1?2<f2laA$i_(<?DumKC~Xs+^$)~c0bn?$(%&=
zoK4{1s%@>}kAQw|!I6-pdxM@@U$PqFSi0_~s3<Iui!VAaXiNwMlg@DWqZdr|_|Y{!
zj;|HyQ>TXr6ATh{&3>Rq@PPnWD$Nom>tDM_*WCy-AV)=7P7ufZ{FtcGZ``|>OQ$5^
zzA=ba*(}qJ58IY?<x(a819Rb>gp`fnMtL+x)fLbrOaVJ5_kAyS*{B%Wfx*DtgBE*(
zM7mP>bxj{`UdI<LWe38%9ox$+nKX)qquk35mF<%B@E8etu@uyp(UFqbfnhdCy1Md6
zL;WA7dR;+e&KR1W8sRAyUtD_woy0~dUmn5#rdum$Ub$)xps&-ba@W0e>G4t^F2X$Q
zxw%$*Oag@QdrS^0)CdkK65Jf>q=u9cB_0eR>#2Qfd@qU~&QXX)Qd%Xsl9_^FS<i$*
zYQ_(-F3Y@2Ty+Qh`Qc$I?qEXl1H_mcXxl%t6{;?*lp1&!a<#Zrp`zaJ^ayjRo;o-c
z7+$8di+F%F;c#9*c#T|xE!77kiFU2#+yP(io7neo-)KpQB%~W?wNccjt^fk`@UrGR
zVN}F{Kj@)3X8g*a{!pSs-3Rck*Ag~`&OwlpJ+5~>O60C2um5~J0|wk`%A#xTc7b5Q
zg^qZ*=^I!*;V$w|(D-THS#;|!81O$}JX`fHF)vYQ-SSDx>ieDC|LGL+qHiUA0P!M(
zhRj_lSKu7EH9Rhz;=Qbo{g0zwz<d?i<MqByRKvxA9GlNUp`ndBU2=h4`fz7)R04ep
z&+8G^1Uh~Lez*4qqSVMaCrtI_S#e##b5bH3L2d`wgNCK=CVj9?ne>Q#@3>v;i>mm2
z%3K@j5%rW(Y}$)HwI_7XUPyGzmwkK82>84pVTiqAnkAT3l0wASocxFHqrdyy6SK3~
z_Z3N({`beQJMWL*W7K*O^SAt}v95dR`8XRz2mp!fYQ-AzX@<2bDE06!r2?1hLcfjS
z8t9lOGmv_Fu`|2h5E%E8{;3rAWop&bZ_o@}&#r7JC+9aj#06sc&u#sT<U-)GD{74z
zQ0<O3%foczWj>c0jr3K*`ohs0TxZI7)ZY|yF64OS|Nj3R&s%Ms#+sQC@m5>I#bxs+
ztp$Pr$M)A95!0I}IJgK_GVjZAp~?u6Nu053uD?~)wv2$D1YNzfq`o4Y7T~N7M>nv@
zh@gcP!C7%6r50riX?Tc^ai6#MM*m6pD6?I%WxnTK)DmC-#)ch~!XWqV`n&2V(PaNM
z-paWo*}Y?&v%_`d*!&zc+sEx_H#GBrhH`OjKu^Exxv54<N0d|z(^|N^YRl<xO04;l
zvop4WQDe1d#|8QhxJEkOhfU3GTkQD}i@;NmfK|TgkORP|iWMSmRJiKh(@(MrP}+|!
zvWxymur05Qax~pwc4%ZrF@pWg&l*7-e^jQ3XY_-9<Pui<eMsmaJI9@5e;>tpG6ZWq
zVPGF3tbLvOzxnbCj<*Oj@pX7Bt)rjj1g0X)DKA>~i1H|X7LXyT0yjogO-e{fSI$9D
z9t~jr9%vB-BvFsb-EQM{v5%5^HtaZ(<U_N{X1zYi*}JH_Mo3pQUM0TGqX~$GBku|M
z7A@&RM<JH)EOZj#?VEX{Wl!i4n?bzD@MPZ|il83%p4da;ap5bJ=Rh(MKBA4m7IZ9p
zx}LCRX2rjhNIsQH;qc{A9R)QyhvxfWwk9w9CJ7nQY>eS*Juo$9N{PvvoJu?%h;bJv
zOa3~T+YhxbD<j_=-I#&8Kh#qk9}<}cPA1)&B1ixhK?=_1Y=)!Rq9IaNk9bH|#?{s_
zu19jo6LMwvm}1atf~<)j&k-uxK-xcPC=jrOWcag?yDdYA_v`<eZdt&43q00;2R34d
zBM_G!A0OpDPr^@CnPPOEnNhu1?y=%u98*S<C}<FBfLWXva#l&O)~}kBiy1qy1#qDI
zh5YPd%2Q9@67os*JeJFPIQv}a&Q*mf-r@<(=9iec+f?hhWWYd^HMnDuSd*@kuH52G
zZkX)a5Xjf7$DdsD*^}}~i_^;8AX02$2c~q|O&v#;6|5eJVmAYJWhwE%2x)c|W}?{u
z)7h8KrW1vw6n6DJ10QZrl`3~MTvnf-rI@K&n<MRL&}r6)(-=QRA-SJ}Ri=1*{IQLT
zyMG=ZHc*PkhcpW{qf^^Rwc=wMpa2sacfv$ZGMp%uJrtucz}NhpJWNRRS|p2n$T?YT
zb?=CQb(jH^Tg=kmIq+9}u>5K@qAgYkVtf5Y<MapHlJ^CLtMdfkWj9nT5S$q$%$B>s
z5JP=(%;v=6d%j{&kJ!cxGm&hPXu;2WE2BgoUBxEtVObiF^aR3jpb|pD(!<Z)AEq(M
zO@pUk;d!Oo6(<j$#6~&7fVh=?>S8*?3s}{&!P^9(Bij%=fw3x>yUw@#hbmcuX`AZ>
za2dcz+I9Sg?=9ZDWGH|I8G-K_;16^wPE2l-X@~04S6Ms;41L(}_a_q=mKaC~Ujv>e
zf0ZtXoMfrvaBJ6HX({6%iuVumo{-$LK%9;iUz;i_Uz_~wdaTw)Pb2R;8vLd1?hfm?
zPVO1dgNDJ<sf3SGw|U)@UH&7dvc<|eQBgmWrl5@Ba3J`uz5mAP^1ge)t^)Z+mv!eH
zcH$R&E$S;)c)_Cep|4mJI4TPE1{Q`?_U>cEV<yBfTn(^mU)XYYuVlXL-0~Y;MT%@a
zDmpSBc8(fYbu<c6d_R%aEeM-<y3e_Fk=^}2mZ+-`W)pvvoDEK#%NRKLR!<1#lE(%n
zUv<|_c4Et+2c#nzS~f~AxgW87KQbg>yu*$oQaL@n-P1t-LMgG?6vHTt9lRcV%{yhE
zeulafy8s;%9|odjrAM*{S+p105r~;LCJ>~)cfh{`Ozb<K6iI1G*Wfv(#<zJo6PT0W
zc1v@8+O!7)s#jL>Y4t~FKx>n^l7BevOv4Ik?%mW)moVQLV=9-vAcZ;e7T|<*MBl_~
zh`I#aLST#`viitN=_wfCF|)({a3JVsZLANiIqPb(f6ngwpS4JZ&|CKE9d~njT}-Xp
zb4$@GbboPjjHCtQ_iMU_ui2P13<<nhiPz<liBi-!*!zc=f;fw|@JS^^4ad^L$~8B+
z_nmfU3P60g8jhrJu)}Oa#a3>UFzqQYro+!K32s(GRe{|R+Zo$kNjXu_r;<%^$x@q`
zC2IC$Jt>_#>3CpuKs=29iA-pa1&rz&5>)!*?L#iE@v3is@y{%pr{6RO2954$p1CU-
zMy+Qn2`k=TTTGx<z-s-PGzu{H1)BYPB^(0r*SD51Sp@L4`U6NWpTxT&^6Rxv?fnjW
zDR$}z<TssL*dSsax_D!e^ZRTx(}pFPvv~rUkPuvEdgm!N?}{aD3fxI*kn}a&!kKHk
zEd-*T^d7dV`GHq|_b2@g$7ZxwVrC)oABj&a6R1D<VBHf8BFA_hT&x=xN@6iTYLIX<
zb#GpGmmFG}6C#dGImC@N9DB<XyX<ppVx(xeZuBAkl@T2pm&->Pymv(2XH^5ZEx(lo
zD=9x=`mbFuineyyELOu2cy2m>Fb4$I6B+^Xu5ONQnu9Ac9H}{~dvIFukem-_D@&U4
z3h5YDKQH77_)kCtT$Dr)VQ$^O)5oEz(i*Y1UN~pwP{TvgWMC6>^UUvQXeJSN|6=rx
z0*S~Swa2SwO5r-6{(4I2)-jRn39cxGtY>dijVvB44KOVGah!B@<6TN8PT4)}`fjT|
zMW_@}%%%}X>z1H29!ynl2HcN(Q2Ve20|PLXy-r;N4Da!ItMiWd4XD2a-`E@J_u;=n
zP_zT-vEOkjCM%(CYe(7`2TCCdruzN_w=yEZ>Cb0tG_=+WRL{J@Z?vC@WMN4JX%WV%
zj06o~*o3X|S0;`Pt@Lxa1$YzlLnj<fJEe@V;HsU)mOfOwK}9f;P6kN(1Pe2A&wYh~
z!Y2xj1pUtcQNM;K<E|%!>ylS*bFCCv2V<y4H#m}QeW3n8OYT?iQgM*Cupd>)0A9tn
zv8>H_e3rE=oq%c^+-!rw2{($vJTJ$~S{8P3&O%5U6k+AA*h5fDlpkyWsaKzcNYVr%
zwuVN7xkK7?<lk5<dIkZZwBf87cD=e&Fc;+YR+jvdWHguQB`qRl0o;D?Hy%^}Z^wcQ
z^6l-b7UFsJPl?sT^ghnr>qY;Oc}^2_cjU5wM*hnuEMIdJwkcv&4z6iM9a=C#B)j>(
zX)o!;TSQRj;;=ebQ@c)*U4&pcMOu4$+5Kz@1eg|U3stkjk}Am9Pz+PrKt2^}CD>|<
zDfsh%>s9xea%qWwv$fwcvslBhfmKKo7MW5<SWnz30{kZWMn!TeP<rW7PkNS%Whbg;
z-CG-$bjf(_zUB#vfgzSb%o27I1rL%RQIw|WlC$sA1G8LlPA*9#q5Uz(k^8&^n@BS`
zpd?XbKJymKh(Xd>-L^<h{jxlgrO2G5B#8z5n>X|4zP5BJ<F5)h`E@+WiPj<?=Arvf
z8_C#aBG{T=B#8f$-PoYKr6Pm%L-x$$SDtTs!QlGQlZ*+7o>y-Lm4qK4(sz7ji$*PH
zOv$lwr^3*`{xx9zK0cBh^YNo-Ro#PC5-`{#|B8Y-))edIzcLUU7P{N^m&J}xAbbuV
zgfpfJs&QS1jIrNouqq2JV|UjXW~4bu?zA|rga4U4I*6UX+0_PUeaf|ECsB@5HQ`{h
zL-qcIyk5C$lW<-4$W2*-pXYn!eFG~FjAXj&gh<{@29a2#J*ddrbA}EG^do`kL&ugv
zgaksApovo;bHM1?@Vx(Ez&?sYy^jYB%zd`>o>tgU)8+>{%&`!ghZQeau0xbpgS3J{
zY+Jbar5o9FLy=Qj<4^M}2{eJ-3_Bzd91kZkLi+z@A%nLp6!bWi`uf^EENdg|v<f|I
zZ+j60LP3}pScY2n(Ika$kDFDJPREFzc>iF$2o=V$Fb9%Lv4L3?!x(6CIU8bUau{m;
z?gH)~>l64uJz5QTU7S9ia%>YbACP<MuxpL2Es6z=AAoi6=_w7Z1Dr&ZqIm|{{=^l<
z&_m7VrRS>>9)H#z7*BGuFA`Xdvl=v#2n?$8aUl0tIn`Z-(wLB=WofmmG^$sYPD03*
z8Nuz5P-NxY(_C#dVApU*G4wV=10lo0KBjbUwok-ybl(ZM)CSN-^0FZby9EFP;YXRW
zcu4NY8`jExiu!hP#p4DQ*R-rWK3T|SU5tYHJbTgiv*mJdo`4e=4o!(8e{_r*;Jr{E
zCno&yDD>d}4-9~7)_6NCKc4%4ae(dU3)b|$c8sevKcHy5foB7I^2_nLaWRGpb2{N1
zg%eXy1|W}37yB8qg)h-8d+H^@K(cdyrG^uAFk|>a8<s2bH1H7{RVgtjHXJG9P7od{
zPFGrnosALrJ%%Hetot%qk}i6Bc=sA6S2AU#3d8+sb)$hk^FX-NLm5>!jxf_xuI*D)
zz8g%$6|PrakF6CcBtC4q;ZN}8QjiVVpI#tqfb40ZO%Y{Q2h^>d_@kTDu*%a*aJh`7
zi&KS|lN*U)Kb=xTSYO-I<Q=y6+|$nPBF*+|Amb4g4d1245_ks90WIqbH)+0*F!TBA
zO(Pq@1B0rNXJUpPh5obQSml3hHCy^+p6<PncBDZME_=0X&FA@&BwcybN6GYk{jn(4
zc&Xs*{XV!$5MGV9+CU7oF$YSHHa89QSv%(o{J}b{m_a$jNmZ}$YN;O{BpQP`*)mza
zr?OdVzEq4to)))TV$^uGBD@cAibBR(=*b%7m#v%C5Iz(EGHVKwo_X$xkHJH~zkECu
zu2YLR1!g#E#YbvE^|-HpinrM7;+#q)Db|We=Y6n={;rt{-hf1GUs=tv*9j!_bI$*o
zSG#lIZZOKIA4}S+%3`*U&!%3sZKZD1PSjVlmZb1J>-K@Y-{rSslB8*$H-8^zz3!uD
zHu`slZntDA{V4M&oh_b?Zj*?5Vme1>)b@-%`*(sBirr;+b_0%qhyA>G5%)h_g}%P`
zJ^i0Ny4n4oyA)ycCh?7}d{G-Eub~o$+^CB$<k7~+LL}w!lq5zFn3M9i_?1@kHN#(%
zY|GFvReADl$cq_^qY;bJ9Tvq}d>!_bu3F4)e7>k19C4Pbb}o{Wg4I|Q@}LSxuo!Ga
z5N(f<+w{8a8iORW^Ao*rexQF(EsN;f>pmB<>(b+tTMQa7&g~<d!>H(f5JPQeF4zrq
zuh(S9`(ynP^ALH!8ea#v?8#(49YakW5;T%c2sEj>^G4WP67)&5B<SE^H^iXy(uSGR
zBefX?>OV!Mtbq5$Ag8cJesn|L@!<P%=^tk~Rx{Z-al|$=0Q?YSWddm}VEKbW|F=<W
z%Af&-uu^yjJz~%fo8!}-`q8r^k<Q=N%ioyedZSd3+5Y1UZfPg8h2qyj<p+vLtv=Bp
z>@ZpY*2Kz)>sQGqgNFN^^aDHxN=3T+u1|=?SN2?OtZuI}nJL9_RHGmRj&-~?03R5F
zcln?6o1gY}^@g4dQMUvNOo)96g0#xlLVo7ZHK~pvlyZ?iSqAO5PLk_9{u-$r<bmy1
zC#_j0tl)t*(|yr~;TM9Vn%9uV_l7v@AY%nxO`+n!Oe<_sAz)_gRHdqasqn?$N11t)
zB*u>~x38=VyQFOO>v7cw3dbM~pi3%8zLa{xBIi(HKUs?Eec8KT8mn3La|unVl{=cc
z_?GlX@;?yb0*m)YcVXx2t-s++_E+VTO|x0vu;9C&uc7#RTg;{vo*tCexxX`$LD}(N
z694zSwt=q%aGSwD1Tf%CB~QqmwiT5aRgRSn{AS#SKSa32Gsl}#)`-!XiyaRj{9dPT
z6u$H$5vAW@-d6f!g7@Rt=4L>hS}$l@ASj|1vHAI@DTIYjSod!><^{=Irtg7fLcHQD
z08sth;Mi~K`WR73a>#CDm5lj!3%p4+?;n|ozvU}dt|E-En1<h$?OsE*ju7rP9O?hc
zD&Fes_FkN=NiP=c#<LRx2U<}V#)QEv$dA#-61r<aP$5OIT;yYyjY%L4tWL&;pnqnV
z2nwIScm#w;vD&-~OVN5J(-*XN^s7t3I8KyUwG0f1WZ5C_m?02Lvg9HHRo`W}Re#0J
zONmVq-0_X}JqzZ4jQCHmkp3zjI)h0aXJYiddIjNUDvr!(58EFRPQH@uWZ;rWAvcyx
zQqN;&5(l6D%4;z^IK)0(D)EbGEw^5KdI&vESy!AHL!wZEBoF9!t&P3yhs}<{Q4(k3
zTMt!F-<_+JxTUS2Jy>2?jtom6JP4(7B`cqp!KMi-%FS;Gl!TWu$43HK@Z@2+NcV|R
zG|*nR!c|ZQAr?N{2DC@ahC_IcyMO%6q;er?6jYg+kl#)mwGcavIY20KE$C6=n?l@s
zPfC{@DlPYuc%OO=eMyalUP>#T86sXKW4+DBm|CIy2!n1-(|x=r!;cE$e9wxbvI(O-
zAw7gXON1W8a?#oe47kh*4}p$<jBva?c)rtli?Wv{RPCFIE6L1{w{B<~Ef#wB%;-D6
z3ro@iR0DP40xMCUjDA66$1Y<Dr@^S<Q10-rWh9pYe&s3(Su@|#4KirF@Nm$jm6E8w
zJl^U?9|=K!Uye})0NP1|Td^S>h0~yvmyP?KeH#&bg_GoSJ)$MIZ#3HBACue)!=8dG
zq+Q(w6AV+nKA>D~u@>ovb*-J3&$0U^(4){&a}E}f(Tc&BbJRuVj@yQC-KCe|pgr8x
zv8LcGqUG4ust%JyhzB8V@gsmRqkL<AvlH)qFelLRUR`!Hu^aVEN5mMUrz{-(oI_bF
z{KH1!MKuMVqK7dsEi1Ha7-g#T^Y+@EFr)zXCCC2r&f7r0;zs<Q!Y^;i_w7WsbhwKm
z`DE1EaV~#-BGKH4rgspBWOyhBO1bo5m!Vf25{t5yf(QY{dfQr-h7Zi7o7HeCSxFXB
zejPp9Bphtr1T&_`-mJqbUk!EkaY|Ej^k$|xbd?sX%gsJ1V8(k)x23;}&XU_l{zIZq
zZa=^ecjX+|Hc_;ry#S=-%Ev$0OKxc;?sJ=(lUB!tFWBI!ZeqV>yqWsgEKuHlJErIp
zNxFs<a22E?Os4M<OP104l#L5Xv5;yCMlIUfH}1})C#gC{Fz3KZYwCCeUYtGBj~wXV
zvl=sso;oJHg%<vuCXsC(&)J93Qp+<|(RPR#J;lu>JR^HF-2a+tSJ^dr|NdAgQPTJ9
zf71cYx3ABaZP>rKu?@wA99;y{4_kJ#2@Ko2JiOP9-(TOo8t~K@&0zPDSNwCWg)olL
z%e1Fe(X+7LXOu_;8;2B-$5X!&&)wGdf=Nc2wiYR3+D`ZoT(XX9h`jba)zP$ppxg3!
zjC-c6h2O3qXsZM4(XZK(g2tKO_kQZ^466URPdw7QPL{z=vdn0ivS<LQxt5Tw%kT|!
zjTC7ZL<(79xqD|`8rEK``;KVw8JA6l(FI`3`{u5@`NEWqk;vj8oYY4qwWNN5z?)KS
zXe3R|G~92#IOC?`V&C)N>@&SDxv%HX=ZH15X3n^$FLGBRk!=GyJZ(xHJvRDM{#&8i
zz`orVzc;4stR=M;aNu(%I}JvXo78HT^5G>!mwgt$Sev}BkxGG1+qC8kuJWZO?y1IL
z>tRpbL_=7M07Kp}jXxyZa?Cz)9~a#;Uy1OGB5Rf!5eHiUwIkLkjv;7iG8W`tm%$Xh
zpQ+KpABFf?WOm15oXP~jKF;-NG=!>y$lsutI@a=c)yliOQ%spu(iBN7e?!Qywdc~6
z_o||UAatt~7}gm`al=cvK(vQ<p;0;~2-ijOAtHK2n|l+;U{5?qSVn{%+KcWweBs0n
z5CuV~CgpP~OR{1H)7io_S;_06+bLUT76!K`UOtw$>MMpE1w)&$p#BXo)F<c|#($Nq
zD^P!>VP`OlojI?rcBGZrfnPRZW5mbbcN4Bw7~g9gjZmVq<GMBL9!^%U+vB<Jx2D*r
z`b<gzMETRe8zLcLvcJK6b>Il^rkXewh?~hr2WUVC%zF{eMbHR~$j+H0x9h3N^Bw0k
zHoR!dnjUyOIH7cLl0=grFsvfJ>l?YYeB^5p{+7b4ICv$JJCsRD<|yvQRYJ`GfIzsh
zcj`4mbS(`1XiQfg#DN}UB4tyjZXIu1iU>*{;ALGzKHdpF*w~fe(yc~1SSP+#06D9P
za_-dzg*d_uKu3W{R|!B@U#XRk&XZ`!J8J3uB?GtJy6kFLti5$tyGZ-HJ`?lMby5x3
z6Xr*~M2tWG<NAM1?L+^+M4~&SY|(4E4mhKloX{OQy1$l?zb4so`Po!_eW*gwFo9Yt
z%+mu_?+tKKNmH<<_5<>fU4{i+a(b^E<a@!4dHH140&b$6S6Or~RM^oIMl}2MBbw^r
z=M+rCrf5_n4wwqkm^LSH7@-nR8?UUFB=r>MBnRMV%4yR?R%Za$pY(S-kaD#>)tC!U
zaS5^3hR~A#ctH4qw=JNx80<4Y<NtB>s!dn`hIH}J@tuMOkuhn;2OlxDd$D9D782$|
z@^thD(@POTel0AFNRZdek;QtTauR~0kwvny^48rF8U5fPuK$_ExM5Zy7DsoVQH#R=
zfGzZI8AaNN_{v&v{2yHBZp1I7Ckyqyca}S0vIcUs#LbqDRA`^aqMck>n`3?7qP4wX
zPY6l_@z>J4T)4GV*@|d`92Kh2o%VS2Ckhw&`|;a#m%gTI&vj(D>elrJ*QE$?p}c0c
zhnv*$@K5D*fn4tRB@o2<b(as@DA&An;oSxq`pdCYO}1!c9?{IMv-wYz&e&dP8=!BM
z`GE|12PKW=T1=&U0(bUo-Q0!3k7iI-T?GZlt}|W3bvaL+4%^~aAfqddrsV^`08}8$
zlE+#(8<`XyHiq0g{OX2NI^!+{W=}Vre!)$K`QDUv!8U@YPv;TO4>2f}|H~WLuX)3A
zXY1zgPKg)yLhkpTOOL-GrzDGV)3ubcm3-t*`4I~u_XCWN`Wl>B*hzADz`>yf3Y5zr
zfl%@DFjs6Hh}D;8AXA|m_oF7_v}%hD%p=1p4iPSBQ-3<9_dtp0tV1rP^<xZ=$ynb?
zGdaqMLcPALuRw78Mw{SC7N%Q)2K*jAWA`o)CW@M@>ZObz>}*Hwqd7>hblaNO7||~{
zKm%HIV&2Aw8L32{H5l!MMC-e;Z=Xerq&gSGE+-x(ZNgfWHN>x`=gI-PD74vr%aIZk
zd-Ty<pRple(GW;BXRpFhiY|Ai(TrxGwwKlsyWtmjz&<8q{dc$<uG#zbDXBzz8z2~}
zH{?Wnn1ft;yhxoT{K420(S&o{V+<r4%KlOK;u=pev(02(pip5ATj$S1vhR*BVR;A)
zDrQT(ajuW>cv0*2lOlF2g0;??S+d~dgy{vV$9SW)-&dT{4zynICJT6yD!_yo@vOod
zePEA*gGC3Y?UKVFUWf26d&qAy@dzDg2o+Pa-^09AW7%Ie_GA1)78P?}wXA{~a7~sb
zPm&WMr9(!kn@!%k1C^%s{lyL56jJF+-c;9q6gTD=`Z;e(TCcE4VmVl_CnS2LTbWyo
zQzkBCRzf{E_?=cd*&h~sv>0~T@b3Ov;e-^95&nnd;~ya3$NwJI%>Vy1oW+Ga7+nS3
zs2l__!8^?c#IBXWKMRR#fh!543k^nF1g=f_@cSe7<~D*(;nx%<A**RiMMD+GYm!M@
zbUU6ej(xIPrzIz8>bI!%kyP0rQ*yd2ng$8izquPSdV17+wbG%pG5;l@K+K5~IQVTk
z*eiSCLEU8x)Gn$*DErO~tm|fK({GSmpC1c!VPj>4DV4&*OzMxg+f*vpf7KSsechVE
z#BiFY&cwr@0CYFCjtV{%E;a8N78vz3sG5E7Jf@froM$m=PUJD5ui_R2V|!oM!C&$2
zy&zp)yPbO!OCkr@qvsM@xXtM0Qc=vWpZ~9|w+@Ty`5wpb(hUj%BAwE!NGL55Du|$z
zAgm%Ff|Sy=fC5Sj(g=crN_WE|AYCGz(%oJAyIa2ApYQX#&$EB*+%soR%{gb{&eZ<T
zbW1fx6z>*Sd@-Tb!SirNZOvo7W}(H)2>2@bXOQDW^Di%n&mV=?om^xm!%>xqL3!k<
zW?C5>_yE~lw%2!QW3d^5g3fH2lZ8)-ZuEF70&n){BClL~&9pN%>iZLFG<>K<8iP!%
z`DQwDe$-wjB_r34gYCho-jICm;KIZs@>ItruT2vLce6xc`d#mbs`4N9^`9kOznR(c
zlY9AFx>aiQ3(6q}Zr>5fjpO($b>JoRPu?}hrcn#;7qydLn?0)eDW-MAEZOm;<v_L)
zFG`Q3^chEZu&g@$Zw*#F`xmYr>N!ilUl?)uDL<osXJNEG9y~se>`<lm*z-P<#I6-^
z%s63g3E<tstf+@CcY1uO+h1#2+h$;Iw+-Cm++}(mCTK7+#qz~FOjPCKH4-8D9E)Ld
zq!N|Qc>5F~<LU*-;Z~UD*%n{+g{-mROR7xpWR9G!l}7@H6gN!=3lH2*vf?ia)mNrk
zd^aGOQpckyH1(~b3x4pRS%U6|Cp0`2Az>q=HpppptQcHxGJhBg<MY0lSas`Rn4M6A
z1FeA>ezV*1T@hc4-bY7w{ruQo!mjgmJo8;VliiTRPp`<g@rOJe<rCwNqe&HA_il%D
zo*oVQmiY|@+z!e8GZLGtt1^!ycy?bm-}9ZGzReZqZ7u8C6Zw;#y8ni^SRoLlZwIv{
zV|KV2xr>M>|6!Ah7z^kUndl<(oET30X>VLKs<oQx$*cp&Z+NB`P0-8f{2&Q>Tux%_
zTyC0h{%K~@7p^_N<k6V<{ZD~2tlJB@wVBiXo3#)3l>7%WRiFtJP7d}@crq1x+#D;t
z#Gm{j^JmG7(Wc21lY8mw{J!Pt-2H^TEWN$2QfCtTm5&)p1kD0YqV~l#=pF^L#Xk9L
zLHJG9vS>Y>tnn;0Q%;u<^0;4>J^0b^^!oCJe#f}-54YJxBqV(k9$vdj`i$OB_*K9g
zNMi|w_(2Mz*RQu3SM>UMTYlZxH&qRHM|PNW%isq1wxpPd0Ygq<EW_sfQIKi*_Gv&W
zU(h>5JSpI;6QEXkUeDxr&B7yQTj~1VTTpf4A+4HDWWoypysXI2&yqBeYZj*UWjVDb
z?{b)aRNd)I9!dB`V<n1=3xgu`-Q2tjGYR*%lCmj*^1EaHaxb%41b@mfv3cx!r`8{E
z2-+L4CwY;L@fI)k)Bl-hpUHLgfD6B<`12F5NnFi54W8#g@n|g|8v4`1M}?pxpYhqV
zZ_+2lIYdzDKVCxPCdD(tMEH6|WQX7({@|(Ya(Nl;S@7gv+XRt`yY3I^Rl=DgZzj--
zpLofkJYx^F*S}NU#;MSgjC$=SY(*Kpm;*w~?b}tEP7XbXPFK`mg8MPO>X2F4l^F>J
zL|r0G_yL40BjLR8S~TnG<%M*z0Z)tL?JhQxGZ_e^W{tq4L7(5(dWYhsV+e7B5y>R@
zUHg=W``Z1?ah<V>#y`jY-w7n)A6tjMzO%k_e94C7o&8&toJ(=^*2`uMeeSIkkZL>g
zRK`~&`K)fgfu0xNXrPSG+w>>Rcnf(y8&)!qrPCVlTwIXsd@(=88=7s+<TWwHO27Xr
z(CyjHZYiSA<^bYYZ@!0;<}jb>y#F~x=Ws&Bc*SQ%#w-?j%srb6weIU%^Thug05)@M
zTnXz$=MOWyY4Xw^DknT$pmZe67s5wocrL6KIM!Su^;aAE-C$d-p=IzMl2R1%Lg0PF
zW>U*F3qHo1FVo8z4i_}NFLQ=RPbhqQtj+e!?X-L5!YRIzjq;}Kh=bPgiZa!mx_KJ6
z@|j~OYXkHpkAE%`d2#I^G5aTv;=NZ;Vv5<J<E!}}T3JW(iq}NMBj5PO%A3Te-n{fE
zs^<n|Dzz$TN8Hah%Eg@G&9MvH_R8i!Fu~;-+n%tf?kAm>m#sV=%sqH9_hx}381HQM
zGGPDc2Jq|PmAWwFq95s|i5M+}>1kHni`MQoBOlV)t?k}*?_1jdcBZ20EhZv_Uq42i
zy}`x=a;c%Vq;<LQv97R8e@ip(oxQImr!xCr@2)7A#7O4<rrFaIX^?IVt0|N%@lJqu
z3RtM}Z7oiCMd5kA7?>_JzvEm_6)h<eIgm#Ey7=zd)KA^d%l<Zxo!+L6Q_j8pU<7o~
zRpZ;<|IxxR|5$HTbY1ND=1%#QG2QWzie@M$tX*)E%~o1UV06aEo~bB~iaOBH&Sva4
z?5kJq{SLszZ={F8Mtw8(=K{o>(W>cImQwqmYP8P=)Y?FRV%>o0T2>M9Iu}J->|f$~
zf&9Nx!+I9UvJs+Z3G4s987ZYkr^^?9Vs@65zg*}Fo9T3BdoL%oTH`b8-s0JQP#yGB
zd6437-*DG+E2XMEwpVFBwPZDJ+#P{5(kn6h`(8Wm)aQ?-<P{vplEPFBUpR}JgvtT=
zCs67bhEC&V0eirI<rFUYIdEq&SFO>Lhr2%XV9h!3dd!Whec-Im0^je$rjK`G))~^^
zDpmY>15%R8)(0Xxj<<Uig6l&d!(6|w>f!CW>3tutiuTi=R-?S8e_+uUe+5{J*JV(t
z<Qpu1SpW0FzQS<(NG#*y3(M4#`k7E(;Wz;YDqa78i0`no`ITPPtwrRf$$xy)V)(AZ
z@?D&`X0|{6V5l0Y{#veILA$w>^F;+*{%v@6&4VMJIY5#*aKK>vnLD0zjncEE$yRRu
zHmmmt?GWI&ko<7Qovlc}sA}7EF>{hKzZ{ljsPQeaD(@-Pg87?|Ucr|Ji+^#%``WeE
z3{wyi4Y9<>;2r7L)E}qlA%_|^{v>+lBK!BluOLDIK|<!n{VOps%6xZCf4%=mT9=x{
z^RDj0AtH;xzbjxjP*wDgRL&2J#fyx0<pvZl_8vSK@Ozv<bi$h19}Kx9eBfczarfPX
z#4i{pqgTV@U!I5RGF}|XNRzXNyl1lh*fG*L=9)A;0?ZzinUb{qd(Zau!fttcdC-{U
z{<ab?wJGhw8(5}pof*M<IpRp!DpHdxk0-st(6d{oDHl1PEbklr(s0rLlc~uOjc2Za
zY^kIDm5`d>op4K}68=C)&Qn#-ds@js*C;NR=qsQ0c;$XSsCIE8s!f+|Wf~!|zI%%r
zB1@FCKk|aaSM~0o%eo5CMG`*5n^hdCT^+M4M9BY5ut8Ukssb`f;c(&lvn)!L@YvG1
zzQAxWko<~ekA#d*+r-0%LW-w%i^kTU5?r*QO;#1vX~)k*D2uSNwPhe1*;*RYOmUNt
zTYH$vYdq{;R9i|0-pa7B+0K2|wzZ(hoPhu-%J*NtTpPYHn|bA1`I$NS$6{*%j+3;!
zlb+<W1#oBi+fAX|m(CT|ftz}}q6P9@ywizpBYWgV;zA)wXS<L1msE&4%I+>-@>CgP
z{N$g;adpDkv!XQVfp*0uj<>fFVOoLq@b3`kz4^JrD(5A9zbgS35Tmyuz$+kT!qRx@
zs)=D!c~5!sqC44|o=fc&L|e%OUBr9jPl0bo=3DxQ;)3qDYBWL5$4ySR=f6Vik5kKe
zl>8fIY~Ogf$R`lX9g89_{5#t4CMJ|Yu<Fg8el2=*25uM~2vfc%(s=Na&*#}MAR;QV
z)??mz81lL>_@(h;v|oqppu^tDTaTksHkMGm4TmRJX$)77Om5zL``F||{^ZVE*Zd=m
zV{1`+?m_>@5a(Qmh@q0<f&;O2JPK2iy*LiVr>e+5h4SC}U9K&EaS&$ra+fc&sJXl-
zs8yZOxBvLqk|O*=IE??@9znAUAic3{6;J+5FcP5xkB_{+dT~4Pd6HyT;^g$^h#Af1
z!H;0}QMw-;lkAx~DU)h}1vefQxQV8UiV{$FG}5B)9zokOH#%d{qrh=Gw{UaK1DU@f
z=OW^E<0aX#G@;_Qo!KzWoe`=d9cg`C<EM&)XZN@|j<;5;*}OQrerXYv9UEVGYhETd
z9!xpk^B_vpv*jy|sHn0|ZaZ{RdeTHfMah+^(WzX(U7_YtQJ%<9SaM!L$m6GyGIZd@
zE!H<;sYhjK8mEPb6l?3g1%bOuL%K{KFZGX|;9U{eDg32kCOCa%;q$N-)bx#omRi1i
zr84cU<jrO(4q+t)BS_`jIgd2bw0@t#;e!rJd|@T!_IzUK+{Q{_)7Fr;;=j-ojy|I7
z@ck3a(mJ^Ferx>uO3l978U<Hf@ZV5}+jRzt0)(XcUsj%|ZoL}vlvj&mXk4z49#ein
zhm=2(l#g2UkiYYn>h<GQ_4TciqrEj6I|iS<orV<MYkbcoHeBqAl$krz?<x`H@~eyb
zmf0lAPDUimFn=u@d*jSfd19Jza$%3~C0?2SsHWyfEq(i4g-zYN+%O|XJlS}netLYL
zgO`q!jc$4;?h-*Sa`KuzCQp^=-<o@D2wkXH6j%^63tBb8r=L(r_|SANYOoIeG++Pe
z<@${&mB87|UQM<(3*;;tTc{{@mXGEp=1_4#Y#6>NV8cCFjWpVM_I}xlqfcRcK=AI%
zCr^b<6kB_q=mz$$l1clvEcU!Ragb}B-0J<KL8eh>T=bXH{_$6m>El;HJG+N0B!8x+
zUcbD_U3B=dorRb1_F_#isncLvYyyuUyw1k;TfmQkf!32_CHCCZYFFjEaU;2DiginS
zClVjLN)@Ff1vgz&fyy8GS8TeNK2I8{{goeKSk@&Y%=gk)E1Cglq>_MN>^-XEc|Ena
zW${wo3A!0*JoOV;ES+5ri<JBV4?Vua=!uYWy47Y`UC1SitwZnKrmLIlm|eJF*2RRe
zWfJVhK<hM<#MY#B(Tk)r&rF=^RpVSrIn1Xm7Aw~)zgasJAEw0QEY7Z1@8`=PPc~;w
zqQ!^%^SF1^@v==u3FR7&3b&Q(#=aZzGX;1}#Baae@%MZA>dM9T&k3|YFXUCJJaYHR
zA~xsJgCB6;gr-%s2=FPKYc~{nzZ#UlSkw?=OejP3nOZn3LQO1iLXcrz50OtW)ZgcO
z!~Bkd&$xO?n8N+w>XMorQii7D$1TSBea8Kp`A3A3mOCc|(}w3VONW0=<`vcH%dTa3
zAJxblczcBXyQ`QZ0i9-<oWpM4-V(I4l{jxiw&RU_xYJT@z0Rk}G3*?f;cuhU%&J!#
zEM#$M;-M8n6WQVJVDH6xQ;e)2Kf#k_Q&Gst$33G`O`nDr-n}MV5gM|rtt6;IKyqRJ
zGef9(WiLmjX<PlRaOtg>Hq#o#;EDKYaE)e!klN?q3T01zy4jZl5ya*D&ZDC1ccT4i
z>L@c+l5E5jAvIpp1FC}l`+8HX@!0}zAvfFd`XgVC`y)<S<Op{p{!kFh&BHF|J8{2>
zQk3)y$St|{E>P`Ch0I~v{!EYj@g-cyxtW9h#^~@pc0WwGNz#xEG=T)1VTf3$j@(L0
z=J$57<<%`9*g1jh?()bQ+k0x&YW<P(^x|YY+xIp+dUdX!@YK!PCwdGVMJ@)-Zqxae
z=5V(DIT?CLQm^c-`n{~!$C1Z*Z(8K2PiA+Tak60j*}neCLBMX#Nwmt7MdmrqL_$j&
zn(Pbhh1B|Ew{1JPKi|*Ux3N+0raS8Ss1=&O!8oe$gy+-KK^jY5U%__f$<e&4b54^t
zWAU!Of`1l!LU)6a(5ZY4F&=Kk(|%6-SB$E>e&@g}a?To``Yd@Ok`H<6jvGY0sluG2
zBZyt8xap;Ik8jA+j@!9r|6pskd|`IJSS?3S*VbVNV(6KmS4r^c7kqfGuq(Ma!+Tqc
zzp&WQ!)m_D?UB!B<2`p4gM4z@pL_a0>DVu`XYf8=B@BAQ%vsT2pe4_Qe`TV8wtig#
zuQY_3o@K6%T6S5Xmez2;^vm}CG^8REFMz$n2-e3qc`9VzzFCB1{>|X8)<N}`fyuRY
zQi^0#?jdiLMg1hr-82{C;bGt7Y?o^1aZ~!-w212Ish0fF<6NYE=-HCRKh8WZV)`b4
z?VBgjiEGO1Nv&({VbAvKEjX#~O=rGTLZr`;`wFUkf5hX|&KjP&;^urRik!>X+Syhu
z=sSJN{O$YMgT-nOcN(~(v`QxBuN-fy2*&i5E~eq9{FU3D^T@$+n>B*Vs*u+c3R(pL
zkee@vGY2`kDgE9)t>i*fxU(kYKOY&1RcW`fAOAU%BDlzM(>E9||5a@RJaR1TdN)*f
z5USH~BcEyc@3@a50oVI3W5@VA!Owm5#njnNy*9k+w7*l{ju-QgP4wK;UppN@E^XYw
zZiaYsB7p9dwLG|9*_TS)HPadPi7ix8>KTvJP?#;nnR@(A<&i}1Vwhlw@Q_XM)?c>M
z>_j>5zrw;3KReHw?{z;sE1y{m;z_`J(dWqLCB||Py3b2vT9$w(M<IF@px6ZOvM!5d
z;q_g*q;`cR3|z5GAR?xC(RK^oB=S7;aq(-tgslo_7LR!CK(9mME&s0<lXu+-_iHrQ
zpte!R^OB~F1Ri{~#JSzN=9Y{qga*@I6mNYJ-~&qB?PTI}b5Ohex4N{qLvNej->#hZ
z-uvuvmW*_E*gW`mTqU@J5uNpy;^K<&xovx*{d-^@$kw*D{;72>s8=Z+FXKg5-t-y#
zWpu?6ld<MS7jGvH`J;Jn*F!f}%fBYA2W}aa1-+xn&qlPtQ>HFHw-S|m8hGhuRZvgO
z@_6oC)*p3(0CmEbKPvcdsxEmdZMvCu6Oq-d!%LxTjL)pXX*zkv2YjCJLL_fmAIZsl
zih$sSMUjZT3HT<*pgX;L)Gx-MK!kVy^vP1;8h9b_FR3hd`ah~>3+|UyLfbvqUv^lA
zIzGGyE*wbwol$2!tF7S+LvGmO=KV<y9m@s5KVGKb`F@y5ZxUC^h2A#r`HGYBSBK*@
zr#XZ2NAZKs<Jo2sA&{VN?+u8lq&xGCJ!(0qOu!WIme)>zH$QS4x#P{{JnpG#%w)mP
z8$->1KI1GQwWe4vLU%x6u+wRZ<n4#P6z~*(g|4SX<OBN6Le5o&A*1c{_c+CWmU!Y7
z(0*&AnC$e3kjVW}zU@u2W0QAZgOqh%STsJ+=8{sob^T0)K(+sHPS3q~aSC0;R{SjC
z$0G;LhxSz+Cx7!(|4!4SMY(?->W+;G9{=Ten}Lk!hFw-$1R*uj)?0u<Gu9Eeq~2^x
zBnD3SH``(}UhrJLIW8(EaEp@jnaA}h*govc`RZt=3E?v<!xg<aa*766Ztszd*N&0b
z83UV;SxKnyMnBzt?XmbfA%cX;g?uA-HWdiNh*B2#DQp{~p&?CJ(3Enx^SSEcX--#h
z)4?+BLSR8Bau$D2N|wt9QO&3-L_&5p?Ebc=41$;;+XntXWlA`w?b4bZb`;*P^VBQE
z60!UFX5+QSZn(F&v8u*>a4{*A6WT9zPJuCp_r<DyyV8F+f0*pazK_)OR{t;Wn;<g>
z&-4kO2w$8rO5euJN`^}|G&(fYop3pe5)MqbtFBDAsm_d;&{kF^g|OQ{x!B;cD19JE
zEqAiBF$U^zpG`LnNPKBR;^THIZhn5SJHZU^LH+rc=34hhL)Q)PIPGi5%+EDjIr3F1
zw<0N4pnF#!vzG&vBp>Wp34c0w`&zUC;1E!wI;%?Yhnr+Pz$XO1Dfx=2#5<WsPret>
zUc0Nmla%H+1gD^|b8HYDs;O$oO}QwnvKmKmO`9CX`!>;i`>c3Gnp;fuxrhF6kyhu`
zZ>PPct|t>-n)ke&{yTqX0`m=*<jhnoX71%?4kbg()RJFeeOPnEVCnd|<0cc@I1NIR
zk$W|zX7t^A0yW3p9u>&H8Cz@e2P}td$Xw*<2aySdKx4KzcK$~rH~j1MXqr>`O};+5
zYraAJWa!eeDv6N&b8|(;)Dqvpap$F`oc+N$aA}$PoMEBUvjw)NE^JAz@m>rkI?u$9
zpBT{$hS@egyDxTmM-p}`+|8uu>*0RrsLSX3BK|46@h%A+Z+tRn-w-x7dNXP;ilu)y
z`+h&r<jx#vZCS%RGx52lgD&}S3-7IZzjDm>S8&X7D1iPX+Y5gVsbGP*z6tyq`Bw5L
zHZLlV)zHDxiF3!D0}VB^-jpSR+($WEBLdlHqR69+0{O~t?=3cDZ&qK)cR}mb+E$tH
z2_HrlV;~dHt4L7X%<I|t%jcb9NlHQ=+NCMl6cgtgOHvTBudP2cbn?3qx`MdX%KUtr
zVxh!Ose3ffBYxgovf*s(>W}uaZWcn;%xn#Uk{j}=VdZ4V<rPA_HQ!+ieZtY_SJwFa
z{gW%?xir}0LO#>|5fU>QmiOY&Je!z^>`fM1#!a4uV{f*R#6^D_nhf_I&H3cW`X(hO
z-}NfNy%6aD3c}DJgx<n1@yXHrx~I_bHu)hRvPb@-^t#ufNjCM34H~2~ySbsYre=ri
zRhs9vfc8kxM>ywct?s+wjX?anjqc8BVQfp{MT9p?)Y7L)Ul>CP&y99-KQXgF{@t3L
zZ_xmBEBiuR<8Piw4$j(sAf^@KkxaK}38Zm87edoVN3$*Sl#2GP#a%>6j|a@IV`Si(
z4Rfegw@p8zqqXd8KCA8=HNWa*M)lDiXZfgk?=99sD%`@dD-R|@@?s;TLm~eV>6-ET
z(!zHzi3{!W6IF%zrlS(_6UfO2*S!vm&is(4$Su39I+5RF`&18HCf+g%Wrm!I^}lta
z*(eNNkKQMrYIWsLQ|c34Tt8)EIv1a^ekCf4jAq~C@v-%54%VfqPNYElU5yb@n9SuS
zjve=ICiq|*RC4KWl;|(GjJCqx^w=hLIqFA+OxC|#51rpaIf7mF)E~kc_a@gzp`W!w
z&bN)W^S*Cfu|F#mrE0p6c;!EJ>5-tfQCLBds!G@>QLb!cL{>sAf;?T@nrC0=^!K$L
zmt}TkpD6P<t#&qi8~=Io;IG)>Up6n3GX~@$QnzN0+RGw}(M`@;GORRzx2pOnbqRe!
z_52Hh=GE0WS2ky)`>=02BYb4qGp6QINt|y@0!Nm)G7as^&oRB1C@MSBh_%5<+@7m=
ze>Qcrj2qaESzZYito8%vSVPb0AN__Z&YXh`FOjPI(u)O@h>_lr34h0~IzI~)!yCN;
z@vAfAqqiamyIFQJy<+s~w8h=wWQ-bj;0B3nA4Xk7$J1gs20PmQefj1C*yh7OPhN7S
zx=1#|HhSTBSfpXwfL-3*i_?4C8#%D0c{c4W;Jv|iR>{FUQ5{sdQCevjhd1>MFJ#@Q
zVVqLS{rlVVyR#o#iZ?!yO(-KPwmolyhXHCXE52KUzEWUih1S-yY|E7>C0wdptrkk3
zG-3KJfk)b_7|(I_si3FLkRZW~2e}x0Kg58BlfFa$4lhKClT%DQ>&E+WdOv^4w7}2@
zl=MpQ&>ae{cL=pVFfEb!v?`&oMC0a76A!z?ZH_QO+%S1-7~@Tpt>X{a)-cQbH>u2h
zhaPS$w*1{*Tf4V%$@!Mo`r1>0gSpw`O6QsRiPL;$Fft<3kbSk@%_?^DNm?ek5;T|B
z9t2q9*)U2y<Jy>}@HjsE=GvVfaF+YSk=Q%$!=mcTBBpD9-Ofx4LS8(v)DPOP&@!@c
z$7B8seRKTL60t0B<8nzbb+oVC%4Dw3pR$*&rVLvozI0~+snl1jB+@e5E_v#h`kSbV
z;S*I>t#DE*j&?u=g!GJ0R=Z{wOpy2YG(-Q>9A=Tamh(8Ra8_R7JSq(jFHH!#y|c)@
zwR56P?3HhnP<Y;BJ4fc=Fkj}lNA|D@*@IL+`|G{2&RVl{v=betpp&3A`J&gSw2<zD
zdJEf+vVpG0$3YxV&MhnLm-N#&aAtB5z2LCr>fLs~DEPDLy9EK_y=CI%JtBEyh5k4S
z8FKi|^4Vi^HH6Q*^!v6%aRe#EGO7q6&RtXHDiM`0@sZC>YYIj>5-!R4HlK%Rxaqx`
zu#m46Z9>*lQ~%q7(VU=wtVXWLe`Zo4;V}7`=sCGkhuxyRmASR%T*IGHiwv7t*{|VZ
z@ZJbhl1jFI&qd}0W41F&&M9zg9s;*nh1xD23xLOiMO3g|OaZr}e|*o;yWEyrX<aM9
zHq)pSX4)=m2>cp|Z?@vd3zK>xM9PT&s9MNs_0^t9&A?W{v%8n;`fAumr<4L$NF#P(
zMTDzD+qLB2m19l&)E9~8^l)RG8I7M5sC`v}PzyGUb%9^ANTe*yb`8vMx$Y-9KSSCg
zeO8c3@-&BgrH$j|hPMuyZvgH~T9r;uj9zk?ooQdu-nAe*eN;fUOYb@L>tt5S=NhU0
z#Ps^36PuSd%}&rrxc_2ZA^pO^?>|)2`GUbT5#SzCcf$+a*@c9YY5~?o71t<2A0Q%0
zerHV%5&w9?Q7HMRMXA@PDefIP-JC8bSDnmRWG%8h@no#ak{Q<p9A2WkK+T)Qlbg7m
z$zUq@{!?<>SeX3vllGO`?UzHyNMy@j$D^Zx`dfL=F6;Bmg^jHQlK)ZGE)~va>A)-B
zop|f|r@YY$JiMrc^d+1<$8hsm>l>)Vm)k#=Erplu(+0<XeHH%1JWI1$ZCLr!sGAQu
z_hMeGFPK4UepQV)QM5yfP@S>o+BMS{?^2h|Q|ei8Nuc$0Ypn$?e3TnwragW(7CyjC
z5zJ)HbovDZB*!i8*EmW|!H!PXnJEZwym_%hp5lt=AmEWk2(b8MMR`no%#C1WckW8q
z6#@kM2w^?W{6uu+V~uC!^2^6av0mR<VAjmRyUVHD)F+C#ILyliUu7|!LgrUWEJN0<
zDyA#xBHtoNI?E@TgTmOF7m1Tw7blQL!M|`H3vvw5p+`kL|ML+XiL1`aCz+4VqTVx2
zY=NHB%Xh&b?xC7KVNyW*nj)03IcWJc!CY$9)Hysm>z^EAiel^yRxu|%MZiVEqW8yb
zq3%*DPxQi=n;EMn+O)uE7NGT;>&qgdkRmW80yfL8-wxOhrMBOYR{R1FbftVixFg@C
z$7}zbD0m4W1x-q9S)`VW-lmrOxUK1;j{ejW<pq|}=fZ8B7r~wc^d@}ZEo*IfWfS;g
zLr#Ia8}C6q=SLhiZIN|#`gWJOl(L$*AsSM-{y;k?U}EGox_Yg5PpKcUl-{qdr5h*>
zC1LzXA;$h^UH5o5phqD-fSuq_iWjkE{Z<=+f5`>{h2E;FkTA-cW}6Fald%4xzVUro
z<*m+dyj7)QKZD7W`mUKB;&ut#68ele`nDINy2c)U>|8;(WNTs)?5zAaGK?yjdWiHa
zNj`khaN<#@^nEA*=*+M_b-lY@8&xRN0rN6(>Y48$gt6$?yxKgyugdk(yLTpL@L{hZ
zyK6XH!5sdvSV8sv<#AOW$TqxglbpWk{AEV!tERsDrrH%@`;|=81mC+$ZI}(AudXBz
z$+@y;cpq|T;NwPyHbUrG3?d1Qt4X+X90%S>Q?s&qnXiBy{HTAOHT1?H^31uxYu%7D
zX5h;uG7-XcQm4@j`p~HZ#Fh)bumQ>NCNSi38f)|Bz=)FSuC(q^Z-4!_^-iFTg5XE&
z?Ubg8FuG<sN(n{7NlJYddzvSP%)Kd}#uVK52qS|`WTc)kNg-P@uFA^N|MNWQ=-nsQ
zdGa?*v0sikWcO@uL+Prv)2OKi%*E>d4*E?XL)9k^DhAh2*S;#)q*m}C8Om!~x4g&@
z{pUzE-l{5kA4aJ%HaN%1Dx`eMv08#sHM}G2qs*6JDw@8ur3R^g@ike<Hh_!T`iph<
zQ?CtmqU*ZS)l#v9dxiFsTOZ?yFcTr=)eAO~#yk{_ZWhE7^%KHQj|xAovcF1*NtRzP
z5sNqboLTsZBcQf^ForH(DD;`&wN?D$a3%Y;T3VL&!A-BKq;E;1PUz*AUnkyP$Fyew
z3TQqZwg<<&T@E6s<!^X=Dx@2%yT9==-`nNz$h{U!jB{hSDBGP6j<pC5CO%&)gxqp~
zTzvcM34y(lZ;?9QsfJ|=k~se>i+lxavG0XmK`goYm3n|#Bc<4^iw>^J^bp^-VUui_
z^L-lCJ<*w|GurZl7K^JLxwU1Y7~O{_)NSpvQsTpdki>r{2$38+X=S-4yjv#tuSa-{
zhZdb8oY$K56k{2?zd_qcZ0<-g(jWq1$D2bn?WYRk=tUN_>8Ztc7+>aaDYlSq;gq<b
z^2DAh-PijdTgeIUSassu;hf~NqkvjNWWDy#U~S+c6DvHv)w}pQ(bCZ-A^((NktA}S
zyI5-??7Th`m6FnRs=ptUSlS)ns+7U^sXbSn(yFtC2<cZV&T%|)cYEC|0+n@fkop9Z
zpv3yn9O@@zWnvVNGcQJf$^f4#cVL3Ru9uV+pXq`Z<tyJyG@ST9X9bz4r%uOXcPGWu
zkmKHa$=y?mBpiO=@VPU&2Yu`sxD!&&{DDt<6Ki`M+1&nm71!44Vc$OM^H|`{9gUaA
zN5!txC(7I3@N*|Rh#&O=!B)atK4qmTteJVCx8K{Qc*u<e$;y9NJnQu{K$y64W1W+2
zsNXr4dd3vz^=>+aAAb@4b+D`Pl*SPBS#OBOP3#D8OCmKa`MuHEf~b59i`Nwkp@UNY
z&y#E(o>wk<Y+oWa_3=73d|FtCpoDDB56;RL&;?&3&|~(49_gu3O=_%M9q~yfWKyMP
z{xR}xBndCZB>Az?S>iic7v8NC{d9{a&KUV#zl=8Qq-?WQy%_Pzc$^r)%5y6AT8T5~
zyJMcN(SFbi))y(M23&%FwxNS35rb+*oIn6Z%mq+3Kf86s@}fI*&`V@Bhr6>st*^$)
zhb;#nxwk9ZoR8L|IoHQK-oLuea6(NO@EyEytjyyT6fcpjrtnanUe=rA_;5Kba&~yz
zG`}~f&0)UnxNV(!Jx&8NT@ya=-mM>A=}hGhza9xt;>~E->3f?zy(Yy-0^ThlvKQ0>
zlT&$8P%0M*L5)y29S-Du57FncgSOmki|E<h5_`42^t9g?yOb{(B&dPMl?HG~zO8qw
zt^`jfShr4~<g}`@7TQQIMZgqLcU~G5$ls7Y`Tg%80Zgjw^j>RnO(Ynvom*j?mou_X
zhsZC8|0-j9I$j)oWZi4~!VdJu8sl!}F@vA5lM)y|0iNDx)_qx_*|zg<T-<~;BZWjE
z!zj%w6v^SGpSGK@9q(W8?`Svo8LN!BId8*PX>j1NFA{?Hri#-zx*E|z_^BM`b)nG8
zR0O4qEnRTmvM3c4=N-`<cqTff@b+X<(!y64*Jc4|tw0Cf8zW-l7b3A?%CTWLr6y|g
zvoMrCnlnK#H2pVojV569p-dqFRvGn(Ha+LWxvqN=2@}fWF|4aIf?8Z*9H@DL@>o^H
z;O?LQj%q^l*&Omjf{2;mSEaKH1%$))Tu{D3bQYmW*Rr5#onCl8>f8Bd!<Ix(816I~
zT&!t!oDF|GY2{ph&CbQl339V}^6M|(iH*wys6@k-XFlxTybnf14oTf(YcNI_3e>i~
zUyI~!y02x6ZXTNfxkRWUS}^@rk`lKuAAsV-%3+)6r!|>WS>V3kIlIha&H!?8l}a@Q
z)v?)9ECewEy@JH6l9Ky(X(C3Vj<gqvo-?w)F`{)V!9x>u;W!O9P{b|aY(0`<BpR>g
zsvHv9D6YIl0p8z+zWj5XX>JAoI1;l<3<rGEn6OY0QAoa0vlqG$>JKu~fm#4+HmpCK
z#_Y%cr&EuQ%mw6C?)w`RRu)0D;EfHaE4`Zy>;C6E2Mmi_Bhv;%PV3{d`Ji1HqD~bH
zH|+Ym;LGse_e2;y+4`?J6&w$b%?22Nk*t&v#Zl>}({tD)1Shb=T`A_<c2LSHt_ss=
zkirqP!5VhFb`UwH#g3A3{A@YQrIGBcHDBA1Uf+0*qK_2ae#bvwhU3Suofje>tsrV*
z$pk836_w|f7aK7rZT&ymdJCm&2k&BDdk%upplv6+A^kRX(<zQbj$5eL*opem5C3mh
zY948`J|EkG=Uj7^vry@bfrX&i4LuDK`|tBkw3==CE1lP#l|bS_q09`R)sa1A_qs0V
z|Eg|l51K%<Ggj#^zkCf0HqExE11G}`8_xp&Z>OJm36mgOso7ln0Oky!yKJ^a<)h(-
z_5VNe3m<8<X6mk#F5m9R?YRafh`9ioO5ei;-yrM}IXF=}97{dBcrg5U=#(n#GRV9h
zM$(XfU%jA(6F$=TH_&&&)#3^jbOfAttD;AB+fkR56JJ&I9V-7ipRmsmis24aGCHGT
z3Vu|y@(|~@(5Oa@Vqb#pI0yZ0k<GPZQ<U5ek)_U(vL8nGpEP+Rk+nZ6Gc26S{dp8r
z;BTVOA-WrPI!f;=tQ<VA_SJ7n{J`v4utW7zkA^JVlGP!_hTuHHy%}6`ET|y3F?gq!
zkLdj5=d#K|G1;+?IZT}|%EPw1WqWl_4}s#bUTLGXUTevUn%!dv007;3>6Cyq0|e4-
z*x@ilNB|ZAz|LJ(9j$b(ULv3*7!E9CAO6)smv>W-#rrN^ZvAA54~*PV0Cs*aPMc<u
zqu;ru7(Rf0uhb#@34yQjvIA~SOL(Xk@YMl-d^2xr4TwS*2?=~WzXA;ola>YHbGR;m
zjU1_fsNVMxqF;>68%X8p89o5IP4VzjB(p@&rGp~hTebF7BAPzh0Wg4oK*3i3G5SRw
zi^Jp8m9R=fz+VZ(;)}&nswo9Pt?}?+%LW)YyUI8CK&7GrU@eO!*d_o(RSJ@nZSIJY
z1c2zEr2<xXA&|V{_`~m5M3QP!K;FoY*~P04AMs%c*EDFib3^e_;BXXp_m4T`iB#*C
zwNG@~_aJ$c^tueFcYt-G9RQzq6r`ZnoX<}bO%2XmyNx#~A*_ew6%L)lG-pmi47hw;
zI=Scmb$u~1QlB|lMVv+X(;tXkZ~W{~tuh)>Rx*f4^1HD|3MJ{BiEPO4d)#^bK-rU^
zCO&LaSq81wTkFaaR49Sm?O}^|PT7j?QMZM;0h@-cWp8IR7X7d&ZRbxJD{(TEh>>b>
zF)PhE;So!MmugTJLIm&YOmbE>Vl?0Ys4Q1U;|xmT;bXw=97Ftr-cVXw&6VOSip6dP
zEwmq*@{G4d!%__-Fg)zOW_ZgQ{1zWD8vaT@R>V<vl9>?^b}w~wD9C6QD9e$!|KeT@
z2DERs;`K7wupv<P{w^WGd~_zQXB)WXO*b$5Q=qnP9z?G<M?_!dIw_it9Nt;xzOi>8
z?^c!C3U)b<ExTE7;!O&~r@zA)qn+#OdtVtA<)O@MK>#M4bAcvNnws=SU*yB_OQfW5
za)Y8wa-2Ghbe-+z>-41n#G`B;b}8qh8SdYkmQnV78r*<OlG!CzmJW<ggRBPVisoTi
zAV%7LCYqw*%y%Q<FnbR-i3pfBF=88~7+N%iM(Wa*DWI4f34uI*D{7L?Vhr=Te57v)
z5Zm{>xBp-}0J(sB+T~-eWinu}ECl5I4eB);Ta!Z#2^!OQdj%d~GyDtR_tj0jl*f<r
z@-SUwG6W=JvSd_W!S0?KQ2E_5K9-FY(@Apme(6M=-v09RF$9oY$J87Y4pMCz8<0ig
z6uo<0)zKOCx^$@@4~3Yqrm^R?(5FrepD`b+wW3b7O2L+Fdb5d9L_yU%94-d+4Tz%=
zOho-)?(_MM4_Jp~lah2+GoJsVb%9@SEhTp@K($9G0Sz<>%78t$)2C=&5r8FFgSXGE
z8K~WN&>R1Fnja3h&FyU3?-x^`KoN0!iK>nkwvK1@*QtS$u6`nd`Qga0pgorxVOPJu
zCFrJY>l?_z_Bo5;@A#|NLkle4iUA{5%lN+Y#pmi=)x!C7W-9dLJqIs>gl0^ktqL9r
zlDMNR+J#6CAQ*e$C&GJwxlSUEjTPJNS7aU#0}BbpCO>NvMJu>uufKb7<NSF9y_Bbi
z5G$GoC*vOuf1ESY!M-f$Hwfwel$GecTSQJ;@txp!T5X8->S)pIrlk<p4>=jRe@d<1
zI0qb=(?IIVCAjsAntBfhGAVyF@1}UY13kxVL4q6_abBi&r`A}~YX)gN1vbjP6}L<0
zic}>dQi8zagy9<T-mcFuZYQs>b^LPc*=6mk92endOeeF4ZHKAS!@ERgM#{#rK8Ciy
za^F4H=l2@XnnSEv`uQv+$%1S#zDbH(pD@1YIlN|WtAw{q340m6S`@Ztg?7lWrlKAN
zM+;GH`@ft(eO{zRch|tBFCWt4LpehPx!z8a#m^2rp+f71%Cd_;>eN0;b~zHl7@br@
zP@8lIid?e%(!{^@ZRyiWwj?|#fsNJCL>0|gCFd;juC#l^4`u**&HO;s{et7RwSc0u
z&4P8K&kLIInVp^on-~#1K(p5T&=erLtFYla>(Rrq*wSL44ikV>J+psZa0BBC^T@M=
z0GJ*LiE&zWfm;u&=KL6A>I+*sOQY{(L#`bTyN;VP+-QtWiteE)HPRsu6WIXR0RaI+
zccO^tSzm8p?$q)wk<QGpElXtvx}!K+$)judcedgIP9cSpF@NrHFQlK3V(xproBHIT
zfjy#AU*^VI`YSXTg+Xb-WT#Z?APPDNKKXt)^4r)$-;YKyxqP%P9Cda{a&l`^7g4Zq
z4zP21cA)?x;V{bRZDr>#e0-19VT}-_-gZsX{G($^6dd%~YNPKg%-ReBNVgfRiNDA=
zFEl*8e1X{Yp|a%wv%bATn0TAh@GpB5FhF782z^&z@f!+MYAED!JXW`R{hMW8km~oh
z^R(U4pwF$S?Lq@8{mBvfwsx;#e+vQ|ASJOu9KQGKFN}p5UG!<_m-gJb7LS!aR2__&
z6G<up<GIA}X!xYRY!GS9jghZWsythRYT%csLj)nNn6|ZsE-5=gses8+0)o=#o3F=N
z_}Nrhbt3pO)Am$<u3AO6NqN3z#x(zsMLl(;yo?$!p0VDge;(aoYwG)<Qk?iHp3U7$
z)a}$^=&%oa4qAV0;XpPRzm4Z8cB3un+w_Y9V&R5Ykz3!6-O;WO%Kh@%{fVTUad%A!
zP!(VJ+i>OMmAdDS!67<N#XuLS`bq%PN&Ua7FI^^{R=X_&0Jfa$3-4?jz?nkOIG_3!
zRqXl(IO;PeHB7bK#&C1HSU&VB3n8%Kgy+lpB3gste35Eq2x)8CjUdv3Sa{q2VW-E~
zLvJluZ#_9-i5y_yVP}NTwpcnB4T}>$R?l-&<mR2^9Cm?uxzJ&_k8lV*N~%`V0cABs
zK!9I}@+zz>&Z5B%kCj<t*65AR&SterInjL;MpEH2IetysK7s`>iY{!$?+1<5-tBx)
zS|54(hss3)*N2_DEZm}rfl{73MaS-F!9fXDk0*7cT@mh+fE^E>FH4W{lbYvY8QW{7
znN<4B#r7?r48X@fWhEr_1|u<G=LiDrhUgH__mc8{)FGBmO}b%Maa4#7=#0KEyqV2z
zkO7l!iNbSzAjIy_5By$Iq6`DD-z21=Q8D^1t#P-Ofh-*n5LC?!z4rZR(Mzf_D|9(e
z^2Y!s<T8YyL3a#}y&OGlnZCC|fUE#GT+(g!weRLquExh~>4ndYdYTw7rLg`rv1`g_
zDpeBD=d*y9N7<_LHS=pb($ncX=bfU0-_*f1G{PfwkeviB_Q}?GGun<8OCin9dw0A|
z#}tJx5Ap`3MdC67xSZ9%h1Z*K$4VgY93CEcC%q%_;<7k#d8Y*}Syf8qg$@UPjIFrk
zqHM)<T^t`lL`pIkJNMdg>S%|XUe$t)oXo};ZK4&H=g_Tt>g=g#u>|7-gF+C9q{@A}
z!ua&-LB#ZJ=(h`*SmD982?$2xC5Z?#N1_M`2l8ET!NW}hq+ar_0;1o=?Ed|a&5qX-
z?z3Mm%j<1w%A9DzbgrF`E?|)T1czsX>}Q2$Sn&OP&@!f_!lQlZ!b2XHp{WIKdd+)i
z-KXUKsEoWkeFK0e@UW*y4%?rs=F41Pm9ybHU!+(!^v1U^h5hT;C+%((hKw*w7MhaV
zfDhQY6A<j^7Fz2zaf05cA+oTkCVvm+=pB<zcdgB=-TM{Bcs>6Zv+GtD4pi5Y1EW+B
zh~L)lVLz5Q?e1$DV7ILxMSCs4v$w|9a3aBp!5>T>R22{@tF2MKy`osf%D*E9VD2O&
zgV%Etw8JaDvCCIZfW&<IM0g%8Gg&THFy-fDhs`Hx@(1?aK4|P2GW9g@v^zR**?sj1
zZIlWVfgqA&5|YUa#^pyTi5h&D(+ZASTS{3k6w%WC6NW9?gYbd)gt^$^<S*#k*7QFm
z%DHEG+K<$9S1*1`F|6M>kiwWzdJyq&3%=QLdJP^Thn5B*Uc|SRP&V`}1!LznchCY>
zNR}})WCt;3bF;(6N1i?GZp05z9pgq1d*E{Cr~$+tSeeqr?BRU}=NXC1j34_>`ywVz
ze!8B01=R>X3&|Fnh^5o}pcF_+CZmfu6x@Y0b=hRDyJu07RD4Sjv3Nk<I#lG_znGTs
zI1pW>n-5G@7N{W*>j?9qtWag4`5=oh#|Nak0a%omz;L+}1P4ltE?v0gj;^y448A*R
zER;b1%X0#gVX(mMmzX4`K=-B0{a=m%aLUP!E&%$|huMONfs_ma%oq;w==CPzH65TJ
zPl`!1;a0TNfCBR0KNPc266`xc!N^CTDdTfsvE^{<T>l{*3A!0Y1q^<pN3GYF+<U<i
zC0t3Xt4z2y832>QHThOHi1<B7raw5KLqA4p()KA{;3YI5Y94k>naG#XxLZFG9|7>s
zTSC<6vML=g_Fc`v0~kdh=(G;lQ0Y69YBgp75P3L)2T*BruNDB*^I<U=^MgeCf#DN1
zuEQYW22+zUORxk-q=ym%^=N{M06zd9<6y@?)qKW~B(0`^DUf-<qRy#vj}1VGY>{D#
z79Ji?Uv>utTzMM{bnBv?Ryyb~onqh^5GNyW;FSc%957&GN~E(wh(Q^t@q=T65v)-1
z>cKv(rVL5|D{GjA&hd1!BPjsJWGtflVEBy-#RDc2aV6@l7|vug6)-T;U(l!lz$F3)
zqvq&*{`;5zEx82-KBE}0<N{WVEAXq|)6`WVz{U+cbO!(!%c5RIp=4I|4vU9K=qufB
zwWTvTu)&K1%5&OM5CDyKauv%3^uC!botZW<fKbM<0SCJ$%5_er;$WblO->{b0SNGH
zeKgfD7%H#54FT*f;xLD!Tq+8W8CI___TfH4RD^<O($Ju5A%HJYsWp<6V99x02}tsn
z51@d4VB6|`g`>w2+g3^wNY5U~s@-F3TMPL|VDK#fhd5<&Sb6L`1SRwk^q2@YT(tmj
z{y-g-rSz*RpqmF|BOOAQI*kD!D-w<=aZ6tbLk$4>@8LkS!MMQ-T1Qp_4kY#Q<8IJ`
zfI$LWTenU-jlZCh{5%}@3qBzC-?vKSfV}I*pp}9TB6?Yu0o}gDT?KRrV3>nuUV|3P
zJUs{z1$yuVUUoD9T-XdmY8Qz!u&*f6Y(Bs-wM)XmQ551|<!ID=OBp3rB!gE`lLn=@
z?qb-m1j@7or>(oFIh9dx0tAi8niQNUfsb&rqyNE$VW>uNR&CdYYP7@$j(!Q)7=X42
zBF1%u(r@ZZXcHg7(QN2YQUPNIfDr`+OqJ3vD`A`;LAL%YVGsLZ;|T!}B{)M6{zk<M
zicbT}sa^e#(|i<n{pYZvp}ccl71eQIBUm0LiFAmkK_#eQ87|{6(^h5G1CfN_kl=Uf
zGQ@&IG;2{TqoeSvEXtsR07^b$*^$Ufkjv8pjZ^}s1AiT7J`f46JLD;XXmjp@NThMn
zQoF<7ib|0^+1b$y!YTQCwNN&jLXA@tgnwQHe7Qi5tD`W)06IXN3x|uhr3titp#s1_
zgyk<@hZyw13zx7Jvb3aK*-<j{<ia*0ej6nKd>|zZ*9fm!*A4_osm1*#vgjpNfq?UT
zSc&NS6^Md~(h*Ko1AjEwV*h{u7C4cmFC|rjjp8^nQUV**8@C|_j=BVy(7cuTUu6NM
zLxU6g`{6}=lqX`u!xCzwc&7!V0(KuKbg+kC^#lRvZ~)q^*SElo6V8ESmFJ^pFEIfB
z`|p2IFL7%F3W*C23F#{M7tVom3WRZ>7AfN3Xp#VtW)y5Q4i=IQN>&LQDd6N#RO2_W
zjaR*01U-NV&dLlQqI3&=jpg6P&nRZ?f1wqJz{#=yz^zcmvvMAX%O8ykN3|gOB@^zY
zFY09u?j^Z8=pUSL{@WOK1ORzKSb{eaqY6>L_i)_30$u0-K-cu&W4j!A<9|!cQT5xf
z^=VN2V)em}Y6r_*-uD0efrBjo9PDU;!J1Iwv%^Me#63ZG(BI=i5<Dro2^7bFfBSMo
z)Of(TC#;N|^if6!7sLJifI>Whbrmqa+1o4taDokQ@TAD)-~Z>oDM&a1NBBxq)GL%#
zAnsy0S&1r;2ZOLN)^ortKttFn`#&W!TJNH?0bt`QR?gCC>P;YqOl(LQBn5k?07@WL
zp>Q;_@T71)&|7b~VF@M@on<Z;0jn%yt1wof8y#0yK*J+aihGIQ?}7~5V$&8__f|9L
zEa5>|xk8_t-Jk-1aco3Dz=|`;QIQTYg2R|4^BojX5LWq6HU4>&M+8K05@-K-3MMml
z_BfLG2Xy}TZ-)93TH*{?8;03!fvy1%QN>aCC6Q}@2lVaCSRwdnqoN;T7T1215$N{*
z`x|`qI~U4z7=41HS%lX$qs*xcXRChU4(Qxr@&#586gP+1Kmq9C+NW`N{6BwF_FKP%
zJ_MBj4nHxOg`2465&(`fvDJ6Le9_@CD6wU%1iGzUQB!XE#8`T(b@zUO1ny$#UC4HF
zR782<f5E!?BT8p^tT_CFVVM8`lf~iJj{6hw0i~j4PIfd$DKS~1Aby-%uLi?7Dj9-#
z;%eMu1qUxczlH)DTwy(GQR;u;Kiow#lxK`<kVg|G(4%5Voe-u0KC}p|B*lEt|Ka1!
zj`=lU3rY?zrl1%QVzibdo<@Ur?twWU_@oe{$Qn#c{7HZjREY_zPCpoit<~ONYs*Y9
zKtmy-+e|_K2T1TX&R>s@1=#{0>%yp1bx^1<rRXbdL5C+#Frf5;DBHHy4K?`GbcP`f
z7Bs5`8kfYkc$xNqeKyu~UKSz@inJ)suxu0oDfL4E`_!-8b6cK-K+x|DTaG~ege=GV
zh_I`*&CO#=FKeP)#^9IqcR3fO5)^27F~KO$Q@b-_8I1DQ_c}XH*Gf+37Cm-uV<?Jl
z;o1cI^sl73i5#d@6>`JQQH&h@YLF9@CS1dcwNuUuYPCMQ9iUAsk9|eYugp3CN_Z~I
z*j`qq7AeFYXjTq34L*51t*9<9AtankdC7&IhFKV^L~H70u(pkYc(u3JzJY?B3-a%i
zFR$g%l_pCJOhALAUF(vo@^(2>^g45oS3bcAXfk?s7!^G<?rI#hY_oZDu}jHi%Tu81
zm6^F3fdao&5`5g{eGmdiFoE6-e9-9)Y#K!81$963IhnHf(tDzaeuWUW9ANko1+v!R
zYVWDI{1ra=Tx%^?ZWCh$lk_tv7ij&*dauWi+QehyD?H_~Y4?|3bQlw`QO-f@<O|*6
zSte^&?#W8k3AU!c<1#tg^IR$pWUF2Jt4Bm&;&BvY@I{XSG!O8}<9B_Aa-h6l)!0x%
zb?@7s9XQhqY7E0rZF3(jRHCm3Ez32_pz$&wry2G&IM9_R)4wF5Th2NzOqMG{R;;&g
z@}^@HY^StUMgXRnk=kyi_#40A2pq8(a&~_$;%7^0vOkZziAIG;|4LUb;R9OdgWsH|
z8!wZ$`{5}`H@k0nfHnd?c^qaasU}2ldP*H1)UCWs-rpl7Sf!4RL0%VM#BdA4M@No?
z!a(wutY!BVHX1W(W5vH8vZFD;@C!&mf-d!3>j)FQ>Y4I!>U_=idd<Ff+B;_qul?Ku
zJm^6wY}Gs&*<n%Z-J@C4P2g)m-^PZq|12$5RGiBrwT!6oj_a!Zqy1gA_GEXZ)4BFk
zI$}x_qmTX+W_8ZlyOiyOz@#uZ9!W;7S|l6I)s{b0=>BmwTk8T|*^->Q=EaAmYmx~&
z^nn-0pZ2PHBmK(0v}Hr}uY-o4*V4xJ1=snElvp1h-H-&s1h;rV%;U#)Yj<+nSx@V8
zsn<RB4Vxl<Cu3A<qy;Yg{kR44y8MCjv~R^${`gwXWNU6K>*>}2^_s{2NNwR!EfU+=
zE<AMRjR42pKu)gZlwX(p(Tb|Q@_?7lp1b#6HFE4$73f>Q$BwjIL<=<>1FSZ;yO48*
zR!Nmz_8J<-XYAVT7`8<?!hV4I6E?SuIOEJ&90qMA`RpmZ<>Bd{FZF07aPm8-{=0m)
z<H@5h>!^+pWL4p$(EWnTxA!@UVDK?g13i6lbm=z;;G}nnS}38o0YCe^)z(Z*?a|aE
zwbwpUx#CP81M8n1oY`zj3l0x+xWo_T+vSdqHBB}8>1m44tWwt;S0)Ex29GY01(NTL
zvUi1F0Pv&_@jLZHs?>79;*X9q#m-?ol`U%6K8uQJ<GfQo{VH3X+kx!LUh>-N81`zS
z?}nnox(L5`fQ1!#KO6OHc@OJu@HB1rb)AT_oZB7M7%ra=F#H)qxo45jA;i%g`xb1c
zxdHhc*CiJ8z|TlztXrqTxEisZmM3f(40GD%i`S5wywhN__`dx(vC-xCm|&<s4gV2R
zD^3YOx#cy3c20+ysLk`ATzdRuBX#1qcl|Vmx6vEpe4Mm%?*7?N2i@R^xQ54uCY$G8
z@|1s6nPQmNVW#H#$ysTQdIXYNTi*^H6Y@;KxGVDm)QO~8$CLLvddc29Lt#@yV+#bn
zuO<$+<vk?hPn>%iD$ycBbUx3ZE_wix<dW@VR%bHW(CW)D)|y$QiriSPS4AFVQd6Bx
zj=V%{c%cOW_25_bY_bFAW(F+v=x6xcy{{kJBDaIe2urW}OuD9@Lqo0jJ8daQgFPP}
z)2@9-KJj#??zBv~l$9p&xHH*vT{SbI7R*$@hv@q-8+v>O&;2?FRX&65^%Bd!7tRw8
zN@qQt&Rt_WS)Mq(eQi@ZbK>hhT4!)YesI-|2kaJOP8piNEzjy!(uk8Aq6gzi3A&d1
znS@%sL;h4@V#LnG63f<RDHS;U8_2%*d%~nz;%M__uAs}uYzmT2&-sb7zsC`+CgfmT
z1fL^etg9H*8DXYM99e=-8Zn%o*@?+aUaJMeDfqZ$V9A9I>~Jtk4S>r)My12BIIp6k
zj#EjTOcg}Igmjo6v}b7!@c{lUVtXdE9}fDoprf!+wSKa=e^!v72CK$s!09gkuZbHZ
z;B1$4f<(A{pz8E-q2?N!O4p7AyVQUNkN(VlBc^YRd{2_;zQ+y@JyJ!O0uKyi#*g#D
zdJx-gY&0_K<HzgcBZBVhl00Xe;)`MNbnBQDq4WoiW_I)M?~;{m)|%2RMfoVJI#cj`
z8H#&Jf6G)e=u}MzZL@u)TNm#c#l&74b!kt~S%dpOq`zNR*KlLhIFV^x+RJR=Qz9cW
zzP13L)EVX{jC`?W{N-eANe{WUM15qE?R9B<wMI;Q-RsnH9phfDuAJ>9fyu(n!o7sP
y+uQYhl7-K;-H%<Jz4KidHTNu(LJ5s$k@#UHxeLDYqk||Z-&VeNE9WN6_x}TSmdVNh

diff --git a/packages/docs/images/hero-light.png b/packages/docs/images/hero-light.png
deleted file mode 100644
index 68c712d6db8984866c0d644f8d6b9e7a6c529a97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 104264
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
YiTW=8yKw8Dd3cP@IsLQXFmb^D0S!qnZU6uP

diff --git a/packages/docs/index.mdx b/packages/docs/index.mdx
index 19a09f890c..9a51c9ef50 100644
--- a/packages/docs/index.mdx
+++ b/packages/docs/index.mdx
@@ -1,56 +1,202 @@
 ---
-title: "Introduction"
-description: "Welcome to the new home for your documentation"
+title: "Intro"
+description: "Get started with OpenCode."
 ---
 
-## Setting up
+[**OpenCode**](https://opencode.ai) is an open source AI coding agent. It's available as a terminal-based interface or
+desktop app.
 
-Get your documentation site up and running in minutes.
+<img
+  src="https://raw.githubusercontent.com/anomalyco/opencode/dev/packages/web/src/assets/lander/screenshot.png"
+  alt="OpenCode TUI with the opencode theme"
+/>
 
-<Card title="Start here" icon="rocket" href="/quickstart" horizontal>
-  Follow our three step quickstart guide.
-</Card>
+Let's get started.
 
-## Make it yours
+---
 
-Design a docs site that looks great and empowers your users.
+#### Prerequisites
 
-<Columns cols={2}>
-  <Card title="Edit locally" icon="pen-to-square" href="/development">
-    Edit your docs locally and preview them in real time.
-  </Card>
-  <Card title="Customize your site" icon="palette" href="/essentials/settings">
-    Customize the design and colors of your site to match your brand.
-  </Card>
-  <Card title="Set up navigation" icon="map" href="/essentials/navigation">
-    Organize your docs to help users find what they need and succeed with your product.
-  </Card>
-  <Card title="API documentation" icon="terminal" href="/api-reference/introduction">
-    Auto-generate API documentation from OpenAPI specifications.
-  </Card>
-</Columns>
+To use OpenCode in your terminal, you'll need:
 
-## Create beautiful pages
+1. A modern terminal emulator like:
+   - [Ghostty](https://ghostty.org), Linux and macOS
+   - [WezTerm](https://wezterm.org), cross-platform
+   - [Alacritty](https://alacritty.org), cross-platform
+   - [Kitty](https://sw.kovidgoyal.net/kitty/), Linux and macOS
+2. API keys for the LLM providers you want to use.
 
-Everything you need to create world-class documentation.
+---
 
-<Columns cols={2}>
-  <Card title="Write with MDX" icon="pen-fancy" href="/essentials/markdown">
-    Use MDX to style your docs pages.
-  </Card>
-  <Card title="Code samples" icon="code" href="/essentials/code">
-    Add sample code to demonstrate how to use your product.
-  </Card>
-  <Card title="Images" icon="image" href="/essentials/images">
-    Display images and other media.
-  </Card>
-  <Card title="Reusable snippets" icon="recycle" href="/essentials/reusable-snippets">
-    Write once and reuse across your docs.
-  </Card>
-</Columns>
+## Install
 
-## Need inspiration?
+<Note>The curl install script is not available in beta.</Note>
 
-<Card title="See complete examples" icon="stars" href="https://mintlify.com/customers">
-  Browse our showcase of exceptional documentation sites.
-</Card>
+You can also install it with the following package managers.
+
+<Tabs>
+  <Tab title="npm">
+    ```bash
+    npm install -g @opencode-ai/cli@next
+    ```
+  </Tab>
+  <Tab title="bun">
+    ```bash
+    bun install -g @opencode-ai/cli@next
+    ```
+  </Tab>
+  <Tab title="pnpm">
+    ```bash
+    pnpm install -g @opencode-ai/cli@next
+    ```
+  </Tab>
+  <Tab title="Yarn">
+    ```bash
+    yarn global add @opencode-ai/cli@next
+    ```
+  </Tab>
+</Tabs>
+
+<Note>During beta, the executable is named `opencode2`.</Note>
+
+### Homebrew
+
+Homebrew installation is not available in beta.
+
+### Arch Linux
+
+Arch Linux installation is not available in beta.
+
+### Windows
+
+<Tip>
+  For the best experience on Windows, use [Windows Subsystem for Linux
+  (WSL)](https://opencode.ai/docs/windows-wsl). It provides better performance and full compatibility with OpenCode's
+  features.
+</Tip>
+
+<Tabs>
+  <Tab title="chocolatey">
+    Chocolatey installation is not available in beta.
+  </Tab>
+  <Tab title="scoop">
+    Scoop installation is not available in beta.
+  </Tab>
+  <Tab title="mise">
+    Mise installation is not available in beta.
+  </Tab>
+  <Tab title="docker">
+    Docker installation is not available in beta.
+  </Tab>
+</Tabs>
+
+Standalone binaries are not available in beta.
+
+---
+
+## Connect
+
+With OpenCode you can use any LLM provider by configuring its API key.
+
+If you are new to LLM providers, we recommend [OpenCode Zen](https://opencode.ai/docs/zen). It's a curated list of models
+that have been tested and verified by the OpenCode team.
+
+1. Run `/connect` in the TUI, select **opencode**, and open [opencode.ai/auth](https://opencode.ai/auth).
+
+   ```text
+   /connect
+   ```
+
+2. Sign in, add your billing details, and copy your API key.
+3. Paste your API key into the prompt.
+
+Alternatively, select another provider. See the current [provider directory](https://opencode.ai/docs/providers#directory).
+
+---
+
+## Usage
+
+You are now ready to use OpenCode in your project. Here are a few common workflows.
+
+### Ask questions
+
+Ask OpenCode to explain your codebase.
+
+<Tip>Use `@` to fuzzy search for files in the project.</Tip>
+
+```text
+How is authentication handled in @packages/functions/src/api/index.ts
+```
+
+### Add features
+
+For larger features, start by asking OpenCode to create a plan.
+
+1. **Create a plan**
+
+   Switch to **Plan mode** with `Tab`. Plan mode prevents OpenCode from making changes while it proposes an implementation.
+
+   ```text
+   <TAB>
+   ```
+
+   Describe the feature with enough context to understand the desired behavior.
+
+   ```text
+   When a user deletes a note, flag it as deleted in the database.
+   Create a screen that shows recently deleted notes.
+   From this screen, the user can restore a note or permanently delete it.
+   ```
+
+   <Tip>Give OpenCode plenty of context and examples.</Tip>
+
+2. **Iterate on the plan**
+
+   Give feedback or add more detail after OpenCode proposes a plan.
+
+   ```text
+   Use the attached image as a visual reference for the new screen.
+   ```
+
+   You can drag and drop images into the terminal to add them to your prompt.
+
+3. **Build the feature**
+
+   When the plan looks right, press `Tab` to return to **Build mode** and ask OpenCode to implement it.
+
+   ```text
+   Sounds good. Go ahead and make the changes.
+   ```
+
+### Make changes
+
+For straightforward work, ask OpenCode to make the change directly and include relevant files and examples.
+
+```text
+Add authentication to the /settings route. Follow the approach used in
+@packages/functions/src/notes.ts and implement it in
+@packages/functions/src/settings.ts.
+```
+
+### Undo changes
+
+Use `/undo` when a change isn't what you wanted.
+
+```text
+/undo
+```
+
+OpenCode reverts the changes and restores your original message so you can revise it. Run `/undo` multiple times to undo
+multiple changes, or use `/redo` to reapply them.
+
+```text
+/redo
+```
+
+---
+
+## Customize
+
+Make OpenCode your own by [picking a theme](https://opencode.ai/docs/themes), [customizing
+keybinds](https://opencode.ai/docs/keybinds), [configuring formatters](https://opencode.ai/docs/formatters), [creating
+commands](https://opencode.ai/docs/commands), or editing the [OpenCode config](https://opencode.ai/docs/config).
diff --git a/packages/docs/logo/dark.svg b/packages/docs/logo/dark.svg
deleted file mode 100644
index 8b343cd6fc..0000000000
--- a/packages/docs/logo/dark.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<svg width="177" height="24" viewBox="0 0 177 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.06145 23.1079C5.26816 22.3769 -3.39077 20.6274 1.4173 5.06384C9.6344 6.09939 16.9728 14.0644 9.06145 23.1079Z" fill="url(#paint0_linear_17557_2145)"/>
-<path d="M8.91928 23.0939C5.27642 21.2223 0.78371 4.20891 17.0071 0C20.7569 7.19341 19.6212 16.5452 8.91928 23.0939Z" fill="url(#paint1_linear_17557_2145)"/>
-<path d="M8.91388 23.0788C8.73534 19.8817 10.1585 9.08525 23.5699 13.1107C23.1812 20.1229 18.984 26.4182 8.91388 23.0788Z" fill="url(#paint2_linear_17557_2145)"/>
-<path d="M32.3008 19.3922V3.89432H37.9383L39.925 9.94786C40.0359 10.3154 40.1642 10.7869 40.3098 11.3624C40.4624 11.938 40.6114 12.5516 40.7571 13.2035C40.9096 13.8553 41.0483 14.4828 41.1731 15.0861C41.3049 15.6824 41.4123 16.1921 41.4955 16.6151H40.6946C40.7709 16.1921 40.8715 15.6824 40.9963 15.0861C41.128 14.4897 41.2667 13.8657 41.4123 13.2139C41.5649 12.562 41.714 11.9484 41.8596 11.3728C42.0052 10.7904 42.1335 10.3154 42.2444 9.94786L44.1999 3.89432H49.8478V19.3922H46.1657V12.7042C46.1657 12.3575 46.1726 11.9172 46.1865 11.3832C46.2004 10.8493 46.2143 10.2703 46.2281 9.64623C46.2489 9.02215 46.2663 8.39114 46.2801 7.75319C46.3009 7.11525 46.3113 6.51891 46.3113 5.96418H46.6234C46.4847 6.56052 46.3321 7.18112 46.1657 7.826C45.9993 8.47088 45.8329 9.10189 45.6665 9.71903C45.507 10.3362 45.3509 10.9013 45.1984 11.4144C45.0528 11.9276 44.928 12.3575 44.824 12.7042L42.6085 19.3922H39.5609L37.3142 12.7042C37.2033 12.3575 37.0715 11.9276 36.919 11.4144C36.7734 10.9013 36.6139 10.3396 36.4405 9.72944C36.2741 9.11229 36.1042 8.48128 35.9309 7.8364C35.7644 7.19153 35.6084 6.56745 35.4628 5.96418H35.8269C35.8338 6.51198 35.8442 7.10485 35.8581 7.74279C35.8719 8.3738 35.8858 9.00481 35.8997 9.63582C35.9205 10.2599 35.9378 10.8389 35.9517 11.3728C35.9655 11.9068 35.9725 12.3506 35.9725 12.7042V19.3922H32.3008ZM51.6684 19.3922V8.02363H55.288V19.3922H51.6684ZM53.4678 6.78588C52.927 6.78588 52.4728 6.61599 52.1053 6.27621C51.7377 5.92951 51.554 5.50652 51.554 5.00726C51.554 4.508 51.7377 4.08848 52.1053 3.74871C52.4728 3.40893 52.927 3.23904 53.4678 3.23904C54.0087 3.23904 54.4629 3.40893 54.8304 3.74871C55.1979 4.08155 55.3817 4.50107 55.3817 5.00726C55.3817 5.50652 55.1979 5.92951 54.8304 6.27621C54.4629 6.61599 54.0087 6.78588 53.4678 6.78588ZM60.7075 13.0266V19.3922H57.0879V8.02363H60.5515L60.5931 10.9672H60.2811C60.5931 10.0241 61.0612 9.26831 61.6852 8.69971C62.3093 8.12417 63.1379 7.8364 64.1711 7.8364C64.9755 7.8364 65.6724 8.01669 66.2618 8.37727C66.8512 8.73091 67.3019 9.23364 67.614 9.88545C67.9329 10.5373 68.0924 11.307 68.0924 12.1945V19.3922H64.4832V12.9122C64.4832 12.2604 64.3202 11.7542 63.9943 11.3936C63.6753 11.0331 63.2212 10.8528 62.6318 10.8528C62.2504 10.8528 61.9141 10.936 61.6228 11.1024C61.3316 11.2688 61.1062 11.515 60.9467 11.8409C60.7873 12.1599 60.7075 12.5551 60.7075 13.0266ZM76.4555 8.02363V10.7488H69.0081V8.02363H76.4555ZM70.6828 5.16328H74.292V15.783C74.292 16.1019 74.3613 16.3342 74.5 16.4799C74.6456 16.6255 74.8987 16.6983 75.2593 16.6983C75.4049 16.6983 75.5956 16.6879 75.8314 16.6671C76.0741 16.6463 76.2509 16.6289 76.3618 16.6151L76.6323 19.309C76.3133 19.3783 75.9631 19.4269 75.5817 19.4546C75.2073 19.4824 74.8363 19.4962 74.4688 19.4962C73.1999 19.4962 72.2499 19.2223 71.6189 18.6745C70.9948 18.1267 70.6828 17.3085 70.6828 16.2198V5.16328Z" fill="#FAFAFA"/>
-<path d="M88.6674 19.6522C87.5232 19.6522 86.5282 19.4581 85.6822 19.0698C84.8432 18.6815 84.1879 18.1371 83.7164 17.4368C83.2448 16.7364 82.9917 15.9078 82.9571 14.9509H84.9333C84.968 15.5957 85.1483 16.1401 85.4742 16.5839C85.8001 17.0207 86.2404 17.3536 86.7951 17.5824C87.3499 17.8043 87.974 17.9152 88.6674 17.9152C89.3885 17.9152 90.0265 17.8008 90.5812 17.572C91.1429 17.3432 91.5832 17.0242 91.9022 16.6151C92.2281 16.199 92.391 15.7171 92.391 15.1693C92.391 14.6978 92.2662 14.306 92.0166 13.994C91.7669 13.675 91.4133 13.408 90.9556 13.1931C90.498 12.9781 89.9537 12.7874 89.3227 12.621L87.5024 12.1321C86.1225 11.7646 85.0824 11.255 84.382 10.6031C83.6886 9.94439 83.3419 9.09496 83.3419 8.05483C83.3419 7.17419 83.5708 6.4045 84.0284 5.74575C84.4861 5.087 85.1171 4.57734 85.9214 4.21676C86.7258 3.84925 87.6446 3.6655 88.6778 3.6655C89.7179 3.6655 90.6297 3.85272 91.4133 4.22717C92.2038 4.60161 92.8244 5.12167 93.2751 5.78736C93.7259 6.4461 93.9651 7.20886 93.9928 8.07563H92.0894C92.0131 7.22966 91.656 6.57438 91.0181 6.10979C90.387 5.63827 89.5861 5.40251 88.6154 5.40251C87.9497 5.40251 87.3603 5.51346 86.8471 5.73535C86.341 5.95724 85.9457 6.26235 85.6614 6.65066C85.3771 7.03204 85.235 7.46889 85.235 7.96122C85.235 8.44661 85.3771 8.84879 85.6614 9.16777C85.9457 9.4798 86.3167 9.73984 86.7743 9.94786C87.232 10.149 87.7243 10.3188 88.2513 10.4575L89.8843 10.884C90.4391 11.0227 90.9765 11.2064 91.4965 11.4352C92.0235 11.6571 92.495 11.9345 92.9111 12.2673C93.3341 12.5933 93.6704 12.9954 93.92 13.4739C94.1696 13.9454 94.2945 14.5036 94.2945 15.1485C94.2945 16.0153 94.0656 16.7884 93.608 17.468C93.1573 18.1475 92.5124 18.6815 91.6733 19.0698C90.8343 19.4581 89.8323 19.6522 88.6674 19.6522ZM101.097 8.02363V9.59422H95.1062V8.02363H101.097ZM96.9368 5.16328H98.7674V16.5215C98.7674 16.9999 98.8645 17.3466 99.0587 17.5616C99.2597 17.7696 99.5995 17.8736 100.078 17.8736C100.21 17.8736 100.366 17.8667 100.546 17.8528C100.733 17.832 100.903 17.8147 101.056 17.8008L101.285 19.3506C101.097 19.3922 100.886 19.4234 100.65 19.4442C100.414 19.465 100.189 19.4754 99.974 19.4754C98.9962 19.4754 98.2439 19.2362 97.7169 18.7577C97.1968 18.2723 96.9368 17.5789 96.9368 16.6775V5.16328ZM106.33 19.621C105.595 19.621 104.932 19.4893 104.343 19.2258C103.754 18.9554 103.285 18.5636 102.939 18.0504C102.592 17.5304 102.419 16.8959 102.419 16.147C102.419 15.4952 102.547 14.9647 102.804 14.5556C103.06 14.1465 103.403 13.8275 103.833 13.5987C104.263 13.3629 104.742 13.1861 105.269 13.0682C105.796 12.9504 106.333 12.8567 106.881 12.7874C107.574 12.6903 108.132 12.6175 108.555 12.569C108.978 12.5204 109.287 12.4407 109.481 12.3298C109.675 12.2119 109.772 12.0142 109.772 11.7369V11.6537C109.772 11.2029 109.679 10.8146 109.492 10.4887C109.311 10.1628 109.041 9.90972 108.68 9.72944C108.32 9.54915 107.872 9.459 107.338 9.459C106.805 9.459 106.34 9.54568 105.945 9.71903C105.556 9.89239 105.241 10.1177 104.998 10.3951C104.755 10.6655 104.593 10.9533 104.509 11.2584L102.71 10.9152C102.897 10.2218 103.22 9.64969 103.677 9.19897C104.135 8.74825 104.679 8.41194 105.31 8.19005C105.941 7.96815 106.607 7.85721 107.307 7.85721C107.8 7.85721 108.295 7.91961 108.795 8.04443C109.301 8.16925 109.765 8.38074 110.188 8.67891C110.611 8.97014 110.951 9.36886 111.208 9.87505C111.464 10.3743 111.593 11.0053 111.593 11.7681V19.3922H109.793V17.8216H109.7C109.568 18.0851 109.363 18.359 109.086 18.6433C108.809 18.9207 108.444 19.153 107.994 19.3402C107.543 19.5274 106.988 19.621 106.33 19.621ZM106.621 17.9984C107.321 17.9984 107.904 17.8667 108.368 17.6032C108.84 17.3328 109.19 16.9861 109.419 16.5631C109.654 16.1331 109.772 15.6824 109.772 15.2109V13.6923C109.703 13.7686 109.554 13.8414 109.325 13.9107C109.096 13.9732 108.829 14.0321 108.524 14.0876C108.226 14.143 107.921 14.1916 107.609 14.2332C107.304 14.2748 107.033 14.3095 106.798 14.3372C106.354 14.3927 105.938 14.4897 105.549 14.6284C105.168 14.7602 104.86 14.9543 104.624 15.2109C104.388 15.4675 104.27 15.8107 104.27 16.2406C104.27 16.6151 104.367 16.934 104.561 17.1975C104.762 17.461 105.04 17.6621 105.393 17.8008C105.747 17.9326 106.156 17.9984 106.621 17.9984ZM114.193 19.3922V8.02363H115.951V9.79184H116.045C116.253 9.20937 116.61 8.74131 117.116 8.38767C117.622 8.03403 118.219 7.85721 118.905 7.85721C119.058 7.85721 119.217 7.86414 119.384 7.87801C119.55 7.88494 119.682 7.89188 119.779 7.89881V9.73984C119.716 9.71903 119.578 9.69476 119.363 9.66703C119.155 9.63929 118.922 9.62542 118.666 9.62542C118.174 9.62542 117.726 9.7329 117.324 9.94786C116.922 10.1628 116.603 10.4714 116.367 10.8736C116.138 11.2758 116.024 11.7577 116.024 12.3194V19.3922H114.193ZM126.322 8.02363V9.59422H120.33V8.02363H126.322ZM122.161 5.16328H123.992V16.5215C123.992 16.9999 124.089 17.3466 124.283 17.5616C124.484 17.7696 124.824 17.8736 125.302 17.8736C125.434 17.8736 125.59 17.8667 125.77 17.8528C125.958 17.832 126.127 17.8147 126.28 17.8008L126.509 19.3506C126.322 19.3922 126.11 19.4234 125.874 19.4442C125.639 19.465 125.413 19.4754 125.198 19.4754C124.221 19.4754 123.468 19.2362 122.941 18.7577C122.421 18.2723 122.161 17.5789 122.161 16.6775V5.16328ZM132.604 19.6418C131.502 19.6418 130.555 19.3957 129.765 18.9034C128.974 18.4041 128.364 17.7141 127.934 16.8335C127.511 15.9459 127.3 14.9266 127.3 13.7755C127.3 12.6106 127.511 11.5843 127.934 10.6968C128.364 9.80224 128.964 9.10189 129.734 8.5957C130.51 8.0895 131.408 7.8364 132.428 7.8364C133.1 7.8364 133.738 7.95429 134.341 8.19005C134.952 8.42581 135.489 8.78292 135.954 9.26138C136.425 9.73984 136.793 10.3431 137.056 11.0712C137.327 11.7924 137.462 12.6453 137.462 13.6299V14.2956H128.433V12.7354H136.463L135.631 13.2971C135.631 12.5412 135.506 11.8756 135.257 11.3C135.007 10.7245 134.643 10.2772 134.165 9.95826C133.686 9.63236 133.107 9.4694 132.428 9.4694C131.748 9.4694 131.162 9.63236 130.67 9.95826C130.177 10.2842 129.796 10.7245 129.526 11.2792C129.262 11.827 129.13 12.4407 129.13 13.1202V14.046C129.13 14.8642 129.273 15.5715 129.557 16.1678C129.841 16.7572 130.243 17.2114 130.763 17.5304C131.283 17.8424 131.901 17.9984 132.615 17.9984C133.093 17.9984 133.523 17.9291 133.905 17.7904C134.293 17.6448 134.619 17.4333 134.882 17.1559C135.153 16.8786 135.354 16.5457 135.486 16.1574L137.275 16.4487C137.108 17.0797 136.81 17.6344 136.38 18.1129C135.95 18.5913 135.413 18.9658 134.768 19.2362C134.123 19.5066 133.402 19.6418 132.604 19.6418ZM139.459 19.3922V8.02363H141.217V9.79184H141.311C141.519 9.20937 141.876 8.74131 142.382 8.38767C142.888 8.03403 143.485 7.85721 144.171 7.85721C144.324 7.85721 144.483 7.86414 144.649 7.87801C144.816 7.88494 144.948 7.89188 145.045 7.89881V9.73984C144.982 9.71903 144.844 9.69476 144.629 9.66703C144.421 9.63929 144.188 9.62542 143.932 9.62542C143.439 9.62542 142.992 9.7329 142.59 9.94786C142.188 10.1628 141.869 10.4714 141.633 10.8736C141.404 11.2758 141.29 11.7577 141.29 12.3194V19.3922H139.459ZM153.429 14.9613V12.7146C153.783 12.2569 154.136 11.8201 154.49 11.404C154.844 10.9811 155.204 10.565 155.572 10.1559C155.939 9.73984 156.314 9.32725 156.695 8.91814L161.355 3.89432H163.893L157.277 10.9672H157.184L153.429 14.9613ZM152.108 19.3922V3.89432H154.043V9.24058L154.022 12.5586L154.043 13.5051V19.3922H152.108ZM161.615 19.3922L155.967 11.4768L157.173 9.96866L163.903 19.3922H161.615ZM165.661 19.3922V8.02363H167.492V19.3922H165.661ZM166.587 6.02658C166.24 6.02658 165.942 5.9087 165.692 5.67294C165.443 5.43025 165.318 5.13901 165.318 4.79923C165.318 4.45946 165.443 4.17169 165.692 3.93593C165.942 3.69323 166.24 3.57189 166.587 3.57189C166.934 3.57189 167.232 3.69323 167.482 3.93593C167.731 4.17169 167.856 4.45946 167.856 4.79923C167.856 5.13901 167.731 5.43025 167.482 5.67294C167.232 5.9087 166.934 6.02658 166.587 6.02658ZM174.836 8.02363V9.59422H168.844V8.02363H174.836ZM170.675 5.16328H172.506V16.5215C172.506 16.9999 172.603 17.3466 172.797 17.5616C172.998 17.7696 173.338 17.8736 173.816 17.8736C173.948 17.8736 174.104 17.8667 174.284 17.8528C174.472 17.832 174.641 17.8147 174.794 17.8008L175.023 19.3506C174.836 19.3922 174.624 19.4234 174.388 19.4442C174.153 19.465 173.927 19.4754 173.712 19.4754C172.735 19.4754 171.982 19.2362 171.455 18.7577C170.935 18.2723 170.675 17.5789 170.675 16.6775V5.16328Z" fill="#9F9FA9"/>
-<defs>
-<linearGradient id="paint0_linear_17557_2145" x1="3.77557" y1="5.91571" x2="5.23185" y2="21.5589" gradientUnits="userSpaceOnUse">
-<stop stop-color="#18E299"/>
-<stop offset="1" stop-color="#15803D"/>
-</linearGradient>
-<linearGradient id="paint1_linear_17557_2145" x1="12.1711" y1="-0.718425" x2="10.1897" y2="22.9832" gradientUnits="userSpaceOnUse">
-<stop stop-color="#16A34A"/>
-<stop offset="1" stop-color="#4ADE80"/>
-</linearGradient>
-<linearGradient id="paint2_linear_17557_2145" x1="23.1327" y1="15.353" x2="9.33841" y2="18.5196" gradientUnits="userSpaceOnUse">
-<stop stop-color="#4ADE80"/>
-<stop offset="1" stop-color="#0D9373"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/packages/docs/logo/light.svg b/packages/docs/logo/light.svg
deleted file mode 100644
index 03e62bf1d9..0000000000
--- a/packages/docs/logo/light.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<svg width="177" height="24" viewBox="0 0 177 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.06145 23.1079C5.26816 22.3769 -3.39077 20.6274 1.4173 5.06384C9.6344 6.09939 16.9728 14.0644 9.06145 23.1079Z" fill="url(#paint0_linear_17557_2020)"/>
-<path d="M8.91928 23.0939C5.27642 21.2223 0.78371 4.20891 17.0071 0C20.7569 7.19341 19.6212 16.5452 8.91928 23.0939Z" fill="url(#paint1_linear_17557_2020)"/>
-<path d="M8.91388 23.0788C8.73534 19.8817 10.1585 9.08525 23.5699 13.1107C23.1812 20.1229 18.984 26.4182 8.91388 23.0788Z" fill="url(#paint2_linear_17557_2020)"/>
-<path d="M32.3008 19.3922V3.89432H37.9383L39.925 9.94786C40.0359 10.3154 40.1642 10.7869 40.3098 11.3624C40.4624 11.938 40.6114 12.5516 40.7571 13.2035C40.9096 13.8553 41.0483 14.4828 41.1731 15.0861C41.3049 15.6824 41.4123 16.1921 41.4955 16.6151H40.6946C40.7709 16.1921 40.8715 15.6824 40.9963 15.0861C41.128 14.4897 41.2667 13.8657 41.4123 13.2139C41.5649 12.562 41.714 11.9484 41.8596 11.3728C42.0052 10.7904 42.1335 10.3154 42.2444 9.94786L44.1999 3.89432H49.8478V19.3922H46.1657V12.7042C46.1657 12.3575 46.1726 11.9172 46.1865 11.3832C46.2004 10.8493 46.2143 10.2703 46.2281 9.64623C46.2489 9.02215 46.2663 8.39114 46.2801 7.75319C46.3009 7.11525 46.3113 6.51891 46.3113 5.96418H46.6234C46.4847 6.56052 46.3321 7.18112 46.1657 7.826C45.9993 8.47088 45.8329 9.10189 45.6665 9.71903C45.507 10.3362 45.3509 10.9013 45.1984 11.4144C45.0528 11.9276 44.928 12.3575 44.824 12.7042L42.6085 19.3922H39.5609L37.3142 12.7042C37.2033 12.3575 37.0715 11.9276 36.919 11.4144C36.7734 10.9013 36.6139 10.3396 36.4405 9.72944C36.2741 9.11229 36.1042 8.48128 35.9309 7.8364C35.7644 7.19153 35.6084 6.56745 35.4628 5.96418H35.8269C35.8338 6.51198 35.8442 7.10485 35.8581 7.74279C35.8719 8.3738 35.8858 9.00481 35.8997 9.63582C35.9205 10.2599 35.9378 10.8389 35.9517 11.3728C35.9655 11.9068 35.9725 12.3506 35.9725 12.7042V19.3922H32.3008ZM51.6684 19.3922V8.02363H55.288V19.3922H51.6684ZM53.4678 6.78588C52.927 6.78588 52.4728 6.61599 52.1053 6.27621C51.7377 5.92951 51.554 5.50652 51.554 5.00726C51.554 4.508 51.7377 4.08848 52.1053 3.74871C52.4728 3.40893 52.927 3.23904 53.4678 3.23904C54.0087 3.23904 54.4629 3.40893 54.8304 3.74871C55.1979 4.08155 55.3817 4.50107 55.3817 5.00726C55.3817 5.50652 55.1979 5.92951 54.8304 6.27621C54.4629 6.61599 54.0087 6.78588 53.4678 6.78588ZM60.7075 13.0266V19.3922H57.0879V8.02363H60.5515L60.5931 10.9672H60.2811C60.5931 10.0241 61.0612 9.26831 61.6852 8.69971C62.3093 8.12417 63.1379 7.8364 64.1711 7.8364C64.9755 7.8364 65.6724 8.01669 66.2618 8.37727C66.8512 8.73091 67.3019 9.23364 67.614 9.88545C67.9329 10.5373 68.0924 11.307 68.0924 12.1945V19.3922H64.4832V12.9122C64.4832 12.2604 64.3202 11.7542 63.9943 11.3936C63.6753 11.0331 63.2212 10.8528 62.6318 10.8528C62.2504 10.8528 61.9141 10.936 61.6228 11.1024C61.3316 11.2688 61.1062 11.515 60.9467 11.8409C60.7873 12.1599 60.7075 12.5551 60.7075 13.0266ZM76.4555 8.02363V10.7488H69.0081V8.02363H76.4555ZM70.6828 5.16328H74.292V15.783C74.292 16.1019 74.3613 16.3342 74.5 16.4799C74.6456 16.6255 74.8987 16.6983 75.2593 16.6983C75.4049 16.6983 75.5956 16.6879 75.8314 16.6671C76.0741 16.6463 76.2509 16.6289 76.3618 16.6151L76.6323 19.309C76.3133 19.3783 75.9631 19.4269 75.5817 19.4546C75.2073 19.4824 74.8363 19.4962 74.4688 19.4962C73.1999 19.4962 72.2499 19.2223 71.6189 18.6745C70.9948 18.1267 70.6828 17.3085 70.6828 16.2198V5.16328Z" fill="#09090B"/>
-<path d="M88.6674 19.6522C87.5232 19.6522 86.5282 19.4581 85.6822 19.0698C84.8432 18.6815 84.1879 18.1371 83.7164 17.4368C83.2448 16.7364 82.9917 15.9078 82.9571 14.9509H84.9333C84.968 15.5957 85.1483 16.1401 85.4742 16.5839C85.8001 17.0207 86.2404 17.3536 86.7951 17.5824C87.3499 17.8043 87.974 17.9152 88.6674 17.9152C89.3885 17.9152 90.0265 17.8008 90.5812 17.572C91.1429 17.3432 91.5832 17.0242 91.9022 16.6151C92.2281 16.199 92.391 15.7171 92.391 15.1693C92.391 14.6978 92.2662 14.306 92.0166 13.994C91.7669 13.675 91.4133 13.408 90.9556 13.1931C90.498 12.9781 89.9537 12.7874 89.3227 12.621L87.5024 12.1321C86.1225 11.7646 85.0824 11.255 84.382 10.6031C83.6886 9.94439 83.3419 9.09496 83.3419 8.05483C83.3419 7.17419 83.5708 6.4045 84.0284 5.74575C84.4861 5.087 85.1171 4.57734 85.9214 4.21676C86.7258 3.84925 87.6446 3.6655 88.6778 3.6655C89.7179 3.6655 90.6297 3.85272 91.4133 4.22717C92.2038 4.60161 92.8244 5.12167 93.2751 5.78736C93.7259 6.4461 93.9651 7.20886 93.9928 8.07563H92.0894C92.0131 7.22966 91.656 6.57438 91.0181 6.10979C90.387 5.63827 89.5861 5.40251 88.6154 5.40251C87.9497 5.40251 87.3603 5.51346 86.8471 5.73535C86.341 5.95724 85.9457 6.26235 85.6614 6.65066C85.3771 7.03204 85.235 7.46889 85.235 7.96122C85.235 8.44661 85.3771 8.84879 85.6614 9.16777C85.9457 9.4798 86.3167 9.73984 86.7743 9.94786C87.232 10.149 87.7243 10.3188 88.2513 10.4575L89.8843 10.884C90.4391 11.0227 90.9765 11.2064 91.4965 11.4352C92.0235 11.6571 92.495 11.9345 92.9111 12.2673C93.3341 12.5933 93.6704 12.9954 93.92 13.4739C94.1696 13.9454 94.2945 14.5036 94.2945 15.1485C94.2945 16.0153 94.0656 16.7884 93.608 17.468C93.1573 18.1475 92.5124 18.6815 91.6733 19.0698C90.8343 19.4581 89.8323 19.6522 88.6674 19.6522ZM101.097 8.02363V9.59422H95.1062V8.02363H101.097ZM96.9368 5.16328H98.7674V16.5215C98.7674 16.9999 98.8645 17.3466 99.0587 17.5616C99.2597 17.7696 99.5995 17.8736 100.078 17.8736C100.21 17.8736 100.366 17.8667 100.546 17.8528C100.733 17.832 100.903 17.8147 101.056 17.8008L101.285 19.3506C101.097 19.3922 100.886 19.4234 100.65 19.4442C100.414 19.465 100.189 19.4754 99.974 19.4754C98.9962 19.4754 98.2439 19.2362 97.7169 18.7577C97.1968 18.2723 96.9368 17.5789 96.9368 16.6775V5.16328ZM106.33 19.621C105.595 19.621 104.932 19.4893 104.343 19.2258C103.754 18.9554 103.285 18.5636 102.939 18.0504C102.592 17.5304 102.419 16.8959 102.419 16.147C102.419 15.4952 102.547 14.9647 102.804 14.5556C103.06 14.1465 103.403 13.8275 103.833 13.5987C104.263 13.3629 104.742 13.1861 105.269 13.0682C105.796 12.9504 106.333 12.8567 106.881 12.7874C107.574 12.6903 108.132 12.6175 108.555 12.569C108.978 12.5204 109.287 12.4407 109.481 12.3298C109.675 12.2119 109.772 12.0142 109.772 11.7369V11.6537C109.772 11.2029 109.679 10.8146 109.492 10.4887C109.311 10.1628 109.041 9.90972 108.68 9.72944C108.32 9.54915 107.872 9.459 107.338 9.459C106.805 9.459 106.34 9.54568 105.945 9.71903C105.556 9.89239 105.241 10.1177 104.998 10.3951C104.755 10.6655 104.593 10.9533 104.509 11.2584L102.71 10.9152C102.897 10.2218 103.22 9.64969 103.677 9.19897C104.135 8.74825 104.679 8.41194 105.31 8.19005C105.941 7.96815 106.607 7.85721 107.307 7.85721C107.8 7.85721 108.295 7.91961 108.795 8.04443C109.301 8.16925 109.765 8.38074 110.188 8.67891C110.611 8.97014 110.951 9.36886 111.208 9.87505C111.464 10.3743 111.593 11.0053 111.593 11.7681V19.3922H109.793V17.8216H109.7C109.568 18.0851 109.363 18.359 109.086 18.6433C108.809 18.9207 108.444 19.153 107.994 19.3402C107.543 19.5274 106.988 19.621 106.33 19.621ZM106.621 17.9984C107.321 17.9984 107.904 17.8667 108.368 17.6032C108.84 17.3328 109.19 16.9861 109.419 16.5631C109.654 16.1331 109.772 15.6824 109.772 15.2109V13.6923C109.703 13.7686 109.554 13.8414 109.325 13.9107C109.096 13.9732 108.829 14.0321 108.524 14.0876C108.226 14.143 107.921 14.1916 107.609 14.2332C107.304 14.2748 107.033 14.3095 106.798 14.3372C106.354 14.3927 105.938 14.4897 105.549 14.6284C105.168 14.7602 104.86 14.9543 104.624 15.2109C104.388 15.4675 104.27 15.8107 104.27 16.2406C104.27 16.6151 104.367 16.934 104.561 17.1975C104.762 17.461 105.04 17.6621 105.393 17.8008C105.747 17.9326 106.156 17.9984 106.621 17.9984ZM114.193 19.3922V8.02363H115.951V9.79184H116.045C116.253 9.20937 116.61 8.74131 117.116 8.38767C117.622 8.03403 118.219 7.85721 118.905 7.85721C119.058 7.85721 119.217 7.86414 119.384 7.87801C119.55 7.88494 119.682 7.89188 119.779 7.89881V9.73984C119.716 9.71903 119.578 9.69476 119.363 9.66703C119.155 9.63929 118.922 9.62542 118.666 9.62542C118.174 9.62542 117.726 9.7329 117.324 9.94786C116.922 10.1628 116.603 10.4714 116.367 10.8736C116.138 11.2758 116.024 11.7577 116.024 12.3194V19.3922H114.193ZM126.322 8.02363V9.59422H120.33V8.02363H126.322ZM122.161 5.16328H123.992V16.5215C123.992 16.9999 124.089 17.3466 124.283 17.5616C124.484 17.7696 124.824 17.8736 125.302 17.8736C125.434 17.8736 125.59 17.8667 125.77 17.8528C125.958 17.832 126.127 17.8147 126.28 17.8008L126.509 19.3506C126.322 19.3922 126.11 19.4234 125.874 19.4442C125.639 19.465 125.413 19.4754 125.198 19.4754C124.221 19.4754 123.468 19.2362 122.941 18.7577C122.421 18.2723 122.161 17.5789 122.161 16.6775V5.16328ZM132.604 19.6418C131.502 19.6418 130.555 19.3957 129.765 18.9034C128.974 18.4041 128.364 17.7141 127.934 16.8335C127.511 15.9459 127.3 14.9266 127.3 13.7755C127.3 12.6106 127.511 11.5843 127.934 10.6968C128.364 9.80224 128.964 9.10189 129.734 8.5957C130.51 8.0895 131.408 7.8364 132.428 7.8364C133.1 7.8364 133.738 7.95429 134.341 8.19005C134.952 8.42581 135.489 8.78292 135.954 9.26138C136.425 9.73984 136.793 10.3431 137.056 11.0712C137.327 11.7924 137.462 12.6453 137.462 13.6299V14.2956H128.433V12.7354H136.463L135.631 13.2971C135.631 12.5412 135.506 11.8756 135.257 11.3C135.007 10.7245 134.643 10.2772 134.165 9.95826C133.686 9.63236 133.107 9.4694 132.428 9.4694C131.748 9.4694 131.162 9.63236 130.67 9.95826C130.177 10.2842 129.796 10.7245 129.526 11.2792C129.262 11.827 129.13 12.4407 129.13 13.1202V14.046C129.13 14.8642 129.273 15.5715 129.557 16.1678C129.841 16.7572 130.243 17.2114 130.763 17.5304C131.283 17.8424 131.901 17.9984 132.615 17.9984C133.093 17.9984 133.523 17.9291 133.905 17.7904C134.293 17.6448 134.619 17.4333 134.882 17.1559C135.153 16.8786 135.354 16.5457 135.486 16.1574L137.275 16.4487C137.108 17.0797 136.81 17.6344 136.38 18.1129C135.95 18.5913 135.413 18.9658 134.768 19.2362C134.123 19.5066 133.402 19.6418 132.604 19.6418ZM139.459 19.3922V8.02363H141.217V9.79184H141.311C141.519 9.20937 141.876 8.74131 142.382 8.38767C142.888 8.03403 143.485 7.85721 144.171 7.85721C144.324 7.85721 144.483 7.86414 144.649 7.87801C144.816 7.88494 144.948 7.89188 145.045 7.89881V9.73984C144.982 9.71903 144.844 9.69476 144.629 9.66703C144.421 9.63929 144.188 9.62542 143.932 9.62542C143.439 9.62542 142.992 9.7329 142.59 9.94786C142.188 10.1628 141.869 10.4714 141.633 10.8736C141.404 11.2758 141.29 11.7577 141.29 12.3194V19.3922H139.459ZM153.429 14.9613V12.7146C153.783 12.2569 154.136 11.8201 154.49 11.404C154.844 10.9811 155.204 10.565 155.572 10.1559C155.939 9.73984 156.314 9.32725 156.695 8.91814L161.355 3.89432H163.893L157.277 10.9672H157.184L153.429 14.9613ZM152.108 19.3922V3.89432H154.043V9.24058L154.022 12.5586L154.043 13.5051V19.3922H152.108ZM161.615 19.3922L155.967 11.4768L157.173 9.96866L163.903 19.3922H161.615ZM165.661 19.3922V8.02363H167.492V19.3922H165.661ZM166.587 6.02658C166.24 6.02658 165.942 5.9087 165.692 5.67294C165.443 5.43025 165.318 5.13901 165.318 4.79923C165.318 4.45946 165.443 4.17169 165.692 3.93593C165.942 3.69323 166.24 3.57189 166.587 3.57189C166.934 3.57189 167.232 3.69323 167.482 3.93593C167.731 4.17169 167.856 4.45946 167.856 4.79923C167.856 5.13901 167.731 5.43025 167.482 5.67294C167.232 5.9087 166.934 6.02658 166.587 6.02658ZM174.836 8.02363V9.59422H168.844V8.02363H174.836ZM170.675 5.16328H172.506V16.5215C172.506 16.9999 172.603 17.3466 172.797 17.5616C172.998 17.7696 173.338 17.8736 173.816 17.8736C173.948 17.8736 174.104 17.8667 174.284 17.8528C174.472 17.832 174.641 17.8147 174.794 17.8008L175.023 19.3506C174.836 19.3922 174.624 19.4234 174.388 19.4442C174.153 19.465 173.927 19.4754 173.712 19.4754C172.735 19.4754 171.982 19.2362 171.455 18.7577C170.935 18.2723 170.675 17.5789 170.675 16.6775V5.16328Z" fill="#52525C"/>
-<defs>
-<linearGradient id="paint0_linear_17557_2020" x1="3.77557" y1="5.91571" x2="5.23185" y2="21.5589" gradientUnits="userSpaceOnUse">
-<stop stop-color="#18E299"/>
-<stop offset="1" stop-color="#15803D"/>
-</linearGradient>
-<linearGradient id="paint1_linear_17557_2020" x1="12.1711" y1="-0.718425" x2="10.1897" y2="22.9832" gradientUnits="userSpaceOnUse">
-<stop stop-color="#16A34A"/>
-<stop offset="1" stop-color="#4ADE80"/>
-</linearGradient>
-<linearGradient id="paint2_linear_17557_2020" x1="23.1327" y1="15.353" x2="9.33841" y2="18.5196" gradientUnits="userSpaceOnUse">
-<stop stop-color="#4ADE80"/>
-<stop offset="1" stop-color="#0D9373"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/packages/docs/quickstart.mdx b/packages/docs/quickstart.mdx
deleted file mode 100644
index 52243fba6c..0000000000
--- a/packages/docs/quickstart.mdx
+++ /dev/null
@@ -1,81 +0,0 @@
----
-title: "Quickstart"
-description: "Start building awesome documentation in minutes"
----
-
-## Get started in three steps
-
-Get your documentation site running locally and make your first customization.
-
-### Step 1: Set up your local environment
-
-<AccordionGroup>
-  <Accordion icon="copy" title="Clone your docs locally">
-    During the onboarding process, you created a GitHub repository with your docs content if you didn't already have
-    one. You can find a link to this repository in your [dashboard](https://dashboard.mintlify.com). To clone the
-    repository locally so that you can make and preview changes to your docs, follow the [Cloning a
-    repository](https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository) guide
-    in the GitHub docs.
-  </Accordion>
-  <Accordion icon="rectangle-terminal" title="Start the preview server">
-    1. Install the Mintlify CLI: `npm i -g mint` 2. Navigate to your docs directory and run: `mint dev` 3. Open
-    `http://localhost:3000` to see your docs live!
-    <Tip>Your preview updates automatically as you edit files.</Tip>
-  </Accordion>
-</AccordionGroup>
-
-### Step 2: Deploy your changes
-
-<AccordionGroup>
-  <Accordion icon="github" title="Install our GitHub app">
-    Install the Mintlify GitHub app from your [dashboard](https://dashboard.mintlify.com/settings/organization/github-app).
-    
-    Our GitHub app automatically deploys your changes to your docs site, so you don't need to manage deployments yourself.
-</Accordion>
-<Accordion icon="palette" title="Update your site name and colors">
-    For a first change, let's update the name and colors of your docs site.
-
-    1. Open `docs.json` in your editor.
-    2. Change the `"name"` field to your project name.
-    3. Update the `"colors"` to match your brand.
-    4. Save and see your changes instantly at `http://localhost:3000`.
-
-    <Tip>Try changing the primary color to see an immediate difference!</Tip>
-
-  </Accordion>
-</AccordionGroup>
-
-### Step 3: Go live
-
-<Accordion icon="rocket" title="Publish your docs">
-  1. Commit and push your changes. 2. Your docs will update and be live in moments!
-</Accordion>
-
-## Next steps
-
-Now that you have your docs running, explore these key features:
-
-<CardGroup cols={2}>
-
-<Card title="Write Content" icon="pen-to-square" href="/essentials/markdown">
-  Learn MDX syntax and start writing your documentation.
-</Card>
-
-<Card title="Customize style" icon="palette" href="/essentials/settings">
-  Make your docs match your brand perfectly.
-</Card>
-
-<Card title="Add code examples" icon="square-code" href="/essentials/code">
-  Include syntax-highlighted code blocks.
-</Card>
-
-<Card title="API documentation" icon="code" href="/api-reference/introduction">
-  Auto-generate API docs from OpenAPI specs.
-</Card>
-
-</CardGroup>
-
-<Note>
-  **Need help?** See our [full documentation](https://mintlify.com/docs) or join our
-  [community](https://mintlify.com/community).
-</Note>
diff --git a/packages/docs/sdk/index.mdx b/packages/docs/sdk/index.mdx
new file mode 100644
index 0000000000..81f71854bb
--- /dev/null
+++ b/packages/docs/sdk/index.mdx
@@ -0,0 +1,4 @@
+---
+title: "SDK"
+description: "Build with OpenCode."
+---
diff --git a/packages/docs/snippets/snippet-intro.mdx b/packages/docs/snippets/snippet-intro.mdx
deleted file mode 100644
index e20fbb6fc9..0000000000
--- a/packages/docs/snippets/snippet-intro.mdx
+++ /dev/null
@@ -1,4 +0,0 @@
-One of the core principles of software development is DRY (Don't Repeat
-Yourself). This is a principle that applies to documentation as
-well. If you find yourself repeating the same content in multiple places, you
-should consider creating a custom snippet to keep your content in sync.

From eed23d8ee9fd8561de5576cffb0ca8843df14817 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Mon, 6 Jul 2026 01:29:08 -0400
Subject: [PATCH 78/82] feat(api): publish v2 reference

---
 packages/client/src/effect/api/api.ts         |    24 +-
 .../client/src/effect/generated/client.ts     |    24 +-
 .../client/src/promise/generated/client.ts    |     6 +
 .../client/src/promise/generated/types.ts     |    11 +
 packages/core/src/project.ts                  |    49 +-
 packages/core/src/project/schema.ts           |     3 +
 packages/core/src/project/sql.ts              |     2 +-
 .../test/effect/layer-node/node-build.test.ts |     1 +
 packages/core/test/location.test.ts           |     1 +
 packages/core/test/project.test.ts            |    60 +-
 packages/core/test/session-compact.test.ts    |     1 +
 packages/core/test/session-create.test.ts     |     1 +
 .../core/test/session-instructions.test.ts    |     1 +
 packages/core/test/session-log.test.ts        |     1 +
 packages/docs/api/index.mdx                   |     6 +
 packages/docs/config.mdx                      |     4 +
 packages/docs/docs.json                       |    15 +-
 packages/docs/index.mdx                       |    68 +-
 packages/docs/openapi.json                    | 26011 +++++++++++++++-
 packages/docs/plugins.mdx                     |     4 +
 packages/docs/troubleshooting.mdx             |   177 +
 packages/protocol/src/groups/agent.ts         |    30 +-
 packages/protocol/src/groups/command.ts       |     2 +-
 packages/protocol/src/groups/credential.ts    |     1 +
 packages/protocol/src/groups/debug.ts         |    24 +-
 packages/protocol/src/groups/event.ts         |     2 +-
 packages/protocol/src/groups/form.ts          |     2 +-
 packages/protocol/src/groups/health.ts        |    24 +-
 packages/protocol/src/groups/integration.ts   |     2 +-
 packages/protocol/src/groups/location.ts      |    30 +-
 packages/protocol/src/groups/message.ts       |     2 +-
 packages/protocol/src/groups/model.ts         |     2 +-
 packages/protocol/src/groups/permission.ts    |     2 +-
 packages/protocol/src/groups/plugin.ts        |     2 +-
 packages/protocol/src/groups/project.ts       |    14 +-
 packages/protocol/src/groups/provider.ts      |     2 +-
 packages/protocol/src/groups/question.ts      |     4 +-
 packages/protocol/src/groups/session.ts       |     2 +-
 packages/protocol/src/groups/skill.ts         |     2 +-
 packages/server/src/handlers/project.ts       |     1 +
 40 files changed, 26473 insertions(+), 147 deletions(-)
 create mode 100644 packages/docs/api/index.mdx
 create mode 100644 packages/docs/config.mdx
 mode change 120000 => 100644 packages/docs/openapi.json
 create mode 100644 packages/docs/plugins.mdx
 create mode 100644 packages/docs/troubleshooting.mdx

diff --git a/packages/client/src/effect/api/api.ts b/packages/client/src/effect/api/api.ts
index 866747dafa..9b67aee42b 100644
--- a/packages/client/src/effect/api/api.ts
+++ b/packages/client/src/effect/api/api.ts
@@ -450,20 +450,24 @@ export interface CredentialApi<E = never> {
   readonly remove: CredentialRemoveOperation<E>
 }
 
-type Endpoint12_0Request = Parameters<RawClient["server.project"]["project.current"]>[0]
-export type Endpoint12_0Input = { readonly location?: Endpoint12_0Request["query"]["location"] }
-export type Endpoint12_0Output = EffectValue<ReturnType<RawClient["server.project"]["project.current"]>>
-export type ProjectCurrentOperation<E = never> = (input?: Endpoint12_0Input) => Effect.Effect<Endpoint12_0Output, E>
+export type Endpoint12_0Output = EffectValue<ReturnType<RawClient["server.project"]["project.list"]>>
+export type ProjectListOperation<E = never> = () => Effect.Effect<Endpoint12_0Output, E>
 
-type Endpoint12_1Request = Parameters<RawClient["server.project"]["project.directories"]>[0]
-export type Endpoint12_1Input = {
-  readonly projectID: Endpoint12_1Request["params"]["projectID"]
-  readonly location?: Endpoint12_1Request["query"]["location"]
+type Endpoint12_1Request = Parameters<RawClient["server.project"]["project.current"]>[0]
+export type Endpoint12_1Input = { readonly location?: Endpoint12_1Request["query"]["location"] }
+export type Endpoint12_1Output = EffectValue<ReturnType<RawClient["server.project"]["project.current"]>>
+export type ProjectCurrentOperation<E = never> = (input?: Endpoint12_1Input) => Effect.Effect<Endpoint12_1Output, E>
+
+type Endpoint12_2Request = Parameters<RawClient["server.project"]["project.directories"]>[0]
+export type Endpoint12_2Input = {
+  readonly projectID: Endpoint12_2Request["params"]["projectID"]
+  readonly location?: Endpoint12_2Request["query"]["location"]
 }
-export type Endpoint12_1Output = EffectValue<ReturnType<RawClient["server.project"]["project.directories"]>>
-export type ProjectDirectoriesOperation<E = never> = (input: Endpoint12_1Input) => Effect.Effect<Endpoint12_1Output, E>
+export type Endpoint12_2Output = EffectValue<ReturnType<RawClient["server.project"]["project.directories"]>>
+export type ProjectDirectoriesOperation<E = never> = (input: Endpoint12_2Input) => Effect.Effect<Endpoint12_2Output, E>
 
 export interface ProjectApi<E = never> {
+  readonly list: ProjectListOperation<E>
   readonly current: ProjectCurrentOperation<E>
   readonly directories: ProjectDirectoriesOperation<E>
 }
diff --git a/packages/client/src/effect/generated/client.ts b/packages/client/src/effect/generated/client.ts
index 2a253cf016..1001c1e047 100644
--- a/packages/client/src/effect/generated/client.ts
+++ b/packages/client/src/effect/generated/client.ts
@@ -544,25 +544,29 @@ const Endpoint11_1 = (raw: RawClient["server.credential"]) => (input: Endpoint11
 
 const adaptGroup11 = (raw: RawClient["server.credential"]) => ({ update: Endpoint11_0(raw), remove: Endpoint11_1(raw) })
 
-type Endpoint12_0Request = Parameters<RawClient["server.project"]["project.current"]>[0]
-type Endpoint12_0Input = { readonly location?: Endpoint12_0Request["query"]["location"] }
-const Endpoint12_0 = (raw: RawClient["server.project"]) => (input?: Endpoint12_0Input) =>
+const Endpoint12_0 = (raw: RawClient["server.project"]) => () =>
+  raw["project.list"]({}).pipe(Effect.mapError(mapClientError))
+
+type Endpoint12_1Request = Parameters<RawClient["server.project"]["project.current"]>[0]
+type Endpoint12_1Input = { readonly location?: Endpoint12_1Request["query"]["location"] }
+const Endpoint12_1 = (raw: RawClient["server.project"]) => (input?: Endpoint12_1Input) =>
   raw["project.current"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))
 
-type Endpoint12_1Request = Parameters<RawClient["server.project"]["project.directories"]>[0]
-type Endpoint12_1Input = {
-  readonly projectID: Endpoint12_1Request["params"]["projectID"]
-  readonly location?: Endpoint12_1Request["query"]["location"]
+type Endpoint12_2Request = Parameters<RawClient["server.project"]["project.directories"]>[0]
+type Endpoint12_2Input = {
+  readonly projectID: Endpoint12_2Request["params"]["projectID"]
+  readonly location?: Endpoint12_2Request["query"]["location"]
 }
-const Endpoint12_1 = (raw: RawClient["server.project"]) => (input: Endpoint12_1Input) =>
+const Endpoint12_2 = (raw: RawClient["server.project"]) => (input: Endpoint12_2Input) =>
   raw["project.directories"]({
     params: { projectID: input["projectID"] },
     query: { location: input["location"] },
   }).pipe(Effect.mapError(mapClientError))
 
 const adaptGroup12 = (raw: RawClient["server.project"]) => ({
-  current: Endpoint12_0(raw),
-  directories: Endpoint12_1(raw),
+  list: Endpoint12_0(raw),
+  current: Endpoint12_1(raw),
+  directories: Endpoint12_2(raw),
 })
 
 type Endpoint13_0Request = Parameters<RawClient["server.form"]["form.request.list"]>[0]
diff --git a/packages/client/src/promise/generated/client.ts b/packages/client/src/promise/generated/client.ts
index f5fe29506e..d3e18279e0 100644
--- a/packages/client/src/promise/generated/client.ts
+++ b/packages/client/src/promise/generated/client.ts
@@ -89,6 +89,7 @@ import type {
   CredentialUpdateOutput,
   CredentialRemoveInput,
   CredentialRemoveOutput,
+  ProjectListOutput,
   ProjectCurrentInput,
   ProjectCurrentOutput,
   ProjectDirectoriesInput,
@@ -899,6 +900,11 @@ export function make(options: ClientOptions) {
         ),
     },
     project: {
+      list: (requestOptions?: RequestOptions) =>
+        request<ProjectListOutput>(
+          { method: "GET", path: `/api/project`, successStatus: 200, declaredStatuses: [401, 400], empty: false },
+          requestOptions,
+        ),
       current: (input?: ProjectCurrentInput, requestOptions?: RequestOptions) =>
         request<ProjectCurrentOutput>(
           {
diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts
index f58135023c..ac30f3c35c 100644
--- a/packages/client/src/promise/generated/types.ts
+++ b/packages/client/src/promise/generated/types.ts
@@ -2458,6 +2458,17 @@ export type CredentialRemoveInput = {
 
 export type CredentialRemoveOutput = void
 
+export type ProjectListOutput = ReadonlyArray<{
+  readonly id: string
+  readonly worktree: string
+  readonly vcs?: "git" | "hg"
+  readonly name?: string
+  readonly icon?: { readonly url?: string; readonly override?: string; readonly color?: string }
+  readonly commands?: { readonly start?: string }
+  readonly time: { readonly created: number; readonly updated: number; readonly initialized?: number }
+  readonly sandboxes: ReadonlyArray<string>
+}>
+
 export type ProjectCurrentInput = {
   readonly location?: {
     readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
diff --git a/packages/core/src/project.ts b/packages/core/src/project.ts
index fe15f11511..1539d56f4f 100644
--- a/packages/core/src/project.ts
+++ b/packages/core/src/project.ts
@@ -3,8 +3,10 @@ export * as Project from "./project"
 
 import { Context, Effect, Layer, Schema } from "effect"
 import { ChildProcess } from "effect/unstable/process"
+import { asc, desc } from "drizzle-orm"
 import path from "path"
 import { AbsolutePath } from "./schema"
+import { Database } from "./database/database"
 import { FSUtil } from "./fs-util"
 import { Git } from "./git"
 import { AppProcess } from "./process"
@@ -12,6 +14,7 @@ import { makeGlobalNode } from "./effect/app-node"
 import { Hash } from "./util/hash"
 import { ProjectDirectories } from "./project/directories"
 import { ProjectSchema } from "./project/schema"
+import { ProjectTable } from "./project/sql"
 
 export const ID = ProjectSchema.ID
 export type ID = ProjectSchema.ID
@@ -25,9 +28,8 @@ export type Current = ProjectSchema.Current
 export const Directory = ProjectSchema.Directory
 export type Directory = ProjectSchema.Directory
 
-export class Info extends Schema.Class<Info>("Project.Info")({
-  id: ID,
-}) {}
+export const Info = ProjectSchema.Info
+export interface Info extends Schema.Schema.Type<typeof Info> {}
 
 export const DirectoriesInput = ProjectSchema.DirectoriesInput
 export type DirectoriesInput = typeof DirectoriesInput.Type
@@ -54,6 +56,7 @@ export const root = Effect.fn("Project.root")(function* (
 })
 
 export interface Interface {
+  readonly list: () => Effect.Effect<ReadonlyArray<Info>>
   readonly directories: (input: DirectoriesInput) => Effect.Effect<Directories>
   readonly resolve: (input: AbsolutePath) => Effect.Effect<Resolved>
   /**
@@ -70,14 +73,50 @@ export interface Interface {
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/ProjectV2") {}
 
+function fromRow(row: typeof ProjectTable.$inferSelect): Info {
+  const icon =
+    row.icon_url || row.icon_url_override || row.icon_color
+      ? {
+          url: row.icon_url ?? undefined,
+          override: row.icon_url_override ?? undefined,
+          color: row.icon_color ?? undefined,
+        }
+      : undefined
+  return {
+    id: row.id,
+    worktree: row.worktree,
+    vcs: row.vcs ?? undefined,
+    name: row.name ?? undefined,
+    icon,
+    commands: row.commands ?? undefined,
+    time: {
+      created: row.time_created,
+      updated: row.time_updated,
+      initialized: row.time_initialized ?? undefined,
+    },
+    sandboxes: row.sandboxes,
+  }
+}
+
 const layer = Layer.effect(
   Service,
   Effect.gen(function* () {
     const fs = yield* FSUtil.Service
     const git = yield* Git.Service
     const proc = yield* AppProcess.Service
+    const db = (yield* Database.Service).db
     const projectDirectories = yield* ProjectDirectories.Service
 
+    const list = Effect.fn("Project.list")(function* () {
+      const rows = yield* db
+        .select()
+        .from(ProjectTable)
+        .orderBy(desc(ProjectTable.time_updated), asc(ProjectTable.id))
+        .all()
+        .pipe(Effect.orDie)
+      return rows.map(fromRow)
+    })
+
     const directories = Effect.fn("Project.directories")(function* (input: DirectoriesInput) {
       return yield* projectDirectories.list(input.projectID)
     })
@@ -190,12 +229,12 @@ const layer = Layer.effect(
       yield* fs.writeFileString(path.join(input.store, "opencode"), input.id).pipe(Effect.ignore)
     })
 
-    return Service.of({ directories, resolve, commit })
+    return Service.of({ list, directories, resolve, commit })
   }),
 )
 
 export const node = makeGlobalNode({
   service: Service,
   layer: layer,
-  deps: [FSUtil.node, Git.node, AppProcess.node, ProjectDirectories.node],
+  deps: [Database.node, FSUtil.node, Git.node, AppProcess.node, ProjectDirectories.node],
 })
diff --git a/packages/core/src/project/schema.ts b/packages/core/src/project/schema.ts
index 86c57e17ca..089b3097d2 100644
--- a/packages/core/src/project/schema.ts
+++ b/packages/core/src/project/schema.ts
@@ -13,6 +13,9 @@ export type Current = typeof Current.Type
 export const Directory = Project.Directory
 export type Directory = typeof Directory.Type
 
+export const Info = Project.Info
+export interface Info extends Schema.Schema.Type<typeof Info> {}
+
 export const DirectoriesInput = Project.DirectoriesInput
 export type DirectoriesInput = typeof DirectoriesInput.Type
 
diff --git a/packages/core/src/project/sql.ts b/packages/core/src/project/sql.ts
index 6a7e5a9d54..fc08241deb 100644
--- a/packages/core/src/project/sql.ts
+++ b/packages/core/src/project/sql.ts
@@ -6,7 +6,7 @@ import { ProjectSchema } from "./schema"
 export const ProjectTable = sqliteTable("project", {
   id: text().$type<ProjectSchema.ID>().primaryKey(),
   worktree: absoluteColumn().notNull(),
-  vcs: text(),
+  vcs: text().$type<"git" | "hg">(),
   name: text(),
   icon_url: text(),
   icon_url_override: text(),
diff --git a/packages/core/test/effect/layer-node/node-build.test.ts b/packages/core/test/effect/layer-node/node-build.test.ts
index e9ff2fc149..32c9988f16 100644
--- a/packages/core/test/effect/layer-node/node-build.test.ts
+++ b/packages/core/test/effect/layer-node/node-build.test.ts
@@ -77,6 +77,7 @@ describe("node build", () => {
       Effect.sync(() => {
         acquisitions++
         return Project.Service.of({
+          list: () => Effect.succeed([]),
           directories: () => Effect.succeed([]),
           resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory }),
           commit: () => Effect.void,
diff --git a/packages/core/test/location.test.ts b/packages/core/test/location.test.ts
index 77e9e96745..d012a0463f 100644
--- a/packages/core/test/location.test.ts
+++ b/packages/core/test/location.test.ts
@@ -12,6 +12,7 @@ const ref = { directory: AbsolutePath.make("/repo/packages/app"), workspaceID }
 const projectLayer = Layer.succeed(
   Project.Service,
   Project.Service.of({
+    list: () => Effect.succeed([]),
     directories: () => Effect.succeed([]),
     resolve: () =>
       Effect.succeed({
diff --git a/packages/core/test/project.test.ts b/packages/core/test/project.test.ts
index ee1264f887..4080f9e68a 100644
--- a/packages/core/test/project.test.ts
+++ b/packages/core/test/project.test.ts
@@ -2,15 +2,71 @@ import { describe, expect } from "bun:test"
 import { $ } from "bun"
 import fs from "fs/promises"
 import path from "path"
-import { Effect, Schema } from "effect"
+import { Effect, Layer, Schema } from "effect"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
+import { Database } from "@opencode-ai/core/database/database"
 import { ProjectV2 } from "@opencode-ai/core/project"
+import { ProjectTable } from "@opencode-ai/core/project/sql"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { Hash } from "@opencode-ai/core/util/hash"
 import { tmpdir } from "./fixture/tmpdir"
 import { testEffect } from "./lib/effect"
 
-const it = testEffect(AppNodeBuilder.build(ProjectV2.node))
+const it = testEffect(
+  Layer.merge(AppNodeBuilder.build(ProjectV2.node), AppNodeBuilder.build(Database.node)),
+)
+
+describe("ProjectV2.list", () => {
+  it.effect("returns complete projects ordered by recent update", () =>
+    Effect.gen(function* () {
+      const db = (yield* Database.Service).db
+      const project = yield* ProjectV2.Service
+      yield* db
+        .insert(ProjectTable)
+        .values([
+          {
+            id: ProjectV2.ID.make("older"),
+            worktree: abs("/older"),
+            vcs: "git",
+            name: "Older",
+            icon_color: "#000000",
+            commands: { start: "bun dev" },
+            sandboxes: [abs("/older/sandbox")],
+            time_created: 1,
+            time_updated: 1,
+          },
+          {
+            id: ProjectV2.ID.make("newer"),
+            worktree: abs("/newer"),
+            sandboxes: [],
+            time_created: 2,
+            time_updated: 2,
+            time_initialized: 3,
+          },
+        ])
+        .run()
+
+      expect(yield* project.list()).toEqual([
+        {
+          id: ProjectV2.ID.make("newer"),
+          worktree: abs("/newer"),
+          time: { created: 2, updated: 2, initialized: 3 },
+          sandboxes: [],
+        },
+        {
+          id: ProjectV2.ID.make("older"),
+          worktree: abs("/older"),
+          vcs: "git",
+          name: "Older",
+          icon: { color: "#000000" },
+          commands: { start: "bun dev" },
+          time: { created: 1, updated: 1 },
+          sandboxes: [abs("/older/sandbox")],
+        },
+      ])
+    }),
+  )
+})
 
 function remoteID(remote: string) {
   return ProjectV2.ID.make(Hash.fast(`git-remote:${remote}`))
diff --git a/packages/core/test/session-compact.test.ts b/packages/core/test/session-compact.test.ts
index 4a9a520d59..98551e9f22 100644
--- a/packages/core/test/session-compact.test.ts
+++ b/packages/core/test/session-compact.test.ts
@@ -33,6 +33,7 @@ const model = Model.make({
 const projects = Layer.succeed(
   ProjectV2.Service,
   ProjectV2.Service.of({
+    list: () => Effect.succeed([]),
     resolve: (directory) => Effect.succeed({ id: ProjectV2.ID.global, directory }),
     directories: () => Effect.succeed([]),
     commit: () => Effect.void,
diff --git a/packages/core/test/session-create.test.ts b/packages/core/test/session-create.test.ts
index 5408030c1a..1b07937ebd 100644
--- a/packages/core/test/session-create.test.ts
+++ b/packages/core/test/session-create.test.ts
@@ -31,6 +31,7 @@ import { tmpdir } from "./fixture/tmpdir"
 const projects = Layer.succeed(
   ProjectV2.Service,
   ProjectV2.Service.of({
+    list: () => Effect.succeed([]),
     resolve: (directory) => Effect.succeed({ id: ProjectV2.ID.global, directory }),
     directories: () => Effect.succeed([]),
     commit: () => Effect.void,
diff --git a/packages/core/test/session-instructions.test.ts b/packages/core/test/session-instructions.test.ts
index daf0308b6f..19e717c836 100644
--- a/packages/core/test/session-instructions.test.ts
+++ b/packages/core/test/session-instructions.test.ts
@@ -55,6 +55,7 @@ const readToolNode = makeLocationNode({
 const projects = Layer.succeed(
   ProjectV2.Service,
   ProjectV2.Service.of({
+    list: () => Effect.succeed([]),
     resolve: (directory) => Effect.succeed({ id: ProjectV2.ID.global, directory }),
     directories: () => Effect.succeed([]),
     commit: () => Effect.void,
diff --git a/packages/core/test/session-log.test.ts b/packages/core/test/session-log.test.ts
index ed8dda7f4d..ef0865f89e 100644
--- a/packages/core/test/session-log.test.ts
+++ b/packages/core/test/session-log.test.ts
@@ -18,6 +18,7 @@ import { testEffect } from "./lib/effect"
 const projects = Layer.succeed(
   ProjectV2.Service,
   ProjectV2.Service.of({
+    list: () => Effect.succeed([]),
     resolve: (directory) => Effect.succeed({ id: ProjectV2.ID.global, directory }),
     directories: () => Effect.succeed([]),
     commit: () => Effect.void,
diff --git a/packages/docs/api/index.mdx b/packages/docs/api/index.mdx
new file mode 100644
index 0000000000..102ff30324
--- /dev/null
+++ b/packages/docs/api/index.mdx
@@ -0,0 +1,6 @@
+---
+title: "API Reference"
+description: "OpenCode HTTP API."
+---
+
+The endpoint reference is generated from the current OpenCode V2 [OpenAPI specification](/openapi.json).
diff --git a/packages/docs/config.mdx b/packages/docs/config.mdx
new file mode 100644
index 0000000000..a084c1a819
--- /dev/null
+++ b/packages/docs/config.mdx
@@ -0,0 +1,4 @@
+---
+title: "Config"
+description: "Configure OpenCode."
+---
diff --git a/packages/docs/docs.json b/packages/docs/docs.json
index a8319876dc..68a975cf85 100644
--- a/packages/docs/docs.json
+++ b/packages/docs/docs.json
@@ -17,11 +17,24 @@
     "tabs": [
       {
         "tab": "Docs",
-        "pages": ["index"]
+        "pages": ["index", "config", "plugins", "troubleshooting"]
       },
       {
         "tab": "SDK",
         "pages": ["sdk/index"]
+      },
+      {
+        "tab": "API",
+        "groups": [
+          {
+            "group": "Overview",
+            "pages": ["api/index"]
+          },
+          {
+            "group": "Endpoints",
+            "openapi": "openapi.json"
+          }
+        ]
       }
     ],
     "global": {}
diff --git a/packages/docs/index.mdx b/packages/docs/index.mdx
index 9a51c9ef50..8e61f92a6b 100644
--- a/packages/docs/index.mdx
+++ b/packages/docs/index.mdx
@@ -98,19 +98,19 @@ Standalone binaries are not available in beta.
 
 With OpenCode you can use any LLM provider by configuring its API key.
 
-If you are new to LLM providers, we recommend [OpenCode Zen](https://opencode.ai/docs/zen). It's a curated list of models
-that have been tested and verified by the OpenCode team.
+Run `/connect` in the TUI and select your provider.
 
-1. Run `/connect` in the TUI, select **opencode**, and open [opencode.ai/auth](https://opencode.ai/auth).
+```text
+/connect
+```
 
-   ```text
-   /connect
-   ```
+If you'd like easy access to all the best coding models you can try out
+[OpenCode Console](https://console.opencode.ai).
 
-2. Sign in, add your billing details, and copy your API key.
-3. Paste your API key into the prompt.
+You can also try [OpenCode Go](https://opencode.ai/go) a $10/month subscription
+plan that grants you access to the best open source models.
 
-Alternatively, select another provider. See the current [provider directory](https://opencode.ai/docs/providers#directory).
+See the current [provider directory](https://opencode.ai/docs/providers#directory).
 
 ---
 
@@ -130,54 +130,16 @@ How is authentication handled in @packages/functions/src/api/index.ts
 
 ### Add features
 
-For larger features, start by asking OpenCode to create a plan.
-
-1. **Create a plan**
-
-   Switch to **Plan mode** with `Tab`. Plan mode prevents OpenCode from making changes while it proposes an implementation.
-
-   ```text
-   <TAB>
-   ```
-
-   Describe the feature with enough context to understand the desired behavior.
-
-   ```text
-   When a user deletes a note, flag it as deleted in the database.
-   Create a screen that shows recently deleted notes.
-   From this screen, the user can restore a note or permanently delete it.
-   ```
-
-   <Tip>Give OpenCode plenty of context and examples.</Tip>
-
-2. **Iterate on the plan**
-
-   Give feedback or add more detail after OpenCode proposes a plan.
-
-   ```text
-   Use the attached image as a visual reference for the new screen.
-   ```
-
-   You can drag and drop images into the terminal to add them to your prompt.
-
-3. **Build the feature**
-
-   When the plan looks right, press `Tab` to return to **Build mode** and ask OpenCode to implement it.
-
-   ```text
-   Sounds good. Go ahead and make the changes.
-   ```
-
-### Make changes
-
-For straightforward work, ask OpenCode to make the change directly and include relevant files and examples.
+Ask OpenCode to add a feature by describing the desired behavior and providing relevant context.
 
 ```text
-Add authentication to the /settings route. Follow the approach used in
-@packages/functions/src/notes.ts and implement it in
-@packages/functions/src/settings.ts.
+When a user deletes a note, flag it as deleted in the database.
+Create a screen that shows recently deleted notes.
+From this screen, the user can restore a note or permanently delete it.
 ```
 
+<Tip>Give OpenCode plenty of context and examples.</Tip>
+
 ### Undo changes
 
 Use `/undo` when a change isn't what you wanted.
diff --git a/packages/docs/openapi.json b/packages/docs/openapi.json
deleted file mode 120000
index 854dd8b2b8..0000000000
--- a/packages/docs/openapi.json
+++ /dev/null
@@ -1 +0,0 @@
-../sdk/openapi.json
\ No newline at end of file
diff --git a/packages/docs/openapi.json b/packages/docs/openapi.json
new file mode 100644
index 0000000000..bcad31bd32
--- /dev/null
+++ b/packages/docs/openapi.json
@@ -0,0 +1,26010 @@
+{
+  "openapi": "3.1.0",
+  "info": {
+    "title": "opencode HttpApi",
+    "version": "0.0.1",
+    "description": "Experimental HttpApi surface for selected instance routes."
+  },
+  "paths": {
+    "/api/health": {
+      "get": {
+        "tags": [
+          "health"
+        ],
+        "operationId": "v2.health.get",
+        "parameters": [],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "healthy": {
+                      "type": "boolean",
+                      "enum": [
+                        true
+                      ]
+                    }
+                  },
+                  "required": [
+                    "healthy"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Check whether the API server is ready to accept requests.",
+        "summary": "Check server health"
+      }
+    },
+    "/api/location": {
+      "get": {
+        "tags": [
+          "location"
+        ],
+        "operationId": "v2.location.get",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Location.Info",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Location.Info"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Resolve the requested location or the server default location.",
+        "summary": "Get location"
+      }
+    },
+    "/api/agent": {
+      "get": {
+        "tags": [
+          "agent"
+        ],
+        "operationId": "v2.agent.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/AgentV2.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve currently registered agents.",
+        "summary": "List agents"
+      }
+    },
+    "/api/plugin": {
+      "get": {
+        "tags": [
+          "plugin"
+        ],
+        "operationId": "v2.plugin.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Plugin.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve currently loaded plugins.",
+        "summary": "List plugins"
+      }
+    },
+    "/api/session": {
+      "get": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.list",
+        "parameters": [
+          {
+            "name": "workspace",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "allOf": [
+                    {
+                      "pattern": "^wrk"
+                    }
+                  ]
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "description": "Maximum number of sessions to return. Defaults to the newest 50 sessions."
+            },
+            "required": false
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "enum": [
+                    "asc",
+                    "desc"
+                  ]
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "description": "Session order for the first page. Use desc for newest first or asc for oldest first."
+            },
+            "required": false
+          },
+          {
+            "name": "search",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          },
+          {
+            "name": "parentID",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "anyOf": [
+                    {
+                      "type": "string",
+                      "allOf": [
+                        {
+                          "pattern": "^ses"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "string",
+                      "enum": [
+                        "null"
+                      ]
+                    }
+                  ],
+                  "description": "Filter by parent session. Use null to return only root sessions."
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          },
+          {
+            "name": "directory",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          },
+          {
+            "name": "project",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          },
+          {
+            "name": "subpath",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          },
+          {
+            "name": "cursor",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "description": "Opaque pagination cursor returned as cursor.previous or cursor.next in the previous response."
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "SessionsResponse",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionsResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidCursorError | InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/InvalidCursorError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError1"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve sessions in the requested order. Items keep that order across pages; use cursor.next or cursor.previous to move through the ordered list.",
+        "summary": "List sessions"
+      },
+      "post": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.create",
+        "parameters": [],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "$ref": "#/components/schemas/SessionV2.Info"
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Create a session at the requested location.",
+        "summary": "Create session",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "anyOf": [
+                      {
+                        "type": "string",
+                        "allOf": [
+                          {
+                            "pattern": "^ses"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "agent": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "model": {
+                    "anyOf": [
+                      {
+                        "$ref": "#/components/schemas/Model.Ref"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "location": {
+                    "anyOf": [
+                      {
+                        "$ref": "#/components/schemas/Location.Ref"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/active": {
+      "get": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.active",
+        "parameters": [],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "object",
+                      "patternProperties": {
+                        "^ses": {
+                          "$ref": "#/components/schemas/SessionActive"
+                        }
+                      }
+                    },
+                    "watermarks": {
+                      "$ref": "#/components/schemas/SessionWatermarks"
+                    }
+                  },
+                  "required": [
+                    "data",
+                    "watermarks"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve foreground Session drains currently owned by this OpenCode process. Sessions absent from the result are inactive. Watermarks are the durable log positions read alongside the activity snapshot; activity itself is process state, so the pairing is advisory rather than transactional.",
+        "summary": "List active sessions"
+      }
+    },
+    "/api/session/{sessionID}": {
+      "get": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.get",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "$ref": "#/components/schemas/SessionV2.Info"
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve a session by ID.",
+        "summary": "Get session"
+      }
+    },
+    "/api/session/{sessionID}/fork": {
+      "post": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.fork",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "$ref": "#/components/schemas/SessionV2.Info"
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | MessageNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/MessageNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Create a child session by copying projected history from the parent. When messageID is supplied, copy messages before that boundary.",
+        "summary": "Fork session",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "messageID": {
+                    "anyOf": [
+                      {
+                        "type": "string",
+                        "allOf": [
+                          {
+                            "pattern": "^msg_"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/agent": {
+      "post": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.switchAgent",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Switch the agent used by subsequent provider turns.",
+        "summary": "Switch session agent",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "agent": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "agent"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/model": {
+      "post": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.switchModel",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Switch the model used by subsequent provider turns.",
+        "summary": "Switch session model",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "model": {
+                    "$ref": "#/components/schemas/Model.Ref"
+                  }
+                },
+                "required": [
+                  "model"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/rename": {
+      "post": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.rename",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Update the session title.",
+        "summary": "Rename session",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "title": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "title"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/prompt": {
+      "post": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.prompt",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "$ref": "#/components/schemas/SessionInput.Admitted"
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "ConflictError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConflictError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Durably admit one session input and schedule agent-loop execution unless resume is false.",
+        "summary": "Send message",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "anyOf": [
+                      {
+                        "type": "string",
+                        "allOf": [
+                          {
+                            "pattern": "^msg_"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "prompt": {
+                    "$ref": "#/components/schemas/PromptInput"
+                  },
+                  "delivery": {
+                    "anyOf": [
+                      {
+                        "type": "string",
+                        "enum": [
+                          "steer",
+                          "queue"
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "resume": {
+                    "anyOf": [
+                      {
+                        "type": "boolean"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "prompt"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/command": {
+      "post": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.command",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "$ref": "#/components/schemas/SessionInput.Admitted"
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | CommandNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/CommandNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "ConflictError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConflictError"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "CommandEvaluationError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CommandEvaluationError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Resolve a slash command into prompt input, admit it durably, and schedule execution unless resume is false.",
+        "summary": "Run command",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "anyOf": [
+                      {
+                        "type": "string",
+                        "allOf": [
+                          {
+                            "pattern": "^msg_"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "command": {
+                    "type": "string"
+                  },
+                  "arguments": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "agent": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "model": {
+                    "anyOf": [
+                      {
+                        "$ref": "#/components/schemas/Model.Ref"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "files": {
+                    "type": "array",
+                    "items": {
+                      "$ref": "#/components/schemas/PromptInput.FileAttachment"
+                    }
+                  },
+                  "agents": {
+                    "type": "array",
+                    "items": {
+                      "$ref": "#/components/schemas/Prompt.AgentAttachment"
+                    }
+                  },
+                  "delivery": {
+                    "anyOf": [
+                      {
+                        "type": "string",
+                        "enum": [
+                          "steer",
+                          "queue"
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "resume": {
+                    "anyOf": [
+                      {
+                        "type": "boolean"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "command"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/skill": {
+      "post": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.skill",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | SkillNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SkillNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Activate a skill for a session by appending a skill message and resuming execution.",
+        "summary": "Activate skill",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "anyOf": [
+                      {
+                        "type": "string",
+                        "allOf": [
+                          {
+                            "pattern": "^msg_"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "skill": {
+                    "type": "string"
+                  },
+                  "resume": {
+                    "anyOf": [
+                      {
+                        "type": "boolean"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "skill"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/synthetic": {
+      "post": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.synthetic",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Append a synthetic message to a session and resume execution.",
+        "summary": "Add synthetic message",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "text": {
+                    "type": "string"
+                  },
+                  "description": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "metadata": {
+                    "type": "object"
+                  }
+                },
+                "required": [
+                  "text"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/shell": {
+      "post": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.shell",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Execute one shell command in the session's working directory. Emits a shell.started event before execution and a shell.ended event with the merged output after.",
+        "summary": "Run shell command",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "anyOf": [
+                      {
+                        "type": "string",
+                        "allOf": [
+                          {
+                            "pattern": "^evt_"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "command": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "command"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/compact": {
+      "post": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.compact",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "SessionBusyError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionBusyError"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "UnknownError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnknownError"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "ServiceUnavailableError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ServiceUnavailableError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Compact a session conversation.",
+        "summary": "Compact session"
+      }
+    },
+    "/api/session/{sessionID}/wait": {
+      "post": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.wait",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "ServiceUnavailableError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ServiceUnavailableError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Wait for a session agent loop to become idle.",
+        "summary": "Wait for session"
+      }
+    },
+    "/api/session/{sessionID}/revert/stage": {
+      "post": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.revert.stage",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "$ref": "#/components/schemas/Revert.State"
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "MessageNotFoundError | SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/MessageNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "SessionBusyError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionBusyError"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "UnknownError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnknownError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Stage or move a reversible session boundary and optionally apply its file changes.",
+        "summary": "Stage session revert",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "messageID": {
+                    "type": "string",
+                    "allOf": [
+                      {
+                        "pattern": "^msg_"
+                      }
+                    ]
+                  },
+                  "files": {
+                    "anyOf": [
+                      {
+                        "type": "boolean"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "messageID"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/revert/clear": {
+      "post": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.revert.clear",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "SessionBusyError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionBusyError"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "UnknownError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnknownError"
+                }
+              }
+            }
+          }
+        },
+        "summary": "Clear staged revert"
+      }
+    },
+    "/api/session/{sessionID}/revert/commit": {
+      "post": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.revert.commit",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "SessionBusyError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionBusyError"
+                }
+              }
+            }
+          }
+        },
+        "summary": "Commit staged revert"
+      }
+    },
+    "/api/session/{sessionID}/context": {
+      "get": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.context",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Session.Message"
+                      }
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "UnknownError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnknownError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve the active context messages for a session (all messages after the last compaction).",
+        "summary": "Get session context"
+      }
+    },
+    "/api/session/{sessionID}/context-entry": {
+      "get": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.context.entry.list",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/SessionContextEntry.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "List API-managed context entries attached to the session's system context.",
+        "summary": "List context entries"
+      }
+    },
+    "/api/session/{sessionID}/context-entry/{key}": {
+      "put": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.context.entry.put",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "key",
+            "in": "path",
+            "schema": {
+              "$ref": "#/components/schemas/SessionContextEntry.Key"
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Attach or replace one durable context entry. The value is rendered into the session's system context; changes announce as updates at the next turn boundary.",
+        "summary": "Put context entry",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "value": {}
+                },
+                "required": [
+                  "value"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      },
+      "delete": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.context.entry.remove",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "key",
+            "in": "path",
+            "schema": {
+              "$ref": "#/components/schemas/SessionContextEntry.Key"
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Remove one context entry; the removal is announced to the model at the next turn boundary.",
+        "summary": "Remove context entry"
+      }
+    },
+    "/api/session/{sessionID}/log": {
+      "get": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.log",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          },
+          {
+            "name": "follow",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "enum": [
+                    "true",
+                    "false"
+                  ]
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "text/event-stream": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "event": {
+                      "type": "string"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/SessionLogItemStream"
+                    }
+                  },
+                  "required": [
+                    "id",
+                    "event",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                },
+                "x-effect-stream": {
+                  "encoding": "sse",
+                  "causeSchema": {
+                    "type": "array",
+                    "items": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "_tag": {
+                              "type": "string",
+                              "enum": [
+                                "Fail"
+                              ]
+                            },
+                            "error": {
+                              "not": {}
+                            }
+                          },
+                          "required": [
+                            "_tag",
+                            "error"
+                          ],
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "object",
+                          "properties": {
+                            "_tag": {
+                              "type": "string",
+                              "enum": [
+                                "Die"
+                              ]
+                            },
+                            "defect": {}
+                          },
+                          "required": [
+                            "_tag",
+                            "defect"
+                          ],
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "object",
+                          "properties": {
+                            "_tag": {
+                              "type": "string",
+                              "enum": [
+                                "Interrupt"
+                              ]
+                            },
+                            "fiberId": {
+                              "anyOf": [
+                                {
+                                  "type": "number"
+                                },
+                                {
+                                  "type": "null"
+                                }
+                              ]
+                            }
+                          },
+                          "required": [
+                            "_tag",
+                            "fiberId"
+                          ],
+                          "additionalProperties": false
+                        }
+                      ]
+                    }
+                  },
+                  "errorSchema": {
+                    "not": {}
+                  },
+                  "failureEvent": "effect/httpapi/stream/failure"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Durable, ordered, gap-free read of public session events after an exclusive aggregate sequence. Emits a synced marker once replay reaches the captured watermark, then completes; with follow=true it continues with live events instead. The only event API that promises reliability: attach after a snapshot watermark to compose fetch and stream without a race window.",
+        "summary": "Read the session log"
+      }
+    },
+    "/api/session/{sessionID}/interrupt": {
+      "post": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.interrupt",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Interrupt active execution owned by this OpenCode process. Idle interruption is a no-op.",
+        "summary": "Interrupt session execution"
+      }
+    },
+    "/api/session/{sessionID}/background": {
+      "post": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.background",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Move active foreground backgroundable tools for this session into background observation. Idle requests are a no-op.",
+        "summary": "Background blocking session tools"
+      }
+    },
+    "/api/session/{sessionID}/message/{messageID}": {
+      "get": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.message",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "messageID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^msg_"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "$ref": "#/components/schemas/Session.Message"
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | MessageNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/MessageNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve one projected message owned by the Session.",
+        "summary": "Get session message"
+      }
+    },
+    "/api/session/{sessionID}/message": {
+      "get": {
+        "tags": [
+          "session"
+        ],
+        "operationId": "v2.session.messages",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "description": "Maximum number of messages to return. When omitted, the endpoint returns its default page size."
+            },
+            "required": false
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "enum": [
+                    "asc",
+                    "desc"
+                  ]
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "description": "Message order for the first page. Use desc for newest first or asc for oldest first."
+            },
+            "required": false
+          },
+          {
+            "name": "cursor",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "description": "Opaque pagination cursor returned as cursor.previous or cursor.next in the previous response. Do not combine with order."
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "SessionMessagesResponse",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionMessagesResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidCursorError | InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/InvalidCursorError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "UnknownError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnknownError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve projected messages for a session. Items keep the requested order across pages; use cursor.next or cursor.previous to move through the ordered timeline.",
+        "summary": "Get session messages"
+      }
+    },
+    "/api/model": {
+      "get": {
+        "tags": [
+          "model"
+        ],
+        "operationId": "v2.model.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/ModelV2.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "ServiceUnavailableError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ServiceUnavailableError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve available models ordered by release date.",
+        "summary": "List models"
+      }
+    },
+    "/api/model/default": {
+      "get": {
+        "tags": [
+          "model"
+        ],
+        "operationId": "v2.model.default",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "anyOf": [
+                        {
+                          "$ref": "#/components/schemas/ModelV2.Info"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "ServiceUnavailableError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ServiceUnavailableError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve the model used when a session has no explicit model selection.",
+        "summary": "Get default model"
+      }
+    },
+    "/api/generate": {
+      "post": {
+        "tags": [
+          "generate"
+        ],
+        "operationId": "v2.generate.text",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "GenerateTextResponse",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GenerateTextResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError1"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "ServiceUnavailableError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ServiceUnavailableError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Run one stateless model generation at the requested location and return the assistant text. Uses the location's default model when none is specified.",
+        "summary": "Generate text",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "prompt": {
+                    "type": "string"
+                  },
+                  "model": {
+                    "anyOf": [
+                      {
+                        "$ref": "#/components/schemas/Model.Ref"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "prompt"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/provider": {
+      "get": {
+        "tags": [
+          "provider"
+        ],
+        "operationId": "v2.provider.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/ProviderV2.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "ServiceUnavailableError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ServiceUnavailableError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve active AI providers so clients can show provider availability and configuration.",
+        "summary": "List providers"
+      }
+    },
+    "/api/provider/{providerID}": {
+      "get": {
+        "tags": [
+          "provider"
+        ],
+        "operationId": "v2.provider.get",
+        "parameters": [
+          {
+            "name": "providerID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/ProviderV2.Info"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "ProviderNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProviderNotFoundError"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "ServiceUnavailableError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ServiceUnavailableError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve a single AI provider so clients can inspect its availability and endpoint settings.",
+        "summary": "Get provider"
+      }
+    },
+    "/api/integration": {
+      "get": {
+        "tags": [
+          "integration"
+        ],
+        "operationId": "v2.integration.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Integration.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve available integrations and their authentication methods.",
+        "summary": "List integrations"
+      }
+    },
+    "/api/integration/{integrationID}": {
+      "get": {
+        "tags": [
+          "integration"
+        ],
+        "operationId": "v2.integration.get",
+        "parameters": [
+          {
+            "name": "integrationID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "anyOf": [
+                        {
+                          "$ref": "#/components/schemas/Integration.Info"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve one integration and its authentication methods.",
+        "summary": "Get integration"
+      }
+    },
+    "/api/integration/{integrationID}/connect/key": {
+      "post": {
+        "tags": [
+          "integration"
+        ],
+        "operationId": "v2.integration.connect.key",
+        "parameters": [
+          {
+            "name": "integrationID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError1"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Run a key authentication method and store the resulting credential.",
+        "summary": "Connect with key",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "key": {
+                    "type": "string"
+                  },
+                  "label": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "key"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/integration/{integrationID}/connect/oauth": {
+      "post": {
+        "tags": [
+          "integration"
+        ],
+        "operationId": "v2.integration.connect.oauth",
+        "parameters": [
+          {
+            "name": "integrationID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/Integration.Attempt"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError1"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Start an OAuth attempt and return the authorization details.",
+        "summary": "Begin OAuth connection",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "methodID": {
+                    "type": "string"
+                  },
+                  "inputs": {
+                    "type": "object",
+                    "additionalProperties": {
+                      "type": "string"
+                    }
+                  },
+                  "label": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "methodID",
+                  "inputs"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/integration/attempt/{attemptID}": {
+      "get": {
+        "tags": [
+          "integration"
+        ],
+        "operationId": "v2.integration.attempt.status",
+        "parameters": [
+          {
+            "name": "attemptID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/Integration.AttemptStatus"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Poll the current status of an OAuth attempt.",
+        "summary": "Get OAuth attempt status"
+      },
+      "delete": {
+        "tags": [
+          "integration"
+        ],
+        "operationId": "v2.integration.attempt.cancel",
+        "parameters": [
+          {
+            "name": "attemptID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Cancel an OAuth attempt and release its resources.",
+        "summary": "Cancel OAuth connection"
+      }
+    },
+    "/api/integration/attempt/{attemptID}/complete": {
+      "post": {
+        "tags": [
+          "integration"
+        ],
+        "operationId": "v2.integration.attempt.complete",
+        "parameters": [
+          {
+            "name": "attemptID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError1"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Complete a code-based OAuth attempt and store the resulting credential.",
+        "summary": "Complete OAuth connection",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "code": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/mcp": {
+      "get": {
+        "tags": [
+          "mcp"
+        ],
+        "operationId": "v2.mcp.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Mcp.Server"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve configured MCP servers and their connection status.",
+        "summary": "List MCP servers"
+      }
+    },
+    "/api/credential/{credentialID}": {
+      "patch": {
+        "tags": [
+          "credential"
+        ],
+        "operationId": "v2.credential.update",
+        "parameters": [
+          {
+            "name": "credentialID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Update a stored credential label.",
+        "summary": "Update credential",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "label": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "label"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      },
+      "delete": {
+        "tags": [
+          "credential"
+        ],
+        "operationId": "v2.credential.remove",
+        "parameters": [
+          {
+            "name": "credentialID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Remove a stored integration credential.",
+        "summary": "Remove credential"
+      }
+    },
+    "/api/project": {
+      "get": {
+        "tags": [
+          "project"
+        ],
+        "operationId": "v2.project.list",
+        "parameters": [],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/Project"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "List known projects.",
+        "summary": "List projects"
+      }
+    },
+    "/api/project/current": {
+      "get": {
+        "tags": [
+          "project"
+        ],
+        "operationId": "v2.project.current",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Project.Current",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Project.Current"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Resolve the project for the requested location.",
+        "summary": "Get current project"
+      }
+    },
+    "/api/project/{projectID}/directories": {
+      "get": {
+        "tags": [
+          "project"
+        ],
+        "operationId": "v2.project.directories",
+        "parameters": [
+          {
+            "name": "projectID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Project.Directories",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Project.Directories"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "List known local absolute directories for a project.",
+        "summary": "List project directories"
+      }
+    },
+    "/api/form/request": {
+      "get": {
+        "tags": [
+          "form"
+        ],
+        "operationId": "v2.form.request.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "anyOf": [
+                          {
+                            "$ref": "#/components/schemas/Form.FormInfo"
+                          },
+                          {
+                            "$ref": "#/components/schemas/Form.UrlInfo"
+                          }
+                        ]
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve pending forms for a location.",
+        "summary": "List pending form requests"
+      }
+    },
+    "/api/session/{sessionID}/form": {
+      "get": {
+        "tags": [
+          "form"
+        ],
+        "operationId": "v2.session.form.list",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "anyOf": [
+                          {
+                            "$ref": "#/components/schemas/Form.FormInfo"
+                          },
+                          {
+                            "$ref": "#/components/schemas/Form.UrlInfo"
+                          }
+                        ]
+                      }
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve pending forms for a session.",
+        "summary": "List session forms"
+      },
+      "post": {
+        "tags": [
+          "form"
+        ],
+        "operationId": "v2.session.form.create",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "anyOf": [
+                        {
+                          "$ref": "#/components/schemas/Form.FormInfo"
+                        },
+                        {
+                          "$ref": "#/components/schemas/Form.UrlInfo"
+                        }
+                      ]
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError1"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "ConflictError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConflictError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Create a form for a session.",
+        "summary": "Create session form",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Form.CreatePayload"
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/form/{formID}": {
+      "get": {
+        "tags": [
+          "form"
+        ],
+        "operationId": "v2.session.form.get",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "formID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^frm_"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "anyOf": [
+                        {
+                          "$ref": "#/components/schemas/Form.FormInfo"
+                        },
+                        {
+                          "$ref": "#/components/schemas/Form.UrlInfo"
+                        }
+                      ]
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | FormNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/FormNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve a form for a session.",
+        "summary": "Get session form"
+      }
+    },
+    "/api/session/{sessionID}/form/{formID}/state": {
+      "get": {
+        "tags": [
+          "form"
+        ],
+        "operationId": "v2.session.form.state",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "formID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^frm_"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "$ref": "#/components/schemas/Form.State"
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | FormNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/FormNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve the current state for a form.",
+        "summary": "Get form state"
+      }
+    },
+    "/api/session/{sessionID}/form/{formID}/reply": {
+      "post": {
+        "tags": [
+          "form"
+        ],
+        "operationId": "v2.session.form.reply",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "formID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^frm_"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "FormInvalidAnswerError | InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/FormInvalidAnswerError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | FormNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/FormNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "FormAlreadySettledError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/FormAlreadySettledError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Submit an answer to a pending form.",
+        "summary": "Reply to form",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Form.Reply"
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/form/{formID}/cancel": {
+      "post": {
+        "tags": [
+          "form"
+        ],
+        "operationId": "v2.session.form.cancel",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "formID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^frm_"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | FormNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/FormNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "FormAlreadySettledError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/FormAlreadySettledError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Cancel a pending form.",
+        "summary": "Cancel form"
+      }
+    },
+    "/api/permission/request": {
+      "get": {
+        "tags": [
+          "permission"
+        ],
+        "operationId": "v2.permission.request.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/PermissionV2.Request"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve pending permission requests for a location.",
+        "summary": "List pending permission requests"
+      }
+    },
+    "/api/permission/saved": {
+      "get": {
+        "tags": [
+          "permission"
+        ],
+        "operationId": "v2.permission.saved.list",
+        "parameters": [
+          {
+            "name": "projectID",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/PermissionSaved.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve saved permissions, optionally filtered by project.",
+        "summary": "List saved permissions"
+      }
+    },
+    "/api/permission/saved/{id}": {
+      "delete": {
+        "tags": [
+          "permission"
+        ],
+        "operationId": "v2.permission.saved.remove",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Remove a saved permission by ID.",
+        "summary": "Remove saved permission"
+      }
+    },
+    "/api/session/{sessionID}/permission": {
+      "post": {
+        "tags": [
+          "permission"
+        ],
+        "operationId": "v2.session.permission.create",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "object",
+                      "properties": {
+                        "id": {
+                          "type": "string",
+                          "allOf": [
+                            {
+                              "pattern": "^per"
+                            }
+                          ]
+                        },
+                        "effect": {
+                          "$ref": "#/components/schemas/PermissionV2.Effect"
+                        }
+                      },
+                      "required": [
+                        "id",
+                        "effect"
+                      ],
+                      "additionalProperties": false
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Evaluate and, when approval is required, create a permission request for a session.",
+        "summary": "Create permission request",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "anyOf": [
+                      {
+                        "type": "string",
+                        "allOf": [
+                          {
+                            "pattern": "^per"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "action": {
+                    "type": "string"
+                  },
+                  "resources": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
+                  "save": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
+                  "metadata": {
+                    "type": "object"
+                  },
+                  "source": {
+                    "$ref": "#/components/schemas/PermissionV2.Source"
+                  },
+                  "agent": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "action",
+                  "resources"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      },
+      "get": {
+        "tags": [
+          "permission"
+        ],
+        "operationId": "v2.session.permission.list",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/PermissionV2.Request"
+                      }
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve pending permission requests owned by a session.",
+        "summary": "List session permission requests"
+      }
+    },
+    "/api/session/{sessionID}/permission/{requestID}": {
+      "get": {
+        "tags": [
+          "permission"
+        ],
+        "operationId": "v2.session.permission.get",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "requestID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^per"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "$ref": "#/components/schemas/PermissionV2.Request"
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | PermissionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/PermissionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve a pending permission request owned by a session.",
+        "summary": "Get permission request"
+      }
+    },
+    "/api/session/{sessionID}/permission/{requestID}/reply": {
+      "post": {
+        "tags": [
+          "permission"
+        ],
+        "operationId": "v2.session.permission.reply",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "requestID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^per"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | PermissionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/PermissionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Respond to a pending permission request owned by a session.",
+        "summary": "Reply to pending permission request",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "reply": {
+                    "$ref": "#/components/schemas/PermissionV2.Reply"
+                  },
+                  "message": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "reply"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/fs/read/*": {
+      "get": {
+        "tags": [
+          "filesystem"
+        ],
+        "operationId": "v2.fs.read",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/octet-stream": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Serve one file relative to the requested location.",
+        "summary": "Read file"
+      }
+    },
+    "/api/fs/list": {
+      "get": {
+        "tags": [
+          "filesystem"
+        ],
+        "operationId": "v2.fs.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          },
+          {
+            "name": "path",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/FileSystem.Entry"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "List direct children of one directory relative to the requested location.",
+        "summary": "List directory"
+      }
+    },
+    "/api/fs/find": {
+      "get": {
+        "tags": [
+          "filesystem"
+        ],
+        "operationId": "v2.fs.find",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          },
+          {
+            "name": "query",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "type",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "enum": [
+                "file",
+                "directory"
+              ]
+            },
+            "required": false
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/FileSystem.Entry"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Find recursively ranked filesystem entries relative to the requested location.",
+        "summary": "Find files"
+      }
+    },
+    "/api/command": {
+      "get": {
+        "tags": [
+          "command"
+        ],
+        "operationId": "v2.command.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/CommandV2.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve currently registered commands.",
+        "summary": "List commands"
+      }
+    },
+    "/api/skill": {
+      "get": {
+        "tags": [
+          "skill"
+        ],
+        "operationId": "v2.skill.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/SkillV2.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve currently registered skills.",
+        "summary": "List skills"
+      }
+    },
+    "/api/event": {
+      "get": {
+        "tags": [
+          "event"
+        ],
+        "operationId": "v2.event.subscribe",
+        "parameters": [],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "text/event-stream": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "event": {
+                      "type": "string"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/V2EventStream"
+                    }
+                  },
+                  "required": [
+                    "id",
+                    "event",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                },
+                "x-effect-stream": {
+                  "encoding": "sse",
+                  "causeSchema": {
+                    "type": "array",
+                    "items": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "_tag": {
+                              "type": "string",
+                              "enum": [
+                                "Fail"
+                              ]
+                            },
+                            "error": {
+                              "not": {}
+                            }
+                          },
+                          "required": [
+                            "_tag",
+                            "error"
+                          ],
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "object",
+                          "properties": {
+                            "_tag": {
+                              "type": "string",
+                              "enum": [
+                                "Die"
+                              ]
+                            },
+                            "defect": {}
+                          },
+                          "required": [
+                            "_tag",
+                            "defect"
+                          ],
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "object",
+                          "properties": {
+                            "_tag": {
+                              "type": "string",
+                              "enum": [
+                                "Interrupt"
+                              ]
+                            },
+                            "fiberId": {
+                              "anyOf": [
+                                {
+                                  "type": "number"
+                                },
+                                {
+                                  "type": "null"
+                                }
+                              ]
+                            }
+                          },
+                          "required": [
+                            "_tag",
+                            "fiberId"
+                          ],
+                          "additionalProperties": false
+                        }
+                      ]
+                    }
+                  },
+                  "errorSchema": {
+                    "not": {}
+                  },
+                  "failureEvent": "effect/httpapi/stream/failure"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Subscribe to native event payloads for the server. Volatile by contract: a slow consumer overflows and fails the stream, and events during disconnection are missed. Consumers that need reliability should combine the changes feed with durable session log reads.",
+        "summary": "Subscribe to events"
+      }
+    },
+    "/api/event/changes": {
+      "get": {
+        "tags": [
+          "event"
+        ],
+        "operationId": "v2.event.changes",
+        "parameters": [],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "text/event-stream": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "event": {
+                      "type": "string"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/EventLog.ChangeStream"
+                    }
+                  },
+                  "required": [
+                    "id",
+                    "event",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                },
+                "x-effect-stream": {
+                  "encoding": "sse",
+                  "causeSchema": {
+                    "type": "array",
+                    "items": {
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "_tag": {
+                              "type": "string",
+                              "enum": [
+                                "Fail"
+                              ]
+                            },
+                            "error": {
+                              "not": {}
+                            }
+                          },
+                          "required": [
+                            "_tag",
+                            "error"
+                          ],
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "object",
+                          "properties": {
+                            "_tag": {
+                              "type": "string",
+                              "enum": [
+                                "Die"
+                              ]
+                            },
+                            "defect": {}
+                          },
+                          "required": [
+                            "_tag",
+                            "defect"
+                          ],
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "object",
+                          "properties": {
+                            "_tag": {
+                              "type": "string",
+                              "enum": [
+                                "Interrupt"
+                              ]
+                            },
+                            "fiberId": {
+                              "anyOf": [
+                                {
+                                  "type": "number"
+                                },
+                                {
+                                  "type": "null"
+                                }
+                              ]
+                            }
+                          },
+                          "required": [
+                            "_tag",
+                            "fiberId"
+                          ],
+                          "additionalProperties": false
+                        }
+                      ]
+                    }
+                  },
+                  "errorSchema": {
+                    "not": {}
+                  },
+                  "failureEvent": "effect/httpapi/stream/failure"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Payload-free hint channel: after an event commits, a subscriber eventually receives a hint for that aggregate with seq at or beyond the event, or a sweep-required marker. Hints coalesce to the latest seq per aggregate under backpressure and the stream never fails from overflow. No consumer may derive correctness from receiving a hint; correctness always comes from durable log reads plus the consumer's own checkpoint. A sweep-required marker is emitted first on every (re)subscribe and whenever hint retention is exceeded: treat every aggregate as potentially dirty and recover via bounded sweep plus log reads.",
+        "summary": "Subscribe to change hints"
+      }
+    },
+    "/api/pty": {
+      "get": {
+        "tags": [
+          "pty"
+        ],
+        "operationId": "v2.pty.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Pty"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "List PTY sessions for a location, including exited sessions retained until removal.",
+        "summary": "List PTY sessions"
+      },
+      "post": {
+        "tags": [
+          "pty"
+        ],
+        "operationId": "v2.pty.create",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/Pty"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Create a pseudo-terminal session for a location.",
+        "summary": "Create PTY session",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "command": {
+                    "type": "string"
+                  },
+                  "args": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
+                  "cwd": {
+                    "type": "string"
+                  },
+                  "title": {
+                    "type": "string"
+                  },
+                  "env": {
+                    "type": "object",
+                    "additionalProperties": {
+                      "type": "string"
+                    }
+                  }
+                },
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/pty/{ptyID}": {
+      "get": {
+        "tags": [
+          "pty"
+        ],
+        "operationId": "v2.pty.get",
+        "parameters": [
+          {
+            "name": "ptyID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^pty"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/Pty"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "PtyNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PtyNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Get one PTY session, including its exit code once exited.",
+        "summary": "Get PTY session"
+      },
+      "put": {
+        "tags": [
+          "pty"
+        ],
+        "operationId": "v2.pty.update",
+        "parameters": [
+          {
+            "name": "ptyID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^pty"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/Pty"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "PtyNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PtyNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Update the title or viewport size of one PTY session.",
+        "summary": "Update PTY session",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "title": {
+                    "type": "string"
+                  },
+                  "size": {
+                    "type": "object",
+                    "properties": {
+                      "rows": {
+                        "type": "integer",
+                        "allOf": [
+                          {
+                            "exclusiveMinimum": 0
+                          }
+                        ]
+                      },
+                      "cols": {
+                        "type": "integer",
+                        "allOf": [
+                          {
+                            "exclusiveMinimum": 0
+                          }
+                        ]
+                      }
+                    },
+                    "required": [
+                      "rows",
+                      "cols"
+                    ],
+                    "additionalProperties": false
+                  }
+                },
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      },
+      "delete": {
+        "tags": [
+          "pty"
+        ],
+        "operationId": "v2.pty.remove",
+        "parameters": [
+          {
+            "name": "ptyID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^pty"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "PtyNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PtyNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Terminate and remove one PTY session.",
+        "summary": "Remove PTY session"
+      }
+    },
+    "/api/pty/{ptyID}/connect-token": {
+      "post": {
+        "tags": [
+          "pty"
+        ],
+        "operationId": "v2.pty.connectToken",
+        "parameters": [
+          {
+            "name": "ptyID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^pty"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/PtyTicket.ConnectToken"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "ForbiddenError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ForbiddenError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "PtyNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PtyNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Create a short-lived single-use ticket for opening a PTY WebSocket connection.",
+        "summary": "Create PTY WebSocket token"
+      }
+    },
+    "/api/pty/{ptyID}/connect": {
+      "get": {
+        "tags": [
+          "pty"
+        ],
+        "operationId": "v2.pty.connect",
+        "parameters": [
+          {
+            "name": "ptyID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^pty"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "in": "query",
+            "name": "location[directory]",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "location[workspace]",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "cursor",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "ticket",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "ForbiddenError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ForbiddenError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "PtyNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PtyNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Establish a WebSocket connection streaming PTY output and accepting terminal input.",
+        "summary": "Connect to PTY session",
+        "x-websocket": true
+      }
+    },
+    "/api/shell": {
+      "get": {
+        "tags": [
+          "shell"
+        ],
+        "operationId": "v2.shell.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Shell"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "List currently running shell commands for a location. Exited commands are not included.",
+        "summary": "List running shell commands"
+      },
+      "post": {
+        "tags": [
+          "shell"
+        ],
+        "operationId": "v2.shell.create",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/Shell"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Spawn one non-interactive shell command for a location. Combined stdout/stderr is captured to a file pageable via output.",
+        "summary": "Run shell command",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "command": {
+                    "type": "string"
+                  },
+                  "cwd": {
+                    "type": "string"
+                  },
+                  "timeout": {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  },
+                  "metadata": {
+                    "type": "object"
+                  }
+                },
+                "required": [
+                  "command"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/shell/{id}": {
+      "get": {
+        "tags": [
+          "shell"
+        ],
+        "operationId": "v2.shell.get",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^sh_"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "$ref": "#/components/schemas/Shell"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "ShellNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ShellNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Get one shell command, including its status and exit code once exited.",
+        "summary": "Get shell command"
+      },
+      "delete": {
+        "tags": [
+          "shell"
+        ],
+        "operationId": "v2.shell.remove",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^sh_"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "ShellNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ShellNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Terminate and remove one shell command and its retained output.",
+        "summary": "Remove shell command"
+      }
+    },
+    "/api/shell/{id}/output": {
+      "get": {
+        "tags": [
+          "shell"
+        ],
+        "operationId": "v2.shell.output",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^sh_"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          },
+          {
+            "name": "cursor",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^[+-]?\\d*\\.?\\d+(?:[Ee][+-]?\\d+)?$"
+                }
+              ]
+            },
+            "required": false
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^[+-]?\\d*\\.?\\d+(?:[Ee][+-]?\\d+)?$"
+                }
+              ]
+            },
+            "required": false
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "object",
+                      "properties": {
+                        "output": {
+                          "type": "string"
+                        },
+                        "cursor": {
+                          "type": "integer",
+                          "allOf": [
+                            {
+                              "minimum": 0
+                            }
+                          ]
+                        },
+                        "size": {
+                          "type": "integer",
+                          "allOf": [
+                            {
+                              "minimum": 0
+                            }
+                          ]
+                        },
+                        "truncated": {
+                          "type": "boolean"
+                        }
+                      },
+                      "required": [
+                        "output",
+                        "cursor",
+                        "size",
+                        "truncated"
+                      ],
+                      "additionalProperties": false
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "ShellNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ShellNotFoundError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Page through captured combined output by absolute byte cursor.",
+        "summary": "Read shell output"
+      }
+    },
+    "/api/question/request": {
+      "get": {
+        "tags": [
+          "question"
+        ],
+        "operationId": "v2.question.request.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/QuestionV2.Request"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve pending question requests for a location.",
+        "summary": "List pending question requests"
+      }
+    },
+    "/api/session/{sessionID}/question": {
+      "get": {
+        "tags": [
+          "question"
+        ],
+        "operationId": "v2.session.question.list",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/QuestionV2.Request"
+                      }
+                    }
+                  },
+                  "required": [
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Retrieve pending question requests owned by a session.",
+        "summary": "List session question requests"
+      }
+    },
+    "/api/session/{sessionID}/question/{requestID}/reply": {
+      "post": {
+        "tags": [
+          "question"
+        ],
+        "operationId": "v2.session.question.reply",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "requestID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^que"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | QuestionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/QuestionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Answer a pending question request owned by a session.",
+        "summary": "Reply to pending question request",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/QuestionV2.Reply"
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/api/session/{sessionID}/question/{requestID}/reject": {
+      "post": {
+        "tags": [
+          "question"
+        ],
+        "operationId": "v2.session.question.reject",
+        "parameters": [
+          {
+            "name": "sessionID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^ses"
+                }
+              ]
+            },
+            "required": true
+          },
+          {
+            "name": "requestID",
+            "in": "path",
+            "schema": {
+              "type": "string",
+              "allOf": [
+                {
+                  "pattern": "^que"
+                }
+              ]
+            },
+            "required": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "SessionNotFoundError | QuestionNotFoundError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/QuestionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/SessionNotFoundError"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "description": "Reject a pending question request owned by a session.",
+        "summary": "Reject pending question request"
+      }
+    },
+    "/api/reference": {
+      "get": {
+        "tags": [
+          "reference"
+        ],
+        "operationId": "v2.reference.list",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Reference.Info"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "List references available in the requested location.",
+        "summary": "List references"
+      }
+    },
+    "/experimental/project/{projectID}/copy": {
+      "post": {
+        "tags": [
+          "projectCopy"
+        ],
+        "operationId": "v2.projectCopy.create",
+        "parameters": [
+          {
+            "name": "projectID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "ProjectCopy.Copy",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectCopy.Copy"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "ProjectCopyError | InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/ProjectCopyError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "strategy": {
+                    "type": "string"
+                  },
+                  "directory": {
+                    "type": "string"
+                  },
+                  "name": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "strategy",
+                  "directory"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      },
+      "delete": {
+        "tags": [
+          "projectCopy"
+        ],
+        "operationId": "v2.projectCopy.remove",
+        "parameters": [
+          {
+            "name": "projectID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "ProjectCopyError | InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/ProjectCopyError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "directory": {
+                    "type": "string"
+                  },
+                  "force": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "directory",
+                  "force"
+                ],
+                "additionalProperties": false
+              }
+            }
+          },
+          "required": true
+        }
+      }
+    },
+    "/experimental/project/{projectID}/copy/refresh": {
+      "post": {
+        "tags": [
+          "projectCopy"
+        ],
+        "operationId": "v2.projectCopy.refresh",
+        "parameters": [
+          {
+            "name": "projectID",
+            "in": "path",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "204": {
+            "description": "<No Content>"
+          },
+          "400": {
+            "description": "ProjectCopyError | InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/ProjectCopyError"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InvalidRequestError"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/vcs/status": {
+      "get": {
+        "tags": [
+          "vcs"
+        ],
+        "operationId": "v2.vcs.status",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Vcs.FileStatus"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "List uncommitted working-copy changes relative to the requested location.",
+        "summary": "VCS status"
+      }
+    },
+    "/api/vcs/diff": {
+      "get": {
+        "tags": [
+          "vcs"
+        ],
+        "operationId": "v2.vcs.diff",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "directory": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "workspace": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false,
+            "style": "deepObject",
+            "explode": true
+          },
+          {
+            "name": "mode",
+            "in": "query",
+            "schema": {
+              "$ref": "#/components/schemas/Vcs.Mode"
+            },
+            "required": true
+          },
+          {
+            "name": "context",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
+          }
+        ],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "$ref": "#/components/schemas/Location.Info"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/SnapshotFileDiff"
+                      }
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "data"
+                  ],
+                  "additionalProperties": false
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "Diff the working copy against HEAD (mode git) or the default-branch merge base (mode branch) for the requested location.",
+        "summary": "VCS diff"
+      }
+    },
+    "/api/debug/location": {
+      "get": {
+        "tags": [
+          "debug"
+        ],
+        "operationId": "v2.debug.location",
+        "parameters": [],
+        "security": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/Location.Ref"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "InvalidRequestError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InvalidRequestError"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "UnauthorizedError",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UnauthorizedError"
+                }
+              }
+            }
+          }
+        },
+        "description": "List locations currently loaded by the server.",
+        "summary": "List loaded locations"
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "UnauthorizedError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "UnauthorizedError"
+            ]
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "InvalidRequestError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "InvalidRequestError"
+            ]
+          },
+          "message": {
+            "type": "string"
+          },
+          "kind": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "field": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "_tag",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "Location.Info": {
+        "type": "object",
+        "properties": {
+          "directory": {
+            "type": "string"
+          },
+          "workspaceID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^wrk"
+              }
+            ]
+          },
+          "project": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string"
+              },
+              "directory": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "id",
+              "directory"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "directory",
+          "project"
+        ],
+        "additionalProperties": false
+      },
+      "Model.Ref": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "providerID": {
+            "type": "string"
+          },
+          "variant": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "providerID"
+        ],
+        "additionalProperties": false
+      },
+      "Provider.Settings": {
+        "type": "object"
+      },
+      "Provider.Request": {
+        "type": "object",
+        "properties": {
+          "settings": {
+            "$ref": "#/components/schemas/Provider.Settings"
+          },
+          "headers": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "body": {
+            "type": "object"
+          }
+        },
+        "required": [
+          "settings",
+          "headers",
+          "body"
+        ],
+        "additionalProperties": false
+      },
+      "Agent.Color": {
+        "anyOf": [
+          {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^#[0-9a-fA-F]{6}$"
+              }
+            ]
+          },
+          {
+            "type": "string",
+            "enum": [
+              "primary",
+              "secondary",
+              "accent",
+              "success",
+              "warning",
+              "error",
+              "info"
+            ]
+          }
+        ]
+      },
+      "PermissionV2.Effect": {
+        "type": "string",
+        "enum": [
+          "allow",
+          "deny",
+          "ask"
+        ]
+      },
+      "PermissionV2.Rule": {
+        "type": "object",
+        "properties": {
+          "action": {
+            "type": "string"
+          },
+          "resource": {
+            "type": "string"
+          },
+          "effect": {
+            "$ref": "#/components/schemas/PermissionV2.Effect"
+          }
+        },
+        "required": [
+          "action",
+          "resource",
+          "effect"
+        ],
+        "additionalProperties": false
+      },
+      "PermissionV2.Ruleset": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/PermissionV2.Rule"
+        }
+      },
+      "AgentV2.Info": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "model": {
+            "$ref": "#/components/schemas/Model.Ref"
+          },
+          "request": {
+            "$ref": "#/components/schemas/Provider.Request"
+          },
+          "system": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "mode": {
+            "type": "string",
+            "enum": [
+              "subagent",
+              "primary",
+              "all"
+            ]
+          },
+          "hidden": {
+            "type": "boolean"
+          },
+          "color": {
+            "$ref": "#/components/schemas/Agent.Color"
+          },
+          "steps": {
+            "type": "integer",
+            "allOf": [
+              {
+                "exclusiveMinimum": 0
+              }
+            ]
+          },
+          "permissions": {
+            "$ref": "#/components/schemas/PermissionV2.Ruleset"
+          }
+        },
+        "required": [
+          "id",
+          "request",
+          "mode",
+          "hidden",
+          "permissions"
+        ],
+        "additionalProperties": false
+      },
+      "Plugin.Info": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id"
+        ],
+        "additionalProperties": false
+      },
+      "Location.Ref": {
+        "type": "object",
+        "properties": {
+          "directory": {
+            "type": "string"
+          },
+          "workspaceID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^wrk"
+              }
+            ]
+          }
+        },
+        "required": [
+          "directory"
+        ],
+        "additionalProperties": false
+      },
+      "File.Diff": {
+        "type": "object",
+        "properties": {
+          "path": {
+            "type": "string"
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "added",
+              "modified",
+              "deleted"
+            ]
+          },
+          "additions": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "deletions": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "patch": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "path",
+          "status",
+          "additions",
+          "deletions",
+          "patch"
+        ],
+        "additionalProperties": false
+      },
+      "Revert.State": {
+        "type": "object",
+        "properties": {
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "partID": {
+            "type": "string"
+          },
+          "snapshot": {
+            "type": "string"
+          },
+          "diff": {
+            "type": "string"
+          },
+          "files": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/File.Diff"
+            }
+          }
+        },
+        "required": [
+          "messageID"
+        ],
+        "additionalProperties": false
+      },
+      "SessionV2.Info": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "parentID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "projectID": {
+            "type": "string"
+          },
+          "agent": {
+            "type": "string"
+          },
+          "model": {
+            "$ref": "#/components/schemas/Model.Ref"
+          },
+          "cost": {
+            "type": "number"
+          },
+          "tokens": {
+            "type": "object",
+            "properties": {
+              "input": {
+                "type": "number"
+              },
+              "output": {
+                "type": "number"
+              },
+              "reasoning": {
+                "type": "number"
+              },
+              "cache": {
+                "type": "object",
+                "properties": {
+                  "read": {
+                    "type": "number"
+                  },
+                  "write": {
+                    "type": "number"
+                  }
+                },
+                "required": [
+                  "read",
+                  "write"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "input",
+              "output",
+              "reasoning",
+              "cache"
+            ],
+            "additionalProperties": false
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              },
+              "updated": {
+                "type": "number"
+              },
+              "archived": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created",
+              "updated"
+            ],
+            "additionalProperties": false
+          },
+          "title": {
+            "type": "string"
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "subpath": {
+            "type": "string"
+          },
+          "revert": {
+            "$ref": "#/components/schemas/Revert.State"
+          }
+        },
+        "required": [
+          "id",
+          "projectID",
+          "cost",
+          "tokens",
+          "time",
+          "title",
+          "location"
+        ],
+        "additionalProperties": false
+      },
+      "SessionWatermarks": {
+        "type": "object",
+        "patternProperties": {
+          "^ses": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          }
+        },
+        "description": "Durable log seq each session's snapshot was computed at. Attach a live log read after the watermark to compose fetch and stream gap-free; apply a snapshot only where its watermark is at or beyond already-applied events. Sessions without durable events are absent."
+      },
+      "SessionsResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SessionV2.Info"
+            }
+          },
+          "watermarks": {
+            "$ref": "#/components/schemas/SessionWatermarks"
+          },
+          "cursor": {
+            "type": "object",
+            "properties": {
+              "previous": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "next": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "data",
+          "watermarks",
+          "cursor"
+        ],
+        "additionalProperties": false
+      },
+      "InvalidCursorError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "InvalidCursorError"
+            ]
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "InvalidRequestError1": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "InvalidRequestError"
+            ]
+          },
+          "message": {
+            "type": "string"
+          },
+          "kind": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "field": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "_tag",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "SessionActive": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "running"
+            ]
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "SessionNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "SessionNotFoundError"
+            ]
+          },
+          "sessionID": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "sessionID",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "MessageNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "MessageNotFoundError"
+            ]
+          },
+          "sessionID": {
+            "type": "string"
+          },
+          "messageID": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "sessionID",
+          "messageID",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "Prompt.Source": {
+        "type": "object",
+        "properties": {
+          "start": {
+            "type": "number"
+          },
+          "end": {
+            "type": "number"
+          },
+          "text": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "start",
+          "end",
+          "text"
+        ],
+        "additionalProperties": false
+      },
+      "PromptInput.FileAttachment": {
+        "type": "object",
+        "properties": {
+          "uri": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "source": {
+            "$ref": "#/components/schemas/Prompt.Source"
+          }
+        },
+        "required": [
+          "uri"
+        ],
+        "additionalProperties": false
+      },
+      "Prompt.AgentAttachment": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "source": {
+            "$ref": "#/components/schemas/Prompt.Source"
+          }
+        },
+        "required": [
+          "name"
+        ],
+        "additionalProperties": false
+      },
+      "PromptInput": {
+        "type": "object",
+        "properties": {
+          "text": {
+            "type": "string"
+          },
+          "files": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PromptInput.FileAttachment"
+            }
+          },
+          "agents": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Prompt.AgentAttachment"
+            }
+          }
+        },
+        "required": [
+          "text"
+        ],
+        "additionalProperties": false
+      },
+      "Prompt.FileAttachment": {
+        "type": "object",
+        "properties": {
+          "uri": {
+            "type": "string"
+          },
+          "mime": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "source": {
+            "$ref": "#/components/schemas/Prompt.Source"
+          }
+        },
+        "required": [
+          "uri",
+          "mime"
+        ],
+        "additionalProperties": false
+      },
+      "Prompt": {
+        "type": "object",
+        "properties": {
+          "text": {
+            "type": "string"
+          },
+          "files": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Prompt.FileAttachment"
+            }
+          },
+          "agents": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Prompt.AgentAttachment"
+            }
+          }
+        },
+        "required": [
+          "text"
+        ],
+        "additionalProperties": false
+      },
+      "SessionInput.Admitted": {
+        "type": "object",
+        "properties": {
+          "admittedSeq": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "prompt": {
+            "$ref": "#/components/schemas/Prompt"
+          },
+          "delivery": {
+            "type": "string",
+            "enum": [
+              "steer",
+              "queue"
+            ]
+          },
+          "timeCreated": {
+            "type": "number"
+          },
+          "promotedSeq": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          }
+        },
+        "required": [
+          "admittedSeq",
+          "id",
+          "sessionID",
+          "prompt",
+          "delivery",
+          "timeCreated"
+        ],
+        "additionalProperties": false
+      },
+      "ConflictError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "ConflictError"
+            ]
+          },
+          "message": {
+            "type": "string"
+          },
+          "resource": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "_tag",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "CommandNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "CommandNotFoundError"
+            ]
+          },
+          "command": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "command",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "CommandEvaluationError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "CommandEvaluationError"
+            ]
+          },
+          "command": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "command",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "SkillNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "SkillNotFoundError"
+            ]
+          },
+          "skill": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "skill",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "SessionBusyError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "SessionBusyError"
+            ]
+          },
+          "sessionID": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "sessionID",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "ServiceUnavailableError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "ServiceUnavailableError"
+            ]
+          },
+          "message": {
+            "type": "string"
+          },
+          "service": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "_tag",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "UnknownError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "UnknownError"
+            ]
+          },
+          "message": {
+            "type": "string"
+          },
+          "ref": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "_tag",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.AgentSelected": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent-switched"
+            ]
+          },
+          "agent": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "time",
+          "type",
+          "agent"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.ModelSelected": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "model-switched"
+            ]
+          },
+          "model": {
+            "$ref": "#/components/schemas/Model.Ref"
+          },
+          "previous": {
+            "$ref": "#/components/schemas/Model.Ref"
+          }
+        },
+        "required": [
+          "id",
+          "time",
+          "type",
+          "model"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.User": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "text": {
+            "type": "string"
+          },
+          "files": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Prompt.FileAttachment"
+            }
+          },
+          "agents": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Prompt.AgentAttachment"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "user"
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "time",
+          "text",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.Synthetic": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "text": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "synthetic"
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "time",
+          "sessionID",
+          "text",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.System": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "system"
+            ]
+          },
+          "text": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "time",
+          "type",
+          "text"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.Skill": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "skill"
+            ]
+          },
+          "name": {
+            "type": "string"
+          },
+          "text": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "time",
+          "type",
+          "name",
+          "text"
+        ],
+        "additionalProperties": false
+      },
+      "Shell": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^sh_"
+              }
+            ]
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "running",
+              "exited",
+              "timeout",
+              "killed"
+            ]
+          },
+          "command": {
+            "type": "string"
+          },
+          "cwd": {
+            "type": "string"
+          },
+          "shell": {
+            "type": "string"
+          },
+          "file": {
+            "type": "string"
+          },
+          "pid": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "exit": {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity",
+                  "-Infinity",
+                  "NaN"
+                ]
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "started": {
+                "anyOf": [
+                  {
+                    "anyOf": [
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "NaN"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "-Infinity"
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity",
+                      "-Infinity",
+                      "NaN"
+                    ]
+                  }
+                ]
+              },
+              "completed": {
+                "anyOf": [
+                  {
+                    "anyOf": [
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "NaN"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "-Infinity"
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity",
+                      "-Infinity",
+                      "NaN"
+                    ]
+                  }
+                ]
+              }
+            },
+            "required": [
+              "started"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "status",
+          "command",
+          "cwd",
+          "shell",
+          "file",
+          "metadata",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.Shell": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              },
+              "completed": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell"
+            ]
+          },
+          "shell": {
+            "$ref": "#/components/schemas/Shell"
+          },
+          "output": {
+            "type": "object",
+            "properties": {
+              "output": {
+                "type": "string"
+              },
+              "cursor": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "size": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "truncated": {
+                "type": "boolean"
+              }
+            },
+            "required": [
+              "output",
+              "cursor",
+              "size",
+              "truncated"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "time",
+          "type",
+          "shell"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.Assistant.Text": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "text"
+            ]
+          },
+          "id": {
+            "type": "string"
+          },
+          "text": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "text"
+        ],
+        "additionalProperties": false
+      },
+      "LLM.ProviderMetadata": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object"
+        }
+      },
+      "Session.Message.Assistant.Reasoning": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "reasoning"
+            ]
+          },
+          "id": {
+            "type": "string"
+          },
+          "text": {
+            "type": "string"
+          },
+          "providerMetadata": {
+            "$ref": "#/components/schemas/LLM.ProviderMetadata"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              },
+              "completed": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "text"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.ToolState.Pending": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "pending"
+            ]
+          },
+          "input": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "status",
+          "input"
+        ],
+        "additionalProperties": false
+      },
+      "Tool.TextContent": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "text"
+            ]
+          },
+          "text": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ],
+        "additionalProperties": false
+      },
+      "Tool.FileContent": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file"
+            ]
+          },
+          "uri": {
+            "type": "string"
+          },
+          "mime": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "uri",
+          "mime"
+        ],
+        "additionalProperties": false
+      },
+      "LLM.ToolContent": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/Tool.TextContent"
+          },
+          {
+            "$ref": "#/components/schemas/Tool.FileContent"
+          }
+        ]
+      },
+      "Session.Message.ToolState.Running": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "running"
+            ]
+          },
+          "input": {
+            "type": "object"
+          },
+          "structured": {
+            "type": "object"
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/LLM.ToolContent"
+            }
+          }
+        },
+        "required": [
+          "status",
+          "input",
+          "structured",
+          "content"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.ToolState.Completed": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "completed"
+            ]
+          },
+          "input": {
+            "type": "object"
+          },
+          "attachments": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Prompt.FileAttachment"
+            }
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/LLM.ToolContent"
+            }
+          },
+          "outputPaths": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "structured": {
+            "type": "object"
+          },
+          "result": {}
+        },
+        "required": [
+          "status",
+          "input",
+          "content",
+          "structured"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Error.Unknown": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "unknown"
+            ]
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.ToolState.Error": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "error"
+            ]
+          },
+          "input": {
+            "type": "object"
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/LLM.ToolContent"
+            }
+          },
+          "structured": {
+            "type": "object"
+          },
+          "error": {
+            "$ref": "#/components/schemas/Session.Error.Unknown"
+          },
+          "result": {}
+        },
+        "required": [
+          "status",
+          "input",
+          "content",
+          "structured",
+          "error"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.Assistant.Tool": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool"
+            ]
+          },
+          "id": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "provider": {
+            "type": "object",
+            "properties": {
+              "executed": {
+                "type": "boolean"
+              },
+              "metadata": {
+                "$ref": "#/components/schemas/LLM.ProviderMetadata"
+              },
+              "resultMetadata": {
+                "$ref": "#/components/schemas/LLM.ProviderMetadata"
+              }
+            },
+            "required": [
+              "executed"
+            ],
+            "additionalProperties": false
+          },
+          "state": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Session.Message.ToolState.Pending"
+              },
+              {
+                "$ref": "#/components/schemas/Session.Message.ToolState.Running"
+              },
+              {
+                "$ref": "#/components/schemas/Session.Message.ToolState.Completed"
+              },
+              {
+                "$ref": "#/components/schemas/Session.Message.ToolState.Error"
+              }
+            ]
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              },
+              "ran": {
+                "type": "number"
+              },
+              "completed": {
+                "type": "number"
+              },
+              "pruned": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "name",
+          "state",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.Assistant": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              },
+              "completed": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "assistant"
+            ]
+          },
+          "agent": {
+            "type": "string"
+          },
+          "model": {
+            "$ref": "#/components/schemas/Model.Ref"
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "anyOf": [
+                {
+                  "$ref": "#/components/schemas/Session.Message.Assistant.Text"
+                },
+                {
+                  "$ref": "#/components/schemas/Session.Message.Assistant.Reasoning"
+                },
+                {
+                  "$ref": "#/components/schemas/Session.Message.Assistant.Tool"
+                }
+              ]
+            }
+          },
+          "snapshot": {
+            "type": "object",
+            "properties": {
+              "start": {
+                "type": "string"
+              },
+              "end": {
+                "type": "string"
+              },
+              "files": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          "finish": {
+            "type": "string"
+          },
+          "cost": {
+            "type": "number"
+          },
+          "tokens": {
+            "type": "object",
+            "properties": {
+              "input": {
+                "type": "number"
+              },
+              "output": {
+                "type": "number"
+              },
+              "reasoning": {
+                "type": "number"
+              },
+              "cache": {
+                "type": "object",
+                "properties": {
+                  "read": {
+                    "type": "number"
+                  },
+                  "write": {
+                    "type": "number"
+                  }
+                },
+                "required": [
+                  "read",
+                  "write"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "input",
+              "output",
+              "reasoning",
+              "cache"
+            ],
+            "additionalProperties": false
+          },
+          "error": {
+            "$ref": "#/components/schemas/Session.Error.Unknown"
+          }
+        },
+        "required": [
+          "id",
+          "time",
+          "type",
+          "agent",
+          "model",
+          "content"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message.Compaction": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "compaction"
+            ]
+          },
+          "reason": {
+            "type": "string",
+            "enum": [
+              "auto",
+              "manual"
+            ]
+          },
+          "summary": {
+            "type": "string"
+          },
+          "recent": {
+            "type": "string"
+          },
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg_"
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "type",
+          "reason",
+          "summary",
+          "recent",
+          "id",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "Session.Message": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/Session.Message.AgentSelected"
+          },
+          {
+            "$ref": "#/components/schemas/Session.Message.ModelSelected"
+          },
+          {
+            "$ref": "#/components/schemas/Session.Message.User"
+          },
+          {
+            "$ref": "#/components/schemas/Session.Message.Synthetic"
+          },
+          {
+            "$ref": "#/components/schemas/Session.Message.System"
+          },
+          {
+            "$ref": "#/components/schemas/Session.Message.Skill"
+          },
+          {
+            "$ref": "#/components/schemas/Session.Message.Shell"
+          },
+          {
+            "$ref": "#/components/schemas/Session.Message.Assistant"
+          },
+          {
+            "$ref": "#/components/schemas/Session.Message.Compaction"
+          }
+        ]
+      },
+      "SessionContextEntry.Key": {
+        "type": "string",
+        "allOf": [
+          {
+            "pattern": "^[a-z0-9][a-z0-9._-]*$",
+            "description": "Context entry key (lowercase alphanumerics plus . _ -)"
+          }
+        ]
+      },
+      "SessionContextEntry.Info": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "$ref": "#/components/schemas/SessionContextEntry.Key"
+          },
+          "value": {}
+        },
+        "required": [
+          "key",
+          "value"
+        ],
+        "additionalProperties": false
+      },
+      "session.agent.selected": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.agent.selected"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "agent": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "sessionID",
+              "agent"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.model.selected": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.model.selected"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "model": {
+                "$ref": "#/components/schemas/Model.Ref"
+              }
+            },
+            "required": [
+              "sessionID",
+              "model"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.moved": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.moved"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "location": {
+                "$ref": "#/components/schemas/Location.Ref"
+              },
+              "subpath": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "sessionID",
+              "location"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.renamed": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.renamed"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "title": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "sessionID",
+              "title"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.forked": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.forked"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "parentID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "from": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "sessionID",
+              "parentID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.prompt.promoted": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.prompt.promoted"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "inputID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "sessionID",
+              "inputID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.prompt.admitted": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.prompt.admitted"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "inputID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "prompt": {
+                "$ref": "#/components/schemas/Prompt"
+              },
+              "delivery": {
+                "type": "string",
+                "enum": [
+                  "steer",
+                  "queue"
+                ]
+              }
+            },
+            "required": [
+              "sessionID",
+              "inputID",
+              "prompt",
+              "delivery"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.context.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.context.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "text": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "sessionID",
+              "text"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.synthetic": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.synthetic"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "text": {
+                "type": "string"
+              },
+              "description": {
+                "type": "string"
+              },
+              "metadata": {
+                "type": "object"
+              }
+            },
+            "required": [
+              "sessionID",
+              "text"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.skill.activated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.skill.activated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "name": {
+                "type": "string"
+              },
+              "text": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "sessionID",
+              "name",
+              "text"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "Shell1": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^sh_"
+              }
+            ]
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "running",
+              "exited",
+              "timeout",
+              "killed"
+            ]
+          },
+          "command": {
+            "type": "string"
+          },
+          "cwd": {
+            "type": "string"
+          },
+          "shell": {
+            "type": "string"
+          },
+          "file": {
+            "type": "string"
+          },
+          "pid": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "exit": {
+            "anyOf": [
+              {
+                "type": "number"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "NaN"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "-Infinity"
+                ]
+              }
+            ]
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "started": {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              "completed": {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              }
+            },
+            "required": [
+              "started"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "status",
+          "command",
+          "cwd",
+          "shell",
+          "file",
+          "metadata",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "session.shell.started": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.shell.started"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "shell": {
+                "$ref": "#/components/schemas/Shell1"
+              }
+            },
+            "required": [
+              "sessionID",
+              "shell"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.shell.ended": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.shell.ended"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "shell": {
+                "$ref": "#/components/schemas/Shell1"
+              },
+              "output": {
+                "type": "object",
+                "properties": {
+                  "output": {
+                    "type": "string"
+                  },
+                  "cursor": {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  },
+                  "size": {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  },
+                  "truncated": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "output",
+                  "cursor",
+                  "size",
+                  "truncated"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "sessionID",
+              "shell",
+              "output"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.step.started": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.step.started"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "agent": {
+                "type": "string"
+              },
+              "model": {
+                "$ref": "#/components/schemas/Model.Ref"
+              },
+              "snapshot": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "sessionID",
+              "assistantMessageID",
+              "agent",
+              "model"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.step.ended": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.step.ended"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "finish": {
+                "type": "string"
+              },
+              "cost": {
+                "type": "number"
+              },
+              "tokens": {
+                "type": "object",
+                "properties": {
+                  "input": {
+                    "type": "number"
+                  },
+                  "output": {
+                    "type": "number"
+                  },
+                  "reasoning": {
+                    "type": "number"
+                  },
+                  "cache": {
+                    "type": "object",
+                    "properties": {
+                      "read": {
+                        "type": "number"
+                      },
+                      "write": {
+                        "type": "number"
+                      }
+                    },
+                    "required": [
+                      "read",
+                      "write"
+                    ],
+                    "additionalProperties": false
+                  }
+                },
+                "required": [
+                  "input",
+                  "output",
+                  "reasoning",
+                  "cache"
+                ],
+                "additionalProperties": false
+              },
+              "snapshot": {
+                "type": "string"
+              },
+              "files": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            "required": [
+              "sessionID",
+              "assistantMessageID",
+              "finish",
+              "cost",
+              "tokens"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.step.failed": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.step.failed"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "error": {
+                "$ref": "#/components/schemas/Session.Error.Unknown"
+              }
+            },
+            "required": [
+              "sessionID",
+              "assistantMessageID",
+              "error"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.text.started": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.text.started"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "textID": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "sessionID",
+              "assistantMessageID",
+              "textID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.text.ended": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.text.ended"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "textID": {
+                "type": "string"
+              },
+              "text": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "sessionID",
+              "assistantMessageID",
+              "textID",
+              "text"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "LLM.ProviderMetadata3": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object"
+        }
+      },
+      "session.reasoning.started": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.reasoning.started"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "reasoningID": {
+                "type": "string"
+              },
+              "providerMetadata": {
+                "$ref": "#/components/schemas/LLM.ProviderMetadata3"
+              }
+            },
+            "required": [
+              "sessionID",
+              "assistantMessageID",
+              "reasoningID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "LLM.ProviderMetadata4": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object"
+        }
+      },
+      "session.reasoning.ended": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.reasoning.ended"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "reasoningID": {
+                "type": "string"
+              },
+              "text": {
+                "type": "string"
+              },
+              "providerMetadata": {
+                "$ref": "#/components/schemas/LLM.ProviderMetadata4"
+              }
+            },
+            "required": [
+              "sessionID",
+              "assistantMessageID",
+              "reasoningID",
+              "text"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.tool.input.started": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.tool.input.started"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "callID": {
+                "type": "string"
+              },
+              "name": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "sessionID",
+              "assistantMessageID",
+              "callID",
+              "name"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.tool.input.ended": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.tool.input.ended"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "callID": {
+                "type": "string"
+              },
+              "text": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "sessionID",
+              "assistantMessageID",
+              "callID",
+              "text"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "LLM.ProviderMetadata5": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object"
+        }
+      },
+      "session.tool.called": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.tool.called"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "callID": {
+                "type": "string"
+              },
+              "tool": {
+                "type": "string"
+              },
+              "input": {
+                "type": "object"
+              },
+              "provider": {
+                "type": "object",
+                "properties": {
+                  "executed": {
+                    "type": "boolean"
+                  },
+                  "metadata": {
+                    "$ref": "#/components/schemas/LLM.ProviderMetadata5"
+                  }
+                },
+                "required": [
+                  "executed"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "sessionID",
+              "assistantMessageID",
+              "callID",
+              "tool",
+              "input",
+              "provider"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.tool.progress": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.tool.progress"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "callID": {
+                "type": "string"
+              },
+              "structured": {
+                "type": "object"
+              },
+              "content": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/LLM.ToolContent"
+                }
+              }
+            },
+            "required": [
+              "sessionID",
+              "assistantMessageID",
+              "callID",
+              "structured",
+              "content"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "LLM.ProviderMetadata6": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object"
+        }
+      },
+      "session.tool.success": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.tool.success"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "callID": {
+                "type": "string"
+              },
+              "structured": {
+                "type": "object"
+              },
+              "content": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/LLM.ToolContent"
+                }
+              },
+              "outputPaths": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "result": {},
+              "provider": {
+                "type": "object",
+                "properties": {
+                  "executed": {
+                    "type": "boolean"
+                  },
+                  "metadata": {
+                    "$ref": "#/components/schemas/LLM.ProviderMetadata6"
+                  }
+                },
+                "required": [
+                  "executed"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "sessionID",
+              "assistantMessageID",
+              "callID",
+              "structured",
+              "content",
+              "provider"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "LLM.ProviderMetadata7": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object"
+        }
+      },
+      "session.tool.failed": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.tool.failed"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "callID": {
+                "type": "string"
+              },
+              "error": {
+                "$ref": "#/components/schemas/Session.Error.Unknown"
+              },
+              "result": {},
+              "provider": {
+                "type": "object",
+                "properties": {
+                  "executed": {
+                    "type": "boolean"
+                  },
+                  "metadata": {
+                    "$ref": "#/components/schemas/LLM.ProviderMetadata7"
+                  }
+                },
+                "required": [
+                  "executed"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "sessionID",
+              "assistantMessageID",
+              "callID",
+              "error",
+              "provider"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.retry.error": {
+        "type": "object",
+        "properties": {
+          "message": {
+            "type": "string"
+          },
+          "statusCode": {
+            "type": "number"
+          },
+          "isRetryable": {
+            "type": "boolean"
+          },
+          "responseHeaders": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "responseBody": {
+            "type": "string"
+          },
+          "metadata": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "message",
+          "isRetryable"
+        ],
+        "additionalProperties": false
+      },
+      "session.retried": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.retried"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "attempt": {
+                "type": "number"
+              },
+              "error": {
+                "$ref": "#/components/schemas/session.retry.error"
+              }
+            },
+            "required": [
+              "sessionID",
+              "attempt",
+              "error"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.compaction.started": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.compaction.started"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "reason": {
+                "type": "string",
+                "enum": [
+                  "auto",
+                  "manual"
+                ]
+              }
+            },
+            "required": [
+              "sessionID",
+              "reason"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.compaction.ended": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.compaction.ended"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "reason": {
+                "type": "string",
+                "enum": [
+                  "auto",
+                  "manual"
+                ]
+              },
+              "text": {
+                "type": "string"
+              },
+              "recent": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "sessionID",
+              "reason",
+              "text",
+              "recent"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.revert.staged": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.revert.staged"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "revert": {
+                "$ref": "#/components/schemas/Revert.State"
+              }
+            },
+            "required": [
+              "sessionID",
+              "revert"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.revert.cleared": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.revert.cleared"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "sessionID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.revert.committed": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.revert.committed"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "sessionID",
+              "messageID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "SessionDurableEvent": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/session.agent.selected"
+          },
+          {
+            "$ref": "#/components/schemas/session.model.selected"
+          },
+          {
+            "$ref": "#/components/schemas/session.moved"
+          },
+          {
+            "$ref": "#/components/schemas/session.renamed"
+          },
+          {
+            "$ref": "#/components/schemas/session.forked"
+          },
+          {
+            "$ref": "#/components/schemas/session.prompt.promoted"
+          },
+          {
+            "$ref": "#/components/schemas/session.prompt.admitted"
+          },
+          {
+            "$ref": "#/components/schemas/session.context.updated"
+          },
+          {
+            "$ref": "#/components/schemas/session.synthetic"
+          },
+          {
+            "$ref": "#/components/schemas/session.skill.activated"
+          },
+          {
+            "$ref": "#/components/schemas/session.shell.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.shell.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.step.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.step.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.step.failed"
+          },
+          {
+            "$ref": "#/components/schemas/session.text.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.text.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.reasoning.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.reasoning.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.tool.input.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.tool.input.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.tool.called"
+          },
+          {
+            "$ref": "#/components/schemas/session.tool.progress"
+          },
+          {
+            "$ref": "#/components/schemas/session.tool.success"
+          },
+          {
+            "$ref": "#/components/schemas/session.tool.failed"
+          },
+          {
+            "$ref": "#/components/schemas/session.retried"
+          },
+          {
+            "$ref": "#/components/schemas/session.compaction.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.compaction.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.revert.staged"
+          },
+          {
+            "$ref": "#/components/schemas/session.revert.cleared"
+          },
+          {
+            "$ref": "#/components/schemas/session.revert.committed"
+          }
+        ]
+      },
+      "EventLog.Synced": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "log.synced"
+            ]
+          },
+          "aggregateID": {
+            "type": "string"
+          },
+          "seq": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "aggregateID"
+        ],
+        "additionalProperties": false,
+        "description": "Marker emitted once when a log read reaches its captured watermark. The reader holds every event committed at or below seq."
+      },
+      "SessionLogItem": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/SessionDurableEvent"
+          },
+          {
+            "$ref": "#/components/schemas/EventLog.Synced"
+          }
+        ]
+      },
+      "SessionLogItemStream": {
+        "type": "string",
+        "contentSchema": {
+          "$ref": "#/components/schemas/SessionLogItem"
+        },
+        "contentMediaType": "application/json"
+      },
+      "SessionMessagesResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Session.Message"
+            }
+          },
+          "watermark": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "cursor": {
+            "type": "object",
+            "properties": {
+              "previous": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "next": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "data",
+          "cursor"
+        ],
+        "additionalProperties": false
+      },
+      "Model.Api": {
+        "anyOf": [
+          {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string"
+              },
+              "type": {
+                "type": "string",
+                "enum": [
+                  "aisdk"
+                ]
+              },
+              "package": {
+                "type": "string"
+              },
+              "url": {
+                "type": "string"
+              },
+              "settings": {
+                "type": "object"
+              }
+            },
+            "required": [
+              "id",
+              "type",
+              "package"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string"
+              },
+              "type": {
+                "type": "string",
+                "enum": [
+                  "native"
+                ]
+              },
+              "url": {
+                "type": "string"
+              },
+              "settings": {
+                "type": "object"
+              }
+            },
+            "required": [
+              "id",
+              "type",
+              "settings"
+            ],
+            "additionalProperties": false
+          }
+        ]
+      },
+      "Model.Capabilities": {
+        "type": "object",
+        "properties": {
+          "tools": {
+            "type": "boolean"
+          },
+          "input": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "output": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "tools",
+          "input",
+          "output"
+        ],
+        "additionalProperties": false
+      },
+      "Model.Cost": {
+        "type": "object",
+        "properties": {
+          "tier": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "context"
+                ]
+              },
+              "size": {
+                "type": "integer"
+              }
+            },
+            "required": [
+              "type",
+              "size"
+            ],
+            "additionalProperties": false
+          },
+          "input": {
+            "type": "number"
+          },
+          "output": {
+            "type": "number"
+          },
+          "cache": {
+            "type": "object",
+            "properties": {
+              "read": {
+                "type": "number"
+              },
+              "write": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "read",
+              "write"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "input",
+          "output",
+          "cache"
+        ],
+        "additionalProperties": false
+      },
+      "ModelV2.Info": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "providerID": {
+            "type": "string"
+          },
+          "family": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "api": {
+            "$ref": "#/components/schemas/Model.Api"
+          },
+          "capabilities": {
+            "$ref": "#/components/schemas/Model.Capabilities"
+          },
+          "request": {
+            "type": "object",
+            "properties": {
+              "settings": {
+                "$ref": "#/components/schemas/Provider.Settings"
+              },
+              "headers": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "string"
+                }
+              },
+              "body": {
+                "type": "object"
+              },
+              "variant": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "settings",
+              "headers",
+              "body"
+            ],
+            "additionalProperties": false
+          },
+          "variants": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "id": {
+                  "type": "string"
+                },
+                "settings": {
+                  "$ref": "#/components/schemas/Provider.Settings"
+                },
+                "headers": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "string"
+                  }
+                },
+                "body": {
+                  "type": "object"
+                }
+              },
+              "required": [
+                "id",
+                "settings",
+                "headers",
+                "body"
+              ],
+              "additionalProperties": false
+            }
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "released": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "released"
+            ],
+            "additionalProperties": false
+          },
+          "cost": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Model.Cost"
+            }
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "alpha",
+              "beta",
+              "deprecated",
+              "active"
+            ]
+          },
+          "enabled": {
+            "type": "boolean"
+          },
+          "limit": {
+            "type": "object",
+            "properties": {
+              "context": {
+                "type": "integer"
+              },
+              "input": {
+                "type": "integer"
+              },
+              "output": {
+                "type": "integer"
+              }
+            },
+            "required": [
+              "context",
+              "output"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "providerID",
+          "name",
+          "api",
+          "capabilities",
+          "request",
+          "variants",
+          "time",
+          "cost",
+          "status",
+          "enabled",
+          "limit"
+        ],
+        "additionalProperties": false
+      },
+      "GenerateTextResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "object",
+            "properties": {
+              "text": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "text"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "Provider.AISDK": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "aisdk"
+            ]
+          },
+          "package": {
+            "type": "string"
+          },
+          "url": {
+            "type": "string"
+          },
+          "settings": {
+            "type": "object"
+          }
+        },
+        "required": [
+          "type",
+          "package"
+        ],
+        "additionalProperties": false
+      },
+      "Provider.Native": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "native"
+            ]
+          },
+          "url": {
+            "type": "string"
+          },
+          "settings": {
+            "type": "object"
+          }
+        },
+        "required": [
+          "type",
+          "settings"
+        ],
+        "additionalProperties": false
+      },
+      "Provider.Api": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/Provider.AISDK"
+          },
+          {
+            "$ref": "#/components/schemas/Provider.Native"
+          }
+        ]
+      },
+      "ProviderV2.Info": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "integrationID": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "disabled": {
+            "type": "boolean"
+          },
+          "api": {
+            "$ref": "#/components/schemas/Provider.Api"
+          },
+          "request": {
+            "$ref": "#/components/schemas/Provider.Request"
+          }
+        },
+        "required": [
+          "id",
+          "name",
+          "api",
+          "request"
+        ],
+        "additionalProperties": false
+      },
+      "ProviderNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "ProviderNotFoundError"
+            ]
+          },
+          "providerID": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "providerID",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "Integration.When": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "op": {
+            "type": "string",
+            "enum": [
+              "eq",
+              "neq"
+            ]
+          },
+          "value": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "key",
+          "op",
+          "value"
+        ],
+        "additionalProperties": false
+      },
+      "Integration.TextPrompt": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "text"
+            ]
+          },
+          "key": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          },
+          "placeholder": {
+            "type": "string"
+          },
+          "when": {
+            "$ref": "#/components/schemas/Integration.When"
+          }
+        },
+        "required": [
+          "type",
+          "key",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "Integration.SelectPrompt": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "select"
+            ]
+          },
+          "key": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "label": {
+                  "type": "string"
+                },
+                "value": {
+                  "type": "string"
+                },
+                "hint": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "label",
+                "value"
+              ],
+              "additionalProperties": false
+            }
+          },
+          "when": {
+            "$ref": "#/components/schemas/Integration.When"
+          }
+        },
+        "required": [
+          "type",
+          "key",
+          "message",
+          "options"
+        ],
+        "additionalProperties": false
+      },
+      "Integration.OAuthMethod": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "oauth"
+            ]
+          },
+          "label": {
+            "type": "string"
+          },
+          "prompts": {
+            "type": "array",
+            "items": {
+              "anyOf": [
+                {
+                  "$ref": "#/components/schemas/Integration.TextPrompt"
+                },
+                {
+                  "$ref": "#/components/schemas/Integration.SelectPrompt"
+                }
+              ]
+            }
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "label"
+        ],
+        "additionalProperties": false
+      },
+      "Integration.KeyMethod": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "key"
+            ]
+          },
+          "label": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Integration.EnvMethod": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "env"
+            ]
+          },
+          "names": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "type",
+          "names"
+        ],
+        "additionalProperties": false
+      },
+      "Integration.Method": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/Integration.OAuthMethod"
+          },
+          {
+            "$ref": "#/components/schemas/Integration.KeyMethod"
+          },
+          {
+            "$ref": "#/components/schemas/Integration.EnvMethod"
+          }
+        ]
+      },
+      "Connection.CredentialInfo": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "credential"
+            ]
+          },
+          "id": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "label"
+        ],
+        "additionalProperties": false
+      },
+      "Connection.EnvInfo": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "env"
+            ]
+          },
+          "name": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "name"
+        ],
+        "additionalProperties": false
+      },
+      "Connection.Info": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/Connection.CredentialInfo"
+          },
+          {
+            "$ref": "#/components/schemas/Connection.EnvInfo"
+          }
+        ]
+      },
+      "Integration.Info": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "methods": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Integration.Method"
+            }
+          },
+          "connections": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Connection.Info"
+            }
+          }
+        },
+        "required": [
+          "id",
+          "name",
+          "methods",
+          "connections"
+        ],
+        "additionalProperties": false
+      },
+      "Integration.Attempt": {
+        "type": "object",
+        "properties": {
+          "attemptID": {
+            "type": "string"
+          },
+          "url": {
+            "type": "string"
+          },
+          "instructions": {
+            "type": "string"
+          },
+          "mode": {
+            "type": "string",
+            "enum": [
+              "auto",
+              "code"
+            ]
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "anyOf": [
+                  {
+                    "anyOf": [
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "NaN"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "-Infinity"
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity",
+                      "-Infinity",
+                      "NaN"
+                    ]
+                  }
+                ]
+              },
+              "expires": {
+                "anyOf": [
+                  {
+                    "anyOf": [
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "NaN"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "-Infinity"
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity",
+                      "-Infinity",
+                      "NaN"
+                    ]
+                  }
+                ]
+              }
+            },
+            "required": [
+              "created",
+              "expires"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "attemptID",
+          "url",
+          "instructions",
+          "mode",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "Integration.AttemptStatus": {
+        "anyOf": [
+          {
+            "type": "object",
+            "properties": {
+              "status": {
+                "type": "string",
+                "enum": [
+                  "pending"
+                ]
+              },
+              "time": {
+                "type": "object",
+                "properties": {
+                  "created": {
+                    "anyOf": [
+                      {
+                        "anyOf": [
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "NaN"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "Infinity"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "-Infinity"
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity",
+                          "-Infinity",
+                          "NaN"
+                        ]
+                      }
+                    ]
+                  },
+                  "expires": {
+                    "anyOf": [
+                      {
+                        "anyOf": [
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "NaN"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "Infinity"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "-Infinity"
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity",
+                          "-Infinity",
+                          "NaN"
+                        ]
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "created",
+                  "expires"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "status",
+              "time"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "status": {
+                "type": "string",
+                "enum": [
+                  "complete"
+                ]
+              },
+              "time": {
+                "type": "object",
+                "properties": {
+                  "created": {
+                    "anyOf": [
+                      {
+                        "anyOf": [
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "NaN"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "Infinity"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "-Infinity"
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity",
+                          "-Infinity",
+                          "NaN"
+                        ]
+                      }
+                    ]
+                  },
+                  "expires": {
+                    "anyOf": [
+                      {
+                        "anyOf": [
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "NaN"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "Infinity"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "-Infinity"
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity",
+                          "-Infinity",
+                          "NaN"
+                        ]
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "created",
+                  "expires"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "status",
+              "time"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "status": {
+                "type": "string",
+                "enum": [
+                  "failed"
+                ]
+              },
+              "message": {
+                "type": "string"
+              },
+              "time": {
+                "type": "object",
+                "properties": {
+                  "created": {
+                    "anyOf": [
+                      {
+                        "anyOf": [
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "NaN"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "Infinity"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "-Infinity"
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity",
+                          "-Infinity",
+                          "NaN"
+                        ]
+                      }
+                    ]
+                  },
+                  "expires": {
+                    "anyOf": [
+                      {
+                        "anyOf": [
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "NaN"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "Infinity"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "-Infinity"
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity",
+                          "-Infinity",
+                          "NaN"
+                        ]
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "created",
+                  "expires"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "status",
+              "message",
+              "time"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "status": {
+                "type": "string",
+                "enum": [
+                  "expired"
+                ]
+              },
+              "time": {
+                "type": "object",
+                "properties": {
+                  "created": {
+                    "anyOf": [
+                      {
+                        "anyOf": [
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "NaN"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "Infinity"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "-Infinity"
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity",
+                          "-Infinity",
+                          "NaN"
+                        ]
+                      }
+                    ]
+                  },
+                  "expires": {
+                    "anyOf": [
+                      {
+                        "anyOf": [
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "NaN"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "Infinity"
+                            ]
+                          },
+                          {
+                            "type": "string",
+                            "enum": [
+                              "-Infinity"
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity",
+                          "-Infinity",
+                          "NaN"
+                        ]
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "created",
+                  "expires"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "status",
+              "time"
+            ],
+            "additionalProperties": false
+          }
+        ]
+      },
+      "Mcp.Status.Connected": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "connected"
+            ]
+          }
+        },
+        "required": [
+          "status"
+        ],
+        "additionalProperties": false
+      },
+      "Mcp.Status.Pending": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "pending"
+            ]
+          }
+        },
+        "required": [
+          "status"
+        ],
+        "additionalProperties": false
+      },
+      "Mcp.Status.Disabled": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "disabled"
+            ]
+          }
+        },
+        "required": [
+          "status"
+        ],
+        "additionalProperties": false
+      },
+      "Mcp.Status.Failed": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "failed"
+            ]
+          },
+          "error": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "status",
+          "error"
+        ],
+        "additionalProperties": false
+      },
+      "Mcp.Status.NeedsAuth": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "needs_auth"
+            ]
+          }
+        },
+        "required": [
+          "status"
+        ],
+        "additionalProperties": false
+      },
+      "Mcp.Status.NeedsClientRegistration": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "needs_client_registration"
+            ]
+          },
+          "error": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "status",
+          "error"
+        ],
+        "additionalProperties": false
+      },
+      "Mcp.Server": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "status": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Mcp.Status.Connected"
+              },
+              {
+                "$ref": "#/components/schemas/Mcp.Status.Pending"
+              },
+              {
+                "$ref": "#/components/schemas/Mcp.Status.Disabled"
+              },
+              {
+                "$ref": "#/components/schemas/Mcp.Status.Failed"
+              },
+              {
+                "$ref": "#/components/schemas/Mcp.Status.NeedsAuth"
+              },
+              {
+                "$ref": "#/components/schemas/Mcp.Status.NeedsClientRegistration"
+              }
+            ]
+          },
+          "integrationID": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "name",
+          "status"
+        ],
+        "additionalProperties": false
+      },
+      "Project.Vcs": {
+        "type": "string",
+        "enum": [
+          "git",
+          "hg"
+        ]
+      },
+      "Project.Icon": {
+        "type": "object",
+        "properties": {
+          "url": {
+            "type": "string"
+          },
+          "override": {
+            "type": "string"
+          },
+          "color": {
+            "type": "string"
+          }
+        },
+        "additionalProperties": false
+      },
+      "Project.Commands": {
+        "type": "object",
+        "properties": {
+          "start": {
+            "type": "string",
+            "description": "Startup script to run when creating a new workspace (worktree)"
+          }
+        },
+        "additionalProperties": false
+      },
+      "Project.Time": {
+        "type": "object",
+        "properties": {
+          "created": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "updated": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "initialized": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          }
+        },
+        "required": [
+          "created",
+          "updated"
+        ],
+        "additionalProperties": false
+      },
+      "Project": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "worktree": {
+            "type": "string"
+          },
+          "vcs": {
+            "$ref": "#/components/schemas/Project.Vcs"
+          },
+          "name": {
+            "type": "string"
+          },
+          "icon": {
+            "$ref": "#/components/schemas/Project.Icon"
+          },
+          "commands": {
+            "$ref": "#/components/schemas/Project.Commands"
+          },
+          "time": {
+            "$ref": "#/components/schemas/Project.Time"
+          },
+          "sandboxes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "id",
+          "worktree",
+          "time",
+          "sandboxes"
+        ],
+        "additionalProperties": false
+      },
+      "Project.Current": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "directory": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "directory"
+        ],
+        "additionalProperties": false
+      },
+      "Project.Directory": {
+        "type": "object",
+        "properties": {
+          "directory": {
+            "type": "string"
+          },
+          "strategy": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "directory"
+        ],
+        "additionalProperties": false
+      },
+      "Project.Directories": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/Project.Directory"
+        }
+      },
+      "Form.Metadata": {
+        "type": "object"
+      },
+      "Form.When": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "op": {
+            "type": "string",
+            "enum": [
+              "eq",
+              "neq"
+            ]
+          },
+          "value": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "anyOf": [
+                  {
+                    "anyOf": [
+                      {
+                        "type": "number"
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "NaN"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "Infinity"
+                        ]
+                      },
+                      {
+                        "type": "string",
+                        "enum": [
+                          "-Infinity"
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity",
+                      "-Infinity",
+                      "NaN"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "boolean"
+              }
+            ]
+          }
+        },
+        "required": [
+          "key",
+          "op",
+          "value"
+        ],
+        "additionalProperties": false
+      },
+      "Form.Option": {
+        "type": "object",
+        "properties": {
+          "value": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "value",
+          "label"
+        ],
+        "additionalProperties": false
+      },
+      "Form.StringField": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "string"
+            ]
+          },
+          "format": {
+            "type": "string",
+            "enum": [
+              "email",
+              "uri",
+              "date",
+              "date-time"
+            ]
+          },
+          "minLength": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "maxLength": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "pattern": {
+            "type": "string"
+          },
+          "placeholder": {
+            "type": "string"
+          },
+          "default": {
+            "type": "string"
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.Option"
+            }
+          },
+          "custom": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "key",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Form.NumberField": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "number"
+            ]
+          },
+          "minimum": {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity",
+                  "-Infinity",
+                  "NaN"
+                ]
+              }
+            ]
+          },
+          "maximum": {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity",
+                  "-Infinity",
+                  "NaN"
+                ]
+              }
+            ]
+          },
+          "default": {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity",
+                  "-Infinity",
+                  "NaN"
+                ]
+              }
+            ]
+          }
+        },
+        "required": [
+          "key",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Form.IntegerField": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "integer"
+            ]
+          },
+          "minimum": {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity",
+                  "-Infinity",
+                  "NaN"
+                ]
+              }
+            ]
+          },
+          "maximum": {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity",
+                  "-Infinity",
+                  "NaN"
+                ]
+              }
+            ]
+          },
+          "default": {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity",
+                  "-Infinity",
+                  "NaN"
+                ]
+              }
+            ]
+          }
+        },
+        "required": [
+          "key",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Form.BooleanField": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "boolean"
+            ]
+          },
+          "default": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "key",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Form.MultiselectField": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "multiselect"
+            ]
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.Option"
+            }
+          },
+          "minItems": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "maxItems": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "custom": {
+            "type": "boolean"
+          },
+          "default": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "key",
+          "type",
+          "options"
+        ],
+        "additionalProperties": false
+      },
+      "Form.FormInfo": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^frm_"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Form.Metadata"
+          },
+          "mode": {
+            "type": "string",
+            "enum": [
+              "form"
+            ]
+          },
+          "fields": {
+            "type": "array",
+            "items": {
+              "anyOf": [
+                {
+                  "$ref": "#/components/schemas/Form.StringField"
+                },
+                {
+                  "$ref": "#/components/schemas/Form.NumberField"
+                },
+                {
+                  "$ref": "#/components/schemas/Form.IntegerField"
+                },
+                {
+                  "$ref": "#/components/schemas/Form.BooleanField"
+                },
+                {
+                  "$ref": "#/components/schemas/Form.MultiselectField"
+                }
+              ]
+            }
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "mode",
+          "fields"
+        ],
+        "additionalProperties": false
+      },
+      "Form.UrlInfo": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^frm_"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Form.Metadata"
+          },
+          "mode": {
+            "type": "string",
+            "enum": [
+              "url"
+            ]
+          },
+          "url": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "mode",
+          "url"
+        ],
+        "additionalProperties": false
+      },
+      "Form.CreatePayload": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^frm_"
+                  }
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "title": {
+            "type": "string"
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Form.Metadata"
+          },
+          "mode": {
+            "type": "string",
+            "enum": [
+              "form",
+              "url"
+            ]
+          },
+          "fields": {
+            "anyOf": [
+              {
+                "type": "array",
+                "items": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/Form.StringField"
+                    },
+                    {
+                      "$ref": "#/components/schemas/Form.NumberField"
+                    },
+                    {
+                      "$ref": "#/components/schemas/Form.IntegerField"
+                    },
+                    {
+                      "$ref": "#/components/schemas/Form.BooleanField"
+                    },
+                    {
+                      "$ref": "#/components/schemas/Form.MultiselectField"
+                    }
+                  ]
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "url": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "mode"
+        ],
+        "additionalProperties": false
+      },
+      "FormNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "FormNotFoundError"
+            ]
+          },
+          "id": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "id",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "Form.Value": {
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity",
+                  "-Infinity",
+                  "NaN"
+                ]
+              }
+            ]
+          },
+          {
+            "type": "boolean"
+          },
+          {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        ]
+      },
+      "Form.Answer": {
+        "type": "object",
+        "additionalProperties": {
+          "$ref": "#/components/schemas/Form.Value"
+        }
+      },
+      "Form.State": {
+        "anyOf": [
+          {
+            "type": "object",
+            "properties": {
+              "status": {
+                "type": "string",
+                "enum": [
+                  "pending"
+                ]
+              }
+            },
+            "required": [
+              "status"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "status": {
+                "type": "string",
+                "enum": [
+                  "answered"
+                ]
+              },
+              "answer": {
+                "$ref": "#/components/schemas/Form.Answer"
+              }
+            },
+            "required": [
+              "status",
+              "answer"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "status": {
+                "type": "string",
+                "enum": [
+                  "cancelled"
+                ]
+              }
+            },
+            "required": [
+              "status"
+            ],
+            "additionalProperties": false
+          }
+        ]
+      },
+      "Form.Reply": {
+        "type": "object",
+        "properties": {
+          "answer": {
+            "$ref": "#/components/schemas/Form.Answer"
+          }
+        },
+        "required": [
+          "answer"
+        ],
+        "additionalProperties": false
+      },
+      "FormAlreadySettledError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "FormAlreadySettledError"
+            ]
+          },
+          "id": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "id",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "FormInvalidAnswerError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "FormInvalidAnswerError"
+            ]
+          },
+          "id": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "id",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "PermissionV2.Source": {
+        "anyOf": [
+          {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "tool"
+                ]
+              },
+              "messageID": {
+                "type": "string"
+              },
+              "callID": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "type",
+              "messageID",
+              "callID"
+            ],
+            "additionalProperties": false
+          }
+        ]
+      },
+      "PermissionV2.Request": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^per"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "action": {
+            "type": "string"
+          },
+          "resources": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "save": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "source": {
+            "$ref": "#/components/schemas/PermissionV2.Source"
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "action",
+          "resources"
+        ],
+        "additionalProperties": false
+      },
+      "PermissionSaved.Info": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "projectID": {
+            "type": "string"
+          },
+          "action": {
+            "type": "string"
+          },
+          "resource": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "projectID",
+          "action",
+          "resource"
+        ],
+        "additionalProperties": false
+      },
+      "PermissionNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "PermissionNotFoundError"
+            ]
+          },
+          "requestID": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "requestID",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "PermissionV2.Reply": {
+        "type": "string",
+        "enum": [
+          "once",
+          "always",
+          "reject"
+        ]
+      },
+      "FileSystem.Entry": {
+        "type": "object",
+        "properties": {
+          "path": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "file",
+              "directory"
+            ]
+          }
+        },
+        "required": [
+          "path",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "CommandV2.Info": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "template": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "agent": {
+            "type": "string"
+          },
+          "model": {
+            "$ref": "#/components/schemas/Model.Ref"
+          },
+          "subtask": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "name",
+          "template"
+        ],
+        "additionalProperties": false
+      },
+      "SkillV2.Info": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "slash": {
+            "type": "boolean"
+          },
+          "autoinvoke": {
+            "type": "boolean"
+          },
+          "location": {
+            "type": "string"
+          },
+          "content": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "name",
+          "location",
+          "content"
+        ],
+        "additionalProperties": false
+      },
+      "models-dev.refreshed": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "models-dev.refreshed"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "integration.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "integration.updated"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "integration.connection.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "integration.connection.updated"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "integrationID": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "integrationID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "catalog.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "catalog.updated"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "agent.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.updated"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "SnapshotFileDiff": {
+        "type": "object",
+        "properties": {
+          "file": {
+            "type": "string"
+          },
+          "patch": {
+            "type": "string"
+          },
+          "additions": {
+            "type": "number"
+          },
+          "deletions": {
+            "type": "number"
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "added",
+              "deleted",
+              "modified"
+            ]
+          }
+        },
+        "required": [
+          "additions",
+          "deletions"
+        ],
+        "additionalProperties": false
+      },
+      "PermissionAction": {
+        "type": "string",
+        "enum": [
+          "allow",
+          "deny",
+          "ask"
+        ]
+      },
+      "PermissionRule": {
+        "type": "object",
+        "properties": {
+          "permission": {
+            "type": "string"
+          },
+          "pattern": {
+            "type": "string"
+          },
+          "action": {
+            "$ref": "#/components/schemas/PermissionAction"
+          }
+        },
+        "required": [
+          "permission",
+          "pattern",
+          "action"
+        ],
+        "additionalProperties": false
+      },
+      "PermissionRuleset": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/PermissionRule"
+        }
+      },
+      "Session": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "slug": {
+            "type": "string"
+          },
+          "projectID": {
+            "type": "string"
+          },
+          "workspaceID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^wrk"
+              }
+            ]
+          },
+          "directory": {
+            "type": "string"
+          },
+          "path": {
+            "type": "string"
+          },
+          "parentID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "summary": {
+            "type": "object",
+            "properties": {
+              "additions": {
+                "type": "number"
+              },
+              "deletions": {
+                "type": "number"
+              },
+              "files": {
+                "type": "number"
+              },
+              "diffs": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/SnapshotFileDiff"
+                }
+              }
+            },
+            "required": [
+              "additions",
+              "deletions",
+              "files"
+            ],
+            "additionalProperties": false
+          },
+          "cost": {
+            "type": "number"
+          },
+          "tokens": {
+            "type": "object",
+            "properties": {
+              "input": {
+                "type": "number"
+              },
+              "output": {
+                "type": "number"
+              },
+              "reasoning": {
+                "type": "number"
+              },
+              "cache": {
+                "type": "object",
+                "properties": {
+                  "read": {
+                    "type": "number"
+                  },
+                  "write": {
+                    "type": "number"
+                  }
+                },
+                "required": [
+                  "read",
+                  "write"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "input",
+              "output",
+              "reasoning",
+              "cache"
+            ],
+            "additionalProperties": false
+          },
+          "share": {
+            "type": "object",
+            "properties": {
+              "url": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "url"
+            ],
+            "additionalProperties": false
+          },
+          "title": {
+            "type": "string"
+          },
+          "agent": {
+            "type": "string"
+          },
+          "model": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string"
+              },
+              "providerID": {
+                "type": "string"
+              },
+              "variant": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "id",
+              "providerID"
+            ],
+            "additionalProperties": false
+          },
+          "version": {
+            "type": "string"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "updated": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "compacting": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "archived": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "created",
+              "updated"
+            ],
+            "additionalProperties": false
+          },
+          "permission": {
+            "$ref": "#/components/schemas/PermissionRuleset"
+          },
+          "revert": {
+            "type": "object",
+            "properties": {
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg"
+                  }
+                ]
+              },
+              "partID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^prt"
+                  }
+                ]
+              },
+              "snapshot": {
+                "type": "string"
+              },
+              "diff": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "messageID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "slug",
+          "projectID",
+          "directory",
+          "title",
+          "version",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "session.created": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.created"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "info": {
+                "$ref": "#/components/schemas/Session"
+              }
+            },
+            "required": [
+              "sessionID",
+              "info"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "info": {
+                "$ref": "#/components/schemas/Session"
+              }
+            },
+            "required": [
+              "sessionID",
+              "info"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.deleted": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.deleted"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "info": {
+                "$ref": "#/components/schemas/Session"
+              }
+            },
+            "required": [
+              "sessionID",
+              "info"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "JSONSchema": {
+        "type": "object"
+      },
+      "OutputFormat": {
+        "anyOf": [
+          {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "text"
+                ]
+              }
+            },
+            "required": [
+              "type"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "json_schema"
+                ]
+              },
+              "schema": {
+                "$ref": "#/components/schemas/JSONSchema"
+              },
+              "retryCount": {
+                "anyOf": [
+                  {
+                    "anyOf": [
+                      {
+                        "type": "integer",
+                        "allOf": [
+                          {
+                            "minimum": 0
+                          }
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "type",
+              "schema"
+            ],
+            "additionalProperties": false
+          }
+        ]
+      },
+      "UserMessage": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "user"
+            ]
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "number",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "format": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/OutputFormat"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "summary": {
+            "anyOf": [
+              {
+                "type": "object",
+                "properties": {
+                  "title": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "body": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "diffs": {
+                    "type": "array",
+                    "items": {
+                      "$ref": "#/components/schemas/SnapshotFileDiff"
+                    }
+                  }
+                },
+                "required": [
+                  "diffs"
+                ],
+                "additionalProperties": false
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "agent": {
+            "type": "string"
+          },
+          "model": {
+            "type": "object",
+            "properties": {
+              "providerID": {
+                "type": "string"
+              },
+              "modelID": {
+                "type": "string"
+              },
+              "variant": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "providerID",
+              "modelID"
+            ],
+            "additionalProperties": false
+          },
+          "system": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "tools": {
+            "anyOf": [
+              {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "boolean"
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "role",
+          "time",
+          "agent",
+          "model"
+        ],
+        "additionalProperties": false
+      },
+      "ProviderAuthError": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "ProviderAuthError"
+            ]
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "providerID": {
+                "type": "string"
+              },
+              "message": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "providerID",
+              "message"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "name",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "UnknownError1": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "UnknownError"
+            ]
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "message": {
+                "type": "string"
+              },
+              "ref": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "message"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "name",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "MessageOutputLengthError": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "MessageOutputLengthError"
+            ]
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "name",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "MessageAbortedError": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "MessageAbortedError"
+            ]
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "message": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "message"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "name",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "StructuredOutputError": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "StructuredOutputError"
+            ]
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "message": {
+                "type": "string"
+              },
+              "retries": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              }
+            },
+            "required": [
+              "message",
+              "retries"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "name",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "ContextOverflowError": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "ContextOverflowError"
+            ]
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "message": {
+                "type": "string"
+              },
+              "responseBody": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "message"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "name",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "ContentFilterError": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "ContentFilterError"
+            ]
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "message": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "message"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "name",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "APIError": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "APIError"
+            ]
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "message": {
+                "type": "string"
+              },
+              "statusCode": {
+                "anyOf": [
+                  {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "isRetryable": {
+                "type": "boolean"
+              },
+              "responseHeaders": {
+                "anyOf": [
+                  {
+                    "type": "object",
+                    "additionalProperties": {
+                      "type": "string"
+                    }
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "responseBody": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "metadata": {
+                "anyOf": [
+                  {
+                    "type": "object",
+                    "additionalProperties": {
+                      "type": "string"
+                    }
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "message",
+              "isRetryable"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "name",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "AssistantMessage": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "assistant"
+            ]
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "completed": {
+                "anyOf": [
+                  {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          },
+          "error": {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/ProviderAuthError"
+                  },
+                  {
+                    "$ref": "#/components/schemas/UnknownError1"
+                  },
+                  {
+                    "$ref": "#/components/schemas/MessageOutputLengthError"
+                  },
+                  {
+                    "$ref": "#/components/schemas/MessageAbortedError"
+                  },
+                  {
+                    "$ref": "#/components/schemas/StructuredOutputError"
+                  },
+                  {
+                    "$ref": "#/components/schemas/ContextOverflowError"
+                  },
+                  {
+                    "$ref": "#/components/schemas/ContentFilterError"
+                  },
+                  {
+                    "$ref": "#/components/schemas/APIError"
+                  }
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "parentID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "modelID": {
+            "type": "string"
+          },
+          "providerID": {
+            "type": "string"
+          },
+          "mode": {
+            "type": "string"
+          },
+          "agent": {
+            "type": "string"
+          },
+          "path": {
+            "type": "object",
+            "properties": {
+              "cwd": {
+                "type": "string"
+              },
+              "root": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "cwd",
+              "root"
+            ],
+            "additionalProperties": false
+          },
+          "summary": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "cost": {
+            "type": "number"
+          },
+          "tokens": {
+            "type": "object",
+            "properties": {
+              "total": {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "input": {
+                "type": "number"
+              },
+              "output": {
+                "type": "number"
+              },
+              "reasoning": {
+                "type": "number"
+              },
+              "cache": {
+                "type": "object",
+                "properties": {
+                  "read": {
+                    "type": "number"
+                  },
+                  "write": {
+                    "type": "number"
+                  }
+                },
+                "required": [
+                  "read",
+                  "write"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "input",
+              "output",
+              "reasoning",
+              "cache"
+            ],
+            "additionalProperties": false
+          },
+          "structured": {
+            "anyOf": [
+              {},
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "variant": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "finish": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "role",
+          "time",
+          "parentID",
+          "modelID",
+          "providerID",
+          "mode",
+          "agent",
+          "path",
+          "cost",
+          "tokens"
+        ],
+        "additionalProperties": false
+      },
+      "Message": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/UserMessage"
+          },
+          {
+            "$ref": "#/components/schemas/AssistantMessage"
+          }
+        ]
+      },
+      "message.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "message.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "info": {
+                "$ref": "#/components/schemas/Message"
+              }
+            },
+            "required": [
+              "sessionID",
+              "info"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "message.removed": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "message.removed"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "sessionID",
+              "messageID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "TextPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "text"
+            ]
+          },
+          "text": {
+            "type": "string"
+          },
+          "synthetic": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "ignored": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "time": {
+            "anyOf": [
+              {
+                "type": "object",
+                "properties": {
+                  "start": {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  },
+                  "end": {
+                    "anyOf": [
+                      {
+                        "type": "integer",
+                        "allOf": [
+                          {
+                            "minimum": 0
+                          }
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "start"
+                ],
+                "additionalProperties": false
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "metadata": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "text"
+        ],
+        "additionalProperties": false
+      },
+      "SubtaskPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "subtask"
+            ]
+          },
+          "prompt": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "agent": {
+            "type": "string"
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "object",
+                "properties": {
+                  "providerID": {
+                    "type": "string"
+                  },
+                  "modelID": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "providerID",
+                  "modelID"
+                ],
+                "additionalProperties": false
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "command": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "prompt",
+          "description",
+          "agent"
+        ],
+        "additionalProperties": false
+      },
+      "ReasoningPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "reasoning"
+            ]
+          },
+          "text": {
+            "type": "string"
+          },
+          "metadata": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "start": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "end": {
+                "anyOf": [
+                  {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "start"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "text",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "FilePartSourceText": {
+        "type": "object",
+        "properties": {
+          "value": {
+            "type": "string"
+          },
+          "start": {
+            "type": "number"
+          },
+          "end": {
+            "type": "number"
+          }
+        },
+        "required": [
+          "value",
+          "start",
+          "end"
+        ],
+        "additionalProperties": false
+      },
+      "FileSource": {
+        "type": "object",
+        "properties": {
+          "text": {
+            "$ref": "#/components/schemas/FilePartSourceText"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "file"
+            ]
+          },
+          "path": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "text",
+          "type",
+          "path"
+        ],
+        "additionalProperties": false
+      },
+      "Range": {
+        "type": "object",
+        "properties": {
+          "start": {
+            "type": "object",
+            "properties": {
+              "line": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "character": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              }
+            },
+            "required": [
+              "line",
+              "character"
+            ],
+            "additionalProperties": false
+          },
+          "end": {
+            "type": "object",
+            "properties": {
+              "line": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "character": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              }
+            },
+            "required": [
+              "line",
+              "character"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "start",
+          "end"
+        ],
+        "additionalProperties": false
+      },
+      "SymbolSource": {
+        "type": "object",
+        "properties": {
+          "text": {
+            "$ref": "#/components/schemas/FilePartSourceText"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "symbol"
+            ]
+          },
+          "path": {
+            "type": "string"
+          },
+          "range": {
+            "$ref": "#/components/schemas/Range"
+          },
+          "name": {
+            "type": "string"
+          },
+          "kind": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          }
+        },
+        "required": [
+          "text",
+          "type",
+          "path",
+          "range",
+          "name",
+          "kind"
+        ],
+        "additionalProperties": false
+      },
+      "ResourceSource": {
+        "type": "object",
+        "properties": {
+          "text": {
+            "$ref": "#/components/schemas/FilePartSourceText"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "resource"
+            ]
+          },
+          "clientName": {
+            "type": "string"
+          },
+          "uri": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "text",
+          "type",
+          "clientName",
+          "uri"
+        ],
+        "additionalProperties": false
+      },
+      "FilePartSource": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/FileSource"
+          },
+          {
+            "$ref": "#/components/schemas/SymbolSource"
+          },
+          {
+            "$ref": "#/components/schemas/ResourceSource"
+          }
+        ]
+      },
+      "FilePart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "file"
+            ]
+          },
+          "mime": {
+            "type": "string"
+          },
+          "filename": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "url": {
+            "type": "string"
+          },
+          "source": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/FilePartSource"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "mime",
+          "url"
+        ],
+        "additionalProperties": false
+      },
+      "ToolStatePending": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "pending"
+            ]
+          },
+          "input": {
+            "type": "object"
+          },
+          "raw": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "status",
+          "input",
+          "raw"
+        ],
+        "additionalProperties": false
+      },
+      "ToolStateRunning": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "running"
+            ]
+          },
+          "input": {
+            "type": "object"
+          },
+          "title": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "metadata": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "start": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              }
+            },
+            "required": [
+              "start"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "status",
+          "input",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "ToolStateCompleted": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "completed"
+            ]
+          },
+          "input": {
+            "type": "object"
+          },
+          "output": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "start": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "end": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "compacted": {
+                "anyOf": [
+                  {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "start",
+              "end"
+            ],
+            "additionalProperties": false
+          },
+          "attachments": {
+            "anyOf": [
+              {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/FilePart"
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "status",
+          "input",
+          "output",
+          "title",
+          "metadata",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "ToolStateError": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "error"
+            ]
+          },
+          "input": {
+            "type": "object"
+          },
+          "error": {
+            "type": "string"
+          },
+          "metadata": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "start": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "end": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              }
+            },
+            "required": [
+              "start",
+              "end"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "status",
+          "input",
+          "error",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "ToolState": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/ToolStatePending"
+          },
+          {
+            "$ref": "#/components/schemas/ToolStateRunning"
+          },
+          {
+            "$ref": "#/components/schemas/ToolStateCompleted"
+          },
+          {
+            "$ref": "#/components/schemas/ToolStateError"
+          }
+        ]
+      },
+      "ToolPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool"
+            ]
+          },
+          "callID": {
+            "type": "string"
+          },
+          "tool": {
+            "type": "string"
+          },
+          "state": {
+            "$ref": "#/components/schemas/ToolState"
+          },
+          "metadata": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "callID",
+          "tool",
+          "state"
+        ],
+        "additionalProperties": false
+      },
+      "StepStartPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "step-start"
+            ]
+          },
+          "snapshot": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "StepFinishPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "step-finish"
+            ]
+          },
+          "reason": {
+            "type": "string"
+          },
+          "snapshot": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "cost": {
+            "type": "number"
+          },
+          "tokens": {
+            "type": "object",
+            "properties": {
+              "total": {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "input": {
+                "type": "number"
+              },
+              "output": {
+                "type": "number"
+              },
+              "reasoning": {
+                "type": "number"
+              },
+              "cache": {
+                "type": "object",
+                "properties": {
+                  "read": {
+                    "type": "number"
+                  },
+                  "write": {
+                    "type": "number"
+                  }
+                },
+                "required": [
+                  "read",
+                  "write"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "required": [
+              "input",
+              "output",
+              "reasoning",
+              "cache"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "reason",
+          "cost",
+          "tokens"
+        ],
+        "additionalProperties": false
+      },
+      "SnapshotPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "snapshot"
+            ]
+          },
+          "snapshot": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "snapshot"
+        ],
+        "additionalProperties": false
+      },
+      "PatchPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "patch"
+            ]
+          },
+          "hash": {
+            "type": "string"
+          },
+          "files": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "hash",
+          "files"
+        ],
+        "additionalProperties": false
+      },
+      "AgentPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent"
+            ]
+          },
+          "name": {
+            "type": "string"
+          },
+          "source": {
+            "anyOf": [
+              {
+                "type": "object",
+                "properties": {
+                  "value": {
+                    "type": "string"
+                  },
+                  "start": {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  },
+                  "end": {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "minimum": 0
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "value",
+                  "start",
+                  "end"
+                ],
+                "additionalProperties": false
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "name"
+        ],
+        "additionalProperties": false
+      },
+      "RetryPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "retry"
+            ]
+          },
+          "attempt": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "error": {
+            "$ref": "#/components/schemas/APIError"
+          },
+          "time": {
+            "type": "object",
+            "properties": {
+              "created": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              }
+            },
+            "required": [
+              "created"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "attempt",
+          "error",
+          "time"
+        ],
+        "additionalProperties": false
+      },
+      "CompactionPart": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^prt"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "compaction"
+            ]
+          },
+          "auto": {
+            "type": "boolean"
+          },
+          "overflow": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "tail_start_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg"
+                  }
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "messageID",
+          "type",
+          "auto"
+        ],
+        "additionalProperties": false
+      },
+      "Part": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/TextPart"
+          },
+          {
+            "$ref": "#/components/schemas/SubtaskPart"
+          },
+          {
+            "$ref": "#/components/schemas/ReasoningPart"
+          },
+          {
+            "$ref": "#/components/schemas/FilePart"
+          },
+          {
+            "$ref": "#/components/schemas/ToolPart"
+          },
+          {
+            "$ref": "#/components/schemas/StepStartPart"
+          },
+          {
+            "$ref": "#/components/schemas/StepFinishPart"
+          },
+          {
+            "$ref": "#/components/schemas/SnapshotPart"
+          },
+          {
+            "$ref": "#/components/schemas/PatchPart"
+          },
+          {
+            "$ref": "#/components/schemas/AgentPart"
+          },
+          {
+            "$ref": "#/components/schemas/RetryPart"
+          },
+          {
+            "$ref": "#/components/schemas/CompactionPart"
+          }
+        ]
+      },
+      "message.part.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "message.part.updated"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "part": {
+                "$ref": "#/components/schemas/Part"
+              },
+              "time": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "sessionID",
+              "part",
+              "time"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "message.part.removed": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "message.part.removed"
+            ]
+          },
+          "durable": {
+            "type": "object",
+            "properties": {
+              "aggregateID": {
+                "type": "string"
+              },
+              "seq": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "version": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 1
+                  }
+                ]
+              }
+            },
+            "required": [
+              "aggregateID",
+              "seq",
+              "version"
+            ],
+            "additionalProperties": false
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "messageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg"
+                  }
+                ]
+              },
+              "partID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^prt"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "sessionID",
+              "messageID",
+              "partID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "durable",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.execution.settled": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.execution.settled"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "outcome": {
+                "type": "string",
+                "enum": [
+                  "success",
+                  "failure",
+                  "interrupted"
+                ]
+              },
+              "error": {
+                "$ref": "#/components/schemas/Session.Error.Unknown"
+              }
+            },
+            "required": [
+              "sessionID",
+              "outcome"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.text.delta": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.text.delta"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "textID": {
+                "type": "string"
+              },
+              "delta": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "sessionID",
+              "assistantMessageID",
+              "textID",
+              "delta"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.reasoning.delta": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.reasoning.delta"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "reasoningID": {
+                "type": "string"
+              },
+              "delta": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "sessionID",
+              "assistantMessageID",
+              "reasoningID",
+              "delta"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.tool.input.delta": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.tool.input.delta"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "assistantMessageID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^msg_"
+                  }
+                ]
+              },
+              "callID": {
+                "type": "string"
+              },
+              "delta": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "sessionID",
+              "assistantMessageID",
+              "callID",
+              "delta"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.compaction.delta": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.compaction.delta"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "text": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "sessionID",
+              "text"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "filesystem.changed": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "filesystem.changed"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "file": {
+                "type": "string"
+              },
+              "event": {
+                "type": "string",
+                "enum": [
+                  "add",
+                  "change",
+                  "unlink"
+                ]
+              }
+            },
+            "required": [
+              "file",
+              "event"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "reference.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "reference.updated"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "permission.v2.asked": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "permission.v2.asked"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^per"
+                  }
+                ]
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "action": {
+                "type": "string"
+              },
+              "resources": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "save": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "metadata": {
+                "type": "object"
+              },
+              "source": {
+                "$ref": "#/components/schemas/PermissionV2.Source"
+              }
+            },
+            "required": [
+              "id",
+              "sessionID",
+              "action",
+              "resources"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "permission.v2.replied": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "permission.v2.replied"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "requestID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^per"
+                  }
+                ]
+              },
+              "reply": {
+                "$ref": "#/components/schemas/PermissionV2.Reply"
+              }
+            },
+            "required": [
+              "sessionID",
+              "requestID",
+              "reply"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "plugin.added": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "plugin.added"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "id"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "plugin.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "plugin.updated"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "project.directories.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "project.directories.updated"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "projectID": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "projectID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "command.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "command.updated"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "config.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "config.updated"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "skill.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "skill.updated"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "Pty": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^pty"
+              }
+            ]
+          },
+          "title": {
+            "type": "string"
+          },
+          "command": {
+            "type": "string"
+          },
+          "args": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "cwd": {
+            "type": "string"
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "running",
+              "exited"
+            ]
+          },
+          "pid": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "exitCode": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "title",
+          "command",
+          "args",
+          "cwd",
+          "status",
+          "pid"
+        ],
+        "additionalProperties": false
+      },
+      "pty.created": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "pty.created"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "info": {
+                "$ref": "#/components/schemas/Pty"
+              }
+            },
+            "required": [
+              "info"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "pty.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "pty.updated"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "info": {
+                "$ref": "#/components/schemas/Pty"
+              }
+            },
+            "required": [
+              "info"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "pty.exited": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "pty.exited"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^pty"
+                  }
+                ]
+              },
+              "exitCode": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              }
+            },
+            "required": [
+              "id",
+              "exitCode"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "pty.deleted": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "pty.deleted"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^pty"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "id"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "shell.created": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell.created"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "info": {
+                "$ref": "#/components/schemas/Shell1"
+              }
+            },
+            "required": [
+              "info"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "shell.exited": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell.exited"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^sh_"
+                  }
+                ]
+              },
+              "exit": {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              "status": {
+                "type": "string",
+                "enum": [
+                  "running",
+                  "exited",
+                  "timeout",
+                  "killed"
+                ]
+              }
+            },
+            "required": [
+              "id",
+              "status"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "shell.deleted": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell.deleted"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^sh_"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "id"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionV2.Option": {
+        "type": "object",
+        "properties": {
+          "label": {
+            "type": "string",
+            "description": "Display text (1-5 words, concise)"
+          },
+          "description": {
+            "type": "string",
+            "description": "Explanation of choice"
+          }
+        },
+        "required": [
+          "label",
+          "description"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionV2.Info": {
+        "type": "object",
+        "properties": {
+          "question": {
+            "type": "string",
+            "description": "Complete question"
+          },
+          "header": {
+            "type": "string",
+            "description": "Very short label (max 30 chars)"
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/QuestionV2.Option"
+            },
+            "description": "Available choices"
+          },
+          "multiple": {
+            "type": "boolean"
+          },
+          "custom": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "question",
+          "header",
+          "options"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionV2.Tool": {
+        "type": "object",
+        "properties": {
+          "messageID": {
+            "type": "string"
+          },
+          "callID": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "messageID",
+          "callID"
+        ],
+        "additionalProperties": false
+      },
+      "question.v2.asked": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "question.v2.asked"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^que"
+                  }
+                ]
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "questions": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/QuestionV2.Info"
+                },
+                "description": "Questions to ask"
+              },
+              "tool": {
+                "$ref": "#/components/schemas/QuestionV2.Tool"
+              }
+            },
+            "required": [
+              "id",
+              "sessionID",
+              "questions"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionV2.Answer": {
+        "type": "array",
+        "items": {
+          "type": "string"
+        }
+      },
+      "question.v2.replied": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "question.v2.replied"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "requestID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^que"
+                  }
+                ]
+              },
+              "answers": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/QuestionV2.Answer"
+                }
+              }
+            },
+            "required": [
+              "sessionID",
+              "requestID",
+              "answers"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "question.v2.rejected": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "question.v2.rejected"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "requestID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^que"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "sessionID",
+              "requestID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "Form.Metadata1": {
+        "type": "object"
+      },
+      "Form.When1": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "op": {
+            "type": "string",
+            "enum": [
+              "eq",
+              "neq"
+            ]
+          },
+          "value": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "anyOf": [
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "NaN"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "Infinity"
+                    ]
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "-Infinity"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "boolean"
+              }
+            ]
+          }
+        },
+        "required": [
+          "key",
+          "op",
+          "value"
+        ],
+        "additionalProperties": false
+      },
+      "Form.StringField1": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When1"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "string"
+            ]
+          },
+          "format": {
+            "type": "string",
+            "enum": [
+              "email",
+              "uri",
+              "date",
+              "date-time"
+            ]
+          },
+          "minLength": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "maxLength": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "pattern": {
+            "type": "string"
+          },
+          "placeholder": {
+            "type": "string"
+          },
+          "default": {
+            "type": "string"
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.Option"
+            }
+          },
+          "custom": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "key",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Form.NumberField1": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When1"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "number"
+            ]
+          },
+          "minimum": {
+            "anyOf": [
+              {
+                "type": "number"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "NaN"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "-Infinity"
+                ]
+              }
+            ]
+          },
+          "maximum": {
+            "anyOf": [
+              {
+                "type": "number"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "NaN"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "-Infinity"
+                ]
+              }
+            ]
+          },
+          "default": {
+            "anyOf": [
+              {
+                "type": "number"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "NaN"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "-Infinity"
+                ]
+              }
+            ]
+          }
+        },
+        "required": [
+          "key",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Form.IntegerField1": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When1"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "integer"
+            ]
+          },
+          "minimum": {
+            "anyOf": [
+              {
+                "type": "number"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "NaN"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "-Infinity"
+                ]
+              }
+            ]
+          },
+          "maximum": {
+            "anyOf": [
+              {
+                "type": "number"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "NaN"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "-Infinity"
+                ]
+              }
+            ]
+          },
+          "default": {
+            "anyOf": [
+              {
+                "type": "number"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "NaN"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "-Infinity"
+                ]
+              }
+            ]
+          }
+        },
+        "required": [
+          "key",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Form.BooleanField1": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When1"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "boolean"
+            ]
+          },
+          "default": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "key",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "Form.MultiselectField1": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "when": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.When1"
+            }
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "multiselect"
+            ]
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Form.Option"
+            }
+          },
+          "minItems": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "maxItems": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "custom": {
+            "type": "boolean"
+          },
+          "default": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "key",
+          "type",
+          "options"
+        ],
+        "additionalProperties": false
+      },
+      "Form.FormInfo1": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^frm_"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Form.Metadata1"
+          },
+          "mode": {
+            "type": "string",
+            "enum": [
+              "form"
+            ]
+          },
+          "fields": {
+            "type": "array",
+            "items": {
+              "anyOf": [
+                {
+                  "$ref": "#/components/schemas/Form.StringField1"
+                },
+                {
+                  "$ref": "#/components/schemas/Form.NumberField1"
+                },
+                {
+                  "$ref": "#/components/schemas/Form.IntegerField1"
+                },
+                {
+                  "$ref": "#/components/schemas/Form.BooleanField1"
+                },
+                {
+                  "$ref": "#/components/schemas/Form.MultiselectField1"
+                }
+              ]
+            }
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "mode",
+          "fields"
+        ],
+        "additionalProperties": false
+      },
+      "Form.UrlInfo1": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^frm_"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Form.Metadata1"
+          },
+          "mode": {
+            "type": "string",
+            "enum": [
+              "url"
+            ]
+          },
+          "url": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "mode",
+          "url"
+        ],
+        "additionalProperties": false
+      },
+      "form.created": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "form.created"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "form": {
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/Form.FormInfo1"
+                  },
+                  {
+                    "$ref": "#/components/schemas/Form.UrlInfo1"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "form"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "Form.Value1": {
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "anyOf": [
+              {
+                "type": "number"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "NaN"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "Infinity"
+                ]
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "-Infinity"
+                ]
+              }
+            ]
+          },
+          {
+            "type": "boolean"
+          },
+          {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        ]
+      },
+      "Form.Answer1": {
+        "type": "object",
+        "additionalProperties": {
+          "$ref": "#/components/schemas/Form.Value1"
+        }
+      },
+      "form.replied": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "form.replied"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^frm_"
+                  }
+                ]
+              },
+              "sessionID": {
+                "type": "string"
+              },
+              "answer": {
+                "$ref": "#/components/schemas/Form.Answer1"
+              }
+            },
+            "required": [
+              "id",
+              "sessionID",
+              "answer"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "form.cancelled": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "form.cancelled"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^frm_"
+                  }
+                ]
+              },
+              "sessionID": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "id",
+              "sessionID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "Todo": {
+        "type": "object",
+        "properties": {
+          "content": {
+            "type": "string",
+            "description": "Brief description of the task"
+          },
+          "status": {
+            "type": "string",
+            "description": "Current status of the task: pending, in_progress, completed, cancelled"
+          },
+          "priority": {
+            "type": "string",
+            "description": "Priority level of the task: high, medium, low"
+          }
+        },
+        "required": [
+          "content",
+          "status",
+          "priority"
+        ],
+        "additionalProperties": false
+      },
+      "todo.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "todo.updated"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "todos": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/Todo"
+                }
+              }
+            },
+            "required": [
+              "sessionID",
+              "todos"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "SessionStatus": {
+        "anyOf": [
+          {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "idle"
+                ]
+              }
+            },
+            "required": [
+              "type"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "retry"
+                ]
+              },
+              "attempt": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              },
+              "message": {
+                "type": "string"
+              },
+              "action": {
+                "type": "object",
+                "properties": {
+                  "reason": {
+                    "type": "string"
+                  },
+                  "provider": {
+                    "type": "string"
+                  },
+                  "title": {
+                    "type": "string"
+                  },
+                  "message": {
+                    "type": "string"
+                  },
+                  "label": {
+                    "type": "string"
+                  },
+                  "link": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "reason",
+                  "provider",
+                  "title",
+                  "message",
+                  "label"
+                ],
+                "additionalProperties": false
+              },
+              "next": {
+                "type": "integer",
+                "allOf": [
+                  {
+                    "minimum": 0
+                  }
+                ]
+              }
+            },
+            "required": [
+              "type",
+              "attempt",
+              "message",
+              "next"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "busy"
+                ]
+              }
+            },
+            "required": [
+              "type"
+            ],
+            "additionalProperties": false
+          }
+        ]
+      },
+      "session.status": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.status"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "status": {
+                "$ref": "#/components/schemas/SessionStatus"
+              }
+            },
+            "required": [
+              "sessionID",
+              "status"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.idle": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.idle"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "sessionID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "tui.prompt.append": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "tui.prompt.append"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "text": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "text"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "tui.command.execute": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "tui.command.execute"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "command": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "enum": [
+                      "session.list",
+                      "session.new",
+                      "session.share",
+                      "session.interrupt",
+                      "session.background",
+                      "session.compact",
+                      "session.page.up",
+                      "session.page.down",
+                      "session.line.up",
+                      "session.line.down",
+                      "session.half.page.up",
+                      "session.half.page.down",
+                      "session.first",
+                      "session.last",
+                      "prompt.clear",
+                      "prompt.submit",
+                      "agent.cycle"
+                    ]
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "command"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "tui.toast.show": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "tui.toast.show"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "title": {
+                "type": "string"
+              },
+              "message": {
+                "type": "string"
+              },
+              "variant": {
+                "type": "string",
+                "enum": [
+                  "info",
+                  "success",
+                  "warning",
+                  "error"
+                ]
+              },
+              "duration": {
+                "anyOf": [
+                  {
+                    "type": "integer",
+                    "allOf": [
+                      {
+                        "exclusiveMinimum": 0
+                      }
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "message",
+              "variant"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "tui.session.select": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "tui.session.select"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses",
+                    "description": "Session ID to navigate to"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "sessionID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "installation.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "installation.updated"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "version": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "version"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "installation.update-available": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "installation.update-available"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "version": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "version"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "vcs.branch.updated": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "vcs.branch.updated"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "branch": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "mcp.status.changed": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp.status.changed"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "server": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "server"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "permission.asked": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "permission.asked"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^per"
+                  }
+                ]
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "permission": {
+                "type": "string"
+              },
+              "patterns": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "metadata": {
+                "type": "object"
+              },
+              "always": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "tool": {
+                "anyOf": [
+                  {
+                    "type": "object",
+                    "properties": {
+                      "messageID": {
+                        "type": "string"
+                      },
+                      "callID": {
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "messageID",
+                      "callID"
+                    ],
+                    "additionalProperties": false
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "id",
+              "sessionID",
+              "permission",
+              "patterns",
+              "metadata",
+              "always"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "permission.replied": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "permission.replied"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "requestID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^per"
+                  }
+                ]
+              },
+              "reply": {
+                "type": "string",
+                "enum": [
+                  "once",
+                  "always",
+                  "reject"
+                ]
+              }
+            },
+            "required": [
+              "sessionID",
+              "requestID",
+              "reply"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionOption": {
+        "type": "object",
+        "properties": {
+          "label": {
+            "type": "string",
+            "description": "Display text (1-5 words, concise)"
+          },
+          "description": {
+            "type": "string",
+            "description": "Explanation of choice"
+          }
+        },
+        "required": [
+          "label",
+          "description"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionInfo": {
+        "type": "object",
+        "properties": {
+          "question": {
+            "type": "string",
+            "description": "Complete question"
+          },
+          "header": {
+            "type": "string",
+            "description": "Very short label (max 30 chars)"
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/QuestionOption"
+            },
+            "description": "Available choices"
+          },
+          "multiple": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Allow selecting multiple choices"
+          },
+          "custom": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Allow typing a custom answer (default: true)"
+          }
+        },
+        "required": [
+          "question",
+          "header",
+          "options"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionTool": {
+        "type": "object",
+        "properties": {
+          "messageID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^msg"
+              }
+            ]
+          },
+          "callID": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "messageID",
+          "callID"
+        ],
+        "additionalProperties": false
+      },
+      "question.asked": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "question.asked"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^que"
+                  }
+                ]
+              },
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "questions": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/QuestionInfo"
+                },
+                "description": "Questions to ask"
+              },
+              "tool": {
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/QuestionTool"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "id",
+              "sessionID",
+              "questions"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionAnswer": {
+        "type": "array",
+        "items": {
+          "type": "string"
+        }
+      },
+      "question.replied": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "question.replied"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "requestID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^que"
+                  }
+                ]
+              },
+              "answers": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/QuestionAnswer"
+                }
+              }
+            },
+            "required": [
+              "sessionID",
+              "requestID",
+              "answers"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "question.rejected": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "question.rejected"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^ses"
+                  }
+                ]
+              },
+              "requestID": {
+                "type": "string",
+                "allOf": [
+                  {
+                    "pattern": "^que"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "sessionID",
+              "requestID"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "session.error": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "created": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.error"
+            ]
+          },
+          "location": {
+            "$ref": "#/components/schemas/Location.Ref"
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "sessionID": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "allOf": [
+                      {
+                        "pattern": "^ses"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "error": {
+                "anyOf": [
+                  {
+                    "anyOf": [
+                      {
+                        "$ref": "#/components/schemas/ProviderAuthError"
+                      },
+                      {
+                        "$ref": "#/components/schemas/UnknownError1"
+                      },
+                      {
+                        "$ref": "#/components/schemas/MessageOutputLengthError"
+                      },
+                      {
+                        "$ref": "#/components/schemas/MessageAbortedError"
+                      },
+                      {
+                        "$ref": "#/components/schemas/StructuredOutputError"
+                      },
+                      {
+                        "$ref": "#/components/schemas/ContextOverflowError"
+                      },
+                      {
+                        "$ref": "#/components/schemas/ContentFilterError"
+                      },
+                      {
+                        "$ref": "#/components/schemas/APIError"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "id",
+          "created",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "V2Event.server.connected": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^evt_"
+              }
+            ]
+          },
+          "metadata": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "location": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Location.Ref"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "server.connected"
+            ]
+          },
+          "data": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "type": "array"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "V2Event": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/models-dev.refreshed"
+          },
+          {
+            "$ref": "#/components/schemas/integration.updated"
+          },
+          {
+            "$ref": "#/components/schemas/integration.connection.updated"
+          },
+          {
+            "$ref": "#/components/schemas/catalog.updated"
+          },
+          {
+            "$ref": "#/components/schemas/agent.updated"
+          },
+          {
+            "$ref": "#/components/schemas/session.created"
+          },
+          {
+            "$ref": "#/components/schemas/session.updated"
+          },
+          {
+            "$ref": "#/components/schemas/session.deleted"
+          },
+          {
+            "$ref": "#/components/schemas/message.updated"
+          },
+          {
+            "$ref": "#/components/schemas/message.removed"
+          },
+          {
+            "$ref": "#/components/schemas/message.part.updated"
+          },
+          {
+            "$ref": "#/components/schemas/message.part.removed"
+          },
+          {
+            "$ref": "#/components/schemas/session.agent.selected"
+          },
+          {
+            "$ref": "#/components/schemas/session.model.selected"
+          },
+          {
+            "$ref": "#/components/schemas/session.moved"
+          },
+          {
+            "$ref": "#/components/schemas/session.renamed"
+          },
+          {
+            "$ref": "#/components/schemas/session.forked"
+          },
+          {
+            "$ref": "#/components/schemas/session.prompt.promoted"
+          },
+          {
+            "$ref": "#/components/schemas/session.prompt.admitted"
+          },
+          {
+            "$ref": "#/components/schemas/session.execution.settled"
+          },
+          {
+            "$ref": "#/components/schemas/session.context.updated"
+          },
+          {
+            "$ref": "#/components/schemas/session.synthetic"
+          },
+          {
+            "$ref": "#/components/schemas/session.skill.activated"
+          },
+          {
+            "$ref": "#/components/schemas/session.shell.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.shell.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.step.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.step.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.step.failed"
+          },
+          {
+            "$ref": "#/components/schemas/session.text.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.text.delta"
+          },
+          {
+            "$ref": "#/components/schemas/session.text.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.reasoning.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.reasoning.delta"
+          },
+          {
+            "$ref": "#/components/schemas/session.reasoning.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.tool.input.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.tool.input.delta"
+          },
+          {
+            "$ref": "#/components/schemas/session.tool.input.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.tool.called"
+          },
+          {
+            "$ref": "#/components/schemas/session.tool.progress"
+          },
+          {
+            "$ref": "#/components/schemas/session.tool.success"
+          },
+          {
+            "$ref": "#/components/schemas/session.tool.failed"
+          },
+          {
+            "$ref": "#/components/schemas/session.retried"
+          },
+          {
+            "$ref": "#/components/schemas/session.compaction.started"
+          },
+          {
+            "$ref": "#/components/schemas/session.compaction.delta"
+          },
+          {
+            "$ref": "#/components/schemas/session.compaction.ended"
+          },
+          {
+            "$ref": "#/components/schemas/session.revert.staged"
+          },
+          {
+            "$ref": "#/components/schemas/session.revert.cleared"
+          },
+          {
+            "$ref": "#/components/schemas/session.revert.committed"
+          },
+          {
+            "$ref": "#/components/schemas/filesystem.changed"
+          },
+          {
+            "$ref": "#/components/schemas/reference.updated"
+          },
+          {
+            "$ref": "#/components/schemas/permission.v2.asked"
+          },
+          {
+            "$ref": "#/components/schemas/permission.v2.replied"
+          },
+          {
+            "$ref": "#/components/schemas/plugin.added"
+          },
+          {
+            "$ref": "#/components/schemas/plugin.updated"
+          },
+          {
+            "$ref": "#/components/schemas/project.directories.updated"
+          },
+          {
+            "$ref": "#/components/schemas/command.updated"
+          },
+          {
+            "$ref": "#/components/schemas/config.updated"
+          },
+          {
+            "$ref": "#/components/schemas/skill.updated"
+          },
+          {
+            "$ref": "#/components/schemas/pty.created"
+          },
+          {
+            "$ref": "#/components/schemas/pty.updated"
+          },
+          {
+            "$ref": "#/components/schemas/pty.exited"
+          },
+          {
+            "$ref": "#/components/schemas/pty.deleted"
+          },
+          {
+            "$ref": "#/components/schemas/shell.created"
+          },
+          {
+            "$ref": "#/components/schemas/shell.exited"
+          },
+          {
+            "$ref": "#/components/schemas/shell.deleted"
+          },
+          {
+            "$ref": "#/components/schemas/question.v2.asked"
+          },
+          {
+            "$ref": "#/components/schemas/question.v2.replied"
+          },
+          {
+            "$ref": "#/components/schemas/question.v2.rejected"
+          },
+          {
+            "$ref": "#/components/schemas/form.created"
+          },
+          {
+            "$ref": "#/components/schemas/form.replied"
+          },
+          {
+            "$ref": "#/components/schemas/form.cancelled"
+          },
+          {
+            "$ref": "#/components/schemas/todo.updated"
+          },
+          {
+            "$ref": "#/components/schemas/session.status"
+          },
+          {
+            "$ref": "#/components/schemas/session.idle"
+          },
+          {
+            "$ref": "#/components/schemas/tui.prompt.append"
+          },
+          {
+            "$ref": "#/components/schemas/tui.command.execute"
+          },
+          {
+            "$ref": "#/components/schemas/tui.toast.show"
+          },
+          {
+            "$ref": "#/components/schemas/tui.session.select"
+          },
+          {
+            "$ref": "#/components/schemas/installation.updated"
+          },
+          {
+            "$ref": "#/components/schemas/installation.update-available"
+          },
+          {
+            "$ref": "#/components/schemas/vcs.branch.updated"
+          },
+          {
+            "$ref": "#/components/schemas/mcp.status.changed"
+          },
+          {
+            "$ref": "#/components/schemas/permission.asked"
+          },
+          {
+            "$ref": "#/components/schemas/permission.replied"
+          },
+          {
+            "$ref": "#/components/schemas/question.asked"
+          },
+          {
+            "$ref": "#/components/schemas/question.replied"
+          },
+          {
+            "$ref": "#/components/schemas/question.rejected"
+          },
+          {
+            "$ref": "#/components/schemas/session.error"
+          },
+          {
+            "$ref": "#/components/schemas/V2Event.server.connected"
+          }
+        ]
+      },
+      "V2EventStream": {
+        "type": "string",
+        "contentSchema": {
+          "$ref": "#/components/schemas/V2Event"
+        },
+        "contentMediaType": "application/json"
+      },
+      "EventLog.Hint": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "log.hint"
+            ]
+          },
+          "aggregateID": {
+            "type": "string"
+          },
+          "seq": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "aggregateID",
+          "seq"
+        ],
+        "additionalProperties": false,
+        "description": "Payload-free change hint: the aggregate's durable log advanced to at least seq. Hints coalesce under backpressure (latest per aggregate) and are never a delivery guarantee."
+      },
+      "EventLog.SweepRequired": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "log.sweep_required"
+            ]
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Hints may have been lost; treat every aggregate as potentially dirty and recover via bounded sweep plus durable log reads. Emitted first on every (re)subscribe."
+      },
+      "EventLog.Change": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/EventLog.Hint"
+          },
+          {
+            "$ref": "#/components/schemas/EventLog.SweepRequired"
+          }
+        ]
+      },
+      "EventLog.ChangeStream": {
+        "type": "string",
+        "contentSchema": {
+          "$ref": "#/components/schemas/EventLog.Change"
+        },
+        "contentMediaType": "application/json"
+      },
+      "PtyNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "PtyNotFoundError"
+            ]
+          },
+          "ptyID": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "ptyID",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "PtyTicket.ConnectToken": {
+        "type": "object",
+        "properties": {
+          "ticket": {
+            "type": "string"
+          },
+          "expires_in": {
+            "type": "integer",
+            "allOf": [
+              {
+                "exclusiveMinimum": 0
+              }
+            ]
+          }
+        },
+        "required": [
+          "ticket",
+          "expires_in"
+        ],
+        "additionalProperties": false
+      },
+      "ForbiddenError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "ForbiddenError"
+            ]
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "ShellNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "ShellNotFoundError"
+            ]
+          },
+          "id": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "id",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionV2.Request": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^que"
+              }
+            ]
+          },
+          "sessionID": {
+            "type": "string",
+            "allOf": [
+              {
+                "pattern": "^ses"
+              }
+            ]
+          },
+          "questions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/QuestionV2.Info"
+            },
+            "description": "Questions to ask"
+          },
+          "tool": {
+            "$ref": "#/components/schemas/QuestionV2.Tool"
+          }
+        },
+        "required": [
+          "id",
+          "sessionID",
+          "questions"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionV2.Reply": {
+        "type": "object",
+        "properties": {
+          "answers": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/QuestionV2.Answer"
+            },
+            "description": "User answers in order of questions (each answer is an array of selected labels)"
+          }
+        },
+        "required": [
+          "answers"
+        ],
+        "additionalProperties": false
+      },
+      "QuestionNotFoundError": {
+        "type": "object",
+        "properties": {
+          "_tag": {
+            "type": "string",
+            "enum": [
+              "QuestionNotFoundError"
+            ]
+          },
+          "requestID": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "_tag",
+          "requestID",
+          "message"
+        ],
+        "additionalProperties": false
+      },
+      "Reference.LocalSource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "local"
+            ]
+          },
+          "path": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "hidden": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "type",
+          "path"
+        ],
+        "additionalProperties": false
+      },
+      "Reference.GitSource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "git"
+            ]
+          },
+          "repository": {
+            "type": "string"
+          },
+          "branch": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "hidden": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "type",
+          "repository"
+        ],
+        "additionalProperties": false
+      },
+      "Reference.Source": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/Reference.LocalSource"
+          },
+          {
+            "$ref": "#/components/schemas/Reference.GitSource"
+          }
+        ]
+      },
+      "Reference.Info": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "path": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "hidden": {
+            "type": "boolean"
+          },
+          "source": {
+            "$ref": "#/components/schemas/Reference.Source"
+          }
+        },
+        "required": [
+          "name",
+          "path",
+          "source"
+        ],
+        "additionalProperties": false
+      },
+      "ProjectCopy.Copy": {
+        "type": "object",
+        "properties": {
+          "directory": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "directory"
+        ],
+        "additionalProperties": false
+      },
+      "ProjectCopyError": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "ProjectCopyError"
+            ]
+          },
+          "data": {
+            "type": "object",
+            "properties": {
+              "message": {
+                "type": "string"
+              },
+              "forceRequired": {
+                "anyOf": [
+                  {
+                    "type": "boolean"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "message"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "required": [
+          "name",
+          "data"
+        ],
+        "additionalProperties": false
+      },
+      "Vcs.FileStatus": {
+        "type": "object",
+        "properties": {
+          "file": {
+            "type": "string"
+          },
+          "additions": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "deletions": {
+            "type": "integer",
+            "allOf": [
+              {
+                "minimum": 0
+              }
+            ]
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "added",
+              "deleted",
+              "modified"
+            ]
+          }
+        },
+        "required": [
+          "file",
+          "additions",
+          "deletions",
+          "status"
+        ],
+        "additionalProperties": false
+      },
+      "Vcs.Mode": {
+        "type": "string",
+        "enum": [
+          "working",
+          "branch"
+        ]
+      }
+    },
+    "securitySchemes": {}
+  },
+  "security": [],
+  "tags": [
+    {
+      "name": "health"
+    },
+    {
+      "name": "location"
+    },
+    {
+      "name": "agent"
+    },
+    {
+      "name": "plugin",
+      "description": "Experimental plugin routes."
+    },
+    {
+      "name": "session",
+      "description": "Experimental session routes."
+    },
+    {
+      "name": "session",
+      "description": "Experimental message routes."
+    },
+    {
+      "name": "model",
+      "description": "Experimental model routes."
+    },
+    {
+      "name": "generate",
+      "description": "Experimental one-shot generation routes."
+    },
+    {
+      "name": "provider",
+      "description": "Experimental provider routes."
+    },
+    {
+      "name": "integration",
+      "description": "Integration discovery and authentication routes."
+    },
+    {
+      "name": "mcp",
+      "description": "MCP server status routes."
+    },
+    {
+      "name": "credential"
+    },
+    {
+      "name": "project",
+      "description": "Location-scoped project routes."
+    },
+    {
+      "name": "form",
+      "description": "Session form routes."
+    },
+    {
+      "name": "permission",
+      "description": "Experimental permission routes."
+    },
+    {
+      "name": "filesystem",
+      "description": "Experimental location-scoped filesystem routes."
+    },
+    {
+      "name": "command",
+      "description": "Experimental command routes."
+    },
+    {
+      "name": "skill",
+      "description": "Experimental skill routes."
+    },
+    {
+      "name": "event",
+      "description": "Experimental event stream routes."
+    },
+    {
+      "name": "pty",
+      "description": "Experimental location-scoped PTY routes."
+    },
+    {
+      "name": "shell",
+      "description": "Experimental location-scoped shell command routes."
+    },
+    {
+      "name": "question",
+      "description": "Experimental session question routes."
+    },
+    {
+      "name": "reference",
+      "description": "Location-scoped project references."
+    },
+    {
+      "name": "projectCopy",
+      "description": "Project copy management routes."
+    },
+    {
+      "name": "vcs",
+      "description": "Location-scoped version control routes."
+    },
+    {
+      "name": "debug"
+    }
+  ]
+}
diff --git a/packages/docs/plugins.mdx b/packages/docs/plugins.mdx
new file mode 100644
index 0000000000..cdc38a8808
--- /dev/null
+++ b/packages/docs/plugins.mdx
@@ -0,0 +1,4 @@
+---
+title: "Plugins"
+description: "Extend OpenCode with plugins."
+---
diff --git a/packages/docs/troubleshooting.mdx b/packages/docs/troubleshooting.mdx
new file mode 100644
index 0000000000..57856c9d71
--- /dev/null
+++ b/packages/docs/troubleshooting.mdx
@@ -0,0 +1,177 @@
+---
+title: "Troubleshooting"
+description: "Diagnose OpenCode startup, server, and session issues."
+---
+
+<Tip>
+  You can ask OpenCode to debug itself. Describe the problem and ask it to use this troubleshooting page; it can read the
+  steps below, inspect its service and logs, and help identify the issue.
+</Tip>
+
+OpenCode runs as two processes: the TUI is a client, while a background server owns sessions, plugins, permissions, and
+other application state. Start by determining whether an issue is in the client, the shared server, or a specific project.
+
+## Check the background service
+
+Show the current server status:
+
+```bash
+opencode2 service status
+```
+
+Verify that its API is healthy:
+
+```bash
+opencode2 api get /api/health
+```
+
+If the service is stuck or unhealthy, restart it:
+
+```bash
+opencode2 service restart
+```
+
+From inside the TUI, run `/reload` to restart the managed service and reconnect:
+
+```text
+/reload
+```
+
+You can also stop and start it explicitly:
+
+```bash
+opencode2 service stop
+opencode2 service start
+```
+
+<Note>
+  OpenCode normally discovers or starts the shared background service automatically. The service commands are only needed
+  when diagnosing its lifecycle.
+</Note>
+
+## Run an isolated session
+
+Use standalone mode to run the TUI with a private server that exits with it:
+
+```bash
+opencode2 --standalone
+```
+
+If an issue disappears in standalone mode, it is likely related to the shared background service rather than the TUI or
+project itself.
+
+## Inspect the API
+
+The `api` command uses the same discovery and authentication flow as the TUI. It accepts either an HTTP method and path or
+an OpenAPI operation ID.
+
+See the [API reference](/api) for all endpoints and operation IDs.
+
+Pass a JSON request body with `--data` or `-d`, and add headers with `--header` or `-H`.
+
+<Warning>
+  Running `opencode2 api` may start the background service when no compatible healthy service is available.
+</Warning>
+
+## Read logs
+
+Installed builds write logs to:
+
+```text
+~/.local/share/opencode/log/opencode.log
+```
+
+Follow the log while reproducing the problem:
+
+```bash
+tail -f ~/.local/share/opencode/log/opencode.log
+```
+
+Each line includes a process `run` ID and a `role` field. Use `role=cli` for TUI and command startup, and `role=server` for
+session, provider, plugin, permission, and tool activity.
+
+```bash
+grep 'role=cli' ~/.local/share/opencode/log/opencode.log
+grep 'role=server' ~/.local/share/opencode/log/opencode.log
+grep 'run=8fc3b1d5' ~/.local/share/opencode/log/opencode.log
+```
+
+Increase verbosity for one reproduction:
+
+```bash
+OPENCODE_LOG_LEVEL=DEBUG opencode2
+```
+
+## Service files
+
+The shared server registers itself at:
+
+```text
+~/.local/state/opencode/service.json
+```
+
+Its private service configuration is stored separately at:
+
+```text
+~/.config/opencode/service.json
+```
+
+The database normally lives at:
+
+```text
+~/.local/share/opencode/opencode-next.db
+```
+
+`OPENCODE_DB` can override the database location.
+
+<Warning>
+  Do not delete or edit service files or the database while troubleshooting. Use the service commands to manage the daemon,
+  and make a backup before inspecting persistent data with external tools.
+</Warning>
+
+## Explicit servers
+
+When connecting with `--server`, set `OPENCODE_PASSWORD` if the server requires authentication:
+
+```bash
+OPENCODE_PASSWORD=secret opencode2 --server http://127.0.0.1:4096
+```
+
+The CLI checks the server before opening the TUI and reports whether it is unreachable, requires a password, or rejected
+the supplied password.
+
+## Report an issue
+
+Include the following when reporting a reproducible problem:
+
+- Output from `opencode2 --version`
+- Output from `opencode2 service status`
+- The smallest sequence of steps that reproduces the issue
+- Whether the issue also occurs with `opencode2 --standalone`
+- Relevant log lines, including their `run` and `role` fields
+
+Remove API keys, authorization headers, prompts, file contents, and other sensitive data before sharing logs.
+
+## Local development
+
+When working from the OpenCode repository, run V2 commands from the repository root:
+
+```bash
+bun dev
+```
+
+The local development channel keeps its logs, SQLite database, and service registration separate from installed builds:
+
+```text
+~/.local/share/opencode/log/opencode-local.log
+~/.local/share/opencode/opencode-local.db
+~/.local/state/opencode/service-local.json
+```
+
+Use the same diagnostics through the package development command:
+
+```bash
+bun dev service status
+bun dev service restart
+bun dev api get /api/health
+```
diff --git a/packages/protocol/src/groups/agent.ts b/packages/protocol/src/groups/agent.ts
index 1a9e958552..cfae58533a 100644
--- a/packages/protocol/src/groups/agent.ts
+++ b/packages/protocol/src/groups/agent.ts
@@ -4,17 +4,19 @@ import { Schema } from "effect"
 import { HttpApiEndpoint, HttpApiGroup, OpenApi } from "effect/unstable/httpapi"
 import { LocationQuery, locationQueryOpenApi } from "./location.js"
 
-export const AgentGroup = HttpApiGroup.make("server.agent").add(
-  HttpApiEndpoint.get("agent.list", "/api/agent", {
-    query: LocationQuery,
-    success: Location.response(Schema.Array(Agent.Info)),
-  })
-    .annotateMerge(locationQueryOpenApi)
-    .annotateMerge(
-      OpenApi.annotations({
-        identifier: "v2.agent.list",
-        summary: "List agents",
-        description: "Retrieve currently registered agents.",
-      }),
-    ),
-)
+export const AgentGroup = HttpApiGroup.make("server.agent")
+  .add(
+    HttpApiEndpoint.get("agent.list", "/api/agent", {
+      query: LocationQuery,
+      success: Location.response(Schema.Array(Agent.Info)),
+    })
+      .annotateMerge(locationQueryOpenApi)
+      .annotateMerge(
+        OpenApi.annotations({
+          identifier: "v2.agent.list",
+          summary: "List agents",
+          description: "Retrieve currently registered agents.",
+        }),
+      ),
+  )
+  .annotateMerge(OpenApi.annotations({ title: "agent" }))
diff --git a/packages/protocol/src/groups/command.ts b/packages/protocol/src/groups/command.ts
index 6d463ae371..cc27e0f12e 100644
--- a/packages/protocol/src/groups/command.ts
+++ b/packages/protocol/src/groups/command.ts
@@ -21,7 +21,7 @@ export const CommandGroup = HttpApiGroup.make("server.command")
   )
   .annotateMerge(
     OpenApi.annotations({
-      title: "commands",
+      title: "command",
       description: "Experimental command routes.",
     }),
   )
diff --git a/packages/protocol/src/groups/credential.ts b/packages/protocol/src/groups/credential.ts
index 7ef7e2e7de..414fc49c0d 100644
--- a/packages/protocol/src/groups/credential.ts
+++ b/packages/protocol/src/groups/credential.ts
@@ -20,6 +20,7 @@ export const CredentialGroup = HttpApiGroup.make("server.credential")
         }),
       ),
   )
+  .annotateMerge(OpenApi.annotations({ title: "credential" }))
   .add(
     HttpApiEndpoint.delete("credential.remove", "/api/credential/:credentialID", {
       params: { credentialID: Credential.ID },
diff --git a/packages/protocol/src/groups/debug.ts b/packages/protocol/src/groups/debug.ts
index f41b02b864..b43e5bc639 100644
--- a/packages/protocol/src/groups/debug.ts
+++ b/packages/protocol/src/groups/debug.ts
@@ -2,14 +2,16 @@ import { Location } from "@opencode-ai/schema/location"
 import { Schema } from "effect"
 import { HttpApiEndpoint, HttpApiGroup, OpenApi } from "effect/unstable/httpapi"
 
-export const DebugGroup = HttpApiGroup.make("server.debug").add(
-  HttpApiEndpoint.get("debug.location", "/api/debug/location", {
-    success: Schema.Array(Location.Ref),
-  }).annotateMerge(
-    OpenApi.annotations({
-      identifier: "v2.debug.location",
-      summary: "List loaded locations",
-      description: "List locations currently loaded by the server.",
-    }),
-  ),
-)
+export const DebugGroup = HttpApiGroup.make("server.debug")
+  .add(
+    HttpApiEndpoint.get("debug.location", "/api/debug/location", {
+      success: Schema.Array(Location.Ref),
+    }).annotateMerge(
+      OpenApi.annotations({
+        identifier: "v2.debug.location",
+        summary: "List loaded locations",
+        description: "List locations currently loaded by the server.",
+      }),
+    ),
+  )
+  .annotateMerge(OpenApi.annotations({ title: "debug" }))
diff --git a/packages/protocol/src/groups/event.ts b/packages/protocol/src/groups/event.ts
index 94cedd1a57..e555abe3f9 100644
--- a/packages/protocol/src/groups/event.ts
+++ b/packages/protocol/src/groups/event.ts
@@ -55,7 +55,7 @@ const make = <const Definitions extends ReadonlyArray<Definition>>(definitions:
           }),
         ),
       )
-      .annotateMerge(OpenApi.annotations({ title: "events", description: "Experimental event stream routes." })),
+      .annotateMerge(OpenApi.annotations({ title: "event", description: "Experimental event stream routes." })),
   }
 }
 
diff --git a/packages/protocol/src/groups/form.ts b/packages/protocol/src/groups/form.ts
index 145f1da0b8..b3fe2f12e8 100644
--- a/packages/protocol/src/groups/form.ts
+++ b/packages/protocol/src/groups/form.ts
@@ -144,4 +144,4 @@ export const makeFormGroup = <
           }),
         ),
     )
-    .annotateMerge(OpenApi.annotations({ title: "forms", description: "Session form routes." }))
+    .annotateMerge(OpenApi.annotations({ title: "form", description: "Session form routes." }))
diff --git a/packages/protocol/src/groups/health.ts b/packages/protocol/src/groups/health.ts
index 18618164f0..640f4d67ff 100644
--- a/packages/protocol/src/groups/health.ts
+++ b/packages/protocol/src/groups/health.ts
@@ -1,14 +1,16 @@
 import { Schema } from "effect"
 import { HttpApiEndpoint, HttpApiGroup, OpenApi } from "effect/unstable/httpapi"
 
-export const HealthGroup = HttpApiGroup.make("server.health").add(
-  HttpApiEndpoint.get("health.get", "/api/health", {
-    success: Schema.Struct({ healthy: Schema.Literal(true) }),
-  }).annotateMerge(
-    OpenApi.annotations({
-      identifier: "v2.health.get",
-      summary: "Check server health",
-      description: "Check whether the API server is ready to accept requests.",
-    }),
-  ),
-)
+export const HealthGroup = HttpApiGroup.make("server.health")
+  .add(
+    HttpApiEndpoint.get("health.get", "/api/health", {
+      success: Schema.Struct({ healthy: Schema.Literal(true) }),
+    }).annotateMerge(
+      OpenApi.annotations({
+        identifier: "v2.health.get",
+        summary: "Check server health",
+        description: "Check whether the API server is ready to accept requests.",
+      }),
+    ),
+  )
+  .annotateMerge(OpenApi.annotations({ title: "health" }))
diff --git a/packages/protocol/src/groups/integration.ts b/packages/protocol/src/groups/integration.ts
index 6c1b08f316..a6ec4d5282 100644
--- a/packages/protocol/src/groups/integration.ts
+++ b/packages/protocol/src/groups/integration.ts
@@ -126,5 +126,5 @@ export const IntegrationGroup = HttpApiGroup.make("server.integration")
       ),
   )
   .annotateMerge(
-    OpenApi.annotations({ title: "integrations", description: "Integration discovery and authentication routes." }),
+    OpenApi.annotations({ title: "integration", description: "Integration discovery and authentication routes." }),
   )
diff --git a/packages/protocol/src/groups/location.ts b/packages/protocol/src/groups/location.ts
index 1752bae9be..4723b8a46a 100644
--- a/packages/protocol/src/groups/location.ts
+++ b/packages/protocol/src/groups/location.ts
@@ -26,17 +26,19 @@ export const locationQueryOpenApi = OpenApi.annotations({
   },
 })
 
-export const LocationGroup = HttpApiGroup.make("server.location").add(
-  HttpApiEndpoint.get("location.get", "/api/location", {
-    query: LocationQuery,
-    success: Location.Info,
-  })
-    .annotateMerge(locationQueryOpenApi)
-    .annotateMerge(
-      OpenApi.annotations({
-        identifier: "v2.location.get",
-        summary: "Get location",
-        description: "Resolve the requested location or the server default location.",
-      }),
-    ),
-)
+export const LocationGroup = HttpApiGroup.make("server.location")
+  .add(
+    HttpApiEndpoint.get("location.get", "/api/location", {
+      query: LocationQuery,
+      success: Location.Info,
+    })
+      .annotateMerge(locationQueryOpenApi)
+      .annotateMerge(
+        OpenApi.annotations({
+          identifier: "v2.location.get",
+          summary: "Get location",
+          description: "Resolve the requested location or the server default location.",
+        }),
+      ),
+  )
+  .annotateMerge(OpenApi.annotations({ title: "location" }))
diff --git a/packages/protocol/src/groups/message.ts b/packages/protocol/src/groups/message.ts
index e6d9a48377..b2a360cd10 100644
--- a/packages/protocol/src/groups/message.ts
+++ b/packages/protocol/src/groups/message.ts
@@ -51,7 +51,7 @@ export const MessageGroup = HttpApiGroup.make("server.message")
   )
   .annotateMerge(
     OpenApi.annotations({
-      title: "messages",
+      title: "session",
       description: "Experimental message routes.",
     }),
   )
diff --git a/packages/protocol/src/groups/model.ts b/packages/protocol/src/groups/model.ts
index 071a1b4735..a5970192bb 100644
--- a/packages/protocol/src/groups/model.ts
+++ b/packages/protocol/src/groups/model.ts
@@ -38,7 +38,7 @@ export const ModelGroup = HttpApiGroup.make("server.model")
   )
   .annotateMerge(
     OpenApi.annotations({
-      title: "models",
+      title: "model",
       description: "Experimental model routes.",
     }),
   )
diff --git a/packages/protocol/src/groups/permission.ts b/packages/protocol/src/groups/permission.ts
index cfd26c2c50..d8f722193f 100644
--- a/packages/protocol/src/groups/permission.ts
+++ b/packages/protocol/src/groups/permission.ts
@@ -134,4 +134,4 @@ export const makePermissionGroup = <
           }),
         ),
     )
-    .annotateMerge(OpenApi.annotations({ title: "permissions", description: "Experimental permission routes." }))
+    .annotateMerge(OpenApi.annotations({ title: "permission", description: "Experimental permission routes." }))
diff --git a/packages/protocol/src/groups/plugin.ts b/packages/protocol/src/groups/plugin.ts
index ee6d1ad7af..daf17c1778 100644
--- a/packages/protocol/src/groups/plugin.ts
+++ b/packages/protocol/src/groups/plugin.ts
@@ -21,7 +21,7 @@ export const PluginGroup = HttpApiGroup.make("server.plugin")
   )
   .annotateMerge(
     OpenApi.annotations({
-      title: "plugins",
+      title: "plugin",
       description: "Experimental plugin routes.",
     }),
   )
diff --git a/packages/protocol/src/groups/project.ts b/packages/protocol/src/groups/project.ts
index 53862fede4..a62f1d072f 100644
--- a/packages/protocol/src/groups/project.ts
+++ b/packages/protocol/src/groups/project.ts
@@ -1,10 +1,22 @@
 import { Project } from "@opencode-ai/schema/project"
+import { Schema } from "effect"
 import { HttpApiEndpoint, HttpApiGroup, OpenApi } from "effect/unstable/httpapi"
 import { LocationQuery, locationQueryOpenApi } from "./location.js"
 
 const root = "/api/project"
 
 export const ProjectGroup = HttpApiGroup.make("server.project")
+  .add(
+    HttpApiEndpoint.get("project.list", root, {
+      success: Schema.Array(Project.Info),
+    }).annotateMerge(
+      OpenApi.annotations({
+        identifier: "v2.project.list",
+        summary: "List projects",
+        description: "List known projects.",
+      }),
+    ),
+  )
   .add(
     HttpApiEndpoint.get("project.current", `${root}/current`, {
       query: LocationQuery,
@@ -36,7 +48,7 @@ export const ProjectGroup = HttpApiGroup.make("server.project")
   )
   .annotateMerge(
     OpenApi.annotations({
-      title: "projects",
+      title: "project",
       description: "Location-scoped project routes.",
     }),
   )
diff --git a/packages/protocol/src/groups/provider.ts b/packages/protocol/src/groups/provider.ts
index 179d87092a..25854aab6b 100644
--- a/packages/protocol/src/groups/provider.ts
+++ b/packages/protocol/src/groups/provider.ts
@@ -39,7 +39,7 @@ export const ProviderGroup = HttpApiGroup.make("server.provider")
   )
   .annotateMerge(
     OpenApi.annotations({
-      title: "providers",
+      title: "provider",
       description: "Experimental provider routes.",
     }),
   )
diff --git a/packages/protocol/src/groups/question.ts b/packages/protocol/src/groups/question.ts
index 288d8724f3..58545a390d 100644
--- a/packages/protocol/src/groups/question.ts
+++ b/packages/protocol/src/groups/question.ts
@@ -30,7 +30,7 @@ export const makeQuestionGroup = <
           }),
         ),
     )
-    .annotateMerge(OpenApi.annotations({ title: "questions", description: "Experimental question routes." }))
+    .annotateMerge(OpenApi.annotations({ title: "question", description: "Experimental question routes." }))
     // Effect applies group middleware only to endpoints already added; session endpoints use session placement below.
     .middleware(locationMiddleware)
     .add(
@@ -80,5 +80,5 @@ export const makeQuestionGroup = <
         ),
     )
     .annotateMerge(
-      OpenApi.annotations({ title: "session questions", description: "Experimental session question routes." }),
+      OpenApi.annotations({ title: "question", description: "Experimental session question routes." }),
     )
diff --git a/packages/protocol/src/groups/session.ts b/packages/protocol/src/groups/session.ts
index 527dcc6f61..d89918f515 100644
--- a/packages/protocol/src/groups/session.ts
+++ b/packages/protocol/src/groups/session.ts
@@ -567,7 +567,7 @@ export const makeSessionGroup = <I extends HttpApiMiddleware.AnyId, S>(sessionLo
     )
     .annotateMerge(
       OpenApi.annotations({
-        title: "sessions",
+        title: "session",
         description: "Experimental session routes.",
       }),
     )
diff --git a/packages/protocol/src/groups/skill.ts b/packages/protocol/src/groups/skill.ts
index 805d0e441a..9d4e372633 100644
--- a/packages/protocol/src/groups/skill.ts
+++ b/packages/protocol/src/groups/skill.ts
@@ -21,7 +21,7 @@ export const SkillGroup = HttpApiGroup.make("server.skill")
   )
   .annotateMerge(
     OpenApi.annotations({
-      title: "skills",
+      title: "skill",
       description: "Experimental skill routes.",
     }),
   )
diff --git a/packages/server/src/handlers/project.ts b/packages/server/src/handlers/project.ts
index c35b019b41..79206e6326 100644
--- a/packages/server/src/handlers/project.ts
+++ b/packages/server/src/handlers/project.ts
@@ -6,6 +6,7 @@ import { Api } from "../api"
 
 export const ProjectHandler = HttpApiBuilder.group(Api, "server.project", (handlers) =>
   handlers
+    .handle("project.list", () => Project.Service.use((project) => project.list()))
     .handle("project.current", () =>
       Location.Service.use((location) =>
         Effect.succeed({ id: location.project.id, directory: location.project.directory }),

From 147da5d278a981f10531f9de5424551d067a82a9 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Mon, 6 Jul 2026 01:32:58 -0400
Subject: [PATCH 79/82] test(opencode): update project service stub

---
 packages/opencode/test/project/project.test.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/opencode/test/project/project.test.ts b/packages/opencode/test/project/project.test.ts
index 804b92b08e..5e425e7f73 100644
--- a/packages/opencode/test/project/project.test.ts
+++ b/packages/opencode/test/project/project.test.ts
@@ -76,6 +76,7 @@ function projectV2FailureLayer() {
   return Layer.succeed(
     ProjectV2.Service,
     ProjectV2.Service.of({
+      list: () => Effect.succeed([]),
       directories: () => Effect.succeed([]),
       resolve: (input) =>
         Effect.succeed({

From fb75ea2cf62f58eb1a30af8edd7d0be509b9e8c1 Mon Sep 17 00:00:00 2001
From: Simon Klee <hello@simonklee.dk>
Date: Mon, 6 Jul 2026 09:20:23 +0200
Subject: [PATCH 80/82] mini: fix default model (#35515)

---
 .../src/cli/cmd/run/catalog.shared.ts         |  21 +-
 .../src/cli/cmd/run/footer.prompt.tsx         |   2 +-
 packages/opencode/src/cli/cmd/run/footer.ts   |   4 +
 .../opencode/src/cli/cmd/run/runtime.boot.ts  |   4 +-
 .../src/cli/cmd/run/runtime.lifecycle.ts      |  28 +--
 packages/opencode/src/cli/cmd/run/runtime.ts  | 179 ++++++++++++------
 .../src/cli/cmd/run/scrollback.surface.ts     |   7 +-
 .../src/cli/cmd/run/session.shared.ts         |  19 +-
 packages/opencode/src/cli/cmd/run/types.ts    |   1 +
 packages/opencode/src/session/session.ts      |  14 +-
 packages/opencode/src/session/title.ts        |  11 ++
 .../test/cli/run/catalog.shared.test.ts       |  27 ++-
 .../opencode/test/cli/run/runtime.test.ts     | 167 ++++++++++++++--
 .../test/cli/run/session.shared.test.ts       |   2 +
 packages/tui/package.json                     |   1 +
 packages/tui/src/editor.ts                    |  16 +-
 packages/tui/src/prompt/content.ts            |  13 ++
 17 files changed, 398 insertions(+), 118 deletions(-)
 create mode 100644 packages/opencode/src/session/title.ts
 create mode 100644 packages/tui/src/prompt/content.ts

diff --git a/packages/opencode/src/cli/cmd/run/catalog.shared.ts b/packages/opencode/src/cli/cmd/run/catalog.shared.ts
index e4c8277fd9..826b87656b 100644
--- a/packages/opencode/src/cli/cmd/run/catalog.shared.ts
+++ b/packages/opencode/src/cli/cmd/run/catalog.shared.ts
@@ -4,7 +4,9 @@ import type { RunAgent, RunCommand, RunProvider, RunReference } from "./types"
 type CurrentAgent = NonNullable<Awaited<ReturnType<OpencodeClient["v2"]["agent"]["list"]>>["data"]>["data"][number]
 type CurrentCommand = NonNullable<Awaited<ReturnType<OpencodeClient["v2"]["command"]["list"]>>["data"]>["data"][number]
 type CurrentSkill = NonNullable<Awaited<ReturnType<OpencodeClient["v2"]["skill"]["list"]>>["data"]>["data"][number]
-type CurrentProvider = NonNullable<Awaited<ReturnType<OpencodeClient["v2"]["provider"]["list"]>>["data"]>["data"][number]
+type CurrentProvider = NonNullable<
+  Awaited<ReturnType<OpencodeClient["v2"]["provider"]["list"]>>["data"]
+>["data"][number]
 type CurrentModel = NonNullable<Awaited<ReturnType<OpencodeClient["v2"]["model"]["list"]>>["data"]>["data"][number]
 
 function location(directory: string) {
@@ -105,6 +107,23 @@ export async function waitForCatalogReady(input: {
   }
 }
 
+export async function waitForDefaultModel(input: {
+  sdk: OpencodeClient
+  directory: string
+  timeoutMs?: number
+  active?: () => boolean
+}): Promise<{ providerID: string; modelID: string } | undefined> {
+  const deadline = Date.now() + (input.timeoutMs ?? 5_000)
+  while (Date.now() < deadline && (input.active?.() ?? true)) {
+    const model = await input.sdk.v2.model
+      .default(location(input.directory), { throwOnError: true })
+      .then((result) => result.data?.data)
+      .catch(() => undefined)
+    if (model) return { providerID: model.providerID, modelID: model.id }
+    await new Promise((resolve) => setTimeout(resolve, 25))
+  }
+}
+
 export async function loadRunAgents(sdk: OpencodeClient, directory: string): Promise<RunAgent[]> {
   const result = await sdk.v2.agent.list(location(directory), { throwOnError: true })
   return (result.data?.data ?? []).map(runAgent)
diff --git a/packages/opencode/src/cli/cmd/run/footer.prompt.tsx b/packages/opencode/src/cli/cmd/run/footer.prompt.tsx
index 9d10a5266a..224a707dd2 100644
--- a/packages/opencode/src/cli/cmd/run/footer.prompt.tsx
+++ b/packages/opencode/src/cli/cmd/run/footer.prompt.tsx
@@ -8,7 +8,7 @@
 import { pathToFileURL } from "bun"
 import { StyledText, fg, type ColorInput, type KeyEvent, type TextareaRenderable } from "@opentui/core"
 import { useRenderer } from "@opentui/solid"
-import { normalizePromptContent } from "@opencode-ai/tui/editor"
+import { normalizePromptContent } from "@opencode-ai/tui/prompt/content"
 import fuzzysort from "fuzzysort"
 import path from "path"
 import { createEffect, createMemo, createResource, createSignal, onCleanup, onMount, type Accessor } from "solid-js"
diff --git a/packages/opencode/src/cli/cmd/run/footer.ts b/packages/opencode/src/cli/cmd/run/footer.ts
index 6a4c03e797..2432c29689 100644
--- a/packages/opencode/src/cli/cmd/run/footer.ts
+++ b/packages/opencode/src/cli/cmd/run/footer.ts
@@ -390,6 +390,10 @@ export class RunFooter implements FooterApi {
   }
 
   public event(next: FooterEvent): void {
+    if (next.type === "model") {
+      this.setCurrentModel(next.selection)
+    }
+
     if (next.type === "turn.duration") {
       const current = this.currentModel()
       this.flush()
diff --git a/packages/opencode/src/cli/cmd/run/runtime.boot.ts b/packages/opencode/src/cli/cmd/run/runtime.boot.ts
index 2933ce5fdd..eae1db77e8 100644
--- a/packages/opencode/src/cli/cmd/run/runtime.boot.ts
+++ b/packages/opencode/src/cli/cmd/run/runtime.boot.ts
@@ -26,6 +26,7 @@ export type ModelInfo = {
 export type SessionInfo = {
   first: boolean
   history: RunPrompt[]
+  model?: NonNullable<RunInput["model"]>
   variant: string | undefined
 }
 
@@ -141,7 +142,8 @@ const layer = Layer.effect(
       return {
         first: session.first,
         history: sessionHistory(session),
-        variant: pickVariant(model, session),
+        model: session.model,
+        variant: pickVariant(model ?? session.model, session),
       }
     })
 
diff --git a/packages/opencode/src/cli/cmd/run/runtime.lifecycle.ts b/packages/opencode/src/cli/cmd/run/runtime.lifecycle.ts
index a25b293883..e06523c7c6 100644
--- a/packages/opencode/src/cli/cmd/run/runtime.lifecycle.ts
+++ b/packages/opencode/src/cli/cmd/run/runtime.lifecycle.ts
@@ -12,9 +12,8 @@ import path from "path"
 import { CliRenderEvents, createCliRenderer, type CliRenderer, type ScrollbackWriter } from "@opentui/core"
 import { createDefaultOpenTuiKeymap } from "@opentui/keymap/opentui"
 import { Global } from "@opencode-ai/core/global"
-import { openEditor } from "@opencode-ai/tui/editor"
 import { registerOpencodeKeymap } from "@opencode-ai/tui/keymap"
-import { Session as SessionApi } from "@/session/session"
+import { isDefaultTitle } from "@/session/title"
 import * as Locale from "@/util/locale"
 import { resolveInteractiveStdin } from "./runtime.stdin"
 import { entrySplash, exitSplash, splashMeta } from "./splash"
@@ -64,7 +63,7 @@ export type LifecycleInput = {
   agent: string | undefined
   model: RunInput["model"]
   variant: string | undefined
-  tuiConfig: RunTuiConfig
+  tuiConfig: RunTuiConfig | Promise<RunTuiConfig>
   backgroundSubagents: boolean
   onPermissionReply: (input: PermissionReply) => void | Promise<void>
   onQuestionReply: (input: QuestionReply) => void | Promise<void>
@@ -108,7 +107,7 @@ function shutdown(renderer: CliRenderer): void {
 }
 
 function splashInfo(title: string | undefined, history: RunPrompt[]) {
-  if (title && !SessionApi.isDefaultTitle(title)) {
+  if (title && !isDefaultTitle(title)) {
     return {
       title,
       showSession: true,
@@ -124,17 +123,9 @@ function splashInfo(title: string | undefined, history: RunPrompt[]) {
 
 function footerLabels(input: Pick<RunInput, "agent" | "model" | "variant">): FooterLabels {
   const agentLabel = Locale.titlecase(input.agent ?? "build")
-
-  if (!input.model) {
-    return {
-      agentLabel,
-      modelLabel: "Model default",
-    }
-  }
-
   return {
     agentLabel,
-    modelLabel: formatModelLabel(input.model, input.variant),
+    modelLabel: input.model ? formatModelLabel(input.model, input.variant) : "",
   }
 }
 
@@ -176,6 +167,7 @@ function queueSplash(
 // the entry splash, RunFooter takes over the footer region.
 export async function createRuntimeLifecycle(input: LifecycleInput): Promise<Lifecycle> {
   const source = resolveInteractiveStdin()
+  const footerTask = import("./footer")
   let unregisterKeymap: (() => void) | undefined
 
   try {
@@ -194,10 +186,10 @@ export async function createRuntimeLifecycle(input: LifecycleInput): Promise<Lif
       consoleMode: "disabled",
       clearOnShutdown: false,
     })
-    const theme = await resolveRunTheme(renderer)
+    const [theme, tuiConfig] = await Promise.all([resolveRunTheme(renderer), input.tuiConfig])
     renderer.setBackgroundColor(theme.background)
     const keymap = createDefaultOpenTuiKeymap(renderer)
-    unregisterKeymap = registerOpencodeKeymap(keymap, renderer, input.tuiConfig)
+    unregisterKeymap = registerOpencodeKeymap(keymap, renderer, tuiConfig)
     const state: SplashState = {
       entry: false,
       exit: false,
@@ -212,7 +204,6 @@ export async function createRuntimeLifecycle(input: LifecycleInput): Promise<Lif
       model: input.model,
       variant: input.variant,
     })
-    const footerTask = import("./footer")
     const wrote = queueSplash(
       renderer,
       state,
@@ -244,9 +235,9 @@ export async function createRuntimeLifecycle(input: LifecycleInput): Promise<Lif
       theme,
       wrote,
       keymap,
-      tuiConfig: input.tuiConfig,
+      tuiConfig,
       backgroundSubagents: input.backgroundSubagents,
-      diffStyle: input.tuiConfig.diff_style ?? "auto",
+      diffStyle: tuiConfig.diff_style ?? "auto",
       onPermissionReply: input.onPermissionReply,
       onQuestionReply: input.onQuestionReply,
       onQuestionReject: input.onQuestionReject,
@@ -260,6 +251,7 @@ export async function createRuntimeLifecycle(input: LifecycleInput): Promise<Lif
           return
         }
 
+        const { openEditor } = await import("@opencode-ai/tui/editor")
         await renderer.idle().catch(() => {})
         const ignore = () => {}
         detachSigint()
diff --git a/packages/opencode/src/cli/cmd/run/runtime.ts b/packages/opencode/src/cli/cmd/run/runtime.ts
index 5c6ede1582..601cdc567f 100644
--- a/packages/opencode/src/cli/cmd/run/runtime.ts
+++ b/packages/opencode/src/cli/cmd/run/runtime.ts
@@ -15,8 +15,7 @@
 import { createOpencodeClient } from "@opencode-ai/sdk/v2"
 import { Flag } from "@opencode-ai/core/flag/flag"
 import { MessageID } from "@/session/schema"
-import { loadRunAgents, loadRunCommands, loadRunReferences } from "./catalog.shared"
-import { createRunDemo } from "./demo"
+import { loadRunAgents, loadRunCommands, loadRunReferences, waitForDefaultModel } from "./catalog.shared"
 import { resolveModelInfo, resolveModelInfoStrict, resolveRunTuiConfig, resolveSessionInfo } from "./runtime.boot"
 import { createRuntimeLifecycle } from "./runtime.lifecycle"
 import { trace } from "./trace"
@@ -91,6 +90,8 @@ type StreamState = {
   handle: Awaited<ReturnType<StreamTransportModule["createSessionTransport"]>>
 }
 
+type RunDemo = ReturnType<(typeof import("./demo"))["createRunDemo"]>
+
 type ResolvedSession = {
   sessionID: string
   sessionTitle?: string
@@ -130,7 +131,7 @@ type RuntimeState = {
   sessionTitle?: string
   agent: string | undefined
   switching?: Promise<void>
-  demo?: ReturnType<typeof createRunDemo>
+  demo?: RunDemo
   selectSubagent?: (sessionID: string | undefined) => void
   session?: Promise<void>
   stream?: Promise<StreamState>
@@ -181,21 +182,21 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
   const log = trace()
   const tuiConfigTask = resolveRunTuiConfig()
   const ctx = await input.boot()
-  const modelTask = resolveModelInfo(ctx.sdk, ctx.directory, ctx.model)
   const sessionTask =
     ctx.resume === true
       ? resolveSessionInfo(ctx.sdk, ctx.sessionID, ctx.model)
       : Promise.resolve({
           first: true,
           history: [],
+          model: undefined,
           variant: undefined,
         })
   const savedTask = resolveSavedVariant(ctx.model)
-  const [tuiConfig, session, savedVariant] = await Promise.all([tuiConfigTask, sessionTask, savedTask])
+  const [session, savedVariant] = await Promise.all([sessionTask, savedTask])
   const state: RuntimeState = {
     shown: !session.first,
     aborting: false,
-    model: ctx.model,
+    model: ctx.model ?? session.model,
     providers: [],
     variants: [],
     limits: {},
@@ -206,23 +207,43 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
     sessionTitle: ctx.sessionTitle,
     agent: ctx.agent,
   }
-  const ensureSession = () => {
-    if (!input.resolveSession || state.sessionID) {
-      return Promise.resolve()
+  const loadModel = async () => {
+    if (state.model) {
+      return {
+        model: state.model,
+        savedVariant,
+        boot: true,
+        info: await resolveModelInfo(ctx.sdk, ctx.directory, state.model),
+      }
     }
 
-    if (state.session) {
-      return state.session
-    }
-
-    state.session = input.resolveSession(ctx).then((next) => {
-      state.sessionID = next.sessionID
-      state.sessionTitle = next.sessionTitle ?? state.sessionTitle
-      state.agent = next.agent
+    const model = await waitForDefaultModel({
+      sdk: ctx.sdk,
+      directory: ctx.directory,
+      active: () => !footer.isClosed,
     })
-    return state.session
-  }
+    if (footer.isClosed) return
+    const [fallbackSavedVariant, info] = await Promise.all([
+      resolveSavedVariant(model),
+      resolveModelInfo(ctx.sdk, ctx.directory, model),
+    ])
+    if (!model || state.model) {
+      return {
+        model: state.model,
+        savedVariant: undefined,
+        boot: false,
+        info,
+      }
+    }
 
+    state.model = model
+    return {
+      model,
+      savedVariant: fallbackSavedVariant,
+      boot: true,
+      info,
+    }
+  }
   const shell = await (deps.createRuntimeLifecycle ?? createRuntimeLifecycle)({
     directory: ctx.directory,
     findFiles: (query) =>
@@ -240,7 +261,7 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
     agent: state.agent,
     model: state.model,
     variant: state.activeVariant,
-    tuiConfig,
+    tuiConfig: tuiConfigTask,
     backgroundSubagents: input.backgroundSubagents,
     onPermissionReply: async (next) => {
       if (state.demo?.permission(next)) {
@@ -345,9 +366,11 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
       }
 
       state.aborting = true
-      void (state.stream
-        ? state.stream.then((item) => item.handle.interruptActiveTurn())
-        : ctx.sdk.v2.session.interrupt({ sessionID: state.sessionID }))
+      void (
+        state.stream
+          ? state.stream.then((item) => item.handle.interruptActiveTurn())
+          : ctx.sdk.v2.session.interrupt({ sessionID: state.sessionID })
+      )
         .catch(() => {})
         .finally(() => {
           state.aborting = false
@@ -374,6 +397,24 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
     },
   })
   const footer = shell.footer
+  const firstPaint = footer.idle().catch(() => {})
+  const modelTask = firstPaint.then(() => (footer.isClosed ? undefined : loadModel()))
+  const ensureSession = () => {
+    if (!input.resolveSession || state.sessionID) {
+      return Promise.resolve()
+    }
+
+    if (state.session) {
+      return state.session
+    }
+
+    state.session = input.resolveSession(ctx).then((next) => {
+      state.sessionID = next.sessionID
+      state.sessionTitle = next.sessionTitle ?? state.sessionTitle
+      state.agent = next.agent
+    })
+    return state.session
+  }
   const rememberLocal = (commit: StreamCommit, after?: LocalReplayAnchor) => {
     state.localRows = [...state.localRows, { commit, after }].slice(-LOCAL_REPLAY_ROW_LIMIT)
   }
@@ -417,12 +458,13 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
     info: Awaited<ReturnType<typeof resolveModelInfo>>,
     current: string | undefined,
     boot = false,
+    saved = savedVariant,
   ) => {
     state.providers = info.providers
     state.variants = variantsFor(state.providers, state.model)
     state.limits = info.limits
     state.activeVariant = boot
-      ? resolveVariant(ctx.variant, current, savedVariant, state.variants)
+      ? resolveVariant(ctx.variant, current, saved, state.variants)
       : current && !state.variants.includes(current)
         ? undefined
         : current
@@ -430,7 +472,11 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
     footer.event({ type: "models", providers: info.providers })
     footer.event({ type: "variants", variants: state.variants, current: state.activeVariant })
     if (state.model)
-      footer.event({ type: "model", model: formatModelLabel(state.model, state.activeVariant, state.providers) })
+      footer.event({
+        type: "model",
+        model: formatModelLabel(state.model, state.activeVariant, state.providers),
+        selection: state.model,
+      })
   }
 
   let catalogRefresh: Promise<void> | undefined
@@ -456,24 +502,24 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
     void catalogRefresh.catch(() => {})
   }
 
-  const initialCatalog = footer
-    .idle()
-    .then(loadCatalog)
-    .catch(() => {})
+  const initialCatalog = firstPaint.then(() => (footer.isClosed ? undefined : loadCatalog())).catch(() => {})
   void initialCatalog
 
   if (Flag.OPENCODE_SHOW_TTFD) {
-    footer.append({
-      kind: "system",
-      text: `startup ${Math.max(0, Math.round(performance.now() - start))}ms`,
-      phase: "final",
-      source: "system",
+    void firstPaint.then(() => {
+      if (footer.isClosed) return
+      footer.append({
+        kind: "system",
+        text: `startup ${Math.max(0, Math.round(performance.now() - start))}ms`,
+        phase: "final",
+        source: "system",
+      })
     })
   }
 
-  if (input.demo) {
-    await ensureSession()
-    state.demo = createRunDemo({
+  const createDemo = async () => {
+    const { createRunDemo } = await import("./demo")
+    return createRunDemo({
       footer,
       sessionID: state.sessionID,
       thinking: input.thinking,
@@ -481,13 +527,35 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
     })
   }
 
-  if (input.afterPaint) {
-    void Promise.resolve(input.afterPaint(ctx)).catch(() => {})
+  if (input.demo) {
+    await firstPaint
+    if (!footer.isClosed) {
+      await ensureSession()
+      state.demo = await createDemo()
+    }
   }
 
-  void modelTask.then((info) => applyModelInfo(info, session.variant, true))
+  if (input.afterPaint) {
+    void firstPaint.then(() => (footer.isClosed ? undefined : input.afterPaint?.(ctx))).catch(() => {})
+  }
 
-  const streamTask = deps.streamTransport ?? import("./stream-v2.transport")
+  void modelTask.then((result) => {
+    if (!result) return
+    const current = state.model
+    const boot =
+      result.boot &&
+      !!current &&
+      current.providerID === result.model?.providerID &&
+      current.modelID === result.model.modelID
+    applyModelInfo(result.info, boot ? session.variant : state.activeVariant, boot, result.savedVariant)
+  })
+
+  let streamTask = deps.streamTransport
+  const loadStreamTransport = () => {
+    if (streamTask) return streamTask
+    streamTask = import("./stream-v2.transport")
+    return streamTask
+  }
   const ensureStream = () => {
     if (state.stream) {
       return state.stream
@@ -501,7 +569,7 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
         throw new Error("runtime closed")
       }
 
-      const mod = await streamTask
+      const mod = await loadStreamTransport()
       if (footer.isClosed) {
         throw new Error("runtime closed")
       }
@@ -570,6 +638,8 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
   })
 
   const runQueue = async () => {
+    await firstPaint
+    if (footer.isClosed) return
     let includeFiles = true
     if (state.demo) {
       await state.demo.start()
@@ -615,14 +685,7 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
               state.history = []
               state.localRows = []
               includeFiles = true
-              state.demo = input.demo
-                ? createRunDemo({
-                    footer,
-                    sessionID: state.sessionID,
-                    thinking: input.thinking,
-                    limits: () => state.limits,
-                  })
-                : undefined
+              state.demo = input.demo ? await createDemo() : undefined
               log?.write("session.new", {
                 sessionID: state.sessionID,
               })
@@ -727,6 +790,8 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
   try {
     const eager = eagerStream(input, ctx)
     if (eager) {
+      await firstPaint
+      if (footer.isClosed) return
       if (input.replay && state.shown) {
         // Replay commits immutable scrollback rows, so wait for provider names
         // before bootstrapping existing session history.
@@ -737,13 +802,15 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
     }
 
     if (!eager && input.resolveSession) {
-      queueMicrotask(() => {
-        if (footer.isClosed) {
-          return
-        }
+      void firstPaint
+        .then(() => {
+          if (footer.isClosed) {
+            return
+          }
 
-        void ensureStream().catch(() => {})
-      })
+          return ensureStream()
+        })
+        .catch(() => {})
     }
 
     try {
diff --git a/packages/opencode/src/cli/cmd/run/scrollback.surface.ts b/packages/opencode/src/cli/cmd/run/scrollback.surface.ts
index f8516a054c..c5e5c6dd7d 100644
--- a/packages/opencode/src/cli/cmd/run/scrollback.surface.ts
+++ b/packages/opencode/src/cli/cmd/run/scrollback.surface.ts
@@ -105,7 +105,7 @@ export class RunScrollbackStream {
   ) {
     this.diffStyle = options.diffStyle
     this.sessionID = options.sessionID
-    this.treeSitterClient = options.treeSitterClient ?? getTreeSitterClient()
+    this.treeSitterClient = options.treeSitterClient
     this.wrote = options.wrote ?? false
     this.onThemeRelease = options.onThemeRelease
   }
@@ -151,6 +151,7 @@ export class RunScrollbackStream {
       startOnNewLine: entryFlags(commit).startOnNewLine,
     })
     const style = entryLook(commit, this.theme.entry)
+    const treeSitterClient = body.type === "text" ? undefined : (this.treeSitterClient ??= getTreeSitterClient())
     const renderable =
       body.type === "text"
         ? new TextRenderable(surface.renderContext, {
@@ -170,7 +171,7 @@ export class RunScrollbackStream {
               drawUnstyledText: false,
               streaming: true,
               fg: entryColor(commit, this.theme),
-              treeSitterClient: this.treeSitterClient,
+              treeSitterClient,
             })
           : new MarkdownRenderable(surface.renderContext, {
               content: "",
@@ -180,7 +181,7 @@ export class RunScrollbackStream {
               internalBlockMode: "top-level",
               tableOptions: { widthMode: "content" },
               fg: entryColor(commit, this.theme),
-              treeSitterClient: this.treeSitterClient,
+              treeSitterClient,
             })
 
     surface.root.add(renderable)
diff --git a/packages/opencode/src/cli/cmd/run/session.shared.ts b/packages/opencode/src/cli/cmd/run/session.shared.ts
index 49dece5a89..b39624662c 100644
--- a/packages/opencode/src/cli/cmd/run/session.shared.ts
+++ b/packages/opencode/src/cli/cmd/run/session.shared.ts
@@ -20,6 +20,8 @@ type Turn = {
 export type RunSession = {
   first: boolean
   turns: Turn[]
+  model?: NonNullable<RunInput["model"]>
+  variant?: string
 }
 
 function fileName(url: string, filename?: string) {
@@ -157,9 +159,11 @@ export async function resolveCurrentSession(
   sessionID: string,
   limit = LIMIT,
 ): Promise<RunSession> {
-  const response = await sdk.v2.session.messages({ sessionID, limit, order: "desc" }, { throwOnError: true })
+  const [response, session] = await Promise.all([
+    sdk.v2.session.messages({ sessionID, limit, order: "desc" }, { throwOnError: true }),
+    sdk.v2.session.get({ sessionID }, { throwOnError: true }),
+  ])
   const messages = response.data.data.toReversed()
-  const session = await sdk.v2.session.get({ sessionID }, { throwOnError: true })
   return {
     first: messages.length === 0,
     turns: messages.flatMap((message) => {
@@ -197,6 +201,13 @@ export async function resolveCurrentSession(
         },
       ]
     }),
+    ...(session.data.data.model && {
+      model: {
+        providerID: session.data.data.model.providerID,
+        modelID: session.data.data.model.id,
+      },
+      variant: session.data.data.model.variant,
+    }),
   }
 }
 
@@ -223,6 +234,10 @@ export function sessionVariant(session: RunSession, model: RunInput["model"]): s
     return undefined
   }
 
+  if (session.model?.providerID === model.providerID && session.model.modelID === model.modelID) {
+    return session.variant
+  }
+
   for (let idx = session.turns.length - 1; idx >= 0; idx -= 1) {
     const turn = session.turns[idx]
     if (turn.provider !== model.providerID || turn.model !== model.modelID) {
diff --git a/packages/opencode/src/cli/cmd/run/types.ts b/packages/opencode/src/cli/cmd/run/types.ts
index f311febb26..2c489e2626 100644
--- a/packages/opencode/src/cli/cmd/run/types.ts
+++ b/packages/opencode/src/cli/cmd/run/types.ts
@@ -312,6 +312,7 @@ export type FooterEvent =
   | {
       type: "model"
       model: string
+      selection: NonNullable<RunInput["model"]>
     }
   | {
       type: "turn.send"
diff --git a/packages/opencode/src/session/session.ts b/packages/opencode/src/session/session.ts
index 143c04a12a..641ae2ddf8 100644
--- a/packages/opencode/src/session/session.ts
+++ b/packages/opencode/src/session/session.ts
@@ -1,3 +1,6 @@
+export { isDefaultTitle } from "./title"
+import { createDefaultTitle } from "./title"
+
 import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { PermissionV1 } from "@opencode-ai/core/v1/permission"
 import { Slug } from "@opencode-ai/core/util/slug"
@@ -43,15 +46,6 @@ import { ProviderV2 } from "@opencode-ai/core/provider"
 import { ModelV2 } from "@opencode-ai/core/model"
 import { SessionMessage } from "@opencode-ai/schema/session-message"
 
-const parentTitlePrefix = "New session - "
-const childTitlePrefix = "Child session - "
-
-export function isDefaultTitle(title: string) {
-  return new RegExp(
-    `^(${parentTitlePrefix}|${childTitlePrefix})\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}Z$`,
-  ).test(title)
-}
-
 type SessionRow = typeof SessionTable.$inferSelect
 
 export function fromRow(row: SessionRow): Info {
@@ -518,7 +512,7 @@ const layer: Layer.Layer<
         path: input.path,
         workspaceID: input.workspaceID,
         parentID: input.parentID,
-        title: input.title ?? (input.parentID ? childTitlePrefix : parentTitlePrefix) + new Date().toISOString(),
+        title: input.title ?? createDefaultTitle(!!input.parentID),
         agent: input.agent,
         model: input.model,
         metadata: input.metadata,
diff --git a/packages/opencode/src/session/title.ts b/packages/opencode/src/session/title.ts
new file mode 100644
index 0000000000..f90012eb72
--- /dev/null
+++ b/packages/opencode/src/session/title.ts
@@ -0,0 +1,11 @@
+const parentTitlePrefix = "New session - "
+const childTitlePrefix = "Child session - "
+const defaultTitle = /^(New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/
+
+export function createDefaultTitle(child: boolean) {
+  return (child ? childTitlePrefix : parentTitlePrefix) + new Date().toISOString()
+}
+
+export function isDefaultTitle(title: string) {
+  return defaultTitle.test(title)
+}
diff --git a/packages/opencode/test/cli/run/catalog.shared.test.ts b/packages/opencode/test/cli/run/catalog.shared.test.ts
index bdf57ef7d1..847eceebec 100644
--- a/packages/opencode/test/cli/run/catalog.shared.test.ts
+++ b/packages/opencode/test/cli/run/catalog.shared.test.ts
@@ -1,12 +1,37 @@
 import { afterEach, describe, expect, mock, spyOn, test } from "bun:test"
 import { OpencodeClient } from "@opencode-ai/sdk/v2"
-import { loadRunReferences, runProviders } from "@/cli/cmd/run/catalog.shared"
+import { loadRunReferences, runProviders, waitForDefaultModel } from "@/cli/cmd/run/catalog.shared"
 
 afterEach(() => {
   mock.restore()
 })
 
 describe("run catalog shared", () => {
+  test("resolves the catalog-selected model for the footer", async () => {
+    const client = new OpencodeClient()
+    const selected = spyOn(client.v2.model, "default").mockImplementation(
+      () =>
+        Promise.resolve({
+          data: {
+            location: { directory: "/tmp", project: { id: "proj_1", directory: "/tmp" } },
+            data: {
+              id: "gpt-5",
+              providerID: "openai",
+            },
+          },
+          error: undefined,
+          request: new Request("https://opencode.test"),
+          response: new Response(),
+        }) as never,
+    )
+
+    await expect(waitForDefaultModel({ sdk: client, directory: "/tmp" })).resolves.toEqual({
+      providerID: "openai",
+      modelID: "gpt-5",
+    })
+    expect(selected).toHaveBeenCalledWith({ location: { directory: "/tmp" } }, { throwOnError: true })
+  })
+
   test("loads visible project references from the current reference catalog", async () => {
     const client = new OpencodeClient()
     const list = spyOn(client.v2.reference, "list").mockImplementation(
diff --git a/packages/opencode/test/cli/run/runtime.test.ts b/packages/opencode/test/cli/run/runtime.test.ts
index 702d82d769..c98a61b69b 100644
--- a/packages/opencode/test/cli/run/runtime.test.ts
+++ b/packages/opencode/test/cli/run/runtime.test.ts
@@ -113,6 +113,7 @@ describe("run interactive runtime", () => {
   test("waits for provider metadata before eager replay transport bootstrap", async () => {
     const providersStarted = defer<void>()
     const providers = defer<void>()
+    const lifecycleModels: unknown[] = []
 
     const sdk = new OpencodeClient()
     const legacyProviders = spyOn(sdk.config, "providers").mockRejectedValue(new Error("legacy providers should stay unused"))
@@ -249,23 +250,23 @@ describe("run interactive runtime", () => {
         replay: true,
         replayLimit: 100,
         agent: "build",
-        model: {
-          providerID: "openai",
-          modelID: "gpt-5",
-        },
+        model: undefined,
         variant: undefined,
         files: [],
         thinking: true,
         backgroundSubagents: false,
       },
       {
-        createRuntimeLifecycle: async () => ({
-          footer: footer(),
-          onResize: () => () => {},
-          refreshTheme: () => {},
-          resetForReplay: () => Promise.resolve(),
-          close: () => Promise.resolve(),
-        }),
+        createRuntimeLifecycle: async (input) => {
+          lifecycleModels.push(input.model)
+          return {
+            footer: footer(),
+            onResize: () => () => {},
+            refreshTheme: () => {},
+            resetForReplay: () => Promise.resolve(),
+            close: () => Promise.resolve(),
+          }
+        },
         streamTransport: Promise.resolve({
           createSessionTransport: async (input: { providers?: () => RunProvider[]; footer: FooterApi }) => {
             transportProviders.push(input.providers?.() ?? [])
@@ -293,12 +294,156 @@ describe("run interactive runtime", () => {
 
     await task
 
+    expect(lifecycleModels).toEqual([{ providerID: "openai", modelID: "gpt-5" }])
     expect(transportProviders).toEqual([[provider]])
     expect(legacyProviders).not.toHaveBeenCalled()
     expect(legacyAgents).not.toHaveBeenCalled()
     expect(legacyCommands).not.toHaveBeenCalled()
   })
 
+  test("defers catalog-selected model resolution until after first paint", async () => {
+    const sdk = new OpencodeClient()
+    const defaultStarted = defer<void>()
+    const releaseDefault = defer<void>()
+    const lifecycleStarted = defer<void>()
+    const painted = defer<void>()
+    const modelShown = defer<void>()
+    let defaultRequested = false
+    const events: FooterEvent[] = []
+    const api = footer(events)
+    api.idle = () => painted.promise
+    const event = api.event
+    api.event = (value) => {
+      event(value)
+      if (value.type !== "model") return
+      modelShown.resolve()
+      api.close()
+    }
+
+    spyOn(sdk.v2.model, "default").mockImplementation(async () => {
+      defaultRequested = true
+      defaultStarted.resolve()
+      await releaseDefault.promise
+      return ok({
+        location: { directory: "/tmp" },
+        data: { id: "gpt-5", providerID: "openai" },
+      }) as never
+    })
+    spyOn(sdk.v2.provider, "list").mockImplementation(() =>
+      ok({ location: { directory: "/tmp" }, data: [] }) as never,
+    )
+    spyOn(sdk.v2.model, "list").mockImplementation(() =>
+      ok({ location: { directory: "/tmp" }, data: [] }) as never,
+    )
+    spyOn(sdk.v2.agent, "list").mockImplementation(() =>
+      ok({ location: { directory: "/tmp" }, data: [] }) as never,
+    )
+    spyOn(sdk.v2.reference, "list").mockImplementation(() =>
+      ok({ location: { directory: "/tmp" }, data: [] }) as never,
+    )
+    spyOn(sdk.v2.command, "list").mockImplementation(() =>
+      ok({ location: { directory: "/tmp" }, data: [] }) as never,
+    )
+    spyOn(sdk.v2.skill, "list").mockImplementation(() =>
+      ok({ location: { directory: "/tmp" }, data: [] }) as never,
+    )
+
+    const task = runInteractiveMode(
+      {
+        sdk,
+        directory: "/tmp",
+        sessionID: "ses-fresh",
+        resume: false,
+        agent: "build",
+        model: undefined,
+        variant: undefined,
+        files: [],
+        thinking: false,
+        backgroundSubagents: false,
+      },
+      {
+        createRuntimeLifecycle: async (input) => {
+          expect(input.model).toBeUndefined()
+          lifecycleStarted.resolve()
+          return {
+            footer: api,
+            onResize: () => () => {},
+            refreshTheme: () => {},
+            resetForReplay: () => Promise.resolve(),
+            close: () => Promise.resolve(),
+          }
+        },
+        streamTransport: Promise.resolve({
+          createSessionTransport: async () => ({
+            runPromptTurn: async () => {},
+            interruptActiveTurn: async () => {},
+            selectSubagent: () => {},
+            replayOnResize: async () => false,
+            close: async () => {},
+          }),
+          formatUnknownError: (error: unknown) => (error instanceof Error ? error.message : String(error)),
+        }),
+      },
+    )
+
+    await lifecycleStarted.promise
+    expect(defaultRequested).toBe(false)
+    painted.resolve()
+    await defaultStarted.promise
+    releaseDefault.resolve()
+    await modelShown.promise
+    await task
+
+    expect(events.find((event) => event.type === "model")).toEqual({
+      type: "model",
+      model: "gpt-5 · openai",
+      selection: { providerID: "openai", modelID: "gpt-5" },
+    })
+  })
+
+  test("does not start deferred work after the footer closes", async () => {
+    const sdk = new OpencodeClient()
+    const lifecycleStarted = defer<void>()
+    const painted = defer<void>()
+    const api = footer()
+    api.idle = () => painted.promise
+    const defaultModel = spyOn(sdk.v2.model, "default")
+
+    const task = runInteractiveMode(
+      {
+        sdk,
+        directory: "/tmp",
+        sessionID: "ses-closed",
+        resume: false,
+        agent: "build",
+        model: undefined,
+        variant: undefined,
+        files: [],
+        thinking: false,
+        backgroundSubagents: false,
+      },
+      {
+        createRuntimeLifecycle: async () => {
+          lifecycleStarted.resolve()
+          return {
+            footer: api,
+            onResize: () => () => {},
+            refreshTheme: () => {},
+            resetForReplay: () => Promise.resolve(),
+            close: () => Promise.resolve(),
+          }
+        },
+      },
+    )
+
+    await lifecycleStarted.promise
+    api.close()
+    painted.resolve()
+    await task
+
+    expect(defaultModel).not.toHaveBeenCalled()
+  })
+
   test("retains last-known-good state across failed coalesced refreshes and retries later", async () => {
     const sdk = new OpencodeClient()
     const refreshGate = defer<void>()
diff --git a/packages/opencode/test/cli/run/session.shared.test.ts b/packages/opencode/test/cli/run/session.shared.test.ts
index a470f51014..102a53ba50 100644
--- a/packages/opencode/test/cli/run/session.shared.test.ts
+++ b/packages/opencode/test/cli/run/session.shared.test.ts
@@ -303,6 +303,8 @@ describe("run session shared", () => {
 
     const out = await resolveCurrentSession(client, "ses_1")
 
+    expect(out.model).toEqual({ providerID: "openai", modelID: "gpt-5" })
+    expect(out.variant).toBe("high")
     expect(out.turns[0]?.prompt).toEqual({
       text: "Review @note.ts",
       parts: [
diff --git a/packages/tui/package.json b/packages/tui/package.json
index 4dade71898..12279e7115 100644
--- a/packages/tui/package.json
+++ b/packages/tui/package.json
@@ -31,6 +31,7 @@
     "./terminal-win32": "./src/terminal-win32.ts",
     "./config/keybind": "./src/config/keybind.ts",
     "./keymap": "./src/keymap.tsx",
+    "./prompt/content": "./src/prompt/content.ts",
     "./prompt/display": "./src/prompt/display.ts",
     "./plugin/runtime": "./src/plugin/runtime.tsx",
     "./plugin/slots": "./src/plugin/slots.tsx",
diff --git a/packages/tui/src/editor.ts b/packages/tui/src/editor.ts
index 68afba6751..f5bbbbc3bb 100644
--- a/packages/tui/src/editor.ts
+++ b/packages/tui/src/editor.ts
@@ -7,22 +7,10 @@ import { spawn } from "node:child_process"
 import type { Stream } from "node:stream"
 import { resolveZedDbPath, resolveZedSelection } from "./editor-zed"
 
+export { normalizePromptContent } from "./prompt/content"
+
 type EditorStdio = "inherit" | "pipe" | "ignore" | number | Stream
 
-export function normalizePromptContent(content: string) {
-  if (content.endsWith("\r\n")) {
-    const body = content.slice(0, -2)
-    return !body.includes("\n") && !body.includes("\r") ? body : content
-  }
-
-  if (content.endsWith("\n")) {
-    const body = content.slice(0, -1)
-    return !body.includes("\n") && !body.includes("\r") ? body : content
-  }
-
-  return content
-}
-
 export async function openEditor(input: { value: string; renderer: CliRenderer; cwd?: string; stdin?: EditorStdio }) {
   const editor = process.env.VISUAL || process.env.EDITOR
   if (!editor) return
diff --git a/packages/tui/src/prompt/content.ts b/packages/tui/src/prompt/content.ts
new file mode 100644
index 0000000000..99ed030868
--- /dev/null
+++ b/packages/tui/src/prompt/content.ts
@@ -0,0 +1,13 @@
+export function normalizePromptContent(content: string) {
+  if (content.endsWith("\r\n")) {
+    const body = content.slice(0, -2)
+    return !body.includes("\n") && !body.includes("\r") ? body : content
+  }
+
+  if (content.endsWith("\n")) {
+    const body = content.slice(0, -1)
+    return !body.includes("\n") && !body.includes("\r") ? body : content
+  }
+
+  return content
+}

From 32cf36de9d89bad66f85c9f1565e6fc3a1a89e0b Mon Sep 17 00:00:00 2001
From: Simon Klee <hello@simonklee.dk>
Date: Mon, 6 Jul 2026 11:03:30 +0200
Subject: [PATCH 81/82] mini migrate to v2 (#35526)

---
 bun.lock                                      |    8 +
 packages/cli/package.json                     |   22 +-
 packages/cli/src/commands/commands.ts         |  105 ++
 packages/cli/src/commands/handlers/mini.ts    |   35 +
 packages/cli/src/commands/handlers/run.ts     |   31 +
 packages/cli/src/commands/handlers/serve.ts   |  154 +--
 packages/cli/src/daemon.ts                    |   70 ++
 packages/cli/src/index.ts                     |    2 +
 .../run => cli/src/mini}/catalog.shared.ts    |   67 +-
 .../src/cli/cmd/run => cli/src/mini}/demo.ts  |    2 +-
 .../cmd/run => cli/src/mini}/entry.body.ts    |    0
 .../run => cli/src/mini}/footer.command.tsx   |    0
 .../cmd/run => cli/src/mini}/footer.menu.tsx  |    2 +-
 .../src/mini}/footer.permission.tsx           |    0
 .../run => cli/src/mini}/footer.prompt.tsx    |    9 +-
 .../run => cli/src/mini}/footer.question.tsx  |    0
 .../run => cli/src/mini}/footer.subagent.tsx  |    0
 .../cli/cmd/run => cli/src/mini}/footer.ts    |   12 +-
 .../cmd/run => cli/src/mini}/footer.view.tsx  |    2 +-
 .../cmd/run => cli/src/mini}/footer.width.ts  |    0
 packages/cli/src/mini/index.ts                |    7 +
 packages/cli/src/mini/mini.ts                 |  234 ++++
 .../run => cli/src/mini}/noninteractive.ts    |   74 +-
 .../run => cli/src/mini}/permission.shared.ts |    0
 .../cmd/run => cli/src/mini}/prompt.editor.ts |    0
 .../cmd/run => cli/src/mini}/prompt.shared.ts |    2 +-
 .../run => cli/src/mini}/question.shared.ts   |    0
 packages/cli/src/mini/run.ts                  |  308 +++++
 .../cmd/run => cli/src/mini}/runtime.boot.ts  |   47 +-
 .../run => cli/src/mini}/runtime.lifecycle.ts |    4 +-
 .../cmd/run => cli/src/mini}/runtime.queue.ts |   11 +-
 .../run => cli/src/mini}/runtime.shared.ts    |    0
 .../cmd/run => cli/src/mini}/runtime.stdin.ts |    0
 .../cli/cmd/run => cli/src/mini}/runtime.ts   |  177 +--
 .../run => cli/src/mini}/scrollback.shared.ts |    0
 .../src/mini}/scrollback.surface.ts           |    0
 .../src/mini}/scrollback.writer.tsx           |    0
 .../cmd/run => cli/src/mini}/session-data.ts  |    2 +-
 .../run => cli/src/mini}/session.shared.ts    |   23 +-
 .../cli/cmd/run => cli/src/mini}/splash.ts    |    4 +-
 .../src/mini}/stream-v2.subagent.ts           |   42 +-
 .../src/mini}/stream-v2.transport.ts          |   96 +-
 .../cli/cmd/run => cli/src/mini}/stream.ts    |    0
 .../src/cli/cmd/run => cli/src/mini}/theme.ts |    0
 .../src/cli/cmd/run => cli/src/mini}/tool.ts  |  252 ++--
 .../src/cli/cmd/run => cli/src/mini}/trace.ts |    0
 .../cmd/run => cli/src/mini}/turn-summary.ts  |    0
 .../src/cli/cmd/run => cli/src/mini}/types.ts |   35 +-
 packages/cli/src/mini/ui.ts                   |   27 +
 .../run => cli/src/mini}/variant.shared.ts    |    7 +-
 packages/cli/src/server-process.ts            |  134 ++
 packages/cli/src/services/standalone.ts       |   20 +-
 packages/cli/test/mini.test.ts                |   80 ++
 packages/client/src/effect/service.ts         |   44 +-
 .../client/src/promise/generated/types.ts     |    2 +-
 packages/opencode/package.json                |    1 +
 packages/opencode/src/cli/cmd/mini.ts         |  172 ---
 packages/opencode/src/cli/cmd/run.ts          | 1100 +----------------
 packages/opencode/src/cli/cmd/v2-serve.ts     |   31 +
 .../opencode/src/cli/cmd/v2-server-command.ts |    8 +
 packages/opencode/src/index.ts                |    4 +-
 packages/opencode/src/temporary.ts            |    4 +-
 .../__snapshots__/help-snapshots.test.ts.snap |   97 +-
 .../test/cli/help/help-snapshots.test.ts      |    4 +-
 .../test/cli/run/catalog.shared.test.ts       |   39 +-
 .../opencode/test/cli/run/entry.body.test.ts  |    4 +-
 .../opencode/test/cli/run/footer.menu.test.ts |    2 +-
 .../test/cli/run/footer.view.test.tsx         |   16 +-
 .../test/cli/run/footer.width.test.ts         |    2 +-
 .../test/cli/run/noninteractive.test.ts       |   48 +-
 .../test/cli/run/permission.shared.test.ts    |    2 +-
 .../test/cli/run/prompt.editor.test.ts        |    4 +-
 .../test/cli/run/prompt.shared.test.ts        |    4 +-
 .../test/cli/run/question.shared.test.ts      |    2 +-
 .../opencode/test/cli/run/run-process.test.ts |    4 +-
 .../test/cli/run/runtime.boot.test.ts         |   76 +-
 .../test/cli/run/runtime.queue.test.ts        |    4 +-
 .../test/cli/run/runtime.stdin.test.ts        |    2 +-
 .../opencode/test/cli/run/runtime.test.ts     |  391 ++++--
 .../test/cli/run/scrollback.surface.test.ts   |    6 +-
 .../test/cli/run/session-data.test.ts         |    4 +-
 .../test/cli/run/session.shared.test.ts       |   45 +-
 .../test/cli/run/stream-v2.transport.test.ts  |  227 ++--
 packages/opencode/test/cli/run/stream.test.ts |    4 +-
 packages/opencode/test/cli/run/theme.test.ts  |    2 +-
 .../test/cli/run/variant.shared.test.ts       |    6 +-
 packages/opencode/test/cli/tui/thread.test.ts |   33 +-
 packages/protocol/src/groups/health.ts        |    6 +-
 packages/sdk/js/src/v2/gen/types.gen.ts       |    2 +
 packages/server/package.json                  |    1 +
 packages/server/src/handlers/health.ts        |    5 +-
 packages/server/src/process.ts                |   64 +
 packages/tui/package.json                     |    2 +
 93 files changed, 2246 insertions(+), 2335 deletions(-)
 create mode 100644 packages/cli/src/commands/handlers/mini.ts
 create mode 100644 packages/cli/src/commands/handlers/run.ts
 create mode 100644 packages/cli/src/daemon.ts
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/catalog.shared.ts (62%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/demo.ts (99%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/entry.body.ts (100%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/footer.command.tsx (100%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/footer.menu.tsx (99%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/footer.permission.tsx (100%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/footer.prompt.tsx (99%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/footer.question.tsx (100%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/footer.subagent.tsx (100%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/footer.ts (98%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/footer.view.tsx (99%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/footer.width.ts (100%)
 create mode 100644 packages/cli/src/mini/index.ts
 create mode 100644 packages/cli/src/mini/mini.ts
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/noninteractive.ts (85%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/permission.shared.ts (100%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/prompt.editor.ts (100%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/prompt.shared.ts (99%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/question.shared.ts (100%)
 create mode 100644 packages/cli/src/mini/run.ts
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/runtime.boot.ts (75%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/runtime.lifecycle.ts (99%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/runtime.queue.ts (96%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/runtime.shared.ts (100%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/runtime.stdin.ts (100%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/runtime.ts (86%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/scrollback.shared.ts (100%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/scrollback.surface.ts (100%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/scrollback.writer.tsx (100%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/session-data.ts (99%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/session.shared.ts (90%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/splash.ts (98%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/stream-v2.subagent.ts (96%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/stream-v2.transport.ts (93%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/stream.ts (100%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/theme.ts (100%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/tool.ts (82%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/trace.ts (100%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/turn-summary.ts (100%)
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/types.ts (90%)
 create mode 100644 packages/cli/src/mini/ui.ts
 rename packages/{opencode/src/cli/cmd/run => cli/src/mini}/variant.shared.ts (96%)
 create mode 100644 packages/cli/src/server-process.ts
 create mode 100644 packages/cli/test/mini.test.ts
 delete mode 100644 packages/opencode/src/cli/cmd/mini.ts
 create mode 100644 packages/opencode/src/cli/cmd/v2-serve.ts
 create mode 100644 packages/opencode/src/cli/cmd/v2-server-command.ts
 create mode 100644 packages/server/src/process.ts

diff --git a/bun.lock b/bun.lock
index 7d4a912af1..a692e1119f 100644
--- a/bun.lock
+++ b/bun.lock
@@ -101,16 +101,22 @@
         "@effect/platform-node": "catalog:",
         "@opencode-ai/client": "workspace:*",
         "@opencode-ai/core": "workspace:*",
+        "@opencode-ai/plugin": "workspace:*",
+        "@opencode-ai/schema": "workspace:*",
         "@opencode-ai/sdk": "workspace:*",
         "@opencode-ai/server": "workspace:*",
         "@opencode-ai/tui": "workspace:*",
         "@opentui/core": "catalog:",
+        "@opentui/keymap": "catalog:",
         "@opentui/solid": "catalog:",
         "@parcel/watcher": "2.5.1",
         "effect": "catalog:",
+        "fuzzysort": "catalog:",
         "jsonc-parser": "3.3.1",
+        "opentui-spinner": "catalog:",
         "semver": "catalog:",
         "solid-js": "catalog:",
+        "strip-ansi": "7.1.2",
       },
       "devDependencies": {
         "@opencode-ai/script": "workspace:*",
@@ -599,6 +605,7 @@
         "@octokit/graphql": "9.0.2",
         "@octokit/rest": "catalog:",
         "@openauthjs/openauth": "catalog:",
+        "@opencode-ai/cli": "workspace:*",
         "@opencode-ai/client": "workspace:*",
         "@opencode-ai/llm": "workspace:*",
         "@opencode-ai/plugin": "workspace:*",
@@ -796,6 +803,7 @@
       "name": "@opencode-ai/server",
       "version": "1.17.13",
       "dependencies": {
+        "@effect/platform-node": "catalog:",
         "@opencode-ai/core": "workspace:*",
         "@opencode-ai/protocol": "workspace:*",
         "@opencode-ai/simulation": "workspace:*",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 122cd993ba..8cb1c2ef22 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -10,6 +10,20 @@
   "files": [
     "bin"
   ],
+  "exports": {
+    "./daemon": "./src/daemon.ts",
+    "./mini": "./src/mini/index.ts",
+    "./mini/footer.command": "./src/mini/footer.command.tsx",
+    "./mini/footer.menu": "./src/mini/footer.menu.tsx",
+    "./mini/footer.permission": "./src/mini/footer.permission.tsx",
+    "./mini/footer.prompt": "./src/mini/footer.prompt.tsx",
+    "./mini/footer.question": "./src/mini/footer.question.tsx",
+    "./mini/footer.subagent": "./src/mini/footer.subagent.tsx",
+    "./mini/footer.view": "./src/mini/footer.view.tsx",
+    "./mini/scrollback.writer": "./src/mini/scrollback.writer.tsx",
+    "./mini/*": "./src/mini/*.ts",
+    "./server-process": "./src/server-process.ts"
+  },
   "scripts": {
     "build": "bun run script/build.ts",
     "dev": "bun run src/index.ts",
@@ -19,16 +33,22 @@
     "@effect/platform-node": "catalog:",
     "@opencode-ai/client": "workspace:*",
     "@opencode-ai/core": "workspace:*",
+    "@opencode-ai/plugin": "workspace:*",
+    "@opencode-ai/schema": "workspace:*",
     "@opencode-ai/sdk": "workspace:*",
     "@opencode-ai/server": "workspace:*",
     "@opencode-ai/tui": "workspace:*",
     "@opentui/core": "catalog:",
+    "@opentui/keymap": "catalog:",
     "@opentui/solid": "catalog:",
     "@parcel/watcher": "2.5.1",
     "effect": "catalog:",
+    "fuzzysort": "catalog:",
     "jsonc-parser": "3.3.1",
+    "opentui-spinner": "catalog:",
     "semver": "catalog:",
-    "solid-js": "catalog:"
+    "solid-js": "catalog:",
+    "strip-ansi": "7.1.2"
   },
   "devDependencies": {
     "@opencode-ai/script": "workspace:*",
diff --git a/packages/cli/src/commands/commands.ts b/packages/cli/src/commands/commands.ts
index b8101f4ae5..a3b49b3d06 100644
--- a/packages/cli/src/commands/commands.ts
+++ b/packages/cli/src/commands/commands.ts
@@ -3,6 +3,31 @@ import { Spec } from "../framework/spec"
 
 declare const OPENCODE_CLI_NAME: string | undefined
 
+const MiniParams = {
+  continue: Flag.boolean("continue").pipe(
+    Flag.withAlias("c"),
+    Flag.withDescription("Continue the last session"),
+    Flag.withDefault(false),
+  ),
+  session: Flag.string("session").pipe(
+    Flag.withAlias("s"),
+    Flag.withDescription("Session ID to continue"),
+    Flag.optional,
+  ),
+  fork: Flag.boolean("fork").pipe(
+    Flag.withDescription("Fork the session when continuing"),
+    Flag.withDefault(false),
+  ),
+  replay: Flag.boolean("replay").pipe(
+    Flag.withDescription("Replay session history on resume and after resize"),
+    Flag.withDefault(true),
+  ),
+  replayLimit: Flag.integer("replay-limit").pipe(
+    Flag.withDescription("Cap visible replay to the newest N messages"),
+    Flag.optional,
+  ),
+}
+
 export const Commands = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME : "opencode", {
   description: "OpenCode 2.0 preview command line interface",
   params: {
@@ -88,6 +113,86 @@ export const Commands = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCO
       ],
     }),
     Spec.make("migrate", { description: "Migrate v1 data to v2" }),
+    Spec.make("mini", {
+      description: "Start the minimal interactive interface",
+      params: {
+        ...MiniParams,
+        project: Argument.string("project").pipe(
+          Argument.withDescription("Path to start OpenCode in"),
+          Argument.optional,
+        ),
+        model: Flag.string("model").pipe(
+          Flag.withAlias("m"),
+          Flag.withDescription("Model to use in the format provider/model"),
+          Flag.optional,
+        ),
+        agent: Flag.string("agent").pipe(Flag.withDescription("Agent to use"), Flag.optional),
+        prompt: Flag.string("prompt").pipe(Flag.withDescription("Prompt to use"), Flag.optional),
+        server: Flag.string("server").pipe(
+          Flag.withDescription("Connect to a server URL instead of the background service"),
+          Flag.optional,
+        ),
+        demo: Flag.boolean("demo").pipe(Flag.withDefault(false), Flag.withHidden),
+      },
+    }),
+    Spec.make("run", {
+      description: "Run OpenCode with a message",
+      params: {
+        message: Argument.string("message").pipe(
+          Argument.withDescription("Message to send"),
+          Argument.variadic({ min: 0 }),
+        ),
+        continue: Flag.boolean("continue").pipe(
+          Flag.withAlias("c"),
+          Flag.withDescription("Continue the last session"),
+          Flag.withDefault(false),
+        ),
+        session: Flag.string("session").pipe(
+          Flag.withAlias("s"),
+          Flag.withDescription("Session ID to continue"),
+          Flag.optional,
+        ),
+        fork: Flag.boolean("fork").pipe(
+          Flag.withDescription("Fork the session before continuing"),
+          Flag.withDefault(false),
+        ),
+        model: Flag.string("model").pipe(
+          Flag.withAlias("m"),
+          Flag.withDescription("Model to use in the format provider/model"),
+          Flag.optional,
+        ),
+        agent: Flag.string("agent").pipe(Flag.withDescription("Agent to use"), Flag.optional),
+        format: Flag.choice("format", ["default", "json"]).pipe(
+          Flag.withDescription("Output format"),
+          Flag.withDefault("default"),
+        ),
+        file: Flag.string("file").pipe(
+          Flag.withAlias("f"),
+          Flag.withDescription("File to attach to the message"),
+          Flag.atMost(100),
+        ),
+        title: Flag.string("title").pipe(Flag.withDescription("Session title"), Flag.optional),
+        server: Flag.string("server").pipe(
+          Flag.withDescription("Connect to a server URL instead of the background service"),
+          Flag.optional,
+        ),
+        dir: Flag.string("dir").pipe(Flag.withDescription("Directory to run in"), Flag.optional),
+        variant: Flag.string("variant").pipe(Flag.withDescription("Model variant"), Flag.optional),
+        thinking: Flag.boolean("thinking").pipe(
+          Flag.withDescription("Show thinking blocks"),
+          Flag.withDefault(false),
+        ),
+        auto: Flag.boolean("auto").pipe(
+          Flag.withDescription("Auto-approve permissions that are not explicitly denied"),
+          Flag.withDefault(false),
+        ),
+        yolo: Flag.boolean("yolo").pipe(Flag.withDefault(false), Flag.withHidden),
+        dangerouslySkipPermissions: Flag.boolean("dangerously-skip-permissions").pipe(
+          Flag.withDefault(false),
+          Flag.withHidden,
+        ),
+      },
+    }),
     Spec.make("service", {
       description: "Manage the background server",
       commands: [
diff --git a/packages/cli/src/commands/handlers/mini.ts b/packages/cli/src/commands/handlers/mini.ts
new file mode 100644
index 0000000000..410757967f
--- /dev/null
+++ b/packages/cli/src/commands/handlers/mini.ts
@@ -0,0 +1,35 @@
+import { Effect, Option, Redacted } from "effect"
+import path from "node:path"
+import { Commands } from "../commands"
+import { Env } from "../../env"
+import { Runtime } from "../../framework/runtime"
+
+export default Runtime.handler(Commands.commands.mini, (input) =>
+  Effect.gen(function* () {
+    const { runMini } = yield* Effect.promise(() => import("../../mini"))
+    const project = Option.getOrUndefined(input.project)
+    const server = Option.getOrUndefined(input.server)
+    const password = yield* Env.password
+    yield* Effect.promise(() =>
+      runMini({
+        attach: server,
+        password: password ? Redacted.value(password) : undefined,
+        directory:
+          server !== undefined
+            ? project
+            : project === undefined
+              ? process.cwd()
+              : path.resolve(process.env.PWD ?? process.cwd(), project),
+        continue: input.continue,
+        session: Option.getOrUndefined(input.session),
+        fork: input.fork,
+        model: Option.getOrUndefined(input.model),
+        agent: Option.getOrUndefined(input.agent),
+        prompt: Option.getOrUndefined(input.prompt),
+        replay: input.replay,
+        replayLimit: Option.getOrUndefined(input.replayLimit),
+        demo: input.demo,
+      }),
+    )
+  }),
+)
diff --git a/packages/cli/src/commands/handlers/run.ts b/packages/cli/src/commands/handlers/run.ts
new file mode 100644
index 0000000000..aa09a32ea9
--- /dev/null
+++ b/packages/cli/src/commands/handlers/run.ts
@@ -0,0 +1,31 @@
+import { Effect, Option, Redacted } from "effect"
+import { Commands } from "../commands"
+import { Env } from "../../env"
+import { Runtime } from "../../framework/runtime"
+
+export default Runtime.handler(Commands.commands.run, (input) =>
+  Effect.gen(function* () {
+    const { runNonInteractive } = yield* Effect.promise(() => import("../../mini"))
+    const password = yield* Env.password
+    const separator = process.argv.indexOf("--", 2)
+    yield* Effect.promise(() =>
+      runNonInteractive({
+        message: [...input.message, ...(separator === -1 ? [] : process.argv.slice(separator + 1))],
+        continue: input.continue,
+        session: Option.getOrUndefined(input.session),
+        fork: input.fork,
+        model: Option.getOrUndefined(input.model),
+        agent: Option.getOrUndefined(input.agent),
+        format: input.format,
+        file: [...input.file],
+        title: Option.getOrUndefined(input.title),
+        server: Option.getOrUndefined(input.server),
+        password: password ? Redacted.value(password) : undefined,
+        directory: Option.getOrUndefined(input.dir),
+        variant: Option.getOrUndefined(input.variant),
+        thinking: input.thinking,
+        dangerouslySkipPermissions: input.auto || input.yolo || input.dangerouslySkipPermissions,
+      }),
+    )
+  }),
+)
diff --git a/packages/cli/src/commands/handlers/serve.ts b/packages/cli/src/commands/handlers/serve.ts
index 8d263880c5..bd3e0c1217 100644
--- a/packages/cli/src/commands/handlers/serve.ts
+++ b/packages/cli/src/commands/handlers/serve.ts
@@ -1,154 +1,16 @@
-import { NodeHttpServer } from "@effect/platform-node"
-import { Credential } from "@opencode-ai/core/credential"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { LayerNode } from "@opencode-ai/core/effect/layer-node"
-import { PermissionSaved } from "@opencode-ai/core/permission/saved"
-import { Project } from "@opencode-ai/core/project"
-import { Global } from "@opencode-ai/core/global"
-import { Context, Effect, FileSystem, Layer, Option, Redacted, Schedule, Schema } from "effect"
-import { HttpRouter, HttpServer } from "effect/unstable/http"
-import { createServer } from "node:http"
-import { createRoutes } from "@opencode-ai/server/routes"
-import { ServerAuth } from "@opencode-ai/server/auth"
-import { InstallationVersion } from "@opencode-ai/core/installation/version"
-import { createOpencodeClient } from "@opencode-ai/sdk/v2/client"
+import { Effect, Option } from "effect"
 import { Commands } from "../commands"
 import { Runtime } from "../../framework/runtime"
-import { Service } from "@opencode-ai/client/effect"
-import { Env } from "../../env"
-import { ServiceConfig } from "../../services/service-config"
-import { Updater } from "../../services/updater"
-import { randomBytes, randomUUID } from "crypto"
-import path from "path"
+import { ServerProcess } from "../../server-process"
 
 export default Runtime.handler(
   Commands.commands.serve,
   Effect.fn("cli.serve")(function* (input) {
-    if (input.service) yield* Effect.sync(() => process.chdir(Global.Path.home))
-    return yield* Effect.scoped(
-      Effect.gen(function* () {
-        const standalonePassword = yield* Env.password
-        // Keep the lease credential out of the environment inherited by any
-        // process this server spawns.
-        if (input.stdio) {
-          delete process.env.OPENCODE_PASSWORD
-          delete process.env.OPENCODE_SERVER_PASSWORD
-        }
-        const config = input.service ? yield* ServiceConfig.read() : {}
-        const password = input.service
-          ? yield* ServiceConfig.password()
-          : standalonePassword
-            ? Redacted.value(standalonePassword)
-            : randomBytes(32).toString("base64url")
-        if (!password) return yield* Effect.fail(new Error("Missing server password"))
-        const hostname = Option.getOrUndefined(input.hostname) ?? config.hostname ?? "127.0.0.1"
-        const port = Option.isSome(input.port)
-          ? input.port
-          : config.port === undefined
-            ? Option.none<number>()
-            : Option.some(config.port)
-        const address = yield* listen(hostname, port, password)
-        yield* Effect.tryPromise(() =>
-          createOpencodeClient({
-            baseUrl: HttpServer.formatAddress(address),
-            headers: ServerAuth.headers({ password }),
-          }).v2.health.get({}),
-        )
-        if (input.service) yield* register(address)
-        const url = HttpServer.formatAddress(address)
-        console.log(input.stdio ? JSON.stringify({ url }) : `server listening on ${url}`)
-        if (!input.service && !input.stdio && !standalonePassword) console.log(`server password ${password}`)
-        const updater = yield* Updater.Service
-        yield* updater.check().pipe(Effect.schedule(Schedule.spaced("10 minutes")), Effect.forkScoped)
-        return yield* input.stdio ? waitForStdinClose() : Effect.never
-      }).pipe(Effect.annotateLogs({ role: "server" })),
-    )
+    if (input.service && input.stdio) return yield* Effect.fail(new Error("--service and --stdio cannot be combined"))
+    return yield* ServerProcess.run({
+      mode: input.service ? "service" : input.stdio ? "stdio" : "default",
+      hostname: Option.getOrUndefined(input.hostname),
+      port: Option.getOrUndefined(input.port),
+    })
   }),
 )
-
-// Server-side half of the registration protocol. The registration embeds the
-// password so the file alone is enough for any client to discover and
-// authenticate. The file arbitrates ownership after concurrent starts; it is
-// not a startup lock: the atomic rename elects the latest writer, the watcher
-// self-evicts losers, and the finalizer id-guard keeps an exiting server from
-// deleting its successor's registration.
-// Written and read through Service.Info so the file the server registers is
-// provably the contract clients discover with.
-const infoJson = Schema.fromJsonString(Service.Info)
-const encodeInfo = Schema.encodeEffect(infoJson)
-const decodeInfo = Schema.decodeUnknownEffect(infoJson)
-
-const register = Effect.fnUntraced(function* (address: HttpServer.Address) {
-  const fs = yield* FileSystem.FileSystem
-  const { file } = yield* ServiceConfig.options()
-  const id = randomUUID()
-  const secret = yield* ServiceConfig.password()
-  const temp = file + "." + id + ".tmp"
-  yield* fs.makeDirectory(path.dirname(file), { recursive: true })
-  const encoded = yield* encodeInfo({
-    id,
-    version: InstallationVersion,
-    url: HttpServer.formatAddress(address),
-    pid: process.pid,
-    password: secret,
-  })
-  yield* fs.writeFileString(temp, encoded, { mode: 0o600 })
-  yield* fs.rename(temp, file)
-  const currentID = fs.readFileString(file).pipe(
-    Effect.flatMap(decodeInfo),
-    Effect.map((info) => info.id),
-    Effect.orElseSucceed(() => undefined),
-  )
-  yield* currentID.pipe(
-    Effect.flatMap((current) =>
-      current === id
-        ? Effect.void
-        : Effect.try({ try: () => process.kill(process.pid, "SIGTERM"), catch: (cause) => cause }).pipe(Effect.ignore),
-    ),
-    Effect.repeat(Schedule.spaced("10 seconds")),
-    Effect.forkScoped,
-  )
-  yield* Effect.addFinalizer(() =>
-    currentID.pipe(
-      Effect.flatMap((current) => (current === id ? fs.remove(file) : Effect.void)),
-      Effect.ignore,
-    ),
-  )
-})
-
-function waitForStdinClose() {
-  return Effect.callback<void>((resume) => {
-    const close = () => resume(Effect.void)
-    process.stdin.once("end", close)
-    process.stdin.once("close", close)
-    process.stdin.resume()
-    if (process.stdin.readableEnded || process.stdin.destroyed) close()
-    return Effect.sync(() => {
-      process.stdin.off("end", close)
-      process.stdin.off("close", close)
-      process.stdin.pause()
-    })
-  })
-}
-
-function listen(hostname: string, port: Option.Option<number>, password: string) {
-  if (Option.isSome(port)) return bind(hostname, port.value, password)
-  const next = (port: number): ReturnType<typeof bind> =>
-    bind(hostname, port, password).pipe(
-      Effect.catch((error) => (port === 65_535 ? Effect.fail(error) : next(port + 1))),
-    )
-  return next(4096)
-}
-
-function bind(hostname: string, port: number, password: string) {
-  const server = createServer()
-  return Layer.build(
-    HttpRouter.serve(createRoutes(password), { disableListenLog: true }).pipe(
-      Layer.provideMerge(NodeHttpServer.layer(() => server, { port, host: hostname })),
-      Layer.provide(AppNodeBuilder.build(LayerNode.group([Credential.node, PermissionSaved.node, Project.node]))),
-    ),
-  ).pipe(
-    Effect.tap(() => Effect.addFinalizer(() => Effect.sync(() => server.closeAllConnections()))),
-    Effect.map((context) => Context.get(context, HttpServer.HttpServer).address),
-  )
-}
diff --git a/packages/cli/src/daemon.ts b/packages/cli/src/daemon.ts
new file mode 100644
index 0000000000..fff1213f81
--- /dev/null
+++ b/packages/cli/src/daemon.ts
@@ -0,0 +1,70 @@
+import { Service } from "@opencode-ai/client/effect"
+import { ClientError, isUnauthorizedError, OpenCode } from "@opencode-ai/client/promise"
+import { InstallationVersion } from "@opencode-ai/core/installation/version"
+import { ServerAuth } from "@opencode-ai/server/auth"
+import { Effect } from "effect"
+import { ServiceConfig } from "./services/service-config"
+
+export type SharedOptions = {
+  readonly mode: "shared"
+  readonly command?: ReadonlyArray<string>
+}
+export type AttachOptions = {
+  readonly mode: "attach"
+  readonly url: string
+  readonly username?: string
+  readonly password?: string
+}
+export type Options = SharedOptions | AttachOptions
+
+const attach = Effect.fn("cli.daemon.attach")(function* (options: AttachOptions) {
+  const transport = {
+    url: options.url,
+    headers:
+      options.password === undefined
+        ? undefined
+        : ServerAuth.headers({ password: options.password, username: options.username }),
+  } satisfies Service.Transport
+  const client = OpenCode.make({ baseUrl: transport.url, headers: transport.headers })
+  const health = yield* Effect.tryPromise({
+    try: () => client.health.get({ signal: AbortSignal.timeout(5_000) }),
+    catch: (cause) => attachError(options, cause),
+  })
+  if (health.version !== InstallationVersion)
+    return yield* Effect.fail(
+      new Error(`Server at ${options.url} has version ${health.version}; this client requires ${InstallationVersion}`),
+    )
+  return transport
+})
+
+const shared = Effect.fn("cli.daemon.shared")(function* (options: SharedOptions) {
+  const config = yield* ServiceConfig.options()
+  const service = options.command === undefined ? config : { ...config, command: options.command }
+  const found = yield* Service.discover(service)
+  if (found) return found
+  return yield* Service.start(service)
+})
+
+export function transport(options: AttachOptions): ReturnType<typeof attach>
+export function transport(options: SharedOptions): ReturnType<typeof shared>
+export function transport(options: Options): ReturnType<typeof attach> | ReturnType<typeof shared>
+export function transport(options: Options) {
+  if (options.mode === "attach") return attach(options)
+  return shared(options)
+}
+
+function attachError(options: AttachOptions, cause: unknown) {
+  if (isUnauthorizedError(cause)) {
+    return new Error(
+      options.password === undefined
+        ? `Server at ${options.url} requires authentication; provide a password`
+        : `Server at ${options.url} rejected the supplied credentials`,
+      { cause },
+    )
+  }
+  if (cause instanceof ClientError && cause.reason === "Transport")
+    return new Error(`Could not reach server at ${options.url}`, { cause })
+  return new Error(`Server at ${options.url} did not provide a compatible V2 health response`, { cause })
+}
+
+export * as Daemon from "./daemon"
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index 64116b9b76..f8775fdb16 100755
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -31,6 +31,8 @@ const Handlers = Runtime.handlers(Commands, {
     logout: () => import("./commands/handlers/mcp/logout"),
   },
   migrate: () => import("./commands/handlers/migrate"),
+  mini: () => import("./commands/handlers/mini"),
+  run: () => import("./commands/handlers/run"),
   service: {
     start: () => import("./commands/handlers/service/start"),
     restart: () => import("./commands/handlers/service/restart"),
diff --git a/packages/opencode/src/cli/cmd/run/catalog.shared.ts b/packages/cli/src/mini/catalog.shared.ts
similarity index 62%
rename from packages/opencode/src/cli/cmd/run/catalog.shared.ts
rename to packages/cli/src/mini/catalog.shared.ts
index 826b87656b..1af0f51f62 100644
--- a/packages/opencode/src/cli/cmd/run/catalog.shared.ts
+++ b/packages/cli/src/mini/catalog.shared.ts
@@ -1,13 +1,18 @@
-import type { OpencodeClient } from "@opencode-ai/sdk/v2"
+import type {
+  AgentListOutput,
+  CommandListOutput,
+  ModelListOutput,
+  OpenCodeClient,
+  ProviderListOutput,
+  SkillListOutput,
+} from "@opencode-ai/client/promise"
 import type { RunAgent, RunCommand, RunProvider, RunReference } from "./types"
 
-type CurrentAgent = NonNullable<Awaited<ReturnType<OpencodeClient["v2"]["agent"]["list"]>>["data"]>["data"][number]
-type CurrentCommand = NonNullable<Awaited<ReturnType<OpencodeClient["v2"]["command"]["list"]>>["data"]>["data"][number]
-type CurrentSkill = NonNullable<Awaited<ReturnType<OpencodeClient["v2"]["skill"]["list"]>>["data"]>["data"][number]
-type CurrentProvider = NonNullable<
-  Awaited<ReturnType<OpencodeClient["v2"]["provider"]["list"]>>["data"]
->["data"][number]
-type CurrentModel = NonNullable<Awaited<ReturnType<OpencodeClient["v2"]["model"]["list"]>>["data"]>["data"][number]
+type CurrentAgent = AgentListOutput["data"][number]
+type CurrentCommand = CommandListOutput["data"][number]
+type CurrentSkill = SkillListOutput["data"][number]
+type CurrentProvider = ProviderListOutput["data"][number]
+type CurrentModel = ModelListOutput["data"][number]
 
 function location(directory: string) {
   return {
@@ -91,16 +96,16 @@ export function runProviders(providers: CurrentProvider[], models: CurrentModel[
 // For explicit --model flows, wait for that exact ref to appear before prompt
 // admission. On timeout, return and let the real execution error surface.
 export async function waitForCatalogReady(input: {
-  sdk: OpencodeClient
+  sdk: OpenCodeClient
   directory: string
   model: { providerID: string; modelID: string }
   timeoutMs?: number
 }) {
   const deadline = Date.now() + (input.timeoutMs ?? 5_000)
   while (Date.now() < deadline) {
-    const models = await input.sdk.v2.model
-      .list(location(input.directory), { throwOnError: true })
-      .then((result) => result.data?.data ?? [])
+    const models = await input.sdk.model
+      .list(location(input.directory))
+      .then((result) => result.data)
       .catch(() => undefined)
     if (models?.some((model) => model.providerID === input.model.providerID && model.id === input.model.modelID)) return
     await new Promise((resolve) => setTimeout(resolve, 25))
@@ -108,47 +113,47 @@ export async function waitForCatalogReady(input: {
 }
 
 export async function waitForDefaultModel(input: {
-  sdk: OpencodeClient
+  sdk: OpenCodeClient
   directory: string
   timeoutMs?: number
   active?: () => boolean
 }): Promise<{ providerID: string; modelID: string } | undefined> {
   const deadline = Date.now() + (input.timeoutMs ?? 5_000)
   while (Date.now() < deadline && (input.active?.() ?? true)) {
-    const model = await input.sdk.v2.model
-      .default(location(input.directory), { throwOnError: true })
-      .then((result) => result.data?.data)
+    const model = await input.sdk.model
+      .default(location(input.directory))
+      .then((result) => result.data)
       .catch(() => undefined)
     if (model) return { providerID: model.providerID, modelID: model.id }
     await new Promise((resolve) => setTimeout(resolve, 25))
   }
 }
 
-export async function loadRunAgents(sdk: OpencodeClient, directory: string): Promise<RunAgent[]> {
-  const result = await sdk.v2.agent.list(location(directory), { throwOnError: true })
-  return (result.data?.data ?? []).map(runAgent)
+export async function loadRunAgents(sdk: OpenCodeClient, directory: string): Promise<RunAgent[]> {
+  const result = await sdk.agent.list(location(directory))
+  return result.data.map(runAgent)
 }
 
-export async function loadRunCommands(sdk: OpencodeClient, directory: string): Promise<RunCommand[]> {
+export async function loadRunCommands(sdk: OpenCodeClient, directory: string): Promise<RunCommand[]> {
   const [commands, skills] = await Promise.all([
-    sdk.v2.command.list(location(directory), { throwOnError: true }),
-    sdk.v2.skill.list(location(directory), { throwOnError: true }),
+    sdk.command.list(location(directory)),
+    sdk.skill.list(location(directory)),
   ])
   return [
-    ...(commands.data?.data ?? []).map(runCommand),
-    ...(skills.data?.data ?? []).filter((skill) => skill.slash !== false).map(runSkill),
+    ...commands.data.map(runCommand),
+    ...skills.data.filter((skill) => skill.slash !== false).map(runSkill),
   ]
 }
 
-export async function loadRunReferences(sdk: OpencodeClient, directory: string): Promise<RunReference[]> {
-  const result = await sdk.v2.reference.list(location(directory), { throwOnError: true })
-  return (result.data?.data ?? []).filter((reference) => !reference.hidden)
+export async function loadRunReferences(sdk: OpenCodeClient, directory: string): Promise<RunReference[]> {
+  const result = await sdk.reference.list(location(directory))
+  return result.data.filter((reference) => !reference.hidden)
 }
 
-export async function loadRunProviders(sdk: OpencodeClient, directory: string): Promise<RunProvider[]> {
+export async function loadRunProviders(sdk: OpenCodeClient, directory: string): Promise<RunProvider[]> {
   const [providers, models] = await Promise.all([
-    sdk.v2.provider.list(location(directory), { throwOnError: true }),
-    sdk.v2.model.list(location(directory), { throwOnError: true }),
+    sdk.provider.list(location(directory)),
+    sdk.model.list(location(directory)),
   ])
-  return runProviders(providers.data?.data ?? [], models.data?.data ?? [])
+  return runProviders([...providers.data], [...models.data])
 }
diff --git a/packages/opencode/src/cli/cmd/run/demo.ts b/packages/cli/src/mini/demo.ts
similarity index 99%
rename from packages/opencode/src/cli/cmd/run/demo.ts
rename to packages/cli/src/mini/demo.ts
index 94450f1242..b06b3c4537 100644
--- a/packages/opencode/src/cli/cmd/run/demo.ts
+++ b/packages/cli/src/mini/demo.ts
@@ -678,7 +678,7 @@ function emitTask(state: State): void {
     state: {
       status: "running",
       input: {
-        filePath: "packages/opencode/src/cli/cmd/run/stream.ts",
+        filePath: "packages/cli/src/mini/stream.ts",
         offset: 1,
         limit: 200,
       },
diff --git a/packages/opencode/src/cli/cmd/run/entry.body.ts b/packages/cli/src/mini/entry.body.ts
similarity index 100%
rename from packages/opencode/src/cli/cmd/run/entry.body.ts
rename to packages/cli/src/mini/entry.body.ts
diff --git a/packages/opencode/src/cli/cmd/run/footer.command.tsx b/packages/cli/src/mini/footer.command.tsx
similarity index 100%
rename from packages/opencode/src/cli/cmd/run/footer.command.tsx
rename to packages/cli/src/mini/footer.command.tsx
diff --git a/packages/opencode/src/cli/cmd/run/footer.menu.tsx b/packages/cli/src/mini/footer.menu.tsx
similarity index 99%
rename from packages/opencode/src/cli/cmd/run/footer.menu.tsx
rename to packages/cli/src/mini/footer.menu.tsx
index 7e820cc6a7..ab9bea05ea 100644
--- a/packages/opencode/src/cli/cmd/run/footer.menu.tsx
+++ b/packages/cli/src/mini/footer.menu.tsx
@@ -3,7 +3,7 @@ import { TextAttributes, type ColorInput } from "@opentui/core"
 import { useTerminalDimensions } from "@opentui/solid"
 import { createEffect, createMemo, createSignal, type Accessor } from "solid-js"
 import { transparent, type RunFooterTheme } from "./theme"
-import * as Locale from "@/util/locale"
+import { Locale } from "@opencode-ai/tui/util/locale"
 
 export const FOOTER_MENU_ROWS = 8
 
diff --git a/packages/opencode/src/cli/cmd/run/footer.permission.tsx b/packages/cli/src/mini/footer.permission.tsx
similarity index 100%
rename from packages/opencode/src/cli/cmd/run/footer.permission.tsx
rename to packages/cli/src/mini/footer.permission.tsx
diff --git a/packages/opencode/src/cli/cmd/run/footer.prompt.tsx b/packages/cli/src/mini/footer.prompt.tsx
similarity index 99%
rename from packages/opencode/src/cli/cmd/run/footer.prompt.tsx
rename to packages/cli/src/mini/footer.prompt.tsx
index 224a707dd2..6ba7940ab6 100644
--- a/packages/opencode/src/cli/cmd/run/footer.prompt.tsx
+++ b/packages/cli/src/mini/footer.prompt.tsx
@@ -12,7 +12,7 @@ import { normalizePromptContent } from "@opencode-ai/tui/prompt/content"
 import fuzzysort from "fuzzysort"
 import path from "path"
 import { createEffect, createMemo, createResource, createSignal, onCleanup, onMount, type Accessor } from "solid-js"
-import * as Locale from "@/util/locale"
+import { Locale } from "@opencode-ai/tui/util/locale"
 import {
   createPromptHistory,
   displayCharAt,
@@ -67,7 +67,7 @@ type PromptInput = {
   prompt: Accessor<boolean>
   width: Accessor<number>
   theme: Accessor<RunFooterTheme>
-  history?: RunPrompt[]
+  history?: Accessor<RunPrompt[]>
   onSubmit: (input: RunPrompt) => boolean | Promise<boolean>
   onCycle: () => void
   onInterrupt: () => boolean
@@ -302,7 +302,10 @@ export function createPromptState(input: PromptInput): PromptState {
     return new StyledText([fg(input.theme().muted)('Ask anything... "Fix a TODO in the codebase"')])
   })
 
-  let history = createPromptHistory(input.history)
+  let history = createPromptHistory(input.history?.())
+  createEffect(() => {
+    history = createPromptHistory(input.history?.())
+  })
   let draft: RunPrompt = { text: "", parts: [] }
   let stash: RunPrompt = { text: "", parts: [] }
   let area: TextareaRenderable | undefined
diff --git a/packages/opencode/src/cli/cmd/run/footer.question.tsx b/packages/cli/src/mini/footer.question.tsx
similarity index 100%
rename from packages/opencode/src/cli/cmd/run/footer.question.tsx
rename to packages/cli/src/mini/footer.question.tsx
diff --git a/packages/opencode/src/cli/cmd/run/footer.subagent.tsx b/packages/cli/src/mini/footer.subagent.tsx
similarity index 100%
rename from packages/opencode/src/cli/cmd/run/footer.subagent.tsx
rename to packages/cli/src/mini/footer.subagent.tsx
diff --git a/packages/opencode/src/cli/cmd/run/footer.ts b/packages/cli/src/mini/footer.ts
similarity index 98%
rename from packages/opencode/src/cli/cmd/run/footer.ts
rename to packages/cli/src/mini/footer.ts
index 2432c29689..ab53e9162e 100644
--- a/packages/opencode/src/cli/cmd/run/footer.ts
+++ b/packages/cli/src/mini/footer.ts
@@ -203,6 +203,8 @@ export class RunFooter implements FooterApi {
   private setSubagent: (next: FooterSubagentState) => void
   private queuedPrompts: Accessor<FooterQueuedPrompt[]>
   private setQueuedPrompts: Setter<FooterQueuedPrompt[]>
+  private history: Accessor<RunPrompt[]>
+  private setHistory: Setter<RunPrompt[]>
   private promptRoute: FooterPromptRoute = { type: "composer" }
   private subagentMenuRows = SUBAGENT_ROWS
   private autocomplete = false
@@ -289,6 +291,9 @@ export class RunFooter implements FooterApi {
     const [queuedPrompts, setQueuedPrompts] = createSignal<FooterQueuedPrompt[]>([])
     this.queuedPrompts = queuedPrompts
     this.setQueuedPrompts = setQueuedPrompts
+    const [history, setHistory] = createSignal(options.history ?? [])
+    this.history = history
+    this.setHistory = setHistory
     this.base = Math.max(1, renderer.footerHeight - TEXTAREA_MIN_ROWS)
     this.scrollback = this.createScrollback(options.wrote ?? false)
 
@@ -322,7 +327,7 @@ export class RunFooter implements FooterApi {
               diffStyle: options.diffStyle,
               tuiConfig: options.tuiConfig,
               backgroundSubagents: options.backgroundSubagents,
-              history: options.history,
+              history: footer.history,
               agent: options.agentLabel,
               onSubmit: footer.handlePrompt,
               onPermissionReply: footer.handlePermissionReply,
@@ -390,6 +395,11 @@ export class RunFooter implements FooterApi {
   }
 
   public event(next: FooterEvent): void {
+    if (next.type === "history") {
+      this.setHistory(next.history)
+      return
+    }
+
     if (next.type === "model") {
       this.setCurrentModel(next.selection)
     }
diff --git a/packages/opencode/src/cli/cmd/run/footer.view.tsx b/packages/cli/src/mini/footer.view.tsx
similarity index 99%
rename from packages/opencode/src/cli/cmd/run/footer.view.tsx
rename to packages/cli/src/mini/footer.view.tsx
index a7c1321494..b8f50659ba 100644
--- a/packages/opencode/src/cli/cmd/run/footer.view.tsx
+++ b/packages/cli/src/mini/footer.view.tsx
@@ -88,7 +88,7 @@ type RunFooterViewProps = {
   diffStyle?: RunDiffStyle
   tuiConfig: RunTuiConfig
   backgroundSubagents: boolean
-  history?: RunPrompt[]
+  history?: () => RunPrompt[]
   agent: string
   onSubmit: (input: RunPrompt) => boolean
   onPermissionReply: (input: PermissionReply) => void | Promise<void>
diff --git a/packages/opencode/src/cli/cmd/run/footer.width.ts b/packages/cli/src/mini/footer.width.ts
similarity index 100%
rename from packages/opencode/src/cli/cmd/run/footer.width.ts
rename to packages/cli/src/mini/footer.width.ts
diff --git a/packages/cli/src/mini/index.ts b/packages/cli/src/mini/index.ts
new file mode 100644
index 0000000000..62decb77a5
--- /dev/null
+++ b/packages/cli/src/mini/index.ts
@@ -0,0 +1,7 @@
+export { runMini, mergeInput as mergeInteractiveInput, type MiniCommandInput } from "./mini"
+export {
+  runNonInteractive,
+  mergeInput as mergeNonInteractiveInput,
+  pickRunModel,
+  type RunCommandInput,
+} from "./run"
diff --git a/packages/cli/src/mini/mini.ts b/packages/cli/src/mini/mini.ts
new file mode 100644
index 0000000000..9259bd5dbe
--- /dev/null
+++ b/packages/cli/src/mini/mini.ts
@@ -0,0 +1,234 @@
+import { NodeFileSystem } from "@effect/platform-node"
+import { OpenCode, type OpenCodeClient } from "@opencode-ai/client/promise"
+import { truthy } from "@opencode-ai/core/flag/flag"
+import { Global } from "@opencode-ai/core/global"
+import { Effect } from "effect"
+import path from "node:path"
+import { Daemon } from "../daemon"
+import { waitForCatalogReady } from "./catalog.shared"
+import { INTERACTIVE_INPUT_ERROR, resolveInteractiveStdin } from "./runtime.stdin"
+import type { RunInput, RunTuiConfig } from "./types"
+
+export type MiniCommandInput = {
+  directory?: string
+  attach?: string
+  password?: string
+  username?: string
+  continue?: boolean
+  session?: string
+  fork?: boolean
+  model?: string
+  agent?: string
+  prompt?: string
+  replay?: boolean
+  replayLimit?: number
+  demo?: boolean
+  serverCommand?: ReadonlyArray<string>
+  tuiConfig?: RunTuiConfig | Promise<RunTuiConfig>
+}
+
+type Session = Awaited<ReturnType<OpenCodeClient["session"]["get"]>>
+type Transport = { readonly url: string; readonly headers?: HeadersInit }
+
+export async function runMini(input: MiniCommandInput) {
+  validate(input)
+  const initialInput = mergeInput(process.stdin.isTTY ? undefined : await Bun.stdin.text(), input.prompt)
+  const runtimeTask = import("./runtime")
+  const directory = input.attach ? input.directory : localDirectory(input.directory)
+  const transportTask = startTransport(input)
+  void transportTask.catch(() => {})
+
+  try {
+    if (input.attach) await transportTask
+    const sdk = OpenCode.make({
+      baseUrl: "http://opencode.pending",
+      fetch: deferredFetch(transportTask),
+    })
+    const attachedSession =
+      input.attach && input.session && !input.directory
+        ? await sdk.session.get({ sessionID: input.session }).catch(() => fail("Session not found"))
+        : undefined
+    const resolvedDirectory =
+      directory ?? attachedSession?.location.directory ?? (await remoteDirectory(await transportTask, sdk))
+    const model = parseModel(input.model)
+    let agentTask: Promise<string | undefined> | undefined
+    const resolveAgent = () => {
+      agentTask ??= validateAgent(sdk, resolvedDirectory, input.agent, input.attach)
+      return agentTask
+    }
+    const resolveSession = async () => {
+      const [agent, selected] = await Promise.all([
+        resolveAgent(),
+        selectSession(sdk, resolvedDirectory, input, attachedSession),
+      ])
+      const readyModel =
+        model ?? (selected?.model ? { providerID: selected.model.providerID, modelID: selected.model.id } : undefined)
+      if (readyModel) await waitForCatalogReady({ sdk, directory: resolvedDirectory, model: readyModel })
+      const session = selected ?? (await createSession(sdk, resolvedDirectory, agent, model))
+      return { id: session.id, title: session.title, resume: selected !== undefined }
+    }
+    const create = (
+      _sdk: OpenCodeClient,
+      next: { agent: string | undefined; model: RunInput["model"]; variant: string | undefined },
+    ) => createSession(sdk, resolvedDirectory, next.agent, next.model, next.variant)
+    const runtime = await runtimeTask
+    await runtime.runInteractiveDeferredMode({
+      sdk,
+      directory: resolvedDirectory,
+      resolveAgent,
+      session: resolveSession,
+      createSession: create,
+      agent: input.agent,
+      model,
+      variant: undefined,
+      files: [],
+      initialInput,
+      thinking: true,
+      backgroundSubagents:
+        truthy("OPENCODE_EXPERIMENTAL_BACKGROUND_SUBAGENTS") ||
+        (process.env.OPENCODE_EXPERIMENTAL_BACKGROUND_SUBAGENTS === undefined && truthy("OPENCODE_EXPERIMENTAL")),
+      replay: input.replay ?? true,
+      replayLimit: input.replayLimit,
+      demo: input.demo,
+      tuiConfig: input.tuiConfig,
+    })
+  } catch (error) {
+    if (error instanceof Error && error.message === INTERACTIVE_INPUT_ERROR) fail(error.message)
+    throw error
+  }
+}
+
+/** @internal Exported for testing. */
+export function mergeInput(piped: string | undefined, prompt: string | undefined) {
+  if (!prompt) return piped || undefined
+  if (!piped) return prompt
+  return piped + "\n" + prompt
+}
+
+function validate(input: MiniCommandInput) {
+  if (!process.stdout.isTTY) fail("opencode mini requires a TTY stdout")
+  if (input.replayLimit !== undefined && (!Number.isInteger(input.replayLimit) || input.replayLimit <= 0)) {
+    fail("--replay-limit must be a positive integer")
+  }
+  if (input.fork && !input.continue && !input.session) fail("--fork requires --continue or --session")
+  resolveInteractiveStdin().cleanup?.()
+}
+
+function localDirectory(directory?: string): string {
+  const root = process.env.PWD ?? process.cwd()
+  try {
+    process.chdir(directory ? (path.isAbsolute(directory) ? directory : path.join(root, directory)) : root)
+    return process.cwd()
+  } catch {
+    fail(`Failed to change directory to ${directory}`)
+  }
+}
+
+function startTransport(input: MiniCommandInput): Promise<Transport> {
+  if (input.attach) {
+    return Effect.runPromise(
+      Daemon.transport({
+        mode: "attach",
+        url: input.attach,
+        password: input.password ?? process.env.OPENCODE_SERVER_PASSWORD,
+        username: input.username ?? process.env.OPENCODE_SERVER_USERNAME,
+      }),
+    )
+  }
+  return Effect.runPromise(
+    Daemon.transport({ mode: "shared", command: input.serverCommand }).pipe(
+      Effect.provide(NodeFileSystem.layer),
+      Effect.provide(Global.layerWith({})),
+    ),
+  )
+}
+
+function deferredFetch(transportTask: Promise<{ url: string; headers?: HeadersInit }>): typeof globalThis.fetch {
+  const fetch = async (input: RequestInfo | URL, init?: RequestInit) => {
+    const transport = await transportTask
+    const request = new Request(input, init)
+    const source = new URL(request.url)
+    const headers = new Headers(request.headers)
+    for (const [key, value] of new Headers(transport.headers)) headers.set(key, value)
+    return globalThis.fetch(new Request(new URL(source.pathname + source.search, transport.url), request), { headers })
+  }
+  return fetch as typeof globalThis.fetch
+}
+
+async function remoteDirectory(
+  transport: { url: string; headers?: HeadersInit },
+  sdk: OpenCodeClient,
+): Promise<string> {
+  const location = await sdk.location.get()
+  if (!location.directory) throw new Error(`Failed to resolve remote directory from ${transport.url}`)
+  return location.directory
+}
+
+function parseModel(value?: string): RunInput["model"] {
+  if (!value) return
+  const [providerID, ...rest] = value.split("/")
+  const modelID = rest.join("/")
+  if (!providerID || !modelID) fail("--model must use the format provider/model")
+  return { providerID, modelID }
+}
+
+async function validateAgent(sdk: OpenCodeClient, directory: string, name?: string, attach?: string) {
+  if (!name) return
+  const deadline = Date.now() + 5_000
+  let agents: Awaited<ReturnType<OpenCodeClient["agent"]["list"]>> | undefined
+  while (Date.now() < deadline) {
+    agents = await sdk.agent.list({ location: { directory } }).catch(() => undefined)
+    const agent = agents?.data.find((item) => item.id === name)
+    if (agent?.mode === "subagent") {
+      warning(`agent "${name}" is a subagent, not a primary agent. Falling back to default agent`)
+      return
+    }
+    if (agent) return name
+    await Bun.sleep(25)
+  }
+  if (!agents) {
+    warning(`failed to list agents${attach ? ` from ${attach}` : ""}. Falling back to default agent`)
+    return
+  }
+  warning(`agent "${name}" not found. Falling back to default agent`)
+}
+
+async function selectSession(sdk: OpenCodeClient, directory: string, input: MiniCommandInput, preselected?: Session) {
+  const selected =
+    preselected ??
+    (input.session
+      ? await sdk.session.get({ sessionID: input.session }).catch(() => undefined)
+      : input.continue
+        ? await sdk.session
+            .list({ directory, parentID: null, limit: 1, order: "desc" })
+            .then((result) => result.data[0])
+        : undefined)
+  if (input.session && !selected) fail("Session not found")
+  if (!selected) return
+  if (!input.fork) return selected
+  return sdk.session.fork({ sessionID: selected.id })
+}
+
+async function createSession(
+  sdk: OpenCodeClient,
+  directory: string,
+  agent: string | undefined,
+  model: RunInput["model"],
+  variant?: string,
+): Promise<Session> {
+  if (model) await waitForCatalogReady({ sdk, directory, model })
+  return sdk.session.create({
+    agent,
+    model: model ? { providerID: model.providerID, id: model.modelID, variant } : undefined,
+    location: { directory },
+  })
+}
+
+function warning(message: string) {
+  process.stderr.write(`\x1b[93m\x1b[1m!\x1b[0m ${message}\n`)
+}
+
+function fail(message: string): never {
+  process.stderr.write(`\x1b[91m\x1b[1mError: \x1b[0m${message}\n`)
+  process.exit(1)
+}
diff --git a/packages/opencode/src/cli/cmd/run/noninteractive.ts b/packages/cli/src/mini/noninteractive.ts
similarity index 85%
rename from packages/opencode/src/cli/cmd/run/noninteractive.ts
rename to packages/cli/src/mini/noninteractive.ts
index 6874527222..0645daac51 100644
--- a/packages/opencode/src/cli/cmd/run/noninteractive.ts
+++ b/packages/cli/src/mini/noninteractive.ts
@@ -1,15 +1,17 @@
 import type {
-  OpencodeClient,
+  EventSubscribeOutput,
+  OpenCodeClient,
+} from "@opencode-ai/client/promise"
+import type {
   ReasoningPart,
   StepFinishPart,
   StepStartPart,
   TextPart,
   ToolPart,
-  V2Event,
 } from "@opencode-ai/sdk/v2"
+import { SessionMessage } from "@opencode-ai/schema/session-message"
 import { EOL } from "node:os"
-import { MessageID } from "@/session/schema"
-import { UI } from "../../ui"
+import { UI } from "./ui"
 
 type Model = {
   providerID: string
@@ -23,7 +25,7 @@ type File = {
 }
 
 type Input = {
-  client: OpencodeClient
+  client: OpenCodeClient
   sessionID: string
   message: string
   files: File[]
@@ -52,6 +54,7 @@ type ToolState = StartedPart & {
   provider?: unknown
 }
 
+type V2Event = EventSubscribeOutput
 type FormRequest = Extract<V2Event, { type: "form.created" }>["data"]["form"]
 
 // MCP elicitations are temporarily owned by the "global" sentinel instead of a real
@@ -61,16 +64,11 @@ const GLOBAL_FORM_SESSION_ID = "global"
 
 export async function runNonInteractivePrompt(input: Input) {
   const controller = new AbortController()
-  const events = await input.client.v2.event.subscribe({
-    signal: controller.signal,
-    sseMaxRetryAttempts: 0,
-    throwOnError: true,
-  })
-  const stream = events.stream[Symbol.asyncIterator]() as AsyncGenerator<V2Event>
+  const stream = input.client.event.subscribe({ signal: controller.signal })[Symbol.asyncIterator]()
   const connected = await stream.next()
   if (connected.done) throw new Error("Event stream disconnected before prompt admission")
 
-  const messageID = MessageID.ascending()
+  const messageID = SessionMessage.ID.create()
   const starts = new Map<string, StartedPart>()
   const tools = new Map<string, ToolState>()
   let submitted = false
@@ -101,7 +99,7 @@ export async function runNonInteractivePrompt(input: Input) {
     UI.empty()
   }
 
-  const replyPermission = async (request: { id: string; action: string; resources: string[] }) => {
+  const replyPermission = async (request: { id: string; action: string; resources: ReadonlyArray<string> }) => {
     if (!input.dangerouslySkipPermissions) {
       permissionRejected = true
       UI.println(
@@ -110,7 +108,7 @@ export async function runNonInteractivePrompt(input: Input) {
           `permission requested: ${request.action} (${request.resources.join(", ")}); auto-rejecting`,
       )
     }
-    await input.client.v2.session.permission
+    await input.client.permission
       .reply({
         sessionID: input.sessionID,
         requestID: request.id,
@@ -118,18 +116,18 @@ export async function runNonInteractivePrompt(input: Input) {
       })
       .catch(() => {})
     if (!input.dangerouslySkipPermissions) {
-      await input.client.v2.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
+      await input.client.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
     }
   }
 
   const rejectQuestion = async (request: { id: string }) => {
     questionRejected = true
-    await input.client.v2.session.question.reject({ sessionID: input.sessionID, requestID: request.id }).catch(() => {})
+    await input.client.question.reject({ sessionID: input.sessionID, requestID: request.id }).catch(() => {})
   }
 
   const cancelForm = async (request: Pick<FormRequest, "id" | "sessionID">) => {
     formCancelled = true
-    await input.client.v2.session.form.cancel({ sessionID: request.sessionID, formID: request.id }).catch(() => {})
+    await input.client.form.cancel({ sessionID: request.sessionID, formID: request.id }).catch(() => {})
   }
 
   const consume = async () => {
@@ -156,7 +154,7 @@ export async function runNonInteractivePrompt(input: Input) {
         continue
       }
       if (!("sessionID" in event.data) || event.data.sessionID !== input.sessionID) continue
-      const time = toMillis(event.created)
+      const time = toMillis("created" in event ? event.created : undefined)
 
       if (event.type === "session.prompt.promoted") {
         if (event.data.inputID === messageID) {
@@ -367,34 +365,31 @@ export async function runNonInteractivePrompt(input: Input) {
     interrupted = true
     process.exitCode = 130
     admission?.abort()
-    void input.client.v2.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
+    void input.client.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
   }
   process.on("SIGINT", interrupt)
 
   let completed: Promise<void> | undefined
   try {
     if (input.agent) {
-      await input.client.v2.session.switchAgent(
-        { sessionID: input.sessionID, agent: input.agent },
-        { throwOnError: true },
-      )
+      await input.client.session.switchAgent({ sessionID: input.sessionID, agent: input.agent })
     }
     const selected = input.model
       ? { providerID: input.model.providerID, id: input.model.modelID, variant: input.variant }
       : input.variant
-        ? await input.client.v2.session
-            .get({ sessionID: input.sessionID }, { throwOnError: true })
-            .then((result) => result.data.data.model)
+        ? await input.client.session
+            .get({ sessionID: input.sessionID })
+            .then((result) => result.model)
             .then(async (model) => {
               if (model) return { ...model, variant: input.variant }
-              const result = await input.client.v2.model.default(undefined, { throwOnError: true })
-              const fallback = result.data.data
+              const result = await input.client.model.default()
+              const fallback = result.data
               return fallback ? { providerID: fallback.providerID, id: fallback.id, variant: input.variant } : undefined
             })
         : undefined
     if (input.variant && !selected) throw new Error("Cannot select a variant before selecting a model")
     if (selected) {
-      await input.client.v2.session.switchModel({ sessionID: input.sessionID, model: selected }, { throwOnError: true })
+      await input.client.session.switchModel({ sessionID: input.sessionID, model: selected })
     }
 
     const prepared = await Promise.all(input.files.map(prepareFile))
@@ -402,7 +397,7 @@ export async function runNonInteractivePrompt(input: Input) {
     submitted = true
     completed = consume()
     admission = new AbortController()
-    const response = await input.client.v2.session
+    const response = await input.client.session
       .prompt(
         {
           sessionID: input.sessionID,
@@ -413,11 +408,11 @@ export async function runNonInteractivePrompt(input: Input) {
           },
           delivery: "steer",
         },
-        { throwOnError: true, signal: admission.signal },
+        { signal: admission.signal },
       )
       .catch(async (error) => {
         if (interrupted) {
-          await input.client.v2.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
+          await input.client.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
         }
         controller.abort()
         await completed?.catch(() => {})
@@ -426,22 +421,21 @@ export async function runNonInteractivePrompt(input: Input) {
       })
     admission = undefined
     if (!response) return
-    if (!response.data.data) throw new Error("Prompt was not admitted")
-    if (interrupted) await input.client.v2.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
+    if (interrupted) await input.client.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
 
     const [permissions, questions, forms] = await Promise.all([
-      input.client.v2.session.permission.list({ sessionID: input.sessionID }).catch(() => undefined),
-      input.client.v2.session.question.list({ sessionID: input.sessionID }).catch(() => undefined),
+      input.client.permission.list({ sessionID: input.sessionID }).catch(() => undefined),
+      input.client.question.list({ sessionID: input.sessionID }).catch(() => undefined),
       Promise.all(
         (input.attached ? [input.sessionID] : [input.sessionID, GLOBAL_FORM_SESSION_ID]).map((sessionID) =>
-          input.client.v2.session.form.list({ sessionID }).catch(() => undefined),
+          input.client.form.list({ sessionID }).catch(() => undefined),
         ),
       ),
     ])
     await Promise.all([
-      ...(permissions?.data?.data ?? []).map(replyPermission),
-      ...(questions?.data?.data ?? []).map(rejectQuestion),
-      ...forms.flatMap((response) => response?.data?.data ?? []).map(cancelForm),
+      ...(permissions ?? []).map(replyPermission),
+      ...(questions ?? []).map(rejectQuestion),
+      ...forms.flatMap((response) => response ?? []).map(cancelForm),
     ])
     await completed
   } finally {
diff --git a/packages/opencode/src/cli/cmd/run/permission.shared.ts b/packages/cli/src/mini/permission.shared.ts
similarity index 100%
rename from packages/opencode/src/cli/cmd/run/permission.shared.ts
rename to packages/cli/src/mini/permission.shared.ts
diff --git a/packages/opencode/src/cli/cmd/run/prompt.editor.ts b/packages/cli/src/mini/prompt.editor.ts
similarity index 100%
rename from packages/opencode/src/cli/cmd/run/prompt.editor.ts
rename to packages/cli/src/mini/prompt.editor.ts
diff --git a/packages/opencode/src/cli/cmd/run/prompt.shared.ts b/packages/cli/src/mini/prompt.shared.ts
similarity index 99%
rename from packages/opencode/src/cli/cmd/run/prompt.shared.ts
rename to packages/cli/src/mini/prompt.shared.ts
index 63c33aa34f..56d1cb2968 100644
--- a/packages/opencode/src/cli/cmd/run/prompt.shared.ts
+++ b/packages/cli/src/mini/prompt.shared.ts
@@ -7,7 +7,7 @@
 // the current browse position. When the user arrows up at cursor offset 0,
 // the current draft is saved and history begins. Arrowing past the end
 // restores the draft.
-export { displayCharAt, displaySlice, mentionTriggerIndex } from "../prompt-display"
+export { displayCharAt, displaySlice, mentionTriggerIndex } from "@opencode-ai/tui/prompt/display"
 import type { RunPrompt } from "./types"
 
 const HISTORY_LIMIT = 200
diff --git a/packages/opencode/src/cli/cmd/run/question.shared.ts b/packages/cli/src/mini/question.shared.ts
similarity index 100%
rename from packages/opencode/src/cli/cmd/run/question.shared.ts
rename to packages/cli/src/mini/question.shared.ts
diff --git a/packages/cli/src/mini/run.ts b/packages/cli/src/mini/run.ts
new file mode 100644
index 0000000000..ee4fc1cb53
--- /dev/null
+++ b/packages/cli/src/mini/run.ts
@@ -0,0 +1,308 @@
+import { NodeFileSystem } from "@effect/platform-node"
+import { OpenCode, type OpenCodeClient } from "@opencode-ai/client/promise"
+import { Global } from "@opencode-ai/core/global"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import type { ToolPart } from "@opencode-ai/sdk/v2"
+import { Effect } from "effect"
+import { open } from "node:fs/promises"
+import path from "node:path"
+import { Daemon } from "../daemon"
+import { Standalone } from "../services/standalone"
+import { loadRunAgents, waitForCatalogReady, waitForDefaultModel } from "./catalog.shared"
+import { runNonInteractivePrompt } from "./noninteractive"
+import { toolInlineInfo } from "./tool"
+import { UI } from "./ui"
+
+export type RunCommandInput = {
+  message: string[]
+  continue?: boolean
+  session?: string
+  fork?: boolean
+  model?: string
+  agent?: string
+  format: "default" | "json"
+  file: string[]
+  title?: string
+  server?: string
+  password?: string
+  username?: string
+  directory?: string
+  variant?: string
+  thinking?: boolean
+  dangerouslySkipPermissions?: boolean
+  standaloneCommand?: ReadonlyArray<string>
+}
+
+type FilePart = {
+  url: string
+  filename: string
+  mime: string
+}
+
+type Transport = { readonly url: string; readonly headers?: HeadersInit }
+
+type Prepared = {
+  directory?: string
+  message: string
+  files: FilePart[]
+}
+
+const ATTACH_FILE_MAX_BYTES = 10 * 1024 * 1024
+
+export async function runNonInteractive(input: RunCommandInput) {
+  if (input.fork && !input.continue && !input.session) fail("--fork requires --continue or --session")
+  const root = process.env.PWD ?? process.cwd()
+  const directory = input.server ? input.directory : localDirectory(input.directory, root)
+  const message = mergeInput(formatMessage(input.message), process.stdin.isTTY ? undefined : await Bun.stdin.text())
+  if (!message?.trim()) fail("You must provide a message")
+  const files = await Promise.all(
+    input.file.map((file) => prepareFile(file, input.server ? root : (directory ?? root), input.server !== undefined)),
+  )
+  const prepared = { directory, message, files }
+  if (input.standaloneCommand)
+    return Effect.runPromise(
+      Effect.scoped(
+        Effect.gen(function* () {
+          const transport = yield* Standalone.transport({ command: input.standaloneCommand })
+          yield* Effect.promise(() => execute(input, prepared, transport))
+        }),
+      ),
+    )
+  const transport = await startTransport(input)
+  return execute(input, prepared, transport)
+}
+
+async function execute(input: RunCommandInput, prepared: Prepared, transport: Transport) {
+  const client = OpenCode.make({ baseUrl: transport.url, headers: transport.headers })
+  const requestedDirectory = prepared.directory ?? (await client.location.get()).directory
+  if (!requestedDirectory) fail("Failed to resolve server directory")
+  const session = await selectSession(client, requestedDirectory, input)
+  const cwd = session?.location.directory ?? requestedDirectory
+  const explicitModel = parseModel(input.model)
+  const sessionModel = session?.model ? { providerID: session.model.providerID, modelID: session.model.id } : undefined
+  const defaultModel =
+    input.variant && !explicitModel && !sessionModel
+      ? await waitForDefaultModel({ sdk: client, directory: cwd })
+      : undefined
+  const model = pickRunModel(explicitModel, input.variant, sessionModel, defaultModel)
+  if (input.variant && !model) return reportError(input, "Cannot select a variant before selecting a model", session?.id)
+  if (model) {
+    await waitForCatalogReady({ sdk: client, directory: cwd, model })
+    const available = await client.model.list({ location: { directory: cwd } })
+    if (!available.data.some((item) => item.providerID === model.providerID && item.id === model.modelID))
+      return reportError(input, `Model unavailable: ${model.providerID}/${model.modelID}`, session?.id)
+  }
+  const agent = await validateAgent(client, cwd, input.agent, input.server)
+  const selected =
+    session ??
+    (await client.session.create({
+      agent,
+      model: model ? { providerID: model.providerID, id: model.modelID, variant: input.variant } : undefined,
+      location: { directory: cwd },
+    }))
+  if (!session && input.title !== undefined) {
+    await client.session.rename({
+      sessionID: selected.id,
+      title:
+        input.title ||
+        prepared.message.slice(0, 50) + (prepared.message.length > 50 ? "..." : ""),
+    })
+  }
+
+  try {
+    await runNonInteractivePrompt({
+      client,
+      sessionID: selected.id,
+      message: prepared.message,
+      files: prepared.files,
+      agent,
+      model,
+      variant: input.variant,
+      thinking: input.thinking ?? false,
+      format: input.format,
+      dangerouslySkipPermissions: input.dangerouslySkipPermissions ?? false,
+      attached: !input.standaloneCommand,
+      renderTool,
+      renderToolError,
+    })
+  } catch (error) {
+    UI.error(error instanceof Error ? error.message : String(error))
+    process.exitCode = 1
+  }
+}
+
+export function mergeInput(message: string | undefined, piped: string | undefined) {
+  if (!message) return piped || undefined
+  if (!piped) return message
+  return message + "\n" + piped
+}
+
+export function pickRunModel(
+  explicit: { providerID: string; modelID: string } | undefined,
+  variant: string | undefined,
+  session: { providerID: string; modelID: string } | undefined,
+  fallback: { providerID: string; modelID: string } | undefined,
+) {
+  if (explicit) return explicit
+  if (!variant) return
+  return session ?? fallback
+}
+
+function formatMessage(message: string[]) {
+  const value = message.map((part) => (part.includes(" ") ? `"${part.replace(/"/g, '\\"')}"` : part)).join(" ")
+  return value || undefined
+}
+
+function localDirectory(directory: string | undefined, root: string) {
+  try {
+    process.chdir(directory ? (path.isAbsolute(directory) ? directory : path.join(root, directory)) : root)
+    return process.cwd()
+  } catch {
+    fail(`Failed to change directory to ${directory}`)
+  }
+}
+
+function startTransport(input: RunCommandInput) {
+  if (input.server) {
+    return Effect.runPromise(
+      Daemon.transport({
+        mode: "attach",
+        url: input.server,
+        password: input.password,
+        username: input.username,
+      }),
+    )
+  }
+  return Effect.runPromise(
+    Daemon.transport({ mode: "shared" }).pipe(
+      Effect.provide(NodeFileSystem.layer),
+      Effect.provide(Global.layerWith({})),
+    ),
+  )
+}
+
+function parseModel(value?: string) {
+  if (!value) return
+  const [providerID, ...rest] = value.split("/")
+  const modelID = rest.join("/")
+  if (!providerID || !modelID) fail("--model must use the format provider/model")
+  return { providerID, modelID }
+}
+
+async function validateAgent(client: OpenCodeClient, directory: string, name?: string, server?: string) {
+  if (!name) return
+  const agents = await loadRunAgents(client, directory).catch(() => undefined)
+  if (!agents) {
+    warning(`failed to list agents${server ? ` from ${server}` : ""}. Falling back to default agent`)
+    return
+  }
+  const agent = agents.find((item) => item.name === name)
+  if (!agent) {
+    warning(`agent "${name}" not found. Falling back to default agent`)
+    return
+  }
+  if (agent.mode === "subagent") {
+    warning(`agent "${name}" is a subagent, not a primary agent. Falling back to default agent`)
+    return
+  }
+  return name
+}
+
+async function selectSession(client: OpenCodeClient, directory: string, input: RunCommandInput) {
+  const selected = input.session
+    ? await client.session.get({ sessionID: input.session }).catch(() => undefined)
+    : input.continue
+      ? await client.session
+          .list({ directory, parentID: null, limit: 1, order: "desc" })
+          .then((result) => result.data[0])
+      : undefined
+  if (input.session && !selected) fail("Session not found")
+  if (!selected || !input.fork) return selected
+  return client.session.fork({ sessionID: selected.id })
+}
+
+async function prepareFile(input: string, directory: string, remote: boolean): Promise<FilePart> {
+  const file = path.resolve(directory, input)
+  const handle = await open(file, "r").catch(() => fail(`File not found: ${input}`))
+  try {
+    const stat = await handle.stat()
+    if (remote && stat.isDirectory()) fail(`Cannot attach local directory without a shared filesystem: ${input}`)
+    if (!stat.isFile() || stat.size > ATTACH_FILE_MAX_BYTES)
+      fail(`Cannot attach a directory, special file, or file larger than 10 MiB: ${input}`)
+    const content = Buffer.alloc(Number(stat.size))
+    let offset = 0
+    while (offset < content.length) {
+      const read = await handle.read(content, offset, content.length - offset, offset)
+      if (read.bytesRead === 0) break
+      offset += read.bytesRead
+    }
+    const bytes = content.subarray(0, offset)
+    const detected = FSUtil.mimeType(file)
+    const text = bytes.toString("utf8")
+    const mime =
+      detected.startsWith("image/") || detected === "application/pdf"
+        ? detected
+        : !isBinaryContent(bytes) && Buffer.from(text, "utf8").equals(bytes)
+          ? "text/plain"
+          : detected
+    return {
+      url: `data:${mime};base64,${bytes.toString("base64")}`,
+      filename: path.basename(file),
+      mime,
+    }
+  } finally {
+    await handle.close()
+  }
+}
+
+function isBinaryContent(bytes: Uint8Array) {
+  if (bytes.length === 0) return false
+  if (bytes.includes(0)) return true
+  return bytes.reduce((count, byte) => count + Number(byte < 9 || (byte > 13 && byte < 32)), 0) / bytes.length > 0.3
+}
+
+async function renderTool(part: ToolPart) {
+  const info = toolInlineInfo(part)
+  if (info.mode === "block") {
+    UI.empty()
+    UI.println(UI.Style.TEXT_NORMAL + info.icon, UI.Style.TEXT_NORMAL + info.title)
+    if (info.body?.trim()) UI.println(info.body)
+    UI.empty()
+    return
+  }
+  UI.println(
+    UI.Style.TEXT_NORMAL + info.icon,
+    UI.Style.TEXT_NORMAL + info.title,
+    info.description ? UI.Style.TEXT_DIM + info.description + UI.Style.TEXT_NORMAL : "",
+  )
+}
+
+async function renderToolError(part: ToolPart) {
+  const info = toolInlineInfo(part)
+  UI.println(UI.Style.TEXT_NORMAL + "✗", UI.Style.TEXT_NORMAL + `${info.title} failed`)
+}
+
+function warning(message: string) {
+  UI.println(UI.Style.TEXT_WARNING_BOLD + "!", UI.Style.TEXT_NORMAL, message)
+}
+
+function reportError(input: RunCommandInput, message: string, sessionID?: string) {
+  process.exitCode = 1
+  if (input.format === "json") {
+    process.stdout.write(
+      JSON.stringify({
+        type: "error",
+        timestamp: Date.now(),
+        sessionID: sessionID ?? "",
+        error: { type: "unknown", message },
+      }) + "\n",
+    )
+    return
+  }
+  UI.error(message)
+}
+
+function fail(message: string): never {
+  UI.error(message)
+  process.exit(1)
+}
diff --git a/packages/opencode/src/cli/cmd/run/runtime.boot.ts b/packages/cli/src/mini/runtime.boot.ts
similarity index 75%
rename from packages/opencode/src/cli/cmd/run/runtime.boot.ts
rename to packages/cli/src/mini/runtime.boot.ts
index eae1db77e8..b5fca98dc0 100644
--- a/packages/opencode/src/cli/cmd/run/runtime.boot.ts
+++ b/packages/cli/src/mini/runtime.boot.ts
@@ -7,12 +7,10 @@
 // none block each other.
 import { Context, Effect, Layer } from "effect"
 import { resolve } from "@opencode-ai/tui/config"
-import { TuiConfig } from "@/config/tui"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { makeGlobalNode } from "@opencode-ai/core/effect/app-node"
-import { makeRuntime } from "@/effect/run-service"
+import { makeRuntime } from "@opencode-ai/core/effect/runtime"
 import { loadRunProviders } from "./catalog.shared"
-import { reusePendingTask } from "./runtime.shared"
 import { resolveCurrentSession, sessionHistory } from "./session.shared"
 import type { RunDiffStyle, RunInput, RunPrompt, RunProvider, RunTuiConfig } from "./types"
 import { pickVariant } from "./variant.shared"
@@ -30,7 +28,6 @@ export type SessionInfo = {
   variant: string | undefined
 }
 
-type Config = Awaited<ReturnType<typeof TuiConfig.get>>
 type BootService = {
   readonly resolveModelInfo: (
     sdk: RunInput["sdk"],
@@ -42,18 +39,10 @@ type BootService = {
     sessionID: string,
     model: RunInput["model"],
   ) => Effect.Effect<SessionInfo>
-  readonly resolveRunTuiConfig: () => Effect.Effect<RunTuiConfig>
-  readonly resolveDiffStyle: () => Effect.Effect<RunDiffStyle>
 }
 
-const configTask: { current?: Promise<Config> } = {}
-
 class Service extends Context.Service<Service, BootService>()("@opencode/RunBoot") {}
 
-function loadConfig() {
-  return reusePendingTask(configTask, () => TuiConfig.get())
-}
-
 function emptyModelInfo(): ModelInfo {
   return {
     providers: [],
@@ -77,23 +66,9 @@ function defaultRunTuiConfig(): RunTuiConfig {
   }
 }
 
-function runTuiConfig(config: Config | undefined): RunTuiConfig {
-  if (!config) {
-    return defaultRunTuiConfig()
-  }
-
-  return {
-    keybinds: config.keybinds,
-    leader_timeout: config.leader_timeout,
-    diff_style: config.diff_style ?? "auto",
-  }
-}
-
 const layer = Layer.effect(
   Service,
   Effect.gen(function* () {
-    const config = Effect.fn("RunBoot.config")(() => Effect.promise(() => loadConfig().catch(() => undefined)))
-
     const resolveModelInfo = Effect.fn("RunBoot.resolveModelInfo")(function* (
       sdk: RunInput["sdk"],
       directory: string,
@@ -147,19 +122,9 @@ const layer = Layer.effect(
       }
     })
 
-    const resolveRunTuiConfig = Effect.fn("RunBoot.resolveRunTuiConfig")(function* () {
-      return runTuiConfig(yield* config())
-    })
-
-    const resolveDiffStyle = Effect.fn("RunBoot.resolveDiffStyle")(function* () {
-      return runTuiConfig(yield* config()).diff_style ?? "auto"
-    })
-
     return Service.of({
       resolveModelInfo,
       resolveSessionInfo,
-      resolveRunTuiConfig,
-      resolveDiffStyle,
     })
   }),
 )
@@ -190,10 +155,12 @@ export async function resolveSessionInfo(
 }
 
 // Reads TUI config once for direct mode keymap setup and display preferences.
-export async function resolveRunTuiConfig(): Promise<RunTuiConfig> {
-  return runtime.runPromise((svc) => svc.resolveRunTuiConfig()).catch(() => defaultRunTuiConfig())
+export async function resolveRunTuiConfig(
+  config?: RunTuiConfig | Promise<RunTuiConfig>,
+): Promise<RunTuiConfig> {
+  return Promise.resolve(config).then((value) => value ?? defaultRunTuiConfig()).catch(() => defaultRunTuiConfig())
 }
 
-export async function resolveDiffStyle(): Promise<RunDiffStyle> {
-  return runtime.runPromise((svc) => svc.resolveDiffStyle()).catch(() => "auto")
+export async function resolveDiffStyle(config?: RunTuiConfig | Promise<RunTuiConfig>): Promise<RunDiffStyle> {
+  return resolveRunTuiConfig(config).then((value) => value.diff_style ?? "auto")
 }
diff --git a/packages/opencode/src/cli/cmd/run/runtime.lifecycle.ts b/packages/cli/src/mini/runtime.lifecycle.ts
similarity index 99%
rename from packages/opencode/src/cli/cmd/run/runtime.lifecycle.ts
rename to packages/cli/src/mini/runtime.lifecycle.ts
index e06523c7c6..4700f7c479 100644
--- a/packages/opencode/src/cli/cmd/run/runtime.lifecycle.ts
+++ b/packages/cli/src/mini/runtime.lifecycle.ts
@@ -13,8 +13,8 @@ import { CliRenderEvents, createCliRenderer, type CliRenderer, type ScrollbackWr
 import { createDefaultOpenTuiKeymap } from "@opentui/keymap/opentui"
 import { Global } from "@opencode-ai/core/global"
 import { registerOpencodeKeymap } from "@opencode-ai/tui/keymap"
-import { isDefaultTitle } from "@/session/title"
-import * as Locale from "@/util/locale"
+import { isDefaultTitle } from "@opencode-ai/tui/util/session"
+import { Locale } from "@opencode-ai/tui/util/locale"
 import { resolveInteractiveStdin } from "./runtime.stdin"
 import { entrySplash, exitSplash, splashMeta } from "./splash"
 import { resolveRunTheme } from "./theme"
diff --git a/packages/opencode/src/cli/cmd/run/runtime.queue.ts b/packages/cli/src/mini/runtime.queue.ts
similarity index 96%
rename from packages/opencode/src/cli/cmd/run/runtime.queue.ts
rename to packages/cli/src/mini/runtime.queue.ts
index d29e03672a..5a2bdb98db 100644
--- a/packages/opencode/src/cli/cmd/run/runtime.queue.ts
+++ b/packages/cli/src/mini/runtime.queue.ts
@@ -8,8 +8,9 @@
 // and tracks per-turn wall-clock duration for the footer status line.
 //
 // Resolves when the footer closes and all in-flight work finishes.
-import * as Locale from "@/util/locale"
-import { MessageID, PartID } from "@/session/schema"
+import { ascending } from "@opencode-ai/schema/identifier"
+import { SessionMessage } from "@opencode-ai/schema/session-message"
+import { Locale } from "@opencode-ai/tui/util/locale"
 import { isExitCommand, isNewCommand } from "./prompt.shared"
 import type { FooterApi, FooterEvent, FooterQueuedPrompt, RunPrompt } from "./types"
 
@@ -167,7 +168,7 @@ export async function runPromptQueue(input: QueueInput): Promise<void> {
               ? prompt
               : {
                   ...prompt,
-                  messageID: prompt.messageID ?? queued?.messageID ?? MessageID.ascending(),
+                  messageID: prompt.messageID ?? queued?.messageID ?? SessionMessage.ID.create(),
                 }
           state.active = sent
 
@@ -285,8 +286,8 @@ export async function runPromptQueue(input: QueueInput): Promise<void> {
       !isNewCommand(prompt.text)
     ) {
       const queued: FooterQueuedPrompt = {
-        messageID: MessageID.ascending(),
-        partID: PartID.ascending(),
+        messageID: SessionMessage.ID.create(),
+        partID: "prt_" + ascending(),
         prompt,
       }
       state.queued = [...state.queued, queued]
diff --git a/packages/opencode/src/cli/cmd/run/runtime.shared.ts b/packages/cli/src/mini/runtime.shared.ts
similarity index 100%
rename from packages/opencode/src/cli/cmd/run/runtime.shared.ts
rename to packages/cli/src/mini/runtime.shared.ts
diff --git a/packages/opencode/src/cli/cmd/run/runtime.stdin.ts b/packages/cli/src/mini/runtime.stdin.ts
similarity index 100%
rename from packages/opencode/src/cli/cmd/run/runtime.stdin.ts
rename to packages/cli/src/mini/runtime.stdin.ts
diff --git a/packages/opencode/src/cli/cmd/run/runtime.ts b/packages/cli/src/mini/runtime.ts
similarity index 86%
rename from packages/opencode/src/cli/cmd/run/runtime.ts
rename to packages/cli/src/mini/runtime.ts
index 601cdc567f..8f575a87fe 100644
--- a/packages/opencode/src/cli/cmd/run/runtime.ts
+++ b/packages/cli/src/mini/runtime.ts
@@ -4,7 +4,7 @@
 // and prompt queue together into a single session loop. Two entry points:
 //
 //   runInteractiveMode     -- used when an SDK client already exists (attach mode)
-//   runInteractiveLocalMode -- used for local in-process mode (no server)
+//   runInteractiveDeferredMode -- paints before resolving its session
 //
 // Both delegate to runInteractiveRuntime, which:
 //   1. resolves TUI config, model info, and session history,
@@ -12,15 +12,22 @@
 //   3. starts the stream transport (SDK event subscription), lazily for fresh
 //      local sessions,
 //   4. runs the prompt queue until the footer closes.
-import { createOpencodeClient } from "@opencode-ai/sdk/v2"
 import { Flag } from "@opencode-ai/core/flag/flag"
-import { MessageID } from "@/session/schema"
+import { SessionMessage } from "@opencode-ai/schema/session-message"
 import { loadRunAgents, loadRunCommands, loadRunReferences, waitForDefaultModel } from "./catalog.shared"
 import { resolveModelInfo, resolveModelInfoStrict, resolveRunTuiConfig, resolveSessionInfo } from "./runtime.boot"
 import { createRuntimeLifecycle } from "./runtime.lifecycle"
 import { trace } from "./trace"
 import { cycleVariant, formatModelLabel, resolveSavedVariant, resolveVariant, saveVariant } from "./variant.shared"
-import type { LocalReplayAnchor, LocalReplayRow, RunInput, RunPrompt, RunProvider, StreamCommit } from "./types"
+import type {
+  LocalReplayAnchor,
+  LocalReplayRow,
+  RunInput,
+  RunPrompt,
+  RunProvider,
+  RunTuiConfig,
+  StreamCommit,
+} from "./types"
 
 /** @internal Exported for testing */
 export { pickVariant, resolveVariant } from "./variant.shared"
@@ -44,9 +51,7 @@ type CreateSession = (sdk: RunInput["sdk"], input: CreateSessionInput) => Promis
 type RunRuntimeInput = {
   boot: () => Promise<BootContext>
   afterPaint?: (ctx: BootContext) => Promise<void> | void
-  resolveSession?: (
-    ctx: BootContext,
-  ) => Promise<{ sessionID: string; sessionTitle?: string; agent?: string | undefined }>
+  resolveSession?: (ctx: BootContext) => Promise<ResolvedSession>
   createSession?: (ctx: BootContext, input: CreateSessionInput) => Promise<ResolvedSession>
   files: RunInput["files"]
   initialInput?: string
@@ -55,13 +60,14 @@ type RunRuntimeInput = {
   replay?: boolean
   replayLimit?: number
   demo?: RunInput["demo"]
+  tuiConfig?: RunTuiConfig | Promise<RunTuiConfig>
 }
 
-type RunLocalInput = {
+type RunDeferredInput = {
+  sdk: RunInput["sdk"]
   directory: string
-  fetch: typeof globalThis.fetch
   resolveAgent: () => Promise<string | undefined>
-  session: (sdk: RunInput["sdk"]) => Promise<{ id: string; title?: string } | undefined>
+  session: (sdk: RunInput["sdk"]) => Promise<{ id: string; title?: string; resume?: boolean } | undefined>
   createSession?: CreateSession
   agent: RunInput["agent"]
   model: RunInput["model"]
@@ -73,6 +79,7 @@ type RunLocalInput = {
   replay?: boolean
   replayLimit?: number
   demo?: RunInput["demo"]
+  tuiConfig?: RunTuiConfig | Promise<RunTuiConfig>
 }
 
 type StreamTransportModule = Pick<
@@ -96,6 +103,7 @@ type ResolvedSession = {
   sessionID: string
   sessionTitle?: string
   agent?: string | undefined
+  resume?: boolean
 }
 
 function createSessionResolver(fn?: CreateSession) {
@@ -165,9 +173,9 @@ async function resolveExitTitle(
     return undefined
   }
 
-  return ctx.sdk.v2.session
+  return ctx.sdk.session
     .get({ sessionID: state.sessionID })
-    .then((x) => x.data?.data.title)
+    .then((session) => session.title)
     .catch(() => undefined)
 }
 
@@ -180,7 +188,7 @@ async function resolveExitTitle(
 async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDeps = {}): Promise<void> {
   const start = performance.now()
   const log = trace()
-  const tuiConfigTask = resolveRunTuiConfig()
+  const tuiConfigTask = resolveRunTuiConfig(input.tuiConfig)
   const ctx = await input.boot()
   const sessionTask =
     ctx.resume === true
@@ -247,9 +255,9 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
   const shell = await (deps.createRuntimeLifecycle ?? createRuntimeLifecycle)({
     directory: ctx.directory,
     findFiles: (query) =>
-      ctx.sdk.find
-        .files({ query, directory: ctx.directory })
-        .then((x) => x.data ?? [])
+      ctx.sdk.file
+        .find({ query, type: "file", location: { directory: ctx.directory } })
+        .then((result) => result.data.map((file) => file.path))
         .catch(() => []),
     agents: [],
     references: [],
@@ -257,7 +265,7 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
     sessionTitle: state.sessionTitle,
     getSessionID: () => state.sessionID,
     first: session.first,
-    history: session.history,
+    history: state.history,
     agent: state.agent,
     model: state.model,
     variant: state.activeVariant,
@@ -269,17 +277,17 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
       }
 
       log?.write("send.permission.reply", next)
-      await ctx.sdk.v2.session.permission.reply({ sessionID: state.sessionID, ...next })
+      await ctx.sdk.permission.reply({ sessionID: state.sessionID, ...next })
     },
     onQuestionReply: async (next) => {
       if (state.demo?.questionReply(next)) {
         return
       }
 
-      await ctx.sdk.v2.session.question.reply({
+      await ctx.sdk.question.reply({
         sessionID: state.sessionID,
         requestID: next.requestID,
-        questionV2Reply: { answers: next.answers ?? [] },
+        answers: next.answers ?? [],
       })
     },
     onQuestionReject: async (next) => {
@@ -287,7 +295,7 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
         return
       }
 
-      await ctx.sdk.v2.session.question.reject({ sessionID: state.sessionID, ...next })
+      await ctx.sdk.question.reject({ sessionID: state.sessionID, ...next })
     },
     onCycleVariant: () => {
       if (!state.model || state.variants.length === 0) {
@@ -369,7 +377,7 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
       void (
         state.stream
           ? state.stream.then((item) => item.handle.interruptActiveTurn())
-          : ctx.sdk.v2.session.interrupt({ sessionID: state.sessionID })
+          : ctx.sdk.session.interrupt({ sessionID: state.sessionID })
       )
         .catch(() => {})
         .finally(() => {
@@ -383,11 +391,11 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
       }
 
       log?.write("send.background", { sessionID: state.sessionID })
-      void ctx.sdk.v2.session.background({ sessionID: state.sessionID }).catch(() => {})
+      void ctx.sdk.session.background({ sessionID: state.sessionID }).catch(() => {})
     },
     onSubagentInterrupt: (sessionID) => {
       log?.write("send.subagent.interrupt", { sessionID })
-      void ctx.sdk.v2.session.interrupt({ sessionID }).catch(() => {})
+      void ctx.sdk.session.interrupt({ sessionID }).catch(() => {})
     },
     onSubagentSelect: (sessionID) => {
       state.selectSubagent?.(sessionID)
@@ -398,7 +406,6 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
   })
   const footer = shell.footer
   const firstPaint = footer.idle().catch(() => {})
-  const modelTask = firstPaint.then(() => (footer.isClosed ? undefined : loadModel()))
   const ensureSession = () => {
     if (!input.resolveSession || state.sessionID) {
       return Promise.resolve()
@@ -408,13 +415,33 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
       return state.session
     }
 
-    state.session = input.resolveSession(ctx).then((next) => {
+    state.session = input.resolveSession(ctx).then(async (next) => {
       state.sessionID = next.sessionID
       state.sessionTitle = next.sessionTitle ?? state.sessionTitle
       state.agent = next.agent
+      if (!next.resume) return
+      const resumed = await resolveSessionInfo(ctx.sdk, next.sessionID, ctx.model)
+      session.first = resumed.first
+      session.history = resumed.history
+      session.model = resumed.model
+      session.variant = resumed.variant
+      state.shown = !resumed.first
+      state.history = [...resumed.history]
+      state.model = ctx.model ?? resumed.model
+      const resumedSavedVariant = state.model ? await resolveSavedVariant(state.model) : undefined
+      state.activeVariant = resolveVariant(ctx.variant, resumed.variant, resumedSavedVariant, [])
+      session.variant = state.activeVariant
+      footer.event({ type: "history", history: resumed.history })
+      footer.event({ type: "first", first: resumed.first })
     })
     return state.session
   }
+  const modelTask = firstPaint.then(async () => {
+    if (footer.isClosed) return
+    await ensureSession()
+    if (footer.isClosed) return
+    return loadModel()
+  })
   const rememberLocal = (commit: StreamCommit, after?: LocalReplayAnchor) => {
     state.localRows = [...state.localRows, { commit, after }].slice(-LOCAL_REPLAY_ROW_LIMIT)
   }
@@ -640,6 +667,10 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
   const runQueue = async () => {
     await firstPaint
     if (footer.isClosed) return
+    await ensureSession()
+    if (footer.isClosed) return
+    await modelTask
+    if (footer.isClosed) return
     let includeFiles = true
     if (state.demo) {
       await state.demo.start()
@@ -728,7 +759,7 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
                 text: error instanceof Error ? error.message : String(error),
                 phase: "start",
                 source: "system",
-                messageID: MessageID.ascending(),
+                messageID: SessionMessage.ID.create(),
               } as const
               rememberLocal(commit)
               footer.append(commit)
@@ -834,61 +865,62 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
   }
 }
 
-// Local in-process mode. Creates an SDK client backed by a direct fetch to
-// the in-process server, so no external HTTP server is needed.
-export async function runInteractiveLocalMode(input: RunLocalInput): Promise<void> {
-  const sdk = createOpencodeClient({
-    baseUrl: "http://opencode.internal",
-    fetch: input.fetch,
-    directory: input.directory,
-  })
+// Deferred mode paints before session resolution. The caller may back the
+// generated client with a transport that is still acquiring a daemon.
+export async function runInteractiveDeferredMode(input: RunDeferredInput, deps?: RunRuntimeDeps): Promise<void> {
+  const sdk = input.sdk
   let session: Promise<ResolvedSession> | undefined
 
-  return runInteractiveRuntime({
-    files: input.files,
-    initialInput: input.initialInput,
-    thinking: input.thinking,
-    backgroundSubagents: input.backgroundSubagents,
-    replay: input.replay,
-    replayLimit: input.replayLimit,
-    demo: input.demo,
-    resolveSession: () => {
-      if (session) {
+  return runInteractiveRuntime(
+    {
+      files: input.files,
+      initialInput: input.initialInput,
+      thinking: input.thinking,
+      backgroundSubagents: input.backgroundSubagents,
+      replay: input.replay,
+      replayLimit: input.replayLimit,
+      demo: input.demo,
+      tuiConfig: input.tuiConfig,
+      resolveSession: () => {
+        if (session) {
+          return session
+        }
+
+        session = Promise.all([input.resolveAgent(), input.session(sdk)]).then(([agent, next]) => {
+          if (!next?.id) {
+            throw new Error("Session not found")
+          }
+
+          return {
+            sessionID: next.id,
+            sessionTitle: next.title,
+            agent,
+            resume: next.resume,
+          }
+        })
         return session
-      }
-
-      session = Promise.all([input.resolveAgent(), input.session(sdk)]).then(([agent, next]) => {
-        if (!next?.id) {
-          throw new Error("Session not found")
-        }
-
+      },
+      createSession: createSessionResolver(input.createSession),
+      boot: async () => {
         return {
-          sessionID: next.id,
-          sessionTitle: next.title,
-          agent,
+          sdk,
+          directory: input.directory,
+          sessionID: "",
+          sessionTitle: undefined,
+          resume: false,
+          agent: input.agent,
+          model: input.model,
+          variant: input.variant,
         }
-      })
-      return session
+      },
     },
-    createSession: createSessionResolver(input.createSession),
-    boot: async () => {
-      return {
-        sdk,
-        directory: input.directory,
-        sessionID: "",
-        sessionTitle: undefined,
-        resume: false,
-        agent: input.agent,
-        model: input.model,
-        variant: input.variant,
-      }
-    },
-  })
+    deps,
+  )
 }
 
 // Attach mode. Uses the caller-provided SDK client directly.
 export async function runInteractiveMode(
-  input: RunInput & { createSession?: CreateSession },
+  input: RunInput & { createSession?: CreateSession; tuiConfig?: RunTuiConfig | Promise<RunTuiConfig> },
   deps?: RunRuntimeDeps,
 ): Promise<void> {
   return runInteractiveRuntime(
@@ -900,6 +932,7 @@ export async function runInteractiveMode(
       replay: input.replay,
       replayLimit: input.replayLimit,
       demo: input.demo,
+      tuiConfig: input.tuiConfig,
       boot: async () => ({
         sdk: input.sdk,
         directory: input.directory,
diff --git a/packages/opencode/src/cli/cmd/run/scrollback.shared.ts b/packages/cli/src/mini/scrollback.shared.ts
similarity index 100%
rename from packages/opencode/src/cli/cmd/run/scrollback.shared.ts
rename to packages/cli/src/mini/scrollback.shared.ts
diff --git a/packages/opencode/src/cli/cmd/run/scrollback.surface.ts b/packages/cli/src/mini/scrollback.surface.ts
similarity index 100%
rename from packages/opencode/src/cli/cmd/run/scrollback.surface.ts
rename to packages/cli/src/mini/scrollback.surface.ts
diff --git a/packages/opencode/src/cli/cmd/run/scrollback.writer.tsx b/packages/cli/src/mini/scrollback.writer.tsx
similarity index 100%
rename from packages/opencode/src/cli/cmd/run/scrollback.writer.tsx
rename to packages/cli/src/mini/scrollback.writer.tsx
diff --git a/packages/opencode/src/cli/cmd/run/session-data.ts b/packages/cli/src/mini/session-data.ts
similarity index 99%
rename from packages/opencode/src/cli/cmd/run/session-data.ts
rename to packages/cli/src/mini/session-data.ts
index ffce45bc94..263b8e86d4 100644
--- a/packages/opencode/src/cli/cmd/run/session-data.ts
+++ b/packages/cli/src/mini/session-data.ts
@@ -25,7 +25,7 @@
 //   event arrives, the queue entry is removed and the footer falls back
 //   to the next pending request or to the prompt view.
 import type { Event, PermissionRequest, QuestionRequest, ToolPart } from "@opencode-ai/sdk/v2"
-import * as Locale from "@/util/locale"
+import { Locale } from "@opencode-ai/tui/util/locale"
 import { toolView } from "./tool"
 import type { FooterOutput, FooterPatch, FooterView, StreamCommit } from "./types"
 
diff --git a/packages/opencode/src/cli/cmd/run/session.shared.ts b/packages/cli/src/mini/session.shared.ts
similarity index 90%
rename from packages/opencode/src/cli/cmd/run/session.shared.ts
rename to packages/cli/src/mini/session.shared.ts
index b39624662c..e68df9e6c2 100644
--- a/packages/opencode/src/cli/cmd/run/session.shared.ts
+++ b/packages/cli/src/mini/session.shared.ts
@@ -4,11 +4,12 @@
 // the prompt history ring. Also finds the most recently used variant for
 // the current model so the footer can pre-select it.
 import { promptCopy, promptSame } from "./prompt.shared"
+import type { Message, Part } from "@opencode-ai/sdk/v2"
 import type { RunInput, RunPrompt } from "./types"
 
 const LIMIT = 200
 
-export type SessionMessages = NonNullable<Awaited<ReturnType<RunInput["sdk"]["session"]["messages"]>>["data"]>
+export type SessionMessages = Array<{ info: Message; parts: Part[] }>
 
 type Turn = {
   prompt: RunPrompt
@@ -160,10 +161,10 @@ export async function resolveCurrentSession(
   limit = LIMIT,
 ): Promise<RunSession> {
   const [response, session] = await Promise.all([
-    sdk.v2.session.messages({ sessionID, limit, order: "desc" }, { throwOnError: true }),
-    sdk.v2.session.get({ sessionID }, { throwOnError: true }),
+    sdk.message.list({ sessionID, limit, order: "desc" }),
+    sdk.session.get({ sessionID }),
   ])
-  const messages = response.data.data.toReversed()
+  const messages = response.data.toReversed()
   return {
     first: messages.length === 0,
     turns: messages.flatMap((message) => {
@@ -195,18 +196,18 @@ export async function resolveCurrentSession(
               })),
             ],
           },
-          provider: session.data.data.model?.providerID,
-          model: session.data.data.model?.id,
-          variant: session.data.data.model?.variant,
+          provider: session.model?.providerID,
+          model: session.model?.id,
+          variant: session.model?.variant,
         },
       ]
     }),
-    ...(session.data.data.model && {
+    ...(session.model && {
       model: {
-        providerID: session.data.data.model.providerID,
-        modelID: session.data.data.model.id,
+        providerID: session.model.providerID,
+        modelID: session.model.id,
       },
-      variant: session.data.data.model.variant,
+      variant: session.model.variant,
     }),
   }
 }
diff --git a/packages/opencode/src/cli/cmd/run/splash.ts b/packages/cli/src/mini/splash.ts
similarity index 98%
rename from packages/opencode/src/cli/cmd/run/splash.ts
rename to packages/cli/src/mini/splash.ts
index 9e9321cafd..e39adba376 100644
--- a/packages/opencode/src/cli/cmd/run/splash.ts
+++ b/packages/cli/src/mini/splash.ts
@@ -17,8 +17,8 @@ import {
   type ScrollbackSnapshot,
   type ScrollbackWriter,
 } from "@opentui/core"
-import * as Locale from "@/util/locale"
-import { go } from "@/cli/logo"
+import { Locale } from "@opencode-ai/tui/util/locale"
+import { go } from "@opencode-ai/tui/logo"
 import type { RunSplashTheme } from "./theme"
 
 export const SPLASH_TITLE_LIMIT = 50
diff --git a/packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts b/packages/cli/src/mini/stream-v2.subagent.ts
similarity index 96%
rename from packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts
rename to packages/cli/src/mini/stream-v2.subagent.ts
index 00de6490c4..ad34f6ecff 100644
--- a/packages/opencode/src/cli/cmd/run/stream-v2.subagent.ts
+++ b/packages/cli/src/mini/stream-v2.subagent.ts
@@ -15,14 +15,9 @@
 // Per-child interruption uses `v2.session.interrupt(childID)`. Per-child
 // backgrounding is intentionally absent: subagent jobs block the parent
 // session, so only whole-session `v2.session.background(parentID)` exists.
-import type {
-  OpencodeClient,
-  SessionMessage,
-  SessionMessageAssistantTool,
-  ToolPart,
-  V2Event,
-} from "@opencode-ai/sdk/v2"
-import { Locale } from "@/util/locale"
+import type { EventSubscribeOutput, OpenCodeClient } from "@opencode-ai/client/promise"
+import type { SessionMessage, SessionMessageAssistantTool, ToolPart } from "@opencode-ai/sdk/v2"
+import { Locale } from "@opencode-ai/tui/util/locale"
 import type { FooterSubagentDetail, FooterSubagentState, FooterSubagentTab, StreamCommit } from "./types"
 
 const CHILD_MESSAGE_LIMIT = 80
@@ -31,6 +26,8 @@ const CHILD_EVENT_BUFFER_LIMIT = 64
 const FAMILY_LIST_LIMIT = 100
 const FALLBACK_LABEL = "Subagent"
 
+type V2Event = EventSubscribeOutput
+
 export function outputText(content: ReadonlyArray<{ type: string; text?: string }>) {
   return content.flatMap((item) => (item.type === "text" && item.text ? [item.text] : [])).join("\n")
 }
@@ -165,7 +162,7 @@ type ChildState = {
 }
 
 export type SubagentTrackerInput = {
-  sdk: OpencodeClient
+  sdk: OpenCodeClient
   sessionID: string
   thinking: boolean
   emit: () => void
@@ -390,8 +387,8 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
     const pendingPrompts = new Map(child.prompts)
     const pendingTools = new Map(child.tools)
     let retry = false
-    const task = input.sdk.v2.session
-      .messages({ sessionID: child.sessionID, limit: CHILD_MESSAGE_LIMIT, order: "desc" }, { throwOnError: true })
+    const task = input.sdk.message
+      .list({ sessionID: child.sessionID, limit: CHILD_MESSAGE_LIMIT, order: "desc" })
       .then((response) => {
         const buffered = hydrationEvents.get(child.sessionID) ?? []
         hydrationEvents.delete(child.sessionID)
@@ -404,7 +401,7 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
         for (const [id, prompt] of pendingPrompts) {
           if (!child.prompts.has(id)) child.prompts.set(id, prompt)
         }
-        rebuild(child, response.data.data.toReversed())
+        rebuild(child, structuredClone(response.data).toReversed() as SessionMessage[])
         for (const [id, tool] of pendingTools) {
           if (!child.finishedTools.has(id) && !child.tools.has(id)) child.tools.set(id, tool)
         }
@@ -428,10 +425,9 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
     if (checked.has(sessionID) || children.has(sessionID) || sessionID === input.sessionID) return
     checked.add(sessionID)
     if (!pendingEvents.has(sessionID)) pendingEvents.set(sessionID, [])
-    void input.sdk.v2.session
-      .get({ sessionID }, { throwOnError: true })
-      .then((response) => {
-        const session = response.data.data
+    void input.sdk.session
+      .get({ sessionID })
+      .then((session) => {
         const buffered = pendingEvents.get(sessionID) ?? []
         pendingEvents.delete(sessionID)
         if (session.parentID !== input.sessionID) return
@@ -558,14 +554,14 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
       })
       childTool(
         child,
-        {
+        structuredClone({
           type: "tool",
           id: event.data.callID,
           name: event.data.tool,
           provider: event.data.provider,
           state: { status: "running", input: event.data.input, structured: {}, content: [] },
           time: { created: current?.started ?? event.created, ran: event.created },
-        },
+        }) as SessionMessageAssistantTool,
         event.data.assistantMessageID,
       )
       touch(child, event.created)
@@ -578,7 +574,7 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
       const failed = event.type === "session.tool.failed"
       childTool(
         child,
-        {
+        structuredClone({
           type: "tool",
           id: event.data.callID,
           name: current?.name ?? "tool",
@@ -605,7 +601,7 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
             ran: current?.started,
             completed: event.created,
           },
-        },
+        }) as SessionMessageAssistantTool,
         event.data.assistantMessageID,
       )
       touch(child, event.created)
@@ -697,9 +693,9 @@ export function createSubagentTracker(input: SubagentTrackerInput): SubagentTrac
       }
       // Family index: adopt children directly from the current session list so
       // historical subagents beyond the projected message window still get tabs.
-      const family = await input.sdk.v2.session
-        .list({ parentID: input.sessionID, limit: FAMILY_LIST_LIMIT, order: "desc" }, { throwOnError: true })
-        .then((response) => response.data.data)
+      const family = await input.sdk.session
+        .list({ parentID: input.sessionID, limit: FAMILY_LIST_LIMIT, order: "desc" })
+        .then((response) => response.data)
         .catch(() => [])
       for (const session of family) {
         const child = ensureChild(session.id)
diff --git a/packages/opencode/src/cli/cmd/run/stream-v2.transport.ts b/packages/cli/src/mini/stream-v2.transport.ts
similarity index 93%
rename from packages/opencode/src/cli/cmd/run/stream-v2.transport.ts
rename to packages/cli/src/mini/stream-v2.transport.ts
index 8b80b0b64e..7cec6f9e87 100644
--- a/packages/opencode/src/cli/cmd/run/stream-v2.transport.ts
+++ b/packages/cli/src/mini/stream-v2.transport.ts
@@ -1,13 +1,13 @@
 import type {
-  OpencodeClient,
+  EventSubscribeOutput,
+  OpenCodeClient,
+} from "@opencode-ai/client/promise"
+import type {
   PermissionRequest,
-  PermissionV2Request,
   QuestionRequest,
-  QuestionV2Request,
   SessionMessage,
   SessionMessageAssistant,
   SessionMessageAssistantTool,
-  V2Event,
 } from "@opencode-ai/sdk/v2"
 import { Event } from "@opencode-ai/schema/event"
 import { blockerStatus, pickBlockerView } from "./session-data"
@@ -31,7 +31,7 @@ type Trace = {
 }
 
 type StreamInput = {
-  sdk: OpencodeClient
+  sdk: OpenCodeClient
   directory?: string
   sessionID: string
   thinking: boolean
@@ -90,7 +90,9 @@ type ShellWait = {
   abort: () => void
 }
 
-type RunV2Event = V2Event
+type RunV2Event = EventSubscribeOutput
+type PermissionV2Request = Extract<RunV2Event, { type: "permission.v2.asked" }>["data"]
+type QuestionV2Request = Extract<RunV2Event, { type: "question.v2.asked" }>["data"]
 type PromptFilePart = Extract<RunPromptPart, { type: "file" }>
 
 type ToolState = {
@@ -144,9 +146,9 @@ function permission(request: PermissionV2Request): PermissionRequest {
     id: request.id,
     sessionID: request.sessionID,
     permission: request.action,
-    patterns: request.resources,
+    patterns: [...request.resources],
     metadata: request.metadata ?? {},
-    always: request.save ?? [],
+    always: [...(request.save ?? [])],
     tool: request.source?.type === "tool" ? request.source : undefined,
   }
 }
@@ -155,7 +157,7 @@ function question(request: QuestionV2Request): QuestionRequest {
   return {
     id: request.id,
     sessionID: request.sessionID,
-    questions: request.questions,
+    questions: request.questions.map((item) => ({ ...item, options: item.options.map((option) => ({ ...option })) })),
     tool: request.tool,
   }
 }
@@ -303,14 +305,14 @@ async function resolveSelectedModel(input: StreamInput, next: Pick<SessionTurnIn
   if (next.model) return { providerID: next.model.providerID, id: next.model.modelID, variant: next.variant }
   if (!next.variant) return
 
-  const session = await input.sdk.v2.session
-    .get({ sessionID: input.sessionID }, { throwOnError: true, signal: next.signal })
-    .then((response) => response.data.data.model)
+  const session = await input.sdk.session
+    .get({ sessionID: input.sessionID }, { signal: next.signal })
+    .then((response) => response.model)
   if (session) return { ...session, variant: next.variant }
 
-  const fallback = await input.sdk.v2.model
-    .default(undefined, { throwOnError: true, signal: next.signal })
-    .then((response) => response.data.data)
+  const fallback = await input.sdk.model
+    .default(undefined, { signal: next.signal })
+    .then((response) => response.data)
   if (!fallback) return
   return { providerID: fallback.providerID, id: fallback.id, variant: next.variant }
 }
@@ -532,21 +534,18 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
 
   const hydrate = async (next: { render: boolean; reuseVisibleWait: boolean }) => {
     const [messages, permissions, questions, active] = await Promise.all([
-      input.sdk.v2.session.messages(
-        { sessionID: input.sessionID, limit: input.replayLimit ?? 200, order: "desc" },
-        { throwOnError: true },
-      ),
-      input.sdk.v2.session.permission.list({ sessionID: input.sessionID }, { throwOnError: true }),
-      input.sdk.v2.session.question.list({ sessionID: input.sessionID }, { throwOnError: true }),
-      input.sdk.v2.session.active({ throwOnError: true }),
+      input.sdk.message.list({ sessionID: input.sessionID, limit: input.replayLimit ?? 200, order: "desc" }),
+      input.sdk.permission.list({ sessionID: input.sessionID }),
+      input.sdk.question.list({ sessionID: input.sessionID }),
+      input.sdk.session.active(),
     ])
-    const projected = messages.data.data.toReversed()
+    const projected = structuredClone(messages.data).toReversed() as SessionMessage[]
     for (const message of projected) renderMessage(message, next.render, next.reuseVisibleWait)
-    state.permissions = permissions.data.data.map(permission)
-    state.questions = questions.data.data.map(question)
+    state.permissions = permissions.map(permission)
+    state.questions = questions.map(question)
     syncBlockers()
-    await subagents.hydrate({ messages: projected, active: active.data.data })
-    const running = input.sessionID in active.data.data
+    await subagents.hydrate({ messages: [...projected], active: active.data })
+    const running = input.sessionID in active.data
     write([], { phase: running ? "running" : "idle", status: running ? "assistant responding" : "" })
     if (!running && state.wait && (state.wait.promoted || state.wait.interrupted)) {
       const current = state.wait
@@ -721,14 +720,14 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
     if (event.type === "session.tool.called") {
       if (state.finishedTools.has(event.data.callID)) return
       const current = state.tools.get(event.data.callID)
-      const item: SessionMessageAssistantTool = {
+      const item = structuredClone({
         type: "tool",
         id: event.data.callID,
         name: event.data.tool,
         provider: event.data.provider,
         state: { status: "running", input: event.data.input, structured: {}, content: [] },
         time: { created: current?.started ?? event.created, ran: event.created },
-      }
+      }) as SessionMessageAssistantTool
       renderTool(event.data.assistantMessageID, item)
       return
     }
@@ -736,7 +735,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
     if (event.type === "session.tool.success" || event.type === "session.tool.failed") {
       const current = state.tools.get(event.data.callID)
       const failed = event.type === "session.tool.failed"
-      const item: SessionMessageAssistantTool = {
+      const item = structuredClone({
         type: "tool",
         id: event.data.callID,
         name: current?.name ?? "tool",
@@ -759,7 +758,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
               result: event.data.result,
             },
         time: { created: current?.started ?? event.created, ran: current?.started, completed: event.created },
-      }
+      }) as SessionMessageAssistantTool
       renderTool(event.data.assistantMessageID, item)
       return
     }
@@ -838,12 +837,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
         const connection = new AbortController()
         const abortConnection = () => connection.abort()
         controller.signal.addEventListener("abort", abortConnection, { once: true })
-        const response = await input.sdk.v2.event.subscribe({
-          signal: connection.signal,
-          sseMaxRetryAttempts: 0,
-          throwOnError: true,
-        })
-        const stream = response.stream[Symbol.asyncIterator]() as AsyncGenerator<RunV2Event>
+        const stream = input.sdk.event.subscribe({ signal: connection.signal })[Symbol.asyncIterator]()
         try {
           const first = await stream.next()
           if (first.done || first.value.type !== "server.connected") throw new Error("Event stream disconnected")
@@ -910,9 +904,9 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
     input.trace?.write("send.shell", { sessionID: input.sessionID, id: eventID, command: next.prompt.text })
     write([], { phase: "running", status: "running shell" })
     try {
-      await input.sdk.v2.session.shell(
+      await input.sdk.session.shell(
         { sessionID: input.sessionID, id: eventID, command: next.prompt.text },
-        { throwOnError: true, signal: abort.signal },
+        { signal: abort.signal },
       )
       await Promise.race([output, wait(SHELL_OUTPUT_GRACE_MS, abort.signal)])
     } catch (error) {
@@ -950,7 +944,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
     state.wait = active
     const interrupt = () => {
       active.interrupted = true
-      void input.sdk.v2.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
+      void input.sdk.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
     }
     next.signal?.addEventListener("abort", interrupt, { once: true })
     try {
@@ -981,9 +975,9 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
         input.trace?.write("send.skill", { sessionID: input.sessionID, messageID, skill: command.name })
         await runTurnWait(next, messageID, {
           send: () =>
-            input.sdk.v2.session.skill(
+            input.sdk.session.skill(
               { sessionID: input.sessionID, id: messageID, skill: command.name },
-              { throwOnError: true, signal: next.signal },
+              { signal: next.signal },
             ),
         })
         return
@@ -1001,7 +995,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
         input.trace?.write("send.command", { sessionID: input.sessionID, messageID, command: command.name })
         await runTurnWait(next, messageID, {
           send: () =>
-            input.sdk.v2.session.command(
+            input.sdk.session.command(
               {
                 sessionID: input.sessionID,
                 id: messageID,
@@ -1013,24 +1007,24 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
                 agents: agents.length ? agents : undefined,
                 delivery: "steer",
               },
-              { throwOnError: true, signal: next.signal },
+              { signal: next.signal },
             ),
         })
         return
       }
 
       if (next.agent) {
-        await input.sdk.v2.session.switchAgent(
+        await input.sdk.session.switchAgent(
           { sessionID: input.sessionID, agent: next.agent },
-          { throwOnError: true, signal: next.signal },
+          { signal: next.signal },
         )
       }
       const selected = await resolveSelectedModel(input, next)
       if (next.variant && !selected) throw new Error("Cannot select a variant before selecting a model")
       if (selected)
-        await input.sdk.v2.session.switchModel(
+        await input.sdk.session.switchModel(
           { sessionID: input.sessionID, model: selected },
-          { throwOnError: true, signal: next.signal },
+          { signal: next.signal },
         )
 
       const prepared = await Promise.all((next.includeFiles ? next.files : []).map(prepareFile))
@@ -1042,7 +1036,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       input.trace?.write("send.prompt", { sessionID: input.sessionID, messageID })
       await runTurnWait(next, messageID, {
         send: () =>
-          input.sdk.v2.session.prompt(
+          input.sdk.session.prompt(
             {
               sessionID: input.sessionID,
               id: messageID,
@@ -1053,7 +1047,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
               },
               delivery: "steer",
             },
-            { throwOnError: true, signal: next.signal },
+            { signal: next.signal },
           ),
       })
     },
@@ -1067,7 +1061,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
         return
       }
       if (state.wait) state.wait.interrupted = true
-      await input.sdk.v2.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
+      await input.sdk.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
     },
     selectSubagent(sessionID) {
       subagents.select(sessionID)
diff --git a/packages/opencode/src/cli/cmd/run/stream.ts b/packages/cli/src/mini/stream.ts
similarity index 100%
rename from packages/opencode/src/cli/cmd/run/stream.ts
rename to packages/cli/src/mini/stream.ts
diff --git a/packages/opencode/src/cli/cmd/run/theme.ts b/packages/cli/src/mini/theme.ts
similarity index 100%
rename from packages/opencode/src/cli/cmd/run/theme.ts
rename to packages/cli/src/mini/theme.ts
diff --git a/packages/opencode/src/cli/cmd/run/tool.ts b/packages/cli/src/mini/tool.ts
similarity index 82%
rename from packages/opencode/src/cli/cmd/run/tool.ts
rename to packages/cli/src/mini/tool.ts
index 181ab7dc7c..8d9b06aee1 100644
--- a/packages/opencode/src/cli/cmd/run/tool.ts
+++ b/packages/cli/src/mini/tool.ts
@@ -16,25 +16,8 @@ import os from "os"
 import path from "path"
 import stripAnsi from "strip-ansi"
 import type { ToolPart } from "@opencode-ai/sdk/v2"
-import type * as Tool from "@/tool/tool"
-import type { ApplyPatchTool } from "@/tool/apply_patch"
-import type { ShellTool as BashTool } from "@/tool/shell"
-import type { EditTool } from "@/tool/edit"
-import type { GlobTool } from "@/tool/glob"
-import type { GrepTool } from "@/tool/grep"
-import type { InvalidTool } from "@/tool/invalid"
-import type { LspTool } from "@/tool/lsp"
-import type { PlanExitTool } from "@/tool/plan"
-import type { QuestionTool } from "@/tool/question"
-import type { ReadTool } from "@/tool/read"
-import type { SkillTool } from "@/tool/skill"
-import type { TaskTool } from "@/tool/task"
-import type { TodoWriteTool } from "@/tool/todo"
-import type { WebFetchTool } from "@/tool/webfetch"
-import { webSearchProviderLabel, type WebSearchTool } from "@/tool/websearch"
-import type { WriteTool } from "@/tool/write"
-import { LANGUAGE_EXTENSIONS } from "@/lsp/language"
-import * as Locale from "@/util/locale"
+import { LANGUAGE_EXTENSIONS } from "@opencode-ai/tui/util/filetype"
+import { Locale } from "@opencode-ai/tui/util/locale"
 import type { RunEntryBody, StreamCommit, ToolSnapshot } from "./types"
 
 export type ToolView = {
@@ -47,6 +30,46 @@ export type ToolPhase = "start" | "progress" | "final"
 
 export type ToolDict = Record<string, unknown>
 
+type PatchFile = {
+  type?: string
+  relativePath?: string
+  filePath?: string
+  movePath?: string
+  patch?: string
+  deletions?: number
+}
+
+type ToolInput = ToolDict & {
+  path?: string
+  pattern?: string
+  filePath?: string
+  filepath?: string
+  url?: string
+  query?: string
+  subagent_type?: string
+  description?: string
+  name?: string
+  operation?: string
+  line?: number
+  character?: number
+  content?: string
+  command?: string
+  workdir?: string
+  todos?: Array<{ status?: string; content?: string }>
+  questions?: Array<{ question?: string }>
+  diff?: string
+}
+
+type ToolMetadata = ToolDict & {
+  count?: number
+  matches?: number
+  diff?: string
+  provider?: unknown
+  files?: PatchFile[]
+  answers?: string[][]
+  exit?: number
+}
+
 export type ToolFrame = {
   raw: string
   name: string
@@ -73,15 +96,15 @@ export type ToolPermissionInfo = {
   file?: string
 }
 
-export type ToolProps<T = Tool.Info> = {
-  input: Partial<Tool.InferParameters<T>>
-  metadata: Partial<Tool.InferMetadata<T>>
+export type ToolProps = {
+  input: ToolInput
+  metadata: ToolMetadata
   frame: ToolFrame
 }
 
-type ToolPermissionProps<T = Tool.Info> = {
-  input: Partial<Tool.InferParameters<T>>
-  metadata: Partial<Tool.InferMetadata<T>>
+type ToolPermissionProps = {
+  input: ToolInput
+  metadata: ToolMetadata
   patterns: string[]
 }
 
@@ -91,40 +114,35 @@ type ToolPermissionCtx = {
   patterns: string[]
 }
 
-type ToolDefs = {
-  invalid: typeof InvalidTool
-  bash: typeof BashTool
-  write: typeof WriteTool
-  edit: typeof EditTool
-  apply_patch: typeof ApplyPatchTool
-  batch: Tool.Info
-  task: typeof TaskTool
-  todowrite: typeof TodoWriteTool
-  question: typeof QuestionTool
-  read: typeof ReadTool
-  glob: typeof GlobTool
-  grep: typeof GrepTool
-  list: Tool.Info
-  lsp: typeof LspTool
-  webfetch: typeof WebFetchTool
-  websearch: typeof WebSearchTool
-  skill: typeof SkillTool
-  plan_exit: typeof PlanExitTool
-}
+type ToolName =
+  | "invalid"
+  | "bash"
+  | "write"
+  | "edit"
+  | "apply_patch"
+  | "batch"
+  | "task"
+  | "todowrite"
+  | "question"
+  | "read"
+  | "glob"
+  | "grep"
+  | "list"
+  | "lsp"
+  | "webfetch"
+  | "websearch"
+  | "skill"
+  | "plan_exit"
 
-type ToolName = keyof ToolDefs
-
-type ToolRule<T = Tool.Info> = {
+type ToolRule = {
   view: ToolView
-  run: (props: ToolProps<T>) => ToolInline
-  scroll?: Partial<Record<ToolPhase, (props: ToolProps<T>) => string>>
-  permission?: (props: ToolPermissionProps<T>) => ToolPermissionInfo
-  snap?: (props: ToolProps<T>) => ToolSnapshot | undefined
+  run: (props: ToolProps) => ToolInline
+  scroll?: Partial<Record<ToolPhase, (props: ToolProps) => string>>
+  permission?: (props: ToolPermissionProps) => ToolPermissionInfo
+  snap?: (props: ToolProps) => ToolSnapshot | undefined
 }
 
-type ToolRegistry = {
-  [K in ToolName]: ToolRule<ToolDefs[K]>
-}
+type ToolRegistry = Record<ToolName, ToolRule>
 
 type AnyToolRule = ToolRule
 
@@ -136,22 +154,28 @@ function dict(v: unknown): ToolDict {
   return { ...v }
 }
 
-function props<T = Tool.Info>(frame: ToolFrame): ToolProps<T> {
+function props(frame: ToolFrame): ToolProps {
   return {
-    input: Object.assign(Object.create(null), frame.input),
-    metadata: Object.assign(Object.create(null), frame.meta),
+    input: frame.input,
+    metadata: frame.meta,
     frame,
   }
 }
 
-function permission<T = Tool.Info>(ctx: ToolPermissionCtx): ToolPermissionProps<T> {
+function permission(ctx: ToolPermissionCtx): ToolPermissionProps {
   return {
-    input: Object.assign(Object.create(null), ctx.input),
-    metadata: Object.assign(Object.create(null), ctx.meta),
+    input: ctx.input,
+    metadata: ctx.meta,
     patterns: ctx.patterns,
   }
 }
 
+function webSearchProviderLabel(provider: unknown) {
+  if (provider === "parallel") return "Parallel Web Search"
+  if (provider === "exa") return "Exa Web Search"
+  return "Web Search"
+}
+
 function text(v: unknown): string {
   return typeof v === "string" ? v : ""
 }
@@ -285,7 +309,7 @@ function count(n: number, label: string): string {
   return `${n} ${label}${n === 1 ? "" : "es"}`
 }
 
-function runGlob(p: ToolProps<typeof GlobTool>): ToolInline {
+function runGlob(p: ToolProps): ToolInline {
   const root = p.input.path ?? ""
   const title = `Glob "${p.input.pattern ?? ""}"`
   const suffix = root ? `in ${toolPath(root)}` : ""
@@ -298,7 +322,7 @@ function runGlob(p: ToolProps<typeof GlobTool>): ToolInline {
   }
 }
 
-function runGrep(p: ToolProps<typeof GrepTool>): ToolInline {
+function runGrep(p: ToolProps): ToolInline {
   const root = p.input.path ?? ""
   const title = `Grep "${p.input.pattern ?? ""}"`
   const suffix = root ? `in ${toolPath(root)}` : ""
@@ -319,7 +343,7 @@ function runList(p: ToolProps): ToolInline {
   }
 }
 
-function runRead(p: ToolProps<typeof ReadTool>): ToolInline {
+function runRead(p: ToolProps): ToolInline {
   const file = toolPath(p.input.filePath)
   const description = info(p.frame.input, ["filePath"]) || undefined
   return {
@@ -329,7 +353,7 @@ function runRead(p: ToolProps<typeof ReadTool>): ToolInline {
   }
 }
 
-function runWrite(p: ToolProps<typeof WriteTool>): ToolInline {
+function runWrite(p: ToolProps): ToolInline {
   return {
     icon: "←",
     title: `Write ${toolPath(p.input.filePath)}`,
@@ -338,7 +362,7 @@ function runWrite(p: ToolProps<typeof WriteTool>): ToolInline {
   }
 }
 
-function runWebfetch(p: ToolProps<typeof WebFetchTool>): ToolInline {
+function runWebfetch(p: ToolProps): ToolInline {
   const url = p.input.url ?? ""
   return {
     icon: "%",
@@ -346,7 +370,7 @@ function runWebfetch(p: ToolProps<typeof WebFetchTool>): ToolInline {
   }
 }
 
-function runEdit(p: ToolProps<typeof EditTool>): ToolInline {
+function runEdit(p: ToolProps): ToolInline {
   return {
     icon: "←",
     title: `Edit ${toolPath(p.input.filePath)}`,
@@ -355,7 +379,7 @@ function runEdit(p: ToolProps<typeof EditTool>): ToolInline {
   }
 }
 
-function runWebSearch(p: ToolProps<typeof WebSearchTool>): ToolInline {
+function runWebSearch(p: ToolProps): ToolInline {
   const title = webSearchProviderLabel(p.metadata.provider)
   return {
     icon: "◈",
@@ -363,7 +387,7 @@ function runWebSearch(p: ToolProps<typeof WebSearchTool>): ToolInline {
   }
 }
 
-function runTask(p: ToolProps<typeof TaskTool>): ToolInline {
+function runTask(p: ToolProps): ToolInline {
   const kind = Locale.titlecase(p.input.subagent_type || "unknown")
   const desc = p.input.description
   const icon = p.frame.status === "error" ? "✗" : p.frame.status === "running" ? "•" : "✓"
@@ -374,7 +398,7 @@ function runTask(p: ToolProps<typeof TaskTool>): ToolInline {
   }
 }
 
-function runTodo(p: ToolProps<typeof TodoWriteTool>): ToolInline {
+function runTodo(p: ToolProps): ToolInline {
   return {
     icon: "#",
     title: "Todos",
@@ -393,14 +417,14 @@ function runTodo(p: ToolProps<typeof TodoWriteTool>): ToolInline {
   }
 }
 
-function runSkill(p: ToolProps<typeof SkillTool>): ToolInline {
+function runSkill(p: ToolProps): ToolInline {
   return {
     icon: "→",
     title: `Skill "${p.input.name ?? ""}"`,
   }
 }
 
-function runPatch(p: ToolProps<typeof ApplyPatchTool>): ToolInline {
+function runPatch(p: ToolProps): ToolInline {
   const files = p.metadata.files?.length ?? 0
   if (files === 0) {
     return {
@@ -415,7 +439,7 @@ function runPatch(p: ToolProps<typeof ApplyPatchTool>): ToolInline {
   }
 }
 
-function runQuestion(p: ToolProps<typeof QuestionTool>): ToolInline {
+function runQuestion(p: ToolProps): ToolInline {
   const total = list(p.frame.input.questions).length
   return {
     icon: "→",
@@ -423,7 +447,7 @@ function runQuestion(p: ToolProps<typeof QuestionTool>): ToolInline {
   }
 }
 
-function runInvalid(p: ToolProps<typeof InvalidTool>): ToolInline {
+function runInvalid(p: ToolProps): ToolInline {
   return {
     icon: "✗",
     title: text(p.frame.state.title) || "Invalid Tool",
@@ -463,14 +487,14 @@ function lspTitle(
   return `LSP ${op} ${file}${pos}`
 }
 
-function runLsp(p: ToolProps<typeof LspTool>): ToolInline {
+function runLsp(p: ToolProps): ToolInline {
   return {
     icon: "→",
     title: text(p.frame.state.title) || lspTitle(p.input),
   }
 }
 
-function runPlanExit(p: ToolProps<typeof PlanExitTool>): ToolInline {
+function runPlanExit(p: ToolProps): ToolInline {
   return {
     icon: "→",
     title: text(p.frame.state.title) || "Switching to build agent",
@@ -479,8 +503,6 @@ function runPlanExit(p: ToolProps<typeof PlanExitTool>): ToolInline {
   }
 }
 
-type PatchFile = Tool.InferMetadata<typeof ApplyPatchTool>["files"][number]
-
 function patchTitle(file: PatchFile): string {
   const rel = file.relativePath
   const from = file.filePath
@@ -497,7 +519,7 @@ function patchTitle(file: PatchFile): string {
   return `# Patched ${rel || toolPath(from)}`
 }
 
-function snapWrite(p: ToolProps<typeof WriteTool>): ToolSnapshot | undefined {
+function snapWrite(p: ToolProps): ToolSnapshot | undefined {
   const file = p.input.filePath || ""
   const content = p.input.content || ""
   if (!file && !content) {
@@ -512,7 +534,7 @@ function snapWrite(p: ToolProps<typeof WriteTool>): ToolSnapshot | undefined {
   }
 }
 
-function snapEdit(p: ToolProps<typeof EditTool>): ToolSnapshot | undefined {
+function snapEdit(p: ToolProps): ToolSnapshot | undefined {
   const file = p.input.filePath || ""
   const diff = p.metadata.diff || ""
   if (!file || !diff.trim()) {
@@ -531,7 +553,7 @@ function snapEdit(p: ToolProps<typeof EditTool>): ToolSnapshot | undefined {
   }
 }
 
-function snapPatch(p: ToolProps<typeof ApplyPatchTool>): ToolSnapshot | undefined {
+function snapPatch(p: ToolProps): ToolSnapshot | undefined {
   const files = list<PatchFile>(p.frame.meta.files)
   if (files.length === 0) {
     return undefined
@@ -568,7 +590,7 @@ function snapPatch(p: ToolProps<typeof ApplyPatchTool>): ToolSnapshot | undefine
   }
 }
 
-function snapTask(p: ToolProps<typeof TaskTool>): ToolSnapshot {
+function snapTask(p: ToolProps): ToolSnapshot {
   const kind = Locale.titlecase(p.input.subagent_type || "general")
   const desc = p.input.description
   const title = text(p.frame.state.title)
@@ -582,7 +604,7 @@ function snapTask(p: ToolProps<typeof TaskTool>): ToolSnapshot {
   }
 }
 
-function snapTodo(p: ToolProps<typeof TodoWriteTool>): ToolSnapshot {
+function snapTodo(p: ToolProps): ToolSnapshot {
   const items = list<{ status?: string; content?: string }>(p.frame.input.todos).flatMap((item) => {
     const content = typeof item?.content === "string" ? item.content : ""
     if (!content) {
@@ -604,7 +626,7 @@ function snapTodo(p: ToolProps<typeof TodoWriteTool>): ToolSnapshot {
   }
 }
 
-function snapQuestion(p: ToolProps<typeof QuestionTool>): ToolSnapshot {
+function snapQuestion(p: ToolProps): ToolSnapshot {
   const answers = list<unknown[]>(p.frame.meta.answers)
   const items = list<{ question?: string }>(p.frame.input.questions).map((item, i) => {
     const answer = list<string>(answers[i]).filter((entry) => typeof entry === "string")
@@ -621,7 +643,7 @@ function snapQuestion(p: ToolProps<typeof QuestionTool>): ToolSnapshot {
   }
 }
 
-function scrollBashStart(p: ToolProps<typeof BashTool>): string {
+function scrollBashStart(p: ToolProps): string {
   const cmd = p.input.command ?? ""
   const wd = p.input.workdir ?? ""
   const formatted = wd && wd !== "." ? toolPath(wd) : ""
@@ -637,7 +659,7 @@ function scrollBashStart(p: ToolProps<typeof BashTool>): string {
   return `# Running in ${dir}\n$ ${cmd}`
 }
 
-function scrollBashProgress(p: ToolProps<typeof BashTool>): string {
+function scrollBashProgress(p: ToolProps): string {
   const out = stripAnsi(p.frame.raw)
   const cmd = (p.input.command ?? "").trim()
   const fmt = (text: string) => {
@@ -670,7 +692,7 @@ function scrollBashProgress(p: ToolProps<typeof BashTool>): string {
   return fmt(out)
 }
 
-function scrollBashFinal(p: ToolProps<typeof BashTool>): string {
+function scrollBashFinal(p: ToolProps): string {
   if (p.frame.status === "error") {
     return fail(p.frame)
   }
@@ -688,22 +710,22 @@ function scrollBashFinal(p: ToolProps<typeof BashTool>): string {
   return `bash completed (exit ${code})${time ? ` · ${time}` : ""}`
 }
 
-function scrollReadStart(p: ToolProps<typeof ReadTool>): string {
+function scrollReadStart(p: ToolProps): string {
   const file = toolPath(p.input.filePath)
   const extra = info(p.frame.input, ["filePath"])
   const tail = extra ? ` ${extra}` : ""
   return `→ Read ${file}${tail}`.trim()
 }
 
-function scrollWriteStart(_: ToolProps<typeof WriteTool>): string {
+function scrollWriteStart(_: ToolProps): string {
   return ""
 }
 
-function scrollEditStart(_: ToolProps<typeof EditTool>): string {
+function scrollEditStart(_: ToolProps): string {
   return ""
 }
 
-function scrollPatchStart(_: ToolProps<typeof ApplyPatchTool>): string {
+function scrollPatchStart(_: ToolProps): string {
   return ""
 }
 
@@ -727,7 +749,7 @@ function patchLine(file: PatchFile): string {
   return `~ Patched ${rel || toolPath(from)}`
 }
 
-function scrollPatchFinal(p: ToolProps<typeof ApplyPatchTool>): string {
+function scrollPatchFinal(p: ToolProps): string {
   if (p.frame.status === "error") {
     return fail(p.frame)
   }
@@ -756,7 +778,7 @@ function scrollPatchFinal(p: ToolProps<typeof ApplyPatchTool>): string {
   return patchLine(files[0]!)
 }
 
-function scrollTaskStart(_: ToolProps<typeof TaskTool>): string {
+function scrollTaskStart(_: ToolProps): string {
   return ""
 }
 
@@ -778,7 +800,7 @@ function taskResult(output: string): string | undefined {
   return next || undefined
 }
 
-function scrollTaskFinal(p: ToolProps<typeof TaskTool>): string {
+function scrollTaskFinal(p: ToolProps): string {
   if (p.frame.status === "error") {
     return fail(p.frame)
   }
@@ -792,11 +814,11 @@ function scrollTaskFinal(p: ToolProps<typeof TaskTool>): string {
   return `# ${kind} Task\n${row}`
 }
 
-function scrollTodoStart(_: ToolProps<typeof TodoWriteTool>): string {
+function scrollTodoStart(_: ToolProps): string {
   return ""
 }
 
-function scrollTodoFinal(p: ToolProps<typeof TodoWriteTool>): string {
+function scrollTodoFinal(p: ToolProps): string {
   const items = list<{ status?: string }>(p.input.todos)
   const time = span(p.frame.state)
   if (items.length === 0) {
@@ -828,11 +850,11 @@ function scrollTodoFinal(p: ToolProps<typeof TodoWriteTool>): string {
   return tail.join(" · ")
 }
 
-function scrollQuestionStart(_: ToolProps<typeof QuestionTool>): string {
+function scrollQuestionStart(_: ToolProps): string {
   return ""
 }
 
-function scrollQuestionFinal(p: ToolProps<typeof QuestionTool>): string {
+function scrollQuestionFinal(p: ToolProps): string {
   const q = p.input.questions ?? []
   const a = p.metadata.answers ?? []
   const time = span(p.frame.state)
@@ -859,15 +881,15 @@ function scrollQuestionFinal(p: ToolProps<typeof QuestionTool>): string {
   return rows.join("\n")
 }
 
-function scrollLspStart(p: ToolProps<typeof LspTool>): string {
+function scrollLspStart(p: ToolProps): string {
   return `→ ${lspTitle(p.input)}`
 }
 
-function scrollSkillStart(p: ToolProps<typeof SkillTool>): string {
+function scrollSkillStart(p: ToolProps): string {
   return `→ Skill "${p.input.name ?? ""}"`
 }
 
-function scrollGlobStart(p: ToolProps<typeof GlobTool>): string {
+function scrollGlobStart(p: ToolProps): string {
   const pattern = p.input.pattern ?? ""
   const head = pattern ? `✱ Glob "${pattern}"` : "✱ Glob"
   const dir = p.input.path ?? ""
@@ -878,11 +900,11 @@ function scrollGlobStart(p: ToolProps<typeof GlobTool>): string {
   return `${head} in ${toolPath(dir)}`
 }
 
-function scrollGlobFinal(p: ToolProps<typeof GlobTool>): string {
+function scrollGlobFinal(p: ToolProps): string {
   return toolError(p.frame) || fail(p.frame)
 }
 
-function scrollGrepStart(p: ToolProps<typeof GrepTool>): string {
+function scrollGrepStart(p: ToolProps): string {
   const pattern = p.input.pattern ?? ""
   const head = pattern ? `✱ Grep "${pattern}"` : "✱ Grep"
   const dir = p.input.path ?? ""
@@ -902,7 +924,7 @@ function scrollListStart(p: ToolProps): string {
   return `→ List ${toolPath(dir)}`
 }
 
-function scrollWebfetchStart(p: ToolProps<typeof WebFetchTool>): string {
+function scrollWebfetchStart(p: ToolProps): string {
   const url = p.input.url ?? ""
   if (!url) {
     return "% WebFetch"
@@ -911,7 +933,7 @@ function scrollWebfetchStart(p: ToolProps<typeof WebFetchTool>): string {
   return `% WebFetch ${url}`
 }
 
-function scrollWebSearchStart(p: ToolProps<typeof WebSearchTool>): string {
+function scrollWebSearchStart(p: ToolProps): string {
   const title = webSearchProviderLabel(p.metadata.provider)
   const query = p.input.query ?? ""
   if (!query) {
@@ -921,7 +943,7 @@ function scrollWebSearchStart(p: ToolProps<typeof WebSearchTool>): string {
   return `◈ ${title} "${query}"`
 }
 
-function permEdit(p: ToolPermissionProps<typeof EditTool>): ToolPermissionInfo {
+function permEdit(p: ToolPermissionProps): ToolPermissionInfo {
   const input = p.input as { filePath?: string; filepath?: string; diff?: string }
   const file = input.filePath || input.filepath || p.patterns[0] || ""
   return {
@@ -933,7 +955,7 @@ function permEdit(p: ToolPermissionProps<typeof EditTool>): ToolPermissionInfo {
   }
 }
 
-function permRead(p: ToolPermissionProps<typeof ReadTool>): ToolPermissionInfo {
+function permRead(p: ToolPermissionProps): ToolPermissionInfo {
   const file = p.input.filePath || p.patterns[0] || ""
   return {
     icon: "→",
@@ -942,7 +964,7 @@ function permRead(p: ToolPermissionProps<typeof ReadTool>): ToolPermissionInfo {
   }
 }
 
-function permGlob(p: ToolPermissionProps<typeof GlobTool>): ToolPermissionInfo {
+function permGlob(p: ToolPermissionProps): ToolPermissionInfo {
   const pattern = p.input.pattern || p.patterns[0] || ""
   return {
     icon: "✱",
@@ -951,7 +973,7 @@ function permGlob(p: ToolPermissionProps<typeof GlobTool>): ToolPermissionInfo {
   }
 }
 
-function permGrep(p: ToolPermissionProps<typeof GrepTool>): ToolPermissionInfo {
+function permGrep(p: ToolPermissionProps): ToolPermissionInfo {
   const pattern = p.input.pattern || p.patterns[0] || ""
   return {
     icon: "✱",
@@ -969,7 +991,7 @@ function permList(p: ToolPermissionProps): ToolPermissionInfo {
   }
 }
 
-function permBash(p: ToolPermissionProps<typeof BashTool>): ToolPermissionInfo {
+function permBash(p: ToolPermissionProps): ToolPermissionInfo {
   const cmd = p.input.command || ""
   return {
     icon: "#",
@@ -978,7 +1000,7 @@ function permBash(p: ToolPermissionProps<typeof BashTool>): ToolPermissionInfo {
   }
 }
 
-function permTask(p: ToolPermissionProps<typeof TaskTool>): ToolPermissionInfo {
+function permTask(p: ToolPermissionProps): ToolPermissionInfo {
   const type = p.input.subagent_type || "general"
   const desc = p.input.description
   return {
@@ -988,7 +1010,7 @@ function permTask(p: ToolPermissionProps<typeof TaskTool>): ToolPermissionInfo {
   }
 }
 
-function permWebfetch(p: ToolPermissionProps<typeof WebFetchTool>): ToolPermissionInfo {
+function permWebfetch(p: ToolPermissionProps): ToolPermissionInfo {
   const url = p.input.url || ""
   return {
     icon: "%",
@@ -997,7 +1019,7 @@ function permWebfetch(p: ToolPermissionProps<typeof WebFetchTool>): ToolPermissi
   }
 }
 
-function permWebSearch(p: ToolPermissionProps<typeof WebSearchTool>): ToolPermissionInfo {
+function permWebSearch(p: ToolPermissionProps): ToolPermissionInfo {
   const query = p.input.query || ""
   const title = webSearchProviderLabel(p.metadata.provider)
   return {
@@ -1007,7 +1029,7 @@ function permWebSearch(p: ToolPermissionProps<typeof WebSearchTool>): ToolPermis
   }
 }
 
-function permLsp(p: ToolPermissionProps<typeof LspTool>): ToolPermissionInfo {
+function permLsp(p: ToolPermissionProps): ToolPermissionInfo {
   const file = p.input.filePath || ""
   const line = typeof p.input.line === "number" ? p.input.line : undefined
   const char = typeof p.input.character === "number" ? p.input.character : undefined
@@ -1273,7 +1295,7 @@ export function toolFrame(commit: StreamCommit, raw: string): ToolFrame {
   }
 }
 
-function runBash(p: ToolProps<typeof BashTool>): ToolInline {
+function runBash(p: ToolProps): ToolInline {
   return {
     icon: "$",
     title: p.input.command || "",
diff --git a/packages/opencode/src/cli/cmd/run/trace.ts b/packages/cli/src/mini/trace.ts
similarity index 100%
rename from packages/opencode/src/cli/cmd/run/trace.ts
rename to packages/cli/src/mini/trace.ts
diff --git a/packages/opencode/src/cli/cmd/run/turn-summary.ts b/packages/cli/src/mini/turn-summary.ts
similarity index 100%
rename from packages/opencode/src/cli/cmd/run/turn-summary.ts
rename to packages/cli/src/mini/turn-summary.ts
diff --git a/packages/opencode/src/cli/cmd/run/types.ts b/packages/cli/src/mini/types.ts
similarity index 90%
rename from packages/opencode/src/cli/cmd/run/types.ts
rename to packages/cli/src/mini/types.ts
index 2c489e2626..1077dc1c9f 100644
--- a/packages/opencode/src/cli/cmd/run/types.ts
+++ b/packages/cli/src/mini/types.ts
@@ -11,7 +11,8 @@
 //     → stream.ts bridges to footer API
 //       → footer.ts queues commits and patches the footer view
 //         → OpenTUI split-footer renderer writes to terminal
-import type { OpencodeClient, PermissionRequest, QuestionRequest, ToolPart } from "@opencode-ai/sdk/v2"
+import type { OpenCodeClient, ReferenceListOutput } from "@opencode-ai/client/promise"
+import type { FilePart, PermissionRequest, QuestionRequest, ToolPart } from "@opencode-ai/sdk/v2"
 import type { TuiConfig } from "@opencode-ai/tui/config"
 
 export type RunFilePart = {
@@ -21,10 +22,17 @@ export type RunFilePart = {
   mime: string
 }
 
-type PromptModel = Parameters<OpencodeClient["session"]["prompt"]>[0]["model"]
-type PromptInput = Parameters<OpencodeClient["session"]["prompt"]>[0]
+type PromptModel = { providerID: string; modelID: string }
 
-export type RunPromptPart = NonNullable<PromptInput["parts"]>[number]
+export type RunPromptPart =
+  | {
+      type: "file"
+      url: string
+      filename?: string
+      mime?: string
+      source?: FilePart["source"]
+    }
+  | { type: "agent"; name: string; source?: { start: number; end: number; value: string } }
 
 export type RunCommand = {
   name: string
@@ -111,12 +119,10 @@ export type RunAgent = {
   hidden: boolean
 }
 
-export type RunReference = NonNullable<
-  Awaited<ReturnType<OpencodeClient["v2"]["reference"]["list"]>>["data"]
->["data"][number]
+export type RunReference = ReferenceListOutput["data"][number]
 
 export type RunInput = {
-  sdk: OpencodeClient
+  sdk: OpenCodeClient
   directory: string
   sessionID: string
   sessionTitle?: string
@@ -282,6 +288,10 @@ export type FooterOutput = {
 // transport both emit these to update footer state without reaching into
 // internal signals directly.
 export type FooterEvent =
+  | {
+      type: "history"
+      history: RunPrompt[]
+    }
   | {
       type: "catalog"
       agents: RunAgent[]
@@ -342,11 +352,14 @@ export type FooterEvent =
       state: FooterSubagentState
     }
 
-export type PermissionReply = Parameters<OpencodeClient["permission"]["reply"]>[0]
+export type PermissionReply = Omit<Parameters<OpenCodeClient["permission"]["reply"]>[0], "sessionID">
 
-export type QuestionReply = Parameters<OpencodeClient["question"]["reply"]>[0]
+export type QuestionReply = {
+  requestID: string
+  answers: string[][]
+}
 
-export type QuestionReject = Parameters<OpencodeClient["question"]["reject"]>[0]
+export type QuestionReject = Omit<Parameters<OpenCodeClient["question"]["reject"]>[0], "sessionID">
 
 export type RunTuiConfig = Pick<TuiConfig.Resolved, "keybinds" | "leader_timeout" | "diff_style">
 
diff --git a/packages/cli/src/mini/ui.ts b/packages/cli/src/mini/ui.ts
new file mode 100644
index 0000000000..1caf2674fc
--- /dev/null
+++ b/packages/cli/src/mini/ui.ts
@@ -0,0 +1,27 @@
+import { EOL } from "node:os"
+
+export const Style = {
+  TEXT_DIM: "\x1b[90m",
+  TEXT_NORMAL: "\x1b[0m",
+  TEXT_WARNING_BOLD: "\x1b[93m\x1b[1m",
+  TEXT_DANGER_BOLD: "\x1b[91m\x1b[1m",
+}
+
+export function println(...message: string[]) {
+  process.stderr.write(message.join(" ") + EOL)
+}
+
+let blank = false
+
+export function empty() {
+  if (blank) return
+  println(Style.TEXT_NORMAL)
+  blank = true
+}
+
+export function error(message: string) {
+  if (message.startsWith("Error: ")) message = message.slice("Error: ".length)
+  println(Style.TEXT_DANGER_BOLD + "Error: " + Style.TEXT_NORMAL + message)
+}
+
+export * as UI from "./ui"
diff --git a/packages/opencode/src/cli/cmd/run/variant.shared.ts b/packages/cli/src/mini/variant.shared.ts
similarity index 96%
rename from packages/opencode/src/cli/cmd/run/variant.shared.ts
rename to packages/cli/src/mini/variant.shared.ts
index fa10af0055..196b4e040c 100644
--- a/packages/opencode/src/cli/cmd/run/variant.shared.ts
+++ b/packages/cli/src/mini/variant.shared.ts
@@ -12,9 +12,8 @@ import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { Context, Effect, Layer } from "effect"
 import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { makeGlobalNode } from "@opencode-ai/core/effect/app-node"
-import { makeRuntime } from "@/effect/run-service"
+import { makeRuntime } from "@opencode-ai/core/effect/runtime"
 import { Global } from "@opencode-ai/core/global"
-import { isRecord } from "@/util/record"
 import { createSession, sessionVariant, type RunSession, type SessionMessages } from "./session.shared"
 import type { RunInput, RunProvider } from "./types"
 
@@ -32,6 +31,10 @@ type VariantRuntime = {
   saveVariant(model: RunInput["model"], variant: string | undefined): Promise<void>
 }
 
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return !!value && typeof value === "object" && !Array.isArray(value)
+}
+
 class Service extends Context.Service<Service, VariantService>()("@opencode/RunVariant") {}
 
 function modelKey(provider: string, model: string): string {
diff --git a/packages/cli/src/server-process.ts b/packages/cli/src/server-process.ts
new file mode 100644
index 0000000000..6f3af1f060
--- /dev/null
+++ b/packages/cli/src/server-process.ts
@@ -0,0 +1,134 @@
+export * as ServerProcess from "./server-process"
+
+import { NodeServices } from "@effect/platform-node"
+import { Service } from "@opencode-ai/client/effect"
+import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
+import { LayerNode } from "@opencode-ai/core/effect/layer-node"
+import { Global } from "@opencode-ai/core/global"
+import { InstallationVersion } from "@opencode-ai/core/installation/version"
+import { AppProcess } from "@opencode-ai/core/process"
+import { Flock } from "@opencode-ai/core/util/flock"
+import { start } from "@opencode-ai/server/process"
+import { randomBytes, randomUUID } from "node:crypto"
+import path from "node:path"
+import { Effect, FileSystem, Logger, Option, Redacted, Schedule, Schema } from "effect"
+import { HttpServer } from "effect/unstable/http"
+import { Env } from "./env"
+import { ServiceConfig } from "./services/service-config"
+import { Updater } from "./services/updater"
+
+export type Mode = "default" | "service" | "stdio"
+
+export type Options = {
+  readonly mode: Mode
+  readonly hostname?: string
+  readonly port?: number
+}
+
+export const run = Effect.fn("cli.server-process.run")((options: Options) =>
+  processEffect(options).pipe(
+    Effect.provide(Updater.layer),
+    Effect.provide(AppNodeBuilder.build(LayerNode.group([Global.node, AppProcess.node]))),
+    Effect.provide(NodeServices.layer),
+  ),
+)
+
+const processEffect = Effect.fnUntraced(function* (options: Options) {
+  if (options.mode === "service") yield* Effect.sync(() => process.chdir(Global.Path.home))
+  return yield* Effect.scoped(
+    Effect.gen(function* () {
+      if (options.mode === "service") {
+        const service = yield* ServiceConfig.options()
+        yield* Flock.effect("service-process", {
+          dir: path.dirname(service.file),
+          staleMs: 3_000,
+          timeoutMs: 15_000,
+        })
+      }
+      const environmentPassword = yield* Env.password
+      // Keep the lease credential out of the environment inherited by tools.
+      if (options.mode === "stdio") {
+        delete process.env.OPENCODE_PASSWORD
+        delete process.env.OPENCODE_SERVER_PASSWORD
+      }
+      const config = options.mode === "service" ? yield* ServiceConfig.read() : {}
+      const password =
+        options.mode === "service"
+          ? yield* ServiceConfig.password()
+          : environmentPassword
+            ? Redacted.value(environmentPassword)
+            : randomBytes(32).toString("base64url")
+      if (!password) return yield* Effect.fail(new Error("Missing server password"))
+      const address = yield* start({
+        hostname: options.hostname ?? config.hostname ?? "127.0.0.1",
+        port: Option.fromNullishOr(options.port ?? config.port),
+        password,
+      }).pipe(Effect.provide(Logger.layer([], { mergeWithExisting: false })))
+      if (options.mode === "service") yield* register(address, password)
+      const url = HttpServer.formatAddress(address)
+      console.log(options.mode === "stdio" ? JSON.stringify({ url }) : `server listening on ${url}`)
+      if (options.mode === "default" && !environmentPassword) console.log(`server password ${password}`)
+      const updater = yield* Updater.Service
+      yield* updater.check().pipe(Effect.schedule(Schedule.spaced("10 minutes")), Effect.forkScoped)
+      return yield* options.mode === "stdio" ? waitForStdinClose() : Effect.never
+    }).pipe(Effect.annotateLogs({ role: "server" })),
+  )
+})
+
+// The latest atomic registration wins. A displaced process notices the new id,
+// exits, and cannot remove its successor's registration from its finalizer.
+const infoJson = Schema.fromJsonString(Service.Info)
+const encodeInfo = Schema.encodeEffect(infoJson)
+const decodeInfo = Schema.decodeUnknownEffect(infoJson)
+
+const register = Effect.fnUntraced(function* (address: HttpServer.Address, password: string) {
+  const fs = yield* FileSystem.FileSystem
+  const options = yield* ServiceConfig.options()
+  const id = randomUUID()
+  const temp = options.file + "." + id + ".tmp"
+  yield* fs.makeDirectory(path.dirname(options.file), { recursive: true })
+  const encoded = yield* encodeInfo({
+    id,
+    version: InstallationVersion,
+    url: HttpServer.formatAddress(address),
+    pid: process.pid,
+    password,
+  })
+  yield* fs.writeFileString(temp, encoded, { mode: 0o600 })
+  yield* fs.rename(temp, options.file)
+  const currentID = fs.readFileString(options.file).pipe(
+    Effect.flatMap(decodeInfo),
+    Effect.map((info) => info.id),
+    Effect.orElseSucceed(() => undefined),
+  )
+  yield* currentID.pipe(
+    Effect.flatMap((current) =>
+      current === id
+        ? Effect.void
+        : Effect.try({ try: () => process.kill(process.pid, "SIGTERM"), catch: (cause) => cause }).pipe(Effect.ignore),
+    ),
+    Effect.repeat(Schedule.spaced("10 seconds")),
+    Effect.forkScoped,
+  )
+  yield* Effect.addFinalizer(() =>
+    currentID.pipe(
+      Effect.flatMap((current) => (current === id ? fs.remove(options.file) : Effect.void)),
+      Effect.ignore,
+    ),
+  )
+})
+
+function waitForStdinClose() {
+  return Effect.callback<void>((resume) => {
+    const close = () => resume(Effect.void)
+    process.stdin.once("end", close)
+    process.stdin.once("close", close)
+    process.stdin.resume()
+    if (process.stdin.readableEnded || process.stdin.destroyed) close()
+    return Effect.sync(() => {
+      process.stdin.off("end", close)
+      process.stdin.off("close", close)
+      process.stdin.pause()
+    })
+  })
+}
diff --git a/packages/cli/src/services/standalone.ts b/packages/cli/src/services/standalone.ts
index 285a433b55..328eb0e302 100644
--- a/packages/cli/src/services/standalone.ts
+++ b/packages/cli/src/services/standalone.ts
@@ -9,11 +9,17 @@ import path from "node:path"
 const Ready = Schema.Struct({ url: Schema.String })
 const decodeReady = Schema.decodeUnknownPromise(Schema.fromJsonString(Ready))
 
-function command(password: string) {
+type Options = {
+  readonly command?: ReadonlyArray<string>
+}
+
+function command(password: string, options: Options) {
   const compiled = path.basename(process.execPath).replace(/\.exe$/, "") !== "bun"
   const entrypoint = compiled ? [] : process.argv[1] ? [process.argv[1]] : []
   if (!compiled && entrypoint.length === 0) throw new Error("Failed to resolve CLI entrypoint")
-  return ChildProcess.make(process.execPath, [...entrypoint, "serve", "--stdio", "--port", "0"], {
+  const [executable, ...args] = options.command ?? [process.execPath, ...entrypoint, "serve"]
+  if (!executable) throw new Error("Failed to resolve standalone server command")
+  return ChildProcess.make(executable, [...args, "--stdio", "--port", "0"], {
     cwd: process.cwd(),
     // Explicit entry wins over anything inherited, so a user-exported
     // OPENCODE_PASSWORD cannot shadow the child's lease credential.
@@ -28,11 +34,11 @@ function command(password: string) {
   })
 }
 
-export const transport = Effect.fn("cli.standalone.transport")(
-  function* () {
+const makeTransport = Effect.fn("cli.standalone.transport")(
+  function* (options: Options) {
     const password = randomBytes(32).toString("base64url")
     const spawner = yield* ChildProcessSpawner.ChildProcessSpawner
-    const proc = yield* spawner.spawn(command(password))
+    const proc = yield* spawner.spawn(command(password, options))
     const output = yield* proc.stdout.pipe(Stream.decodeText(), Stream.splitLines, Stream.take(1), Stream.mkString)
     if (!output) return yield* Effect.fail(new Error("Standalone server exited before reporting readiness"))
     const ready = yield* Effect.tryPromise(() => decodeReady(output))
@@ -41,4 +47,8 @@ export const transport = Effect.fn("cli.standalone.transport")(
   Effect.provide(AppNodeBuilder.build(CrossSpawnSpawner.node)),
 )
 
+export function transport(options: Options = {}) {
+  return makeTransport(options)
+}
+
 export * as Standalone from "./standalone"
diff --git a/packages/cli/test/mini.test.ts b/packages/cli/test/mini.test.ts
new file mode 100644
index 0000000000..95b74d2404
--- /dev/null
+++ b/packages/cli/test/mini.test.ts
@@ -0,0 +1,80 @@
+import { describe, expect, test } from "bun:test"
+import { mergeInteractiveInput, mergeNonInteractiveInput, pickRunModel } from "../src/mini"
+
+async function cli(args: string[]) {
+  const child = Bun.spawn([process.execPath, "run", "src/index.ts", ...args], {
+    cwd: new URL("..", import.meta.url).pathname,
+    stdout: "pipe",
+    stderr: "pipe",
+  })
+  const [stdout, stderr, exitCode] = await Promise.all([
+    new Response(child.stdout).text(),
+    new Response(child.stderr).text(),
+    child.exited,
+  ])
+  return { stdout, stderr, exitCode }
+}
+
+describe("mini command", () => {
+  test("uses piped stdin as the initial prompt", () => {
+    expect(mergeInteractiveInput("from stdin", undefined)).toBe("from stdin")
+    expect(mergeInteractiveInput("from stdin", "from flag")).toBe("from stdin\nfrom flag")
+  })
+
+  test("keeps run as mini's non-interactive input mode", () => {
+    expect(mergeNonInteractiveInput("from args", "from stdin")).toBe("from args\nfrom stdin")
+    expect(mergeNonInteractiveInput(undefined, "from stdin")).toBe("from stdin")
+  })
+
+  test("applies a variant to a resumed session's model", () => {
+    expect(
+      pickRunModel(
+        undefined,
+        "high",
+        { providerID: "session-provider", modelID: "session-model" },
+        { providerID: "default-provider", modelID: "default-model" },
+      ),
+    ).toEqual({ providerID: "session-provider", modelID: "session-model" })
+  })
+
+  test("is registered in the preview CLI", async () => {
+    const result = await cli(["--help"])
+
+    expect(result.exitCode).toBe(0)
+    expect(result.stdout).toContain("mini       Start the minimal interactive interface")
+    expect(result.stdout).toContain("run        Run OpenCode with a message")
+  })
+
+  test("exposes run without legacy attach or command modes", async () => {
+    const result = await cli(["run", "--help"])
+
+    expect(result.exitCode).toBe(0)
+    expect(result.stdout).toContain("--server string")
+    expect(result.stdout).not.toContain("--attach")
+    expect(result.stdout).not.toContain("--command")
+  })
+
+  test("keeps option-like prompt text after the argument separator", async () => {
+    const result = await cli(["run", "--server", "http://127.0.0.1:1", "--", "--foo"])
+
+    expect(result.exitCode).toBe(1)
+    expect(result.stderr).not.toContain("You must provide a message")
+  })
+
+  test("uses the shared V2 server option instead of an attach command", async () => {
+    const result = await cli(["mini", "--help"])
+
+    expect(result.exitCode).toBe(0)
+    expect(result.stdout).toContain("--server string")
+    expect(result.stdout).not.toContain("SUBCOMMANDS")
+  })
+
+  test("routes local and explicit-server invocations into mini", async () => {
+    for (const args of [["mini"], ["mini", "--server", "http://127.0.0.1:1"]]) {
+      const result = await cli(args)
+
+      expect(result.exitCode).toBe(1)
+      expect(result.stderr).toContain("opencode mini requires a TTY stdout")
+    }
+  })
+})
diff --git a/packages/client/src/effect/service.ts b/packages/client/src/effect/service.ts
index ca428f5aa6..03e9c07237 100644
--- a/packages/client/src/effect/service.ts
+++ b/packages/client/src/effect/service.ts
@@ -31,11 +31,14 @@ export type Options = {
 // Read-only lookup: registration file plus health check and version gate.
 // Never spawns; escalation to start() is the caller's policy.
 export const discover = Effect.fn("service.discover")(function* (options: Options = {}) {
+  return (yield* discoverLocal(options))?.transport
+})
+
+const discoverLocal = Effect.fnUntraced(function* (options: Options) {
   const info = yield* read(options.file)
   if (info === undefined) return undefined
   if (options.version !== undefined && info.version !== options.version) return undefined
-  const found = yield* probe(info)
-  return found?.transport
+  return yield* probe(info, options.version)
 })
 
 // Idempotent ensure-running: reuses a healthy compatible server, replaces a
@@ -48,18 +51,29 @@ export const start = Effect.fn("service.start")(function* (options: Options = {}
 
   const [command, ...args] = options.command ?? ["opencode", "serve", "--service"]
   if (command === undefined) return yield* Effect.fail(new Error("Missing service command"))
-  yield* Effect.try({
+  const child = yield* Effect.try({
     try: () => {
-      spawn(command, args, { detached: true, stdio: "ignore" }).unref()
+      const child = spawn(command, args, { detached: true, stdio: "ignore" })
+      child.unref()
+      return child
     },
     catch: (cause) => new Error("Failed to start server", { cause }),
   })
 
-  return yield* discover(options).pipe(
+  return yield* discoverLocal(options).pipe(
     Effect.flatMap((found) =>
       found === undefined ? Effect.fail(new Error("Server is not ready")) : Effect.succeed(found),
     ),
     Effect.retry(poll),
+    Effect.tap((found) =>
+      found.info.pid === child.pid
+        ? Effect.void
+        : Effect.sync(() => {
+            child.kill("SIGTERM")
+          }),
+    ),
+    Effect.map((found) => found.transport),
+    Effect.tapError(() => Effect.try({ try: () => child.kill("SIGTERM"), catch: () => undefined }).pipe(Effect.ignore)),
     Effect.mapError(() => new Error("Failed to start server")),
   )
 })
@@ -90,6 +104,9 @@ export const Info = Schema.Struct({
 export type Info = typeof Info.Type
 
 const decode = Schema.decodeUnknownEffect(Schema.fromJsonString(Info))
+const decodeHealth = Schema.decodeUnknownEffect(
+  Schema.Struct({ healthy: Schema.Literal(true), version: Schema.String, pid: Schema.Int }),
+)
 
 // A missing or corrupt file means no valid info; callers treat both
 // the same (the registering server self-evicts, clients rediscover).
@@ -105,18 +122,23 @@ type LocalService = {
   readonly transport: Transport
 }
 
-const probe = Effect.fnUntraced(function* (info: Info) {
+const probe = Effect.fnUntraced(function* (info: Info, version?: string) {
   const headers = info.password === undefined ? undefined : auth(info.password)
-  const healthy = yield* Effect.tryPromise(() =>
+  const response = yield* Effect.tryPromise(() =>
     fetch(new URL("/api/health", info.url), {
       headers,
       signal: AbortSignal.timeout(2_000),
     }),
-  ).pipe(
-    Effect.map((response) => response.ok),
-    Effect.orElseSucceed(() => false),
+  ).pipe(Effect.option, Effect.map(Option.getOrUndefined))
+  if (response === undefined || !response.ok) return undefined
+  const health = yield* Effect.tryPromise(() => response.json()).pipe(
+    Effect.flatMap(decodeHealth),
+    Effect.option,
+    Effect.map(Option.getOrUndefined),
   )
-  if (!healthy) return undefined
+  if (health?.pid !== info.pid) return undefined
+  if (info.version !== undefined && health.version !== info.version) return undefined
+  if (version !== undefined && health.version !== version) return undefined
   return { info, transport: { url: info.url, headers } } satisfies LocalService
 })
 
diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts
index ac30f3c35c..ac0efadb5c 100644
--- a/packages/client/src/promise/generated/types.ts
+++ b/packages/client/src/promise/generated/types.ts
@@ -157,7 +157,7 @@ export type ProjectCopyError = {
 export const isProjectCopyError = (value: unknown): value is ProjectCopyError =>
   typeof value === "object" && value !== null && "name" in value && value["name"] === "ProjectCopyError"
 
-export type HealthGetOutput = { readonly healthy: true }
+export type HealthGetOutput = { readonly healthy: true; readonly version: string; readonly pid: number }
 
 export type LocationGetInput = {
   readonly location?: {
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index 651e426336..bea2dc5973 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -85,6 +85,7 @@
     "@octokit/rest": "catalog:",
     "@openauthjs/openauth": "catalog:",
     "@opencode-ai/client": "workspace:*",
+    "@opencode-ai/cli": "workspace:*",
     "@opencode-ai/llm": "workspace:*",
     "@opencode-ai/plugin": "workspace:*",
     "@opencode-ai/protocol": "workspace:*",
diff --git a/packages/opencode/src/cli/cmd/mini.ts b/packages/opencode/src/cli/cmd/mini.ts
deleted file mode 100644
index 96faa2e88e..0000000000
--- a/packages/opencode/src/cli/cmd/mini.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-import type { Argv } from "yargs"
-import { cmd } from "./cmd"
-import { UI } from "@/cli/ui"
-import { resolveThreadDirectory } from "./tui"
-
-type ReplayArgs = {
-  replay?: boolean
-  noReplay?: boolean
-}
-
-type MiniArgs = ReplayArgs & {
-  continue?: boolean
-  session?: string
-  fork?: boolean
-  replayLimit?: number
-}
-
-type MiniLocalArgs = MiniArgs & {
-  project?: string
-  model?: string
-  agent?: string
-  prompt?: string
-  demo?: boolean
-}
-
-type MiniAttachArgs = MiniArgs & {
-  url: string
-  dir?: string
-  password?: string
-  username?: string
-}
-
-function replay(args: ReplayArgs) {
-  if (args.replay === true) {
-    UI.error("--replay is not supported; replay is enabled by default")
-    process.exitCode = 1
-    return "invalid" as const
-  }
-  return args.replay === false || args.noReplay === true ? false : undefined
-}
-
-function miniOptions<T>(yargs: Argv<T>) {
-  return yargs
-    .option("continue", {
-      alias: ["c"],
-      describe: "continue the last session",
-      type: "boolean",
-    })
-    .option("session", {
-      alias: ["s"],
-      describe: "session id to continue",
-      type: "string",
-    })
-    .option("fork", {
-      type: "boolean",
-      describe: "fork the session when continuing (use with --continue or --session)",
-    })
-    .option("replay", {
-      type: "boolean",
-      hidden: true,
-    })
-    .option("no-replay", {
-      type: "boolean",
-      describe: "disable session history replay on resume and after resize",
-    })
-    .option("replay-limit", {
-      type: "number",
-      describe: "cap visible replay to the newest N messages",
-    })
-}
-
-/** @internal Exported for CLI parser tests. */
-export const MiniLocalCommand = cmd<{}, MiniLocalArgs>({
-  command: "$0 [project]",
-  describe: "start the minimal interactive interface",
-  builder: (yargs) =>
-    miniOptions(
-      yargs
-        .positional("project", {
-          type: "string",
-          describe: "path to start opencode in",
-        })
-        .option("model", {
-          type: "string",
-          alias: ["m"],
-          describe: "model to use in the format of provider/model",
-        })
-        .option("agent", {
-          type: "string",
-          describe: "agent to use",
-        })
-        .option("prompt", {
-          type: "string",
-          describe: "prompt to use",
-        })
-        .option("demo", {
-          type: "boolean",
-          hidden: true,
-        }),
-    ),
-  handler: async (args) => {
-    const shouldReplay = replay(args)
-    if (shouldReplay === "invalid") return
-
-    const { runMini } = await import("./run")
-    await runMini({
-      directory: resolveThreadDirectory(args.project),
-      continue: args.continue,
-      session: args.session,
-      fork: args.fork,
-      model: args.model,
-      agent: args.agent,
-      prompt: args.prompt,
-      replay: shouldReplay,
-      replayLimit: args.replayLimit,
-      demo: args.demo,
-    })
-  },
-})
-
-/** @internal Exported for CLI parser tests. */
-export const MiniAttachCommand = cmd<{}, MiniAttachArgs>({
-  command: "attach <url>",
-  describe: "attach to a running opencode server with the minimal interface",
-  builder: (yargs) =>
-    miniOptions(
-      yargs
-        .positional("url", {
-          type: "string",
-          describe: "http://localhost:4096",
-          demandOption: true,
-        })
-        .option("dir", {
-          type: "string",
-          describe: "directory on the remote server",
-        })
-        .option("password", {
-          alias: ["p"],
-          type: "string",
-          describe: "basic auth password (defaults to OPENCODE_SERVER_PASSWORD)",
-        })
-        .option("username", {
-          alias: ["u"],
-          type: "string",
-          describe: "basic auth username (defaults to OPENCODE_SERVER_USERNAME or 'opencode')",
-        }),
-    ),
-  handler: async (args) => {
-    const shouldReplay = replay(args)
-    if (shouldReplay === "invalid") return
-
-    const { runMini } = await import("./run")
-    await runMini({
-      attach: args.url,
-      directory: args.dir,
-      password: args.password,
-      username: args.username,
-      continue: args.continue,
-      session: args.session,
-      fork: args.fork,
-      replay: shouldReplay,
-      replayLimit: args.replayLimit,
-    })
-  },
-})
-
-export const MiniCommand = cmd({
-  command: "mini",
-  describe: "start the minimal interactive interface",
-  builder: (yargs) => yargs.command(MiniLocalCommand).command(MiniAttachCommand).demandCommand(),
-  handler: async () => {},
-})
diff --git a/packages/opencode/src/cli/cmd/run.ts b/packages/opencode/src/cli/cmd/run.ts
index f56775e26c..2021aadadd 100644
--- a/packages/opencode/src/cli/cmd/run.ts
+++ b/packages/opencode/src/cli/cmd/run.ts
@@ -1,149 +1,12 @@
-import type { PermissionV1 } from "@opencode-ai/core/v1/permission"
-import { FSUtil } from "@opencode-ai/core/fs-util"
-// CLI entry point for `opencode run` and `opencode mini`.
-//
-// Handles three modes:
-//   1. Non-interactive (default): sends a single prompt, streams events to
-//      stdout, and exits when the session goes idle.
-//   2. Interactive local (`opencode mini`): boots the split-footer direct mode
-//      with an in-process server (no external HTTP).
-//   3. Interactive attach (`opencode mini attach`): connects to a running
-//      opencode server and runs interactive mode against it.
-//
-// Also supports `--command` for slash-command execution, `--format json` for
-// raw event streaming, `--continue` / `--session` for session resumption,
-// and `--fork` for forking before continuing.
-import type { Argv } from "yargs"
-import path from "path"
-import { pathToFileURL } from "url"
-import { open } from "node:fs/promises"
 import { Effect } from "effect"
-import { UI } from "../ui"
 import { effectCmd } from "../effect-cmd"
-import { EOL } from "os"
-import { Filesystem } from "@/util/filesystem"
-import { createOpencodeClient, type OpencodeClient, type ToolPart } from "@opencode-ai/sdk/v2"
-import { FormatError, FormatUnknownError } from "../error"
-import { INTERACTIVE_INPUT_ERROR, resolveInteractiveStdin } from "./run/runtime.stdin"
-import { isImageAttachment, isPdfAttachment } from "@/util/media"
-import { loadRunAgents, waitForCatalogReady } from "./run/catalog.shared"
-
-type ModelInput = Parameters<OpencodeClient["session"]["prompt"]>[0]["model"]
-
-function pick(value: string | undefined): ModelInput | undefined {
-  if (!value) return undefined
-  const [providerID, ...rest] = value.split("/")
-  return {
-    providerID,
-    modelID: rest.join("/"),
-  } as ModelInput
-}
-
-function resolveRunInput(value?: string, piped?: string): string | undefined {
-  if (!value) {
-    return piped
-  }
-
-  if (!piped) {
-    return value
-  }
-
-  return value + "\n" + piped
-}
-
-function isBinaryContent(bytes: Uint8Array) {
-  if (bytes.length === 0) return false
-  if (bytes.includes(0)) return true
-  return (
-    bytes.reduce((count, byte) => count + Number(byte < 9 || (byte > 13 && byte < 32)), 0) / bytes.length > 0.3
-  )
-}
-
-type FilePart = {
-  type: "file"
-  url: string
-  filename: string
-  mime: string
-}
-
-const ATTACH_FILE_MAX_BYTES = 10 * 1024 * 1024
-
-type Inline = {
-  icon: string
-  title: string
-  description?: string
-}
-
-type SessionInfo = {
-  id: string
-  title?: string
-  directory?: string
-  current?: boolean
-}
-
-function inline(info: Inline) {
-  const suffix = info.description ? UI.Style.TEXT_DIM + ` ${info.description}` + UI.Style.TEXT_NORMAL : ""
-  UI.println(UI.Style.TEXT_NORMAL + info.icon, UI.Style.TEXT_NORMAL + info.title + suffix)
-}
-
-function block(info: Inline, output?: string) {
-  UI.empty()
-  inline(info)
-  if (!output?.trim()) return
-  UI.println(output)
-  UI.empty()
-}
-
-function formatRunError(error: unknown) {
-  return FormatError(error) ?? FormatUnknownError(error)
-}
-
-async function tool(part: ToolPart) {
-  try {
-    const { toolInlineInfo } = await import("./run/tool")
-    const next = toolInlineInfo(part)
-    if (next.mode === "block") {
-      block(next, next.body)
-      return
-    }
-
-    inline(next)
-  } catch {
-    inline({
-      icon: "\u2699",
-      title: part.tool,
-    })
-  }
-}
-
-async function toolError(part: ToolPart) {
-  try {
-    const { toolInlineInfo } = await import("./run/tool")
-    const next = toolInlineInfo(part)
-    inline({
-      icon: "✗",
-      title: `${next.title} failed`,
-      ...(next.description && { description: next.description }),
-    })
-    return
-  } catch {
-    inline({
-      icon: "✗",
-      title: `${part.tool} failed`,
-    })
-  }
-}
+import { v2ServerCommand } from "./v2-server-command"
 
 export const RunCommand = effectCmd({
   command: "run [message..]",
   describe: "run opencode with a message",
-  // --attach connects to a remote server (no local instance needed); the
-  // default path runs an in-process server and needs the project instance.
-  instance: (args) => !args.attach,
-  // For --dir without --attach, load instance for the resolved target dir.
-  // The handler also chdirs (preserving the legacy order: chdir → file resolution).
-  directory: (args) => (args.dir && !args.attach ? path.resolve(process.cwd(), args.dir) : process.cwd()),
-  builder: (yargs: Argv) =>
+  instance: false,
+  builder: (yargs) =>
     yargs
       .positional("message", {
         describe: "message to send",
@@ -151,10 +14,6 @@ export const RunCommand = effectCmd({
         array: true,
         default: [],
       })
-      .option("command", {
-        describe: "the command to run, use message for args",
-        type: "string",
-      })
       .option("continue", {
         alias: ["c"],
         describe: "continue the last session",
@@ -180,8 +39,8 @@ export const RunCommand = effectCmd({
       })
       .option("format", {
         type: "string",
-        choices: ["default", "json"],
-        default: "default",
+        choices: ["default", "json"] as const,
+        default: "default" as const,
         describe: "format: default (formatted) or json (raw JSON events)",
       })
       .option("file", {
@@ -194,53 +53,36 @@ export const RunCommand = effectCmd({
         type: "string",
         describe: "title for the session (uses truncated prompt if no value provided)",
       })
+      .option("server", {
+        type: "string",
+        describe: "connect to a running opencode server",
+      })
       .option("attach", {
         type: "string",
-        describe: "attach to a running opencode server (e.g., http://localhost:4096)",
+        hidden: true,
       })
       .option("password", {
         alias: ["p"],
         type: "string",
-        describe: "basic auth password (defaults to OPENCODE_SERVER_PASSWORD)",
+        hidden: true,
       })
       .option("username", {
         alias: ["u"],
         type: "string",
-        describe: "basic auth username (defaults to OPENCODE_SERVER_USERNAME or 'opencode')",
+        hidden: true,
       })
       .option("dir", {
         type: "string",
-        describe: "directory to run in, path on remote server if attaching",
-      })
-      .option("port", {
-        type: "number",
-        describe: "port for the local server (defaults to random port if no value provided)",
+        describe: "directory to run in, or a path on the remote server",
       })
       .option("variant", {
         type: "string",
-        describe: "model variant (provider-specific reasoning effort, e.g., high, max, minimal)",
+        describe: "model variant",
       })
       .option("thinking", {
         type: "boolean",
         describe: "show thinking blocks",
       })
-      .option("replay", {
-        type: "boolean",
-        default: true,
-        hidden: true,
-        describe: "replay interactive session history on resume and after resize (use --no-replay to disable)",
-      })
-      .option("replay-limit", {
-        type: "number",
-        hidden: true,
-        describe: "cap visible interactive replay to the newest N messages",
-      })
-      .option("interactive", {
-        alias: ["i"],
-        type: "boolean",
-        describe: "run in direct interactive split-footer mode",
-        default: false,
-      })
       .option("auto", {
         type: "boolean",
         describe: "auto-approve permissions that are not explicitly denied (dangerous!)",
@@ -255,899 +97,29 @@ export const RunCommand = effectCmd({
         type: "boolean",
         hidden: true,
         default: false,
-      })
-      .option("demo", {
-        type: "boolean",
-        default: false,
-        hidden: true,
-        describe: "enable direct interactive demo slash commands; pass one as the message to run it immediately",
       }),
   handler: Effect.fn("Cli.run")(function* (args) {
-    const { Agent } = yield* Effect.promise(() => import("@/agent/agent"))
-    const { RuntimeFlags } = yield* Effect.promise(() => import("@/effect/runtime-flags"))
-    const { InstanceRef } = yield* Effect.promise(() => import("@/effect/instance-ref"))
-    const { ServerAuth } = yield* Effect.promise(() => import("@/server/auth"))
-    const agentSvc = yield* Agent.Service
-    const flags = yield* RuntimeFlags.Service
-    const localInstance = yield* InstanceRef
-    yield* Effect.promise(async () => {
-      const rawMessage = [...args.message, ...(args["--"] || [])].join(" ")
-      const interactive = (args as typeof args & { mini?: boolean }).mini === true
-      const auto = args.auto || args.yolo || args["dangerously-skip-permissions"]
-      const thinking = interactive ? (args.thinking ?? true) : (args.thinking ?? false)
-      const die = (message: string): never => {
-        UI.error(message)
-        process.exit(1)
-      }
-      const dieInteractive = (error: unknown): never => {
-        if (error instanceof Error && error.message === INTERACTIVE_INPUT_ERROR) {
-          die(error.message)
-        }
-
-        throw error
-      }
-
-      let message = [...args.message, ...(args["--"] || [])]
-        .map((arg) => (arg.includes(" ") ? `"${arg.replace(/"/g, '\\"')}"` : arg))
-        .join(" ")
-
-      if (interactive && args.command) {
-        die("opencode mini cannot be used with --command")
-      }
-
-      if (interactive && args._?.[0] !== "mini") {
-        die("opencode mini must be run with the mini command")
-      }
-
-      if (args.demo && !interactive) {
-        die("--demo requires opencode mini")
-      }
-
-      if (interactive && args.format === "json") {
-        die("opencode mini cannot be used with --format json")
-      }
-
-      if (args["replay-limit"] !== undefined && !interactive) {
-        die("--replay-limit requires opencode mini")
-      }
-
-      if (
-        args["replay-limit"] !== undefined &&
-        (!Number.isInteger(args["replay-limit"]) || args["replay-limit"] <= 0)
-      ) {
-        die("--replay-limit must be a positive integer")
-      }
-
-      if (interactive && !process.stdout.isTTY) {
-        die("opencode mini requires a TTY stdout")
-      }
-
-      if (interactive) {
-        try {
-          resolveInteractiveStdin().cleanup?.()
-        } catch (error) {
-          dieInteractive(error)
-        }
-      }
-
-      const replay = args.replay === false ? false : args.replay || args["replay-limit"] !== undefined
-
-      const root = Filesystem.resolve(process.env.PWD ?? process.cwd())
-      const directory = (() => {
-        if (!args.dir) return args.attach ? undefined : root
-        if (args.attach) return args.dir
-
-        try {
-          process.chdir(path.isAbsolute(args.dir) ? args.dir : path.join(root, args.dir))
-          return process.cwd()
-        } catch {
-          UI.error("Failed to change directory to " + args.dir)
-          process.exit(1)
-        }
-      })()
-      const attachHeaders = args.attach
-        ? ServerAuth.headers({ password: args.password, username: args.username })
-        : undefined
-      const attachSDK = (dir?: string) => {
-        return createOpencodeClient({
-          baseUrl: args.attach!,
-          directory: dir,
-          headers: attachHeaders,
-        })
-      }
-
-      const files: FilePart[] = []
-      const fileInputs: Array<{
-        filePath: string
-        resolvedPath: string
-        stat: ReturnType<typeof Filesystem.stat>
-        isDirectory: boolean
-      }> = []
-      if (args.file) {
-        const list = Array.isArray(args.file) ? args.file : [args.file]
-
-        for (const filePath of list) {
-          const resolvedPath = path.resolve(args.attach ? root : (directory ?? root), filePath)
-          if (!(await Filesystem.exists(resolvedPath))) {
-            UI.error(`File not found: ${filePath}`)
-            process.exit(1)
-          }
-
-          const stat = Filesystem.stat(resolvedPath)
-          const isDirectory = stat?.isDirectory() ?? false
-          if (args.attach && isDirectory) {
-            UI.error(`Cannot attach local directory without a shared filesystem: ${filePath}`)
-            process.exit(1)
-          }
-          fileInputs.push({ filePath, resolvedPath, stat, isDirectory })
-        }
-      }
-
-      const piped = process.stdin.isTTY ? undefined : await Bun.stdin.text()
-      message = resolveRunInput(message, piped) ?? ""
-      const initialInput = resolveRunInput(rawMessage, piped)
-
-      if (message.trim().length === 0 && !args.command && !interactive) {
-        UI.error("You must provide a message or a command")
-        process.exit(1)
-      }
-
-      if (args.fork && !args.continue && !args.session) {
-        UI.error("--fork requires --continue or --session")
-        process.exit(1)
-      }
-
-      const rules: PermissionV1.Ruleset = interactive
-        ? []
-        : [
-          {
-            permission: "question",
-            action: "deny",
-            pattern: "*",
-          },
-          {
-            permission: "plan_enter",
-            action: "deny",
-            pattern: "*",
-          },
-          {
-            permission: "plan_exit",
-            action: "deny",
-            pattern: "*",
-          },
-        ]
-      const currentPrompt = !interactive && !args.command && fileInputs.every((file) => !file.isDirectory)
-
-      const inlineFiles = interactive || currentPrompt
-      for (const file of fileInputs) {
-        const content = await (async () => {
-          if (file.isDirectory || !inlineFiles) return
-          if (!file.stat?.isFile() || file.stat.size > ATTACH_FILE_MAX_BYTES) {
-            UI.error(`Cannot attach local file larger than 10 MiB or a special file: ${file.filePath}`)
-            process.exit(1)
-          }
-          const handle = await open(file.resolvedPath, "r")
-          try {
-            const opened = await handle.stat()
-            if (!opened.isFile() || Number(opened.size) > ATTACH_FILE_MAX_BYTES) {
-              UI.error(`Cannot attach local file larger than 10 MiB or a special file: ${file.filePath}`)
-              process.exit(1)
-            }
-            if (opened.size === 0) return Buffer.alloc(0)
-            const buffer = Buffer.alloc(Number(opened.size))
-            let offset = 0
-            while (offset < buffer.length) {
-              const read = await handle.read(buffer, offset, buffer.length - offset, offset)
-              if (read.bytesRead === 0) break
-              offset += read.bytesRead
-            }
-            return buffer.subarray(0, offset)
-          } finally {
-            await handle.close()
-          }
-        })()
-        const detected = FSUtil.mimeType(file.resolvedPath)
-        const text = content?.toString("utf8")
-        const mime = file.isDirectory
-          ? "application/x-directory"
-          : isImageAttachment(detected) || isPdfAttachment(detected)
-            ? detected
-            : content && !isBinaryContent(content) && text !== undefined && Buffer.from(text, "utf8").equals(content)
-              ? "text/plain"
-              : detected
-
-        files.push({
-          type: "file",
-          url: content ? `data:${mime};base64,${content.toString("base64")}` : pathToFileURL(file.resolvedPath).href,
-          filename: path.basename(file.resolvedPath),
-          mime,
-        })
-      }
-
-      function title() {
-        if (args.title === undefined) return
-        if (args.title !== "") return args.title
-        return message.slice(0, 50) + (message.length > 50 ? "..." : "")
-      }
-
-      async function currentSession(sdk: OpencodeClient, sessionID: string): Promise<SessionInfo | undefined> {
-        const listed = await sdk.v2.session
-          .list({
-            directory: await current(sdk),
-            limit: 50,
-            order: "desc",
-          })
-          .then((result) => result.data?.data.find((item) => item.id === sessionID))
-          .catch(() => undefined)
-        const selected =
-          listed ??
-          (await sdk.v2.session
-            .get({ sessionID })
-            .then((result) => result.data?.data)
-            .catch(() => undefined))
-        const legacy =
-          selected ??
-          (await sdk.session
-            .get({ sessionID })
-            .then((result) => result.data)
-            .catch(() => undefined))
-        const transcript = await transcriptKind(sdk, legacy?.id ?? sessionID)
-        if (!legacy && transcript === "empty") {
-          return
-        }
-        if (interactive && transcript === "legacy") {
-          throw new Error("Mini cannot resume a legacy Session transcript")
-        }
-
-        return {
-          id: legacy?.id ?? sessionID,
-          title: legacy?.title,
-          directory: legacy ? ("location" in legacy ? legacy.location.directory : legacy.directory) : await current(sdk),
-          current: transcript !== "legacy",
-        }
-      }
-
-      async function forkSession(sdk: OpencodeClient, session: SessionInfo): Promise<SessionInfo | undefined> {
-        if (session.current !== false) {
-          const forked = await sdk.v2.session.fork(
-            { sessionID: session.id, messageID: undefined },
-            { throwOnError: true },
-          )
-          await waitForFork(sdk, session.id, forked.data.data.id)
-          return {
-            id: forked.data.data.id,
-            title: forked.data.data.title,
-            directory: forked.data.data.location.directory,
-            current: true,
-          }
-        }
-
-        const forked = await sdk.session.fork({
-          sessionID: session.id,
-        })
-        const id = forked.data?.id
-        if (!id) {
-          return
-        }
-
-        return {
-          id,
-          title: forked.data?.title ?? session.title,
-          directory: forked.data?.directory ?? session.directory,
-          current: false,
-        }
-      }
-
-      async function waitForFork(sdk: OpencodeClient, parentID: string, sessionID: string) {
-        const parentHasMessages = await sdk.v2.session
-          .messages({ sessionID: parentID, limit: 1 })
-          .then((result) => (result.data?.data.length ?? 0) > 0)
-          .catch(() => false)
-        if (!parentHasMessages) {
-          return
-        }
-
-        const deadline = Date.now() + 3000
-        while (Date.now() < deadline) {
-          const forkedHasMessages = await sdk.v2.session
-            .messages({ sessionID, limit: 1 })
-            .then((result) => (result.data?.data.length ?? 0) > 0)
-            .catch(() => false)
-          if (forkedHasMessages) {
-            return
-          }
-
-          await Bun.sleep(25)
-        }
-      }
-
-      async function session(sdk: OpencodeClient): Promise<SessionInfo | undefined> {
-        if (args.session) {
-          const current = await currentSession(sdk, args.session)
-          if (!current) {
-            UI.error("Session not found")
-            process.exit(1)
-          }
-          if (!interactive && !currentPrompt && current.current !== false) {
-            throw new Error("This operation is not available for a current Session transcript")
-          }
-
-          if (args.fork) {
-            return forkSession(sdk, current)
-          }
-
-          return current
-        }
-
-        const base = args.continue ? await currentRootSession(sdk) : undefined
-        if (base && !interactive && !currentPrompt && base.current !== false) {
-          throw new Error("This operation is not available for a current Session transcript")
-        }
-
-        if (base && args.fork) {
-          return forkSession(sdk, base)
-        }
-
-        if (base) {
-          return {
-            id: base.id,
-            title: base.title,
-            directory: base.directory,
-            current: "current" in base ? base.current : false,
-          }
-        }
-
-        if (interactive || currentPrompt) {
-          const name = title()
-          const result = await sdk.v2.session.create({
-            location: { directory: await current(sdk) },
-          })
-          const created = result.data?.data
-          if (!created) return
-          if (name) await sdk.v2.session.rename({ sessionID: created.id, title: name })
-          return {
-            id: created.id,
-            title: name ?? created.title,
-            directory: created.location.directory,
-            current: true,
-          }
-        }
-
-        const name = title()
-        const result = await sdk.session.create({
-          title: name,
-          permission: [...rules],
-        })
-        const id = result.data?.id
-        if (!id) {
-          return
-        }
-
-        return {
-          id,
-          title: result.data?.title ?? name,
-          directory: result.data?.directory,
-          current: false,
-        }
-      }
-
-      async function currentRootSession(sdk: OpencodeClient): Promise<SessionInfo | undefined> {
-        const response = await sdk.v2.session.list({
-          directory: await current(sdk),
-          limit: 50,
-          order: "desc",
-        })
-        const root = (response.data?.data ?? [])
-          .filter((session) => !session.parentID)
-          .toSorted((a, b) => b.time.updated - a.time.updated)[0]
-        if (!root) return
-        return currentSession(sdk, root.id)
-      }
-
-      async function transcriptKind(sdk: OpencodeClient, sessionID: string) {
-        const current = await sdk.v2.session.messages({ sessionID, limit: 1 }).then((result) => (result.data?.data.length ?? 0) > 0)
-        // Ordinary prompt flows assume a transcript with current messages is
-        // current-owned; only legacy-only modes (--command, directory
-        // attachments) still probe legacy history for mixed transcripts.
-        if (current && (interactive || currentPrompt)) return "current" as const
-
-        const legacy = await sdk.session.messages({ sessionID, limit: 1 }).then((result) => (result.data?.length ?? 0) > 0)
-        if (current) {
-          if (legacy) throw new Error("Session contains mixed legacy and current transcripts")
-          return "current" as const
-        }
-        if (legacy) return "legacy" as const
-        return "empty" as const
-      }
-
-      async function createFreshSession(
-        sdk: OpencodeClient,
-        input: { agent: string | undefined; model: ModelInput | undefined; variant: string | undefined },
-      ): Promise<SessionInfo> {
-        const name = args.title !== undefined && args.title !== "" ? args.title : undefined
-        const result = await sdk.v2.session.create({
-          agent: input.agent,
-          model: input.model
-            ? {
-              providerID: input.model.providerID,
-              id: input.model.modelID,
-              variant: input.variant,
-            }
-            : undefined,
-          location: { directory: await current(sdk) },
-        })
-        const created = result.data?.data
-        const id = created?.id
-        if (!id) {
-          throw new Error("Failed to create session")
-        }
-        if (name) await sdk.v2.session.rename({ sessionID: id, title: name })
-
-        return {
-          id,
-          title: name ?? created.title,
-        }
-      }
-
-      async function current(sdk: OpencodeClient): Promise<string> {
-        if (!args.attach) {
-          return directory ?? root
-        }
-
-        const next = await sdk.v2.location
-          .get(undefined, { throwOnError: true })
-          .then((x) => x.data?.directory)
-          .catch(() => undefined)
-        if (next) {
-          return next
-        }
-
-        UI.error("Failed to resolve remote directory")
-        process.exit(1)
-      }
-
-      async function localAgent() {
-        if (!args.agent) return undefined
-        const name = args.agent
-
-        const entry = await Effect.runPromise(
-          agentSvc.get(name).pipe(Effect.provideService(InstanceRef, localInstance)),
-        )
-        if (!entry) {
-          UI.println(
-            UI.Style.TEXT_WARNING_BOLD + "!",
-            UI.Style.TEXT_NORMAL,
-            `agent "${name}" not found. Falling back to default agent`,
-          )
-          return undefined
-        }
-        if (entry.mode === "subagent") {
-          UI.println(
-            UI.Style.TEXT_WARNING_BOLD + "!",
-            UI.Style.TEXT_NORMAL,
-            `agent "${name}" is a subagent, not a primary agent. Falling back to default agent`,
-          )
-          return undefined
-        }
-        return name
-      }
-
-      async function attachAgent(sdk: OpencodeClient) {
-        if (!args.agent) return undefined
-        const name = args.agent
-
-        const modes = await loadRunAgents(sdk, await current(sdk)).catch(() => undefined)
-
-        if (!modes) {
-          UI.println(
-            UI.Style.TEXT_WARNING_BOLD + "!",
-            UI.Style.TEXT_NORMAL,
-            `failed to list agents from ${args.attach}. Falling back to default agent`,
-          )
-          return undefined
-        }
-
-        const agent = modes.find((item) => item.name === name)
-        if (!agent) {
-          UI.println(
-            UI.Style.TEXT_WARNING_BOLD + "!",
-            UI.Style.TEXT_NORMAL,
-            `agent "${name}" not found. Falling back to default agent`,
-          )
-          return undefined
-        }
-
-        if (agent.mode === "subagent") {
-          UI.println(
-            UI.Style.TEXT_WARNING_BOLD + "!",
-            UI.Style.TEXT_NORMAL,
-            `agent "${name}" is a subagent, not a primary agent. Falling back to default agent`,
-          )
-          return undefined
-        }
-
-        return name
-      }
-
-      async function pickAgent(sdk: OpencodeClient) {
-        if (!args.agent) return undefined
-        if (args.attach) {
-          return attachAgent(sdk)
-        }
-
-        return localAgent()
-      }
-
-      async function execute(sdk: OpencodeClient) {
-        const sess = await session(sdk)
-        if (!sess?.id) {
-          UI.error("Session not found")
-          process.exit(1)
-        }
-        const sessionID = sess.id
-
-        function emit(type: string, data: Record<string, unknown>) {
-          if (args.format === "json") {
-            process.stdout.write(
-              JSON.stringify({
-                type,
-                timestamp: Date.now(),
-                sessionID,
-                ...data,
-              }) + EOL,
-            )
-            return true
-          }
-          return false
-        }
-
-        // Consume one subscribed event stream for the active session and mirror it
-        // to stdout/UI. `client` is passed explicitly because attach mode may
-        // rebind the SDK to the session's directory after the subscription is
-        // created, and replies issued from inside the loop must use that client.
-        async function loop(client: OpencodeClient, events: Awaited<ReturnType<typeof sdk.event.subscribe>>) {
-          const toggles = new Map<string, boolean>()
-          let error: string | undefined
-
-          for await (const event of events.stream) {
-            if (
-              event.type === "message.updated" &&
-              event.properties.sessionID === sessionID &&
-              event.properties.info.role === "assistant" &&
-              args.format !== "json" &&
-              toggles.get("start") !== true
-            ) {
-              UI.empty()
-              UI.println(`> ${event.properties.info.agent} · ${event.properties.info.modelID}`)
-              UI.empty()
-              toggles.set("start", true)
-            }
-
-            if (event.type === "message.part.updated") {
-              const part = event.properties.part
-              if (part.sessionID !== sessionID) continue
-
-              if (part.type === "tool" && (part.state.status === "completed" || part.state.status === "error")) {
-                if (emit("tool_use", { part })) continue
-                if (part.state.status === "completed") {
-                  await tool(part)
-                  continue
-                }
-                await toolError(part)
-                UI.error(part.state.error)
-              }
-
-              if (
-                part.type === "tool" &&
-                part.tool === "task" &&
-                part.state.status === "running" &&
-                args.format !== "json"
-              ) {
-                if (toggles.get(part.id) === true) continue
-                await tool(part)
-                toggles.set(part.id, true)
-              }
-
-              if (part.type === "step-start") {
-                if (emit("step_start", { part })) continue
-              }
-
-              if (part.type === "step-finish") {
-                if (emit("step_finish", { part })) continue
-              }
-
-              if (part.type === "text" && part.time?.end) {
-                if (emit("text", { part })) continue
-                const text = part.text.trim()
-                if (!text) continue
-                if (!process.stdout.isTTY) {
-                  process.stdout.write(text + EOL)
-                  continue
-                }
-                UI.empty()
-                UI.println(text)
-                UI.empty()
-              }
-
-              if (part.type === "reasoning" && part.time?.end && thinking) {
-                if (emit("reasoning", { part })) continue
-                const text = part.text.trim()
-                if (!text) continue
-                const line = `Thinking: ${text}`
-                if (process.stdout.isTTY) {
-                  UI.empty()
-                  UI.println(`${UI.Style.TEXT_DIM}\u001b[3m${line}\u001b[0m${UI.Style.TEXT_NORMAL}`)
-                  UI.empty()
-                  continue
-                }
-                process.stdout.write(line + EOL)
-              }
-            }
-
-            if (event.type === "session.error") {
-              const props = event.properties
-              if (props.sessionID !== sessionID || !props.error) continue
-              let err = String(props.error.name)
-              if ("data" in props.error && props.error.data && "message" in props.error.data) {
-                err = String(props.error.data.message)
-              }
-              error = error ? error + EOL + err : err
-              if (emit("error", { error: props.error })) continue
-              UI.error(err)
-            }
-
-            if (
-              event.type === "session.status" &&
-              event.properties.sessionID === sessionID &&
-              event.properties.status.type === "idle"
-            ) {
-              break
-            }
-
-            if (event.type === "permission.asked") {
-              const permission = event.properties
-              if (permission.sessionID !== sessionID) continue
-
-              if (auto) {
-                await client.permission.reply({
-                  requestID: permission.id,
-                  reply: "once",
-                })
-              } else {
-                UI.println(
-                  UI.Style.TEXT_WARNING_BOLD + "!",
-                  UI.Style.TEXT_NORMAL +
-                  `permission requested: ${permission.permission} (${permission.patterns.join(", ")}); auto-rejecting`,
-                )
-                await client.permission.reply({
-                  requestID: permission.id,
-                  reply: "reject",
-                })
-              }
-            }
-          }
-          return error
-        }
-        const cwd = args.attach ? (directory ?? sess.directory ?? (await current(sdk))) : (directory ?? root)
-        const client = args.attach ? attachSDK(cwd) : sdk
-
-        // Current-session flows resolve explicit --model refs from a location
-        // catalog that populates asynchronously after boot. Wait only when the
-        // user supplied a model; default-model races.
-        const selectedModel = pick(args.model)
-        if (selectedModel && (interactive || (currentPrompt && sess.current !== false))) {
-          await waitForCatalogReady({ sdk: client, directory: cwd, model: selectedModel })
-        }
-
-        // Validate agent if specified
-        const agent = await pickAgent(client)
-
-        if (!interactive) {
-          if (currentPrompt && sess.current !== false) {
-            const model = selectedModel
-            const { runNonInteractivePrompt } = await import("./run/noninteractive")
-            try {
-              await runNonInteractivePrompt({
-                client,
-                sessionID,
-                message,
-                files,
-                agent,
-                model,
-                variant: args.variant,
-                thinking,
-                format: args.format === "json" ? "json" : "default",
-                dangerouslySkipPermissions: args["dangerously-skip-permissions"],
-                attached: Boolean(args.attach),
-                renderTool: tool,
-                renderToolError: toolError,
-              })
-            } catch (error) {
-              const output = error instanceof Error ? { type: "unknown", message: error.message } : error
-              if (!emit("error", { error: output })) UI.error(formatRunError(error))
-              process.exitCode = 1
-            }
-            return
-          }
-
-          const events = await client.event.subscribe()
-          const completed = loop(client, events).catch((e) => {
-            console.error(e)
-            process.exitCode = 1
-          })
-          async function finish() {
-            if (args.attach) return
-            const error = await completed
-            if (error) process.exitCode = 1
-          }
-
-          if (args.command) {
-            const result = await client.session.command({
-              sessionID,
-              agent,
-              model: args.model,
-              command: args.command,
-              arguments: message,
-              variant: args.variant,
-            })
-            if (result.error) {
-              if (!emit("error", { error: result.error })) UI.error(formatRunError(result.error))
-              process.exitCode = 1
-              return
-            }
-            await finish()
-            return
-          }
-
-          const model = pick(args.model)
-          const result = await client.session.prompt({
-            sessionID,
-            agent,
-            model,
-            variant: args.variant,
-            parts: [...files, { type: "text", text: message }],
-          })
-          if (result.error) {
-            if (!emit("error", { error: result.error })) UI.error(formatRunError(result.error))
-            process.exitCode = 1
-            return
-          }
-          await finish()
-          return
-        }
-
-        const model = pick(args.model)
-        const { runInteractiveMode } = await import("./run/runtime")
-        try {
-          await runInteractiveMode({
-            sdk: client,
-            directory: cwd,
-            sessionID,
-            sessionTitle: sess.title,
-            resume: Boolean(args.session || args.continue),
-            replay,
-            replayLimit: args["replay-limit"],
-            agent,
-            model,
-            variant: args.variant,
-            files,
-            initialInput,
-            createSession: createFreshSession,
-            thinking,
-            backgroundSubagents: flags.experimentalBackgroundSubagents,
-            demo: args.demo,
-          })
-        } catch (error) {
-          dieInteractive(error)
-        }
-        return
-      }
-
-      if (interactive && !args.attach && !args.session && !args.continue) {
-        const model = pick(args.model)
-        const { runInteractiveLocalMode } = await import("./run/runtime")
-        const fetchFn = (async (input: RequestInfo | URL, init?: RequestInit) => {
-          const { Server } = await import("@/server/server")
-          const request = new Request(input, init)
-          const headers = new Headers(request.headers)
-          const auth = ServerAuth.header()
-          if (auth) headers.set("Authorization", auth)
-          return Server.Default().app.fetch(new Request(request, { headers }))
-        }) as typeof globalThis.fetch
-
-        try {
-          return await runInteractiveLocalMode({
-            directory: directory ?? root,
-            fetch: fetchFn,
-            resolveAgent: localAgent,
-            session,
-            createSession: createFreshSession,
-            agent: args.agent,
-            model,
-            variant: args.variant,
-            replay,
-            replayLimit: args["replay-limit"],
-            files,
-            initialInput,
-            thinking,
-            backgroundSubagents: flags.experimentalBackgroundSubagents,
-            demo: args.demo,
-          })
-        } catch (error) {
-          dieInteractive(error)
-        }
-      }
-
-      if (args.attach) {
-        const sdk = attachSDK(directory)
-        return await execute(sdk)
-      }
-
-      const fetchFn = (async (input: RequestInfo | URL, init?: RequestInit) => {
-        const { Server } = await import("@/server/server")
-        const request = new Request(input, init)
-        const headers = new Headers(request.headers)
-        const auth = ServerAuth.header()
-        if (auth) headers.set("Authorization", auth)
-        return Server.Default().app.fetch(new Request(request, { headers }))
-      }) as typeof globalThis.fetch
-      const sdk = createOpencodeClient({
-        baseUrl: "http://opencode.internal",
-        fetch: fetchFn,
-        directory,
-      })
-      await execute(sdk)
-    })
+    const { runNonInteractive } = yield* Effect.promise(() => import("@opencode-ai/cli/mini"))
+    yield* Effect.promise(() =>
+      runNonInteractive({
+        message: [...args.message, ...(args["--"] || [])],
+        continue: args.continue,
+        session: args.session,
+        fork: args.fork,
+        model: args.model,
+        agent: args.agent,
+        format: args.format,
+        file: args.file ?? [],
+        title: args.title,
+        server: args.server ?? args.attach,
+        password: args.password ?? process.env.OPENCODE_PASSWORD ?? process.env.OPENCODE_SERVER_PASSWORD,
+        username: args.username ?? process.env.OPENCODE_SERVER_USERNAME,
+        directory: args.dir,
+        variant: args.variant,
+        thinking: args.thinking,
+        dangerouslySkipPermissions: args.auto || args.yolo || args["dangerously-skip-permissions"],
+        standaloneCommand: args.server || args.attach ? undefined : v2ServerCommand(),
+      }),
+    )
   }),
 })
-
-type MiniCommandInput = {
-  directory?: string
-  attach?: string
-  password?: string
-  username?: string
-  continue?: boolean
-  session?: string
-  fork?: boolean
-  model?: string
-  agent?: string
-  prompt?: string
-  replay?: boolean
-  replayLimit?: number
-  demo?: boolean
-}
-
-export async function runMini(input: MiniCommandInput) {
-  if (!RunCommand.handler) throw new Error("Mini command handler is unavailable")
-  await RunCommand.handler({
-    $0: "opencode",
-    _: ["mini"],
-    message: input.prompt ? [input.prompt] : [],
-    command: undefined,
-    continue: input.continue,
-    session: input.session,
-    fork: input.fork,
-    model: input.model,
-    agent: input.agent,
-    format: "default",
-    file: undefined,
-    title: undefined,
-    attach: input.attach,
-    password: input.password,
-    username: input.username,
-    dir: input.directory,
-    port: undefined,
-    variant: undefined,
-    thinking: undefined,
-    mini: true,
-    interactive: false,
-    replay: input.replay ?? true,
-    "replay-limit": input.replayLimit,
-    replayLimit: input.replayLimit,
-    auto: false,
-    yolo: false,
-    "dangerously-skip-permissions": false,
-    dangerouslySkipPermissions: false,
-    demo: input.demo ?? false,
-  } as Parameters<NonNullable<typeof RunCommand.handler>>[0] & { mini: boolean })
-}
diff --git a/packages/opencode/src/cli/cmd/v2-serve.ts b/packages/opencode/src/cli/cmd/v2-serve.ts
new file mode 100644
index 0000000000..e5eeb470d1
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/v2-serve.ts
@@ -0,0 +1,31 @@
+import { ServerProcess } from "@opencode-ai/cli/server-process"
+import { Effect } from "effect"
+import { cmd } from "./cmd"
+
+export const V2ServeCommand = cmd({
+  command: "__v2-serve",
+  describe: false,
+  builder: (yargs) =>
+    yargs
+      .option("stdio", { type: "boolean", hidden: true })
+      .option("port", { type: "number", hidden: true }),
+  handler: async (args) => {
+    const controller = new AbortController()
+    const interrupt = () => controller.abort()
+    process.once("SIGINT", interrupt)
+    process.once("SIGTERM", interrupt)
+    process.once("SIGHUP", interrupt)
+    try {
+      await Effect.runPromise(
+        ServerProcess.run({ mode: args.stdio ? "stdio" : "service", port: args.port }),
+        { signal: controller.signal },
+      )
+    } catch (error) {
+      if (!controller.signal.aborted) throw error
+    } finally {
+      process.off("SIGINT", interrupt)
+      process.off("SIGTERM", interrupt)
+      process.off("SIGHUP", interrupt)
+    }
+  },
+})
diff --git a/packages/opencode/src/cli/cmd/v2-server-command.ts b/packages/opencode/src/cli/cmd/v2-server-command.ts
new file mode 100644
index 0000000000..ef04997868
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/v2-server-command.ts
@@ -0,0 +1,8 @@
+import path from "node:path"
+
+export function v2ServerCommand() {
+  const compiled = path.basename(process.execPath).replace(/\.exe$/, "") !== "bun"
+  const entrypoint = compiled ? [] : process.argv[1] ? [process.argv[1]] : []
+  if (!compiled && entrypoint.length === 0) throw new Error("Failed to resolve CLI entrypoint")
+  return [process.execPath, ...entrypoint, "__v2-serve"]
+}
diff --git a/packages/opencode/src/index.ts b/packages/opencode/src/index.ts
index f17904bd49..daa99d43c0 100644
--- a/packages/opencode/src/index.ts
+++ b/packages/opencode/src/index.ts
@@ -19,7 +19,7 @@ import { GithubCommand } from "./cli/cmd/github"
 import { ExportCommand } from "./cli/cmd/export"
 import { ImportCommand } from "./cli/cmd/import"
 import { AttachCommand } from "./cli/cmd/attach"
-import { MiniCommand } from "./cli/cmd/mini"
+import { V2ServeCommand } from "./cli/cmd/v2-serve"
 import { TuiThreadCommand } from "./cli/cmd/tui"
 import { AcpCommand } from "./cli/cmd/acp"
 import { EOL } from "os"
@@ -81,7 +81,7 @@ const cli = yargs(args)
   .completion("completion", "generate shell completion script")
   .command(AcpCommand)
   .command(McpCommand)
-  .command(MiniCommand)
+  .command(V2ServeCommand)
   .command(TuiThreadCommand)
   .command(AttachCommand)
   .command(RunCommand)
diff --git a/packages/opencode/src/temporary.ts b/packages/opencode/src/temporary.ts
index b100ba9d10..8ece4b89ef 100644
--- a/packages/opencode/src/temporary.ts
+++ b/packages/opencode/src/temporary.ts
@@ -1,6 +1,6 @@
 import yargs from "yargs"
-import { MiniCommand } from "./cli/cmd/mini"
 import { TuiThreadCommand } from "./cli/cmd/tui"
+import { V2ServeCommand } from "./cli/cmd/v2-serve"
 import { InstallationVersion } from "@opencode-ai/core/installation/version"
 import { hideBin } from "yargs/helpers"
 const cli = yargs(hideBin(process.argv))
@@ -28,6 +28,6 @@ const cli = yargs(hideBin(process.argv))
     if (opts.printLogs) process.env.OPENCODE_PRINT_LOGS = "1"
     if (opts.logLevel) process.env.OPENCODE_LOG_LEVEL = opts.logLevel
   })
-  .command(MiniCommand)
+  .command(V2ServeCommand)
   .command(TuiThreadCommand)
   .parse()
diff --git a/packages/opencode/test/cli/help/__snapshots__/help-snapshots.test.ts.snap b/packages/opencode/test/cli/help/__snapshots__/help-snapshots.test.ts.snap
index bd5dc88e7e..5c84f0d389 100644
--- a/packages/opencode/test/cli/help/__snapshots__/help-snapshots.test.ts.snap
+++ b/packages/opencode/test/cli/help/__snapshots__/help-snapshots.test.ts.snap
@@ -41,34 +41,6 @@ Options:
       --pure        run without external plugins                                           [boolean]"
 `;
 
-exports[`opencode CLI help-text snapshots every documented command emits stable help text: opencode mini --help 1`] = `
-"opencode mini
-
-start the minimal interactive interface
-
-Commands:
-  opencode mini [project]     start the minimal interactive interface                      [default]
-  opencode mini attach <url>  attach to a running opencode server with the minimal interface
-
-Positionals:
-  project  path to start opencode in                                                        [string]
-
-Options:
-  -h, --help          show help                                                            [boolean]
-  -v, --version       show version number                                                  [boolean]
-      --print-logs    print logs to stderr                                                 [boolean]
-      --log-level     log level                 [string] [choices: "DEBUG", "INFO", "WARN", "ERROR"]
-      --pure          run without external plugins                                         [boolean]
-  -m, --model         model to use in the format of provider/model                          [string]
-      --agent         agent to use                                                          [string]
-      --prompt        prompt to use                                                         [string]
-  -c, --continue      continue the last session                                            [boolean]
-  -s, --session       session id to continue                                                [string]
-      --fork          fork the session when continuing (use with --continue or --session)  [boolean]
-      --no-replay     disable session history replay on resume and after resize            [boolean]
-      --replay-limit  cap visible replay to the newest N messages                           [number]"
-`;
-
 exports[`opencode CLI help-text snapshots every documented command emits stable help text: opencode attach --help 1`] = `
 "opencode attach <url>
 
@@ -100,33 +72,25 @@ Positionals:
   message  message to send                                                     [array] [default: []]
 
 Options:
-  -h, --help         show help                                                             [boolean]
-  -v, --version      show version number                                                   [boolean]
-      --print-logs   print logs to stderr                                                  [boolean]
-      --log-level    log level                  [string] [choices: "DEBUG", "INFO", "WARN", "ERROR"]
-      --pure         run without external plugins                                          [boolean]
-      --command      the command to run, use message for args                               [string]
-  -c, --continue     continue the last session                                             [boolean]
-  -s, --session      session id to continue                                                 [string]
-      --fork         fork the session before continuing (requires --continue or --session) [boolean]
-  -m, --model        model to use in the format of provider/model                           [string]
-      --agent        agent to use                                                           [string]
-      --format       format: default (formatted) or json (raw JSON events)
+  -h, --help        show help                                                              [boolean]
+  -v, --version     show version number                                                    [boolean]
+      --print-logs  print logs to stderr                                                   [boolean]
+      --log-level   log level                   [string] [choices: "DEBUG", "INFO", "WARN", "ERROR"]
+      --pure        run without external plugins                                           [boolean]
+  -c, --continue    continue the last session                                              [boolean]
+  -s, --session     session id to continue                                                  [string]
+      --fork        fork the session before continuing (requires --continue or --session)  [boolean]
+  -m, --model       model to use in the format of provider/model                            [string]
+      --agent       agent to use                                                            [string]
+      --format      format: default (formatted) or json (raw JSON events)
                                           [string] [choices: "default", "json"] [default: "default"]
-  -f, --file         file(s) to attach to message                                            [array]
-      --title        title for the session (uses truncated prompt if no value provided)     [string]
-      --attach       attach to a running opencode server (e.g., http://localhost:4096)      [string]
-  -p, --password     basic auth password (defaults to OPENCODE_SERVER_PASSWORD)             [string]
-  -u, --username     basic auth username (defaults to OPENCODE_SERVER_USERNAME or 'opencode')
-                                                                                            [string]
-      --dir          directory to run in, path on remote server if attaching                [string]
-      --port         port for the local server (defaults to random port if no value provided)
-                                                                                            [number]
-      --variant      model variant (provider-specific reasoning effort, e.g., high, max, minimal)
-                                                                                            [string]
-      --thinking     show thinking blocks                                                  [boolean]
-  -i, --interactive  run in direct interactive split-footer mode          [boolean] [default: false]
-      --auto         auto-approve permissions that are not explicitly denied (dangerous!)
+  -f, --file        file(s) to attach to message                                             [array]
+      --title       title for the session (uses truncated prompt if no value provided)      [string]
+      --server      connect to a running opencode server                                    [string]
+      --dir         directory to run in, or a path on the remote server                     [string]
+      --variant     model variant                                                           [string]
+      --thinking    show thinking blocks                                                   [boolean]
+      --auto        auto-approve permissions that are not explicitly denied (dangerous!)
                                                                           [boolean] [default: false]"
 `;
 
@@ -426,31 +390,6 @@ Options:
       --format      Output format                 [string] [choices: "json", "tsv"] [default: "tsv"]"
 `;
 
-exports[`opencode CLI help-text snapshots every documented command emits stable help text: opencode mini attach --help 1`] = `
-"opencode mini attach <url>
-
-attach to a running opencode server with the minimal interface
-
-Positionals:
-  url  http://localhost:4096                                                     [string] [required]
-
-Options:
-  -h, --help          show help                                                            [boolean]
-  -v, --version       show version number                                                  [boolean]
-      --print-logs    print logs to stderr                                                 [boolean]
-      --log-level     log level                 [string] [choices: "DEBUG", "INFO", "WARN", "ERROR"]
-      --pure          run without external plugins                                         [boolean]
-      --dir           directory on the remote server                                        [string]
-  -p, --password      basic auth password (defaults to OPENCODE_SERVER_PASSWORD)            [string]
-  -u, --username      basic auth username (defaults to OPENCODE_SERVER_USERNAME or 'opencode')
-                                                                                            [string]
-  -c, --continue      continue the last session                                            [boolean]
-  -s, --session       session id to continue                                                [string]
-      --fork          fork the session when continuing (use with --continue or --session)  [boolean]
-      --no-replay     disable session history replay on resume and after resize            [boolean]
-      --replay-limit  cap visible replay to the newest N messages                           [number]"
-`;
-
 exports[`opencode CLI help-text snapshots every documented command emits stable help text: opencode mcp list --help 1`] = `
 "opencode mcp list
 
diff --git a/packages/opencode/test/cli/help/help-snapshots.test.ts b/packages/opencode/test/cli/help/help-snapshots.test.ts
index fc3dabeef3..ec3dd902cb 100644
--- a/packages/opencode/test/cli/help/help-snapshots.test.ts
+++ b/packages/opencode/test/cli/help/help-snapshots.test.ts
@@ -57,7 +57,6 @@ function normalize(text: string): string {
 const TOP_LEVEL = [
   "acp",
   "mcp",
-  "mini",
   "attach",
   "run",
   "debug",
@@ -82,7 +81,6 @@ const TOP_LEVEL = [
 // distinct argv shape, not every leaf. Add new entries when a subcommand
 // gains user-visible flags that we want to lock in.
 const SUBCOMMANDS = [
-  ["mini", "attach"],
   ["mcp", "list"],
   ["mcp", "add"],
   ["mcp", "auth"],
@@ -115,7 +113,7 @@ describe("opencode CLI help-text snapshots", () => {
         const topLevel = yield* opencode.spawn(["--help"], { env: SNAPSHOT_ENV })
         expect(topLevel.exitCode).toBe(0)
         expect(topLevel.stderr.endsWith("\n")).toBe(true)
-        expect(topLevel.stderr).toContain("opencode mini")
+        expect(topLevel.stderr).not.toContain("opencode mini")
         expect(topLevel.stderr).not.toContain("--mini")
         expect(topLevel.stderr).not.toContain("--thinking")
         expect(topLevel.stderr).not.toContain("--variant")
diff --git a/packages/opencode/test/cli/run/catalog.shared.test.ts b/packages/opencode/test/cli/run/catalog.shared.test.ts
index 847eceebec..0f5ef225bf 100644
--- a/packages/opencode/test/cli/run/catalog.shared.test.ts
+++ b/packages/opencode/test/cli/run/catalog.shared.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, describe, expect, mock, spyOn, test } from "bun:test"
-import { OpencodeClient } from "@opencode-ai/sdk/v2"
-import { loadRunReferences, runProviders, waitForDefaultModel } from "@/cli/cmd/run/catalog.shared"
+import { OpenCode } from "@opencode-ai/client/promise"
+import { loadRunReferences, runProviders, waitForDefaultModel } from "@opencode-ai/cli/mini/catalog.shared"
 
 afterEach(() => {
   mock.restore()
@@ -8,20 +8,12 @@ afterEach(() => {
 
 describe("run catalog shared", () => {
   test("resolves the catalog-selected model for the footer", async () => {
-    const client = new OpencodeClient()
-    const selected = spyOn(client.v2.model, "default").mockImplementation(
+    const client = OpenCode.make({ baseUrl: "https://opencode.test" })
+    const selected = spyOn(client.model, "default").mockImplementation(
       () =>
         Promise.resolve({
-          data: {
-            location: { directory: "/tmp", project: { id: "proj_1", directory: "/tmp" } },
-            data: {
-              id: "gpt-5",
-              providerID: "openai",
-            },
-          },
-          error: undefined,
-          request: new Request("https://opencode.test"),
-          response: new Response(),
+          location: { directory: "/tmp", project: { id: "proj_1", directory: "/tmp" } },
+          data: { id: "gpt-5", providerID: "openai" },
         }) as never,
     )
 
@@ -29,17 +21,16 @@ describe("run catalog shared", () => {
       providerID: "openai",
       modelID: "gpt-5",
     })
-    expect(selected).toHaveBeenCalledWith({ location: { directory: "/tmp" } }, { throwOnError: true })
+    expect(selected).toHaveBeenCalledWith({ location: { directory: "/tmp" } })
   })
 
   test("loads visible project references from the current reference catalog", async () => {
-    const client = new OpencodeClient()
-    const list = spyOn(client.v2.reference, "list").mockImplementation(
+    const client = OpenCode.make({ baseUrl: "https://opencode.test" })
+    const list = spyOn(client.reference, "list").mockImplementation(
       () =>
         Promise.resolve({
-          data: {
-            location: { directory: "/tmp", project: { id: "proj_1", directory: "/tmp" } },
-            data: [
+          location: { directory: "/tmp", project: { id: "proj_1", directory: "/tmp" } },
+          data: [
               {
                 name: "effect",
                 path: "/repos/effect",
@@ -52,17 +43,13 @@ describe("run catalog shared", () => {
                 hidden: true,
                 source: { type: "local", path: "/repos/secret" },
               },
-            ],
-          },
-          error: undefined,
-          request: new Request("https://opencode.test"),
-          response: new Response(),
+          ],
         }) as never,
     )
 
     const references = await loadRunReferences(client, "/tmp")
 
-    expect(list).toHaveBeenCalledWith({ location: { directory: "/tmp" } }, { throwOnError: true })
+    expect(list).toHaveBeenCalledWith({ location: { directory: "/tmp" } })
     expect(references).toMatchObject([{ name: "effect", path: "/repos/effect", description: "Effect v4 sources" }])
   })
 
diff --git a/packages/opencode/test/cli/run/entry.body.test.ts b/packages/opencode/test/cli/run/entry.body.test.ts
index f393350381..714d0eab25 100644
--- a/packages/opencode/test/cli/run/entry.body.test.ts
+++ b/packages/opencode/test/cli/run/entry.body.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test"
 import type { ToolPart } from "@opencode-ai/sdk/v2"
-import { entryBody, entryCanStream, entryDone } from "@/cli/cmd/run/entry.body"
-import type { StreamCommit, ToolSnapshot } from "@/cli/cmd/run/types"
+import { entryBody, entryCanStream, entryDone } from "@opencode-ai/cli/mini/entry.body"
+import type { StreamCommit, ToolSnapshot } from "@opencode-ai/cli/mini/types"
 
 function commit(input: Partial<StreamCommit> & Pick<StreamCommit, "kind" | "text" | "phase" | "source">): StreamCommit {
   return input
diff --git a/packages/opencode/test/cli/run/footer.menu.test.ts b/packages/opencode/test/cli/run/footer.menu.test.ts
index edfa59be88..4086155acb 100644
--- a/packages/opencode/test/cli/run/footer.menu.test.ts
+++ b/packages/opencode/test/cli/run/footer.menu.test.ts
@@ -1,6 +1,6 @@
 import { expect, test } from "bun:test"
 import { createRoot } from "solid-js"
-import { FOOTER_MENU_ROWS, createFooterMenuState } from "@/cli/cmd/run/footer.menu"
+import { FOOTER_MENU_ROWS, createFooterMenuState } from "@opencode-ai/cli/mini/footer.menu"
 
 function mount(count: number, limit = FOOTER_MENU_ROWS) {
   let dispose!: () => void
diff --git a/packages/opencode/test/cli/run/footer.view.test.tsx b/packages/opencode/test/cli/run/footer.view.test.tsx
index da9ce384b4..4c3139ce9c 100644
--- a/packages/opencode/test/cli/run/footer.view.test.tsx
+++ b/packages/opencode/test/cli/run/footer.view.test.tsx
@@ -15,10 +15,10 @@ import {
   RunSkillSelectBody,
   RunSubagentSelectBody,
   RunVariantSelectBody,
-} from "@/cli/cmd/run/footer.command"
-import { RunFooterView } from "@/cli/cmd/run/footer.view"
-import { RunEntryContent } from "@/cli/cmd/run/scrollback.writer"
-import { RUN_THEME_FALLBACK, type RunTheme } from "@/cli/cmd/run/theme"
+} from "@opencode-ai/cli/mini/footer.command"
+import { RunFooterView } from "@opencode-ai/cli/mini/footer.view"
+import { RunEntryContent } from "@opencode-ai/cli/mini/scrollback.writer"
+import { RUN_THEME_FALLBACK, type RunTheme } from "@opencode-ai/cli/mini/theme"
 import type {
   FooterState,
   FooterSubagentState,
@@ -30,10 +30,10 @@ import type {
   RunProvider,
   RunTuiConfig,
   StreamCommit,
-} from "@/cli/cmd/run/types"
-import { RunQuestionBody } from "@/cli/cmd/run/footer.question"
-import { selectedCommand } from "@/cli/cmd/run/footer.prompt"
-import { RejectField } from "@/cli/cmd/run/footer.permission"
+} from "@opencode-ai/cli/mini/types"
+import { RunQuestionBody } from "@opencode-ai/cli/mini/footer.question"
+import { selectedCommand } from "@opencode-ai/cli/mini/footer.prompt"
+import { RejectField } from "@opencode-ai/cli/mini/footer.permission"
 import { createTuiResolvedConfig } from "../../fixture/tui-runtime"
 
 const tuiConfig = createTuiResolvedConfig()
diff --git a/packages/opencode/test/cli/run/footer.width.test.ts b/packages/opencode/test/cli/run/footer.width.test.ts
index 75efcb8aaf..8feabba6a8 100644
--- a/packages/opencode/test/cli/run/footer.width.test.ts
+++ b/packages/opencode/test/cli/run/footer.width.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { footerWidthPolicy } from "@/cli/cmd/run/footer.width"
+import { footerWidthPolicy } from "@opencode-ai/cli/mini/footer.width"
 
 describe("run footer width", () => {
   test("preserves shared dialog and statusline breakpoints", () => {
diff --git a/packages/opencode/test/cli/run/noninteractive.test.ts b/packages/opencode/test/cli/run/noninteractive.test.ts
index 4462c53a97..e77d28b62b 100644
--- a/packages/opencode/test/cli/run/noninteractive.test.ts
+++ b/packages/opencode/test/cli/run/noninteractive.test.ts
@@ -1,16 +1,12 @@
 import { afterEach, describe, expect, mock, spyOn, test } from "bun:test"
-import { OpencodeClient, type V2Event } from "@opencode-ai/sdk/v2"
-import { runNonInteractivePrompt } from "@/cli/cmd/run/noninteractive"
+import { OpenCode, type EventSubscribeOutput } from "@opencode-ai/client/promise"
+import { runNonInteractivePrompt } from "@opencode-ai/cli/mini/noninteractive"
 
+type V2Event = EventSubscribeOutput
 type FormInfo = Extract<V2Event, { type: "form.created" }>["data"]["form"]
 
 function ok<T>(data: T) {
-  return Promise.resolve({
-    data,
-    error: undefined,
-    request: new Request("https://opencode.test"),
-    response: new Response(),
-  })
+  return Promise.resolve(data)
 }
 
 function form(id: string, sessionID: string): FormInfo {
@@ -43,8 +39,8 @@ function settled(outcome: "success" | "interrupted" = "success"): V2Event {
 // Runs one non-interactive prompt against a mocked SDK. `turn` produces the
 // live events the prompt admission triggers, keyed by the generated message ID.
 async function run(input: { turn: (inputID: string) => V2Event[]; pendingForms?: FormInfo[]; attached?: boolean }) {
-  const sdk = new OpencodeClient()
-  const values: V2Event[] = [{ id: "evt_connected", created: 0, type: "server.connected", data: {} }]
+  const sdk = OpenCode.make({ baseUrl: "https://opencode.test" })
+  const values: V2Event[] = [{ id: "evt_connected", type: "server.connected", data: {} }]
   let wake: (() => void) | undefined
   const stream = (async function* (): AsyncGenerator<V2Event, void, unknown> {
     while (true) {
@@ -58,22 +54,20 @@ async function run(input: { turn: (inputID: string) => V2Event[]; pendingForms?:
       yield value
     }
   })()
-  spyOn(sdk.v2.event, "subscribe").mockImplementation(
-    () => Promise.resolve({ stream }) as ReturnType<typeof sdk.v2.event.subscribe>,
-  )
-  spyOn(sdk.v2.session.permission, "list").mockImplementation(() => ok({ data: [] }) as never)
-  spyOn(sdk.v2.session.question, "list").mockImplementation(() => ok({ data: [] }) as never)
-  spyOn(sdk.v2.session.form, "list").mockImplementation(
+  spyOn(sdk.event, "subscribe").mockImplementation(() => stream)
+  spyOn(sdk.permission, "list").mockImplementation(() => ok([]) as never)
+  spyOn(sdk.question, "list").mockImplementation(() => ok([]) as never)
+  spyOn(sdk.form, "list").mockImplementation(
     (request) =>
-      ok({ data: input.pendingForms?.filter((item) => item.sessionID === request.sessionID) ?? [] }) as never,
+      ok(input.pendingForms?.filter((item) => item.sessionID === request.sessionID) ?? []) as never,
   )
-  spyOn(sdk.v2.session.form, "cancel").mockImplementation(() => ok(undefined) as never)
-  spyOn(sdk.v2.session, "prompt").mockImplementation((request) => {
+  spyOn(sdk.form, "cancel").mockImplementation(() => ok(undefined) as never)
+  spyOn(sdk.session, "prompt").mockImplementation((request) => {
     const messageID = request.id ?? "msg_prompt"
     values.push(...input.turn(messageID))
     wake?.()
     wake = undefined
-    return ok({ data: { admittedSeq: 1, id: messageID, sessionID: "ses_1", timeCreated: 1 } }) as never
+    return ok({ admittedSeq: 1, id: messageID, sessionID: "ses_1", timeCreated: 1 }) as never
   })
   await runNonInteractivePrompt({
     client: sdk,
@@ -102,9 +96,9 @@ describe("runNonInteractivePrompt", () => {
       // which must not leave the consume loop waiting forever.
       turn: () => [formCreated(form("frm_live", "global")), settled("interrupted")],
     })
-    expect(sdk.v2.session.form.cancel).toHaveBeenCalledWith({ sessionID: "global", formID: "frm_live" })
-    expect(sdk.v2.session.form.cancel).toHaveBeenCalledWith({ sessionID: "ses_1", formID: "frm_pending" })
-    expect(sdk.v2.session.form.cancel).toHaveBeenCalledWith({ sessionID: "global", formID: "frm_pending_global" })
+    expect(sdk.form.cancel).toHaveBeenCalledWith({ sessionID: "global", formID: "frm_live" })
+    expect(sdk.form.cancel).toHaveBeenCalledWith({ sessionID: "ses_1", formID: "frm_pending" })
+    expect(sdk.form.cancel).toHaveBeenCalledWith({ sessionID: "global", formID: "frm_pending_global" })
   })
 
   test("attach mode cancels only session-owned forms", async () => {
@@ -113,9 +107,9 @@ describe("runNonInteractivePrompt", () => {
       pendingForms: [form("frm_pending", "ses_1"), form("frm_pending_global", "global")],
       turn: (messageID) => [formCreated(form("frm_live", "global")), prompted(messageID), settled()],
     })
-    expect(sdk.v2.session.form.cancel).toHaveBeenCalledWith({ sessionID: "ses_1", formID: "frm_pending" })
-    expect(sdk.v2.session.form.list).not.toHaveBeenCalledWith({ sessionID: "global" })
-    expect(sdk.v2.session.form.cancel).not.toHaveBeenCalledWith({ sessionID: "global", formID: "frm_live" })
-    expect(sdk.v2.session.form.cancel).not.toHaveBeenCalledWith({ sessionID: "global", formID: "frm_pending_global" })
+    expect(sdk.form.cancel).toHaveBeenCalledWith({ sessionID: "ses_1", formID: "frm_pending" })
+    expect(sdk.form.list).not.toHaveBeenCalledWith({ sessionID: "global" })
+    expect(sdk.form.cancel).not.toHaveBeenCalledWith({ sessionID: "global", formID: "frm_live" })
+    expect(sdk.form.cancel).not.toHaveBeenCalledWith({ sessionID: "global", formID: "frm_pending_global" })
   })
 })
diff --git a/packages/opencode/test/cli/run/permission.shared.test.ts b/packages/opencode/test/cli/run/permission.shared.test.ts
index 03be4220f2..84ad63207c 100644
--- a/packages/opencode/test/cli/run/permission.shared.test.ts
+++ b/packages/opencode/test/cli/run/permission.shared.test.ts
@@ -8,7 +8,7 @@ import {
   permissionInfo,
   permissionReject,
   permissionRun,
-} from "@/cli/cmd/run/permission.shared"
+} from "@opencode-ai/cli/mini/permission.shared"
 
 function req(input: Partial<PermissionRequest> = {}): PermissionRequest {
   return {
diff --git a/packages/opencode/test/cli/run/prompt.editor.test.ts b/packages/opencode/test/cli/run/prompt.editor.test.ts
index 872c603047..5506217479 100644
--- a/packages/opencode/test/cli/run/prompt.editor.test.ts
+++ b/packages/opencode/test/cli/run/prompt.editor.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test"
-import { realignEditorPromptParts, resolveEditorSlashValue } from "@/cli/cmd/run/prompt.editor"
-import type { RunPromptPart } from "@/cli/cmd/run/types"
+import { realignEditorPromptParts, resolveEditorSlashValue } from "@opencode-ai/cli/mini/prompt.editor"
+import type { RunPromptPart } from "@opencode-ai/cli/mini/types"
 
 describe("run prompt editor helpers", () => {
   test("strips the local /editor command from the initial editor text", () => {
diff --git a/packages/opencode/test/cli/run/prompt.shared.test.ts b/packages/opencode/test/cli/run/prompt.shared.test.ts
index fcb1bfe425..e6da0b155e 100644
--- a/packages/opencode/test/cli/run/prompt.shared.test.ts
+++ b/packages/opencode/test/cli/run/prompt.shared.test.ts
@@ -5,8 +5,8 @@ import {
   isNewCommand,
   movePromptHistory,
   pushPromptHistory,
-} from "@/cli/cmd/run/prompt.shared"
-import type { RunPrompt } from "@/cli/cmd/run/types"
+} from "@opencode-ai/cli/mini/prompt.shared"
+import type { RunPrompt } from "@opencode-ai/cli/mini/types"
 
 function prompt(text: string, parts: RunPrompt["parts"] = []): RunPrompt {
   return { text, parts }
diff --git a/packages/opencode/test/cli/run/question.shared.test.ts b/packages/opencode/test/cli/run/question.shared.test.ts
index 27c8cecdb3..552fc9a65c 100644
--- a/packages/opencode/test/cli/run/question.shared.test.ts
+++ b/packages/opencode/test/cli/run/question.shared.test.ts
@@ -10,7 +10,7 @@ import {
   questionStoreCustom,
   questionSubmit,
   questionSync,
-} from "@/cli/cmd/run/question.shared"
+} from "@opencode-ai/cli/mini/question.shared"
 
 function req(input: Partial<QuestionRequest> = {}): QuestionRequest {
   return {
diff --git a/packages/opencode/test/cli/run/run-process.test.ts b/packages/opencode/test/cli/run/run-process.test.ts
index 30ae27b68d..6f4b01a849 100644
--- a/packages/opencode/test/cli/run/run-process.test.ts
+++ b/packages/opencode/test/cli/run/run-process.test.ts
@@ -363,11 +363,11 @@ describe("opencode run (non-interactive subprocess)", () => {
   )
 
   cliIt.concurrent(
-    "applies a variant to the configured default model",
+    "applies a variant to the selected model",
     ({ llm, opencode }) =>
       Effect.gen(function* () {
         yield* llm.text("variant response")
-        const result = yield* opencode.spawn(["run", "--variant", "default", "use the default model"], {
+        const result = yield* opencode.spawn(["run", "--model", "test/test-model", "--variant", "default", "use the model"], {
           config: { ...testProviderConfig(llm.url), model: "test/test-model" },
         })
 
diff --git a/packages/opencode/test/cli/run/runtime.boot.test.ts b/packages/opencode/test/cli/run/runtime.boot.test.ts
index 59a0d8e7c5..f642c47c08 100644
--- a/packages/opencode/test/cli/run/runtime.boot.test.ts
+++ b/packages/opencode/test/cli/run/runtime.boot.test.ts
@@ -1,17 +1,11 @@
 import { afterEach, describe, expect, mock, spyOn, test } from "bun:test"
-import { OpencodeClient } from "@opencode-ai/sdk/v2"
+import { OpenCode } from "@opencode-ai/client/promise"
 import type { Resolved } from "@opencode-ai/tui/config"
-import { TuiConfig } from "@/config/tui"
-import { resolveDiffStyle, resolveModelInfo, resolveRunTuiConfig } from "@/cli/cmd/run/runtime.boot"
+import { resolveDiffStyle, resolveModelInfo, resolveRunTuiConfig } from "@opencode-ai/cli/mini/runtime.boot"
 import { createTuiResolvedConfig } from "../../fixture/tui-runtime"
 
 function ok<T>(data: T) {
-  return Promise.resolve({
-    data,
-    error: undefined,
-    request: new Request("https://opencode.test"),
-    response: new Response(),
-  })
+  return Promise.resolve(data)
 }
 
 function provider(id: string, name: string) {
@@ -108,23 +102,21 @@ describe("run runtime boot", () => {
   })
 
   test("reads footer keybinds from resolved keybind config", async () => {
-    spyOn(TuiConfig, "get").mockResolvedValue(
-      config({
-        leader: "ctrl+g",
-        bindings: {
-          commandList: ["ctrl+p"],
-          variantCycle: ["ctrl+t", "alt+t"],
-          interrupt: ["ctrl+c"],
-          historyPrevious: ["k"],
-          historyNext: ["j"],
-          inputClear: ["ctrl+l"],
-          inputSubmit: ["ctrl+s"],
-          inputNewline: ["alt+return"],
-        },
-      }),
-    )
+    const input = config({
+      leader: "ctrl+g",
+      bindings: {
+        commandList: ["ctrl+p"],
+        variantCycle: ["ctrl+t", "alt+t"],
+        interrupt: ["ctrl+c"],
+        historyPrevious: ["k"],
+        historyNext: ["j"],
+        inputClear: ["ctrl+l"],
+        inputSubmit: ["ctrl+s"],
+        inputNewline: ["alt+return"],
+      },
+    })
 
-    const result = await resolveRunTuiConfig()
+    const result = await resolveRunTuiConfig(input)
 
     expect(result.keybinds.get("leader")?.[0]?.key).toBe("ctrl+g")
     expect(result.leader_timeout).toBe(2000)
@@ -139,9 +131,7 @@ describe("run runtime boot", () => {
   })
 
   test("falls back to default tui keymap config when config load fails", async () => {
-    spyOn(TuiConfig, "get").mockRejectedValue(new Error("boom"))
-
-    const result = await resolveRunTuiConfig()
+    const result = await resolveRunTuiConfig(Promise.reject(new Error("boom")))
 
     expect(result.keybinds.get("leader")?.[0]?.key).toBe("ctrl+x")
     expect(result.leader_timeout).toBe(2000)
@@ -157,31 +147,23 @@ describe("run runtime boot", () => {
   })
 
   test("preserves disabled leader from resolved tui config", async () => {
-    spyOn(TuiConfig, "get").mockResolvedValue(config({ leader: "none" }))
-
-    const result = await resolveRunTuiConfig()
+    const result = await resolveRunTuiConfig(config({ leader: "none" }))
 
     expect(result.keybinds.get("leader")).toEqual([])
   })
 
   test("reads diff style and falls back to auto", async () => {
-    spyOn(TuiConfig, "get").mockResolvedValue(config({ diff_style: "stacked" }))
-    await expect(resolveDiffStyle()).resolves.toBe("stacked")
+    await expect(resolveDiffStyle(config({ diff_style: "stacked" }))).resolves.toBe("stacked")
 
-    mock.restore()
-    spyOn(TuiConfig, "get").mockRejectedValue(new Error("boom"))
-    await expect(resolveDiffStyle()).resolves.toBe("auto")
+    await expect(resolveDiffStyle(Promise.reject(new Error("boom")))).resolves.toBe("auto")
   })
 
   test("loads v2 providers and models for model selector data", async () => {
-    const sdk = new OpencodeClient()
+    const sdk = OpenCode.make({ baseUrl: "https://opencode.test" })
     const providers = [provider("openai", "OpenAI")]
     const models = [model("gpt-5", "openai", 128000, ["high", "minimal"])]
-    // The generated methods have conditional return types for throwOnError; these mocks represent the successful branch.
-    // @ts-expect-error successful SDK response is valid for both modes at runtime
-    const providerList = spyOn(sdk.v2.provider, "list").mockImplementation(() => ok({ data: providers }))
-    // @ts-expect-error successful SDK response is valid for both modes at runtime
-    spyOn(sdk.v2.model, "list").mockImplementation(() => ok({ data: models }))
+    const providerList = spyOn(sdk.provider, "list").mockImplementation(() => ok({ data: providers }) as never)
+    spyOn(sdk.model, "list").mockImplementation(() => ok({ data: models }) as never)
 
     await expect(resolveModelInfo(sdk, "/workspace", { providerID: "openai", modelID: "gpt-5" })).resolves.toEqual({
       providers: [
@@ -230,19 +212,15 @@ describe("run runtime boot", () => {
           directory: "/workspace",
         },
       },
-      { throwOnError: true },
     )
   })
 
   test("loads context limits across v2 providers", async () => {
-    const sdk = new OpencodeClient()
+    const sdk = OpenCode.make({ baseUrl: "https://opencode.test" })
     const providers = [provider("openai", "OpenAI"), provider("anthropic", "Anthropic")]
     const models = [model("gpt-5", "openai", 128000, ["high", "minimal"]), model("sonnet", "anthropic", 200000)]
-    // The generated methods have conditional return types for throwOnError; these mocks represent the successful branch.
-    // @ts-expect-error successful SDK response is valid for both modes at runtime
-    spyOn(sdk.v2.provider, "list").mockImplementation(() => ok({ data: providers }))
-    // @ts-expect-error successful SDK response is valid for both modes at runtime
-    spyOn(sdk.v2.model, "list").mockImplementation(() => ok({ data: models }))
+    spyOn(sdk.provider, "list").mockImplementation(() => ok({ data: providers }) as never)
+    spyOn(sdk.model, "list").mockImplementation(() => ok({ data: models }) as never)
 
     await expect(resolveModelInfo(sdk, "/workspace", { providerID: "openai", modelID: "gpt-5" })).resolves.toEqual({
       providers: [
diff --git a/packages/opencode/test/cli/run/runtime.queue.test.ts b/packages/opencode/test/cli/run/runtime.queue.test.ts
index 558373a35d..bdb80efc1d 100644
--- a/packages/opencode/test/cli/run/runtime.queue.test.ts
+++ b/packages/opencode/test/cli/run/runtime.queue.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test"
-import { runPromptQueue } from "@/cli/cmd/run/runtime.queue"
-import type { FooterApi, FooterEvent, RunPrompt, StreamCommit } from "@/cli/cmd/run/types"
+import { runPromptQueue } from "@opencode-ai/cli/mini/runtime.queue"
+import type { FooterApi, FooterEvent, RunPrompt, StreamCommit } from "@opencode-ai/cli/mini/types"
 
 function footer() {
   const prompts = new Set<(input: RunPrompt) => void>()
diff --git a/packages/opencode/test/cli/run/runtime.stdin.test.ts b/packages/opencode/test/cli/run/runtime.stdin.test.ts
index 7c4a10e82d..42e090e893 100644
--- a/packages/opencode/test/cli/run/runtime.stdin.test.ts
+++ b/packages/opencode/test/cli/run/runtime.stdin.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test"
 import { Readable } from "node:stream"
-import { INTERACTIVE_INPUT_ERROR, resolveInteractiveStdin } from "@/cli/cmd/run/runtime.stdin"
+import { INTERACTIVE_INPUT_ERROR, resolveInteractiveStdin } from "@opencode-ai/cli/mini/runtime.stdin"
 
 function stream(isTTY: boolean) {
   return Object.assign(new Readable({ read() {} }), { isTTY }) as NodeJS.ReadStream
diff --git a/packages/opencode/test/cli/run/runtime.test.ts b/packages/opencode/test/cli/run/runtime.test.ts
index c98a61b69b..fcba5842fe 100644
--- a/packages/opencode/test/cli/run/runtime.test.ts
+++ b/packages/opencode/test/cli/run/runtime.test.ts
@@ -1,7 +1,7 @@
 import { afterEach, describe, expect, mock, spyOn, test } from "bun:test"
-import { OpencodeClient } from "@opencode-ai/sdk/v2"
-import { runInteractiveMode } from "@/cli/cmd/run/runtime"
-import type { FooterApi, FooterEvent, RunProvider } from "@/cli/cmd/run/types"
+import { OpenCode } from "@opencode-ai/client/promise"
+import { runInteractiveDeferredMode, runInteractiveMode } from "@opencode-ai/cli/mini/runtime"
+import type { FooterApi, FooterEvent, RunProvider } from "@opencode-ai/cli/mini/types"
 
 const provider: RunProvider = {
   id: "openai",
@@ -45,12 +45,7 @@ function defer<T>() {
 }
 
 function ok<T>(data: T) {
-  return Promise.resolve({
-    data,
-    error: undefined,
-    request: new Request("https://opencode.test"),
-    response: new Response(),
-  })
+  return Promise.resolve(data)
 }
 
 function footer(events: FooterEvent[] = []): FooterApi {
@@ -110,16 +105,173 @@ afterEach(() => {
 })
 
 describe("run interactive runtime", () => {
+  test("resolves the deferred session only after first paint", async () => {
+    const sdk = OpenCode.make({ baseUrl: "https://opencode.test" })
+    const lifecycleStarted = defer<void>()
+    const painted = defer<void>()
+    const api = footer()
+    let resolved = 0
+    api.idle = () => painted.promise
+    spyOn(sdk.provider, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+    spyOn(sdk.model, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+    spyOn(sdk.agent, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+    spyOn(sdk.reference, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+    spyOn(sdk.command, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+    spyOn(sdk.skill, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+
+    const task = runInteractiveDeferredMode(
+      {
+        sdk,
+        directory: "/tmp",
+        resolveAgent: async () => "build",
+        session: async () => {
+          resolved++
+          api.close()
+          return { id: "ses-deferred", title: "Deferred" }
+        },
+        agent: "build",
+        model: { providerID: "openai", modelID: "gpt-5" },
+        variant: undefined,
+        files: [],
+        thinking: false,
+        backgroundSubagents: false,
+      },
+      {
+        createRuntimeLifecycle: async () => {
+          lifecycleStarted.resolve()
+          return {
+            footer: api,
+            onResize: () => () => {},
+            refreshTheme: () => {},
+            resetForReplay: () => Promise.resolve(),
+            close: () => Promise.resolve(),
+          }
+        },
+      },
+    )
+
+    await lifecycleStarted.promise
+    expect(resolved).toBe(0)
+    painted.resolve()
+    await task
+    expect(resolved).toBe(1)
+  })
+
+  test("restores deferred session history and model after first paint", async () => {
+    const sdk = OpenCode.make({ baseUrl: "https://opencode.test" })
+    const lifecycleStarted = defer<void>()
+    const painted = defer<void>()
+    const events: FooterEvent[] = []
+    const api = footer(events)
+    api.idle = () => painted.promise
+    const event = api.event
+    api.event = (value) => {
+      event(value)
+      if (value.type === "model") api.close()
+    }
+    spyOn(sdk.session, "get").mockImplementation(
+      () =>
+        ok({
+          id: "ses-resume",
+          projectID: "pro-1",
+          title: "Resume",
+          cost: 0,
+          tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+          time: { created: 1, updated: 1 },
+          location: { directory: "/tmp" },
+          model: { providerID: "openai", id: "gpt-5", variant: "high" },
+        }) as never,
+    )
+    spyOn(sdk.message, "list").mockImplementation(
+      () =>
+        ok({
+          data: [{ id: "msg-user", type: "user", text: "previous prompt", time: { created: 1 } }],
+          cursor: {},
+        }) as never,
+    )
+    spyOn(sdk.provider, "list").mockImplementation(
+      () =>
+        ok({
+          location: { directory: "/tmp" },
+          data: [{ id: "openai", name: "OpenAI", request: { headers: {}, body: {} } }],
+        }) as never,
+    )
+    spyOn(sdk.model, "list").mockImplementation(
+      () =>
+        ok({
+          location: { directory: "/tmp" },
+          data: [
+            {
+              id: "gpt-5",
+              providerID: "openai",
+              name: "Little Frank",
+              capabilities: { tools: true, input: ["text"], output: ["text"] },
+              request: { headers: {}, body: {} },
+              variants: [{ id: "high", settings: {}, headers: {}, body: {} }],
+              time: { released: 1 },
+              cost: [{ input: 0, output: 0, cache: { read: 0, write: 0 } }],
+              status: "active",
+              enabled: true,
+              limit: { context: 128000, output: 8192 },
+            },
+          ],
+        }) as never,
+    )
+    spyOn(sdk.agent, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+    spyOn(sdk.reference, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+    spyOn(sdk.command, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+    spyOn(sdk.skill, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+
+    const task = runInteractiveDeferredMode(
+      {
+        sdk,
+        directory: "/tmp",
+        resolveAgent: async () => "build",
+        session: async () => ({ id: "ses-resume", title: "Resume", resume: true }),
+        agent: "build",
+        model: undefined,
+        variant: undefined,
+        files: [],
+        thinking: false,
+        backgroundSubagents: false,
+      },
+      {
+        createRuntimeLifecycle: async () => {
+          lifecycleStarted.resolve()
+          return {
+            footer: api,
+            onResize: () => () => {},
+            refreshTheme: () => {},
+            resetForReplay: () => Promise.resolve(),
+            close: () => Promise.resolve(),
+          }
+        },
+      },
+    )
+
+    await lifecycleStarted.promise
+    expect(sdk.session.get).not.toHaveBeenCalled()
+    painted.resolve()
+    await task
+
+    expect(events).toContainEqual({
+      type: "history",
+      history: [{ text: "previous prompt", parts: [] }],
+    })
+    expect(events).toContainEqual({
+      type: "model",
+      model: "Little Frank · OpenAI · high",
+      selection: { providerID: "openai", modelID: "gpt-5" },
+    })
+  })
+
   test("waits for provider metadata before eager replay transport bootstrap", async () => {
     const providersStarted = defer<void>()
     const providers = defer<void>()
     const lifecycleModels: unknown[] = []
 
-    const sdk = new OpencodeClient()
-    const legacyProviders = spyOn(sdk.config, "providers").mockRejectedValue(new Error("legacy providers should stay unused"))
-    const legacyAgents = spyOn(sdk.app, "agents").mockRejectedValue(new Error("legacy agents should stay unused"))
-    const legacyCommands = spyOn(sdk.command, "list").mockRejectedValue(new Error("legacy commands should stay unused"))
-    spyOn(sdk.v2.provider, "list").mockImplementation(async () => {
+    const sdk = OpenCode.make({ baseUrl: "https://opencode.test" })
+    spyOn(sdk.provider, "list").mockImplementation(async () => {
       providersStarted.resolve()
       await providers.promise
       return ok({
@@ -142,55 +294,56 @@ describe("run interactive runtime", () => {
         ],
       }) as never
     })
-    spyOn(sdk.v2.model, "list").mockImplementation(() =>
-      ok({
-        location: {
-          directory: "/tmp",
-        },
-        data: [
-          {
-            id: "gpt-5",
-            providerID: "openai",
-            name: "Little Frank",
-            api: {
-              id: "openai",
-              type: "native",
-              settings: {},
-            },
-            capabilities: {
-              tools: true,
-              input: ["text"],
-              output: ["text"],
-            },
-            request: {
-              headers: {},
-              body: {},
-            },
-            variants: [],
-            time: {
-              released: 1,
-            },
-            cost: [
-              {
-                input: 0,
-                output: 0,
-                cache: {
-                  read: 0,
-                  write: 0,
-                },
-              },
-            ],
-            status: "active",
-            enabled: true,
-            limit: {
-              context: 128000,
-              output: 8192,
-            },
+    spyOn(sdk.model, "list").mockImplementation(
+      () =>
+        ok({
+          location: {
+            directory: "/tmp",
           },
-        ],
-      }) as never,
+          data: [
+            {
+              id: "gpt-5",
+              providerID: "openai",
+              name: "Little Frank",
+              api: {
+                id: "openai",
+                type: "native",
+                settings: {},
+              },
+              capabilities: {
+                tools: true,
+                input: ["text"],
+                output: ["text"],
+              },
+              request: {
+                headers: {},
+                body: {},
+              },
+              variants: [],
+              time: {
+                released: 1,
+              },
+              cost: [
+                {
+                  input: 0,
+                  output: 0,
+                  cache: {
+                    read: 0,
+                    write: 0,
+                  },
+                },
+              ],
+              status: "active",
+              enabled: true,
+              limit: {
+                context: 128000,
+                output: 8192,
+              },
+            },
+          ],
+        }) as never,
     )
-    spyOn(sdk.v2.session, "messages").mockImplementation(() =>
+    spyOn(sdk.message, "list").mockImplementation(() =>
       ok({
         data: [
           {
@@ -205,9 +358,9 @@ describe("run interactive runtime", () => {
         cursor: {},
       }),
     )
-    spyOn(sdk.v2.session, "get").mockImplementation(() =>
-      ok({
-        data: {
+    spyOn(sdk.session, "get").mockImplementation(
+      () =>
+        ok({
           id: "ses-1",
           projectID: "pro-1",
           title: "Session",
@@ -232,13 +385,12 @@ describe("run interactive runtime", () => {
             providerID: "openai",
             id: "gpt-5",
           },
-        },
-      }),
+        }) as never,
     )
-    spyOn(sdk.v2.agent, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
-    spyOn(sdk.v2.reference, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
-    spyOn(sdk.v2.command, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
-    spyOn(sdk.v2.skill, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+    spyOn(sdk.agent, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+    spyOn(sdk.reference, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+    spyOn(sdk.command, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+    spyOn(sdk.skill, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
 
     const task = runInteractiveMode(
       {
@@ -296,13 +448,10 @@ describe("run interactive runtime", () => {
 
     expect(lifecycleModels).toEqual([{ providerID: "openai", modelID: "gpt-5" }])
     expect(transportProviders).toEqual([[provider]])
-    expect(legacyProviders).not.toHaveBeenCalled()
-    expect(legacyAgents).not.toHaveBeenCalled()
-    expect(legacyCommands).not.toHaveBeenCalled()
   })
 
   test("defers catalog-selected model resolution until after first paint", async () => {
-    const sdk = new OpencodeClient()
+    const sdk = OpenCode.make({ baseUrl: "https://opencode.test" })
     const defaultStarted = defer<void>()
     const releaseDefault = defer<void>()
     const lifecycleStarted = defer<void>()
@@ -320,7 +469,7 @@ describe("run interactive runtime", () => {
       api.close()
     }
 
-    spyOn(sdk.v2.model, "default").mockImplementation(async () => {
+    spyOn(sdk.model, "default").mockImplementation(async () => {
       defaultRequested = true
       defaultStarted.resolve()
       await releaseDefault.promise
@@ -329,24 +478,12 @@ describe("run interactive runtime", () => {
         data: { id: "gpt-5", providerID: "openai" },
       }) as never
     })
-    spyOn(sdk.v2.provider, "list").mockImplementation(() =>
-      ok({ location: { directory: "/tmp" }, data: [] }) as never,
-    )
-    spyOn(sdk.v2.model, "list").mockImplementation(() =>
-      ok({ location: { directory: "/tmp" }, data: [] }) as never,
-    )
-    spyOn(sdk.v2.agent, "list").mockImplementation(() =>
-      ok({ location: { directory: "/tmp" }, data: [] }) as never,
-    )
-    spyOn(sdk.v2.reference, "list").mockImplementation(() =>
-      ok({ location: { directory: "/tmp" }, data: [] }) as never,
-    )
-    spyOn(sdk.v2.command, "list").mockImplementation(() =>
-      ok({ location: { directory: "/tmp" }, data: [] }) as never,
-    )
-    spyOn(sdk.v2.skill, "list").mockImplementation(() =>
-      ok({ location: { directory: "/tmp" }, data: [] }) as never,
-    )
+    spyOn(sdk.provider, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+    spyOn(sdk.model, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+    spyOn(sdk.agent, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+    spyOn(sdk.reference, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+    spyOn(sdk.command, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
+    spyOn(sdk.skill, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
 
     const task = runInteractiveMode(
       {
@@ -402,12 +539,12 @@ describe("run interactive runtime", () => {
   })
 
   test("does not start deferred work after the footer closes", async () => {
-    const sdk = new OpencodeClient()
+    const sdk = OpenCode.make({ baseUrl: "https://opencode.test" })
     const lifecycleStarted = defer<void>()
     const painted = defer<void>()
     const api = footer()
     api.idle = () => painted.promise
-    const defaultModel = spyOn(sdk.v2.model, "default")
+    const defaultModel = spyOn(sdk.model, "default")
 
     const task = runInteractiveMode(
       {
@@ -444,8 +581,50 @@ describe("run interactive runtime", () => {
     expect(defaultModel).not.toHaveBeenCalled()
   })
 
+  test("searches files through the V2 file API", async () => {
+    const sdk = OpenCode.make({ baseUrl: "https://opencode.test" })
+    const api = footer()
+    const find = spyOn(sdk.file, "find").mockImplementation(
+      () =>
+        ok({
+          location: { directory: "/tmp", project: { id: "proj_1", directory: "/tmp" } },
+          data: [{ path: "src/index.ts", type: "file" }],
+        }) as never,
+    )
+
+    await runInteractiveMode(
+      {
+        sdk,
+        directory: "/tmp",
+        sessionID: "ses-files",
+        resume: false,
+        agent: "build",
+        model: undefined,
+        variant: undefined,
+        files: [],
+        thinking: false,
+        backgroundSubagents: false,
+      },
+      {
+        createRuntimeLifecycle: async (input) => {
+          await expect(input.findFiles("index")).resolves.toEqual(["src/index.ts"])
+          api.close()
+          return {
+            footer: api,
+            onResize: () => () => {},
+            refreshTheme: () => {},
+            resetForReplay: () => Promise.resolve(),
+            close: () => Promise.resolve(),
+          }
+        },
+      },
+    )
+
+    expect(find).toHaveBeenCalledWith({ query: "index", type: "file", location: { directory: "/tmp" } })
+  })
+
   test("retains last-known-good state across failed coalesced refreshes and retries later", async () => {
-    const sdk = new OpencodeClient()
+    const sdk = OpenCode.make({ baseUrl: "https://opencode.test" })
     const refreshGate = defer<void>()
     let providerCalls = 0
     let modelCalls = 0
@@ -453,7 +632,7 @@ describe("run interactive runtime", () => {
     let referenceCalls = 0
     const events: FooterEvent[] = []
     const api = footer(events)
-    spyOn(sdk.v2.provider, "list").mockImplementation(async () => {
+    spyOn(sdk.provider, "list").mockImplementation(async () => {
       providerCalls++
       if (providerCalls === 2) {
         await refreshGate.promise
@@ -471,7 +650,7 @@ describe("run interactive runtime", () => {
         ],
       }) as never
     })
-    spyOn(sdk.v2.model, "list").mockImplementation(() => {
+    spyOn(sdk.model, "list").mockImplementation(() => {
       modelCalls++
       return ok({
         location: { directory: "/tmp" },
@@ -484,9 +663,7 @@ describe("run interactive runtime", () => {
             capabilities: { tools: true, input: ["text"], output: ["text"] },
             request: { headers: {}, body: {} },
             variants:
-              modelCalls >= 4
-                ? []
-                : [{ id: modelCalls >= 3 ? "high" : "low", settings: {}, headers: {}, body: {} }],
+              modelCalls >= 4 ? [] : [{ id: modelCalls >= 3 ? "high" : "low", settings: {}, headers: {}, body: {} }],
             time: { released: 1 },
             cost: [{ input: 0, output: 0, cache: { read: 0, write: 0 } }],
             status: "active",
@@ -496,7 +673,7 @@ describe("run interactive runtime", () => {
         ],
       }) as never
     })
-    spyOn(sdk.v2.agent, "list").mockImplementation(async () => {
+    spyOn(sdk.agent, "list").mockImplementation(async () => {
       agentCalls++
       if (agentCalls === 2) throw new Error("agent refresh failed")
       return ok({
@@ -504,7 +681,7 @@ describe("run interactive runtime", () => {
         data: [{ id: "build", description: agentCalls >= 3 ? "Refreshed agent" : "Agent", mode: "primary" }],
       }) as never
     })
-    spyOn(sdk.v2.reference, "list").mockImplementation(() => {
+    spyOn(sdk.reference, "list").mockImplementation(() => {
       referenceCalls++
       return ok({
         location: { directory: "/tmp" },
@@ -513,12 +690,10 @@ describe("run interactive runtime", () => {
         ],
       }) as never
     })
-    spyOn(sdk.v2.command, "list").mockImplementation(() =>
-      ok({ location: { directory: "/tmp" }, data: [{ name: "check", description: "Check" }] }) as never,
-    )
-    spyOn(sdk.v2.skill, "list").mockImplementation(() =>
-      ok({ location: { directory: "/tmp" }, data: [] }) as never,
+    spyOn(sdk.command, "list").mockImplementation(
+      () => ok({ location: { directory: "/tmp" }, data: [{ name: "check", description: "Check" }] }) as never,
     )
+    spyOn(sdk.skill, "list").mockImplementation(() => ok({ location: { directory: "/tmp" }, data: [] }) as never)
     let finalProviders: RunProvider[] = []
     let finalLimits: Record<string, number> = {}
     let retainedProviders: RunProvider[] = []
diff --git a/packages/opencode/test/cli/run/scrollback.surface.test.ts b/packages/opencode/test/cli/run/scrollback.surface.test.ts
index 7406d36cbb..abe40559ed 100644
--- a/packages/opencode/test/cli/run/scrollback.surface.test.ts
+++ b/packages/opencode/test/cli/run/scrollback.surface.test.ts
@@ -2,9 +2,9 @@ import { afterEach, expect, test } from "bun:test"
 import type { ToolPart } from "@opencode-ai/sdk/v2"
 import { RGBA, SyntaxStyle } from "@opentui/core"
 import { MockTreeSitterClient, createTestRenderer, type TestRenderer } from "@opentui/core/testing"
-import { RunScrollbackStream } from "@/cli/cmd/run/scrollback.surface"
-import { RUN_THEME_FALLBACK, type RunTheme } from "@/cli/cmd/run/theme"
-import type { StreamCommit } from "@/cli/cmd/run/types"
+import { RunScrollbackStream } from "@opencode-ai/cli/mini/scrollback.surface"
+import { RUN_THEME_FALLBACK, type RunTheme } from "@opencode-ai/cli/mini/theme"
+import type { StreamCommit } from "@opencode-ai/cli/mini/types"
 
 type ClaimedCommit = {
   snapshot: {
diff --git a/packages/opencode/test/cli/run/session-data.test.ts b/packages/opencode/test/cli/run/session-data.test.ts
index 1483356986..b1fa17df13 100644
--- a/packages/opencode/test/cli/run/session-data.test.ts
+++ b/packages/opencode/test/cli/run/session-data.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test"
 import type { Event } from "@opencode-ai/sdk/v2"
-import { createSessionData, reduceSessionData } from "@/cli/cmd/run/session-data"
-import type { StreamCommit } from "@/cli/cmd/run/types"
+import { createSessionData, reduceSessionData } from "@opencode-ai/cli/mini/session-data"
+import type { StreamCommit } from "@opencode-ai/cli/mini/types"
 
 function reduce(data: ReturnType<typeof createSessionData>, event: unknown, thinking = true) {
   return reduceSessionData({
diff --git a/packages/opencode/test/cli/run/session.shared.test.ts b/packages/opencode/test/cli/run/session.shared.test.ts
index 102a53ba50..2e098581ac 100644
--- a/packages/opencode/test/cli/run/session.shared.test.ts
+++ b/packages/opencode/test/cli/run/session.shared.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, mock, spyOn, test } from "bun:test"
-import { OpencodeClient } from "@opencode-ai/sdk/v2"
+import { OpenCode } from "@opencode-ai/client/promise"
 import {
   createSession,
   resolveCurrentSession,
@@ -7,7 +7,7 @@ import {
   sessionVariant,
   type RunSession,
   type SessionMessages,
-} from "@/cli/cmd/run/session.shared"
+} from "@opencode-ai/cli/mini/session.shared"
 
 type Message = SessionMessages[number]
 type Part = Message["parts"][number]
@@ -252,11 +252,10 @@ describe("run session shared", () => {
   })
 
   test("restores current prompt history from stored text and file references", async () => {
-    const client = new OpencodeClient()
-    spyOn(client.v2.session, "messages").mockImplementation(() =>
+    const client = OpenCode.make({ baseUrl: "https://opencode.test" })
+    spyOn(client.message, "list").mockImplementation(() =>
       Promise.resolve({
-        data: {
-          data: [
+        data: [
             {
               id: "msg_prompt",
               type: "user",
@@ -272,32 +271,20 @@ describe("run session shared", () => {
               agents: [],
               time: { created: 1 },
             },
-          ],
-          cursor: {},
-        },
-        error: undefined,
-        request: new Request("https://opencode.test"),
-        response: new Response(),
+        ],
+        cursor: {},
       }),
     )
-    spyOn(client.v2.session, "get").mockImplementation(() =>
+    spyOn(client.session, "get").mockImplementation(() =>
       Promise.resolve({
-        data: {
-          data: {
-            id: "ses_1",
-            title: "Session",
-            version: "dev",
-            projectID: "proj_1",
-            location: { directory: "/tmp", project: { id: "proj_1", directory: "/tmp" } },
-            time: { created: 1, updated: 1 },
-            cost: 0,
-            tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
-            model: { providerID: "openai", id: "gpt-5", variant: "high" },
-          },
-        },
-        error: undefined,
-        request: new Request("https://opencode.test"),
-        response: new Response(),
+        id: "ses_1",
+        title: "Session",
+        projectID: "proj_1",
+        location: { directory: "/tmp" },
+        time: { created: 1, updated: 1 },
+        cost: 0,
+        tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+        model: { providerID: "openai", id: "gpt-5", variant: "high" },
       }),
     )
 
diff --git a/packages/opencode/test/cli/run/stream-v2.transport.test.ts b/packages/opencode/test/cli/run/stream-v2.transport.test.ts
index cd43fda2de..d191419e5c 100644
--- a/packages/opencode/test/cli/run/stream-v2.transport.test.ts
+++ b/packages/opencode/test/cli/run/stream-v2.transport.test.ts
@@ -2,12 +2,12 @@ import { afterEach, describe, expect, mock, spyOn, test } from "bun:test"
 import fs from "fs/promises"
 import path from "path"
 import { pathToFileURL } from "node:url"
-import { OpencodeClient, type V2Event } from "@opencode-ai/sdk/v2"
-import { createSessionTransport } from "@/cli/cmd/run/stream-v2.transport"
-import type { FooterApi, FooterEvent, StreamCommit } from "@/cli/cmd/run/types"
+import { OpenCode, type EventSubscribeOutput, type MessageListOutput, type OpenCodeClient } from "@opencode-ai/client/promise"
+import { createSessionTransport } from "@opencode-ai/cli/mini/stream-v2.transport"
+import type { FooterApi, FooterEvent, StreamCommit } from "@opencode-ai/cli/mini/types"
 import { tmpdir } from "../../fixture/fixture"
 
-type RunV2Event = V2Event
+type RunV2Event = EventSubscribeOutput
 
 function feed() {
   const values: RunV2Event[] = []
@@ -41,16 +41,11 @@ function feed() {
 }
 
 function ok<T>(data: T) {
-  return Promise.resolve({
-    data,
-    error: undefined,
-    request: new Request("https://opencode.test"),
-    response: new Response(),
-  })
+  return Promise.resolve(data)
 }
 
 function connected(id = "evt_connected") {
-  return { id, created: 0, type: "server.connected", data: {} } satisfies RunV2Event
+  return { id, type: "server.connected", data: {} } satisfies RunV2Event
 }
 
 function durable(sessionID: string, seq = 0, version = 1) {
@@ -85,9 +80,7 @@ function footer() {
   return { api, commits, events }
 }
 
-type SessionMessages = NonNullable<
-  Awaited<ReturnType<OpencodeClient["v2"]["session"]["messages"]>>["data"]
->["data"][number][]
+type SessionMessages = MessageListOutput["data"]
 
 function sdk(input: {
   streams: ReturnType<typeof feed>[]
@@ -95,15 +88,10 @@ function sdk(input: {
   messages?: Record<string, SessionMessages>
   sessions?: Array<{ id: string; parentID?: string; title?: string; agent?: string; time: { updated: number } }>
 }) {
-  const client = new OpencodeClient()
+  const client = OpenCode.make({ baseUrl: "https://opencode.test" })
   let subscription = 0
-  spyOn(client.v2.event, "subscribe").mockImplementation(
-    () =>
-      Promise.resolve({ stream: input.streams[subscription++]?.stream ?? feed().stream }) as ReturnType<
-        typeof client.v2.event.subscribe
-      >,
-  )
-  spyOn(client.v2.session, "messages").mockImplementation((request) =>
+  spyOn(client.event, "subscribe").mockImplementation(() => input.streams[subscription++]?.stream ?? feed().stream)
+  spyOn(client.message, "list").mockImplementation((request) =>
     ok({
       data: input.messages?.[request.sessionID] ?? [
         {
@@ -118,14 +106,14 @@ function sdk(input: {
       cursor: {},
     }),
   )
-  spyOn(client.v2.session.permission, "list").mockImplementation(() => ok({ data: [] }))
-  spyOn(client.v2.session.question, "list").mockImplementation(() => ok({ data: [] }))
-  spyOn(client.v2.session, "active").mockImplementation(() => ok({ data: input.active?.() ?? {}, watermarks: {} }))
-  spyOn(client.v2.session, "switchAgent").mockImplementation(() => ok(undefined))
-  spyOn(client.v2.session, "switchModel").mockImplementation(() => ok(undefined))
+  spyOn(client.permission, "list").mockImplementation(() => ok([]))
+  spyOn(client.question, "list").mockImplementation(() => ok([]))
+  spyOn(client.session, "active").mockImplementation(() => ok({ data: input.active?.() ?? {}, watermarks: {} }))
+  spyOn(client.session, "switchAgent").mockImplementation(() => ok(undefined))
+  spyOn(client.session, "switchModel").mockImplementation(() => ok(undefined))
   // The generated methods have conditional return types for throwOnError; the
   // minimal shapes below are enough for family discovery and model fallback.
-  spyOn(client.v2.session, "list").mockImplementation((request) => {
+  spyOn(client.session, "list").mockImplementation((request) => {
     const parentID = request?.parentID
     return ok({
       location: { directory: "/tmp", project: { id: "proj_1", directory: "/tmp" } },
@@ -139,7 +127,7 @@ function sdk(input: {
         ) ?? [],
     }) as never
   })
-  spyOn(client.v2.model, "default").mockImplementation(
+  spyOn(client.model, "default").mockImplementation(
     () =>
       ok({
         location: { directory: "/tmp", project: { id: "proj_1", directory: "/tmp" } },
@@ -170,9 +158,7 @@ describe("V2 mini transport", () => {
     expect(ui.commits.map((item) => item.text)).toEqual(["previous prompt"])
 
     let admitted = false
-    // The generated method has conditional return types for throwOnError; this mock represents the successful branch.
-    // @ts-expect-error successful SDK response is valid for both modes at runtime
-    spyOn(client.v2.session, "prompt").mockImplementation((request) => {
+    spyOn(client.session, "prompt").mockImplementation((request) => {
       const messageID = request.id ?? "msg_prompt"
       const prompt = request.prompt ?? { text: "" }
       admitted = true
@@ -185,7 +171,7 @@ describe("V2 mini transport", () => {
           delivery: "steer" as const,
           timeCreated: 2,
         },
-      })
+      }) as never
     })
 
     const turn = transport.runPromptTurn({
@@ -250,10 +236,8 @@ describe("V2 mini transport", () => {
       limits: () => ({}),
       footer: ui.api,
     })
-    let request: Parameters<OpencodeClient["v2"]["session"]["prompt"]>[0] | undefined
-    // The generated method has conditional return types for throwOnError; this mock represents the successful branch.
-    // @ts-expect-error successful SDK response is valid for both modes at runtime
-    spyOn(client.v2.session, "prompt").mockImplementation((input) => {
+    let request: Parameters<OpenCodeClient["session"]["prompt"]>[0] | undefined
+    spyOn(client.session, "prompt").mockImplementation((input) => {
       request = input
       queueMicrotask(() => {
         events.push({
@@ -282,7 +266,7 @@ describe("V2 mini transport", () => {
           delivery: "steer" as const,
           timeCreated: 2,
         },
-      })
+      }) as never
     })
 
     await transport.runPromptTurn({
@@ -344,10 +328,10 @@ describe("V2 mini transport", () => {
       limits: () => ({}),
       footer: ui.api,
     })
-    let request: Parameters<OpencodeClient["v2"]["session"]["prompt"]>[0] | undefined
+    let request: Parameters<OpenCodeClient["session"]["prompt"]>[0] | undefined
     // The generated method has conditional return types for throwOnError; this mock represents the successful branch.
     // @ts-expect-error successful SDK response is valid for both modes at runtime
-    spyOn(client.v2.session, "prompt").mockImplementation((input) => {
+    spyOn(client.session, "prompt").mockImplementation((input) => {
       request = input
       queueMicrotask(() => {
         events.push({
@@ -441,10 +425,10 @@ describe("V2 mini transport", () => {
       limits: () => ({}),
       footer: ui.api,
     })
-    let request: Parameters<OpencodeClient["v2"]["session"]["prompt"]>[0] | undefined
+    let request: Parameters<OpenCodeClient["session"]["prompt"]>[0] | undefined
     // The generated method has conditional return types for throwOnError; this mock represents the successful branch.
     // @ts-expect-error successful SDK response is valid for both modes at runtime
-    spyOn(client.v2.session, "prompt").mockImplementation((input) => {
+    spyOn(client.session, "prompt").mockImplementation((input) => {
       request = input
       queueMicrotask(() => {
         events.push({
@@ -561,7 +545,7 @@ describe("V2 mini transport", () => {
       },
     })
     let projected = false
-    spyOn(client.v2.session, "messages").mockImplementation(() =>
+    spyOn(client.message, "list").mockImplementation(() =>
       ok({
         data: projected
           ? [
@@ -589,7 +573,7 @@ describe("V2 mini transport", () => {
     let admitted = false
     // The generated method has conditional return types for throwOnError; this mock represents the successful branch.
     // @ts-expect-error successful SDK response is valid for both modes at runtime
-    spyOn(client.v2.session, "prompt").mockImplementation((request) => {
+    spyOn(client.session, "prompt").mockImplementation((request) => {
       const messageID = request.id ?? "msg_prompt"
       const prompt = request.prompt ?? { text: "" }
       admitted = true
@@ -632,7 +616,7 @@ describe("V2 mini transport", () => {
         return active
       },
     })
-    spyOn(client.v2.session, "messages").mockImplementation(() =>
+    spyOn(client.message, "list").mockImplementation(() =>
       ok({
         data: projected
           ? [
@@ -661,7 +645,7 @@ describe("V2 mini transport", () => {
     let admitted = false
     // The generated method has conditional return types for throwOnError; this mock represents the successful branch.
     // @ts-expect-error successful SDK response is valid for both modes at runtime
-    spyOn(client.v2.session, "prompt").mockImplementation((request) => {
+    spyOn(client.session, "prompt").mockImplementation((request) => {
       const messageID = request.id ?? "msg_prompt"
       const prompt = request.prompt ?? { text: "" }
       admitted = true
@@ -701,7 +685,7 @@ describe("V2 mini transport", () => {
       limits: () => ({}),
       footer: ui.api,
     })
-    spyOn(client.v2.session, "messages").mockImplementation(() =>
+    spyOn(client.message, "list").mockImplementation(() =>
       ok({
         data: [
           {
@@ -745,7 +729,7 @@ describe("V2 mini transport", () => {
     const events = feed()
     events.push(connected())
     const client = sdk({ streams: [events] })
-    spyOn(client.v2.session, "messages").mockImplementation(() =>
+    spyOn(client.message, "list").mockImplementation(() =>
       ok({
         data: [
           {
@@ -842,7 +826,7 @@ describe("V2 mini transport", () => {
     let admitted = false
     // The generated method has conditional return types for throwOnError; this mock represents the successful branch.
     // @ts-expect-error successful SDK response is valid for both modes at runtime
-    spyOn(client.v2.session, "prompt").mockImplementation((request) => {
+    spyOn(client.session, "prompt").mockImplementation((request) => {
       const messageID = request.id ?? "msg_prompt"
       const prompt = request.prompt ?? { text: "" }
       admitted = true
@@ -850,7 +834,7 @@ describe("V2 mini transport", () => {
         data: { admittedSeq: 1, id: messageID, sessionID: "ses_1", prompt, delivery: "steer" as const, timeCreated: 2 },
       })
     })
-    const interrupted = spyOn(client.v2.session, "interrupt").mockImplementation(() => ok(undefined))
+    const interrupted = spyOn(client.session, "interrupt").mockImplementation(() => ok(undefined))
 
     const turn = transport.runPromptTurn({
       agent: undefined,
@@ -886,21 +870,19 @@ describe("V2 mini transport", () => {
       limits: () => ({}),
       footer: ui.api,
     })
-    // The generated method has conditional return types for throwOnError; the test only needs the nested model field.
-    // @ts-expect-error minimal session shape is enough for this lookup
-    spyOn(client.v2.session, "get").mockImplementation(() => ok({ data: { model: undefined } }))
-    spyOn(client.v2.model, "default").mockImplementation(
+    spyOn(client.session, "get").mockImplementation(() => ok({ model: undefined }) as never)
+    spyOn(client.model, "default").mockImplementation(
       () =>
         ok({
           location: { directory: "/tmp", project: { id: "proj_1", directory: "/tmp" } },
           data: { id: "gpt-5", providerID: "openai" },
         }) as never,
     )
-    const switched = spyOn(client.v2.session, "switchModel").mockImplementation(() => ok(undefined))
+    const switched = spyOn(client.session, "switchModel").mockImplementation(() => ok(undefined))
     let admitted = false
     // The generated method has conditional return types for throwOnError; this mock represents the successful branch.
     // @ts-expect-error successful SDK response is valid for both modes at runtime
-    spyOn(client.v2.session, "prompt").mockImplementation((request) => {
+    spyOn(client.session, "prompt").mockImplementation((request) => {
       const messageID = request.id ?? "msg_prompt"
       const prompt = request.prompt ?? { text: "" }
       admitted = true
@@ -938,7 +920,7 @@ describe("V2 mini transport", () => {
 
     expect(switched).toHaveBeenCalledWith(
       { sessionID: "ses_1", model: { providerID: "openai", id: "gpt-5", variant: "high" } },
-      expect.objectContaining({ throwOnError: true }),
+      { signal: undefined },
     )
     await transport.close()
   })
@@ -958,7 +940,7 @@ describe("V2 mini transport", () => {
     let admitted = false
     // The generated method has conditional return types for throwOnError; this mock represents the successful branch.
     // @ts-expect-error successful SDK response is valid for both modes at runtime
-    spyOn(client.v2.session, "prompt").mockImplementation((request) => {
+    spyOn(client.session, "prompt").mockImplementation((request) => {
       const messageID = request.id ?? "msg_prompt"
       const prompt = request.prompt ?? { text: "" }
       admitted = true
@@ -966,7 +948,7 @@ describe("V2 mini transport", () => {
         data: { admittedSeq: 1, id: messageID, sessionID: "ses_1", prompt, delivery: "steer" as const, timeCreated: 2 },
       })
     })
-    const interrupted = spyOn(client.v2.session, "interrupt").mockImplementation(() => ok(undefined))
+    const interrupted = spyOn(client.session, "interrupt").mockImplementation(() => ok(undefined))
     const controller = new AbortController()
     const turn = transport.runPromptTurn({
       agent: undefined,
@@ -1014,8 +996,8 @@ describe("V2 mini transport", () => {
       limits: () => ({}),
       footer: ui.api,
     })
-    let request: Parameters<OpencodeClient["v2"]["session"]["shell"]>[0] | undefined
-    spyOn(client.v2.session, "shell").mockImplementation((input) => {
+    let request: Parameters<OpenCodeClient["session"]["shell"]>[0] | undefined
+    spyOn(client.session, "shell").mockImplementation((input) => {
       request = input
       queueMicrotask(() => {
         events.push({
@@ -1094,7 +1076,7 @@ describe("V2 mini transport", () => {
     })
     let started = false
     let aborted = false
-    spyOn(client.v2.session, "shell").mockImplementation(
+    spyOn(client.session, "shell").mockImplementation(
       (_input, options) =>
         new Promise((_, reject) => {
           started = true
@@ -1104,7 +1086,7 @@ describe("V2 mini transport", () => {
           })
         }) as never,
     )
-    const interrupted = spyOn(client.v2.session, "interrupt").mockImplementation(() => ok(undefined))
+    const interrupted = spyOn(client.session, "interrupt").mockImplementation(() => ok(undefined))
 
     const turn = transport.runPromptTurn({
       agent: undefined,
@@ -1135,9 +1117,9 @@ describe("V2 mini transport", () => {
       limits: () => ({}),
       footer: ui.api,
     })
-    let request: Parameters<OpencodeClient["v2"]["session"]["shell"]>[0] | undefined
+    let request: Parameters<OpenCodeClient["session"]["shell"]>[0] | undefined
     let complete!: () => void
-    spyOn(client.v2.session, "shell").mockImplementation((input) => {
+    spyOn(client.session, "shell").mockImplementation((input) => {
       request = input
       return new Promise<void>((resolve) => {
         complete = resolve
@@ -1414,8 +1396,8 @@ describe("V2 mini transport", () => {
       limits: () => ({}),
       footer: ui.api,
     })
-    let request: Parameters<OpencodeClient["v2"]["session"]["command"]>[0] | undefined
-    spyOn(client.v2.session, "command").mockImplementation((input) => {
+    let request: Parameters<OpenCodeClient["session"]["command"]>[0] | undefined
+    spyOn(client.session, "command").mockImplementation((input) => {
       request = input
       queueMicrotask(() => {
         events.push({
@@ -1436,14 +1418,12 @@ describe("V2 mini transport", () => {
         })
       })
       return ok({
-        data: {
-          admittedSeq: 1,
-          id: input.id ?? "msg_cmd",
-          sessionID: "ses_1",
-          prompt: { text: "evaluated template" },
-          delivery: "steer" as const,
-          timeCreated: 2,
-        },
+        admittedSeq: 1,
+        id: input.id ?? "msg_cmd",
+        sessionID: "ses_1",
+        prompt: { text: "evaluated template" },
+        delivery: "steer" as const,
+        timeCreated: 2,
       })
     })
 
@@ -1471,8 +1451,8 @@ describe("V2 mini transport", () => {
       delivery: "steer",
     })
     // Selection rides the command payload; no separate client-side switch.
-    expect(client.v2.session.switchAgent).not.toHaveBeenCalled()
-    expect(client.v2.session.switchModel).not.toHaveBeenCalled()
+    expect(client.session.switchAgent).not.toHaveBeenCalled()
+    expect(client.session.switchModel).not.toHaveBeenCalled()
     await transport.close()
   })
 
@@ -1488,10 +1468,10 @@ describe("V2 mini transport", () => {
       limits: () => ({}),
       footer: ui.api,
     })
-    let request: Parameters<OpencodeClient["v2"]["session"]["skill"]>[0] | undefined
-    const command = spyOn(client.v2.session, "command")
-    const prompt = spyOn(client.v2.session, "prompt")
-    spyOn(client.v2.session, "skill").mockImplementation((input) => {
+    let request: Parameters<OpenCodeClient["session"]["skill"]>[0] | undefined
+    const command = spyOn(client.session, "command")
+    const prompt = spyOn(client.session, "prompt")
+    spyOn(client.session, "skill").mockImplementation((input) => {
       request = input
       queueMicrotask(() => {
         events.push({
@@ -1551,7 +1531,7 @@ describe("V2 mini transport", () => {
       footer: ui.api,
     })
     let sent = false
-    spyOn(client.v2.session, "skill").mockImplementation(() => {
+    spyOn(client.session, "skill").mockImplementation(() => {
       sent = true
       return ok(undefined) as never
     })
@@ -1721,20 +1701,18 @@ describe("V2 mini transport", () => {
         ],
       },
     })
-    spyOn(client.v2.session, "get").mockImplementation(() =>
+    spyOn(client.session, "get").mockImplementation(() =>
       ok({
-        data: {
-          id: "ses_child",
-          parentID: "ses_1",
-          projectID: "proj_1",
-          agent: "explore",
-          cost: 0,
-          tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
-          time: { created: 1, updated: 1 },
-          title: "Find files",
-          location: { directory: "/tmp", project: { id: "proj_1", directory: "/tmp" } },
-        },
-      }),
+        id: "ses_child",
+        parentID: "ses_1",
+        projectID: "proj_1",
+        agent: "explore",
+        cost: 0,
+        tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+        time: { created: 1, updated: 1 },
+        title: "Find files",
+        location: { directory: "/tmp" },
+      }) as never,
     )
     const ui = footer()
     const transport = await createSessionTransport({
@@ -1857,7 +1835,7 @@ describe("V2 mini transport", () => {
     const hydration = new Promise<void>((resolve) => {
       releaseHydration = resolve
     })
-    spyOn(client.v2.session, "messages").mockImplementation(async (request) => {
+    spyOn(client.message, "list").mockImplementation(async (request) => {
       if (request.sessionID === "ses_child") {
         childHydrating = true
         await hydration
@@ -1927,7 +1905,7 @@ describe("V2 mini transport", () => {
     const retry = new Promise<void>((resolve) => {
       releaseRetry = resolve
     })
-    spyOn(client.v2.session, "messages").mockImplementation(async (request) => {
+    spyOn(client.message, "list").mockImplementation(async (request) => {
       if (request.sessionID !== "ses_child") return ok({ data: [], cursor: {} })
       childRequests++
       if (childRequests === 1) {
@@ -2006,7 +1984,7 @@ describe("V2 mini transport", () => {
     const hydration = new Promise<void>((resolve) => {
       releaseHydration = resolve
     })
-    spyOn(client.v2.session, "messages").mockImplementation(async (request) => {
+    spyOn(client.message, "list").mockImplementation(async (request) => {
       if (request.sessionID !== "ses_child") return ok({ data: [], cursor: {} })
       childHydrating = true
       await hydration
@@ -2119,21 +2097,19 @@ describe("V2 mini transport", () => {
     const gate = new Promise<void>((resolve) => {
       resolveGet = resolve
     })
-    spyOn(client.v2.session, "get").mockImplementation(async () => {
+    spyOn(client.session, "get").mockImplementation(async () => {
       await gate
       return ok({
-        data: {
-          id: "ses_child",
-          parentID: "ses_1",
-          projectID: "proj_1",
-          agent: "explore",
-          cost: 0,
-          tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
-          time: { created: 1, updated: 1 },
-          title: "Find files",
-          location: { directory: "/tmp", project: { id: "proj_1", directory: "/tmp" } },
-        },
-      })
+        id: "ses_child",
+        parentID: "ses_1",
+        projectID: "proj_1",
+        agent: "explore",
+        cost: 0,
+        tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+        time: { created: 1, updated: 1 },
+        title: "Find files",
+        location: { directory: "/tmp" },
+      }) as never
     })
     const ui = footer()
     const transport = await createSessionTransport({
@@ -2178,21 +2154,19 @@ describe("V2 mini transport", () => {
     const gate = new Promise<void>((resolve) => {
       resolveGet = resolve
     })
-    spyOn(client.v2.session, "get").mockImplementation(async () => {
+    spyOn(client.session, "get").mockImplementation(async () => {
       await gate
       return ok({
-        data: {
-          id: "ses_child",
-          parentID: "ses_1",
-          projectID: "proj_1",
-          agent: "explore",
-          cost: 0,
-          tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
-          time: { created: 1, updated: 1 },
-          title: "Find files",
-          location: { directory: "/tmp", project: { id: "proj_1", directory: "/tmp" } },
-        },
-      })
+        id: "ses_child",
+        parentID: "ses_1",
+        projectID: "proj_1",
+        agent: "explore",
+        cost: 0,
+        tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+        time: { created: 1, updated: 1 },
+        title: "Find files",
+        location: { directory: "/tmp" },
+      }) as never
     })
     const ui = footer()
     const transport = await createSessionTransport({
@@ -2286,10 +2260,7 @@ describe("V2 mini transport", () => {
       footer: ui.api,
     })
     const states = ui.events.flatMap((event) => (event.type === "stream.subagent" ? [event.state] : []))
-    expect(client.v2.session.list).toHaveBeenCalledWith(
-      { parentID: "ses_1", limit: 100, order: "desc" },
-      { throwOnError: true },
-    )
+    expect(client.session.list).toHaveBeenCalledWith({ parentID: "ses_1", limit: 100, order: "desc" })
     expect(states.at(-1)?.tabs).toMatchObject([
       {
         sessionID: "ses_child_old",
diff --git a/packages/opencode/test/cli/run/stream.test.ts b/packages/opencode/test/cli/run/stream.test.ts
index e6b40dd925..8e02b7cf48 100644
--- a/packages/opencode/test/cli/run/stream.test.ts
+++ b/packages/opencode/test/cli/run/stream.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test"
-import { writeSessionOutput } from "@/cli/cmd/run/stream"
-import type { FooterApi, FooterEvent, StreamCommit } from "@/cli/cmd/run/types"
+import { writeSessionOutput } from "@opencode-ai/cli/mini/stream"
+import type { FooterApi, FooterEvent, StreamCommit } from "@opencode-ai/cli/mini/types"
 
 function footer() {
   const events: FooterEvent[] = []
diff --git a/packages/opencode/test/cli/run/theme.test.ts b/packages/opencode/test/cli/run/theme.test.ts
index 4102dea1c9..52b8fc6439 100644
--- a/packages/opencode/test/cli/run/theme.test.ts
+++ b/packages/opencode/test/cli/run/theme.test.ts
@@ -1,6 +1,6 @@
 import { expect, test } from "bun:test"
 import { RGBA, type CliRenderer, type TerminalColors } from "@opentui/core"
-import { RUN_THEME_FALLBACK, generateSystem, resolveRunTheme, resolveTheme } from "@/cli/cmd/run/theme"
+import { RUN_THEME_FALLBACK, generateSystem, resolveRunTheme, resolveTheme } from "@opencode-ai/cli/mini/theme"
 
 const palette = ["#15161e", "#f7768e", "#9ece6a", "#e0af68", "#7aa2f7", "#bb9af7", "#7dcfff", "#c0caf5"] as const
 
diff --git a/packages/opencode/test/cli/run/variant.shared.test.ts b/packages/opencode/test/cli/run/variant.shared.test.ts
index e05c9888bb..70e565670f 100644
--- a/packages/opencode/test/cli/run/variant.shared.test.ts
+++ b/packages/opencode/test/cli/run/variant.shared.test.ts
@@ -10,9 +10,9 @@ import {
   formatModelLabel,
   pickVariant,
   resolveVariant,
-} from "@/cli/cmd/run/variant.shared"
-import type { SessionMessages } from "@/cli/cmd/run/session.shared"
-import type { RunProvider } from "@/cli/cmd/run/types"
+} from "@opencode-ai/cli/mini/variant.shared"
+import type { SessionMessages } from "@opencode-ai/cli/mini/session.shared"
+import type { RunProvider } from "@opencode-ai/cli/mini/types"
 import { testEffect } from "../../lib/effect"
 
 const model = {
diff --git a/packages/opencode/test/cli/tui/thread.test.ts b/packages/opencode/test/cli/tui/thread.test.ts
index a358eddb31..6d35900640 100644
--- a/packages/opencode/test/cli/tui/thread.test.ts
+++ b/packages/opencode/test/cli/tui/thread.test.ts
@@ -4,7 +4,6 @@ import fs from "fs/promises"
 import path from "path"
 import yargs from "yargs"
 import { tmpdir } from "../../fixture/fixture"
-import { MiniLocalCommand } from "../../../src/cli/cmd/mini"
 import { TuiThreadCommand, resolveThreadDirectory } from "../../../src/cli/cmd/tui"
 import { cliIt } from "../../lib/cli-process"
 
@@ -38,7 +37,7 @@ describe("tui thread", () => {
     await check(".")
   })
 
-  test("resolves a relative mini project from PWD when cwd differs", async () => {
+  test("resolves a relative project from PWD when cwd differs", async () => {
     await using pwd = await tmpdir({ git: true })
     await using cwd = await tmpdir({ git: true })
 
@@ -46,18 +45,6 @@ describe("tui thread", () => {
     expect(resolveThreadDirectory(undefined, pwd.path, cwd.path)).toBe(cwd.path)
   })
 
-  test("parses supported mini --no-replay forms", async () => {
-    for (const option of ["--no-replay", "--no-replay=true", "--noReplay"]) {
-      const args = await yargs([])
-        .command({ ...MiniLocalCommand, handler: () => {} })
-        .exitProcess(false)
-        .parse([option, "--replay-limit", "10"])
-
-      expect(args.replay === false || args.noReplay === true).toBe(true)
-      expect(args.replayLimit).toBe(10)
-    }
-  })
-
   test("preserves boolean negation for existing options", async () => {
     const args = await yargs([])
       .command({ ...TuiThreadCommand, handler: () => {} })
@@ -85,24 +72,6 @@ describe("tui thread", () => {
     }),
   )
 
-  cliIt.live("routes local sessions through mini", ({ opencode }) =>
-    Effect.gen(function* () {
-      const result = yield* opencode.spawn(["mini"])
-
-      opencode.expectExit(result, 1)
-      expect(result.stderr).toContain("opencode mini requires a TTY stdout")
-    }),
-  )
-
-  cliIt.live("routes attached sessions through mini attach", ({ opencode }) =>
-    Effect.gen(function* () {
-      const result = yield* opencode.spawn(["mini", "attach", "http://127.0.0.1:1"])
-
-      opencode.expectExit(result, 1)
-      expect(result.stderr).toContain("opencode mini requires a TTY stdout")
-    }),
-  )
-
   cliIt.live("rejects removed attach mini alias", ({ opencode }) =>
     Effect.gen(function* () {
       const result = yield* opencode.spawn(["attach", "http://127.0.0.1:1", "--mini"])
diff --git a/packages/protocol/src/groups/health.ts b/packages/protocol/src/groups/health.ts
index 640f4d67ff..625cce3919 100644
--- a/packages/protocol/src/groups/health.ts
+++ b/packages/protocol/src/groups/health.ts
@@ -4,7 +4,11 @@ import { HttpApiEndpoint, HttpApiGroup, OpenApi } from "effect/unstable/httpapi"
 export const HealthGroup = HttpApiGroup.make("server.health")
   .add(
     HttpApiEndpoint.get("health.get", "/api/health", {
-      success: Schema.Struct({ healthy: Schema.Literal(true) }),
+      success: Schema.Struct({
+        healthy: Schema.Literal(true),
+        version: Schema.String,
+        pid: Schema.Int.check(Schema.isGreaterThan(0)),
+      }),
     }).annotateMerge(
       OpenApi.annotations({
         identifier: "v2.health.get",
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index 5b9d40cad5..4d2cf1922c 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -15546,6 +15546,8 @@ export type V2HealthGetResponses = {
    */
   200: {
     healthy: true
+    version: string
+    pid: number
   }
 }
 
diff --git a/packages/server/package.json b/packages/server/package.json
index 6c5b3cb1b5..3a14a250a9 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -12,6 +12,7 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
+    "@effect/platform-node": "catalog:",
     "@opencode-ai/core": "workspace:*",
     "@opencode-ai/protocol": "workspace:*",
     "@opencode-ai/simulation": "workspace:*",
diff --git a/packages/server/src/handlers/health.ts b/packages/server/src/handlers/health.ts
index 60000b3fc0..a73b050aa7 100644
--- a/packages/server/src/handlers/health.ts
+++ b/packages/server/src/handlers/health.ts
@@ -1,7 +1,10 @@
+import { InstallationVersion } from "@opencode-ai/core/installation/version"
 import { Effect } from "effect"
 import { HttpApiBuilder } from "effect/unstable/httpapi"
 import { Api } from "../api"
 
 export const HealthHandler = HttpApiBuilder.group(Api, "server.health", (handlers) =>
-  handlers.handle("health.get", () => Effect.succeed({ healthy: true as const })),
+  handlers.handle("health.get", () =>
+    Effect.succeed({ healthy: true as const, version: InstallationVersion, pid: process.pid }),
+  ),
 )
diff --git a/packages/server/src/process.ts b/packages/server/src/process.ts
new file mode 100644
index 0000000000..de6f4b328f
--- /dev/null
+++ b/packages/server/src/process.ts
@@ -0,0 +1,64 @@
+export * as ServerProcess from "./process"
+
+import { NodeHttpClient, NodeHttpServer } from "@effect/platform-node"
+import { Credential } from "@opencode-ai/core/credential"
+import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
+import { LayerNode } from "@opencode-ai/core/effect/layer-node"
+import { PermissionSaved } from "@opencode-ai/core/permission/saved"
+import { Project } from "@opencode-ai/core/project"
+import { HealthGroup } from "@opencode-ai/protocol/groups/health"
+import { Context, Effect, Layer, Option } from "effect"
+import { HttpClient, HttpClientRequest, HttpRouter, HttpServer } from "effect/unstable/http"
+import { HttpApi, HttpApiClient } from "effect/unstable/httpapi"
+import { createServer } from "node:http"
+import { ServerAuth } from "./auth"
+import { createRoutes } from "./routes"
+
+export type Options = {
+  readonly hostname: string
+  readonly port: Option.Option<number>
+  readonly password: string
+}
+
+const ReadinessApi = HttpApi.make("readiness").add(HealthGroup)
+
+export const start = Effect.fn("ServerProcess.start")(function* (options: Options) {
+  if (!options.password) return yield* Effect.fail(new Error("Missing server password"))
+  const address = yield* listen(options)
+  yield* Effect.gen(function* () {
+    const client = yield* HttpApiClient.make(ReadinessApi, {
+      baseUrl: HttpServer.formatAddress(address),
+      transformClient: HttpClient.mapRequest((request) =>
+        HttpClientRequest.setHeader(
+          request,
+          "authorization",
+          ServerAuth.header({ username: "opencode", password: options.password }) ?? "",
+        ),
+      ),
+    })
+    yield* client["server.health"]["health.get"]({})
+  }).pipe(Effect.provide(NodeHttpClient.layerNodeHttp))
+  return address
+})
+
+function listen(options: Options) {
+  if (Option.isSome(options.port)) return bind(options.hostname, options.port.value, options.password)
+  const next = (port: number): ReturnType<typeof bind> =>
+    bind(options.hostname, port, options.password).pipe(
+      Effect.catch((error) => (port === 65_535 ? Effect.fail(error) : next(port + 1))),
+    )
+  return next(4096)
+}
+
+function bind(hostname: string, port: number, password: string) {
+  const server = createServer()
+  return Layer.build(
+    HttpRouter.serve(createRoutes(password), { disableListenLog: true }).pipe(
+      Layer.provideMerge(NodeHttpServer.layer(() => server, { port, host: hostname })),
+      Layer.provide(AppNodeBuilder.build(LayerNode.group([Credential.node, PermissionSaved.node, Project.node]))),
+    ),
+  ).pipe(
+    Effect.tap(() => Effect.addFinalizer(() => Effect.sync(() => server.closeAllConnections()))),
+    Effect.map((context) => Context.get(context, HttpServer.HttpServer).address),
+  )
+}
diff --git a/packages/tui/package.json b/packages/tui/package.json
index 12279e7115..fc1199dedc 100644
--- a/packages/tui/package.json
+++ b/packages/tui/package.json
@@ -38,9 +38,11 @@
     "./plugin/command-shim": "./src/plugin/command-shim.ts",
     "./parsers-config": "./src/parsers-config.ts",
     "./util/error": "./src/util/error.ts",
+    "./util/filetype": "./src/util/filetype.ts",
     "./util/locale": "./src/util/locale.ts",
     "./util/persistence": "./src/util/persistence.ts",
     "./util/record": "./src/util/record.ts",
+    "./util/session": "./src/util/session.ts",
     "./logo": "./src/logo.ts",
     "./ui/dialog": "./src/ui/dialog.tsx",
     "./ui/spinner": "./src/ui/spinner.ts",

From 0bba8c780a241f5ae84a05f865521b76921f14c1 Mon Sep 17 00:00:00 2001
From: Simon Klee <hello@simonklee.dk>
Date: Mon, 6 Jul 2026 12:34:44 +0200
Subject: [PATCH 82/82] cli/mini: fix run failure handling (#35539)

---
 packages/cli/package.json                     |  1 +
 packages/cli/src/index.ts                     |  2 +-
 packages/cli/src/mini/catalog.shared.ts       |  6 +-
 packages/cli/src/mini/noninteractive.ts       | 12 +++-
 packages/cli/src/mini/run.ts                  | 59 +++++++++--------
 packages/cli/src/server-process.ts            |  2 +-
 packages/cli/src/services/standalone.ts       |  2 +-
 packages/cli/test/fixture/standalone-owner.ts |  3 +-
 packages/cli/test/mini.test.ts                | 64 ++++++++++++++++++-
 packages/cli/test/standalone.test.ts          |  5 +-
 packages/client/src/effect/service.ts         | 27 +++++---
 packages/server/src/handlers/model.ts         | 15 +++++
 turbo.json                                    |  4 ++
 13 files changed, 152 insertions(+), 50 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 8cb1c2ef22..2b26f52ec2 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -27,6 +27,7 @@
   "scripts": {
     "build": "bun run script/build.ts",
     "dev": "bun run src/index.ts",
+    "test": "bun test --timeout 30000 --only-failures",
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index f8775fdb16..5b851d7f49 100755
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -58,6 +58,6 @@ Effect.logInfo("cli starting", {
   Effect.provide(LoggingLayer),
   Effect.provide(NodeServices.layer),
   Effect.scoped,
-  Effect.tap(() => Effect.sync(() => process.exit(0))),
+  Effect.tap(() => Effect.sync(() => process.exit(process.exitCode ?? 0))),
   NodeRuntime.runMain,
 )
diff --git a/packages/cli/src/mini/catalog.shared.ts b/packages/cli/src/mini/catalog.shared.ts
index 1af0f51f62..d810c47077 100644
--- a/packages/cli/src/mini/catalog.shared.ts
+++ b/packages/cli/src/mini/catalog.shared.ts
@@ -14,10 +14,11 @@ type CurrentSkill = SkillListOutput["data"][number]
 type CurrentProvider = ProviderListOutput["data"][number]
 type CurrentModel = ModelListOutput["data"][number]
 
-function location(directory: string) {
+function location(directory: string, workspace?: string) {
   return {
     location: {
       directory,
+      workspace,
     },
   }
 }
@@ -98,13 +99,14 @@ export function runProviders(providers: CurrentProvider[], models: CurrentModel[
 export async function waitForCatalogReady(input: {
   sdk: OpenCodeClient
   directory: string
+  workspace?: string
   model: { providerID: string; modelID: string }
   timeoutMs?: number
 }) {
   const deadline = Date.now() + (input.timeoutMs ?? 5_000)
   while (Date.now() < deadline) {
     const models = await input.sdk.model
-      .list(location(input.directory))
+      .list(location(input.directory, input.workspace))
       .then((result) => result.data)
       .catch(() => undefined)
     if (models?.some((model) => model.providerID === input.model.providerID && model.id === input.model.modelID)) return
diff --git a/packages/cli/src/mini/noninteractive.ts b/packages/cli/src/mini/noninteractive.ts
index 0645daac51..97d2fd91b6 100644
--- a/packages/cli/src/mini/noninteractive.ts
+++ b/packages/cli/src/mini/noninteractive.ts
@@ -132,8 +132,14 @@ export async function runNonInteractivePrompt(input: Input) {
 
   const consume = async () => {
     while (!controller.signal.aborted) {
-      const next = await stream.next()
-      if (next.done) throw new Error("Event stream disconnected during prompt execution")
+      const next = await stream.next().catch((error) => {
+        if (!emittedError) throw error
+        return { done: true as const, value: undefined }
+      })
+      if (next.done) {
+        if (emittedError) return
+        throw new Error("Event stream disconnected during prompt execution")
+      }
       const event = next.value
 
       if (event.type === "permission.v2.asked" && submitted && event.data.sessionID === input.sessionID) {
@@ -416,7 +422,7 @@ export async function runNonInteractivePrompt(input: Input) {
         }
         controller.abort()
         await completed?.catch(() => {})
-        if (interrupted) return undefined
+        if (interrupted || emittedError) return undefined
         throw error
       })
     admission = undefined
diff --git a/packages/cli/src/mini/run.ts b/packages/cli/src/mini/run.ts
index ee4fc1cb53..d8e3dcd228 100644
--- a/packages/cli/src/mini/run.ts
+++ b/packages/cli/src/mini/run.ts
@@ -8,7 +8,7 @@ import { open } from "node:fs/promises"
 import path from "node:path"
 import { Daemon } from "../daemon"
 import { Standalone } from "../services/standalone"
-import { loadRunAgents, waitForCatalogReady, waitForDefaultModel } from "./catalog.shared"
+import { loadRunAgents, waitForCatalogReady } from "./catalog.shared"
 import { runNonInteractivePrompt } from "./noninteractive"
 import { toolInlineInfo } from "./tool"
 import { UI } from "./ui"
@@ -49,7 +49,11 @@ type Prepared = {
 
 const ATTACH_FILE_MAX_BYTES = 10 * 1024 * 1024
 
-export async function runNonInteractive(input: RunCommandInput) {
+export function runNonInteractive(input: RunCommandInput) {
+  return run(input).catch((error) => reportError(input, error instanceof Error ? error.message : String(error)))
+}
+
+async function run(input: RunCommandInput) {
   if (input.fork && !input.continue && !input.session) fail("--fork requires --continue or --session")
   const root = process.env.PWD ?? process.cwd()
   const directory = input.server ? input.directory : localDirectory(input.directory, root)
@@ -78,17 +82,22 @@ async function execute(input: RunCommandInput, prepared: Prepared, transport: Tr
   if (!requestedDirectory) fail("Failed to resolve server directory")
   const session = await selectSession(client, requestedDirectory, input)
   const cwd = session?.location.directory ?? requestedDirectory
+  const workspace = session?.location.workspaceID
   const explicitModel = parseModel(input.model)
   const sessionModel = session?.model ? { providerID: session.model.providerID, modelID: session.model.id } : undefined
   const defaultModel =
-    input.variant && !explicitModel && !sessionModel
-      ? await waitForDefaultModel({ sdk: client, directory: cwd })
+    !explicitModel && !sessionModel
+      ? await client.model
+          .default({ location: { directory: cwd, workspace } })
+          .then((result) =>
+            result.data ? { providerID: result.data.providerID, modelID: result.data.id } : undefined,
+          )
       : undefined
   const model = pickRunModel(explicitModel, input.variant, sessionModel, defaultModel)
   if (input.variant && !model) return reportError(input, "Cannot select a variant before selecting a model", session?.id)
   if (model) {
-    await waitForCatalogReady({ sdk: client, directory: cwd, model })
-    const available = await client.model.list({ location: { directory: cwd } })
+    await waitForCatalogReady({ sdk: client, directory: cwd, workspace, model })
+    const available = await client.model.list({ location: { directory: cwd, workspace } })
     if (!available.data.some((item) => item.providerID === model.providerID && item.id === model.modelID))
       return reportError(input, `Model unavailable: ${model.providerID}/${model.modelID}`, session?.id)
   }
@@ -109,26 +118,21 @@ async function execute(input: RunCommandInput, prepared: Prepared, transport: Tr
     })
   }
 
-  try {
-    await runNonInteractivePrompt({
-      client,
-      sessionID: selected.id,
-      message: prepared.message,
-      files: prepared.files,
-      agent,
-      model,
-      variant: input.variant,
-      thinking: input.thinking ?? false,
-      format: input.format,
-      dangerouslySkipPermissions: input.dangerouslySkipPermissions ?? false,
-      attached: !input.standaloneCommand,
-      renderTool,
-      renderToolError,
-    })
-  } catch (error) {
-    UI.error(error instanceof Error ? error.message : String(error))
-    process.exitCode = 1
-  }
+  await runNonInteractivePrompt({
+    client,
+    sessionID: selected.id,
+    message: prepared.message,
+    files: prepared.files,
+    agent,
+    model,
+    variant: input.variant,
+    thinking: input.thinking ?? false,
+    format: input.format,
+    dangerouslySkipPermissions: input.dangerouslySkipPermissions ?? false,
+    attached: !input.standaloneCommand,
+    renderTool,
+    renderToolError,
+  }).catch((error) => reportError(input, error instanceof Error ? error.message : String(error), selected.id))
 }
 
 export function mergeInput(message: string | undefined, piped: string | undefined) {
@@ -303,6 +307,5 @@ function reportError(input: RunCommandInput, message: string, sessionID?: string
 }
 
 function fail(message: string): never {
-  UI.error(message)
-  process.exit(1)
+  throw new Error(message)
 }
diff --git a/packages/cli/src/server-process.ts b/packages/cli/src/server-process.ts
index 6f3af1f060..48471a573a 100644
--- a/packages/cli/src/server-process.ts
+++ b/packages/cli/src/server-process.ts
@@ -39,7 +39,7 @@ const processEffect = Effect.fnUntraced(function* (options: Options) {
     Effect.gen(function* () {
       if (options.mode === "service") {
         const service = yield* ServiceConfig.options()
-        yield* Flock.effect("service-process", {
+        yield* Flock.effect(path.basename(service.file, ".json") + "-process", {
           dir: path.dirname(service.file),
           staleMs: 3_000,
           timeoutMs: 15_000,
diff --git a/packages/cli/src/services/standalone.ts b/packages/cli/src/services/standalone.ts
index 328eb0e302..c0a8d8b71d 100644
--- a/packages/cli/src/services/standalone.ts
+++ b/packages/cli/src/services/standalone.ts
@@ -42,7 +42,7 @@ const makeTransport = Effect.fn("cli.standalone.transport")(
     const output = yield* proc.stdout.pipe(Stream.decodeText(), Stream.splitLines, Stream.take(1), Stream.mkString)
     if (!output) return yield* Effect.fail(new Error("Standalone server exited before reporting readiness"))
     const ready = yield* Effect.tryPromise(() => decodeReady(output))
-    return { url: ready.url, headers: ServerAuth.headers({ password }), pid: proc.pid }
+    return { url: ready.url, headers: ServerAuth.headers({ password, username: "opencode" }), pid: proc.pid }
   },
   Effect.provide(AppNodeBuilder.build(CrossSpawnSpawner.node)),
 )
diff --git a/packages/cli/test/fixture/standalone-owner.ts b/packages/cli/test/fixture/standalone-owner.ts
index 6149f614de..1ad311890a 100644
--- a/packages/cli/test/fixture/standalone-owner.ts
+++ b/packages/cli/test/fixture/standalone-owner.ts
@@ -8,7 +8,8 @@ await Effect.runPromise(
   Effect.scoped(
     Effect.gen(function* () {
       const transport = yield* Standalone.transport()
-      console.log(`${transport.pid} ${transport.url}`)
+      const response = yield* Effect.promise(() => fetch(new URL("/api/health", transport.url), { headers: transport.headers }))
+      console.log(`${transport.pid} ${transport.url} ${response.status}`)
       return yield* Effect.never
     }),
   ),
diff --git a/packages/cli/test/mini.test.ts b/packages/cli/test/mini.test.ts
index 95b74d2404..4734b62476 100644
--- a/packages/cli/test/mini.test.ts
+++ b/packages/cli/test/mini.test.ts
@@ -1,9 +1,11 @@
 import { describe, expect, test } from "bun:test"
+import { InstallationVersion } from "@opencode-ai/core/installation/version"
+import path from "node:path"
 import { mergeInteractiveInput, mergeNonInteractiveInput, pickRunModel } from "../src/mini"
 
 async function cli(args: string[]) {
   const child = Bun.spawn([process.execPath, "run", "src/index.ts", ...args], {
-    cwd: new URL("..", import.meta.url).pathname,
+    cwd: path.join(import.meta.dir, ".."),
     stdout: "pipe",
     stderr: "pipe",
   })
@@ -61,6 +63,66 @@ describe("mini command", () => {
     expect(result.stderr).not.toContain("You must provide a message")
   })
 
+  test("preserves a run failure exit code", async () => {
+    let modelRequests = 0
+    const server = Bun.serve({
+      port: 0,
+      fetch(request) {
+        const url = new URL(request.url)
+        if (url.pathname === "/api/health")
+          return Response.json({ healthy: true, version: InstallationVersion, pid: process.pid })
+        if (url.pathname === "/api/model") {
+          modelRequests++
+          return Response.json({
+            location: { directory: process.cwd(), project: { id: "global", directory: process.cwd() } },
+            data: modelRequests === 1 ? [{ id: "missing", providerID: "definitely" }] : [],
+          })
+        }
+        return new Response(undefined, { status: 404 })
+      },
+    })
+
+    try {
+      const result = await cli([
+        "run",
+        "--server",
+        server.url.toString(),
+        "--dir",
+        process.cwd(),
+        "--model",
+        "definitely/missing",
+        "hi",
+      ])
+
+      expect(result.exitCode).toBe(1)
+      expect(result.stderr).toContain("Model unavailable: definitely/missing")
+    } finally {
+      server.stop(true)
+    }
+  })
+
+  test("reports pre-admission errors as JSON", async () => {
+    const server = Bun.serve({
+      port: 0,
+      fetch() {
+        return Response.json({ healthy: true, version: "incompatible", pid: process.pid })
+      },
+    })
+
+    try {
+      const result = await cli(["run", "--format", "json", "--server", server.url.toString(), "hi"])
+
+      expect(result.exitCode).toBe(1)
+      expect(JSON.parse(result.stdout)).toMatchObject({
+        type: "error",
+        sessionID: "",
+        error: { type: "unknown", message: expect.stringContaining("requires") },
+      })
+    } finally {
+      server.stop(true)
+    }
+  })
+
   test("uses the shared V2 server option instead of an attach command", async () => {
     const result = await cli(["mini", "--help"])
 
diff --git a/packages/cli/test/standalone.test.ts b/packages/cli/test/standalone.test.ts
index 1a309477f3..3cfe25855f 100644
--- a/packages/cli/test/standalone.test.ts
+++ b/packages/cli/test/standalone.test.ts
@@ -4,18 +4,19 @@ import path from "node:path"
 test("standalone server exits when its owner is killed", async () => {
   const owner = Bun.spawn([process.execPath, path.join(import.meta.dir, "fixture/standalone-owner.ts")], {
     cwd: path.join(import.meta.dir, ".."),
-    env: process.env,
+    env: { ...process.env, OPENCODE_SERVER_USERNAME: "custom" },
     stdin: "ignore",
     stdout: "pipe",
     stderr: "pipe",
   })
   const line = await Promise.race([readLine(owner.stdout), Bun.sleep(10_000).then(() => undefined)])
-  const [rawPID, url] = line?.split(" ") ?? []
+  const [rawPID, url, status] = line?.split(" ") ?? []
   const pid = Number(rawPID)
 
   try {
     expect(pid).toBeGreaterThan(0)
     expect(url).toStartWith("http://127.0.0.1:")
+    expect(status).toBe("200")
     expect(running(pid)).toBe(true)
 
     owner.kill("SIGKILL")
diff --git a/packages/client/src/effect/service.ts b/packages/client/src/effect/service.ts
index 03e9c07237..9c5e833ee1 100644
--- a/packages/client/src/effect/service.ts
+++ b/packages/client/src/effect/service.ts
@@ -104,9 +104,10 @@ export const Info = Schema.Struct({
 export type Info = typeof Info.Type
 
 const decode = Schema.decodeUnknownEffect(Schema.fromJsonString(Info))
-const decodeHealth = Schema.decodeUnknownEffect(
+const decodeHealth = Schema.decodeUnknownOption(
   Schema.Struct({ healthy: Schema.Literal(true), version: Schema.String, pid: Schema.Int }),
 )
+const decodeLegacyHealth = Schema.decodeUnknownOption(Schema.Struct({ healthy: Schema.Literal(true) }))
 
 // A missing or corrupt file means no valid info; callers treat both
 // the same (the registering server self-evicts, clients rediscover).
@@ -122,7 +123,7 @@ type LocalService = {
   readonly transport: Transport
 }
 
-const probe = Effect.fnUntraced(function* (info: Info, version?: string) {
+const probe = Effect.fnUntraced(function* (info: Info, version?: string, allowLegacy = false) {
   const headers = info.password === undefined ? undefined : auth(info.password)
   const response = yield* Effect.tryPromise(() =>
     fetch(new URL("/api/health", info.url), {
@@ -131,14 +132,20 @@ const probe = Effect.fnUntraced(function* (info: Info, version?: string) {
     }),
   ).pipe(Effect.option, Effect.map(Option.getOrUndefined))
   if (response === undefined || !response.ok) return undefined
-  const health = yield* Effect.tryPromise(() => response.json()).pipe(
-    Effect.flatMap(decodeHealth),
-    Effect.option,
-    Effect.map(Option.getOrUndefined),
+  const body = yield* Effect.tryPromise(() => response.json()).pipe(Effect.option, Effect.map(Option.getOrUndefined))
+  const health = decodeHealth(body)
+  if (Option.isSome(health)) {
+    if (health.value.pid !== info.pid) return undefined
+    if (info.version !== undefined && health.value.version !== info.version) return undefined
+    if (version !== undefined && health.value.version !== version) return undefined
+    return { info, transport: { url: info.url, headers } } satisfies LocalService
+  }
+  if (
+    !allowLegacy ||
+    Option.isNone(decodeLegacyHealth(body)) ||
+    (typeof body === "object" && body !== null && ("version" in body || "pid" in body))
   )
-  if (health?.pid !== info.pid) return undefined
-  if (info.version !== undefined && health.version !== info.version) return undefined
-  if (version !== undefined && health.version !== version) return undefined
+    return undefined
   return { info, transport: { url: info.url, headers } } satisfies LocalService
 })
 
@@ -147,7 +154,7 @@ const probe = Effect.fnUntraced(function* (info: Info, version?: string) {
 const find = Effect.fnUntraced(function* (options: Options) {
   const info = yield* read(options.file)
   if (info === undefined) return undefined
-  return yield* probe(info)
+  return yield* probe(info, undefined, true)
 })
 
 // 50ms cadence bounded at ~5s, shared by stop escalation and start readiness.
diff --git a/packages/server/src/handlers/model.ts b/packages/server/src/handlers/model.ts
index 5059804354..b5d6ef37cf 100644
--- a/packages/server/src/handlers/model.ts
+++ b/packages/server/src/handlers/model.ts
@@ -1,4 +1,6 @@
 import { Catalog } from "@opencode-ai/core/catalog"
+import { PluginSupervisor } from "@opencode-ai/core/plugin/supervisor"
+import { ServiceUnavailableError } from "@opencode-ai/protocol/errors"
 import { Effect } from "effect"
 import { HttpApiBuilder } from "effect/unstable/httpapi"
 import { Api } from "../api"
@@ -17,6 +19,19 @@ export const ModelHandler = HttpApiBuilder.group(Api, "server.model", (handlers)
       .handle(
         "model.default",
         Effect.fn(function* () {
+          const plugins = yield* PluginSupervisor.Service
+          yield* plugins.ready.pipe(
+            Effect.timeoutOrElse({
+              duration: "5 seconds",
+              orElse: () =>
+                Effect.fail(
+                  new ServiceUnavailableError({
+                    message: "Model catalog initialization timed out",
+                    service: "model.catalog",
+                  }),
+                ),
+            }),
+          )
           const catalog = yield* Catalog.Service
           return yield* response(catalog.model.default())
         }),
diff --git a/turbo.json b/turbo.json
index 2ab43fc5ce..83bc4fbeae 100644
--- a/turbo.json
+++ b/turbo.json
@@ -12,6 +12,10 @@
       "dependsOn": ["^build"],
       "outputs": []
     },
+    "@opencode-ai/cli#test": {
+      "dependsOn": ["^build"],
+      "outputs": []
+    },
     "@opencode-ai/tui#test": {
       "dependsOn": ["^build"],
       "outputs": []