fix(opencode): make mcp env handling portable

fix(opencode): restrict local mcp environment
chore: update nix node_modules hashes
2026-08-09 19:09:49 -04:00 · 2026-06-24 16:59:07 -05:00 · 2026-06-24 16:24:48 -05:00 · 2026-06-24 20:56:38 +00:00 · 2026-06-24 20:45:23 +00:00 · 2026-06-24 16:43:17 -04:00
316 changed files with 5032 additions and 3957 deletions
@@ -325,6 +325,7 @@ jobs:
        run: bun run build
        working-directory: packages/desktop
        env:
+          NODE_OPTIONS: --max-old-space-size=4096
          OPENCODE_CHANNEL: ${{ (github.ref_name == 'beta' && 'beta') || 'prod' }}
          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
          SENTRY_ORG: ${{ vars.SENTRY_ORG }}
@@ -9,6 +9,7 @@ on:
      - "bun.lock"
      - "packages/storybook/**"
      - "packages/ui/**"
+      - "packages/session-ui/**"
  pull_request:
    branches: [dev]
    paths:
@@ -17,6 +18,7 @@ on:
      - "bun.lock"
      - "packages/storybook/**"
      - "packages/ui/**"
+      - "packages/session-ui/**"
  workflow_dispatch:

 concurrency:
@@ -57,13 +57,6 @@ The bounded projection of a Core-executed tool result persisted in Session histo
 **Managed Tool Output File**:
 A temporary file created under OpenCode's shared tool-output directory to retain complete output that was too large for Session history.

-**Model Request Options**:
-Provider-semantic model settings selected from the Catalog and active Session variant before the LLM protocol adapter encodes them for a provider request.
-_Avoid_: Request body, wire options
-
-**Generation Controls**:
-Provider-neutral sampling and output controls, partitioned from provider semantics and compatibility wire fields when model metadata enters the Catalog.
-
 **PTY Environment**:
 The host-supplied environment overlay applied by the server when creating a PTY, observed for the request Location and resolved PTY working directory.

@@ -114,8 +107,6 @@ The host-supplied environment overlay applied by the server when creating a PTY,
 - 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.
- **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`.
 - A **PTY Environment** adapter observes plugins in the request Location while passing the resolved PTY working directory to the hook; standalone servers use an empty adapter.
 - A **Mid-Conversation System Message** lowers to the provider's native chronological instruction role when supported and to a wrapped chronological fallback otherwise.
@@ -29,11 +29,12 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/core": "workspace:*",
        "@opencode-ai/sdk": "workspace:*",
+        "@opencode-ai/session-ui": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
        "@pierre/trees": "1.0.0-beta.4",
        "@sentry/solid": "catalog:",
@@ -86,7 +87,7 @@
    },
    "packages/cli": {
      "name": "@opencode-ai/cli",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "bin": {
        "lildax": "./bin/lildax.cjs",
      },
@@ -111,7 +112,7 @@
    },
    "packages/console/app": {
      "name": "@opencode-ai/console-app",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -147,7 +148,7 @@
    },
    "packages/console/core": {
      "name": "@opencode-ai/console-core",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -174,7 +175,7 @@
    },
    "packages/console/function": {
      "name": "@opencode-ai/console-function",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@ai-sdk/anthropic": "3.0.82",
        "@ai-sdk/openai": "3.0.48",
@@ -196,7 +197,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode-ai/console-mail",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -220,7 +221,7 @@
    },
    "packages/console/support": {
      "name": "@opencode-ai/console-support",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@opencode-ai/console-core": "workspace:*",
@@ -240,7 +241,7 @@
    },
    "packages/core": {
      "name": "@opencode-ai/core",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -333,7 +334,7 @@
    },
    "packages/desktop": {
      "name": "@opencode-ai/desktop",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@zip.js/zip.js": "2.7.62",
        "effect": "catalog:",
@@ -387,7 +388,7 @@
    },
    "packages/effect-drizzle-sqlite": {
      "name": "@opencode-ai/effect-drizzle-sqlite",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "drizzle-orm": "catalog:",
        "effect": "catalog:",
@@ -401,7 +402,7 @@
    },
    "packages/effect-sqlite-node": {
      "name": "@opencode-ai/effect-sqlite-node",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "effect": "catalog:",
      },
@@ -413,10 +414,11 @@
    },
    "packages/enterprise": {
      "name": "@opencode-ai/enterprise",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@hono/standard-validator": "catalog:",
        "@opencode-ai/core": "workspace:*",
+        "@opencode-ai/session-ui": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
        "@pierre/diffs": "catalog:",
        "@solidjs/meta": "catalog:",
@@ -444,7 +446,7 @@
    },
    "packages/function": {
      "name": "@opencode-ai/function",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -460,7 +462,7 @@
    },
    "packages/http-recorder": {
      "name": "@opencode-ai/http-recorder",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@effect/platform-node": "4.0.0-beta.83",
        "@effect/platform-node-shared": "4.0.0-beta.83",
@@ -479,7 +481,7 @@
    },
    "packages/llm": {
      "name": "@opencode-ai/llm",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@opencode-ai/schema": "workspace:*",
        "@smithy/eventstream-codec": "4.2.14",
@@ -498,7 +500,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -537,6 +539,7 @@
        "@openauthjs/openauth": "catalog:",
        "@opencode-ai/llm": "workspace:*",
        "@opencode-ai/plugin": "workspace:*",
+        "@opencode-ai/schema": "workspace:*",
        "@opencode-ai/script": "workspace:*",
        "@opencode-ai/sdk": "workspace:*",
        "@opencode-ai/server": "workspace:*",
@@ -626,7 +629,7 @@
    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@ai-sdk/provider": "3.0.8",
        "@opencode-ai/sdk": "workspace:*",
@@ -676,7 +679,7 @@
    },
    "packages/sdk/js": {
      "name": "@opencode-ai/sdk",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "cross-spawn": "catalog:",
      },
@@ -691,7 +694,7 @@
    },
    "packages/server": {
      "name": "@opencode-ai/server",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@opencode-ai/core": "workspace:*",
        "drizzle-orm": "catalog:",
@@ -703,9 +706,53 @@
        "@typescript/native-preview": "catalog:",
      },
    },
+    "packages/session-ui": {
+      "name": "@opencode-ai/session-ui",
+      "version": "1.17.10",
+      "dependencies": {
+        "@kobalte/core": "catalog:",
+        "@opencode-ai/core": "workspace:*",
+        "@opencode-ai/sdk": "workspace:*",
+        "@opencode-ai/ui": "workspace:*",
+        "@pierre/diffs": "catalog:",
+        "@shikijs/stream": "catalog:",
+        "@shikijs/transformers": "3.9.2",
+        "@solid-primitives/bounds": "0.1.3",
+        "@solid-primitives/event-listener": "2.4.5",
+        "@solid-primitives/media": "2.3.3",
+        "@solid-primitives/resize-observer": "2.1.3",
+        "@solidjs/meta": "catalog:",
+        "@solidjs/router": "catalog:",
+        "diff": "catalog:",
+        "dompurify": "3.3.1",
+        "fuzzysort": "catalog:",
+        "katex": "0.16.27",
+        "luxon": "catalog:",
+        "marked": "catalog:",
+        "marked-katex-extension": "5.1.6",
+        "marked-shiki": "catalog:",
+        "morphdom": "2.7.8",
+        "motion": "12.34.5",
+        "remeda": "catalog:",
+        "remend": "catalog:",
+        "shiki": "catalog:",
+        "solid-js": "catalog:",
+        "solid-list": "catalog:",
+        "strip-ansi": "7.1.2",
+      },
+      "devDependencies": {
+        "@tsconfig/node22": "catalog:",
+        "@types/bun": "catalog:",
+        "@types/katex": "0.16.7",
+        "@types/luxon": "catalog:",
+        "@typescript/native-preview": "catalog:",
+        "typescript": "catalog:",
+        "vite": "catalog:",
+      },
+    },
    "packages/slack": {
      "name": "@opencode-ai/slack",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "@slack/bolt": "^3.17.1",
@@ -718,7 +765,7 @@
    },
    "packages/stats/app": {
      "name": "@opencode-ai/stats-app",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@ibm/plex": "6.4.1",
        "@opencode-ai/stats-core": "workspace:*",
@@ -751,7 +798,7 @@
    },
    "packages/stats/core": {
      "name": "@opencode-ai/stats-core",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@aws-sdk/client-athena": "3.933.0",
        "@planetscale/database": "1.19.0",
@@ -770,7 +817,7 @@
    },
    "packages/stats/server": {
      "name": "@opencode-ai/stats-server",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@aws-sdk/client-firehose": "3.933.0",
        "@effect/platform-node": "catalog:",
@@ -789,6 +836,7 @@
    "packages/storybook": {
      "name": "@opencode-ai/storybook",
      "devDependencies": {
+        "@opencode-ai/session-ui": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
        "@solidjs/meta": "catalog:",
        "@storybook/addon-a11y": "^10.2.13",
@@ -810,7 +858,7 @@
    },
    "packages/tui": {
      "name": "@opencode-ai/tui",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@opencode-ai/core": "workspace:*",
        "@opencode-ai/plugin": "workspace:*",
@@ -837,11 +885,9 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@kobalte/core": "catalog:",
-        "@opencode-ai/core": "workspace:*",
-        "@opencode-ai/sdk": "workspace:*",
        "@pierre/diffs": "catalog:",
        "@shikijs/stream": "catalog:",
        "@shikijs/transformers": "3.9.2",
@@ -886,7 +932,7 @@
    },
    "packages/web": {
      "name": "@opencode-ai/web",
-      "version": "1.17.9",
+      "version": "1.17.10",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -1825,6 +1871,8 @@

    "@opencode-ai/server": ["@opencode-ai/server@workspace:packages/server"],

+    "@opencode-ai/session-ui": ["@opencode-ai/session-ui@workspace:packages/session-ui"],
+
    "@opencode-ai/slack": ["@opencode-ai/slack@workspace:packages/slack"],

    "@opencode-ai/stats-app": ["@opencode-ai/stats-app@workspace:packages/stats/app"],
@@ -5843,6 +5891,8 @@

    "@opencode-ai/llm/@smithy/util-utf8": ["@smithy/util-utf8@4.2.2", "", { "dependencies": { "@smithy/util-buffer-from": "^4.2.2", "tslib": "^2.6.2" } }, "sha512-75MeYpjdWRe8M5E3AW0O4Cx3UadweS+cwdXjwYGBW5h/gxxnbeZ877sLPX/ZJA9GVTlL/qG0dXP29JWFCD1Ayw=="],

+    "@opencode-ai/session-ui/@solid-primitives/resize-observer": ["@solid-primitives/resize-observer@2.1.3", "", { "dependencies": { "@solid-primitives/event-listener": "^2.4.3", "@solid-primitives/rootless": "^1.5.2", "@solid-primitives/static-store": "^0.1.2", "@solid-primitives/utils": "^6.3.2" }, "peerDependencies": { "solid-js": "^1.6.12" } }, "sha512-zBLje5E06TgOg93S7rGPldmhDnouNGhvfZVKOp+oG2XU8snA+GoCSSCz1M+jpNAg5Ek2EakU5UVQqL152WmdXQ=="],
+
    "@opencode-ai/ui/@solid-primitives/resize-observer": ["@solid-primitives/resize-observer@2.1.3", "", { "dependencies": { "@solid-primitives/event-listener": "^2.4.3", "@solid-primitives/rootless": "^1.5.2", "@solid-primitives/static-store": "^0.1.2", "@solid-primitives/utils": "^6.3.2" }, "peerDependencies": { "solid-js": "^1.6.12" } }, "sha512-zBLje5E06TgOg93S7rGPldmhDnouNGhvfZVKOp+oG2XU8snA+GoCSSCz1M+jpNAg5Ek2EakU5UVQqL152WmdXQ=="],

    "@opencode-ai/web/@shikijs/transformers": ["@shikijs/transformers@3.20.0", "", { "dependencies": { "@shikijs/core": "3.20.0", "@shikijs/types": "3.20.0" } }, "sha512-PrHHMRr3Q5W1qB/42kJW6laqFyWdhrPF2hNR9qjOm1xcSiAO3hAHo7HaVyHE6pMyevmy3i51O8kuGGXC78uK3g=="],
@@ -42,11 +42,12 @@ const inferenceEventTable = new aws.s3tables.Table(
            { name: "request", type: "string", required: false },
            { name: "client", type: "string", required: false },
            { name: "user_agent", type: "string", required: false },
+            { name: "model", type: "string", required: false },
+            { name: "model_tier", type: "string", required: false },
            { name: "model_variant", type: "string", required: false },
            { name: "source", type: "string", required: false },
            { name: "provider", type: "string", required: false },
            { name: "provider_model", type: "string", required: false },
-            { name: "model", type: "string", required: false },
            { name: "llm_error_code", type: "int", required: false },
            { name: "llm_error_message", type: "string", required: false },
            { name: "error_response", type: "string", required: false },
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-JJnJVqP2+NiiRVoTKXjGD09lPRyfz8YMfx0m3jBaUzU=",
-    "aarch64-linux": "sha256-tY3/IA+iZbOQQGxrcHMvQ1xqByskZyVI+4LZkU0wVjs=",
-    "aarch64-darwin": "sha256-9qMRrQKKOgQuOcAgAq8oZacVFD7G4nbAfZawmCRuJdY=",
-    "x86_64-darwin": "sha256-dR2VGxDLoAPEmk8SsEF4dhlPBcb9ubztAuVfwxuAD4M="
+    "x86_64-linux": "sha256-gV5PVd9+MB5tM3pPH+S6YhGPRPXqHv5Ayw+8gngNlqY=",
+    "aarch64-linux": "sha256-1pxoseGyRwAawiPblo8FeaaAAdl0mkKRs6BS8qxxoh0=",
+    "aarch64-darwin": "sha256-81D/v2Ka7mtFHp4iM9eB9kjFcumSTvR07ABb1ahRLS0=",
+    "x86_64-darwin": "sha256-nolxEbc/1ItbmuHPUjaSu3DHwBV/0/Si2xuM6wpiq0k="
  }
 }
@@ -119,6 +119,7 @@ export async function setupTimelineBenchmark(page: Page, options: { historyTurns
          editToolPartsExpanded: true,
          shellToolPartsExpanded: true,
          showReasoningSummaries: true,
+          showSessionProgressBar: true,
        },
      }),
    )
@@ -13,6 +13,7 @@ export async function installTimelineSettings(page: Page) {
          editToolPartsExpanded: true,
          shellToolPartsExpanded: true,
          showReasoningSummaries: true,
+          showSessionProgressBar: true,
        },
      }),
    )
@@ -261,6 +261,7 @@ async function configurePage(page: Page) {
          editToolPartsExpanded: true,
          shellToolPartsExpanded: true,
          showReasoningSummaries: true,
+          showSessionProgressBar: true,
        },
      }),
    )
@@ -47,6 +47,7 @@ async function configurePage(page: Page) {
          editToolPartsExpanded: true,
          shellToolPartsExpanded: true,
          showReasoningSummaries: true,
+          showSessionProgressBar: true,
        },
      }),
    )
@@ -362,6 +362,7 @@ async function configureSmokePage(page: Page, directory: string) {
          editToolPartsExpanded: true,
          shellToolPartsExpanded: true,
          showReasoningSummaries: true,
+          showSessionProgressBar: true,
        },
      }),
    )
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.17.9",
+  "version": "1.17.10",
  "description": "",
  "type": "module",
  "exports": {
@@ -47,6 +47,7 @@
    "@kobalte/core": "catalog:",
    "@opencode-ai/core": "workspace:*",
    "@opencode-ai/sdk": "workspace:*",
+    "@opencode-ai/session-ui": "workspace:*",
    "@opencode-ai/ui": "workspace:*",
    "@pierre/trees": "1.0.0-beta.4",
    "@sentry/solid": "catalog:",
@@ -4,7 +4,7 @@ import { I18nProvider } from "@opencode-ai/ui/context"
 import { DialogProvider } from "@opencode-ai/ui/context/dialog"
 import { FileComponentProvider } from "@opencode-ai/ui/context/file"
 import { MarkedProvider } from "@opencode-ai/ui/context/marked"
-import { File } from "@opencode-ai/ui/file"
+import { File } from "@opencode-ai/session-ui/file"
 import { Font } from "@opencode-ai/ui/font"
 import { Splash } from "@opencode-ai/ui/logo"
 import { ThemeProvider } from "@opencode-ai/ui/theme/context"
@@ -7,8 +7,8 @@ import { same } from "@/utils/same"
 import { Icon } from "@opencode-ai/ui/icon"
 import { Accordion } from "@opencode-ai/ui/accordion"
 import { StickyAccordionHeader } from "@opencode-ai/ui/sticky-accordion-header"
-import { File } from "@opencode-ai/ui/file"
-import { Markdown } from "@opencode-ai/ui/markdown"
+import { File } from "@opencode-ai/session-ui/file"
+import { Markdown } from "@opencode-ai/session-ui/markdown"
 import { ScrollView } from "@opencode-ai/ui/scroll-view"
 import type { Message, Part, UserMessage } from "@opencode-ai/sdk/v2/client"
 import { useLanguage } from "@/context/language"
@@ -335,6 +335,18 @@ export const SettingsGeneral: Component = () => {
          </div>
        </SettingsRow>

+        <SettingsRow
+          title={language.t("settings.general.row.showSessionProgressBar.title")}
+          description={language.t("settings.general.row.showSessionProgressBar.description")}
+        >
+          <div data-action="settings-show-session-progress-bar">
+            <Switch
+              checked={settings.general.showSessionProgressBar()}
+              onChange={(checked) => settings.general.setShowSessionProgressBar(checked)}
+            />
+          </div>
+        </SettingsRow>
+
        <SettingsRow
          title={language.t("settings.general.row.newLayoutDesigns.title")}
          description={language.t("settings.general.row.newLayoutDesigns.description")}
@@ -318,6 +318,18 @@ export const SettingsGeneralV2: Component = () => {
          </div>
        </SettingsRowV2>

+        <SettingsRowV2
+          title={language.t("settings.general.row.showSessionProgressBar.title")}
+          description={language.t("settings.general.row.showSessionProgressBar.description")}
+        >
+          <div data-action="settings-show-session-progress-bar">
+            <Switch
+              checked={settings.general.showSessionProgressBar()}
+              onChange={(checked) => settings.general.setShowSessionProgressBar(checked)}
+            />
+          </div>
+        </SettingsRowV2>
+
        <SettingsRowV2
          title={language.t("settings.general.row.newLayoutDesigns.title")}
          description={language.t("settings.general.row.newLayoutDesigns.description")}
@@ -2,7 +2,7 @@ import { describe, expect, test } from "bun:test"
 import { createStore } from "solid-js/store"
 import { QueryClient } from "@tanstack/solid-query"
 import type { Config, OpencodeClient, Project } from "@opencode-ai/sdk/v2/client"
-import type { NormalizedProviderListResponse } from "@opencode-ai/ui/context"
+import type { NormalizedProviderListResponse } from "@opencode-ai/session-ui/context"
 import { bootstrapDirectory, loadPathQuery, loadProvidersQuery } from "./bootstrap"
 import type { State, VcsCache } from "./types"
 import { ServerScope } from "@/utils/server-scope"
@@ -19,7 +19,7 @@ import { cmp, normalizeAgentList, normalizeProviderList } from "./utils"
 import { formatServerError } from "@/utils/server-errors"
 import { QueryClient, queryOptions } from "@tanstack/solid-query"
 import { loadMcpQuery } from "../server-sync"
-import { NormalizedProviderListResponse } from "@opencode-ai/ui/context"
+import { NormalizedProviderListResponse } from "@opencode-ai/session-ui/context"
 import { ScopedKey, type ServerScope } from "@/utils/server-scope"

 type GlobalStore = {
@@ -1,7 +1,7 @@
 import { beforeAll, describe, expect, mock, test } from "bun:test"
 import { createRoot, getOwner, type Owner } from "solid-js"
 import { createStore } from "solid-js/store"
-import type { NormalizedProviderListResponse } from "@opencode-ai/ui/context"
+import type { NormalizedProviderListResponse } from "@opencode-ai/session-ui/context"
 import type { State } from "./types"
 import type { QueryOptionsApi } from "../server-sync"
 import { ServerScope } from "@/utils/server-scope"
@@ -17,7 +17,7 @@ import { canDisposeDirectory, pickDirectoriesToEvict } from "./eviction"
 import { useQuery } from "@tanstack/solid-query"
 import { QueryOptionsApi } from "../server-sync"
 import { directoryKey, type DirectoryKey } from "./utils"
-import { NormalizedProviderListResponse } from "@opencode-ai/ui/context"
+import { NormalizedProviderListResponse } from "@opencode-ai/session-ui/context"
 import type { ServerScope } from "@/utils/server-scope"

 export function createChildStoreManager(input: {
@@ -15,7 +15,7 @@ import type {
  Todo,
  VcsInfo,
 } from "@opencode-ai/sdk/v2/client"
-import { NormalizedProviderListResponse } from "@opencode-ai/ui/context"
+import { NormalizedProviderListResponse } from "@opencode-ai/session-ui/context"
 import type { Accessor } from "solid-js"
 import type { SetStoreFunction, Store } from "solid-js/store"

@@ -1,5 +1,5 @@
 import type { Agent, Project, ProviderListResponse } from "@opencode-ai/sdk/v2/client"
-import { NormalizedProviderListResponse } from "@opencode-ai/ui/context"
+import { NormalizedProviderListResponse } from "@opencode-ai/session-ui/context"
 export { pathKey as directoryKey, type PathKey as DirectoryKey } from "@/utils/path-key"

 export const cmp = (a: string, b: string) => (a < b ? -1 : a > b ? 1 : 0)
@@ -29,7 +29,8 @@ import { createRefreshQueue } from "./global-sync/queue"
 import { directoryKey } from "./global-sync/utils"
 import { PathKey } from "@/utils/path-key"
 import { createDirSyncContext } from "./directory-sync"
-import { createSimpleContext, NormalizedProviderListResponse } from "@opencode-ai/ui/context"
+import { createSimpleContext } from "@opencode-ai/ui/context"
+import { NormalizedProviderListResponse } from "@opencode-ai/session-ui/context"
 import { createRefCountMap } from "@/utils/refcount"
 import { useGlobal } from "./global"
 import { ServerConnection, useServer } from "./server"
@@ -31,6 +31,7 @@ export interface Settings {
    showReasoningSummaries: boolean
    shellToolPartsExpanded: boolean
    editToolPartsExpanded: boolean
+    showSessionProgressBar: boolean
    showCustomAgents: boolean
    mobileTitlebarPosition: "top" | "bottom"
    newLayoutDesigns?: boolean
@@ -116,6 +117,7 @@ const defaultSettings: Settings = {
    showReasoningSummaries: false,
    shellToolPartsExpanded: false,
    editToolPartsExpanded: false,
+    showSessionProgressBar: true,
    showCustomAgents: false,
    mobileTitlebarPosition: "top",
  },
@@ -237,6 +239,13 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
        setEditToolPartsExpanded(value: boolean) {
          setStore("general", "editToolPartsExpanded", value)
        },
+        showSessionProgressBar: withFallback(
+          () => store.general?.showSessionProgressBar,
+          defaultSettings.general.showSessionProgressBar,
+        ),
+        setShowSessionProgressBar(value: boolean) {
+          setStore("general", "showSessionProgressBar", value)
+        },
        showCustomAgents,
        setShowCustomAgents(value: boolean) {
          setStore("general", "showCustomAgents", value)
@@ -590,6 +590,8 @@ export const dict = {
  "settings.general.row.editToolPartsExpanded.title": "توسيع أجزاء أداة edit",
  "settings.general.row.editToolPartsExpanded.description":
    "إظهار أجزاء أدوات edit و write و patch موسعة بشكل افتراضي في الشريط الزمني",
+  "settings.general.row.showSessionProgressBar.title": "إظهار شريط تقدم الجلسة",
+  "settings.general.row.showSessionProgressBar.description": "عرض شريط التقدم المتحرك أعلى الجلسة أثناء عمل الوكيل",
  "settings.general.row.wayland.title": "استخدام Wayland الأصلي",
  "settings.general.row.wayland.description": "تعطيل التراجع إلى X11 على Wayland. يتطلب إعادة التشغيل.",
  "settings.general.row.wayland.tooltip":
@@ -598,6 +598,9 @@ export const dict = {
  "settings.general.row.editToolPartsExpanded.title": "Expandir partes da ferramenta de edição",
  "settings.general.row.editToolPartsExpanded.description":
    "Mostrar partes das ferramentas de edição, escrita e patch expandidas por padrão na linha do tempo",
+  "settings.general.row.showSessionProgressBar.title": "Mostrar barra de progresso da sessão",
+  "settings.general.row.showSessionProgressBar.description":
+    "Exibir a barra de progresso animada no topo da sessão quando o agente estiver trabalhando",
  "settings.general.row.wayland.title": "Usar Wayland nativo",
  "settings.general.row.wayland.description": "Desabilitar fallback X11 no Wayland. Requer reinicialização.",
  "settings.general.row.wayland.tooltip":
@@ -663,6 +663,9 @@ export const dict = {
  "settings.general.row.editToolPartsExpanded.title": "Proširi dijelove alata za uređivanje",
  "settings.general.row.editToolPartsExpanded.description":
    "Prikaži dijelove alata za uređivanje, pisanje i patch podrazumijevano proširene na vremenskoj traci",
+  "settings.general.row.showSessionProgressBar.title": "Prikaži traku napretka sesije",
+  "settings.general.row.showSessionProgressBar.description":
+    "Prikaži animiranu traku napretka na vrhu sesije kada agent radi",
  "settings.general.row.wayland.title": "Koristi nativni Wayland",
  "settings.general.row.wayland.description": "Onemogući X11 fallback na Waylandu. Zahtijeva restart.",
  "settings.general.row.wayland.tooltip":
@@ -657,6 +657,9 @@ export const dict = {
  "settings.general.row.editToolPartsExpanded.title": "Udvid edit-værktøjsdele",
  "settings.general.row.editToolPartsExpanded.description":
    "Vis edit-, write- og patch-værktøjsdele udvidet som standard i tidslinjen",
+  "settings.general.row.showSessionProgressBar.title": "Vis sessionens fremdriftslinje",
+  "settings.general.row.showSessionProgressBar.description":
+    "Vis den animerede fremdriftslinje øverst i sessionen, når agenten arbejder",
  "settings.general.row.wayland.title": "Brug native Wayland",
  "settings.general.row.wayland.description": "Deaktiver X11-fallback på Wayland. Kræver genstart.",
  "settings.general.row.wayland.tooltip":
@@ -609,6 +609,9 @@ export const dict = {
  "settings.general.row.editToolPartsExpanded.title": "Edit-Tool-Abschnitte ausklappen",
  "settings.general.row.editToolPartsExpanded.description":
    "Edit-, Write- und Patch-Tool-Abschnitte standardmäßig in der Timeline ausgeklappt anzeigen",
+  "settings.general.row.showSessionProgressBar.title": "Sitzungsfortschrittsleiste anzeigen",
+  "settings.general.row.showSessionProgressBar.description":
+    "Die animierte Fortschrittsleiste oben in der Sitzung anzeigen, wenn der Agent arbeitet",
  "settings.general.row.wayland.title": "Natives Wayland verwenden",
  "settings.general.row.wayland.description": "X11-Fallback unter Wayland deaktivieren. Erfordert Neustart.",
  "settings.general.row.wayland.tooltip":
@@ -854,6 +854,9 @@ export const dict = {
  "settings.general.row.editToolPartsExpanded.title": "Expand edit tool parts",
  "settings.general.row.editToolPartsExpanded.description":
    "Show edit, write, and patch tool parts expanded by default in the timeline",
+  "settings.general.row.showSessionProgressBar.title": "Show session progress bar",
+  "settings.general.row.showSessionProgressBar.description":
+    "Display the animated progress bar at the top of the session when the agent is working",
  "settings.general.row.newLayoutDesigns.title": "New layout and designs",
  "settings.general.row.newLayoutDesigns.description": "Enable the redesigned layout, home, composer, and session UI",
  "settings.general.row.pinchZoom.title": "Pinch to zoom",
@@ -667,6 +667,9 @@ export const dict = {
  "settings.general.row.editToolPartsExpanded.title": "Expandir partes de la herramienta de edición",
  "settings.general.row.editToolPartsExpanded.description":
    "Mostrar las partes de las herramientas de edición, escritura y parcheado expandidas por defecto en la línea de tiempo",
+  "settings.general.row.showSessionProgressBar.title": "Mostrar barra de progreso de la sesión",
+  "settings.general.row.showSessionProgressBar.description":
+    "Mostrar la barra de progreso animada en la parte superior de la sesión cuando el agente esté trabajando",
  "settings.general.row.wayland.title": "Usar Wayland nativo",
  "settings.general.row.wayland.description": "Deshabilitar fallback a X11 en Wayland. Requiere reinicio.",
  "settings.general.row.wayland.tooltip":
@@ -606,6 +606,9 @@ export const dict = {
  "settings.general.row.editToolPartsExpanded.title": "Développer les parties de l'outil edit",
  "settings.general.row.editToolPartsExpanded.description":
    "Afficher les parties des outils edit, write et patch développées par défaut dans la chronologie",
+  "settings.general.row.showSessionProgressBar.title": "Afficher la barre de progression de la session",
+  "settings.general.row.showSessionProgressBar.description":
+    "Afficher la barre de progression animée en haut de la session lorsque l'agent travaille",
  "settings.general.row.wayland.title": "Utiliser Wayland natif",
  "settings.general.row.wayland.description": "Désactiver le repli X11 sur Wayland. Nécessite un redémarrage.",
  "settings.general.row.wayland.tooltip":
@@ -595,6 +595,9 @@ export const dict = {
  "settings.general.row.editToolPartsExpanded.title": "edit ツールパーツを展開",
  "settings.general.row.editToolPartsExpanded.description":
    "タイムラインで edit、write、patch ツールパーツをデフォルトで展開して表示します",
+  "settings.general.row.showSessionProgressBar.title": "セッション進行状況バーを表示",
+  "settings.general.row.showSessionProgressBar.description":
+    "エージェントの作業中に、セッション上部にアニメーション付きの進行状況バーを表示します",
  "settings.general.row.wayland.title": "ネイティブWaylandを使用",
  "settings.general.row.wayland.description": "WaylandでのX11フォールバックを無効にします。再起動が必要です。",
  "settings.general.row.wayland.tooltip":
@@ -591,6 +591,9 @@ export const dict = {
  "settings.general.row.editToolPartsExpanded.title": "edit 도구 파트 펼치기",
  "settings.general.row.editToolPartsExpanded.description":
    "타임라인에서 기본적으로 edit, write, patch 도구 파트를 펼친 상태로 표시합니다",
+  "settings.general.row.showSessionProgressBar.title": "세션 진행 표시줄 표시",
+  "settings.general.row.showSessionProgressBar.description":
+    "에이전트가 작업 중일 때 세션 상단에 애니메이션 진행 표시줄을 표시합니다",
  "settings.general.row.wayland.title": "네이티브 Wayland 사용",
  "settings.general.row.wayland.description": "Wayland에서 X11 폴백을 비활성화합니다. 다시 시작해야 합니다.",
  "settings.general.row.wayland.tooltip":
@@ -664,6 +664,9 @@ export const dict = {
  "settings.general.row.editToolPartsExpanded.title": "Utvid edit-verktøydeler",
  "settings.general.row.editToolPartsExpanded.description":
    "Vis edit-, write- og patch-verktøydeler utvidet som standard i tidslinjen",
+  "settings.general.row.showSessionProgressBar.title": "Vis fremdriftslinje for sesjonen",
+  "settings.general.row.showSessionProgressBar.description":
+    "Vis den animerte fremdriftslinjen øverst i sesjonen når agenten jobber",
  "settings.general.row.wayland.title": "Bruk innebygd Wayland",
  "settings.general.row.wayland.description": "Deaktiver X11-fallback på Wayland. Krever omstart.",
  "settings.general.row.wayland.tooltip":
@@ -596,6 +596,9 @@ export const dict = {
  "settings.general.row.editToolPartsExpanded.title": "Rozwijaj elementy narzędzia edit",
  "settings.general.row.editToolPartsExpanded.description":
    "Domyślnie pokazuj rozwinięte elementy narzędzi edit, write i patch na osi czasu",
+  "settings.general.row.showSessionProgressBar.title": "Pokazuj pasek postępu sesji",
+  "settings.general.row.showSessionProgressBar.description":
+    "Wyświetlaj animowany pasek postępu u góry sesji, gdy agent pracuje",
  "settings.general.row.wayland.title": "Użyj natywnego Wayland",
  "settings.general.row.wayland.description": "Wyłącz fallback X11 na Wayland. Wymaga restartu.",
  "settings.general.row.wayland.tooltip":
@@ -664,6 +664,9 @@ export const dict = {
  "settings.general.row.editToolPartsExpanded.title": "Разворачивать элементы инструмента edit",
  "settings.general.row.editToolPartsExpanded.description":
    "Показывать элементы инструментов edit, write и patch в ленте развернутыми по умолчанию",
+  "settings.general.row.showSessionProgressBar.title": "Показывать индикатор прогресса сессии",
+  "settings.general.row.showSessionProgressBar.description":
+    "Показывать анимированный индикатор прогресса вверху сессии, когда агент работает",
  "settings.general.row.wayland.title": "Использовать нативный Wayland",
  "settings.general.row.wayland.description": "Отключить X11 fallback на Wayland. Требуется перезапуск.",
  "settings.general.row.wayland.tooltip":
@@ -655,6 +655,9 @@ export const dict = {
  "settings.general.row.editToolPartsExpanded.title": "ขยายส่วนเครื่องมือ edit",
  "settings.general.row.editToolPartsExpanded.description":
    "แสดงส่วนเครื่องมือ edit, write และ patch แบบขยายตามค่าเริ่มต้นในไทม์ไลน์",
+  "settings.general.row.showSessionProgressBar.title": "แสดงแถบความคืบหน้าของเซสชัน",
+  "settings.general.row.showSessionProgressBar.description":
+    "แสดงแถบความคืบหน้าแบบเคลื่อนไหวที่ด้านบนของเซสชันเมื่อเอเจนต์กำลังทำงาน",
  "settings.general.row.wayland.title": "ใช้ Wayland แบบเนทีฟ",
  "settings.general.row.wayland.description": "ปิดใช้งาน X11 fallback บน Wayland ต้องรีสตาร์ท",
  "settings.general.row.wayland.tooltip": "บน Linux ที่มีจอภาพรีเฟรชเรตแบบผสม Wayland แบบเนทีฟอาจเสถียรกว่า",
@@ -671,6 +671,10 @@ export const dict = {
  "settings.general.row.editToolPartsExpanded.description":
    "Zaman çizelgesinde düzenleme, yazma ve yama araç bileşenlerini varsayılan olarak genişletilmiş göster",

+  "settings.general.row.showSessionProgressBar.title": "Oturum ilerleme çubuğunu göster",
+  "settings.general.row.showSessionProgressBar.description":
+    "Ajan çalışırken oturumun üst kısmında animasyonlu ilerleme çubuğunu göster",
+
  "settings.general.row.wayland.title": "Yerel Wayland kullan",
  "settings.general.row.wayland.description":
    "Wayland'da X11 geri dönüşünü devre dışı bırak. Yeniden başlatma gerektirir.",
@@ -781,6 +781,9 @@ export const dict = {
  "settings.general.row.editToolPartsExpanded.title": "Розгортати частини інструменту редагування",
  "settings.general.row.editToolPartsExpanded.description":
    "Показувати частини інструментів редагування, запису та патчів розгорнутими за замовчуванням на часовій шкалі",
+  "settings.general.row.showSessionProgressBar.title": "Показувати індикатор прогресу сесії",
+  "settings.general.row.showSessionProgressBar.description":
+    "Відображати анімований індикатор прогресу вгорі сесії, коли агент працює",

  "settings.general.row.wayland.title": "Використовувати нативний Wayland",
  "settings.general.row.wayland.description": "Вимкнути резервний X11 на Wayland. Потребує перезапуску.",
@@ -664,6 +664,8 @@ export const dict = {
  "settings.general.row.shellToolPartsExpanded.description": "默认在时间线中展开 shell 工具部分",
  "settings.general.row.editToolPartsExpanded.title": "展开编辑工具部分",
  "settings.general.row.editToolPartsExpanded.description": "默认在时间线中展开 edit、write 和 patch 工具部分",
+  "settings.general.row.showSessionProgressBar.title": "显示会话进度条",
+  "settings.general.row.showSessionProgressBar.description": "当智能体正在工作时，在会话顶部显示动画进度条",
  "settings.general.row.wayland.title": "使用原生 Wayland",
  "settings.general.row.wayland.description": "在 Wayland 上禁用 X11 回退。需要重启。",
  "settings.general.row.wayland.tooltip": "在混合刷新率显示器的 Linux 系统上，原生 Wayland 可能更稳定。",
@@ -650,6 +650,8 @@ export const dict = {
  "settings.general.row.shellToolPartsExpanded.description": "在時間軸中預設展開 shell 工具區塊",
  "settings.general.row.editToolPartsExpanded.title": "展開 edit 工具區塊",
  "settings.general.row.editToolPartsExpanded.description": "在時間軸中預設展開 edit、write 和 patch 工具區塊",
+  "settings.general.row.showSessionProgressBar.title": "顯示工作階段進度列",
+  "settings.general.row.showSessionProgressBar.description": "當代理程式正在運作時，在工作階段頂部顯示動畫進度列",
  "settings.general.row.wayland.title": "使用原生 Wayland",
  "settings.general.row.wayland.description": "在 Wayland 上停用 X11 後備模式。需要重新啟動。",
  "settings.general.row.wayland.tooltip": "在混合更新率螢幕的 Linux 系統上，原生 Wayland 可能更穩定。",
@@ -1,4 +1,5 @@
@import "@opencode-ai/ui/styles/tailwind";
+@import "@opencode-ai/session-ui/styles";
@import "@opencode-ai/ui/v2/styles/tailwind.css";

@font-face {
@@ -23,6 +24,44 @@
 }

@layer components {
+  @keyframes session-progress-whip {
+    0% {
+      clip-path: inset(0 100% 0 0 round 999px);
+      animation-timing-function: cubic-bezier(0.2, 0.8, 0.2, 1);
+    }
+
+    48% {
+      clip-path: inset(0 0 0 0 round 999px);
+      animation-timing-function: cubic-bezier(0.65, 0, 0.35, 1);
+    }
+
+    100% {
+      clip-path: inset(0 0 0 100% round 999px);
+    }
+  }
+
+  [data-component="session-progress"] {
+    position: absolute;
+    inset: 0 0 auto;
+    height: 2px;
+    overflow: hidden;
+    pointer-events: none;
+    opacity: 1;
+    transition: opacity 220ms ease-out;
+  }
+
+  [data-component="session-progress"][data-state="hiding"] {
+    opacity: 0;
+  }
+
+  [data-component="session-progress-bar"] {
+    width: 100%;
+    height: 100%;
+    border-radius: 999px;
+    clip-path: inset(0 100% 0 0 round 999px);
+    will-change: clip-path;
+  }
+
  [data-component="getting-started"] {
    container-type: inline-size;
    container-name: getting-started;
@@ -1,4 +1,4 @@
-import { DataProvider } from "@opencode-ai/ui/context"
+import { DataProvider } from "@opencode-ai/session-ui/context"
 import { showToast } from "@/utils/toast"
 import { base64Encode } from "@opencode-ai/core/util/encode"
 import { useLocation, useNavigate, useParams } from "@solidjs/router"
@@ -60,7 +60,7 @@ import { ServerHealthIndicator } from "@/components/server/server-row"
 import { type ServerHealth } from "@/utils/server-health"
 import { Persist, persisted } from "@/utils/persist"
 import { useMarked } from "@opencode-ai/ui/context/marked"
-import { preloadMarkdown } from "@opencode-ai/ui/markdown-cache"
+import { preloadMarkdown } from "@opencode-ai/session-ui/markdown-cache"

 const HOME_SESSION_LIMIT = 64
 const HOME_ROW_LAYOUT =
@@ -3,7 +3,7 @@ import { getProjectAvatarVariant } from "@/context/layout"
 import { displayName, getProjectAvatarSource } from "@/pages/layout/helpers"
 import { useSessionTabAvatarState } from "@/pages/layout/project-avatar-state"
 import { ProjectAvatar } from "@opencode-ai/ui/v2/project-avatar-v2"
-import { SessionProgressIndicatorV2 } from "@opencode-ai/ui/v2/session-progress-indicator-v2"
+import { SessionProgressIndicatorV2 } from "@opencode-ai/session-ui/v2/session-progress-indicator-v2"
 import { Show } from "solid-js"

 export function SessionTabAvatar(props: {
@@ -25,7 +25,7 @@ import { ResizeHandle } from "@opencode-ai/ui/resize-handle"
 import { Select } from "@opencode-ai/ui/select"
 import { Tabs } from "@opencode-ai/ui/tabs"
 import { createAutoScroll } from "@opencode-ai/ui/hooks"
-import { previewSelectedLines } from "@opencode-ai/ui/pierre/selection-bridge"
+import { previewSelectedLines } from "@opencode-ai/session-ui/pierre/selection-bridge"
 import { Button } from "@opencode-ai/ui/button"
 import { showToast } from "@/utils/toast"
 import { base64Encode, checksum } from "@opencode-ai/core/util/encode"
@@ -1,7 +1,7 @@
 import { For, Show } from "solid-js"
 import type { PermissionRequest } from "@opencode-ai/sdk/v2"
 import { Button } from "@opencode-ai/ui/button"
-import { DockPrompt } from "@opencode-ai/ui/dock-prompt"
+import { DockPrompt } from "@opencode-ai/session-ui/dock-prompt"
 import { Icon } from "@opencode-ai/ui/icon"
 import { useLanguage } from "@/context/language"

@@ -2,7 +2,7 @@ import { For, Show, createMemo, onCleanup, onMount, type Component } from "solid
 import { createStore } from "solid-js/store"
 import { useMutation } from "@tanstack/solid-query"
 import { Button } from "@opencode-ai/ui/button"
-import { DockPrompt } from "@opencode-ai/ui/dock-prompt"
+import { DockPrompt } from "@opencode-ai/session-ui/dock-prompt"
 import { Icon } from "@opencode-ai/ui/icon"
 import { showToast } from "@/utils/toast"
 import type { QuestionAnswer, QuestionRequest } from "@opencode-ai/sdk/v2"
@@ -2,10 +2,10 @@ import { createEffect, createMemo, createSignal, Match, on, onCleanup, Switch }
 import { createStore } from "solid-js/store"
 import { Dynamic } from "solid-js/web"
 import { makeEventListener } from "@solid-primitives/event-listener"
-import type { FileSearchHandle } from "@opencode-ai/ui/file"
+import type { FileSearchHandle } from "@opencode-ai/session-ui/file"
 import { useFileComponent } from "@opencode-ai/ui/context/file"
-import { cloneSelectedLineRange, previewSelectedLines } from "@opencode-ai/ui/pierre/selection-bridge"
-import { createLineCommentController } from "@opencode-ai/ui/line-comment-annotations"
+import { cloneSelectedLineRange, previewSelectedLines } from "@opencode-ai/session-ui/pierre/selection-bridge"
+import { createLineCommentController } from "@opencode-ai/session-ui/line-comment-annotations"
 import { sampledChecksum } from "@opencode-ai/core/util/encode"
 import { DropdownMenu } from "@opencode-ai/ui/dropdown-menu"
 import { IconButton } from "@opencode-ai/ui/icon-button"
@@ -1,12 +1,12 @@
 import { createEffect, onCleanup, type JSX } from "solid-js"
 import { makeEventListener } from "@solid-primitives/event-listener"
 import type { SnapshotFileDiff, VcsFileDiff } from "@opencode-ai/sdk/v2"
-import { SessionReview } from "@opencode-ai/ui/session-review"
+import { SessionReview } from "@opencode-ai/session-ui/session-review"
 import type {
  SessionReviewCommentActions,
  SessionReviewCommentDelete,
  SessionReviewCommentUpdate,
-} from "@opencode-ai/ui/session-review"
+} from "@opencode-ai/session-ui/session-review"
 import type { SelectedLineRange } from "@/context/file"
 import { useSDK } from "@/context/sdk"
 import { useLayout } from "@/context/layout"
@@ -26,7 +26,7 @@ import {
  Part as MessagePart,
  partDefaultOpen,
  type UserActions,
-} from "@opencode-ai/ui/message-part"
+} from "@opencode-ai/session-ui/message-part"
 import { DiffChanges } from "@opencode-ai/ui/diff-changes"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
 import { Icon } from "@opencode-ai/ui/icon"
@@ -35,7 +35,7 @@ import { DropdownMenu } from "@opencode-ai/ui/dropdown-menu"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { InlineInput } from "@opencode-ai/ui/inline-input"
 import { Spinner } from "@opencode-ai/ui/spinner"
-import { SessionRetry } from "@opencode-ai/ui/session-retry"
+import { SessionRetry } from "@opencode-ai/session-ui/session-retry"
 import { ScrollView } from "@opencode-ai/ui/scroll-view"
 import { StickyAccordionHeader } from "@opencode-ai/ui/sticky-accordion-header"
 import { TextField } from "@opencode-ai/ui/text-field"
@@ -51,11 +51,12 @@ import type {
 import { showToast } from "@/utils/toast"
 import { getDirectory, getFilename } from "@opencode-ai/core/util/path"
 import { Popover as KobaltePopover } from "@kobalte/core/popover"
-import { normalize } from "@opencode-ai/ui/session-diff"
+import { normalize } from "@opencode-ai/session-ui/session-diff"
 import { useFileComponent } from "@opencode-ai/ui/context/file"
 import { shouldMarkBoundaryGesture, normalizeWheelDelta } from "@/pages/session/message-gesture"
 import { SessionContextUsage } from "@/components/session-context-usage"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
+import { createResizeObserver } from "@solid-primitives/resize-observer"
 import { useLanguage } from "@/context/language"
 import { useSessionKey } from "@/pages/session/session-layout"
 import { useServerSDK } from "@/context/server-sdk"
@@ -94,6 +95,8 @@ const taskDescription = (part: PartType, sessionID: string) => {
  if (typeof value === "string" && value) return value
 }

+const pace = (width: number) => Math.round(Math.max(1200, Math.min(3200, (Math.max(width, 360) * 2000) / 900)))
+
 const boundaryTarget = (root: HTMLElement, target: EventTarget | null) => {
  const current = target instanceof Element ? target : undefined
  const nested = current?.closest("[data-scrollable]")
@@ -564,7 +567,18 @@ export function MessageTimeline(props: {
    open: false,
    dismiss: null as "escape" | "outside" | null,
  })
+  const [bar, setBar] = createStore({
+    ms: pace(640),
+  })
  let more: HTMLButtonElement | undefined
+  let head: HTMLDivElement | undefined
+
+  const updateTitleMetrics = () => {
+    if (!head || head.clientWidth <= 0) return
+    setBar("ms", pace(head.clientWidth))
+  }
+
+  createResizeObserver(() => head, updateTitleMetrics)

  const bindListRoot = (root: HTMLDivElement) => {
    if (root === listRoot()) return
@@ -1277,6 +1291,10 @@ export function MessageTimeline(props: {
      >
        <Show when={showHeader()}>
          <div
+            ref={(el) => {
+              head = el
+              updateTitleMetrics()
+            }}
            data-session-title
            classList={{
              "sticky top-0 z-30 bg-[linear-gradient(to_bottom,var(--background-stronger)_48px,transparent)]": true,
@@ -1288,6 +1306,17 @@ export function MessageTimeline(props: {
              "md:max-w-200 md:mx-auto 2xl:max-w-[1000px]": props.centered,
            }}
          >
+            <Show when={workingStatus() !== "hidden" && settings.general.showSessionProgressBar()}>
+              <div data-component="session-progress" data-state={workingStatus()} aria-hidden="true">
+                <div
+                  data-component="session-progress-bar"
+                  style={{
+                    background: tint() ?? "var(--icon-interactive-base)",
+                    animation: `session-progress-whip ${bar.ms}ms infinite`,
+                  }}
+                />
+              </div>
+            </Show>
            <div class="h-12 w-full flex items-center justify-between gap-2">
              <div class="flex items-center gap-1 min-w-0 flex-1 pr-3">
                <div class="flex items-center min-w-0 grow-1">
@@ -1,6 +1,6 @@
 import { parseCommentNote, readCommentMetadata } from "@/utils/comment-note"
 import { AssistantMessage, Part, SessionStatus, SnapshotFileDiff, UserMessage } from "@opencode-ai/sdk/v2"
-import { groupParts, PartGroup, renderable } from "@opencode-ai/ui/message-part"
+import { groupParts, PartGroup, renderable } from "@opencode-ai/session-ui/message-part"
 import { Data, Equal } from "effect"

 export type SummaryDiff = SnapshotFileDiff & { file: string }
@@ -1,7 +1,7 @@
 import { useNavigate } from "@solidjs/router"
 import { useCommand, type CommandOption } from "@/context/command"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
-import { previewSelectedLines } from "@opencode-ai/ui/pierre/selection-bridge"
+import { previewSelectedLines } from "@opencode-ai/session-ui/pierre/selection-bridge"
 import { useFile, selectionFromLines, type FileSelection, type SelectedLineRange } from "@/context/file"
 import { useLanguage } from "@/context/language"
 import { useLayout } from "@/context/layout"
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/cli",
-  "version": "1.17.9",
+  "version": "1.17.10",
  "type": "module",
  "license": "MIT",
  "bin": {
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-app",
-  "version": "1.17.9",
+  "version": "1.17.10",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -196,6 +196,7 @@ export async function handler(
          providerInfo.modifyHeaders(headers, providerInfo.apiKey, stickyId)
          Object.entries(providerInfo.headerModifier ?? {}).forEach(([k, v]) => {
            if (v === "$ip") return headers.set(k, ip)
+            if (v === "$caller") return headers.set(k, `caller:${ip}`)
            if (v === "$session") return headers.set(k, sessionId)
            if (v === "$model") return headers.set(k, model)
            if (v === "$request") return headers.set(k, requestId)
@@ -354,7 +355,7 @@ export async function handler(
              responseLength += value.length
              buffer += decoder.decode(value, { stream: true })

-              const parts = buffer.split(providerInfo.streamSeparator)
+              const parts = buffer.split(/\r\n\r\n|\n\n|\r\r/)
              buffer = parts.pop() ?? ""

              for (let part of parts) {
@@ -139,7 +139,6 @@ export const anthropicHelper: ProviderHelper = ({ reqModel, providerModel }) =>
        return encoder.encode(messages.join(""))
      }
    },
-    streamSeparator: "\n\n",
    createUsageParser: () => {
      let usage: Usage

@@ -37,7 +37,6 @@ export const googleHelper: ProviderHelper = ({ providerModel }) => ({
    return body
  },
  createBinaryStreamDecoder: () => undefined,
-  streamSeparator: "\r\n\r\n",
  createUsageParser: () => {
    let usage: Usage

@@ -37,7 +37,6 @@ export const oaCompatHelper: ProviderHelper = ({ adjustCacheUsage }) => ({
    }
  },
  createBinaryStreamDecoder: () => undefined,
-  streamSeparator: "\n\n",
  createUsageParser: () => {
    let usage: Usage

@@ -20,7 +20,6 @@ export const openaiHelper: ProviderHelper = ({ workspaceID }) => ({
  },
  modifyBody: (body: Record<string, any>) => body,
  createBinaryStreamDecoder: () => undefined,
-  streamSeparator: "\n\n",
  createUsageParser: () => {
    let usage: Usage

@@ -44,7 +44,6 @@ export type ProviderHelper = (input: {
  modifyHeaders: (headers: Headers, apiKey: string, stickyId: string) => void
  modifyBody: (body: Record<string, any>) => Record<string, any>
  createBinaryStreamDecoder: () => ((chunk: Uint8Array) => Uint8Array | undefined) | undefined
-  streamSeparator: string
  createUsageParser: () => {
    parse: (chunk: string) => void
    retrieve: () => any
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/console-core",
-  "version": "1.17.9",
+  "version": "1.17.10",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-function",
-  "version": "1.17.9",
+  "version": "1.17.10",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -118,11 +118,12 @@ function toLakeEvent(time: string, data: Record<string, unknown>) {
    request: string(data, "request"),
    client: string(data, "client"),
    user_agent: string(data, "user_agent"),
+    model: string(data, "model"),
+    model_tier: string(data, "model.tier"),
    model_variant: string(data, "model.variant"),
    source: string(data, "source"),
    provider: string(data, "provider"),
    provider_model: string(data, "provider.model"),
-    model: string(data, "model"),
    llm_error_code: integer(data, "llm.error.code"),
    llm_error_message: string(data, "llm.error.message"),
    error_response: string(data, "error.response"),
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-mail",
-  "version": "1.17.9",
+  "version": "1.17.10",
  "dependencies": {
    "@jsx-email/all": "2.2.3",
    "@jsx-email/cli": "1.4.3",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-support",
-  "version": "1.17.9",
+  "version": "1.17.10",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.9",
+  "version": "1.17.10",
  "name": "@opencode-ai/core",
  "type": "module",
  "license": "MIT",
@@ -1,8 +1,8 @@
 export * as Catalog from "./catalog"

 import { Array, Context, Effect, Layer, Option, Order, pipe, Schema } from "effect"
+import { Catalog } from "@opencode-ai/schema/catalog"
 import { ModelV2 } from "./model"
-import { ModelRequest } from "./model-request"
 import { ProviderV2 } from "./provider"
 import { EventV2 } from "./event"
 import { Policy } from "./policy"
@@ -18,9 +18,7 @@ export type DefaultModel = { providerID: ProviderV2.ID; modelID: ModelV2.ID }

 export const PolicyActions = Schema.Literals(["provider.use"])

-export const Event = {
-  Updated: EventV2.define({ type: "catalog.updated", schema: {} }),
-}
+export const Event = Catalog.Event

 type Data = {
  providers: Map<ProviderV2.ID, ProviderRecord>
@@ -86,7 +84,8 @@ export const layer = Layer.effect(
              ? { ...model.api, settings: { ...provider.api.settings, ...model.api.settings } }
              : model.api
      const request = {
-        ...ModelRequest.merge({ ...provider.request, generation: {}, options: {} }, model.request),
+        headers: { ...provider.request.headers, ...model.request.headers },
+        body: { ...provider.request.body, ...model.request.body },
        variant: model.request.variant,
      }
      return ModelV2.Info.make({
@@ -4,7 +4,6 @@ import { define } from "../../plugin/internal"
 import { Effect } from "effect"
 import { Config } from "../../config"
 import { ModelV2 } from "../../model"
-import { ModelRequest } from "../../model-request"
 import { ProviderV2 } from "../../provider"

 export const Plugin = define({
@@ -59,15 +58,11 @@ export const Plugin = define({
                Object.assign(provider.request.body, item.request.body)
              }
            })
-            const providerApi = catalog.provider.get(providerID)?.provider.api
-            const providerPackage = providerApi?.type === "aisdk" ? providerApi.package : undefined
-
            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 }
-                const packageName = model.api.type === "aisdk" ? model.api.package : providerPackage
                if (config.capabilities !== undefined) {
                  model.capabilities = {
                    tools: config.capabilities.tools,
@@ -76,10 +71,8 @@ export const Plugin = define({
                  }
                }
                if (config.request !== undefined) {
-                  ModelRequest.assign(model.request, {
-                    headers: config.request.headers,
-                    ...ModelRequest.normalizeAiSdkOptions(packageName, config.request.body ?? {}),
-                  })
+                  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) {
@@ -90,15 +83,11 @@ export const Plugin = define({
                        id: variant.id,
                        headers: {},
                        body: {},
-                        generation: {},
-                        options: {},
                      }
                      model.variants.push(existing)
                    }
-                    ModelRequest.assign(existing, {
-                      headers: variant.headers,
-                      ...ModelRequest.normalizeAiSdkOptions(packageName, variant.body ?? {}),
-                    })
+                    Object.assign(existing.headers, variant.headers)
+                    Object.assign(existing.body, variant.body)
                  }
                }
                if (config.cost !== undefined) {
@@ -1,46 +1,19 @@
 export * as EventV2 from "./event"

 import { Cause, Context, Effect, Layer, Option, PubSub, Schema, Stream } from "effect"
+import { Event } from "@opencode-ai/schema/event"
+import type { Data, Definition, Payload } from "@opencode-ai/schema/event"
 import { and, asc, eq, gt } from "drizzle-orm"
 import { Database } from "./database/database"
 import { EventSequenceTable, EventTable } from "./event/sql"
 import { Location } from "./location"
-import { withStatics } from "./schema"
-import { Identifier } from "./util/identifier"
 import { LayerNode } from "./effect/layer-node"
 import { isDeepStrictEqual } from "node:util"
+import { Durable } from "@opencode-ai/schema/durable-event-manifest"

-export const ID = Schema.String.check(Schema.isStartsWith("evt_")).pipe(
-  Schema.brand("Event.ID"),
-  withStatics((schema) => ({
-    create: () => schema.make("evt_" + Identifier.ascending()),
-  })),
-)
-export type ID = typeof ID.Type
-
-export type Definition<Type extends string = string, DataSchema extends Schema.Top = Schema.Top> = {
-  readonly type: Type
-  readonly durable?: {
-    readonly version: number
-    readonly aggregate: string
-  }
-  readonly data: DataSchema
-}
-
-export type Data<D extends Definition> = Schema.Schema.Type<D["data"]>
-
-export type Payload<D extends Definition = Definition> = {
-  readonly id: ID
-  readonly type: D["type"]
-  readonly data: Data<D>
-  readonly durable?: {
-    readonly aggregateID: string
-    readonly seq: number
-    readonly version: number
-  }
-  readonly location?: Location.Ref
-  readonly metadata?: Record<string, unknown>
-}
+export const ID = Event.ID
+export type ID = import("@opencode-ai/schema/event").ID
+export type { Data, Definition, Payload } from "@opencode-ai/schema/event"

 export type Subscriber<D extends Definition = Definition> = (event: Payload<D>) => Effect.Effect<void>
 export type Unsubscribe = Effect.Effect<void>
@@ -74,52 +47,8 @@ export class InvalidDurableEventError extends Schema.TaggedErrorClass<InvalidDur
  },
 ) {}

-export function versionedType(type: string, version: number) {
-  return `${type}.${version}`
-}
-
-export const registry = new Map<string, Definition>()
-const durableRegistry = new Map<string, Definition>()
-
-export function define<const Type extends string, Fields extends Schema.Struct.Fields>(input: {
-  readonly type: Type
-  readonly durable?: {
-    readonly version: number
-    readonly aggregate: string
-  }
-  readonly schema: Fields
-}): Schema.Schema<Payload<Definition<Type, Schema.Struct<Fields>>>> & Definition<Type, Schema.Struct<Fields>> {
-  const Data = Schema.Struct(input.schema)
-  const Payload = Schema.Struct({
-    id: ID,
-    metadata: Schema.optional(Schema.Record(Schema.String, Schema.Unknown)),
-    type: Schema.Literal(input.type),
-    durable: Schema.optional(Schema.Struct({ aggregateID: Schema.String, seq: Schema.Number, version: Schema.Number })),
-    location: Schema.optional(Location.Ref),
-    data: Data,
-  }).annotate({ identifier: input.type })
-
-  const definition = Object.assign(Payload, {
-    type: input.type,
-    ...(input.durable === undefined ? {} : { durable: input.durable }),
-    data: Data,
-  })
-  const existing = registry.get(input.type)
-  if (
-    input.durable === undefined ||
-    existing?.durable === undefined ||
-    input.durable.version >= existing.durable.version
-  ) {
-    registry.set(input.type, definition)
-  }
-  if (input.durable) durableRegistry.set(versionedType(input.type, input.durable.version), definition)
-  return definition as Schema.Schema<Payload<Definition<Type, Schema.Struct<Fields>>>> &
-    Definition<Type, Schema.Struct<Fields>>
-}
-
-export function definitions() {
-  return registry.values().toArray()
-}
+export const define = Event.define
+export const versionedType = Event.versionedType

 export interface PublishOptions {
  readonly id?: ID
@@ -169,6 +98,7 @@ export const layerWith = (options?: LayerOptions) =>
        typed: new Map<string, PubSub.PubSub<Payload>>(),
      }
      const projectors = new Map<string, Subscriber[]>()
+      // TODO: Bind durable projectors to exact type+version before supporting incompatible historical payloads.
      const listeners = new Array<Subscriber>()
      const { db } = yield* Database.Service

@@ -194,6 +124,7 @@ export const layerWith = (options?: LayerOptions) =>
      )

      function commitDurableEvent(
+        definition: Definition,
        event: Payload,
        input?: {
          readonly seq: number
@@ -204,7 +135,6 @@ export const layerWith = (options?: LayerOptions) =>
        commit?: (seq: number) => Effect.Effect<void>,
      ) {
        return Effect.gen(function* () {
-          const definition = registry.get(event.type)
          const durable = definition?.durable
          if (durable) {
            const aggregateID = (event.data as Record<string, unknown>)[durable.aggregate]
@@ -238,9 +168,10 @@ export const layerWith = (options?: LayerOptions) =>
                            .get()
                            .pipe(Effect.orDie)
                          const latest = row?.seq ?? -1
-                          const encoded = Schema.encodeUnknownSync(
-                            definition.data as Schema.Codec<unknown, unknown, never, never>,
-                          )(event.data) as Record<string, unknown>
+                          const encoded = Schema.encodeUnknownSync(definition.data)(event.data) as Record<
+                            string,
+                            unknown
+                          >
                          if (input?.strictOwner && row?.ownerID && row.ownerID !== input.ownerID) {
                            yield* Effect.die(
                              new InvalidDurableEventError({
@@ -356,9 +287,8 @@ export const layerWith = (options?: LayerOptions) =>
        })
      }

-      function publishEvent<D extends Definition>(event: Payload<D>, commit?: PublishOptions["commit"]) {
+      function publishEvent<D extends Definition>(definition: D, event: Payload<D>, commit?: PublishOptions["commit"]) {
        return Effect.gen(function* () {
-          const definition = registry.get(event.type)
          if (!definition?.durable && commit)
            return yield* Effect.die(
              new InvalidDurableEventError({
@@ -367,7 +297,7 @@ export const layerWith = (options?: LayerOptions) =>
              }),
            )
          if (definition?.durable) {
-            const committed = yield* commitDurableEvent(event as Payload, undefined, commit)
+            const committed = yield* commitDurableEvent(definition, event as Payload, undefined, commit)
            if (committed) {
              event = {
                ...event,
@@ -416,6 +346,7 @@ export const layerWith = (options?: LayerOptions) =>
              ? { directory: serviceLocation.directory, workspaceID: serviceLocation.workspaceID }
              : undefined)
          return yield* publishEvent(
+            definition,
            {
              id: options?.id ?? ID.create(),
              ...(options?.metadata ? { metadata: options.metadata } : {}),
@@ -433,7 +364,7 @@ export const layerWith = (options?: LayerOptions) =>
        options?: { readonly publish?: boolean; readonly ownerID?: string; readonly strictOwner?: boolean },
      ) {
        return Effect.gen(function* () {
-          const definition = durableRegistry.get(event.type)
+          const definition = Durable.get(event.type)
          if (!definition?.durable) {
            yield* Effect.die(
              new InvalidDurableEventError({ type: event.type, message: `Unknown durable event type ${event.type}` }),
@@ -442,11 +373,9 @@ export const layerWith = (options?: LayerOptions) =>
            const payload = {
              id: event.id,
              type: definition.type,
-              data: Schema.decodeUnknownSync(definition.data as Schema.Codec<unknown, unknown, never, never>)(
-                event.data,
-              ),
+              data: Schema.decodeUnknownSync(definition.data)(event.data),
            } as Payload
-            const committed = yield* commitDurableEvent(payload, {
+            const committed = yield* commitDurableEvent(definition, payload, {
              seq: event.seq,
              aggregateID: event.aggregateID,
              ownerID: options?.ownerID,
@@ -530,8 +459,8 @@ export const layerWith = (options?: LayerOptions) =>

      const streamAll = (): Stream.Stream<Payload> => Stream.fromPubSub(pubsub.all)

-      const decodeSerializedEvent = (event: SerializedEvent): Payload => {
-        const definition = durableRegistry.get(event.type)
+      const decodeSerializedEvent = (event: SerializedEvent) => {
+        const definition = Durable.get(event.type)
        if (!definition?.durable) {
          throw new InvalidDurableEventError({ type: event.type, message: `Unknown durable event type ${event.type}` })
        }
@@ -539,7 +468,7 @@ export const layerWith = (options?: LayerOptions) =>
          id: event.id,
          type: definition.type,
          durable: { aggregateID: event.aggregateID, seq: event.seq, version: definition.durable.version },
-          data: Schema.decodeUnknownSync(definition.data as Schema.Codec<unknown, unknown, never, never>)(event.data),
+          data: Schema.decodeUnknownSync(definition.data)(event.data),
        }
      }

@@ -2,12 +2,11 @@ export * as FileSystem from "./filesystem"

 import path from "path"
 import { Context, Effect, Layer, Schema } from "effect"
-import { EventV2 } from "./event"
 import { FSUtil } from "./fs-util"
 import { Location } from "./location"
 import { PositiveInt, RelativePath } from "./schema"
 import { FileSystemSearch } from "./filesystem/search"
-import { Entry, Match } from "@opencode-ai/schema/filesystem"
+import { Entry, FileSystem, Match } from "@opencode-ai/schema/filesystem"
 export { Entry, Match, Submatch } from "@opencode-ai/schema/filesystem"

 export const ReadInput = Schema.Struct({
@@ -48,14 +47,7 @@ export class GrepInput extends Schema.Class<GrepInput>("FileSystem.GrepInput")({
  limit: PositiveInt.pipe(Schema.optional),
 }) {}

-export const Event = {
-  Edited: EventV2.define({
-    type: "file.edited",
-    schema: {
-      file: Schema.String,
-    },
-  }),
-}
+export const Event = FileSystem.Event

 export interface Interface {
  readonly read: (input: ReadInput) => Effect.Effect<{ readonly content: Uint8Array; readonly mime: string }>
@@ -3,7 +3,8 @@ export * as Watcher from "./watcher"
 // @ts-ignore
 import { createWrapper } from "@parcel/watcher/wrapper"
 import type ParcelWatcher from "@parcel/watcher"
-import { Cause, Context, Effect, Layer, Schema } from "effect"
+import { Cause, Context, Effect, Layer } from "effect"
+import { FileSystemWatcher } from "@opencode-ai/schema/filesystem-watcher"
 import path from "path"
 import { Config } from "../config"
 import { EventV2 } from "../event"
@@ -19,15 +20,7 @@ declare const OPENCODE_LIBC: string | undefined

 const SUBSCRIBE_TIMEOUT_MS = 10_000

-export const Event = {
-  Updated: EventV2.define({
-    type: "file.watcher.updated",
-    schema: {
-      file: Schema.String,
-      event: Schema.Literals(["add", "change", "unlink"]),
-    },
-  }),
-}
+export const Event = FileSystemWatcher.Event

 const watcher = lazy((): typeof import("@parcel/watcher") | undefined => {
  try {
@@ -136,16 +136,7 @@ export class AuthorizationError extends Schema.TaggedErrorClass<AuthorizationErr

 export type Error = CodeRequiredError | AuthorizationError

-export const Event = {
-  Updated: EventV2.define({
-    type: "integration.updated",
-    schema: {},
-  }),
-  ConnectionUpdated: EventV2.define({
-    type: "integration.connection.updated",
-    schema: { integrationID: ID },
-  }),
-}
+export const Event = Integration.Event

 export const Ref = Integration.Ref
 export type Ref = Integration.Ref
@@ -1,102 +0,0 @@
-export * as ModelRequest from "./model-request"
-
-import { ModelRequest } from "@opencode-ai/schema/model-request"
-
-export const Generation = ModelRequest.Generation
-export type Generation = ModelRequest.Generation
-
-export const Request = ModelRequest.Request
-export type Request = ModelRequest.Request
-
-interface MutableRequest {
-  headers: Record<string, string>
-  body: Record<string, unknown>
-  generation?: Record<string, unknown>
-  options?: Record<string, unknown>
-}
-
-const generationKeys = new Map<string, keyof Generation>([
-  ["maxOutputTokens", "maxTokens"],
-  ["maxTokens", "maxTokens"],
-  ["temperature", "temperature"],
-  ["topP", "topP"],
-  ["topK", "topK"],
-  ["frequencyPenalty", "frequencyPenalty"],
-  ["presencePenalty", "presencePenalty"],
-  ["seed", "seed"],
-  ["stopSequences", "stop"],
-  ["stop", "stop"],
-])
-
-interface Profile {
-  readonly namespace: string
-  readonly semantics: ReadonlyMap<string, string>
-}
-
-const profiles = new Map<string, Profile>([
-  [
-    "@ai-sdk/openai",
-    {
-      namespace: "openai",
-      semantics: new Map([
-        ["store", "store"],
-        ["promptCacheKey", "promptCacheKey"],
-        ["reasoningEffort", "reasoningEffort"],
-        ["reasoningSummary", "reasoningSummary"],
-        ["include", "include"],
-        ["textVerbosity", "textVerbosity"],
-        ["serviceTier", "serviceTier"],
-        ["service_tier", "serviceTier"],
-      ]),
-    },
-  ],
-  [
-    "@ai-sdk/openai-compatible",
-    {
-      namespace: "openai",
-      semantics: new Map([
-        ["store", "store"],
-        ["promptCacheKey", "promptCacheKey"],
-        ["reasoningEffort", "reasoningEffort"],
-        ["reasoning_effort", "reasoningEffort"],
-      ]),
-    },
-  ],
-  ["@ai-sdk/anthropic", { namespace: "anthropic", semantics: new Map([["thinking", "thinking"]]) }],
-])
-
-export const namespace = (packageName: string) => profiles.get(packageName)?.namespace
-
-export const merge = (base: Request, override: Partial<Request>) => ({
-  headers: { ...base.headers, ...override.headers },
-  body: { ...base.body, ...override.body },
-  generation: { ...base.generation, ...override.generation },
-  options: { ...base.options, ...override.options },
-})
-
-export const assign = (target: MutableRequest, override: Partial<Request>) => {
-  Object.assign(target.headers, override.headers)
-  Object.assign(target.body, override.body)
-  Object.assign((target.generation ??= {}), override.generation)
-  Object.assign((target.options ??= {}), override.options)
-}
-
-/** Partitions AI-SDK-shaped request options before they enter the Catalog. */
-export function normalizeAiSdkOptions(packageName: string | undefined, input: Readonly<Record<string, unknown>>) {
-  const generation: Record<string, number | ReadonlyArray<string>> = {}
-  const options: Record<string, unknown> = {}
-  const body: Record<string, unknown> = {}
-  const semantics = profiles.get(packageName ?? "")?.semantics
-
-  for (const [key, value] of Object.entries(input)) {
-    const generationKey = generationKeys.get(key)
-    if (generationKey === "stop" && Array.isArray(value) && value.every((item) => typeof item === "string"))
-      generation[generationKey] = value
-    else if (generationKey !== undefined && generationKey !== "stop" && typeof value === "number")
-      generation[generationKey] = value
-    else if (semantics?.has(key)) options[semantics.get(key)!] = value
-    else body[key] = value
-  }
-
-  return { generation, options, body }
-}
@@ -1,6 +1,7 @@
 import path from "path"
 import { Context, Duration, Effect, Layer, Option, Schedule, Schema } from "effect"
 import { FetchHttpClient, HttpClient, HttpClientRequest } from "effect/unstable/http"
+import { ModelsDev } from "@opencode-ai/schema/models-dev"
 import { Global } from "./global"
 import { Flag } from "./flag/flag"
 import { Flock } from "./util/flock"
@@ -108,12 +109,7 @@ export const Provider = Schema.Struct({

 export type Provider = Schema.Schema.Type<typeof Provider>

-export const Event = {
-  Refreshed: EventV2.define({
-    type: "models-dev.refreshed",
-    schema: {},
-  }),
-}
+export const Event = ModelsDev.Event

 declare const OPENCODE_MODELS_DEV: Record<string, Provider> | undefined

@@ -7,45 +7,31 @@ import { Location } from "./location"
 import { AgentV2 } from "./agent"
 import { SessionV2 } from "./session"
 import { SessionStore } from "./session/store"
-import { withStatics } from "./schema"
-import { Identifier } from "./util/identifier"
 import { Wildcard } from "./util/wildcard"
 import { PermissionSaved } from "./permission/saved"

 export { Effect, Rule, Ruleset } from "@opencode-ai/schema/permission"
 const missingAgentPermissions: Permission.Ruleset = [{ action: "*", resource: "*", effect: "deny" }]

-export const ID = Schema.String.check(Schema.isStartsWith("per")).pipe(
-  Schema.brand("PermissionV2.ID"),
-  withStatics((schema) => ({ create: (id?: string) => schema.make(id ?? "per_" + Identifier.ascending()) })),
-)
+export const ID = Permission.ID
 export type ID = typeof ID.Type

-export const Source = Schema.Union([
-  Schema.Struct({
-    type: Schema.Literal("tool"),
-    messageID: Schema.String,
-    callID: Schema.String,
-  }),
-]).annotate({ identifier: "PermissionV2.Source" })
+export const Source = Permission.Source
 export type Source = typeof Source.Type

 const RequestFields = {
-  sessionID: SessionV2.ID,
-  action: Schema.String,
-  resources: Schema.Array(Schema.String),
-  save: Schema.Array(Schema.String).pipe(Schema.optional),
-  metadata: Schema.Record(Schema.String, Schema.Unknown).pipe(Schema.optional),
-  source: Source.pipe(Schema.optional),
+  sessionID: Permission.Request.fields.sessionID,
+  action: Permission.Request.fields.action,
+  resources: Permission.Request.fields.resources,
+  save: Permission.Request.fields.save,
+  metadata: Permission.Request.fields.metadata,
+  source: Permission.Request.fields.source,
 }

-export const Request = Schema.Struct({
-  id: ID,
-  ...RequestFields,
-}).annotate({ identifier: "PermissionV2.Request" })
+export const Request = Permission.Request
 export type Request = typeof Request.Type

-export const Reply = Schema.Literals(["once", "always", "reject"]).annotate({ identifier: "PermissionV2.Reply" })
+export const Reply = Permission.Reply
 export type Reply = typeof Reply.Type

 export const AssertInput = Schema.Struct({
@@ -68,17 +54,7 @@ export const AskResult = Schema.Struct({
 }).annotate({ identifier: "PermissionV2.AskResult" })
 export type AskResult = typeof AskResult.Type

-export const Event = {
-  Asked: EventV2.define({ type: "permission.v2.asked", schema: Request.fields }),
-  Replied: EventV2.define({
-    type: "permission.v2.replied",
-    schema: {
-      sessionID: SessionV2.ID,
-      requestID: ID,
-      reply: Reply,
-    },
-  }),
-}
+export const Event = Permission.Event

 export class RejectedError extends Schema.TaggedErrorClass<RejectedError>()("PermissionV2.RejectedError", {}) {}

@@ -1,7 +1,8 @@
 export * as PluginV2 from "./plugin"

-import { Context, Deferred, Effect, Exit, Layer, Schema, Scope } from "effect"
+import { Context, Deferred, Effect, Exit, Layer, Scope } from "effect"
 import type { Plugin } from "@opencode-ai/plugin/v2/effect"
+import { PluginEvent, PluginID } from "@opencode-ai/schema/plugin"
 import { AgentV2 } from "./agent"
 import { AISDK } from "./aisdk"
 import { Catalog } from "./catalog"
@@ -14,17 +15,10 @@ import { Reference } from "./reference"
 import { SkillV2 } from "./skill"
 import { State } from "./state"

-export const ID = Schema.String.pipe(Schema.brand("Plugin.ID"))
+export const ID = PluginID
 export type ID = typeof ID.Type

-export const Event = {
-  Added: EventV2.define({
-    type: "plugin.added",
-    schema: {
-      id: ID,
-    },
-  }),
-}
+export const Event = PluginEvent

 export interface Interface {
  readonly add: (id: ID, effect: Plugin["effect"]) => Effect.Effect<void>
@@ -29,6 +29,7 @@ import { CommandPlugin } from "./command"
 import { ModelsDevPlugin } from "./models-dev"
 import { ProviderPlugins } from "./provider"
 import { SkillPlugin } from "./skill"
+import { VariantPlugin } from "./variant"

 export type Requirements =
  | AgentV2.Service
@@ -107,12 +108,13 @@ export const locationLayer = Layer.effectDiscard(
      yield* add(CommandPlugin.Plugin)
      yield* add(SkillPlugin.Plugin)
      yield* add(ModelsDevPlugin)
-      yield* add(ConfigProviderPlugin.Plugin)
      yield* add(ConfigAgentPlugin.Plugin)
      yield* add(ConfigCommandPlugin.Plugin)
      yield* add(ConfigSkillPlugin.Plugin)
      for (const item of ProviderPlugins) yield* add(item)
      yield* add(ConfigExternalPlugin.Plugin)
+      yield* add(ConfigProviderPlugin.Plugin)
+      yield* add(VariantPlugin.Plugin)
    }).pipe(Effect.withSpan("PluginInternal.boot"), Effect.forkScoped({ startImmediately: true }))
  }),
 ).pipe(
@@ -2,7 +2,6 @@ import { define } from "./internal"
 import { Effect, Stream } from "effect"
 import { EventV2 } from "../event"
 import { ModelV2 } from "../model"
-import { ModelRequest } from "../model-request"
 import { ModelsDev } from "../models-dev"
 import { ProviderV2 } from "../provider"

@@ -38,15 +37,12 @@ function cost(input: ModelsDev.Model["cost"]) {
  ]
 }

-function variants(model: ModelsDev.Model, packageName?: string) {
-  return Object.entries(model.experimental?.modes ?? {}).map(([id, item]) => {
-    const request = ModelRequest.normalizeAiSdkOptions(packageName, item.provider?.body ?? {})
-    return {
-      id: ModelV2.VariantID.make(id),
-      headers: { ...(item.provider?.headers ?? {}) },
-      ...request,
-    }
-  })
+function variants(model: ModelsDev.Model) {
+  return Object.entries(model.experimental?.modes ?? {}).map(([id, item]) => ({
+    id: ModelV2.VariantID.make(id),
+    headers: { ...(item.provider?.headers ?? {}) },
+    body: { ...(item.provider?.body ?? {}) },
+  }))
 }

 export const ModelsDevPlugin = define({
@@ -115,7 +111,7 @@ export const ModelsDevPlugin = define({
                input: [...(model.modalities?.input ?? [])],
                output: [...(model.modalities?.output ?? [])],
              }
-              draft.variants = variants(model, model.provider?.npm ?? item.npm)
+              draft.variants = variants(model)
              draft.time.released = released(model.release_date)
              draft.cost = cost(model.cost)
              draft.status = model.status ?? "active"
@@ -8,9 +8,9 @@ import { EventV2 } from "../../event"
 import { Credential } from "../../credential"
 import { Integration } from "../../integration"
 import { ModelV2 } from "../../model"
-import { ModelRequest } from "../../model-request"
 import { ProviderV2 } from "../../provider"
 import { ConfigProviderV1 } from "../../v1/config/provider"
+import { ConfigProviderOptionsV1 } from "../../v1/config/provider-options"
 import { ConfigV1 } from "../../v1/config/config"

 const defaultServer = "https://console.opencode.ai"
@@ -142,15 +142,14 @@ export const OpencodePlugin = define<HttpClient.HttpClient | EventV2.Service | S
            if (config.modalities?.input !== undefined) model.capabilities.input = [...config.modalities.input]
            if (config.modalities?.output !== undefined) model.capabilities.output = [...config.modalities.output]
            const packageName = config.provider?.npm ?? item.npm
-            ModelRequest.assign(model.request, {
-              headers: config.headers,
-              ...ModelRequest.normalizeAiSdkOptions(packageName, withoutCredentials(config.options)),
-            })
+            const lowerer = ConfigProviderOptionsV1.get(packageName)
+            Object.assign(model.request.headers, config.headers)
+            Object.assign(model.request.body, lowerer.request(withoutCredentials(config.options)))
            if (config.variants !== undefined) {
              model.variants = Object.entries(config.variants).map(([id, options]) => ({
                id: ModelV2.VariantID.make(id),
                headers: { ...(options.headers ?? {}) },
-                ...ModelRequest.normalizeAiSdkOptions(packageName, withoutCredentials(options)),
+                body: lowerer.request(withoutCredentials(options)),
              }))
            }
            if (config.release_date !== undefined) {
@@ -0,0 +1,39 @@
+export * as VariantPlugin from "./variant"
+
+import type { ModelV2Info } from "@opencode-ai/sdk/v2/types"
+import { Effect } from "effect"
+import { define } from "./internal"
+
+export const Plugin = define({
+  id: "variant",
+  effect: Effect.fn(function* (ctx) {
+    yield* ctx.catalog.transform((catalog) => {
+      for (const record of catalog.provider.list()) {
+        for (const model of record.models.values()) {
+          catalog.model.update(model.providerID, model.id, (draft) => {
+            const generated = generate(draft)
+            if (generated.length === 0) return
+
+            const explicit = new Map(draft.variants.map((variant) => [variant.id, variant]))
+            const generatedIDs = new Set(generated.map((variant) => variant.id))
+            draft.variants = [
+              ...generated.map((variant) => explicit.get(variant.id) ?? variant),
+              ...draft.variants.filter((variant) => !generatedIDs.has(variant.id)),
+            ]
+          })
+        }
+      }
+    })
+  }),
+})
+
+export function generate(model: ModelV2Info): ModelV2Info["variants"] {
+  if (model.api.type !== "aisdk" || model.api.package !== "@ai-sdk/openai-compatible") return []
+  const ids = `${model.id} ${model.api.id}`.toLowerCase()
+  if (!["glm-5.2", "glm-5-2", "glm-5p2"].some((name) => ids.includes(name))) return []
+  return ["high", "max"].map((id) => ({
+    id,
+    headers: {},
+    body: { reasoning_effort: id },
+  }))
+}
@@ -13,6 +13,7 @@ import { Slug } from "../util/slug"
 import { EventV2 } from "../event"
 import { Database } from "../database/database"
 import { Location } from "../location"
+import { ProjectDirectoriesEvent } from "@opencode-ai/schema/project-directories"

 export const StrategyID = Schema.Trim.pipe(Schema.check(Schema.isNonEmpty()), Schema.brand("ProjectCopy.StrategyID"))
 export type StrategyID = typeof StrategyID.Type
@@ -106,12 +107,7 @@ export interface Strategy {
  readonly list: (directory: AbsolutePath) => Effect.Effect<ListEntry[], Git.WorktreeError | DirectoryUnavailableError>
 }

-export const Event = {
-  Updated: EventV2.define({
-    type: "project.directories.updated",
-    schema: { projectID: Project.ID },
-  }),
-}
+export const Event = ProjectDirectoriesEvent

 export interface Interface {
  readonly register: (strategy: Strategy) => Effect.Effect<void, DuplicateStrategyError>
@@ -2,10 +2,11 @@ export * as Pty from "./pty"

 import type { Disp, Proc } from "#pty"
 import { Context, Effect, Layer, Schema, Types } from "effect"
+import { PtyEvent, PtyInfo } from "@opencode-ai/schema/pty"
 import { Config } from "./config"
 import { EventV2 } from "./event"
 import { Location } from "./location"
-import { NonNegativeInt, PositiveInt } from "./schema"
+import { PositiveInt } from "./schema"
 import { PtyID } from "./pty/schema"
 import { Shell } from "./shell"
 import { lazy } from "./util/lazy"
@@ -35,18 +36,7 @@ type Active = {
  listeners: Disp[]
 }

-export const Info = Schema.Struct({
-  id: PtyID,
-  title: Schema.String,
-  command: Schema.String,
-  args: Schema.Array(Schema.String),
-  cwd: Schema.String,
-  status: Schema.Literals(["running", "exited"]),
-  // Windows ConPTY assigns the child pid asynchronously, so 0 is valid at spawn time.
-  pid: NonNegativeInt,
-  // Present once status is "exited".
-  exitCode: Schema.optional(NonNegativeInt),
-}).annotate({ identifier: "Pty" })
+export const Info = PtyInfo

 export type Info = Types.DeepMutable<typeof Info.Type>

@@ -100,12 +90,7 @@ export class ExitedError extends Schema.TaggedErrorClass<ExitedError>()("Pty.Exi
  ptyID: PtyID,
 }) {}

-export const Event = {
-  Created: EventV2.define({ type: "pty.created", schema: { info: Info } }),
-  Updated: EventV2.define({ type: "pty.updated", schema: { info: Info } }),
-  Exited: EventV2.define({ type: "pty.exited", schema: { id: PtyID, exitCode: NonNegativeInt } }),
-  Deleted: EventV2.define({ type: "pty.deleted", schema: { id: PtyID } }),
-}
+export const Event = PtyEvent

 export interface Interface {
  readonly list: () => Effect.Effect<Info[]>
@@ -1,13 +1 @@
-import { Schema } from "effect"
-import { Identifier } from "../id/id"
-import { withStatics } from "../schema"
-
-const ptyIdSchema = Schema.String.check(Schema.isStartsWith("pty")).pipe(Schema.brand("PtyID"))
-
-export type PtyID = typeof ptyIdSchema.Type
-
-export const PtyID = ptyIdSchema.pipe(
-  withStatics((schema: typeof ptyIdSchema) => ({
-    ascending: (id?: string) => schema.make(Identifier.ascending("pty", id)),
-  })),
-)
+export { ID as PtyID } from "@opencode-ai/schema/pty"
@@ -0,0 +1,3 @@
+export * as PublicEventManifest from "./public-event-manifest"
+
+export { ServerDefinitions as Definitions } from "@opencode-ai/schema/event-manifest"
@@ -1,83 +1,35 @@
 export * as QuestionV2 from "./question"

 import { Context, Deferred, Effect, Layer, Schema } from "effect"
+import { Question } from "@opencode-ai/schema/question"
 import { EventV2 } from "./event"
-import { Identifier } from "./id/id"
-import { withStatics } from "./schema"
 import { SessionSchema } from "./session/schema"

-export const ID = Schema.String.check(Schema.isStartsWith("que")).pipe(
-  Schema.brand("QuestionV2.ID"),
-  withStatics((schema) => ({ ascending: (id?: string) => schema.make(Identifier.ascending("question", id)) })),
-)
+export const ID = Question.ID
 export type ID = typeof ID.Type

-export const Option = Schema.Struct({
-  label: Schema.String.annotate({ description: "Display text (1-5 words, concise)" }),
-  description: Schema.String.annotate({ description: "Explanation of choice" }),
-}).annotate({ identifier: "QuestionV2.Option" })
+export const Option = Question.Option
 export type Option = typeof Option.Type

-const base = {
-  question: Schema.String.annotate({ description: "Complete question" }),
-  header: Schema.String.annotate({ description: "Very short label (max 30 chars)" }),
-  options: Schema.Array(Option).annotate({ description: "Available choices" }),
-  multiple: Schema.Boolean.pipe(Schema.optional).annotate({ description: "Allow selecting multiple choices" }),
-}
-
-export const Info = Schema.Struct({
-  ...base,
-  custom: Schema.Boolean.pipe(Schema.optional).annotate({
-    description: "Allow typing a custom answer (default: true)",
-  }),
-}).annotate({ identifier: "QuestionV2.Info" })
+export const Info = Question.Info
 export type Info = typeof Info.Type

-export const Prompt = Schema.Struct(base).annotate({ identifier: "QuestionV2.Prompt" })
+export const Prompt = Question.Prompt
 export type Prompt = typeof Prompt.Type

-export const Tool = Schema.Struct({
-  messageID: Schema.String,
-  callID: Schema.String,
-}).annotate({ identifier: "QuestionV2.Tool" })
+export const Tool = Question.Tool
 export type Tool = typeof Tool.Type

-export const Request = Schema.Struct({
-  id: ID,
-  sessionID: SessionSchema.ID,
-  questions: Schema.Array(Info).annotate({ description: "Questions to ask" }),
-  tool: Tool.pipe(Schema.optional),
-}).annotate({ identifier: "QuestionV2.Request" })
+export const Request = Question.Request
 export type Request = typeof Request.Type

-export const Answer = Schema.Array(Schema.String).annotate({ identifier: "QuestionV2.Answer" })
+export const Answer = Question.Answer
 export type Answer = typeof Answer.Type

-export const Reply = Schema.Struct({
-  answers: Schema.Array(Answer).annotate({
-    description: "User answers in order of questions (each answer is an array of selected labels)",
-  }),
-}).annotate({ identifier: "QuestionV2.Reply" })
+export const Reply = Question.Reply
 export type Reply = typeof Reply.Type

-export const Event = {
-  Asked: EventV2.define({ type: "question.v2.asked", schema: Request.fields }),
-  Replied: EventV2.define({
-    type: "question.v2.replied",
-    schema: {
-      sessionID: SessionSchema.ID,
-      requestID: ID,
-      answers: Schema.Array(Answer),
-    },
-  }),
-  Rejected: EventV2.define({
-    type: "question.v2.rejected",
-    schema: {
-      sessionID: SessionSchema.ID,
-      requestID: ID,
-    },
-  }),
-}
+export const Event = Question.Event

 export class RejectedError extends Schema.TaggedErrorClass<RejectedError>()("QuestionV2.RejectedError", {}) {
  override get message() {
@@ -18,9 +18,7 @@ export type GitSource = Reference.GitSource
 export const Source = Reference.Source
 export type Source = Reference.Source

-export const Event = {
-  Updated: EventV2.define({ type: "reference.updated", schema: {} }),
-}
+export const Event = Reference.Event

 export class Info extends Schema.Class<Info>("Reference.Info")({
  name: Schema.String,
@@ -1,468 +1,2 @@
-import { Schema } from "effect"
-import { ProviderMetadata, ToolContent } from "@opencode-ai/schema/llm"
-import { Delivery } from "@opencode-ai/schema/session-delivery"
-import { EventV2 } from "../event"
-import { ModelV2 } from "../model"
-import { DateTimeUtcFromMillis, NonNegativeInt, RelativePath } from "../schema"
-import { FileAttachment, Prompt } from "./prompt"
-import { SessionSchema } from "./schema"
-import { Location } from "../location"
-import { SessionMessageID } from "./message-id"
-import { SessionMessage } from "./message"
-
-export { FileAttachment }
-
-export const Source = Schema.Struct({
-  start: NonNegativeInt,
-  end: NonNegativeInt,
-  text: Schema.String,
-}).annotate({
-  identifier: "session.next.event.source",
-})
-export type Source = typeof Source.Type
-
-const Base = {
-  timestamp: DateTimeUtcFromMillis,
-  sessionID: SessionSchema.ID,
-}
-const PromptFields = {
-  ...Base,
-  messageID: SessionMessageID.ID,
-  prompt: Prompt,
-  delivery: Delivery,
-}
-
-const options = {
-  durable: {
-    aggregate: "sessionID",
-    version: 1,
-  },
-} as const
-const stepSettlementOptions = {
-  durable: {
-    aggregate: "sessionID",
-    version: 2,
-  },
-} as const
-
-export const UnknownError = SessionMessage.UnknownError
-export type UnknownError = SessionMessage.UnknownError
-
-export const AgentSwitched = EventV2.define({
-  type: "session.next.agent.switched",
-  ...options,
-  schema: {
-    ...Base,
-    messageID: SessionMessageID.ID,
-    agent: Schema.String,
-  },
-})
-export type AgentSwitched = typeof AgentSwitched.Type
-
-export const ModelSwitched = EventV2.define({
-  type: "session.next.model.switched",
-  ...options,
-  schema: {
-    ...Base,
-    messageID: SessionMessageID.ID,
-    model: ModelV2.Ref,
-  },
-})
-export type ModelSwitched = typeof ModelSwitched.Type
-
-export const Moved = EventV2.define({
-  type: "session.next.moved",
-  ...options,
-  schema: {
-    ...Base,
-    location: Location.Ref,
-    subdirectory: RelativePath.pipe(Schema.optional),
-  },
-})
-export type Moved = typeof Moved.Type
-
-export const Prompted = EventV2.define({
-  type: "session.next.prompted",
-  ...options,
-  schema: PromptFields,
-})
-export type Prompted = typeof Prompted.Type
-
-export const PromptAdmitted = EventV2.define({
-  type: "session.next.prompt.admitted",
-  ...options,
-  schema: PromptFields,
-})
-export type PromptAdmitted = typeof PromptAdmitted.Type
-
-export const ContextUpdated = EventV2.define({
-  type: "session.next.context.updated",
-  ...options,
-  schema: {
-    ...Base,
-    messageID: SessionMessageID.ID,
-    text: Schema.String,
-  },
-})
-export type ContextUpdated = typeof ContextUpdated.Type
-
-export const Synthetic = EventV2.define({
-  type: "session.next.synthetic",
-  ...options,
-  schema: {
-    ...Base,
-    messageID: SessionMessageID.ID,
-    text: Schema.String,
-  },
-})
-export type Synthetic = typeof Synthetic.Type
-
-export namespace Shell {
-  export const Started = EventV2.define({
-    type: "session.next.shell.started",
-    ...options,
-    schema: {
-      ...Base,
-      messageID: SessionMessageID.ID,
-      callID: Schema.String,
-      command: Schema.String,
-    },
-  })
-  export type Started = typeof Started.Type
-
-  export const Ended = EventV2.define({
-    type: "session.next.shell.ended",
-    ...options,
-    schema: {
-      ...Base,
-      callID: Schema.String,
-      output: Schema.String,
-    },
-  })
-  export type Ended = typeof Ended.Type
-}
-
-export namespace Step {
-  export const Started = EventV2.define({
-    type: "session.next.step.started",
-    ...options,
-    schema: {
-      ...Base,
-      assistantMessageID: SessionMessageID.ID,
-      agent: Schema.String,
-      model: ModelV2.Ref,
-      snapshot: Schema.String.pipe(Schema.optional),
-    },
-  })
-  export type Started = typeof Started.Type
-
-  export const Ended = EventV2.define({
-    type: "session.next.step.ended",
-    ...stepSettlementOptions,
-    schema: {
-      ...Base,
-      assistantMessageID: SessionMessageID.ID,
-      finish: Schema.String,
-      cost: Schema.Finite,
-      tokens: Schema.Struct({
-        input: Schema.Finite,
-        output: Schema.Finite,
-        reasoning: Schema.Finite,
-        cache: Schema.Struct({
-          read: Schema.Finite,
-          write: Schema.Finite,
-        }),
-      }),
-      snapshot: Schema.String.pipe(Schema.optional),
-    },
-  })
-  export type Ended = typeof Ended.Type
-
-  export const Failed = EventV2.define({
-    type: "session.next.step.failed",
-    ...stepSettlementOptions,
-    schema: {
-      ...Base,
-      assistantMessageID: SessionMessageID.ID,
-      error: UnknownError,
-    },
-  })
-  export type Failed = typeof Failed.Type
-}
-
-export namespace Text {
-  export const Started = EventV2.define({
-    type: "session.next.text.started",
-    ...options,
-    schema: {
-      ...Base,
-      assistantMessageID: SessionMessageID.ID,
-      textID: Schema.String,
-    },
-  })
-  export type Started = typeof Started.Type
-
-  // Stream fragments are live-only; Text.Ended is the replayable full-value boundary.
-  export const Delta = EventV2.define({
-    type: "session.next.text.delta",
-    schema: {
-      ...Base,
-      assistantMessageID: SessionMessageID.ID,
-      textID: Schema.String,
-      delta: Schema.String,
-    },
-  })
-  export type Delta = typeof Delta.Type
-
-  export const Ended = EventV2.define({
-    type: "session.next.text.ended",
-    ...options,
-    schema: {
-      ...Base,
-      assistantMessageID: SessionMessageID.ID,
-      textID: Schema.String,
-      text: Schema.String,
-    },
-  })
-  export type Ended = typeof Ended.Type
-}
-
-export namespace Reasoning {
-  export const Started = EventV2.define({
-    type: "session.next.reasoning.started",
-    ...options,
-    schema: {
-      ...Base,
-      assistantMessageID: SessionMessageID.ID,
-      reasoningID: Schema.String,
-      providerMetadata: ProviderMetadata.pipe(Schema.optional),
-    },
-  })
-  export type Started = typeof Started.Type
-
-  // Stream fragments are live-only; Reasoning.Ended is the replayable full-value boundary.
-  export const Delta = EventV2.define({
-    type: "session.next.reasoning.delta",
-    schema: {
-      ...Base,
-      assistantMessageID: SessionMessageID.ID,
-      reasoningID: Schema.String,
-      delta: Schema.String,
-    },
-  })
-  export type Delta = typeof Delta.Type
-
-  export const Ended = EventV2.define({
-    type: "session.next.reasoning.ended",
-    ...options,
-    schema: {
-      ...Base,
-      assistantMessageID: SessionMessageID.ID,
-      reasoningID: Schema.String,
-      text: Schema.String,
-      providerMetadata: ProviderMetadata.pipe(Schema.optional),
-    },
-  })
-  export type Ended = typeof Ended.Type
-}
-
-export namespace Tool {
-  const ToolBase = {
-    ...Base,
-    assistantMessageID: SessionMessageID.ID,
-    callID: Schema.String,
-  }
-
-  export namespace Input {
-    export const Started = EventV2.define({
-      type: "session.next.tool.input.started",
-      ...options,
-      schema: {
-        ...ToolBase,
-        name: Schema.String,
-      },
-    })
-    export type Started = typeof Started.Type
-
-    // Stream fragments are live-only; Input.Ended is the replayable raw-input boundary.
-    export const Delta = EventV2.define({
-      type: "session.next.tool.input.delta",
-      schema: {
-        ...ToolBase,
-        delta: Schema.String,
-      },
-    })
-    export type Delta = typeof Delta.Type
-
-    export const Ended = EventV2.define({
-      type: "session.next.tool.input.ended",
-      ...options,
-      schema: {
-        ...ToolBase,
-        text: Schema.String,
-      },
-    })
-    export type Ended = typeof Ended.Type
-  }
-
-  export const Called = EventV2.define({
-    type: "session.next.tool.called",
-    ...options,
-    schema: {
-      ...ToolBase,
-      tool: Schema.String,
-      input: Schema.Record(Schema.String, Schema.Unknown),
-      provider: Schema.Struct({
-        executed: Schema.Boolean,
-        metadata: ProviderMetadata.pipe(Schema.optional),
-      }),
-    },
-  })
-  export type Called = typeof Called.Type
-
-  /**
-   * Replayable bounded running-tool state. Tools should checkpoint semantic
-   * transitions or at a bounded cadence, not persist every stdout/stderr chunk.
-   */
-  export const Progress = EventV2.define({
-    type: "session.next.tool.progress",
-    ...options,
-    schema: {
-      ...ToolBase,
-      structured: Schema.Record(Schema.String, Schema.Any),
-      content: Schema.Array(ToolContent),
-    },
-  })
-  export type Progress = typeof Progress.Type
-
-  export const Success = EventV2.define({
-    type: "session.next.tool.success",
-    ...options,
-    schema: {
-      ...ToolBase,
-      structured: Schema.Record(Schema.String, Schema.Any),
-      content: Schema.Array(ToolContent),
-      outputPaths: Schema.Array(Schema.String).pipe(Schema.optional),
-      result: Schema.Unknown.pipe(Schema.optional),
-      provider: Schema.Struct({
-        executed: Schema.Boolean,
-        metadata: ProviderMetadata.pipe(Schema.optional),
-      }),
-    },
-  })
-  export type Success = typeof Success.Type
-
-  export const Failed = EventV2.define({
-    type: "session.next.tool.failed",
-    ...options,
-    schema: {
-      ...ToolBase,
-      error: UnknownError,
-      result: Schema.Unknown.pipe(Schema.optional),
-      provider: Schema.Struct({
-        executed: Schema.Boolean,
-        metadata: ProviderMetadata.pipe(Schema.optional),
-      }),
-    },
-  })
-  export type Failed = typeof Failed.Type
-}
-
-export const RetryError = Schema.Struct({
-  message: Schema.String,
-  statusCode: Schema.Finite.pipe(Schema.optional),
-  isRetryable: Schema.Boolean,
-  responseHeaders: Schema.Record(Schema.String, Schema.String).pipe(Schema.optional),
-  responseBody: Schema.String.pipe(Schema.optional),
-  metadata: Schema.Record(Schema.String, Schema.String).pipe(Schema.optional),
-}).annotate({
-  identifier: "session.next.retry_error",
-})
-export type RetryError = typeof RetryError.Type
-
-export const Retried = EventV2.define({
-  type: "session.next.retried",
-  ...options,
-  schema: {
-    ...Base,
-    attempt: Schema.Finite,
-    error: RetryError,
-  },
-})
-export type Retried = typeof Retried.Type
-
-export namespace Compaction {
-  export const Started = EventV2.define({
-    type: "session.next.compaction.started",
-    ...options,
-    schema: {
-      ...Base,
-      messageID: SessionMessageID.ID,
-      reason: Schema.Union([Schema.Literal("auto"), Schema.Literal("manual")]),
-    },
-  })
-  export type Started = typeof Started.Type
-
-  export const Delta = EventV2.define({
-    type: "session.next.compaction.delta",
-    schema: {
-      ...Base,
-      messageID: SessionMessageID.ID,
-      text: Schema.String,
-    },
-  })
-  export type Delta = typeof Delta.Type
-
-  export const Ended = EventV2.define({
-    type: "session.next.compaction.ended",
-    ...options,
-    schema: {
-      ...Base,
-      messageID: SessionMessageID.ID,
-      reason: Started.data.fields.reason,
-      text: Schema.String,
-      recent: Schema.String,
-    },
-  })
-  export type Ended = typeof Ended.Type
-}
-
-const DurableDefinitions = [
-  AgentSwitched,
-  ModelSwitched,
-  Moved,
-  Prompted,
-  PromptAdmitted,
-  ContextUpdated,
-  Synthetic,
-  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,
-] as const
-const EphemeralDefinitions = [Text.Delta, Tool.Input.Delta, Reasoning.Delta, Compaction.Delta] as const
-
-export const Durable = Schema.Union(DurableDefinitions, { mode: "oneOf" }).pipe(Schema.toTaggedUnion("type"))
-export type DurableEvent = typeof Durable.Type
-
-export const All = Schema.Union([...DurableDefinitions, ...EphemeralDefinitions], { mode: "oneOf" }).pipe(
-  Schema.toTaggedUnion("type"),
-)
-export type Event = typeof All.Type
-export type Type = Event["type"]
-
-export * as SessionEvent from "./event"
+export * from "@opencode-ai/schema/session-event"
+export * as SessionEvent from "@opencode-ai/schema/session-event"
@@ -11,7 +11,6 @@ import { Catalog } from "../../catalog"
 import { Credential } from "../../credential"
 import { Integration } from "../../integration"
 import { ModelV2 } from "../../model"
-import { ModelRequest } from "../../model-request"
 import { ProviderV2 } from "../../provider"
 import { SessionSchema } from "../schema"

@@ -88,8 +87,6 @@ const apiKey = (model: ModelV2.Info, credential?: Credential.Value) => {
 }

 const withDefaults = (model: ModelV2.Info, route: AnyRoute) => {
-  const options = model.request.options ?? {}
-  const namespace = model.api.type === "aisdk" ? ModelRequest.namespace(model.api.package) : undefined
  const body = model.request.body
  const httpBody = Object.hasOwn(body, "apiKey")
    ? Object.fromEntries(Object.entries(body).filter(([key]) => key !== "apiKey"))
@@ -98,8 +95,6 @@ const withDefaults = (model: ModelV2.Info, route: AnyRoute) => {
    provider: model.providerID,
    endpoint: model.api.url === undefined ? undefined : { baseURL: model.api.url },
    headers: model.request.headers,
-    generation: model.request.generation,
-    providerOptions: namespace && Object.keys(options).length > 0 ? { [namespace]: options } : undefined,
    http: { body: httpBody },
    limits: { context: model.limit.context, output: model.limit.output },
  })
@@ -122,7 +117,8 @@ const withVariant = (
  return Effect.succeed(
    variant
      ? produce(model, (draft) => {
-          ModelRequest.assign(draft.request, variant)
+          Object.assign(draft.request.headers, variant.headers)
+          Object.assign(draft.request.body, variant.body)
        })
      : model,
  )
@@ -1,30 +1,17 @@
 export * as SessionTodo from "./todo"

 import { asc, eq } from "drizzle-orm"
-import { Context, Effect, Layer, Schema } from "effect"
+import { Context, Effect, Layer } from "effect"
+import { SessionTodo, SessionTodoInfo } from "@opencode-ai/schema/session-todo"
 import { Database } from "../database/database"
 import { EventV2 } from "../event"
 import { SessionSchema } from "./schema"
 import { TodoTable } from "./sql"

-export const Info = Schema.Struct({
-  content: Schema.String.annotate({ description: "Brief description of the task" }),
-  status: Schema.String.annotate({
-    description: "Current status of the task: pending, in_progress, completed, cancelled",
-  }),
-  priority: Schema.String.annotate({ description: "Priority level of the task: high, medium, low" }),
-}).annotate({ identifier: "SessionTodo.Info" })
+export const Info = SessionTodoInfo
 export type Info = typeof Info.Type

-export const Event = {
-  Updated: EventV2.define({
-    type: "todo.updated",
-    schema: {
-      sessionID: SessionSchema.ID,
-      todos: Schema.Array(Info),
-    },
-  }),
-}
+export const Event = SessionTodo.Event

 export interface Interface {
  readonly update: (input: {
@@ -6,7 +6,6 @@ import { ConfigMCPV1 } from "./mcp"
 import { ConfigPermissionV1 } from "./permission"
 import { ConfigProviderV1 } from "./provider"
 import { ConfigProviderOptionsV1 } from "./provider-options"
-import { ModelRequest } from "../../model-request"

 const keys = new Set([
  "logLevel",
@@ -192,11 +191,7 @@ function migrateProvider(info: ConfigProviderV1.Info) {
 function migrateModel(info: typeof ConfigProviderV1.Model.Type, packageName?: string) {
  const packageID = info.provider?.npm ?? packageName
  const lowerer = ConfigProviderOptionsV1.get(packageID)
-  const ingest = (options: Readonly<Record<string, unknown>>) => {
-    const request = ModelRequest.normalizeAiSdkOptions(packageID, options)
-    return { ...lowerer.request(request.body), ...request.generation, ...request.options }
-  }
-  const request = info.options && ingest(info.options)
+  const request = info.options && lowerer.request(info.options)
  const costs = info.cost && [
    {
      input: info.cost.input,
@@ -241,7 +236,7 @@ function migrateModel(info: typeof ConfigProviderV1.Model.Type, packageName?: st
      info.variants &&
      Object.entries(info.variants).map(([id, options]) => ({
        id,
-        body: ingest(options),
+        body: lowerer.request(options),
      })),
    cost: costs,
    disabled: info.status === "deprecated" ? true : undefined,
@@ -1,71 +1,8 @@
 export * as PermissionV1 from "./permission"

 import { Schema } from "effect"
-import { ProjectV2 } from "../project"
-import { withStatics } from "../schema"
-import { SessionSchema } from "../session/schema"
-import { Identifier } from "../util/identifier"
-
-export const ID = Schema.String.check(Schema.isStartsWith("per")).pipe(
-  Schema.brand("PermissionID"),
-  withStatics((schema) => ({ ascending: (id?: string) => schema.make(id ?? "per_" + Identifier.ascending()) })),
-)
-export type ID = typeof ID.Type
-
-export const Action = Schema.Literals(["allow", "deny", "ask"]).annotate({ identifier: "PermissionAction" })
-export type Action = typeof Action.Type
-
-export const Rule = Schema.Struct({
-  permission: Schema.String,
-  pattern: Schema.String,
-  action: Action,
-}).annotate({ identifier: "PermissionRule" })
-export type Rule = typeof Rule.Type
-
-export const Ruleset = Schema.Array(Rule).annotate({ identifier: "PermissionRuleset" })
-export type Ruleset = typeof Ruleset.Type
-
-export const Request = Schema.Struct({
-  id: ID,
-  sessionID: SessionSchema.ID,
-  permission: Schema.String,
-  patterns: Schema.Array(Schema.String),
-  metadata: Schema.Record(Schema.String, Schema.Unknown),
-  always: Schema.Array(Schema.String),
-  tool: Schema.Struct({
-    messageID: Schema.String,
-    callID: Schema.String,
-  }).pipe(Schema.optional),
-}).annotate({ identifier: "PermissionRequest" })
-export type Request = typeof Request.Type
-
-export const Reply = Schema.Literals(["once", "always", "reject"])
-export type Reply = typeof Reply.Type
-
-export const ReplyBody = Schema.Struct({
-  reply: Reply,
-  message: Schema.String.pipe(Schema.optional),
-}).annotate({ identifier: "PermissionReplyBody" })
-export type ReplyBody = typeof ReplyBody.Type
-
-export const Approval = Schema.Struct({
-  projectID: ProjectV2.ID,
-  patterns: Schema.Array(Schema.String),
-}).annotate({ identifier: "PermissionApproval" })
-export type Approval = typeof Approval.Type
-
-export const AskInput = Schema.Struct({
-  ...Request.fields,
-  id: ID.pipe(Schema.optional),
-  ruleset: Ruleset,
-}).annotate({ identifier: "PermissionAskInput" })
-export type AskInput = typeof AskInput.Type
-
-export const ReplyInput = Schema.Struct({
-  requestID: ID,
-  ...ReplyBody.fields,
-}).annotate({ identifier: "PermissionReplyInput" })
-export type ReplyInput = typeof ReplyInput.Type
+export * from "@opencode-ai/schema/permission-v1"
+import { ID } from "@opencode-ai/schema/permission-v1"

 export class RejectedError extends Schema.TaggedErrorClass<RejectedError>()("PermissionRejectedError", {}) {
  override get message() {
@@ -1,39 +1,52 @@
 export * as SessionV1 from "./session"

-import { Effect, Schema, Types } from "effect"
-import { EventV2 } from "../event"
-import { PermissionV1 } from "./permission"
-import { ProjectV2 } from "../project"
-import { ProviderV2 } from "../provider"
-import { ModelV2 } from "../model"
-import { optionalOmitUndefined, withStatics } from "../schema"
-import { Identifier } from "../util/identifier"
+import { Schema } from "effect"
 import { NonNegativeInt } from "../schema"
 import { NamedError } from "../util/error"
-import { SessionSchema } from "../session/schema"
-import { WorkspaceV2 } from "../workspace"

-const Timestamp = Schema.Finite.check(Schema.isGreaterThanOrEqualTo(0))
-
-export const MessageID = Schema.String.check(Schema.isStartsWith("msg")).pipe(
-  Schema.brand("MessageID"),
-  withStatics((schema) => ({ ascending: (id?: string) => schema.make(id ?? "msg_" + Identifier.ascending()) })),
-)
-export type MessageID = typeof MessageID.Type
-
-export const PartID = Schema.String.check(Schema.isStartsWith("prt")).pipe(
-  Schema.brand("PartID"),
-  withStatics((schema) => ({ ascending: (id?: string) => schema.make(id ?? "prt_" + Identifier.ascending()) })),
-)
-export type PartID = typeof PartID.Type
+export {
+  AgentPart,
+  AgentPartInput,
+  Assistant,
+  CompactionPart,
+  Event,
+  FilePart,
+  FilePartInput,
+  FilePartSource,
+  FileSource,
+  Format,
+  Info,
+  MessageID,
+  OutputFormatJsonSchema,
+  OutputFormatText,
+  Part,
+  PartID,
+  PatchPart,
+  Range,
+  ReasoningPart,
+  ResourceSource,
+  RetryPart,
+  SessionInfo,
+  SnapshotPart,
+  StepFinishPart,
+  StepStartPart,
+  SubtaskPart,
+  SubtaskPartInput,
+  SymbolSource,
+  TextPart,
+  TextPartInput,
+  ToolPart,
+  ToolState,
+  ToolStateCompleted,
+  ToolStateError,
+  ToolStatePending,
+  ToolStateRunning,
+  User,
+  WithParts,
+} from "@opencode-ai/schema/session-v1"

 export const OutputLengthError = NamedError.create("MessageOutputLengthError", {})
-
-export const AuthError = NamedError.create("ProviderAuthError", {
-  providerID: Schema.String,
-  message: Schema.String,
-})
-
+export const AuthError = NamedError.create("ProviderAuthError", { providerID: Schema.String, message: Schema.String })
 export const AbortedError = NamedError.create("MessageAbortedError", { message: Schema.String })
 export const StructuredOutputError = NamedError.create("StructuredOutputError", {
  message: Schema.String,
@@ -52,581 +65,4 @@ export const ContextOverflowError = NamedError.create("ContextOverflowError", {
  message: Schema.String,
  responseBody: Schema.optional(Schema.String),
 })
-export const ContentFilterError = NamedError.create("ContentFilterError", {
-  message: Schema.String,
-})
-
-export class OutputFormatText extends Schema.Class<OutputFormatText>("OutputFormatText")({
-  type: Schema.Literal("text"),
-}) {}
-
-export class OutputFormatJsonSchema extends Schema.Class<OutputFormatJsonSchema>("OutputFormatJsonSchema")({
-  type: Schema.Literal("json_schema"),
-  schema: Schema.Record(Schema.String, Schema.Any).annotate({ identifier: "JSONSchema" }),
-  retryCount: NonNegativeInt.pipe(Schema.optional, Schema.withDecodingDefault(Effect.succeed(2))),
-}) {}
-
-export const Format = Schema.Union([OutputFormatText, OutputFormatJsonSchema]).annotate({
-  discriminator: "type",
-  identifier: "OutputFormat",
-})
-export type OutputFormat = Schema.Schema.Type<typeof Format>
-
-const partBase = {
-  id: PartID,
-  sessionID: SessionSchema.ID,
-  messageID: MessageID,
-}
-
-export const SnapshotPart = Schema.Struct({
-  ...partBase,
-  type: Schema.Literal("snapshot"),
-  snapshot: Schema.String,
-}).annotate({ identifier: "SnapshotPart" })
-export type SnapshotPart = Types.DeepMutable<Schema.Schema.Type<typeof SnapshotPart>>
-
-export const PatchPart = Schema.Struct({
-  ...partBase,
-  type: Schema.Literal("patch"),
-  hash: Schema.String,
-  files: Schema.Array(Schema.String),
-}).annotate({ identifier: "PatchPart" })
-export type PatchPart = Types.DeepMutable<Schema.Schema.Type<typeof PatchPart>>
-
-export const TextPart = Schema.Struct({
-  ...partBase,
-  type: Schema.Literal("text"),
-  text: Schema.String,
-  synthetic: Schema.optional(Schema.Boolean),
-  ignored: Schema.optional(Schema.Boolean),
-  time: Schema.optional(
-    Schema.Struct({
-      start: NonNegativeInt,
-      end: Schema.optional(NonNegativeInt),
-    }),
-  ),
-  metadata: Schema.optional(Schema.Record(Schema.String, Schema.Any)),
-}).annotate({ identifier: "TextPart" })
-export type TextPart = Types.DeepMutable<Schema.Schema.Type<typeof TextPart>>
-
-export const ReasoningPart = Schema.Struct({
-  ...partBase,
-  type: Schema.Literal("reasoning"),
-  text: Schema.String,
-  metadata: Schema.optional(Schema.Record(Schema.String, Schema.Any)),
-  time: Schema.Struct({
-    start: NonNegativeInt,
-    end: Schema.optional(NonNegativeInt),
-  }),
-}).annotate({ identifier: "ReasoningPart" })
-export type ReasoningPart = Types.DeepMutable<Schema.Schema.Type<typeof ReasoningPart>>
-
-const filePartSourceBase = {
-  text: Schema.Struct({
-    value: Schema.String,
-    start: Schema.Finite,
-    end: Schema.Finite,
-  }).annotate({ identifier: "FilePartSourceText" }),
-}
-
-export const Range = Schema.Struct({
-  start: Schema.Struct({ line: NonNegativeInt, character: NonNegativeInt }),
-  end: Schema.Struct({ line: NonNegativeInt, character: NonNegativeInt }),
-}).annotate({ identifier: "Range" })
-export type Range = typeof Range.Type
-
-export const FileSource = Schema.Struct({
-  ...filePartSourceBase,
-  type: Schema.Literal("file"),
-  path: Schema.String,
-}).annotate({ identifier: "FileSource" })
-
-export const SymbolSource = Schema.Struct({
-  ...filePartSourceBase,
-  type: Schema.Literal("symbol"),
-  path: Schema.String,
-  range: Range,
-  name: Schema.String,
-  kind: NonNegativeInt,
-}).annotate({ identifier: "SymbolSource" })
-
-export const ResourceSource = Schema.Struct({
-  ...filePartSourceBase,
-  type: Schema.Literal("resource"),
-  clientName: Schema.String,
-  uri: Schema.String,
-}).annotate({ identifier: "ResourceSource" })
-
-export const FilePartSource = Schema.Union([FileSource, SymbolSource, ResourceSource]).annotate({
-  discriminator: "type",
-  identifier: "FilePartSource",
-})
-
-export const FilePart = Schema.Struct({
-  ...partBase,
-  type: Schema.Literal("file"),
-  mime: Schema.String,
-  filename: Schema.optional(Schema.String),
-  url: Schema.String,
-  source: Schema.optional(FilePartSource),
-}).annotate({ identifier: "FilePart" })
-export type FilePart = Types.DeepMutable<Schema.Schema.Type<typeof FilePart>>
-
-export const AgentPart = Schema.Struct({
-  ...partBase,
-  type: Schema.Literal("agent"),
-  name: Schema.String,
-  source: Schema.optional(
-    Schema.Struct({
-      value: Schema.String,
-      start: NonNegativeInt,
-      end: NonNegativeInt,
-    }),
-  ),
-}).annotate({ identifier: "AgentPart" })
-export type AgentPart = Types.DeepMutable<Schema.Schema.Type<typeof AgentPart>>
-
-export const CompactionPart = Schema.Struct({
-  ...partBase,
-  type: Schema.Literal("compaction"),
-  auto: Schema.Boolean,
-  overflow: Schema.optional(Schema.Boolean),
-  tail_start_id: Schema.optional(MessageID),
-}).annotate({ identifier: "CompactionPart" })
-export type CompactionPart = Types.DeepMutable<Schema.Schema.Type<typeof CompactionPart>>
-
-export const SubtaskPart = Schema.Struct({
-  ...partBase,
-  type: Schema.Literal("subtask"),
-  prompt: Schema.String,
-  description: Schema.String,
-  agent: Schema.String,
-  model: Schema.optional(
-    Schema.Struct({
-      providerID: ProviderV2.ID,
-      modelID: ModelV2.ID,
-    }),
-  ),
-  command: Schema.optional(Schema.String),
-}).annotate({ identifier: "SubtaskPart" })
-export type SubtaskPart = Types.DeepMutable<Schema.Schema.Type<typeof SubtaskPart>>
-
-export const RetryPart = Schema.Struct({
-  ...partBase,
-  type: Schema.Literal("retry"),
-  attempt: NonNegativeInt,
-  error: APIError.EffectSchema,
-  time: Schema.Struct({
-    created: NonNegativeInt,
-  }),
-}).annotate({ identifier: "RetryPart" })
-export type RetryPart = Omit<Types.DeepMutable<Schema.Schema.Type<typeof RetryPart>>, "error"> & {
-  error: APIError
-}
-
-export const StepStartPart = Schema.Struct({
-  ...partBase,
-  type: Schema.Literal("step-start"),
-  snapshot: Schema.optional(Schema.String),
-}).annotate({ identifier: "StepStartPart" })
-export type StepStartPart = Types.DeepMutable<Schema.Schema.Type<typeof StepStartPart>>
-
-export const StepFinishPart = Schema.Struct({
-  ...partBase,
-  type: Schema.Literal("step-finish"),
-  reason: Schema.String,
-  snapshot: Schema.optional(Schema.String),
-  cost: Schema.Finite,
-  tokens: Schema.Struct({
-    total: Schema.optional(Schema.Finite),
-    input: Schema.Finite,
-    output: Schema.Finite,
-    reasoning: Schema.Finite,
-    cache: Schema.Struct({
-      read: Schema.Finite,
-      write: Schema.Finite,
-    }),
-  }),
-}).annotate({ identifier: "StepFinishPart" })
-export type StepFinishPart = Types.DeepMutable<Schema.Schema.Type<typeof StepFinishPart>>
-
-export const ToolStatePending = Schema.Struct({
-  status: Schema.Literal("pending"),
-  input: Schema.Record(Schema.String, Schema.Any),
-  raw: Schema.String,
-}).annotate({ identifier: "ToolStatePending" })
-export type ToolStatePending = Types.DeepMutable<Schema.Schema.Type<typeof ToolStatePending>>
-
-export const ToolStateRunning = Schema.Struct({
-  status: Schema.Literal("running"),
-  input: Schema.Record(Schema.String, Schema.Any),
-  title: Schema.optional(Schema.String),
-  metadata: Schema.optional(Schema.Record(Schema.String, Schema.Any)),
-  time: Schema.Struct({
-    start: NonNegativeInt,
-  }),
-}).annotate({ identifier: "ToolStateRunning" })
-export type ToolStateRunning = Types.DeepMutable<Schema.Schema.Type<typeof ToolStateRunning>>
-
-export const ToolStateCompleted = Schema.Struct({
-  status: Schema.Literal("completed"),
-  input: Schema.Record(Schema.String, Schema.Any),
-  output: Schema.String,
-  title: Schema.String,
-  metadata: Schema.Record(Schema.String, Schema.Any),
-  time: Schema.Struct({
-    start: NonNegativeInt,
-    end: NonNegativeInt,
-    compacted: Schema.optional(NonNegativeInt),
-  }),
-  attachments: Schema.optional(Schema.Array(FilePart)),
-}).annotate({ identifier: "ToolStateCompleted" })
-export type ToolStateCompleted = Types.DeepMutable<Schema.Schema.Type<typeof ToolStateCompleted>>
-
-export const ToolStateError = Schema.Struct({
-  status: Schema.Literal("error"),
-  input: Schema.Record(Schema.String, Schema.Any),
-  error: Schema.String,
-  metadata: Schema.optional(Schema.Record(Schema.String, Schema.Any)),
-  time: Schema.Struct({
-    start: NonNegativeInt,
-    end: NonNegativeInt,
-  }),
-}).annotate({ identifier: "ToolStateError" })
-export type ToolStateError = Types.DeepMutable<Schema.Schema.Type<typeof ToolStateError>>
-
-export const ToolState = Schema.Union([
-  ToolStatePending,
-  ToolStateRunning,
-  ToolStateCompleted,
-  ToolStateError,
-]).annotate({
-  discriminator: "status",
-  identifier: "ToolState",
-})
-export type ToolState = ToolStatePending | ToolStateRunning | ToolStateCompleted | ToolStateError
-
-export const ToolPart = Schema.Struct({
-  ...partBase,
-  type: Schema.Literal("tool"),
-  callID: Schema.String,
-  tool: Schema.String,
-  state: ToolState,
-  metadata: Schema.optional(Schema.Record(Schema.String, Schema.Any)),
-}).annotate({ identifier: "ToolPart" })
-export type ToolPart = Omit<Types.DeepMutable<Schema.Schema.Type<typeof ToolPart>>, "state"> & {
-  state: ToolState
-}
-
-const messageBase = {
-  id: MessageID,
-  sessionID: partBase.sessionID,
-}
-
-const FileDiff = Schema.Struct({
-  file: Schema.optional(Schema.String),
-  patch: Schema.optional(Schema.String),
-  additions: Schema.Finite,
-  deletions: Schema.Finite,
-  status: Schema.optional(Schema.Literals(["added", "deleted", "modified"])),
-}).annotate({ identifier: "SnapshotFileDiff" })
-
-export const User = Schema.Struct({
-  ...messageBase,
-  role: Schema.Literal("user"),
-  time: Schema.Struct({
-    created: Timestamp,
-  }),
-  format: Schema.optional(Format),
-  summary: Schema.optional(
-    Schema.Struct({
-      title: Schema.optional(Schema.String),
-      body: Schema.optional(Schema.String),
-      diffs: Schema.Array(FileDiff),
-    }),
-  ),
-  agent: Schema.String,
-  model: Schema.Struct({
-    providerID: ProviderV2.ID,
-    modelID: ModelV2.ID,
-    variant: Schema.optional(Schema.String),
-  }),
-  system: Schema.optional(Schema.String),
-  tools: Schema.optional(Schema.Record(Schema.String, Schema.Boolean)),
-}).annotate({ identifier: "UserMessage" })
-export type User = Types.DeepMutable<Schema.Schema.Type<typeof User>>
-
-export const Part = Schema.Union([
-  TextPart,
-  SubtaskPart,
-  ReasoningPart,
-  FilePart,
-  ToolPart,
-  StepStartPart,
-  StepFinishPart,
-  SnapshotPart,
-  PatchPart,
-  AgentPart,
-  RetryPart,
-  CompactionPart,
-]).annotate({ discriminator: "type", identifier: "Part" })
-export type Part =
-  | TextPart
-  | SubtaskPart
-  | ReasoningPart
-  | FilePart
-  | ToolPart
-  | StepStartPart
-  | StepFinishPart
-  | SnapshotPart
-  | PatchPart
-  | AgentPart
-  | RetryPart
-  | CompactionPart
-
-const AssistantErrorSchema = Schema.Union([
-  AuthError.EffectSchema,
-  NamedError.Unknown.EffectSchema,
-  OutputLengthError.EffectSchema,
-  AbortedError.EffectSchema,
-  StructuredOutputError.EffectSchema,
-  ContextOverflowError.EffectSchema,
-  ContentFilterError.EffectSchema,
-  APIError.EffectSchema,
-]).annotate({ discriminator: "name" })
-type AssistantError = Schema.Schema.Type<typeof AssistantErrorSchema>
-
-export const TextPartInput = Schema.Struct({
-  id: Schema.optional(PartID),
-  type: Schema.Literal("text"),
-  text: Schema.String,
-  synthetic: Schema.optional(Schema.Boolean),
-  ignored: Schema.optional(Schema.Boolean),
-  time: Schema.optional(
-    Schema.Struct({
-      start: NonNegativeInt,
-      end: Schema.optional(NonNegativeInt),
-    }),
-  ),
-  metadata: Schema.optional(Schema.Record(Schema.String, Schema.Any)),
-}).annotate({ identifier: "TextPartInput" })
-export type TextPartInput = Types.DeepMutable<Schema.Schema.Type<typeof TextPartInput>>
-
-export const FilePartInput = Schema.Struct({
-  id: Schema.optional(PartID),
-  type: Schema.Literal("file"),
-  mime: Schema.String,
-  filename: Schema.optional(Schema.String),
-  url: Schema.String,
-  source: Schema.optional(FilePartSource),
-}).annotate({ identifier: "FilePartInput" })
-export type FilePartInput = Types.DeepMutable<Schema.Schema.Type<typeof FilePartInput>>
-
-export const AgentPartInput = Schema.Struct({
-  id: Schema.optional(PartID),
-  type: Schema.Literal("agent"),
-  name: Schema.String,
-  source: Schema.optional(
-    Schema.Struct({
-      value: Schema.String,
-      start: NonNegativeInt,
-      end: NonNegativeInt,
-    }),
-  ),
-}).annotate({ identifier: "AgentPartInput" })
-export type AgentPartInput = Types.DeepMutable<Schema.Schema.Type<typeof AgentPartInput>>
-
-export const SubtaskPartInput = Schema.Struct({
-  id: Schema.optional(PartID),
-  type: Schema.Literal("subtask"),
-  prompt: Schema.String,
-  description: Schema.String,
-  agent: Schema.String,
-  model: Schema.optional(
-    Schema.Struct({
-      providerID: ProviderV2.ID,
-      modelID: ModelV2.ID,
-    }),
-  ),
-  command: Schema.optional(Schema.String),
-}).annotate({ identifier: "SubtaskPartInput" })
-export type SubtaskPartInput = Types.DeepMutable<Schema.Schema.Type<typeof SubtaskPartInput>>
-
-export const Assistant = Schema.Struct({
-  ...messageBase,
-  role: Schema.Literal("assistant"),
-  time: Schema.Struct({
-    created: NonNegativeInt,
-    completed: Schema.optional(NonNegativeInt),
-  }),
-  error: Schema.optional(AssistantErrorSchema),
-  parentID: MessageID,
-  modelID: ModelV2.ID,
-  providerID: ProviderV2.ID,
-  mode: Schema.String,
-  agent: Schema.String,
-  path: Schema.Struct({
-    cwd: Schema.String,
-    root: Schema.String,
-  }),
-  summary: Schema.optional(Schema.Boolean),
-  cost: Schema.Finite,
-  tokens: Schema.Struct({
-    total: Schema.optional(Schema.Finite),
-    input: Schema.Finite,
-    output: Schema.Finite,
-    reasoning: Schema.Finite,
-    cache: Schema.Struct({
-      read: Schema.Finite,
-      write: Schema.Finite,
-    }),
-  }),
-  structured: Schema.optional(Schema.Any),
-  variant: Schema.optional(Schema.String),
-  finish: Schema.optional(Schema.String),
-}).annotate({ identifier: "AssistantMessage" })
-export type Assistant = Omit<Types.DeepMutable<Schema.Schema.Type<typeof Assistant>>, "error"> & {
-  error?: AssistantError
-}
-
-export const Info = Schema.Union([User, Assistant]).annotate({ discriminator: "role", identifier: "Message" })
-export type Info = User | Assistant
-
-export const WithParts = Schema.Struct({
-  info: Info,
-  parts: Schema.Array(Part),
-})
-export type WithParts = {
-  info: Info
-  parts: Part[]
-}
-
-const options = {
-  durable: {
-    aggregate: "sessionID",
-    version: 1,
-  },
-} as const
-
-const SessionSummary = Schema.Struct({
-  additions: Schema.Finite,
-  deletions: Schema.Finite,
-  files: Schema.Finite,
-  diffs: optionalOmitUndefined(Schema.Array(FileDiff)),
-})
-
-const SessionTokens = Schema.Struct({
-  input: Schema.Finite,
-  output: Schema.Finite,
-  reasoning: Schema.Finite,
-  cache: Schema.Struct({
-    read: Schema.Finite,
-    write: Schema.Finite,
-  }),
-})
-
-const SessionShare = Schema.Struct({
-  url: Schema.String,
-})
-
-const SessionRevert = Schema.Struct({
-  messageID: MessageID,
-  partID: optionalOmitUndefined(PartID),
-  snapshot: optionalOmitUndefined(Schema.String),
-  diff: optionalOmitUndefined(Schema.String),
-})
-
-const SessionModel = Schema.Struct({
-  id: ModelV2.ID,
-  providerID: ProviderV2.ID,
-  variant: optionalOmitUndefined(Schema.String),
-})
-
-export const SessionInfo = Schema.Struct({
-  id: SessionSchema.ID,
-  slug: Schema.String,
-  projectID: ProjectV2.ID,
-  workspaceID: optionalOmitUndefined(WorkspaceV2.ID),
-  directory: Schema.String,
-  path: optionalOmitUndefined(Schema.String),
-  parentID: optionalOmitUndefined(SessionSchema.ID),
-  summary: optionalOmitUndefined(SessionSummary),
-  cost: optionalOmitUndefined(Schema.Finite),
-  tokens: optionalOmitUndefined(SessionTokens),
-  share: optionalOmitUndefined(SessionShare),
-  title: Schema.String,
-  agent: optionalOmitUndefined(Schema.String),
-  model: optionalOmitUndefined(SessionModel),
-  version: Schema.String,
-  metadata: optionalOmitUndefined(Schema.Record(Schema.String, Schema.Any)),
-  time: Schema.Struct({
-    created: NonNegativeInt,
-    updated: NonNegativeInt,
-    compacting: optionalOmitUndefined(NonNegativeInt),
-    archived: optionalOmitUndefined(Schema.Finite),
-  }),
-  permission: optionalOmitUndefined(PermissionV1.Ruleset),
-  revert: optionalOmitUndefined(SessionRevert),
-}).annotate({ identifier: "Session" })
-export type SessionInfo = typeof SessionInfo.Type
-
-export const Event = {
-  Created: EventV2.define({
-    type: "session.created",
-    ...options,
-    schema: {
-      sessionID: SessionSchema.ID,
-      info: SessionInfo,
-    },
-  }),
-  Updated: EventV2.define({
-    type: "session.updated",
-    ...options,
-    schema: {
-      sessionID: SessionSchema.ID,
-      info: SessionInfo,
-    },
-  }),
-  Deleted: EventV2.define({
-    type: "session.deleted",
-    ...options,
-    schema: {
-      sessionID: SessionSchema.ID,
-      info: SessionInfo,
-    },
-  }),
-  MessageUpdated: EventV2.define({
-    type: "message.updated",
-    ...options,
-    schema: {
-      sessionID: SessionSchema.ID,
-      info: Info,
-    },
-  }),
-  MessageRemoved: EventV2.define({
-    type: "message.removed",
-    ...options,
-    schema: {
-      sessionID: SessionSchema.ID,
-      messageID: MessageID,
-    },
-  }),
-  PartUpdated: EventV2.define({
-    type: "message.part.updated",
-    ...options,
-    schema: {
-      sessionID: SessionSchema.ID,
-      part: Part,
-      time: Schema.Finite,
-    },
-  }),
-  PartRemoved: EventV2.define({
-    type: "message.part.removed",
-    ...options,
-    schema: {
-      sessionID: SessionSchema.ID,
-      messageID: MessageID,
-      partID: PartID,
-    },
-  }),
-}
+export const ContentFilterError = NamedError.create("ContentFilterError", { message: Schema.String })
@@ -233,16 +233,13 @@ describe("CatalogV2", () => {
          model.request.headers.shared = "model"
          model.request.body.model = true
          model.request.body.request = true
-          const options = (model.request.options ??= {})
-          options.shared = "model"
-          options.model = true
+          model.request.body.shared = "model"
        })
      })

      const model = required(yield* catalog.model.get(providerID, modelID))
      expect(model.request.headers).toEqual({ provider: "provider", shared: "model", model: "model" })
-      expect(model.request.body).toEqual({ provider: true, model: true, request: true })
-      expect(model.request.options).toEqual({ shared: "model", model: true })
+      expect(model.request.body).toEqual({ provider: true, model: true, request: true, shared: "model" })
    }),
  )

@@ -599,9 +599,9 @@ describe("Config", () => {
              models: {
                model: {
                  request: {
-                    body: { temperature: 0.3, reasoningEffort: "high", serviceTier: "priority" },
+                    body: { temperature: 0.3, reasoning_effort: "high", service_tier: "priority" },
                  },
-                  variants: [{ id: "high", body: { reasoningEffort: "high", reasoningSummary: "auto" } }],
+                  variants: [{ id: "high", body: { reasoning_effort: "high", reasoning_summary: "auto" } }],
                },
              },
            })
@@ -55,7 +55,7 @@ function request(headers: Record<string, string>, variant?: string) {
 const decode = Schema.decodeUnknownSync(Config.Info)

 describe("ConfigProviderPlugin.Plugin", () => {
-  it.effect("partitions existing model variant bodies without changing config shape", () =>
+  it.effect("keeps configured model variant bodies unchanged", () =>
    Effect.gen(function* () {
      const catalog = yield* Catalog.Service
      const providerID = ProviderV2.ID.opencode
@@ -96,8 +96,7 @@ describe("ConfigProviderPlugin.Plugin", () => {
      expect(model.variants).toMatchObject([
        {
          id: "high",
-          body: {},
-          options: {
+          body: {
            reasoningEffort: "high",
            reasoningSummary: "auto",
            include: ["reasoning.encrypted_content"],
@@ -107,7 +106,7 @@ describe("ConfigProviderPlugin.Plugin", () => {
    }),
  )

-  it.effect("uses the effective provider package across layered config", () =>
+  it.effect("keeps layered model variant bodies unchanged", () =>
    Effect.gen(function* () {
      const catalog = yield* Catalog.Service
      const providerID = ProviderV2.ID.opencode
@@ -147,8 +146,7 @@ describe("ConfigProviderPlugin.Plugin", () => {
      const model = required(yield* catalog.model.get(providerID, modelID))
      expect(model.variants[0]).toMatchObject({
        id: "high",
-        body: {},
-        options: { reasoningEffort: "high" },
+        body: { reasoningEffort: "high" },
      })
    }),
  )
@@ -1,10 +1,14 @@
 import { describe, expect } from "bun:test"
 import { Cause, DateTime, Deferred, Effect, Exit, Fiber, Layer, Schema, Stream } from "effect"
 import { EventV2 } from "@opencode-ai/core/event"
+import { Event } from "@opencode-ai/schema/event"
+import { Session } from "@opencode-ai/schema/session"
+import { SessionEvent } from "@opencode-ai/schema/session-event"
+import { SessionV1 } from "@opencode-ai/schema/session-v1"
 import { Database } from "@opencode-ai/core/database/database"
 import { EventSequenceTable, EventTable } from "@opencode-ai/core/event/sql"
 import { Location } from "@opencode-ai/core/location"
-import { AbsolutePath, DateTimeUtcFromMillis } from "@opencode-ai/core/schema"
+import { AbsolutePath } from "@opencode-ai/core/schema"
 import { WorkspaceV2 } from "@opencode-ai/core/workspace"
 import { eq } from "drizzle-orm"
 import { location } from "./fixture/location"
@@ -16,10 +20,6 @@ const locationLayer = Layer.succeed(
    location({ directory: AbsolutePath.make("project"), workspaceID: WorkspaceV2.ID.make("wrk_test") }),
  ),
 )
-const eventLayer = Layer.mergeAll(EventV2.defaultLayer, Database.defaultLayer)
-const it = testEffect(eventLayer.pipe(Layer.provideMerge(locationLayer)))
-const itWithoutLocation = testEffect(eventLayer)
-
 const Message = EventV2.define({
  type: "test.message",
  schema: {
@@ -70,18 +70,16 @@ const VersionedMessage = EventV2.define({
  },
 })

-const SyncTimestamp = EventV2.define({
-  type: "test.timestamp",
-  durable: {
-    version: 1,
-    aggregate: "id",
-  },
-  schema: {
-    id: Schema.String,
-    timestamp: DateTimeUtcFromMillis,
-  },
+const DurableMessage = SessionV1.Event.MessageRemoved
+const durableData = (sessionID: Session.ID, text: string) => ({
+  sessionID,
+  messageID: SessionV1.MessageID.ascending(`msg_${text}`),
 })

+const eventLayer = Layer.mergeAll(EventV2.layerWith().pipe(Layer.provide(Database.defaultLayer)), Database.defaultLayer)
+const it = testEffect(eventLayer.pipe(Layer.provideMerge(locationLayer)))
+const itWithoutLocation = testEffect(eventLayer)
+
 describe("EventV2", () => {
  it.effect("publishes events with the current location", () =>
    Effect.gen(function* () {
@@ -122,26 +120,21 @@ describe("EventV2", () => {
    }),
  )

-  it.effect("stores definitions in the exported registry", () =>
-    Effect.sync(() => {
-      expect(EventV2.registry.get(Message.type)).toBe(Message)
-    }),
-  )
-
-  it.effect("keeps the latest sync definition in the registry", () =>
+  it.effect("selects the latest durable definition independent of declaration order", () =>
    Effect.sync(() => {
      const latest = EventV2.define({
        type: "test.out-of-order",
        durable: { version: 2, aggregate: "id" },
        schema: { id: Schema.String },
      })
-      EventV2.define({
+      const historical = EventV2.define({
        type: "test.out-of-order",
        durable: { version: 1, aggregate: "id" },
        schema: { id: Schema.String },
      })

-      expect(EventV2.registry.get("test.out-of-order")).toBe(latest)
+      expect(Event.latest([latest, historical]).get("test.out-of-order")).toBe(latest)
+      expect(Event.latest([historical, latest]).get("test.out-of-order")).toBe(latest)
    }),
  )

@@ -363,19 +356,19 @@ describe("EventV2", () => {
  it.effect("replays durable aggregate events after a sequence and tails new events", () =>
    Effect.gen(function* () {
      const events = yield* EventV2.Service
-      const aggregateID = EventV2.ID.create()
-      yield* events.publish(SyncMessage, { id: aggregateID, text: "zero" })
-      yield* events.publish(SyncMessage, { id: aggregateID, text: "one" })
+      const aggregateID = Session.ID.create()
+      yield* events.publish(DurableMessage, durableData(aggregateID, "zero"))
+      yield* events.publish(DurableMessage, durableData(aggregateID, "one"))
      const fiber = yield* events
        .durable({ aggregateID, after: 0 })
        .pipe(Stream.take(2), Stream.runCollect, Effect.forkScoped)
      yield* Effect.yieldNow

-      yield* events.publish(SyncMessage, { id: aggregateID, text: "two" })
+      yield* events.publish(DurableMessage, durableData(aggregateID, "two"))

      expect(Array.from(yield* Fiber.join(fiber)).map((event) => [event.durable?.seq, event.data])).toEqual([
-        [1, { id: aggregateID, text: "one" }],
-        [2, { id: aggregateID, text: "two" }],
+        [1, durableData(aggregateID, "one")],
+        [2, durableData(aggregateID, "two")],
      ])
    }),
  )
@@ -383,20 +376,15 @@ describe("EventV2", () => {
  it.effect("catches durable aggregate events published during replay handoff", () =>
    Effect.gen(function* () {
      const events = yield* EventV2.Service
-      const aggregateID = EventV2.ID.create()
-      yield* events.publish(SyncMessage, { id: aggregateID, text: "zero" })
+      const aggregateID = Session.ID.create()
+      yield* events.publish(DurableMessage, durableData(aggregateID, "zero"))
      const fiber = yield* events.durable({ aggregateID }).pipe(Stream.take(2), Stream.runCollect, Effect.forkScoped)

-      yield* events.publish(SyncMessage, { id: aggregateID, text: "one" })
+      yield* events.publish(DurableMessage, durableData(aggregateID, "one"))

-      expect(
-        Array.from(yield* Fiber.join(fiber)).map((event) => [
-          event.durable?.seq,
-          (event.data as { text: string }).text,
-        ]),
-      ).toEqual([
-        [0, "zero"],
-        [1, "one"],
+      expect(Array.from(yield* Fiber.join(fiber)).map((event) => [event.durable?.seq, event.data])).toEqual([
+        [0, durableData(aggregateID, "zero")],
+        [1, durableData(aggregateID, "one")],
      ])
    }),
  )
@@ -415,16 +403,16 @@ describe("EventV2", () => {

      yield* Effect.gen(function* () {
        const events = yield* EventV2.Service
-        const aggregateID = EventV2.ID.create()
+        const aggregateID = Session.ID.create()
        const fiber = yield* events.durable({ aggregateID }).pipe(Stream.take(1), Stream.runCollect, Effect.forkScoped)
        yield* Deferred.await(readStarted)

        pause = false
-        yield* events.publish(SyncMessage, { id: aggregateID, text: "during handoff" })
+        yield* events.publish(DurableMessage, durableData(aggregateID, "during handoff"))
        yield* Deferred.succeed(continueRead, undefined)

        expect(Array.from(yield* Fiber.join(fiber)).map((event) => [event.durable?.seq, event.data])).toEqual([
-          [0, { id: aggregateID, text: "during handoff" }],
+          [0, durableData(aggregateID, "during handoff")],
        ])
      }).pipe(Effect.provide(Layer.mergeAll(Database.defaultLayer, eventLayer)))
    }),
@@ -433,7 +421,7 @@ describe("EventV2", () => {
  it.effect("coalesces durable aggregate wakes while draining every committed event", () =>
    Effect.gen(function* () {
      const events = yield* EventV2.Service
-      const aggregateID = EventV2.ID.create()
+      const aggregateID = Session.ID.create()
      const count = 64
      const fiber = yield* events
        .durable({ aggregateID })
@@ -441,11 +429,11 @@ describe("EventV2", () => {
      yield* Effect.yieldNow

      for (let index = 0; index < count; index++) {
-        yield* events.publish(SyncMessage, { id: aggregateID, text: String(index) })
+        yield* events.publish(DurableMessage, durableData(aggregateID, String(index)))
      }

      expect(Array.from(yield* Fiber.join(fiber)).map((event) => [event.durable?.seq, event.data])).toEqual(
-        Array.from({ length: count }, (_, index) => [index, { id: aggregateID, text: String(index) }]),
+        Array.from({ length: count }, (_, index) => [index, durableData(aggregateID, String(index))]),
      )
    }),
  )
@@ -453,14 +441,14 @@ describe("EventV2", () => {
  it.effect("omits live-only events from durable aggregate streams", () =>
    Effect.gen(function* () {
      const events = yield* EventV2.Service
-      const aggregateID = EventV2.ID.create()
+      const aggregateID = Session.ID.create()
      const fiber = yield* events.durable({ aggregateID }).pipe(Stream.take(1), Stream.runCollect, Effect.forkScoped)
      yield* Effect.yieldNow

      yield* events.publish(Message, { text: "live only" })
-      yield* events.publish(SyncMessage, { id: aggregateID, text: "durable" })
+      yield* events.publish(DurableMessage, durableData(aggregateID, "durable"))

-      expect(Array.from(yield* Fiber.join(fiber)).map((event) => event.type)).toEqual([SyncMessage.type])
+      expect(Array.from(yield* Fiber.join(fiber)).map((event) => event.type)).toEqual([DurableMessage.type])
    }),
  )

@@ -487,23 +475,23 @@ describe("EventV2", () => {
    Effect.gen(function* () {
      const events = yield* EventV2.Service
      const received = new Array<EventV2.Payload>()
-      yield* events.project(SyncMessage, (event) =>
+      yield* events.project(DurableMessage, (event) =>
        Effect.sync(() => {
          received.push(event)
        }),
      )
-      const aggregateID = EventV2.ID.create()
+      const aggregateID = Session.ID.create()

      yield* events.replay({
        id: EventV2.ID.create(),
-        type: EventV2.versionedType(SyncMessage.type, 1),
+        type: EventV2.versionedType(DurableMessage.type, 1),
        seq: 0,
        aggregateID,
-        data: { id: aggregateID, text: "hello" },
+        data: durableData(aggregateID, "hello"),
      })

-      expect(received[0]?.type).toBe(SyncMessage.type)
-      expect(received[0]?.data).toEqual({ id: aggregateID, text: "hello" })
+      expect(received[0]?.type).toBe(DurableMessage.type)
+      expect(received[0]?.data).toEqual(durableData(aggregateID, "hello"))
    }),
  )

@@ -511,14 +499,14 @@ describe("EventV2", () => {
    Effect.gen(function* () {
      const events = yield* EventV2.Service
      const { db } = yield* Database.Service
-      const aggregateID = EventV2.ID.create()
+      const aggregateID = Session.ID.create()

      yield* events.replay({
        id: EventV2.ID.create(),
-        type: EventV2.versionedType(SyncMessage.type, 1),
+        type: EventV2.versionedType(DurableMessage.type, 1),
        seq: 0,
        aggregateID,
-        data: { id: aggregateID, text: "replayed" },
+        data: durableData(aggregateID, "replayed"),
      })
      const rows = yield* db
        .select()
@@ -538,11 +526,11 @@ describe("EventV2", () => {
      Effect.gen(function* () {
        const events = yield* EventV2.Service
        const { db } = yield* Database.Service
-        const envelopeAggregateID = EventV2.ID.create()
-        const payloadAggregateID = EventV2.ID.create()
+        const envelopeAggregateID = Session.ID.create()
+        const payloadAggregateID = Session.ID.create()
        const received = new Array<EventV2.Payload>()
-        yield* events.publish(SyncMessage, { id: payloadAggregateID, text: "seed" })
-        yield* events.project(SyncMessage, (event) =>
+        yield* events.publish(DurableMessage, durableData(payloadAggregateID, "seed"))
+        yield* events.project(DurableMessage, (event) =>
          Effect.sync(() => {
            received.push(event)
          }),
@@ -551,10 +539,10 @@ describe("EventV2", () => {
        const exit = yield* events
          .replay({
            id: EventV2.ID.create(),
-            type: EventV2.versionedType(SyncMessage.type, 1),
+            type: EventV2.versionedType(DurableMessage.type, 1),
            seq: 1,
            aggregateID: envelopeAggregateID,
-            data: { id: payloadAggregateID, text: "replayed" },
+            data: durableData(payloadAggregateID, "replayed"),
          })
          .pipe(Effect.exit)
        const rows = yield* db
@@ -580,22 +568,22 @@ describe("EventV2", () => {
  it.effect("replay defects on sequence mismatch", () =>
    Effect.gen(function* () {
      const events = yield* EventV2.Service
-      const aggregateID = EventV2.ID.create()
+      const aggregateID = Session.ID.create()

      yield* events.replay({
        id: EventV2.ID.create(),
-        type: EventV2.versionedType(SyncMessage.type, 1),
+        type: EventV2.versionedType(DurableMessage.type, 1),
        seq: 0,
        aggregateID,
-        data: { id: aggregateID, text: "first" },
+        data: durableData(aggregateID, "first"),
      })
      const exit = yield* events
        .replay({
          id: EventV2.ID.create(),
-          type: EventV2.versionedType(SyncMessage.type, 1),
+          type: EventV2.versionedType(DurableMessage.type, 1),
          seq: 5,
          aggregateID,
-          data: { id: aggregateID, text: "bad" },
+          data: durableData(aggregateID, "bad"),
        })
        .pipe(Effect.exit)

@@ -606,9 +594,9 @@ describe("EventV2", () => {
  it.effect("replay decodes synchronized transformed values before projection", () =>
    Effect.gen(function* () {
      const events = yield* EventV2.Service
-      const aggregateID = EventV2.ID.create()
-      const received = new Array<typeof SyncTimestamp.Type>()
-      yield* events.project(SyncTimestamp, (event) =>
+      const aggregateID = Session.ID.create()
+      const received = new Array<typeof SessionEvent.ContextUpdated.Type>()
+      yield* events.project(SessionEvent.ContextUpdated, (event) =>
        Effect.sync(() => {
          received.push(event)
        }),
@@ -616,10 +604,10 @@ describe("EventV2", () => {

      yield* events.replay({
        id: EventV2.ID.create(),
-        type: EventV2.versionedType(SyncTimestamp.type, 1),
+        type: EventV2.versionedType(SessionEvent.ContextUpdated.type, 1),
        seq: 0,
        aggregateID,
-        data: { id: aggregateID, timestamp: 0 },
+        data: { sessionID: aggregateID, messageID: "msg_context", timestamp: 0, text: "context" },
      })

      expect(received[0]?.data.timestamp).toEqual(DateTime.makeUnsafe(0))
@@ -646,21 +634,21 @@ describe("EventV2", () => {
  it.effect("replayAll validates contiguous aggregate events", () =>
    Effect.gen(function* () {
      const events = yield* EventV2.Service
-      const aggregateID = EventV2.ID.create()
+      const aggregateID = Session.ID.create()
      const source = yield* events.replayAll([
        {
          id: EventV2.ID.create(),
-          type: EventV2.versionedType(SyncMessage.type, 1),
+          type: EventV2.versionedType(DurableMessage.type, 1),
          seq: 0,
          aggregateID,
-          data: { id: aggregateID, text: "one" },
+          data: durableData(aggregateID, "one"),
        },
        {
          id: EventV2.ID.create(),
-          type: EventV2.versionedType(SyncMessage.type, 1),
+          type: EventV2.versionedType(DurableMessage.type, 1),
          seq: 1,
          aggregateID,
-          data: { id: aggregateID, text: "two" },
+          data: durableData(aggregateID, "two"),
        },
      ])

@@ -672,38 +660,38 @@ describe("EventV2", () => {
    Effect.gen(function* () {
      const events = yield* EventV2.Service
      const { db } = yield* Database.Service
-      const aggregateID = EventV2.ID.create()
+      const aggregateID = Session.ID.create()

      const one = yield* events.replayAll([
        {
          id: EventV2.ID.create(),
-          type: EventV2.versionedType(SyncMessage.type, 1),
+          type: EventV2.versionedType(DurableMessage.type, 1),
          seq: 0,
          aggregateID,
-          data: { id: aggregateID, text: "one" },
+          data: durableData(aggregateID, "one"),
        },
        {
          id: EventV2.ID.create(),
-          type: EventV2.versionedType(SyncMessage.type, 1),
+          type: EventV2.versionedType(DurableMessage.type, 1),
          seq: 1,
          aggregateID,
-          data: { id: aggregateID, text: "two" },
+          data: durableData(aggregateID, "two"),
        },
      ])
      const two = yield* events.replayAll([
        {
          id: EventV2.ID.create(),
-          type: EventV2.versionedType(SyncMessage.type, 1),
+          type: EventV2.versionedType(DurableMessage.type, 1),
          seq: 2,
          aggregateID,
-          data: { id: aggregateID, text: "three" },
+          data: durableData(aggregateID, "three"),
        },
        {
          id: EventV2.ID.create(),
-          type: EventV2.versionedType(SyncMessage.type, 1),
+          type: EventV2.versionedType(DurableMessage.type, 1),
          seq: 3,
          aggregateID,
-          data: { id: aggregateID, text: "four" },
+          data: durableData(aggregateID, "four"),
        },
      ])
      const rows = yield* db
@@ -723,10 +711,10 @@ describe("EventV2", () => {
    Effect.gen(function* () {
      const events = yield* EventV2.Service
      const received = new Array<EventV2.Payload>()
-      const aggregateID = EventV2.ID.create()
-      yield* events.publish(SyncMessage, { id: aggregateID, text: "seed" })
+      const aggregateID = Session.ID.create()
+      yield* events.publish(DurableMessage, durableData(aggregateID, "seed"))
      yield* events.claim(aggregateID, "owner-a")
-      yield* events.project(SyncMessage, (event) =>
+      yield* events.project(DurableMessage, (event) =>
        Effect.sync(() => {
          received.push(event)
        }),
@@ -735,10 +723,10 @@ describe("EventV2", () => {
      yield* events.replay(
        {
          id: EventV2.ID.create(),
-          type: EventV2.versionedType(SyncMessage.type, 1),
+          type: EventV2.versionedType(DurableMessage.type, 1),
          seq: 1,
          aggregateID,
-          data: { id: aggregateID, text: "ignored" },
+          data: durableData(aggregateID, "ignored"),
        },
        { ownerID: "owner-b" },
      )
@@ -750,14 +738,14 @@ describe("EventV2", () => {
  it.effect("strict owner fences exact replay", () =>
    Effect.gen(function* () {
      const events = yield* EventV2.Service
-      const aggregateID = EventV2.ID.create()
+      const aggregateID = Session.ID.create()
      const id = EventV2.ID.create()
      const replayed = {
        id,
-        type: EventV2.versionedType(SyncMessage.type, 1),
+        type: EventV2.versionedType(DurableMessage.type, 1),
        seq: 0,
        aggregateID,
-        data: { id: aggregateID, text: "owned" },
+        data: durableData(aggregateID, "owned"),
      }
      yield* events.replay(replayed, { ownerID: "owner-a" })

@@ -771,11 +759,11 @@ describe("EventV2", () => {
    Effect.gen(function* () {
      const events = yield* EventV2.Service
      const { db } = yield* Database.Service
-      const aggregateID = EventV2.ID.create()
-      const published = yield* events.publish(SyncMessage, { id: aggregateID, text: "owned" })
+      const aggregateID = Session.ID.create()
+      const published = yield* events.publish(DurableMessage, durableData(aggregateID, "owned"))
      const replayed = {
        id: published.id,
-        type: EventV2.versionedType(SyncMessage.type, 1),
+        type: EventV2.versionedType(DurableMessage.type, 1),
        seq: published.durable!.seq,
        aggregateID,
        data: published.data,
@@ -792,7 +780,7 @@ describe("EventV2", () => {
      expect(row?.ownerID).toBe("owner-a")
      const exit = yield* events
        .replay(
-          { ...replayed, id: EventV2.ID.create(), seq: 1, data: { id: aggregateID, text: "conflict" } },
+          { ...replayed, id: EventV2.ID.create(), seq: 1, data: durableData(aggregateID, "conflict") },
          { ownerID: "owner-b", strictOwner: true },
        )
        .pipe(Effect.exit)
@@ -804,15 +792,15 @@ describe("EventV2", () => {
    Effect.gen(function* () {
      const events = yield* EventV2.Service
      const { db } = yield* Database.Service
-      const aggregateID = EventV2.ID.create()
+      const aggregateID = Session.ID.create()

      yield* events.replay(
        {
          id: EventV2.ID.create(),
-          type: EventV2.versionedType(SyncMessage.type, 1),
+          type: EventV2.versionedType(DurableMessage.type, 1),
          seq: 0,
          aggregateID,
-          data: { id: aggregateID, text: "owned" },
+          data: durableData(aggregateID, "owned"),
        },
        { ownerID: "owner-1" },
      )
@@ -831,26 +819,26 @@ describe("EventV2", () => {
    Effect.gen(function* () {
      const events = yield* EventV2.Service
      const { db } = yield* Database.Service
-      const aggregateID = EventV2.ID.create()
-      yield* events.publish(SyncMessage, { id: aggregateID, text: "local" })
+      const aggregateID = Session.ID.create()
+      yield* events.publish(DurableMessage, durableData(aggregateID, "local"))

      yield* events.replay(
        {
          id: EventV2.ID.create(),
-          type: EventV2.versionedType(SyncMessage.type, 1),
+          type: EventV2.versionedType(DurableMessage.type, 1),
          seq: 1,
          aggregateID,
-          data: { id: aggregateID, text: "claimed" },
+          data: durableData(aggregateID, "claimed"),
        },
        { ownerID: "owner-1" },
      )
      yield* events.replay(
        {
          id: EventV2.ID.create(),
-          type: EventV2.versionedType(SyncMessage.type, 1),
+          type: EventV2.versionedType(DurableMessage.type, 1),
          seq: 2,
          aggregateID,
-          data: { id: aggregateID, text: "fenced" },
+          data: durableData(aggregateID, "fenced"),
        },
        { ownerID: "owner-2" },
      )
@@ -875,14 +863,14 @@ describe("EventV2", () => {
  it.effect("strict replay rejects an owner conflict instead of silently skipping it", () =>
    Effect.gen(function* () {
      const events = yield* EventV2.Service
-      const aggregateID = EventV2.ID.create()
+      const aggregateID = Session.ID.create()
      yield* events.replay(
        {
          id: EventV2.ID.create(),
-          type: EventV2.versionedType(SyncMessage.type, 1),
+          type: EventV2.versionedType(DurableMessage.type, 1),
          seq: 0,
          aggregateID,
-          data: { id: aggregateID, text: "claimed" },
+          data: durableData(aggregateID, "claimed"),
        },
        { ownerID: "owner-1" },
      )
@@ -891,10 +879,10 @@ describe("EventV2", () => {
        .replay(
          {
            id: EventV2.ID.create(),
-            type: EventV2.versionedType(SyncMessage.type, 1),
+            type: EventV2.versionedType(DurableMessage.type, 1),
            seq: 1,
            aggregateID,
-            data: { id: aggregateID, text: "conflict" },
+            data: durableData(aggregateID, "conflict"),
          },
          { ownerID: "owner-2", strictOwner: true },
        )
@@ -908,14 +896,14 @@ describe("EventV2", () => {
    Effect.gen(function* () {
      const events = yield* EventV2.Service
      const received = new Array<EventV2.Payload>()
-      const aggregateID = EventV2.ID.create()
+      const aggregateID = Session.ID.create()
      yield* events.listen((event) => Effect.sync(() => received.push(event)))
      const replayed = {
        id: EventV2.ID.create(),
-        type: EventV2.versionedType(SyncMessage.type, 1),
+        type: EventV2.versionedType(DurableMessage.type, 1),
        seq: 0,
        aggregateID,
-        data: { id: aggregateID, text: "replayed" },
+        data: durableData(aggregateID, "replayed"),
      }

      yield* events.replay(replayed, { publish: true })
@@ -929,19 +917,19 @@ describe("EventV2", () => {
    Effect.gen(function* () {
      const events = yield* EventV2.Service
      const received = new Array<EventV2.Payload>()
-      const aggregateID = EventV2.ID.create()
+      const aggregateID = Session.ID.create()
      const replayed = {
        id: EventV2.ID.create(),
-        type: EventV2.versionedType(SyncMessage.type, 1),
+        type: EventV2.versionedType(DurableMessage.type, 1),
        seq: 0,
        aggregateID,
-        data: { id: aggregateID, text: "original" },
+        data: durableData(aggregateID, "original"),
      }
      yield* events.listen((event) => Effect.sync(() => received.push(event)))
      yield* events.replay(replayed, { publish: true })

      const exit = yield* events
-        .replay({ ...replayed, data: { id: aggregateID, text: "divergent" } }, { publish: true })
+        .replay({ ...replayed, data: durableData(aggregateID, "divergent") }, { publish: true })
        .pipe(Effect.exit)

      expect(String(exit)).toContain("Replay diverged")
@@ -952,23 +940,23 @@ describe("EventV2", () => {
  it.effect("rejects an event ID reused at another aggregate position", () =>
    Effect.gen(function* () {
      const events = yield* EventV2.Service
-      const aggregateID = EventV2.ID.create()
+      const aggregateID = Session.ID.create()
      const id = EventV2.ID.create()
      yield* events.replay({
        id,
-        type: EventV2.versionedType(SyncMessage.type, 1),
+        type: EventV2.versionedType(DurableMessage.type, 1),
        seq: 0,
        aggregateID,
-        data: { id: aggregateID, text: "first" },
+        data: durableData(aggregateID, "first"),
      })

      const exit = yield* events
        .replay({
          id,
-          type: EventV2.versionedType(SyncMessage.type, 1),
+          type: EventV2.versionedType(DurableMessage.type, 1),
          seq: 1,
          aggregateID,
-          data: { id: aggregateID, text: "second" },
+          data: durableData(aggregateID, "second"),
        })
        .pipe(Effect.exit)

@@ -980,27 +968,27 @@ describe("EventV2", () => {
    Effect.gen(function* () {
      const events = yield* EventV2.Service
      const { db } = yield* Database.Service
-      const aggregateID = EventV2.ID.create()
+      const aggregateID = Session.ID.create()
      const received = new Array<EventV2.Payload>()
      yield* events.listen((event) => Effect.sync(() => received.push(event)))

      yield* events.replay(
        {
          id: EventV2.ID.create(),
-          type: EventV2.versionedType(SyncMessage.type, 1),
+          type: EventV2.versionedType(DurableMessage.type, 1),
          seq: 0,
          aggregateID,
-          data: { id: aggregateID, text: "first" },
+          data: durableData(aggregateID, "first"),
        },
        { ownerID: "owner-1" },
      )
      yield* events.replay(
        {
          id: EventV2.ID.create(),
-          type: EventV2.versionedType(SyncMessage.type, 1),
+          type: EventV2.versionedType(DurableMessage.type, 1),
          seq: 1,
          aggregateID,
-          data: { id: aggregateID, text: "ignored" },
+          data: durableData(aggregateID, "ignored"),
        },
        { ownerID: "owner-2", publish: true },
      )
@@ -1047,10 +1035,10 @@ describe("EventV2", () => {
    Effect.gen(function* () {
      const events = yield* EventV2.Service
      const received = new Array<EventV2.Payload>()
-      const aggregateID = EventV2.ID.create()
-      yield* events.publish(SyncMessage, { id: aggregateID, text: "seed" })
+      const aggregateID = Session.ID.create()
+      yield* events.publish(DurableMessage, durableData(aggregateID, "seed"))
      yield* events.remove(aggregateID)
-      yield* events.project(SyncMessage, (event) =>
+      yield* events.project(DurableMessage, (event) =>
        Effect.sync(() => {
          received.push(event)
        }),
@@ -1058,13 +1046,13 @@ describe("EventV2", () => {

      yield* events.replay({
        id: EventV2.ID.create(),
-        type: EventV2.versionedType(SyncMessage.type, 1),
+        type: EventV2.versionedType(DurableMessage.type, 1),
        seq: 0,
        aggregateID,
-        data: { id: aggregateID, text: "replayed" },
+        data: durableData(aggregateID, "replayed"),
      })

-      expect(received[0]?.data).toEqual({ id: aggregateID, text: "replayed" })
+      expect(received[0]?.data).toEqual(durableData(aggregateID, "replayed"))
    }),
  )
 })
@@ -0,0 +1,16 @@
+import { describe, expect, test } from "bun:test"
+import { SessionV1 as Wire } from "@opencode-ai/schema/session-v1"
+import { SessionV1 } from "../src/v1/session"
+
+describe("legacy event schema compatibility", () => {
+  test("Core references canonical SessionV1 definitions", () => {
+    expect(SessionV1.Event.Created).toBe(Wire.Event.Created)
+    expect(SessionV1.Event.PartUpdated).toBe(Wire.Event.PartUpdated)
+  })
+
+  test("Core retains NamedError constructor identity", () => {
+    const error = new SessionV1.APIError({ message: "failed", isRetryable: false })
+    expect(error).toBeInstanceOf(SessionV1.APIError)
+    expect(error.toObject()).toEqual({ name: "APIError", data: { message: "failed", isRetryable: false } })
+  })
+})
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Aiden Cline	8f62645677	fix(opencode): make mcp env handling portable	2026-06-24 16:59:07 -05:00
Aiden Cline	d1adfdba16	fix(opencode): restrict local mcp environment	2026-06-24 16:24:48 -05:00
opencode-agent[bot]	4b83f5d8f0	chore: update nix node_modules hashes	2026-06-24 20:56:38 +00:00
opencode-agent[bot]	121decfd15	chore: generate	2026-06-24 20:45:23 +00:00
Kit Langton	24b0132bc5	refactor(schema): extract public event definitions (#33579 )	2026-06-24 16:43:17 -04:00
opencode	858f35f1b3	sync release versions for v1.17.10	2026-06-24 20:37:40 +00:00
Simon Klee	20750a3295	tui: remove logo animation (#33633 ) Render branding as a static logo to avoid continuous redraws and mouse-driven visual effects.	2026-06-24 19:28:46 +00:00
Aiden Cline	1ddb75dd3e	fix: restore dev CI (#33701 )	2026-06-24 14:04:50 -05:00
Frank	ea5dd9d940	zen: track model tier in stats	2026-06-24 14:34:58 -04:00
opencode-agent[bot]	31b58b4704	chore: generate	2026-06-24 17:21:26 +00:00
Dax Raad	42bb793574	feat(core): generate model variants	2026-06-24 13:17:14 -04:00
Dax Raad	17f312d537	refactor(core): simplify model requests	2026-06-24 13:17:14 -04:00
Aiden Cline	116ac93ddb	fix(mcp): hide denied resource template tool (#33686 )	2026-06-24 12:01:44 -05:00
opencode-agent[bot]	2684293291	chore: generate	2026-06-24 16:56:33 +00:00
4rcadia	e8e83afbce	feat(mcp): append server instructions to context (#32490 ) Co-authored-by: Aiden Cline <aidenpcline@gmail.com>	2026-06-24 11:54:19 -05:00
Adam	2e909334c1	refactor(stats): simplify locale prefix stripping	2026-06-24 10:33:59 -05:00
Adam	69f3b633b8	fix(stats): strip locale prefixes from data routes	2026-06-24 10:33:58 -05:00
Frank	db7c28b3ee	zen: migrate to new inference	2026-06-24 11:15:42 -04:00
opencode-agent[bot]	e45f55d922	chore: update nix node_modules hashes	2026-06-24 15:09:00 +00:00
Victor Navarro	04c1730c90	refactor(ui): isolate session components (#33670 )	2026-06-24 14:56:09 +00:00
opencode-agent[bot]	1ef0fd5d01	chore: generate	2026-06-24 13:59:28 +00:00
Shoubhit Dash	36501a81c3	docs(llm): propose AI library design (#33666 )	2026-06-24 19:27:21 +05:30
Simon Klee	6281e35a18	tui: fix multi-day duration formatting (#33651 ) Report elapsed days and remaining hours instead of showing zero days and the total duration as hours. Close #32957 Close #32956	2026-06-24 12:05:06 +00:00