fix(opencode): let NaN/Infinity flow in Rune, normalize to null at the boundary

Rune previously threw the instant any non-finite number materialized, which killed the program before the model's own guard could run — so idiomatic code like parseInt(x) || 0, Number(x) then Number.isNaN(x), averages, and counters crashed mid-expression. Real JS (and a real-engine sandbox) let these values flow and rely on JSON serialization to turn them into null at the edge. - copyIn no longer rejects non-finite numbers, so NaN/Infinity exist as ordinary in-sandbox intermediates and defensive guards can run. - copyOut normalizes non-finite numbers to null as a value leaves the sandbox; final return and tool-call arguments both funnel through it, so one check pins both boundaries (matching JSON.stringify, which produces null anyway). - NaN/Infinity are now bindable identifiers (e.g. reduce(max, -Infinity)). Extends rune-parity.test.ts (guards run, non-finite -> null out incl. nested, a direct copyOut unit test) and updates rune.md.
fix(opencode): make Rune tolerate idiomatic defensive JavaScript
2026-07-01 12:26:55 -05:00 · 2026-07-01 12:20:54 -05:00 · 2026-07-01 11:36:37 -05:00 · 2026-07-01 11:02:01 -05:00 · 2026-07-01 10:54:42 -05:00 · 2026-06-30 22:34:23 -05:00
708 changed files with 17029 additions and 33338 deletions
@@ -35,37 +35,13 @@ jobs:
            const now = Date.now();
            const twoHours = 2 * 60 * 60 * 1000;
            const orgMemberAssociations = new Set(['OWNER', 'MEMBER']);
-            const agentLogin = 'opencode-agent[bot]';
-            const { data: file } = await github.rest.repos.getContent({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              path: '.github/TEAM_MEMBERS',
-              ref: 'dev',
-            });
-            const teamMembers = new Set(
-              Buffer.from(file.content, 'base64')
-                .toString()
-                .split('\n')
-                .map((line) => line.trim().toLowerCase())
-                .filter(Boolean)
-            );
-
-            function isExempt(item) {
-              const login = item.user?.login?.toLowerCase();
-              return (
-                login === agentLogin ||
-                orgMemberAssociations.has(item.author_association) ||
-                (login && teamMembers.has(login))
-              );
-            }

            for (const item of items) {
              const isPR = !!item.pull_request;
              const kind = isPR ? 'PR' : 'issue';
-              const login = item.user?.login;

-              if (isExempt(item)) {
-                core.info(`Skipping ${kind} #${item.number}; author ${login || 'unknown'} is exempt`);
+              if (orgMemberAssociations.has(item.author_association)) {
+                core.info(`Skipping ${kind} #${item.number}; author association is ${item.author_association}`);
                try {
                  await github.rest.issues.removeLabel({
                    owner: context.repo.owner,
@@ -17,31 +17,12 @@ jobs:
        with:
          fetch-depth: 1

-      - name: Check exempt issue author
-        id: author
-        run: |
-          LOGIN="${{ github.event.issue.user.login }}"
-          ASSOCIATION="${{ github.event.issue.author_association }}"
-
-          if [ "$LOGIN" = "opencode-agent[bot]" ] ||
-             [ "$ASSOCIATION" = "OWNER" ] ||
-             [ "$ASSOCIATION" = "MEMBER" ] ||
-             grep -qxiF "$LOGIN" .github/TEAM_MEMBERS; then
-            echo "skip=true" >> "$GITHUB_OUTPUT"
-            echo "Skipping issue automation for exempt author: $LOGIN ($ASSOCIATION)"
-          else
-            echo "skip=false" >> "$GITHUB_OUTPUT"
-          fi
-
      - uses: ./.github/actions/setup-bun
-        if: steps.author.outputs.skip != 'true'

      - name: Install opencode
-        if: steps.author.outputs.skip != 'true'
        run: curl -fsSL https://opencode.ai/install | bash

      - name: Check duplicates and compliance
-        if: steps.author.outputs.skip != 'true'
        env:
          OPENCODE_API_KEY: ${{ secrets.OPENCODE_API_KEY }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -151,31 +132,12 @@ jobs:
        with:
          fetch-depth: 1

-      - name: Check exempt issue author
-        id: author
-        run: |
-          LOGIN="${{ github.event.issue.user.login }}"
-          ASSOCIATION="${{ github.event.issue.author_association }}"
-
-          if [ "$LOGIN" = "opencode-agent[bot]" ] ||
-             [ "$ASSOCIATION" = "OWNER" ] ||
-             [ "$ASSOCIATION" = "MEMBER" ] ||
-             grep -qxiF "$LOGIN" .github/TEAM_MEMBERS; then
-            echo "skip=true" >> "$GITHUB_OUTPUT"
-            echo "Skipping issue automation for exempt author: $LOGIN ($ASSOCIATION)"
-          else
-            echo "skip=false" >> "$GITHUB_OUTPUT"
-          fi
-
      - uses: ./.github/actions/setup-bun
-        if: steps.author.outputs.skip != 'true'

      - name: Install opencode
-        if: steps.author.outputs.skip != 'true'
        run: curl -fsSL https://opencode.ai/install | bash

      - name: Recheck compliance
-        if: steps.author.outputs.skip != 'true'
        env:
          OPENCODE_API_KEY: ${{ secrets.OPENCODE_API_KEY }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -6,7 +6,6 @@ on:
    branches:
      - ci
      - dev
-      - v2
      - beta
      - fix/npm-native-binary-install
      - snapshot-*
@@ -32,9 +31,6 @@ permissions:
  contents: write
  packages: write

-env:
-  OPENCODE_CHANNEL: ${{ (github.ref_name == 'v2' && 'next') || '' }}
-
 jobs:
  version:
    runs-on: blacksmith-4vcpu-ubuntu-2404
@@ -126,7 +122,7 @@ jobs:
      - build-cli
      - version
    runs-on: blacksmith-4vcpu-windows-2025
-    if: github.repository == 'anomalyco/opencode' && github.ref_name != 'v2'
+    if: github.repository == 'anomalyco/opencode'
    env:
      AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
      AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
@@ -225,7 +221,7 @@ jobs:
    needs:
      - build-cli
      - version
-    if: github.repository == 'anomalyco/opencode' && github.ref_name != 'v2'
+    if: github.repository == 'anomalyco/opencode'
    continue-on-error: false
    env:
      AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
@@ -451,7 +447,6 @@ jobs:
          path: packages/opencode/dist

      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        if: github.ref_name != 'v2'
        with:
          name: opencode-cli-signed-windows
          path: packages/opencode/dist
@@ -4,7 +4,6 @@ on:
  push:
    branches:
      - dev
-      - v2
  pull_request:
  workflow_dispatch:

@@ -75,9 +74,13 @@ jobs:
        working-directory: packages/client
        run: bun run check:generated

+      - name: Run HttpApi exerciser gates
+        if: runner.os == 'Linux'
+        working-directory: packages/opencode
+        run: bun run test:httpapi
+
  e2e:
    name: e2e (${{ matrix.settings.name }})
-    if: github.ref_name != 'v2' && github.head_ref != 'v2'
    strategy:
      fail-fast: false
      matrix:
@@ -16,32 +16,13 @@ jobs:
        with:
          fetch-depth: 1

-      - name: Check exempt issue author
-        id: author
-        run: |
-          LOGIN="${{ github.event.issue.user.login }}"
-          ASSOCIATION="${{ github.event.issue.author_association }}"
-
-          if [ "$LOGIN" = "opencode-agent[bot]" ] ||
-             [ "$ASSOCIATION" = "OWNER" ] ||
-             [ "$ASSOCIATION" = "MEMBER" ] ||
-             grep -qxiF "$LOGIN" .github/TEAM_MEMBERS; then
-            echo "skip=true" >> "$GITHUB_OUTPUT"
-            echo "Skipping issue automation for exempt author: $LOGIN ($ASSOCIATION)"
-          else
-            echo "skip=false" >> "$GITHUB_OUTPUT"
-          fi
-
      - name: Setup Bun
-        if: steps.author.outputs.skip != 'true'
        uses: ./.github/actions/setup-bun

      - name: Install opencode
-        if: steps.author.outputs.skip != 'true'
        run: curl -fsSL https://opencode.ai/install | bash

      - name: Triage issue
-        if: steps.author.outputs.skip != 'true'
        env:
          OPENCODE_API_KEY: ${{ secrets.OPENCODE_API_KEY }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -1,16 +0,0 @@
-export default {
-  id: "sample-agent-plugin",
-  setup: async (ctx) => {
-    await ctx.agent.transform((agents) => {
-      agents.update("sample-plugin-agent", (agent) => {
-        agent.description = "Example primary agent registered by .opencode/plugins/sample-agent.ts"
-        agent.mode = "primary"
-        agent.system = [
-          "You are the sample plugin agent for this repository.",
-          "Use this agent to verify that local plugin auto-discovery can add agents.",
-          "Keep responses concise and explain which plugin registered you when asked.",
-        ].join("\n")
-      })
-    })
-  },
-}
@@ -1,144 +0,0 @@
---
-name: debug-opencode
-description: Use when interactively running, debugging, or verifying opencode's own V2 CLI/TUI or server during development in this repo — starting the dev TUI, driving it with termctrl, comparing V2 against the legacy TUI, hitting the V2 server/API directly, reading log files, or attaching Bun's inspector.
---
-
-# Debugging opencode itself
-
-Workflow for interactively exercising the V2 CLI/TUI and server while developing in this repo. All commands below run from `packages/cli` unless noted otherwise.
-
-## Migration context
-
- The TUI is being ported from legacy APIs to the new V2 APIs. New and migrated TUI behavior should use `sdk.client.v2` and the location-scoped data in `packages/tui/src/context/data.tsx` instead of adding dependencies on legacy sync state.
- Preserve established TUI behavior unless the task intentionally changes it. When behavior, copy, keyboard interaction, or layout is unclear, compare the local V2 TUI with the latest released legacy TUI (see "Comparing V2 against the legacy TUI" below) rather than guessing.
-
-## Server/client model
-
-opencode V2 is a client/server system, not a single monolithic process:
-
- **Server process** runs the Effect HTTP API (`packages/server`) and owns all domain state: sessions, database, plugins, permissions, Location services. It's started by the `serve` command (`packages/cli/src/commands/handlers/serve.ts`).
- **TUI process** is a separate process that runs no application logic itself — it's an HTTP/SSE client of the server via the generated SDK (`createOpencodeClient` / `sdk.client.v2`).
- **Discovery**: CLI processes find the shared server through a JSON registration file at `~/.local/state/opencode/service.json` (or `service-local.json` for the local/dev channel) containing `{id, version, url, pid}`. A separate password file under `~/.config/opencode/service.json` provides HTTP Basic auth. Before reusing a registration, the client calls `GET /health` to confirm the server is alive, authenticated, and version-compatible.
- **Sharing**: because of this registration/health-check dance, many concurrent `opencode`/TUI invocations converge on one shared background daemon rather than each spawning their own. If no compatible healthy daemon is found, a new one is spawned detached (`serve --service`) and registers itself.
- **`bun dev service start|status|stop|restart`** manages this shared background daemon's lifecycle directly — useful when you need to force a fresh server, confirm one is running, or kill a stuck one.
- **Standalone mode** (`--standalone`) opts a single invocation out of the shared daemon: it spawns a private one-off `serve --stdio --port 0` child tied to that invocation's lifetime, with its own random password. Use this to isolate a debugging session from your other running opencode sessions.
- Every log line is tagged `role=server` or `role=cli` and a per-process `run=<id>`, so you can distinguish server-side and client-side activity in one shared log file (see "Logs" below) even when both roles are interleaved from concurrent processes.
-
-## Starting the dev TUI
-
- This package is the V2 CLI adapter. Run its `dev` script when testing the TUI; do not use the repository-root `bun dev`, which launches the legacy `packages/opencode` CLI.
- Run commands from `packages/cli`. Use `bun dev` for most debugging so the TUI starts with a private V2 server.
-
-## Interactive debugging with termctrl
-
- Use `termctrl` for interactive checks instead of starting the TUI as a blocking foreground process. It provides a real PTY, handles OpenTUI's host handshake, and can save reviewable screenshots.
- Use a dedicated session name and do not reuse or kill an unrelated session.
-
-```bash
-termctrl start opencode-v2-dev --host opentui --cols 112 --rows 34 -- bun dev
-termctrl wait opencode-v2-dev "Ask anything" --timeout 20000
-termctrl show opencode-v2-dev
-```
-
- Wait for visible text before interacting instead of relying on fixed sleeps. Use the text expected from the screen under test, such as `Ask anything` or `Connect a provider`.
- Drive the running TUI with `termctrl send`. Prefix typed input with `text:` and send control keys separately so the interaction matches real terminal input.
-
-```bash
-termctrl send opencode-v2-dev 'text:example prompt' enter
-termctrl send opencode-v2-dev ctrl-c
-```
-
- Use `termctrl show` after each meaningful interaction and inspect the full visible screen for rendering errors, stale state, error toasts, and unexpected exits.
- Save PNG evidence for every user-visible bug and fix. Do not save text captures; inspect the rendered PNG. Write temporary captures outside the repository unless the artifact is intended to be committed.
-
-```bash
-termctrl save opencode-v2-dev --format png --out /tmp/opencode/v2-tui.png
-```
-
- For resize-sensitive changes, resize the viewport, wait for the expected content, and capture the screen again:
-
-```bash
-termctrl resize opencode-v2-dev --cols 100 --rows 30
-termctrl show opencode-v2-dev
-```
-
- Source changes may require restarting the process. Use `termctrl restart opencode-v2-dev` rather than assuming the running TUI reloaded the change.
- To exercise background-service behavior, use `bun dev service start`, `bun dev service status`, and `bun dev service stop`.
- Always clean up the Terminal Control session when the check is complete:
-
-```bash
-termctrl stop opencode-v2-dev
-```
-
-## Comparing V2 against the legacy TUI
-
-Run both versions in separate Terminal Control sessions and save PNG-only captures at equivalent states:
-
-```bash
-# From packages/cli: local V2 TUI
-termctrl start opencode-v2-dev --host opentui --cols 112 --rows 34 -- bun dev
-
-# Released legacy TUI behavior reference
-termctrl start opencode-legacy --host opentui --cols 112 --rows 34 -- bunx opencode-ai@latest
-
-termctrl save opencode-v2-dev --format png --out /tmp/opencode/v2.png
-termctrl save opencode-legacy --format png --out /tmp/opencode/legacy.png
-```
-
- Use the same viewport and send equivalent inputs to both sessions before comparing screenshots. The released CLI is a behavioral reference, not a source of V2 API design; keep the local implementation on V2 endpoints.
- Stop both sessions after comparison: `termctrl stop opencode-v2-dev` and `termctrl stop opencode-legacy`.
-
-## Server/API debugging
-
- Use `bun dev api --help` from `packages/cli` to inspect the API debugging command. It sends one request to the V2 server using the same daemon discovery/auth path as the CLI.
- Use `bun dev api` to introspect the server-side data backing the TUI. This is useful when debugging UI bugs: compare what the screen renders with the raw session, message, event, agent, or health data returned by the API to determine whether the bug is in the server state, the client data layer, or the TUI rendering.
- `bun dev api` accepts either an OpenAPI operation ID or a raw HTTP method plus path:
-
-```bash
-bun dev api get /health
-bun dev api get /openapi.json
-bun dev api <operationId> --param key=value
-```
-
- Pass JSON request bodies with `--data`/`-d`; the command sets `content-type: application/json` automatically unless you provide a header. Add extra headers with `--header`/`-H name:value`.
- If no compatible background server is registered, `bun dev api` starts one through the daemon service. Use `bun dev service status`, `bun dev service restart`, and `bun dev service stop` when you need explicit lifecycle control.
- Prefer raw method/path calls for quick server debugging and operation IDs when exercising documented OpenAPI routes with path or query parameters.
-
-## Logs
-
- Log files live under `~/.local/share/opencode/log/`. In a local/dev checkout the active file is `opencode-local.log`; `opencode.log` is used for non-local (released) channel installs. Both are append-only, shared across every CLI and server process on the machine.
- Each line is structured `key=value` text: `timestamp`, `level`, `run=<id>` (per-process run ID), `message`, and a `role=cli` or `role=server` tag. Use `run=` to isolate one process's activity and `role=` to separate client-side from server-side log lines, since a shared daemon interleaves many processes' output in one file.
- Tail the live file while reproducing an issue instead of guessing from stale output:
-
-```bash
-tail -f ~/.local/share/opencode/log/opencode-local.log
-```
-
- Filter to one run or role when the file is noisy:
-
-```bash
-grep 'run=8fc3b1d5' ~/.local/share/opencode/log/opencode-local.log
-grep 'role=server' ~/.local/share/opencode/log/opencode-local.log
-```
-
- `OPENCODE_LOG_LEVEL` controls verbosity (default `INFO`); set it before starting `bun dev` or `serve` to get `DEBUG` output for a specific repro.
- `OPENCODE_PRINT_LOGS=1` additionally tees log output to stderr of the process that emitted it, which is useful when a process fails before you'd think to check the shared log file.
- `termctrl logs <session>` surfaces stdout/stderr for a Terminal Control session specifically (e.g. inspector output or startup failures before the TUI renderer starts) — use the log file above for anything emitted by a separate server/daemon process instead.
-
-## Debugger
-
- To debug the V2 CLI or TUI with Bun's inspector, launch the CLI entrypoint through Terminal Control with an inspector URL, then attach a debugger to that URL:
-
-```bash
-termctrl start opencode-v2-debug --host opentui --cols 112 --rows 34 -- \
-  bun run --inspect=ws://localhost:6499/ src/index.ts
-```
-
- Use `--inspect-wait` or `--inspect-brk` when execution must pause until the debugger attaches.
- Use `termctrl logs opencode-v2-debug` for inspector output or startup failures emitted before the TUI renderer starts. Use `termctrl show` for the visible full-screen TUI.
-
-## Verification
-
- Run `bun typecheck` from `packages/cli` after CLI adapter changes.
- Run `bun typecheck` and `bun test` from `packages/tui` after shared TUI changes. Do not run tests from the repository root.
- Treat automated checks and Terminal Control smoke tests as complementary. For user-visible changes, verify initial render, the changed interaction, Ctrl-C exit behavior, and save a screenshot of the corrected state.
@@ -1,31 +0,0 @@
---
-name: sample-skill
-description: Use when the user says sample skill, skill demo, or asks how an opencode SKILL.md should be structured; demonstrates a tiny project-local skill with practical assistant workflow guidance.
---
-
-# Sample Skill
-
-This is a minimal project-local opencode skill. It exists as a reference for how a skill is structured and as a tiny reusable workflow the assistant can load when the user asks for a skill example.
-
-## When To Use
-
- Use when the user asks for a sample skill or skill template.
- Use when demonstrating the required `SKILL.md` frontmatter and body format.
- Do not use for unrelated coding tasks just because a skill exists.
-
-## Workflow
-
- Confirm the specific outcome the user wants if the request is ambiguous.
- Inspect the relevant files before changing anything.
- Make the smallest correct change.
- Verify the result with a focused read, typecheck, test, or other lightweight check when available.
- Summarize the changed files and any required restart or reload step.
-
-## Example Response Style
-
-When this skill is relevant, keep responses direct and actionable:
-
-```text
-I created a project-local skill at .opencode/skills/sample-skill/SKILL.md.
-Restart opencode for the new skill to be discovered by future sessions.
-```
@@ -1,7 +1,6 @@
 - To regenerate the legacy JavaScript SDK, run `./packages/sdk/js/script/build.ts`.
 - After changing the public Protocol or Server `HttpApi`, run `bun run generate` from `packages/client`. Do not edit `src/generated` or `src/generated-effect` directly.
 - Keep runtime dependencies directed from Schema to Core and Protocol, then from Core and Protocol to Server. Client runtime code may depend on Schema and Protocol but never Core or Server; `sdk-next` composes Client, Core, and Server.
- Do not modify `packages/opencode` unless the user explicitly asks for V1 work. `packages/opencode` is the V1 implementation and is present for reference only. New implementation changes should land in the V2 package set: `packages/core`, `packages/cli`, `packages/server`, `packages/protocol`, `packages/schema`, and related generated client surfaces when required.
 - The default branch in this repo is `dev`.
 - Local `main` ref may not exist; use `dev` or `origin/dev` for diffs.

@@ -29,7 +29,7 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@dnd-kit/abstract": "0.5.0",
        "@dnd-kit/dom": "0.5.0",
@@ -92,13 +92,12 @@
    },
    "packages/cli": {
      "name": "@opencode-ai/cli",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "bin": {
-        "opencode2": "./bin/opencode2.cjs",
+        "lildax": "./bin/lildax.cjs",
      },
      "dependencies": {
        "@effect/platform-node": "catalog:",
-        "@opencode-ai/client": "workspace:*",
        "@opencode-ai/core": "workspace:*",
        "@opencode-ai/sdk": "workspace:*",
        "@opencode-ai/server": "workspace:*",
@@ -107,15 +106,12 @@
        "@opentui/solid": "catalog:",
        "@parcel/watcher": "2.5.1",
        "effect": "catalog:",
-        "jsonc-parser": "3.3.1",
-        "semver": "catalog:",
        "solid-js": "catalog:",
      },
      "devDependencies": {
        "@opencode-ai/script": "workspace:*",
        "@tsconfig/bun": "catalog:",
        "@types/bun": "catalog:",
-        "@types/semver": "catalog:",
        "@typescript/native-preview": "catalog:",
      },
    },
@@ -144,7 +140,7 @@
    },
    "packages/console/app": {
      "name": "@opencode-ai/console-app",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -180,7 +176,7 @@
    },
    "packages/console/core": {
      "name": "@opencode-ai/console-core",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -207,7 +203,7 @@
    },
    "packages/console/function": {
      "name": "@opencode-ai/console-function",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@ai-sdk/anthropic": "3.0.82",
        "@ai-sdk/openai": "3.0.48",
@@ -229,7 +225,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode-ai/console-mail",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -253,7 +249,7 @@
    },
    "packages/console/support": {
      "name": "@opencode-ai/console-support",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@opencode-ai/console-core": "workspace:*",
@@ -273,7 +269,7 @@
    },
    "packages/core": {
      "name": "@opencode-ai/core",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -304,7 +300,6 @@
        "@effect/sql-sqlite-bun": "catalog:",
        "@ff-labs/fff-bun": "0.9.4",
        "@lydell/node-pty": "catalog:",
-        "@modelcontextprotocol/sdk": "1.29.0",
        "@npmcli/arborist": "9.4.0",
        "@npmcli/config": "10.8.1",
        "@opencode-ai/effect-drizzle-sqlite": "workspace:*",
@@ -326,7 +321,7 @@
        "drizzle-orm": "catalog:",
        "effect": "catalog:",
        "fuzzysort": "3.1.0",
-        "gitlab-ai-provider": "6.10.0",
+        "gitlab-ai-provider": "6.9.3",
        "glob": "13.0.5",
        "google-auth-library": "10.5.0",
        "gray-matter": "4.0.3",
@@ -339,7 +334,7 @@
        "npm-package-arg": "13.0.2",
        "semver": "^7.6.3",
        "turndown": "7.2.0",
-        "venice-ai-sdk-provider": "2.1.1",
+        "venice-ai-sdk-provider": "2.0.2",
        "which": "6.0.1",
        "xdg-basedir": "5.1.0",
        "zod": "catalog:",
@@ -368,7 +363,7 @@
    },
    "packages/desktop": {
      "name": "@opencode-ai/desktop",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@zip.js/zip.js": "2.7.62",
        "effect": "catalog:",
@@ -422,7 +417,7 @@
    },
    "packages/effect-drizzle-sqlite": {
      "name": "@opencode-ai/effect-drizzle-sqlite",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "drizzle-orm": "catalog:",
        "effect": "catalog:",
@@ -436,7 +431,7 @@
    },
    "packages/effect-sqlite-node": {
      "name": "@opencode-ai/effect-sqlite-node",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "effect": "catalog:",
      },
@@ -448,7 +443,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode-ai/enterprise",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@hono/standard-validator": "catalog:",
        "@opencode-ai/core": "workspace:*",
@@ -480,7 +475,7 @@
    },
    "packages/function": {
      "name": "@opencode-ai/function",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -496,7 +491,7 @@
    },
    "packages/http-recorder": {
      "name": "@opencode-ai/http-recorder",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@effect/platform-node": "4.0.0-beta.83",
        "@effect/platform-node-shared": "4.0.0-beta.83",
@@ -527,7 +522,7 @@
    },
    "packages/llm": {
      "name": "@opencode-ai/llm",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@opencode-ai/schema": "workspace:*",
        "@smithy/eventstream-codec": "4.2.14",
@@ -546,7 +541,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -583,7 +578,6 @@
        "@octokit/graphql": "9.0.2",
        "@octokit/rest": "catalog:",
        "@openauthjs/openauth": "catalog:",
-        "@opencode-ai/client": "workspace:*",
        "@opencode-ai/llm": "workspace:*",
        "@opencode-ai/plugin": "workspace:*",
        "@opencode-ai/protocol": "workspace:*",
@@ -609,6 +603,7 @@
        "@standard-schema/spec": "1.0.0",
        "@types/ws": "8.18.1",
        "@zip.js/zip.js": "2.7.62",
+        "acorn": "8.15.0",
        "ai": "catalog:",
        "ai-gateway-provider": "3.1.2",
        "bonjour-service": "1.3.0",
@@ -619,7 +614,7 @@
        "drizzle-orm": "catalog:",
        "effect": "catalog:",
        "fuzzysort": "3.1.0",
-        "gitlab-ai-provider": "6.10.0",
+        "gitlab-ai-provider": "6.9.3",
        "glob": "13.0.5",
        "google-auth-library": "10.5.0",
        "gray-matter": "4.0.3",
@@ -642,8 +637,9 @@
        "tree-sitter-bash": "0.25.0",
        "tree-sitter-powershell": "0.25.10",
        "turndown": "7.2.0",
+        "typescript": "catalog:",
        "ulid": "catalog:",
-        "venice-ai-sdk-provider": "2.1.1",
+        "venice-ai-sdk-provider": "2.0.2",
        "vscode-jsonrpc": "8.2.1",
        "web-tree-sitter": "0.25.10",
        "ws": "8.21.0",
@@ -670,19 +666,15 @@
        "@typescript/native-preview": "catalog:",
        "drizzle-orm": "catalog:",
        "prettier": "3.6.2",
-        "typescript": "catalog:",
        "vscode-languageserver-types": "3.17.5",
        "why-is-node-running": "3.2.2",
      },
    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@ai-sdk/provider": "3.0.8",
-        "@opencode-ai/llm": "workspace:*",
-        "@opencode-ai/protocol": "workspace:*",
-        "@opencode-ai/schema": "workspace:*",
        "@opencode-ai/sdk": "workspace:*",
        "effect": "catalog:",
        "zod": "catalog:",
@@ -691,7 +683,6 @@
        "@opentui/core": "catalog:",
        "@opentui/keymap": "catalog:",
        "@opentui/solid": "catalog:",
-        "@tsconfig/bun": "catalog:",
        "@tsconfig/node22": "catalog:",
        "@types/node": "catalog:",
        "@typescript/native-preview": "catalog:",
@@ -710,7 +701,6 @@
    },
    "packages/protocol": {
      "name": "@opencode-ai/protocol",
-      "version": "1.17.11",
      "dependencies": {
        "@opencode-ai/schema": "workspace:*",
        "effect": "catalog:",
@@ -719,12 +709,10 @@
        "@tsconfig/bun": "catalog:",
        "@types/bun": "catalog:",
        "@typescript/native-preview": "catalog:",
-        "typescript": "catalog:",
      },
    },
    "packages/schema": {
      "name": "@opencode-ai/schema",
-      "version": "1.17.11",
      "dependencies": {
        "effect": "catalog:",
      },
@@ -732,7 +720,6 @@
        "@tsconfig/bun": "catalog:",
        "@types/bun": "catalog:",
        "@typescript/native-preview": "catalog:",
-        "typescript": "catalog:",
      },
    },
    "packages/script": {
@@ -750,7 +737,6 @@
      "dependencies": {
        "@opencode-ai/client": "workspace:*",
        "@opencode-ai/core": "workspace:*",
-        "@opencode-ai/plugin": "workspace:*",
        "@opencode-ai/server": "workspace:*",
        "effect": "catalog:",
      },
@@ -762,7 +748,7 @@
    },
    "packages/sdk/js": {
      "name": "@opencode-ai/sdk",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "cross-spawn": "catalog:",
      },
@@ -777,7 +763,7 @@
    },
    "packages/server": {
      "name": "@opencode-ai/server",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@opencode-ai/core": "workspace:*",
        "@opencode-ai/protocol": "workspace:*",
@@ -792,7 +778,7 @@
    },
    "packages/session-ui": {
      "name": "@opencode-ai/session-ui",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/core": "workspace:*",
@@ -836,7 +822,7 @@
    },
    "packages/slack": {
      "name": "@opencode-ai/slack",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "@slack/bolt": "^3.17.1",
@@ -849,7 +835,7 @@
    },
    "packages/stats/app": {
      "name": "@opencode-ai/stats-app",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@ibm/plex": "6.4.1",
        "@opencode-ai/stats-core": "workspace:*",
@@ -882,7 +868,7 @@
    },
    "packages/stats/core": {
      "name": "@opencode-ai/stats-core",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@aws-sdk/client-athena": "3.933.0",
        "@planetscale/database": "1.19.0",
@@ -901,7 +887,7 @@
    },
    "packages/stats/server": {
      "name": "@opencode-ai/stats-server",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@aws-sdk/client-firehose": "3.933.0",
        "@effect/platform-node": "catalog:",
@@ -942,9 +928,8 @@
    },
    "packages/tui": {
      "name": "@opencode-ai/tui",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
-        "@opencode-ai/client": "workspace:*",
        "@opencode-ai/core": "workspace:*",
        "@opencode-ai/plugin": "workspace:*",
        "@opencode-ai/sdk": "workspace:*",
@@ -952,7 +937,6 @@
        "@opentui/core": "catalog:",
        "@opentui/keymap": "catalog:",
        "@opentui/solid": "catalog:",
-        "@solid-primitives/event-bus": "1.1.2",
        "clipboardy": "4.0.0",
        "diff": "catalog:",
        "effect": "catalog:",
@@ -971,7 +955,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@pierre/diffs": "catalog:",
@@ -1022,7 +1006,7 @@
    },
    "packages/web": {
      "name": "@opencode-ai/web",
-      "version": "1.17.13",
+      "version": "1.17.11",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -3024,9 +3008,9 @@

    "abstract-logging": ["abstract-logging@2.0.1", "", {}, "sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA=="],

-    "accepts": ["accepts@2.0.0", "", { "dependencies": { "mime-types": "^3.0.0", "negotiator": "^1.0.0" } }, "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng=="],
+    "accepts": ["accepts@1.3.8", "", { "dependencies": { "mime-types": "~2.1.34", "negotiator": "0.6.3" } }, "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="],

-    "acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+    "acorn": ["acorn@8.15.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="],

    "acorn-jsx": ["acorn-jsx@5.3.2", "", { "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="],

@@ -3194,7 +3178,7 @@

    "bluebird": ["bluebird@3.7.2", "", {}, "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="],

-    "body-parser": ["body-parser@2.2.2", "", { "dependencies": { "bytes": "^3.1.2", "content-type": "^1.0.5", "debug": "^4.4.3", "http-errors": "^2.0.0", "iconv-lite": "^0.7.0", "on-finished": "^2.4.1", "qs": "^6.14.1", "raw-body": "^3.0.1", "type-is": "^2.0.1" } }, "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA=="],
+    "body-parser": ["body-parser@1.20.5", "", { "dependencies": { "bytes": "~3.1.2", "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "~1.2.0", "http-errors": "~2.0.1", "iconv-lite": "~0.4.24", "on-finished": "~2.4.1", "qs": "~6.15.1", "raw-body": "~2.5.3", "type-is": "~1.6.18", "unpipe": "~1.0.0" } }, "sha512-3grm+/2tUOvu2cjJkvsIxrv/wVpfXQW4PsQHYm7yk4vfpu7Ekl6nEsYBoJUL6qDwZUx8wUhQ8tR2qz+ad9c9OA=="],

    "bonjour-service": ["bonjour-service@1.3.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "multicast-dns": "^7.2.5" } }, "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA=="],

@@ -3362,7 +3346,7 @@

    "consola": ["consola@3.4.2", "", {}, "sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA=="],

-    "content-disposition": ["content-disposition@1.1.0", "", {}, "sha512-5jRCH9Z/+DRP7rkvY83B+yGIGX96OYdJmzngqnw2SBSxqCFPd0w2km3s5iawpGX8krnwSGmF0FW5Nhr0Hfai3g=="],
+    "content-disposition": ["content-disposition@0.5.4", "", { "dependencies": { "safe-buffer": "5.2.1" } }, "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="],

    "content-type": ["content-type@1.0.5", "", {}, "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="],

@@ -3372,7 +3356,7 @@

    "cookie-es": ["cookie-es@2.0.1", "", {}, "sha512-aVf4A4hI2w70LnF7GG+7xDQUkliwiXWXFvTjkip4+b64ygDQ2sJPRSKFDHbxn8o0xu9QzPkMuuiWIXyFSE2slA=="],

-    "cookie-signature": ["cookie-signature@1.2.2", "", {}, "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg=="],
+    "cookie-signature": ["cookie-signature@1.0.7", "", {}, "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA=="],

    "core-util-is": ["core-util-is@1.0.3", "", {}, "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="],

@@ -3680,7 +3664,7 @@

    "exponential-backoff": ["exponential-backoff@3.1.3", "", {}, "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA=="],

-    "express": ["express@5.2.1", "", { "dependencies": { "accepts": "^2.0.0", "body-parser": "^2.2.1", "content-disposition": "^1.0.0", "content-type": "^1.0.5", "cookie": "^0.7.1", "cookie-signature": "^1.2.1", "debug": "^4.4.0", "depd": "^2.0.0", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "finalhandler": "^2.1.0", "fresh": "^2.0.0", "http-errors": "^2.0.0", "merge-descriptors": "^2.0.0", "mime-types": "^3.0.0", "on-finished": "^2.4.1", "once": "^1.4.0", "parseurl": "^1.3.3", "proxy-addr": "^2.0.7", "qs": "^6.14.0", "range-parser": "^1.2.1", "router": "^2.2.0", "send": "^1.1.0", "serve-static": "^2.2.0", "statuses": "^2.0.1", "type-is": "^2.0.1", "vary": "^1.1.2" } }, "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw=="],
+    "express": ["express@4.22.2", "", { "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "~1.20.5", "content-disposition": "~0.5.4", "content-type": "~1.0.4", "cookie": "~0.7.1", "cookie-signature": "~1.0.6", "debug": "2.6.9", "depd": "2.0.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "finalhandler": "~1.3.1", "fresh": "~0.5.2", "http-errors": "~2.0.0", "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "~2.4.1", "parseurl": "~1.3.3", "path-to-regexp": "~0.1.12", "proxy-addr": "~2.0.7", "qs": "~6.15.1", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", "send": "~0.19.0", "serve-static": "~1.16.2", "setprototypeof": "1.2.0", "statuses": "~2.0.1", "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" } }, "sha512-IuL+Elrou2ZvCFHs18/CIzy2Nzvo25nZ1/D2eIZlz7c+QUayAcYoiM2BthCjs+EBHVpjYjcuLDAiCWgeIX3X1Q=="],

    "express-rate-limit": ["express-rate-limit@8.5.2", "", { "dependencies": { "ip-address": "^10.2.0" }, "peerDependencies": { "express": ">= 4.11" } }, "sha512-5Kb34ipNX694DH48vN9irak1Qx30nb0PLYHXfJgw4YEjiC3ZEmZJhwOp+VfiCYwFzvFTdB9QkArYS5kXa2cx2A=="],

@@ -3738,7 +3722,7 @@

    "fill-range": ["fill-range@7.1.1", "", { "dependencies": { "to-regex-range": "^5.0.1" } }, "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg=="],

-    "finalhandler": ["finalhandler@2.1.1", "", { "dependencies": { "debug": "^4.4.0", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "on-finished": "^2.4.1", "parseurl": "^1.3.3", "statuses": "^2.0.1" } }, "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA=="],
+    "finalhandler": ["finalhandler@1.3.2", "", { "dependencies": { "debug": "2.6.9", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "~2.4.1", "parseurl": "~1.3.3", "statuses": "~2.0.2", "unpipe": "~1.0.0" } }, "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg=="],

    "find-babel-config": ["find-babel-config@2.1.2", "", { "dependencies": { "json5": "^2.2.3" } }, "sha512-ZfZp1rQyp4gyuxqt1ZqjFGVeVBvmpURMqdIWXbPRfB97Bf6BzdK/xSIbylEINzQ0kB5tlDQfn9HkNXXWsqTqLg=="],

@@ -3776,7 +3760,7 @@

    "framer-motion": ["framer-motion@8.5.5", "", { "dependencies": { "@motionone/dom": "^10.15.3", "hey-listen": "^1.0.8", "tslib": "^2.4.0" }, "optionalDependencies": { "@emotion/is-prop-valid": "^0.8.2" }, "peerDependencies": { "react": "^18.0.0", "react-dom": "^18.0.0" } }, "sha512-5IDx5bxkjWHWUF3CVJoSyUVOtrbAxtzYBBowRE2uYI/6VYhkEBD+rbTHEGuUmbGHRj6YqqSfoG7Aa1cLyWCrBA=="],

-    "fresh": ["fresh@2.0.0", "", {}, "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A=="],
+    "fresh": ["fresh@0.5.2", "", {}, "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="],

    "fs-extra": ["fs-extra@10.1.0", "", { "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="],

@@ -3828,7 +3812,7 @@

    "github-slugger": ["github-slugger@2.0.0", "", {}, "sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw=="],

-    "gitlab-ai-provider": ["gitlab-ai-provider@6.10.0", "", { "dependencies": { "@anthropic-ai/sdk": "^0.71.0", "@anycable/core": "^0.9.2", "graphql-request": "^6.1.0", "isomorphic-ws": "^5.0.0", "openai": "^6.16.0", "socket.io-client": "^4.8.1", "vscode-jsonrpc": "^8.2.1", "zod": "^3.25.76" }, "peerDependencies": { "@ai-sdk/provider": ">=3.0.0", "@ai-sdk/provider-utils": ">=4.0.0" } }, "sha512-oWEZ06rDO6JjB7INHO882wyBAQqCZVHiDHwCs5M+VPmdDj8TzhGXcYesA2CcV5RoI5lfHLKwGp5uKFB62VWpqw=="],
+    "gitlab-ai-provider": ["gitlab-ai-provider@6.9.3", "", { "dependencies": { "@anthropic-ai/sdk": "^0.71.0", "@anycable/core": "^0.9.2", "graphql-request": "^6.1.0", "isomorphic-ws": "^5.0.0", "openai": "^6.16.0", "socket.io-client": "^4.8.1", "vscode-jsonrpc": "^8.2.1", "zod": "^3.25.76" }, "peerDependencies": { "@ai-sdk/provider": ">=3.0.0", "@ai-sdk/provider-utils": ">=4.0.0" } }, "sha512-lWo6b6es5+k9iXaDIvE9ECzyK4zfEza4+dQ5FN8SJpEuVRi3ZBCpHIOTa32QoYEDCBaiPh+tcyca86PfNodmlg=="],

    "glob": ["glob@13.0.5", "", { "dependencies": { "minimatch": "^10.2.1", "minipass": "^7.1.2", "path-scurry": "^2.0.0" } }, "sha512-BzXxZg24Ibra1pbQ/zE7Kys4Ua1ks7Bn6pKLkVPZ9FZe4JQS6/Q7ef3LG1H+k7lUf5l4T3PLSyYyYJVYUvfgTw=="],

@@ -4340,11 +4324,11 @@

    "mdn-data": ["mdn-data@2.27.1", "", {}, "sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ=="],

-    "media-typer": ["media-typer@1.1.0", "", {}, "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw=="],
+    "media-typer": ["media-typer@0.3.0", "", {}, "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="],

    "merge-anything": ["merge-anything@5.1.7", "", { "dependencies": { "is-what": "^4.1.8" } }, "sha512-eRtbOb1N5iyH0tkQDAoQ4Ipsp/5qSR79Dzrz8hEPxRX10RWWR/iQXdoKmBSRCThY1Fh5EhISDtpSc93fpxUniQ=="],

-    "merge-descriptors": ["merge-descriptors@2.0.0", "", {}, "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g=="],
+    "merge-descriptors": ["merge-descriptors@1.0.3", "", {}, "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ=="],

    "merge-stream": ["merge-stream@2.0.0", "", {}, "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="],

@@ -4830,7 +4814,7 @@

    "range-parser": ["range-parser@1.2.1", "", {}, "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="],

-    "raw-body": ["raw-body@3.0.2", "", { "dependencies": { "bytes": "~3.1.2", "http-errors": "~2.0.1", "iconv-lite": "~0.7.0", "unpipe": "~1.0.0" } }, "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA=="],
+    "raw-body": ["raw-body@2.5.3", "", { "dependencies": { "bytes": "~3.1.2", "http-errors": "~2.0.1", "iconv-lite": "~0.4.24", "unpipe": "~1.0.0" } }, "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA=="],

    "rc9": ["rc9@2.1.2", "", { "dependencies": { "defu": "^6.1.4", "destr": "^2.0.3" } }, "sha512-btXCnMmRIBINM2LDZoEmOogIZU7Qe7zn4BpomSKZ/ykbLObuBdvG+mFq11DL6fjH1DRwHhrlgtYWG96bJiC7Cg=="],

@@ -5016,7 +5000,7 @@

    "semver-compare": ["semver-compare@1.0.0", "", {}, "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow=="],

-    "send": ["send@1.2.1", "", { "dependencies": { "debug": "^4.4.3", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "fresh": "^2.0.0", "http-errors": "^2.0.1", "mime-types": "^3.0.2", "ms": "^2.1.3", "on-finished": "^2.4.1", "range-parser": "^1.2.1", "statuses": "^2.0.2" } }, "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ=="],
+    "send": ["send@0.19.2", "", { "dependencies": { "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "~0.5.2", "http-errors": "~2.0.1", "mime": "1.6.0", "ms": "2.1.3", "on-finished": "~2.4.1", "range-parser": "~1.2.1", "statuses": "~2.0.2" } }, "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg=="],

    "seq-queue": ["seq-queue@0.0.5", "", {}, "sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q=="],

@@ -5026,7 +5010,7 @@

    "seroval-plugins": ["seroval-plugins@1.3.3", "", { "peerDependencies": { "seroval": "^1.0" } }, "sha512-16OL3NnUBw8JG1jBLUoZJsLnQq0n5Ua6aHalhJK4fMQkz1lqR7Osz1sA30trBtd9VUDc2NgkuRCn8+/pBwqZ+w=="],

-    "serve-static": ["serve-static@2.2.1", "", { "dependencies": { "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "parseurl": "^1.3.3", "send": "^1.2.0" } }, "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw=="],
+    "serve-static": ["serve-static@1.16.3", "", { "dependencies": { "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", "send": "~0.19.1" } }, "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA=="],

    "set-cookie-parser": ["set-cookie-parser@2.7.2", "", {}, "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw=="],

@@ -5342,7 +5326,7 @@

    "type-fest": ["type-fest@4.41.0", "", {}, "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA=="],

-    "type-is": ["type-is@2.1.0", "", { "dependencies": { "content-type": "^2.0.0", "media-typer": "^1.1.0", "mime-types": "^3.0.0" } }, "sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA=="],
+    "type-is": ["type-is@1.6.18", "", { "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" } }, "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="],

    "typed-array-buffer": ["typed-array-buffer@1.0.3", "", { "dependencies": { "call-bound": "^1.0.3", "es-errors": "^1.3.0", "is-typed-array": "^1.1.14" } }, "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw=="],

@@ -5446,7 +5430,7 @@

    "vary": ["vary@1.1.2", "", {}, "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="],

-    "venice-ai-sdk-provider": ["venice-ai-sdk-provider@2.1.1", "", { "dependencies": { "@ai-sdk/openai-compatible": "^2.0.51", "@ai-sdk/provider": "^3.0.10", "@ai-sdk/provider-utils": "^4.0.30" }, "peerDependencies": { "ai": "^6.0.90" } }, "sha512-w3OHkuzzKZ3r2TOxER6myBYzZJNoDqol+DUHu3NnfBN/GETnUVxecZJab0CHQQ8GZc0jjzpFymepjcLDPS4SQg=="],
+    "venice-ai-sdk-provider": ["venice-ai-sdk-provider@2.0.2", "", { "dependencies": { "@ai-sdk/openai-compatible": "^2.0.47", "@ai-sdk/provider": "^3.0.10", "@ai-sdk/provider-utils": "^4.0.27" }, "peerDependencies": { "ai": "^6.0.90" } }, "sha512-aoa05nI3BTK5aGbjBflq+Gfln2AHAkwNbWuGGvCzUIsOfp5Y3iPD4O4PUGDAEiWVJWbjpPn0KfDa0H/HebwsaA=="],

    "verror": ["verror@1.10.1", "", { "dependencies": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", "extsprintf": "^1.2.0" } }, "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg=="],

@@ -5708,6 +5692,8 @@

    "@astrojs/mdx/@astrojs/markdown-remark": ["@astrojs/markdown-remark@6.3.11", "", { "dependencies": { "@astrojs/internal-helpers": "0.7.6", "@astrojs/prism": "3.3.0", "github-slugger": "^2.0.0", "hast-util-from-html": "^2.0.3", "hast-util-to-text": "^4.0.2", "import-meta-resolve": "^4.2.0", "js-yaml": "^4.1.1", "mdast-util-definitions": "^6.0.0", "rehype-raw": "^7.0.0", "rehype-stringify": "^10.0.1", "remark-gfm": "^4.0.1", "remark-parse": "^11.0.0", "remark-rehype": "^11.1.2", "remark-smartypants": "^3.0.2", "shiki": "^3.21.0", "smol-toml": "^1.6.0", "unified": "^11.0.5", "unist-util-remove-position": "^5.0.0", "unist-util-visit": "^5.0.0", "unist-util-visit-parents": "^6.0.2", "vfile": "^6.0.3" } }, "sha512-hcaxX/5aC6lQgHeGh1i+aauvSwIT6cfyFjKWvExYSxUhZZBBdvCliOtu06gbQyhbe0pGJNoNmqNlQZ5zYUuIyQ=="],

+    "@astrojs/mdx/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+
    "@astrojs/mdx/source-map": ["source-map@0.7.6", "", {}, "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ=="],

    "@astrojs/sitemap/zod": ["zod@4.4.3", "", {}, "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ=="],
@@ -5918,12 +5904,18 @@

    "@malept/flatpak-bundler/fs-extra": ["fs-extra@9.1.0", "", { "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="],

+    "@mdx-js/mdx/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+
    "@mdx-js/mdx/source-map": ["source-map@0.7.6", "", {}, "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ=="],

+    "@modelcontextprotocol/sdk/express": ["express@5.2.1", "", { "dependencies": { "accepts": "^2.0.0", "body-parser": "^2.2.1", "content-disposition": "^1.0.0", "content-type": "^1.0.5", "cookie": "^0.7.1", "cookie-signature": "^1.2.1", "debug": "^4.4.0", "depd": "^2.0.0", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "finalhandler": "^2.1.0", "fresh": "^2.0.0", "http-errors": "^2.0.0", "merge-descriptors": "^2.0.0", "mime-types": "^3.0.0", "on-finished": "^2.4.1", "once": "^1.4.0", "parseurl": "^1.3.3", "proxy-addr": "^2.0.7", "qs": "^6.14.0", "range-parser": "^1.2.1", "router": "^2.2.0", "send": "^1.1.0", "serve-static": "^2.2.0", "statuses": "^2.0.1", "type-is": "^2.0.1", "vary": "^1.1.2" } }, "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw=="],
+
    "@modelcontextprotocol/sdk/hono": ["hono@4.12.23", "", {}, "sha512-eIaZ9qDgu7XV0pxOCrg7/WhnQ6Ivm22UcxhXx/A3dcbqbbYgBEkc6e/J/s7j2tS96zoB0S9VBdLwQNCWwUo4LA=="],

    "@modelcontextprotocol/sdk/jose": ["jose@6.2.3", "", {}, "sha512-YYVDInQKFJfR/xa3ojUTl8c2KoTwiL1R5Wg9YCydwH0x0B9grbzlg5HC7mMjCtUJjbQ/YnGEZIhI5tCgfTb4Hw=="],

+    "@modelcontextprotocol/sdk/raw-body": ["raw-body@3.0.2", "", { "dependencies": { "bytes": "~3.1.2", "http-errors": "~2.0.1", "iconv-lite": "~0.7.0", "unpipe": "~1.0.0" } }, "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA=="],
+
    "@modelcontextprotocol/sdk/zod": ["zod@4.4.3", "", {}, "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ=="],

    "@npmcli/config/ini": ["ini@6.0.0", "", {}, "sha512-IBTdIkzZNOpqm7q3dRqJvMaldXjDHWkEDfrwGEQTs5eaQMWV+djAhR+wahyNNMAa+qpbDUhBMVt4ZKNwpPm7xQ=="],
@@ -5992,14 +5984,10 @@

    "@openauthjs/openauth/jose": ["jose@5.9.6", "", {}, "sha512-AMlnetc9+CV9asI19zHmrgS/WYsWUwCn2R7RzlbJWD7F9eWYUTGyBmU9o6PxngtLGOiDGPRu+Uc4fhKzbpteZQ=="],

-    "@opencode-ai/cli/semver": ["semver@7.7.4", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA=="],
-
    "@opencode-ai/core/@ai-sdk/openai": ["@ai-sdk/openai@3.0.53", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-Wld+Rbc05KaUn08uBt06eEuwcgalcIFtIl32Yp+GxuZXUQwOb6YeAuq+C6da4ch6BurFoqEaLemJVwjBb7x+PQ=="],

    "@opencode-ai/core/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.41", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-kNAGINk71AlOXx10Dq/PXw4t/9XjdK8uxfpVElRwtSFMdeSiLVt58p9TPx4/FJD+hxZuVhvxYj9r42osxWq79g=="],

-    "@opencode-ai/core/semver": ["semver@7.8.5", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA=="],
-
    "@opencode-ai/desktop/@actions/artifact": ["@actions/artifact@4.0.0", "", { "dependencies": { "@actions/core": "^1.10.0", "@actions/github": "^6.0.1", "@actions/http-client": "^2.1.0", "@azure/core-http": "^3.0.5", "@azure/storage-blob": "^12.15.0", "@octokit/core": "^5.2.1", "@octokit/plugin-request-log": "^1.0.4", "@octokit/plugin-retry": "^3.0.9", "@octokit/request": "^8.4.1", "@octokit/request-error": "^5.1.1", "@protobuf-ts/plugin": "^2.2.3-alpha.1", "archiver": "^7.0.1", "jwt-decode": "^3.1.2", "unzip-stream": "^0.3.1" } }, "sha512-HCc2jMJRAfviGFAh0FsOR/jNfWhirxl7W6z8zDtttt0GltwxBLdEIjLiweOPFl9WbyJRW1VWnPUSAixJqcWUMQ=="],

    "@opencode-ai/desktop/marked": ["marked@15.0.12", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA=="],
@@ -6010,8 +5998,6 @@

    "@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/script/semver": ["semver@7.8.5", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA=="],
-
    "@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=="],
@@ -6060,12 +6046,8 @@

    "@shikijs/themes/@shikijs/types": ["@shikijs/types@4.2.0", "", { "dependencies": { "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-VT/MKtlpOhEPZloSH3Pb9WCZEBDoQVMa9jedp5UAwmJOar1DVc9DRODAxmYPW9M93IK4ryuqRejFfmlvlVDemw=="],

-    "@slack/bolt/express": ["express@4.22.2", "", { "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "~1.20.5", "content-disposition": "~0.5.4", "content-type": "~1.0.4", "cookie": "~0.7.1", "cookie-signature": "~1.0.6", "debug": "2.6.9", "depd": "2.0.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "finalhandler": "~1.3.1", "fresh": "~0.5.2", "http-errors": "~2.0.0", "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "~2.4.1", "parseurl": "~1.3.3", "path-to-regexp": "~0.1.12", "proxy-addr": "~2.0.7", "qs": "~6.15.1", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", "send": "~0.19.0", "serve-static": "~1.16.2", "setprototypeof": "1.2.0", "statuses": "~2.0.1", "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" } }, "sha512-IuL+Elrou2ZvCFHs18/CIzy2Nzvo25nZ1/D2eIZlz7c+QUayAcYoiM2BthCjs+EBHVpjYjcuLDAiCWgeIX3X1Q=="],
-
    "@slack/bolt/path-to-regexp": ["path-to-regexp@8.4.2", "", {}, "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA=="],

-    "@slack/bolt/raw-body": ["raw-body@2.5.3", "", { "dependencies": { "bytes": "~3.1.2", "http-errors": "~2.0.1", "iconv-lite": "~0.4.24", "unpipe": "~1.0.0" } }, "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA=="],
-
    "@slack/oauth/@slack/logger": ["@slack/logger@3.0.0", "", { "dependencies": { "@types/node": ">=12.0.0" } }, "sha512-DTuBFbqu4gGfajREEMrkq5jBhcnskinhr4+AnfJEk48zhVeEv3XnUKGIX98B74kxhYsIMfApGGySTn7V3b5yBA=="],

    "@slack/socket-mode/@slack/logger": ["@slack/logger@3.0.0", "", { "dependencies": { "@types/node": ">=12.0.0" } }, "sha512-DTuBFbqu4gGfajREEMrkq5jBhcnskinhr4+AnfJEk48zhVeEv3XnUKGIX98B74kxhYsIMfApGGySTn7V3b5yBA=="],
@@ -6132,6 +6114,10 @@

    "@vscode/emmet-helper/jsonc-parser": ["jsonc-parser@2.3.1", "", {}, "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="],

+    "accepts/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],
+
+    "accepts/negotiator": ["negotiator@0.6.3", "", {}, "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="],
+
    "ai-gateway-provider/@ai-sdk/amazon-bedrock": ["@ai-sdk/amazon-bedrock@4.0.107", "", { "dependencies": { "@ai-sdk/anthropic": "3.0.78", "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27", "@smithy/eventstream-codec": "^4.0.1", "@smithy/util-utf8": "^4.0.0", "aws4fetch": "^1.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-8nT08pGPy25rleJNk56ep00UHK6kCtCmu+ZNqVVSSPDieADlIZqcaN1iRXAFBoCH0Fb9F6C2EjFDaySdsargfQ=="],

    "ai-gateway-provider/@ai-sdk/anthropic": ["@ai-sdk/anthropic@3.0.78", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-0OY12G20cUt6iU6htpEA1491Oz++NVxZxlmWGX4B7rSbeZ5pnDmOu6YtW9BKzdZlNx5Gn23i6WMxyZFoMKNcgA=="],
@@ -6166,6 +6152,8 @@

    "astro/@astrojs/internal-helpers": ["@astrojs/internal-helpers@0.6.1", "", {}, "sha512-l5Pqf6uZu31aG+3Lv8nl/3s4DbUzdlxTWDof4pEpto6GUJNhhCbelVi9dEyurOVyqaelwmS9oSyOWOENSfgo9A=="],

+    "astro/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+
    "astro/common-ancestor-path": ["common-ancestor-path@1.0.1", "", {}, "sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w=="],

    "astro/diff": ["diff@5.2.2", "", {}, "sha512-vtcDfH3TOjP8UekytvnHH1o1P4FcUdt4eQ1Y+Abap1tk/OB2MWQvcwS2ClCd1zuIhc3JKOx6p3kod8Vfys3E+A=="],
@@ -6186,6 +6174,10 @@

    "babel-plugin-module-resolver/glob": ["glob@9.3.5", "", { "dependencies": { "fs.realpath": "^1.0.0", "minimatch": "^8.0.2", "minipass": "^4.2.4", "path-scurry": "^1.6.1" } }, "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q=="],

+    "body-parser/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
+
+    "body-parser/iconv-lite": ["iconv-lite@0.4.24", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3" } }, "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="],
+
    "builder-util/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],

    "builder-util/js-yaml": ["js-yaml@4.1.1", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA=="],
@@ -6252,6 +6244,8 @@

    "engine.io-client/ws": ["ws@8.20.1", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w=="],

+    "esast-util-from-js/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+
    "esbuild-plugin-copy/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],

    "esbuild-plugin-copy/chokidar": ["chokidar@3.6.0", "", { "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" }, "optionalDependencies": { "fsevents": "~2.3.2" } }, "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="],
@@ -6264,10 +6258,16 @@

    "express/cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="],

+    "express/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
+
+    "express/path-to-regexp": ["path-to-regexp@0.1.13", "", {}, "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA=="],
+
    "fetch-blob/web-streams-polyfill": ["web-streams-polyfill@3.3.3", "", {}, "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw=="],

    "filelist/minimatch": ["minimatch@5.1.9", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw=="],

+    "finalhandler/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
+
    "form-data/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],

    "fs-extra/jsonfile": ["jsonfile@6.2.1", "", { "dependencies": { "universalify": "^2.0.0" }, "optionalDependencies": { "graceful-fs": "^4.1.6" } }, "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q=="],
@@ -6310,6 +6310,8 @@

    "md-to-react-email/marked": ["marked@7.0.4", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-t8eP0dXRJMtMvBojtkcsA7n48BkauktUKzfkPSCq85ZMTJ0v76Rke4DYz01omYpPTUh4p/f7HePgRo3ebG8+QQ=="],

+    "micromark-extension-mdxjs/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+
    "micromatch/picomatch": ["picomatch@2.3.2", "", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="],

    "miniflare/acorn": ["acorn@8.14.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA=="],
@@ -6350,8 +6352,6 @@

    "opencode/minimatch": ["minimatch@10.0.3", "", { "dependencies": { "@isaacs/brace-expansion": "^5.0.0" } }, "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw=="],

-    "opencode/semver": ["semver@7.8.5", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA=="],
-
    "opencode-gitlab-auth/open": ["open@10.2.0", "", { "dependencies": { "default-browser": "^5.2.1", "define-lazy-prop": "^3.0.0", "is-inside-container": "^1.0.0", "wsl-utils": "^0.1.0" } }, "sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA=="],

    "openid-client/jose": ["jose@4.15.9", "", {}, "sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA=="],
@@ -6392,6 +6392,8 @@

    "proper-lockfile/signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="],

+    "raw-body/iconv-lite": ["iconv-lite@0.4.24", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3" } }, "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="],
+
    "readdir-glob/minimatch": ["minimatch@5.1.9", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw=="],

    "rimraf/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="],
@@ -6400,6 +6402,10 @@

    "router/path-to-regexp": ["path-to-regexp@8.4.2", "", {}, "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA=="],

+    "send/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
+
+    "send/mime": ["mime@1.6.0", "", { "bin": { "mime": "cli.js" } }, "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="],
+
    "serialize-error/type-fest": ["type-fest@0.13.1", "", {}, "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="],

    "sharp/detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="],
@@ -6430,6 +6436,8 @@

    "tar/yallist": ["yallist@5.0.0", "", {}, "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw=="],

+    "terser/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+
    "terser/commander": ["commander@2.20.3", "", {}, "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="],

    "thread-stream/real-require": ["real-require@1.0.0", "", {}, "sha512-P4nbQYQfePJxRSmY+v/KINxVucm4NF3p3s7pJveMTtom52FR4YGltUQLB8idDXwDDWW+eYrWDFbuzUnjoWHF7g=="],
@@ -6444,24 +6452,28 @@

    "tw-to-css/tailwindcss": ["tailwindcss@3.3.2", "", { "dependencies": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", "chokidar": "^3.5.3", "didyoumean": "^1.2.2", "dlv": "^1.1.3", "fast-glob": "^3.2.12", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", "jiti": "^1.18.2", "lilconfig": "^2.1.0", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.0.0", "postcss": "^8.4.23", "postcss-import": "^15.1.0", "postcss-js": "^4.0.1", "postcss-load-config": "^4.0.1", "postcss-nested": "^6.0.1", "postcss-selector-parser": "^6.0.11", "postcss-value-parser": "^4.2.0", "resolve": "^1.22.2", "sucrase": "^3.32.0" }, "bin": { "tailwind": "lib/cli.js", "tailwindcss": "lib/cli.js" } }, "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w=="],

-    "type-is/content-type": ["content-type@2.0.0", "", {}, "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ=="],
+    "type-is/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],

    "unifont/ofetch": ["ofetch@1.5.1", "", { "dependencies": { "destr": "^2.0.5", "node-fetch-native": "^1.6.7", "ufo": "^1.6.1" } }, "sha512-2W4oUZlVaqAPAil6FUg/difl6YhqhUR7x2eZY4bQCko22UXg3hptq9KLQdqFClV+Wu85UX7hNtdGTngi/1BxcA=="],

+    "unplugin/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+
    "unplugin/chokidar": ["chokidar@3.6.0", "", { "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" }, "optionalDependencies": { "fsevents": "~2.3.2" } }, "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="],

    "unused-filename/path-exists": ["path-exists@5.0.0", "", {}, "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ=="],

    "unzipper/fs-extra": ["fs-extra@11.3.5", "", { "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-eKpRKAovdpZtR1WopLHxlBWvAgPny3c4gX1G5Jhwmmw4XJj0ifSD5qB5TOo8hmA0wlRKDAOAhEE1yVPgs6Fgcg=="],

-    "venice-ai-sdk-provider/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.53", "", { "dependencies": { "@ai-sdk/provider": "3.0.12", "@ai-sdk/provider-utils": "4.0.32" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-SoPSkrL5cbNQnAljRsJ7pOzJ2FmWgnhC0lfFOda873ycCdFJL1A+h3Ib7mX2spcv3XnNaO13y/45/0RyqNWlIQ=="],
+    "venice-ai-sdk-provider/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.47", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-Enm5UlL0zUCrW3792opk5h7hRWxZOZzDe6eQYVFqX9LUOGGCe1h8MZWAGim765nwzgnjlpeYOsuzZmLtRsTPlg=="],

    "venice-ai-sdk-provider/@ai-sdk/provider": ["@ai-sdk/provider@3.0.10", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-Q3BZ27qfpYqnCYGvE3vt+Qi6LGOF9R5Nmzn+9JoM1lCRsD9mYaIhfJLkSunN48nfGXJ6n+XNV0J/XVpqGQl7Dw=="],

-    "venice-ai-sdk-provider/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.32", "", { "dependencies": { "@ai-sdk/provider": "3.0.12", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-Kwj499fTcN9bP/AfGoPU7JWIXeP6VZqKI6omsH062c9E2G4gdjeJczkz4z/tYSkzYjLE2AI3DtZbMfs6D7vn2Q=="],
+    "venice-ai-sdk-provider/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="],

    "verror/core-util-is": ["core-util-is@1.0.2", "", {}, "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="],

+    "vite-plugin-dynamic-import/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+
    "vite-plugin-icons-spritesheet/glob": ["glob@11.1.0", "", { "dependencies": { "foreground-child": "^3.3.1", "jackspeak": "^4.1.1", "minimatch": "^10.1.1", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^2.0.0" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw=="],

    "vitest/@vitest/expect": ["@vitest/expect@4.1.7", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@types/chai": "^5.2.2", "@vitest/spy": "4.1.7", "@vitest/utils": "4.1.7", "chai": "^6.2.2", "tinyrainbow": "^3.1.0" } }, "sha512-1R+tw0ortHEbZDGMymm+pN7/AFQ/RkFFdtd7EN+VBpynKmLbP8A3rpEXdshBJ7+8hQ9zBJh/i1s0yKNtxAnU7w=="],
@@ -6714,6 +6726,28 @@

    "@malept/flatpak-bundler/fs-extra/jsonfile": ["jsonfile@6.2.1", "", { "dependencies": { "universalify": "^2.0.0" }, "optionalDependencies": { "graceful-fs": "^4.1.6" } }, "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q=="],

+    "@modelcontextprotocol/sdk/express/accepts": ["accepts@2.0.0", "", { "dependencies": { "mime-types": "^3.0.0", "negotiator": "^1.0.0" } }, "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng=="],
+
+    "@modelcontextprotocol/sdk/express/body-parser": ["body-parser@2.2.2", "", { "dependencies": { "bytes": "^3.1.2", "content-type": "^1.0.5", "debug": "^4.4.3", "http-errors": "^2.0.0", "iconv-lite": "^0.7.0", "on-finished": "^2.4.1", "qs": "^6.14.1", "raw-body": "^3.0.1", "type-is": "^2.0.1" } }, "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA=="],
+
+    "@modelcontextprotocol/sdk/express/content-disposition": ["content-disposition@1.1.0", "", {}, "sha512-5jRCH9Z/+DRP7rkvY83B+yGIGX96OYdJmzngqnw2SBSxqCFPd0w2km3s5iawpGX8krnwSGmF0FW5Nhr0Hfai3g=="],
+
+    "@modelcontextprotocol/sdk/express/cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="],
+
+    "@modelcontextprotocol/sdk/express/cookie-signature": ["cookie-signature@1.2.2", "", {}, "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg=="],
+
+    "@modelcontextprotocol/sdk/express/finalhandler": ["finalhandler@2.1.1", "", { "dependencies": { "debug": "^4.4.0", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "on-finished": "^2.4.1", "parseurl": "^1.3.3", "statuses": "^2.0.1" } }, "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA=="],
+
+    "@modelcontextprotocol/sdk/express/fresh": ["fresh@2.0.0", "", {}, "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A=="],
+
+    "@modelcontextprotocol/sdk/express/merge-descriptors": ["merge-descriptors@2.0.0", "", {}, "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g=="],
+
+    "@modelcontextprotocol/sdk/express/send": ["send@1.2.1", "", { "dependencies": { "debug": "^4.4.3", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "fresh": "^2.0.0", "http-errors": "^2.0.1", "mime-types": "^3.0.2", "ms": "^2.1.3", "on-finished": "^2.4.1", "range-parser": "^1.2.1", "statuses": "^2.0.2" } }, "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ=="],
+
+    "@modelcontextprotocol/sdk/express/serve-static": ["serve-static@2.2.1", "", { "dependencies": { "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "parseurl": "^1.3.3", "send": "^1.2.0" } }, "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw=="],
+
+    "@modelcontextprotocol/sdk/express/type-is": ["type-is@2.1.0", "", { "dependencies": { "content-type": "^2.0.0", "media-typer": "^1.1.0", "mime-types": "^3.0.0" } }, "sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA=="],
+
    "@octokit/auth-app/@octokit/request/@octokit/endpoint": ["@octokit/endpoint@11.0.3", "", { "dependencies": { "@octokit/types": "^16.0.0", "universal-user-agent": "^7.0.2" } }, "sha512-FWFlNxghg4HrXkD3ifYbS/IdL/mDHjh9QcsNyhQjN8dplUoZbejsdpmuqdA76nxj2xoWPs7p8uX2SNr9rYu0Ag=="],

    "@octokit/auth-app/@octokit/request/@octokit/types": ["@octokit/types@16.0.0", "", { "dependencies": { "@octokit/openapi-types": "^27.0.0" } }, "sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg=="],
@@ -6836,34 +6870,6 @@

    "@shikijs/stream/@shikijs/core/@shikijs/types": ["@shikijs/types@4.2.0", "", { "dependencies": { "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-VT/MKtlpOhEPZloSH3Pb9WCZEBDoQVMa9jedp5UAwmJOar1DVc9DRODAxmYPW9M93IK4ryuqRejFfmlvlVDemw=="],

-    "@slack/bolt/express/accepts": ["accepts@1.3.8", "", { "dependencies": { "mime-types": "~2.1.34", "negotiator": "0.6.3" } }, "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="],
-
-    "@slack/bolt/express/body-parser": ["body-parser@1.20.5", "", { "dependencies": { "bytes": "~3.1.2", "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "~1.2.0", "http-errors": "~2.0.1", "iconv-lite": "~0.4.24", "on-finished": "~2.4.1", "qs": "~6.15.1", "raw-body": "~2.5.3", "type-is": "~1.6.18", "unpipe": "~1.0.0" } }, "sha512-3grm+/2tUOvu2cjJkvsIxrv/wVpfXQW4PsQHYm7yk4vfpu7Ekl6nEsYBoJUL6qDwZUx8wUhQ8tR2qz+ad9c9OA=="],
-
-    "@slack/bolt/express/content-disposition": ["content-disposition@0.5.4", "", { "dependencies": { "safe-buffer": "5.2.1" } }, "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="],
-
-    "@slack/bolt/express/cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="],
-
-    "@slack/bolt/express/cookie-signature": ["cookie-signature@1.0.7", "", {}, "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA=="],
-
-    "@slack/bolt/express/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
-
-    "@slack/bolt/express/finalhandler": ["finalhandler@1.3.2", "", { "dependencies": { "debug": "2.6.9", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "~2.4.1", "parseurl": "~1.3.3", "statuses": "~2.0.2", "unpipe": "~1.0.0" } }, "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg=="],
-
-    "@slack/bolt/express/fresh": ["fresh@0.5.2", "", {}, "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="],
-
-    "@slack/bolt/express/merge-descriptors": ["merge-descriptors@1.0.3", "", {}, "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ=="],
-
-    "@slack/bolt/express/path-to-regexp": ["path-to-regexp@0.1.13", "", {}, "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA=="],
-
-    "@slack/bolt/express/send": ["send@0.19.2", "", { "dependencies": { "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "~0.5.2", "http-errors": "~2.0.1", "mime": "1.6.0", "ms": "2.1.3", "on-finished": "~2.4.1", "range-parser": "~1.2.1", "statuses": "~2.0.2" } }, "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg=="],
-
-    "@slack/bolt/express/serve-static": ["serve-static@1.16.3", "", { "dependencies": { "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", "send": "~0.19.1" } }, "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA=="],
-
-    "@slack/bolt/express/type-is": ["type-is@1.6.18", "", { "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" } }, "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="],
-
-    "@slack/bolt/raw-body/iconv-lite": ["iconv-lite@0.4.24", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3" } }, "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="],
-
    "@slack/web-api/form-data/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],

    "@slack/web-api/p-queue/eventemitter3": ["eventemitter3@4.0.7", "", {}, "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="],
@@ -6886,6 +6892,8 @@

    "@standard-community/standard-openapi/effect/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],

+    "@storybook/csf-plugin/unplugin/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
+
    "@storybook/csf-plugin/unplugin/webpack-virtual-modules": ["webpack-virtual-modules@0.6.2", "", {}, "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ=="],

    "@tailwindcss/oxide-wasm32-wasi/@napi-rs/wasm-runtime/@tybys/wasm-util": ["@tybys/wasm-util@0.10.2", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg=="],
@@ -6894,6 +6902,8 @@

    "@vitest/expect/@vitest/utils/@vitest/pretty-format": ["@vitest/pretty-format@3.2.4", "", { "dependencies": { "tinyrainbow": "^2.0.0" } }, "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA=="],

+    "accepts/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],
+
    "ai-gateway-provider/@ai-sdk/amazon-bedrock/@ai-sdk/provider": ["@ai-sdk/provider@3.0.10", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-Q3BZ27qfpYqnCYGvE3vt+Qi6LGOF9R5Nmzn+9JoM1lCRsD9mYaIhfJLkSunN48nfGXJ6n+XNV0J/XVpqGQl7Dw=="],

    "ai-gateway-provider/@ai-sdk/amazon-bedrock/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="],
@@ -6958,6 +6968,8 @@

    "babel-plugin-module-resolver/glob/path-scurry": ["path-scurry@1.11.1", "", { "dependencies": { "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" } }, "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA=="],

+    "body-parser/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
+
    "builder-util/js-yaml/argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="],

    "c12/chokidar/readdirp": ["readdirp@5.0.0", "", {}, "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ=="],
@@ -7016,8 +7028,12 @@

    "esbuild-plugin-copy/chokidar/readdirp": ["readdirp@3.6.0", "", { "dependencies": { "picomatch": "^2.2.1" } }, "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="],

+    "express/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
+
    "filelist/minimatch/brace-expansion": ["brace-expansion@2.1.1", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA=="],

+    "finalhandler/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
+
    "form-data/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],

    "iconv-corefoundation/cli-truncate/slice-ansi": ["slice-ansi@3.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", "is-fullwidth-code-point": "^3.0.0" } }, "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ=="],
@@ -7054,6 +7070,8 @@

    "rimraf/glob/minimatch": ["minimatch@3.1.5", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w=="],

+    "send/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
+
    "storybook/open/wsl-utils": ["wsl-utils@0.1.0", "", { "dependencies": { "is-wsl": "^3.1.0" } }, "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw=="],

    "string-width-cjs/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
@@ -7068,14 +7086,12 @@

    "tw-to-css/tailwindcss/postcss": ["postcss@8.5.15", "", { "dependencies": { "nanoid": "^3.3.12", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A=="],

+    "type-is/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],
+
    "unplugin/chokidar/readdirp": ["readdirp@3.6.0", "", { "dependencies": { "picomatch": "^2.2.1" } }, "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="],

    "unzipper/fs-extra/jsonfile": ["jsonfile@6.2.1", "", { "dependencies": { "universalify": "^2.0.0" }, "optionalDependencies": { "graceful-fs": "^4.1.6" } }, "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q=="],

-    "venice-ai-sdk-provider/@ai-sdk/openai-compatible/@ai-sdk/provider": ["@ai-sdk/provider@3.0.12", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-sj9DWTJ2Ze0WR9qsiOPqoqzNx3OxL6iMxHImbhvoe9qOspekbzxNDMiJ4TIGfYHYh9w4OmBjz3prvqhzTi96+Q=="],
-
-    "venice-ai-sdk-provider/@ai-sdk/provider-utils/@ai-sdk/provider": ["@ai-sdk/provider@3.0.12", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-sj9DWTJ2Ze0WR9qsiOPqoqzNx3OxL6iMxHImbhvoe9qOspekbzxNDMiJ4TIGfYHYh9w4OmBjz3prvqhzTi96+Q=="],
-
    "venice-ai-sdk-provider/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],

    "vitest/@vitest/expect/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
@@ -7260,6 +7276,10 @@

    "@jsx-email/cli/vite/esbuild/@esbuild/win32-x64": ["@esbuild/win32-x64@0.18.20", "", { "os": "win32", "cpu": "x64" }, "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ=="],

+    "@modelcontextprotocol/sdk/express/type-is/content-type": ["content-type@2.0.0", "", {}, "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ=="],
+
+    "@modelcontextprotocol/sdk/express/type-is/media-typer": ["media-typer@1.1.0", "", {}, "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw=="],
+
    "@octokit/auth-app/@octokit/request-error/@octokit/types/@octokit/openapi-types": ["@octokit/openapi-types@27.0.0", "", {}, "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA=="],

    "@octokit/auth-app/@octokit/request/@octokit/types/@octokit/openapi-types": ["@octokit/openapi-types@27.0.0", "", {}, "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA=="],
@@ -7292,20 +7312,6 @@

    "@sentry/bundler-plugin-core/glob/path-scurry/minipass": ["minipass@7.1.3", "", {}, "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A=="],

-    "@slack/bolt/express/accepts/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],
-
-    "@slack/bolt/express/accepts/negotiator": ["negotiator@0.6.3", "", {}, "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="],
-
-    "@slack/bolt/express/body-parser/iconv-lite": ["iconv-lite@0.4.24", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3" } }, "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="],
-
-    "@slack/bolt/express/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
-
-    "@slack/bolt/express/send/mime": ["mime@1.6.0", "", { "bin": { "mime": "cli.js" } }, "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="],
-
-    "@slack/bolt/express/type-is/media-typer": ["media-typer@0.3.0", "", {}, "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="],
-
-    "@slack/bolt/express/type-is/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],
-
    "@slack/web-api/form-data/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],

    "@solidjs/start/shiki/@shikijs/engine-javascript/oniguruma-to-es": ["oniguruma-to-es@2.3.0", "", { "dependencies": { "emoji-regex-xs": "^1.0.0", "regex": "^5.1.1", "regex-recursion": "^5.1.1" } }, "sha512-bwALDxriqfKGfUufKGGepCzu9x7nJQuoRoAFp4AnwehhC2crqrDIAP/uN2qdlsAvSMpeRC3+Yzhqc7hLmle5+g=="],
@@ -7434,10 +7440,6 @@

    "@sentry/bundler-plugin-core/glob/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="],

-    "@slack/bolt/express/accepts/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],
-
-    "@slack/bolt/express/type-is/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],
-
    "@solidjs/start/shiki/@shikijs/engine-javascript/oniguruma-to-es/regex": ["regex@5.1.1", "", { "dependencies": { "regex-utilities": "^2.3.0" } }, "sha512-dN5I359AVGPnwzJm2jN1k0W9LPZ+ePvoOeVMMfqIMFz53sSwXkxaJoxr50ptnsC771lK95BnTrVSZxq0b9yCGw=="],

    "@solidjs/start/shiki/@shikijs/engine-javascript/oniguruma-to-es/regex-recursion": ["regex-recursion@5.1.1", "", { "dependencies": { "regex": "^5.1.1", "regex-utilities": "^2.3.0" } }, "sha512-ae7SBCbzVNrIjgSbh7wMznPcQel1DNlDtzensnFxpiNpXt1U2ju/bHugH422r+4LAVS1FpW1YCwilmnNsjum9w=="],
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-zjYaBa+TKuHVBO0z0YqOOFLOxpxj2hB6Iq1o+BXBeVc=",
-    "aarch64-linux": "sha256-S2QDDoKcg8QCqjxCnMmLp/3xmiVHAbCJ0CuHQRjDBbE=",
-    "aarch64-darwin": "sha256-GtdfHbk4fhvosgo6iEjXrWSxteK+eNrT0P9swEccbew=",
-    "x86_64-darwin": "sha256-zmWFdPSTS/DpU40CgHA/KKiSIs0PlI092TzLv/cG0jE="
+    "x86_64-linux": "sha256-JXQ9PAqqRlJtHa8T3ZxqdRRyxC+0ip+2wSnehvKXUbI=",
+    "aarch64-linux": "sha256-nI+RaxDXmAcjhSjCtIvyi292xBEg0E5NXaoyGrJE69s=",
+    "aarch64-darwin": "sha256-UleKpm7Khf3kibm4BqZJ9bmu0N2kOjNd77g1Bd2tmfw=",
+    "x86_64-darwin": "sha256-V4AQH868dOfVhEj1mKTnZlhpZwFqBYsHS28Tx9VXHkE="
  }
 }
@@ -2,12 +2,11 @@
  "$schema": "https://json.schemastore.org/package.json",
  "name": "opencode",
  "description": "AI-powered development tool",
-  "version": "0.0.0",
  "private": true,
  "type": "module",
  "packageManager": "bun@1.3.14",
  "scripts": {
-    "dev": "bun run --cwd packages/cli --conditions=browser src/index.ts",
+    "dev": "bun run --cwd packages/opencode --conditions=browser src/index.ts",
    "dev:desktop": "bun --cwd packages/desktop dev",
    "dev:web": "bun --cwd packages/app dev",
    "dev:console": "ulimit -n 10240 2>/dev/null; bun run --cwd packages/console/app dev",
@@ -45,7 +45,7 @@ export async function installStressSessionTabs(page: Page, input?: { draftID?: s
        }),
      )
      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
+        "opencode.global.dat:tabs",
        JSON.stringify([
          ...sessionIDs.map((sessionId) => ({
            type: "session",
@@ -14,7 +14,7 @@ test("closing the active server's last tab opens the remaining server tab", asyn
      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
      localStorage.setItem("opencode.global.dat:server", JSON.stringify({ list: [serverB] }))
      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
+        "opencode.global.dat:tabs",
        JSON.stringify([
          { type: "session", server: "http://127.0.0.1:4096", sessionId: sessionA },
          { type: "session", server: serverB, sessionId: sessionB },
@@ -52,7 +52,7 @@ test("legacy session routes preserve an existing tab's server", async ({ page })
      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
      localStorage.setItem("opencode.global.dat:server", JSON.stringify({ list: [serverB] }))
      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
+        "opencode.global.dat:tabs",
        JSON.stringify([{ type: "session", server: serverB, sessionId: sessionB }]),
      )
    },
@@ -66,7 +66,7 @@ test("shows the V2 thinking level control while relevant", async ({ page }) => {
  await expect(control).toBeVisible()

  await control.locator('[data-action="prompt-model-variant"]').click()
-  const high = page.getByRole("menuitemradio", { name: "high" })
+  const high = page.getByRole("option", { name: "high" })
  await expect(high).toBeVisible()
  await page.mouse.move(0, 0)
  await expect(control).toBeVisible()
@@ -38,29 +38,6 @@ test("shows a pending question dock", async ({ page }) => {
  await expect(question.getByRole("radio", { name: /Extended/ })).toBeVisible()
  await expect(page.locator('[data-component="session-composer"]')).toHaveCount(0)

-  const rejectRequests: string[] = []
-  page.on("request", (request) => {
-    if (request.method() !== "POST") return
-    if (new URL(request.url()).pathname === "/question/question-request/reject") rejectRequests.push(request.url())
-  })
-
-  await question.locator('[data-component="icon-button"][data-icon="chevron-down"]').click()
-  await expect(question).toBeVisible()
-  await expect(question.getByText("Which implementation should be used?")).toBeVisible()
-  await expect(question.getByText("Select one answer")).toBeHidden()
-  await expect(question.getByRole("radio", { name: /Minimal/ })).toBeHidden()
-  await expect(question.getByRole("radio", { name: /Extended/ })).toBeHidden()
-  await expect(question.getByRole("button", { name: "Dismiss" })).toBeVisible()
-  await expect(question.getByRole("button", { name: "Submit" })).toBeVisible()
-  await expect(page.locator('[data-component="question-minimized-dock"]')).toHaveCount(0)
-  expect(rejectRequests).toEqual([])
-
-  await question.locator('[data-component="icon-button"][data-icon="chevron-down"]').click()
-  await expect(question).toBeVisible()
-  await expect(question.getByText("Which implementation should be used?")).toBeVisible()
-  await expect(question.getByRole("radio", { name: /Minimal/ })).toBeVisible()
-  expect(rejectRequests).toEqual([])
-
  await question.getByRole("radio", { name: /Minimal/ }).click()
  const reply = page.waitForRequest(
    (request) => request.method() === "POST" && new URL(request.url()).pathname === "/question/question-request/reply",
@@ -145,7 +145,7 @@ async function configurePage(page: Page) {
        }),
      )
      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
+        "opencode.global.dat:tabs",
        JSON.stringify(sessionIDs.map((sessionId) => ({ type: "session", server, dirBase64, sessionId }))),
      )
    },
@@ -127,7 +127,7 @@ test.describe("smoke: session timeline", () => {
    await page.addInitScript(
      ({ dirBase64, sourceID, targetID }) => {
        localStorage.setItem(
-          "opencode.window.browser.dat:tabs",
+          "opencode.global.dat:tabs",
          JSON.stringify(
            [sourceID, targetID].map((sessionId) => ({
              type: "session",
@@ -253,7 +253,7 @@ test.describe("smoke: session timeline", () => {
    await page.addInitScript(
      ({ dirBase64, sourceID, targetID }) => {
        localStorage.setItem(
-          "opencode.window.browser.dat:tabs",
+          "opencode.global.dat:tabs",
          JSON.stringify(
            [sourceID, targetID].map((sessionId) => ({
              type: "session",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.17.13",
+  "version": "1.17.11",
  "description": "",
  "type": "module",
  "exports": {
@@ -28,22 +28,22 @@ import {
  Show,
 } from "solid-js"
 import { Dynamic } from "solid-js/web"
-import { CommandProvider, useCommand, type CommandOption } from "@/context/command"
+import { CommandProvider } from "@/context/command"
 import { CommentsProvider } from "@/context/comments"
 import { FileProvider } from "@/context/file"
-import { ServerSDKProvider } from "@/context/server-sdk"
-import { ServerSyncProvider } from "@/context/server-sync"
+import { ServerSDKProvider, useServerSDK } from "@/context/server-sdk"
+import { ServerSyncProvider, useServerSync } from "@/context/server-sync"
 import { GlobalProvider, useGlobal } from "@/context/global"
 import { HighlightsProvider } from "@/context/highlights"
 import { LanguageProvider, type Locale, useLanguage } from "@/context/language"
 import { LayoutProvider } from "@/context/layout"
 import { ModelsProvider } from "@/context/models"
-import { NotificationProvider } from "@/context/notification"
+import { NotificationProvider, useNotification } from "@/context/notification"
 import { PermissionProvider } from "@/context/permission"
-import { usePlatform } from "@/context/platform"
 import { PromptProvider } from "@/context/prompt"
 import { ServerConnection, ServerProvider, serverName, useServer } from "@/context/server"
 import { SettingsProvider, useSettings } from "@/context/settings"
+import { TerminalProvider } from "@/context/terminal"
 import { TabsProvider, useTabs, type DraftTab } from "@/context/tabs"
 import { SDKProvider, useSDK } from "@/context/sdk"
 import { WslServersProvider } from "@/wsl/context"
@@ -52,9 +52,16 @@ import LegacyLayout from "@/pages/layout"
 import NewLayout from "@/pages/layout-new"
 import { ErrorPage } from "./pages/error"
 import { useCheckServerHealth } from "./utils/server-health"
-import { legacySessionServer, requireServerKey, sessionHref } from "./utils/session-route"
+import {
+  legacySessionHref,
+  legacySessionServer,
+  requireServerKey,
+  selectSessionLineage,
+  sessionHref,
+} from "./utils/session-route"
+import { isSessionNotFoundError } from "./utils/server-errors"

-import { SessionPage, TargetSessionRoute as TargetSessionRouteContent } from "@/pages/session"
+import Session from "@/pages/session"
 import { NewHome, LegacyHome } from "@/pages/home"

 const NewSession = lazy(() => import("@/pages/new-session"))
@@ -88,7 +95,11 @@ const SessionRoute = () => {
    tabs.newDraft({ server: server.key, directory: sdk().directory }, search.prompt)
  })

-  return <SessionPage />
+  return (
+    <SessionProviders>
+      <Session />
+    </SessionProviders>
+  )
 }

 const TargetSessionRoute = () => {
@@ -103,13 +114,76 @@ const TargetSessionRoute = () => {
    <Show when={requireServerKey(params.serverKey)} keyed>
      <ServerSDKProvider server={conn}>
        <ServerSyncProvider server={conn}>
-          <TargetSessionRouteContent />
+          <ResolvedTargetSessionRoute />
        </ServerSyncProvider>
      </ServerSDKProvider>
    </Show>
  )
 }

+function ResolvedTargetSessionRoute() {
+  const params = useParams<{ serverKey: string; id: string }>()
+  const settings = useSettings()
+  const tabs = useTabs()
+  const sync = useServerSync()
+  const serverKey = createMemo(() => requireServerKey(params.serverKey))
+  const cached = createMemo(() => sync().session.lineage.peek(params.id))
+  const [resolved] = createResource(
+    () => {
+      if (cached()) return
+      return { id: params.id, server: serverKey(), sync: sync() }
+    },
+    ({ id, server, sync }) =>
+      sync.session.lineage.resolve(id).catch((error) => {
+        if (isSessionNotFoundError(error, id)) tabs.removeSessionTab({ server, sessionId: id })
+        throw error
+      }),
+  )
+  const current = createMemo(() => selectSessionLineage(params.id, cached(), resolved()))
+  const directory = createMemo(() => current()?.session.directory)
+  const targetDirectory = () => directory()!
+
+  createEffect(() => {
+    const session = current()
+    if (!session) return
+    tabs.addSessionTab({
+      server: serverKey(),
+      sessionId: session.root.id,
+    })
+  })
+
+  return (
+    <TargetServerScopedProviders directory={directory} sessionID={() => params.id}>
+      <Show when={!!current() || resolved.state !== "errored"} fallback={<ErrorPage error={resolved.error} />}>
+        <Show when={directory()}>
+          <Show
+            when={settings.general.newLayoutDesigns()}
+            fallback={<Navigate href={legacySessionHref(directory()!, params.id)} />}
+          >
+            <SDKProvider directory={targetDirectory}>
+              <DirectoryDataProvider directory={targetDirectory} server={serverKey}>
+                <TargetSessionPage />
+              </DirectoryDataProvider>
+            </SDKProvider>
+          </Show>
+        </Show>
+      </Show>
+    </TargetServerScopedProviders>
+  )
+}
+
+function TargetSessionPage() {
+  const sdk = useSDK()
+  const serverSDK = useServerSDK()
+  return (
+    <Show when={`${serverSDK().scope}\0${sdk().directory}`} keyed>
+      <SessionProviders>
+        <Session />
+      </SessionProviders>
+    </Show>
+  )
+}
+
 // Wraps the non-draft routes. They are gated on (and keyed to) the globally selected
 // server via ServerKey, then provide the server-scoped shell (Permission/Layout/
 // Notification/Models + the visual Layout) for that server.
@@ -157,7 +231,7 @@ function ResolvedDraftRoute(props: { draft: DraftTab }) {
    <Show when={`${props.draft.server}\0${props.draft.directory}`} keyed>
      <ServerSDKProvider server={conn}>
        <ServerSyncProvider server={conn}>
-          <DraftServerScopedProviders directory={directory}>
+          <TargetServerScopedProviders directory={directory}>
            <SDKProvider directory={directory}>
              <DirectoryDataProvider directory={directory} server={serverKey}>
                <DraftProviders>
@@ -165,7 +239,7 @@ function ResolvedDraftRoute(props: { draft: DraftTab }) {
                </DraftProviders>
              </DirectoryDataProvider>
            </SDKProvider>
-          </DraftServerScopedProviders>
+          </TargetServerScopedProviders>
        </ServerSyncProvider>
      </ServerSDKProvider>
    </Show>
@@ -226,36 +300,12 @@ function SharedProviders(props: ParentProps) {
    <>
      <BodyDesignClass />
      <CommandProvider>
-        <DesktopCommands />
        <HighlightsProvider>{props.children}</HighlightsProvider>
      </CommandProvider>
    </>
  )
 }

-function DesktopCommands() {
-  const command = useCommand()
-  const language = useLanguage()
-  const platform = usePlatform()
-
-  command.register("desktop", () => {
-    const commands: CommandOption[] = []
-    if (platform.platform === "desktop" && platform.exportDebugLogs) {
-      commands.push({
-        id: "logs.export",
-        title: "Export logs",
-        category: language.t("command.category.settings"),
-        onSelect: () => {
-          void platform.exportDebugLogs?.()
-        },
-      })
-    }
-    return commands
-  })
-
-  return null
-}
-
 // Server-scoped providers shared by the legacy shell and the top-level new shell.
 type ServerScopedShellProps = ParentProps<{
  directory?: () => string | undefined
@@ -290,14 +340,38 @@ function NewAppLayout(props: ParentProps) {
  )
 }

-function DraftServerScopedProviders(props: ParentProps<{ directory?: () => string | undefined }>) {
+function TargetServerScopedProviders(props: ServerScopedShellProps) {
  return (
    <PermissionProvider directory={props.directory}>
+      <MarkSessionNotificationsViewed sessionID={props.sessionID} />
      <ModelsProvider directory={props.directory}>{props.children}</ModelsProvider>
    </PermissionProvider>
  )
 }

+function MarkSessionNotificationsViewed(props: { sessionID?: () => string | undefined }) {
+  const notification = useNotification()
+  createEffect(() => {
+    const sessionID = props.sessionID?.()
+    if (!notification.ready() || !sessionID) return
+    if (notification.session.unseenCount(sessionID) === 0) return
+    notification.session.markViewed(sessionID)
+  })
+  return null
+}
+
+function SessionProviders(props: ParentProps) {
+  return (
+    <TerminalProvider>
+      <FileProvider>
+        <PromptProvider>
+          <CommentsProvider>{props.children}</CommentsProvider>
+        </PromptProvider>
+      </FileProvider>
+    </TerminalProvider>
+  )
+}
+
 // The draft page only renders the prompt composer, so it drops TerminalProvider.
 // FileProvider and CommentsProvider stay because PromptInput uses file search and comment context.
 function DraftProviders(props: ParentProps) {
@@ -3,26 +3,13 @@ import { List } from "@opencode-ai/ui/list"
 import { Switch } from "@opencode-ai/ui/switch"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { Button } from "@opencode-ai/ui/button"
-import { ButtonV2 } from "@opencode-ai/ui/v2/button-v2"
-import { Dialog as DialogV2, DialogBody, DialogHeader, DialogTitleGroup } from "@opencode-ai/ui/v2/dialog-v2"
-import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
-import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
-import { TextInputV2 } from "@opencode-ai/ui/v2/text-input-v2"
-import { Switch as SwitchV2 } from "@opencode-ai/ui/v2/switch-v2"
-import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
-import { useFilteredList } from "@opencode-ai/ui/hooks"
-import { For, Show, type Component } from "solid-js"
+import type { Component } from "solid-js"
 import { useLocal } from "@/context/local"
 import { popularProviders } from "@/hooks/use-providers"
 import { useLanguage } from "@/context/language"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { DialogSelectProvider } from "./dialog-select-provider"
 import { decode64 } from "@/utils/base64"
-import { SettingsListV2 } from "./settings-v2/parts/list"
-import { SettingsRowV2 } from "./settings-v2/parts/row"
-import "./settings-v2/settings-v2.css"
-
-type ModelItem = ReturnType<ReturnType<typeof useLocal>["model"]["list"]>[number]

 export const DialogManageModels: Component = () => {
  const local = useLocal()
@@ -115,151 +102,3 @@ export const DialogManageModels: Component = () => {
    </Dialog>
  )
 }
-
-export const DialogManageModelsV2: Component = () => {
-  const local = useLocal()
-  const language = useLanguage()
-  const dialog = useDialog()
-  const directory = () => decode64(local.slug())
-
-  const handleConnectProvider = () => {
-    dialog.show(() => <DialogSelectProvider directory={directory} />)
-  }
-  const providerList = (providerID: string) => local.model.list().filter((x) => x.provider.id === providerID)
-  const providerVisible = (providerID: string) =>
-    providerList(providerID).every((x) => local.model.visible({ modelID: x.id, providerID: x.provider.id }))
-  const setProviderVisibility = (providerID: string, checked: boolean) => {
-    providerList(providerID).forEach((x) => {
-      local.model.setVisibility({ modelID: x.id, providerID: x.provider.id }, checked)
-    })
-  }
-  const setModelVisibility = (item: ModelItem, checked: boolean) => {
-    local.model.setVisibility({ modelID: item.id, providerID: item.provider.id }, checked)
-  }
-  const list = useFilteredList<ModelItem>({
-    items: () => local.model.list(),
-    key: (x) => `${x.provider.id}:${x.id}`,
-    filterKeys: ["provider.name", "name", "id"],
-    sortBy: (a, b) => a.name.localeCompare(b.name),
-    groupBy: (x) => x.provider.id,
-    sortGroupsBy: (a, b) => {
-      const aRank = popularProviders.indexOf(a.category)
-      const bRank = popularProviders.indexOf(b.category)
-      const aPopular = aRank >= 0
-      const bPopular = bRank >= 0
-      if (aPopular && !bPopular) return -1
-      if (!aPopular && bPopular) return 1
-      return aRank - bRank
-    },
-  })
-
-  return (
-    <DialogV2 size="large" variant="settings" class="settings-v2-manage-models-dialog">
-      <DialogHeader hideClose={true} closeLabel={language.t("common.close")}>
-        <DialogTitleGroup
-          title={language.t("dialog.model.manage")}
-          description={language.t("dialog.model.manage.description")}
-        />
-        <ButtonV2 variant="neutral" icon="plus" onClick={handleConnectProvider}>
-          {language.t("command.provider.connect")}
-        </ButtonV2>
-      </DialogHeader>
-      <DialogBody class="flex min-h-0 flex-1 flex-col">
-        <div class="px-4 pt-px pb-3">
-          <div class="relative">
-            <TextInputV2
-              type="search"
-              appearance="base"
-              class="!w-full self-stretch"
-              value={list.filter()}
-              onInput={(event) => list.onInput(event.currentTarget.value)}
-              placeholder={language.t("dialog.model.search.placeholder")}
-              spellcheck={false}
-              autocorrect="off"
-              autocomplete="off"
-              autocapitalize="off"
-              autofocus
-              aria-label={language.t("dialog.model.search.placeholder")}
-            />
-            <Show when={list.filter()}>
-              <IconButtonV2
-                type="button"
-                variant="ghost-muted"
-                size="small"
-                class="settings-v2-tab-search-clear"
-                icon={<IconV2 name="close" size="large" class="text-v2-icon-icon-muted" />}
-                onClick={() => list.clear()}
-                aria-label={language.t("common.clear")}
-              />
-            </Show>
-          </div>
-        </div>
-        <div data-slot="manage-models-scroll" class="relative min-h-0 flex-1">
-          <div class="settings-v2-panel settings-v2-models h-full px-4 pt-4 pb-4">
-            <Show
-              when={!list.grouped.loading}
-              fallback={
-                <div class="settings-v2-models-status">
-                  {language.t("common.loading")}
-                  {language.t("common.loading.ellipsis")}
-                </div>
-              }
-            >
-              <Show
-                when={list.flat().length > 0}
-                fallback={
-                  <div class="settings-v2-models-status">
-                    <span>{language.t("dialog.model.empty")}</span>
-                    <Show when={list.filter()}>
-                      <span class="settings-v2-models-status-filter">&quot;{list.filter()}&quot;</span>
-                    </Show>
-                  </div>
-                }
-              >
-                <For each={list.grouped.latest}>
-                  {(group) => (
-                    <div class="settings-v2-section" data-component="settings-models-provider">
-                      <div class="settings-v2-models-group-header justify-between">
-                        <div class="flex min-w-0 items-center gap-2">
-                          <ProviderIcon id={group.category} width={16} height={16} class="ml-4 shrink-0" />
-                          <h3 class="settings-v2-section-title">{group.items[0].provider.name}</h3>
-                        </div>
-                        <div>
-                          <SwitchV2
-                            class="mr-6"
-                            checked={providerVisible(group.category)}
-                            onChange={(checked) => setProviderVisibility(group.category, checked)}
-                            hideLabel
-                          >
-                            {group.items[0].provider.name}
-                          </SwitchV2>
-                        </div>
-                      </div>
-                      <SettingsListV2>
-                        <For each={group.items}>
-                          {(item) => (
-                            <SettingsRowV2 title={item.name} description="">
-                              <div>
-                                <SwitchV2
-                                  checked={local.model.visible({ modelID: item.id, providerID: item.provider.id })}
-                                  onChange={(checked) => setModelVisibility(item, checked)}
-                                  hideLabel
-                                >
-                                  {item.name}
-                                </SwitchV2>
-                              </div>
-                            </SettingsRowV2>
-                          )}
-                        </For>
-                      </SettingsListV2>
-                    </div>
-                  )}
-                </For>
-              </Show>
-            </Show>
-          </div>
-        </div>
-      </DialogBody>
-    </DialogV2>
-  )
-}
@@ -1,19 +1,15 @@
 import { Popover as Kobalte } from "@kobalte/core/popover"
-import { Component, ComponentProps, createMemo, For, JSX, Show, ValidComponent } from "solid-js"
+import { Component, ComponentProps, createMemo, JSX, Show, ValidComponent } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useLocal } from "@/context/local"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { popularProviders } from "@/hooks/use-providers"
 import { Button } from "@opencode-ai/ui/button"
 import { IconButton } from "@opencode-ai/ui/icon-button"
-import { ScrollView } from "@opencode-ai/ui/scroll-view"
 import { Tag } from "@opencode-ai/ui/tag"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { List } from "@opencode-ai/ui/list"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
-import { Icon } from "@opencode-ai/ui/v2/icon"
-import { Tag as TagV2 } from "@opencode-ai/ui/v2/badge-v2"
-import { MenuV2 } from "@opencode-ai/ui/v2/menu-v2"
 import { ModelTooltip } from "./model-tooltip"
 import { useLanguage } from "@/context/language"
 import { decode64 } from "@/utils/base64"
@@ -22,22 +18,6 @@ const isFree = (provider: string, cost: { input: number } | undefined) =>
  provider === "opencode" && (!cost || cost.input === 0)

 type ModelState = ReturnType<typeof useLocal>["model"]
-type ModelItem = ReturnType<ModelState["list"]>[number]
-
-const modelKey = (model: ModelItem) => `${model.provider.id}:${model.id}`
-const manageKey = "action:manage"
-
-const sortModelGroups = (a: { category: string; items: ModelItem[] }, b: { category: string; items: ModelItem[] }) => {
-  const aIndex = popularProviders.indexOf(a.category)
-  const bIndex = popularProviders.indexOf(b.category)
-  const aPopular = aIndex >= 0
-  const bPopular = bIndex >= 0
-
-  if (aPopular && !bPopular) return -1
-  if (!aPopular && bPopular) return 1
-  if (aPopular && bPopular) return aIndex - bIndex
-  return a.items[0].provider.name.localeCompare(b.items[0].provider.name)
-}

 const ModelList: Component<{
  provider?: string
@@ -220,271 +200,6 @@ export function ModelSelectorPopover(props: {
  )
 }

-export function ModelSelectorPopoverV2(props: {
-  provider?: string
-  model?: ModelState
-  children?: JSX.Element
-  triggerAs?: ValidComponent
-  triggerProps?: ModelSelectorTriggerProps
-  onClose?: () => void
-}) {
-  const model = props.model ?? useLocal().model
-  const language = useLanguage()
-  const dialog = useDialog()
-  const [store, setStore] = createStore({ open: false, search: "", active: "" })
-  let searchRef: HTMLInputElement | undefined
-  let contentRef: HTMLDivElement | undefined
-  let restoreTrigger = true
-
-  const allModels = createMemo(() =>
-    model
-      .list()
-      .filter((item) => model.visible({ modelID: item.id, providerID: item.provider.id }))
-      .filter((item) => (props.provider ? item.provider.id === props.provider : true)),
-  )
-  const models = createMemo(() => {
-    const search = store.search.trim().toLowerCase()
-    const filtered = search
-      ? allModels().filter(
-          (item) =>
-            item.name.toLowerCase().includes(search) ||
-            item.id.toLowerCase().includes(search) ||
-            item.provider.name.toLowerCase().includes(search),
-        )
-      : allModels()
-
-    return [...filtered].sort((a, b) => a.name.localeCompare(b.name))
-  })
-  const groups = createMemo(() => {
-    const byProvider = new Map<string, ModelItem[]>()
-    for (const item of models()) {
-      byProvider.set(item.provider.id, [...(byProvider.get(item.provider.id) ?? []), item])
-    }
-    return Array.from(byProvider, ([category, items]) => ({ category, items })).sort(sortModelGroups)
-  })
-  const keys = () => [...models().map(modelKey), manageKey]
-  const current = () => {
-    const value = model.current()
-    return value ? `${value.provider.id}:${value.id}` : undefined
-  }
-  const initialActive = () => {
-    const selected = current()
-    const options = keys()
-    if (selected && options.includes(selected)) return selected
-    return options[0] ?? ""
-  }
-  const activeItem = () =>
-    store.active ? contentRef?.querySelector<HTMLElement>(`[data-option-key="${CSS.escape(store.active)}"]`) : undefined
-  const afterClose = (callback: () => void) => {
-    const complete = () => {
-      if (contentRef?.isConnected) {
-        requestAnimationFrame(complete)
-        return
-      }
-      requestAnimationFrame(() => requestAnimationFrame(callback))
-    }
-    requestAnimationFrame(complete)
-  }
-  const setOpen = (open: boolean) => {
-    if (open) {
-      restoreTrigger = true
-      setStore({ open: true, active: initialActive() })
-      setTimeout(() =>
-        requestAnimationFrame(() => {
-          searchRef?.focus()
-          activeItem()?.scrollIntoView({ block: "nearest" })
-        }),
-      )
-      return
-    }
-    setStore({ open: false, search: "", active: "" })
-  }
-  const select = (item: ModelItem) => {
-    model.set({ modelID: item.id, providerID: item.provider.id }, { recent: true })
-    props.onClose?.()
-  }
-  const selectModel = (item: ModelItem) => {
-    restoreTrigger = false
-    setOpen(false)
-    afterClose(() => select(item))
-  }
-  const manage = () => {
-    restoreTrigger = false
-    setOpen(false)
-    afterClose(() => {
-      void import("./dialog-manage-models").then((x) => {
-        dialog.show(() => <x.DialogManageModelsV2 />)
-      })
-    })
-  }
-  const selectActive = () => {
-    const item = models().find((item) => modelKey(item) === store.active)
-    if (item) {
-      selectModel(item)
-      return
-    }
-    if (store.active === manageKey) manage()
-  }
-  const moveActive = (delta: number) => {
-    const options = keys()
-    if (options.length === 0) return
-    const index = options.indexOf(store.active)
-    const start = index === -1 ? 0 : index
-    setStore("active", options[(start + delta + options.length) % options.length])
-    queueMicrotask(() => activeItem()?.scrollIntoView({ block: "nearest" }))
-  }
-  const setSearch = (value: string) => {
-    const search = value.trim().toLowerCase()
-    const first = [...allModels()]
-      .sort((a, b) => a.name.localeCompare(b.name))
-      .find(
-        (item) =>
-          !search ||
-          item.name.toLowerCase().includes(search) ||
-          item.id.toLowerCase().includes(search) ||
-          item.provider.name.toLowerCase().includes(search),
-      )
-    setStore({ search: value, active: first ? modelKey(first) : manageKey })
-  }
-
-  return (
-    <MenuV2 open={store.open} modal={false} placement="top-start" gutter={6} onOpenChange={setOpen}>
-      <MenuV2.Trigger as={props.triggerAs ?? "div"} {...props.triggerProps}>
-        {props.children}
-      </MenuV2.Trigger>
-      <MenuV2.Portal>
-        <MenuV2.Content
-          ref={(el: HTMLDivElement) => (contentRef = el)}
-          class="w-[284px] overflow-hidden rounded-md border-0 bg-v2-background-bg-layer-01 !p-0 shadow-[var(--v2-elevation-floating)] focus:outline-none"
-          onPointerDownOutside={() => (restoreTrigger = false)}
-          onFocusOutside={() => (restoreTrigger = false)}
-          onCloseAutoFocus={(event) => {
-            if (!restoreTrigger) event.preventDefault()
-          }}
-        >
-          <div class="flex flex-col p-0.5">
-            <div class="flex h-7 items-center gap-2 rounded-sm pl-3 pr-2.5 text-v2-icon-icon-muted">
-              <Icon name="magnifying-glass" size="small" class="shrink-0" />
-              <input
-                ref={(el) => (searchRef = el)}
-                value={store.search}
-                placeholder={language.t("dialog.model.search.placeholder")}
-                class="h-7 min-w-0 flex-1 border-0 bg-transparent text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-base outline-none placeholder:text-v2-text-text-faint"
-                spellcheck={false}
-                autocorrect="off"
-                autocomplete="off"
-                autocapitalize="off"
-                onInput={(event) => setSearch(event.currentTarget.value)}
-                onKeyDown={(event) => {
-                  if (event.key === "Tab") return
-                  event.stopPropagation()
-                  if (event.key === "Escape") {
-                    event.preventDefault()
-                    restoreTrigger = false
-                    setOpen(false)
-                    afterClose(() => props.onClose?.())
-                    return
-                  }
-                  if (event.altKey || event.metaKey) return
-                  if (event.key === "ArrowDown") {
-                    event.preventDefault()
-                    moveActive(1)
-                    return
-                  }
-                  if (event.key === "ArrowUp") {
-                    event.preventDefault()
-                    moveActive(-1)
-                    return
-                  }
-                  if (event.key === "Enter" && !event.isComposing) {
-                    event.preventDefault()
-                    selectActive()
-                  }
-                }}
-              />
-              <Show when={store.search.trim()}>
-                <button
-                  type="button"
-                  class="flex size-5 items-center justify-center rounded-sm text-v2-icon-icon-muted hover:bg-v2-overlay-simple-overlay-hover"
-                  onPointerDown={(event) => event.preventDefault()}
-                  onClick={() => setSearch("")}
-                  aria-label={language.t("common.clear")}
-                >
-                  <Icon name="close" size="small" />
-                </button>
-              </Show>
-            </div>
-          </div>
-          <div class="h-px bg-v2-border-border-muted" />
-          <ScrollView data-slot="model-selector-scroll" class="max-h-[220px] min-h-0">
-            <div class="flex flex-col p-0.5 pt-0">
-              <Show
-                when={models().length > 0}
-                fallback={
-                  <div class="flex h-12 items-center px-3 text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-faint">
-                    {language.t("dialog.model.empty")}
-                  </div>
-                }
-              >
-                <For each={groups()}>
-                  {(group) => (
-                    <MenuV2.Group>
-                      <MenuV2.GroupLabel class="gap-2 px-3">
-                        <span class="min-w-0 truncate">{group.items[0].provider.name}</span>
-                      </MenuV2.GroupLabel>
-                      <MenuV2.RadioGroup value={current()}>
-                        <For each={group.items}>
-                          {(item) => (
-                            <MenuV2.RadioItem
-                              value={modelKey(item)}
-                              data-option-key={modelKey(item)}
-                              data-selected-model={current() === modelKey(item) ? true : undefined}
-                              class="scroll-my-6"
-                              classList={{ "!bg-v2-overlay-simple-overlay-hover": store.active === modelKey(item) }}
-                              onMouseEnter={() => {
-                                setStore("active", modelKey(item))
-                                setTimeout(() => searchRef?.focus())
-                              }}
-                              onSelect={() => selectModel(item)}
-                            >
-                              <span class="min-w-0 truncate">{item.name}</span>
-                              <Show when={isFree(item.provider.id, item.cost)}>
-                                <TagV2 class="shrink-0">{language.t("model.tag.free")}</TagV2>
-                              </Show>
-                              <Show when={item.latest}>
-                                <TagV2 class="shrink-0">{language.t("model.tag.latest")}</TagV2>
-                              </Show>
-                            </MenuV2.RadioItem>
-                          )}
-                        </For>
-                      </MenuV2.RadioGroup>
-                    </MenuV2.Group>
-                  )}
-                </For>
-              </Show>
-            </div>
-          </ScrollView>
-          <div class="h-px bg-v2-border-border-muted" />
-          <div class="flex flex-col p-0.5">
-            <MenuV2.Item
-              data-option-key={manageKey}
-              classList={{ "!bg-v2-overlay-simple-overlay-hover": store.active === manageKey }}
-              onMouseEnter={() => {
-                setStore("active", manageKey)
-                setTimeout(() => searchRef?.focus())
-              }}
-              onSelect={manage}
-            >
-              <Icon name="outline-sliders" size="small" />
-              <span class="min-w-0 flex-1 truncate leading-5">{language.t("dialog.model.manage")}</span>
-            </MenuV2.Item>
-          </div>
-        </MenuV2.Content>
-      </MenuV2.Portal>
-    </MenuV2>
-  )
-}
-
 export const DialogSelectModel: Component<{ provider?: string; model?: ModelState }> = (props) => {
  const dialog = useDialog()
  const language = useLanguage()
@@ -35,14 +35,12 @@ import { DockShellForm, DockTray } from "@opencode-ai/ui/dock-surface"
 import { Icon } from "@opencode-ai/ui/icon"
 import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
 import { Tooltip, TooltipKeybind } from "@opencode-ai/ui/tooltip"
-import { ButtonV2 } from "@opencode-ai/ui/v2/button-v2"
 import { KeybindV2 } from "@opencode-ai/ui/v2/keybind-v2"
-import { MenuV2 } from "@opencode-ai/ui/v2/menu-v2"
 import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { Select } from "@opencode-ai/ui/select"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
-import { ModelSelectorPopover, ModelSelectorPopoverV2 } from "@/components/dialog-select-model"
+import { ModelSelectorPopover } from "@/components/dialog-select-model"
 import { useCommand } from "@/context/command"
 import { Persist, persisted } from "@/utils/persist"
 import { usePermission } from "@/context/permission"
@@ -70,7 +68,6 @@ import { promptPlaceholder } from "./prompt-input/placeholder"
 import { createPromptInputTransientState } from "./prompt-input/transient-state"
 import { showToast } from "@/utils/toast"
 import { ImagePreview } from "@opencode-ai/ui/image-preview"
-import type { ReferenceInfo } from "@opencode-ai/sdk/v2/client"

 export type PromptInputState = ReturnType<typeof usePrompt>

@@ -217,7 +214,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
  let fileInputRef: HTMLInputElement | undefined
  let scrollRef!: HTMLDivElement
  let slashPopoverRef!: HTMLDivElement
-  let restoreEndOnFocus = true

  const mirror = { input: false }
  const inset = 56
@@ -597,16 +593,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    })
  }

-  const handleFocus = () => {
-    if (!restoreEndOnFocus) return
-    restoreEndOnFocus = false
-    requestAnimationFrame(() => {
-      if (document.activeElement !== editorRef) return
-      setCursorPosition(editorRef, prompt.cursor() ?? promptLength(prompt.current()))
-      queueScroll()
-    })
-  }
-
  const renderEditorWithCursor = (parts: Prompt) => {
    const cursor = currentCursor()
    renderEditor(parts)
@@ -643,89 +629,24 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    })
  }

-  const referenceDescription = (reference: ReferenceInfo) =>
-    reference.source.type === "git" ? reference.source.repository : reference.source.path
-
-  const referenceList = createMemo(() =>
-    sync()
-      .data.reference.filter((reference) => !reference.hidden)
-      .map(
-        (reference): AtOption => ({
-          type: "reference",
-          name: reference.name,
-          path: reference.path,
-          display: reference.name,
-          description: reference.description ?? referenceDescription(reference),
-        }),
-      ),
-  )
-
  const agentList = createMemo(() =>
    props.controls.agents.available
      .filter((agent) => !agent.hidden && agent.mode !== "primary")
      .map((agent): AtOption => ({ type: "agent", name: agent.name, display: agent.name })),
  )

-  const mcpResourceList = createMemo(() =>
-    Object.values(sync().data.mcp_resource).map(
-      (resource): AtOption => ({
-        type: "resource",
-        name: resource.name,
-        uri: resource.uri,
-        client: resource.client,
-        display: resource.name,
-        description: resource.description,
-        mime: resource.mimeType,
-      }),
-    ),
-  )
-
  const handleAtSelect = (option: AtOption | undefined) => {
    if (!option) return
    if (option.type === "agent") {
      addPart({ type: "agent", name: option.name, content: "@" + option.name, start: 0, end: 0 })
-      return
+    } else {
+      addPart({ type: "file", path: option.path, content: "@" + option.path, start: 0, end: 0 })
    }
-    if (option.type === "reference") {
-      addPart({
-        type: "file",
-        path: option.path,
-        content: "@" + option.name,
-        start: 0,
-        end: 0,
-        mime: "application/x-directory",
-        filename: option.name,
-      })
-      return
-    }
-    if (option.type === "resource") {
-      addPart({
-        type: "file",
-        path: option.uri,
-        content: "@" + option.name,
-        start: 0,
-        end: 0,
-        mime: option.mime ?? "text/plain",
-        filename: option.name,
-        url: option.uri,
-        source: {
-          type: "resource",
-          text: { value: "@" + option.name, start: 0, end: 0 },
-          clientName: option.client,
-          uri: option.uri,
-        },
-      })
-      return
-    }
-    addPart({ type: "file", path: option.path, content: "@" + option.path, start: 0, end: 0 })
  }

  const atKey = (x: AtOption | undefined) => {
    if (!x) return ""
-    if (x.type === "agent") return `agent:${x.name}`
-    if (x.type === "reference") return `reference:${x.name}`
-    if (x.type === "resource") return `resource:${x.client}:${x.uri}`
-    return `file:${x.path}`
+    return x.type === "agent" ? `agent:${x.name}` : `file:${x.path}`
  }

  const {
@@ -736,36 +657,30 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    onKeyDown: atOnKeyDown,
  } = useFilteredList<AtOption>({
    items: async (query) => {
-      const references = referenceList()
      const agents = agentList()
-      const mcpResources = mcpResourceList()
      const open = recent()
      const seen = new Set(open)
      const pinned: AtOption[] = open.map((path) => ({ type: "file", path, display: path, recent: true }))
-      if (!query.trim()) return [...references, ...agents, ...mcpResources, ...pinned]
+      if (!query.trim()) return [...agents, ...pinned]
      const paths = await files.searchFilesAndDirectories(query)
      const fileOptions: AtOption[] = paths
        .filter((path) => !seen.has(path))
        .map((path) => ({ type: "file", path, display: path }))
-      return [...references, ...agents, ...mcpResources, ...pinned, ...fileOptions]
+      return [...agents, ...pinned, ...fileOptions]
    },
    key: atKey,
    filterKeys: ["display"],
    skipFilter: (item) => item.type === "file" && !item.recent,
    groupBy: (item) => {
-      if (item.type === "reference") return "reference"
      if (item.type === "agent") return "agent"
-      if (item.type === "resource") return "resource"
      if (item.recent) return "recent"
      return "file"
    },
    sortGroupsBy: (a, b) => {
      const rank = (category: string) => {
-        if (category === "reference") return 0
-        if (category === "agent") return 1
-        if (category === "resource") return 2
-        if (category === "recent") return 3
-        return 4
+        if (category === "agent") return 0
+        if (category === "recent") return 1
+        return 2
      }
      return rank(a.category) - rank(b.category)
    },
@@ -831,17 +746,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    const pill = document.createElement("span")
    pill.textContent = part.content
    pill.setAttribute("data-type", part.type)
-    if (part.type === "file") {
-      pill.setAttribute("data-path", part.path)
-      if (part.mime) pill.setAttribute("data-mime", part.mime)
-      if (part.filename) pill.setAttribute("data-filename", part.filename)
-      if (part.url) pill.setAttribute("data-url", part.url)
-      if (part.source?.type === "resource") {
-        pill.setAttribute("data-source-type", part.source.type)
-        pill.setAttribute("data-source-client-name", part.source.clientName)
-        pill.setAttribute("data-source-uri", part.source.uri)
-      }
-    }
+    if (part.type === "file") pill.setAttribute("data-path", part.path)
    if (part.type === "agent") pill.setAttribute("data-name", part.name)
    pill.setAttribute("contenteditable", "false")
    pill.style.userSelect = "text"
@@ -956,29 +861,12 @@ export const PromptInput: Component<PromptInputProps> = (props) => {

    const pushFile = (file: HTMLElement) => {
      const content = file.textContent ?? ""
-      const source =
-        file.dataset.sourceType === "resource" && file.dataset.sourceClientName && file.dataset.sourceUri
-          ? {
-              type: "resource" as const,
-              text: {
-                value: content,
-                start: position,
-                end: position + content.length,
-              },
-              clientName: file.dataset.sourceClientName,
-              uri: file.dataset.sourceUri,
-            }
-          : undefined
      parts.push({
        type: "file",
        path: file.dataset.path!,
        content,
        start: position,
        end: position + content.length,
-        ...(file.dataset.mime ? { mime: file.dataset.mime } : {}),
-        ...(file.dataset.filename ? { filename: file.dataset.filename } : {}),
-        ...(file.dataset.url ? { url: file.dataset.url } : {}),
-        ...(source ? { source } : {}),
      })
      position += content.length
    }
@@ -1482,7 +1370,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    model: props.controls.model.selection,
    providerID: props.controls.model.selection.current()?.provider?.id,
    modelName: props.controls.model.selection.current()?.name ?? language.t("dialog.model.select.title"),
-    newLayoutDesigns: props.controls.newLayoutDesigns,
    style: control(),
    onClose: restoreFocus,
    onUnpaidClick: () => {
@@ -1493,11 +1380,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
  }))

  const newSession = () => props.variant === "new-session"
-  const bindEditorRef = (el: HTMLDivElement) => {
-    editorRef = el
-    restoreEndOnFocus = true
-    props.ref?.(el)
-  }
  const showAgentControl = createMemo(() => props.controls.agents.visible && props.controls.agents.options.length > 0)
  const agentControlState = createMemo<ComposerAgentControlState>(() => ({
    title: language.t("command.agent.cycle"),
@@ -1581,7 +1463,10 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                <div class="relative max-h-[180px] overflow-y-auto no-scrollbar" ref={(el) => (scrollRef = el)}>
                  <div
                    data-component="prompt-input"
-                    ref={bindEditorRef}
+                    ref={(el) => {
+                      editorRef = el
+                      props.ref?.(el)
+                    }}
                    role="textbox"
                    aria-multiline="true"
                    aria-label={designPlaceholder()}
@@ -1596,7 +1481,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                    onPaste={handlePaste}
                    onCompositionStart={handleCompositionStart}
                    onCompositionEnd={handleCompositionEnd}
-                    onFocus={handleFocus}
                    onBlur={handleBlur}
                    onKeyDown={handleKeyDown}
                    classList={{
@@ -1617,7 +1501,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                </div>
              </div>
              <div class="flex h-11 items-center px-2">
-                <div class="flex min-w-0 flex-1 items-center gap-1">
+                <div class="flex min-w-0 flex-1 items-center gap-0">
                  {fileAttachmentInput()}
                  <TooltipV2
                    placement="top"
@@ -1649,7 +1533,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                  <Show when={!providersLoading() && store.mode !== "shell" && showVariantControl()}>
                    <div
                      data-component="prompt-variant-control"
-                      class="[&_[data-action=prompt-model-variant]]:![font-weight:440]"
                      classList={{
                        "animate-in fade-in": providersShouldFadeIn(),
                        "hidden group-hover/prompt-input:block group-focus-within/prompt-input:block":
@@ -1666,45 +1549,22 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                          </>
                        }
                      >
-                        <MenuV2
-                          gutter={6}
-                          modal={false}
-                          placement="top-start"
+                        <Select
+                          size="normal"
+                          options={variants()}
+                          current={props.controls.model.selection.variant.current() ?? "default"}
+                          label={(x) => (x === "default" ? language.t("common.default") : x)}
                          onOpenChange={(open) => setStore("variantOpen", open)}
-                        >
-                          <MenuV2.Trigger
-                            as={ButtonV2}
-                            data-action="prompt-model-variant"
-                            variant="ghost-muted"
-                            size="normal"
-                            class="max-w-[160px] justify-start capitalize"
-                            style={control()}
-                          >
-                            <span class="truncate">
-                              {props.controls.model.selection.variant.current() ?? language.t("common.default")}
-                            </span>
-                            <span class="-ml-0.5 -mr-1 flex shrink-0">
-                              <Icon name="chevron-down" size="small" />
-                            </span>
-                          </MenuV2.Trigger>
-                          <MenuV2.Portal>
-                            <MenuV2.Content>
-                              <MenuV2.RadioGroup
-                                value={props.controls.model.selection.variant.current() ?? "default"}
-                                onChange={(value) => {
-                                  props.controls.model.selection.variant.set(value === "default" ? undefined : value)
-                                  restoreFocus()
-                                }}
-                              >
-                                {variants().map((value) => (
-                                  <MenuV2.RadioItem value={value} class="capitalize">
-                                    {value === "default" ? language.t("common.default") : value}
-                                  </MenuV2.RadioItem>
-                                ))}
-                              </MenuV2.RadioGroup>
-                            </MenuV2.Content>
-                          </MenuV2.Portal>
-                        </MenuV2>
+                          onSelect={(value) => {
+                            props.controls.model.selection.variant.set(value === "default" ? undefined : value)
+                            restoreFocus()
+                          }}
+                          class="capitalize max-w-[160px] justify-start text-v2-text-text-faint"
+                          valueClass="truncate text-[13px] font-[440] leading-5 text-v2-text-text-faint"
+                          triggerStyle={control()}
+                          triggerProps={{ "data-action": "prompt-model-variant" }}
+                          variant="ghost"
+                        />
                      </TooltipV2>
                    </div>
                  </Show>
@@ -1784,7 +1644,10 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
              >
                <div
                  data-component="prompt-input"
-                  ref={bindEditorRef}
+                  ref={(el) => {
+                    editorRef = el
+                    props.ref?.(el)
+                  }}
                  role="textbox"
                  aria-multiline="true"
                  aria-label={placeholder()}
@@ -1799,7 +1662,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                  onPaste={handlePaste}
                  onCompositionStart={handleCompositionStart}
                  onCompositionEnd={handleCompositionEnd}
-                  onFocus={handleFocus}
                  onBlur={handleBlur}
                  onKeyDown={handleKeyDown}
                  classList={{
@@ -2084,7 +1946,6 @@ type ComposerModelControlState = {
  model: ReturnType<typeof useLocal>["model"]
  providerID?: string
  modelName: string
-  newLayoutDesigns: boolean
  style: JSX.CSSProperties | undefined
  onClose: () => void
  onUnpaidClick: () => void
@@ -2175,65 +2036,36 @@ function ComposerModelControl(props: { state: ComposerModelControlState }) {
            </>
          }
        >
-          <Show
-            when={props.state.newLayoutDesigns}
-            fallback={
-              <ModelSelectorPopover
-                model={props.state.model}
-                triggerAs={Button}
-                triggerProps={{
-                  variant: "ghost",
-                  size: "normal",
-                  style: props.state.style,
-                  class:
-                    "min-w-0 max-w-[220px] justify-start text-[13px] font-[440] leading-5 text-v2-text-text-faint group",
-                  classList: { "animate-in fade-in": props.state.shouldAnimate },
-                  "data-action": "prompt-model",
-                }}
-                onClose={props.state.onClose}
-              >
-                <ModelControlContent state={props.state} />
-              </ModelSelectorPopover>
-            }
+          <ModelSelectorPopover
+            model={props.state.model}
+            triggerAs={Button}
+            triggerProps={{
+              variant: "ghost",
+              size: "normal",
+              style: props.state.style,
+              class:
+                "min-w-0 max-w-[220px] justify-start text-[13px] font-[440] leading-5 text-v2-text-text-faint group",
+              classList: { "animate-in fade-in": props.state.shouldAnimate },
+              "data-action": "prompt-model",
+            }}
+            onClose={props.state.onClose}
          >
-            <ModelSelectorPopoverV2
-              model={props.state.model}
-              triggerAs={ButtonV2}
-              triggerProps={{
-                variant: "ghost-muted",
-                size: "normal",
-                style: props.state.style,
-                class: "min-w-0 max-w-[220px] justify-start ![font-weight:440] group",
-                classList: { "animate-in fade-in": props.state.shouldAnimate },
-                "data-action": "prompt-model",
-              }}
-              onClose={props.state.onClose}
-            >
-              <ModelControlContent state={props.state} v2 />
-            </ModelSelectorPopoverV2>
-          </Show>
+            <Show when={props.state.providerID}>
+              {(providerID) => (
+                <ProviderIcon
+                  id={providerID()}
+                  class="size-4 shrink-0 opacity-40 group-hover:opacity-100 transition-opacity duration-150"
+                  style={{ "will-change": "opacity", transform: "translateZ(0)" }}
+                />
+              )}
+            </Show>
+            <span class="truncate">{props.state.modelName}</span>
+            <span class="-ml-1 shrink-0 flex size-fit">
+              <Icon name="chevron-down" size="small" class="text-v2-icon-icon-muted" />
+            </span>
+          </ModelSelectorPopover>
        </TooltipV2>
      </Show>
    </Show>
  )
 }
-
-function ModelControlContent(props: { state: ComposerModelControlState; v2?: boolean }) {
-  return (
-    <>
-      <Show when={props.state.providerID}>
-        {(providerID) => (
-          <ProviderIcon
-            id={providerID()}
-            class="size-4 shrink-0 opacity-40 group-hover:opacity-100 transition-opacity duration-150"
-            style={{ "will-change": "opacity", transform: "translateZ(0)" }}
-          />
-        )}
-      </Show>
-      <span class="truncate">{props.state.modelName}</span>
-      <span class={props.v2 ? "-ml-0.5 -mr-1 flex shrink-0" : "-ml-1 shrink-0 flex size-fit"}>
-        <Icon name="chevron-down" size="small" class="text-v2-icon-icon-muted" />
-      </span>
-    </>
-  )
-}
@@ -100,41 +100,6 @@ describe("buildRequestParts", () => {
    )
  })

-  test("preserves reference aliases as directory file parts", () => {
-    const result = buildRequestParts({
-      prompt: [
-        {
-          type: "file",
-          path: "/repo/../docs",
-          content: "@docs",
-          start: 0,
-          end: 5,
-          mime: "application/x-directory",
-          filename: "docs",
-        },
-      ],
-      context: [],
-      images: [],
-      text: "@docs",
-      messageID: "msg_reference",
-      sessionID: "ses_reference",
-      sessionDirectory: "/repo/app",
-    })
-
-    const filePart = result.requestParts.find((part) => part.type === "file")
-    expect(filePart).toBeDefined()
-    if (filePart?.type === "file") {
-      expect(filePart.mime).toBe("application/x-directory")
-      expect(filePart.filename).toBe("docs")
-      expect(filePart.url).toBe("file:///repo/../docs")
-      expect(filePart.source?.type).toBe("file")
-      if (filePart.source?.type === "file") {
-        expect(filePart.source.path).toBe("/repo/../docs")
-        expect(filePart.source.text.value).toBe("@docs")
-      }
-    }
-  })
-
  test("deduplicates context files when prompt already includes same path", () => {
    const prompt: Prompt = [{ type: "file", path: "src/foo.ts", content: "@src/foo.ts", start: 0, end: 11 }]

@@ -99,31 +99,21 @@ export function buildRequestParts(input: BuildRequestPartsInput) {

  const files = input.prompt.filter(isFileAttachment).map((attachment) => {
    const path = absolute(input.sessionDirectory, attachment.path)
-    const source = attachment.source
-      ? {
-          ...attachment.source,
-          text: {
-            value: attachment.content,
-            start: attachment.start,
-            end: attachment.end,
-          },
-        }
-      : {
-          type: "file" as const,
-          text: {
-            value: attachment.content,
-            start: attachment.start,
-            end: attachment.end,
-          },
-          path,
-        }
    return {
      id: Identifier.ascending("part"),
      type: "file",
-      mime: attachment.mime ?? "text/plain",
-      url: attachment.url ?? `file://${encodeFilePath(path)}${fileQuery(attachment.selection)}`,
-      filename: attachment.filename ?? getFilename(attachment.path),
-      source,
+      mime: "text/plain",
+      url: `file://${encodeFilePath(path)}${fileQuery(attachment.selection)}`,
+      filename: getFilename(attachment.path),
+      source: {
+        type: "file",
+        text: {
+          value: attachment.content,
+          start: attachment.start,
+          end: attachment.end,
+        },
+        path,
+      },
    } satisfies PromptRequestPart
  })

@@ -37,7 +37,7 @@ export const PromptContextItems: Component<ContextItemsProps> = (props) => {
                  </span>
                }
                placement="top"
-                openDelay={800}
+                openDelay={2000}
              >
                <div
                  classList={{
@@ -7,16 +7,6 @@ import { getDirectory, getFilename } from "@opencode-ai/core/util/path"

 export type AtOption =
  | { type: "agent"; name: string; display: string }
-  | {
-      type: "resource"
-      name: string
-      uri: string
-      client: string
-      display: string
-      description?: string
-      mime?: string
-    }
-  | { type: "reference"; name: string; path: string; display: string; description: string }
  | { type: "file"; path: string; display: string; recent?: boolean }

 export interface SlashCommand {
@@ -113,94 +103,6 @@ export const PromptPopover: Component<PromptPopoverProps> = (props) => {
                    )
                  }

-                  if (item.type === "resource") {
-                    return (
-                      <button
-                        class="w-full flex items-center gap-x-2 px-2 py-0.5"
-                        classList={{
-                          "rounded-[4px]": props.newLayoutDesigns,
-                          "rounded-md": !props.newLayoutDesigns,
-                          "bg-v2-overlay-simple-overlay-hover": props.newLayoutDesigns && props.atActive === key,
-                          "bg-surface-raised-base-hover": !props.newLayoutDesigns && props.atActive === key,
-                        }}
-                        onClick={() => props.onAtSelect(item)}
-                        onPointerMove={() => props.setAtActive(key)}
-                      >
-                        <FileIcon node={{ path: item.uri, type: "file" }} class="shrink-0 size-4" />
-                        <div
-                          class="flex items-center min-w-0"
-                          classList={{
-                            "text-[13px] leading-[calc(var(--font-size-base)*1.8)] tracking-[-0.04px] [font-weight:440]":
-                              props.newLayoutDesigns,
-                            "text-14-regular": !props.newLayoutDesigns,
-                          }}
-                        >
-                          <span
-                            class="text-text-strong whitespace-nowrap"
-                            classList={{ "text-v2-text-text-base": props.newLayoutDesigns }}
-                          >
-                            @{item.name}
-                          </span>
-                          <Show when={item.description}>
-                            {(description) => (
-                              <span
-                                class="whitespace-nowrap truncate min-w-0 ml-2"
-                                classList={{
-                                  "text-v2-text-text-muted": props.newLayoutDesigns,
-                                  "text-text-weak": !props.newLayoutDesigns,
-                                }}
-                              >
-                                {description()}
-                              </span>
-                            )}
-                          </Show>
-                        </div>
-                      </button>
-                    )
-                  }
-
-                  if (item.type === "reference") {
-                    return (
-                      <button
-                        class="w-full flex items-center gap-x-2 px-2 py-0.5"
-                        classList={{
-                          "rounded-[4px]": props.newLayoutDesigns,
-                          "rounded-md": !props.newLayoutDesigns,
-                          "bg-v2-overlay-simple-overlay-hover": props.newLayoutDesigns && props.atActive === key,
-                          "bg-surface-raised-base-hover": !props.newLayoutDesigns && props.atActive === key,
-                        }}
-                        onClick={() => props.onAtSelect(item)}
-                        onPointerMove={() => props.setAtActive(key)}
-                      >
-                        <FileIcon node={{ path: item.path, type: "directory" }} class="shrink-0 size-4" />
-                        <div
-                          class="flex items-center min-w-0"
-                          classList={{
-                            "text-[13px] leading-[calc(var(--font-size-base)*1.8)] tracking-[-0.04px] [font-weight:440]":
-                              props.newLayoutDesigns,
-                            "text-14-regular": !props.newLayoutDesigns,
-                          }}
-                        >
-                          <span
-                            class="text-text-strong whitespace-nowrap"
-                            classList={{ "text-v2-text-text-base": props.newLayoutDesigns }}
-                          >
-                            @{item.name}
-                          </span>
-                          <span
-                            class="whitespace-nowrap truncate min-w-0 ml-2"
-                            classList={{
-                              "text-v2-text-text-muted": props.newLayoutDesigns,
-                              "text-text-weak": !props.newLayoutDesigns,
-                            }}
-                          >
-                            {item.description}
-                          </span>
-                        </div>
-                      </button>
-                    )
-                  }
-
                  const isDirectory = item.path.endsWith("/")
                  const directory = isDirectory ? item.path : getDirectory(item.path)
                  const filename = isDirectory ? "" : getFilename(item.path)
@@ -92,17 +92,11 @@ export function PromptWorkspaceSelector(props: {
          </MenuV2.Content>
        </MenuV2.Portal>
      </MenuV2>
-      <Show when={props.branch}>
-        {(branch) => (
-          <>
-            <span class="hidden select-none opacity-50 sm:inline mx-1">/</span>
-            <div class="flex h-7 min-w-0 max-w-[220px] items-center gap-1.5 px-2 text-[13px] font-[440] leading-5 tracking-[-0.04px]">
-              <Icon name="branch" size="small" class="shrink-0 text-v2-icon-icon-muted" />
-              <span class="min-w-0 truncate">{branch()}</span>
-            </div>
-          </>
-        )}
-      </Show>
+      <span class="hidden select-none opacity-50 sm:inline mx-1">/</span>
+      <div class="flex h-7 min-w-0 max-w-[220px] items-center gap-1.5 px-2 text-[13px] font-[440] leading-5 tracking-[-0.04px]">
+        <Icon name="branch" size="small" class="shrink-0 text-v2-icon-icon-muted" />
+        <span class="min-w-0 truncate">{props.branch || "main"}</span>
+      </div>
    </>
  )
 }
@@ -1,9 +1,9 @@
-import { Match, Show, Switch, createMemo, type ComponentProps, type JSX } from "solid-js"
+import { Match, Show, Switch, createMemo } from "solid-js"
+import { Tooltip, type TooltipProps } from "@opencode-ai/ui/tooltip"
 import { ProgressCircle } from "@opencode-ai/ui/progress-circle"
 import { ProgressCircleV2 } from "@opencode-ai/ui/v2/progress-circle-v2"
 import { Button } from "@opencode-ai/ui/button"
 import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
-import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"

 import { useFile } from "@/context/file"
 import { useLayout } from "@/context/layout"
@@ -18,16 +18,7 @@ import { createSessionTabs } from "@/pages/session/helpers"
 interface SessionContextUsageProps {
  variant?: "button" | "indicator"
  buttonAppearance?: "default" | "v2"
-  placement?: ComponentProps<typeof TooltipV2>["placement"]
-}
-
-function ContextTooltipRow(props: { name: JSX.Element; value: JSX.Element }) {
-  return (
-    <div class="flex min-w-0 items-center gap-4">
-      <span class="shrink-0 text-v2-text-text-muted">{props.name}</span>
-      <span class="ml-auto min-w-0 truncate text-right text-v2-text-text-base">{props.value}</span>
-    </div>
-  )
+  placement?: TooltipProps["placement"]
 }

 function openSessionContext(args: {
@@ -35,7 +26,7 @@ function openSessionContext(args: {
  layout: ReturnType<typeof useLayout>
  tabs: ReturnType<ReturnType<typeof useLayout>["tabs"]>
 }) {
-  args.view.reviewPanel.open(args.view.reviewPanel.opened() ? "other" : "context-button")
+  if (!args.view.reviewPanel.opened()) args.view.reviewPanel.open()
  if (args.layout.fileTree.opened() && args.layout.fileTree.tab() !== "all") args.layout.fileTree.setTab("all")
  void args.tabs.open("context")
  args.tabs.setActive("context")
@@ -73,25 +64,16 @@ export function SessionContextUsage(props: SessionContextUsageProps) {
  const cost = createMemo(() => {
    return usd().format(info()?.cost ?? 0)
  })
-  const contextVisible = createMemo(() => view().reviewPanel.opened() && tabState.activeTab() === "context")
-  const hasOtherTabs = createMemo(() =>
-    tabs()
-      .all()
-      .some((tab) => tab !== "context" && tab !== "review"),
-  )

  const openContext = () => {
    if (!params.id) return

-    const sessionView = view()
-    if (contextVisible()) {
+    if (tabState.activeTab() === "context") {
      tabs().close("context")
-      if (sessionView.reviewPanel.source() === "context-button" && !hasOtherTabs()) sessionView.reviewPanel.close()
      return
    }
-
    openSessionContext({
-      view: sessionView,
+      view: view(),
      layout,
      tabs: tabs(),
    })
@@ -99,20 +81,7 @@ export function SessionContextUsage(props: SessionContextUsageProps) {

  const circle = () => (
    <div class="flex items-center justify-center">
-      <ProgressCircle
-        size={16}
-        strokeWidth={2}
-        percentage={context()?.usage ?? 0}
-        style={
-          variant() === "indicator"
-            ? {
-                "--progress-circle-background": "var(--v2-background-bg-layer-04, var(--border-weak-base))",
-                "--progress-circle-background-overlay": "var(--v2-overlay-simple-overlay-pressed, transparent)",
-                "--progress-circle-progress": "var(--v2-icon-icon-base, var(--icon-base))",
-              }
-            : undefined
-        }
-      />
+      <ProgressCircle size={16} strokeWidth={2} percentage={context()?.usage ?? 0} />
    </div>
  )
  const circleV2 = () => (
@@ -122,19 +91,35 @@ export function SessionContextUsage(props: SessionContextUsageProps) {
  )

  const tooltipValue = () => (
-    <div class="flex w-[120px] flex-col gap-2">
-      <ContextTooltipRow name={language.t("context.usage.cost")} value={cost()} />
-      <ContextTooltipRow name={language.t("context.usage.usage")} value={`${context()?.usage ?? 0}%`} />
-      <ContextTooltipRow
-        name={language.t("context.usage.tokens")}
-        value={getSessionTokenTotal(tokens())?.toLocaleString(language.intl()) ?? "0"}
-      />
+    <div>
+      <Show when={tokens()}>
+        {(value) => (
+          <div class="flex items-center gap-2">
+            <span class="text-text-invert-strong">
+              {getSessionTokenTotal(value())?.toLocaleString(language.intl())}
+            </span>
+            <span class="text-text-invert-base">{language.t("context.usage.tokens")}</span>
+          </div>
+        )}
+      </Show>
+      <Show when={context()}>
+        {(ctx) => (
+          <div class="flex items-center gap-2">
+            <span class="text-text-invert-strong">{ctx().usage ?? 0}%</span>
+            <span class="text-text-invert-base">{language.t("context.usage.usage")}</span>
+          </div>
+        )}
+      </Show>
+      <div class="flex items-center gap-2">
+        <span class="text-text-invert-strong">{cost()}</span>
+        <span class="text-text-invert-base">{language.t("context.usage.cost")}</span>
+      </div>
    </div>
  )

  return (
    <Show when={params.id}>
-      <TooltipV2 value={tooltipValue()} placement={props.placement ?? "top"} shift={-8}>
+      <Tooltip value={tooltipValue()} placement={props.placement ?? "top"}>
        <Switch>
          <Match when={variant() === "indicator"}>{circle()}</Match>
          <Match when={buttonAppearance() === "v2"}>
@@ -159,7 +144,7 @@ export function SessionContextUsage(props: SessionContextUsageProps) {
            </Button>
          </Match>
        </Switch>
-      </TooltipV2>
+      </Tooltip>
    </Show>
  )
 }
@@ -541,7 +541,6 @@ function SessionHeaderV2Actions(props: { state: SessionHeaderV2ActionsState }) {
      </Show>
      <Show when={props.state.reviewVisible}>
        <TooltipV2
-          class="shrink-0"
          placement="bottom"
          value={
            <>
@@ -21,7 +21,7 @@
  position: relative;
 }

-[data-titlebar-tab-slot]:not(:first-child):not([data-active="true"])::before {
+[data-titlebar-tab-slot]:not(:first-child)::before {
  content: "";
  position: absolute;
  top: 8px;
@@ -32,10 +32,6 @@
  background: var(--v2-background-bg-layer-02);
 }

-[data-titlebar-tab-slot][data-active="true"] + [data-titlebar-tab-slot]::before {
-  display: none;
-}
-
 [data-titlebar-tab] [data-slot="tab-close"]::before {
  content: "";
  position: absolute;
@@ -5,24 +5,19 @@ import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
 import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
 import { useGlobal } from "@/context/global"
 import { useLanguage } from "@/context/language"
-import { ServerConnection, serverName } from "@/context/server"
-import { displayName, projectForSession } from "@/pages/layout/helpers"
+import { ServerConnection } from "@/context/server"
+import { projectForSession } from "@/pages/layout/helpers"
 import { SessionTabAvatar } from "@/pages/layout/session-tab-avatar"
 import { showToast } from "@/utils/toast"
 import type { Session } from "@opencode-ai/sdk/v2"
 import { canOpenTabRename, forwardTabRef } from "./titlebar-tab-gesture"
-import { TabPreviewPopover } from "./titlebar-tab-popover"
 import "./titlebar-tab-nav.css"

-// MouseEvent.button uses 1 for the middle/wheel button.
-const MIDDLE_MOUSE_BUTTON = 1
-
 export function TabNavItem(props: {
  ref?: Ref<HTMLDivElement>
  href: string
  server: ServerConnection.Key
  session: () => Session | undefined
-  fallbackTitle?: string
  onTitleChange?: (title: string) => void
  onTitleChangeFailed?: (title: string) => void
  onClose: () => void
@@ -58,33 +53,6 @@ export function TabNavItem(props: {
    if (!session) return
    return projectForSession(session, serverCtx()?.projects.list() ?? [])
  })
-  const title = createMemo(() => props.session()?.title ?? props.fallbackTitle)
-
-  const projectName = createMemo(() => {
-    const session = props.session()
-    if (!session) return
-    return displayName(project() ?? { worktree: session.directory })
-  })
-  const previewPath = createMemo(() => {
-    const session = props.session()
-    if (!session) return
-    const home = serverCtx()?.sync.data.path.home
-    return home ? session.directory.replace(home, "~") : session.directory
-  })
-  const branch = createMemo(() => {
-    const session = props.session()
-    if (!session) return
-    return serverCtx()?.sync.child(session.directory, { bootstrap: false })[0].vcs?.branch
-  })
-  // Only label the server when multiple servers are connected.
-  const serverLabel = createMemo(() => {
-    if (global.servers.list().length <= 1) return
-    const conn = global.servers.list().find((item) => ServerConnection.key(item) === props.server)
-    return conn ? serverName(conn) : undefined
-  })
-
-  const [popoverOpen, setPopoverOpen] = createSignal(false)
-  const previewBlocked = () => !!props.dragging || editing() || !!props.pressed || !props.session()

  const measureTitleOverflow = () => {
    if (!titleEl || editing()) {
@@ -103,7 +71,7 @@ export function TabNavItem(props: {
  }

  createEffect(() => {
-    title()
+    props.session()?.title
    props.forceTruncate
    editing()
    scheduleTitleOverflow()
@@ -162,9 +130,9 @@ export function TabNavItem(props: {
  createEffect(() => {
    if (editing()) return
    if (!titleEl) return
-    const value = title()
-    if (value === undefined) return
-    titleEl.textContent = value
+    const title = props.session()?.title
+    if (title === undefined) return
+    titleEl.textContent = title
  })

  const openRename = (event: MouseEvent) => {
@@ -200,7 +168,7 @@ export function TabNavItem(props: {
    onCleanup(cleanup)
  })

-  const tab = (
+  return (
    <div
      ref={(el) => {
        tabRoot = el
@@ -216,35 +184,30 @@ export function TabNavItem(props: {
      data-dragging={props.dragging}
      data-pressed={props.pressed}
      onMouseDown={(event) => {
-        if (event.button !== MIDDLE_MOUSE_BUTTON) return
-        event.preventDefault()
-        event.stopPropagation()
-      }}
-      onAuxClick={(event) => {
-        if (event.button !== MIDDLE_MOUSE_BUTTON) return
+        if (event.button !== 1) return
        closeTab(event)
      }}
    >
-      <Show when={title() !== undefined}>
-        <a
-          data-slot="tab-link"
-          data-titlebar-tab-link
-          href={props.href}
-          draggable={false}
-          onDragStart={(event) => {
-            event.preventDefault()
-            event.stopPropagation()
-          }}
-          onClick={(event) => {
-            event.preventDefault()
-            if (editing()) return
-            if (props.suppressNavigation?.()) return
-            props.onNavigate()
-          }}
-          class="flex h-full min-w-0 flex-1 flex-row items-center gap-1.5 text-[13px] font-medium text-v2-text-text-faint group-data-[active='true']:text-v2-text-text-base group-data-[editing='true']:text-v2-text-text-base [-webkit-user-drag:none]"
-        >
-          <Show when={props.session()}>
-            {(session) => (
+      <Show when={props.session()}>
+        {(session) => {
+          return (
+            <a
+              data-slot="tab-link"
+              data-titlebar-tab-link
+              href={props.href}
+              draggable={false}
+              onDragStart={(event) => {
+                event.preventDefault()
+                event.stopPropagation()
+              }}
+              onClick={(event) => {
+                event.preventDefault()
+                if (editing()) return
+                if (props.suppressNavigation?.()) return
+                props.onNavigate()
+              }}
+              class="flex h-full min-w-0 flex-1 flex-row items-center gap-1.5 text-[13px] font-medium text-v2-text-text-faint group-data-[active='true']:text-v2-text-text-base group-data-[editing='true']:text-v2-text-text-base [-webkit-user-drag:none]"
+            >
              <span data-slot="project-avatar-slot">
                <SessionTabAvatar
                  project={project()}
@@ -253,45 +216,45 @@ export function TabNavItem(props: {
                  activeServer={props.activeServer}
                />
              </span>
-            )}
-          </Show>
-          <span
-            ref={(el) => {
-              titleEl = el
-              titleEl.textContent = title() ?? ""
-            }}
-            data-slot="tab-title"
-            data-titlebar-tab-title
-            class="min-w-0 flex-1 outline-none leading-4"
-            classList={{
-              "overflow-hidden text-clip whitespace-nowrap": !editing(),
-              "select-text": editing(),
-            }}
-            contenteditable={editing() ? true : undefined}
-            onDblClick={openRename}
-            onKeyDown={(event) => {
-              event.stopPropagation()
-              if (event.key === "Enter") {
-                event.preventDefault()
-                void closeRename(true)
-                return
-              }
-              if (event.key !== "Escape") return
-              event.preventDefault()
-              titleEl.textContent = props.session()?.title ?? ""
-              void closeRename(false)
-            }}
-            onBlur={() => void closeRename(true)}
-            onPointerDown={(event) => {
-              if (!editing()) return
-              event.stopPropagation()
-            }}
-            onClick={(event) => {
-              if (!editing()) return
-              event.preventDefault()
-            }}
-          />
-        </a>
+              <span
+                ref={(el) => {
+                  titleEl = el
+                  titleEl.textContent = session().title
+                }}
+                data-slot="tab-title"
+                data-titlebar-tab-title
+                class="min-w-0 flex-1 outline-none leading-4"
+                classList={{
+                  "overflow-hidden text-clip whitespace-nowrap": !editing(),
+                  "select-text": editing(),
+                }}
+                contenteditable={editing() ? true : undefined}
+                onDblClick={openRename}
+                onKeyDown={(event) => {
+                  event.stopPropagation()
+                  if (event.key === "Enter") {
+                    event.preventDefault()
+                    void closeRename(true)
+                    return
+                  }
+                  if (event.key !== "Escape") return
+                  event.preventDefault()
+                  titleEl.textContent = session().title
+                  void closeRename(false)
+                }}
+                onBlur={() => void closeRename(true)}
+                onPointerDown={(event) => {
+                  if (!editing()) return
+                  event.stopPropagation()
+                }}
+                onClick={(event) => {
+                  if (!editing()) return
+                  event.preventDefault()
+                }}
+              />
+            </a>
+          )
+        }}
      </Show>

      <div data-slot="tab-close" class="group-hover:bg-[var(--tab-bg)] group-data-[active=true]:bg-[var(--tab-bg)]">
@@ -309,24 +272,6 @@ export function TabNavItem(props: {
      </div>
    </div>
  )
-
-  return (
-    <TabPreviewPopover
-      trigger={tab}
-      open={popoverOpen() && !previewBlocked()}
-      onOpenChange={(value) => {
-        if (value && previewBlocked()) return
-        setPopoverOpen(value)
-      }}
-      data={{
-        projectName: projectName(),
-        title: props.session()?.title,
-        path: previewPath(),
-        branch: branch(),
-        serverName: serverLabel(),
-      }}
-    />
-  )
 }

 export function DraftTabItem(props: {
@@ -357,12 +302,7 @@ export function DraftTabItem(props: {
      class="group relative flex h-7 w-full min-w-0 flex-row items-center gap-1.5 overflow-hidden rounded-[6px] bg-[var(--tab-bg)] px-1.5 [container-type:inline-size] whitespace-nowrap [--tab-bg:var(--v2-background-bg-deep)] hover:[--tab-bg:var(--v2-background-bg-layer-02)] has-[>a:focus-visible]:[--tab-bg:var(--v2-background-bg-layer-02)] data-[active='true']:[--tab-bg:var(--v2-background-bg-layer-02)] data-[dragging='true']:[--tab-bg:var(--v2-background-bg-layer-02)] data-[pressed='true']:[--tab-bg:var(--v2-background-bg-layer-02)] data-[editing='true']:[--tab-bg:var(--v2-background-bg-layer-02)]"
      classList={{ invisible: props.hidden }}
      onMouseDown={(event) => {
-        if (event.button !== MIDDLE_MOUSE_BUTTON) return
-        event.preventDefault()
-        event.stopPropagation()
-      }}
-      onAuxClick={(event) => {
-        if (event.button !== MIDDLE_MOUSE_BUTTON) return
+        if (event.button !== 1) return
        closeTab(event)
      }}
    >
@@ -1,133 +0,0 @@
-[data-component="session-tab-popover-trigger"] {
-  display: flex;
-  width: 100%;
-  min-width: 0;
-}
-
-[data-component="session-tab-popover"] {
-  z-index: 50;
-  box-sizing: border-box;
-  width: 256px;
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-  padding: 12px;
-
-  background: var(--v2-background-bg-base);
-  border-radius: 6px;
-  box-shadow: var(--v2-elevation-floating);
-
-  color: var(--v2-text-text-base);
-  font-variant-numeric: tabular-nums;
-  user-select: none;
-  pointer-events: none;
-
-  transform-origin: var(--kb-hovercard-content-transform-origin);
-  /* Entrance: fade in while scaling up from 0.96 to 1.0. */
-  animation: sessionTabPopoverIn 150ms cubic-bezier(0.16, 1, 0.3, 1);
-
-  &:focus-visible,
-  &:focus-within {
-    outline: none;
-  }
-
-  /* Exit: subtle fade + scale down, using the same ease-out curve as entry. */
-  &[data-closed] {
-    animation: sessionTabPopoverOut 100ms cubic-bezier(0.16, 1, 0.3, 1) forwards;
-  }
-
-  [data-slot="header"] {
-    display: flex;
-    flex-direction: column;
-    gap: 8px;
-    width: 100%;
-  }
-
-  [data-slot="project"] {
-    font-weight: 440;
-    font-size: 13px;
-    line-height: 1;
-    letter-spacing: -0.04px;
-    color: var(--v2-text-text-muted);
-  }
-
-  [data-slot="title"] {
-    font-weight: 530;
-    font-size: 13px;
-    line-height: 1.2;
-    letter-spacing: -0.04px;
-    color: var(--v2-text-text-base);
-    overflow-wrap: anywhere;
-  }
-
-  [data-slot="row"] {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    width: 100%;
-    min-width: 0;
-  }
-
-  [data-slot="icon"] {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-shrink: 0;
-    width: 16px;
-    height: 16px;
-    color: var(--v2-icon-icon-muted);
-  }
-
-  [data-slot="detail"] {
-    flex: 1 0 0;
-    min-width: 0;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    font-weight: 440;
-    font-size: 13px;
-    line-height: 1;
-    letter-spacing: -0.04px;
-    color: var(--v2-text-text-muted);
-  }
-
-  [data-slot="server"] {
-    font-weight: 440;
-    font-size: 13px;
-    line-height: 1;
-    letter-spacing: -0.04px;
-    color: var(--v2-text-text-muted);
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-}
-
-@keyframes sessionTabPopoverIn {
-  from {
-    opacity: 0;
-    transform: scale(0.96);
-  }
-  to {
-    opacity: 1;
-    transform: scale(1);
-  }
-}
-
-@keyframes sessionTabPopoverOut {
-  from {
-    opacity: 1;
-    transform: scale(1);
-  }
-  to {
-    opacity: 0;
-    transform: scale(0.96);
-  }
-}
-
-@media (prefers-reduced-motion: reduce) {
-  [data-component="session-tab-popover"],
-  [data-component="session-tab-popover"][data-closed] {
-    animation: none;
-  }
-}
@@ -1,99 +0,0 @@
-import { HoverCard as Kobalte } from "@kobalte/core/hover-card"
-import { Show, type JSXElement } from "solid-js"
-import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
-import "./titlebar-tab-popover.css"
-
-// Initial hover delay before the preview appears, per design.
-const OPEN_DELAY = 200
-// Mouse-out delay: begin closing immediately (a brief exit animation plays).
-const CLOSE_DELAY = 0
-// After a preview closes, hovering a neighbouring tab within this window skips
-// the open delay — mirrors the tooltip's skipDelayDuration so moving across
-// tabs doesn't re-wait the full delay each time.
-const SKIP_WINDOW = 300
-let lastClosedAt = 0
-
-export interface TabPreviewData {
-  projectName?: string
-  title?: string
-  path?: string
-  branch?: string
-  serverName?: string
-}
-
-export function TabPreviewPopover(props: {
-  trigger: JSXElement
-  open: boolean
-  onOpenChange: (open: boolean) => void
-  data: TabPreviewData
-}) {
-  let triggerEl: HTMLDivElement | undefined
-
-  // Kobalte reads openDelay lazily when the pointer enters the trigger, so this
-  // resolves the skip window per-hover.
-  const resolveOpenDelay = () => (Date.now() - lastClosedAt < SKIP_WINDOW ? 0 : OPEN_DELAY)
-  const handleOpenChange = (open: boolean) => {
-    if (!open) lastClosedAt = Date.now()
-    props.onOpenChange(open)
-  }
-
-  return (
-    <Kobalte
-      open={props.open}
-      onOpenChange={handleOpenChange}
-      openDelay={resolveOpenDelay()}
-      closeDelay={CLOSE_DELAY}
-      // The preview is non-interactive (pointer-events: none), so there is no
-      // safe area to traverse — leaving the tab hides it immediately.
-      ignoreSafeArea
-      placement="bottom-start"
-      gutter={6}
-    >
-      <Kobalte.Trigger ref={triggerEl} as="div" data-component="session-tab-popover-trigger" tabIndex={-1}>
-        {props.trigger}
-      </Kobalte.Trigger>
-      <Kobalte.Portal>
-        <Kobalte.Content
-          ref={(el) => {
-            // Portalled content lives outside the themed subtree, so mirror the
-            // active theme like the v2 tooltip does.
-            const theme = triggerEl?.closest("[data-theme]")?.getAttribute("data-theme")
-            if (theme) el.setAttribute("data-theme", theme)
-          }}
-          data-component="session-tab-popover"
-        >
-          <div data-slot="header">
-            <Show when={props.data.projectName}>
-              <span data-slot="project">{props.data.projectName}</span>
-            </Show>
-            <Show when={props.data.title}>
-              <span data-slot="title">{props.data.title}</span>
-            </Show>
-          </div>
-
-          <Show when={props.data.path}>
-            <div data-slot="row">
-              <span data-slot="icon">
-                <IconV2 name="folder" />
-              </span>
-              <span data-slot="detail">{props.data.path}</span>
-            </div>
-          </Show>
-
-          <Show when={props.data.branch}>
-            <div data-slot="row">
-              <span data-slot="icon">
-                <IconV2 name="branch" />
-              </span>
-              <span data-slot="detail">{props.data.branch}</span>
-            </div>
-          </Show>
-
-          <Show when={props.data.serverName}>
-            <div data-slot="server">{props.data.serverName}</div>
-          </Show>
-        </Kobalte.Content>
-      </Kobalte.Portal>
-    </Kobalte>
-  )
-}
@@ -31,7 +31,6 @@ function SessionTabSlot(props: {
  onClose: () => void
 }) {
  const tabs = useTabs()
-  const language = useLanguage()
  const sortable = useSortable({
    get id() {
      return props.id
@@ -51,7 +50,6 @@ function SessionTabSlot(props: {
    ({ id, ctx }) => ctx.sync.session.resolve(id).catch(() => undefined),
  )
  const session = createMemo(() => cachedSession() ?? loadedSession())
-  const missingSession = createMemo(() => !!props.serverCtx() && !loadedSession.loading && !session())
  let prefetched = false

  createEffect(() => {
@@ -87,9 +85,8 @@ function SessionTabSlot(props: {
      ref={sortable.ref}
      data-titlebar-tab-slot
      data-tab-key={props.id}
-      data-active={props.active()}
      class="relative flex w-56 min-w-7 max-w-56 flex-shrink"
-      classList={{ hidden: !session() && !missingSession() }}
+      classList={{ hidden: !session() }}
    >
      <TabNavItem
        ref={(el) => {
@@ -98,7 +95,6 @@ function SessionTabSlot(props: {
        href={tabHref(props.tab)}
        server={props.tab.server}
        session={session}
-        fallbackTitle={missingSession() ? language.t("session.tab.unknown") : undefined}
        onTitleChange={(title) => {
          const value = session()
          const ctx = props.serverCtx()
@@ -144,7 +140,6 @@ function DraftTabSlot(props: {
      ref={sortable.ref}
      data-titlebar-tab-slot
      data-tab-key={props.id}
-      data-active={props.active()}
      class="relative flex w-56 min-w-7 max-w-56 flex-shrink"
    >
      <DraftTabItem
@@ -229,8 +229,7 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
      }}
      style={{
        "min-height": minHeight(),
-        // Keep native macOS traffic lights clear even when the desktop window is narrow.
-        "padding-left": mac() ? `${84 / zoom()}px` : 0,
+        "padding-left": mac() && !mobile() ? `${84 / zoom()}px` : 0,
        width: electronWindows() ? `env(titlebar-area-width, calc(100vw - ${windowsControlsWidth()}))` : undefined,
        "max-width": electronWindows()
          ? `env(titlebar-area-width, calc(100vw - ${windowsControlsWidth()}))`
@@ -572,7 +571,7 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
                          placement="bottom"
                          title={language.t("command.session.new")}
                          keybind={command.keybind("session.new")}
-                          openDelay={800}
+                          openDelay={2000}
                        >
                          <Button
                            variant="ghost"
@@ -602,7 +601,7 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
                  >
                    <Show when={hasProjects() && nav()}>
                      <div class="flex items-center gap-0 transition-transform">
-                        <Tooltip placement="bottom" value={language.t("common.goBack")} openDelay={800}>
+                        <Tooltip placement="bottom" value={language.t("common.goBack")} openDelay={2000}>
                          <Button
                            variant="ghost"
                            icon="chevron-left"
@@ -612,7 +611,7 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
                            aria-label={language.t("common.goBack")}
                          />
                        </Tooltip>
-                        <Tooltip placement="bottom" value={language.t("common.goForward")} openDelay={800}>
+                        <Tooltip placement="bottom" value={language.t("common.goForward")} openDelay={2000}>
                          <Button
                            variant="ghost"
                            icon="chevron-right"
@@ -16,7 +16,6 @@ describe("bootstrapDirectory", () => {
      status: "loading",
      agent: [],
      command: [],
-      reference: [],
      project: "",
      projectMeta: undefined,
      icon: undefined,
@@ -36,7 +35,6 @@ describe("bootstrapDirectory", () => {
      question: {},
      mcp_ready: true,
      mcp: {},
-      mcp_resource: {},
      lsp_ready: true,
      lsp: [],
      vcs: undefined,
@@ -69,7 +67,6 @@ describe("bootstrapDirectory", () => {
        },
        permission: { list: async () => ({ data: [] }) },
        question: { list: async () => ({ data: [] }) },
-        v2: { reference: { list: async () => ({ data: { data: [] } }) } },
        mcp: {
          status: async () => {
            mcpReads.push("status")
@@ -6,7 +6,6 @@ import type {
  Project,
  ProviderAuthResponse,
  QuestionRequest,
-  ReferenceInfo,
  Session,
 } from "@opencode-ai/sdk/v2/client"
 import { showToast } from "@/utils/toast"
@@ -19,7 +18,7 @@ import type { ServerSession } from "../server-session"
 import { cmp, normalizeAgentList, normalizeProviderList } from "./utils"
 import { formatServerError } from "@/utils/server-errors"
 import { QueryClient, queryOptions } from "@tanstack/solid-query"
-import { loadMcpQuery, loadMcpResourcesQuery } from "../server-sync"
+import { loadMcpQuery } from "../server-sync"
 import { NormalizedProviderListResponse } from "@opencode-ai/session-ui/context"
 import { ScopedKey, type ServerScope } from "@/utils/server-scope"

@@ -196,13 +195,6 @@ export const loadPathQuery = (scope: ServerScope, directory: string | null, sdk:
    queryFn: () => retry(() => sdk.path.get().then((x) => x.data!)),
  })

-export const loadReferencesQuery = (scope: ServerScope, directory: string, sdk: OpencodeClient) =>
-  queryOptions<ReferenceInfo[]>({
-    queryKey: [scope, directory, "references"] as const,
-    queryFn: () => retry(() => sdk.v2.reference.list().then((x) => x.data?.data ?? [])).catch(() => []),
-    placeholderData: [],
-  })
-
 export async function bootstrapDirectory(input: {
  directory: string
  scope: ServerScope
@@ -285,7 +277,6 @@ export async function bootstrapDirectory(input: {
          }),
        ),
      input.mcp && (() => retry(() => input.sdk.command.list().then((x) => input.setStore("command", x.data ?? [])))),
-      () => input.queryClient.fetchQuery(loadReferencesQuery(input.scope, input.directory, input.sdk)),
      () =>
        retry(() =>
          input.sdk.permission.list().then((x) => {
@@ -348,7 +339,6 @@ export async function bootstrapDirectory(input: {
        ),
      () => Promise.resolve(input.loadSessions(input.directory)),
      input.mcp && (() => input.queryClient.fetchQuery(loadMcpQuery(input.scope, input.directory, input.sdk))),
-      input.mcp && (() => input.queryClient.fetchQuery(loadMcpResourcesQuery(input.scope, input.directory, input.sdk))),
      () =>
        input.queryClient.fetchQuery(loadProvidersQuery(input.scope, input.directory, input.sdk)).catch((err) => {
          const project = getFilename(input.directory)
@@ -34,9 +34,7 @@ const queryOptionsApi = {
  }),
  agents: (directory: string) => ({ queryKey: [directory, "agents"], queryFn: async () => [] }),
  mcp: (directory: string) => ({ queryKey: [directory, "mcp"], queryFn: async () => ({}) }),
-  mcpResources: (directory: string) => ({ queryKey: [directory, "mcpResources"], queryFn: async () => ({}) }),
  lsp: (directory: string) => ({ queryKey: [directory, "lsp"], queryFn: async () => [] }),
-  references: (directory: string) => ({ queryKey: [directory, "references"], queryFn: async () => [] }),
  sessions: (directory: string) => ({ queryKey: [directory, "loadSessions"] as const }),
 } as unknown as QueryOptionsApi

@@ -199,18 +197,14 @@ describe("createChildStoreManager", () => {
    try {
      if (!manager) throw new Error("manager required")
      const [store, setStore] = manager.child("/project", { bootstrap: false })
-      expect(querySingles.length - offset).toBe(6)
+      expect(querySingles.length - offset).toBe(4)
      const query = querySingles[offset + 1]
-      const resourceQuery = querySingles[offset + 2]
      if (!query) throw new Error("query required")
-      if (!resourceQuery) throw new Error("resource query required")
      expect(query().enabled).toBe(false)
-      expect(resourceQuery().enabled).toBe(false)

      setStore("status", "complete")
      manager.child("/project", { bootstrap: false, mcp: true })
      expect(query().enabled).toBe(true)
-      expect(resourceQuery().enabled).toBe(true)
      expect(store.mcp).toEqual({ demo: { status: "disabled" } })
      expect(mcpLoads).toEqual(["/project"])

@@ -185,10 +185,8 @@ export function createChildStoreManager(input: {

          const pathQuery = useQuery(() => input.queryOptions.path(key))
          const mcpQuery = useQuery(() => ({ ...input.queryOptions.mcp(key), enabled: mcpEnabled() }))
-          const mcpResourceQuery = useQuery(() => ({ ...input.queryOptions.mcpResources(key), enabled: mcpEnabled() }))
          const lspQuery = useQuery(() => input.queryOptions.lsp(key))
          const providerQuery = useQuery(() => input.queryOptions.providers(key))
-          const referenceQuery = useQuery(() => input.queryOptions.references(key))

          const child = createStore<State>({
            project: "",
@@ -212,9 +210,6 @@ export function createChildStoreManager(input: {
            status: "loading" as const,
            agent: [],
            command: [],
-            get reference() {
-              return referenceQuery.isLoading ? [] : (referenceQuery.data ?? [])
-            },
            session: [],
            sessionTotal: 0,
            session_status: {},
@@ -232,9 +227,6 @@ export function createChildStoreManager(input: {
            get mcp() {
              return mcpQuery.isLoading ? {} : (mcpQuery.data ?? {})
            },
-            get mcp_resource() {
-              return mcpResourceQuery.isLoading ? {} : (mcpResourceQuery.data ?? {})
-            },
            get lsp_ready() {
              return !lspQuery.isLoading
            },
@@ -112,7 +112,6 @@ export function applyDirectoryEvent(input: {
  push: (directory: string) => void
  directory: string
  loadLsp: () => void
-  loadReferences?: () => void
  vcsCache?: VcsCache
  setSessionTodo?: (sessionID: string, todos: Todo[] | undefined) => void
  retainedLimit?: number
@@ -405,9 +404,5 @@ export function applyDirectoryEvent(input: {
      input.loadLsp()
      break
    }
-    case "reference.updated": {
-      input.loadReferences?.()
-      break
-    }
  }
 }
@@ -3,14 +3,12 @@ import type {
  Command,
  Config,
  LspStatus,
-  McpResource,
  McpStatus,
  Message,
  Part,
  Path,
  PermissionRequest,
  QuestionRequest,
-  ReferenceInfo,
  Session,
  SessionStatus,
  SnapshotFileDiff,
@@ -36,7 +34,6 @@ export type State = {
  status: "loading" | "partial" | "complete"
  agent: Agent[]
  command: Command[]
-  reference: ReferenceInfo[]
  project: string
  projectMeta: ProjectMeta | undefined
  icon: string | undefined
@@ -66,9 +63,6 @@ export type State = {
  mcp: {
    [name: string]: McpStatus
  }
-  mcp_resource: {
-    [key: string]: McpResource
-  }
  lsp_ready: boolean
  lsp: LspStatus[]
  vcs: VcsInfo | undefined
@@ -28,7 +28,6 @@ const DEFAULT_SIDEBAR_WIDTH = 344
 const DEFAULT_FILE_TREE_WIDTH = 200
 const DEFAULT_SESSION_WIDTH = 600
 const DEFAULT_TERMINAL_HEIGHT = 280
-const DEFAULT_REVIEW_PANEL_OPENED = false
 export type AvatarColorKey = (typeof AVATAR_COLOR_KEYS)[number]

 export function getAvatarColors(key?: string) {
@@ -78,7 +77,6 @@ export type LocalProject = Partial<Project> & { worktree: string; expanded: bool
 export type HomeProjectSelection = { server: ServerConnection.Key; directory?: string }

 export type ReviewDiffStyle = "unified" | "split"
-export type ReviewPanelSource = "context-button" | "other"

 export type LayoutRoute =
  | { type: "home" }
@@ -212,8 +210,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
        if (!isRecord(review)) return review
        if (typeof review.panelOpened === "boolean") return review

-        const opened =
-          isRecord(fileTree) && typeof fileTree.opened === "boolean" ? fileTree.opened : DEFAULT_REVIEW_PANEL_OPENED
+        const opened = isRecord(fileTree) && typeof fileTree.opened === "boolean" ? fileTree.opened : true
        return {
          ...review,
          panelOpened: opened,
@@ -282,7 +279,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
        },
        review: {
          diffStyle: "split" as ReviewDiffStyle,
-          panelOpened: DEFAULT_REVIEW_PANEL_OPENED,
+          panelOpened: true,
        },
        fileTree: {
          opened: false,
@@ -305,9 +302,6 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
        },
      }),
    )
-    const [ephemeral, setEphemeral] = createStore({
-      reviewPanelSource: "other" as ReviewPanelSource,
-    })

    const MAX_SESSION_KEYS = 50
    const PENDING_MESSAGE_TTL_MS = 2 * 60 * 1000
@@ -668,7 +662,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
        diffStyle: createMemo(() => store.review?.diffStyle ?? "split"),
        setDiffStyle(diffStyle: ReviewDiffStyle) {
          if (!store.review) {
-            setStore("review", { diffStyle, panelOpened: DEFAULT_REVIEW_PANEL_OPENED })
+            setStore("review", { diffStyle, panelOpened: true })
            return
          }
          setStore("review", "diffStyle", diffStyle)
@@ -783,8 +777,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
        const key = createSessionKeyReader(sessionKey, ensureKey)
        const s = createMemo(() => store.sessionView[key()] ?? { scroll: {} })
        const terminalOpened = createMemo(() => store.terminal?.opened ?? false)
-        const reviewPanelOpened = createMemo(() => store.review?.panelOpened ?? DEFAULT_REVIEW_PANEL_OPENED)
-        const reviewPanelSource = createMemo(() => (reviewPanelOpened() ? ephemeral.reviewPanelSource : "other"))
+        const reviewPanelOpened = createMemo(() => store.review?.panelOpened ?? true)

        function setTerminalOpened(next: boolean) {
          const current = store.terminal
@@ -798,26 +791,16 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
          setStore("terminal", "opened", next)
        }

-        function setReviewPanelOpened(next: boolean, source: ReviewPanelSource) {
-          const nextSource = next ? source : "other"
+        function setReviewPanelOpened(next: boolean) {
          const current = store.review
          if (!current) {
-            batch(() => {
-              setStore("review", { diffStyle: "split" as ReviewDiffStyle, panelOpened: next })
-              setEphemeral("reviewPanelSource", nextSource)
-            })
+            setStore("review", { diffStyle: "split" as ReviewDiffStyle, panelOpened: next })
            return
          }

-          const value = current.panelOpened ?? DEFAULT_REVIEW_PANEL_OPENED
-          if (value === next) {
-            if (ephemeral.reviewPanelSource !== nextSource) setEphemeral("reviewPanelSource", nextSource)
-            return
-          }
-          batch(() => {
-            setStore("review", "panelOpened", next)
-            setEphemeral("reviewPanelSource", nextSource)
-          })
+          const value = current.panelOpened ?? true
+          if (value === next) return
+          setStore("review", "panelOpened", next)
        }

        return {
@@ -853,15 +836,14 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
          },
          reviewPanel: {
            opened: reviewPanelOpened,
-            source: reviewPanelSource,
-            open(source: ReviewPanelSource = "other") {
-              setReviewPanelOpened(true, source)
+            open() {
+              setReviewPanelOpened(true)
            },
            close() {
-              setReviewPanelOpened(false, "other")
+              setReviewPanelOpened(false)
            },
            toggle() {
-              setReviewPanelOpened(!reviewPanelOpened(), "other")
+              setReviewPanelOpened(!reviewPanelOpened())
            },
          },
          review: {
@@ -80,7 +80,6 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
    const [store, setStore] = createStore<{
      current?: string
      draft?: State
-      promoting?: State
      last?: {
        type: "agent" | "model" | "variant"
        agent?: string
@@ -124,7 +123,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({

    const scope = createMemo<State | undefined>(() => {
      const session = id()
-      if (!session) return store.draft ?? store.promoting
+      if (!session) return store.draft
      return saved.session[session] ?? handoff.get(handoffKey(serverSDK().scope, sdk().directory, session))
    })

@@ -137,13 +136,11 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
      if (!next) return
      if (saved.session[session] !== undefined) {
        handoff.delete(key)
-        setStore("promoting", undefined)
        return
      }

      setSaved("session", session, clone(next))
      handoff.delete(key)
-      setStore("promoting", undefined)
    })

    const configuredModel = () => {
@@ -376,19 +373,19 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
      agent,
      session: {
        reset() {
-          setStore({ draft: undefined, promoting: undefined })
+          setStore("draft", undefined)
        },
        promote(dir: string, session: string) {
          const next = clone(snapshot())
          if (!next) return
-          const key = handoffKey(serverSDK().scope, dir, session)
-          handoff.set(key, next)

          if (dir === sdk().directory) {
            setSaved("session", session, next)
+            setStore("draft", undefined)
+            return
          }

-          setStore("promoting", next)
+          handoff.set(handoffKey(serverSDK().scope, dir, session), next)
          setStore("draft", undefined)
        },
        restore(msg: { sessionID: string; agent: string; model: ModelKey }) {
@@ -64,9 +64,6 @@ type PlatformBase = {
  /** Storage mechanism, defaults to localStorage */
  storage?: (name?: string) => SyncStorage | AsyncStorage

-  /** Stable platform window identity for window-scoped persistence */
-  windowID?: string
-
  /** Application-global desktop updater */
  updater?: UpdaterPlatform

@@ -12,7 +12,6 @@ import { useTabs, type Tab } from "./tabs"
 import { ServerConnection } from "./server"
 import { requireServerKey } from "@/utils/session-route"
 import { useSettings } from "./settings"
-import type { FilePartSource } from "@opencode-ai/sdk/v2/client"

 interface PartBase {
  content: string
@@ -28,10 +27,6 @@ export interface FileAttachmentPart extends PartBase {
  type: "file"
  path: string
  selection?: FileSelection
-  mime?: string
-  filename?: string
-  url?: string
-  source?: FilePartSource
 }

 export interface AgentPart extends PartBase {
@@ -78,13 +73,7 @@ function isPartEqual(partA: ContentPart, partB: ContentPart) {
    case "text":
      return partB.type === "text" && partA.content === partB.content
    case "file":
-      return (
-        partB.type === "file" &&
-        partA.path === partB.path &&
-        partA.mime === partB.mime &&
-        partA.filename === partB.filename &&
-        isSelectionEqual(partA.selection, partB.selection)
-      )
+      return partB.type === "file" && partA.path === partB.path && isSelectionEqual(partA.selection, partB.selection)
    case "agent":
      return partB.type === "agent" && partA.name === partB.name
    case "image":
@@ -1,11 +1,4 @@
-import type {
-  Config,
-  McpResource,
-  OpencodeClient,
-  Path,
-  Project,
-  ProviderAuthResponse,
-} from "@opencode-ai/sdk/v2/client"
+import type { Config, OpencodeClient, Path, Project, ProviderAuthResponse } from "@opencode-ai/sdk/v2/client"
 import { showToast } from "@/utils/toast"
 import { getFilename } from "@opencode-ai/core/util/path"
 import { type Accessor, batch, createMemo, getOwner, onCleanup, onMount, untrack } from "solid-js"
@@ -22,7 +15,6 @@ import {
  loadPathQuery,
  loadProjectsQuery,
  loadProvidersQuery,
-  loadReferencesQuery,
 } from "./global-sync/bootstrap"
 import { createChildStoreManager } from "./global-sync/child-store"
 import { applyDirectoryEvent, applyGlobalEvent } from "./global-sync/event-reducer"
@@ -64,13 +56,6 @@ export const loadMcpQuery = (scope: ServerScope, directory: string, sdk: Opencod
    queryFn: () => sdk.mcp.status().then((r) => r.data ?? {}),
  })

-export const loadMcpResourcesQuery = (scope: ServerScope, directory: string, sdk: OpencodeClient) =>
-  queryOptions<Record<string, McpResource>>({
-    queryKey: [scope, directory, "mcpResources"] as const,
-    queryFn: () => sdk.experimental.resource.list().then((r) => r.data ?? {}),
-    placeholderData: {},
-  })
-
 export const loadLspQuery = (scope: ServerScope, directory: string, sdk: OpencodeClient) =>
  queryOptions({
    queryKey: [scope, directory, "lsp"] as const,
@@ -90,9 +75,7 @@ function makeQueryOptionsApi(
    path: (directory: PathKey | null) =>
      loadPathQuery(scope, directory, directory === null ? serverSDK() : sdkFor(directory)),
    agents: (directory: PathKey) => loadAgentsQuery(scope, directory, sdkFor(directory)),
-    references: (directory: PathKey) => loadReferencesQuery(scope, directory, sdkFor(directory)),
    mcp: (directory: PathKey) => loadMcpQuery(scope, directory, sdkFor(directory)),
-    mcpResources: (directory: PathKey) => loadMcpResourcesQuery(scope, directory, sdkFor(directory)),
    lsp: (directory: PathKey) => loadLspQuery(scope, directory, sdkFor(directory)),
    sessions: (directory: PathKey) => ({ queryKey: [scope, directory, "loadSessions"] as const }),
  }
@@ -413,9 +396,6 @@ export function createServerSyncContextInner(serverSDK: ServerSDK) {
      loadLsp: () => {
        void queryClient.fetchQuery(queryOptionsApi.lsp(key))
      },
-      loadReferences: () => {
-        void queryClient.fetchQuery(queryOptionsApi.references(key))
-      },
    })
  })

@@ -504,7 +484,6 @@ export function createServerSyncContextInner(serverSDK: ServerSDK) {
          },
          refresh: async () => {
            await queryClient.refetchQueries(queryOptionsApi.mcp(key))
-            await queryClient.refetchQueries(queryOptionsApi.mcpResources(key))
          },
        })
      },
@@ -51,7 +51,7 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
    const fallback = server.key
    const [store, setStore, _, ready] = persisted(
      {
-        ...Persist.window("tabs"),
+        ...Persist.global("tabs"),
        migrate: (value: unknown) => {
          if (!Array.isArray(value)) return value
          return value.map((tab) => {
@@ -62,7 +62,7 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
      },
      createStore<Tab[]>([]),
    )
-    const [recent, setRecent, , recentReady] = persisted(Persist.window("tabs.recent"), createStore<RecentTab>({}))
+    const [recent, setRecent, , recentReady] = persisted(Persist.global("tabs.recent"), createStore<RecentTab>({}))

    const params = useParams()
    const navigate = useNavigate()
@@ -1,13 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { DESKTOP_MENU } from "./desktop-menu"
-
-describe("desktop menu", () => {
-  test("exports logs through the desktop command registry", () => {
-    const items = DESKTOP_MENU.flatMap((menu) => menu.items ?? []).filter(
-      (item) => item.type === "item" && item.label === "Export Logs...",
-    )
-
-    expect(items).toHaveLength(2)
-    expect(items.every((item) => item.type === "item" && item.command === "logs.export" && !item.action)).toBe(true)
-  })
-})
@@ -388,20 +388,6 @@ export const dict = {
  "wsl.onboarding.chooseDistroFirst": "Choose a distro first.",
  "wsl.onboarding.loadFailed": "Failed to load WSL state.",
  "wsl.onboarding.loading": "Loading...",
-  "wsl.onboarding.installedDistros": "Installed distros",
-  "wsl.onboarding.checkAgain": "Check again",
-  "wsl.onboarding.distroStatus.ready": "Ready",
-  "wsl.onboarding.distroStatus.checking": "Checking...",
-  "wsl.onboarding.distroStatus.opencodeMissing": "OpenCode not installed",
-  "wsl.onboarding.distroStatus.missingTools": "Missing bash, curl",
-  "wsl.onboarding.distroStatus.unsupported": "Unsupported · Use WSL 2",
-  "wsl.onboarding.needAnotherDistro": "Need another distro?",
-  "wsl.onboarding.needAnotherDistroHint": "Install a Linux distribution from the WSL catalog",
-  "wsl.onboarding.wslNotInstalled.title": "WSL not installed",
-  "wsl.onboarding.wslNotInstalled.description":
-    "WSL (Windows Subsystem for Linux) is required before OpenCode can add a WSL server",
-  "wsl.onboarding.wslUnavailable.title": "WSL unavailable",
-  "wsl.onboarding.wslUnavailable.description": "OpenCode could not verify WSL on this machine.",
  "wsl.onboarding.installWsl": "Install WSL",
  "wsl.onboarding.windowsRestartRequired": "Restart Windows to finish installing WSL, then reopen OpenCode.",
  "wsl.onboarding.next": "Next",
@@ -411,7 +397,6 @@ export const dict = {
  "wsl.onboarding.install": "Install",
  "wsl.onboarding.installing": "Installing...",
  "wsl.onboarding.installDistro": "Install distro",
-  "wsl.onboarding.searchDistros": "Search distros",
  "wsl.onboarding.wsl2Required": "WSL 2 is required.",
  "wsl.onboarding.toolsRequired": "This distro needs bash and curl.",
  "wsl.onboarding.openTerminal": "Open terminal",
@@ -619,12 +604,7 @@ export const dict = {
  "session.tab.session": "Session",
  "session.tab.review": "Review",
  "session.tab.context": "Context",
-  "session.tab.unknown": "Unknown Session",
  "session.panel.reviewAndFiles": "Review and files",
-  "session.error.notFound": "This session cannot be found",
-  "session.error.notFound.description": "This tab points to a session that no longer exists on this server.",
-  "session.error.notFound.closeTab": "Close Tab",
-  "session.error.serverConnection": "Can't connect to this server",
  "session.review.filesChanged": "{{count}} Files Changed",
  "session.review.change.one": "Change",
  "session.review.change.other": "Changes",
@@ -657,10 +637,6 @@ export const dict = {
  "session.todo.expand": "Expand",
  "session.todo.progress": "{{done}} of {{total}} todos completed",
  "session.question.progress": "{{current}} of {{total}} questions",
-  "session.question.minimize": "Minimize question",
-  "session.question.restore": "Restore question",
-  "session.question.pending.one": "{{count}} pending question",
-  "session.question.pending.other": "{{count}} pending questions",
  "session.followupDock.summary.one": "{{count}} queued message",
  "session.followupDock.summary.other": "{{count}} queued messages",
  "session.followupDock.sendNow": "Send now",
@@ -194,19 +194,8 @@
    timeline-scope: --home-projects-scroll;
  }

-  [data-slot="model-selector-scroll"] {
-    timeline-scope: --model-selector-scroll;
-  }
-
-  [data-slot="manage-models-scroll"] {
-    timeline-scope: --manage-models-scroll;
-  }
-
  [data-slot="home-projects-scroll"]::before,
-  [data-slot="home-projects-scroll"]::after,
-  [data-slot="model-selector-scroll"]::before,
-  [data-slot="model-selector-scroll"]::after,
-  [data-slot="manage-models-scroll"]::before {
+  [data-slot="home-projects-scroll"]::after {
    content: "";
    position: absolute;
    left: 0;
@@ -222,26 +211,11 @@
    background: linear-gradient(to bottom, var(--v2-background-bg-base), transparent);
  }

-  [data-slot="model-selector-scroll"]::before {
-    top: 0;
-    background: linear-gradient(to bottom, var(--v2-background-bg-layer-01), transparent);
-  }
-
-  [data-slot="manage-models-scroll"]::before {
-    top: 0;
-    background: linear-gradient(to bottom, var(--v2-background-bg-base), transparent);
-  }
-
  [data-slot="home-projects-scroll"]::after {
    bottom: 0;
    background: linear-gradient(to top, var(--v2-background-bg-base), transparent);
  }

-  [data-slot="model-selector-scroll"]::after {
-    bottom: 0;
-    background: linear-gradient(to top, var(--v2-background-bg-layer-01), transparent);
-  }
-
  @supports (animation-timeline: --home-projects-scroll) and (timeline-scope: --home-projects-scroll) {
    [data-slot="home-projects-scroll"] .scroll-view__viewport {
      scroll-timeline: --home-projects-scroll y;
@@ -259,34 +233,4 @@
      animation-range: calc(100% - 1.1px) calc(100% - 1px);
    }
  }
-
-  @supports (animation-timeline: --model-selector-scroll) and (timeline-scope: --model-selector-scroll) {
-    [data-slot="model-selector-scroll"] .scroll-view__viewport {
-      scroll-timeline: --model-selector-scroll y;
-    }
-
-    [data-slot="model-selector-scroll"]::before {
-      animation: home-projects-fade-top linear both;
-      animation-timeline: --model-selector-scroll;
-      animation-range: 0 0.1px;
-    }
-
-    [data-slot="model-selector-scroll"]::after {
-      animation: home-projects-fade-bottom linear both;
-      animation-timeline: --model-selector-scroll;
-      animation-range: calc(100% - 1.1px) calc(100% - 1px);
-    }
-  }
-
-  @supports (animation-timeline: --manage-models-scroll) and (timeline-scope: --manage-models-scroll) {
-    [data-slot="manage-models-scroll"] .settings-v2-panel {
-      scroll-timeline: --manage-models-scroll y;
-    }
-
-    [data-slot="manage-models-scroll"]::before {
-      animation: home-projects-fade-top linear both;
-      animation-timeline: --manage-models-scroll;
-      animation-range: 0 0.1px;
-    }
-  }
 }
@@ -276,10 +276,7 @@ export const ErrorPage: Component<ErrorPageProps> = (props) => {
  }

  return (
-    <div
-      class="relative flex-1 h-screen w-screen min-h-0 flex flex-col items-center justify-center font-sans"
-      data-tauri-drag-region
-    >
+    <div class="relative flex-1 h-screen w-screen min-h-0 flex flex-col items-center justify-center bg-background-base font-sans">
      <div class="w-2/3 max-w-3xl flex flex-col items-center justify-center gap-8">
        <Logo class="w-58.5 opacity-12 shrink-0" />
        <div class="flex flex-col items-center gap-2 text-center">
@@ -671,7 +671,7 @@ function HomeProjectColumn(props: {
      class="mt-6 flex min-h-0 min-w-0 flex-col gap-4 overflow-hidden lg:mt-14 lg:pt-[52px]"
      aria-label={props.language.t("home.projects")}
    >
-      <div class="flex h-7 min-w-0 shrink-0 items-center justify-between pl-1.5 pr-3">
+      <div class="flex h-7 min-w-0 shrink-0 items-center justify-between pl-1.5">
        <div class={HOME_SECTION_LABEL}>{props.language.t("home.projects")}</div>
        <Show when={global.servers.list().length === 1}>
          <TooltipV2 placement="bottom" value={props.language.t("home.project.add")}>
@@ -697,7 +697,7 @@ function HomeProjectColumn(props: {
            </div>
          }
        >
-          <div class="flex min-w-0 flex-col gap-4 pr-3">
+          <div class="flex min-w-0 flex-col gap-1 pr-3">
            <For each={global.servers.list()}>
              {(item) => {
                const key = ServerConnection.key(item)
@@ -1006,8 +1006,8 @@ function HomeSessionLeading(props: {
      <Show when={hasOpenTab()}>
        <span
          aria-hidden="true"
-          class="pointer-events-none absolute top-1/2 h-3 w-0.5 -translate-y-1/2 rounded-[2px] bg-v2-background-bg-layer-04"
-          style={{ right: "calc(100% + 4px)" }}
+          class="pointer-events-none absolute top-1/2 h-[7px] w-[3px] -translate-y-1/2 rounded-[2px] bg-v2-background-bg-layer-04"
+          style={{ right: "calc(100% + 5px)" }}
        />
      </Show>
      <SessionTabAvatar
@@ -1163,7 +1163,13 @@ function HomeSessionSearch(props: {
            </div>
          </div>
        </Show>
-        <label class="relative z-20 flex h-9 w-full items-center gap-2 rounded-[6px] bg-v2-background-bg-layer-02/60 py-1 pl-3 pr-2 text-v2-icon-icon-muted transition-[background-color,box-shadow] duration-[120ms] ease-in-out hover:bg-v2-background-bg-layer-02">
+        <label
+          class="relative z-20 flex h-9 w-full items-center gap-2 rounded-[6px] bg-v2-background-bg-layer-02 py-1 pl-3 pr-2 text-v2-icon-icon-muted transition-[background-color,box-shadow] duration-[120ms] ease-in-out"
+          classList={{
+            "focus-within:shadow-[0_0_0_0.5px_var(--v2-border-border-focus),var(--v2-elevation-raised)]": !props.open,
+            "shadow-[0_0_0_0.5px_var(--v2-border-border-focus)]": props.open,
+          }}
+        >
          <IconV2 name="magnifying-glass" />
          <input
            ref={input}
@@ -943,6 +943,18 @@ export default function LegacyLayout(props: ParentProps) {
        keybind: "mod+comma",
        onSelect: () => openSettings(),
      },
+      ...(platform.platform === "desktop" && platform.exportDebugLogs
+        ? [
+            {
+              id: "logs.export",
+              title: "Export logs",
+              category: language.t("command.category.settings"),
+              onSelect: () => {
+                void platform.exportDebugLogs?.()
+              },
+            },
+          ]
+        : []),
      {
        id: "session.previous",
        title: language.t("command.session.previous"),
@@ -3,7 +3,6 @@ import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { createQuery, skipToken, useMutation, useQueryClient } from "@tanstack/solid-query"
 import {
  batch,
-  ErrorBoundary,
  onCleanup,
  Show,
  Match,
@@ -11,10 +10,8 @@ import {
  createMemo,
  createEffect,
  createComputed,
-  createResource,
  on,
  onMount,
-  type ParentProps,
  untrack,
 } from "solid-js"
 import { makeEventListener } from "@solid-primitives/event-listener"
@@ -22,37 +19,29 @@ import { createMediaQuery } from "@solid-primitives/media"
 import { createResizeObserver } from "@solid-primitives/resize-observer"
 import { debounce } from "@solid-primitives/scheduled"
 import { useLocal } from "@/context/local"
-import { FileProvider, selectionFromLines, useFile, type FileSelection, type SelectedLineRange } from "@/context/file"
+import { selectionFromLines, useFile, type FileSelection, type SelectedLineRange } from "@/context/file"
 import { createStore } from "solid-js/store"
 import { ResizeHandle } from "@opencode-ai/ui/resize-handle"
 import { Select } from "@opencode-ai/ui/select"
 import { Tabs } from "@opencode-ai/ui/tabs"
-import { ButtonV2 } from "@opencode-ai/ui/v2/button-v2"
 import { createAutoScroll } from "@opencode-ai/ui/hooks"
 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"
-import { Navigate, useLocation, useNavigate, useParams, useSearchParams } from "@solidjs/router"
+import { useLocation, useNavigate, useSearchParams } from "@solidjs/router"
 import { NewSessionView, SessionHeader } from "@/components/session"
-import { ErrorPage } from "@/pages/error"
-import { CommentsProvider, useComments } from "@/context/comments"
-import { DirectoryDataProvider } from "@/pages/directory-layout"
+import { useComments } from "@/context/comments"
 import { useServerSync } from "@/context/server-sync"
 import { useLanguage } from "@/context/language"
 import { useLayout } from "@/context/layout"
-import { ModelsProvider } from "@/context/models"
-import { useNotification } from "@/context/notification"
-import { PermissionProvider } from "@/context/permission"
-import { PromptProvider, usePrompt } from "@/context/prompt"
+import { usePrompt } from "@/context/prompt"
 import { usePlatform } from "@/context/platform"
-import { SDKProvider, useSDK } from "@/context/sdk"
+import { useSDK } from "@/context/sdk"
 import { useServerSDK } from "@/context/server-sdk"
-import { ServerConnection, serverName, useServer } from "@/context/server"
 import { useSettings } from "@/context/settings"
 import { useSync } from "@/context/sync"
-import { useTabs } from "@/context/tabs"
-import { TerminalProvider, useTerminal } from "@/context/terminal"
+import { useTerminal } from "@/context/terminal"
 import { PromptInput } from "@/components/prompt-input"
 import { useSettingsCommand } from "@/components/settings-dialog"
 import { type FollowupDraft, sendFollowupDraft } from "@/components/prompt-input/submit"
@@ -84,8 +73,8 @@ import { Identifier } from "@/utils/id"
 import { diffs as list } from "@/utils/diffs"
 import { Persist, persisted } from "@/utils/persist"
 import { extractPromptFromParts } from "@/utils/prompt"
-import { formatServerError, isSessionNotFoundError } from "@/utils/server-errors"
-import { legacySessionHref, requireServerKey, selectSessionLineage, sessionHref } from "@/utils/session-route"
+import { formatServerError } from "@/utils/server-errors"
+import { legacySessionHref, requireServerKey, sessionHref } from "@/utils/session-route"
 import { useUsageExceededDialogs } from "./session/usage-exceeded-dialogs"
 import { createSessionOwnership } from "./session/session-ownership"

@@ -102,15 +91,6 @@ const sessionViewState = () => ({
  changes: "git" as ChangeMode,
 })

-function isLocalSessionNotFoundError(error: unknown, sessionID: string) {
-  return error instanceof Error && error.message === `Session not found: ${sessionID}`
-}
-
-function isCurrentSessionNotFoundError(error: unknown, sessionID: string | undefined) {
-  if (!sessionID) return false
-  return isSessionNotFoundError(error, sessionID) || isLocalSessionNotFoundError(error, sessionID)
-}
-
 async function runPromptRollbackMutation<T, R>(input: {
  capturePrompt: () => { current: () => T[]; set: (value: T[]) => void; reset: () => void }
  optimistic: (prompt: { set: (value: T[]) => void; reset: () => void }) => void
@@ -134,204 +114,6 @@ async function runPromptRollbackMutation<T, R>(input: {
    })
 }

-export function SessionPage() {
-  return (
-    <SessionProviders>
-      <Page />
-    </SessionProviders>
-  )
-}
-
-export function TargetSessionRoute() {
-  const params = useParams<{ serverKey: string; id: string }>()
-  return (
-    <Show when={`${params.serverKey}\0${params.id}`} keyed>
-      <SessionRouteErrorBoundary sessionID={params.id} serverKey={requireServerKey(params.serverKey)} padded>
-        <ResolvedTargetSessionRoute />
-      </SessionRouteErrorBoundary>
-    </Show>
-  )
-}
-
-function SessionRouteErrorBoundary(
-  props: ParentProps<{ sessionID?: string; serverKey?: ServerConnection.Key; padded?: boolean }>,
-) {
-  const settings = useSettings()
-  return (
-    <ErrorBoundary
-      fallback={(error) =>
-        settings.general.newLayoutDesigns() ? (
-          <SessionRouteFrame padded={props.padded}>
-            <SessionPanelFrame newLayout raised={!!props.sessionID}>
-              <SessionErrorFallback error={error} sessionID={props.sessionID} serverKey={props.serverKey} />
-            </SessionPanelFrame>
-          </SessionRouteFrame>
-        ) : (
-          <ErrorPage error={error} />
-        )
-      }
-    >
-      {props.children}
-    </ErrorBoundary>
-  )
-}
-
-function SessionErrorFallback(props: { error: unknown; sessionID?: string; serverKey?: ServerConnection.Key }) {
-  const language = useLanguage()
-  const server = useServer()
-  const tabs = useTabs()
-  const displayServer = createMemo(() => {
-    const key = props.serverKey ?? server.key
-    const conn = server.list.find((item) => ServerConnection.key(item) === key)
-    return conn ? serverName(conn) : key
-  })
-  const closeTab = () => {
-    if (!props.sessionID) return
-    tabs.removeSessionTab({ server: props.serverKey ?? server.key, sessionId: props.sessionID })
-  }
-  if (isCurrentSessionNotFoundError(props.error, props.sessionID)) {
-    return (
-      <div class="flex-1 min-h-0 overflow-hidden">
-        <div class="h-full px-6 pb-42 -mt-4 flex flex-col items-center justify-center text-center gap-4">
-          <div class="flex flex-col items-center gap-2">
-            <div class="text-16-medium text-text max-w-md">{language.t("session.error.notFound")}</div>
-            <div class="text-13-regular text-text-weak max-w-md">
-              {language.t("session.error.notFound.description")}
-            </div>
-          </div>
-          <Show when={props.sessionID}>
-            {(sessionID) => (
-              <div class="max-w-full flex flex-col items-center gap-1">
-                <div class="max-w-full text-11-regular text-text-faint break-all">{displayServer()}</div>
-                <code class="max-w-full rounded-[4px] px-1 py-0.5 font-mono text-xs font-medium leading-4 text-text-base break-all bg-[color-mix(in_oklch,var(--v2-text-text-base)_8%,transparent)]">
-                  {sessionID()}
-                </code>
-              </div>
-            )}
-          </Show>
-          <ButtonV2 variant="neutral" size="normal" icon="xmark-small" onClick={closeTab}>
-            {language.t("session.error.notFound.closeTab")}
-          </ButtonV2>
-        </div>
-      </div>
-    )
-  }
-  return <ErrorPage error={props.error} />
-}
-
-function ResolvedTargetSessionRoute() {
-  const params = useParams<{ serverKey: string; id: string }>()
-  const settings = useSettings()
-  const tabs = useTabs()
-  const sync = useServerSync()
-  const serverKey = createMemo(() => requireServerKey(params.serverKey))
-  const cached = createMemo(() => sync().session.lineage.peek(params.id))
-  const [resolved] = createResource(
-    () => {
-      if (cached()) return
-      return { id: params.id, sync: sync() }
-    },
-    ({ id, sync }) => sync.session.lineage.resolve(id),
-  )
-  const current = createMemo(() => selectSessionLineage(params.id, cached(), resolved()))
-  const directory = createMemo(() => current()?.session.directory)
-  const targetDirectory = () => directory()!
-
-  createEffect(() => {
-    const session = current()
-    if (!session) return
-    tabs.addSessionTab({
-      server: serverKey(),
-      sessionId: session.root.id,
-    })
-  })
-
-  return (
-    <TargetServerScopedProviders directory={directory} sessionID={() => params.id}>
-      <Show when={directory()}>
-        <Show
-          when={settings.general.newLayoutDesigns()}
-          fallback={<Navigate href={legacySessionHref(directory()!, params.id)} />}
-        >
-          <SDKProvider directory={targetDirectory}>
-            <DirectoryDataProvider directory={targetDirectory} server={serverKey}>
-              <TargetSessionPage />
-            </DirectoryDataProvider>
-          </SDKProvider>
-        </Show>
-      </Show>
-    </TargetServerScopedProviders>
-  )
-}
-
-function TargetSessionPage() {
-  const sdk = useSDK()
-  const serverSDK = useServerSDK()
-  return (
-    <Show when={`${serverSDK().scope}\0${sdk().directory}`} keyed>
-      <SessionPage />
-    </Show>
-  )
-}
-
-function TargetServerScopedProviders(
-  props: ParentProps<{ directory?: () => string | undefined; sessionID?: () => string | undefined }>,
-) {
-  return (
-    <PermissionProvider directory={props.directory}>
-      <MarkSessionNotificationsViewed sessionID={props.sessionID} />
-      <ModelsProvider directory={props.directory}>{props.children}</ModelsProvider>
-    </PermissionProvider>
-  )
-}
-
-function MarkSessionNotificationsViewed(props: { sessionID?: () => string | undefined }) {
-  const notification = useNotification()
-  createEffect(() => {
-    const sessionID = props.sessionID?.()
-    if (!notification.ready() || !sessionID) return
-    if (notification.session.unseenCount(sessionID) === 0) return
-    notification.session.markViewed(sessionID)
-  })
-  return null
-}
-
-function SessionProviders(props: ParentProps) {
-  return (
-    <TerminalProvider>
-      <FileProvider>
-        <PromptProvider>
-          <CommentsProvider>{props.children}</CommentsProvider>
-        </PromptProvider>
-      </FileProvider>
-    </TerminalProvider>
-  )
-}
-
-function SessionRouteFrame(props: ParentProps<{ padded?: boolean }>) {
-  return (
-    <div class="relative size-full overflow-hidden flex flex-col" classList={{ "p-2": props.padded }}>
-      {props.children}
-    </div>
-  )
-}
-
-function SessionPanelFrame(props: ParentProps<{ newLayout: boolean; raised?: boolean }>) {
-  return (
-    <div
-      classList={{
-        "flex-1 min-h-0 flex flex-col": true,
-        "bg-v2-background-bg-base": props.newLayout,
-        "bg-background-stronger": !props.newLayout,
-        "rounded-[10px] overflow-hidden": props.newLayout,
-        "shadow-[var(--v2-elevation-raised)]": props.newLayout && props.raised,
-      }}
-    >
-      {props.children}
-    </div>
-  )
-}
-
 export default function Page() {
  const serverSync = useServerSync()
  const layout = useLayout()
@@ -1913,88 +1695,9 @@ export default function Page() {
    () => !isDesktop() && settings.general.newLayoutDesigns() && settings.general.mobileTitlebarPosition() === "bottom",
  )

-  const sessionErrorFallback = (error: unknown, reset: () => void) => {
-    createEffect(on(sessionKey, reset, { defer: true }))
-    return <SessionErrorFallback error={error} sessionID={params.id} />
-  }
-
-  const sessionPanelContent = () => (
-    <>
-      {sessionSync() ?? ""}
-      <Show when={!isDesktop() && !!params.id && settings.general.newLayoutDesigns() && !mobileTabsBottom()}>
-        {mobileTabs(true)}
-      </Show>
-      <div class="flex-1 min-h-0 overflow-hidden">
-        <Switch>
-          <Match when={params.id && mobileChanges()}>
-            <div class="relative h-full overflow-hidden">
-              {reviewContent({
-                diffStyle: "unified",
-                classes: {
-                  root: "pb-8 [&_[data-slot=session-review-list]]:pb-0",
-                  header: "px-4 !h-16 !pb-4",
-                  container: "px-4",
-                },
-                loadingClass: "px-4 py-4 text-text-weak",
-                emptyClass: "h-full pb-64 -mt-4 flex flex-col items-center justify-center text-center gap-6",
-              })}
-            </div>
-          </Match>
-          <Match when={params.id}>
-            <Show when={messagesReady() ? params.id : undefined} keyed>
-              {(_id) => (
-                <MessageTimeline
-                  actions={actions}
-                  scroll={ui.scroll}
-                  onResumeScroll={resumeScroll}
-                  setScrollRef={setScrollRef}
-                  onScheduleScrollState={scheduleScrollState}
-                  onAutoScrollHandleScroll={autoScroll.handleScroll}
-                  onMarkScrollGesture={markScrollGesture}
-                  hasScrollGesture={hasScrollGesture}
-                  onUserScroll={markUserScroll}
-                  onHistoryScroll={onHistoryScroll}
-                  onAutoScrollInteraction={autoScroll.handleInteraction}
-                  shouldAnchorBottom={() =>
-                    !location.hash && !store.messageId && !ui.pendingMessage && !autoScroll.userScrolled()
-                  }
-                  centered={centered()}
-                  setContentRef={(el) => {
-                    content = el
-                    autoScroll.contentRef(el)
-
-                    const root = scroller
-                    if (root) scheduleScrollState(root)
-                  }}
-                  userMessages={visibleUserMessages()}
-                  setHistoryAnchor={(handlers) => {
-                    captureHistoryAnchor = handlers.capture
-                    restoreHistoryAnchor = handlers.restore
-                  }}
-                  anchor={anchor}
-                  setRevealMessage={(fn) => {
-                    revealMessage = fn
-                  }}
-                  setScrollToEnd={(fn) => {
-                    scrollToEnd = fn
-                  }}
-                />
-              )}
-            </Show>
-          </Match>
-          <Match when={true}>
-            <NewSessionView worktree={newSessionWorktree()} />
-          </Match>
-        </Switch>
-      </div>
-
-      <Show when={(params.id || !newSessionDesign()) && !mobileChanges()}>{(_) => composerRegion()}</Show>
-      <Show when={!!params.id && mobileTabsBottom()}>{mobileTabs(true, true)}</Show>
-    </>
-  )
-
  return (
-    <SessionRouteFrame>
+    <div class="relative size-full overflow-hidden flex flex-col">
+      {sessionSync() ?? ""}
      <SessionHeader />
      <div
        class="flex-1 min-h-0 flex flex-col md:flex-row"
@@ -2014,13 +1717,85 @@ export default function Page() {
            width: sessionPanelWidth(),
          }}
        >
-          <SessionPanelFrame newLayout={settings.general.newLayoutDesigns()} raised={!!params.id}>
-            {settings.general.newLayoutDesigns() ? (
-              <ErrorBoundary fallback={sessionErrorFallback}>{sessionPanelContent()}</ErrorBoundary>
-            ) : (
-              sessionPanelContent()
-            )}
-          </SessionPanelFrame>
+          <div
+            classList={{
+              "flex-1 min-h-0 flex flex-col": true,
+              "bg-v2-background-bg-base": settings.general.newLayoutDesigns(),
+              "bg-background-stronger": !settings.general.newLayoutDesigns(),
+              "rounded-[10px] overflow-hidden": settings.general.newLayoutDesigns(),
+              "shadow-[var(--v2-elevation-raised)]": settings.general.newLayoutDesigns() && !!params.id,
+            }}
+          >
+            <Show when={!isDesktop() && !!params.id && settings.general.newLayoutDesigns() && !mobileTabsBottom()}>
+              {mobileTabs(true)}
+            </Show>
+            <div class="flex-1 min-h-0 overflow-hidden">
+              <Switch>
+                <Match when={params.id && mobileChanges()}>
+                  <div class="relative h-full overflow-hidden">
+                    {reviewContent({
+                      diffStyle: "unified",
+                      classes: {
+                        root: "pb-8 [&_[data-slot=session-review-list]]:pb-0",
+                        header: "px-4 !h-16 !pb-4",
+                        container: "px-4",
+                      },
+                      loadingClass: "px-4 py-4 text-text-weak",
+                      emptyClass: "h-full pb-64 -mt-4 flex flex-col items-center justify-center text-center gap-6",
+                    })}
+                  </div>
+                </Match>
+                <Match when={params.id}>
+                  <Show when={messagesReady() ? params.id : undefined} keyed>
+                    {(_id) => (
+                      <MessageTimeline
+                        actions={actions}
+                        scroll={ui.scroll}
+                        onResumeScroll={resumeScroll}
+                        setScrollRef={setScrollRef}
+                        onScheduleScrollState={scheduleScrollState}
+                        onAutoScrollHandleScroll={autoScroll.handleScroll}
+                        onMarkScrollGesture={markScrollGesture}
+                        hasScrollGesture={hasScrollGesture}
+                        onUserScroll={markUserScroll}
+                        onHistoryScroll={onHistoryScroll}
+                        onAutoScrollInteraction={autoScroll.handleInteraction}
+                        shouldAnchorBottom={() =>
+                          !location.hash && !store.messageId && !ui.pendingMessage && !autoScroll.userScrolled()
+                        }
+                        centered={centered()}
+                        setContentRef={(el) => {
+                          content = el
+                          autoScroll.contentRef(el)
+
+                          const root = scroller
+                          if (root) scheduleScrollState(root)
+                        }}
+                        userMessages={visibleUserMessages()}
+                        setHistoryAnchor={(handlers) => {
+                          captureHistoryAnchor = handlers.capture
+                          restoreHistoryAnchor = handlers.restore
+                        }}
+                        anchor={anchor}
+                        setRevealMessage={(fn) => {
+                          revealMessage = fn
+                        }}
+                        setScrollToEnd={(fn) => {
+                          scrollToEnd = fn
+                        }}
+                      />
+                    )}
+                  </Show>
+                </Match>
+                <Match when={true}>
+                  <NewSessionView worktree={newSessionWorktree()} />
+                </Match>
+              </Switch>
+            </div>
+
+            <Show when={(params.id || !newSessionDesign()) && !mobileChanges()}>{(_) => composerRegion()}</Show>
+            <Show when={!!params.id && mobileTabsBottom()}>{mobileTabs(true, true)}</Show>
+          </div>

          <Show when={desktopReviewOpen()}>
            <div onPointerDown={() => size.start()}>
@@ -2057,6 +1832,6 @@ export default function Page() {
      </div>

      <TerminalPanel />
-    </SessionRouteFrame>
+    </div>
  )
 }
@@ -1,10 +1,9 @@
-import { For, Show, createEffect, createMemo, onCleanup, onMount, type Component } from "solid-js"
+import { For, Show, createMemo, onCleanup, onMount, type Component } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useMutation } from "@tanstack/solid-query"
 import { Button } from "@opencode-ai/ui/button"
 import { DockPrompt } from "@opencode-ai/session-ui/dock-prompt"
 import { Icon } from "@opencode-ai/ui/icon"
-import { useSpring } from "@opencode-ai/ui/motion-spring"
 import { showToast } from "@/utils/toast"
 import type { QuestionAnswer, QuestionRequest } from "@opencode-ai/sdk/v2"
 import { useLanguage } from "@/context/language"
@@ -78,12 +77,9 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
    customOn: cached?.customOn ?? ([] as boolean[]),
    editing: false,
    focus: 0,
-    minimized: false,
-    optionsHeight: 180,
  })

  let root: HTMLDivElement | undefined
-  let optionsRef: HTMLDivElement | undefined
  let customRef: HTMLButtonElement | undefined
  let optsRef: HTMLButtonElement[] = []
  let replied = false
@@ -100,13 +96,11 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
    const n = Math.min(store.tab + 1, total())
    return language.t("session.question.progress", { current: n, total: total() })
  })
+
  const customLabel = () => language.t("ui.messagePart.option.typeOwnAnswer")
  const customPlaceholder = () => language.t("ui.question.custom.placeholder")

  const last = createMemo(() => store.tab >= total() - 1)
-  const collapse = useSpring(() => (store.minimized ? 1 : 0), { visualDuration: 0.3, bounce: 0 })
-  const hidden = createMemo(() => Math.max(0, Math.min(1, collapse())))
-  const optionsOff = createMemo(() => hidden() > 0.98)

  const customUpdate = (value: string, selected: boolean = on()) => {
    const prev = input().trim()
@@ -198,14 +192,6 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
    focus(pickFocus())
  })

-  createEffect(() => {
-    const el = optionsRef
-    if (!el) return
-    const update = () => setStore("optionsHeight", (height) => Math.max(height, el.scrollHeight))
-    update()
-    createResizeObserver(el, update)
-  })
-
  onCleanup(() => {
    if (focusFrame !== undefined) cancelAnimationFrame(focusFrame)
    if (replied) return
@@ -419,7 +405,7 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
    const tab = store.tab + 1
    setStore("tab", tab)
    setStore("editing", false)
-    if (!store.minimized) focus(pickFocus(tab))
+    focus(pickFocus(tab))
  }

  const back = () => {
@@ -428,212 +414,163 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
    const tab = store.tab - 1
    setStore("tab", tab)
    setStore("editing", false)
-    if (!store.minimized) focus(pickFocus(tab))
+    focus(pickFocus(tab))
  }

  const jump = (tab: number) => {
    if (sending()) return
    setStore("tab", tab)
    setStore("editing", false)
-    if (!store.minimized) focus(pickFocus(tab))
-  }
-
-  const minimize = () => {
-    if (sending()) return
-    setStore("editing", false)
-    setStore("minimized", true)
-  }
-
-  const restore = () => {
-    if (sending()) return
-    setStore("minimized", false)
-    focus(pickFocus())
+    focus(pickFocus(tab))
  }

  return (
-    <div data-component="session-question-dock">
-      <DockPrompt
-        kind="question"
-        ref={(el) => (root = el)}
-        onKeyDown={nav}
-        header={
-          <>
-            <div data-slot="question-header-title">{summary()}</div>
-            <div data-slot="question-header-actions">
-              <Show when={total() > 1}>
-                <div data-slot="question-progress">
-                  <For each={questions()}>
-                    {(_, i) => (
-                      <button
-                        type="button"
-                        data-slot="question-progress-segment"
-                        data-active={i() === store.tab}
-                        data-answered={answered(i())}
-                        disabled={sending()}
-                        onClick={() => jump(i())}
-                        aria-label={`${language.t("ui.tool.questions")} ${i() + 1}`}
-                      />
-                    )}
-                  </For>
-                </div>
-              </Show>
-              <button
-                type="button"
-                data-component="icon-button"
-                data-icon="chevron-down"
-                data-size="normal"
-                data-variant="ghost"
-                disabled={sending()}
-                style={{ transform: `rotate(${hidden() * 180}deg)` }}
-                onClick={store.minimized ? restore : minimize}
-                aria-label={language.t(store.minimized ? "session.question.restore" : "session.question.minimize")}
-              >
-                <Icon name="chevron-down" size="small" />
-              </button>
+    <DockPrompt
+      kind="question"
+      ref={(el) => (root = el)}
+      onKeyDown={nav}
+      header={
+        <>
+          <div data-slot="question-header-title">{summary()}</div>
+          <Show when={total() > 1}>
+            <div data-slot="question-progress">
+              <For each={questions()}>
+                {(_, i) => (
+                  <button
+                    type="button"
+                    data-slot="question-progress-segment"
+                    data-active={i() === store.tab}
+                    data-answered={answered(i())}
+                    disabled={sending()}
+                    onClick={() => jump(i())}
+                    aria-label={`${language.t("ui.tool.questions")} ${i() + 1}`}
+                  />
+                )}
+              </For>
            </div>
-          </>
-        }
-        footer={
-          <>
-            <Button variant="ghost" size="large" disabled={sending()} onClick={reject} aria-keyshortcuts="Escape">
-              {language.t("ui.common.dismiss")}
-            </Button>
-            <div data-slot="question-footer-actions">
-              <Show when={store.tab > 0}>
-                <Button variant="secondary" size="large" disabled={sending()} onClick={back}>
-                  {language.t("ui.common.back")}
-                </Button>
-              </Show>
-              <Button
-                variant={last() ? "primary" : "secondary"}
-                size="large"
-                disabled={sending()}
-                onClick={next}
-                aria-keyshortcuts="Meta+Enter Control+Enter"
-              >
-                {last() ? language.t("ui.common.submit") : language.t("ui.common.next")}
-              </Button>
-            </div>
-          </>
-        }
-      >
-        <div
-          data-slot="question-text"
-          style={{
-            display: store.minimized ? "-webkit-box" : undefined,
-            "-webkit-line-clamp": store.minimized ? "3" : undefined,
-            "-webkit-box-orient": store.minimized ? "vertical" : undefined,
-            overflow: store.minimized ? "hidden" : undefined,
-          }}
-        >
-          {question()?.question}
-        </div>
-        <Show when={!store.minimized}>
-          <Show when={multi()} fallback={<div data-slot="question-hint">{language.t("ui.question.singleHint")}</div>}>
-            <div data-slot="question-hint">{language.t("ui.question.multiHint")}</div>
          </Show>
-        </Show>
-        <div
-          ref={(el) => (optionsRef = el)}
-          data-slot="question-options"
-          aria-hidden={store.minimized || optionsOff() ? "true" : undefined}
-          classList={{ "pointer-events-none": hidden() > 0.1 }}
-          style={{
-            "max-height": `${Math.max(0, store.optionsHeight * (1 - hidden()))}px`,
-            opacity: `${Math.max(0, Math.min(1, 1 - hidden()))}`,
-            visibility: optionsOff() ? "hidden" : "visible",
-          }}
-        >
-          <For each={options()}>
-            {(opt, i) => (
-              <Option
-                multi={multi()}
-                picked={picked(opt.label)}
-                label={opt.label}
-                description={opt.description}
-                disabled={sending()}
-                ref={(el) => (optsRef[i()] = el)}
-                onFocus={() => setStore("focus", i())}
-                onClick={() => selectOption(i())}
-              />
-            )}
-          </For>
+        </>
+      }
+      footer={
+        <>
+          <Button variant="ghost" size="large" disabled={sending()} onClick={reject} aria-keyshortcuts="Escape">
+            {language.t("ui.common.dismiss")}
+          </Button>
+          <div data-slot="question-footer-actions">
+            <Show when={store.tab > 0}>
+              <Button variant="secondary" size="large" disabled={sending()} onClick={back}>
+                {language.t("ui.common.back")}
+              </Button>
+            </Show>
+            <Button
+              variant={last() ? "primary" : "secondary"}
+              size="large"
+              disabled={sending()}
+              onClick={next}
+              aria-keyshortcuts="Meta+Enter Control+Enter"
+            >
+              {last() ? language.t("ui.common.submit") : language.t("ui.common.next")}
+            </Button>
+          </div>
+        </>
+      }
+    >
+      <div data-slot="question-text" class="overflow-auto">
+        {question()?.question}
+      </div>
+      <Show when={multi()} fallback={<div data-slot="question-hint">{language.t("ui.question.singleHint")}</div>}>
+        <div data-slot="question-hint">{language.t("ui.question.multiHint")}</div>
+      </Show>
+      <div data-slot="question-options">
+        <For each={options()}>
+          {(opt, i) => (
+            <Option
+              multi={multi()}
+              picked={picked(opt.label)}
+              label={opt.label}
+              description={opt.description}
+              disabled={sending()}
+              ref={(el) => (optsRef[i()] = el)}
+              onFocus={() => setStore("focus", i())}
+              onClick={() => selectOption(i())}
+            />
+          )}
+        </For>

-          <Show
-            when={store.editing}
-            fallback={
-              <button
-                type="button"
-                ref={customRef}
-                data-slot="question-option"
-                data-custom="true"
-                data-picked={on()}
-                role={multi() ? "checkbox" : "radio"}
-                aria-checked={on()}
-                disabled={sending()}
-                onFocus={() => setStore("focus", options().length)}
-                onClick={customOpen}
-              >
-                <Mark multi={multi()} picked={on()} onClick={toggleCustomMark} />
-                <span data-slot="question-option-main">
-                  <span data-slot="option-label">{customLabel()}</span>
-                  <span data-slot="option-description">{input() || customPlaceholder()}</span>
-                </span>
-              </button>
-            }
-          >
-            <form
+        <Show
+          when={store.editing}
+          fallback={
+            <button
+              type="button"
+              ref={customRef}
              data-slot="question-option"
              data-custom="true"
              data-picked={on()}
              role={multi() ? "checkbox" : "radio"}
              aria-checked={on()}
-              onMouseDown={(e) => {
-                if (sending()) {
-                  e.preventDefault()
-                  return
-                }
-                if (e.target instanceof HTMLTextAreaElement) return
-                const input = e.currentTarget.querySelector('[data-slot="question-custom-input"]')
-                if (input instanceof HTMLTextAreaElement) input.focus()
-              }}
-              onSubmit={(e) => {
-                e.preventDefault()
-                commitCustom()
-              }}
+              disabled={sending()}
+              onFocus={() => setStore("focus", options().length)}
+              onClick={customOpen}
            >
              <Mark multi={multi()} picked={on()} onClick={toggleCustomMark} />
              <span data-slot="question-option-main">
                <span data-slot="option-label">{customLabel()}</span>
-                <textarea
-                  ref={focusCustom}
-                  data-slot="question-custom-input"
-                  placeholder={customPlaceholder()}
-                  value={input()}
-                  rows={1}
-                  disabled={sending()}
-                  onKeyDown={(e) => {
-                    if (e.key === "Escape") {
-                      e.preventDefault()
-                      setStore("editing", false)
-                      focus(options().length)
-                      return
-                    }
-                    if ((e.metaKey || e.ctrlKey) && !e.altKey) return
-                    if (e.key !== "Enter" || e.shiftKey) return
-                    e.preventDefault()
-                    commitCustom()
-                  }}
-                  onInput={(e) => {
-                    customUpdate(e.currentTarget.value)
-                    resizeInput(e.currentTarget)
-                  }}
-                />
+                <span data-slot="option-description">{input() || customPlaceholder()}</span>
              </span>
-            </form>
-          </Show>
-        </div>
-      </DockPrompt>
-    </div>
+            </button>
+          }
+        >
+          <form
+            data-slot="question-option"
+            data-custom="true"
+            data-picked={on()}
+            role={multi() ? "checkbox" : "radio"}
+            aria-checked={on()}
+            onMouseDown={(e) => {
+              if (sending()) {
+                e.preventDefault()
+                return
+              }
+              if (e.target instanceof HTMLTextAreaElement) return
+              const input = e.currentTarget.querySelector('[data-slot="question-custom-input"]')
+              if (input instanceof HTMLTextAreaElement) input.focus()
+            }}
+            onSubmit={(e) => {
+              e.preventDefault()
+              commitCustom()
+            }}
+          >
+            <Mark multi={multi()} picked={on()} onClick={toggleCustomMark} />
+            <span data-slot="question-option-main">
+              <span data-slot="option-label">{customLabel()}</span>
+              <textarea
+                ref={focusCustom}
+                data-slot="question-custom-input"
+                placeholder={customPlaceholder()}
+                value={input()}
+                rows={1}
+                disabled={sending()}
+                onKeyDown={(e) => {
+                  if (e.key === "Escape") {
+                    e.preventDefault()
+                    setStore("editing", false)
+                    focus(options().length)
+                    return
+                  }
+                  if ((e.metaKey || e.ctrlKey) && !e.altKey) return
+                  if (e.key !== "Enter" || e.shiftKey) return
+                  e.preventDefault()
+                  commitCustom()
+                }}
+                onInput={(e) => {
+                  customUpdate(e.currentTarget.value)
+                  resizeInput(e.currentTarget)
+                }}
+              />
+            </span>
+          </form>
+        </Show>
+      </div>
+    </DockPrompt>
  )
 }
@@ -736,9 +736,8 @@ export function MessageTimeline(props: {
    if (!sessionID() || parentID()) return
    setTitle({ editing: true, draft: titleLabel() ?? "" })
    requestAnimationFrame(() => {
-      if (!titleRef) return
-      titleRef.focus()
-      titleRef.select()
+      titleRef?.focus()
+      titleRef?.select()
    })
  }

@@ -1358,7 +1357,7 @@ export function MessageTimeline(props: {
              "w-full": true,
              "pb-4": true,
              "pr-3": true,
-              "pl-2": settings.general.newLayoutDesigns(),
+              "pl-4": settings.general.newLayoutDesigns(),
              "pl-2 md:pl-4": !settings.general.newLayoutDesigns(),
              "md:max-w-200 md:mx-auto 2xl:max-w-[1000px]": props.centered && !settings.general.newLayoutDesigns(),
            }}
@@ -1370,19 +1369,19 @@ export function MessageTimeline(props: {
                  "pr-3": !settings.general.newLayoutDesigns(),
                }}
              >
-                <div class="flex items-center min-w-0 flex-1 w-full">
+                <div class="flex items-center min-w-0 grow-1">
                  <Show when={parentID()}>
                    <button
                      type="button"
                      data-slot="session-title-parent"
-                      class="min-w-0 max-w-[40%] truncate px-2 text-[13px] font-[530] leading-4 tracking-[-0.04px] text-v2-text-text-faint transition-colors hover:text-v2-text-text-muted"
+                      class="min-w-0 max-w-[40%] truncate text-14-medium text-text-weak transition-colors hover:text-text-base"
                      onClick={navigateParent}
                    >
                      {parentTitle()}
                    </button>
                    <span
                      data-slot="session-title-separator"
-                      class="-translate-y-[0.5px] px-1 text-[11px] font-medium text-v2-text-text-faint"
+                      class="px-2 text-14-medium text-text-weak"
                      aria-hidden="true"
                    >
                      /
@@ -1394,13 +1393,8 @@ export function MessageTimeline(props: {
                      fallback={
                        <h1
                          data-slot="session-title-child"
-                          classList={{
-                            "truncate text-[13px] font-[530] leading-4 tracking-[-0.04px] text-v2-text-text-base": true,
-                            "w-fit rounded-[6px] px-2 py-1 hover:bg-v2-overlay-simple-overlay-hover":
-                              settings.general.newLayoutDesigns(),
-                            "grow-1 min-w-0": !settings.general.newLayoutDesigns(),
-                          }}
-                          onClick={openTitleEditor}
+                          class="text-14-medium text-text-strong truncate grow-1 min-w-0"
+                          onDblClick={openTitleEditor}
                        >
                          {childTitle()}
                        </h1>
@@ -1414,10 +1408,10 @@ export function MessageTimeline(props: {
                        value={title.draft}
                        disabled={titleMutation.isPending}
                        classList={{
-                          "block text-[13px] font-[530] leading-4 tracking-[-0.04px] text-v2-text-text-base": true,
-                          "w-full flex-1 grow-1 min-w-0 pl-1 -ml-1 rounded-[6px]": !settings.general.newLayoutDesigns(),
-                          "field-sizing-content self-start rounded-[6px] px-2 py-1 ":
+                          "text-14-medium text-text-strong grow-1 min-w-0 pl-1 -ml-1": true,
+                          "h-6 leading-4 rounded-[3px] focus:shadow-none focus:outline focus:outline-1 focus:outline-offset-[-1px] focus:outline-v2-border-border-focus":
                            settings.general.newLayoutDesigns(),
+                          "rounded-[6px]": !settings.general.newLayoutDesigns(),
                        }}
                        style={{
                          "--inline-input-shadow": settings.general.newLayoutDesigns()
@@ -16,7 +16,6 @@ type PersistedWithReady<T> = [

 type PersistTarget = {
  storage?: string
-  scope?: "window"
  legacyStorageNames?: string[]
  key: string
  legacy?: string[]
@@ -25,7 +24,6 @@ type PersistTarget = {

 const LEGACY_STORAGE = "default.dat"
 const GLOBAL_STORAGE = "opencode.global.dat"
-const WINDOW_STORAGE = "opencode.window"
 const LOCAL_PREFIX = "opencode."
 const fallback = new Map<string, boolean>()

@@ -349,11 +347,6 @@ function draftStorage(draftID: string) {
  return `opencode.draft.${head}.${sum}.dat`
 }

-function windowStorage(windowID: string) {
-  const safe = (windowID || "browser").replace(/[^a-zA-Z0-9._-]/g, "-")
-  return `${WINDOW_STORAGE}.${safe}.dat`
-}
-
 function legacyWorkspaceStorage(dir: string) {
  const storage = workspaceStorage(pathKey(dir))
  const result = new Set<string>()
@@ -474,8 +467,6 @@ export const PersistTesting = {
  localStorageWithPrefix,
  migrateLegacy,
  normalize,
-  resolveTarget,
-  windowStorage,
  workspaceStorage,
 }

@@ -483,9 +474,6 @@ export const Persist = {
  global(key: string, legacy?: string[]): PersistTarget {
    return { storage: GLOBAL_STORAGE, key, legacy }
  },
-  window(key: string, legacy?: string[]): PersistTarget {
-    return { scope: "window", key, legacy }
-  },
  draft(draftID: string, key: string, legacy?: string[]): PersistTarget {
    return { storage: draftStorage(draftID), key: `draft:${key}`, legacy }
  },
@@ -515,16 +503,6 @@ export const Persist = {
  },
 }

-function resolveTarget(target: PersistTarget, platform: Platform): PersistTarget {
-  if (target.scope !== "window") return target
-  if (platform.platform === "desktop" && !platform.windowID) return { ...target, storage: GLOBAL_STORAGE }
-  const windowID = platform.platform === "desktop" ? (platform.windowID ?? "browser") : "browser"
-  return {
-    ...target,
-    storage: windowStorage(windowID),
-  }
-}
-
 export function removePersisted(
  target: { storage?: string; legacyStorageNames?: string[]; key: string },
  platform?: Platform,
@@ -555,7 +533,7 @@ export function persisted<T>(
  store: [Store<T>, SetStoreFunction<T>],
 ): PersistedWithReady<T> {
  const platform = usePlatform()
-  const config = resolveTarget(typeof target === "string" ? { key: target } : target, platform)
+  const config: PersistTarget = typeof target === "string" ? { key: target } : target

  const defaults = snapshot(store[0])
  const legacy = config.legacy ?? []
@@ -1,57 +0,0 @@
-import { useMutation } from "@tanstack/solid-query"
-import { createEffect } from "solid-js"
-import type { Accessor } from "solid-js"
-import {
-  addServerProbePlan,
-  createProbeFailureGate,
-  runAddableProbePlan,
-  type AddServerProbePlan,
-  type WslAddServerView,
-} from "./settings-model"
-import type { WslInstalledDistro, WslServersPlatform, WslServersState } from "./types"
-
-export function useWslAddServerProbes(input: {
-  state: Accessor<WslServersState | undefined>
-  api: WslServersPlatform
-  view: Accessor<WslAddServerView>
-  adding: Accessor<boolean>
-  busy: Accessor<boolean>
-  selectedDistro: Accessor<string | null>
-  addableInstalledDistros: Accessor<WslInstalledDistro[]>
-  onError: (error: unknown) => void
-}) {
-  const gate = createProbeFailureGate()
-  const probe = useMutation(() => ({
-    mutationFn: async (command: AddServerProbePlan) => {
-      if (command.kind === "addable") {
-        await runAddableProbePlan({ plan: command.plan, api: input.api })
-        return
-      }
-      if (command.plan.action === "probeRuntime") await input.api.probeRuntime()
-      if (command.plan.action === "refreshDistros") await input.api.refreshDistros()
-    },
-    onError: input.onError,
-    onSettled: (_result, error, command) => {
-      if (command) gate.settle(command.key, error)
-    },
-  }))
-
-  createEffect(() => {
-    if (probe.isPending) return
-    const command = addServerProbePlan({
-      state: input.state(),
-      view: input.view(),
-      adding: input.adding(),
-      busy: input.busy(),
-      selectedDistro: input.selectedDistro(),
-      addableInstalledDistros: input.addableInstalledDistros(),
-    })
-    if (!command || !gate.accepts(command.key)) return
-    probe.mutate(command)
-  })
-
-  return {
-    probingAddable: () => probe.isPending && probe.variables?.kind === "addable",
-    resetProbeFailure: () => gate.reset(),
-  }
-}
@@ -1,28 +1,20 @@
+import { Button } from "@opencode-ai/ui/button"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
+import { Spinner } from "@opencode-ai/ui/spinner"
 import { showToast } from "@opencode-ai/ui/toast"
-import { ButtonV2 } from "@opencode-ai/ui/v2/button-v2"
-import { Dialog, DialogBody, DialogFooter, DialogHeader, DialogTitle } from "@opencode-ai/ui/v2/dialog-v2"
-import { DividerV2 } from "@opencode-ai/ui/v2/divider-v2"
-import { LoaderV2 } from "@opencode-ai/ui/v2/loader-v2"
-import { RadioGroupV2, RadioItemV2 } from "@opencode-ai/ui/v2/radio-v2"
-import { TextInputV2 } from "@opencode-ai/ui/v2/text-input-v2"
-import { createMemo, For, Show } from "solid-js"
+import { createEffect, createMemo, For, Match, onCleanup, Show, Switch } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useLanguage } from "@/context/language"
 import { usePlatform } from "@/context/platform"
-import { useWslAddServerProbes } from "./add-server-probes"
 import { useWslServers } from "./context"
-import { addServerViewModel, type AddServerText } from "./settings-model"
-import "./dialog-add-wsl-server.css"
+import { enterWslOpencodeStep } from "./settings-model"

-function isWslRuntimeMissing(error: string | null | undefined) {
-  if (!error) return true
-  return /WSL is not installed|not been installed|wsl(?:\.exe)? --install/i.test(error)
-}
+type WslServerStep = "wsl" | "distro" | "opencode"

-function translate(language: ReturnType<typeof useLanguage>, value: AddServerText) {
-  if (value.params) return language.t(value.key, value.params)
-  return language.t(value.key)
+const STEPS: WslServerStep[] = ["wsl", "distro", "opencode"]
+
+function isHiddenDistro(name: string) {
+  return /^docker-desktop(?:-data)?$/i.test(name)
 }

 interface DialogWslServerProps {
@@ -30,272 +22,210 @@ interface DialogWslServerProps {
 }

 export function DialogAddWslServer(props: DialogWslServerProps = {}) {
-  const language = useLanguage()
-  const controller = useWslAddServerController(props)
-  const model = controller.model
-  const primaryButton = () => model().primaryButton
-  const primaryButtonStyle = () => {
-    const width = primaryButton().width
-    if (!width) return undefined
-    return { width }
-  }
-
-  return (
-    <Show
-      when={!controller.wslServers.isPending && !controller.wslServers.isError}
-      fallback={
-        <Dialog fit class="settings-v2-wsl-dialog">
-          <Show
-            when={!controller.wslServers.isError}
-            fallback={<div class="settings-v2-wsl-loading">{controller.loadError()}</div>}
-          >
-            <div class="settings-v2-wsl-loading">
-              <LoaderV2 />
-            </div>
-          </Show>
-        </Dialog>
-      }
-    >
-      <Show
-        when={model().runtimeState === "ready"}
-        fallback={
-          <Show
-            when={model().runtimeState === "checking" || model().runtimeState === "loading"}
-            fallback={
-              <DialogWslSetup
-                state={model().runtimeState}
-                error={controller.runtimeError()}
-                installable={isWslRuntimeMissing(controller.runtimeError())}
-                busy={model().busy}
-                onInstall={controller.installWsl}
-              />
-            }
-          >
-            <Dialog fit class="settings-v2-wsl-dialog">
-              <div class="settings-v2-wsl-loading">
-                <LoaderV2 />
-              </div>
-            </Dialog>
-          </Show>
-        }
-      >
-        <Dialog fit class="settings-v2-wsl-dialog">
-          <DialogHeader hideClose={true}>
-            <DialogTitle>
-              {controller.view() === "main" ? language.t("wsl.server.add") : language.t("wsl.onboarding.installDistro")}
-            </DialogTitle>
-          </DialogHeader>
-          <DividerV2 />
-          <Show
-            when={controller.view() === "main"}
-            fallback={
-              <>
-                <DialogBody class="settings-v2-wsl-dialog-body settings-v2-wsl-catalog-picker">
-                  <TextInputV2
-                    class="settings-v2-wsl-catalog-search"
-                    appearance="large"
-                    placeholder={language.t("wsl.onboarding.searchDistros")}
-                    value={controller.catalogSearch()}
-                    disabled={model().busy}
-                    onInput={(event) => controller.setCatalogSearch(event.currentTarget.value)}
-                  />
-                  <div class="settings-v2-wsl-catalog-list">
-                    <RadioGroupV2
-                      hideLabel
-                      class="settings-v2-wsl-distro-group"
-                      label={language.t("wsl.onboarding.installDistro")}
-                      value={model().catalogTarget ?? undefined}
-                      onChange={controller.setCatalogTarget}
-                      disabled={model().busy}
-                    >
-                      <For each={model().filteredInstallableDistros}>
-                        {(item) => (
-                          <RadioItemV2
-                            class="settings-v2-wsl-distro-row settings-v2-wsl-catalog-row"
-                            value={item.name}
-                            disabled={model().busy}
-                            label={<span class="settings-v2-wsl-distro-label">{item.label}</span>}
-                          />
-                        )}
-                      </For>
-                    </RadioGroupV2>
-                  </div>
-                </DialogBody>
-                <DialogFooter>
-                  <ButtonV2 variant="neutral" disabled={model().busy} onClick={controller.closeCatalog}>
-                    {language.t("common.cancel")}
-                  </ButtonV2>
-                  <ButtonV2
-                    variant={model().installingCatalogDistro ? "loading" : "contrast"}
-                    disabled={!model().installingCatalogDistro && (model().busy || !model().catalogTarget)}
-                    style={{ width: "99px" }}
-                    onClick={controller.installCatalogDistro}
-                  >
-                    <Show when={model().installingCatalogDistro} fallback={language.t("wsl.onboarding.installDistro")}>
-                      <LoaderV2 />
-                    </Show>
-                  </ButtonV2>
-                </DialogFooter>
-              </>
-            }
-          >
-            <DialogBody class="settings-v2-wsl-dialog-body">
-              <div class="settings-v2-wsl-section-header">
-                <span class="settings-v2-wsl-section-title">{language.t("wsl.onboarding.installedDistros")}</span>
-                <ButtonV2
-                  variant="ghost-muted"
-                  size="small"
-                  disabled={model().busy}
-                  onClick={controller.refreshDistros}
-                >
-                  {language.t("wsl.onboarding.checkAgain")}
-                </ButtonV2>
-              </div>
-
-              <Show
-                when={model().addableInstalledDistros.length > 0}
-                fallback={
-                  <div class="settings-v2-wsl-distro-list">
-                    <div class="settings-v2-wsl-distro-empty">
-                      {model().visibleInstalledDistros.length
-                        ? language.t("wsl.onboarding.allDistrosAdded")
-                        : language.t("wsl.onboarding.noDistros")}
-                    </div>
-                  </div>
-                }
-              >
-                <div class="settings-v2-wsl-distro-list">
-                  <RadioGroupV2
-                    hideLabel
-                    class="settings-v2-wsl-distro-group"
-                    label={language.t("wsl.onboarding.installedDistros")}
-                    value={model().selectedDistro ?? undefined}
-                    onChange={controller.setSelectedDistro}
-                    disabled={model().busy}
-                  >
-                    <For each={model().addableInstalledDistros}>
-                      {(item) => {
-                        const status = () => model().distroStatuses[item.name] ?? null
-                        return (
-                          <RadioItemV2
-                            class={`settings-v2-wsl-distro-row${item.version === 1 ? " settings-v2-wsl-distro-row--unsupported" : ""}`}
-                            value={item.name}
-                            disabled={item.version === 1 || model().busy}
-                            label={<span class="settings-v2-wsl-distro-label">{item.name}</span>}
-                            description={
-                              <Show when={status()}>
-                                {(value) => (
-                                  <span class="settings-v2-wsl-distro-status" data-tone={value().tone}>
-                                    {translate(language, value().label)}
-                                  </span>
-                                )}
-                              </Show>
-                            }
-                          />
-                        )
-                      }}
-                    </For>
-                  </RadioGroupV2>
-                </div>
-              </Show>
-
-              <Show when={model().installableDistros.length > 0}>
-                <button
-                  type="button"
-                  class="settings-v2-wsl-catalog-card"
-                  disabled={model().busy}
-                  onClick={controller.openCatalog}
-                >
-                  <span class="settings-v2-wsl-catalog-icon" aria-hidden="true">
-                    <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-                      <path
-                        d="M13.5564 10.4443V13.5554H4.22309C3.24087 13.5554 2.44531 13.5554 2.44531 13.5554V10.4443M11.112 5.99989L8.00087 9.111L4.88976 5.99989M8.00087 9.111L8.00087 2.44434"
-                        stroke="currentColor"
-                      />
-                    </svg>
-                  </span>
-                  <span class="settings-v2-wsl-catalog-copy">
-                    <span class="settings-v2-wsl-catalog-title">{language.t("wsl.onboarding.needAnotherDistro")}</span>
-                    <span class="settings-v2-wsl-catalog-description">
-                      {language.t("wsl.onboarding.needAnotherDistroHint")}
-                    </span>
-                  </span>
-                  <span class="settings-v2-wsl-catalog-chevron" aria-hidden="true">
-                    <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-                      <path d="M6 12L10 8L6 4" stroke="currentColor" />
-                    </svg>
-                  </span>
-                </button>
-              </Show>
-            </DialogBody>
-
-            <DialogFooter>
-              <ButtonV2 variant="neutral" disabled={controller.adding()} onClick={controller.close}>
-                {language.t("common.cancel")}
-              </ButtonV2>
-              <ButtonV2
-                variant={primaryButton().loading ? "loading" : primaryButton().variant}
-                disabled={!primaryButton().loading && primaryButton().disabled}
-                style={primaryButtonStyle()}
-                onClick={controller.runPrimary}
-              >
-                <Show when={primaryButton().loading} fallback={translate(language, primaryButton().label)}>
-                  <LoaderV2 />
-                </Show>
-              </ButtonV2>
-            </DialogFooter>
-          </Show>
-        </Dialog>
-      </Show>
-    </Show>
-  )
-}
-
-function useWslAddServerController(props: DialogWslServerProps) {
  const language = useLanguage()
  const platform = usePlatform()
  const dialog = useDialog()
  const wslServers = useWslServers()
  const api = platform.wslServers!
  const [store, setStore] = createStore({
-    view: "main" as "main" | "catalog",
+    step: undefined as WslServerStep | undefined,
    selectedDistro: null as string | null,
-    catalogSearch: "",
-    catalogTarget: null as string | null,
+    installTarget: undefined as string | undefined,
    adding: false,
  })
  const current = () => wslServers.data
-  const viewModel = (probingAddable: boolean) =>
-    addServerViewModel({
-      state: current(),
-      view: store.view,
-      selectedDistro: store.selectedDistro,
-      catalogSearch: store.catalogSearch,
-      catalogTarget: store.catalogTarget,
-      adding: store.adding,
-      probingAddable,
-    })
-  const baseModel = createMemo(() => viewModel(false))
-  const probes = useWslAddServerProbes({
-    state: current,
-    api,
-    view: () => store.view,
-    adding: () => store.adding,
-    busy: () => baseModel().busy,
-    selectedDistro: () => baseModel().selectedDistro,
-    addableInstalledDistros: () => baseModel().addableInstalledDistros,
-    onError: (error) => requestError(language, error),
+  let disposed = false
+  onCleanup(() => {
+    disposed = true
  })
-  const model = createMemo(() => viewModel(probes.probingAddable()))
+  const busy = createMemo(() => !!current()?.job || store.adding)
+  const visibleInstalledDistros = createMemo(() =>
+    (current()?.installed ?? []).filter((item) => !isHiddenDistro(item.name)),
+  )
+  const visibleOnlineDistros = createMemo(() => (current()?.online ?? []).filter((item) => !isHiddenDistro(item.name)))
+  const defaultInstalledDistro = createMemo(() => visibleInstalledDistros().find((item) => item.isDefault) ?? null)
+  const existingServerDistros = createMemo(() => new Set((current()?.servers ?? []).map((item) => item.config.distro)))
+  const addableInstalledDistros = createMemo(() => {
+    return visibleInstalledDistros().filter((item) => !existingServerDistros().has(item.name))
+  })
+  const selectedDistro = createMemo(() => {
+    if (store.selectedDistro && addableInstalledDistros().some((item) => item.name === store.selectedDistro)) {
+      return store.selectedDistro
+    }
+    const distro = defaultInstalledDistro()
+    if (distro && !existingServerDistros().has(distro.name)) return distro.name
+    return null
+  })
+  const selectedProbe = createMemo(() => {
+    const distro = selectedDistro()
+    if (!distro) return null
+    return current()?.distroProbes[distro] ?? null
+  })
+  const selectedInstalled = createMemo(() => {
+    const distro = selectedDistro()
+    if (!distro) return null
+    return (current()?.installed ?? []).find((item) => item.name === distro) ?? null
+  })
+  const opencodeCheck = createMemo(() => {
+    const distro = selectedDistro()
+    if (!distro) return null
+    return current()?.opencodeChecks[distro] ?? null
+  })
+  const wslReady = createMemo(() => !!current()?.runtime?.available && !current()?.pendingRestart)
+  const distroReady = createMemo(() => {
+    const probe = selectedProbe()
+    if (!probe || !selectedDistro()) return false
+    if (selectedInstalled()?.version === 1) return false
+    return probe.canExecute && probe.hasBash && probe.hasCurl
+  })
+  const opencodeReady = createMemo(() => {
+    const check = opencodeCheck()
+    return !!check?.resolvedPath && !check.error
+  })
+  const distroWarningProbe = createMemo(() => {
+    const probe = selectedProbe()
+    if (!probe) return null
+    if (distroReady()) return null
+    return probe
+  })
+  const distroUnavailableMessage = createMemo(() => {
+    const probe = distroWarningProbe()
+    const distro = selectedDistro()
+    if (!probe || probe.canExecute || !distro) return null
+    if (!selectedInstalled()) return language.t("wsl.onboarding.distroNotInstalled", { distro })
+    return language.t("wsl.onboarding.openDistroOnce", { distro })
+  })
+  const distroMissingTools = createMemo(() => {
+    const probe = distroWarningProbe()
+    if (!probe?.canExecute) return null
+    if (probe.hasBash && probe.hasCurl) return null
+    return probe
+  })
+  const installableDistros = createMemo(() => {
+    const online = visibleOnlineDistros()
+    const installed = new Set(visibleInstalledDistros().map((item) => item.name))
+    const hasVersionedUbuntu = online.some((item) => /^Ubuntu-\d/.test(item.name))
+    return online
+      .filter((item) => !installed.has(item.name))
+      .filter((item) => !(item.name === "Ubuntu" && hasVersionedUbuntu))
+  })
+  const installTarget = createMemo(
+    () => installableDistros().find((item) => item.name === store.installTarget) ?? installableDistros()[0] ?? null,
+  )
+  const installingDistro = createMemo(() => current()?.job?.kind === "install-distro")
+  const installingOpencode = createMemo(() => {
+    const job = current()?.job
+    return job?.kind === "install-opencode" && job.distro === selectedDistro()
+  })
+  const allReady = createMemo(() => wslReady() && distroReady() && opencodeReady())
+  const addDisabled = createMemo(() => {
+    const job = current()?.job
+    if (!job) return store.adding
+    return store.adding || job.kind !== "probe-opencode"
+  })
+  const recommendedStep = createMemo<WslServerStep>(() => {
+    if (!wslReady()) return "wsl"
+    if (!distroReady()) return "distro"
+    return "opencode"
+  })
+  // activeStep falls back to recommendedStep when the user hasn't picked one.
+  // Once the user clicks a step tab we respect their choice rather than snapping
+  // them back when a probe result updates recommendedStep.
+  const activeStep = createMemo(() => store.step ?? recommendedStep())

-  const openCatalog = () => {
-    const first = model().installableDistros[0]
-    setStore({
-      view: "catalog",
-      catalogSearch: "",
-      catalogTarget: first?.name ?? null,
-    })
-  }
+  const autoProbe = createMemo(() => {
+    const state = current()
+    if (!state || busy()) return null
+    if (state.pendingRestart) return null
+    if (!state.runtime) return { key: "runtime", run: () => api.probeRuntime() }
+    if (!wslReady()) return null
+    if (!state.installed.length && !state.online.length) {
+      return { key: "distros", run: () => api.refreshDistros() }
+    }
+    const distro = selectedDistro()
+    if (distro && !state.distroProbes[distro]) {
+      return { key: `probe-distro:${distro}`, run: () => api.probeDistro(distro) }
+    }
+    if (!distro || !distroReady()) return null
+    if (!state.opencodeChecks[distro]) {
+      return { key: `probe-opencode:${distro}`, run: () => api.probeOpencode(distro) }
+    }
+    return null
+  })
+
+  let lastAutoProbe: string | null = null
+  createEffect(() => {
+    const probe = autoProbe()
+    if (!probe || probe.key === lastAutoProbe) return
+    const key = probe.key
+    lastAutoProbe = key
+    void (async () => {
+      try {
+        await probe.run()
+      } catch (err) {
+        if (disposed) return
+        // Allow the same probe to run again when reactive inputs next change
+        // (e.g. user reselects a distro). Without this the user would be stuck
+        // on a transient wsl.exe failure until they pick a different distro.
+        if (lastAutoProbe === key) lastAutoProbe = null
+        requestError(language, err)
+      }
+    })()
+  })
+
+  const wslMessage = createMemo(() => {
+    const state = current()
+    if (!state || state.job?.kind === "runtime") return language.t("wsl.onboarding.checkingRuntime")
+    if (state.pendingRestart) return language.t("wsl.onboarding.restartRequired")
+    if (state.runtime?.available) return state.runtime.version ?? language.t("wsl.onboarding.ready")
+    return state.runtime?.error ?? language.t("wsl.onboarding.required")
+  })
+
+  const distroMessage = createMemo(() => {
+    const state = current()
+    if (!state) return language.t("wsl.onboarding.checkingDistros")
+    const distro = selectedDistro()
+    if (state.job?.kind === "install-distro")
+      return language.t("wsl.onboarding.installingDistro", { distro: state.job.distro })
+    if (state.job?.kind === "probe-distro")
+      return language.t("wsl.onboarding.checkingDistro", { distro: state.job.distro })
+    if (state.job?.kind === "distros") return language.t("wsl.onboarding.listingDistros")
+    if (distroUnavailableMessage()) return distroUnavailableMessage()!
+    if (selectedProbe() && distroReady())
+      return language.t("wsl.onboarding.distroReady", { distro: selectedProbe()!.name })
+    if (distro) return language.t("wsl.onboarding.finishingDistro", { distro })
+    return language.t("wsl.onboarding.pickDistro")
+  })
+
+  const opencodeMessage = createMemo(() => {
+    const state = current()
+    if (!state) return language.t("wsl.onboarding.checkingOpencode")
+    const distro = selectedDistro()
+    if (state.job?.kind === "install-opencode") {
+      return distro
+        ? language.t("wsl.onboarding.updatingOpencodeIn", { distro })
+        : language.t("wsl.onboarding.updatingOpencode")
+    }
+    if (state.job?.kind === "probe-opencode") {
+      return distro
+        ? language.t("wsl.onboarding.checkingOpencodeIn", { distro })
+        : language.t("wsl.onboarding.checkingOpencode")
+    }
+    if (opencodeCheck()?.error) return opencodeCheck()!.error
+    if (opencodeCheck()?.matchesDesktop === false) {
+      return distro
+        ? language.t("wsl.onboarding.updateOpencodeIn", { distro })
+        : language.t("wsl.onboarding.updateOpencode")
+    }
+    if (opencodeReady()) {
+      return distro
+        ? language.t("wsl.onboarding.opencodeReadyIn", { distro })
+        : language.t("wsl.onboarding.opencodeReady")
+    }
+    return distro
+      ? language.t("wsl.onboarding.installOpencodeIn", { distro })
+      : language.t("wsl.onboarding.chooseDistroFirst")
+  })

  const run = async (action: () => Promise<unknown>) => {
    try {
@@ -305,43 +235,26 @@ function useWslAddServerController(props: DialogWslServerProps) {
    }
  }

-  const refreshDistros = () => {
-    void run(async () => {
-      probes.resetProbeFailure()
-      await api.refreshDistros()
-    })
+  const runSelectedDistro = (action: (distro: string) => Promise<unknown>) => {
+    const distro = selectedDistro()
+    if (!distro) return
+    void run(() => action(distro))
  }

-  const installDistro = (name: string) => {
-    void run(async () => {
-      probes.resetProbeFailure()
-      await api.installDistro(name)
-      setStore("view", "main")
-    })
+  const selectDistro = (name: string) => {
+    setStore("selectedDistro", name)
+    setStore("step", undefined)
  }

-  const installCatalogDistro = () => {
-    if (model().installingCatalogDistro) return
-    const name = model().catalogTarget
-    if (!name) return
-    installDistro(name)
+  const openOpencodeStep = () => {
+    const distro = selectedDistro()
+    if (!distro) return
+    void run(() => enterWslOpencodeStep(distro, api.probeOpencode, (step) => setStore("step", step)))
  }

-  const closeCatalog = () => {
-    probes.resetProbeFailure()
-    setStore({ view: "main", catalogSearch: "", catalogTarget: null })
-  }
-
-  const runPrimary = async () => {
-    const button = model().primaryButton
-    if (button.loading) return
-    const distro = model().selectedDistro
-    const action = button.action
-    if (!distro || !action) return
-    if (action === "install-opencode") {
-      await run(() => api.installOpencode(distro))
-      return
-    }
+  const finish = async () => {
+    const distro = selectedDistro()
+    if (!distro) return
    setStore("adding", true)
    try {
      await api.addServer(distro)
@@ -357,99 +270,346 @@ function useWslAddServerController(props: DialogWslServerProps) {
    }
  }

-  const loadError = () => {
+  const steps = createMemo(() => {
+    const active = activeStep()
+    const activeIndex = STEPS.indexOf(active)
+    const recommendedIndex = STEPS.indexOf(recommendedStep())
+    return STEPS.map((step) => {
+      const index = STEPS.indexOf(step)
+      return {
+        step,
+        title:
+          step === "wsl"
+            ? language.t("wsl.server.label")
+            : step === "distro"
+              ? language.t("wsl.onboarding.step.distro")
+              : language.t("wsl.onboarding.step.opencode"),
+        state:
+          active === step
+            ? "current"
+            : step === "wsl"
+              ? wslReady()
+                ? "done"
+                : "warning"
+              : step === "distro"
+                ? distroReady()
+                  ? "done"
+                  : index > activeIndex
+                    ? "locked"
+                    : "warning"
+                : opencodeCheck()?.matchesDesktop === false
+                  ? "warning"
+                  : opencodeReady()
+                    ? "done"
+                    : index > activeIndex
+                      ? "locked"
+                      : "warning",
+        locked: index > recommendedIndex,
+      }
+    })
+  })
+  const loadError = createMemo(() => {
    const error = wslServers.error
    if (!error) return language.t("wsl.onboarding.loadFailed")
    return error instanceof Error ? error.message : String(error)
-  }
-
-  return {
-    wslServers,
-    model,
-    loadError,
-    runtimeError: () => current()?.runtime?.error ?? null,
-    view: () => store.view,
-    catalogSearch: () => store.catalogSearch,
-    adding: () => store.adding,
-    setCatalogSearch: (value: string) => setStore("catalogSearch", value),
-    setCatalogTarget: (value: string) => setStore("catalogTarget", value),
-    setSelectedDistro: (value: string) => setStore("selectedDistro", value),
-    openCatalog,
-    closeCatalog,
-    refreshDistros,
-    installCatalogDistro,
-    installWsl: () => void run(() => api.installWsl()),
-    runPrimary: () => void runPrimary(),
-    close: () => dialog.close(),
-  }
-}
-
-function DialogWslSetup(props: {
-  state: string
-  error: string | null
-  installable: boolean
-  busy: boolean
-  onInstall: () => void
-}) {
-  const language = useLanguage()
-  const dialog = useDialog()
-  const title = () =>
-    props.state === "pendingRestart"
-      ? language.t("wsl.onboarding.restartRequired")
-      : props.installable
-        ? language.t("wsl.onboarding.wslNotInstalled.title")
-        : language.t("wsl.onboarding.wslUnavailable.title")
-  const description = () => {
-    if (props.state === "pendingRestart") return language.t("wsl.onboarding.windowsRestartRequired")
-    if (!props.installable) return language.t("wsl.onboarding.wslUnavailable.description")
-    return language.t("wsl.onboarding.wslNotInstalled.description")
-  }
+  })

  return (
-    <Dialog fit class="settings-v2-wsl-not-installed-dialog">
-      <div class="settings-v2-wsl-not-installed-content">
-        <div class="settings-v2-wsl-not-installed-message">
-          <svg
-            class="settings-v2-wsl-not-installed-icon"
-            width="24"
-            height="24"
-            viewBox="0 0 24 24"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-            aria-hidden="true"
-          >
-            <g clip-path="url(#settings-v2-wsl-warning-clip)">
-              <path
-                fill-rule="evenodd"
-                clip-rule="evenodd"
-                d="M12 -0.00244141L23.6926 20.2498H0.308594L12 -0.00244141ZM12.7954 6.32932C12.5844 6.11834 12.2982 5.99982 11.9999 5.99982C11.7015 5.99982 11.4154 6.11834 11.2044 6.32932C10.9934 6.5403 10.8749 6.82645 10.8749 7.12482V11.6248C10.8749 11.9232 10.9934 12.2093 11.2044 12.4203C11.4154 12.6313 11.7015 12.7498 11.9999 12.7498C12.2982 12.7498 12.5844 12.6313 12.7954 12.4203C13.0064 12.2093 13.1249 11.9232 13.1249 11.6248V7.12482C13.1249 6.82645 13.0064 6.5403 12.7954 6.32932ZM13.0605 17.5605C12.7792 17.8418 12.3977 17.9998 11.9999 17.9998C11.6021 17.9998 11.2205 17.8418 10.9392 17.5605C10.6579 17.2792 10.4999 16.8976 10.4999 16.4998C10.4999 16.102 10.6579 15.7205 10.9392 15.4392C11.2205 15.1579 11.6021 14.9998 11.9999 14.9998C12.3977 14.9998 12.7792 15.1579 13.0605 15.4392C13.3418 15.7205 13.4999 16.102 13.4999 16.4998C13.4999 16.8976 13.3418 17.2792 13.0605 17.5605Z"
-                fill="#DBDBDB"
-              />
-            </g>
-            <defs>
-              <clipPath id="settings-v2-wsl-warning-clip">
-                <rect width="24" height="24" fill="white" />
-              </clipPath>
-            </defs>
-          </svg>
-          <h2 class="settings-v2-wsl-not-installed-title">{title()}</h2>
-          <p class="settings-v2-wsl-not-installed-description">{description()}</p>
-          <Show when={!props.installable && props.error}>
-            <p class="settings-v2-wsl-unavailable-error">{props.error}</p>
+    <div class="px-5 pb-5 flex flex-col gap-4">
+      <Show
+        when={!wslServers.isPending}
+        fallback={<div class="px-1 py-6 text-14-regular text-text-weak">{language.t("wsl.onboarding.loading")}</div>}
+      >
+        <Show
+          when={!wslServers.isError}
+          fallback={<div class="px-1 py-6 text-14-regular text-text-weak">{loadError()}</div>}
+        >
+          <div class="flex gap-2 pb-1">
+            <For each={steps()}>
+              {(item) => (
+                <button
+                  type="button"
+                  class="basis-0 flex-1 min-w-0 rounded-md border px-3 py-2 text-left transition-colors"
+                  classList={{
+                    "border-border-strong-base bg-surface-base-hover": item.state === "current",
+                    "border-icon-success-base/40 bg-surface-base": item.state === "done",
+                    "border-border-weak-base bg-background-base opacity-60": item.state === "locked",
+                    "border-icon-warning-base/40 bg-surface-base": item.state === "warning",
+                  }}
+                  disabled={item.locked}
+                  onClick={() => setStore("step", item.step)}
+                >
+                  <div class="text-13-medium text-text-strong">{item.title}</div>
+                </button>
+              )}
+            </For>
+          </div>
+
+          <Switch>
+            <Match when={activeStep() === "wsl"}>
+              <div class="rounded-md bg-surface-base p-4 flex flex-col gap-3">
+                <div class="flex items-center justify-between gap-3">
+                  <div class="text-14-medium text-text-strong">{language.t("wsl.server.label")}</div>
+                  <Show when={current()?.runtime && !wslReady() && !current()?.pendingRestart}>
+                    <Button
+                      variant="secondary"
+                      size="large"
+                      disabled={busy()}
+                      onClick={() => void run(() => api.installWsl())}
+                    >
+                      {language.t("wsl.onboarding.installWsl")}
+                    </Button>
+                  </Show>
+                </div>
+                <div class="text-12-regular text-text-weak whitespace-pre-wrap break-words">{wslMessage()}</div>
+                <Show when={current()?.pendingRestart}>
+                  <div class="rounded-md border border-border-weak-base px-3 py-3">
+                    <div class="text-12-regular text-text-warning-base">
+                      {language.t("wsl.onboarding.windowsRestartRequired")}
+                    </div>
+                  </div>
+                </Show>
+                <div class="flex items-center justify-end">
+                  <Button
+                    variant="secondary"
+                    size="large"
+                    disabled={busy() || !wslReady()}
+                    onClick={() => setStore("step", "distro")}
+                  >
+                    {language.t("wsl.onboarding.next")}
+                  </Button>
+                </div>
+              </div>
+            </Match>
+
+            <Match when={activeStep() === "distro"}>
+              <div class="rounded-md bg-surface-base p-4 flex flex-col gap-3">
+                <div class="flex items-center justify-between gap-3">
+                  <div class="text-14-medium text-text-strong">{language.t("wsl.onboarding.step.distro")}</div>
+                  <Show when={selectedDistro()}>
+                    <Button
+                      variant="ghost"
+                      size="small"
+                      disabled={busy()}
+                      onClick={() => runSelectedDistro((distro) => api.probeDistro(distro))}
+                    >
+                      {language.t("wsl.onboarding.refresh")}
+                    </Button>
+                  </Show>
+                </div>
+                <div class="text-12-regular text-text-weak whitespace-pre-wrap break-words">{distroMessage()}</div>
+
+                <div class="flex flex-col gap-2">
+                  <Show
+                    when={addableInstalledDistros().length > 0}
+                    fallback={
+                      <div class="text-12-regular text-text-weak">
+                        {visibleInstalledDistros().length
+                          ? language.t("wsl.onboarding.allDistrosAdded")
+                          : current()?.runtime?.available
+                            ? language.t("wsl.onboarding.noDistros")
+                            : language.t("wsl.onboarding.checkingDistros")}
+                      </div>
+                    }
+                  >
+                    <For each={addableInstalledDistros()}>
+                      {(item) => (
+                        <button
+                          type="button"
+                          class="rounded-md border border-border-weak-base px-3 py-2 text-left transition-colors"
+                          classList={{ "bg-surface-raised-base": selectedDistro() === item.name }}
+                          onClick={() => selectDistro(item.name)}
+                        >
+                          <div class="text-13-medium text-text-strong">{item.name}</div>
+                          <Show when={item.isDefault}>
+                            <div class="text-12-regular text-text-weak">{language.t("common.default")}</div>
+                          </Show>
+                        </button>
+                      )}
+                    </For>
+                  </Show>
+                </div>
+
+                <Show when={installableDistros().length > 0}>
+                  <div class="rounded-md border border-border-weak-base p-2 flex flex-col gap-2">
+                    <div class="px-1 flex items-center justify-between gap-3">
+                      <div class="text-12-medium text-text-weak">{language.t("wsl.onboarding.install")}</div>
+                      <div class="flex items-center gap-2 shrink-0">
+                        <Show when={installingDistro()}>
+                          <Spinner class="h-4 w-4 text-icon-info-base shrink-0" />
+                        </Show>
+                        <Button
+                          variant="secondary"
+                          size="small"
+                          disabled={busy() || !installTarget()}
+                          onClick={() => void run(() => api.installDistro(installTarget()!.name))}
+                        >
+                          {installingDistro()
+                            ? language.t("wsl.onboarding.installing")
+                            : language.t("wsl.onboarding.install")}
+                        </Button>
+                      </div>
+                    </div>
+                    <div
+                      role="radiogroup"
+                      aria-label={language.t("wsl.onboarding.installDistro")}
+                      class="max-h-52 overflow-y-auto rounded-md bg-background-base"
+                    >
+                      <For each={installableDistros()}>
+                        {(item) => {
+                          const selected = () => installTarget()?.name === item.name
+                          return (
+                            <button
+                              type="button"
+                              role="radio"
+                              aria-checked={selected()}
+                              disabled={busy()}
+                              class="w-full px-3 py-2 flex items-center gap-3 text-left border-b border-border-weak-base last:border-b-0 transition-colors"
+                              classList={{
+                                "bg-surface-raised-base": selected(),
+                                "hover:bg-surface-base": !selected(),
+                              }}
+                              onClick={() => setStore("installTarget", item.name)}
+                            >
+                              <div
+                                class="mt-0.5 h-4 w-4 rounded-full border border-border-strong-base flex items-center justify-center shrink-0"
+                                classList={{ "border-text-strong": selected() }}
+                              >
+                                <div class="h-2 w-2 rounded-full bg-text-strong" classList={{ hidden: !selected() }} />
+                              </div>
+                              <div class="min-w-0 flex-1 text-13-medium text-text-strong truncate">{item.label}</div>
+                            </button>
+                          )
+                        }}
+                      </For>
+                    </div>
+                  </div>
+                </Show>
+
+                <Show when={selectedInstalled()?.version === 1 || distroUnavailableMessage() || distroMissingTools()}>
+                  <div class="rounded-md border border-border-weak-base px-3 py-3 flex flex-col gap-1">
+                    <Show when={selectedInstalled()?.version === 1}>
+                      <div class="text-12-regular text-text-warning-base">
+                        {language.t("wsl.onboarding.wsl2Required")}
+                      </div>
+                    </Show>
+                    <Show when={distroUnavailableMessage()}>
+                      {(message) => <div class="text-12-regular text-text-warning-base">{message()}</div>}
+                    </Show>
+                    <Show when={distroMissingTools()}>
+                      <div class="text-12-regular text-text-warning-base">
+                        {language.t("wsl.onboarding.toolsRequired")}
+                      </div>
+                    </Show>
+                  </div>
+                </Show>
+
+                <div class="flex items-center gap-2">
+                  <Button
+                    variant="secondary"
+                    size="large"
+                    disabled={busy() || !selectedInstalled()}
+                    onClick={() => runSelectedDistro((distro) => api.openTerminal(distro))}
+                  >
+                    {language.t("wsl.onboarding.openTerminal")}
+                  </Button>
+                  <Button
+                    variant="ghost"
+                    size="large"
+                    disabled={busy() || !selectedDistro()}
+                    onClick={() => runSelectedDistro((distro) => api.probeDistro(distro))}
+                  >
+                    {language.t("wsl.onboarding.refresh")}
+                  </Button>
+                </div>
+
+                <div class="flex items-center justify-end">
+                  <Button
+                    variant="secondary"
+                    size="large"
+                    disabled={busy() || !selectedDistro() || !distroReady()}
+                    onClick={openOpencodeStep}
+                  >
+                    {language.t("wsl.onboarding.next")}
+                  </Button>
+                </div>
+              </div>
+            </Match>
+
+            <Match when={activeStep() === "opencode"}>
+              <div class="rounded-md bg-surface-base p-4 flex flex-col gap-3">
+                <div class="flex items-center justify-between gap-3">
+                  <div class="text-14-medium text-text-strong">{language.t("wsl.onboarding.step.opencode")}</div>
+                  <div class="flex items-center gap-2">
+                    <Show when={selectedDistro()}>
+                      <Button
+                        variant="ghost"
+                        size="large"
+                        disabled={busy()}
+                        onClick={() => runSelectedDistro((distro) => api.probeOpencode(distro))}
+                      >
+                        {language.t("wsl.onboarding.refresh")}
+                      </Button>
+                    </Show>
+                    <Show when={!opencodeReady() || opencodeCheck()?.matchesDesktop === false}>
+                      <Button
+                        variant="secondary"
+                        size="large"
+                        disabled={busy()}
+                        onClick={() => runSelectedDistro((distro) => api.installOpencode(distro))}
+                      >
+                        <Show when={installingOpencode()}>
+                          <Spinner class="size-4 shrink-0" />
+                        </Show>
+                        {opencodeCheck()?.resolvedPath
+                          ? language.t("wsl.onboarding.updateOpencode")
+                          : language.t("wsl.onboarding.installOpencode")}
+                      </Button>
+                    </Show>
+                  </div>
+                </div>
+                <div class="text-12-regular text-text-weak whitespace-pre-wrap break-words">{opencodeMessage()}</div>
+                <Show when={opencodeCheck()?.matchesDesktop === false ? opencodeCheck() : null}>
+                  {(check) => (
+                    <div class="rounded-md border border-border-weak-base px-3 py-3 flex flex-col gap-1">
+                      <div class="text-12-regular text-text-weak">
+                        {language.t("wsl.onboarding.path", {
+                          path: check().resolvedPath ?? language.t("wsl.onboarding.notFound"),
+                        })}
+                      </div>
+                      <div class="text-12-regular text-text-weak">
+                        {language.t("wsl.onboarding.version", {
+                          version: check().version ?? language.t("wsl.onboarding.unknown"),
+                        })}
+                        <Show when={check().expectedVersion}>
+                          {(expected) => (
+                            <span>{` · ${language.t("wsl.onboarding.desktopVersion", { version: expected() })}`}</span>
+                          )}
+                        </Show>
+                      </div>
+                      <div class="text-12-regular text-text-warning-base">
+                        {language.t("wsl.onboarding.versionMismatch")}
+                      </div>
+                    </div>
+                  )}
+                </Show>
+              </div>
+            </Match>
+          </Switch>
+
+          <Show when={activeStep() === "opencode" && allReady() && selectedDistro()}>
+            <div class="flex items-center justify-end gap-2">
+              <Button variant="ghost" size="large" disabled={store.adding} onClick={() => dialog.close()}>
+                {language.t("common.cancel")}
+              </Button>
+              <Button variant="primary" size="large" disabled={addDisabled()} onClick={() => void finish()}>
+                {store.adding ? language.t("wsl.onboarding.adding") : language.t("wsl.server.add")}
+              </Button>
+            </div>
          </Show>
-        </div>
-        <Show when={props.state === "unavailable" && props.installable}>
-          <ButtonV2 variant="neutral" disabled={props.busy} onClick={props.onInstall}>
-            {language.t("wsl.onboarding.installWsl")}
-          </ButtonV2>
        </Show>
-        <Show when={props.state !== "unavailable"}>
-          <ButtonV2 variant="neutral" onClick={() => dialog.close()}>
-            {language.t("common.close")}
-          </ButtonV2>
-        </Show>
-      </div>
-    </Dialog>
+      </Show>
+    </div>
  )
 }

@@ -1,392 +0,0 @@
-[data-component="dialog-v2"].settings-v2-wsl-dialog [data-slot="dialog-container"] {
-  width: 480px;
-  max-width: calc(100vw - 32px);
-  height: auto;
-  align-items: stretch;
-}
-
-[data-component="dialog-v2"].settings-v2-wsl-dialog [data-slot="dialog-content"] {
-  align-items: stretch;
-  width: 100%;
-  overflow: hidden;
-}
-
-[data-component="dialog-v2"].settings-v2-wsl-dialog [data-slot="dialog-header"] {
-  align-items: center;
-  padding: 24px 16px 0;
-}
-
-[data-component="dialog-v2"].settings-v2-wsl-dialog [data-slot="dialog-body"] {
-  display: flex;
-  width: 100%;
-  min-width: 0;
-  flex-direction: column;
-  align-items: stretch;
-  padding: 0;
-  gap: 0;
-}
-
-.settings-v2-wsl-dialog-body {
-  display: flex;
-  flex-direction: column;
-  gap: 16px;
-  width: 100%;
-  min-width: 0;
-  align-self: stretch;
-  box-sizing: border-box;
-  padding: 16px 16px 1px;
-}
-
-[data-component="dialog-v2"].settings-v2-wsl-dialog [data-slot="dialog-footer"] {
-  padding: 0 16px 24px;
-  margin-top: 8px;
-}
-
-[data-component="dialog-v2"].settings-v2-wsl-not-installed-dialog [data-slot="dialog-container"] {
-  width: 480px;
-  max-width: calc(100vw - 32px);
-  min-height: 264px;
-  height: auto;
-  background: var(--v2-background-bg-layer-01);
-  box-shadow: var(--v2-elevation-overlay);
-  border-radius: 10px;
-}
-
-[data-component="dialog-v2"].settings-v2-wsl-not-installed-dialog [data-slot="dialog-content"] {
-  align-items: stretch;
-  min-height: 264px;
-  border-radius: 10px;
-  overflow: hidden;
-}
-
-[data-component="dialog-v2"].settings-v2-wsl-not-installed-dialog [data-slot="dialog-body"] {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  align-items: stretch;
-  justify-content: center;
-  padding: 0;
-}
-
-.settings-v2-wsl-not-installed-content {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  width: 100%;
-  padding: 56px 0;
-  gap: 24px;
-  text-align: center;
-}
-
-.settings-v2-wsl-not-installed-message {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  width: 100%;
-  gap: 8px;
-}
-
-.settings-v2-wsl-not-installed-icon {
-  flex: none;
-  flex-shrink: 0;
-}
-
-.settings-v2-wsl-not-installed-title {
-  display: flex;
-  flex: none;
-  align-items: center;
-  justify-content: center;
-  margin: 0;
-  font-style: normal;
-  font-weight: 530;
-  font-size: 15px;
-  line-height: 20px;
-  letter-spacing: -0.13px;
-  font-variant-numeric: tabular-nums;
-  font-variation-settings: "slnt" 0;
-  color: var(--v2-text-text-base);
-}
-
-.settings-v2-wsl-not-installed-description {
-  display: flex;
-  flex: none;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  max-width: 300px;
-  margin: 0;
-  font-style: normal;
-  font-weight: 440;
-  font-size: 13px;
-  line-height: 20px;
-  text-align: center;
-  letter-spacing: -0.04px;
-  font-variant-numeric: tabular-nums;
-  font-variation-settings: "slnt" 0;
-  color: var(--v2-text-text-muted);
-}
-
-.settings-v2-wsl-unavailable-error {
-  width: 100%;
-  max-width: 360px;
-  margin: 4px 0 0;
-  font-style: normal;
-  font-weight: 440;
-  font-size: 12px;
-  line-height: 18px;
-  text-align: center;
-  letter-spacing: -0.04px;
-  font-variant-numeric: tabular-nums;
-  font-variation-settings: "slnt" 0;
-  color: var(--v2-text-text-faint);
-  overflow-wrap: anywhere;
-}
-
-.settings-v2-wsl-section-header {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-  flex: none;
-  align-self: stretch;
-  gap: 12px;
-  height: 24px;
-  padding: 0 0 0 9px;
-}
-
-.settings-v2-wsl-section-title {
-  flex: none;
-  user-select: none;
-  font-style: normal;
-  font-weight: 440;
-  font-size: 13px;
-  line-height: 16px;
-  letter-spacing: -0.04px;
-  font-variation-settings: "slnt" 0;
-  color: var(--v2-text-text-base);
-}
-
-.settings-v2-wsl-distro-list {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  flex: none;
-  align-self: stretch;
-  width: 100%;
-  height: fit-content;
-  max-height: 220px;
-  padding: 0;
-  border-radius: 8px;
-  background: var(--v2-background-bg-base);
-  box-shadow: var(--v2-elevation-raised);
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-
-.settings-v2-wsl-distro-group {
-  width: 100%;
-}
-
-.settings-v2-wsl-distro-group [data-slot="radio-v2-items"] {
-  width: 100%;
-  gap: 0;
-}
-
-.settings-v2-wsl-distro-row {
-  box-sizing: border-box;
-  width: 100%;
-  min-height: 62px;
-  padding: 14px 14px 14px 16px;
-  border-bottom: 0.5px solid var(--v2-border-border-base);
-}
-
-.settings-v2-wsl-distro-row:last-child {
-  border-bottom: none;
-}
-
-.settings-v2-wsl-distro-row [data-slot="radio-v2-item-label"] {
-  position: relative;
-  display: flex;
-  flex: 1;
-  width: 100%;
-  min-width: 0;
-  align-self: stretch;
-}
-
-.settings-v2-wsl-distro-row [data-slot="radio-v2-item-label"]::before {
-  content: "";
-  position: absolute;
-  inset: -14px -14px -14px -44px;
-}
-
-.settings-v2-wsl-distro-row [data-slot="radio-v2-item-text"] {
-  width: 100%;
-}
-
-.settings-v2-wsl-distro-label {
-  font-style: normal;
-  font-weight: 440;
-  font-size: 13px;
-  line-height: 16px;
-  letter-spacing: -0.04px;
-  font-variant-numeric: tabular-nums;
-  font-variation-settings: "slnt" 0;
-  color: inherit;
-}
-
-.settings-v2-wsl-distro-status {
-  flex: none;
-  font-style: normal;
-  font-weight: 440;
-  font-size: 12px;
-  line-height: 12px;
-  letter-spacing: 0.05px;
-  font-variant-numeric: tabular-nums;
-  font-variation-settings: "slnt" 0;
-}
-
-.settings-v2-wsl-distro-status[data-tone="success"] {
-  color: var(--v2-state-fg-success);
-}
-
-.settings-v2-wsl-distro-status[data-tone="warning"] {
-  color: var(--v2-state-fg-warning);
-}
-
-.settings-v2-wsl-distro-status[data-tone="muted"] {
-  color: var(--v2-text-text-muted);
-}
-
-.settings-v2-wsl-distro-row:where([data-disabled]) .settings-v2-wsl-distro-status {
-  color: inherit;
-}
-
-.settings-v2-wsl-distro-empty {
-  padding: 16px;
-  font-size: 13px;
-  font-weight: 440;
-  line-height: 1.4;
-  color: var(--v2-text-text-muted);
-}
-
-.settings-v2-wsl-catalog-card {
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: row;
-  align-items: flex-start;
-  flex: none;
-  align-self: stretch;
-  gap: 12px;
-  width: 100%;
-  min-height: 64px;
-  padding: 14px 14px 16px 16px;
-  border: 0.5px solid var(--v2-border-border-base);
-  border-radius: 8px;
-  background: transparent;
-  cursor: pointer;
-  text-align: left;
-}
-
-.settings-v2-wsl-catalog-card:focus-visible {
-  outline: 2px solid var(--v2-border-border-focus);
-  outline-offset: 2px;
-}
-
-.settings-v2-wsl-catalog-card:disabled {
-  cursor: not-allowed;
-  opacity: 0.5;
-}
-
-.settings-v2-wsl-catalog-icon {
-  display: flex;
-  flex: none;
-  flex-shrink: 0;
-  align-items: center;
-  justify-content: center;
-  width: 16px;
-  height: 16px;
-  color: var(--v2-icon-icon-base);
-}
-
-.settings-v2-wsl-catalog-copy {
-  display: flex;
-  min-width: 0;
-  flex: 1;
-  flex-direction: column;
-  align-items: flex-start;
-  justify-content: center;
-  gap: 6px;
-}
-
-.settings-v2-wsl-catalog-title {
-  user-select: none;
-  font-style: normal;
-  font-weight: 440;
-  font-size: 13px;
-  line-height: 16px;
-  letter-spacing: -0.04px;
-  font-variation-settings: "slnt" 0;
-  color: var(--v2-text-text-base);
-}
-
-.settings-v2-wsl-catalog-description {
-  user-select: none;
-  font-style: normal;
-  font-weight: 440;
-  font-size: 12px;
-  line-height: 12px;
-  letter-spacing: 0.05px;
-  font-variation-settings: "slnt" 0;
-  color: var(--v2-text-text-muted);
-}
-
-.settings-v2-wsl-catalog-chevron {
-  display: flex;
-  flex: none;
-  flex-shrink: 0;
-  align-items: center;
-  justify-content: center;
-  width: 16px;
-  height: 16px;
-  color: var(--v2-icon-icon-muted);
-}
-
-.settings-v2-wsl-catalog-list {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  flex: none;
-  align-self: stretch;
-  width: 100%;
-  height: fit-content;
-  max-height: 220px;
-  padding: 0;
-  border-radius: 8px;
-  box-shadow: inset 0 0 0 0.5px var(--v2-border-border-strong);
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-
-.settings-v2-wsl-catalog-picker {
-  gap: 12px;
-}
-
-.settings-v2-wsl-catalog-search {
-  width: 100%;
-}
-
-.settings-v2-wsl-catalog-row {
-  min-height: 48px;
-}
-
-.settings-v2-wsl-loading {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 48px 24px;
-  font-size: 13px;
-  font-weight: 440;
-  line-height: 1;
-  color: var(--v2-text-text-muted);
-  text-align: center;
-}
@@ -1,31 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import {
-  addableProbePlan,
-  addServerProbePlan,
-  addServerViewModel,
-  autoProbePlan,
-  createProbeFailureGate,
-  runAddableProbePlan,
-  wslOpencodeAction,
-  wslRuntimeRetryable,
-} from "./settings-model"
-import type { WslServersState } from "./types"
-
-const readyWslState = readyState()
-
-function readyState(input: Partial<WslServersState> = {}): WslServersState {
-  return {
-    runtime: { available: true, version: "2.4.13.0", error: null },
-    installed: [],
-    online: [],
-    distroProbes: {},
-    opencodeChecks: {},
-    pendingRestart: false,
-    servers: [],
-    job: null,
-    ...input,
-  }
-}
+import { enterWslOpencodeStep, wslOpencodeAction, wslRuntimeRetryable } from "./settings-model"

 describe("WSL server settings presentation", () => {
  test("retries only settled unsuccessful runtimes", () => {
@@ -71,161 +45,13 @@ describe("WSL server settings presentation", () => {
    ).toBeUndefined()
  })

-  test("plans addable distro probes with the selected distro first", () => {
-    const plan = addableProbePlan({
-      state: readyWslState,
-      view: "main",
-      adding: false,
-      selectedDistro: "Ubuntu",
-      addableInstalledDistros: [
-        { name: "Debian", version: 2, isDefault: true },
-        { name: "Ubuntu", version: 2, isDefault: false },
-      ],
-    })
-
-    expect(plan?.key).toBe("distro:Ubuntu|distro:Debian")
-    expect(plan?.distros).toEqual(["Ubuntu", "Debian"])
-  })
-
-  test("plans bootstrap probes for missing runtime and initial distro lists", () => {
-    expect(autoProbePlan({ state: undefined, busy: false })).toBeUndefined()
-    expect(autoProbePlan({ state: { ...readyWslState, runtime: null }, busy: false })).toEqual({
-      key: "runtime",
-      action: "probeRuntime",
-    })
-    expect(autoProbePlan({ state: readyWslState, busy: false })).toEqual({
-      key: "distros",
-      action: "refreshDistros",
-    })
-  })
-
-  test("uses one command plan for bootstrap before addable distro probing", () => {
-    expect(
-      addServerProbePlan({
-        state: { ...readyWslState, runtime: null },
-        view: "main",
-        adding: false,
-        busy: false,
-        selectedDistro: null,
-        addableInstalledDistros: [{ name: "Debian", version: 2, isDefault: true }],
-      }),
-    ).toEqual({ kind: "auto", key: "auto:runtime", plan: { key: "runtime", action: "probeRuntime" } })
-
-    expect(
-      addServerProbePlan({
-        state: {
-          ...readyWslState,
-          installed: [{ name: "Debian", version: 2, isDefault: true }],
-          online: [{ name: "Ubuntu", label: "Ubuntu" }],
-        },
-        view: "main",
-        adding: false,
-        busy: false,
-        selectedDistro: "Debian",
-        addableInstalledDistros: [{ name: "Debian", version: 2, isDefault: true }],
-      }),
-    ).toEqual({ kind: "addable", key: "addable:distro:Debian", plan: { key: "distro:Debian", distros: ["Debian"] } })
-  })
-
-  test("does not accept the same failed probe command until reset", () => {
-    const gate = createProbeFailureGate()
-
-    expect(gate.accepts("addable:distro:Debian")).toBe(true)
-    gate.settle("addable:distro:Debian", new Error("wsl failed"))
-    expect(gate.accepts("addable:distro:Debian")).toBe(false)
-    expect(gate.accepts("addable:distro:Ubuntu")).toBe(true)
-    gate.reset()
-    expect(gate.accepts("addable:distro:Debian")).toBe(true)
-  })
-
-  test("keeps default distro selection stable while probes resolve", () => {
-    const model = addServerViewModel({
-      state: {
-        ...readyWslState,
-        installed: [
-          { name: "Debian", version: 2, isDefault: true },
-          { name: "Ubuntu", version: 2, isDefault: false },
-        ],
-        online: [{ name: "Alpine", label: "Alpine Linux" }],
-        distroProbes: {
-          Ubuntu: { name: "Ubuntu", canExecute: true, hasBash: true, hasCurl: true, error: null },
-        },
-      },
-      view: "main",
-      selectedDistro: null,
-      catalogSearch: "",
-      catalogTarget: null,
-      adding: false,
-      probingAddable: false,
-    })
-
-    expect(model.selectedDistro).toBe("Debian")
-  })
-
-  test("keeps the dialog busy across serial addable probe job gaps", () => {
-    const model = addServerViewModel({
-      state: readyState({
-        installed: [{ name: "Debian", version: 2, isDefault: true }],
-        online: [{ name: "Ubuntu", label: "Ubuntu" }],
-      }),
-      view: "main",
-      selectedDistro: null,
-      catalogSearch: "",
-      catalogTarget: null,
-      adding: false,
-      probingAddable: true,
-    })
-
-    expect(model.busy).toBe(true)
-  })
-
-  test("does not report ready when OpenCode is present but cannot run", () => {
-    const model = addServerViewModel({
-      state: {
-        ...readyWslState,
-        installed: [{ name: "Debian", version: 2, isDefault: true }],
-        online: [{ name: "Ubuntu", label: "Ubuntu" }],
-        distroProbes: {
-          Debian: { name: "Debian", canExecute: true, hasBash: true, hasCurl: true, error: null },
-        },
-        opencodeChecks: {
-          Debian: {
-            distro: "Debian",
-            resolvedPath: "/home/me/.opencode/bin/opencode",
-            version: null,
-            expectedVersion: "1.2.3",
-            matchesDesktop: null,
-            error: "opencode is installed but could not run",
-          },
-        },
-      },
-      view: "main",
-      selectedDistro: null,
-      catalogSearch: "",
-      catalogTarget: null,
-      adding: false,
-      probingAddable: false,
-    })
-
-    expect(model.distroStatuses.Debian).toEqual({
-      label: { key: "wsl.onboarding.installOpencode" },
-      tone: "warning",
-    })
-    expect(model.primaryButton.action).toBe("install-opencode")
-  })
-
-  test("delegates addable probe plans to one batch command", async () => {
-    const calls: string[][] = []
-
-    await runAddableProbePlan({
-      plan: { key: "distro:Debian|distro:Ubuntu", distros: ["Debian", "Ubuntu"] },
-      api: {
-        probeAddable: async (distros) => {
-          calls.push(distros)
-        },
-      },
-    })
-
-    expect(calls).toEqual([["Debian", "Ubuntu"]])
+  test("probes the selected distro before entering the OpenCode step", async () => {
+    const calls: string[] = []
+    await enterWslOpencodeStep(
+      "Debian",
+      async (distro) => calls.push(distro),
+      (step) => calls.push(step),
+    )
+    expect(calls).toEqual(["Debian", "opencode"])
  })
 })
@@ -1,341 +1,19 @@
-import fuzzysort from "fuzzysort"
-import type {
-  WslInstalledDistro,
-  WslOnlineDistro,
-  WslOpencodeCheck,
-  WslServersPlatform,
-  WslServerRuntime,
-  WslServersState,
-} from "./types"
-
-export type AddServerText = {
-  key: string
-  params?: Record<string, string>
-}
-
-export type DistroStatusTone = "success" | "warning" | "muted"
-
-export type DistroStatus = {
-  label: AddServerText
-  tone: DistroStatusTone
-}
-
-export type AddServerPrimaryButton = {
-  variant: "neutral" | "contrast"
-  label: AddServerText
-  disabled: boolean
-  action: "install-opencode" | "add" | null
-  loading: boolean
-  width: string | null
-}
-
-export type AddServerRuntimeState = "loading" | "pendingRestart" | "checking" | "unavailable" | "ready"
-
-export type AddableProbePlan = {
-  key: string
-  distros: string[]
-}
-
-export type AutoProbePlan = { key: "runtime"; action: "probeRuntime" } | { key: "distros"; action: "refreshDistros" }
-
-export type AddServerProbePlan =
-  | { kind: "auto"; key: string; plan: AutoProbePlan }
-  | { kind: "addable"; key: string; plan: AddableProbePlan }
-
-export type WslAddServerView = "main" | "catalog"
-
-function isHiddenDistro(name: string) {
-  return /^docker-desktop(?:-data)?$/i.test(name)
-}
+import type { WslOpencodeCheck, WslServerRuntime } from "./types"

 export const wslRuntimeRetryable = (runtime: WslServerRuntime) =>
  runtime.kind === "failed" || runtime.kind === "stopped"

+export async function enterWslOpencodeStep(
+  distro: string,
+  probe: (distro: string) => Promise<unknown>,
+  select: (step: "opencode") => void,
+) {
+  await probe(distro)
+  select("opencode")
+}
+
 export function wslOpencodeAction(check?: WslOpencodeCheck) {
  if (!check) return
  if (!check.resolvedPath) return "Install OpenCode"
  if (check.matchesDesktop === false) return "Update OpenCode"
 }
-
-export function wslDistroReady(state: WslServersState | undefined, name: string) {
-  const installed = state?.installed.find((item) => item.name === name)
-  const probe = state?.distroProbes[name]
-  if (!probe || !installed) return false
-  if (installed.version === 1) return false
-  return probe.canExecute && probe.hasBash && probe.hasCurl
-}
-
-export function addServerViewModel(input: {
-  state: WslServersState | undefined
-  view: WslAddServerView
-  selectedDistro: string | null
-  catalogSearch: string
-  catalogTarget: string | null
-  adding: boolean
-  probingAddable: boolean
-}) {
-  const state = input.state
-  const visibleInstalledDistros = (state?.installed ?? []).filter((item) => !isHiddenDistro(item.name))
-  const visibleOnlineDistros = (state?.online ?? []).filter((item) => !isHiddenDistro(item.name))
-  const existingServerDistros = new Set((state?.servers ?? []).map((item) => item.config.distro))
-  const addableInstalledDistros = visibleInstalledDistros.filter((item) => !existingServerDistros.has(item.name))
-  const selectedDistro = addServerSelectedDistro(input.selectedDistro, visibleInstalledDistros, addableInstalledDistros)
-  const opencodeCheck = selectedDistro ? (state?.opencodeChecks[selectedDistro] ?? null) : null
-  const installableDistros = addServerInstallableDistros(visibleInstalledDistros, visibleOnlineDistros)
-  const filteredInstallableDistros = addServerFilteredInstallableDistros(installableDistros, input.catalogSearch)
-  const catalogTarget = addServerCatalogTarget(input.catalogTarget, filteredInstallableDistros)
-  const busy = !!state?.job || input.adding || input.probingAddable
-
-  return {
-    busy,
-    runtimeState: addServerRuntimeState(state),
-    visibleInstalledDistros,
-    visibleOnlineDistros,
-    addableInstalledDistros,
-    selectedDistro,
-    opencodeCheck,
-    wslReady: !!state?.runtime?.available && !state?.pendingRestart,
-    distroStatuses: Object.fromEntries(
-      addableInstalledDistros.flatMap((item) => {
-        const status = addServerDistroStatus({ state, name: item.name, probingAddable: input.probingAddable })
-        if (!status) return []
-        return [[item.name, status]]
-      }),
-    ) as Record<string, DistroStatus | undefined>,
-    primaryButton: addServerPrimaryButton({
-      state,
-      selectedDistro,
-      opencodeCheck,
-      adding: input.adding,
-      probingAddable: input.probingAddable,
-    }),
-    installableDistros,
-    filteredInstallableDistros,
-    catalogTarget,
-    installingCatalogDistro: state?.job?.kind === "install-distro",
-  }
-}
-
-function addServerSelectedDistro(
-  selected: string | null,
-  visibleInstalledDistros: WslInstalledDistro[],
-  addableInstalledDistros: WslInstalledDistro[],
-) {
-  if (selected && addableInstalledDistros.some((item) => item.name === selected && item.version !== 1)) return selected
-  const defaultDistro = visibleInstalledDistros.find((item) => item.isDefault)
-  if (
-    defaultDistro &&
-    defaultDistro.version !== 1 &&
-    addableInstalledDistros.some((item) => item.name === defaultDistro.name)
-  ) {
-    return defaultDistro.name
-  }
-  return addableInstalledDistros.find((item) => item.version !== 1)?.name ?? null
-}
-
-function addServerRuntimeState(state: WslServersState | undefined): AddServerRuntimeState {
-  if (!state) return "loading"
-  if (state.pendingRestart) return "pendingRestart"
-  if (!state.runtime) return "checking"
-  if (!state.runtime.available) return "unavailable"
-  return "ready"
-}
-
-function addServerDistroStatus(input: {
-  state: WslServersState | undefined
-  name: string
-  probingAddable: boolean
-}): DistroStatus | undefined {
-  const installed = input.state?.installed.find((item) => item.name === input.name)
-  if (installed?.version === 1) return { label: { key: "wsl.onboarding.distroStatus.unsupported" }, tone: "muted" }
-  const job = input.state?.job
-  const probe = input.state?.distroProbes[input.name]
-  if (!probe) {
-    if (input.probingAddable || (job?.kind === "probe-addable" && job.distros.includes(input.name))) {
-      return checkingStatus()
-    }
-    return
-  }
-  if (!probe.canExecute) {
-    if (!installed) {
-      return { label: { key: "wsl.onboarding.distroNotInstalled", params: { distro: input.name } }, tone: "warning" }
-    }
-    return { label: { key: "wsl.onboarding.openDistroOnce", params: { distro: input.name } }, tone: "warning" }
-  }
-  if (!probe.hasBash || !probe.hasCurl) {
-    return { label: { key: "wsl.onboarding.distroStatus.missingTools" }, tone: "warning" }
-  }
-  const check = input.state?.opencodeChecks[input.name]
-  if (!check) {
-    if (input.probingAddable || (job?.kind === "probe-addable" && job.distros.includes(input.name))) {
-      return checkingStatus()
-    }
-    return
-  }
-  if (check.matchesDesktop === false) return { label: { key: "wsl.onboarding.updateOpencode" }, tone: "warning" }
-  if (!check.resolvedPath) return { label: { key: "wsl.onboarding.distroStatus.opencodeMissing" }, tone: "warning" }
-  if (check.error) return { label: { key: "wsl.onboarding.installOpencode" }, tone: "warning" }
-  return { label: { key: "wsl.onboarding.distroStatus.ready" }, tone: "success" }
-}
-
-function checkingStatus(): DistroStatus {
-  return { label: { key: "wsl.onboarding.distroStatus.checking" }, tone: "muted" }
-}
-
-function addServerPrimaryButton(input: {
-  state: WslServersState | undefined
-  selectedDistro: string | null
-  opencodeCheck: WslOpencodeCheck | null
-  adding: boolean
-  probingAddable: boolean
-}): AddServerPrimaryButton {
-  const ready = !!input.selectedDistro && wslDistroReady(input.state, input.selectedDistro)
-  const probingSelected = input.probingAddable && !addServerSelectedDistroSettled(input.state, input.selectedDistro)
-  const probingOpencode =
-    probingSelected ||
-    (ready &&
-      (!input.opencodeCheck ||
-        (!!input.selectedDistro &&
-          input.state?.job?.kind === "probe-addable" &&
-          input.state.job.distros.includes(input.selectedDistro))))
-  const installingOpencode =
-    input.state?.job?.kind === "install-opencode" && input.state.job.distro === input.selectedDistro
-  if (!ready || probingOpencode) {
-    return {
-      variant: "contrast",
-      label: probingSelected ? { key: "wsl.onboarding.distroStatus.checking" } : { key: "wsl.server.add" },
-      disabled: true,
-      action: null,
-      loading: probingSelected,
-      width: null,
-    }
-  }
-  if (!addServerOpencodeReady(input.opencodeCheck)) {
-    const update = !!input.opencodeCheck?.resolvedPath && input.opencodeCheck.matchesDesktop === false
-    return {
-      variant: "neutral",
-      label: installingOpencode
-        ? { key: "wsl.onboarding.updatingOpencode" }
-        : update
-          ? { key: "wsl.onboarding.updateOpencode" }
-          : { key: "wsl.onboarding.installOpencode" },
-      disabled: !!input.state?.job || input.adding,
-      action: "install-opencode",
-      loading: installingOpencode,
-      width: update ? "138px" : "129px",
-    }
-  }
-  return {
-    variant: "contrast",
-    label: input.adding ? { key: "wsl.onboarding.adding" } : { key: "wsl.server.add" },
-    disabled: input.adding || !!input.state?.job,
-    action: "add",
-    loading: input.adding,
-    width: null,
-  }
-}
-
-function addServerOpencodeReady(check: WslOpencodeCheck | null) {
-  return !!check?.resolvedPath && check.matchesDesktop !== false && !check.error
-}
-
-function addServerSelectedDistroSettled(state: WslServersState | undefined, selectedDistro: string | null) {
-  if (!selectedDistro) return false
-  const installed = state?.installed.find((item) => item.name === selectedDistro)
-  if (installed?.version === 1) return false
-  if (!state?.distroProbes[selectedDistro]) return false
-  if (!wslDistroReady(state, selectedDistro)) return true
-  return !!state.opencodeChecks[selectedDistro]
-}
-
-function addServerInstallableDistros(installedDistros: WslInstalledDistro[], onlineDistros: WslOnlineDistro[]) {
-  const installed = new Set(installedDistros.map((item) => item.name))
-  const hasVersionedUbuntu = onlineDistros.some((item) => /^Ubuntu-\d/.test(item.name))
-  return onlineDistros
-    .filter((item) => !installed.has(item.name))
-    .filter((item) => item.name !== "Ubuntu" || !hasVersionedUbuntu)
-}
-
-function addServerFilteredInstallableDistros(installableDistros: WslOnlineDistro[], search: string) {
-  const query = search.trim()
-  if (!query) return installableDistros
-  return fuzzysort.go(query, installableDistros, { keys: ["label", "name"] }).map((item) => item.obj)
-}
-
-function addServerCatalogTarget(target: string | null, distros: WslOnlineDistro[]) {
-  if (target && distros.some((item) => item.name === target)) return target
-  return distros[0]?.name ?? null
-}
-
-export function addableProbePlan(input: {
-  state: WslServersState | undefined
-  view: WslAddServerView
-  adding: boolean
-  selectedDistro: string | null
-  addableInstalledDistros: WslInstalledDistro[]
-}) {
-  const state = input.state
-  if (!state?.runtime?.available || state.pendingRestart || input.view !== "main" || input.adding) return
-  if (state.job) return
-  const ordered = input.selectedDistro
-    ? [
-        ...input.addableInstalledDistros.filter((item) => item.name === input.selectedDistro),
-        ...input.addableInstalledDistros.filter((item) => item.name !== input.selectedDistro),
-      ]
-    : input.addableInstalledDistros
-  const pending = ordered.flatMap((item) => {
-    if (item.version === 1) return []
-    if (!state.distroProbes[item.name]) return [`distro:${item.name}`]
-    if (wslDistroReady(state, item.name) && !state.opencodeChecks[item.name]) return [`opencode:${item.name}`]
-    return []
-  })
-  if (!pending.length) return
-  return {
-    key: pending.join("|"),
-    distros: ordered.filter((item) => item.version !== 1).map((item) => item.name),
-  } satisfies AddableProbePlan
-}
-
-export function autoProbePlan(input: { state: WslServersState | undefined; busy: boolean }) {
-  if (!input.state || input.busy || input.state.pendingRestart) return
-  if (!input.state.runtime) return { key: "runtime", action: "probeRuntime" } satisfies AutoProbePlan
-  if (!input.state.runtime.available) return
-  if (input.state.installed.length || input.state.online.length) return
-  return { key: "distros", action: "refreshDistros" } satisfies AutoProbePlan
-}
-
-export function addServerProbePlan(input: {
-  state: WslServersState | undefined
-  view: WslAddServerView
-  adding: boolean
-  busy: boolean
-  selectedDistro: string | null
-  addableInstalledDistros: WslInstalledDistro[]
-}) {
-  const auto = autoProbePlan({ state: input.state, busy: input.busy })
-  if (auto) return { kind: "auto", key: `auto:${auto.key}`, plan: auto } satisfies AddServerProbePlan
-  const addable = addableProbePlan(input)
-  if (addable) return { kind: "addable", key: `addable:${addable.key}`, plan: addable } satisfies AddServerProbePlan
-}
-
-export function createProbeFailureGate() {
-  let failed: string | undefined
-  return {
-    accepts(key: string) {
-      return key !== failed
-    },
-    settle(key: string, error?: unknown) {
-      if (error) failed = key
-    },
-    reset() {
-      failed = undefined
-    },
-  }
-}
-
-export async function runAddableProbePlan(input: {
-  plan: AddableProbePlan
-  api: Pick<WslServersPlatform, "probeAddable">
-}) {
-  await input.api.probeAddable(input.plan.distros)
-}
@@ -1,6 +1,8 @@
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Tag } from "@opencode-ai/ui/v2/badge-v2"
 import { ButtonV2 } from "@opencode-ai/ui/v2/button-v2"
+import { Dialog, DialogBody, DialogHeader, DialogTitle } from "@opencode-ai/ui/v2/dialog-v2"
+import { DividerV2 } from "@opencode-ai/ui/v2/divider-v2"
 import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
 import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
 import { MenuV2 } from "@opencode-ai/ui/v2/menu-v2"
@@ -28,7 +30,17 @@ export function AddServerMenu(props: { onAddServer: () => void }) {
  const dialog = useDialog()
  const language = useLanguage()
  const openAddWsl = () => {
-    dialog.push(() => <DialogAddWslServer />)
+    dialog.push(() => (
+      <Dialog size="large" fit class="settings-v2-wsl-dialog">
+        <DialogHeader hideClose={true}>
+          <DialogTitle>{language.t("wsl.server.add")}</DialogTitle>
+        </DialogHeader>
+        <DividerV2 />
+        <DialogBody>
+          <DialogAddWslServer />
+        </DialogBody>
+      </Dialog>
+    ))
  }
  return (
    <Show
@@ -53,7 +53,8 @@ export type WslJob =
  | { kind: "distros"; startedAt: number }
  | { kind: "install-wsl"; startedAt: number }
  | { kind: "install-distro"; distro: string; startedAt: number }
-  | { kind: "probe-addable"; distros: string[]; startedAt: number }
+  | { kind: "probe-distro"; distro: string; startedAt: number }
+  | { kind: "probe-opencode"; distro: string; startedAt: number }
  | { kind: "install-opencode"; distro: string; startedAt: number }

 export type WslServersState = {
@@ -76,7 +77,8 @@ export type WslServersPlatform = {
  refreshDistros(): Promise<void>
  installWsl(): Promise<void>
  installDistro(name: string): Promise<void>
-  probeAddable(distros: string[]): Promise<void>
+  probeDistro(name: string): Promise<void>
+  probeOpencode(name: string): Promise<void>
  installOpencode(name: string): Promise<void>
  openTerminal(name: string): Promise<void>
  addServer(distro: string): Promise<WslServerConfig>
@@ -1,98 +0,0 @@
-# V2 CLI and TUI development guide
-
-## Migration context
-
- The TUI is being ported from legacy APIs to the new V2 APIs. New and migrated TUI behavior should use `sdk.client.v2` and the location-scoped data in `packages/tui/src/context/data.tsx` instead of adding dependencies on legacy sync state.
- Preserve established TUI behavior unless the task intentionally changes it. When behavior, copy, keyboard interaction, or layout is unclear, compare the local V2 TUI with the latest released legacy TUI.
- Run both versions in separate Terminal Control sessions and save PNG-only captures at equivalent states:
-
-```bash
-# From packages/cli: local V2 TUI
-termctrl start opencode-v2-dev --host opentui --cols 112 --rows 34 -- bun dev
-
-# Released legacy TUI behavior reference
-termctrl start opencode-legacy --host opentui --cols 112 --rows 34 -- bunx opencode-ai@latest
-
-termctrl save opencode-v2-dev --format png --out /tmp/opencode/v2.png
-termctrl save opencode-legacy --format png --out /tmp/opencode/legacy.png
-```
-
- Use the same viewport and send equivalent inputs to both sessions before comparing screenshots. The released CLI is a behavioral reference, not a source of V2 API design; keep the local implementation on V2 endpoints.
- Stop both sessions after comparison: `termctrl stop opencode-v2-dev` and `termctrl stop opencode-legacy`.
-
-## Interactive debugging
-
- This package is the V2 CLI adapter. Run its `dev` script when testing the TUI; do not use the repository-root `bun dev`, which launches the legacy `packages/opencode` CLI.
- Run commands from `packages/cli`. Use `bun dev` for most debugging so the TUI starts with a private V2 server.
- Use `termctrl` for interactive checks instead of starting the TUI as a blocking foreground process. It provides a real PTY, handles OpenTUI's host handshake, and can save reviewable screenshots.
- Use a dedicated session name and do not reuse or kill an unrelated session.
-
-```bash
-termctrl start opencode-v2-dev --host opentui --cols 112 --rows 34 -- bun dev
-termctrl wait opencode-v2-dev "Ask anything" --timeout 20000
-termctrl show opencode-v2-dev
-```
-
- Wait for visible text before interacting instead of relying on fixed sleeps. Use the text expected from the screen under test, such as `Ask anything` or `Connect a provider`.
- Drive the running TUI with `termctrl send`. Prefix typed input with `text:` and send control keys separately so the interaction matches real terminal input.
-
-```bash
-termctrl send opencode-v2-dev 'text:example prompt' enter
-termctrl send opencode-v2-dev ctrl-c
-```
-
- Use `termctrl show` after each meaningful interaction and inspect the full visible screen for rendering errors, stale state, error toasts, and unexpected exits.
- Save PNG evidence for every user-visible bug and fix. Do not save text captures; inspect the rendered PNG. Write temporary captures outside the repository unless the artifact is intended to be committed.
-
-```bash
-termctrl save opencode-v2-dev --format png --out /tmp/opencode/v2-tui.png
-```
-
- For resize-sensitive changes, resize the viewport, wait for the expected content, and capture the screen again:
-
-```bash
-termctrl resize opencode-v2-dev --cols 100 --rows 30
-termctrl show opencode-v2-dev
-```
-
- Source changes may require restarting the process. Use `termctrl restart opencode-v2-dev` rather than assuming the running TUI reloaded the change.
- To exercise background-service behavior, use `bun dev service start`, `bun dev service status`, and `bun dev service stop`.
- Always clean up the Terminal Control session when the check is complete:
-
-```bash
-termctrl stop opencode-v2-dev
-```
-
-## Server/API debugging
-
- Use `bun dev api --help` from `packages/cli` to inspect the API debugging command. It sends one request to the V2 server using the same daemon discovery/auth path as the CLI.
- Use `bun dev api` to introspect the server-side data backing the TUI. This is useful when debugging UI bugs: compare what the screen renders with the raw session, message, event, agent, or health data returned by the API to determine whether the bug is in the server state, the client data layer, or the TUI rendering.
- `bun dev api` accepts either an OpenAPI operation ID or a raw HTTP method plus path:
-
-```bash
-bun dev api get /health
-bun dev api get /openapi.json
-bun dev api <operationId> --param key=value
-```
-
- Pass JSON request bodies with `--data`/`-d`; the command sets `content-type: application/json` automatically unless you provide a header. Add extra headers with `--header`/`-H name:value`.
- If no compatible background server is registered, `bun dev api` starts one through the daemon service. Use `bun dev service status`, `bun dev service restart`, and `bun dev service stop` when you need explicit lifecycle control.
- Prefer raw method/path calls for quick server debugging and operation IDs when exercising documented OpenAPI routes with path or query parameters.
-
-## Debugger
-
- To debug the V2 CLI or TUI with Bun's inspector, launch the CLI entrypoint through Terminal Control with an inspector URL, then attach a debugger to that URL:
-
-```bash
-termctrl start opencode-v2-debug --host opentui --cols 112 --rows 34 -- \
-  bun run --inspect=ws://localhost:6499/ src/index.ts
-```
-
- Use `--inspect-wait` or `--inspect-brk` when execution must pause until the debugger attaches.
- Use `termctrl logs opencode-v2-debug` for inspector output or startup failures emitted before the TUI renderer starts. Use `termctrl show` for the visible full-screen TUI.
-
-## Verification
-
- Run `bun typecheck` from `packages/cli` after CLI adapter changes.
- Run `bun typecheck` and `bun test` from `packages/tui` after shared TUI changes. Do not run tests from the repository root.
- Treat automated checks and Terminal Control smoke tests as complementary. For user-visible changes, verify initial render, the changed interaction, Ctrl-C exit behavior, and save a screenshot of the corrected state.
@@ -31,11 +31,11 @@ function run(target) {

 const envPath = process.env.OPENCODE_BIN_PATH
 const scriptDir = path.dirname(fs.realpathSync(__filename))
-const cached = path.join(scriptDir, ".opencode2")
+const cached = path.join(scriptDir, ".lildax")
 const platform = { darwin: "darwin", linux: "linux", win32: "windows" }[os.platform()] || os.platform()
 const arch = { x64: "x64", arm64: "arm64", arm: "arm" }[os.arch()] || os.arch()
 const base = "@opencode-ai/cli-" + platform + "-" + arch
-const binary = platform === "windows" ? "opencode2.exe" : "opencode2"
+const binary = platform === "windows" ? "lildax.exe" : "lildax"

 function supportsAvx2() {
  if (arch !== "x64") return false
@@ -121,7 +121,7 @@ function findBinary(startDir) {
 const resolved = envPath || (fs.existsSync(cached) ? cached : findBinary(scriptDir))
 if (!resolved) {
  console.error(
-    "It seems that your package manager failed to install the right opencode2 CLI package. Try manually installing " +
+    "It seems that your package manager failed to install the right lildax CLI package. Try manually installing " +
      names.map((name) => `"${name}"`).join(" or ") +
      " package",
  )
@@ -1,11 +1,11 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/cli",
-  "version": "1.17.13",
+  "version": "1.17.11",
  "type": "module",
  "license": "MIT",
  "bin": {
-    "opencode2": "./bin/opencode2.cjs"
+    "lildax": "./bin/lildax.cjs"
  },
  "files": [
    "bin"
@@ -17,7 +17,6 @@
  },
  "dependencies": {
    "@effect/platform-node": "catalog:",
-    "@opencode-ai/client": "workspace:*",
    "@opencode-ai/core": "workspace:*",
    "@opencode-ai/sdk": "workspace:*",
    "@opencode-ai/server": "workspace:*",
@@ -26,15 +25,12 @@
    "@opentui/solid": "catalog:",
    "@parcel/watcher": "2.5.1",
    "effect": "catalog:",
-    "jsonc-parser": "3.3.1",
-    "semver": "catalog:",
    "solid-js": "catalog:"
  },
  "devDependencies": {
    "@opencode-ai/script": "workspace:*",
    "@tsconfig/bun": "catalog:",
    "@types/bun": "catalog:",
-    "@types/semver": "catalog:",
    "@typescript/native-preview": "catalog:"
  }
 }
@@ -10,7 +10,7 @@ import pkg from "../package.json"
 import { modelsData } from "./generate"

 const dir = path.resolve(import.meta.dirname, "..")
-const binary = "opencode2"
+const binary = "lildax"
 process.chdir(dir)

 await rm("dist", { recursive: true, force: true })
@@ -25,15 +25,14 @@ for (const filepath of new Bun.Glob("*/package.json").scanSync({ cwd: "./dist" }
 }
 console.log("binaries", binaries)
 const version = Object.values(binaries)[0]
-const name = pkg.name

-await $`mkdir -p ./dist/${name}/bin`
-await $`cp ./bin/opencode2.cjs ./dist/${name}/bin/opencode2`
-await Bun.file(`./dist/${name}/package.json`).write(
+await $`mkdir -p ./dist/${pkg.name}/bin`
+await $`cp ./bin/lildax.cjs ./dist/${pkg.name}/bin/lildax`
+await Bun.file(`./dist/${pkg.name}/package.json`).write(
  JSON.stringify(
    {
-      name,
-      bin: { opencode2: "./bin/opencode2" },
+      name: pkg.name,
+      bin: { lildax: "./bin/lildax" },
      version,
      license: pkg.license,
      repository: { type: "git", url: "git+https://github.com/anomalyco/opencode.git" },
@@ -51,4 +50,4 @@ await Promise.all(
    publish(`./dist/${name.replace("@opencode-ai/", "")}`, name, version),
  ),
 )
-await publish(`./dist/${name}`, name, version)
+await publish(`./dist/${pkg.name}`, pkg.name, version)
@@ -5,26 +5,6 @@ declare const OPENCODE_CLI_NAME: string | undefined

 export const Commands = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME : "opencode", {
  description: "OpenCode 2.0 preview command line interface",
-  params: {
-    directory: Argument.string("directory").pipe(
-      Argument.withDescription("Directory to start OpenCode in"),
-      Argument.optional,
-    ),
-    standalone: Flag.boolean("standalone").pipe(
-      Flag.withDescription("Run with a private server instead of the background service"),
-      Flag.withDefault(false),
-    ),
-    continue: Flag.boolean("continue").pipe(
-      Flag.withAlias("c"),
-      Flag.withDescription("Continue the last session"),
-      Flag.withDefault(false),
-    ),
-    session: Flag.string("session").pipe(
-      Flag.withAlias("s"),
-      Flag.withDescription("Session ID to continue"),
-      Flag.optional,
-    ),
-  },
  commands: [
    Spec.make("api", {
      description: "Make a request to the running server",
@@ -46,43 +26,6 @@ export const Commands = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCO
      description: "Debugging and troubleshooting tools",
      commands: [Spec.make("agents", { description: "List all agents" })],
    }),
-    Spec.make("mcp", {
-      description: "Manage MCP (Model Context Protocol) servers",
-      commands: [
-        Spec.make("list", { description: "List configured MCP servers and their status" }),
-        Spec.make("add", {
-          description: "Add an MCP server to your configuration",
-          params: {
-            name: Argument.string("name").pipe(Argument.withDescription("Name of the MCP server")),
-            command: Argument.string("command").pipe(
-              Argument.withDescription("Command and arguments for a local server, passed after --"),
-              Argument.variadic({ min: 0 }),
-            ),
-            url: Flag.string("url").pipe(Flag.withDescription("URL for a remote MCP server"), Flag.optional),
-            header: Flag.keyValuePair("header").pipe(
-              Flag.withDescription("HTTP header for a remote server, as name=value"),
-              Flag.optional,
-            ),
-            env: Flag.keyValuePair("env").pipe(
-              Flag.withDescription("Environment variable for a local server, as name=value"),
-              Flag.optional,
-            ),
-            global: Flag.boolean("global").pipe(
-              Flag.withDescription("Write to the global config instead of the project config"),
-              Flag.withDefault(false),
-            ),
-          },
-        }),
-        Spec.make("auth", {
-          description: "Authenticate with an OAuth-capable remote MCP server",
-          params: { name: Argument.string("name").pipe(Argument.withDescription("Name of the MCP server")) },
-        }),
-        Spec.make("logout", {
-          description: "Remove stored OAuth credentials for an MCP server",
-          params: { name: Argument.string("name").pipe(Argument.withDescription("Name of the MCP server")) },
-        }),
-      ],
-    }),
    Spec.make("migrate", { description: "Migrate v1 data to v2" }),
    Spec.make("service", {
      description: "Manage the background server",
@@ -91,27 +34,18 @@ export const Commands = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCO
        Spec.make("restart", { description: "Restart the background server" }),
        Spec.make("status", { description: "Show background server status" }),
        Spec.make("stop", { description: "Stop the background server" }),
-        Spec.make("get", {
-          description: "Get service configuration",
-          params: { key: Argument.string("key").pipe(Argument.optional) },
-        }),
-        Spec.make("set", {
-          description: "Set service configuration",
-          params: { key: Argument.string("key"), value: Argument.string("value") },
-        }),
-        Spec.make("unset", {
-          description: "Unset service configuration",
-          params: { key: Argument.string("key") },
+        Spec.make("password", {
+          description: "Get or set the server password",
+          params: { value: Argument.string("value").pipe(Argument.optional) },
        }),
      ],
    }),
    Spec.make("serve", {
      description: "Start the v2 API server",
      params: {
-        hostname: Flag.string("hostname").pipe(Flag.optional),
+        hostname: Flag.string("hostname").pipe(Flag.withDefault("127.0.0.1")),
        port: Flag.integer("port").pipe(Flag.optional),
-        service: Flag.boolean("service").pipe(Flag.withDefault(false)),
-        stdio: Flag.boolean("stdio").pipe(Flag.withDefault(false)),
+        register: Flag.boolean("register").pipe(Flag.withDefault(false)),
      },
    }),
  ],
@@ -1,28 +1,13 @@
 import { Commands } from "../commands"
 import { Runtime } from "../../framework/runtime"
-import { Effect, Option } from "effect"
+import { Effect } from "effect"
 import { Daemon } from "../../services/daemon"
-import { Standalone } from "../../services/standalone"
-import { Updater } from "../../services/updater"

-export default Runtime.handler(Commands, (input) =>
+export default Runtime.handler(Commands, () =>
  Effect.gen(function* () {
-    const directory = Option.getOrUndefined(input.directory)
-    if (directory !== undefined) process.chdir(directory)
-    const updater = yield* Updater.Service
-    yield* updater.check().pipe(Effect.forkScoped)
    const daemon = yield* Daemon.Service
-    const transport = yield* (input.standalone ? Standalone.transport() : daemon.transport())
+    const transport = yield* daemon.transport()
    const { runTui } = yield* Effect.promise(() => import("../../tui"))
-    yield* runTui(
-      transport,
-      { continue: input.continue, sessionID: Option.getOrUndefined(input.session) },
-      input.standalone
-        ? undefined
-        : async () => {
-            await Effect.runPromise(daemon.stop())
-            return Effect.runPromise(daemon.transport())
-          },
-    )
+    yield* runTui(transport)
  }),
 )
@@ -1,58 +0,0 @@
-import { EOL } from "node:os"
-import path from "node:path"
-import { Effect, Option } from "effect"
-import { applyEdits, modify } from "jsonc-parser"
-import { Global } from "@opencode-ai/core/global"
-import { Commands } from "../../commands"
-import { Runtime } from "../../../framework/runtime"
-
-export default Runtime.handler(
-  Commands.commands.mcp.commands.add,
-  Effect.fn("cli.mcp.add")(function* (input) {
-    const url = Option.getOrUndefined(input.url)
-    const headers = Option.getOrUndefined(input.header)
-    const environment = Option.getOrUndefined(input.env)
-    // The CLI framework strands `--` operands on the root command, so read the local server command
-    // straight from argv after `--`. This also lets the command carry its own flags (e.g. `npx -y`).
-    const dash = process.argv.indexOf("--")
-    const command = dash === -1 ? [...input.command] : process.argv.slice(dash + 1)
-
-    const hasCommand = command.length > 0
-    if (url && hasCommand)
-      return yield* Effect.fail(new Error("Provide either --url <url> or a command after --, not both"))
-    if (!url && !hasCommand) return yield* Effect.fail(new Error("Provide either --url <url> or a command after --"))
-    if (url && !URL.canParse(url)) return yield* Effect.fail(new Error(`Invalid URL: ${url}`))
-    if (url && environment) return yield* Effect.fail(new Error("--env is only valid for local MCP servers"))
-    if (hasCommand && headers) return yield* Effect.fail(new Error("--header is only valid for remote MCP servers"))
-
-    const server = url
-      ? { type: "remote" as const, url, ...(headers ? { headers } : {}) }
-      : { type: "local" as const, command, ...(environment ? { environment } : {}) }
-
-    const configPath = yield* Effect.promise(() => resolveConfigPath(input.global ? Global.Path.config : process.cwd()))
-    yield* Effect.promise(() => write(configPath, input.name, server))
-    process.stdout.write(`MCP server "${input.name}" added to ${configPath}` + EOL)
-  }),
-)
-
-async function resolveConfigPath(directory: string) {
-  const candidates = [
-    path.join(directory, "opencode.json"),
-    path.join(directory, "opencode.jsonc"),
-    path.join(directory, ".opencode", "opencode.json"),
-    path.join(directory, ".opencode", "opencode.jsonc"),
-  ]
-  for (const candidate of candidates) {
-    if (await Bun.file(candidate).exists()) return candidate
-  }
-  return candidates[0]
-}
-
-async function write(configPath: string, name: string, server: unknown) {
-  const file = Bun.file(configPath)
-  const text = (await file.exists()) ? await file.text() : "{}"
-  const edits = modify(text, ["mcp", "servers", name], server, {
-    formattingOptions: { tabSize: 2, insertSpaces: true },
-  })
-  await Bun.write(configPath, applyEdits(text, edits))
-}
@@ -1,58 +0,0 @@
-import { EOL } from "node:os"
-import { Effect } from "effect"
-import type { IntegrationAttemptStatus, IntegrationOAuthMethod, OpencodeClient } from "@opencode-ai/sdk/v2/client"
-import { Commands } from "../../commands"
-import { Runtime } from "../../../framework/runtime"
-import { Daemon } from "../../../services/daemon"
-import { resolveIntegration } from "./resolve"
-
-const location = { directory: process.cwd() }
-
-export default Runtime.handler(
-  Commands.commands.mcp.commands.auth,
-  Effect.fn("cli.mcp.auth")(function* (input) {
-    const daemon = yield* Daemon.Service
-    const client = yield* daemon.client()
-
-    const integration = yield* resolveIntegration(client, input.name, location)
-    if (!integration)
-      return yield* Effect.fail(new Error(`MCP server "${input.name}" is not an OAuth-capable remote server`))
-    const method = integration.methods.find(
-      (candidate): candidate is IntegrationOAuthMethod => candidate.type === "oauth",
-    )
-    if (!method)
-      return yield* Effect.fail(new Error(`MCP server "${input.name}" is not an OAuth-capable remote server`))
-
-    const started = yield* Effect.promise(() =>
-      client.v2.integration.connect.oauth({ integrationID: integration.id, methodID: method.id, inputs: {}, location }),
-    )
-    const attempt = started.data?.data
-    if (!attempt) return yield* Effect.fail(new Error(started.error?.message ?? "Failed to start OAuth attempt"))
-    if (attempt.mode === "code")
-      return yield* Effect.fail(new Error("This server requires manual code entry, which the CLI does not support"))
-
-    process.stdout.write(attempt.instructions + EOL + attempt.url + EOL)
-
-    const result = yield* poll(client, attempt.attemptID)
-    if (result.status === "complete") {
-      process.stdout.write(`Authenticated with ${input.name}` + EOL)
-      return
-    }
-    const reason = result.status === "failed" ? `: ${result.message}` : ""
-    return yield* Effect.fail(new Error(`Authentication ${result.status}${reason}`))
-  }),
-)
-
-const poll = (
-  client: OpencodeClient,
-  attemptID: string,
-): Effect.Effect<Exclude<IntegrationAttemptStatus, { status: "pending" }>> =>
-  Effect.gen(function* () {
-    const response = yield* Effect.promise(() => client.v2.integration.attempt.status({ attemptID, location }))
-    const status = response.data?.data
-    if (!status || status.status === "pending") {
-      yield* Effect.sleep("1 second")
-      return yield* poll(client, attemptID)
-    }
-    return status
-  })
@@ -1,52 +0,0 @@
-import { EOL } from "node:os"
-import * as Effect from "effect/Effect"
-import type { McpServer } from "@opencode-ai/sdk/v2/client"
-import { Commands } from "../../commands"
-import { Runtime } from "../../../framework/runtime"
-import { Daemon } from "../../../services/daemon"
-
-export default Runtime.handler(
-  Commands.commands.mcp.commands.list,
-  Effect.fn("cli.mcp.list")(function* () {
-    const daemon = yield* Daemon.Service
-    const client = yield* daemon.client()
-    const response = yield* Effect.promise(() => client.v2.mcp.list({ location: { directory: process.cwd() } }))
-    const servers = (response.data?.data ?? []).toSorted((a, b) => a.name.localeCompare(b.name))
-    if (servers.length === 0) {
-      process.stdout.write("No MCP servers configured" + EOL)
-      return
-    }
-    const width = Math.max(...servers.map((server) => server.name.length))
-    const lines = servers.map(
-      (server) => `${icon(server.status)} ${server.name.padEnd(width)}  ${describe(server.status)}`,
-    )
-    process.stdout.write(lines.join(EOL) + EOL)
-  }),
-)
-
-function icon(status: McpServer["status"]) {
-  switch (status.status) {
-    case "connected":
-      return "✓"
-    case "needs_auth":
-      return "⚠"
-    case "failed":
-    case "needs_client_registration":
-      return "✗"
-    default:
-      return "○"
-  }
-}
-
-function describe(status: McpServer["status"]) {
-  switch (status.status) {
-    case "needs_auth":
-      return "needs authentication"
-    case "needs_client_registration":
-      return `needs client registration: ${status.error}`
-    case "failed":
-      return `failed: ${status.error}`
-    default:
-      return status.status
-  }
-}
@@ -1,35 +0,0 @@
-import { EOL } from "node:os"
-import { Effect } from "effect"
-import { Commands } from "../../commands"
-import { Runtime } from "../../../framework/runtime"
-import { Daemon } from "../../../services/daemon"
-import { resolveIntegration } from "./resolve"
-
-const location = { directory: process.cwd() }
-
-export default Runtime.handler(
-  Commands.commands.mcp.commands.logout,
-  Effect.fn("cli.mcp.logout")(function* (input) {
-    const daemon = yield* Daemon.Service
-    const client = yield* daemon.client()
-
-    const integration = yield* resolveIntegration(client, input.name, location)
-    if (!integration) {
-      process.stdout.write(`No stored credentials for ${input.name}` + EOL)
-      return
-    }
-
-    const credentials = integration.connections.filter((connection) => connection.type === "credential")
-    if (credentials.length === 0) {
-      process.stdout.write(`No stored credentials for ${input.name}` + EOL)
-      return
-    }
-
-    yield* Effect.forEach(
-      credentials,
-      (connection) => Effect.promise(() => client.v2.credential.remove({ credentialID: connection.id, location })),
-      { discard: true },
-    )
-    process.stdout.write(`Removed OAuth credentials for ${input.name}` + EOL)
-  }),
-)
@@ -1,17 +0,0 @@
-import { Effect } from "effect"
-import type { OpencodeClient } from "@opencode-ai/sdk/v2/client"
-
-// Resolve through the MCP-owned integrationID rather than matching integration names: the shared
-// integration registry also holds provider/plugin integrations, whose names could collide with a server.
-// Fails when the server is unknown; returns undefined when the server has no integration (e.g. a local
-// or anonymous server), leaving that case for the caller to interpret.
-export const resolveIntegration = (client: OpencodeClient, name: string, location: { directory: string }) =>
-  Effect.gen(function* () {
-    const servers = yield* Effect.promise(() => client.v2.mcp.list({ location }))
-    const server = (servers.data?.data ?? []).find((entry) => entry.name === name)
-    if (!server) return yield* Effect.fail(new Error(`MCP server not found: ${name}`))
-    const integrationID = server.integrationID
-    if (!integrationID) return undefined
-    const found = yield* Effect.promise(() => client.v2.integration.get({ integrationID, location }))
-    return found.data?.data
-  })
@@ -1,76 +1,30 @@
 import { NodeHttpServer } from "@effect/platform-node"
 import { Credential } from "@opencode-ai/core/credential"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { PermissionSaved } from "@opencode-ai/core/permission/saved"
-import { Global } from "@opencode-ai/core/global"
-import { Context, Layer, Option, Schedule } from "effect"
+import { Context, Layer, Option } from "effect"
 import * as Effect from "effect/Effect"
 import { HttpRouter, HttpServer } from "effect/unstable/http"
 import { createServer } from "node:http"
 import { createRoutes } from "@opencode-ai/server/routes"
-import { ServerAuth } from "@opencode-ai/server/auth"
-import { createOpencodeClient } from "@opencode-ai/sdk/v2/client"
 import { Commands } from "../commands"
 import { Runtime } from "../../framework/runtime"
 import { Daemon } from "../../services/daemon"
-import { Updater } from "../../services/updater"
-import { randomBytes } from "crypto"

 export default Runtime.handler(
  Commands.commands.serve,
  Effect.fn("cli.serve")(function* (input) {
-    if (input.service) yield* Effect.sync(() => process.chdir(Global.Path.home))
    return yield* Effect.scoped(
      Effect.gen(function* () {
        const daemon = yield* Daemon.Service
-        const standalonePassword = process.env.OPENCODE_SERVER_PASSWORD
-        if (input.stdio) delete process.env.OPENCODE_SERVER_PASSWORD
-        const config = input.service ? yield* daemon.config() : {}
-        const password = input.service
-          ? yield* daemon.password()
-          : standalonePassword || randomBytes(32).toString("base64url")
-        if (!password) return yield* Effect.fail(new Error("Missing server password"))
-        const hostname = Option.getOrUndefined(input.hostname) ?? config.hostname ?? "127.0.0.1"
-        const port = Option.isSome(input.port)
-          ? input.port
-          : config.port === undefined
-            ? Option.none<number>()
-            : Option.some(config.port)
-        const address = yield* listen(hostname, port, password)
-        yield* Effect.tryPromise(() =>
-          createOpencodeClient({
-            baseUrl: HttpServer.formatAddress(address),
-            headers: ServerAuth.headers({ password }),
-          }).v2.health.get({}),
-        )
-        if (input.service) yield* daemon.register(address)
-        const url = HttpServer.formatAddress(address)
-        console.log(input.stdio ? JSON.stringify({ url }) : `server listening on ${url}`)
-        if (!input.service && !input.stdio && !standalonePassword) console.log(`server password ${password}`)
-        const updater = yield* Updater.Service
-        yield* updater.check().pipe(Effect.schedule(Schedule.spaced("10 minutes")), Effect.forkScoped)
-        return yield* (input.stdio ? waitForStdinClose() : Effect.never)
-      }).pipe(Effect.annotateLogs({ role: "server" })),
+        const address = yield* listen(input.hostname, input.port, yield* daemon.password())
+        if (input.register) yield* daemon.register(address)
+        console.log(`server listening on ${HttpServer.formatAddress(address)}`)
+        return yield* Effect.never
+      }),
    )
  }),
 )

-function waitForStdinClose() {
-  return Effect.callback<void>((resume) => {
-    const close = () => resume(Effect.void)
-    process.stdin.once("end", close)
-    process.stdin.once("close", close)
-    process.stdin.resume()
-    if (process.stdin.readableEnded || process.stdin.destroyed) close()
-    return Effect.sync(() => {
-      process.stdin.off("end", close)
-      process.stdin.off("close", close)
-      process.stdin.pause()
-    })
-  })
-}
-
 function listen(hostname: string, port: Option.Option<number>, password: string) {
  if (Option.isSome(port)) return bind(hostname, port.value, password)
  const next = (port: number): ReturnType<typeof bind> =>
@@ -81,14 +35,11 @@ function listen(hostname: string, port: Option.Option<number>, password: string)
 }

 function bind(hostname: string, port: number, password: string) {
-  const server = createServer()
  return Layer.build(
    HttpRouter.serve(createRoutes(password), { disableListenLog: true, disableLogger: true }).pipe(
-      Layer.provideMerge(NodeHttpServer.layer(() => server, { port, host: hostname })),
-      Layer.provide(AppNodeBuilder.build(LayerNode.group([Credential.node, PermissionSaved.node]))),
+      Layer.provideMerge(NodeHttpServer.layer(() => createServer(), { port, host: hostname })),
+      Layer.provide(Credential.defaultLayer),
+      Layer.provide(PermissionSaved.defaultLayer),
    ),
-  ).pipe(
-    Effect.tap(() => Effect.addFinalizer(() => Effect.sync(() => server.closeAllConnections()))),
-    Effect.map((context) => Context.get(context, HttpServer.HttpServer).address),
-  )
+  ).pipe(Effect.map((context) => Context.get(context, HttpServer.HttpServer).address))
 }
@@ -6,9 +6,11 @@ import { Runtime } from "../../../framework/runtime"
 import { Daemon } from "../../../services/daemon"

 export default Runtime.handler(
-  Commands.commands.service.commands.get,
-  Effect.fn("cli.service.get")(function* (input) {
+  Commands.commands.service.commands.password,
+  Effect.fn("cli.service.password")(function* (input) {
    const daemon = yield* Daemon.Service
-    process.stdout.write((yield* daemon.get(Option.getOrUndefined(input.key))) + EOL)
+    const value = Option.getOrUndefined(input.value)
+    if (value !== undefined) yield* daemon.stop()
+    process.stdout.write((yield* daemon.password(value)) + EOL)
  }),
 )
@@ -1,11 +0,0 @@
-import * as Effect from "effect/Effect"
-import { Commands } from "../../commands"
-import { Runtime } from "../../../framework/runtime"
-import { Daemon } from "../../../services/daemon"
-
-export default Runtime.handler(
-  Commands.commands.service.commands.set,
-  Effect.fn("cli.service.set")(function* (input) {
-    yield* (yield* Daemon.Service).set(input.key, input.value)
-  }),
-)
@@ -8,6 +8,6 @@ export default Runtime.handler(
  Commands.commands.service.commands.status,
  Effect.fn("cli.service.status")(function* () {
    const url = yield* (yield* Daemon.Service).status()
-    process.stdout.write((url ? url : "stopped") + EOL)
+    process.stdout.write((url ? `running ${url}` : "stopped") + EOL)
  }),
 )
@@ -1,11 +0,0 @@
-import * as Effect from "effect/Effect"
-import { Commands } from "../../commands"
-import { Runtime } from "../../../framework/runtime"
-import { Daemon } from "../../../services/daemon"
-
-export default Runtime.handler(
-  Commands.commands.service.commands.unset,
-  Effect.fn("cli.service.unset")(function* (input) {
-    yield* (yield* Daemon.Service).unset(input.key)
-  }),
-)
@@ -2,8 +2,6 @@ import * as Effect from "effect/Effect"
 import * as Command from "effect/unstable/cli/Command"
 import { Spec } from "./spec"
 import { Daemon } from "../services/daemon"
-import { Updater } from "../services/updater"
-import { Scope } from "effect"

 export type Input<Value> =
  Value extends Spec.Node<infer _Name, infer Command, infer _Commands>
@@ -12,11 +10,11 @@ export type Input<Value> =
      ? Input
      : never

-type RuntimeHandler = (input: unknown) => Effect.Effect<void, unknown, Daemon.Service | Updater.Service | Scope.Scope>
+type RuntimeHandler = (input: unknown) => Effect.Effect<void, unknown, Daemon.Service>
 type Loader<Node extends Spec.Any> = () => Promise<{
-  default: (input: Input<Node>) => Effect.Effect<void, any, Daemon.Service | Updater.Service | Scope.Scope>
+  default: (input: Input<Node>) => Effect.Effect<void, any, Daemon.Service>
 }>
-type ProvidedCommand = Command.Command<string, unknown, unknown, unknown, Daemon.Service | Updater.Service | Scope.Scope>
+type ProvidedCommand = Command.Command<string, unknown, unknown, unknown, Daemon.Service>

 export type Handlers<Node extends Spec.Any> = keyof Node["commands"] extends never
  ? Loader<Node>
@@ -2,25 +2,10 @@

 import * as NodeRuntime from "@effect/platform-node/NodeRuntime"
 import * as NodeServices from "@effect/platform-node/NodeServices"
-import { NodeFileSystem } from "@effect/platform-node"
 import * as Effect from "effect/Effect"
-import { Layer, Logger, References } from "effect"
 import { Commands } from "./commands/commands"
 import { Runtime } from "./framework/runtime"
 import { Daemon } from "./services/daemon"
-import { Logging } from "@opencode-ai/core/observability/logging"
-import { Updater } from "./services/updater"
-import { InstallationChannel, InstallationVersion, InstallationLocal } from "@opencode-ai/core/installation/version"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { LayerNode } from "@opencode-ai/core/effect/layer-node"
-import { Global } from "@opencode-ai/core/global"
-import { AppProcess } from "@opencode-ai/core/process"
-
-const LoggingLayer = Logger.layer(Logging.loggers(), { mergeWithExisting: false }).pipe(
-  Layer.provide(NodeFileSystem.layer),
-  Layer.orDie,
-  Layer.merge(Layer.succeed(References.MinimumLogLevel, Logging.minimumLogLevel())),
-)

 const Handlers = Runtime.handlers(Commands, {
  $: () => import("./commands/handlers/default"),
@@ -28,34 +13,20 @@ const Handlers = Runtime.handlers(Commands, {
  debug: {
    agents: () => import("./commands/handlers/debug/agents"),
  },
-  mcp: {
-    list: () => import("./commands/handlers/mcp/list"),
-    add: () => import("./commands/handlers/mcp/add"),
-    auth: () => import("./commands/handlers/mcp/auth"),
-    logout: () => import("./commands/handlers/mcp/logout"),
-  },
  migrate: () => import("./commands/handlers/migrate"),
  service: {
    start: () => import("./commands/handlers/service/start"),
    restart: () => import("./commands/handlers/service/restart"),
    status: () => import("./commands/handlers/service/status"),
    stop: () => import("./commands/handlers/service/stop"),
-    get: () => import("./commands/handlers/service/get"),
-    set: () => import("./commands/handlers/service/set"),
-    unset: () => import("./commands/handlers/service/unset"),
+    password: () => import("./commands/handlers/service/password"),
  },
  serve: () => import("./commands/handlers/serve"),
 })

-Effect.logInfo("cli starting", { version: InstallationVersion, channel: InstallationChannel, local: InstallationLocal }).pipe(
-  Effect.flatMap(() => Runtime.run(Commands, Handlers, { version: InstallationVersion })),
-  Effect.annotateLogs({ role: "cli" }),
-  Effect.provide(Daemon.layer),
-  Effect.provide(Updater.layer),
-  Effect.provide(AppNodeBuilder.build(LayerNode.group([Global.node, AppProcess.node]))),
-  Effect.provide(LoggingLayer),
+Runtime.run(Commands, Handlers, { version: "local" }).pipe(
+  Effect.provide(Daemon.defaultLayer),
  Effect.provide(NodeServices.layer),
  Effect.scoped,
-  Effect.tap(() => Effect.sync(() => process.exit(0))),
  NodeRuntime.runMain,
 )
@@ -1,5 +1,5 @@
 import { Global } from "@opencode-ai/core/global"
-import { InstallationChannel, InstallationVersion } from "@opencode-ai/core/installation/version"
+import { InstallationVersion } from "@opencode-ai/core/installation/version"
 import { createOpencodeClient } from "@opencode-ai/sdk/v2/client"
 import { ServerAuth } from "@opencode-ai/server/auth"
 import { Context, Effect, FileSystem, Layer, Option, Schedule, Schema, Scope } from "effect"
@@ -15,10 +15,6 @@ export interface Interface {
  readonly status: () => Effect.Effect<string | undefined>
  readonly stop: () => Effect.Effect<void, unknown>
  readonly password: (value?: string) => Effect.Effect<string, unknown>
-  readonly config: () => Effect.Effect<ServiceConfig, unknown>
-  readonly get: (key?: string) => Effect.Effect<string, unknown>
-  readonly set: (key: string, value: string) => Effect.Effect<void, unknown>
-  readonly unset: (key: string) => Effect.Effect<void, unknown>
  readonly register: (address: HttpServer.Address) => Effect.Effect<void, unknown, Scope.Scope>
 }

@@ -32,22 +28,6 @@ const Registration = Schema.Struct({
 })
 type Registration = typeof Registration.Type

-const ServiceConfig = Schema.Struct({
-  hostname: Schema.optional(Schema.String),
-  port: Schema.optional(Schema.Int.check(Schema.isGreaterThanOrEqualTo(1), Schema.isLessThanOrEqualTo(65_535))),
-  password: Schema.optional(Schema.String),
-  autostart: Schema.optional(Schema.Boolean),
-})
-export type ServiceConfig = typeof ServiceConfig.Type
-
-const serviceConfigKeys = ["hostname", "port", "password", "autostart"] as const
-type ServiceConfigKey = (typeof serviceConfigKeys)[number]
-
-function serviceConfigKey(key: string): ServiceConfigKey {
-  if (serviceConfigKeys.includes(key as ServiceConfigKey)) return key as ServiceConfigKey
-  throw new Error(`Unknown service config key: ${key}`)
-}
-
 function sameRegistration(left: Registration, right: Registration) {
  return left.id === right.id && left.version === right.version && left.url === right.url && left.pid === right.pid
 }
@@ -56,115 +36,23 @@ export const layer = Layer.effect(
  Service,
  Effect.gen(function* () {
    const fs = yield* FileSystem.FileSystem
-    const global = yield* Global.Service
-    const directory = global.state
-    const filename = InstallationChannel === "local" ? "service-local.json" : "service.json"
-    const file = path.join(directory, filename)
-    const configFile = path.join(global.config, filename)
+    const directory = Global.Path.state
+    const file = path.join(directory, "server.json")
+    const passwordFile = path.join(directory, "password")
    const decodeRegistration = Schema.decodeUnknownEffect(Schema.fromJsonString(Registration))
-    const decodeServiceConfig = Schema.decodeUnknownEffect(Schema.fromJsonString(ServiceConfig))
-
-    const config = Effect.fn("cli.daemon.config")(function* () {
-      return yield* fs.readFileString(configFile).pipe(
-        Effect.flatMap(decodeServiceConfig),
-        Effect.catch(() => Effect.succeed({} as ServiceConfig)),
-      )
-    })
-
-    const writeConfig = Effect.fn("cli.daemon.writeConfig")(function* (value: ServiceConfig) {
-      const temp = configFile + ".tmp"
-      yield* fs.makeDirectory(path.dirname(configFile), { recursive: true })
-      yield* fs.writeFileString(temp, JSON.stringify(value, null, 2) + "\n", { mode: 0o600 })
-      yield* fs.rename(temp, configFile)
-    })

    const password = Effect.fn("cli.daemon.password")(function* (value?: string) {
-      const existing = yield* config()
-      if (value === undefined && existing.password) return existing.password
-      const next = value ?? randomBytes(32).toString("base64url")
+      const existing = yield* fs.readFileString(passwordFile).pipe(Effect.catch(() => Effect.succeed(undefined)))
+      if (value === undefined && existing) return existing

      // Keep one private credential across server restarts so discovered clients
      // can reconnect without exposing a password flag or environment variable.
-      yield* writeConfig({ ...existing, password: next })
-      return next
-    })
-
-    const get = Effect.fn("cli.daemon.get")(function* (key?: string) {
-      if (key === undefined) {
-        const { password: _password, ...safe } = yield* config()
-        return JSON.stringify(safe, null, 2)
-      }
-      switch (serviceConfigKey(key)) {
-        case "hostname": {
-          return (yield* config()).hostname ?? ""
-        }
-        case "port": {
-          const port = (yield* config()).port
-          return port === undefined ? "" : String(port)
-        }
-        case "password": {
-          return yield* password()
-        }
-        case "autostart": {
-          const autostart = (yield* config()).autostart
-          return autostart === undefined ? "" : String(autostart)
-        }
-      }
-    })
-
-    const set = Effect.fn("cli.daemon.set")(function* (key: string, value: string) {
-      switch (serviceConfigKey(key)) {
-        case "hostname": {
-          yield* stop()
-          yield* writeConfig({ ...(yield* config()), hostname: value })
-          return
-        }
-        case "port": {
-          const port = Number(value)
-          if (!Number.isInteger(port) || port < 1 || port > 65_535) throw new Error("Port must be between 1 and 65535")
-          yield* stop()
-          yield* writeConfig({ ...(yield* config()), port })
-          return
-        }
-        case "password": {
-          yield* stop()
-          yield* password(value)
-          return
-        }
-        case "autostart": {
-          if (value !== "true" && value !== "false") throw new Error("Autostart must be true or false")
-          yield* writeConfig({ ...(yield* config()), autostart: value === "true" })
-          return
-        }
-      }
-    })
-
-    const unset = Effect.fn("cli.daemon.unset")(function* (key: string) {
-      switch (serviceConfigKey(key)) {
-        case "hostname": {
-          yield* stop()
-          const { hostname: _hostname, ...next } = yield* config()
-          yield* writeConfig(next)
-          return
-        }
-        case "port": {
-          yield* stop()
-          const { port: _port, ...next } = yield* config()
-          yield* writeConfig(next)
-          return
-        }
-        case "password": {
-          yield* stop()
-          const { password: _password, ...next } = yield* config()
-          yield* writeConfig(next)
-          return
-        }
-        case "autostart": {
-          const { autostart: _autostart, ...next } = yield* config()
-          yield* writeConfig(next)
-          return
-        }
-      }
+      const generated = value ?? randomBytes(32).toString("base64url")
+      const temp = passwordFile + ".tmp"
+      yield* fs.makeDirectory(directory, { recursive: true })
+      yield* fs.writeFileString(temp, generated, { mode: 0o600 })
+      yield* fs.rename(temp, passwordFile)
+      return generated
    })

    const registration = Effect.fnUntraced(function* () {
@@ -183,16 +71,6 @@ export const layer = Layer.effect(
      return yield* Effect.fail(new Error("Registered server is not healthy"))
    })

-    const remoteTransport = Effect.fn("cli.daemon.remoteTransport")(function* (input: ServiceConfig) {
-      const url = serviceURL(input)
-      const headers = ServerAuth.headers({ password: input.password })
-      const response = yield* Effect.tryPromise(() =>
-        createOpencodeClient({ baseUrl: url, headers }).v2.health.get({ signal: AbortSignal.timeout(2_000) }),
-      )
-      if (response.data?.healthy === true) return { url, headers }
-      return yield* Effect.fail(new Error(`Server is not healthy: ${url}`))
-    })
-
    const compatible = Effect.fnUntraced(function* () {
      const info = yield* healthy()
      if (info.version === InstallationVersion) return info
@@ -233,7 +111,7 @@ export const layer = Layer.effect(
      const existing = yield* healthy().pipe(Effect.option)
      const found = Option.getOrUndefined(existing)
      const compiled = path.basename(process.execPath).replace(/\.exe$/, "") !== "bun"
-      if (found?.version === InstallationVersion) return found.url
+      if (found?.version === InstallationVersion && compiled) return found.url
      if (found) yield* stopProcess(found).pipe(Effect.ignore)

      const entrypoint = compiled ? undefined : process.argv[1]
@@ -241,7 +119,7 @@ export const layer = Layer.effect(
        return yield* Effect.fail(new Error("Failed to resolve CLI entrypoint"))
      yield* Effect.try({
        try: () => {
-          spawn(process.execPath, [...(entrypoint ? [entrypoint] : []), "serve", "--service"], {
+          spawn(process.execPath, [...(entrypoint ? [entrypoint] : []), "serve", "--register"], {
            detached: true,
            stdio: "ignore",
          }).unref()
@@ -257,8 +135,6 @@ export const layer = Layer.effect(
    })

    const transport = Effect.fn("cli.daemon.transport")(function* () {
-      const current = yield* config()
-      if (current.autostart === false) return yield* remoteTransport(current)
      return { url: yield* start(), headers: ServerAuth.headers({ password: yield* password() }) }
    })

@@ -309,15 +185,10 @@ export const layer = Layer.effect(
      )
    })

-    return Service.of({ client, transport, start, status, stop, password, config, get, set, unset, register })
+    return Service.of({ client, transport, start, status, stop, password, register })
  }),
 )

-function serviceURL(config: ServiceConfig) {
-  const hostname = config.hostname ?? "127.0.0.1"
-  const result = new URL(`http://${hostname.includes(":") && !hostname.startsWith("[") ? `[${hostname}]` : hostname}`)
-  result.port = String(config.port ?? 4096)
-  return result.toString()
-}
+export const defaultLayer = layer

 export * as Daemon from "./daemon"
@@ -1,42 +0,0 @@
-import { ServerAuth } from "@opencode-ai/server/auth"
-import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { Effect, Schema, Stream } from "effect"
-import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
-import { randomBytes } from "node:crypto"
-import path from "node:path"
-
-const Ready = Schema.Struct({ url: Schema.String })
-const decodeReady = Schema.decodeUnknownPromise(Schema.fromJsonString(Ready))
-
-function command(password: string) {
-  const compiled = path.basename(process.execPath).replace(/\.exe$/, "") !== "bun"
-  const entrypoint = compiled ? [] : process.argv[1] ? [process.argv[1]] : []
-  if (!compiled && entrypoint.length === 0) throw new Error("Failed to resolve CLI entrypoint")
-  return ChildProcess.make(process.execPath, [...entrypoint, "serve", "--stdio", "--port", "0"], {
-    cwd: process.cwd(),
-    env: { OPENCODE_SERVER_PASSWORD: password },
-    extendEnv: true,
-    // The server treats EOF on this pipe as the end of its ownership lease.
-    // The OS closes it even when the TUI is killed before Effect finalizers run.
-    stdin: "pipe",
-    stderr: "ignore",
-    killSignal: "SIGTERM",
-    forceKillAfter: "3 seconds",
-  })
-}
-
-export const transport = Effect.fn("cli.standalone.transport")(
-  function* () {
-    const password = randomBytes(32).toString("base64url")
-    const spawner = yield* ChildProcessSpawner.ChildProcessSpawner
-    const proc = yield* spawner.spawn(command(password))
-    const output = yield* proc.stdout.pipe(Stream.decodeText(), Stream.splitLines, Stream.take(1), Stream.mkString)
-    if (!output) return yield* Effect.fail(new Error("Standalone server exited before reporting readiness"))
-    const ready = yield* Effect.tryPromise(() => decodeReady(output))
-    return { url: ready.url, headers: ServerAuth.headers({ password }), pid: proc.pid }
-  },
-  Effect.provide(AppNodeBuilder.build(CrossSpawnSpawner.node)),
-)
-
-export * as Standalone from "./standalone"
@@ -1,33 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { action, decodePolicy } from "./updater"
-
-describe("updater", () => {
-  test("reads autoupdate from JSONC", () => {
-    expect(decodePolicy('{ // preference\n "autoupdate": "notify",\n}')).toBe("notify")
-    expect(decodePolicy('{ "autoupdate": false }')).toBe(false)
-    expect(decodePolicy('{ "autoupdate": "invalid" }')).toBeUndefined()
-  })
-
-  test("automatically updates patches and minors", () => {
-    expect(action("1.2.3", "1.2.4", true)).toBe("upgrade")
-    expect(action("1.2.3", "1.3.0", true)).toBe("upgrade")
-    expect(action("1.2.3", "1.2.4", "notify")).toBe("upgrade")
-    expect(action("1.2.3", "1.3.0", "notify")).toBe("upgrade")
-  })
-
-  test("skips when autoupdate is disabled", () => {
-    expect(action("1.2.3", "1.2.4", false)).toBe("none")
-  })
-
-  test("never automatically updates majors", () => {
-    expect(action("1.2.3", "2.0.0", true)).toBe("none")
-  })
-
-  test("reports up-to-date only when versions match", () => {
-    expect(action("1.2.3", "1.2.3", true)).toBe("none")
-  })
-
-  test("upgrades when latest is lower (rollback)", () => {
-    expect(action("1.2.4", "1.2.3", true)).toBe("upgrade")
-  })
-})
@@ -1,156 +0,0 @@
-import { Global } from "@opencode-ai/core/global"
-import { Flag } from "@opencode-ai/core/flag/flag"
-import { AppProcess } from "@opencode-ai/core/process"
-import {
-  InstallationChannel,
-  InstallationLocal,
-  InstallationVersion,
-} from "@opencode-ai/core/installation/version"
-import { Context, Duration, Effect, FileSystem, Layer } from "effect"
-import { ChildProcess } from "effect/unstable/process"
-import { parse, type ParseError } from "jsonc-parser"
-import path from "node:path"
-import semver from "semver"
-
-export type Policy = boolean | "notify"
-export type Action = "none" | "upgrade"
-type Method = "npm" | "pnpm" | "bun" | "yarn"
-
-const packageName = "@opencode-ai/cli"
-
-export interface Interface {
-  readonly check: () => Effect.Effect<void>
-}
-
-export class Service extends Context.Service<Service, Interface>()("@opencode/cli/Updater") {}
-
-export function decodePolicy(text: string): Policy | undefined {
-  // The CLI only projects this host-level preference instead of initializing
-  // the location-scoped server configuration graph.
-  const errors: ParseError[] = []
-  const input: unknown = parse(text, errors, { allowTrailingComma: true })
-  if (errors.length || typeof input !== "object" || input === null || !("autoupdate" in input)) return
-  const value = input.autoupdate
-  if (typeof value === "boolean" || value === "notify") return value
-}
-
-export function action(current: string, latest: string, policy: Policy): Action {
-  if (policy === false) return "none"
-  if (!semver.valid(current) || !semver.valid(latest) || semver.eq(latest, current)) return "none"
-  // Major upgrades are never installed automatically.
-  if (semver.major(latest) !== semver.major(current)) return "none"
-  return "upgrade"
-}
-
-export const layer = Layer.effect(
-  Service,
-  Effect.gen(function* () {
-    const fs = yield* FileSystem.FileSystem
-    const global = yield* Global.Service
-    const appProcess = yield* AppProcess.Service
-    const channel = InstallationChannel.replace(/[^a-zA-Z0-9._-]/g, "-")
-
-    const readPolicy = Effect.fnUntraced(function* () {
-      const values = yield* Effect.forEach(["config.json", "opencode.json", "opencode.jsonc"], (name) =>
-        fs
-          .readFileString(path.join(global.config, name))
-          .pipe(Effect.map(decodePolicy), Effect.catch(() => Effect.succeed(undefined))),
-      )
-      return values.findLast((value) => value !== undefined) ?? true
-    })
-
-    const run = Effect.fnUntraced(function* (command: string[], timeout: Duration.Input = "10 seconds") {
-      return yield* appProcess
-        .run(ChildProcess.make(command[0], command.slice(1)), {
-          timeout,
-          maxOutputBytes: 100_000,
-          maxErrorBytes: 100_000,
-        })
-        .pipe(
-          Effect.map((result) => ({
-            code: result.exitCode,
-            stdout: result.stdout.toString("utf8"),
-            stderr: result.stderr.toString("utf8"),
-          })),
-          Effect.catch(() => Effect.succeed({ code: 1, stdout: "", stderr: "" })),
-        )
-    })
-
-    const method = Effect.fnUntraced(function* () {
-      const checks: ReadonlyArray<{ method: Method; command: string[] }> = [
-        { method: "npm", command: ["npm", "list", "-g", "--depth=0", packageName] },
-        { method: "pnpm", command: ["pnpm", "list", "-g", "--depth=0", packageName] },
-        { method: "bun", command: ["bun", "pm", "ls", "-g"] },
-        { method: "yarn", command: ["yarn", "global", "list"] },
-      ]
-      const results = yield* Effect.forEach(
-        checks,
-        (check) => run(check.command).pipe(Effect.map((result) => ({ check, result }))),
-        { concurrency: "unbounded" },
-      )
-      return results.find((result) => result.result.stdout.includes(packageName))?.check.method
-    })
-
-    const latest = Effect.fnUntraced(function* () {
-      const response = yield* Effect.tryPromise({
-        try: () =>
-          fetch(
-            `https://registry.npmjs.org/${encodeURIComponent(packageName)}/${encodeURIComponent(InstallationChannel)}`,
-            { headers: { "User-Agent": `opencode/${InstallationVersion}` }, signal: AbortSignal.timeout(10_000) },
-          ),
-        catch: (cause) => new Error("Failed to check for updates", { cause }),
-      })
-      if (!response.ok) return yield* Effect.fail(new Error(`Update check failed with status ${response.status}`))
-      const data = yield* Effect.tryPromise({
-        try: () => response.json(),
-        catch: (cause) => new Error("Failed to read update information", { cause }),
-      })
-      if (typeof data !== "object" || data === null || !("version" in data) || typeof data.version !== "string") {
-        return yield* Effect.fail(new Error("Update information did not include a version"))
-      }
-      return data.version
-    })
-
-    const upgrade = Effect.fnUntraced(function* (method: Method, version: string) {
-      const target = `${packageName}@${version}`
-      const commands: Record<Method, string[]> = {
-        npm: ["npm", "install", "--global", target],
-        pnpm: ["pnpm", "install", "--global", target],
-        bun: ["bun", "install", "--global", target],
-        yarn: ["yarn", "global", "add", target],
-      }
-      const result = yield* run(commands[method], "5 minutes")
-      if (result.code === 0) return
-      return yield* Effect.fail(new Error(result.stderr.trim() || `Failed to update with ${method}`))
-    })
-
-    const check = Effect.fn("cli.updater.check")(function* () {
-      if (InstallationLocal || Flag.OPENCODE_DISABLE_AUTOUPDATE)
-        return yield* Effect.logInfo("update check skipped", {
-          reason: InstallationLocal ? "local-install" : "disabled",
-          version: InstallationVersion,
-          channel: InstallationChannel,
-        })
-      const policy = yield* readPolicy()
-      if (policy === false) return yield* Effect.logInfo("update check skipped", { reason: "policy-disabled" })
-
-      return yield* Effect.gen(function* () {
-        const version = yield* latest()
-        yield* Effect.logInfo("update check", {
-          current: InstallationVersion,
-          latest: version,
-        })
-        const next = action(InstallationVersion, version, policy)
-        if (next === "none") return yield* Effect.logInfo("update check done", { action: "up-to-date" })
-        const detected = yield* method()
-        if (!detected) return yield* Effect.logWarning("automatic update skipped: installation method not found")
-        yield* upgrade(detected, version)
-        yield* Effect.logInfo("updated OpenCode", { from: InstallationVersion, to: version, method: detected })
-      })
-    }, Effect.catchCause((cause) => Effect.logWarning("automatic update failed", { cause })))
-
-    return Service.of({ check })
-  }),
-)
-
-export * as Updater from "./updater"
@@ -1,49 +1,36 @@
 import { run } from "@opencode-ai/tui"
 import { TuiConfig } from "@opencode-ai/tui/config"
 import { Effect } from "effect"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { Global } from "@opencode-ai/core/global"
-import { loadBuiltinPlugins } from "@opencode-ai/tui/builtins"
-import { OpenCode } from "@opencode-ai/client"
-import { createOpencodeClient } from "@opencode-ai/sdk/v2/client"
-import type { Args } from "@opencode-ai/tui/context/args"

-type Transport = { url: string; headers: RequestInit["headers"] }
-
-export function runTui(transport: Transport, args: Args, reload?: () => Promise<Transport>) {
+export function runTui(transport: { url: string; headers: RequestInit["headers"] }) {
  const config = TuiConfig.resolve({}, { terminalSuspend: false })
-  let disposeSlots: (() => void) | undefined
-  return Effect.gen(function* () {
-    const options = { baseUrl: transport.url, headers: transport.headers }
-    const api = OpenCode.make(options)
-    const directory = yield* Effect.tryPromise(() => api.file.list({ location: { directory: process.cwd() } })).pipe(
-      Effect.map((response) => response.location.directory),
-      Effect.catch(() =>
-        Effect.tryPromise(() => api.location.get()).pipe(Effect.map((response) => response.directory)),
-      ),
-    )
-    return yield* run({
-      client: createOpencodeClient({ ...options, directory }),
-      api,
-      reload: reload
-        ? async () => {
-            const next = await reload()
-            return {
-              client: createOpencodeClient({ baseUrl: next.url, headers: next.headers, directory }),
-              api: OpenCode.make({ baseUrl: next.url, headers: next.headers }),
-            }
-          }
-        : undefined,
-      args,
-      config,
-      pluginHost: {
-        async start(input) {
-          disposeSlots = await loadBuiltinPlugins(input.api, input.runtime)
-        },
-        async dispose() {
-          disposeSlots?.()
-        },
-      },
-    })
-  }).pipe(Effect.provide(AppNodeBuilder.build(Global.node)))
+  return run({
+    ...transport,
+    args: {},
+    config,
+    fetch: gracefulFetch,
+    pluginHost: {
+      async start() {},
+      async dispose() {},
+    },
+  }).pipe(Effect.provide(Global.defaultLayer))
 }
+
+const legacyDefaults: Record<string, unknown> = {
+  "/config/providers": { providers: [], default: {} },
+  "/provider": { all: [], default: {}, connected: [] },
+  "/agent": [],
+  "/config": {},
+}
+
+const gracefulFetch = Object.assign(
+  async (input: RequestInfo | URL, init?: RequestInit) => {
+    const response = await fetch(input, init)
+    if (response.status !== 404) return response
+    const fallback = legacyDefaults[new URL(input instanceof Request ? input.url : input).pathname]
+    if (fallback === undefined) return response
+    return Response.json(fallback)
+  },
+  { preconnect: fetch.preconnect },
+)
@@ -1,30 +0,0 @@
-import { NodeFileSystem } from "@effect/platform-node"
-import { Global } from "@opencode-ai/core/global"
-import { expect, test } from "bun:test"
-import { Effect } from "effect"
-import fs from "node:fs/promises"
-import os from "node:os"
-import path from "node:path"
-import { Daemon } from "../src/services/daemon"
-
-test("local channel stores service config with the local service filename", async () => {
-  const root = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-daemon-"))
-  try {
-    await Effect.runPromise(
-      Effect.gen(function* () {
-        const daemon = yield* Daemon.Service
-        yield* daemon.set("autostart", "false")
-      }).pipe(
-        Effect.provide(Daemon.layer),
-        Effect.provide(Global.layerWith({ config: path.join(root, "config"), state: path.join(root, "state") })),
-        Effect.provide(NodeFileSystem.layer),
-      ),
-    )
-    expect(await Bun.file(path.join(root, "config", "service-local.json")).json()).toEqual({
-      autostart: false,
-    })
-    expect(await Bun.file(path.join(root, "config", "service.json")).exists()).toBe(false)
-  } finally {
-    await fs.rm(root, { recursive: true, force: true })
-  }
-})
@@ -1,15 +0,0 @@
-import { Effect } from "effect"
-import path from "node:path"
-import { Standalone } from "../../src/services/standalone"
-
-process.argv[1] = path.join(import.meta.dir, "../../src/index.ts")
-
-await Effect.runPromise(
-  Effect.scoped(
-    Effect.gen(function* () {
-      const transport = yield* Standalone.transport()
-      console.log(`${transport.pid} ${transport.url}`)
-      return yield* Effect.never
-    }),
-  ),
-)
@@ -1,65 +0,0 @@
-import { expect, test } from "bun:test"
-import path from "node:path"
-
-test("standalone server exits when its owner is killed", async () => {
-  const owner = Bun.spawn([process.execPath, path.join(import.meta.dir, "fixture/standalone-owner.ts")], {
-    cwd: path.join(import.meta.dir, ".."),
-    env: process.env,
-    stdin: "ignore",
-    stdout: "pipe",
-    stderr: "pipe",
-  })
-  const line = await Promise.race([readLine(owner.stdout), Bun.sleep(10_000).then(() => undefined)])
-  const [rawPID, url] = line?.split(" ") ?? []
-  const pid = Number(rawPID)
-
-  try {
-    expect(pid).toBeGreaterThan(0)
-    expect(url).toStartWith("http://127.0.0.1:")
-    expect(running(pid)).toBe(true)
-
-    owner.kill("SIGKILL")
-    await owner.exited
-
-    expect(await waitForExit(pid)).toBe(true)
-  } finally {
-    owner.kill("SIGKILL")
-    if (running(pid)) process.kill(pid, "SIGKILL")
-  }
-})
-
-async function readLine(stream: ReadableStream<Uint8Array>) {
-  const reader = stream.getReader()
-  const decoder = new TextDecoder()
-  const chunks: string[] = []
-  while (true) {
-    const result = await reader.read()
-    if (result.done) break
-    chunks.push(decoder.decode(result.value, { stream: true }))
-    const output = chunks.join("")
-    const newline = output.indexOf("\n")
-    if (newline !== -1) {
-      reader.releaseLock()
-      return output.slice(0, newline)
-    }
-  }
-  reader.releaseLock()
-  return chunks.join("") + decoder.decode()
-}
-
-async function waitForExit(pid: number, attempts = 100): Promise<boolean> {
-  if (!running(pid)) return true
-  if (attempts === 0) return false
-  await Bun.sleep(50)
-  return waitForExit(pid, attempts - 1)
-}
-
-function running(pid: number) {
-  if (!Number.isSafeInteger(pid) || pid <= 0) return false
-  try {
-    process.kill(pid, 0)
-    return true
-  } catch {
-    return false
-  }
-}
@@ -1,23 +1,16 @@
 import { NodeFileSystem } from "@effect/platform-node"
-import { compile, emitEffectImported, emitEffectShape, emitPromise, write } from "@opencode-ai/httpapi-codegen"
-import {
-  ClientApi,
-  effectOmitEndpoints,
-  endpointNames,
-  groupNames,
-  promiseOmitEndpoints,
-} from "@opencode-ai/protocol/client"
+import { compile, emitEffectImported, emitPromise, write } from "@opencode-ai/httpapi-codegen"
+import { ClientApi, endpointNames, groupNames, omitEndpoints } from "../src/contract"
 import { Effect } from "effect"
 import { fileURLToPath } from "url"

-const promiseContract = compile(ClientApi, { groupNames, endpointNames, omitEndpoints: promiseOmitEndpoints })
-const effectContract = compile(ClientApi, { groupNames, endpointNames, omitEndpoints: effectOmitEndpoints })
+const contract = compile(ClientApi, { groupNames, endpointNames, omitEndpoints })

 await Effect.runPromise(
  Effect.all(
    [
      write(
-        emitPromise(promiseContract, {
+        emitPromise(contract, {
          outputTypes: {
            "events.subscribe": {
              name: "OpenCodeEventEncoded",
@@ -28,14 +21,10 @@ await Effect.runPromise(
        fileURLToPath(new URL("../src/generated", import.meta.url)),
      ),
      write(
-        emitEffectImported(effectContract, { module: "../contract", api: "ClientApi" }),
+        emitEffectImported(contract, { module: "../contract", api: "ClientApi" }),
        fileURLToPath(new URL("../src/generated-effect", import.meta.url)),
      ),
-      write(
-        emitEffectShape(effectContract, { module: "@opencode-ai/protocol/client", api: "ClientApi" }),
-        fileURLToPath(new URL("../../plugin/src/v2/effect/generated", import.meta.url)),
-      ),
    ],
-    { concurrency: 3, discard: true },
+    { concurrency: 2, discard: true },
  ).pipe(Effect.provide(NodeFileSystem.layer)),
 )
@@ -1,7 +1,53 @@
-export {
-  ClientApi,
-  effectOmitEndpoints,
-  endpointNames,
-  groupNames,
-  promiseOmitEndpoints,
-} from "@opencode-ai/protocol/client"
+import { makeDefaultApi } from "@opencode-ai/protocol/api"
+import { InvalidRequestError, SessionNotFoundError } from "@opencode-ai/protocol/errors"
+import { HttpApiMiddleware } from "effect/unstable/httpapi"
+
+class LocationMiddleware extends HttpApiMiddleware.Service<LocationMiddleware>()(
+  "@opencode-ai/client/LocationMiddleware",
+) {}
+
+class SessionLocationMiddleware extends HttpApiMiddleware.Service<SessionLocationMiddleware>()(
+  "@opencode-ai/client/SessionLocationMiddleware",
+  { error: [InvalidRequestError, SessionNotFoundError] },
+) {}
+
+export const ClientApi = makeDefaultApi({
+  locationMiddleware: LocationMiddleware,
+  sessionLocationMiddleware: SessionLocationMiddleware,
+})
+
+export const groupNames = {
+  "server.health": "health",
+  "server.location": "location",
+  "server.agent": "agents",
+  "server.session": "sessions",
+  "server.message": "messages",
+  "server.model": "models",
+  "server.provider": "providers",
+  "server.integration": "integrations",
+  "server.credential": "credentials",
+  "server.permission": "permissions",
+  "server.fs": "files",
+  "server.command": "commands",
+  "server.skill": "skills",
+  "server.event": "events",
+  "server.pty": "ptys",
+  "server.question": "questions",
+  "server.reference": "references",
+  "server.projectCopy": "projectCopies",
+} as const
+
+export const endpointNames = {
+  "session.messages": "list",
+  "integration.connect.key": "connectKey",
+  "integration.connect.oauth": "connectOauth",
+  "integration.attempt.status": "attemptStatus",
+  "integration.attempt.complete": "attemptComplete",
+  "integration.attempt.cancel": "attemptCancel",
+  "permission.request.list": "listRequests",
+  "permission.saved.list": "listSaved",
+  "permission.saved.remove": "removeSaved",
+  "question.request.list": "listRequests",
+} as const
+
+export const omitEndpoints = new Set(["fs.read", "pty.connect", "pty.connectToken"])
@@ -32,25 +32,18 @@ const Endpoint2_0 = (raw: RawClient["server.agent"]) => (input?: Endpoint2_0Inpu

 const adaptGroup2 = (raw: RawClient["server.agent"]) => ({ list: Endpoint2_0(raw) })

-type Endpoint3_0Request = Parameters<RawClient["server.plugin"]["plugin.list"]>[0]
-type Endpoint3_0Input = { readonly location?: Endpoint3_0Request["query"]["location"] }
-const Endpoint3_0 = (raw: RawClient["server.plugin"]) => (input?: Endpoint3_0Input) =>
-  raw["plugin.list"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))
-
-const adaptGroup3 = (raw: RawClient["server.plugin"]) => ({ list: Endpoint3_0(raw) })
-
-type Endpoint4_0Request = Parameters<RawClient["server.session"]["session.list"]>[0]
-type Endpoint4_0Input = {
-  readonly workspace?: Endpoint4_0Request["query"]["workspace"]
-  readonly limit?: Endpoint4_0Request["query"]["limit"]
-  readonly order?: Endpoint4_0Request["query"]["order"]
-  readonly search?: Endpoint4_0Request["query"]["search"]
-  readonly directory?: Endpoint4_0Request["query"]["directory"]
-  readonly project?: Endpoint4_0Request["query"]["project"]
-  readonly subpath?: Endpoint4_0Request["query"]["subpath"]
-  readonly cursor?: Endpoint4_0Request["query"]["cursor"]
+type Endpoint3_0Request = Parameters<RawClient["server.session"]["session.list"]>[0]
+type Endpoint3_0Input = {
+  readonly workspace?: Endpoint3_0Request["query"]["workspace"]
+  readonly limit?: Endpoint3_0Request["query"]["limit"]
+  readonly order?: Endpoint3_0Request["query"]["order"]
+  readonly search?: Endpoint3_0Request["query"]["search"]
+  readonly directory?: Endpoint3_0Request["query"]["directory"]
+  readonly project?: Endpoint3_0Request["query"]["project"]
+  readonly subpath?: Endpoint3_0Request["query"]["subpath"]
+  readonly cursor?: Endpoint3_0Request["query"]["cursor"]
 }
-const Endpoint4_0 = (raw: RawClient["server.session"]) => (input?: Endpoint4_0Input) =>
+const Endpoint3_0 = (raw: RawClient["server.session"]) => (input?: Endpoint3_0Input) =>
  raw["session.list"]({
    query: {
      workspace: input?.["workspace"],
@@ -64,14 +57,14 @@ const Endpoint4_0 = (raw: RawClient["server.session"]) => (input?: Endpoint4_0In
    },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint4_1Request = Parameters<RawClient["server.session"]["session.create"]>[0]
-type Endpoint4_1Input = {
-  readonly id?: Endpoint4_1Request["payload"]["id"]
-  readonly agent?: Endpoint4_1Request["payload"]["agent"]
-  readonly model?: Endpoint4_1Request["payload"]["model"]
-  readonly location?: Endpoint4_1Request["payload"]["location"]
+type Endpoint3_1Request = Parameters<RawClient["server.session"]["session.create"]>[0]
+type Endpoint3_1Input = {
+  readonly id?: Endpoint3_1Request["payload"]["id"]
+  readonly agent?: Endpoint3_1Request["payload"]["agent"]
+  readonly model?: Endpoint3_1Request["payload"]["model"]
+  readonly location?: Endpoint3_1Request["payload"]["location"]
 }
-const Endpoint4_1 = (raw: RawClient["server.session"]) => (input?: Endpoint4_1Input) =>
+const Endpoint3_1 = (raw: RawClient["server.session"]) => (input?: Endpoint3_1Input) =>
  raw["session.create"]({
    payload: { id: input?.["id"], agent: input?.["agent"], model: input?.["model"], location: input?.["location"] },
  }).pipe(
@@ -79,70 +72,49 @@ const Endpoint4_1 = (raw: RawClient["server.session"]) => (input?: Endpoint4_1In
    Effect.map((value) => value.data),
  )

-const Endpoint4_2 = (raw: RawClient["server.session"]) => () =>
+const Endpoint3_2 = (raw: RawClient["server.session"]) => () =>
  raw["session.active"]({}).pipe(
    Effect.mapError(mapClientError),
    Effect.map((value) => value.data),
  )

-type Endpoint4_3Request = Parameters<RawClient["server.session"]["session.get"]>[0]
-type Endpoint4_3Input = { readonly sessionID: Endpoint4_3Request["params"]["sessionID"] }
-const Endpoint4_3 = (raw: RawClient["server.session"]) => (input: Endpoint4_3Input) =>
+type Endpoint3_3Request = Parameters<RawClient["server.session"]["session.get"]>[0]
+type Endpoint3_3Input = { readonly sessionID: Endpoint3_3Request["params"]["sessionID"] }
+const Endpoint3_3 = (raw: RawClient["server.session"]) => (input: Endpoint3_3Input) =>
  raw["session.get"]({ params: { sessionID: input["sessionID"] } }).pipe(
    Effect.mapError(mapClientError),
    Effect.map((value) => value.data),
  )

-type Endpoint4_4Request = Parameters<RawClient["server.session"]["session.fork"]>[0]
-type Endpoint4_4Input = {
-  readonly sessionID: Endpoint4_4Request["params"]["sessionID"]
-  readonly messageID?: Endpoint4_4Request["payload"]["messageID"]
+type Endpoint3_4Request = Parameters<RawClient["server.session"]["session.switchAgent"]>[0]
+type Endpoint3_4Input = {
+  readonly sessionID: Endpoint3_4Request["params"]["sessionID"]
+  readonly agent: Endpoint3_4Request["payload"]["agent"]
 }
-const Endpoint4_4 = (raw: RawClient["server.session"]) => (input: Endpoint4_4Input) =>
-  raw["session.fork"]({ params: { sessionID: input["sessionID"] }, payload: { messageID: input["messageID"] } }).pipe(
-    Effect.mapError(mapClientError),
-    Effect.map((value) => value.data),
-  )
-
-type Endpoint4_5Request = Parameters<RawClient["server.session"]["session.switchAgent"]>[0]
-type Endpoint4_5Input = {
-  readonly sessionID: Endpoint4_5Request["params"]["sessionID"]
-  readonly agent: Endpoint4_5Request["payload"]["agent"]
-}
-const Endpoint4_5 = (raw: RawClient["server.session"]) => (input: Endpoint4_5Input) =>
+const Endpoint3_4 = (raw: RawClient["server.session"]) => (input: Endpoint3_4Input) =>
  raw["session.switchAgent"]({ params: { sessionID: input["sessionID"] }, payload: { agent: input["agent"] } }).pipe(
    Effect.mapError(mapClientError),
  )

-type Endpoint4_6Request = Parameters<RawClient["server.session"]["session.switchModel"]>[0]
-type Endpoint4_6Input = {
-  readonly sessionID: Endpoint4_6Request["params"]["sessionID"]
-  readonly model: Endpoint4_6Request["payload"]["model"]
+type Endpoint3_5Request = Parameters<RawClient["server.session"]["session.switchModel"]>[0]
+type Endpoint3_5Input = {
+  readonly sessionID: Endpoint3_5Request["params"]["sessionID"]
+  readonly model: Endpoint3_5Request["payload"]["model"]
 }
-const Endpoint4_6 = (raw: RawClient["server.session"]) => (input: Endpoint4_6Input) =>
+const Endpoint3_5 = (raw: RawClient["server.session"]) => (input: Endpoint3_5Input) =>
  raw["session.switchModel"]({ params: { sessionID: input["sessionID"] }, payload: { model: input["model"] } }).pipe(
    Effect.mapError(mapClientError),
  )

-type Endpoint4_7Request = Parameters<RawClient["server.session"]["session.rename"]>[0]
-type Endpoint4_7Input = {
-  readonly sessionID: Endpoint4_7Request["params"]["sessionID"]
-  readonly title: Endpoint4_7Request["payload"]["title"]
+type Endpoint3_6Request = Parameters<RawClient["server.session"]["session.prompt"]>[0]
+type Endpoint3_6Input = {
+  readonly sessionID: Endpoint3_6Request["params"]["sessionID"]
+  readonly id?: Endpoint3_6Request["payload"]["id"]
+  readonly prompt: Endpoint3_6Request["payload"]["prompt"]
+  readonly delivery?: Endpoint3_6Request["payload"]["delivery"]
+  readonly resume?: Endpoint3_6Request["payload"]["resume"]
 }
-const Endpoint4_7 = (raw: RawClient["server.session"]) => (input: Endpoint4_7Input) =>
-  raw["session.rename"]({ params: { sessionID: input["sessionID"] }, payload: { title: input["title"] } }).pipe(
-    Effect.mapError(mapClientError),
-  )
-
-type Endpoint4_8Request = Parameters<RawClient["server.session"]["session.prompt"]>[0]
-type Endpoint4_8Input = {
-  readonly sessionID: Endpoint4_8Request["params"]["sessionID"]
-  readonly id?: Endpoint4_8Request["payload"]["id"]
-  readonly prompt: Endpoint4_8Request["payload"]["prompt"]
-  readonly delivery?: Endpoint4_8Request["payload"]["delivery"]
-  readonly resume?: Endpoint4_8Request["payload"]["resume"]
-}
-const Endpoint4_8 = (raw: RawClient["server.session"]) => (input: Endpoint4_8Input) =>
+const Endpoint3_6 = (raw: RawClient["server.session"]) => (input: Endpoint3_6Input) =>
  raw["session.prompt"]({
    params: { sessionID: input["sessionID"] },
    payload: { id: input["id"], prompt: input["prompt"], delivery: input["delivery"], resume: input["resume"] },
@@ -151,36 +123,23 @@ const Endpoint4_8 = (raw: RawClient["server.session"]) => (input: Endpoint4_8Inp
    Effect.map((value) => value.data),
  )

-type Endpoint4_9Request = Parameters<RawClient["server.session"]["session.skill"]>[0]
-type Endpoint4_9Input = {
-  readonly sessionID: Endpoint4_9Request["params"]["sessionID"]
-  readonly id?: Endpoint4_9Request["payload"]["id"]
-  readonly skill: Endpoint4_9Request["payload"]["skill"]
-  readonly resume?: Endpoint4_9Request["payload"]["resume"]
-}
-const Endpoint4_9 = (raw: RawClient["server.session"]) => (input: Endpoint4_9Input) =>
-  raw["session.skill"]({
-    params: { sessionID: input["sessionID"] },
-    payload: { id: input["id"], skill: input["skill"], resume: input["resume"] },
-  }).pipe(Effect.mapError(mapClientError))
-
-type Endpoint4_10Request = Parameters<RawClient["server.session"]["session.compact"]>[0]
-type Endpoint4_10Input = { readonly sessionID: Endpoint4_10Request["params"]["sessionID"] }
-const Endpoint4_10 = (raw: RawClient["server.session"]) => (input: Endpoint4_10Input) =>
+type Endpoint3_7Request = Parameters<RawClient["server.session"]["session.compact"]>[0]
+type Endpoint3_7Input = { readonly sessionID: Endpoint3_7Request["params"]["sessionID"] }
+const Endpoint3_7 = (raw: RawClient["server.session"]) => (input: Endpoint3_7Input) =>
  raw["session.compact"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint4_11Request = Parameters<RawClient["server.session"]["session.wait"]>[0]
-type Endpoint4_11Input = { readonly sessionID: Endpoint4_11Request["params"]["sessionID"] }
-const Endpoint4_11 = (raw: RawClient["server.session"]) => (input: Endpoint4_11Input) =>
+type Endpoint3_8Request = Parameters<RawClient["server.session"]["session.wait"]>[0]
+type Endpoint3_8Input = { readonly sessionID: Endpoint3_8Request["params"]["sessionID"] }
+const Endpoint3_8 = (raw: RawClient["server.session"]) => (input: Endpoint3_8Input) =>
  raw["session.wait"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint4_12Request = Parameters<RawClient["server.session"]["session.revert.stage"]>[0]
-type Endpoint4_12Input = {
-  readonly sessionID: Endpoint4_12Request["params"]["sessionID"]
-  readonly messageID: Endpoint4_12Request["payload"]["messageID"]
-  readonly files?: Endpoint4_12Request["payload"]["files"]
+type Endpoint3_9Request = Parameters<RawClient["server.session"]["session.revert.stage"]>[0]
+type Endpoint3_9Input = {
+  readonly sessionID: Endpoint3_9Request["params"]["sessionID"]
+  readonly messageID: Endpoint3_9Request["payload"]["messageID"]
+  readonly files?: Endpoint3_9Request["payload"]["files"]
 }
-const Endpoint4_12 = (raw: RawClient["server.session"]) => (input: Endpoint4_12Input) =>
+const Endpoint3_9 = (raw: RawClient["server.session"]) => (input: Endpoint3_9Input) =>
  raw["session.revert.stage"]({
    params: { sessionID: input["sessionID"] },
    payload: { messageID: input["messageID"], files: input["files"] },
@@ -189,42 +148,42 @@ const Endpoint4_12 = (raw: RawClient["server.session"]) => (input: Endpoint4_12I
    Effect.map((value) => value.data),
  )

-type Endpoint4_13Request = Parameters<RawClient["server.session"]["session.revert.clear"]>[0]
-type Endpoint4_13Input = { readonly sessionID: Endpoint4_13Request["params"]["sessionID"] }
-const Endpoint4_13 = (raw: RawClient["server.session"]) => (input: Endpoint4_13Input) =>
+type Endpoint3_10Request = Parameters<RawClient["server.session"]["session.revert.clear"]>[0]
+type Endpoint3_10Input = { readonly sessionID: Endpoint3_10Request["params"]["sessionID"] }
+const Endpoint3_10 = (raw: RawClient["server.session"]) => (input: Endpoint3_10Input) =>
  raw["session.revert.clear"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint4_14Request = Parameters<RawClient["server.session"]["session.revert.commit"]>[0]
-type Endpoint4_14Input = { readonly sessionID: Endpoint4_14Request["params"]["sessionID"] }
-const Endpoint4_14 = (raw: RawClient["server.session"]) => (input: Endpoint4_14Input) =>
+type Endpoint3_11Request = Parameters<RawClient["server.session"]["session.revert.commit"]>[0]
+type Endpoint3_11Input = { readonly sessionID: Endpoint3_11Request["params"]["sessionID"] }
+const Endpoint3_11 = (raw: RawClient["server.session"]) => (input: Endpoint3_11Input) =>
  raw["session.revert.commit"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint4_15Request = Parameters<RawClient["server.session"]["session.context"]>[0]
-type Endpoint4_15Input = { readonly sessionID: Endpoint4_15Request["params"]["sessionID"] }
-const Endpoint4_15 = (raw: RawClient["server.session"]) => (input: Endpoint4_15Input) =>
+type Endpoint3_12Request = Parameters<RawClient["server.session"]["session.context"]>[0]
+type Endpoint3_12Input = { readonly sessionID: Endpoint3_12Request["params"]["sessionID"] }
+const Endpoint3_12 = (raw: RawClient["server.session"]) => (input: Endpoint3_12Input) =>
  raw["session.context"]({ params: { sessionID: input["sessionID"] } }).pipe(
    Effect.mapError(mapClientError),
    Effect.map((value) => value.data),
  )

-type Endpoint4_16Request = Parameters<RawClient["server.session"]["session.history"]>[0]
-type Endpoint4_16Input = {
-  readonly sessionID: Endpoint4_16Request["params"]["sessionID"]
-  readonly limit?: Endpoint4_16Request["query"]["limit"]
-  readonly after?: Endpoint4_16Request["query"]["after"]
+type Endpoint3_13Request = Parameters<RawClient["server.session"]["session.history"]>[0]
+type Endpoint3_13Input = {
+  readonly sessionID: Endpoint3_13Request["params"]["sessionID"]
+  readonly limit?: Endpoint3_13Request["query"]["limit"]
+  readonly after?: Endpoint3_13Request["query"]["after"]
 }
-const Endpoint4_16 = (raw: RawClient["server.session"]) => (input: Endpoint4_16Input) =>
+const Endpoint3_13 = (raw: RawClient["server.session"]) => (input: Endpoint3_13Input) =>
  raw["session.history"]({
    params: { sessionID: input["sessionID"] },
    query: { limit: input["limit"], after: input["after"] },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint4_17Request = Parameters<RawClient["server.session"]["session.events"]>[0]
-type Endpoint4_17Input = {
-  readonly sessionID: Endpoint4_17Request["params"]["sessionID"]
-  readonly after?: Endpoint4_17Request["query"]["after"]
+type Endpoint3_14Request = Parameters<RawClient["server.session"]["session.events"]>[0]
+type Endpoint3_14Input = {
+  readonly sessionID: Endpoint3_14Request["params"]["sessionID"]
+  readonly after?: Endpoint3_14Request["query"]["after"]
 }
-const Endpoint4_17 = (raw: RawClient["server.session"]) => (input: Endpoint4_17Input) =>
+const Endpoint3_14 = (raw: RawClient["server.session"]) => (input: Endpoint3_14Input) =>
  Stream.unwrap(
    raw["session.events"]({ params: { sessionID: input["sessionID"] }, query: { after: input["after"] } }).pipe(
      Effect.mapError(mapClientError),
@@ -232,281 +191,227 @@ const Endpoint4_17 = (raw: RawClient["server.session"]) => (input: Endpoint4_17I
    ),
  )

-type Endpoint4_18Request = Parameters<RawClient["server.session"]["session.interrupt"]>[0]
-type Endpoint4_18Input = { readonly sessionID: Endpoint4_18Request["params"]["sessionID"] }
-const Endpoint4_18 = (raw: RawClient["server.session"]) => (input: Endpoint4_18Input) =>
+type Endpoint3_15Request = Parameters<RawClient["server.session"]["session.interrupt"]>[0]
+type Endpoint3_15Input = { readonly sessionID: Endpoint3_15Request["params"]["sessionID"] }
+const Endpoint3_15 = (raw: RawClient["server.session"]) => (input: Endpoint3_15Input) =>
  raw["session.interrupt"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint4_19Request = Parameters<RawClient["server.session"]["session.background"]>[0]
-type Endpoint4_19Input = { readonly sessionID: Endpoint4_19Request["params"]["sessionID"] }
-const Endpoint4_19 = (raw: RawClient["server.session"]) => (input: Endpoint4_19Input) =>
-  raw["session.background"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))
-
-type Endpoint4_20Request = Parameters<RawClient["server.session"]["session.message"]>[0]
-type Endpoint4_20Input = {
-  readonly sessionID: Endpoint4_20Request["params"]["sessionID"]
-  readonly messageID: Endpoint4_20Request["params"]["messageID"]
+type Endpoint3_16Request = Parameters<RawClient["server.session"]["session.message"]>[0]
+type Endpoint3_16Input = {
+  readonly sessionID: Endpoint3_16Request["params"]["sessionID"]
+  readonly messageID: Endpoint3_16Request["params"]["messageID"]
 }
-const Endpoint4_20 = (raw: RawClient["server.session"]) => (input: Endpoint4_20Input) =>
+const Endpoint3_16 = (raw: RawClient["server.session"]) => (input: Endpoint3_16Input) =>
  raw["session.message"]({ params: { sessionID: input["sessionID"], messageID: input["messageID"] } }).pipe(
    Effect.mapError(mapClientError),
    Effect.map((value) => value.data),
  )

-const adaptGroup4 = (raw: RawClient["server.session"]) => ({
-  list: Endpoint4_0(raw),
-  create: Endpoint4_1(raw),
-  active: Endpoint4_2(raw),
-  get: Endpoint4_3(raw),
-  fork: Endpoint4_4(raw),
-  switchAgent: Endpoint4_5(raw),
-  switchModel: Endpoint4_6(raw),
-  rename: Endpoint4_7(raw),
-  prompt: Endpoint4_8(raw),
-  skill: Endpoint4_9(raw),
-  compact: Endpoint4_10(raw),
-  wait: Endpoint4_11(raw),
-  revertStage: Endpoint4_12(raw),
-  revertClear: Endpoint4_13(raw),
-  revertCommit: Endpoint4_14(raw),
-  context: Endpoint4_15(raw),
-  history: Endpoint4_16(raw),
-  events: Endpoint4_17(raw),
-  interrupt: Endpoint4_18(raw),
-  background: Endpoint4_19(raw),
-  message: Endpoint4_20(raw),
+const adaptGroup3 = (raw: RawClient["server.session"]) => ({
+  list: Endpoint3_0(raw),
+  create: Endpoint3_1(raw),
+  active: Endpoint3_2(raw),
+  get: Endpoint3_3(raw),
+  switchAgent: Endpoint3_4(raw),
+  switchModel: Endpoint3_5(raw),
+  prompt: Endpoint3_6(raw),
+  compact: Endpoint3_7(raw),
+  wait: Endpoint3_8(raw),
+  stage: Endpoint3_9(raw),
+  clear: Endpoint3_10(raw),
+  commit: Endpoint3_11(raw),
+  context: Endpoint3_12(raw),
+  history: Endpoint3_13(raw),
+  events: Endpoint3_14(raw),
+  interrupt: Endpoint3_15(raw),
+  message: Endpoint3_16(raw),
 })

-type Endpoint5_0Request = Parameters<RawClient["server.message"]["session.messages"]>[0]
-type Endpoint5_0Input = {
-  readonly sessionID: Endpoint5_0Request["params"]["sessionID"]
-  readonly limit?: Endpoint5_0Request["query"]["limit"]
-  readonly order?: Endpoint5_0Request["query"]["order"]
-  readonly cursor?: Endpoint5_0Request["query"]["cursor"]
+type Endpoint4_0Request = Parameters<RawClient["server.message"]["session.messages"]>[0]
+type Endpoint4_0Input = {
+  readonly sessionID: Endpoint4_0Request["params"]["sessionID"]
+  readonly limit?: Endpoint4_0Request["query"]["limit"]
+  readonly order?: Endpoint4_0Request["query"]["order"]
+  readonly cursor?: Endpoint4_0Request["query"]["cursor"]
 }
-const Endpoint5_0 = (raw: RawClient["server.message"]) => (input: Endpoint5_0Input) =>
+const Endpoint4_0 = (raw: RawClient["server.message"]) => (input: Endpoint4_0Input) =>
  raw["session.messages"]({
    params: { sessionID: input["sessionID"] },
    query: { limit: input["limit"], order: input["order"], cursor: input["cursor"] },
  }).pipe(Effect.mapError(mapClientError))

-const adaptGroup5 = (raw: RawClient["server.message"]) => ({ list: Endpoint5_0(raw) })
+const adaptGroup4 = (raw: RawClient["server.message"]) => ({ list: Endpoint4_0(raw) })

-type Endpoint6_0Request = Parameters<RawClient["server.model"]["model.list"]>[0]
-type Endpoint6_0Input = { readonly location?: Endpoint6_0Request["query"]["location"] }
-const Endpoint6_0 = (raw: RawClient["server.model"]) => (input?: Endpoint6_0Input) =>
+type Endpoint5_0Request = Parameters<RawClient["server.model"]["model.list"]>[0]
+type Endpoint5_0Input = { readonly location?: Endpoint5_0Request["query"]["location"] }
+const Endpoint5_0 = (raw: RawClient["server.model"]) => (input?: Endpoint5_0Input) =>
  raw["model.list"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))

-const adaptGroup6 = (raw: RawClient["server.model"]) => ({ list: Endpoint6_0(raw) })
+const adaptGroup5 = (raw: RawClient["server.model"]) => ({ list: Endpoint5_0(raw) })

-type Endpoint7_0Request = Parameters<RawClient["server.generate"]["generate.text"]>[0]
-type Endpoint7_0Input = {
-  readonly location?: Endpoint7_0Request["query"]["location"]
-  readonly prompt: Endpoint7_0Request["payload"]["prompt"]
-  readonly model?: Endpoint7_0Request["payload"]["model"]
-}
-const Endpoint7_0 = (raw: RawClient["server.generate"]) => (input: Endpoint7_0Input) =>
-  raw["generate.text"]({
-    query: { location: input["location"] },
-    payload: { prompt: input["prompt"], model: input["model"] },
-  }).pipe(
-    Effect.mapError(mapClientError),
-    Effect.map((value) => value.data),
-  )
-
-const adaptGroup7 = (raw: RawClient["server.generate"]) => ({ text: Endpoint7_0(raw) })
-
-type Endpoint8_0Request = Parameters<RawClient["server.provider"]["provider.list"]>[0]
-type Endpoint8_0Input = { readonly location?: Endpoint8_0Request["query"]["location"] }
-const Endpoint8_0 = (raw: RawClient["server.provider"]) => (input?: Endpoint8_0Input) =>
+type Endpoint6_0Request = Parameters<RawClient["server.provider"]["provider.list"]>[0]
+type Endpoint6_0Input = { readonly location?: Endpoint6_0Request["query"]["location"] }
+const Endpoint6_0 = (raw: RawClient["server.provider"]) => (input?: Endpoint6_0Input) =>
  raw["provider.list"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint8_1Request = Parameters<RawClient["server.provider"]["provider.get"]>[0]
-type Endpoint8_1Input = {
-  readonly providerID: Endpoint8_1Request["params"]["providerID"]
-  readonly location?: Endpoint8_1Request["query"]["location"]
+type Endpoint6_1Request = Parameters<RawClient["server.provider"]["provider.get"]>[0]
+type Endpoint6_1Input = {
+  readonly providerID: Endpoint6_1Request["params"]["providerID"]
+  readonly location?: Endpoint6_1Request["query"]["location"]
 }
-const Endpoint8_1 = (raw: RawClient["server.provider"]) => (input: Endpoint8_1Input) =>
+const Endpoint6_1 = (raw: RawClient["server.provider"]) => (input: Endpoint6_1Input) =>
  raw["provider.get"]({ params: { providerID: input["providerID"] }, query: { location: input["location"] } }).pipe(
    Effect.mapError(mapClientError),
  )

-const adaptGroup8 = (raw: RawClient["server.provider"]) => ({ list: Endpoint8_0(raw), get: Endpoint8_1(raw) })
+const adaptGroup6 = (raw: RawClient["server.provider"]) => ({ list: Endpoint6_0(raw), get: Endpoint6_1(raw) })

-type Endpoint9_0Request = Parameters<RawClient["server.integration"]["integration.list"]>[0]
-type Endpoint9_0Input = { readonly location?: Endpoint9_0Request["query"]["location"] }
-const Endpoint9_0 = (raw: RawClient["server.integration"]) => (input?: Endpoint9_0Input) =>
+type Endpoint7_0Request = Parameters<RawClient["server.integration"]["integration.list"]>[0]
+type Endpoint7_0Input = { readonly location?: Endpoint7_0Request["query"]["location"] }
+const Endpoint7_0 = (raw: RawClient["server.integration"]) => (input?: Endpoint7_0Input) =>
  raw["integration.list"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint9_1Request = Parameters<RawClient["server.integration"]["integration.get"]>[0]
-type Endpoint9_1Input = {
-  readonly integrationID: Endpoint9_1Request["params"]["integrationID"]
-  readonly location?: Endpoint9_1Request["query"]["location"]
+type Endpoint7_1Request = Parameters<RawClient["server.integration"]["integration.get"]>[0]
+type Endpoint7_1Input = {
+  readonly integrationID: Endpoint7_1Request["params"]["integrationID"]
+  readonly location?: Endpoint7_1Request["query"]["location"]
 }
-const Endpoint9_1 = (raw: RawClient["server.integration"]) => (input: Endpoint9_1Input) =>
+const Endpoint7_1 = (raw: RawClient["server.integration"]) => (input: Endpoint7_1Input) =>
  raw["integration.get"]({
    params: { integrationID: input["integrationID"] },
    query: { location: input["location"] },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint9_2Request = Parameters<RawClient["server.integration"]["integration.connect.key"]>[0]
-type Endpoint9_2Input = {
-  readonly integrationID: Endpoint9_2Request["params"]["integrationID"]
-  readonly location?: Endpoint9_2Request["query"]["location"]
-  readonly key: Endpoint9_2Request["payload"]["key"]
-  readonly label?: Endpoint9_2Request["payload"]["label"]
+type Endpoint7_2Request = Parameters<RawClient["server.integration"]["integration.connect.key"]>[0]
+type Endpoint7_2Input = {
+  readonly integrationID: Endpoint7_2Request["params"]["integrationID"]
+  readonly location?: Endpoint7_2Request["query"]["location"]
+  readonly key: Endpoint7_2Request["payload"]["key"]
+  readonly label?: Endpoint7_2Request["payload"]["label"]
 }
-const Endpoint9_2 = (raw: RawClient["server.integration"]) => (input: Endpoint9_2Input) =>
+const Endpoint7_2 = (raw: RawClient["server.integration"]) => (input: Endpoint7_2Input) =>
  raw["integration.connect.key"]({
    params: { integrationID: input["integrationID"] },
    query: { location: input["location"] },
    payload: { key: input["key"], label: input["label"] },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint9_3Request = Parameters<RawClient["server.integration"]["integration.connect.oauth"]>[0]
-type Endpoint9_3Input = {
-  readonly integrationID: Endpoint9_3Request["params"]["integrationID"]
-  readonly location?: Endpoint9_3Request["query"]["location"]
-  readonly methodID: Endpoint9_3Request["payload"]["methodID"]
-  readonly inputs: Endpoint9_3Request["payload"]["inputs"]
-  readonly label?: Endpoint9_3Request["payload"]["label"]
+type Endpoint7_3Request = Parameters<RawClient["server.integration"]["integration.connect.oauth"]>[0]
+type Endpoint7_3Input = {
+  readonly integrationID: Endpoint7_3Request["params"]["integrationID"]
+  readonly location?: Endpoint7_3Request["query"]["location"]
+  readonly methodID: Endpoint7_3Request["payload"]["methodID"]
+  readonly inputs: Endpoint7_3Request["payload"]["inputs"]
+  readonly label?: Endpoint7_3Request["payload"]["label"]
 }
-const Endpoint9_3 = (raw: RawClient["server.integration"]) => (input: Endpoint9_3Input) =>
+const Endpoint7_3 = (raw: RawClient["server.integration"]) => (input: Endpoint7_3Input) =>
  raw["integration.connect.oauth"]({
    params: { integrationID: input["integrationID"] },
    query: { location: input["location"] },
    payload: { methodID: input["methodID"], inputs: input["inputs"], label: input["label"] },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint9_4Request = Parameters<RawClient["server.integration"]["integration.attempt.status"]>[0]
-type Endpoint9_4Input = {
-  readonly attemptID: Endpoint9_4Request["params"]["attemptID"]
-  readonly location?: Endpoint9_4Request["query"]["location"]
+type Endpoint7_4Request = Parameters<RawClient["server.integration"]["integration.attempt.status"]>[0]
+type Endpoint7_4Input = {
+  readonly attemptID: Endpoint7_4Request["params"]["attemptID"]
+  readonly location?: Endpoint7_4Request["query"]["location"]
 }
-const Endpoint9_4 = (raw: RawClient["server.integration"]) => (input: Endpoint9_4Input) =>
+const Endpoint7_4 = (raw: RawClient["server.integration"]) => (input: Endpoint7_4Input) =>
  raw["integration.attempt.status"]({
    params: { attemptID: input["attemptID"] },
    query: { location: input["location"] },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint9_5Request = Parameters<RawClient["server.integration"]["integration.attempt.complete"]>[0]
-type Endpoint9_5Input = {
-  readonly attemptID: Endpoint9_5Request["params"]["attemptID"]
-  readonly location?: Endpoint9_5Request["query"]["location"]
-  readonly code?: Endpoint9_5Request["payload"]["code"]
+type Endpoint7_5Request = Parameters<RawClient["server.integration"]["integration.attempt.complete"]>[0]
+type Endpoint7_5Input = {
+  readonly attemptID: Endpoint7_5Request["params"]["attemptID"]
+  readonly location?: Endpoint7_5Request["query"]["location"]
+  readonly code?: Endpoint7_5Request["payload"]["code"]
 }
-const Endpoint9_5 = (raw: RawClient["server.integration"]) => (input: Endpoint9_5Input) =>
+const Endpoint7_5 = (raw: RawClient["server.integration"]) => (input: Endpoint7_5Input) =>
  raw["integration.attempt.complete"]({
    params: { attemptID: input["attemptID"] },
    query: { location: input["location"] },
    payload: { code: input["code"] },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint9_6Request = Parameters<RawClient["server.integration"]["integration.attempt.cancel"]>[0]
-type Endpoint9_6Input = {
-  readonly attemptID: Endpoint9_6Request["params"]["attemptID"]
-  readonly location?: Endpoint9_6Request["query"]["location"]
+type Endpoint7_6Request = Parameters<RawClient["server.integration"]["integration.attempt.cancel"]>[0]
+type Endpoint7_6Input = {
+  readonly attemptID: Endpoint7_6Request["params"]["attemptID"]
+  readonly location?: Endpoint7_6Request["query"]["location"]
 }
-const Endpoint9_6 = (raw: RawClient["server.integration"]) => (input: Endpoint9_6Input) =>
+const Endpoint7_6 = (raw: RawClient["server.integration"]) => (input: Endpoint7_6Input) =>
  raw["integration.attempt.cancel"]({
    params: { attemptID: input["attemptID"] },
    query: { location: input["location"] },
  }).pipe(Effect.mapError(mapClientError))

-const adaptGroup9 = (raw: RawClient["server.integration"]) => ({
-  list: Endpoint9_0(raw),
-  get: Endpoint9_1(raw),
-  connectKey: Endpoint9_2(raw),
-  connectOauth: Endpoint9_3(raw),
-  attemptStatus: Endpoint9_4(raw),
-  attemptComplete: Endpoint9_5(raw),
-  attemptCancel: Endpoint9_6(raw),
+const adaptGroup7 = (raw: RawClient["server.integration"]) => ({
+  list: Endpoint7_0(raw),
+  get: Endpoint7_1(raw),
+  connectKey: Endpoint7_2(raw),
+  connectOauth: Endpoint7_3(raw),
+  attemptStatus: Endpoint7_4(raw),
+  attemptComplete: Endpoint7_5(raw),
+  attemptCancel: Endpoint7_6(raw),
 })

-type Endpoint10_0Request = Parameters<RawClient["server.mcp"]["mcp.list"]>[0]
-type Endpoint10_0Input = { readonly location?: Endpoint10_0Request["query"]["location"] }
-const Endpoint10_0 = (raw: RawClient["server.mcp"]) => (input?: Endpoint10_0Input) =>
-  raw["mcp.list"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))
-
-const adaptGroup10 = (raw: RawClient["server.mcp"]) => ({ list: Endpoint10_0(raw) })
-
-type Endpoint11_0Request = Parameters<RawClient["server.credential"]["credential.update"]>[0]
-type Endpoint11_0Input = {
-  readonly credentialID: Endpoint11_0Request["params"]["credentialID"]
-  readonly location?: Endpoint11_0Request["query"]["location"]
-  readonly label: Endpoint11_0Request["payload"]["label"]
+type Endpoint8_0Request = Parameters<RawClient["server.credential"]["credential.update"]>[0]
+type Endpoint8_0Input = {
+  readonly credentialID: Endpoint8_0Request["params"]["credentialID"]
+  readonly location?: Endpoint8_0Request["query"]["location"]
+  readonly label: Endpoint8_0Request["payload"]["label"]
 }
-const Endpoint11_0 = (raw: RawClient["server.credential"]) => (input: Endpoint11_0Input) =>
+const Endpoint8_0 = (raw: RawClient["server.credential"]) => (input: Endpoint8_0Input) =>
  raw["credential.update"]({
    params: { credentialID: input["credentialID"] },
    query: { location: input["location"] },
    payload: { label: input["label"] },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint11_1Request = Parameters<RawClient["server.credential"]["credential.remove"]>[0]
-type Endpoint11_1Input = {
-  readonly credentialID: Endpoint11_1Request["params"]["credentialID"]
-  readonly location?: Endpoint11_1Request["query"]["location"]
+type Endpoint8_1Request = Parameters<RawClient["server.credential"]["credential.remove"]>[0]
+type Endpoint8_1Input = {
+  readonly credentialID: Endpoint8_1Request["params"]["credentialID"]
+  readonly location?: Endpoint8_1Request["query"]["location"]
 }
-const Endpoint11_1 = (raw: RawClient["server.credential"]) => (input: Endpoint11_1Input) =>
+const Endpoint8_1 = (raw: RawClient["server.credential"]) => (input: Endpoint8_1Input) =>
  raw["credential.remove"]({
    params: { credentialID: input["credentialID"] },
    query: { location: input["location"] },
  }).pipe(Effect.mapError(mapClientError))

-const adaptGroup11 = (raw: RawClient["server.credential"]) => ({ update: Endpoint11_0(raw), remove: Endpoint11_1(raw) })
+const adaptGroup8 = (raw: RawClient["server.credential"]) => ({ update: Endpoint8_0(raw), remove: Endpoint8_1(raw) })

-type Endpoint12_0Request = Parameters<RawClient["server.project"]["project.current"]>[0]
-type Endpoint12_0Input = { readonly location?: Endpoint12_0Request["query"]["location"] }
-const Endpoint12_0 = (raw: RawClient["server.project"]) => (input?: Endpoint12_0Input) =>
-  raw["project.current"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))
-
-type Endpoint12_1Request = Parameters<RawClient["server.project"]["project.directories"]>[0]
-type Endpoint12_1Input = {
-  readonly projectID: Endpoint12_1Request["params"]["projectID"]
-  readonly location?: Endpoint12_1Request["query"]["location"]
-}
-const Endpoint12_1 = (raw: RawClient["server.project"]) => (input: Endpoint12_1Input) =>
-  raw["project.directories"]({
-    params: { projectID: input["projectID"] },
-    query: { location: input["location"] },
-  }).pipe(Effect.mapError(mapClientError))
-
-const adaptGroup12 = (raw: RawClient["server.project"]) => ({
-  current: Endpoint12_0(raw),
-  directories: Endpoint12_1(raw),
-})
-
-type Endpoint13_0Request = Parameters<RawClient["server.permission"]["permission.request.list"]>[0]
-type Endpoint13_0Input = { readonly location?: Endpoint13_0Request["query"]["location"] }
-const Endpoint13_0 = (raw: RawClient["server.permission"]) => (input?: Endpoint13_0Input) =>
+type Endpoint9_0Request = Parameters<RawClient["server.permission"]["permission.request.list"]>[0]
+type Endpoint9_0Input = { readonly location?: Endpoint9_0Request["query"]["location"] }
+const Endpoint9_0 = (raw: RawClient["server.permission"]) => (input?: Endpoint9_0Input) =>
  raw["permission.request.list"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint13_1Request = Parameters<RawClient["server.permission"]["permission.saved.list"]>[0]
-type Endpoint13_1Input = { readonly projectID?: Endpoint13_1Request["query"]["projectID"] }
-const Endpoint13_1 = (raw: RawClient["server.permission"]) => (input?: Endpoint13_1Input) =>
+type Endpoint9_1Request = Parameters<RawClient["server.permission"]["permission.saved.list"]>[0]
+type Endpoint9_1Input = { readonly projectID?: Endpoint9_1Request["query"]["projectID"] }
+const Endpoint9_1 = (raw: RawClient["server.permission"]) => (input?: Endpoint9_1Input) =>
  raw["permission.saved.list"]({ query: { projectID: input?.["projectID"] } }).pipe(
    Effect.mapError(mapClientError),
    Effect.map((value) => value.data),
  )

-type Endpoint13_2Request = Parameters<RawClient["server.permission"]["permission.saved.remove"]>[0]
-type Endpoint13_2Input = { readonly id: Endpoint13_2Request["params"]["id"] }
-const Endpoint13_2 = (raw: RawClient["server.permission"]) => (input: Endpoint13_2Input) =>
+type Endpoint9_2Request = Parameters<RawClient["server.permission"]["permission.saved.remove"]>[0]
+type Endpoint9_2Input = { readonly id: Endpoint9_2Request["params"]["id"] }
+const Endpoint9_2 = (raw: RawClient["server.permission"]) => (input: Endpoint9_2Input) =>
  raw["permission.saved.remove"]({ params: { id: input["id"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint13_3Request = Parameters<RawClient["server.permission"]["session.permission.create"]>[0]
-type Endpoint13_3Input = {
-  readonly sessionID: Endpoint13_3Request["params"]["sessionID"]
-  readonly id?: Endpoint13_3Request["payload"]["id"]
-  readonly action: Endpoint13_3Request["payload"]["action"]
-  readonly resources: Endpoint13_3Request["payload"]["resources"]
-  readonly save?: Endpoint13_3Request["payload"]["save"]
-  readonly metadata?: Endpoint13_3Request["payload"]["metadata"]
-  readonly source?: Endpoint13_3Request["payload"]["source"]
-  readonly agent?: Endpoint13_3Request["payload"]["agent"]
+type Endpoint9_3Request = Parameters<RawClient["server.permission"]["session.permission.create"]>[0]
+type Endpoint9_3Input = {
+  readonly sessionID: Endpoint9_3Request["params"]["sessionID"]
+  readonly id?: Endpoint9_3Request["payload"]["id"]
+  readonly action: Endpoint9_3Request["payload"]["action"]
+  readonly resources: Endpoint9_3Request["payload"]["resources"]
+  readonly save?: Endpoint9_3Request["payload"]["save"]
+  readonly metadata?: Endpoint9_3Request["payload"]["metadata"]
+  readonly source?: Endpoint9_3Request["payload"]["source"]
+  readonly agent?: Endpoint9_3Request["payload"]["agent"]
 }
-const Endpoint13_3 = (raw: RawClient["server.permission"]) => (input: Endpoint13_3Input) =>
+const Endpoint9_3 = (raw: RawClient["server.permission"]) => (input: Endpoint9_3Input) =>
  raw["session.permission.create"]({
    params: { sessionID: input["sessionID"] },
    payload: {
@@ -523,87 +428,87 @@ const Endpoint13_3 = (raw: RawClient["server.permission"]) => (input: Endpoint13
    Effect.map((value) => value.data),
  )

-type Endpoint13_4Request = Parameters<RawClient["server.permission"]["session.permission.list"]>[0]
-type Endpoint13_4Input = { readonly sessionID: Endpoint13_4Request["params"]["sessionID"] }
-const Endpoint13_4 = (raw: RawClient["server.permission"]) => (input: Endpoint13_4Input) =>
+type Endpoint9_4Request = Parameters<RawClient["server.permission"]["session.permission.list"]>[0]
+type Endpoint9_4Input = { readonly sessionID: Endpoint9_4Request["params"]["sessionID"] }
+const Endpoint9_4 = (raw: RawClient["server.permission"]) => (input: Endpoint9_4Input) =>
  raw["session.permission.list"]({ params: { sessionID: input["sessionID"] } }).pipe(
    Effect.mapError(mapClientError),
    Effect.map((value) => value.data),
  )

-type Endpoint13_5Request = Parameters<RawClient["server.permission"]["session.permission.get"]>[0]
-type Endpoint13_5Input = {
-  readonly sessionID: Endpoint13_5Request["params"]["sessionID"]
-  readonly requestID: Endpoint13_5Request["params"]["requestID"]
+type Endpoint9_5Request = Parameters<RawClient["server.permission"]["session.permission.get"]>[0]
+type Endpoint9_5Input = {
+  readonly sessionID: Endpoint9_5Request["params"]["sessionID"]
+  readonly requestID: Endpoint9_5Request["params"]["requestID"]
 }
-const Endpoint13_5 = (raw: RawClient["server.permission"]) => (input: Endpoint13_5Input) =>
+const Endpoint9_5 = (raw: RawClient["server.permission"]) => (input: Endpoint9_5Input) =>
  raw["session.permission.get"]({ params: { sessionID: input["sessionID"], requestID: input["requestID"] } }).pipe(
    Effect.mapError(mapClientError),
    Effect.map((value) => value.data),
  )

-type Endpoint13_6Request = Parameters<RawClient["server.permission"]["session.permission.reply"]>[0]
-type Endpoint13_6Input = {
-  readonly sessionID: Endpoint13_6Request["params"]["sessionID"]
-  readonly requestID: Endpoint13_6Request["params"]["requestID"]
-  readonly reply: Endpoint13_6Request["payload"]["reply"]
-  readonly message?: Endpoint13_6Request["payload"]["message"]
+type Endpoint9_6Request = Parameters<RawClient["server.permission"]["session.permission.reply"]>[0]
+type Endpoint9_6Input = {
+  readonly sessionID: Endpoint9_6Request["params"]["sessionID"]
+  readonly requestID: Endpoint9_6Request["params"]["requestID"]
+  readonly reply: Endpoint9_6Request["payload"]["reply"]
+  readonly message?: Endpoint9_6Request["payload"]["message"]
 }
-const Endpoint13_6 = (raw: RawClient["server.permission"]) => (input: Endpoint13_6Input) =>
+const Endpoint9_6 = (raw: RawClient["server.permission"]) => (input: Endpoint9_6Input) =>
  raw["session.permission.reply"]({
    params: { sessionID: input["sessionID"], requestID: input["requestID"] },
    payload: { reply: input["reply"], message: input["message"] },
  }).pipe(Effect.mapError(mapClientError))

-const adaptGroup13 = (raw: RawClient["server.permission"]) => ({
-  listRequests: Endpoint13_0(raw),
-  listSaved: Endpoint13_1(raw),
-  removeSaved: Endpoint13_2(raw),
-  create: Endpoint13_3(raw),
-  list: Endpoint13_4(raw),
-  get: Endpoint13_5(raw),
-  reply: Endpoint13_6(raw),
+const adaptGroup9 = (raw: RawClient["server.permission"]) => ({
+  listRequests: Endpoint9_0(raw),
+  listSaved: Endpoint9_1(raw),
+  removeSaved: Endpoint9_2(raw),
+  create: Endpoint9_3(raw),
+  list: Endpoint9_4(raw),
+  get: Endpoint9_5(raw),
+  reply: Endpoint9_6(raw),
 })

-type Endpoint14_0Request = Parameters<RawClient["server.fs"]["fs.list"]>[0]
-type Endpoint14_0Input = {
-  readonly location?: Endpoint14_0Request["query"]["location"]
-  readonly path?: Endpoint14_0Request["query"]["path"]
+type Endpoint10_0Request = Parameters<RawClient["server.fs"]["fs.list"]>[0]
+type Endpoint10_0Input = {
+  readonly location?: Endpoint10_0Request["query"]["location"]
+  readonly path?: Endpoint10_0Request["query"]["path"]
 }
-const Endpoint14_0 = (raw: RawClient["server.fs"]) => (input?: Endpoint14_0Input) =>
+const Endpoint10_0 = (raw: RawClient["server.fs"]) => (input?: Endpoint10_0Input) =>
  raw["fs.list"]({ query: { location: input?.["location"], path: input?.["path"] } }).pipe(
    Effect.mapError(mapClientError),
  )

-type Endpoint14_1Request = Parameters<RawClient["server.fs"]["fs.find"]>[0]
-type Endpoint14_1Input = {
-  readonly location?: Endpoint14_1Request["query"]["location"]
-  readonly query: Endpoint14_1Request["query"]["query"]
-  readonly type?: Endpoint14_1Request["query"]["type"]
-  readonly limit?: Endpoint14_1Request["query"]["limit"]
+type Endpoint10_1Request = Parameters<RawClient["server.fs"]["fs.find"]>[0]
+type Endpoint10_1Input = {
+  readonly location?: Endpoint10_1Request["query"]["location"]
+  readonly query: Endpoint10_1Request["query"]["query"]
+  readonly type?: Endpoint10_1Request["query"]["type"]
+  readonly limit?: Endpoint10_1Request["query"]["limit"]
 }
-const Endpoint14_1 = (raw: RawClient["server.fs"]) => (input: Endpoint14_1Input) =>
+const Endpoint10_1 = (raw: RawClient["server.fs"]) => (input: Endpoint10_1Input) =>
  raw["fs.find"]({
    query: { location: input["location"], query: input["query"], type: input["type"], limit: input["limit"] },
  }).pipe(Effect.mapError(mapClientError))

-const adaptGroup14 = (raw: RawClient["server.fs"]) => ({ list: Endpoint14_0(raw), find: Endpoint14_1(raw) })
+const adaptGroup10 = (raw: RawClient["server.fs"]) => ({ list: Endpoint10_0(raw), find: Endpoint10_1(raw) })

-type Endpoint15_0Request = Parameters<RawClient["server.command"]["command.list"]>[0]
-type Endpoint15_0Input = { readonly location?: Endpoint15_0Request["query"]["location"] }
-const Endpoint15_0 = (raw: RawClient["server.command"]) => (input?: Endpoint15_0Input) =>
+type Endpoint11_0Request = Parameters<RawClient["server.command"]["command.list"]>[0]
+type Endpoint11_0Input = { readonly location?: Endpoint11_0Request["query"]["location"] }
+const Endpoint11_0 = (raw: RawClient["server.command"]) => (input?: Endpoint11_0Input) =>
  raw["command.list"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))

-const adaptGroup15 = (raw: RawClient["server.command"]) => ({ list: Endpoint15_0(raw) })
+const adaptGroup11 = (raw: RawClient["server.command"]) => ({ list: Endpoint11_0(raw) })

-type Endpoint16_0Request = Parameters<RawClient["server.skill"]["skill.list"]>[0]
-type Endpoint16_0Input = { readonly location?: Endpoint16_0Request["query"]["location"] }
-const Endpoint16_0 = (raw: RawClient["server.skill"]) => (input?: Endpoint16_0Input) =>
+type Endpoint12_0Request = Parameters<RawClient["server.skill"]["skill.list"]>[0]
+type Endpoint12_0Input = { readonly location?: Endpoint12_0Request["query"]["location"] }
+const Endpoint12_0 = (raw: RawClient["server.skill"]) => (input?: Endpoint12_0Input) =>
  raw["skill.list"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))

-const adaptGroup16 = (raw: RawClient["server.skill"]) => ({ list: Endpoint16_0(raw) })
+const adaptGroup12 = (raw: RawClient["server.skill"]) => ({ list: Endpoint12_0(raw) })

-const Endpoint17_0 = (raw: RawClient["server.event"]) => () =>
+const Endpoint13_0 = (raw: RawClient["server.event"]) => () =>
  Stream.unwrap(
    raw["event.subscribe"]({}).pipe(
      Effect.mapError(mapClientError),
@@ -611,23 +516,23 @@ const Endpoint17_0 = (raw: RawClient["server.event"]) => () =>
    ),
  )

-const adaptGroup17 = (raw: RawClient["server.event"]) => ({ subscribe: Endpoint17_0(raw) })
+const adaptGroup13 = (raw: RawClient["server.event"]) => ({ subscribe: Endpoint13_0(raw) })

-type Endpoint18_0Request = Parameters<RawClient["server.pty"]["pty.list"]>[0]
-type Endpoint18_0Input = { readonly location?: Endpoint18_0Request["query"]["location"] }
-const Endpoint18_0 = (raw: RawClient["server.pty"]) => (input?: Endpoint18_0Input) =>
+type Endpoint14_0Request = Parameters<RawClient["server.pty"]["pty.list"]>[0]
+type Endpoint14_0Input = { readonly location?: Endpoint14_0Request["query"]["location"] }
+const Endpoint14_0 = (raw: RawClient["server.pty"]) => (input?: Endpoint14_0Input) =>
  raw["pty.list"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint18_1Request = Parameters<RawClient["server.pty"]["pty.create"]>[0]
-type Endpoint18_1Input = {
-  readonly location?: Endpoint18_1Request["query"]["location"]
-  readonly command?: Endpoint18_1Request["payload"]["command"]
-  readonly args?: Endpoint18_1Request["payload"]["args"]
-  readonly cwd?: Endpoint18_1Request["payload"]["cwd"]
-  readonly title?: Endpoint18_1Request["payload"]["title"]
-  readonly env?: Endpoint18_1Request["payload"]["env"]
+type Endpoint14_1Request = Parameters<RawClient["server.pty"]["pty.create"]>[0]
+type Endpoint14_1Input = {
+  readonly location?: Endpoint14_1Request["query"]["location"]
+  readonly command?: Endpoint14_1Request["payload"]["command"]
+  readonly args?: Endpoint14_1Request["payload"]["args"]
+  readonly cwd?: Endpoint14_1Request["payload"]["cwd"]
+  readonly title?: Endpoint14_1Request["payload"]["title"]
+  readonly env?: Endpoint14_1Request["payload"]["env"]
 }
-const Endpoint18_1 = (raw: RawClient["server.pty"]) => (input?: Endpoint18_1Input) =>
+const Endpoint14_1 = (raw: RawClient["server.pty"]) => (input?: Endpoint14_1Input) =>
  raw["pty.create"]({
    query: { location: input?.["location"] },
    payload: {
@@ -639,227 +544,162 @@ const Endpoint18_1 = (raw: RawClient["server.pty"]) => (input?: Endpoint18_1Inpu
    },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint18_2Request = Parameters<RawClient["server.pty"]["pty.get"]>[0]
-type Endpoint18_2Input = {
-  readonly ptyID: Endpoint18_2Request["params"]["ptyID"]
-  readonly location?: Endpoint18_2Request["query"]["location"]
+type Endpoint14_2Request = Parameters<RawClient["server.pty"]["pty.get"]>[0]
+type Endpoint14_2Input = {
+  readonly ptyID: Endpoint14_2Request["params"]["ptyID"]
+  readonly location?: Endpoint14_2Request["query"]["location"]
 }
-const Endpoint18_2 = (raw: RawClient["server.pty"]) => (input: Endpoint18_2Input) =>
+const Endpoint14_2 = (raw: RawClient["server.pty"]) => (input: Endpoint14_2Input) =>
  raw["pty.get"]({ params: { ptyID: input["ptyID"] }, query: { location: input["location"] } }).pipe(
    Effect.mapError(mapClientError),
  )

-type Endpoint18_3Request = Parameters<RawClient["server.pty"]["pty.update"]>[0]
-type Endpoint18_3Input = {
-  readonly ptyID: Endpoint18_3Request["params"]["ptyID"]
-  readonly location?: Endpoint18_3Request["query"]["location"]
-  readonly title?: Endpoint18_3Request["payload"]["title"]
-  readonly size?: Endpoint18_3Request["payload"]["size"]
+type Endpoint14_3Request = Parameters<RawClient["server.pty"]["pty.update"]>[0]
+type Endpoint14_3Input = {
+  readonly ptyID: Endpoint14_3Request["params"]["ptyID"]
+  readonly location?: Endpoint14_3Request["query"]["location"]
+  readonly title?: Endpoint14_3Request["payload"]["title"]
+  readonly size?: Endpoint14_3Request["payload"]["size"]
 }
-const Endpoint18_3 = (raw: RawClient["server.pty"]) => (input: Endpoint18_3Input) =>
+const Endpoint14_3 = (raw: RawClient["server.pty"]) => (input: Endpoint14_3Input) =>
  raw["pty.update"]({
    params: { ptyID: input["ptyID"] },
    query: { location: input["location"] },
    payload: { title: input["title"], size: input["size"] },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint18_4Request = Parameters<RawClient["server.pty"]["pty.remove"]>[0]
-type Endpoint18_4Input = {
-  readonly ptyID: Endpoint18_4Request["params"]["ptyID"]
-  readonly location?: Endpoint18_4Request["query"]["location"]
+type Endpoint14_4Request = Parameters<RawClient["server.pty"]["pty.remove"]>[0]
+type Endpoint14_4Input = {
+  readonly ptyID: Endpoint14_4Request["params"]["ptyID"]
+  readonly location?: Endpoint14_4Request["query"]["location"]
 }
-const Endpoint18_4 = (raw: RawClient["server.pty"]) => (input: Endpoint18_4Input) =>
+const Endpoint14_4 = (raw: RawClient["server.pty"]) => (input: Endpoint14_4Input) =>
  raw["pty.remove"]({ params: { ptyID: input["ptyID"] }, query: { location: input["location"] } }).pipe(
    Effect.mapError(mapClientError),
  )

-const adaptGroup18 = (raw: RawClient["server.pty"]) => ({
-  list: Endpoint18_0(raw),
-  create: Endpoint18_1(raw),
-  get: Endpoint18_2(raw),
-  update: Endpoint18_3(raw),
-  remove: Endpoint18_4(raw),
+const adaptGroup14 = (raw: RawClient["server.pty"]) => ({
+  list: Endpoint14_0(raw),
+  create: Endpoint14_1(raw),
+  get: Endpoint14_2(raw),
+  update: Endpoint14_3(raw),
+  remove: Endpoint14_4(raw),
 })

-type Endpoint19_0Request = Parameters<RawClient["server.shell"]["shell.list"]>[0]
-type Endpoint19_0Input = { readonly location?: Endpoint19_0Request["query"]["location"] }
-const Endpoint19_0 = (raw: RawClient["server.shell"]) => (input?: Endpoint19_0Input) =>
-  raw["shell.list"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))
-
-type Endpoint19_1Request = Parameters<RawClient["server.shell"]["shell.create"]>[0]
-type Endpoint19_1Input = {
-  readonly location?: Endpoint19_1Request["query"]["location"]
-  readonly command: Endpoint19_1Request["payload"]["command"]
-  readonly cwd?: Endpoint19_1Request["payload"]["cwd"]
-  readonly timeout?: Endpoint19_1Request["payload"]["timeout"]
-  readonly metadata?: Endpoint19_1Request["payload"]["metadata"]
-}
-const Endpoint19_1 = (raw: RawClient["server.shell"]) => (input: Endpoint19_1Input) =>
-  raw["shell.create"]({
-    query: { location: input["location"] },
-    payload: { command: input["command"], cwd: input["cwd"], timeout: input["timeout"], metadata: input["metadata"] },
-  }).pipe(Effect.mapError(mapClientError))
-
-type Endpoint19_2Request = Parameters<RawClient["server.shell"]["shell.get"]>[0]
-type Endpoint19_2Input = {
-  readonly id: Endpoint19_2Request["params"]["id"]
-  readonly location?: Endpoint19_2Request["query"]["location"]
-}
-const Endpoint19_2 = (raw: RawClient["server.shell"]) => (input: Endpoint19_2Input) =>
-  raw["shell.get"]({ params: { id: input["id"] }, query: { location: input["location"] } }).pipe(
-    Effect.mapError(mapClientError),
-  )
-
-type Endpoint19_3Request = Parameters<RawClient["server.shell"]["shell.output"]>[0]
-type Endpoint19_3Input = {
-  readonly id: Endpoint19_3Request["params"]["id"]
-  readonly location?: Endpoint19_3Request["query"]["location"]
-  readonly cursor?: Endpoint19_3Request["query"]["cursor"]
-  readonly limit?: Endpoint19_3Request["query"]["limit"]
-}
-const Endpoint19_3 = (raw: RawClient["server.shell"]) => (input: Endpoint19_3Input) =>
-  raw["shell.output"]({
-    params: { id: input["id"] },
-    query: { location: input["location"], cursor: input["cursor"], limit: input["limit"] },
-  }).pipe(Effect.mapError(mapClientError))
-
-type Endpoint19_4Request = Parameters<RawClient["server.shell"]["shell.remove"]>[0]
-type Endpoint19_4Input = {
-  readonly id: Endpoint19_4Request["params"]["id"]
-  readonly location?: Endpoint19_4Request["query"]["location"]
-}
-const Endpoint19_4 = (raw: RawClient["server.shell"]) => (input: Endpoint19_4Input) =>
-  raw["shell.remove"]({ params: { id: input["id"] }, query: { location: input["location"] } }).pipe(
-    Effect.mapError(mapClientError),
-  )
-
-const adaptGroup19 = (raw: RawClient["server.shell"]) => ({
-  list: Endpoint19_0(raw),
-  create: Endpoint19_1(raw),
-  get: Endpoint19_2(raw),
-  output: Endpoint19_3(raw),
-  remove: Endpoint19_4(raw),
-})
-
-type Endpoint20_0Request = Parameters<RawClient["server.question"]["question.request.list"]>[0]
-type Endpoint20_0Input = { readonly location?: Endpoint20_0Request["query"]["location"] }
-const Endpoint20_0 = (raw: RawClient["server.question"]) => (input?: Endpoint20_0Input) =>
+type Endpoint15_0Request = Parameters<RawClient["server.question"]["question.request.list"]>[0]
+type Endpoint15_0Input = { readonly location?: Endpoint15_0Request["query"]["location"] }
+const Endpoint15_0 = (raw: RawClient["server.question"]) => (input?: Endpoint15_0Input) =>
  raw["question.request.list"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint20_1Request = Parameters<RawClient["server.question"]["session.question.list"]>[0]
-type Endpoint20_1Input = { readonly sessionID: Endpoint20_1Request["params"]["sessionID"] }
-const Endpoint20_1 = (raw: RawClient["server.question"]) => (input: Endpoint20_1Input) =>
+type Endpoint15_1Request = Parameters<RawClient["server.question"]["session.question.list"]>[0]
+type Endpoint15_1Input = { readonly sessionID: Endpoint15_1Request["params"]["sessionID"] }
+const Endpoint15_1 = (raw: RawClient["server.question"]) => (input: Endpoint15_1Input) =>
  raw["session.question.list"]({ params: { sessionID: input["sessionID"] } }).pipe(
    Effect.mapError(mapClientError),
    Effect.map((value) => value.data),
  )

-type Endpoint20_2Request = Parameters<RawClient["server.question"]["session.question.reply"]>[0]
-type Endpoint20_2Input = {
-  readonly sessionID: Endpoint20_2Request["params"]["sessionID"]
-  readonly requestID: Endpoint20_2Request["params"]["requestID"]
-  readonly answers: Endpoint20_2Request["payload"]["answers"]
+type Endpoint15_2Request = Parameters<RawClient["server.question"]["session.question.reply"]>[0]
+type Endpoint15_2Input = {
+  readonly sessionID: Endpoint15_2Request["params"]["sessionID"]
+  readonly requestID: Endpoint15_2Request["params"]["requestID"]
+  readonly answers: Endpoint15_2Request["payload"]["answers"]
 }
-const Endpoint20_2 = (raw: RawClient["server.question"]) => (input: Endpoint20_2Input) =>
+const Endpoint15_2 = (raw: RawClient["server.question"]) => (input: Endpoint15_2Input) =>
  raw["session.question.reply"]({
    params: { sessionID: input["sessionID"], requestID: input["requestID"] },
    payload: { answers: input["answers"] },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint20_3Request = Parameters<RawClient["server.question"]["session.question.reject"]>[0]
-type Endpoint20_3Input = {
-  readonly sessionID: Endpoint20_3Request["params"]["sessionID"]
-  readonly requestID: Endpoint20_3Request["params"]["requestID"]
+type Endpoint15_3Request = Parameters<RawClient["server.question"]["session.question.reject"]>[0]
+type Endpoint15_3Input = {
+  readonly sessionID: Endpoint15_3Request["params"]["sessionID"]
+  readonly requestID: Endpoint15_3Request["params"]["requestID"]
 }
-const Endpoint20_3 = (raw: RawClient["server.question"]) => (input: Endpoint20_3Input) =>
+const Endpoint15_3 = (raw: RawClient["server.question"]) => (input: Endpoint15_3Input) =>
  raw["session.question.reject"]({ params: { sessionID: input["sessionID"], requestID: input["requestID"] } }).pipe(
    Effect.mapError(mapClientError),
  )

-const adaptGroup20 = (raw: RawClient["server.question"]) => ({
-  listRequests: Endpoint20_0(raw),
-  list: Endpoint20_1(raw),
-  reply: Endpoint20_2(raw),
-  reject: Endpoint20_3(raw),
+const adaptGroup15 = (raw: RawClient["server.question"]) => ({
+  listRequests: Endpoint15_0(raw),
+  list: Endpoint15_1(raw),
+  reply: Endpoint15_2(raw),
+  reject: Endpoint15_3(raw),
 })

-type Endpoint21_0Request = Parameters<RawClient["server.reference"]["reference.list"]>[0]
-type Endpoint21_0Input = { readonly location?: Endpoint21_0Request["query"]["location"] }
-const Endpoint21_0 = (raw: RawClient["server.reference"]) => (input?: Endpoint21_0Input) =>
+type Endpoint16_0Request = Parameters<RawClient["server.reference"]["reference.list"]>[0]
+type Endpoint16_0Input = { readonly location?: Endpoint16_0Request["query"]["location"] }
+const Endpoint16_0 = (raw: RawClient["server.reference"]) => (input?: Endpoint16_0Input) =>
  raw["reference.list"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))

-const adaptGroup21 = (raw: RawClient["server.reference"]) => ({ list: Endpoint21_0(raw) })
+const adaptGroup16 = (raw: RawClient["server.reference"]) => ({ list: Endpoint16_0(raw) })

-type Endpoint22_0Request = Parameters<RawClient["server.projectCopy"]["projectCopy.create"]>[0]
-type Endpoint22_0Input = {
-  readonly projectID: Endpoint22_0Request["params"]["projectID"]
-  readonly location?: Endpoint22_0Request["query"]["location"]
-  readonly strategy: Endpoint22_0Request["payload"]["strategy"]
-  readonly directory: Endpoint22_0Request["payload"]["directory"]
-  readonly name?: Endpoint22_0Request["payload"]["name"]
+type Endpoint17_0Request = Parameters<RawClient["server.projectCopy"]["projectCopy.create"]>[0]
+type Endpoint17_0Input = {
+  readonly projectID: Endpoint17_0Request["params"]["projectID"]
+  readonly location?: Endpoint17_0Request["query"]["location"]
+  readonly strategy: Endpoint17_0Request["payload"]["strategy"]
+  readonly directory: Endpoint17_0Request["payload"]["directory"]
+  readonly name?: Endpoint17_0Request["payload"]["name"]
 }
-const Endpoint22_0 = (raw: RawClient["server.projectCopy"]) => (input: Endpoint22_0Input) =>
+const Endpoint17_0 = (raw: RawClient["server.projectCopy"]) => (input: Endpoint17_0Input) =>
  raw["projectCopy.create"]({
    params: { projectID: input["projectID"] },
    query: { location: input["location"] },
    payload: { strategy: input["strategy"], directory: input["directory"], name: input["name"] },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint22_1Request = Parameters<RawClient["server.projectCopy"]["projectCopy.remove"]>[0]
-type Endpoint22_1Input = {
-  readonly projectID: Endpoint22_1Request["params"]["projectID"]
-  readonly location?: Endpoint22_1Request["query"]["location"]
-  readonly directory: Endpoint22_1Request["payload"]["directory"]
-  readonly force: Endpoint22_1Request["payload"]["force"]
+type Endpoint17_1Request = Parameters<RawClient["server.projectCopy"]["projectCopy.remove"]>[0]
+type Endpoint17_1Input = {
+  readonly projectID: Endpoint17_1Request["params"]["projectID"]
+  readonly location?: Endpoint17_1Request["query"]["location"]
+  readonly directory: Endpoint17_1Request["payload"]["directory"]
+  readonly force: Endpoint17_1Request["payload"]["force"]
 }
-const Endpoint22_1 = (raw: RawClient["server.projectCopy"]) => (input: Endpoint22_1Input) =>
+const Endpoint17_1 = (raw: RawClient["server.projectCopy"]) => (input: Endpoint17_1Input) =>
  raw["projectCopy.remove"]({
    params: { projectID: input["projectID"] },
    query: { location: input["location"] },
    payload: { directory: input["directory"], force: input["force"] },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint22_2Request = Parameters<RawClient["server.projectCopy"]["projectCopy.refresh"]>[0]
-type Endpoint22_2Input = {
-  readonly projectID: Endpoint22_2Request["params"]["projectID"]
-  readonly location?: Endpoint22_2Request["query"]["location"]
+type Endpoint17_2Request = Parameters<RawClient["server.projectCopy"]["projectCopy.refresh"]>[0]
+type Endpoint17_2Input = {
+  readonly projectID: Endpoint17_2Request["params"]["projectID"]
+  readonly location?: Endpoint17_2Request["query"]["location"]
 }
-const Endpoint22_2 = (raw: RawClient["server.projectCopy"]) => (input: Endpoint22_2Input) =>
+const Endpoint17_2 = (raw: RawClient["server.projectCopy"]) => (input: Endpoint17_2Input) =>
  raw["projectCopy.refresh"]({
    params: { projectID: input["projectID"] },
    query: { location: input["location"] },
  }).pipe(Effect.mapError(mapClientError))

-const adaptGroup22 = (raw: RawClient["server.projectCopy"]) => ({
-  create: Endpoint22_0(raw),
-  remove: Endpoint22_1(raw),
-  refresh: Endpoint22_2(raw),
+const adaptGroup17 = (raw: RawClient["server.projectCopy"]) => ({
+  create: Endpoint17_0(raw),
+  remove: Endpoint17_1(raw),
+  refresh: Endpoint17_2(raw),
 })

 const adaptClient = (raw: RawClient) => ({
  health: adaptGroup0(raw["server.health"]),
  location: adaptGroup1(raw["server.location"]),
-  agent: adaptGroup2(raw["server.agent"]),
-  plugin: adaptGroup3(raw["server.plugin"]),
-  session: adaptGroup4(raw["server.session"]),
-  message: adaptGroup5(raw["server.message"]),
-  model: adaptGroup6(raw["server.model"]),
-  generate: adaptGroup7(raw["server.generate"]),
-  provider: adaptGroup8(raw["server.provider"]),
-  integration: adaptGroup9(raw["server.integration"]),
-  "server.mcp": adaptGroup10(raw["server.mcp"]),
-  credential: adaptGroup11(raw["server.credential"]),
-  project: adaptGroup12(raw["server.project"]),
-  permission: adaptGroup13(raw["server.permission"]),
-  file: adaptGroup14(raw["server.fs"]),
-  command: adaptGroup15(raw["server.command"]),
-  skill: adaptGroup16(raw["server.skill"]),
-  event: adaptGroup17(raw["server.event"]),
-  pty: adaptGroup18(raw["server.pty"]),
-  shell: adaptGroup19(raw["server.shell"]),
-  question: adaptGroup20(raw["server.question"]),
-  reference: adaptGroup21(raw["server.reference"]),
-  projectCopy: adaptGroup22(raw["server.projectCopy"]),
+  agents: adaptGroup2(raw["server.agent"]),
+  sessions: adaptGroup3(raw["server.session"]),
+  messages: adaptGroup4(raw["server.message"]),
+  models: adaptGroup5(raw["server.model"]),
+  providers: adaptGroup6(raw["server.provider"]),
+  integrations: adaptGroup7(raw["server.integration"]),
+  credentials: adaptGroup8(raw["server.credential"]),
+  permissions: adaptGroup9(raw["server.permission"]),
+  files: adaptGroup10(raw["server.fs"]),
+  commands: adaptGroup11(raw["server.command"]),
+  skills: adaptGroup12(raw["server.skill"]),
+  events: adaptGroup13(raw["server.event"]),
+  ptys: adaptGroup14(raw["server.pty"]),
+  questions: adaptGroup15(raw["server.question"]),
+  references: adaptGroup16(raw["server.reference"]),
+  projectCopies: adaptGroup17(raw["server.projectCopy"]),
 })

 export const make = (options?: { readonly baseUrl?: URL | string }) =>
@@ -2,146 +2,116 @@ import type {
  HealthGetOutput,
  LocationGetInput,
  LocationGetOutput,
-  AgentListInput,
-  AgentListOutput,
-  PluginListInput,
-  PluginListOutput,
-  SessionListInput,
-  SessionListOutput,
-  SessionCreateInput,
-  SessionCreateOutput,
-  SessionActiveOutput,
-  SessionGetInput,
-  SessionGetOutput,
-  SessionForkInput,
-  SessionForkOutput,
-  SessionSwitchAgentInput,
-  SessionSwitchAgentOutput,
-  SessionSwitchModelInput,
-  SessionSwitchModelOutput,
-  SessionRenameInput,
-  SessionRenameOutput,
-  SessionPromptInput,
-  SessionPromptOutput,
-  SessionSkillInput,
-  SessionSkillOutput,
-  SessionCompactInput,
-  SessionCompactOutput,
-  SessionWaitInput,
-  SessionWaitOutput,
-  SessionRevertStageInput,
-  SessionRevertStageOutput,
-  SessionRevertClearInput,
-  SessionRevertClearOutput,
-  SessionRevertCommitInput,
-  SessionRevertCommitOutput,
-  SessionContextInput,
-  SessionContextOutput,
-  SessionHistoryInput,
-  SessionHistoryOutput,
-  SessionEventsInput,
-  SessionEventsOutput,
-  SessionInterruptInput,
-  SessionInterruptOutput,
-  SessionBackgroundInput,
-  SessionBackgroundOutput,
-  SessionMessageInput,
-  SessionMessageOutput,
-  MessageListInput,
-  MessageListOutput,
-  ModelListInput,
-  ModelListOutput,
-  GenerateTextInput,
-  GenerateTextOutput,
-  ProviderListInput,
-  ProviderListOutput,
-  ProviderGetInput,
-  ProviderGetOutput,
-  IntegrationListInput,
-  IntegrationListOutput,
-  IntegrationGetInput,
-  IntegrationGetOutput,
-  IntegrationConnectKeyInput,
-  IntegrationConnectKeyOutput,
-  IntegrationConnectOauthInput,
-  IntegrationConnectOauthOutput,
-  IntegrationAttemptStatusInput,
-  IntegrationAttemptStatusOutput,
-  IntegrationAttemptCompleteInput,
-  IntegrationAttemptCompleteOutput,
-  IntegrationAttemptCancelInput,
-  IntegrationAttemptCancelOutput,
-  ServerMcpListInput,
-  ServerMcpListOutput,
-  CredentialUpdateInput,
-  CredentialUpdateOutput,
-  CredentialRemoveInput,
-  CredentialRemoveOutput,
-  ProjectCurrentInput,
-  ProjectCurrentOutput,
-  ProjectDirectoriesInput,
-  ProjectDirectoriesOutput,
-  PermissionListRequestsInput,
-  PermissionListRequestsOutput,
-  PermissionListSavedInput,
-  PermissionListSavedOutput,
-  PermissionRemoveSavedInput,
-  PermissionRemoveSavedOutput,
-  PermissionCreateInput,
-  PermissionCreateOutput,
-  PermissionListInput,
-  PermissionListOutput,
-  PermissionGetInput,
-  PermissionGetOutput,
-  PermissionReplyInput,
-  PermissionReplyOutput,
-  FileReadInput,
-  FileReadOutput,
-  FileListInput,
-  FileListOutput,
-  FileFindInput,
-  FileFindOutput,
-  CommandListInput,
-  CommandListOutput,
-  SkillListInput,
-  SkillListOutput,
-  EventSubscribeOutput,
-  PtyListInput,
-  PtyListOutput,
-  PtyCreateInput,
-  PtyCreateOutput,
-  PtyGetInput,
-  PtyGetOutput,
-  PtyUpdateInput,
-  PtyUpdateOutput,
-  PtyRemoveInput,
-  PtyRemoveOutput,
-  ShellListInput,
-  ShellListOutput,
-  ShellCreateInput,
-  ShellCreateOutput,
-  ShellGetInput,
-  ShellGetOutput,
-  ShellOutputInput,
-  ShellOutputOutput,
-  ShellRemoveInput,
-  ShellRemoveOutput,
-  QuestionListRequestsInput,
-  QuestionListRequestsOutput,
-  QuestionListInput,
-  QuestionListOutput,
-  QuestionReplyInput,
-  QuestionReplyOutput,
-  QuestionRejectInput,
-  QuestionRejectOutput,
-  ReferenceListInput,
-  ReferenceListOutput,
-  ProjectCopyCreateInput,
-  ProjectCopyCreateOutput,
-  ProjectCopyRemoveInput,
-  ProjectCopyRemoveOutput,
-  ProjectCopyRefreshInput,
-  ProjectCopyRefreshOutput,
+  AgentsListInput,
+  AgentsListOutput,
+  SessionsListInput,
+  SessionsListOutput,
+  SessionsCreateInput,
+  SessionsCreateOutput,
+  SessionsActiveOutput,
+  SessionsGetInput,
+  SessionsGetOutput,
+  SessionsSwitchAgentInput,
+  SessionsSwitchAgentOutput,
+  SessionsSwitchModelInput,
+  SessionsSwitchModelOutput,
+  SessionsPromptInput,
+  SessionsPromptOutput,
+  SessionsCompactInput,
+  SessionsCompactOutput,
+  SessionsWaitInput,
+  SessionsWaitOutput,
+  SessionsStageInput,
+  SessionsStageOutput,
+  SessionsClearInput,
+  SessionsClearOutput,
+  SessionsCommitInput,
+  SessionsCommitOutput,
+  SessionsContextInput,
+  SessionsContextOutput,
+  SessionsHistoryInput,
+  SessionsHistoryOutput,
+  SessionsEventsInput,
+  SessionsEventsOutput,
+  SessionsInterruptInput,
+  SessionsInterruptOutput,
+  SessionsMessageInput,
+  SessionsMessageOutput,
+  MessagesListInput,
+  MessagesListOutput,
+  ModelsListInput,
+  ModelsListOutput,
+  ProvidersListInput,
+  ProvidersListOutput,
+  ProvidersGetInput,
+  ProvidersGetOutput,
+  IntegrationsListInput,
+  IntegrationsListOutput,
+  IntegrationsGetInput,
+  IntegrationsGetOutput,
+  IntegrationsConnectKeyInput,
+  IntegrationsConnectKeyOutput,
+  IntegrationsConnectOauthInput,
+  IntegrationsConnectOauthOutput,
+  IntegrationsAttemptStatusInput,
+  IntegrationsAttemptStatusOutput,
+  IntegrationsAttemptCompleteInput,
+  IntegrationsAttemptCompleteOutput,
+  IntegrationsAttemptCancelInput,
+  IntegrationsAttemptCancelOutput,
+  CredentialsUpdateInput,
+  CredentialsUpdateOutput,
+  CredentialsRemoveInput,
+  CredentialsRemoveOutput,
+  PermissionsListRequestsInput,
+  PermissionsListRequestsOutput,
+  PermissionsListSavedInput,
+  PermissionsListSavedOutput,
+  PermissionsRemoveSavedInput,
+  PermissionsRemoveSavedOutput,
+  PermissionsCreateInput,
+  PermissionsCreateOutput,
+  PermissionsListInput,
+  PermissionsListOutput,
+  PermissionsGetInput,
+  PermissionsGetOutput,
+  PermissionsReplyInput,
+  PermissionsReplyOutput,
+  FilesListInput,
+  FilesListOutput,
+  FilesFindInput,
+  FilesFindOutput,
+  CommandsListInput,
+  CommandsListOutput,
+  SkillsListInput,
+  SkillsListOutput,
+  EventsSubscribeOutput,
+  PtysListInput,
+  PtysListOutput,
+  PtysCreateInput,
+  PtysCreateOutput,
+  PtysGetInput,
+  PtysGetOutput,
+  PtysUpdateInput,
+  PtysUpdateOutput,
+  PtysRemoveInput,
+  PtysRemoveOutput,
+  QuestionsListRequestsInput,
+  QuestionsListRequestsOutput,
+  QuestionsListInput,
+  QuestionsListOutput,
+  QuestionsReplyInput,
+  QuestionsReplyOutput,
+  QuestionsRejectInput,
+  QuestionsRejectOutput,
+  ReferencesListInput,
+  ReferencesListOutput,
+  ProjectCopiesCreateInput,
+  ProjectCopiesCreateOutput,
+  ProjectCopiesRemoveInput,
+  ProjectCopiesRemoveOutput,
+  ProjectCopiesRefreshInput,
+  ProjectCopiesRefreshOutput,
 } from "./types"
 import { ClientError } from "./client-error"

@@ -165,7 +135,6 @@ interface RequestDescriptor {
  readonly successStatus: number
  readonly declaredStatuses: ReadonlyArray<number>
  readonly empty: boolean
-  readonly binary?: true
 }

 export function make(options: ClientOptions) {
@@ -211,7 +180,6 @@ export function make(options: ClientOptions) {
  const request = async <A>(descriptor: RequestDescriptor, requestOptions?: RequestOptions): Promise<A> => {
    const response = await execute(descriptor, requestOptions)
    if (response.status !== descriptor.successStatus) return responseError(response, descriptor)
-    if (descriptor.binary) return new Uint8Array(await response.arrayBuffer()) as A
    if (descriptor.empty) {
      try {
        await response.body?.cancel()
@@ -300,9 +268,9 @@ export function make(options: ClientOptions) {
          requestOptions,
        ),
    },
-    agent: {
-      list: (input?: AgentListInput, requestOptions?: RequestOptions) =>
-        request<AgentListOutput>(
+    agents: {
+      list: (input?: AgentsListInput, requestOptions?: RequestOptions) =>
+        request<AgentsListOutput>(
          {
            method: "GET",
            path: `/api/agent`,
@@ -314,23 +282,9 @@ export function make(options: ClientOptions) {
          requestOptions,
        ),
    },
-    plugin: {
-      list: (input?: PluginListInput, requestOptions?: RequestOptions) =>
-        request<PluginListOutput>(
-          {
-            method: "GET",
-            path: `/api/plugin`,
-            query: { location: input?.["location"] },
-            successStatus: 200,
-            declaredStatuses: [401, 400],
-            empty: false,
-          },
-          requestOptions,
-        ),
-    },
-    session: {
-      list: (input?: SessionListInput, requestOptions?: RequestOptions) =>
-        request<SessionListOutput>(
+    sessions: {
+      list: (input?: SessionsListInput, requestOptions?: RequestOptions) =>
+        request<SessionsListOutput>(
          {
            method: "GET",
            path: `/api/session`,
@@ -350,8 +304,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      create: (input?: SessionCreateInput, requestOptions?: RequestOptions) =>
-        request<{ readonly data: SessionCreateOutput }>(
+      create: (input?: SessionsCreateInput, requestOptions?: RequestOptions) =>
+        request<{ readonly data: SessionsCreateOutput }>(
          {
            method: "POST",
            path: `/api/session`,
@@ -368,7 +322,7 @@ export function make(options: ClientOptions) {
          requestOptions,
        ).then((value) => value.data),
      active: (requestOptions?: RequestOptions) =>
-        request<{ readonly data: SessionActiveOutput }>(
+        request<{ readonly data: SessionsActiveOutput }>(
          {
            method: "GET",
            path: `/api/session/active`,
@@ -378,8 +332,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ).then((value) => value.data),
-      get: (input: SessionGetInput, requestOptions?: RequestOptions) =>
-        request<{ readonly data: SessionGetOutput }>(
+      get: (input: SessionsGetInput, requestOptions?: RequestOptions) =>
+        request<{ readonly data: SessionsGetOutput }>(
          {
            method: "GET",
            path: `/api/session/${encodeURIComponent(input.sessionID)}`,
@@ -389,20 +343,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ).then((value) => value.data),
-      fork: (input: SessionForkInput, requestOptions?: RequestOptions) =>
-        request<{ readonly data: SessionForkOutput }>(
-          {
-            method: "POST",
-            path: `/api/session/${encodeURIComponent(input.sessionID)}/fork`,
-            body: { messageID: input["messageID"] },
-            successStatus: 200,
-            declaredStatuses: [404, 400, 401],
-            empty: false,
-          },
-          requestOptions,
-        ).then((value) => value.data),
-      switchAgent: (input: SessionSwitchAgentInput, requestOptions?: RequestOptions) =>
-        request<SessionSwitchAgentOutput>(
+      switchAgent: (input: SessionsSwitchAgentInput, requestOptions?: RequestOptions) =>
+        request<SessionsSwitchAgentOutput>(
          {
            method: "POST",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/agent`,
@@ -413,8 +355,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      switchModel: (input: SessionSwitchModelInput, requestOptions?: RequestOptions) =>
-        request<SessionSwitchModelOutput>(
+      switchModel: (input: SessionsSwitchModelInput, requestOptions?: RequestOptions) =>
+        request<SessionsSwitchModelOutput>(
          {
            method: "POST",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/model`,
@@ -425,20 +367,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      rename: (input: SessionRenameInput, requestOptions?: RequestOptions) =>
-        request<SessionRenameOutput>(
-          {
-            method: "POST",
-            path: `/api/session/${encodeURIComponent(input.sessionID)}/rename`,
-            body: { title: input["title"] },
-            successStatus: 204,
-            declaredStatuses: [404, 400, 401],
-            empty: true,
-          },
-          requestOptions,
-        ),
-      prompt: (input: SessionPromptInput, requestOptions?: RequestOptions) =>
-        request<{ readonly data: SessionPromptOutput }>(
+      prompt: (input: SessionsPromptInput, requestOptions?: RequestOptions) =>
+        request<{ readonly data: SessionsPromptOutput }>(
          {
            method: "POST",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/prompt`,
@@ -449,31 +379,19 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ).then((value) => value.data),
-      skill: (input: SessionSkillInput, requestOptions?: RequestOptions) =>
-        request<SessionSkillOutput>(
-          {
-            method: "POST",
-            path: `/api/session/${encodeURIComponent(input.sessionID)}/skill`,
-            body: { id: input["id"], skill: input["skill"], resume: input["resume"] },
-            successStatus: 204,
-            declaredStatuses: [404, 400, 401],
-            empty: true,
-          },
-          requestOptions,
-        ),
-      compact: (input: SessionCompactInput, requestOptions?: RequestOptions) =>
-        request<SessionCompactOutput>(
+      compact: (input: SessionsCompactInput, requestOptions?: RequestOptions) =>
+        request<SessionsCompactOutput>(
          {
            method: "POST",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/compact`,
            successStatus: 204,
-            declaredStatuses: [404, 409, 503, 500, 400, 401],
+            declaredStatuses: [404, 503, 400, 401],
            empty: true,
          },
          requestOptions,
        ),
-      wait: (input: SessionWaitInput, requestOptions?: RequestOptions) =>
-        request<SessionWaitOutput>(
+      wait: (input: SessionsWaitInput, requestOptions?: RequestOptions) =>
+        request<SessionsWaitOutput>(
          {
            method: "POST",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/wait`,
@@ -483,42 +401,42 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      revertStage: (input: SessionRevertStageInput, requestOptions?: RequestOptions) =>
-        request<{ readonly data: SessionRevertStageOutput }>(
+      stage: (input: SessionsStageInput, requestOptions?: RequestOptions) =>
+        request<{ readonly data: SessionsStageOutput }>(
          {
            method: "POST",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/revert/stage`,
            body: { messageID: input["messageID"], files: input["files"] },
            successStatus: 200,
-            declaredStatuses: [404, 409, 500, 400, 401],
+            declaredStatuses: [404, 500, 400, 401],
            empty: false,
          },
          requestOptions,
        ).then((value) => value.data),
-      revertClear: (input: SessionRevertClearInput, requestOptions?: RequestOptions) =>
-        request<SessionRevertClearOutput>(
+      clear: (input: SessionsClearInput, requestOptions?: RequestOptions) =>
+        request<SessionsClearOutput>(
          {
            method: "POST",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/revert/clear`,
            successStatus: 204,
-            declaredStatuses: [404, 409, 500, 400, 401],
+            declaredStatuses: [404, 500, 400, 401],
            empty: true,
          },
          requestOptions,
        ),
-      revertCommit: (input: SessionRevertCommitInput, requestOptions?: RequestOptions) =>
-        request<SessionRevertCommitOutput>(
+      commit: (input: SessionsCommitInput, requestOptions?: RequestOptions) =>
+        request<SessionsCommitOutput>(
          {
            method: "POST",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/revert/commit`,
            successStatus: 204,
-            declaredStatuses: [404, 409, 400, 401],
+            declaredStatuses: [404, 400, 401],
            empty: true,
          },
          requestOptions,
        ),
-      context: (input: SessionContextInput, requestOptions?: RequestOptions) =>
-        request<{ readonly data: SessionContextOutput }>(
+      context: (input: SessionsContextInput, requestOptions?: RequestOptions) =>
+        request<{ readonly data: SessionsContextOutput }>(
          {
            method: "GET",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/context`,
@@ -528,8 +446,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ).then((value) => value.data),
-      history: (input: SessionHistoryInput, requestOptions?: RequestOptions) =>
-        request<SessionHistoryOutput>(
+      history: (input: SessionsHistoryInput, requestOptions?: RequestOptions) =>
+        request<SessionsHistoryOutput>(
          {
            method: "GET",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/history`,
@@ -540,8 +458,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      events: (input: SessionEventsInput, requestOptions?: RequestOptions): AsyncIterable<SessionEventsOutput> =>
-        sse<SessionEventsOutput>(
+      events: (input: SessionsEventsInput, requestOptions?: RequestOptions): AsyncIterable<SessionsEventsOutput> =>
+        sse<SessionsEventsOutput>(
          {
            method: "GET",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/event`,
@@ -552,8 +470,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      interrupt: (input: SessionInterruptInput, requestOptions?: RequestOptions) =>
-        request<SessionInterruptOutput>(
+      interrupt: (input: SessionsInterruptInput, requestOptions?: RequestOptions) =>
+        request<SessionsInterruptOutput>(
          {
            method: "POST",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/interrupt`,
@@ -563,19 +481,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      background: (input: SessionBackgroundInput, requestOptions?: RequestOptions) =>
-        request<SessionBackgroundOutput>(
-          {
-            method: "POST",
-            path: `/api/session/${encodeURIComponent(input.sessionID)}/background`,
-            successStatus: 204,
-            declaredStatuses: [404, 400, 401],
-            empty: true,
-          },
-          requestOptions,
-        ),
-      message: (input: SessionMessageInput, requestOptions?: RequestOptions) =>
-        request<{ readonly data: SessionMessageOutput }>(
+      message: (input: SessionsMessageInput, requestOptions?: RequestOptions) =>
+        request<{ readonly data: SessionsMessageOutput }>(
          {
            method: "GET",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/message/${encodeURIComponent(input.messageID)}`,
@@ -586,9 +493,9 @@ export function make(options: ClientOptions) {
          requestOptions,
        ).then((value) => value.data),
    },
-    message: {
-      list: (input: MessageListInput, requestOptions?: RequestOptions) =>
-        request<MessageListOutput>(
+    messages: {
+      list: (input: MessagesListInput, requestOptions?: RequestOptions) =>
+        request<MessagesListOutput>(
          {
            method: "GET",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/message`,
@@ -600,9 +507,9 @@ export function make(options: ClientOptions) {
          requestOptions,
        ),
    },
-    model: {
-      list: (input?: ModelListInput, requestOptions?: RequestOptions) =>
-        request<ModelListOutput>(
+    models: {
+      list: (input?: ModelsListInput, requestOptions?: RequestOptions) =>
+        request<ModelsListOutput>(
          {
            method: "GET",
            path: `/api/model`,
@@ -614,24 +521,9 @@ export function make(options: ClientOptions) {
          requestOptions,
        ),
    },
-    generate: {
-      text: (input: GenerateTextInput, requestOptions?: RequestOptions) =>
-        request<{ readonly data: GenerateTextOutput }>(
-          {
-            method: "POST",
-            path: `/api/generate`,
-            query: { location: input["location"] },
-            body: { prompt: input["prompt"], model: input["model"] },
-            successStatus: 200,
-            declaredStatuses: [400, 503, 401],
-            empty: false,
-          },
-          requestOptions,
-        ).then((value) => value.data),
-    },
-    provider: {
-      list: (input?: ProviderListInput, requestOptions?: RequestOptions) =>
-        request<ProviderListOutput>(
+    providers: {
+      list: (input?: ProvidersListInput, requestOptions?: RequestOptions) =>
+        request<ProvidersListOutput>(
          {
            method: "GET",
            path: `/api/provider`,
@@ -642,8 +534,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      get: (input: ProviderGetInput, requestOptions?: RequestOptions) =>
-        request<ProviderGetOutput>(
+      get: (input: ProvidersGetInput, requestOptions?: RequestOptions) =>
+        request<ProvidersGetOutput>(
          {
            method: "GET",
            path: `/api/provider/${encodeURIComponent(input.providerID)}`,
@@ -655,9 +547,9 @@ export function make(options: ClientOptions) {
          requestOptions,
        ),
    },
-    integration: {
-      list: (input?: IntegrationListInput, requestOptions?: RequestOptions) =>
-        request<IntegrationListOutput>(
+    integrations: {
+      list: (input?: IntegrationsListInput, requestOptions?: RequestOptions) =>
+        request<IntegrationsListOutput>(
          {
            method: "GET",
            path: `/api/integration`,
@@ -668,8 +560,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      get: (input: IntegrationGetInput, requestOptions?: RequestOptions) =>
-        request<IntegrationGetOutput>(
+      get: (input: IntegrationsGetInput, requestOptions?: RequestOptions) =>
+        request<IntegrationsGetOutput>(
          {
            method: "GET",
            path: `/api/integration/${encodeURIComponent(input.integrationID)}`,
@@ -680,8 +572,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      connectKey: (input: IntegrationConnectKeyInput, requestOptions?: RequestOptions) =>
-        request<IntegrationConnectKeyOutput>(
+      connectKey: (input: IntegrationsConnectKeyInput, requestOptions?: RequestOptions) =>
+        request<IntegrationsConnectKeyOutput>(
          {
            method: "POST",
            path: `/api/integration/${encodeURIComponent(input.integrationID)}/connect/key`,
@@ -693,8 +585,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      connectOauth: (input: IntegrationConnectOauthInput, requestOptions?: RequestOptions) =>
-        request<IntegrationConnectOauthOutput>(
+      connectOauth: (input: IntegrationsConnectOauthInput, requestOptions?: RequestOptions) =>
+        request<IntegrationsConnectOauthOutput>(
          {
            method: "POST",
            path: `/api/integration/${encodeURIComponent(input.integrationID)}/connect/oauth`,
@@ -706,8 +598,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      attemptStatus: (input: IntegrationAttemptStatusInput, requestOptions?: RequestOptions) =>
-        request<IntegrationAttemptStatusOutput>(
+      attemptStatus: (input: IntegrationsAttemptStatusInput, requestOptions?: RequestOptions) =>
+        request<IntegrationsAttemptStatusOutput>(
          {
            method: "GET",
            path: `/api/integration/attempt/${encodeURIComponent(input.attemptID)}`,
@@ -718,8 +610,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      attemptComplete: (input: IntegrationAttemptCompleteInput, requestOptions?: RequestOptions) =>
-        request<IntegrationAttemptCompleteOutput>(
+      attemptComplete: (input: IntegrationsAttemptCompleteInput, requestOptions?: RequestOptions) =>
+        request<IntegrationsAttemptCompleteOutput>(
          {
            method: "POST",
            path: `/api/integration/attempt/${encodeURIComponent(input.attemptID)}/complete`,
@@ -731,8 +623,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      attemptCancel: (input: IntegrationAttemptCancelInput, requestOptions?: RequestOptions) =>
-        request<IntegrationAttemptCancelOutput>(
+      attemptCancel: (input: IntegrationsAttemptCancelInput, requestOptions?: RequestOptions) =>
+        request<IntegrationsAttemptCancelOutput>(
          {
            method: "DELETE",
            path: `/api/integration/attempt/${encodeURIComponent(input.attemptID)}`,
@@ -744,23 +636,9 @@ export function make(options: ClientOptions) {
          requestOptions,
        ),
    },
-    "server.mcp": {
-      list: (input?: ServerMcpListInput, requestOptions?: RequestOptions) =>
-        request<ServerMcpListOutput>(
-          {
-            method: "GET",
-            path: `/api/mcp`,
-            query: { location: input?.["location"] },
-            successStatus: 200,
-            declaredStatuses: [401, 400],
-            empty: false,
-          },
-          requestOptions,
-        ),
-    },
-    credential: {
-      update: (input: CredentialUpdateInput, requestOptions?: RequestOptions) =>
-        request<CredentialUpdateOutput>(
+    credentials: {
+      update: (input: CredentialsUpdateInput, requestOptions?: RequestOptions) =>
+        request<CredentialsUpdateOutput>(
          {
            method: "PATCH",
            path: `/api/credential/${encodeURIComponent(input.credentialID)}`,
@@ -772,8 +650,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      remove: (input: CredentialRemoveInput, requestOptions?: RequestOptions) =>
-        request<CredentialRemoveOutput>(
+      remove: (input: CredentialsRemoveInput, requestOptions?: RequestOptions) =>
+        request<CredentialsRemoveOutput>(
          {
            method: "DELETE",
            path: `/api/credential/${encodeURIComponent(input.credentialID)}`,
@@ -785,35 +663,9 @@ export function make(options: ClientOptions) {
          requestOptions,
        ),
    },
-    project: {
-      current: (input?: ProjectCurrentInput, requestOptions?: RequestOptions) =>
-        request<ProjectCurrentOutput>(
-          {
-            method: "GET",
-            path: `/api/project/current`,
-            query: { location: input?.["location"] },
-            successStatus: 200,
-            declaredStatuses: [401, 400],
-            empty: false,
-          },
-          requestOptions,
-        ),
-      directories: (input: ProjectDirectoriesInput, requestOptions?: RequestOptions) =>
-        request<ProjectDirectoriesOutput>(
-          {
-            method: "GET",
-            path: `/api/project/${encodeURIComponent(input.projectID)}/directories`,
-            query: { location: input["location"] },
-            successStatus: 200,
-            declaredStatuses: [401, 400],
-            empty: false,
-          },
-          requestOptions,
-        ),
-    },
-    permission: {
-      listRequests: (input?: PermissionListRequestsInput, requestOptions?: RequestOptions) =>
-        request<PermissionListRequestsOutput>(
+    permissions: {
+      listRequests: (input?: PermissionsListRequestsInput, requestOptions?: RequestOptions) =>
+        request<PermissionsListRequestsOutput>(
          {
            method: "GET",
            path: `/api/permission/request`,
@@ -824,8 +676,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      listSaved: (input?: PermissionListSavedInput, requestOptions?: RequestOptions) =>
-        request<{ readonly data: PermissionListSavedOutput }>(
+      listSaved: (input?: PermissionsListSavedInput, requestOptions?: RequestOptions) =>
+        request<{ readonly data: PermissionsListSavedOutput }>(
          {
            method: "GET",
            path: `/api/permission/saved`,
@@ -836,8 +688,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ).then((value) => value.data),
-      removeSaved: (input: PermissionRemoveSavedInput, requestOptions?: RequestOptions) =>
-        request<PermissionRemoveSavedOutput>(
+      removeSaved: (input: PermissionsRemoveSavedInput, requestOptions?: RequestOptions) =>
+        request<PermissionsRemoveSavedOutput>(
          {
            method: "DELETE",
            path: `/api/permission/saved/${encodeURIComponent(input.id)}`,
@@ -847,8 +699,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      create: (input: PermissionCreateInput, requestOptions?: RequestOptions) =>
-        request<{ readonly data: PermissionCreateOutput }>(
+      create: (input: PermissionsCreateInput, requestOptions?: RequestOptions) =>
+        request<{ readonly data: PermissionsCreateOutput }>(
          {
            method: "POST",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/permission`,
@@ -867,8 +719,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ).then((value) => value.data),
-      list: (input: PermissionListInput, requestOptions?: RequestOptions) =>
-        request<{ readonly data: PermissionListOutput }>(
+      list: (input: PermissionsListInput, requestOptions?: RequestOptions) =>
+        request<{ readonly data: PermissionsListOutput }>(
          {
            method: "GET",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/permission`,
@@ -878,8 +730,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ).then((value) => value.data),
-      get: (input: PermissionGetInput, requestOptions?: RequestOptions) =>
-        request<{ readonly data: PermissionGetOutput }>(
+      get: (input: PermissionsGetInput, requestOptions?: RequestOptions) =>
+        request<{ readonly data: PermissionsGetOutput }>(
          {
            method: "GET",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/permission/${encodeURIComponent(input.requestID)}`,
@@ -889,8 +741,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ).then((value) => value.data),
-      reply: (input: PermissionReplyInput, requestOptions?: RequestOptions) =>
-        request<PermissionReplyOutput>(
+      reply: (input: PermissionsReplyInput, requestOptions?: RequestOptions) =>
+        request<PermissionsReplyOutput>(
          {
            method: "POST",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/permission/${encodeURIComponent(input.requestID)}/reply`,
@@ -902,22 +754,9 @@ export function make(options: ClientOptions) {
          requestOptions,
        ),
    },
-    file: {
-      read: (input: FileReadInput, requestOptions?: RequestOptions) =>
-        request<FileReadOutput>(
-          {
-            method: "GET",
-            path: `/api/fs/read/${encodePath(input.path)}`,
-            query: { location: input["location"] },
-            successStatus: 200,
-            declaredStatuses: [401, 400],
-            empty: false,
-            binary: true,
-          },
-          requestOptions,
-        ),
-      list: (input?: FileListInput, requestOptions?: RequestOptions) =>
-        request<FileListOutput>(
+    files: {
+      list: (input?: FilesListInput, requestOptions?: RequestOptions) =>
+        request<FilesListOutput>(
          {
            method: "GET",
            path: `/api/fs/list`,
@@ -928,8 +767,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      find: (input: FileFindInput, requestOptions?: RequestOptions) =>
-        request<FileFindOutput>(
+      find: (input: FilesFindInput, requestOptions?: RequestOptions) =>
+        request<FilesFindOutput>(
          {
            method: "GET",
            path: `/api/fs/find`,
@@ -941,9 +780,9 @@ export function make(options: ClientOptions) {
          requestOptions,
        ),
    },
-    command: {
-      list: (input?: CommandListInput, requestOptions?: RequestOptions) =>
-        request<CommandListOutput>(
+    commands: {
+      list: (input?: CommandsListInput, requestOptions?: RequestOptions) =>
+        request<CommandsListOutput>(
          {
            method: "GET",
            path: `/api/command`,
@@ -955,9 +794,9 @@ export function make(options: ClientOptions) {
          requestOptions,
        ),
    },
-    skill: {
-      list: (input?: SkillListInput, requestOptions?: RequestOptions) =>
-        request<SkillListOutput>(
+    skills: {
+      list: (input?: SkillsListInput, requestOptions?: RequestOptions) =>
+        request<SkillsListOutput>(
          {
            method: "GET",
            path: `/api/skill`,
@@ -969,16 +808,16 @@ export function make(options: ClientOptions) {
          requestOptions,
        ),
    },
-    event: {
-      subscribe: (requestOptions?: RequestOptions): AsyncIterable<EventSubscribeOutput> =>
-        sse<EventSubscribeOutput>(
+    events: {
+      subscribe: (requestOptions?: RequestOptions): AsyncIterable<EventsSubscribeOutput> =>
+        sse<EventsSubscribeOutput>(
          { method: "GET", path: `/api/event`, successStatus: 200, declaredStatuses: [401, 400], empty: false },
          requestOptions,
        ),
    },
-    pty: {
-      list: (input?: PtyListInput, requestOptions?: RequestOptions) =>
-        request<PtyListOutput>(
+    ptys: {
+      list: (input?: PtysListInput, requestOptions?: RequestOptions) =>
+        request<PtysListOutput>(
          {
            method: "GET",
            path: `/api/pty`,
@@ -989,8 +828,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      create: (input?: PtyCreateInput, requestOptions?: RequestOptions) =>
-        request<PtyCreateOutput>(
+      create: (input?: PtysCreateInput, requestOptions?: RequestOptions) =>
+        request<PtysCreateOutput>(
          {
            method: "POST",
            path: `/api/pty`,
@@ -1008,8 +847,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      get: (input: PtyGetInput, requestOptions?: RequestOptions) =>
-        request<PtyGetOutput>(
+      get: (input: PtysGetInput, requestOptions?: RequestOptions) =>
+        request<PtysGetOutput>(
          {
            method: "GET",
            path: `/api/pty/${encodeURIComponent(input.ptyID)}`,
@@ -1020,8 +859,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      update: (input: PtyUpdateInput, requestOptions?: RequestOptions) =>
-        request<PtyUpdateOutput>(
+      update: (input: PtysUpdateInput, requestOptions?: RequestOptions) =>
+        request<PtysUpdateOutput>(
          {
            method: "PUT",
            path: `/api/pty/${encodeURIComponent(input.ptyID)}`,
@@ -1033,8 +872,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      remove: (input: PtyRemoveInput, requestOptions?: RequestOptions) =>
-        request<PtyRemoveOutput>(
+      remove: (input: PtysRemoveInput, requestOptions?: RequestOptions) =>
+        request<PtysRemoveOutput>(
          {
            method: "DELETE",
            path: `/api/pty/${encodeURIComponent(input.ptyID)}`,
@@ -1046,77 +885,9 @@ export function make(options: ClientOptions) {
          requestOptions,
        ),
    },
-    shell: {
-      list: (input?: ShellListInput, requestOptions?: RequestOptions) =>
-        request<ShellListOutput>(
-          {
-            method: "GET",
-            path: `/api/shell`,
-            query: { location: input?.["location"] },
-            successStatus: 200,
-            declaredStatuses: [401, 400],
-            empty: false,
-          },
-          requestOptions,
-        ),
-      create: (input: ShellCreateInput, requestOptions?: RequestOptions) =>
-        request<ShellCreateOutput>(
-          {
-            method: "POST",
-            path: `/api/shell`,
-            query: { location: input["location"] },
-            body: {
-              command: input["command"],
-              cwd: input["cwd"],
-              timeout: input["timeout"],
-              metadata: input["metadata"],
-            },
-            successStatus: 200,
-            declaredStatuses: [401, 400],
-            empty: false,
-          },
-          requestOptions,
-        ),
-      get: (input: ShellGetInput, requestOptions?: RequestOptions) =>
-        request<ShellGetOutput>(
-          {
-            method: "GET",
-            path: `/api/shell/${encodeURIComponent(input.id)}`,
-            query: { location: input["location"] },
-            successStatus: 200,
-            declaredStatuses: [404, 401, 400],
-            empty: false,
-          },
-          requestOptions,
-        ),
-      output: (input: ShellOutputInput, requestOptions?: RequestOptions) =>
-        request<ShellOutputOutput>(
-          {
-            method: "GET",
-            path: `/api/shell/${encodeURIComponent(input.id)}/output`,
-            query: { location: input["location"], cursor: input["cursor"], limit: input["limit"] },
-            successStatus: 200,
-            declaredStatuses: [404, 401, 400],
-            empty: false,
-          },
-          requestOptions,
-        ),
-      remove: (input: ShellRemoveInput, requestOptions?: RequestOptions) =>
-        request<ShellRemoveOutput>(
-          {
-            method: "DELETE",
-            path: `/api/shell/${encodeURIComponent(input.id)}`,
-            query: { location: input["location"] },
-            successStatus: 204,
-            declaredStatuses: [404, 401, 400],
-            empty: true,
-          },
-          requestOptions,
-        ),
-    },
-    question: {
-      listRequests: (input?: QuestionListRequestsInput, requestOptions?: RequestOptions) =>
-        request<QuestionListRequestsOutput>(
+    questions: {
+      listRequests: (input?: QuestionsListRequestsInput, requestOptions?: RequestOptions) =>
+        request<QuestionsListRequestsOutput>(
          {
            method: "GET",
            path: `/api/question/request`,
@@ -1127,8 +898,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      list: (input: QuestionListInput, requestOptions?: RequestOptions) =>
-        request<{ readonly data: QuestionListOutput }>(
+      list: (input: QuestionsListInput, requestOptions?: RequestOptions) =>
+        request<{ readonly data: QuestionsListOutput }>(
          {
            method: "GET",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/question`,
@@ -1138,8 +909,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ).then((value) => value.data),
-      reply: (input: QuestionReplyInput, requestOptions?: RequestOptions) =>
-        request<QuestionReplyOutput>(
+      reply: (input: QuestionsReplyInput, requestOptions?: RequestOptions) =>
+        request<QuestionsReplyOutput>(
          {
            method: "POST",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/question/${encodeURIComponent(input.requestID)}/reply`,
@@ -1150,8 +921,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      reject: (input: QuestionRejectInput, requestOptions?: RequestOptions) =>
-        request<QuestionRejectOutput>(
+      reject: (input: QuestionsRejectInput, requestOptions?: RequestOptions) =>
+        request<QuestionsRejectOutput>(
          {
            method: "POST",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/question/${encodeURIComponent(input.requestID)}/reject`,
@@ -1162,9 +933,9 @@ export function make(options: ClientOptions) {
          requestOptions,
        ),
    },
-    reference: {
-      list: (input?: ReferenceListInput, requestOptions?: RequestOptions) =>
-        request<ReferenceListOutput>(
+    references: {
+      list: (input?: ReferencesListInput, requestOptions?: RequestOptions) =>
+        request<ReferencesListOutput>(
          {
            method: "GET",
            path: `/api/reference`,
@@ -1176,9 +947,9 @@ export function make(options: ClientOptions) {
          requestOptions,
        ),
    },
-    projectCopy: {
-      create: (input: ProjectCopyCreateInput, requestOptions?: RequestOptions) =>
-        request<ProjectCopyCreateOutput>(
+    projectCopies: {
+      create: (input: ProjectCopiesCreateInput, requestOptions?: RequestOptions) =>
+        request<ProjectCopiesCreateOutput>(
          {
            method: "POST",
            path: `/experimental/project/${encodeURIComponent(input.projectID)}/copy`,
@@ -1190,8 +961,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      remove: (input: ProjectCopyRemoveInput, requestOptions?: RequestOptions) =>
-        request<ProjectCopyRemoveOutput>(
+      remove: (input: ProjectCopiesRemoveInput, requestOptions?: RequestOptions) =>
+        request<ProjectCopiesRemoveOutput>(
          {
            method: "DELETE",
            path: `/experimental/project/${encodeURIComponent(input.projectID)}/copy`,
@@ -1203,8 +974,8 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      refresh: (input: ProjectCopyRefreshInput, requestOptions?: RequestOptions) =>
-        request<ProjectCopyRefreshOutput>(
+      refresh: (input: ProjectCopiesRefreshInput, requestOptions?: RequestOptions) =>
+        request<ProjectCopiesRefreshOutput>(
          {
            method: "POST",
            path: `/experimental/project/${encodeURIComponent(input.projectID)}/copy/refresh`,
@@ -1219,10 +990,6 @@ export function make(options: ClientOptions) {
  }
 }

-function encodePath(value: string): string {
-  return value.split("/").map(encodeURIComponent).join("/")
-}
-
 function appendQuery(params: URLSearchParams, key: string, value: unknown): void {
  if (value === undefined || value === null) return
  if (Array.isArray(value)) {
@@ -33,15 +33,6 @@ export type SessionNotFoundError = {
 export const isSessionNotFoundError = (value: unknown): value is SessionNotFoundError =>
  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "SessionNotFoundError"

-export type MessageNotFoundError = {
-  readonly _tag: "MessageNotFoundError"
-  readonly sessionID: string
-  readonly messageID: string
-  readonly message: string
-}
-export const isMessageNotFoundError = (value: unknown): value is MessageNotFoundError =>
-  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "MessageNotFoundError"
-
 export type ConflictError = {
  readonly _tag: "ConflictError"
  readonly message: string
@@ -50,22 +41,6 @@ export type ConflictError = {
 export const isConflictError = (value: unknown): value is ConflictError =>
  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "ConflictError"

-export type SkillNotFoundError = {
-  readonly _tag: "SkillNotFoundError"
-  readonly skill: string
-  readonly message: string
-}
-export const isSkillNotFoundError = (value: unknown): value is SkillNotFoundError =>
-  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "SkillNotFoundError"
-
-export type SessionBusyError = {
-  readonly _tag: "SessionBusyError"
-  readonly sessionID: string
-  readonly message: string
-}
-export const isSessionBusyError = (value: unknown): value is SessionBusyError =>
-  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "SessionBusyError"
-
 export type ServiceUnavailableError = {
  readonly _tag: "ServiceUnavailableError"
  readonly message: string
@@ -74,6 +49,15 @@ export type ServiceUnavailableError = {
 export const isServiceUnavailableError = (value: unknown): value is ServiceUnavailableError =>
  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "ServiceUnavailableError"

+export type MessageNotFoundError = {
+  readonly _tag: "MessageNotFoundError"
+  readonly sessionID: string
+  readonly messageID: string
+  readonly message: string
+}
+export const isMessageNotFoundError = (value: unknown): value is MessageNotFoundError =>
+  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "MessageNotFoundError"
+
 export type UnknownError = {
  readonly _tag: "UnknownError"
  readonly message: string
@@ -102,10 +86,6 @@ export type PtyNotFoundError = { readonly _tag: "PtyNotFoundError"; readonly pty
 export const isPtyNotFoundError = (value: unknown): value is PtyNotFoundError =>
  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "PtyNotFoundError"

-export type ShellNotFoundError = { readonly _tag: "ShellNotFoundError"; readonly id: string; readonly message: string }
-export const isShellNotFoundError = (value: unknown): value is ShellNotFoundError =>
-  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "ShellNotFoundError"
-
 export type QuestionNotFoundError = {
  readonly _tag: "QuestionNotFoundError"
  readonly requestID: string
@@ -135,13 +115,13 @@ export type LocationGetOutput = {
  readonly project: { readonly id: string; readonly directory: string }
 }

-export type AgentListInput = {
+export type AgentsListInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
 }

-export type AgentListOutput = {
+export type AgentsListOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -168,22 +148,7 @@ export type AgentListOutput = {
  }>
 }

-export type PluginListInput = {
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  }["location"]
-}
-
-export type PluginListOutput = {
-  readonly location: {
-    readonly directory: string
-    readonly workspaceID?: string
-    readonly project: { readonly id: string; readonly directory: string }
-  }
-  readonly data: ReadonlyArray<{ readonly id: string }>
-}
-
-export type SessionListInput = {
+export type SessionsListInput = {
  readonly workspace?: {
    readonly workspace?: string | undefined
    readonly limit?: number | undefined
@@ -266,7 +231,7 @@ export type SessionListInput = {
  }["cursor"]
 }

-export type SessionListOutput = {
+export type SessionsListOutput = {
  readonly data: ReadonlyArray<{
    readonly id: string
    readonly parentID?: string
@@ -301,7 +266,7 @@ export type SessionListOutput = {
  readonly cursor: { readonly previous?: string | null; readonly next?: string | null }
 }

-export type SessionCreateInput = {
+export type SessionsCreateInput = {
  readonly id?: {
    readonly id?: string | null
    readonly agent?: string | null
@@ -328,7 +293,7 @@ export type SessionCreateInput = {
  }["location"]
 }

-export type SessionCreateOutput = {
+export type SessionsCreateOutput = {
  readonly data: {
    readonly id: string
    readonly parentID?: string
@@ -362,11 +327,11 @@ export type SessionCreateOutput = {
  }
 }["data"]

-export type SessionActiveOutput = { readonly data: { readonly [x: string]: { readonly type: "running" } } }["data"]
+export type SessionsActiveOutput = { readonly data: { readonly [x: string]: { readonly type: "running" } } }["data"]

-export type SessionGetInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }
+export type SessionsGetInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }

-export type SessionGetOutput = {
+export type SessionsGetOutput = {
  readonly data: {
    readonly id: string
    readonly parentID?: string
@@ -400,69 +365,23 @@ export type SessionGetOutput = {
  }
 }["data"]

-export type SessionForkInput = {
-  readonly sessionID: { readonly sessionID: string }["sessionID"]
-  readonly messageID?: { readonly messageID?: string | undefined }["messageID"]
-}
-
-export type SessionForkOutput = {
-  readonly data: {
-    readonly id: string
-    readonly parentID?: string
-    readonly projectID: string
-    readonly agent?: string
-    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string }
-    readonly cost: number
-    readonly tokens: {
-      readonly input: number
-      readonly output: number
-      readonly reasoning: number
-      readonly cache: { readonly read: number; readonly write: number }
-    }
-    readonly time: { readonly created: number; readonly updated: number; readonly archived?: number }
-    readonly title: string
-    readonly location: { readonly directory: string; readonly workspaceID?: string }
-    readonly subpath?: string
-    readonly revert?: {
-      readonly messageID: string
-      readonly partID?: string
-      readonly snapshot?: string
-      readonly diff?: string
-      readonly files?: ReadonlyArray<{
-        readonly path: string
-        readonly status: "added" | "modified" | "deleted"
-        readonly additions: number
-        readonly deletions: number
-        readonly patch: string
-      }>
-    }
-  }
-}["data"]
-
-export type SessionSwitchAgentInput = {
+export type SessionsSwitchAgentInput = {
  readonly sessionID: { readonly sessionID: string }["sessionID"]
  readonly agent: { readonly agent: string }["agent"]
 }

-export type SessionSwitchAgentOutput = void
+export type SessionsSwitchAgentOutput = void

-export type SessionSwitchModelInput = {
+export type SessionsSwitchModelInput = {
  readonly sessionID: { readonly sessionID: string }["sessionID"]
  readonly model: {
    readonly model: { readonly id: string; readonly providerID: string; readonly variant?: string }
  }["model"]
 }

-export type SessionSwitchModelOutput = void
+export type SessionsSwitchModelOutput = void

-export type SessionRenameInput = {
-  readonly sessionID: { readonly sessionID: string }["sessionID"]
-  readonly title: { readonly title: string }["title"]
-}
-
-export type SessionRenameOutput = void
-
-export type SessionPromptInput = {
+export type SessionsPromptInput = {
  readonly sessionID: { readonly sessionID: string }["sessionID"]
  readonly id?: {
    readonly id?: string | null
@@ -538,7 +457,7 @@ export type SessionPromptInput = {
  }["resume"]
 }

-export type SessionPromptOutput = {
+export type SessionsPromptOutput = {
  readonly data: {
    readonly admittedSeq: number
    readonly id: string
@@ -563,42 +482,21 @@ export type SessionPromptOutput = {
  }
 }["data"]

-export type SessionSkillInput = {
-  readonly sessionID: { readonly sessionID: string }["sessionID"]
-  readonly id?: {
-    readonly id?: string | undefined
-    readonly skill: string
-    readonly resume?: boolean | undefined
-  }["id"]
-  readonly skill: {
-    readonly id?: string | undefined
-    readonly skill: string
-    readonly resume?: boolean | undefined
-  }["skill"]
-  readonly resume?: {
-    readonly id?: string | undefined
-    readonly skill: string
-    readonly resume?: boolean | undefined
-  }["resume"]
-}
+export type SessionsCompactInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }

-export type SessionSkillOutput = void
+export type SessionsCompactOutput = void

-export type SessionCompactInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }
+export type SessionsWaitInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }

-export type SessionCompactOutput = void
+export type SessionsWaitOutput = void

-export type SessionWaitInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }
-
-export type SessionWaitOutput = void
-
-export type SessionRevertStageInput = {
+export type SessionsStageInput = {
  readonly sessionID: { readonly sessionID: string }["sessionID"]
  readonly messageID: { readonly messageID: string; readonly files?: boolean | undefined }["messageID"]
  readonly files?: { readonly messageID: string; readonly files?: boolean | undefined }["files"]
 }

-export type SessionRevertStageOutput = {
+export type SessionsStageOutput = {
  readonly data: {
    readonly messageID: string
    readonly partID?: string
@@ -614,17 +512,17 @@ export type SessionRevertStageOutput = {
  }
 }["data"]

-export type SessionRevertClearInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }
+export type SessionsClearInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }

-export type SessionRevertClearOutput = void
+export type SessionsClearOutput = void

-export type SessionRevertCommitInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }
+export type SessionsCommitInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }

-export type SessionRevertCommitOutput = void
+export type SessionsCommitOutput = void

-export type SessionContextInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }
+export type SessionsContextInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }

-export type SessionContextOutput = {
+export type SessionsContextOutput = {
  readonly data: ReadonlyArray<
    | {
        readonly id: string
@@ -664,7 +562,6 @@ export type SessionContextOutput = {
        readonly time: { readonly created: number }
        readonly sessionID: string
        readonly text: string
-        readonly description?: string
        readonly type: "synthetic"
      }
    | {
@@ -674,14 +571,6 @@ export type SessionContextOutput = {
        readonly type: "system"
        readonly text: string
      }
-    | {
-        readonly id: string
-        readonly metadata?: { readonly [x: string]: JsonValue }
-        readonly time: { readonly created: number }
-        readonly type: "skill"
-        readonly name: string
-        readonly text: string
-      }
    | {
        readonly id: string
        readonly metadata?: { readonly [x: string]: JsonValue }
@@ -787,13 +676,13 @@ export type SessionContextOutput = {
  >
 }["data"]

-export type SessionHistoryInput = {
+export type SessionsHistoryInput = {
  readonly sessionID: { readonly sessionID: string }["sessionID"]
  readonly limit?: { readonly limit?: number | undefined; readonly after?: number | undefined }["limit"]
  readonly after?: { readonly limit?: number | undefined; readonly after?: number | undefined }["after"]
 }

-export type SessionHistoryOutput = {
+export type SessionsHistoryOutput = {
  readonly data: ReadonlyArray<
    | {
        readonly id: string
@@ -834,27 +723,6 @@ export type SessionHistoryOutput = {
          readonly subdirectory?: string
        }
      }
-    | {
-        readonly id: string
-        readonly metadata?: { readonly [x: string]: JsonValue }
-        readonly type: "session.next.renamed"
-        readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-        readonly location?: { readonly directory: string; readonly workspaceID?: string }
-        readonly data: { readonly timestamp: number; readonly sessionID: string; readonly title: string }
-      }
-    | {
-        readonly id: string
-        readonly metadata?: { readonly [x: string]: JsonValue }
-        readonly type: "session.next.forked"
-        readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-        readonly location?: { readonly directory: string; readonly workspaceID?: string }
-        readonly data: {
-          readonly timestamp: number
-          readonly sessionID: string
-          readonly parentID: string
-          readonly messageID?: string
-        }
-      }
    | {
        readonly id: string
        readonly metadata?: { readonly [x: string]: JsonValue }
@@ -933,21 +801,6 @@ export type SessionHistoryOutput = {
          readonly sessionID: string
          readonly messageID: string
          readonly text: string
-          readonly description?: string
-        }
-      }
-    | {
-        readonly id: string
-        readonly metadata?: { readonly [x: string]: JsonValue }
-        readonly type: "session.next.skill.activated"
-        readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-        readonly location?: { readonly directory: string; readonly workspaceID?: string }
-        readonly data: {
-          readonly timestamp: number
-          readonly sessionID: string
-          readonly messageID: string
-          readonly name: string
-          readonly text: string
        }
      }
    | {
@@ -1283,12 +1136,12 @@ export type SessionHistoryOutput = {
  readonly hasMore: boolean
 }

-export type SessionEventsInput = {
+export type SessionsEventsInput = {
  readonly sessionID: { readonly sessionID: string }["sessionID"]
  readonly after?: { readonly after?: number | undefined }["after"]
 }

-export type SessionEventsOutput =
+export type SessionsEventsOutput =
  | {
      readonly id: string
      readonly metadata?: { readonly [x: string]: unknown }
@@ -1328,27 +1181,6 @@ export type SessionEventsOutput =
        readonly subdirectory?: string
      }
    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.renamed"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly timestamp: number; readonly sessionID: string; readonly title: string }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.forked"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly parentID: string
-        readonly messageID?: string
-      }
-    }
  | {
      readonly id: string
      readonly metadata?: { readonly [x: string]: unknown }
@@ -1427,21 +1259,6 @@ export type SessionEventsOutput =
        readonly sessionID: string
        readonly messageID: string
        readonly text: string
-        readonly description?: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.skill.activated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly name: string
-        readonly text: string
      }
    }
  | {
@@ -1774,20 +1591,16 @@ export type SessionEventsOutput =
      readonly data: { readonly timestamp: number; readonly sessionID: string; readonly messageID: string }
    }

-export type SessionInterruptInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }
+export type SessionsInterruptInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }

-export type SessionInterruptOutput = void
+export type SessionsInterruptOutput = void

-export type SessionBackgroundInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }
-
-export type SessionBackgroundOutput = void
-
-export type SessionMessageInput = {
+export type SessionsMessageInput = {
  readonly sessionID: { readonly sessionID: string; readonly messageID: string }["sessionID"]
  readonly messageID: { readonly sessionID: string; readonly messageID: string }["messageID"]
 }

-export type SessionMessageOutput = {
+export type SessionsMessageOutput = {
  readonly data:
    | {
        readonly id: string
@@ -1827,7 +1640,6 @@ export type SessionMessageOutput = {
        readonly time: { readonly created: number }
        readonly sessionID: string
        readonly text: string
-        readonly description?: string
        readonly type: "synthetic"
      }
    | {
@@ -1837,14 +1649,6 @@ export type SessionMessageOutput = {
        readonly type: "system"
        readonly text: string
      }
-    | {
-        readonly id: string
-        readonly metadata?: { readonly [x: string]: JsonValue }
-        readonly time: { readonly created: number }
-        readonly type: "skill"
-        readonly name: string
-        readonly text: string
-      }
    | {
        readonly id: string
        readonly metadata?: { readonly [x: string]: JsonValue }
@@ -1949,7 +1753,7 @@ export type SessionMessageOutput = {
      }
 }["data"]

-export type MessageListInput = {
+export type MessagesListInput = {
  readonly sessionID: { readonly sessionID: string }["sessionID"]
  readonly limit?: {
    readonly limit?: number | undefined
@@ -1968,7 +1772,7 @@ export type MessageListInput = {
  }["cursor"]
 }

-export type MessageListOutput = {
+export type MessagesListOutput = {
  readonly data: ReadonlyArray<
    | {
        readonly id: string
@@ -2008,7 +1812,6 @@ export type MessageListOutput = {
        readonly time: { readonly created: number }
        readonly sessionID: string
        readonly text: string
-        readonly description?: string
        readonly type: "synthetic"
      }
    | {
@@ -2018,14 +1821,6 @@ export type MessageListOutput = {
        readonly type: "system"
        readonly text: string
      }
-    | {
-        readonly id: string
-        readonly metadata?: { readonly [x: string]: JsonValue }
-        readonly time: { readonly created: number }
-        readonly type: "skill"
-        readonly name: string
-        readonly text: string
-      }
    | {
        readonly id: string
        readonly metadata?: { readonly [x: string]: JsonValue }
@@ -2132,13 +1927,13 @@ export type MessageListOutput = {
  readonly cursor: { readonly previous?: string | null; readonly next?: string | null }
 }

-export type ModelListInput = {
+export type ModelsListInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
 }

-export type ModelListOutput = {
+export type ModelsListOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -2191,29 +1986,13 @@ export type ModelListOutput = {
  }>
 }

-export type GenerateTextInput = {
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  }["location"]
-  readonly prompt: {
-    readonly prompt: string
-    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
-  }["prompt"]
-  readonly model?: {
-    readonly prompt: string
-    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
-  }["model"]
-}
-
-export type GenerateTextOutput = { readonly data: { readonly text: string } }["data"]
-
-export type ProviderListInput = {
+export type ProvidersListInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
 }

-export type ProviderListOutput = {
+export type ProvidersListOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -2239,14 +2018,14 @@ export type ProviderListOutput = {
  }>
 }

-export type ProviderGetInput = {
+export type ProvidersGetInput = {
  readonly providerID: { readonly providerID: string }["providerID"]
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
 }

-export type ProviderGetOutput = {
+export type ProvidersGetOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -2272,13 +2051,13 @@ export type ProviderGetOutput = {
  }
 }

-export type IntegrationListInput = {
+export type IntegrationsListInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
 }

-export type IntegrationListOutput = {
+export type IntegrationsListOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -2323,14 +2102,14 @@ export type IntegrationListOutput = {
  }>
 }

-export type IntegrationGetInput = {
+export type IntegrationsGetInput = {
  readonly integrationID: { readonly integrationID: string }["integrationID"]
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
 }

-export type IntegrationGetOutput = {
+export type IntegrationsGetOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -2375,7 +2154,7 @@ export type IntegrationGetOutput = {
  } | null
 }

-export type IntegrationConnectKeyInput = {
+export type IntegrationsConnectKeyInput = {
  readonly integrationID: { readonly integrationID: string }["integrationID"]
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
@@ -2384,9 +2163,9 @@ export type IntegrationConnectKeyInput = {
  readonly label?: { readonly key: string; readonly label?: string | undefined }["label"]
 }

-export type IntegrationConnectKeyOutput = void
+export type IntegrationsConnectKeyOutput = void

-export type IntegrationConnectOauthInput = {
+export type IntegrationsConnectOauthInput = {
  readonly integrationID: { readonly integrationID: string }["integrationID"]
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
@@ -2408,7 +2187,7 @@ export type IntegrationConnectOauthInput = {
  }["label"]
 }

-export type IntegrationConnectOauthOutput = {
+export type IntegrationsConnectOauthOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -2426,14 +2205,14 @@ export type IntegrationConnectOauthOutput = {
  }
 }

-export type IntegrationAttemptStatusInput = {
+export type IntegrationsAttemptStatusInput = {
  readonly attemptID: { readonly attemptID: string }["attemptID"]
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
 }

-export type IntegrationAttemptStatusOutput = {
+export type IntegrationsAttemptStatusOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -2471,7 +2250,7 @@ export type IntegrationAttemptStatusOutput = {
      }
 }

-export type IntegrationAttemptCompleteInput = {
+export type IntegrationsAttemptCompleteInput = {
  readonly attemptID: { readonly attemptID: string }["attemptID"]
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
@@ -2479,43 +2258,18 @@ export type IntegrationAttemptCompleteInput = {
  readonly code?: { readonly code?: string | undefined }["code"]
 }

-export type IntegrationAttemptCompleteOutput = void
+export type IntegrationsAttemptCompleteOutput = void

-export type IntegrationAttemptCancelInput = {
+export type IntegrationsAttemptCancelInput = {
  readonly attemptID: { readonly attemptID: string }["attemptID"]
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
 }

-export type IntegrationAttemptCancelOutput = void
+export type IntegrationsAttemptCancelOutput = void

-export type ServerMcpListInput = {
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  }["location"]
-}
-
-export type ServerMcpListOutput = {
-  readonly location: {
-    readonly directory: string
-    readonly workspaceID?: string
-    readonly project: { readonly id: string; readonly directory: string }
-  }
-  readonly data: ReadonlyArray<{
-    readonly name: string
-    readonly status:
-      | { readonly status: "connected" }
-      | { readonly status: "disconnected" }
-      | { readonly status: "disabled" }
-      | { readonly status: "failed"; readonly error: string }
-      | { readonly status: "needs_auth" }
-      | { readonly status: "needs_client_registration"; readonly error: string }
-    readonly integrationID?: string
-  }>
-}
-
-export type CredentialUpdateInput = {
+export type CredentialsUpdateInput = {
  readonly credentialID: { readonly credentialID: string }["credentialID"]
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
@@ -2523,41 +2277,24 @@ export type CredentialUpdateInput = {
  readonly label: { readonly label: string }["label"]
 }

-export type CredentialUpdateOutput = void
+export type CredentialsUpdateOutput = void

-export type CredentialRemoveInput = {
+export type CredentialsRemoveInput = {
  readonly credentialID: { readonly credentialID: string }["credentialID"]
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
 }

-export type CredentialRemoveOutput = void
+export type CredentialsRemoveOutput = void

-export type ProjectCurrentInput = {
+export type PermissionsListRequestsInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
 }

-export type ProjectCurrentOutput = { readonly id: string; readonly directory: string }
-
-export type ProjectDirectoriesInput = {
-  readonly projectID: { readonly projectID: string }["projectID"]
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  }["location"]
-}
-
-export type ProjectDirectoriesOutput = ReadonlyArray<{ readonly directory: string; readonly strategy?: string }>
-
-export type PermissionListRequestsInput = {
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  }["location"]
-}
-
-export type PermissionListRequestsOutput = {
+export type PermissionsListRequestsOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -2574,9 +2311,11 @@ export type PermissionListRequestsOutput = {
  }>
 }

-export type PermissionListSavedInput = { readonly projectID?: { readonly projectID?: string | undefined }["projectID"] }
+export type PermissionsListSavedInput = {
+  readonly projectID?: { readonly projectID?: string | undefined }["projectID"]
+}

-export type PermissionListSavedOutput = {
+export type PermissionsListSavedOutput = {
  readonly data: ReadonlyArray<{
    readonly id: string
    readonly projectID: string
@@ -2585,11 +2324,11 @@ export type PermissionListSavedOutput = {
  }>
 }["data"]

-export type PermissionRemoveSavedInput = { readonly id: { readonly id: string }["id"] }
+export type PermissionsRemoveSavedInput = { readonly id: { readonly id: string }["id"] }

-export type PermissionRemoveSavedOutput = void
+export type PermissionsRemoveSavedOutput = void

-export type PermissionCreateInput = {
+export type PermissionsCreateInput = {
  readonly sessionID: { readonly sessionID: string }["sessionID"]
  readonly id?: {
    readonly id?: string | null
@@ -2656,13 +2395,13 @@ export type PermissionCreateInput = {
  }["agent"]
 }

-export type PermissionCreateOutput = {
+export type PermissionsCreateOutput = {
  readonly data: { readonly id: string; readonly effect: "allow" | "deny" | "ask" }
 }["data"]

-export type PermissionListInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }
+export type PermissionsListInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }

-export type PermissionListOutput = {
+export type PermissionsListOutput = {
  readonly data: ReadonlyArray<{
    readonly id: string
    readonly sessionID: string
@@ -2674,12 +2413,12 @@ export type PermissionListOutput = {
  }>
 }["data"]

-export type PermissionGetInput = {
+export type PermissionsGetInput = {
  readonly sessionID: { readonly sessionID: string; readonly requestID: string }["sessionID"]
  readonly requestID: { readonly sessionID: string; readonly requestID: string }["requestID"]
 }

-export type PermissionGetOutput = {
+export type PermissionsGetOutput = {
  readonly data: {
    readonly id: string
    readonly sessionID: string
@@ -2691,25 +2430,16 @@ export type PermissionGetOutput = {
  }
 }["data"]

-export type PermissionReplyInput = {
+export type PermissionsReplyInput = {
  readonly sessionID: { readonly sessionID: string; readonly requestID: string }["sessionID"]
  readonly requestID: { readonly sessionID: string; readonly requestID: string }["requestID"]
  readonly reply: { readonly reply: "once" | "always" | "reject"; readonly message?: string | undefined }["reply"]
  readonly message?: { readonly reply: "once" | "always" | "reject"; readonly message?: string | undefined }["message"]
 }

-export type PermissionReplyOutput = void
+export type PermissionsReplyOutput = void

-export type FileReadInput = {
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  }["location"]
-  readonly path: string
-}
-
-export type FileReadOutput = globalThis.Uint8Array
-
-export type FileListInput = {
+export type FilesListInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
    readonly path?: string | undefined
@@ -2720,7 +2450,7 @@ export type FileListInput = {
  }["path"]
 }

-export type FileListOutput = {
+export type FilesListOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -2729,7 +2459,7 @@ export type FileListOutput = {
  readonly data: ReadonlyArray<{ readonly path: string; readonly type: "file" | "directory" }>
 }

-export type FileFindInput = {
+export type FilesFindInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
    readonly query: string
@@ -2756,7 +2486,7 @@ export type FileFindInput = {
  }["limit"]
 }

-export type FileFindOutput = {
+export type FilesFindOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -2765,13 +2495,13 @@ export type FileFindOutput = {
  readonly data: ReadonlyArray<{ readonly path: string; readonly type: "file" | "directory" }>
 }

-export type CommandListInput = {
+export type CommandsListInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
 }

-export type CommandListOutput = {
+export type CommandsListOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -2787,13 +2517,13 @@ export type CommandListOutput = {
  }>
 }

-export type SkillListInput = {
+export type SkillsListInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
 }

-export type SkillListOutput = {
+export type SkillsListOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -2803,1370 +2533,20 @@ export type SkillListOutput = {
    readonly name: string
    readonly description?: string
    readonly slash?: boolean
-    readonly autoinvoke?: boolean
    readonly location: string
    readonly content: string
  }>
 }

-export type EventSubscribeOutput =
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "models-dev.refreshed"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {}
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "integration.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {}
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "integration.connection.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly integrationID: string }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "catalog.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {}
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "agent.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {}
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.created"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly sessionID: string
-        readonly info: {
-          readonly id: string
-          readonly slug: string
-          readonly projectID: string
-          readonly workspaceID?: string
-          readonly directory: string
-          readonly path?: string
-          readonly parentID?: string
-          readonly summary?: {
-            readonly additions: number
-            readonly deletions: number
-            readonly files: number
-            readonly diffs?: ReadonlyArray<{
-              readonly file?: string
-              readonly patch?: string
-              readonly additions: number
-              readonly deletions: number
-              readonly status?: "added" | "deleted" | "modified"
-            }>
-          }
-          readonly cost?: number
-          readonly tokens?: {
-            readonly input: number
-            readonly output: number
-            readonly reasoning: number
-            readonly cache: { readonly read: number; readonly write: number }
-          }
-          readonly share?: { readonly url: string }
-          readonly title: string
-          readonly agent?: string
-          readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string }
-          readonly version: string
-          readonly metadata?: { readonly [x: string]: any }
-          readonly time: {
-            readonly created: number
-            readonly updated: number
-            readonly compacting?: number
-            readonly archived?: number
-          }
-          readonly permission?: ReadonlyArray<{
-            readonly permission: string
-            readonly pattern: string
-            readonly action: "allow" | "deny" | "ask"
-          }>
-          readonly revert?: {
-            readonly messageID: string
-            readonly partID?: string
-            readonly snapshot?: string
-            readonly diff?: string
-          }
-        }
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly sessionID: string
-        readonly info: {
-          readonly id: string
-          readonly slug: string
-          readonly projectID: string
-          readonly workspaceID?: string
-          readonly directory: string
-          readonly path?: string
-          readonly parentID?: string
-          readonly summary?: {
-            readonly additions: number
-            readonly deletions: number
-            readonly files: number
-            readonly diffs?: ReadonlyArray<{
-              readonly file?: string
-              readonly patch?: string
-              readonly additions: number
-              readonly deletions: number
-              readonly status?: "added" | "deleted" | "modified"
-            }>
-          }
-          readonly cost?: number
-          readonly tokens?: {
-            readonly input: number
-            readonly output: number
-            readonly reasoning: number
-            readonly cache: { readonly read: number; readonly write: number }
-          }
-          readonly share?: { readonly url: string }
-          readonly title: string
-          readonly agent?: string
-          readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string }
-          readonly version: string
-          readonly metadata?: { readonly [x: string]: any }
-          readonly time: {
-            readonly created: number
-            readonly updated: number
-            readonly compacting?: number
-            readonly archived?: number
-          }
-          readonly permission?: ReadonlyArray<{
-            readonly permission: string
-            readonly pattern: string
-            readonly action: "allow" | "deny" | "ask"
-          }>
-          readonly revert?: {
-            readonly messageID: string
-            readonly partID?: string
-            readonly snapshot?: string
-            readonly diff?: string
-          }
-        }
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.deleted"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly sessionID: string
-        readonly info: {
-          readonly id: string
-          readonly slug: string
-          readonly projectID: string
-          readonly workspaceID?: string
-          readonly directory: string
-          readonly path?: string
-          readonly parentID?: string
-          readonly summary?: {
-            readonly additions: number
-            readonly deletions: number
-            readonly files: number
-            readonly diffs?: ReadonlyArray<{
-              readonly file?: string
-              readonly patch?: string
-              readonly additions: number
-              readonly deletions: number
-              readonly status?: "added" | "deleted" | "modified"
-            }>
-          }
-          readonly cost?: number
-          readonly tokens?: {
-            readonly input: number
-            readonly output: number
-            readonly reasoning: number
-            readonly cache: { readonly read: number; readonly write: number }
-          }
-          readonly share?: { readonly url: string }
-          readonly title: string
-          readonly agent?: string
-          readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string }
-          readonly version: string
-          readonly metadata?: { readonly [x: string]: any }
-          readonly time: {
-            readonly created: number
-            readonly updated: number
-            readonly compacting?: number
-            readonly archived?: number
-          }
-          readonly permission?: ReadonlyArray<{
-            readonly permission: string
-            readonly pattern: string
-            readonly action: "allow" | "deny" | "ask"
-          }>
-          readonly revert?: {
-            readonly messageID: string
-            readonly partID?: string
-            readonly snapshot?: string
-            readonly diff?: string
-          }
-        }
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "message.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly sessionID: string
-        readonly info:
-          | {
-              readonly id: string
-              readonly sessionID: string
-              readonly role: "user"
-              readonly time: { readonly created: number }
-              readonly format?:
-                | (
-                    | { readonly type: "text" }
-                    | {
-                        readonly type: "json_schema"
-                        readonly schema: { readonly [x: string]: any }
-                        readonly retryCount?: number | undefined | undefined
-                      }
-                  )
-                | undefined
-              readonly summary?:
-                | {
-                    readonly title?: string | undefined
-                    readonly body?: string | undefined
-                    readonly diffs: ReadonlyArray<{
-                      readonly file?: string
-                      readonly patch?: string
-                      readonly additions: number
-                      readonly deletions: number
-                      readonly status?: "added" | "deleted" | "modified"
-                    }>
-                  }
-                | undefined
-              readonly agent: string
-              readonly model: {
-                readonly providerID: string
-                readonly modelID: string
-                readonly variant?: string | undefined
-              }
-              readonly system?: string | undefined
-              readonly tools?: { readonly [x: string]: boolean } | undefined
-            }
-          | {
-              readonly id: string
-              readonly sessionID: string
-              readonly role: "assistant"
-              readonly time: { readonly created: number; readonly completed?: number | undefined }
-              readonly error?:
-                | {
-                    readonly name: "ProviderAuthError"
-                    readonly data: { readonly providerID: string; readonly message: string }
-                  }
-                | {
-                    readonly name: "UnknownError"
-                    readonly data: { readonly message: string; readonly ref?: string | undefined }
-                  }
-                | { readonly name: "MessageOutputLengthError"; readonly data: {} }
-                | { readonly name: "MessageAbortedError"; readonly data: { readonly message: string } }
-                | {
-                    readonly name: "StructuredOutputError"
-                    readonly data: { readonly message: string; readonly retries: number }
-                  }
-                | {
-                    readonly name: "ContextOverflowError"
-                    readonly data: { readonly message: string; readonly responseBody?: string | undefined }
-                  }
-                | { readonly name: "ContentFilterError"; readonly data: { readonly message: string } }
-                | {
-                    readonly name: "APIError"
-                    readonly data: {
-                      readonly message: string
-                      readonly statusCode?: number | undefined
-                      readonly isRetryable: boolean
-                      readonly responseHeaders?: { readonly [x: string]: string } | undefined
-                      readonly responseBody?: string | undefined
-                      readonly metadata?: { readonly [x: string]: string } | undefined
-                    }
-                  }
-                | undefined
-              readonly parentID: string
-              readonly modelID: string
-              readonly providerID: string
-              readonly mode: string
-              readonly agent: string
-              readonly path: { readonly cwd: string; readonly root: string }
-              readonly summary?: boolean | undefined
-              readonly cost: number
-              readonly tokens: {
-                readonly total?: number | undefined
-                readonly input: number
-                readonly output: number
-                readonly reasoning: number
-                readonly cache: { readonly read: number; readonly write: number }
-              }
-              readonly structured?: any | undefined
-              readonly variant?: string | undefined
-              readonly finish?: string | undefined
-            }
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "message.removed"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly sessionID: string; readonly messageID: string }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "message.part.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly sessionID: string
-        readonly part:
-          | {
-              readonly id: string
-              readonly sessionID: string
-              readonly messageID: string
-              readonly type: "text"
-              readonly text: string
-              readonly synthetic?: boolean | undefined
-              readonly ignored?: boolean | undefined
-              readonly time?: { readonly start: number; readonly end?: number | undefined } | undefined
-              readonly metadata?: { readonly [x: string]: any } | undefined
-            }
-          | {
-              readonly id: string
-              readonly sessionID: string
-              readonly messageID: string
-              readonly type: "subtask"
-              readonly prompt: string
-              readonly description: string
-              readonly agent: string
-              readonly model?: { readonly providerID: string; readonly modelID: string } | undefined
-              readonly command?: string | undefined
-            }
-          | {
-              readonly id: string
-              readonly sessionID: string
-              readonly messageID: string
-              readonly type: "reasoning"
-              readonly text: string
-              readonly metadata?: { readonly [x: string]: any } | undefined
-              readonly time: { readonly start: number; readonly end?: number | undefined }
-            }
-          | {
-              readonly id: string
-              readonly sessionID: string
-              readonly messageID: string
-              readonly type: "file"
-              readonly mime: string
-              readonly filename?: string | undefined
-              readonly url: string
-              readonly source?:
-                | (
-                    | {
-                        readonly text: { readonly value: string; readonly start: number; readonly end: number }
-                        readonly type: "file"
-                        readonly path: string
-                      }
-                    | {
-                        readonly text: { readonly value: string; readonly start: number; readonly end: number }
-                        readonly type: "symbol"
-                        readonly path: string
-                        readonly range: {
-                          readonly start: { readonly line: number; readonly character: number }
-                          readonly end: { readonly line: number; readonly character: number }
-                        }
-                        readonly name: string
-                        readonly kind: number
-                      }
-                    | {
-                        readonly text: { readonly value: string; readonly start: number; readonly end: number }
-                        readonly type: "resource"
-                        readonly clientName: string
-                        readonly uri: string
-                      }
-                  )
-                | undefined
-            }
-          | {
-              readonly id: string
-              readonly sessionID: string
-              readonly messageID: string
-              readonly type: "tool"
-              readonly callID: string
-              readonly tool: string
-              readonly state:
-                | { readonly status: "pending"; readonly input: { readonly [x: string]: any }; readonly raw: string }
-                | {
-                    readonly status: "running"
-                    readonly input: { readonly [x: string]: any }
-                    readonly title?: string | undefined
-                    readonly metadata?: { readonly [x: string]: any } | undefined
-                    readonly time: { readonly start: number }
-                  }
-                | {
-                    readonly status: "completed"
-                    readonly input: { readonly [x: string]: any }
-                    readonly output: string
-                    readonly title: string
-                    readonly metadata: { readonly [x: string]: any }
-                    readonly time: {
-                      readonly start: number
-                      readonly end: number
-                      readonly compacted?: number | undefined
-                    }
-                    readonly attachments?:
-                      | ReadonlyArray<{
-                          readonly id: string
-                          readonly sessionID: string
-                          readonly messageID: string
-                          readonly type: "file"
-                          readonly mime: string
-                          readonly filename?: string | undefined
-                          readonly url: string
-                          readonly source?:
-                            | (
-                                | {
-                                    readonly text: {
-                                      readonly value: string
-                                      readonly start: number
-                                      readonly end: number
-                                    }
-                                    readonly type: "file"
-                                    readonly path: string
-                                  }
-                                | {
-                                    readonly text: {
-                                      readonly value: string
-                                      readonly start: number
-                                      readonly end: number
-                                    }
-                                    readonly type: "symbol"
-                                    readonly path: string
-                                    readonly range: {
-                                      readonly start: { readonly line: number; readonly character: number }
-                                      readonly end: { readonly line: number; readonly character: number }
-                                    }
-                                    readonly name: string
-                                    readonly kind: number
-                                  }
-                                | {
-                                    readonly text: {
-                                      readonly value: string
-                                      readonly start: number
-                                      readonly end: number
-                                    }
-                                    readonly type: "resource"
-                                    readonly clientName: string
-                                    readonly uri: string
-                                  }
-                              )
-                            | undefined
-                        }>
-                      | undefined
-                  }
-                | {
-                    readonly status: "error"
-                    readonly input: { readonly [x: string]: any }
-                    readonly error: string
-                    readonly metadata?: { readonly [x: string]: any } | undefined
-                    readonly time: { readonly start: number; readonly end: number }
-                  }
-              readonly metadata?: { readonly [x: string]: any } | undefined
-            }
-          | {
-              readonly id: string
-              readonly sessionID: string
-              readonly messageID: string
-              readonly type: "step-start"
-              readonly snapshot?: string | undefined
-            }
-          | {
-              readonly id: string
-              readonly sessionID: string
-              readonly messageID: string
-              readonly type: "step-finish"
-              readonly reason: string
-              readonly snapshot?: string | undefined
-              readonly cost: number
-              readonly tokens: {
-                readonly total?: number | undefined
-                readonly input: number
-                readonly output: number
-                readonly reasoning: number
-                readonly cache: { readonly read: number; readonly write: number }
-              }
-            }
-          | {
-              readonly id: string
-              readonly sessionID: string
-              readonly messageID: string
-              readonly type: "snapshot"
-              readonly snapshot: string
-            }
-          | {
-              readonly id: string
-              readonly sessionID: string
-              readonly messageID: string
-              readonly type: "patch"
-              readonly hash: string
-              readonly files: ReadonlyArray<string>
-            }
-          | {
-              readonly id: string
-              readonly sessionID: string
-              readonly messageID: string
-              readonly type: "agent"
-              readonly name: string
-              readonly source?: { readonly value: string; readonly start: number; readonly end: number } | undefined
-            }
-          | {
-              readonly id: string
-              readonly sessionID: string
-              readonly messageID: string
-              readonly type: "retry"
-              readonly attempt: number
-              readonly error: {
-                readonly name: "APIError"
-                readonly data: {
-                  readonly message: string
-                  readonly statusCode?: number | undefined
-                  readonly isRetryable: boolean
-                  readonly responseHeaders?: { readonly [x: string]: string } | undefined
-                  readonly responseBody?: string | undefined
-                  readonly metadata?: { readonly [x: string]: string } | undefined
-                }
-              }
-              readonly time: { readonly created: number }
-            }
-          | {
-              readonly id: string
-              readonly sessionID: string
-              readonly messageID: string
-              readonly type: "compaction"
-              readonly auto: boolean
-              readonly overflow?: boolean | undefined
-              readonly tail_start_id?: string | undefined
-            }
-        readonly time: number
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "message.part.removed"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly sessionID: string; readonly messageID: string; readonly partID: string }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.agent.switched"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly agent: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.model.switched"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly model: { readonly id: string; readonly providerID: string; readonly variant?: string }
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.moved"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly location: { readonly directory: string; readonly workspaceID?: string }
-        readonly subdirectory?: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.renamed"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly timestamp: number; readonly sessionID: string; readonly title: string }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.forked"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly parentID: string
-        readonly messageID?: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.prompted"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly prompt: {
-          readonly text: string
-          readonly files?: ReadonlyArray<{
-            readonly uri: string
-            readonly mime: string
-            readonly name?: string
-            readonly description?: string
-            readonly source?: { readonly start: number; readonly end: number; readonly text: string }
-          }>
-          readonly agents?: ReadonlyArray<{
-            readonly name: string
-            readonly source?: { readonly start: number; readonly end: number; readonly text: string }
-          }>
-        }
-        readonly delivery: "steer" | "queue"
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.prompt.admitted"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly prompt: {
-          readonly text: string
-          readonly files?: ReadonlyArray<{
-            readonly uri: string
-            readonly mime: string
-            readonly name?: string
-            readonly description?: string
-            readonly source?: { readonly start: number; readonly end: number; readonly text: string }
-          }>
-          readonly agents?: ReadonlyArray<{
-            readonly name: string
-            readonly source?: { readonly start: number; readonly end: number; readonly text: string }
-          }>
-        }
-        readonly delivery: "steer" | "queue"
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.context.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly text: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.synthetic"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly text: string
-        readonly description?: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.skill.activated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly name: string
-        readonly text: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.shell.started"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly callID: string
-        readonly command: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.shell.ended"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly callID: string
-        readonly output: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.step.started"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly assistantMessageID: string
-        readonly agent: string
-        readonly model: { readonly id: string; readonly providerID: string; readonly variant?: string }
-        readonly snapshot?: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.step.ended"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly assistantMessageID: string
-        readonly finish: string
-        readonly cost: number
-        readonly tokens: {
-          readonly input: number
-          readonly output: number
-          readonly reasoning: number
-          readonly cache: { readonly read: number; readonly write: number }
-        }
-        readonly snapshot?: string
-        readonly files?: ReadonlyArray<string>
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.step.failed"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly assistantMessageID: string
-        readonly error: { readonly type: "unknown"; readonly message: string }
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.text.started"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly assistantMessageID: string
-        readonly textID: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.text.delta"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly assistantMessageID: string
-        readonly textID: string
-        readonly delta: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.text.ended"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly assistantMessageID: string
-        readonly textID: string
-        readonly text: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.reasoning.started"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly assistantMessageID: string
-        readonly reasoningID: string
-        readonly providerMetadata?: { readonly [x: string]: { readonly [x: string]: unknown } }
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.reasoning.delta"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly assistantMessageID: string
-        readonly reasoningID: string
-        readonly delta: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.reasoning.ended"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly assistantMessageID: string
-        readonly reasoningID: string
-        readonly text: string
-        readonly providerMetadata?: { readonly [x: string]: { readonly [x: string]: unknown } }
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.tool.input.started"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly assistantMessageID: string
-        readonly callID: string
-        readonly name: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.tool.input.delta"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly assistantMessageID: string
-        readonly callID: string
-        readonly delta: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.tool.input.ended"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly assistantMessageID: string
-        readonly callID: string
-        readonly text: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.tool.called"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly assistantMessageID: string
-        readonly callID: string
-        readonly tool: string
-        readonly input: { readonly [x: string]: unknown }
-        readonly provider: {
-          readonly executed: boolean
-          readonly metadata?: { readonly [x: string]: { readonly [x: string]: unknown } }
-        }
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.tool.progress"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly assistantMessageID: string
-        readonly callID: string
-        readonly structured: { readonly [x: string]: unknown }
-        readonly content: ReadonlyArray<
-          | { readonly type: "text"; readonly text: string }
-          | { readonly type: "file"; readonly uri: string; readonly mime: string; readonly name?: string }
-        >
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.tool.success"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly assistantMessageID: string
-        readonly callID: string
-        readonly structured: { readonly [x: string]: unknown }
-        readonly content: ReadonlyArray<
-          | { readonly type: "text"; readonly text: string }
-          | { readonly type: "file"; readonly uri: string; readonly mime: string; readonly name?: string }
-        >
-        readonly outputPaths?: ReadonlyArray<string>
-        readonly result?: unknown
-        readonly provider: {
-          readonly executed: boolean
-          readonly metadata?: { readonly [x: string]: { readonly [x: string]: unknown } }
-        }
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.tool.failed"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly assistantMessageID: string
-        readonly callID: string
-        readonly error: { readonly type: "unknown"; readonly message: string }
-        readonly result?: unknown
-        readonly provider: {
-          readonly executed: boolean
-          readonly metadata?: { readonly [x: string]: { readonly [x: string]: unknown } }
-        }
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.retried"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly attempt: number
-        readonly error: {
-          readonly message: string
-          readonly statusCode?: number
-          readonly isRetryable: boolean
-          readonly responseHeaders?: { readonly [x: string]: string }
-          readonly responseBody?: string
-          readonly metadata?: { readonly [x: string]: string }
-        }
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.compaction.started"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly reason: "auto" | "manual"
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.compaction.delta"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly text: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.compaction.ended"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly messageID: string
-        readonly reason: "auto" | "manual"
-        readonly text: string
-        readonly recent: string
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.revert.staged"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly timestamp: number
-        readonly sessionID: string
-        readonly revert: {
-          readonly messageID: string
-          readonly partID?: string
-          readonly snapshot?: string
-          readonly diff?: string
-          readonly files?: ReadonlyArray<{
-            readonly path: string
-            readonly status: "added" | "modified" | "deleted"
-            readonly additions: number
-            readonly deletions: number
-            readonly patch: string
-          }>
-        }
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.revert.cleared"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly timestamp: number; readonly sessionID: string }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "session.next.revert.committed"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly timestamp: number; readonly sessionID: string; readonly messageID: string }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "file.edited"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly file: string }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "reference.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {}
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "permission.v2.asked"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly id: string
-        readonly sessionID: string
-        readonly action: string
-        readonly resources: ReadonlyArray<string>
-        readonly save?: ReadonlyArray<string>
-        readonly metadata?: { readonly [x: string]: unknown }
-        readonly source?: { readonly type: "tool"; readonly messageID: string; readonly callID: string }
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "permission.v2.replied"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly sessionID: string
-        readonly requestID: string
-        readonly reply: "once" | "always" | "reject"
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "plugin.added"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly id: string }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "project.directories.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly projectID: string }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "skill.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {}
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "file.watcher.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly file: string; readonly event: "add" | "change" | "unlink" }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "pty.created"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly info: {
-          readonly id: string
-          readonly title: string
-          readonly command: string
-          readonly args: ReadonlyArray<string>
-          readonly cwd: string
-          readonly status: "running" | "exited"
-          readonly pid: number
-          readonly exitCode?: number
-        }
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "pty.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly info: {
-          readonly id: string
-          readonly title: string
-          readonly command: string
-          readonly args: ReadonlyArray<string>
-          readonly cwd: string
-          readonly status: "running" | "exited"
-          readonly pid: number
-          readonly exitCode?: number
-        }
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "pty.exited"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly id: string; readonly exitCode: number }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "pty.deleted"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly id: string }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "shell.created"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly info: {
-          readonly id: string
-          readonly status: "running" | "exited" | "timeout" | "killed"
-          readonly command: string
-          readonly cwd: string
-          readonly shell: string
-          readonly file: string
-          readonly pid?: number
-          readonly exit?: number
-          readonly metadata: { readonly [x: string]: unknown }
-          readonly time: { readonly started: number; readonly completed?: number }
-        }
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "shell.exited"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly id: string
-        readonly exit?: number
-        readonly status: "running" | "exited" | "timeout" | "killed"
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "shell.deleted"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly id: string }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "question.v2.asked"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly id: string
-        readonly sessionID: string
-        readonly questions: ReadonlyArray<{
-          readonly question: string
-          readonly header: string
-          readonly options: ReadonlyArray<{ readonly label: string; readonly description: string }>
-          readonly multiple?: boolean
-          readonly custom?: boolean
-        }>
-        readonly tool?: { readonly messageID: string; readonly callID: string }
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "question.v2.replied"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly sessionID: string
-        readonly requestID: string
-        readonly answers: ReadonlyArray<ReadonlyArray<string>>
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "question.v2.rejected"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: { readonly sessionID: string; readonly requestID: string }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown }
-      readonly type: "todo.updated"
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number }
-      readonly location?: { readonly directory: string; readonly workspaceID?: string }
-      readonly data: {
-        readonly sessionID: string
-        readonly todos: ReadonlyArray<{ readonly content: string; readonly status: string; readonly priority: string }>
-      }
-    }
-  | {
-      readonly id: string
-      readonly metadata?: { readonly [x: string]: unknown } | undefined
-      readonly durable?: { readonly aggregateID: string; readonly seq: number; readonly version: number } | undefined
-      readonly location?: { readonly directory: string; readonly workspaceID?: string } | undefined
-      readonly type: "server.connected"
-      readonly data: {}
-    }
+export type EventsSubscribeOutput = OpenCodeEventEncoded

-export type PtyListInput = {
+export type PtysListInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
 }

-export type PtyListOutput = {
+export type PtysListOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -4184,7 +2564,7 @@ export type PtyListOutput = {
  }>
 }

-export type PtyCreateInput = {
+export type PtysCreateInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
@@ -4225,7 +2605,7 @@ export type PtyCreateInput = {
  }["env"]
 }

-export type PtyCreateOutput = {
+export type PtysCreateOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -4243,14 +2623,14 @@ export type PtyCreateOutput = {
  }
 }

-export type PtyGetInput = {
+export type PtysGetInput = {
  readonly ptyID: { readonly ptyID: string }["ptyID"]
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
 }

-export type PtyGetOutput = {
+export type PtysGetOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -4268,7 +2648,7 @@ export type PtyGetOutput = {
  }
 }

-export type PtyUpdateInput = {
+export type PtysUpdateInput = {
  readonly ptyID: { readonly ptyID: string }["ptyID"]
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
@@ -4280,7 +2660,7 @@ export type PtyUpdateInput = {
  readonly size?: { readonly title?: string; readonly size?: { readonly rows: number; readonly cols: number } }["size"]
 }

-export type PtyUpdateOutput = {
+export type PtysUpdateOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -4298,176 +2678,22 @@ export type PtyUpdateOutput = {
  }
 }

-export type PtyRemoveInput = {
+export type PtysRemoveInput = {
  readonly ptyID: { readonly ptyID: string }["ptyID"]
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
 }

-export type PtyRemoveOutput = void
+export type PtysRemoveOutput = void

-export type ShellListInput = {
+export type QuestionsListRequestsInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
 }

-export type ShellListOutput = {
-  readonly location: {
-    readonly directory: string
-    readonly workspaceID?: string
-    readonly project: { readonly id: string; readonly directory: string }
-  }
-  readonly data: ReadonlyArray<{
-    readonly id: string
-    readonly status: "running" | "exited" | "timeout" | "killed"
-    readonly command: string
-    readonly cwd: string
-    readonly shell: string
-    readonly file: string
-    readonly pid?: number
-    readonly exit?: number | "Infinity" | "-Infinity" | "NaN"
-    readonly metadata: { readonly [x: string]: JsonValue }
-    readonly time: {
-      readonly started: number | "Infinity" | "-Infinity" | "NaN"
-      readonly completed?: number | "Infinity" | "-Infinity" | "NaN"
-    }
-  }>
-}
-
-export type ShellCreateInput = {
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  }["location"]
-  readonly command: {
-    readonly command: string
-    readonly cwd?: string
-    readonly timeout?: number
-    readonly metadata?: { readonly [x: string]: JsonValue }
-  }["command"]
-  readonly cwd?: {
-    readonly command: string
-    readonly cwd?: string
-    readonly timeout?: number
-    readonly metadata?: { readonly [x: string]: JsonValue }
-  }["cwd"]
-  readonly timeout?: {
-    readonly command: string
-    readonly cwd?: string
-    readonly timeout?: number
-    readonly metadata?: { readonly [x: string]: JsonValue }
-  }["timeout"]
-  readonly metadata?: {
-    readonly command: string
-    readonly cwd?: string
-    readonly timeout?: number
-    readonly metadata?: { readonly [x: string]: JsonValue }
-  }["metadata"]
-}
-
-export type ShellCreateOutput = {
-  readonly location: {
-    readonly directory: string
-    readonly workspaceID?: string
-    readonly project: { readonly id: string; readonly directory: string }
-  }
-  readonly data: {
-    readonly id: string
-    readonly status: "running" | "exited" | "timeout" | "killed"
-    readonly command: string
-    readonly cwd: string
-    readonly shell: string
-    readonly file: string
-    readonly pid?: number
-    readonly exit?: number | "Infinity" | "-Infinity" | "NaN"
-    readonly metadata: { readonly [x: string]: JsonValue }
-    readonly time: {
-      readonly started: number | "Infinity" | "-Infinity" | "NaN"
-      readonly completed?: number | "Infinity" | "-Infinity" | "NaN"
-    }
-  }
-}
-
-export type ShellGetInput = {
-  readonly id: { readonly id: string }["id"]
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  }["location"]
-}
-
-export type ShellGetOutput = {
-  readonly location: {
-    readonly directory: string
-    readonly workspaceID?: string
-    readonly project: { readonly id: string; readonly directory: string }
-  }
-  readonly data: {
-    readonly id: string
-    readonly status: "running" | "exited" | "timeout" | "killed"
-    readonly command: string
-    readonly cwd: string
-    readonly shell: string
-    readonly file: string
-    readonly pid?: number
-    readonly exit?: number | "Infinity" | "-Infinity" | "NaN"
-    readonly metadata: { readonly [x: string]: JsonValue }
-    readonly time: {
-      readonly started: number | "Infinity" | "-Infinity" | "NaN"
-      readonly completed?: number | "Infinity" | "-Infinity" | "NaN"
-    }
-  }
-}
-
-export type ShellOutputInput = {
-  readonly id: { readonly id: string }["id"]
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-    readonly cursor?: number | undefined
-    readonly limit?: number | undefined
-  }["location"]
-  readonly cursor?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-    readonly cursor?: number | undefined
-    readonly limit?: number | undefined
-  }["cursor"]
-  readonly limit?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-    readonly cursor?: number | undefined
-    readonly limit?: number | undefined
-  }["limit"]
-}
-
-export type ShellOutputOutput = {
-  readonly location: {
-    readonly directory: string
-    readonly workspaceID?: string
-    readonly project: { readonly id: string; readonly directory: string }
-  }
-  readonly data: {
-    readonly output: string
-    readonly cursor: number
-    readonly size: number
-    readonly truncated: boolean
-  }
-}
-
-export type ShellRemoveInput = {
-  readonly id: { readonly id: string }["id"]
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  }["location"]
-}
-
-export type ShellRemoveOutput = void
-
-export type QuestionListRequestsInput = {
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  }["location"]
-}
-
-export type QuestionListRequestsOutput = {
+export type QuestionsListRequestsOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -4487,9 +2713,9 @@ export type QuestionListRequestsOutput = {
  }>
 }

-export type QuestionListInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }
+export type QuestionsListInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }

-export type QuestionListOutput = {
+export type QuestionsListOutput = {
  readonly data: ReadonlyArray<{
    readonly id: string
    readonly sessionID: string
@@ -4504,28 +2730,28 @@ export type QuestionListOutput = {
  }>
 }["data"]

-export type QuestionReplyInput = {
+export type QuestionsReplyInput = {
  readonly sessionID: { readonly sessionID: string; readonly requestID: string }["sessionID"]
  readonly requestID: { readonly sessionID: string; readonly requestID: string }["requestID"]
  readonly answers: { readonly answers: ReadonlyArray<ReadonlyArray<string>> }["answers"]
 }

-export type QuestionReplyOutput = void
+export type QuestionsReplyOutput = void

-export type QuestionRejectInput = {
+export type QuestionsRejectInput = {
  readonly sessionID: { readonly sessionID: string; readonly requestID: string }["sessionID"]
  readonly requestID: { readonly sessionID: string; readonly requestID: string }["requestID"]
 }

-export type QuestionRejectOutput = void
+export type QuestionsRejectOutput = void

-export type ReferenceListInput = {
+export type ReferencesListInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
 }

-export type ReferenceListOutput = {
+export type ReferencesListOutput = {
  readonly location: {
    readonly directory: string
    readonly workspaceID?: string
@@ -4548,7 +2774,7 @@ export type ReferenceListOutput = {
  }>
 }

-export type ProjectCopyCreateInput = {
+export type ProjectCopiesCreateInput = {
  readonly projectID: { readonly projectID: string }["projectID"]
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
@@ -4558,9 +2784,9 @@ export type ProjectCopyCreateInput = {
  readonly name?: { readonly strategy: string; readonly directory: string; readonly name?: string }["name"]
 }

-export type ProjectCopyCreateOutput = { readonly directory: string }
+export type ProjectCopiesCreateOutput = { readonly directory: string }

-export type ProjectCopyRemoveInput = {
+export type ProjectCopiesRemoveInput = {
  readonly projectID: { readonly projectID: string }["projectID"]
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
@@ -4569,13 +2795,13 @@ export type ProjectCopyRemoveInput = {
  readonly force: { readonly directory: string; readonly force: boolean }["force"]
 }

-export type ProjectCopyRemoveOutput = void
+export type ProjectCopiesRemoveOutput = void

-export type ProjectCopyRefreshInput = {
+export type ProjectCopiesRefreshInput = {
  readonly projectID: { readonly projectID: string }["projectID"]
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
  }["location"]
 }

-export type ProjectCopyRefreshOutput = void
+export type ProjectCopiesRefreshOutput = void
@@ -1,3 +1,2 @@
 export * from "./generated/index"
-export type { EventSubscribeOutput as OpenCodeEvent } from "./generated/types"
-export type OpenCodeClient = ReturnType<typeof import("./generated/client").make>
+export type { EventsSubscribeOutput as OpenCodeEvent } from "./generated/types"
@@ -3,7 +3,6 @@ import { Schema } from "effect"
 import { AgentV2 } from "@opencode-ai/core/agent"
 import { Location as CoreLocation } from "@opencode-ai/core/location"
 import { ModelV2 } from "@opencode-ai/core/model"
-import { ProjectV2 } from "@opencode-ai/core/project"
 import { SessionV2 } from "@opencode-ai/core/session"
 import { SessionInput as CoreSessionInput } from "@opencode-ai/core/session/input"
 import { SessionMessage as CoreSessionMessage } from "@opencode-ai/core/session/message"
@@ -20,21 +19,17 @@ import { SessionMessage } from "@opencode-ai/schema/session-message"
 import { Workspace } from "@opencode-ai/schema/workspace"
 import { Api } from "@opencode-ai/server/api"
 import { compile, emitPromise } from "@opencode-ai/httpapi-codegen"
-import { ClientApi, endpointNames, groupNames, promiseOmitEndpoints } from "../src/contract"
+import { ClientApi, endpointNames, groupNames, omitEndpoints } from "../src/contract"

 test("Core and Server reuse the authoritative Schema and Protocol values", () => {
  expect(AgentV2.ID).toBe(Agent.ID)
  expect(CoreLocation.Ref).toBe(Location.Ref)
  expect(ModelV2.Ref).toBe(Model.Ref)
  expect(SessionV2.Info).toBe(Session.Info)
-  expect(ProjectV2.Current).toBe(Project.Current)
-  expect(ProjectV2.Directory).toBe(Project.Directory)
-  expect(ProjectV2.Directories).toBe(Project.Directories)
  expect(CoreSessionInput.Admitted).toBe(SessionInput.Admitted)
  expect(CoreSessionMessage.Message).toBe(SessionMessage.Message)
  expect(CorePrompt).toBe(Prompt)
  expect(Api.groups["server.session"].identifier).toBe("server.session")
-  expect(Api.groups["server.project"].identifier).toBe("server.project")
  expect(Object.keys(ClientApi.groups)).toEqual(Object.keys(Api.groups))
  expect(Session.ID.create()).toStartWith("ses_")
  expect(Project.ID.global).toBe("global")
@@ -43,8 +38,8 @@ test("Core and Server reuse the authoritative Schema and Protocol values", () =>
 })

 test("client and Server contracts generate identically", () => {
-  const server = compile(Api, { groupNames, endpointNames, omitEndpoints: promiseOmitEndpoints })
-  const client = compile(ClientApi, { groupNames, endpointNames, omitEndpoints: promiseOmitEndpoints })
+  const server = compile(Api, { groupNames, endpointNames, omitEndpoints })
+  const client = compile(ClientApi, { groupNames, endpointNames, omitEndpoints })

  expect(emitPromise(client)).toEqual(emitPromise(server))
 })
@@ -3,19 +3,19 @@ import { DateTime, Effect, Stream } from "effect"
 import { HttpClient, HttpClientResponse } from "effect/unstable/http"
 import { AbsolutePath, Agent, Location, Model, OpenCode, Prompt, Session, SessionMessage } from "../src/effect"

-test("session.get returns the decoded Effect projection", async () => {
+test("sessions.get returns the decoded Effect projection", async () => {
  const httpClient = HttpClient.make((request) =>
    Effect.succeed(HttpClientResponse.fromWeb(request, Response.json(session))),
  )
  const result = await Effect.gen(function* () {
    const client = yield* OpenCode.make({ baseUrl: "http://localhost:3000" })
-    return yield* client.session.get({ sessionID: Session.ID.make("ses_test") })
+    return yield* client.sessions.get({ sessionID: Session.ID.make("ses_test") })
  }).pipe(Effect.provideService(HttpClient.HttpClient, httpClient), Effect.runPromise)

  expect(DateTime.toEpochMillis(result.time.created)).toBe(1_717_171_717_000)
 })

-test("event.subscribe exposes and decodes the native Effect event stream", async () => {
+test("events.subscribe exposes and decodes the native Effect event stream", async () => {
  const httpClient = HttpClient.make((request) =>
    Effect.succeed(
      HttpClientResponse.fromWeb(
@@ -30,7 +30,7 @@ test("event.subscribe exposes and decodes the native Effect event stream", async
  )
  const events = await Effect.gen(function* () {
    const client = yield* OpenCode.make({ baseUrl: "http://localhost:3000" })
-    return yield* client.event.subscribe().pipe(Stream.runCollect)
+    return yield* client.events.subscribe().pipe(Stream.runCollect)
  }).pipe(Effect.provideService(HttpClient.HttpClient, httpClient), Effect.runPromise)

  expect(Array.from(events).map((event) => event.type)).toEqual(["server.connected", "session.next.model.switched"])
@@ -40,7 +40,7 @@ test("event.subscribe exposes and decodes the native Effect event stream", async
  expect(durable.durable).toEqual({ aggregateID: "ses_test", seq: 1, version: 1 })
 })

-test("event.subscribe terminates on Effect protocol decode failures", async () => {
+test("events.subscribe terminates on Effect protocol decode failures", async () => {
  const httpClient = HttpClient.make((request) =>
    Effect.succeed(
      HttpClientResponse.fromWeb(
@@ -53,7 +53,7 @@ test("event.subscribe terminates on Effect protocol decode failures", async () =
  )
  const error = await Effect.gen(function* () {
    const client = yield* OpenCode.make({ baseUrl: "http://localhost:3000" })
-    return yield* client.event.subscribe().pipe(Stream.runCollect, Effect.flip)
+    return yield* client.events.subscribe().pipe(Stream.runCollect, Effect.flip)
  }).pipe(Effect.provideService(HttpClient.HttpClient, httpClient), Effect.runPromise)

  expect(error._tag).toBe("ClientError")
@@ -112,41 +112,41 @@ test("session methods retain decoded Effect inputs and outputs", async () => {
  })
  const result = await Effect.gen(function* () {
    const client = yield* OpenCode.make({ baseUrl: "http://localhost:3000" })
-    const page = yield* client.session.list({ limit: 10 })
-    const active = yield* client.session.active()
-    const created = yield* client.session.create({
+    const page = yield* client.sessions.list({ limit: 10 })
+    const active = yield* client.sessions.active()
+    const created = yield* client.sessions.create({
      location: Location.Ref.make({ directory: AbsolutePath.make("/tmp/project") }),
    })
-    yield* client.session.switchAgent({ sessionID: Session.ID.make("ses_test"), agent: Agent.ID.make("build") })
-    yield* client.session.switchModel({
+    yield* client.sessions.switchAgent({ sessionID: Session.ID.make("ses_test"), agent: Agent.ID.make("build") })
+    yield* client.sessions.switchModel({
      sessionID: Session.ID.make("ses_test"),
      model: Model.Ref.make({ id: "claude", providerID: "anthropic" }),
    })
-    const admitted = yield* client.session.prompt({
+    const admitted = yield* client.sessions.prompt({
      sessionID: Session.ID.make("ses_test"),
      prompt: Prompt.make({ text: "Hello" }),
      resume: false,
    })
-    yield* client.session.compact({ sessionID: Session.ID.make("ses_test") })
-    yield* client.session.wait({ sessionID: Session.ID.make("ses_test") })
-    const context = yield* client.session.context({ sessionID: Session.ID.make("ses_test") })
-    const history = yield* client.session.history({
+    yield* client.sessions.compact({ sessionID: Session.ID.make("ses_test") })
+    yield* client.sessions.wait({ sessionID: Session.ID.make("ses_test") })
+    const context = yield* client.sessions.context({ sessionID: Session.ID.make("ses_test") })
+    const history = yield* client.sessions.history({
      sessionID: Session.ID.make("ses_test"),
      after: 0,
      limit: 1,
    })
    const historyNext = history.hasMore
-      ? yield* client.session.history({
+      ? yield* client.sessions.history({
          sessionID: Session.ID.make("ses_test"),
          after: history.data.at(-1)?.durable?.seq,
          limit: 2,
        })
      : undefined
-    const events = yield* client.session
+    const events = yield* client.sessions
      .events({ sessionID: Session.ID.make("ses_test"), after: 0 })
      .pipe(Stream.runCollect)
-    yield* client.session.interrupt({ sessionID: Session.ID.make("ses_test") })
-    const message = yield* client.session.message({
+    yield* client.sessions.interrupt({ sessionID: Session.ID.make("ses_test") })
+    const message = yield* client.sessions.message({
      sessionID: Session.ID.make("ses_test"),
      messageID: SessionMessage.ID.make("msg_model"),
    })
@@ -171,7 +171,7 @@ test("session methods retain decoded Effect inputs and outputs", async () => {
  expect(result.message).toEqual(expect.objectContaining({ id: "msg_model", type: "model-switched" }))
 })

-test("session.history retains the typed SessionNotFoundError", async () => {
+test("sessions.history retains the typed SessionNotFoundError", async () => {
  const httpClient = HttpClient.make((request) =>
    Effect.succeed(
      HttpClientResponse.fromWeb(
@@ -185,7 +185,7 @@ test("session.history retains the typed SessionNotFoundError", async () => {
  )
  const error = await Effect.gen(function* () {
    const client = yield* OpenCode.make({ baseUrl: "http://localhost:3000" })
-    return yield* client.session
+    return yield* client.sessions
      .history({
        sessionID: Session.ID.make("ses_missing"),
      })
--- a/Show More
+++ b/Show More