fix(httpapi): preserve SDK schema parity

test(httpapi): compare request body schema kind
fix(httpapi): preserve legacy SDK error parity
2026-04-28 22:56:18 -04:00 · 2026-04-28 22:20:10 -04:00 · 2026-04-28 22:16:49 -04:00 · 2026-04-28 22:10:41 -04:00 · 2026-04-28 22:05:24 -04:00 · 2026-04-28 21:56:40 -04:00
289 changed files with 6240 additions and 12230 deletions
@@ -16,9 +16,7 @@ ariane-emory
 -danieljoshuanazareth
 -danieljoshuanazareth
 -davidbernat looks to be a clawdbot that spams team and sends super weird emails, doesnt appear to be a real person
-dmtrkovalenko
 edemaine
-fahreddinozcan
 -florianleibert
 fwang
 iamdavidhill
@@ -88,7 +88,7 @@ jobs:
      - name: Build
        id: build
        run: |
-          ./packages/opencode/script/build.ts ${{ (github.ref_name == 'beta' && '--sourcemaps') || '' }}
+          ./packages/opencode/script/build.ts
        env:
          OPENCODE_VERSION: ${{ needs.version.outputs.version }}
          OPENCODE_RELEASE: ${{ needs.version.outputs.release }}
@@ -28,11 +28,3 @@ Use the current Effect v4 / effect-smol source, not memory or older Effect v2/v3
 - In tests, prefer the repo's existing Effect test helpers and live tests for filesystem, git, child process, locks, or timing behavior.
 - Do not introduce `any`, non-null assertions, unchecked casts, or older Effect APIs just to satisfy types.
 - Do not answer from memory. Verify against `.opencode/references/effect-smol` or nearby code first.
-
-## Testing Patterns
-
- Use `testEffect(...)` from `packages/opencode/test/lib/effect.ts` for tests that exercise Effect services, layers, runtime context, scoped resources, or platform integrations.
- Use `it.live(...)` for filesystem, git repositories, HTTP servers, sockets, child processes, locks, real time, and other live platform behavior.
- Run tests from package directories such as `packages/opencode`; never run package tests from the repo root.
- Prefer explicit test layers over ad hoc managed runtimes. Keep dependency provisioning visible in the test file.
- Use scoped fixtures and finalizers for resources that must be cleaned up, including temporary directories, flags, databases, fibers, servers, and global state.
@@ -29,7 +29,7 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "1.14.30",
+      "version": "1.14.29",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/core": "workspace:*",
@@ -83,7 +83,7 @@
    },
    "packages/console/app": {
      "name": "@opencode-ai/console-app",
-      "version": "1.14.30",
+      "version": "1.14.29",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -117,7 +117,7 @@
    },
    "packages/console/core": {
      "name": "@opencode-ai/console-core",
-      "version": "1.14.30",
+      "version": "1.14.29",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -144,7 +144,7 @@
    },
    "packages/console/function": {
      "name": "@opencode-ai/console-function",
-      "version": "1.14.30",
+      "version": "1.14.29",
      "dependencies": {
        "@ai-sdk/anthropic": "3.0.64",
        "@ai-sdk/openai": "3.0.48",
@@ -168,7 +168,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode-ai/console-mail",
-      "version": "1.14.30",
+      "version": "1.14.29",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -192,7 +192,7 @@
    },
    "packages/core": {
      "name": "@opencode-ai/core",
-      "version": "1.14.30",
+      "version": "1.14.29",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -226,7 +226,7 @@
    },
    "packages/desktop": {
      "name": "@opencode-ai/desktop",
-      "version": "1.14.30",
+      "version": "1.14.29",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -259,7 +259,7 @@
    },
    "packages/desktop-electron": {
      "name": "@opencode-ai/desktop-electron",
-      "version": "1.14.30",
+      "version": "1.14.29",
      "dependencies": {
        "drizzle-orm": "catalog:",
        "effect": "catalog:",
@@ -303,7 +303,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode-ai/enterprise",
-      "version": "1.14.30",
+      "version": "1.14.29",
      "dependencies": {
        "@opencode-ai/core": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -332,7 +332,7 @@
    },
    "packages/function": {
      "name": "@opencode-ai/function",
-      "version": "1.14.30",
+      "version": "1.14.29",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -348,7 +348,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "1.14.30",
+      "version": "1.14.29",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -491,7 +491,7 @@
    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
-      "version": "1.14.30",
+      "version": "1.14.29",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "effect": "catalog:",
@@ -506,8 +506,8 @@
        "typescript": "catalog:",
      },
      "peerDependencies": {
-        "@opentui/core": ">=0.2.0",
-        "@opentui/solid": ">=0.2.0",
+        "@opentui/core": ">=0.1.105",
+        "@opentui/solid": ">=0.1.105",
      },
      "optionalPeers": [
        "@opentui/core",
@@ -526,7 +526,7 @@
    },
    "packages/sdk/js": {
      "name": "@opencode-ai/sdk",
-      "version": "1.14.30",
+      "version": "1.14.29",
      "dependencies": {
        "cross-spawn": "catalog:",
      },
@@ -541,7 +541,7 @@
    },
    "packages/slack": {
      "name": "@opencode-ai/slack",
-      "version": "1.14.30",
+      "version": "1.14.29",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "@slack/bolt": "^3.17.1",
@@ -576,7 +576,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "1.14.30",
+      "version": "1.14.29",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/core": "workspace:*",
@@ -625,7 +625,7 @@
    },
    "packages/web": {
      "name": "@opencode-ai/web",
-      "version": "1.14.30",
+      "version": "1.14.29",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -685,8 +685,8 @@
    "@npmcli/arborist": "9.4.0",
    "@octokit/rest": "22.0.0",
    "@openauthjs/openauth": "0.0.0-20250322224806",
-    "@opentui/core": "0.2.0",
-    "@opentui/solid": "0.2.0",
+    "@opentui/core": "0.1.105",
+    "@opentui/solid": "0.1.105",
    "@pierre/diffs": "1.1.0-beta.18",
    "@playwright/test": "1.59.1",
    "@solid-primitives/storage": "4.3.3",
@@ -1613,21 +1613,21 @@

    "@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.40.0", "", {}, "sha512-cifvXDhcqMwwTlTK04GBNeIe7yyo28Mfby85QXFe1Yk8nmi36Ab/5UQwptOx84SsoGNRg+EVSjwzfSZMy6pmlw=="],

-    "@opentui/core": ["@opentui/core@0.2.0", "", { "dependencies": { "bun-ffi-structs": "0.1.2", "diff": "8.0.2", "jimp": "1.6.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.2.0", "@opentui/core-darwin-x64": "0.2.0", "@opentui/core-linux-arm64": "0.2.0", "@opentui/core-linux-x64": "0.2.0", "@opentui/core-win32-arm64": "0.2.0", "@opentui/core-win32-x64": "0.2.0", "bun-webgpu": "0.1.7", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-7YOEqPUQmsgrOb9nmLEBlX8RVHPFy4HquK1C489DwfvvPTiws8nTbZ+webNQDWha7shgnYQK4Zo1EcOlpQ5+1Q=="],
+    "@opentui/core": ["@opentui/core@0.1.105", "", { "dependencies": { "bun-ffi-structs": "0.1.2", "diff": "8.0.2", "jimp": "1.6.0", "marked": "17.0.1", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.1.105", "@opentui/core-darwin-x64": "0.1.105", "@opentui/core-linux-arm64": "0.1.105", "@opentui/core-linux-x64": "0.1.105", "@opentui/core-win32-arm64": "0.1.105", "@opentui/core-win32-x64": "0.1.105", "bun-webgpu": "0.1.5", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-vllSOOCW6VIThV/96GRLJ1IxIBuR+ci6FDvnPIAG4s7SJ/FW6zAkqDn1xrtBwwk/lM3QWjLqy8BZc+zwWvveJA=="],

-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.2.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-VVmKwth3hzsQPjAZ7WGJxmzuzx0uCtynd79JJDg26D7QRM9V5beVGbKwwU5SKsDlK74EyQoY85Mv9xFY5E4jrA=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.1.105", "", { "os": "darwin", "cpu": "arm64" }, "sha512-1pIL7aer9amwj8EpYoMNtvavKetIe+nX8uBRmYsMQb+KvJoUAZUqENfRW+qHE5WrsOyxx8/QoyXTHw15GG5iLQ=="],

-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.2.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-eX+WNdbSNr7Bozdq/MH6p1vXIALGt0SqBHR4YtWyTh6X7KDz9FTtJT3ylxMPqiVRUGBNAiWOxoqKGXW7JLQ0TA=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.1.105", "", { "os": "darwin", "cpu": "x64" }, "sha512-hLIRSWlK3gY2NRXJGWiTBiMYSmRDjOYFZF6WtUVXhY2SL3sp08dhmr/6dmAVH+3pKCsCipLEsrrcQX6SAihCTA=="],

-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.2.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-ARZa+ywbN/OV7esT5ZdJMlQW3a4Pr56qLlEI/X65ik88C2sgmDze4Kf2FmqtvJ1hbv1YsMfLHH9MfhLl5twyHQ=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.1.105", "", { "os": "linux", "cpu": "arm64" }, "sha512-jlRKfPkozTZEkHEePuCWYcTIUtPm+ieInAwGVqGmjbvqjxdVv1/W/Dt6LEZ/9jpRiOPd+FjXAfLe6wa/XWHr+w=="],

-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.2.0", "", { "os": "linux", "cpu": "x64" }, "sha512-ZjNxrD45P51cdbABoivVQLBakVYwDqAridJbHhkK6T/+EU7YsTrmAu9ae19N9ZGnrlKzLViQF8GOavNUNjAbhw=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.1.105", "", { "os": "linux", "cpu": "x64" }, "sha512-kfWS1WMg6qHShmxZX9s1tZc/8JcXw6uyy2UtyTbJdRFExtXGH37oKHi8QK8iPL2ExCx4z7zqVnVJfO3X/Wh7lA=="],

-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.2.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-ImMjFPOWE8wcZQ2lUz1D418xonS/5EwnItUF1g5dbp1q9+A0vv2P3bxTenLwMqcYvG4wjO6gKT3n2QLnRd6qKg=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.1.105", "", { "os": "win32", "cpu": "arm64" }, "sha512-UFx6A8OpBVbGWK6OAw4GqAqKZgIITJfSOd35pG9yDVKQouHN2OGc2HeeXrH2A4h42p40Xl6IfcqqfllkpC13Dg=="],

-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.2.0", "", { "os": "win32", "cpu": "x64" }, "sha512-6yfYHTtJ4yzbl8kXCW3Pc4eWbZDYVw21GumwdNgkjJJ2JqQAQ861em0riEoucYAa5qPYYTiMUEw7X4Fv8lGwuQ=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.1.105", "", { "os": "win32", "cpu": "x64" }, "sha512-f9FqqUmxehwhF+cgyazm0YT0v0BYTTCPzd6eztqhl74N3x/kC+jOOz2rdJDC/tTBo1JVsF64KupOnhIs6/Cogg=="],

-    "@opentui/solid": ["@opentui/solid@0.2.0", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.2.0", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-kZR9i0FPAcVtomrPsKuSb+D9smooplo9zggFfU2vnnguNuQjGNbEmuJtxhCacy7ig9g3GomdNtQAzD4LiAY+3w=="],
+    "@opentui/solid": ["@opentui/solid@0.1.105", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.1.105", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.10", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.11" } }, "sha512-uxnaMP802sCI487pv/Hk9xdFdIj9mkg3eNliAqbqR0Shmd4phcjKEZvPRpijjmI99j4s9nul71jzF3h1oz31Nw=="],

    "@oslojs/asn1": ["@oslojs/asn1@1.0.0", "", { "dependencies": { "@oslojs/binary": "1.0.0" } }, "sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA=="],

@@ -2731,15 +2731,15 @@

    "bun-types": ["bun-types@1.3.12", "", { "dependencies": { "@types/node": "*" } }, "sha512-HqOLj5PoFajAQciOMRiIZGNoKxDJSr6qigAttOX40vJuSp6DN/CxWp9s3C1Xwm4oH7ybueITwiaOcWXoYVoRkA=="],

-    "bun-webgpu": ["bun-webgpu@0.1.7", "", { "dependencies": { "@webgpu/types": "^0.1.60" }, "optionalDependencies": { "bun-webgpu-darwin-arm64": "^0.1.7", "bun-webgpu-darwin-x64": "^0.1.7", "bun-webgpu-linux-x64": "^0.1.7", "bun-webgpu-win32-x64": "^0.1.7" } }, "sha512-KUxUp+oQIf7pPBMD4Hv1TUu7DWaOZ4ciKulTk9to9+Uc8yHoYrMW7L2SJCJ4FHHkywgf/7aLRgRx0b7i6DvGIQ=="],
+    "bun-webgpu": ["bun-webgpu@0.1.5", "", { "dependencies": { "@webgpu/types": "^0.1.60" }, "optionalDependencies": { "bun-webgpu-darwin-arm64": "^0.1.5", "bun-webgpu-darwin-x64": "^0.1.5", "bun-webgpu-linux-x64": "^0.1.5", "bun-webgpu-win32-x64": "^0.1.5" } }, "sha512-91/K6S5whZKX7CWAm9AylhyKrLGRz6BUiiPiM/kXadSnD4rffljCD/q9cNFftm5YXhx4MvLqw33yEilxogJvwA=="],

-    "bun-webgpu-darwin-arm64": ["bun-webgpu-darwin-arm64@0.1.7", "", { "os": "darwin", "cpu": "arm64" }, "sha512-mRrFFyHzPWjsTRidAZBRcu808CPQBOUL0P6b4nxLhp+XHcV/mbUHERZMgW9s58tsojQfSdzschiQa8q+JCgRWA=="],
+    "bun-webgpu-darwin-arm64": ["bun-webgpu-darwin-arm64@0.1.6", "", { "os": "darwin", "cpu": "arm64" }, "sha512-lIsDkPzJzPl6yrB5CUOINJFPnTRv6fF/Q8J1mAr43ogSp86WZEg9XZKaT6f3EUJ+9ETogGoMnoj1q0AwHUTbAQ=="],

-    "bun-webgpu-darwin-x64": ["bun-webgpu-darwin-x64@0.1.7", "", { "os": "darwin", "cpu": "x64" }, "sha512-g0NXGNgvaVCSH/jCWWlfdiquOHkbUN6vP4zqzSkIxWKQeLnqm3oADcok7SO3yIgI7v5mKpRc/ks7NDEKNH+jNQ=="],
+    "bun-webgpu-darwin-x64": ["bun-webgpu-darwin-x64@0.1.6", "", { "os": "darwin", "cpu": "x64" }, "sha512-uEddf5U7GvKIkM/BV18rUKtYHL6d0KeqBjNHwfqDH9QgEo9KVSKvJXS5I/sMefk5V5pIYE+8tQhtrREevhocng=="],

-    "bun-webgpu-linux-x64": ["bun-webgpu-linux-x64@0.1.7", "", { "os": "linux", "cpu": "x64" }, "sha512-UEP7UZdEhx9otvkZczjsszL8ZVlrODANQvgl+C88/bNVmxDoFi7w1fWzGi1sZyakiETjmtFDq2/xCLhbSZxjqw=="],
+    "bun-webgpu-linux-x64": ["bun-webgpu-linux-x64@0.1.6", "", { "os": "linux", "cpu": "x64" }, "sha512-Y/f15j9r8ba0xUz+3lATtS74OE+PPzQXO7Do/1eCluJcuOlfa77kMjvBK/ShWnem3Y9xqi59pebTPOGRB+CaJA=="],

-    "bun-webgpu-win32-x64": ["bun-webgpu-win32-x64@0.1.7", "", { "os": "win32", "cpu": "x64" }, "sha512-KZktiFkBz6sN7PEm1NVdeaLP5Q5X/PlSHZqefY4nNuWtf0LNvh54NhZe7yVv/Plz/nGbv92b0KHMBY3ki/pp6g=="],
+    "bun-webgpu-win32-x64": ["bun-webgpu-win32-x64@0.1.6", "", { "os": "win32", "cpu": "x64" }, "sha512-MHSFAKqizISb+C5NfDrFe3g0Al5Njnu0j/A+oO2Q+bIWX+fUYjBSowiYE1ZXJx65KuryuB+tiM7Qh6cQbVvkEg=="],

    "bundle-name": ["bundle-name@4.1.0", "", { "dependencies": { "run-applescript": "^7.0.0" } }, "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q=="],

@@ -5597,6 +5597,8 @@

    "@opentui/solid/@babel/core": ["@babel/core@7.28.0", "", { "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.0", "@babel/helper-compilation-targets": "^7.27.2", "@babel/helper-module-transforms": "^7.27.3", "@babel/helpers": "^7.27.6", "@babel/parser": "^7.28.0", "@babel/template": "^7.27.2", "@babel/traverse": "^7.28.0", "@babel/types": "^7.28.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.3", "semver": "^6.3.1" } }, "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ=="],

+    "@opentui/solid/babel-preset-solid": ["babel-preset-solid@1.9.10", "", { "dependencies": { "babel-plugin-jsx-dom-expressions": "^0.40.3" }, "peerDependencies": { "@babel/core": "^7.0.0", "solid-js": "^1.9.10" }, "optionalPeers": ["solid-js"] }, "sha512-HCelrgua/Y+kqO8RyL04JBWS/cVdrtUv/h45GntgQY+cJl4eBcKkCDV3TdMjtKx1nXwRaR9QXslM/Npm1dxdZQ=="],
+
    "@oslojs/jwt/@oslojs/encoding": ["@oslojs/encoding@0.4.1", "", {}, "sha512-hkjo6MuIK/kQR5CrGNdAPZhS01ZCXuWDRJ187zh6qqF2+yMHZpD9fAYpX8q2bOO6Ryhl3XpCT6kUX76N8hhm4Q=="],

    "@pierre/diffs/@shikijs/transformers": ["@shikijs/transformers@3.20.0", "", { "dependencies": { "@shikijs/core": "3.20.0", "@shikijs/types": "3.20.0" } }, "sha512-PrHHMRr3Q5W1qB/42kJW6laqFyWdhrPF2hNR9qjOm1xcSiAO3hAHo7HaVyHE6pMyevmy3i51O8kuGGXC78uK3g=="],
@@ -5949,10 +5951,6 @@

    "openid-client/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="],

-    "opentui-spinner/@opentui/core": ["@opentui/core@0.1.105", "", { "dependencies": { "bun-ffi-structs": "0.1.2", "diff": "8.0.2", "jimp": "1.6.0", "marked": "17.0.1", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.1.105", "@opentui/core-darwin-x64": "0.1.105", "@opentui/core-linux-arm64": "0.1.105", "@opentui/core-linux-x64": "0.1.105", "@opentui/core-win32-arm64": "0.1.105", "@opentui/core-win32-x64": "0.1.105", "bun-webgpu": "0.1.5", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-vllSOOCW6VIThV/96GRLJ1IxIBuR+ci6FDvnPIAG4s7SJ/FW6zAkqDn1xrtBwwk/lM3QWjLqy8BZc+zwWvveJA=="],
-
-    "opentui-spinner/@opentui/solid": ["@opentui/solid@0.1.105", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.1.105", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.10", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.11" } }, "sha512-uxnaMP802sCI487pv/Hk9xdFdIj9mkg3eNliAqbqR0Shmd4phcjKEZvPRpijjmI99j4s9nul71jzF3h1oz31Nw=="],
-
    "ora/bl": ["bl@4.1.0", "", { "dependencies": { "buffer": "^5.5.0", "inherits": "^2.0.4", "readable-stream": "^3.4.0" } }, "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="],

    "ora/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
@@ -6713,24 +6711,6 @@

    "opencontrol/@modelcontextprotocol/sdk/zod-to-json-schema": ["zod-to-json-schema@3.25.2", "", { "peerDependencies": { "zod": "^3.25.28 || ^4" } }, "sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA=="],

-    "opentui-spinner/@opentui/core/@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.1.105", "", { "os": "darwin", "cpu": "arm64" }, "sha512-1pIL7aer9amwj8EpYoMNtvavKetIe+nX8uBRmYsMQb+KvJoUAZUqENfRW+qHE5WrsOyxx8/QoyXTHw15GG5iLQ=="],
-
-    "opentui-spinner/@opentui/core/@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.1.105", "", { "os": "darwin", "cpu": "x64" }, "sha512-hLIRSWlK3gY2NRXJGWiTBiMYSmRDjOYFZF6WtUVXhY2SL3sp08dhmr/6dmAVH+3pKCsCipLEsrrcQX6SAihCTA=="],
-
-    "opentui-spinner/@opentui/core/@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.1.105", "", { "os": "linux", "cpu": "arm64" }, "sha512-jlRKfPkozTZEkHEePuCWYcTIUtPm+ieInAwGVqGmjbvqjxdVv1/W/Dt6LEZ/9jpRiOPd+FjXAfLe6wa/XWHr+w=="],
-
-    "opentui-spinner/@opentui/core/@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.1.105", "", { "os": "linux", "cpu": "x64" }, "sha512-kfWS1WMg6qHShmxZX9s1tZc/8JcXw6uyy2UtyTbJdRFExtXGH37oKHi8QK8iPL2ExCx4z7zqVnVJfO3X/Wh7lA=="],
-
-    "opentui-spinner/@opentui/core/@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.1.105", "", { "os": "win32", "cpu": "arm64" }, "sha512-UFx6A8OpBVbGWK6OAw4GqAqKZgIITJfSOd35pG9yDVKQouHN2OGc2HeeXrH2A4h42p40Xl6IfcqqfllkpC13Dg=="],
-
-    "opentui-spinner/@opentui/core/@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.1.105", "", { "os": "win32", "cpu": "x64" }, "sha512-f9FqqUmxehwhF+cgyazm0YT0v0BYTTCPzd6eztqhl74N3x/kC+jOOz2rdJDC/tTBo1JVsF64KupOnhIs6/Cogg=="],
-
-    "opentui-spinner/@opentui/core/bun-webgpu": ["bun-webgpu@0.1.5", "", { "dependencies": { "@webgpu/types": "^0.1.60" }, "optionalDependencies": { "bun-webgpu-darwin-arm64": "^0.1.5", "bun-webgpu-darwin-x64": "^0.1.5", "bun-webgpu-linux-x64": "^0.1.5", "bun-webgpu-win32-x64": "^0.1.5" } }, "sha512-91/K6S5whZKX7CWAm9AylhyKrLGRz6BUiiPiM/kXadSnD4rffljCD/q9cNFftm5YXhx4MvLqw33yEilxogJvwA=="],
-
-    "opentui-spinner/@opentui/solid/@babel/core": ["@babel/core@7.28.0", "", { "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.0", "@babel/helper-compilation-targets": "^7.27.2", "@babel/helper-module-transforms": "^7.27.3", "@babel/helpers": "^7.27.6", "@babel/parser": "^7.28.0", "@babel/template": "^7.27.2", "@babel/traverse": "^7.28.0", "@babel/types": "^7.28.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.3", "semver": "^6.3.1" } }, "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ=="],
-
-    "opentui-spinner/@opentui/solid/babel-preset-solid": ["babel-preset-solid@1.9.10", "", { "dependencies": { "babel-plugin-jsx-dom-expressions": "^0.40.3" }, "peerDependencies": { "@babel/core": "^7.0.0", "solid-js": "^1.9.10" }, "optionalPeers": ["solid-js"] }, "sha512-HCelrgua/Y+kqO8RyL04JBWS/cVdrtUv/h45GntgQY+cJl4eBcKkCDV3TdMjtKx1nXwRaR9QXslM/Npm1dxdZQ=="],
-
    "ora/bl/buffer": ["buffer@5.7.1", "", { "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" } }, "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="],

    "ora/bl/readable-stream": ["readable-stream@3.6.2", "", { "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" } }, "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="],
@@ -7073,18 +7053,6 @@

    "opencontrol/@modelcontextprotocol/sdk/express/type-is": ["type-is@2.0.1", "", { "dependencies": { "content-type": "^1.0.5", "media-typer": "^1.1.0", "mime-types": "^3.0.0" } }, "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw=="],

-    "opentui-spinner/@opentui/core/bun-webgpu/@webgpu/types": ["@webgpu/types@0.1.69", "", {}, "sha512-RPmm6kgRbI8e98zSD3RVACvnuktIja5+yLgDAkTmxLr90BEwdTXRQWNLF3ETTTyH/8mKhznZuN5AveXYFEsMGQ=="],
-
-    "opentui-spinner/@opentui/core/bun-webgpu/bun-webgpu-darwin-arm64": ["bun-webgpu-darwin-arm64@0.1.6", "", { "os": "darwin", "cpu": "arm64" }, "sha512-lIsDkPzJzPl6yrB5CUOINJFPnTRv6fF/Q8J1mAr43ogSp86WZEg9XZKaT6f3EUJ+9ETogGoMnoj1q0AwHUTbAQ=="],
-
-    "opentui-spinner/@opentui/core/bun-webgpu/bun-webgpu-darwin-x64": ["bun-webgpu-darwin-x64@0.1.6", "", { "os": "darwin", "cpu": "x64" }, "sha512-uEddf5U7GvKIkM/BV18rUKtYHL6d0KeqBjNHwfqDH9QgEo9KVSKvJXS5I/sMefk5V5pIYE+8tQhtrREevhocng=="],
-
-    "opentui-spinner/@opentui/core/bun-webgpu/bun-webgpu-linux-x64": ["bun-webgpu-linux-x64@0.1.6", "", { "os": "linux", "cpu": "x64" }, "sha512-Y/f15j9r8ba0xUz+3lATtS74OE+PPzQXO7Do/1eCluJcuOlfa77kMjvBK/ShWnem3Y9xqi59pebTPOGRB+CaJA=="],
-
-    "opentui-spinner/@opentui/core/bun-webgpu/bun-webgpu-win32-x64": ["bun-webgpu-win32-x64@0.1.6", "", { "os": "win32", "cpu": "x64" }, "sha512-MHSFAKqizISb+C5NfDrFe3g0Al5Njnu0j/A+oO2Q+bIWX+fUYjBSowiYE1ZXJx65KuryuB+tiM7Qh6cQbVvkEg=="],
-
-    "opentui-spinner/@opentui/solid/@babel/core/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],
-
    "ora/bl/buffer/ieee754": ["ieee754@1.2.1", "", {}, "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="],

    "pkg-up/find-up/locate-path/p-locate": ["p-locate@3.0.0", "", { "dependencies": { "p-limit": "^2.0.0" } }, "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="],
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-cBfg4pJ4mjsfS4MFFASBaZZykArgIoeo/3woOcSGy1U=",
-    "aarch64-linux": "sha256-Q6cqUwfqbscdrPW0uHcfshhQINjJi0HiyURMSdOOCf4=",
-    "aarch64-darwin": "sha256-1AtfsD1D9YxWSEsecPJF9XsvsxsWTtVtkP5l6UW43og=",
-    "x86_64-darwin": "sha256-YS5/8YTf9LymAUbjXVrGDfxtKVJrpZbPnnCtsGHSHoU="
+    "x86_64-linux": "sha256-h2T/LnUnISZZDn9ZQkZ/A59P+6+QdfOlrgl4RXK/vgM=",
+    "aarch64-linux": "sha256-+DRohG1ZEB/2LtZU90GWoqJkeyu/sW8A8oKT3f/TtQ0=",
+    "aarch64-darwin": "sha256-k4nsk/WduuxY8HgjRuqzGT9EjEo7V/2mAzBTYee0fZ0=",
+    "x86_64-darwin": "sha256-3dSvfN2+5lXwOx57x8NSIWbEZ1fp6+1T6bJpAuUNPyk="
  }
 }
@@ -34,8 +34,8 @@
      "@types/cross-spawn": "6.0.6",
      "@octokit/rest": "22.0.0",
      "@hono/zod-validator": "0.4.2",
-      "@opentui/core": "0.2.0",
-      "@opentui/solid": "0.2.0",
+      "@opentui/core": "0.1.105",
+      "@opentui/solid": "0.1.105",
      "ulid": "3.0.1",
      "@kobalte/core": "0.13.11",
      "@types/luxon": "3.7.1",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.14.30",
+  "version": "1.14.29",
  "description": "",
  "type": "module",
  "exports": {
@@ -329,7 +329,6 @@ export const SettingsGeneral: Component = () => {
            label={(o) => o.label}
            onSelect={(option) => {
              if (!option) return
-              if (option.value === currentShell()) return
              globalSync.updateConfig({ shell: option.value })
            }}
            variant="secondary"
@@ -33,7 +33,6 @@ import { SESSION_RECENT_LIMIT } from "./global-sync/types"
 import { formatServerError } from "@/utils/server-errors"
 import { queryOptions, skipToken, useMutation, useQueries, useQuery, useQueryClient } from "@tanstack/solid-query"
 import { createRefreshQueue } from "./global-sync/queue"
-import { directoryKey } from "./global-sync/utils"

 type GlobalStore = {
  ready: boolean
@@ -170,20 +169,18 @@ function createGlobalSync() {

  const queue = createRefreshQueue({
    paused,
-    key: directoryKey,
    bootstrap: () => queryClient.fetchQuery({ queryKey: ["bootstrap"] }),
    bootstrapInstance,
  })

  const sdkFor = (directory: string) => {
-    const key = directoryKey(directory)
-    const cached = sdkCache.get(key)
+    const cached = sdkCache.get(directory)
    if (cached) return cached
    const sdk = globalSDK.createClient({
      directory,
      throwOnError: true,
    })
-    sdkCache.set(key, sdk)
+    sdkCache.set(directory, sdk)
    return sdk
  }

@@ -195,25 +192,23 @@ function createGlobalSync() {
      void bootstrapInstance(directory)
    },
    onDispose: (directory) => {
-      const key = directoryKey(directory)
-      queue.clear(key)
-      sessionMeta.delete(key)
-      sdkCache.delete(key)
-      clearProviderRev(key)
-      clearSessionPrefetchDirectory(key)
+      queue.clear(directory)
+      sessionMeta.delete(directory)
+      sdkCache.delete(directory)
+      clearProviderRev(directory)
+      clearSessionPrefetchDirectory(directory)
    },
    translate: language.t,
    getSdk: sdkFor,
  })

  async function loadSessions(directory: string) {
-    const key = directoryKey(directory)
-    const pending = sessionLoads.get(key)
+    const pending = sessionLoads.get(directory)
    if (pending) return pending

-    children.pin(key)
+    children.pin(directory)
    const [store, setStore] = children.child(directory, { bootstrap: false })
-    const meta = sessionMeta.get(key)
+    const meta = sessionMeta.get(directory)
    if (meta && meta.limit >= store.limit) {
      const next = trimSessions(store.session, {
        limit: store.limit,
@@ -223,14 +218,14 @@ function createGlobalSync() {
        setStore("session", reconcile(next, { key: "id" }))
        cleanupDroppedSessionCaches(store, setStore, next, setSessionTodo)
      }
-      children.unpin(key)
+      children.unpin(directory)
      return
    }

    const limit = Math.max(store.limit + SESSION_RECENT_LIMIT, SESSION_RECENT_LIMIT)
    const promise = queryClient
      .fetchQuery({
-        ...loadSessionsQuery(key),
+        ...loadSessionsQuery(directory),
        queryFn: () =>
          loadRootSessionsWithFallback({
            directory,
@@ -260,7 +255,7 @@ function createGlobalSync() {
                setStore("session", reconcile(sessions, { key: "id" }))
                cleanupDroppedSessionCaches(store, setStore, sessions, setSessionTodo)
              })
-              sessionMeta.set(key, { limit })
+              sessionMeta.set(directory, { limit })
            })
            .catch((err) => {
              console.error("Failed to load sessions", err)
@@ -275,24 +270,23 @@ function createGlobalSync() {
      })
      .then(() => {})

-    sessionLoads.set(key, promise)
+    sessionLoads.set(directory, promise)
    void promise.finally(() => {
-      sessionLoads.delete(key)
-      children.unpin(key)
+      sessionLoads.delete(directory)
+      children.unpin(directory)
    })
    return promise
  }

  async function bootstrapInstance(directory: string) {
-    const key = directoryKey(directory)
-    if (!key) return
-    const pending = booting.get(key)
+    if (!directory) return
+    const pending = booting.get(directory)
    if (pending) return pending

-    children.pin(key)
+    children.pin(directory)
    const promise = Promise.resolve().then(async () => {
      const child = children.ensureChild(directory)
-      const cache = children.vcsCache.get(key)
+      const cache = children.vcsCache.get(directory)
      if (!cache) return
      const sdk = sdkFor(directory)
      await bootstrapDirectory({
@@ -313,17 +307,16 @@ function createGlobalSync() {
      })
    })

-    booting.set(key, promise)
+    booting.set(directory, promise)
    void promise.finally(() => {
-      booting.delete(key)
-      children.unpin(key)
+      booting.delete(directory)
+      children.unpin(directory)
    })
    return promise
  }

  const unsub = globalSDK.event.listen((e) => {
    const directory = e.name
-    const key = directoryKey(directory)
    const event = e.details
    const recent = bootingRoot || Date.now() - bootedAt < 1500

@@ -346,9 +339,9 @@ function createGlobalSync() {
      return
    }

-    const existing = children.children[key]
+    const existing = children.children[directory]
    if (!existing) return
-    children.mark(key)
+    children.mark(directory)
    const [store, setStore] = existing
    applyDirectoryEvent({
      event,
@@ -357,9 +350,9 @@ function createGlobalSync() {
      setStore,
      push: queue.push,
      setSessionTodo,
-      vcsCache: children.vcsCache.get(key),
+      vcsCache: children.vcsCache.get(directory),
      loadLsp: () => {
-        void queryClient.fetchQuery(loadLspQuery(key, sdkFor(directory)))
+        void queryClient.fetchQuery(loadLspQuery(directory, sdkFor(directory)))
      },
    })
  })
@@ -370,7 +363,7 @@ function createGlobalSync() {
  })
  onCleanup(() => {
    for (const directory of Object.keys(children.children)) {
-      children.disposeDirectory(directoryKey(directory))
+      children.disposeDirectory(directory)
    }
  })

@@ -17,7 +17,6 @@ import { canDisposeDirectory, pickDirectoriesToEvict } from "./eviction"
 import { useQueries } from "@tanstack/solid-query"
 import { loadPathQuery, loadProvidersQuery } from "./bootstrap"
 import { loadLspQuery, loadMcpQuery } from "../global-sync"
-import { directoryKey, type DirectoryKey } from "./utils"

 export function createChildStoreManager(input: {
  owner: Owner
@@ -37,37 +36,30 @@ export function createChildStoreManager(input: {
  const ownerPins = new WeakMap<object, Set<string>>()
  const disposers = new Map<string, () => void>()

-  const markKey = (key: DirectoryKey) => {
-    if (!key) return
-    lifecycle.set(key, { lastAccessAt: Date.now() })
-    runEviction(key)
-  }
-
  const mark = (directory: string) => {
-    const key = directoryKey(directory)
-    markKey(key)
+    if (!directory) return
+    lifecycle.set(directory, { lastAccessAt: Date.now() })
+    runEviction(directory)
  }

  const pin = (directory: string) => {
-    const key = directoryKey(directory)
-    if (!key) return
-    pins.set(key, (pins.get(key) ?? 0) + 1)
-    markKey(key)
+    if (!directory) return
+    pins.set(directory, (pins.get(directory) ?? 0) + 1)
+    mark(directory)
  }

  const unpin = (directory: string) => {
-    const key = directoryKey(directory)
-    if (!key) return
-    const next = (pins.get(key) ?? 0) - 1
+    if (!directory) return
+    const next = (pins.get(directory) ?? 0) - 1
    if (next > 0) {
-      pins.set(key, next)
+      pins.set(directory, next)
      return
    }
-    pins.delete(key)
+    pins.delete(directory)
    runEviction()
  }

-  const pinned = (directory: string) => (pins.get(directoryKey(directory)) ?? 0) > 0
+  const pinned = (directory: string) => (pins.get(directory) ?? 0) > 0

  const pinForOwner = (directory: string) => {
    const current = getOwner()
@@ -89,31 +81,30 @@ export function createChildStoreManager(input: {
    })
  }

-  function disposeDirectory(directory: DirectoryKey) {
-    const key = directory
+  function disposeDirectory(directory: string) {
    if (
      !canDisposeDirectory({
-        directory: key,
-        hasStore: !!children[key],
-        pinned: pinned(key),
-        booting: input.isBooting(key),
-        loadingSessions: input.isLoadingSessions(key),
+        directory,
+        hasStore: !!children[directory],
+        pinned: pinned(directory),
+        booting: input.isBooting(directory),
+        loadingSessions: input.isLoadingSessions(directory),
      })
    ) {
      return false
    }

-    vcsCache.delete(key)
-    metaCache.delete(key)
-    iconCache.delete(key)
-    lifecycle.delete(key)
-    const dispose = disposers.get(key)
+    vcsCache.delete(directory)
+    metaCache.delete(directory)
+    iconCache.delete(directory)
+    lifecycle.delete(directory)
+    const dispose = disposers.get(directory)
    if (dispose) {
      dispose()
-      disposers.delete(key)
+      disposers.delete(directory)
    }
-    delete children[key]
-    input.onDispose(key)
+    delete children[directory]
+    input.onDispose(directory)
    return true
  }

@@ -130,14 +121,13 @@ export function createChildStoreManager(input: {
    }).filter((directory) => directory !== skip)
    if (list.length === 0) return
    for (const directory of list) {
-      if (!disposeDirectory(directoryKey(directory))) continue
+      if (!disposeDirectory(directory)) continue
    }
  }

  function ensureChild(directory: string) {
-    const key = directoryKey(directory)
-    if (!key) console.error("No directory provided")
-    if (!children[key]) {
+    if (!directory) console.error("No directory provided")
+    if (!children[directory]) {
      const vcs = runWithOwner(input.owner, () =>
        persisted(
          Persist.workspace(directory, "vcs", ["vcs.v1"]),
@@ -146,7 +136,7 @@ export function createChildStoreManager(input: {
      )
      if (!vcs) throw new Error(input.translate("error.childStore.persistedCacheCreateFailed"))
      const vcsStore = vcs[0]
-      vcsCache.set(key, { store: vcsStore, setStore: vcs[1], ready: vcs[3] })
+      vcsCache.set(directory, { store: vcsStore, setStore: vcs[1], ready: vcs[3] })

      const meta = runWithOwner(input.owner, () =>
        persisted(
@@ -155,7 +145,7 @@ export function createChildStoreManager(input: {
        ),
      )
      if (!meta) throw new Error(input.translate("error.childStore.persistedProjectMetadataCreateFailed"))
-      metaCache.set(key, { store: meta[0], setStore: meta[1], ready: meta[3] })
+      metaCache.set(directory, { store: meta[0], setStore: meta[1], ready: meta[3] })

      const icon = runWithOwner(input.owner, () =>
        persisted(
@@ -164,7 +154,7 @@ export function createChildStoreManager(input: {
        ),
      )
      if (!icon) throw new Error(input.translate("error.childStore.persistedProjectIconCreateFailed"))
-      iconCache.set(key, { store: icon[0], setStore: icon[1], ready: icon[3] })
+      iconCache.set(directory, { store: icon[0], setStore: icon[1], ready: icon[3] })

      const init = () =>
        createRoot((dispose) => {
@@ -175,10 +165,10 @@ export function createChildStoreManager(input: {

          const [pathQuery, mcpQuery, lspQuery, providerQuery] = useQueries(() => ({
            queries: [
-              loadPathQuery(key, sdk),
-              loadMcpQuery(key, sdk),
-              loadLspQuery(key, sdk),
-              loadProvidersQuery(key, sdk),
+              loadPathQuery(directory, sdk),
+              loadMcpQuery(directory, sdk),
+              loadLspQuery(directory, sdk),
+              loadProvidersQuery(directory, sdk),
            ],
          }))

@@ -187,7 +177,7 @@ export function createChildStoreManager(input: {
            projectMeta: initialMeta,
            icon: initialIcon,
            get provider_ready() {
-              return !providerQuery.isLoading
+              return providerQuery.isLoading
            },
            provider: { all: [], connected: [], default: {} },
            config: {},
@@ -207,13 +197,13 @@ export function createChildStoreManager(input: {
            permission: {},
            question: {},
            get mcp_ready() {
-              return !mcpQuery.isLoading
+              return mcpQuery.isLoading
            },
            get mcp() {
              return mcpQuery.isLoading ? {} : (mcpQuery.data ?? {})
            },
            get lsp_ready() {
-              return !lspQuery.isLoading
+              return lspQuery.isLoading
            },
            get lsp() {
              return lspQuery.isLoading ? [] : (lspQuery.data ?? [])
@@ -223,13 +213,13 @@ export function createChildStoreManager(input: {
            message: {},
            part: {},
          })
-          children[key] = child
-          disposers.set(key, dispose)
+          children[directory] = child
+          disposers.set(directory, dispose)

          const onPersistedInit = (init: Promise<string> | string | null, run: () => void) => {
            if (!(init instanceof Promise)) return
            void init.then(() => {
-              if (children[key] !== child) return
+              if (children[directory] !== child) return
              run()
            })
          }
@@ -253,16 +243,15 @@ export function createChildStoreManager(input: {

      runWithOwner(input.owner, init)
    }
-    markKey(key)
-    const childStore = children[key]
+    mark(directory)
+    const childStore = children[directory]
    if (!childStore) throw new Error(input.translate("error.childStore.storeCreateFailed"))
    return childStore
  }

  function child(directory: string, options: ChildOptions = {}) {
-    const key = directoryKey(directory)
    const childStore = ensureChild(directory)
-    pinForOwner(key)
+    pinForOwner(directory)
    const shouldBootstrap = options.bootstrap ?? true
    if (shouldBootstrap && childStore[0].status === "loading") {
      input.onBootstrap(directory)
@@ -271,7 +260,6 @@ export function createChildStoreManager(input: {
  }

  function peek(directory: string, options: ChildOptions = {}) {
-    const key = directoryKey(directory)
    const childStore = ensureChild(directory)
    const shouldBootstrap = options.bootstrap ?? true
    if (shouldBootstrap && childStore[0].status === "loading") {
@@ -281,9 +269,8 @@ export function createChildStoreManager(input: {
  }

  function projectMeta(directory: string, patch: ProjectMeta) {
-    const key = directoryKey(directory)
    const [store, setStore] = ensureChild(directory)
-    const cached = metaCache.get(key)
+    const cached = metaCache.get(directory)
    if (!cached) return
    const previous = store.projectMeta ?? {}
    const icon = patch.icon ? { ...previous.icon, ...patch.icon } : previous.icon
@@ -299,9 +286,8 @@ export function createChildStoreManager(input: {
  }

  function projectIcon(directory: string, value: string | undefined) {
-    const key = directoryKey(directory)
    const [store, setStore] = ensureChild(directory)
-    const cached = iconCache.get(key)
+    const cached = iconCache.get(directory)
    if (!cached) return
    if (store.icon === value) return
    cached.setStore("value", value)
@@ -1,46 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { createRefreshQueue } from "./queue"
-import { directoryKey } from "./utils"
-
-const tick = () => new Promise((resolve) => setTimeout(resolve, 10))
-
-describe("createRefreshQueue", () => {
-  test("clears queued directories by normalized key", async () => {
-    const calls: string[] = []
-    const queue = createRefreshQueue({
-      paused: () => false,
-      key: directoryKey,
-      bootstrap: async () => {},
-      bootstrapInstance: (directory) => {
-        calls.push(directory)
-      },
-    })
-
-    queue.push("C:\\tmp\\demo")
-    queue.clear("C:/tmp/demo")
-
-    await tick()
-
-    expect(calls).toEqual([])
-    queue.dispose()
-  })
-
-  test("passes the original directory to bootstrapInstance", async () => {
-    const calls: string[] = []
-    const queue = createRefreshQueue({
-      paused: () => false,
-      key: directoryKey,
-      bootstrap: async () => {},
-      bootstrapInstance: (directory) => {
-        calls.push(directory)
-      },
-    })
-
-    queue.push("C:\\tmp\\demo")
-
-    await tick()
-
-    expect(calls).toEqual(["C:\\tmp\\demo"])
-    queue.dispose()
-  })
-})
@@ -2,25 +2,22 @@ type QueueInput = {
  paused: () => boolean
  bootstrap: () => Promise<void>
  bootstrapInstance: (directory: string) => Promise<void> | void
-  key?: (directory: string) => string
 }

 export function createRefreshQueue(input: QueueInput) {
-  const queued = new Map<string, string>()
+  const queued = new Set<string>()
  let root = false
  let running = false
  let timer: ReturnType<typeof setTimeout> | undefined

-  const key = input.key ?? ((directory: string) => directory)
-
  const tick = () => new Promise<void>((resolve) => setTimeout(resolve, 0))

  const take = (count: number) => {
    if (queued.size === 0) return [] as string[]
    const items: string[] = []
-    for (const [id, directory] of queued) {
-      queued.delete(id)
-      items.push(directory)
+    for (const item of queued) {
+      queued.delete(item)
+      items.push(item)
      if (items.length >= count) break
    }
    return items
@@ -36,7 +33,7 @@ export function createRefreshQueue(input: QueueInput) {

  const push = (directory: string) => {
    if (!directory) return
-    queued.set(key(directory), directory)
+    queued.add(directory)
    if (input.paused()) return
    schedule()
  }
@@ -76,7 +73,7 @@ export function createRefreshQueue(input: QueueInput) {
    push,
    refresh,
    clear(directory: string) {
-      queued.delete(key(directory))
+      queued.delete(directory)
    },
    dispose() {
      if (!timer) return
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test"
 import type { Agent } from "@opencode-ai/sdk/v2/client"
-import { directoryKey, normalizeAgentList } from "./utils"
+import { normalizeAgentList } from "./utils"

 const agent = (name = "build") =>
  ({
@@ -33,20 +33,3 @@ describe("normalizeAgentList", () => {
    expect(normalizeAgentList([{ name: "build" }, agent("docs")])).toEqual([agent("docs")])
  })
 })
-
-describe("directoryKey", () => {
-  test("normalizes slashes", () => {
-    expect(String(directoryKey("C:\\Repos\\sst\\opencode"))).toBe("C:/Repos/sst/opencode")
-    expect(String(directoryKey("C:/Repos/sst/opencode"))).toBe("C:/Repos/sst/opencode")
-  })
-
-  test("preserves backslashes in posix paths", () => {
-    expect(String(directoryKey("/tmp/foo\\bar"))).toBe("/tmp/foo\\bar")
-  })
-
-  test("trims trailing slashes without breaking roots", () => {
-    expect(String(directoryKey("C:/Repos/sst/opencode/"))).toBe("C:/Repos/sst/opencode")
-    expect(String(directoryKey("C:/"))).toBe("C:/")
-    expect(String(directoryKey("/"))).toBe("/")
-  })
-})
@@ -1,5 +1,4 @@
 import type { Agent, Project, ProviderListResponse } from "@opencode-ai/sdk/v2/client"
-export { pathKey as directoryKey, type PathKey as DirectoryKey } from "@/utils/path-key"

 export const cmp = (a: string, b: string) => (a < b ? -1 : a > b ? 1 : 0)

@@ -382,7 +382,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
          setSaved("session", session, {
            agent: msg.agent,
            model: msg.model,
-            variant: msg.model?.variant ?? null,
+            variant: msg.model.variant ?? null,
          })
        },
      },
@@ -721,6 +721,8 @@ export const dict = {
  "settings.permissions.tool.webfetch.description": "جلب محتوى من عنوان URL",
  "settings.permissions.tool.websearch.title": "بحث الويب",
  "settings.permissions.tool.websearch.description": "البحث في الويب",
+  "settings.permissions.tool.codesearch.title": "بحث الكود",
+  "settings.permissions.tool.codesearch.description": "البحث عن كود على الويب",
  "settings.permissions.tool.external_directory.title": "دليل خارجي",
  "settings.permissions.tool.external_directory.description": "الوصول إلى الملفات خارج دليل المشروع",
  "settings.permissions.tool.doom_loop.title": "حلقة الموت",
@@ -732,6 +732,8 @@ export const dict = {
  "settings.permissions.tool.webfetch.description": "Buscar conteúdo de uma URL",
  "settings.permissions.tool.websearch.title": "Pesquisa Web",
  "settings.permissions.tool.websearch.description": "Pesquisar na web",
+  "settings.permissions.tool.codesearch.title": "Pesquisa de Código",
+  "settings.permissions.tool.codesearch.description": "Pesquisar código na web",
  "settings.permissions.tool.external_directory.title": "Diretório Externo",
  "settings.permissions.tool.external_directory.description": "Acessar arquivos fora do diretório do projeto",
  "settings.permissions.tool.doom_loop.title": "Loop Infinito",
@@ -806,6 +806,8 @@ export const dict = {
  "settings.permissions.tool.webfetch.description": "Preuzmi sadržaj sa URL-a",
  "settings.permissions.tool.websearch.title": "Web pretraga",
  "settings.permissions.tool.websearch.description": "Pretražuj web",
+  "settings.permissions.tool.codesearch.title": "Pretraga koda",
+  "settings.permissions.tool.codesearch.description": "Pretraži kod na webu",
  "settings.permissions.tool.external_directory.title": "Vanjski direktorij",
  "settings.permissions.tool.external_directory.description": "Pristup datotekama izvan direktorija projekta",
  "settings.permissions.tool.doom_loop.title": "Beskonačna petlja",
@@ -800,6 +800,8 @@ export const dict = {
  "settings.permissions.tool.webfetch.description": "Hent indhold fra en URL",
  "settings.permissions.tool.websearch.title": "Websøgning",
  "settings.permissions.tool.websearch.description": "Søg på nettet",
+  "settings.permissions.tool.codesearch.title": "Kodesøgning",
+  "settings.permissions.tool.codesearch.description": "Søg kode på nettet",
  "settings.permissions.tool.external_directory.title": "Ekstern mappe",
  "settings.permissions.tool.external_directory.description": "Få adgang til filer uden for projektmappen",
  "settings.permissions.tool.doom_loop.title": "Doom Loop",
@@ -743,6 +743,8 @@ export const dict = {
  "settings.permissions.tool.webfetch.description": "Inhalt von einer URL abrufen",
  "settings.permissions.tool.websearch.title": "Web-Suche",
  "settings.permissions.tool.websearch.description": "Das Web durchsuchen",
+  "settings.permissions.tool.codesearch.title": "Code-Suche",
+  "settings.permissions.tool.codesearch.description": "Code im Web durchsuchen",
  "settings.permissions.tool.external_directory.title": "Externes Verzeichnis",
  "settings.permissions.tool.external_directory.description": "Zugriff auf Dateien außerhalb des Projektverzeichnisses",
  "settings.permissions.tool.doom_loop.title": "Doom Loop",
@@ -920,6 +920,8 @@ export const dict = {
  "settings.permissions.tool.webfetch.description": "Fetch content from a URL",
  "settings.permissions.tool.websearch.title": "Web Search",
  "settings.permissions.tool.websearch.description": "Search the web",
+  "settings.permissions.tool.codesearch.title": "Code Search",
+  "settings.permissions.tool.codesearch.description": "Search code on the web",
  "settings.permissions.tool.external_directory.title": "External Directory",
  "settings.permissions.tool.external_directory.description": "Access files outside the project directory",
  "settings.permissions.tool.doom_loop.title": "Doom Loop",
@@ -813,6 +813,8 @@ export const dict = {
  "settings.permissions.tool.webfetch.description": "Obtener contenido de una URL",
  "settings.permissions.tool.websearch.title": "Búsqueda Web",
  "settings.permissions.tool.websearch.description": "Buscar en la web",
+  "settings.permissions.tool.codesearch.title": "Búsqueda de Código",
+  "settings.permissions.tool.codesearch.description": "Buscar código en la web",
  "settings.permissions.tool.external_directory.title": "Directorio Externo",
  "settings.permissions.tool.external_directory.description": "Acceder a archivos fuera del directorio del proyecto",
  "settings.permissions.tool.doom_loop.title": "Bucle Infinito",
@@ -741,6 +741,8 @@ export const dict = {
  "settings.permissions.tool.webfetch.description": "Récupérer le contenu d'une URL",
  "settings.permissions.tool.websearch.title": "Recherche Web",
  "settings.permissions.tool.websearch.description": "Rechercher sur le web",
+  "settings.permissions.tool.codesearch.title": "Recherche de code",
+  "settings.permissions.tool.codesearch.description": "Rechercher du code sur le web",
  "settings.permissions.tool.external_directory.title": "Répertoire externe",
  "settings.permissions.tool.external_directory.description": "Accéder aux fichiers en dehors du répertoire du projet",
  "settings.permissions.tool.doom_loop.title": "Boucle infernale",
@@ -727,6 +727,8 @@ export const dict = {
  "settings.permissions.tool.webfetch.description": "URLからコンテンツを取得",
  "settings.permissions.tool.websearch.title": "Web検索",
  "settings.permissions.tool.websearch.description": "ウェブを検索",
+  "settings.permissions.tool.codesearch.title": "コード検索",
+  "settings.permissions.tool.codesearch.description": "ウェブ上のコードを検索",
  "settings.permissions.tool.external_directory.title": "外部ディレクトリ",
  "settings.permissions.tool.external_directory.description": "プロジェクトディレクトリ外のファイルへのアクセス",
  "settings.permissions.tool.doom_loop.title": "無限ループ",
@@ -722,6 +722,8 @@ export const dict = {
  "settings.permissions.tool.webfetch.description": "URL에서 콘텐츠 가져오기",
  "settings.permissions.tool.websearch.title": "웹 검색",
  "settings.permissions.tool.websearch.description": "웹 검색",
+  "settings.permissions.tool.codesearch.title": "코드 검색",
+  "settings.permissions.tool.codesearch.description": "웹에서 코드 검색",
  "settings.permissions.tool.external_directory.title": "외부 디렉터리",
  "settings.permissions.tool.external_directory.description": "프로젝트 디렉터리 외부의 파일에 액세스",
  "settings.permissions.tool.doom_loop.title": "무한 반복",
@@ -807,6 +807,8 @@ export const dict = {
  "settings.permissions.tool.webfetch.description": "Hent innhold fra en URL",
  "settings.permissions.tool.websearch.title": "Websøk",
  "settings.permissions.tool.websearch.description": "Søk på nettet",
+  "settings.permissions.tool.codesearch.title": "Kodesøk",
+  "settings.permissions.tool.codesearch.description": "Søk etter kode på nettet",
  "settings.permissions.tool.external_directory.title": "Ekstern mappe",
  "settings.permissions.tool.external_directory.description": "Få tilgang til filer utenfor prosjektmappen",
  "settings.permissions.tool.doom_loop.title": "Doom Loop",
@@ -729,6 +729,8 @@ export const dict = {
  "settings.permissions.tool.webfetch.description": "Pobieranie zawartości z adresu URL",
  "settings.permissions.tool.websearch.title": "Wyszukiwanie w sieci",
  "settings.permissions.tool.websearch.description": "Przeszukiwanie sieci",
+  "settings.permissions.tool.codesearch.title": "Wyszukiwanie kodu",
+  "settings.permissions.tool.codesearch.description": "Przeszukiwanie kodu w sieci",
  "settings.permissions.tool.external_directory.title": "Katalog zewnętrzny",
  "settings.permissions.tool.external_directory.description": "Dostęp do plików poza katalogiem projektu",
  "settings.permissions.tool.doom_loop.title": "Zapętlenie",
@@ -808,6 +808,8 @@ export const dict = {
  "settings.permissions.tool.webfetch.description": "Получение контента по URL",
  "settings.permissions.tool.websearch.title": "Web Search",
  "settings.permissions.tool.websearch.description": "Поиск в интернете",
+  "settings.permissions.tool.codesearch.title": "Code Search",
+  "settings.permissions.tool.codesearch.description": "Поиск кода в интернете",
  "settings.permissions.tool.external_directory.title": "Внешняя директория",
  "settings.permissions.tool.external_directory.description": "Доступ к файлам вне директории проекта",
  "settings.permissions.tool.doom_loop.title": "Doom Loop",
@@ -796,6 +796,8 @@ export const dict = {
  "settings.permissions.tool.webfetch.description": "ดึงเนื้อหาจาก URL",
  "settings.permissions.tool.websearch.title": "ค้นหาเว็บ",
  "settings.permissions.tool.websearch.description": "ค้นหาบนเว็บ",
+  "settings.permissions.tool.codesearch.title": "ค้นหาโค้ด",
+  "settings.permissions.tool.codesearch.description": "ค้นหาโค้ดบนเว็บ",
  "settings.permissions.tool.external_directory.title": "ไดเรกทอรีภายนอก",
  "settings.permissions.tool.external_directory.description": "เข้าถึงไฟล์นอกไดเรกทอรีโปรเจกต์",
  "settings.permissions.tool.doom_loop.title": "Doom Loop",
@@ -816,6 +816,8 @@ export const dict = {
  "settings.permissions.tool.webfetch.description": "Bir URL'den içerik getir",
  "settings.permissions.tool.websearch.title": "Web Ara",
  "settings.permissions.tool.websearch.description": "Web'de ara",
+  "settings.permissions.tool.codesearch.title": "Kod Ara",
+  "settings.permissions.tool.codesearch.description": "Web'de kod ara",
  "settings.permissions.tool.external_directory.title": "Harici Dizin",
  "settings.permissions.tool.external_directory.description": "Proje dizini dışındaki dosyalara eriş",
  "settings.permissions.tool.doom_loop.title": "Sonsuz Döngü",
@@ -793,6 +793,8 @@ export const dict = {
  "settings.permissions.tool.webfetch.description": "从 URL 获取内容",
  "settings.permissions.tool.websearch.title": "网页搜索",
  "settings.permissions.tool.websearch.description": "搜索网页",
+  "settings.permissions.tool.codesearch.title": "代码搜索",
+  "settings.permissions.tool.codesearch.description": "在网上搜索代码",
  "settings.permissions.tool.external_directory.title": "外部目录",
  "settings.permissions.tool.external_directory.description": "访问项目目录之外的文件",
  "settings.permissions.tool.doom_loop.title": "死循环",
@@ -789,6 +789,8 @@ export const dict = {
  "settings.permissions.tool.webfetch.description": "從 URL 取得內容",
  "settings.permissions.tool.websearch.title": "Web Search",
  "settings.permissions.tool.websearch.description": "搜尋網頁",
+  "settings.permissions.tool.codesearch.title": "Code Search",
+  "settings.permissions.tool.codesearch.description": "在網路上搜尋程式碼",
  "settings.permissions.tool.external_directory.title": "外部目錄",
  "settings.permissions.tool.external_directory.description": "存取專案目錄之外的檔案",
  "settings.permissions.tool.doom_loop.title": "Doom Loop",
@@ -64,13 +64,13 @@ import { DebugBar } from "@/components/debug-bar"
 import { Titlebar } from "@/components/titlebar"
 import { useServer } from "@/context/server"
 import { useLanguage, type Locale } from "@/context/language"
-import { pathKey } from "@/utils/path-key"
 import {
  displayName,
  effectiveWorkspaceOrder,
  errorMessage,
  latestRootSession,
  sortedRootSessions,
+  workspaceKey,
 } from "./layout/helpers"
 import {
  collectNewSessionDeepLinks,
@@ -164,7 +164,7 @@ export default function Layout(props: ParentProps) {

  const editor = createInlineEditorController()
  const setBusy = (directory: string, value: boolean) => {
-    const key = pathKey(directory)
+    const key = workspaceKey(directory)
    if (value) {
      setState("busyWorkspaces", key, true)
      return
@@ -176,7 +176,7 @@ export default function Layout(props: ParentProps) {
      }),
    )
  }
-  const isBusy = (directory: string) => !!state.busyWorkspaces[pathKey(directory)]
+  const isBusy = (directory: string) => !!state.busyWorkspaces[workspaceKey(directory)]
  const navLeave = { current: undefined as number | undefined }
  const sortNow = () => state.sortNow
  let sizet: number | undefined
@@ -497,8 +497,8 @@ export default function Layout(props: ParentProps) {
        }

        const currentSession = params.id
-        if (pathKey(directory) === pathKey(currentDir()) && props.sessionID === currentSession) return
-        if (pathKey(directory) === pathKey(currentDir()) && session?.parentID === currentSession) return
+        if (workspaceKey(directory) === workspaceKey(currentDir()) && props.sessionID === currentSession) return
+        if (workspaceKey(directory) === workspaceKey(currentDir()) && session?.parentID === currentSession) return

        dismissSessionAlert(sessionKey)

@@ -556,14 +556,14 @@ export default function Layout(props: ParentProps) {
  const currentProject = createMemo(() => {
    const directory = currentDir()
    if (!directory) return
-    const key = pathKey(directory)
+    const key = workspaceKey(directory)

    const projects = layout.projects.list()

-    const sandbox = projects.find((p) => p.sandboxes?.some((item) => pathKey(item) === key))
+    const sandbox = projects.find((p) => p.sandboxes?.some((item) => workspaceKey(item) === key))
    if (sandbox) return sandbox

-    const direct = projects.find((p) => pathKey(p.worktree) === key)
+    const direct = projects.find((p) => workspaceKey(p.worktree) === key)
    if (direct) return direct

    const [child] = globalSync.child(directory, { bootstrap: false })
@@ -596,7 +596,7 @@ export default function Layout(props: ParentProps) {
  })

  const workspaceName = (directory: string, projectId?: string, branch?: string) => {
-    const key = pathKey(directory)
+    const key = workspaceKey(directory)
    const direct = store.workspaceName[key] ?? store.workspaceName[directory]
    if (direct) return direct
    if (!projectId) return
@@ -605,7 +605,7 @@ export default function Layout(props: ParentProps) {
  }

  const setWorkspaceName = (directory: string, next: string, projectId?: string, branch?: string) => {
-    const key = pathKey(directory)
+    const key = workspaceKey(directory)
    setStore("workspaceName", key, next)
    if (!projectId) return
    if (!branch) return
@@ -633,7 +633,7 @@ export default function Layout(props: ParentProps) {
    const activeDir = currentDir()
    return workspaceIds(project).filter((directory) => {
      const expanded = store.workspaceExpanded[directory] ?? directory === project.worktree
-      const active = pathKey(directory) === pathKey(activeDir)
+      const active = workspaceKey(directory) === workspaceKey(activeDir)
      return expanded || active
    })
  })
@@ -644,9 +644,10 @@ export default function Layout(props: ParentProps) {
    const projects = layout.projects.list()
    for (const [directory, expanded] of Object.entries(store.workspaceExpanded)) {
      if (!expanded) continue
-      const key = pathKey(directory)
+      const key = workspaceKey(directory)
      const project = projects.find(
-        (item) => pathKey(item.worktree) === key || item.sandboxes?.some((sandbox) => pathKey(sandbox) === key),
+        (item) =>
+          workspaceKey(item.worktree) === key || item.sandboxes?.some((sandbox) => workspaceKey(sandbox) === key),
      )
      if (!project) continue
      if (project.vcs === "git" && layout.sidebar.workspaces(project.worktree)()) continue
@@ -699,7 +700,7 @@ export default function Layout(props: ParentProps) {
      seen: lru,
      keep: sessionID,
      limit: PREFETCH_MAX_SESSIONS_PER_DIR,
-      preserve: params.id && pathKey(directory) === pathKey(currentDir()) ? [params.id] : undefined,
+      preserve: params.id && workspaceKey(directory) === workspaceKey(currentDir()) ? [params.id] : undefined,
    })
  }

@@ -1220,14 +1221,17 @@ export default function Layout(props: ParentProps) {
  }

  function projectRoot(directory: string) {
-    const key = pathKey(directory)
+    const key = workspaceKey(directory)
    const project = layout.projects
      .list()
-      .find((item) => pathKey(item.worktree) === key || item.sandboxes?.some((sandbox) => pathKey(sandbox) === key))
+      .find(
+        (item) =>
+          workspaceKey(item.worktree) === key || item.sandboxes?.some((sandbox) => workspaceKey(sandbox) === key),
+      )
    if (project) return project.worktree

    const known = Object.entries(store.workspaceOrder).find(
-      ([root, dirs]) => pathKey(root) === key || dirs.some((item) => pathKey(item) === key),
+      ([root, dirs]) => workspaceKey(root) === key || dirs.some((item) => workspaceKey(item) === key),
    )
    if (known) return known[0]

@@ -1279,7 +1283,7 @@ export default function Layout(props: ParentProps) {
      : [root]
    const canOpen = (value: string | undefined) => {
      if (!value) return false
-      return dirs.some((item) => pathKey(item) === pathKey(value))
+      return dirs.some((item) => workspaceKey(item) === workspaceKey(value))
    }
    const refreshDirs = async (target?: string) => {
      if (!target || target === root || canOpen(target)) return canOpen(target)
@@ -1405,9 +1409,9 @@ export default function Layout(props: ParentProps) {

  function closeProject(directory: string) {
    const list = layout.projects.list()
-    const key = pathKey(directory)
-    const index = list.findIndex((x) => pathKey(x.worktree) === key)
-    const active = pathKey(currentProject()?.worktree ?? "") === key
+    const key = workspaceKey(directory)
+    const index = list.findIndex((x) => workspaceKey(x.worktree) === key)
+    const active = workspaceKey(currentProject()?.worktree ?? "") === key
    if (index === -1) return
    const next = list[index + 1]

@@ -1481,8 +1485,8 @@ export default function Layout(props: ParentProps) {
    if (directory === root) return

    const current = currentDir()
-    const currentKey = pathKey(current)
-    const deletedKey = pathKey(directory)
+    const currentKey = workspaceKey(current)
+    const deletedKey = workspaceKey(directory)
    const shouldLeave = leaveDeletedWorkspace || (!!params.dir && currentKey === deletedKey)
    if (!leaveDeletedWorkspace && shouldLeave) {
      navigateWithSidebarReset(`/${base64Encode(root)}/session`)
@@ -1505,7 +1509,7 @@ export default function Layout(props: ParentProps) {

    if (!result) return

-    if (pathKey(store.lastProjectSession[root]?.directory ?? "") === pathKey(directory)) {
+    if (workspaceKey(store.lastProjectSession[root]?.directory ?? "") === workspaceKey(directory)) {
      clearLastProjectSession(root)
    }

@@ -1525,12 +1529,12 @@ export default function Layout(props: ParentProps) {
    if (shouldLeave) return

    const nextCurrent = currentDir()
-    const nextKey = pathKey(nextCurrent)
+    const nextKey = workspaceKey(nextCurrent)
    const project = layout.projects.list().find((item) => item.worktree === root)
    const dirs = project
      ? effectiveWorkspaceOrder(root, [root, ...(project.sandboxes ?? [])], store.workspaceOrder[root])
      : [root]
-    const valid = dirs.some((item) => pathKey(item) === nextKey)
+    const valid = dirs.some((item) => workspaceKey(item) === nextKey)

    if (params.dir && projectRoot(nextCurrent) === root && !valid) {
      navigateWithSidebarReset(`/${base64Encode(root)}/session`)
@@ -1636,7 +1640,7 @@ export default function Layout(props: ParentProps) {
    })

    const handleDelete = () => {
-      const leaveDeletedWorkspace = !!params.dir && pathKey(currentDir()) === pathKey(props.directory)
+      const leaveDeletedWorkspace = !!params.dir && workspaceKey(currentDir()) === workspaceKey(props.directory)
      if (leaveDeletedWorkspace) {
        navigateWithSidebarReset(`/${base64Encode(props.root)}/session`)
      }
@@ -1863,9 +1867,11 @@ export default function Layout(props: ParentProps) {
    const local = project.worktree
    const dirs = [local, ...(project.sandboxes ?? [])]
    const active = currentProject()
-    const directory = pathKey(active?.worktree ?? "") === pathKey(project.worktree) ? currentDir() : undefined
+    const directory = workspaceKey(active?.worktree ?? "") === workspaceKey(project.worktree) ? currentDir() : undefined
    const extra =
-      directory && pathKey(directory) !== pathKey(local) && !dirs.some((item) => pathKey(item) === pathKey(directory))
+      directory &&
+      workspaceKey(directory) !== workspaceKey(local) &&
+      !dirs.some((item) => workspaceKey(item) === workspaceKey(directory))
        ? directory
        : undefined
    const pending = extra ? WorktreeState.get(extra)?.status === "pending" : false
@@ -1910,7 +1916,7 @@ export default function Layout(props: ParentProps) {
    setStore(
      "workspaceOrder",
      project.worktree,
-      result.filter((directory) => pathKey(directory) !== pathKey(project.worktree)),
+      result.filter((directory) => workspaceKey(directory) !== workspaceKey(project.worktree)),
    )
  }

@@ -1936,8 +1942,8 @@ export default function Layout(props: ParentProps) {
    setWorkspaceName(created.directory, created.branch, project.id, created.branch)

    const local = project.worktree
-    const key = pathKey(created.directory)
-    const root = pathKey(local)
+    const key = workspaceKey(created.directory)
+    const root = workspaceKey(local)

    setBusy(created.directory, true)
    WorktreeState.pending(created.directory)
@@ -1948,7 +1954,7 @@ export default function Layout(props: ParentProps) {
    setStore("workspaceOrder", project.worktree, (prev) => {
      const existing = prev ?? []
      const next = existing.filter((item) => {
-        const id = pathKey(item)
+        const id = workspaceKey(item)
        return id !== root && id !== key
      })
      return [created.directory, ...next]
@@ -14,8 +14,8 @@ import {
  errorMessage,
  hasProjectPermissions,
  latestRootSession,
+  workspaceKey,
 } from "./helpers"
-import { pathKey } from "@/utils/path-key"

 const session = (input: Partial<Session> & Pick<Session, "id" | "directory">) =>
  ({
@@ -104,16 +104,16 @@ describe("layout deep links", () => {

 describe("layout workspace helpers", () => {
  test("normalizes trailing slash in workspace key", () => {
-    expect(String(pathKey("/tmp/demo///"))).toBe("/tmp/demo")
-    expect(String(pathKey("C:\\tmp\\demo\\\\"))).toBe("C:/tmp/demo")
+    expect(workspaceKey("/tmp/demo///")).toBe("/tmp/demo")
+    expect(workspaceKey("C:\\tmp\\demo\\\\")).toBe("C:/tmp/demo")
  })

  test("preserves posix and drive roots in workspace key", () => {
-    expect(String(pathKey("/"))).toBe("/")
-    expect(String(pathKey("///"))).toBe("/")
-    expect(String(pathKey("C:\\"))).toBe("C:/")
-    expect(String(pathKey("C://"))).toBe("C:/")
-    expect(String(pathKey("C:///"))).toBe("C:/")
+    expect(workspaceKey("/")).toBe("/")
+    expect(workspaceKey("///")).toBe("/")
+    expect(workspaceKey("C:\\")).toBe("C:/")
+    expect(workspaceKey("C://")).toBe("C:/")
+    expect(workspaceKey("C:///")).toBe("C:/")
  })

  test("keeps local first while preserving known order", () => {
@@ -1,12 +1,19 @@
 import { getFilename } from "@opencode-ai/core/util/path"
 import { type Session } from "@opencode-ai/sdk/v2/client"
-import { pathKey } from "@/utils/path-key"

 type SessionStore = {
  session?: Session[]
  path: { directory: string }
 }

+export const workspaceKey = (directory: string) => {
+  const value = directory.replaceAll("\\", "/")
+  const drive = value.match(/^([A-Za-z]:)\/+$/)
+  if (drive) return `${drive[1]}/`
+  if (/^\/+$/i.test(value)) return "/"
+  return value.replace(/\/+$/, "")
+}
+
 function sortSessions(now: number) {
  const oneMinuteAgo = now - 60 * 1000
  return (a: Session, b: Session) => {
@@ -22,7 +29,7 @@ function sortSessions(now: number) {
 }

 const isRootVisibleSession = (session: Session, directory: string) =>
-  pathKey(session.directory) === pathKey(directory) && !session.parentID && !session.time?.archived
+  workspaceKey(session.directory) === workspaceKey(directory) && !session.parentID && !session.time?.archived

 export const roots = (store: SessionStore) =>
  (store.session ?? []).filter((session) => isRootVisibleSession(session, store.path.directory))
@@ -65,11 +72,11 @@ export const errorMessage = (err: unknown, fallback: string) => {
 }

 export const effectiveWorkspaceOrder = (local: string, dirs: string[], persisted?: string[]) => {
-  const root = pathKey(local)
+  const root = workspaceKey(local)
  const live = new Map<string, string>()

  for (const dir of dirs) {
-    const key = pathKey(dir)
+    const key = workspaceKey(dir)
    if (key === root) continue
    if (!live.has(key)) live.set(key, dir)
  }
@@ -78,7 +85,7 @@ export const effectiveWorkspaceOrder = (local: string, dirs: string[], persisted

  const result = [local]
  for (const dir of persisted) {
-    const key = pathKey(dir)
+    const key = workspaceKey(dir)
    if (key === root) continue
    const match = live.get(key)
    if (!match) continue
@@ -20,10 +20,9 @@ import { childSessionOnPath, hasProjectPermissions } from "./helpers"
 const OPENCODE_PROJECT_ID = "4b0ea68d7af9a6031a7ffda7ad66e0cb83315750"

 export function getProjectAvatarSource(id?: string, icon?: { color?: string; url?: string; override?: string }) {
-  if (id === OPENCODE_PROJECT_ID) return "https://opencode.ai/favicon.svg"
-  if (icon?.override) return icon?.override
-  if (icon?.color) return undefined
-  return icon?.url
+  return id === OPENCODE_PROJECT_ID
+    ? "https://opencode.ai/favicon.svg"
+    : (icon?.override ?? (icon?.color ? undefined : icon?.url))
 }

 export const ProjectIcon = (props: { project: LocalProject; class?: string; notify?: boolean }): JSX.Element => {
@@ -16,9 +16,8 @@ import { type Session } from "@opencode-ai/sdk/v2/client"
 import { type LocalProject } from "@/context/layout"
 import { loadSessionsQuery, useGlobalSync } from "@/context/global-sync"
 import { useLanguage } from "@/context/language"
-import { pathKey } from "@/utils/path-key"
 import { NewSessionItem, SessionItem, SessionSkeleton } from "./sidebar-items"
-import { sortedRootSessions } from "./helpers"
+import { sortedRootSessions, workspaceKey } from "./helpers"
 import { useQuery } from "@tanstack/solid-query"

 type InlineEditorComponent = (props: {
@@ -310,7 +309,7 @@ export const SortableWorkspace = (props: {
  const slug = createMemo(() => base64Encode(props.directory))
  const sessions = createMemo(() => sortedRootSessions(workspaceStore, props.sortNow()))
  const local = createMemo(() => props.directory === props.project.worktree)
-  const active = createMemo(() => pathKey(props.ctx.currentDir()) === pathKey(props.directory))
+  const active = createMemo(() => workspaceKey(props.ctx.currentDir()) === workspaceKey(props.directory))
  const workspaceValue = createMemo(() => {
    const branch = workspaceStore.vcs?.branch
    const name = branch ?? getFilename(props.directory)
@@ -1,24 +0,0 @@
-export type PathKey = string & { _brand: "PathKey" }
-
-const isDrive = (value: string) => {
-  if (value.length !== 2) return false
-  const code = value.charCodeAt(0)
-  return value[1] === ":" && ((code >= 65 && code <= 90) || (code >= 97 && code <= 122))
-}
-
-const trimTrailingSlashes = (value: string) => {
-  for (let i = value.length - 1; i >= 0; i--) {
-    if (value[i] !== "/") return value.slice(0, i + 1)
-  }
-  return ""
-}
-
-const isWindowsPath = (value: string) => value[1] === ":" || value.startsWith("\\\\")
-
-export const pathKey = (path: string) => {
-  const value = isWindowsPath(path) ? path.replaceAll("\\", "/") : path
-  const trimmed = trimTrailingSlashes(value)
-  if (!trimmed && value.startsWith("/")) return "/" as PathKey
-  if (isDrive(trimmed)) return `${trimmed}/` as PathKey
-  return trimmed as PathKey
-}
@@ -1,8 +1,6 @@
 import { beforeAll, beforeEach, describe, expect, mock, test } from "bun:test"

 type PersistTestingType = typeof import("./persist").PersistTesting
-type PersistType = typeof import("./persist").Persist
-type RemovePersistedType = typeof import("./persist").removePersisted

 class MemoryStorage implements Storage {
  private values = new Map<string, string>()
@@ -47,8 +45,6 @@ class MemoryStorage implements Storage {
 const storage = new MemoryStorage()

 let persistTesting: PersistTestingType
-let Persist: PersistType
-let removePersisted: RemovePersistedType

 beforeAll(async () => {
  mock.module("@/context/platform", () => ({
@@ -57,8 +53,6 @@ beforeAll(async () => {

  const mod = await import("./persist")
  persistTesting = mod.PersistTesting
-  Persist = mod.Persist
-  removePersisted = mod.removePersisted
 })

 beforeEach(() => {
@@ -118,50 +112,4 @@ describe("persist localStorage resilience", () => {
    expect(result.endsWith(".dat")).toBeTrue()
    expect(/[:\\/]/.test(result)).toBeFalse()
  })
-
-  test("workspace target keeps raw path storage as legacy fallback", () => {
-    const target = Persist.workspace("C:\\Users\\foo", "vcs")
-
-    expect(target.storage).toBe(persistTesting.workspaceStorage("C:/Users/foo"))
-    expect(target.legacyStorageNames).toEqual([persistTesting.workspaceStorage("C:\\Users\\foo")])
-  })
-
-  test("workspace target keeps backslash storage as fallback for normalized Windows paths", () => {
-    const target = Persist.workspace("C:/Users/foo", "vcs")
-
-    expect(target.storage).toBe(persistTesting.workspaceStorage("C:/Users/foo"))
-    expect(target.legacyStorageNames).toEqual([persistTesting.workspaceStorage("C:\\Users\\foo")])
-  })
-
-  test("migrates direct legacy keys into scoped storage", () => {
-    storage.setItem("legacy.workspace", '{"value":2}')
-    const target = Persist.workspace("C:/Users/foo", "demo", ["legacy.workspace"])
-    const current = persistTesting.localStorageWithPrefix(target.storage!)
-    const legacyStore = persistTesting.localStorageDirect()
-
-    const result = persistTesting.migrateLegacy({
-      current,
-      legacyStore,
-      stores: [],
-      keys: target.legacy!,
-      key: target.key,
-      defaults: { value: 1 },
-    })
-
-    expect(result).toBe('{"value":2}')
-    expect(storage.getItem(`${target.storage}:${target.key}`)).toBe('{"value":2}')
-    expect(legacyStore.getItem("legacy.workspace")).toBeNull()
-    expect(storage.getItem("legacy.workspace")).toBeNull()
-  })
-
-  test("removes legacy workspace storage when removing persisted target", () => {
-    const target = Persist.workspace("C:\\Users\\foo", "terminal")
-    storage.setItem(`${target.storage}:${target.key}`, '{"value":1}')
-    storage.setItem(`${target.legacyStorageNames![0]}:${target.key}`, '{"value":2}')
-
-    removePersisted(target)
-
-    expect(storage.getItem(`${target.storage}:${target.key}`)).toBeNull()
-    expect(storage.getItem(`${target.legacyStorageNames![0]}:${target.key}`)).toBeNull()
-  })
 })
@@ -3,7 +3,6 @@ import { makePersisted, type AsyncStorage, type SyncStorage } from "@solid-primi
 import { checksum } from "@opencode-ai/core/util/encode"
 import { createResource, type Accessor } from "solid-js"
 import type { SetStoreFunction, Store } from "solid-js/store"
-import { pathKey } from "@/utils/path-key"

 type InitType = Promise<string> | string | null
 type PersistedWithReady<T> = [
@@ -15,7 +14,6 @@ type PersistedWithReady<T> = [

 type PersistTarget = {
  storage?: string
-  legacyStorageNames?: string[]
  key: string
  legacy?: string[]
  migrate?: (value: unknown) => unknown
@@ -210,153 +208,12 @@ function normalize(defaults: unknown, raw: string, migrate?: (value: unknown) =>
  return JSON.stringify(merged)
 }

-function readCurrent(input: {
-  storage: SyncStorage
-  key: string
-  defaults: unknown
-  migrate?: (value: unknown) => unknown
-}) {
-  const raw = input.storage.getItem(input.key)
-  if (raw === null) return
-  const next = normalize(input.defaults, raw, input.migrate)
-  if (next === undefined) {
-    input.storage.removeItem(input.key)
-    return null
-  }
-  if (raw !== next) input.storage.setItem(input.key, next)
-  return next
-}
-
-function migrateLegacy(input: {
-  current: SyncStorage
-  legacyStore?: SyncStorage
-  stores: SyncStorage[]
-  keys: string[]
-  key: string
-  defaults: unknown
-  migrate?: (value: unknown) => unknown
-}) {
-  for (const store of input.stores) {
-    const raw = store.getItem(input.key)
-    if (raw === null) continue
-
-    const next = normalize(input.defaults, raw, input.migrate)
-    if (next === undefined) {
-      store.removeItem(input.key)
-      continue
-    }
-    input.current.setItem(input.key, next)
-    store.removeItem(input.key)
-    return next
-  }
-
-  if (!input.legacyStore) return null
-
-  for (const key of input.keys) {
-    const raw = input.legacyStore.getItem(key)
-    if (raw === null) continue
-
-    const next = normalize(input.defaults, raw, input.migrate)
-    if (next === undefined) {
-      input.legacyStore.removeItem(key)
-      continue
-    }
-    input.current.setItem(input.key, next)
-    input.legacyStore.removeItem(key)
-    return next
-  }
-
-  return null
-}
-
-async function readCurrentAsync(input: {
-  storage: AsyncStorage
-  key: string
-  defaults: unknown
-  migrate?: (value: unknown) => unknown
-}) {
-  const raw = await input.storage.getItem(input.key)
-  if (raw === null) return
-  const next = normalize(input.defaults, raw, input.migrate)
-  if (next === undefined) {
-    await input.storage.removeItem(input.key).catch(() => undefined)
-    return null
-  }
-  if (raw !== next) await input.storage.setItem(input.key, next)
-  return next
-}
-
-async function removeAsync(storage: AsyncStorage, key: string) {
-  try {
-    await storage.removeItem(key)
-  } catch {}
-}
-
-async function migrateLegacyAsync(input: {
-  current: AsyncStorage
-  legacyStore?: AsyncStorage
-  stores: AsyncStorage[]
-  keys: string[]
-  key: string
-  defaults: unknown
-  migrate?: (value: unknown) => unknown
-}) {
-  for (const store of input.stores) {
-    const raw = await store.getItem(input.key)
-    if (raw === null) continue
-
-    const next = normalize(input.defaults, raw, input.migrate)
-    if (next === undefined) {
-      await removeAsync(store, input.key)
-      continue
-    }
-    await input.current.setItem(input.key, next)
-    await store.removeItem(input.key)
-    return next
-  }
-
-  if (!input.legacyStore) return null
-
-  for (const key of input.keys) {
-    const raw = await input.legacyStore.getItem(key)
-    if (raw === null) continue
-
-    const next = normalize(input.defaults, raw, input.migrate)
-    if (next === undefined) {
-      await removeAsync(input.legacyStore, key)
-      continue
-    }
-    await input.current.setItem(input.key, next)
-    await input.legacyStore.removeItem(key)
-    return next
-  }
-
-  return null
-}
-
 function workspaceStorage(dir: string) {
  const head = (dir.slice(0, 12) || "workspace").replace(/[^a-zA-Z0-9._-]/g, "-")
  const sum = checksum(dir) ?? "0"
  return `opencode.workspace.${head}.${sum}.dat`
 }

-function legacyWorkspaceStorage(dir: string) {
-  const storage = workspaceStorage(pathKey(dir))
-  const result = new Set<string>()
-  const raw = workspaceStorage(dir)
-  if (raw !== storage) result.add(raw)
-
-  const key = pathKey(dir)
-  const drive = key.length >= 3 && key[1] === ":" && key[2] === "/"
-  if (drive) {
-    const backslash = workspaceStorage(key.replaceAll("/", "\\"))
-    if (backslash !== storage) result.add(backslash)
-  }
-
-  if (result.size === 0) return
-  return [...result]
-}
-
 function localStorageWithPrefix(prefix: string): SyncStorage {
  const base = `${prefix}:`
  const scope = `prefix:${prefix}`
@@ -447,7 +304,6 @@ function localStorageDirect(): SyncStorage {
 export const PersistTesting = {
  localStorageDirect,
  localStorageWithPrefix,
-  migrateLegacy,
  normalize,
  workspaceStorage,
 }
@@ -457,17 +313,10 @@ export const Persist = {
    return { storage: GLOBAL_STORAGE, key, legacy }
  },
  workspace(dir: string, key: string, legacy?: string[]): PersistTarget {
-    const storage = workspaceStorage(pathKey(dir))
-    return { storage, legacyStorageNames: legacyWorkspaceStorage(dir), key: `workspace:${key}`, legacy }
+    return { storage: workspaceStorage(dir), key: `workspace:${key}`, legacy }
  },
  session(dir: string, session: string, key: string, legacy?: string[]): PersistTarget {
-    const storage = workspaceStorage(pathKey(dir))
-    return {
-      storage,
-      legacyStorageNames: legacyWorkspaceStorage(dir),
-      key: `session:${session}:${key}`,
-      legacy,
-    }
+    return { storage: workspaceStorage(dir), key: `session:${session}:${key}`, legacy }
  },
  scoped(dir: string, session: string | undefined, key: string, legacy?: string[]): PersistTarget {
    if (session) return Persist.session(dir, session, key, legacy)
@@ -475,18 +324,11 @@ export const Persist = {
  },
 }

-export function removePersisted(
-  target: { storage?: string; legacyStorageNames?: string[]; key: string },
-  platform?: Platform,
-) {
+export function removePersisted(target: { storage?: string; key: string }, platform?: Platform) {
  const isDesktop = platform?.platform === "desktop" && !!platform.storage

  if (isDesktop) {
-    void platform.storage?.(target.storage)?.removeItem(target.key)
-    for (const storage of target.legacyStorageNames ?? []) {
-      void platform.storage?.(storage)?.removeItem(target.key)
-    }
-    return
+    return platform.storage?.(target.storage)?.removeItem(target.key)
  }

  if (!target.storage) {
@@ -495,9 +337,6 @@ export function removePersisted(
  }

  localStorageWithPrefix(target.storage).removeItem(target.key)
-  for (const storage of target.legacyStorageNames ?? []) {
-    localStorageWithPrefix(storage).removeItem(target.key)
-  }
 }

 export function persisted<T>(
@@ -524,27 +363,39 @@ export function persisted<T>(
    return platform.storage?.(LEGACY_STORAGE)
  })()

-  const legacyStorageNames = config.legacyStorageNames ?? []
-
  const storage = (() => {
    if (!isDesktop) {
      const current = currentStorage as SyncStorage
      const legacyStore = legacyStorage as SyncStorage
-      const legacyStores = legacyStorageNames.map(localStorageWithPrefix)

      const api: SyncStorage = {
        getItem: (key) => {
-          const value = readCurrent({ storage: current, key, defaults, migrate: config.migrate })
-          if (value !== undefined) return value
-          return migrateLegacy({
-            current,
-            legacyStore,
-            stores: legacyStores,
-            keys: legacy,
-            key,
-            defaults,
-            migrate: config.migrate,
-          })
+          const raw = current.getItem(key)
+          if (raw !== null) {
+            const next = normalize(defaults, raw, config.migrate)
+            if (next === undefined) {
+              current.removeItem(key)
+              return null
+            }
+            if (raw !== next) current.setItem(key, next)
+            return next
+          }
+
+          for (const legacyKey of legacy) {
+            const legacyRaw = legacyStore.getItem(legacyKey)
+            if (legacyRaw === null) continue
+
+            const next = normalize(defaults, legacyRaw, config.migrate)
+            if (next === undefined) {
+              legacyStore.removeItem(legacyKey)
+              continue
+            }
+            current.setItem(key, next)
+            legacyStore.removeItem(legacyKey)
+            return next
+          }
+
+          return null
        },
        setItem: (key, value) => {
          current.setItem(key, value)
@@ -559,23 +410,37 @@ export function persisted<T>(

    const current = currentStorage as AsyncStorage
    const legacyStore = legacyStorage as AsyncStorage | undefined
-    const legacyStores = legacyStorageNames
-      .map((name) => platform.storage?.(name) as AsyncStorage | undefined)
-      .filter((x) => !!x)

    const api: AsyncStorage = {
      getItem: async (key) => {
-        const value = await readCurrentAsync({ storage: current, key, defaults, migrate: config.migrate })
-        if (value !== undefined) return value
-        return migrateLegacyAsync({
-          current,
-          legacyStore,
-          stores: legacyStores,
-          keys: legacy,
-          key,
-          defaults,
-          migrate: config.migrate,
-        })
+        const raw = await current.getItem(key)
+        if (raw !== null) {
+          const next = normalize(defaults, raw, config.migrate)
+          if (next === undefined) {
+            await current.removeItem(key).catch(() => undefined)
+            return null
+          }
+          if (raw !== next) await current.setItem(key, next)
+          return next
+        }
+
+        if (!legacyStore) return null
+
+        for (const legacyKey of legacy) {
+          const legacyRaw = await legacyStore.getItem(legacyKey)
+          if (legacyRaw === null) continue
+
+          const next = normalize(defaults, legacyRaw, config.migrate)
+          if (next === undefined) {
+            await legacyStore.removeItem(legacyKey).catch(() => undefined)
+            continue
+          }
+          await current.setItem(key, next)
+          await legacyStore.removeItem(legacyKey)
+          return next
+        }
+
+        return null
      },
      setItem: async (key, value) => {
        await current.setItem(key, value)
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-app",
-  "version": "1.14.30",
+  "version": "1.14.29",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -11,12 +11,12 @@ const prodAssetNames: Record<string, string> = {
 } satisfies Record<DownloadPlatform, string>

 const betaAssetNames: Record<string, string> = {
-  "darwin-aarch64-dmg": "opencode-desktop-mac-arm64.dmg",
-  "darwin-x64-dmg": "opencode-desktop-mac-x64.dmg",
-  "windows-x64-nsis": "opencode-desktop-win-x64.exe",
-  "linux-x64-deb": "opencode-desktop-linux-amd64.deb",
-  "linux-x64-appimage": "opencode-desktop-linux-x86_64.AppImage",
-  "linux-x64-rpm": "opencode-desktop-linux-x86_64.rpm",
+  "darwin-aarch64-dmg": "opencode-electron-mac-arm64.dmg",
+  "darwin-x64-dmg": "opencode-electron-mac-x64.dmg",
+  "windows-x64-nsis": "opencode-electron-win-x64.exe",
+  "linux-x64-deb": "opencode-electron-linux-amd64.deb",
+  "linux-x64-appimage": "opencode-electron-linux-x86_64.AppImage",
+  "linux-x64-rpm": "opencode-electron-linux-x86_64.rpm",
 } satisfies Record<DownloadPlatform, string>

 // Doing this on the server lets us preserve the original name for platforms we don't care to rename for
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/console-core",
-  "version": "1.14.30",
+  "version": "1.14.29",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-function",
-  "version": "1.14.30",
+  "version": "1.14.29",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-mail",
-  "version": "1.14.30",
+  "version": "1.14.29",
  "dependencies": {
    "@jsx-email/all": "2.2.3",
    "@jsx-email/cli": "1.4.3",
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.14.30",
+  "version": "1.14.29",
  "name": "@opencode-ai/core",
  "type": "module",
  "license": "MIT",
@@ -47,7 +47,7 @@ export const Flag = {
  OPENCODE_DISABLE_CLAUDE_CODE,
  OPENCODE_DISABLE_CLAUDE_CODE_PROMPT: OPENCODE_DISABLE_CLAUDE_CODE || truthy("OPENCODE_DISABLE_CLAUDE_CODE_PROMPT"),
  OPENCODE_DISABLE_CLAUDE_CODE_SKILLS,
-  OPENCODE_DISABLE_EXTERNAL_SKILLS: truthy("OPENCODE_DISABLE_EXTERNAL_SKILLS"),
+  OPENCODE_DISABLE_EXTERNAL_SKILLS: OPENCODE_DISABLE_CLAUDE_CODE_SKILLS || truthy("OPENCODE_DISABLE_EXTERNAL_SKILLS"),
  OPENCODE_FAKE_VCS: process.env["OPENCODE_FAKE_VCS"],
  OPENCODE_SERVER_PASSWORD: process.env["OPENCODE_SERVER_PASSWORD"],
  OPENCODE_SERVER_USERNAME: process.env["OPENCODE_SERVER_USERNAME"],
@@ -4,7 +4,6 @@ import { xdgData, xdgCache, xdgConfig, xdgState } from "xdg-basedir"
 import os from "os"
 import { Context, Effect, Layer } from "effect"
 import { Flock } from "./util/flock"
-import { Flag } from "./flag/flag"

 const app = "opencode"
 const data = path.join(xdgData!, app)
@@ -48,28 +47,19 @@ export interface Interface {
  readonly log: string
 }

-export function make(input: Partial<Interface> = {}): Interface {
-  return {
-    home: Path.home,
-    data: Path.data,
-    cache: Path.cache,
-    config: Flag.OPENCODE_CONFIG_DIR ?? Path.config,
-    state: Path.state,
-    bin: Path.bin,
-    log: Path.log,
-    ...input,
-  }
-}
-
 export const layer = Layer.effect(
  Service,
-  Effect.sync(() => Service.of(make())),
+  Effect.gen(function* () {
+    return Service.of({
+      home: Path.home,
+      data: Path.data,
+      cache: Path.cache,
+      config: Path.config,
+      state: Path.state,
+      bin: Path.bin,
+      log: Path.log,
+    })
+  }),
 )

-export const layerWith = (input: Partial<Interface>) =>
-  Layer.effect(
-    Service,
-    Effect.sync(() => Service.of(make(input))),
-  )
-
 export * as Global from "./global"
@@ -18,17 +18,20 @@ function sleep(ms: number) {
  return new Promise<void>((resolve) => setTimeout(resolve, ms))
 }

-const msg: Msg = JSON.parse(process.argv[2])
+const msg: Msg = JSON.parse(process.argv[2]!)

-const testGlobal = Global.layerWith({
-  home: os.homedir(),
-  data: os.tmpdir(),
-  cache: os.tmpdir(),
-  config: os.tmpdir(),
-  state: os.tmpdir(),
-  bin: os.tmpdir(),
-  log: os.tmpdir(),
-})
+const testGlobal = Layer.succeed(
+  Global.Service,
+  Global.Service.of({
+    home: os.homedir(),
+    data: os.tmpdir(),
+    cache: os.tmpdir(),
+    config: os.tmpdir(),
+    state: os.tmpdir(),
+    bin: os.tmpdir(),
+    log: os.tmpdir(),
+  }),
+)

 const testLayer = EffectFlock.layer.pipe(Layer.provide(testGlobal), Layer.provide(AppFileSystem.defaultLayer))

@@ -93,15 +93,18 @@ async function waitForFile(file: string, timeout = 3_000) {
 // Test layer
 // ---------------------------------------------------------------------------

-const testGlobal = Global.layerWith({
-  home: os.homedir(),
-  data: os.tmpdir(),
-  cache: os.tmpdir(),
-  config: os.tmpdir(),
-  state: os.tmpdir(),
-  bin: os.tmpdir(),
-  log: os.tmpdir(),
-})
+const testGlobal = Layer.succeed(
+  Global.Service,
+  Global.Service.of({
+    home: os.homedir(),
+    data: os.tmpdir(),
+    cache: os.tmpdir(),
+    config: os.tmpdir(),
+    state: os.tmpdir(),
+    bin: os.tmpdir(),
+    log: os.tmpdir(),
+  }),
+)

 const testLayer = EffectFlock.layer.pipe(Layer.provide(testGlobal), Layer.provide(AppFileSystem.defaultLayer))

@@ -63,7 +63,6 @@ const getBase = (): Configuration => ({
      sign: signWindows,
    },
    target: ["nsis"],
-    verifyUpdateCodeSignature: false,
  },
  nsis: {
    oneClick: false,
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop-electron",
  "private": true,
-  "version": "1.14.30",
+  "version": "1.14.29",
  "type": "module",
  "license": "MIT",
  "homepage": "https://opencode.ai",
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop",
  "private": true,
-  "version": "1.14.30",
+  "version": "1.14.29",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/enterprise",
-  "version": "1.14.30",
+  "version": "1.14.29",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,7 +1,7 @@
 id = "opencode"
 name = "OpenCode"
 description = "The open source coding agent."
-version = "1.14.30"
+version = "1.14.29"
 schema_version = 1
 authors = ["Anomaly"]
 repository = "https://github.com/anomalyco/opencode"
@@ -11,26 +11,26 @@ name = "OpenCode"
 icon = "./icons/opencode.svg"

 [agent_servers.opencode.targets.darwin-aarch64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.30/opencode-darwin-arm64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.29/opencode-darwin-arm64.zip"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.darwin-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.30/opencode-darwin-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.29/opencode-darwin-x64.zip"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.linux-aarch64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.30/opencode-linux-arm64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.29/opencode-linux-arm64.tar.gz"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.linux-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.30/opencode-linux-x64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.29/opencode-linux-x64.tar.gz"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.windows-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.30/opencode-windows-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.14.29/opencode-windows-x64.zip"
 cmd = "./opencode.exe"
 args = ["acp"]
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/function",
-  "version": "1.14.30",
+  "version": "1.14.29",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -78,7 +78,6 @@ See `specs/effect/migration.md` for the compact pattern reference and examples.
 - Use `Effect.fn("Domain.method")` for named/traced effects and `Effect.fnUntraced` for internal helpers.
 - `Effect.fn` / `Effect.fnUntraced` accept pipeable operators as extra arguments, so avoid unnecessary outer `.pipe()` wrappers.
 - Use `Effect.callback` for callback-based APIs.
- Use `Effect.void` instead of `Effect.succeed(undefined)` or `Effect.succeed(void 0)`.
 - Prefer `DateTime.nowAsDate` over `new Date(yield* Clock.currentTimeMillis)` when you need a `Date`.

 ## Module conventions
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.14.30",
+  "version": "1.14.29",
  "name": "opencode",
  "type": "module",
  "license": "MIT",
@@ -50,7 +50,6 @@ console.log(`Loaded ${migrations.length} migrations`)
 const singleFlag = process.argv.includes("--single")
 const baselineFlag = process.argv.includes("--baseline")
 const skipInstall = process.argv.includes("--skip-install")
-const sourcemapsFlag = process.argv.includes("--sourcemaps")
 const plugin = createSolidTransformPlugin()
 const skipEmbedWebUi = process.argv.includes("--skip-embed-web-ui")

@@ -200,7 +199,6 @@ for (const item of targets) {
    external: ["node-gyp"],
    format: "esm",
    minify: true,
-    sourcemap: sourcemapsFlag ? "linked" : "none",
    splitting: true,
    compile: {
      autoloadBunfig: false,
@@ -12,16 +12,14 @@ Plan for replacing instance Hono route implementations with Effect `HttpApi` whi

 ## Current State

- `OPENCODE_EXPERIMENTAL_HTTPAPI` selects the backend at server startup. Default is still `hono`.
- `server/backend.ts` picks one of `effect-httpapi` or `hono`; `server.ts` builds either a pure Effect `HttpApi` web handler or the legacy Hono app accordingly. The earlier in-Hono "bridge" model has been replaced by this fork-at-startup.
- Legacy Hono routes remain mounted for the `hono` backend and remain the source for `hono-openapi` SDK generation.
- An Effect `HttpApi` OpenAPI surface exists (`OpenApi.fromApi(PublicApi)` in `cli/cmd/generate.ts --httpapi`, `OPENCODE_SDK_OPENAPI=httpapi` in `packages/sdk/js/script/build.ts`) but is opt-in. The default SDK generation is still Hono.
- `httpapi/public.ts` carries the Hono-compat normalization for the Effect-generated OpenAPI surface (auth scheme strip, request-body required flag, optional `null` arms, `BadRequestError` / `NotFoundError` remap, `$ref` self-cycle fix, `auth_token` query injection). Today's Effect-generated SDK is not byte-identical to the Hono-generated SDK — see Phase 4.
- Auth is centrally configured for the Effect backend via Effect `Config` (`refactor: use Effect config for HttpApi authorization`, `Fix HttpApi raw route authorization`) rather than re-attached in each route module.
+- `OPENCODE_EXPERIMENTAL_HTTPAPI` gates the bridge. Default behavior still uses Hono.
+- The bridge mounts selected paths in `server/routes/instance/index.ts` before legacy Hono routes.
+- Legacy Hono routes remain for default behavior and for `hono-openapi` SDK generation.
+- `HttpApi` auth is independent of Hono auth.
+- `Authorization` is attached in each route module, not centrally wrapped in `server.ts`.
 - Auth supports Basic auth and the legacy `auth_token` query parameter through `HttpApiSecurity.apiKey`.
 - Instance context is provided by `httpapi/server.ts` using `directory`, `workspace`, and `x-opencode-directory`.
 - `Observability.layer` is provided in the Effect route layer and deduplicated through the shared `memoMap`.
- CORS middleware is wired into both backends (`feat(httpapi): add CORS middleware to instance routes`).

 ## Migration Rules

@@ -124,19 +122,10 @@ Keep large or stateful groups for later:

 Hono routes cannot be deleted while `hono-openapi` is the source of SDK generation.

-Status: the Effect `HttpApi` OpenAPI surface is **implemented and opt-in** (`bun dev generate --httpapi`, `OPENCODE_SDK_OPENAPI=httpapi`). Default SDK generation still uses Hono. `httpapi/public.ts` applies the Hono-compat normalization layer to the Effect output. Diff against the Hono-generated spec still shows real gaps that must be closed before the SDK can flip:
-
- Branded-type `pattern` constraints on ID schemas are not propagated to the Effect output (~169 missing).
- Per-property `description` annotations are not propagated through `Schema.Struct` to the Effect output (~107 missing).
- `Event.*` and `SyncEvent.*` component names use dotted form in Hono and PascalCase in Effect (~50 differences, breaks SDK type names).
- Effect's component deduper emits numbered duplicates (`Session9`, `SyncEvent.session.updated.11`) that need a name-collision fix.
- Cosmetic-only diffs (`additionalProperties: false`, `const` vs `enum`, MAX_SAFE_INTEGER `maximum`, `propertyNames`) can be normalized in `public.ts` if they would otherwise change SDK output.
-
 Required before route deletion:

- Close the diff above so Effect-generated SDK output matches the Hono-generated SDK output for every retained path.
+- Generate the public OpenAPI surface from Effect `HttpApi` for ported routes.
 - Keep operation IDs, schemas, status codes, and SDK type names stable unless the change is intentional.
- Flip `packages/sdk/js/script/build.ts` default to `httpapi` and regenerate.
 - Compare generated SDK output against `dev` for every route group deletion.
 - Remove Hono OpenAPI stubs only after Effect OpenAPI is the SDK source for those paths.

@@ -376,26 +365,25 @@ Prefer smaller PRs from here so route behavior and SDK/OpenAPI fallout stays rev
 8. [x] Bridge session read routes: list, status, get, children, todo, diff, messages.
 9. [x] Bridge session lifecycle mutation routes: create, delete, update, fork, abort.
 10. [x] Bridge remaining session mutation and prompt routes.
-11. [ ] Replace event SSE with non-Hono Effect HTTP. The Effect backend has a raw Effect HTTP `httpapi/event.ts`; the Hono backend still uses `hono/streaming` `streamSSE`. Either port Hono `/event` to raw Effect HTTP for the fallback window, or skip and delete it together with Hono in step 15.
-12. [x] Replace pty websocket/control routes with non-Hono Effect HTTP for the Effect backend. Hono `pty.ts` remains in the Hono backend.
-13. [x] Replace tui bridge routes or explicitly isolate them behind a non-Hono compatibility layer for the Effect backend. Hono `tui.ts` remains in the Hono backend.
-14. [ ] Switch OpenAPI/SDK generation to Effect routes and compare SDK output. Effect path is implemented and opt-in via `--httpapi` / `OPENCODE_SDK_OPENAPI=httpapi`. Close the schema-shape gaps in `public.ts` (branded `pattern`, per-property `description`, `Event.*` / `SyncEvent.*` naming, dedup collisions), then flip `packages/sdk/js/script/build.ts` default.
-15. [ ] Flip `backend.ts` default from `hono` to `effect-httpapi`, keep `OPENCODE_EXPERIMENTAL_HTTPAPI` (or its inverse) as a short fallback flag, then delete replaced Hono route files.
+11. [ ] Replace event SSE with non-Hono Effect HTTP.
+12. [x] Replace pty websocket/control routes with non-Hono Effect HTTP.
+13. [x] Replace tui bridge routes or explicitly isolate them behind a non-Hono compatibility layer.
+14. [ ] Switch OpenAPI/SDK generation to Effect routes and compare SDK output.
+15. [ ] Flip ported JSON routes default-on, keep a short fallback, then delete replaced Hono route files.

 ## Checklist

 - [x] Add first `HttpApi` JSON route slices.
- [x] Bridge selected `HttpApi` routes behind `OPENCODE_EXPERIMENTAL_HTTPAPI`. (Now backend-fork-at-startup rather than in-Hono path mounting.)
+- [x] Bridge selected `HttpApi` routes into Hono behind `OPENCODE_EXPERIMENTAL_HTTPAPI`.
 - [x] Reuse existing Effect services in handlers.
 - [x] Provide auth, instance lookup, and observability in the Effect route layer.
- [x] Centralize auth via Effect `Config` for the Effect backend.
+- [x] Attach auth middleware in route modules.
 - [x] Support `auth_token` as a query security scheme.
 - [x] Add bridge-level auth and instance tests.
 - [x] Complete exact Hono route inventory.
 - [x] Resolve implemented-but-unmounted route groups.
 - [x] Port remaining top-level JSON reads.
- [x] Implement Effect `HttpApi` OpenAPI generation behind `--httpapi` / `OPENCODE_SDK_OPENAPI=httpapi`.
- [ ] Close Effect-vs-Hono OpenAPI schema-shape gaps and flip the SDK generator default.
- [ ] Flip the runtime backend default from `hono` to `effect-httpapi`, with a short fallback flag.
+- [ ] Generate SDK/OpenAPI from Effect routes.
+- [ ] Flip ported JSON routes to default-on with fallback.
 - [ ] Delete replaced Hono route implementations.
- [ ] Replace SSE/websocket/streaming Hono routes with non-Hono implementations (or remove with the rest of Hono).
+- [ ] Replace SSE/websocket/streaming Hono routes with non-Hono implementations.
@@ -286,6 +286,7 @@ emitted JSON Schema must stay byte-identical.

 - [x] `src/tool/apply_patch.ts`
 - [x] `src/tool/bash.ts`
+- [x] `src/tool/codesearch.ts`
 - [x] `src/tool/edit.ts`
 - [x] `src/tool/glob.ts`
 - [x] `src/tool/grep.ts`
@@ -40,6 +40,7 @@ These exported tool definitions currently use `Tool.define(...)` in `src/tool`:

 - [x] `apply_patch.ts`
 - [x] `bash.ts`
+- [x] `codesearch.ts`
 - [x] `edit.ts`
 - [x] `glob.ts`
 - [x] `grep.ts`
@@ -78,6 +79,7 @@ Notable items that are already effectively on the target path and do not need se
 - `apply_patch.ts`
 - `grep.ts`
 - `write.ts`
+- `codesearch.ts`
 - `websearch.ts`
 - `edit.ts`

@@ -1,67 +0,0 @@
-// @ts-nocheck
-
-import { OpenCode } from "@opencode-ai/core"
-import { ReadTool } from "@opencode-ai/core/tools"
-
-const opencode = OpenCode.make({})
-
-opencode.tool.add(ReadTool)
-
-opencode.tool.add({
-  name: "bash",
-  schema: {
-    type: "object",
-    properties: {
-      command: {
-        type: "string",
-        description: "The command to run.",
-      },
-    },
-    required: ["command"],
-  },
-  execute(input, ctx) {},
-})
-
-opencode.auth.add({
-  provider: "openai",
-  type: "api",
-  value: process.env.OPENAI_API_KEY,
-})
-
-opencode.agent.add({
-  name: "build",
-  permissions: [],
-  model: {
-    id: "gpt-5-5",
-    provider: "openai",
-    variant: "xhigh",
-  },
-})
-
-const sessionID = await opencode.session.create({
-  agent: "build",
-})
-
-opencode.subscribe((event) => {
-  console.log(event)
-})
-
-await opencode.session.prompt({
-  sessionID,
-  text: "hey what is up",
-})
-
-await opencode.session.prompt({
-  sessionID,
-  text: "what is up with this",
-  files: [
-    {
-      mime: "image/png",
-      uri: "data:image/png;base64,xxxx",
-    },
-  ],
-})
-
-await opencode.session.wait()
-
-console.log(await opencode.session.messages(sessionID))
@@ -169,6 +169,7 @@ export const layer = Layer.effect(
                bash: "allow",
                webfetch: "allow",
                websearch: "allow",
+                codesearch: "allow",
                read: "allow",
                external_directory: {
                  "*": "ask",
@@ -28,6 +28,7 @@ const AVAILABLE_PERMISSIONS = [
  "task",
  "todowrite",
  "websearch",
+  "codesearch",
  "lsp",
  "skill",
 ]
@@ -245,7 +245,10 @@ export const ExportCommand = cmd({
          output: process.stderr,
        })

-        const sessions = await AppRuntime.runPromise(Session.Service.use((svc) => svc.list()))
+        const sessions = []
+        for await (const session of Session.list()) {
+          sessions.push(session)
+        }

        if (sessions.length === 0) {
          prompts.log.error("No sessions found", {
@@ -156,38 +156,28 @@ async function handlePluginAuth(plugin: { auth: PluginAuth }, provider: string,
  }

  if (method.type === "api") {
-    const key = await prompts.password({
-      message: "Enter your API key",
-      validate: (x) => (x && x.length > 0 ? undefined : "Required"),
-    })
-    if (prompts.isCancel(key)) throw new UI.CancelledError()
-
-    const metadata = Object.keys(inputs).length ? { metadata: inputs } : {}
-    if (!method.authorize) {
-      await put(provider, {
-        type: "api",
-        key,
-        ...metadata,
+    if (method.authorize) {
+      const key = await prompts.password({
+        message: "Enter your API key",
+        validate: (x) => (x && x.length > 0 ? undefined : "Required"),
      })
+      if (prompts.isCancel(key)) throw new UI.CancelledError()
+
+      const result = await method.authorize(inputs)
+      if (result.type === "failed") {
+        prompts.log.error("Failed to authorize")
+      }
+      if (result.type === "success") {
+        const saveProvider = result.provider ?? provider
+        await put(saveProvider, {
+          type: "api",
+          key: result.key ?? key,
+        })
+        prompts.log.success("Login successful")
+      }
      prompts.outro("Done")
      return true
    }
-
-    const result = await method.authorize(inputs)
-    if (result.type === "failed") {
-      prompts.log.error("Failed to authorize")
-    }
-    if (result.type === "success") {
-      const saveProvider = result.provider ?? provider
-      await put(saveProvider, {
-        type: "api",
-        key: result.key ?? key,
-        ...metadata,
-      })
-      prompts.log.success("Login successful")
-    }
-    prompts.outro("Done")
-    return true
  }

  return false
@@ -19,6 +19,7 @@ import { ReadTool } from "../../tool/read"
 import { WebFetchTool } from "../../tool/webfetch"
 import { EditTool } from "../../tool/edit"
 import { WriteTool } from "../../tool/write"
+import { CodeSearchTool } from "../../tool/codesearch"
 import { WebSearchTool } from "../../tool/websearch"
 import { TaskTool } from "../../tool/task"
 import { SkillTool } from "../../tool/skill"
@@ -144,6 +145,13 @@ function edit(info: ToolProps<typeof EditTool>) {
  )
 }

+function codesearch(info: ToolProps<typeof CodeSearchTool>) {
+  inline({
+    icon: "◇",
+    title: `Exa Code Search "${info.input.query}"`,
+  })
+}
+
 function websearch(info: ToolProps<typeof WebSearchTool>) {
  inline({
    icon: "◈",
@@ -407,6 +415,7 @@ export const RunCommand = cmd({
          if (part.tool === "write") return write(props<typeof WriteTool>(part))
          if (part.tool === "webfetch") return webfetch(props<typeof WebFetchTool>(part))
          if (part.tool === "edit") return edit(props<typeof EditTool>(part))
+          if (part.tool === "codesearch") return codesearch(props<typeof CodeSearchTool>(part))
          if (part.tool === "websearch") return websearch(props<typeof WebSearchTool>(part))
          if (part.tool === "task") return task(props<typeof TaskTool>(part))
          if (part.tool === "todowrite") return todo(props<typeof TodoWriteTool>(part))
@@ -91,9 +91,7 @@ export const SessionListCommand = cmd({
  },
  handler: async (args) => {
    await bootstrap(process.cwd(), async () => {
-      const sessions = await AppRuntime.runPromise(
-        Session.Service.use((svc) => svc.list({ roots: true, limit: args.maxCount })),
-      )
+      const sessions = [...Session.list({ roots: true, limit: args.maxCount })]

      if (sessions.length === 0) {
        return
@@ -301,9 +301,6 @@ function App(props: { onSnapshot?: () => Promise<string[]> }) {
    renderer.clearSelection()
  }
  const [terminalTitleEnabled, setTerminalTitleEnabled] = createSignal(kv.get("terminal_title_enabled", true))
-  const [pasteSummaryEnabled, setPasteSummaryEnabled] = createSignal(
-    kv.get("paste_summary_enabled", !sync.data.config.experimental?.disable_paste_summary),
-  )

  // Update terminal window title based on current route and session
  createEffect(() => {
@@ -739,19 +736,6 @@ function App(props: { onSnapshot?: () => Promise<string[]> }) {
        dialog.clear()
      },
    },
-    {
-      title: pasteSummaryEnabled() ? "Disable paste summary" : "Enable paste summary",
-      value: "app.toggle.paste_summary",
-      category: "System",
-      onSelect: (dialog) => {
-        setPasteSummaryEnabled((prev) => {
-          const next = !prev
-          kv.set("paste_summary_enabled", next)
-          return next
-        })
-        dialog.clear()
-      },
-    },
    {
      title: kv.get("session_directory_filter_enabled", true)
        ? "Disable session directory filtering"
@@ -12,7 +12,7 @@ import { useRoute } from "@tui/context/route"
 import { useProject } from "@tui/context/project"
 import { useSync } from "@tui/context/sync"
 import { useEvent } from "@tui/context/event"
-import { editorSelectionKey, useEditorContext, type EditorSelection } from "@tui/context/editor"
+import { useEditorContext } from "@tui/context/editor"
 import { MessageID, PartID } from "@/session/schema"
 import { createStore, produce, unwrap } from "solid-js/store"
 import { useKeybind } from "@tui/context/keybind"
@@ -84,32 +84,6 @@ function fadeColor(color: RGBA, alpha: number) {
  return RGBA.fromValues(color.r, color.g, color.b, color.a * alpha)
 }

-function hasEditorRangeSelection(selection: EditorSelection["ranges"][number]) {
-  return (
-    selection.selection.start.line !== selection.selection.end.line ||
-    selection.selection.start.character !== selection.selection.end.character
-  )
-}
-
-function getEditorRangeLabel(selection: EditorSelection["ranges"][number]) {
-  if (!hasEditorRangeSelection(selection)) return
-  if (selection.selection.start.line === selection.selection.end.line) return `#${selection.selection.start.line}`
-  return `#${selection.selection.start.line}-${selection.selection.end.line}`
-}
-
-function formatEditorContext(selection: EditorSelection) {
-  const selected = selection.ranges.filter(hasEditorRangeSelection)
-  if (selected.length === 0)
-    return `<system-reminder>Note: The user opened the file "${selection.filePath}". This may or may not be relevant to the current task.</system-reminder>\n`
-
-  const ranges = selected.map((range, index) => {
-    const prefix = selected.length > 1 ? `Selection ${index + 1}: ` : ""
-    return `Note: The user selected ${prefix}${getEditorRangeLabel(range)} from "${selection.filePath}". \`\`\`${range.text}\`\`\`\n\n`
-  })
-
-  return `<system-reminder>${ranges.join("\n")} This may or may not be relevant to the current task.</system-reminder>\n`
-}
-
 let stashed: { prompt: PromptInfo; cursor: number } | undefined

 export function Prompt(props: PromptProps) {
@@ -139,21 +113,13 @@ export function Prompt(props: PromptProps) {
  const list = createMemo(() => props.placeholders?.normal ?? [])
  const shell = createMemo(() => props.placeholders?.shell ?? [])
  const fileContextEnabled = createMemo(() => kv.get("file_context_enabled", true))
-  const [dismissedEditorSelectionKey, setDismissedEditorSelectionKey] = createSignal<string>()
-  const editorContext = createMemo(() => {
-    const selection = fileContextEnabled() ? editor.selection() : undefined
-    if (!selection) return
-    return editorSelectionKey(selection) === dismissedEditorSelectionKey() ? undefined : selection
-  })
-  const editorPath = createMemo(() => editorContext()?.filePath)
+  const editorPath = createMemo(() => (fileContextEnabled() ? editor.selection()?.filePath : undefined))
  const editorSelectionLabel = createMemo(() => {
-    const ranges = editorContext()?.ranges
-    if (!ranges) return
-    const first = ranges.find(hasEditorRangeSelection) ?? ranges[0]
-    if (!first) return
-    return [getEditorRangeLabel(first), ranges.length > 1 ? `+${ranges.length - 1}` : undefined]
-      .filter(Boolean)
-      .join(" ")
+    const selection = fileContextEnabled() ? editor.selection()?.selection : undefined
+    if (!selection) return
+    if (selection.start.line === selection.end.line && selection.start.character === selection.end.character) return
+    if (selection.start.line === selection.end.line) return `#${selection.start.line}`
+    return `#${selection.start.line}-${selection.end.line}`
  })
  const editorFileLabel = createMemo(() => {
    const value = editorPath()
@@ -169,8 +135,6 @@ export function Prompt(props: PromptProps) {
    if (!file) return
    return Locale.truncateMiddle(file, Math.max(12, Math.min(48, Math.floor(dimensions().width / 3))))
  })
-  const [editorContextHover, setEditorContextHover] = createSignal(false)
-  let lastSubmittedEditorSelectionKey: string | undefined
  const [auto, setAuto] = createSignal<AutocompleteRef>()
  const currentProviderLabel = createMemo(() => local.model.parsed().provider)
  const hasRightContent = createMemo(() => Boolean(props.right))
@@ -186,11 +150,6 @@ export function Prompt(props: PromptProps) {
    }
  }

-  function dismissEditorContext() {
-    setDismissedEditorSelectionKey(editorSelectionKey(editorContext()))
-    editor.clearSelection()
-  }
-
  const textareaKeybindings = useTextareaKeybindings()

  const fileStyleId = syntax().getStyleId("extmark.file")!
@@ -320,16 +279,6 @@ export function Prompt(props: PromptProps) {
          dialog.clear()
        },
      },
-      {
-        title: "Remove editor context",
-        value: "prompt.editor_context.clear",
-        category: "Prompt",
-        enabled: Boolean(editorContext()),
-        onSelect: (dialog) => {
-          dismissEditorContext()
-          dialog.clear()
-        },
-      },
      {
        title: "Paste",
        value: "prompt.paste",
@@ -798,25 +747,37 @@ export function Prompt(props: PromptProps) {
    // Capture mode before it gets reset
    const currentMode = store.mode
    const variant = local.model.variant.current()
-    const editorSelection = editorContext()
-    const currentEditorSelectionKey = editorSelectionKey(editorSelection)
-    const editorParts =
-      editorSelection && currentEditorSelectionKey !== lastSubmittedEditorSelectionKey
-        ? [
-            {
-              id: PartID.ascending(),
-              type: "text" as const,
-              text: formatEditorContext(editorSelection),
-              synthetic: true,
-              metadata: {
-                kind: "editor_context",
-                source: editorSelection.source ?? "editor",
-                filePath: editorSelection.filePath,
-                ranges: editorSelection.ranges,
-              },
+    const editorSelection = fileContextEnabled() ? editor.selection() : undefined
+    const editorParts = editorSelection
+      ? [
+          {
+            id: PartID.ascending(),
+            type: "text" as const,
+            text: (() => {
+              const start = editorSelection.selection.start
+              const end = editorSelection.selection.end
+
+              let text = ""
+              if (start.line === end.line && start.character === end.character) {
+                text = `Note: The user opened the file "${editorSelection.filePath}".`
+              } else if (start.line === end.line) {
+                text = `Note: The user selected line ${start.line + 1} from "${editorSelection.filePath}". \`\`\`${editorSelection.text}\`\`\`\n\n`
+              } else {
+                text = `Note: The user selected lines ${start.line + 1} to ${end.line + 1} from "${editorSelection.filePath}". \`\`\`${editorSelection.text}\`\`\`\n\n`
+              }
+
+              return `<system-reminder>${text} This may or may not be relevant to the current task.</system-reminder>\n`
+            })(),
+            synthetic: true,
+            metadata: {
+              kind: "editor_context",
+              source: editorSelection.source ?? "editor",
+              filePath: editorSelection.filePath,
+              selection: editorSelection.selection,
            },
-          ]
-        : []
+          },
+        ]
+      : []

    if (store.mode === "shell") {
      void sdk.client.session.shell({
@@ -879,7 +840,7 @@ export function Prompt(props: PromptProps) {
          ],
        })
        .catch(() => {})
-      lastSubmittedEditorSelectionKey = currentEditorSelectionKey
+      editor.clearSelection()
    }
    history.append({
      ...store.prompt,
@@ -1248,7 +1209,7 @@ export function Prompt(props: PromptProps) {
                const lineCount = (pastedContent.match(/\n/g)?.length ?? 0) + 1
                if (
                  (lineCount >= 3 || pastedContent.length > 150) &&
-                  kv.get("paste_summary_enabled", !sync.data.config.experimental?.disable_paste_summary)
+                  !sync.data.config.experimental?.disable_paste_summary
                ) {
                  pasteText(pastedContent, `[Pasted ~${lineCount} lines]`)
                  return
@@ -1430,18 +1391,7 @@ export function Prompt(props: PromptProps) {
          </Show>
          <Show when={status().type !== "retry"}>
            <box gap={2} flexDirection="row">
-              <Show when={editorFileLabelDisplay()}>
-                {(file) => (
-                  <text
-                    fg={theme.secondary}
-                    onMouseOver={() => setEditorContextHover(true)}
-                    onMouseOut={() => setEditorContextHover(false)}
-                    onMouseUp={dismissEditorContext}
-                  >
-                    {editorContextHover() ? `x ${file()}` : file()}
-                  </text>
-                )}
-              </Show>
+              <Show when={editorFileLabelDisplay()}>{(file) => <text fg={theme.secondary}>{file()}</text>}</Show>
              <Switch>
                <Match when={store.mode === "normal"}>
                  <Switch>
@@ -12,9 +12,6 @@ const ZedEditorRowSchema = z.object({
  workspace_paths: z.string().nullable(),
  timestamp: z.string(),
  buffer_path: z.string().nullable(),
-})
-
-const ZedSelectionRowSchema = z.object({
  selection_start: z.number().nullable(),
  selection_end: z.number().nullable(),
 })
@@ -27,7 +24,6 @@ const utf8 = new TextEncoder()

 type ZedEditorRow = z.infer<typeof ZedEditorRowSchema>
 type ZedActiveEditorRow = ZedEditorRow & { item_kind: "Editor"; editor_id: number }
-type ZedSelectionRow = z.infer<typeof ZedSelectionRowSchema>

 export type ZedSelectionResult =
  | { type: "selection"; selection: EditorSelection }
@@ -40,21 +36,7 @@ export async function resolveZedSelection(dbPath: string, cwd = process.cwd()):

  const row = active.row
  if (!row.buffer_path) return { type: "empty" }
-
-  const selections = queryZedEditorSelections(dbPath, row)
-  if (selections.type !== "selections") return selections
-  const byteRanges = selections.selections
-    .flatMap((selection) => {
-      if (selection.selection_start == null || selection.selection_end == null) return []
-      return [
-        {
-          start: Math.min(selection.selection_start, selection.selection_end),
-          end: Math.max(selection.selection_start, selection.selection_end),
-        },
-      ]
-    })
-    .sort((left, right) => left.start - right.start || left.end - right.end)
-  if (byteRanges.length === 0) return { type: "unavailable" }
+  if (row.selection_start == null || row.selection_end == null) return { type: "unavailable" }

  const contents = queryZedEditorContents(dbPath, row)
  const text =
@@ -65,21 +47,16 @@ export async function resolveZedSelection(dbPath: string, cwd = process.cwd()):
          .catch(() => undefined)
  if (text == null) return { type: "unavailable" }

-  const ranges = byteRanges.map((range) => {
-    const startOffset = utf8ByteOffsetToStringIndex(text, range.start)
-    const endOffset = utf8ByteOffsetToStringIndex(text, range.end)
-    return {
-      text: text.slice(startOffset, endOffset),
-      selection: offsetsToSelection(text, startOffset, endOffset),
-    }
-  })
+  const startOffset = utf8ByteOffsetToStringIndex(text, Math.min(row.selection_start, row.selection_end))
+  const endOffset = utf8ByteOffsetToStringIndex(text, Math.max(row.selection_start, row.selection_end))

  return {
    type: "selection",
    selection: {
+      text: text.slice(startOffset, endOffset),
      filePath: row.buffer_path,
      source: "zed",
-      ranges,
+      selection: offsetsToSelection(text, startOffset, endOffset),
    },
  }
 }
@@ -96,11 +73,14 @@ function queryZedActiveEditor(dbPath: string, cwd: string) {
          i.workspace_id as workspace_id,
          w.paths as workspace_paths,
          w.timestamp as timestamp,
-          e.buffer_path as buffer_path
+          e.buffer_path as buffer_path,
+          s.start as selection_start,
+          s.end as selection_end
        from items i
        join panes p on p.pane_id = i.pane_id and p.workspace_id = i.workspace_id
        join workspaces w on w.workspace_id = i.workspace_id
        left join editors e on e.item_id = i.item_id and e.workspace_id = i.workspace_id
+        left join editor_selections s on s.editor_id = e.item_id and s.workspace_id = e.workspace_id
        where i.active = 1 and p.active = 1
        order by w.timestamp desc`,
      )
@@ -128,34 +108,6 @@ function queryZedActiveEditor(dbPath: string, cwd: string) {
  }
 }

-function queryZedEditorSelections(dbPath: string, row: ZedActiveEditorRow) {
-  let db: Database | undefined
-  try {
-    db = new Database(dbPath, { readonly: true })
-    const raw = db
-      .query(
-        `select
-          start as selection_start,
-          end as selection_end
-        from editor_selections
-        where editor_id = $editorID and workspace_id = $workspaceID`,
-      )
-      .all({ $editorID: row.editor_id, $workspaceID: row.workspace_id })
-
-    const selections = raw.flatMap((selection) => {
-      const parsed = ZedSelectionRowSchema.safeParse(selection)
-      return parsed.success ? [parsed.data] : []
-    })
-
-    if (raw.length > 0 && selections.length === 0) return { type: "unavailable" as const }
-    return { type: "selections" as const, selections }
-  } catch {
-    return { type: "unavailable" as const }
-  } finally {
-    db?.close()
-  }
-}
-
 function queryZedEditorContents(dbPath: string, row: ZedActiveEditorRow) {
  let db: Database | undefined
  try {
@@ -189,20 +141,13 @@ export function resolveZedDbPath() {
    path.join(os.homedir(), ".local", "share", "zed", "db", "0-stable", "db.sqlite"),
  ].filter((item): item is string => Boolean(item))

-  return candidates.find((item) => isFile(item))
-}
-
-function isFile(item: string) {
-  try {
-    return Filesystem.stat(item)?.isFile() === true
-  } catch {
-    return false
-  }
+  return candidates.find((item) => Filesystem.stat(item)?.isFile())
 }

 function scoreZedWorkspace(workspacePaths: string | null, cwd: string) {
  return zedWorkspacePaths(workspacePaths).reduce((score, item) => {
-    if (pathContains(item, cwd)) return Math.max(score, path.resolve(item).length)
+    if (pathContains(item, cwd)) return Math.max(score, 2)
+    if (pathContains(cwd, item)) return Math.max(score, 1)
    return score
  }, 0)
 }
@@ -28,46 +28,16 @@ const PositionSchema = z.object({
  character: z.number(),
 })

-const EditorSelectionRangeSchema = z.object({
+const EditorSelectionSchema = z.object({
  text: z.string(),
+  filePath: z.string(),
+  source: z.enum(["websocket", "zed"]).optional(),
  selection: z.object({
    start: PositionSchema,
    end: PositionSchema,
  }),
 })

-const EditorSelectionSchema = z
-  .union([
-    z.object({
-      filePath: z.string(),
-      source: z.enum(["websocket", "zed"]).optional(),
-      ranges: z.array(EditorSelectionRangeSchema).min(1),
-    }),
-    z.object({
-      text: z.string(),
-      filePath: z.string(),
-      source: z.enum(["websocket", "zed"]).optional(),
-      selection: z.object({
-        start: PositionSchema,
-        end: PositionSchema,
-      }),
-    }),
-  ])
-  .transform((value) =>
-    "ranges" in value
-      ? value
-      : {
-          filePath: value.filePath,
-          source: value.source,
-          ranges: [
-            {
-              text: value.text,
-              selection: value.selection,
-            },
-          ],
-        },
-  )
-
 const EditorMentionSchema = z.object({
  filePath: z.string(),
  lineStart: z.number(),
@@ -105,9 +75,8 @@ type EditorLockFile = {

 export const { use: useEditorContext, provider: EditorContextProvider } = createSimpleContext({
  name: "EditorContext",
-  init: (props: { WebSocketImpl?: typeof WebSocket }) => {
+  init: () => {
    const mentionListeners = new Set<(mention: EditorMention) => void>()
-    const WebSocketImpl = props.WebSocketImpl ?? WebSocket
    const [store, setStore] = createStore<{
      status: "disabled" | "connecting" | "connected"
      selection: EditorSelection | undefined
@@ -118,160 +87,138 @@ export const { use: useEditorContext, provider: EditorContextProvider } = create
      server: undefined,
    })

-    let socket: WebSocket | undefined
-    let closed = false
-    let reconnect: ReturnType<typeof setTimeout> | undefined
-    let attempt = 0
-    let requestID = 0
-    let zedSelection: Promise<void> | undefined
-    let lastZedSelectionKey: string | undefined
-    let directory = process.cwd()
-    const pending = new Map<number, string>()
+    onMount(() => {
+      let socket: WebSocket | undefined
+      let closed = false
+      let reconnect: ReturnType<typeof setTimeout> | undefined
+      let attempt = 0
+      let requestID = 0
+      let zedSelection: Promise<void> | undefined
+      let lastZedSelectionKey: string | undefined
+      const pending = new Map<number, string>()

-    const send = (payload: JsonRpcMessage) => {
-      if (!socket || socket.readyState !== 1) return
-      socket.send(JSON.stringify({ jsonrpc: "2.0", ...payload }))
-    }
-
-    const request = (method: string, params?: unknown) => {
-      requestID += 1
-      pending.set(requestID, method)
-      send({ id: requestID, method, params })
-    }
-
-    const connect = () => {
-      if (closed) return
-
-      const connection = resolveEditorConnection(directory)
-      if (!connection) {
-        const dbPath = resolveZedDbPath()
-        if (!dbPath) {
-          setStore("status", "disabled")
-          scheduleReconnect()
-          return
-        }
-        zedSelection ??= resolveZedSelection(dbPath, directory)
-          .then((result) => {
-            if (closed || socket) return
-            if (result.type === "unavailable") return
-            const selection = result.type === "selection" ? result.selection : undefined
-            const key = editorSelectionKey(selection)
-            if (key !== lastZedSelectionKey) {
-              lastZedSelectionKey = key
-              setStore("selection", selection)
-              setStore("status", selection ? "connected" : "disabled")
-            }
-          })
-          .catch(() => {
-            // Keep the last known Zed selection for transient polling failures.
-          })
-          .finally(() => {
-            zedSelection = undefined
-          })
-        scheduleZedPoll()
-        return
+      const send = (payload: JsonRpcMessage) => {
+        if (!socket || socket.readyState !== WebSocket.OPEN) return
+        socket.send(JSON.stringify({ jsonrpc: "2.0", ...payload }))
      }

-      setStore("status", "connecting")
-      const current = openEditorSocket(connection, WebSocketImpl)
-      socket = current
+      const request = (method: string, params?: unknown) => {
+        requestID += 1
+        pending.set(requestID, method)
+        send({ id: requestID, method, params })
+      }

-      current.addEventListener("open", () => {
-        if (socket !== current) {
-          current.close()
-          return
-        }
+      const scheduleReconnect = () => {
+        if (closed) return
+        if (reconnect) clearTimeout(reconnect)
+        attempt += 1
+        const delay = Math.min(1000 * 2 ** (attempt - 1), 10_000)
+        reconnect = setTimeout(connect, delay)
+      }

-        attempt = 0
-        setStore("status", "connected")
-        request("initialize", {
-          protocolVersion: MCP_PROTOCOL_VERSION,
-          capabilities: {},
-          clientInfo: { name: "opencode", version: "0.0.0" },
-        })
-      })
+      const scheduleZedPoll = () => {
+        if (closed) return
+        if (reconnect) clearTimeout(reconnect)
+        reconnect = setTimeout(connect, 1000)
+      }

-      current.addEventListener("message", (event) => {
-        const message = parseMessage(event.data)
-        if (!message) return
-
-        const selection =
-          message.method === "selection_changed" ? EditorSelectionSchema.safeParse(message.params) : undefined
-        if (selection?.success) {
-          setStore("selection", { ...selection.data, source: "websocket" })
-          return
-        }
-
-        const mention = message.method === "at_mentioned" ? EditorMentionSchema.safeParse(message.params) : undefined
-        if (mention?.success) {
-          mentionListeners.forEach((listener) => listener(mention.data))
-          return
-        }
-
-        if (typeof message.id !== "number") return
-
-        const method = pending.get(message.id)
-        if (!method) return
-
-        pending.delete(message.id)
-        if (message.error) return
-
-        const initialize = method === "initialize" ? EditorServerInfoSchema.safeParse(message.result) : undefined
-        if (initialize?.success) {
-          setStore("server", initialize.data)
-          send({ method: "notifications/initialized" })
-          return
-        }
-      })
-
-      current.addEventListener("close", () => {
-        if (socket !== current) return
-
-        socket = undefined
-        pending.clear()
+      const connect = () => {
        if (closed) return

+        const connection = resolveEditorConnection()
+        if (!connection) {
+          const dbPath = resolveZedDbPath()
+          if (!dbPath) {
+            setStore("status", "disabled")
+            scheduleReconnect()
+            return
+          }
+          zedSelection ??= resolveZedSelection(dbPath)
+            .then((result) => {
+              if (closed || socket) return
+              if (result.type === "unavailable") return
+              const selection = result.type === "selection" ? result.selection : undefined
+              const key = editorSelectionKey(selection)
+              if (key !== lastZedSelectionKey) {
+                lastZedSelectionKey = key
+                setStore("selection", selection)
+                setStore("status", selection ? "connected" : "disabled")
+              }
+            })
+            .catch(() => {
+              // Keep the last known Zed selection for transient polling failures.
+            })
+            .finally(() => {
+              zedSelection = undefined
+            })
+          scheduleZedPoll()
+          return
+        }
+
        setStore("status", "connecting")
-        scheduleReconnect()
-      })
-    }
+        const current = openEditorSocket(connection)
+        socket = current

-    const scheduleReconnect = () => {
-      if (closed) return
-      if (reconnect) clearTimeout(reconnect)
-      attempt += 1
-      const delay = Math.min(1000 * 2 ** (attempt - 1), 10_000)
-      reconnect = setTimeout(connect, delay)
-    }
+        current.addEventListener("open", () => {
+          if (socket !== current) {
+            current.close()
+            return
+          }

-    const scheduleZedPoll = () => {
-      if (closed) return
-      if (reconnect) clearTimeout(reconnect)
-      reconnect = setTimeout(connect, 1000)
-    }
+          attempt = 0
+          setStore("status", "connected")
+          request("initialize", {
+            protocolVersion: MCP_PROTOCOL_VERSION,
+            capabilities: {},
+            clientInfo: { name: "opencode", version: "0.0.0" },
+          })
+        })

-    const reconnectWithDirectory = (nextDirectory?: string) => {
-      const resolved = nextDirectory || process.cwd()
-      if (directory === resolved) return
+        current.addEventListener("message", (event) => {
+          const message = parseMessage(event.data)
+          if (!message) return

-      directory = resolved
-      attempt = 0
-      pending.clear()
-      lastZedSelectionKey = undefined
-      if (reconnect) clearTimeout(reconnect)
-      reconnect = undefined
-      if (socket) {
-        const current = socket
-        socket = undefined
-        current.close()
+          const selection =
+            message.method === "selection_changed" ? EditorSelectionSchema.safeParse(message.params) : undefined
+          if (selection?.success) {
+            setStore("selection", { ...selection.data, source: "websocket" })
+            return
+          }
+
+          const mention = message.method === "at_mentioned" ? EditorMentionSchema.safeParse(message.params) : undefined
+          if (mention?.success) {
+            mentionListeners.forEach((listener) => listener(mention.data))
+            return
+          }
+
+          if (typeof message.id !== "number") return
+
+          const method = pending.get(message.id)
+          if (!method) return
+
+          pending.delete(message.id)
+          if (message.error) return
+
+          const initialize = method === "initialize" ? EditorServerInfoSchema.safeParse(message.result) : undefined
+          if (initialize?.success) {
+            setStore("server", initialize.data)
+            send({ method: "notifications/initialized" })
+            return
+          }
+        })
+
+        current.addEventListener("close", () => {
+          if (socket !== current) return
+
+          socket = undefined
+          pending.clear()
+          if (closed) return
+
+          setStore("status", "connecting")
+          scheduleReconnect()
+        })
      }
-      setStore("status", "disabled")
-      setStore("selection", undefined)
-      setStore("server", undefined)
-      connect()
-    }

-    onMount(() => {
      connect()

      onCleanup(() => {
@@ -283,7 +230,7 @@ export const { use: useEditorContext, provider: EditorContextProvider } = create

    return {
      enabled() {
-        return Boolean(resolveEditorConnection(directory) || resolveZedDbPath())
+        return Boolean(resolveEditorConnection() || resolveZedDbPath())
      },
      connected() {
        return store.status === "connected"
@@ -292,7 +239,6 @@ export const { use: useEditorContext, provider: EditorContextProvider } = create
        return store.selection
      },
      clearSelection() {
-        lastZedSelectionKey = undefined
        setStore("selection", undefined)
      },
      onMention(listener: (mention: EditorMention) => void) {
@@ -302,10 +248,6 @@ export const { use: useEditorContext, provider: EditorContextProvider } = create
      server() {
        return store.server
      },
-      reconnect(directory?: string) {
-        setStore("selection", undefined)
-        reconnectWithDirectory(directory)
-      },
    }
  },
 })
@@ -318,16 +260,8 @@ function parsePort(value: string | undefined) {
  return parsed
 }

-function resolveEditorConnection(directory: string): EditorConnection | undefined {
-  const port = parsePort(process.env.CLAUDE_CODE_SSE_PORT || process.env.OPENCODE_EDITOR_SSE_PORT)
-  if (port) {
-    return {
-      url: `ws://127.0.0.1:${port}`,
-      source: `env:${port}`,
-    }
-  }
-
-  const lock = resolveEditorLockFile(directory)
+function resolveEditorConnection(): EditorConnection | undefined {
+  const lock = resolveEditorLockFile()
  if (lock) {
    return {
      url: `ws://127.0.0.1:${lock.port}`,
@@ -335,9 +269,16 @@ function resolveEditorConnection(directory: string): EditorConnection | undefine
      source: `lock:${lock.port}`,
    }
  }
+
+  const port = parsePort(process.env.CLAUDE_CODE_SSE_PORT || process.env.OPENCODE_EDITOR_SSE_PORT)
+  if (!port) return
+  return {
+    url: `ws://127.0.0.1:${port}`,
+    source: `env:${port}`,
+  }
 }

-function resolveEditorLockFile(activeDirectory: string) {
+function resolveEditorLockFile() {
  const directory = path.join(os.homedir(), ".claude", "ide")
  let entries: string[]

@@ -347,9 +288,10 @@ function resolveEditorLockFile(activeDirectory: string) {
    return
  }

-  // longest workspace folder that contains the active session directory; 0 if none match
+  const cwd = process.cwd()
+  // longest workspace folder that contains cwd; 0 if none match
  const bestMatchLength = (lock: EditorLockFile) =>
-    Math.max(0, ...lock.workspaceFolders.map((folder) => pathContainsLength(folder, activeDirectory)))
+    Math.max(0, ...lock.workspaceFolders.map((folder) => pathContainsLength(folder, cwd)))
  const locks = entries
    .filter((entry) => entry.endsWith(".lock"))
    .map((entry) => readEditorLockFile(path.join(directory, entry)))
@@ -383,17 +325,15 @@ function readEditorLockFile(filePath: string): EditorLockFile | undefined {
  }
 }

-export function editorSelectionKey(selection: EditorSelection | undefined) {
+function editorSelectionKey(selection: EditorSelection | undefined) {
  if (!selection) return ""
  return [
    selection.filePath,
-    ...selection.ranges.flatMap((range) => [
-      range.selection.start.line,
-      range.selection.start.character,
-      range.selection.end.line,
-      range.selection.end.character,
-      range.text,
-    ]),
+    selection.selection.start.line,
+    selection.selection.start.character,
+    selection.selection.end.line,
+    selection.selection.end.character,
+    selection.text,
  ].join("\0")
 }

@@ -403,10 +343,10 @@ function pathContainsLength(parent: string, child: string) {
  return relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative)) ? resolved.length : 0
 }

-function openEditorSocket(connection: EditorConnection, WebSocketImpl: typeof WebSocket) {
-  if (!connection.authToken) return new WebSocketImpl(connection.url)
+function openEditorSocket(connection: EditorConnection) {
+  if (!connection.authToken) return new WebSocket(connection.url)

-  return new WebSocketImpl(connection.url, {
+  return new WebSocket(connection.url, {
    headers: {
      "x-claude-code-ide-authorization": connection.authToken,
    },
@@ -44,13 +44,13 @@ import type { GrepTool } from "@/tool/grep"
 import type { EditTool } from "@/tool/edit"
 import type { ApplyPatchTool } from "@/tool/apply_patch"
 import type { WebFetchTool } from "@/tool/webfetch"
+import type { CodeSearchTool } from "@/tool/codesearch"
 import type { WebSearchTool } from "@/tool/websearch"
 import type { TaskTool } from "@/tool/task"
 import type { QuestionTool } from "@/tool/question"
 import type { SkillTool } from "@/tool/skill"
 import { useKeyboard, useRenderer, useTerminalDimensions, type JSX } from "@opentui/solid"
 import { useSDK } from "@tui/context/sdk"
-import { useEditorContext } from "@tui/context/editor"
 import { useCommandDialog } from "@tui/component/dialog-command"
 import type { DialogContext } from "@tui/ui/dialog"
 import { useKeybind } from "@tui/context/keybind"
@@ -180,7 +180,6 @@ export function Session() {
  const scrollAcceleration = createMemo(() => getScrollAcceleration(tuiConfig))
  const toast = useToast()
  const sdk = useSDK()
-  const editor = useEditorContext()

  createEffect(() => {
    const sessionID = route.sessionID
@@ -208,7 +207,6 @@ export function Session() {
          await sync.bootstrap({ fatal: false })
        } catch {}
      }
-      editor.reconnect(result.data.directory)
      await sync.session.sync(sessionID)
      if (route.sessionID === sessionID && scroll) scroll.scrollBy(100_000)
    })().catch((error) => {
@@ -1567,6 +1565,9 @@ function ToolPart(props: { last: boolean; part: ToolPart; message: AssistantMess
        <Match when={props.part.tool === "webfetch"}>
          <WebFetch {...toolprops} />
        </Match>
+        <Match when={props.part.tool === "codesearch"}>
+          <CodeSearch {...toolprops} />
+        </Match>
        <Match when={props.part.tool === "websearch"}>
          <WebSearch {...toolprops} />
        </Match>
@@ -1947,6 +1948,15 @@ function WebFetch(props: ToolProps<typeof WebFetchTool>) {
  )
 }

+function CodeSearch(props: ToolProps<typeof CodeSearchTool>) {
+  const metadata = props.metadata as { results?: number }
+  return (
+    <InlineTool icon="◇" pending="Searching code..." complete={props.input.query} part={props.part}>
+      Exa Code Search "{props.input.query}" <Show when={metadata.results}>({metadata.results} results)</Show>
+    </InlineTool>
+  )
+}
+
 function WebSearch(props: ToolProps<typeof WebSearchTool>) {
  const metadata = props.metadata as { numResults?: number }
  return (
@@ -350,6 +350,21 @@ export function PermissionPrompt(props: { request: PermissionRequest }) {
              }
            }

+            if (permission === "codesearch") {
+              const query = typeof data.query === "string" ? data.query : ""
+              return {
+                icon: "◇",
+                title: `Exa Code Search "${query}"`,
+                body: (
+                  <Show when={query}>
+                    <box paddingLeft={1}>
+                      <text fg={theme.textMuted}>{"Query: " + query}</text>
+                    </box>
+                  </Show>
+                ),
+              }
+            }
+
            if (permission === "external_directory") {
              const meta = props.request.metadata ?? {}
              const parent = typeof meta["parentDir"] === "string" ? meta["parentDir"] : undefined
@@ -71,12 +71,6 @@ async function input(value?: string) {
  return piped + "\n" + value
 }

-export function resolveThreadDirectory(project?: string, envPWD = process.env.PWD, cwd = process.cwd()) {
-  const root = Filesystem.resolve(envPWD ?? cwd)
-  if (project) return Filesystem.resolve(path.isAbsolute(project) ? project : path.join(root, project))
-  return Filesystem.resolve(cwd)
-}
-
 export const TuiThreadCommand = cmd({
  command: "$0 [project]",
  describe: "start opencode tui",
@@ -130,7 +124,10 @@ export const TuiThreadCommand = cmd({

      // Resolve relative --project paths from PWD, then use the real cwd after
      // chdir so the thread and worker share the same directory key.
-      const next = resolveThreadDirectory(args.project)
+      const root = Filesystem.resolve(process.env.PWD ?? process.cwd())
+      const next = args.project
+        ? Filesystem.resolve(path.isAbsolute(args.project) ? args.project : path.join(root, args.project))
+        : Filesystem.resolve(process.cwd())
      const file = await target()
      try {
        process.chdir(next)
@@ -759,23 +759,18 @@ export const layer = Layer.effect(
      const patch = writableGlobal(config)

      let next: Info
-      let changed: boolean
      if (!file.endsWith(".jsonc")) {
        const existing = ConfigParse.effectSchema(Info, ConfigParse.jsonc(before, file), file)
        const merged = mergeDeep(writable(existing), patch)
-        const serialized = JSON.stringify(merged, null, 2)
-        changed = serialized !== before
-        if (changed) yield* fs.writeFileString(file, serialized).pipe(Effect.orDie)
+        yield* fs.writeFileString(file, JSON.stringify(merged, null, 2)).pipe(Effect.orDie)
        next = merged
      } else {
        const updated = patchJsonc(before, patch)
        next = ConfigParse.effectSchema(Info, ConfigParse.jsonc(updated, file), file)
-        changed = updated !== before
-        if (changed) yield* fs.writeFileString(file, updated).pipe(Effect.orDie)
+        yield* fs.writeFileString(file, updated).pipe(Effect.orDie)
      }

-      // Only tear down running instances if the config actually changed.
-      if (changed) yield* invalidate()
+      yield* invalidate()
      return next
    })

@@ -35,6 +35,7 @@ const InputObject = Schema.StructWithRest(
    question: Schema.optional(Action),
    webfetch: Schema.optional(Action),
    websearch: Schema.optional(Action),
+    codesearch: Schema.optional(Action),
    lsp: Schema.optional(Rule),
    doom_loop: Schema.optional(Action),
    skill: Schema.optional(Rule),
@@ -1,26 +1,27 @@
+import { lazy } from "@/util/lazy"
 import type { ProjectID } from "@/project/schema"
 import type { WorkspaceAdaptor, WorkspaceAdaptorEntry } from "../types"
-import { WorktreeAdaptor } from "./worktree"

-const BUILTIN: Record<string, WorkspaceAdaptor> = {
-  worktree: WorktreeAdaptor,
+const BUILTIN: Record<string, () => Promise<WorkspaceAdaptor>> = {
+  worktree: lazy(async () => (await import("./worktree")).WorktreeAdaptor),
 }

 const state = new Map<ProjectID, Map<string, WorkspaceAdaptor>>()

-export function getAdaptor(projectID: ProjectID, type: string): WorkspaceAdaptor {
+export async function getAdaptor(projectID: ProjectID, type: string): Promise<WorkspaceAdaptor> {
  const custom = state.get(projectID)?.get(type)
  if (custom) return custom

  const builtin = BUILTIN[type]
-  if (builtin) return builtin
+  if (builtin) return builtin()

  throw new Error(`Unknown workspace adaptor: ${type}`)
 }

 export async function listAdaptors(projectID: ProjectID): Promise<WorkspaceAdaptorEntry[]> {
  const builtin = await Promise.all(
-    Object.entries(BUILTIN).map(async ([type, adaptor]) => {
+    Object.entries(BUILTIN).map(async ([type, init]) => {
+      const adaptor = await init()
      return {
        type,
        name: adaptor.name,
@@ -1,4 +1,6 @@
 import { Schema } from "effect"
+import { AppRuntime } from "@/effect/app-runtime"
+import { Worktree } from "@/worktree"
 import { type WorkspaceAdaptor, WorkspaceInfo } from "../types"

 const WorktreeConfig = Schema.Struct({
@@ -8,26 +10,19 @@ const WorktreeConfig = Schema.Struct({
 })
 const decodeWorktreeConfig = Schema.decodeUnknownSync(WorktreeConfig)

-async function loadWorktree() {
-  const [{ AppRuntime }, { Worktree }] = await Promise.all([import("@/effect/app-runtime"), import("@/worktree")])
-  return { AppRuntime, Worktree }
-}
-
 export const WorktreeAdaptor: WorkspaceAdaptor = {
  name: "Worktree",
  description: "Create a git worktree",
  async configure(info) {
-    const { AppRuntime, Worktree } = await loadWorktree()
-    const next = await AppRuntime.runPromise(Worktree.Service.use((svc) => svc.makeWorktreeInfo()))
+    const worktree = await AppRuntime.runPromise(Worktree.Service.use((svc) => svc.makeWorktreeInfo()))
    return {
      ...info,
-      name: next.name,
-      branch: next.branch,
-      directory: next.directory,
+      name: worktree.name,
+      branch: worktree.branch,
+      directory: worktree.directory,
    }
  },
  async create(info) {
-    const { AppRuntime, Worktree } = await loadWorktree()
    const config = decodeWorktreeConfig(info)
    await AppRuntime.runPromise(
      Worktree.Service.use((svc) =>
@@ -40,7 +35,6 @@ export const WorktreeAdaptor: WorkspaceAdaptor = {
    )
  },
  async remove(info) {
-    const { AppRuntime, Worktree } = await loadWorktree()
    const config = decodeWorktreeConfig(info)
    await AppRuntime.runPromise(Worktree.Service.use((svc) => svc.remove({ directory: config.directory })))
  },
@@ -1,19 +0,0 @@
-This is a plugin to simulate a remote environment locally. Add this to `.opencode/opencode.jsonc`:
-
-```json
-  "plugin": ["../packages/opencode/src/control-plane/dev/debug-workspace-plugin.ts"],
-```
-
-In a separate terminal, run a separate OpenCode server. This will act like a remote server and the local instance will proxy all requests to it:
-
-```
-./packages/opencode/script/run-workspace-server
-```
-
-With the plugin install, you can now run OpenCode and create a `debug` workspace type. This will create a "remote" workspace which talks to the second workspace server started above.
-
-How this works:
-
- The workspace server needs to know the workspace id and port to run. It waits for this information to be written to a file and starts the server when the data is written.
- The debug plugin writes this information in the `create` call to the workspace. So create a `debug` workspace will always kick off a new external server.
- The server script watches for file changes, so whenver you create a new `debug` workspace it will restart with the new information. This means that there is only ever one working `debug` workspace at a time; when you create a new one all previous sessions will show that it can't connect because previous debug workspaces do not exist.
@@ -0,0 +1,66 @@
+export async function parseSSE(
+  body: ReadableStream<Uint8Array>,
+  signal: AbortSignal,
+  onEvent: (event: unknown) => void,
+) {
+  const reader = body.getReader()
+  const decoder = new TextDecoder()
+  let buf = ""
+  let last = ""
+  let retry = 1000
+
+  const abort = () => {
+    void reader.cancel().catch(() => undefined)
+  }
+
+  signal.addEventListener("abort", abort)
+
+  try {
+    while (!signal.aborted) {
+      const chunk = await reader.read().catch(() => ({ done: true, value: undefined as Uint8Array | undefined }))
+      if (chunk.done) break
+
+      buf += decoder.decode(chunk.value, { stream: true })
+      buf = buf.replace(/\r\n/g, "\n").replace(/\r/g, "\n")
+
+      const chunks = buf.split("\n\n")
+      buf = chunks.pop() ?? ""
+
+      chunks.forEach((chunk) => {
+        const data: string[] = []
+        chunk.split("\n").forEach((line) => {
+          if (line.startsWith("data:")) {
+            data.push(line.replace(/^data:\s*/, ""))
+            return
+          }
+          if (line.startsWith("id:")) {
+            last = line.replace(/^id:\s*/, "")
+            return
+          }
+          if (line.startsWith("retry:")) {
+            const parsed = Number.parseInt(line.replace(/^retry:\s*/, ""), 10)
+            if (!Number.isNaN(parsed)) retry = parsed
+          }
+        })
+
+        if (!data.length) return
+        const raw = data.join("\n")
+        try {
+          onEvent(JSON.parse(raw))
+        } catch {
+          onEvent({
+            type: "sse.message",
+            properties: {
+              data: raw,
+              id: last || undefined,
+              retry,
+            },
+          })
+        }
+      })
+    }
+  } finally {
+    signal.removeEventListener("abort", abort)
+    reader.releaseLock()
+  }
+}
@@ -1,23 +1,22 @@
 import { GlobalBus, type GlobalEvent } from "@/bus/global"
-import { Effect } from "effect"

 export function waitEvent(input: { timeout: number; signal?: AbortSignal; fn: (event: GlobalEvent) => boolean }) {
-  if (input.signal?.aborted) return Effect.fail(input.signal.reason ?? new Error("Request aborted"))
+  if (input.signal?.aborted) return Promise.reject(input.signal.reason ?? new Error("Request aborted"))

-  return Effect.callback<void, unknown>((resume) => {
+  return new Promise<void>((resolve, reject) => {
    const abort = () => {
      cleanup()
-      resume(Effect.fail(input.signal?.reason ?? new Error("Request aborted")))
+      reject(input.signal?.reason ?? new Error("Request aborted"))
    }

    const handler = (event: GlobalEvent) => {
      try {
        if (!input.fn(event)) return
        cleanup()
-        resume(Effect.void)
+        resolve()
      } catch (error) {
        cleanup()
-        resume(Effect.fail(error))
+        reject(error)
      }
    }

@@ -29,11 +28,10 @@ export function waitEvent(input: { timeout: number; signal?: AbortSignal; fn: (e

    const timeout = setTimeout(() => {
      cleanup()
-      resume(Effect.fail(new Error("Timed out waiting for global event")))
+      reject(new Error("Timed out waiting for global event"))
    }, input.timeout)

    GlobalBus.on("event", handler)
    input.signal?.addEventListener("abort", abort, { once: true })
-    return Effect.sync(cleanup)
  })
 }
@@ -1,5 +1,6 @@
-import { Context, Effect, FiberMap, Layer, Schema, Stream } from "effect"
-import { FetchHttpClient, HttpBody, HttpClient, HttpClientError, HttpClientRequest } from "effect/unstable/http"
+import { Schema } from "effect"
+import { setTimeout as sleep } from "node:timers/promises"
+import { fn } from "@/util/fn"
 import { Database } from "@/storage/db"
 import { asc } from "drizzle-orm"
 import { eq } from "drizzle-orm"
@@ -19,10 +20,12 @@ import { WorkspaceTable } from "./workspace.sql"
 import { getAdaptor } from "./adaptors"
 import { type WorkspaceInfo, WorkspaceInfo as WorkspaceInfoSchema } from "./types"
 import { WorkspaceID } from "./schema"
+import { parseSSE } from "./sse"
 import { Session } from "@/session/session"
 import { SessionTable } from "@/session/session.sql"
 import { SessionID } from "@/session/schema"
 import { errorData } from "@/util/error"
+import { AppRuntime } from "@/effect/app-runtime"
 import { waitEvent } from "./util"
 import { WorkspaceContext } from "./workspace-context"
 import { NonNegativeInt, withStatics } from "@/util/schema"
@@ -73,11 +76,6 @@ function fromRow(row: typeof WorkspaceTable.$inferSelect): Info {
  }
 }

-const db = <T>(fn: (d: Parameters<typeof Database.use>[0] extends (trx: infer D) => any ? D : never) => T) =>
-  Effect.sync(() => Database.use(fn))
-
-const log = Log.create({ service: "workspace-sync" })
-
 export const CreateInput = Schema.Struct({
  id: Schema.optional(WorkspaceID),
  type: Info.fields.type,
@@ -87,759 +85,286 @@ export const CreateInput = Schema.Struct({
 }).pipe(withStatics((s) => ({ zod: effectZod(s), zodObject: zodObject(s) })))
 export type CreateInput = Schema.Schema.Type<typeof CreateInput>

+export const create = fn(CreateInput.zod, async (input) => {
+  const id = WorkspaceID.ascending(input.id)
+  const adaptor = await getAdaptor(input.projectID, input.type)
+
+  const config = await adaptor.configure({ ...input, id, name: Slug.create(), directory: null })
+
+  const info: Info = {
+    id,
+    type: config.type,
+    branch: config.branch ?? null,
+    name: config.name ?? null,
+    directory: config.directory ?? null,
+    extra: config.extra ?? null,
+    projectID: input.projectID,
+  }
+
+  Database.use((db) => {
+    db.insert(WorkspaceTable)
+      .values({
+        id: info.id,
+        type: info.type,
+        branch: info.branch,
+        name: info.name,
+        directory: info.directory,
+        extra: info.extra,
+        project_id: info.projectID,
+      })
+      .run()
+  })
+
+  const env = {
+    OPENCODE_AUTH_CONTENT: JSON.stringify(await AppRuntime.runPromise(Auth.Service.use((auth) => auth.all()))),
+    OPENCODE_WORKSPACE_ID: config.id,
+    OPENCODE_EXPERIMENTAL_WORKSPACES: "true",
+    OTEL_EXPORTER_OTLP_HEADERS: process.env.OTEL_EXPORTER_OTLP_HEADERS,
+    OTEL_EXPORTER_OTLP_ENDPOINT: process.env.OTEL_EXPORTER_OTLP_ENDPOINT,
+    OTEL_RESOURCE_ATTRIBUTES: process.env.OTEL_RESOURCE_ATTRIBUTES,
+  }
+  await adaptor.create(config, env)
+
+  startSync(info)
+
+  await waitEvent({
+    timeout: TIMEOUT,
+    fn(event) {
+      if (event.workspace === info.id && event.payload.type === Event.Status.type) {
+        const { status } = event.payload.properties
+        return status === "error" || status === "connected"
+      }
+      return false
+    },
+  })
+
+  return info
+})
+
 export const SessionRestoreInput = Schema.Struct({
  workspaceID: WorkspaceID,
  sessionID: SessionID,
 }).pipe(withStatics((s) => ({ zod: effectZod(s), zodObject: zodObject(s) })))
 export type SessionRestoreInput = Schema.Schema.Type<typeof SessionRestoreInput>

-export class SyncHttpError extends Schema.TaggedErrorClass<SyncHttpError>()("WorkspaceSyncHttpError", {
-  message: Schema.String,
-  status: Schema.Number,
-  body: Schema.optional(Schema.String),
-}) {}
+export const sessionRestore = fn(SessionRestoreInput.zod, async (input) => {
+  log.info("session restore requested", {
+    workspaceID: input.workspaceID,
+    sessionID: input.sessionID,
+  })
+  try {
+    const space = await get(input.workspaceID)
+    if (!space) throw new Error(`Workspace not found: ${input.workspaceID}`)

-export class WorkspaceNotFoundError extends Schema.TaggedErrorClass<WorkspaceNotFoundError>()(
-  "WorkspaceNotFoundError",
-  {
-    message: Schema.String,
-    workspaceID: WorkspaceID,
-  },
-) {}
+    const adaptor = await getAdaptor(space.projectID, space.type)
+    const target = await adaptor.target(space)

-export class SessionEventsNotFoundError extends Schema.TaggedErrorClass<SessionEventsNotFoundError>()(
-  "WorkspaceSessionEventsNotFoundError",
-  {
-    message: Schema.String,
-    sessionID: SessionID,
-  },
-) {}
+    // Need to switch the workspace of the session
+    SyncEvent.run(Session.Event.Updated, {
+      sessionID: input.sessionID,
+      info: {
+        workspaceID: input.workspaceID,
+      },
+    })

-export class SessionRestoreHttpError extends Schema.TaggedErrorClass<SessionRestoreHttpError>()(
-  "WorkspaceSessionRestoreHttpError",
-  {
-    message: Schema.String,
-    workspaceID: WorkspaceID,
-    sessionID: SessionID,
-    status: Schema.Number,
-    body: Schema.String,
-  },
-) {}
+    const rows = Database.use((db) =>
+      db
+        .select({
+          id: EventTable.id,
+          aggregateID: EventTable.aggregate_id,
+          seq: EventTable.seq,
+          type: EventTable.type,
+          data: EventTable.data,
+        })
+        .from(EventTable)
+        .where(eq(EventTable.aggregate_id, input.sessionID))
+        .orderBy(asc(EventTable.seq))
+        .all(),
+    )
+    if (rows.length === 0) throw new Error(`No events found for session: ${input.sessionID}`)

-export class SyncTimeoutError extends Schema.TaggedErrorClass<SyncTimeoutError>()("WorkspaceSyncTimeoutError", {
-  message: Schema.String,
-  state: Schema.Record(Schema.String, Schema.Number),
-}) {}
+    const all = rows

-export class SyncAbortedError extends Schema.TaggedErrorClass<SyncAbortedError>()("WorkspaceSyncAbortedError", {
-  message: Schema.String,
-  cause: Schema.optional(Schema.Defect),
-}) {}
-
-type CreateError = Auth.AuthError
-type SessionRestoreError =
-  | WorkspaceNotFoundError
-  | SessionEventsNotFoundError
-  | SessionRestoreHttpError
-  | HttpClientError.HttpClientError
-type WaitForSyncError = SyncTimeoutError | SyncAbortedError
-type SyncLoopError = SyncHttpError | HttpClientError.HttpClientError
-
-export interface Interface {
-  readonly create: (input: CreateInput) => Effect.Effect<Info, CreateError>
-  readonly sessionRestore: (input: SessionRestoreInput) => Effect.Effect<{ total: number }, SessionRestoreError>
-  readonly list: (project: Project.Info) => Effect.Effect<Info[]>
-  readonly get: (id: WorkspaceID) => Effect.Effect<Info | undefined>
-  readonly remove: (id: WorkspaceID) => Effect.Effect<Info | undefined>
-  readonly status: () => Effect.Effect<ConnectionStatus[]>
-  readonly isSyncing: (workspaceID: WorkspaceID) => Effect.Effect<boolean>
-  readonly waitForSync: (
-    workspaceID: WorkspaceID,
-    state: Record<string, number>,
-    signal?: AbortSignal,
-  ) => Effect.Effect<void, WaitForSyncError>
-  readonly startWorkspaceSyncing: (projectID: ProjectID) => Effect.Effect<void>
-}
-
-export class Service extends Context.Service<Service, Interface>()("@opencode/Workspace") {}
-
-export const layer = Layer.effect(
-  Service,
-  Effect.gen(function* () {
-    const auth = yield* Auth.Service
-    const session = yield* Session.Service
-    const http = yield* HttpClient.HttpClient
-    const sync = yield* SyncEvent.Service
-    const connections = new Map<WorkspaceID, ConnectionStatus>()
-    const syncFibers = yield* FiberMap.make<WorkspaceID, void, SyncLoopError>()
-
-    const setStatus = (id: WorkspaceID, status: ConnectionStatus["status"]) => {
-      const prev = connections.get(id)
-      if (prev?.status === status) return
-      const next = { workspaceID: id, status }
-      connections.set(id, next)
-
-      GlobalBus.emit("event", {
-        directory: "global",
-        workspace: id,
-        payload: {
-          type: Event.Status.type,
-          properties: next,
+    const size = 10
+    const sets = Array.from({ length: Math.ceil(all.length / size) }, (_, i) => all.slice(i * size, (i + 1) * size))
+    const total = sets.length
+    log.info("session restore prepared", {
+      workspaceID: input.workspaceID,
+      sessionID: input.sessionID,
+      workspaceType: space.type,
+      directory: space.directory,
+      target: target.type === "remote" ? String(route(target.url, "/sync/replay")) : target.directory,
+      events: all.length,
+      batches: total,
+      first: all[0]?.seq,
+      last: all.at(-1)?.seq,
+    })
+    GlobalBus.emit("event", {
+      directory: "global",
+      workspace: input.workspaceID,
+      payload: {
+        type: Event.Restore.type,
+        properties: {
+          workspaceID: input.workspaceID,
+          sessionID: input.sessionID,
+          total,
+          step: 0,
        },
-      })
-    }
-
-    const connectSSE = Effect.fn("Workspace.connectSSE")(function* (
-      url: URL | string,
-      headers: HeadersInit | undefined,
-    ) {
-      const response = yield* http.execute(
-        HttpClientRequest.get(route(url, "/global/event"), {
-          headers: new Headers(headers),
-          accept: "text/event-stream",
-        }),
-      )
-      if (response.status < 200 || response.status >= 300) {
-        return yield* new SyncHttpError({
-          message: `Workspace sync HTTP failure: ${response.status}`,
-          status: response.status,
-        })
-      }
-      return response.stream
+      },
    })
-
-    const parseSSE = Effect.fn("Workspace.parseSSE")(function* (
-      stream: Stream.Stream<Uint8Array, unknown>,
-      onEvent: (event: unknown) => Effect.Effect<void>,
-    ) {
-      yield* stream.pipe(
-        Stream.decodeText(),
-        Stream.splitLines,
-        Stream.mapAccum(
-          () => ({ data: [] as string[], id: undefined as string | undefined, retry: 1000 }),
-          (state, line) => {
-            if (line === "") {
-              if (!state.data.length) return [state, []]
-              return [{ ...state, data: [] }, [{ data: state.data.join("\n"), id: state.id, retry: state.retry }]]
-            }
-
-            const index = line.indexOf(":")
-            const field = index === -1 ? line : line.slice(0, index)
-            const value = index === -1 ? "" : line.slice(index + (line[index + 1] === " " ? 2 : 1))
-
-            if (field === "data") return [{ ...state, data: [...state.data, value] }, []]
-            if (field === "id") return [{ ...state, id: value }, []]
-            if (field === "retry") {
-              const retry = Number.parseInt(value, 10)
-              return [Number.isNaN(retry) ? state : { ...state, retry }, []]
-            }
-            return [state, []]
-          },
-          {
-            onHalt: (state) =>
-              state.data.length ? [{ data: state.data.join("\n"), id: state.id, retry: state.retry }] : [],
-          },
-        ),
-        Stream.map((event) => {
-          try {
-            return JSON.parse(event.data) as unknown
-          } catch {
-            return {
-              type: "sse.message",
-              properties: {
-                data: event.data,
-                id: event.id || undefined,
-                retry: event.retry,
-              },
-            }
-          }
-        }),
-        Stream.runForEach(onEvent),
-      )
-    })
-
-    const syncHistory = Effect.fn("Workspace.syncHistory")(function* (
-      space: Info,
-      url: URL | string,
-      headers: HeadersInit | undefined,
-    ) {
-      const sessionIDs = yield* db((db) =>
-        db
-          .select({ id: SessionTable.id })
-          .from(SessionTable)
-          .where(eq(SessionTable.workspace_id, space.id))
-          .all()
-          .map((row) => row.id),
-      )
-      const state = sessionIDs.length
-        ? Object.fromEntries(
-            (yield* db((db) =>
-              db.select().from(EventSequenceTable).where(inArray(EventSequenceTable.aggregate_id, sessionIDs)).all(),
-            )).map((row) => [row.aggregate_id, row.seq]),
-          )
-        : {}
-
-      log.info("syncing workspace history", {
-        workspaceID: space.id,
-        sessions: sessionIDs.length,
-        known: Object.keys(state).length,
-      })
-
-      const response = yield* http.execute(
-        HttpClientRequest.post(route(url, "/sync/history"), {
-          headers: new Headers(headers),
-          body: HttpBody.jsonUnsafe(state),
-        }),
-      )
-
-      if (response.status < 200 || response.status >= 300) {
-        const body = yield* response.text
-        return yield* new SyncHttpError({
-          message: `Workspace history HTTP failure: ${response.status} ${body}`,
-          status: response.status,
-          body,
-        })
-      }
-
-      const events = (yield* response.json) as HistoryEvent[]
-
-      log.info("workspace history synced", {
-        workspaceID: space.id,
+    for (const [i, events] of sets.entries()) {
+      log.info("session restore batch starting", {
+        workspaceID: input.workspaceID,
+        sessionID: input.sessionID,
+        step: i + 1,
+        total,
        events: events.length,
+        first: events[0]?.seq,
+        last: events.at(-1)?.seq,
+        target: target.type === "remote" ? String(route(target.url, "/sync/replay")) : target.directory,
      })
-
-      yield* Effect.promise(async () => {
-        await WorkspaceContext.provide({
-          workspaceID: space.id,
-          async fn() {
-            await Effect.runPromise(
-              Effect.forEach(
-                events,
-                (event) =>
-                  sync.replay(
-                    {
-                      id: event.id,
-                      aggregateID: event.aggregate_id,
-                      seq: event.seq,
-                      type: event.type,
-                      data: event.data,
-                    },
-                    { publish: true },
-                  ),
-                { discard: true },
-              ),
-            )
-          },
-        })
-      })
-    })
-
-    const syncWorkspaceLoop = Effect.fn("Workspace.syncWorkspaceLoop")(function* (space: Info) {
-      const adaptor = getAdaptor(space.projectID, space.type)
-      const target = yield* Effect.promise(() => Promise.resolve(adaptor.target(space)))
-
-      if (target.type === "local") return
-
-      let attempt = 0
-
-      while (true) {
-        log.info("connecting to global sync", { workspace: space.name })
-        setStatus(space.id, "connecting")
-
-        const stream = yield* connectSSE(target.url, target.headers).pipe(
-          Effect.tap(() => syncHistory(space, target.url, target.headers)),
-          Effect.catch((err) =>
-            Effect.sync(() => {
-              setStatus(space.id, "error")
-              log.info("failed to connect to global sync", {
-                workspace: space.name,
-                err,
-              })
-              return null
-            }),
-          ),
-        )
-
-        if (stream) {
-          attempt = 0
-
-          log.info("global sync connected", { workspace: space.name })
-          setStatus(space.id, "connected")
-
-          yield* parseSSE(stream, (evt) =>
-            Effect.gen(function* () {
-              if (!evt || typeof evt !== "object" || !("payload" in evt)) return
-              const payload = evt.payload as { type?: string; syncEvent?: SyncEvent.SerializedEvent }
-              if (payload.type === "server.heartbeat") return
-
-              if (payload.type === "sync" && payload.syncEvent) {
-                const failed = yield* sync.replay(payload.syncEvent).pipe(
-                  Effect.as(false),
-                  Effect.catchCause((error) =>
-                    Effect.sync(() => {
-                      log.info("failed to replay global event", {
-                        workspaceID: space.id,
-                        error,
-                      })
-                      return true
-                    }),
-                  ),
-                )
-                if (failed) return
-              }
-
-              try {
-                const event = evt as { directory?: string; project?: string; payload: unknown }
-                GlobalBus.emit("event", {
-                  directory: event.directory,
-                  project: event.project,
-                  workspace: space.id,
-                  payload: event.payload,
-                })
-              } catch (error) {
-                log.info("failed to replay global event", {
-                  workspaceID: space.id,
-                  error,
-                })
-              }
-            }),
-          )
-
-          log.info("disconnected from global sync: " + space.id)
-          setStatus(space.id, "disconnected")
-        }
-
-        // Back off reconnect attempts up to 2 minutes while the workspace
-        // stays unavailable.
-        yield* Effect.sleep(`${Math.min(120_000, 1_000 * 2 ** attempt)} millis`)
-        attempt += 1
-      }
-    })
-
-    const startSync = Effect.fn("Workspace.startSync")(function* (space: Info) {
-      if (!Flag.OPENCODE_EXPERIMENTAL_WORKSPACES) return
-
-      const adaptor = getAdaptor(space.projectID, space.type)
-      const target = yield* Effect.promise(() => Promise.resolve(adaptor.target(space)))
-
      if (target.type === "local") {
-        setStatus(space.id, (yield* Effect.promise(() => Filesystem.exists(target.directory))) ? "connected" : "error")
-        return
-      }
-
-      const exists = yield* FiberMap.has(syncFibers, space.id)
-      if (exists && connections.get(space.id)?.status !== "error") return
-
-      setStatus(space.id, "disconnected")
-
-      yield* FiberMap.run(
-        syncFibers,
-        space.id,
-        // TODO: look into `tapError` to set the status but still
-        // allow the fiber to fail and automatically get removed
-        syncWorkspaceLoop(space).pipe(
-          Effect.catch((error) =>
-            Effect.sync(() => {
-              setStatus(space.id, "error")
-              log.warn("workspace listener failed", {
-                workspaceID: space.id,
-                error,
-              })
-            }),
-          ),
-        ),
-      )
-    })
-
-    const stopSync = Effect.fn("Workspace.stopSync")(function* (id: WorkspaceID) {
-      yield* FiberMap.remove(syncFibers, id)
-      connections.delete(id)
-    })
-
-    const create = Effect.fn("Workspace.create")(function* (input: CreateInput) {
-      const id = WorkspaceID.ascending(input.id)
-      const adaptor = getAdaptor(input.projectID, input.type)
-      const config = yield* Effect.promise(() =>
-        Promise.resolve(adaptor.configure({ ...input, id, name: Slug.create(), directory: null })),
-      )
-
-      const info: Info = {
-        id,
-        type: config.type,
-        branch: config.branch ?? null,
-        name: config.name ?? null,
-        directory: config.directory ?? null,
-        extra: config.extra ?? null,
-        projectID: input.projectID,
-      }
-
-      yield* db((db) => {
-        db.insert(WorkspaceTable)
-          .values({
-            id: info.id,
-            type: info.type,
-            branch: info.branch,
-            name: info.name,
-            directory: info.directory,
-            extra: info.extra,
-            project_id: info.projectID,
-          })
-          .run()
-      })
-
-      const env = {
-        OPENCODE_AUTH_CONTENT: JSON.stringify(yield* auth.all()),
-        OPENCODE_WORKSPACE_ID: config.id,
-        OPENCODE_EXPERIMENTAL_WORKSPACES: "true",
-        OTEL_EXPORTER_OTLP_HEADERS: process.env.OTEL_EXPORTER_OTLP_HEADERS,
-        OTEL_EXPORTER_OTLP_ENDPOINT: process.env.OTEL_EXPORTER_OTLP_ENDPOINT,
-        OTEL_RESOURCE_ATTRIBUTES: process.env.OTEL_RESOURCE_ATTRIBUTES,
-      }
-
-      yield* Effect.promise(() => adaptor.create(config, env))
-      yield* Effect.all(
-        [
-          waitEvent({
-            timeout: TIMEOUT,
-            fn(event) {
-              if (event.workspace === info.id && event.payload.type === Event.Status.type) {
-                const { status } = event.payload.properties
-                return status === "error" || status === "connected"
-              }
-              return false
-            },
-          }),
-          startSync(info),
-        ],
-        { concurrency: 2, discard: true },
-      )
-
-      return info
-    })
-
-    const sessionRestore = Effect.fn("Workspace.sessionRestore")(function* (input: SessionRestoreInput) {
-      return yield* Effect.gen(function* () {
-        log.info("session restore requested", {
+        SyncEvent.replayAll(events)
+        log.info("session restore batch replayed locally", {
          workspaceID: input.workspaceID,
          sessionID: input.sessionID,
+          step: i + 1,
+          total,
+          events: events.length,
        })
-
-        const space = yield* get(input.workspaceID)
-        if (!space)
-          return yield* new WorkspaceNotFoundError({
-            message: `Workspace not found: ${input.workspaceID}`,
-            workspaceID: input.workspaceID,
-          })
-
-        const adaptor = getAdaptor(space.projectID, space.type)
-        const target = yield* Effect.promise(() => Promise.resolve(adaptor.target(space)))
-
-        yield* sync.run(Session.Event.Updated, {
-          sessionID: input.sessionID,
-          info: {
-            workspaceID: input.workspaceID,
-          },
-        })
-
-        const rows = yield* db((db) =>
-          db
-            .select({
-              id: EventTable.id,
-              aggregateID: EventTable.aggregate_id,
-              seq: EventTable.seq,
-              type: EventTable.type,
-              data: EventTable.data,
-            })
-            .from(EventTable)
-            .where(eq(EventTable.aggregate_id, input.sessionID))
-            .orderBy(asc(EventTable.seq))
-            .all(),
-        )
-        if (rows.length === 0)
-          return yield* new SessionEventsNotFoundError({
-            message: `No events found for session: ${input.sessionID}`,
-            sessionID: input.sessionID,
-          })
-
-        const size = 10
-        // TODO: look into using effect APIs to process this in chunks
-        const sets = Array.from({ length: Math.ceil(rows.length / size) }, (_, i) =>
-          rows.slice(i * size, (i + 1) * size),
-        )
-        const total = sets.length
-
-        log.info("session restore prepared", {
-          workspaceID: input.workspaceID,
-          sessionID: input.sessionID,
-          workspaceType: space.type,
-          directory: space.directory,
-          target: target.type === "remote" ? String(route(target.url, "/sync/replay")) : target.directory,
-          events: rows.length,
-          batches: total,
-          first: rows[0]?.seq,
-          last: rows.at(-1)?.seq,
-        })
-
-        yield* Effect.sync(() =>
-          GlobalBus.emit("event", {
-            directory: "global",
-            workspace: input.workspaceID,
-            payload: {
-              type: Event.Restore.type,
-              properties: {
-                workspaceID: input.workspaceID,
-                sessionID: input.sessionID,
-                total,
-                step: 0,
-              },
-            },
+      } else {
+        const url = route(target.url, "/sync/replay")
+        const headers = new Headers(target.headers)
+        headers.set("content-type", "application/json")
+        const res = await fetch(url, {
+          method: "POST",
+          headers,
+          body: JSON.stringify({
+            directory: space.directory ?? "",
+            events,
          }),
-        )
-
-        for (const [i, events] of sets.entries()) {
-          log.info("session restore batch starting", {
+        })
+        if (!res.ok) {
+          const body = await res.text()
+          log.error("session restore batch failed", {
            workspaceID: input.workspaceID,
            sessionID: input.sessionID,
            step: i + 1,
            total,
-            events: events.length,
-            first: events[0]?.seq,
-            last: events.at(-1)?.seq,
-            target: target.type === "remote" ? String(route(target.url, "/sync/replay")) : target.directory,
+            status: res.status,
+            body,
          })
-
-          if (target.type === "local") {
-            yield* sync.replayAll(events)
-            log.info("session restore batch replayed locally", {
-              workspaceID: input.workspaceID,
-              sessionID: input.sessionID,
-              step: i + 1,
-              total,
-              events: events.length,
-            })
-          } else {
-            const url = route(target.url, "/sync/replay")
-            const res = yield* http.execute(
-              HttpClientRequest.post(url, {
-                headers: new Headers(target.headers),
-                body: HttpBody.jsonUnsafe({
-                  directory: space.directory ?? "",
-                  events,
-                }),
-              }),
-            )
-
-            if (res.status < 200 || res.status >= 300) {
-              const body = yield* res.text
-              log.error("session restore batch failed", {
-                workspaceID: input.workspaceID,
-                sessionID: input.sessionID,
-                step: i + 1,
-                total,
-                status: res.status,
-                body,
-              })
-              return yield* new SessionRestoreHttpError({
-                message: `Failed to replay session ${input.sessionID} into workspace ${input.workspaceID}: HTTP ${res.status} ${body}`,
-                workspaceID: input.workspaceID,
-                sessionID: input.sessionID,
-                status: res.status,
-                body,
-              })
-            }
-
-            log.info("session restore batch posted", {
-              workspaceID: input.workspaceID,
-              sessionID: input.sessionID,
-              step: i + 1,
-              total,
-              status: res.status,
-            })
-          }
-
-          yield* Effect.sync(() =>
-            GlobalBus.emit("event", {
-              directory: "global",
-              workspace: input.workspaceID,
-              payload: {
-                type: Event.Restore.type,
-                properties: {
-                  workspaceID: input.workspaceID,
-                  sessionID: input.sessionID,
-                  total,
-                  step: i + 1,
-                },
-              },
-            }),
+          throw new Error(
+            `Failed to replay session ${input.sessionID} into workspace ${input.workspaceID}: HTTP ${res.status} ${body}`,
          )
        }
-
-        log.info("session restore complete", {
+        log.info("session restore batch posted", {
          workspaceID: input.workspaceID,
          sessionID: input.sessionID,
-          batches: total,
+          step: i + 1,
+          total,
+          status: res.status,
        })
-
-        return { total }
-      }).pipe(
-        Effect.tapError((err) =>
-          Effect.sync(() =>
-            log.error("session restore failed", {
-              workspaceID: input.workspaceID,
-              sessionID: input.sessionID,
-              error: errorData(err),
-            }),
-          ),
-        ),
-      )
-    })
-
-    const list = Effect.fn("Workspace.list")(function* (project: Project.Info) {
-      return yield* db((db) =>
-        db
-          .select()
-          .from(WorkspaceTable)
-          .where(eq(WorkspaceTable.project_id, project.id))
-          .all()
-          .map(fromRow)
-          .sort((a, b) => a.id.localeCompare(b.id)),
-      )
-    })
-
-    const get = Effect.fn("Workspace.get")(function* (id: WorkspaceID) {
-      const row = yield* db((db) => db.select().from(WorkspaceTable).where(eq(WorkspaceTable.id, id)).get())
-      if (!row) return
-      return fromRow(row)
-    })
-
-    const remove = Effect.fn("Workspace.remove")(function* (id: WorkspaceID) {
-      const sessions = yield* db((db) =>
-        db.select({ id: SessionTable.id }).from(SessionTable).where(eq(SessionTable.workspace_id, id)).all(),
-      )
-      yield* Effect.forEach(sessions, (sessionInfo) => session.remove(sessionInfo.id), { discard: true })
-
-      const row = yield* db((db) => db.select().from(WorkspaceTable).where(eq(WorkspaceTable.id, id)).get())
-      if (!row) return
-
-      yield* stopSync(id)
-
-      const info = fromRow(row)
-      yield* Effect.catch(
-        Effect.gen(function* () {
-          const adaptor = getAdaptor(info.projectID, row.type)
-          yield* Effect.tryPromise(() => Promise.resolve(adaptor.remove(info)))
-        }),
-        () =>
-          Effect.sync(() => {
-            log.error("adaptor not available when removing workspace", { type: row.type })
-          }),
-      )
-
-      yield* db((db) => db.delete(WorkspaceTable).where(eq(WorkspaceTable.id, id)).run())
-      return info
-    })
-
-    const status = Effect.fn("Workspace.status")(function* () {
-      return [...connections.values()]
-    })
-
-    const isSyncing = Effect.fn("Workspace.isSyncing")(function* (workspaceID: WorkspaceID) {
-      const exists = yield* FiberMap.has(syncFibers, workspaceID)
-      return exists && connections.get(workspaceID)?.status !== "error"
-    })
-
-    const waitForSync = Effect.fn("Workspace.waitForSync")(function* (
-      workspaceID: WorkspaceID,
-      state: Record<string, number>,
-      signal?: AbortSignal,
-    ) {
-      if (synced(state)) return
-
-      yield* Effect.catch(
-        waitEvent({
-          timeout: TIMEOUT,
-          signal,
-          fn(event) {
-            if (event.workspace !== workspaceID && event.payload.type !== "sync") {
-              return false
-            }
-            return synced(state)
-          },
-        }),
-        (): Effect.Effect<never, WaitForSyncError> =>
-          signal?.aborted
-            ? Effect.fail(
-                new SyncAbortedError({
-                  message: signal.reason instanceof Error ? signal.reason.message : "Request aborted",
-                  cause: signal.reason,
-                }),
-              )
-            : Effect.fail(
-                new SyncTimeoutError({
-                  message: `Timed out waiting for sync fence: ${JSON.stringify(state)}`,
-                  state,
-                }),
-              ),
-      )
-    })
-
-    const startWorkspaceSyncing = Effect.fn("Workspace.startWorkspaceSyncing")(function* (projectID: ProjectID) {
-      // This session table join makes this query only return
-      // workspaces that have sessions
-      const rows = yield* db((db) =>
-        db
-          .selectDistinct({ workspace: WorkspaceTable })
-          .from(WorkspaceTable)
-          .innerJoin(SessionTable, eq(SessionTable.workspace_id, WorkspaceTable.id))
-          .where(eq(WorkspaceTable.project_id, projectID))
-          .all(),
-      )
-
-      for (const { workspace } of rows) {
-        yield* startSync(fromRow(workspace)).pipe(
-          Effect.catch((error) =>
-            Effect.sync(() => {
-              setStatus(workspace.id, "error")
-              log.warn("workspace sync failed to start", {
-                workspaceID: workspace.id,
-                error,
-              })
-            }),
-          ),
-          Effect.forkDetach,
-        )
      }
+      GlobalBus.emit("event", {
+        directory: "global",
+        workspace: input.workspaceID,
+        payload: {
+          type: Event.Restore.type,
+          properties: {
+            workspaceID: input.workspaceID,
+            sessionID: input.sessionID,
+            total,
+            step: i + 1,
+          },
+        },
+      })
+    }
+
+    log.info("session restore complete", {
+      workspaceID: input.workspaceID,
+      sessionID: input.sessionID,
+      batches: total,
    })

-    return Service.of({
-      create,
-      sessionRestore,
-      list,
-      get,
-      remove,
-      status,
-      isSyncing,
-      waitForSync,
-      startWorkspaceSyncing,
+    return {
+      total,
+    }
+  } catch (err) {
+    log.error("session restore failed", {
+      workspaceID: input.workspaceID,
+      sessionID: input.sessionID,
+      error: errorData(err),
    })
-  }),
-)
+    throw err
+  }
+})

-export const defaultLayer = layer.pipe(
-  Layer.provide(Auth.defaultLayer),
-  Layer.provide(Session.defaultLayer),
-  Layer.provide(SyncEvent.defaultLayer),
-  Layer.provide(FetchHttpClient.layer),
-)
+export function list(project: Project.Info) {
+  const rows = Database.use((db) =>
+    db.select().from(WorkspaceTable).where(eq(WorkspaceTable.project_id, project.id)).all(),
+  )
+  const spaces = rows.map(fromRow).sort((a, b) => a.id.localeCompare(b.id))
+  return spaces
+}

+export const get = fn(WorkspaceID.zod, async (id) => {
+  const row = Database.use((db) => db.select().from(WorkspaceTable).where(eq(WorkspaceTable.id, id)).get())
+  if (!row) return
+  return fromRow(row)
+})
+
+export const remove = fn(WorkspaceID.zod, async (id) => {
+  const sessions = Database.use((db) =>
+    db.select({ id: SessionTable.id }).from(SessionTable).where(eq(SessionTable.workspace_id, id)).all(),
+  )
+  for (const session of sessions) {
+    await AppRuntime.runPromise(Session.Service.use((svc) => svc.remove(session.id)))
+  }
+
+  const row = Database.use((db) => db.select().from(WorkspaceTable).where(eq(WorkspaceTable.id, id)).get())
+
+  if (row) {
+    stopSync(id)
+
+    const info = fromRow(row)
+    try {
+      const adaptor = await getAdaptor(info.projectID, row.type)
+      await adaptor.remove(info)
+    } catch {
+      log.error("adaptor not available when removing workspace", { type: row.type })
+    }
+    Database.use((db) => db.delete(WorkspaceTable).where(eq(WorkspaceTable.id, id)).run())
+    return info
+  }
+})
+
+const connections = new Map<WorkspaceID, ConnectionStatus>()
+const aborts = new Map<WorkspaceID, AbortController>()
 const TIMEOUT = 5000

-type HistoryEvent = {
-  id: string
-  aggregate_id: string
-  seq: number
-  type: string
-  data: Record<string, unknown>
+function setStatus(id: WorkspaceID, status: ConnectionStatus["status"]) {
+  const prev = connections.get(id)
+  if (prev?.status === status) return
+  const next = { workspaceID: id, status }
+  connections.set(id, next)
+
+  if (status === "error") {
+    aborts.delete(id)
+  }
+
+  GlobalBus.emit("event", {
+    directory: "global",
+    workspace: id,
+    payload: {
+      type: Event.Status.type,
+      properties: next,
+    },
+  })
+}
+
+export function status(): ConnectionStatus[] {
+  return [...connections.values()]
 }

 function synced(state: Record<string, number>) {
@@ -864,6 +389,32 @@ function synced(state: Record<string, number>) {
  })
 }

+export async function isSyncing(workspaceID: WorkspaceID) {
+  return aborts.has(workspaceID)
+}
+
+export async function waitForSync(workspaceID: WorkspaceID, state: Record<string, number>, signal?: AbortSignal) {
+  if (synced(state)) return
+
+  try {
+    await waitEvent({
+      timeout: TIMEOUT,
+      signal,
+      fn(event) {
+        if (event.workspace !== workspaceID && event.payload.type !== "sync") {
+          return false
+        }
+        return synced(state)
+      },
+    })
+  } catch {
+    if (signal?.aborted) throw signal.reason ?? new Error("Request aborted")
+    throw new Error(`Timed out waiting for sync fence: ${JSON.stringify(state)}`)
+  }
+}
+
+const log = Log.create({ service: "workspace-sync" })
+
 function route(url: string | URL, path: string) {
  const next = new URL(url)
  next.pathname = `${next.pathname.replace(/\/$/, "")}${path}`
@@ -872,4 +423,198 @@ function route(url: string | URL, path: string) {
  return next
 }

+async function connectSSE(url: URL | string, headers: HeadersInit | undefined, signal: AbortSignal) {
+  const res = await fetch(route(url, "/global/event"), {
+    method: "GET",
+    headers,
+    signal,
+  })
+
+  if (!res.ok) throw new Error(`Workspace sync HTTP failure: ${res.status}`)
+  if (!res.body) throw new Error("No response body from global sync")
+
+  return res.body
+}
+
+async function syncHistory(space: Info, url: URL | string, headers: HeadersInit | undefined, signal: AbortSignal) {
+  const sessionIDs = Database.use((db) =>
+    db
+      .select({ id: SessionTable.id })
+      .from(SessionTable)
+      .where(eq(SessionTable.workspace_id, space.id))
+      .all()
+      .map((row) => row.id),
+  )
+  const state = sessionIDs.length
+    ? Object.fromEntries(
+        Database.use((db) =>
+          db.select().from(EventSequenceTable).where(inArray(EventSequenceTable.aggregate_id, sessionIDs)).all(),
+        ).map((row) => [row.aggregate_id, row.seq]),
+      )
+    : {}
+
+  log.info("syncing workspace history", {
+    workspaceID: space.id,
+    sessions: sessionIDs.length,
+    known: Object.keys(state).length,
+  })
+
+  const requestHeaders = new Headers(headers)
+  requestHeaders.set("content-type", "application/json")
+
+  const res = await fetch(route(url, "/sync/history"), {
+    method: "POST",
+    headers: requestHeaders,
+    body: JSON.stringify(state),
+    signal,
+  })
+
+  if (!res.ok) {
+    const body = await res.text()
+    throw new Error(`Workspace history HTTP failure: ${res.status} ${body}`)
+  }
+
+  const events = await res.json()
+
+  return WorkspaceContext.provide({
+    workspaceID: space.id,
+    fn: () => {
+      for (const event of events) {
+        SyncEvent.replay(
+          {
+            id: event.id,
+            aggregateID: event.aggregate_id,
+            seq: event.seq,
+            type: event.type,
+            data: event.data,
+          },
+          { publish: true },
+        )
+      }
+    },
+  })
+
+  log.info("workspace history synced", {
+    workspaceID: space.id,
+    events: events.length,
+  })
+}
+
+async function syncWorkspaceLoop(space: Info, signal: AbortSignal) {
+  const adaptor = await getAdaptor(space.projectID, space.type)
+  const target = await adaptor.target(space)
+
+  if (target.type === "local") return null
+
+  let attempt = 0
+
+  while (!signal.aborted) {
+    log.info("connecting to global sync", { workspace: space.name })
+    setStatus(space.id, "connecting")
+
+    let stream
+    try {
+      stream = await connectSSE(target.url, target.headers, signal)
+      await syncHistory(space, target.url, target.headers, signal)
+    } catch (err) {
+      stream = null
+      setStatus(space.id, "error")
+      log.info("failed to connect to global sync", {
+        workspace: space.name,
+        err,
+      })
+    }
+
+    if (stream) {
+      attempt = 0
+
+      log.info("global sync connected", { workspace: space.name })
+      setStatus(space.id, "connected")
+
+      await parseSSE(stream, signal, (evt: any) => {
+        try {
+          if (!("payload" in evt)) return
+          if (evt.payload.type === "server.heartbeat") return
+
+          if (evt.payload.type === "sync") {
+            SyncEvent.replay(evt.payload.syncEvent as SyncEvent.SerializedEvent)
+          }
+
+          GlobalBus.emit("event", {
+            directory: evt.directory,
+            project: evt.project,
+            workspace: space.id,
+            payload: evt.payload,
+          })
+        } catch (err) {
+          log.info("failed to replay global event", {
+            workspaceID: space.id,
+            error: err,
+          })
+        }
+      })
+
+      log.info("disconnected from global sync: " + space.id)
+      setStatus(space.id, "disconnected")
+    }
+
+    // Back off reconnect attempts up to 2 minutes while the workspace
+    // stays unavailable.
+    await sleep(Math.min(120_000, 1_000 * 2 ** attempt))
+    attempt += 1
+  }
+}
+
+async function startSync(space: Info) {
+  if (!Flag.OPENCODE_EXPERIMENTAL_WORKSPACES) return
+
+  const adaptor = await getAdaptor(space.projectID, space.type)
+  const target = await adaptor.target(space)
+
+  if (target.type === "local") {
+    void Filesystem.exists(target.directory).then((exists) => {
+      setStatus(space.id, exists ? "connected" : "error")
+    })
+    return
+  }
+
+  if (aborts.has(space.id)) return true
+
+  setStatus(space.id, "disconnected")
+
+  const abort = new AbortController()
+  aborts.set(space.id, abort)
+
+  void syncWorkspaceLoop(space, abort.signal).catch((error) => {
+    aborts.delete(space.id)
+
+    setStatus(space.id, "error")
+    log.warn("workspace listener failed", {
+      workspaceID: space.id,
+      error,
+    })
+  })
+}
+
+function stopSync(id: WorkspaceID) {
+  aborts.get(id)?.abort()
+  aborts.delete(id)
+  connections.delete(id)
+}
+
+export function startWorkspaceSyncing(projectID: ProjectID) {
+  const spaces = Database.use((db) =>
+    db
+      .select({ workspace: WorkspaceTable })
+      .from(WorkspaceTable)
+      .innerJoin(SessionTable, eq(SessionTable.workspace_id, WorkspaceTable.id))
+      .where(eq(WorkspaceTable.project_id, projectID))
+      .all(),
+  )
+
+  for (const row of new Map(spaces.map((row) => [row.workspace.id, row.workspace])).values()) {
+    void startSync(fromRow(row))
+  }
+}
+
 export * as Workspace from "./workspace"
@@ -41,13 +41,11 @@ import { ToolRegistry } from "@/tool/registry"
 import { Format } from "@/format"
 import { Project } from "@/project/project"
 import { Vcs } from "@/project/vcs"
-import { Workspace } from "@/control-plane/workspace"
 import { Worktree } from "@/worktree"
 import { Pty } from "@/pty"
 import { Installation } from "@/installation"
 import { ShareNext } from "@/share/share-next"
 import { SessionShare } from "@/share/session"
-import { SyncEvent } from "@/sync"
 import { Npm } from "@opencode-ai/core/npm"
 import { memoMap } from "@opencode-ai/core/effect/memo-map"

@@ -92,13 +90,11 @@ export const AppLayer = Layer.mergeAll(
  Format.defaultLayer,
  Project.defaultLayer,
  Vcs.defaultLayer,
-  Workspace.defaultLayer,
  Worktree.defaultLayer,
  Pty.defaultLayer,
  Installation.defaultLayer,
  ShareNext.defaultLayer,
  SessionShare.defaultLayer,
-  SyncEvent.defaultLayer,
 ).pipe(Layer.provideMerge(Observability.layer))

 const rt = ManagedRuntime.make(AppLayer, { memoMap })
@@ -1,4 +1,4 @@
-import { Effect, Exit, Fiber } from "effect"
+import { Effect, Fiber } from "effect"
 import { WorkspaceContext } from "@/control-plane/workspace-context"
 import { Instance, type InstanceContext } from "@/project/instance"
 import type { WorkspaceID } from "@/control-plane/schema"
@@ -9,7 +9,6 @@ import { attachWith } from "./run-service"
 export interface Shape {
  readonly promise: <A, E, R>(effect: Effect.Effect<A, E, R>) => Promise<A>
  readonly fork: <A, E, R>(effect: Effect.Effect<A, E, R>) => Fiber.Fiber<A, E>
-  readonly run: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E>
 }

 function restore<R>(instance: InstanceContext | undefined, workspace: WorkspaceID | undefined, fn: () => R): R {
@@ -44,14 +43,6 @@ export function make(): Effect.Effect<Shape> {
        restore(instance, workspace, () => Effect.runPromise(wrap(effect))),
      fork: <A, E, R>(effect: Effect.Effect<A, E, R>) =>
        restore(instance, workspace, () => Effect.runFork(wrap(effect))),
-      run: <A, E, R>(effect: Effect.Effect<A, E, R>) =>
-        Effect.callback<A, E>((resume) => {
-          restore(instance, workspace, () =>
-            Effect.runPromiseExit(wrap(effect)).then((exit) =>
-              resume(Exit.isSuccess(exit) ? Effect.succeed(exit.value) : Effect.failCause(exit.cause)),
-            ),
-          )
-        }),
    } satisfies Shape
  })
 }
@@ -1,67 +0,0 @@
-import { Config, Context, Effect, Layer } from "effect"
-
-type ConfigMap = Record<string, Config.Config<unknown>>
-
-/**
- * The service shape inferred from an object of Effect `Config` definitions.
- */
-export type Shape<Fields extends ConfigMap> = {
-  readonly [Key in keyof Fields]: Config.Success<Fields[Key]>
-}
-
-/**
- * A Context service class with generated layers for config-backed services.
- */
-export type ServiceClass<Self, Id extends string, Service> = Context.ServiceClass<Self, Id, Service> & {
-  /** Provide already-parsed config, useful in tests. */
-  readonly layer: (input: Service) => Layer.Layer<Self>
-  /** Parse config once from the active Effect ConfigProvider and provide the service. */
-  readonly defaultLayer: Layer.Layer<Self, Config.ConfigError>
-}
-
-/**
- * Create a Context service whose implementation is derived from Effect `Config`.
- *
- * This keeps Effect `Config` as the source of truth for env names, defaults, and
- * validation while generating a typed service plus convenient production/test
- * layers.
- *
- * ```ts
- * class ServerAuthConfig extends ConfigService.Service<ServerAuthConfig>()(
- *   "@opencode/ServerAuthConfig",
- *   {
- *     password: Config.string("OPENCODE_SERVER_PASSWORD").pipe(Config.option),
- *     username: Config.string("OPENCODE_SERVER_USERNAME").pipe(Config.withDefault("opencode")),
- *   },
- * ) {}
- *
- * const live = ServerAuthConfig.defaultLayer
- * const test = ServerAuthConfig.layer({ password: Option.some("secret"), username: "kit" })
- * ```
- */
-export const Service =
-  <Self>() =>
-  <const Id extends string, const Fields extends ConfigMap>(id: Id, fields: Fields) => {
-    class ConfigTag extends Context.Service<Self, Shape<Fields>>()(id) {
-      static layer(input: Shape<Fields>) {
-        return Layer.succeed(this, this.of(input))
-      }
-
-      static get defaultLayer() {
-        return Layer.effect(
-          this,
-          Config.all(fields)
-            .asEffect()
-            .pipe(
-              // oxlint-disable-next-line typescript-eslint/no-unsafe-type-assertion -- Config.all preserves the field shape, but its conditional return type also supports iterable inputs.
-              Effect.map((config) => this.of(config as Shape<Fields>)),
-            ),
-        )
-      }
-    }
-
-    // oxlint-disable-next-line typescript-eslint/no-unsafe-type-assertion -- The generated class carries typed static helpers.
-    return ConfigTag as ServiceClass<Self, Id, Shape<Fields>>
-  }
-
-export * as ConfigService from "./config-service"
@@ -1,38 +0,0 @@
-import { Context, Effect } from "effect"
-
-type EffectMethod = (...args: ReadonlyArray<never>) => Effect.Effect<unknown, unknown, unknown>
-
-type ServiceUse<Identifier, Shape> = {
-  readonly [Key in keyof Shape as Shape[Key] extends EffectMethod ? Key : never]: Shape[Key] extends (
-    ...args: infer Args
-  ) => infer Return
-    ? Args extends ReadonlyArray<unknown>
-      ? Return extends Effect.Effect<infer A, infer E, infer R>
-        ? (...args: Args) => Effect.Effect<A, E, R | Identifier>
-        : never
-      : never
-    : never
-}
-
-export const serviceUse = <Identifier, Shape>(tag: Context.Service<Identifier, Shape>) => {
-  // This is the only dynamic boundary: TypeScript knows the accessor shape,
-  // but Proxy property names are runtime values.
-  const access = new Proxy(
-    {},
-    {
-      get: (_, key) => {
-        if (typeof key !== "string") return undefined
-        return (...args: unknown[]) =>
-          tag.use((service) => {
-            // oxlint-disable-next-line typescript-eslint/no-unsafe-type-assertion -- Proxy keys are checked at runtime.
-            const method = service[key as keyof Shape]
-            if (typeof method !== "function") return Effect.die(new Error(`Service method not found: ${key}`))
-            // oxlint-disable-next-line typescript-eslint/no-unsafe-type-assertion -- ServiceUse exposes only Effect-returning methods.
-            return (method as (...args: unknown[]) => Effect.Effect<unknown, unknown, unknown>)(...args)
-          })
-      },
-    },
-  )
-  // oxlint-disable-next-line typescript-eslint/no-unsafe-type-assertion -- Proxy implements the mapped accessor surface lazily.
-  return access as ServiceUse<Identifier, Shape>
-}
@@ -10,6 +10,7 @@ import { BusEvent } from "@/bus/bus-event"
 import { InstanceState } from "@/effect/instance-state"
 import { Flag } from "@opencode-ai/core/flag/flag"
 import { Git } from "@/git"
+import { Instance } from "@/project/instance"
 import { lazy } from "@/util/lazy"
 import { Config } from "@/config/config"
 import { FileIgnore } from "./ignore"
@@ -75,27 +76,25 @@ export const layer = Layer.effect(
        function* () {
          if (yield* Flag.OPENCODE_EXPERIMENTAL_DISABLE_FILEWATCHER) return

-          const ctx = yield* InstanceState.context
-
-          log.info("init", { directory: ctx.directory })
+          log.info("init", { directory: Instance.directory })

          const backend = getBackend()
          if (!backend) {
-            log.error("watcher backend not supported", { directory: ctx.directory, platform: process.platform })
+            log.error("watcher backend not supported", { directory: Instance.directory, platform: process.platform })
            return
          }

          const w = watcher()
          if (!w) return

-          log.info("watcher backend", { directory: ctx.directory, platform: process.platform, backend })
+          log.info("watcher backend", { directory: Instance.directory, platform: process.platform, backend })

          const subs: ParcelWatcher.AsyncSubscription[] = []
          yield* Effect.addFinalizer(() =>
            Effect.promise(() => Promise.allSettled(subs.map((sub) => sub.unsubscribe()))),
          )

-          const cb: ParcelWatcher.SubscribeCallback = InstanceState.bind((err, evts) => {
+          const cb: ParcelWatcher.SubscribeCallback = Instance.bind((err, evts) => {
            if (err) return
            for (const evt of evts) {
              if (evt.type === "create") void Bus.publish(Event.Updated, { file: evt.path, event: "add" })
@@ -123,14 +122,19 @@ export const layer = Layer.effect(
          const cfgIgnores = cfg.watcher?.ignore ?? []

          if (yield* Flag.OPENCODE_EXPERIMENTAL_FILEWATCHER) {
-            yield* subscribe(ctx.directory, [...FileIgnore.PATTERNS, ...cfgIgnores, ...protecteds(ctx.directory)])
+            yield* subscribe(Instance.directory, [
+              ...FileIgnore.PATTERNS,
+              ...cfgIgnores,
+              ...protecteds(Instance.directory),
+            ])
          }

-          if (ctx.project.vcs === "git") {
+          if (Instance.project.vcs === "git") {
            const result = yield* git.run(["rev-parse", "--git-dir"], {
-              cwd: ctx.worktree,
+              cwd: Instance.project.worktree,
            })
-            const vcsDir = result.exitCode === 0 ? path.resolve(ctx.worktree, result.text().trim()) : undefined
+            const vcsDir =
+              result.exitCode === 0 ? path.resolve(Instance.project.worktree, result.text().trim()) : undefined
            if (vcsDir && !cfgIgnores.includes(".git") && !cfgIgnores.includes(vcsDir)) {
              const ignore = (yield* Effect.promise(() => readdir(vcsDir).catch(() => []))).filter(
                (entry) => entry !== "HEAD",
@@ -114,11 +114,6 @@ function isMcpConfigured(entry: McpEntry): entry is ConfigMCP.Info {

 const sanitize = (s: string) => s.replace(/[^a-zA-Z0-9_-]/g, "_")

-function remoteURL(key: string, value: string) {
-  if (URL.canParse(value)) return new URL(value)
-  log.warn("invalid remote mcp url", { key })
-}
-
 // Convert MCP tool definition to AI SDK Tool type
 function convertMcpTool(mcpTool: MCPToolDef, client: MCPClient, timeout?: number): Tool {
  const inputSchema = mcpTool.inputSchema
@@ -272,13 +267,6 @@ export const layer = Layer.effect(
    ) {
      const oauthDisabled = mcp.oauth === false
      const oauthConfig = typeof mcp.oauth === "object" ? mcp.oauth : undefined
-      const url = remoteURL(key, mcp.url)
-      if (!url) {
-        return {
-          client: undefined as MCPClient | undefined,
-          status: { status: "failed" as const, error: `Invalid MCP URL for "${key}"` },
-        }
-      }
      let authProvider: McpOAuthProvider | undefined

      if (!oauthDisabled) {
@@ -303,14 +291,14 @@ export const layer = Layer.effect(
      const transports: Array<{ name: string; transport: TransportWithAuth }> = [
        {
          name: "StreamableHTTP",
-          transport: new StreamableHTTPClientTransport(url, {
+          transport: new StreamableHTTPClientTransport(new URL(mcp.url), {
            authProvider,
            requestInit: mcp.headers ? { headers: mcp.headers } : undefined,
          }),
        },
        {
          name: "SSE",
-          transport: new SSEClientTransport(url, {
+          transport: new SSEClientTransport(new URL(mcp.url), {
            authProvider,
            requestInit: mcp.headers ? { headers: mcp.headers } : undefined,
          }),
@@ -734,8 +722,6 @@ export const layer = Layer.effect(
      if (!mcpConfig) throw new Error(`MCP server ${mcpName} not found or disabled`)
      if (mcpConfig.type !== "remote") throw new Error(`MCP server ${mcpName} is not a remote server`)
      if (mcpConfig.oauth === false) throw new Error(`MCP server ${mcpName} has OAuth explicitly disabled`)
-      const url = remoteURL(mcpName, mcpConfig.url)
-      if (!url) throw new Error(`Invalid MCP URL for "${mcpName}"`)

      // OAuth config is optional - if not provided, we'll use auto-discovery
      const oauthConfig = typeof mcpConfig.oauth === "object" ? mcpConfig.oauth : undefined
@@ -765,7 +751,7 @@ export const layer = Layer.effect(
        auth,
      )

-      const transport = new StreamableHTTPClientTransport(url, { authProvider })
+      const transport = new StreamableHTTPClientTransport(new URL(mcpConfig.url), { authProvider })

      return yield* Effect.tryPromise({
        try: () => {
@@ -1,26 +0,0 @@
-import type { Hooks, PluginInput } from "@opencode-ai/plugin"
-
-export async function AzureAuthPlugin(_input: PluginInput): Promise<Hooks> {
-  const prompts = []
-  if (!process.env.AZURE_RESOURCE_NAME) {
-    prompts.push({
-      type: "text" as const,
-      key: "resourceName",
-      message: "Enter Azure Resource Name",
-      placeholder: "e.g. my-models",
-    })
-  }
-
-  return {
-    auth: {
-      provider: "azure",
-      methods: [
-        {
-          type: "api",
-          label: "API key",
-          prompts,
-        },
-      ],
-    },
-  }
-}
@@ -14,7 +14,6 @@ const ISSUER = "https://auth.openai.com"
 const CODEX_API_ENDPOINT = "https://chatgpt.com/backend-api/codex/responses"
 const OAUTH_PORT = 1455
 const OAUTH_POLLING_SAFETY_MARGIN_MS = 3000
-const ALLOWED_MODELS = new Set(["gpt-5.5", "gpt-5.2", "gpt-5.3-codex", "gpt-5.4", "gpt-5.4-mini"])

 interface PkceCodes {
  verifier: string
@@ -359,45 +358,50 @@ function waitForOAuthCallback(pkce: PkceCodes, state: string): Promise<TokenResp

 export async function CodexAuthPlugin(input: PluginInput): Promise<Hooks> {
  return {
-    provider: {
-      id: "openai",
-      async models(provider, ctx) {
-        if (ctx.auth?.type !== "oauth") return provider.models
-
-        return Object.fromEntries(
-          Object.entries(provider.models)
-            .filter(([, model]) => {
-              if (ALLOWED_MODELS.has(model.api.id)) return true
-              const match = model.api.id.match(/^gpt-(\d+\.\d+)/)
-              return match ? parseFloat(match[1]) > 5.4 : false
-            })
-            .map(([modelID, model]) => [
-              modelID,
-              {
-                ...model,
-                cost: {
-                  input: 0,
-                  output: 0,
-                  cache: { read: 0, write: 0 },
-                },
-                limit: model.id.includes("gpt-5.5")
-                  ? {
-                      context: 400_000,
-                      input: 272_000,
-                      output: 128_000,
-                    }
-                  : model.limit,
-              },
-            ]),
-        )
-      },
-    },
    auth: {
      provider: "openai",
-      async loader(getAuth) {
+      async loader(getAuth, provider) {
        const auth = await getAuth()
        if (auth.type !== "oauth") return {}

+        // Filter models to only allowed Codex models for OAuth
+        const allowedModels = new Set([
+          "gpt-5.1-codex",
+          "gpt-5.1-codex-max",
+          "gpt-5.1-codex-mini",
+          "gpt-5.2",
+          "gpt-5.2-codex",
+          "gpt-5.3-codex",
+          "gpt-5.4",
+          "gpt-5.4-mini",
+        ])
+        for (const [modelId, model] of Object.entries(provider.models)) {
+          if (modelId.includes("codex")) continue
+          if (allowedModels.has(model.api.id)) continue
+          const match = model.api.id.match(/^gpt-(\d+\.\d+)/)
+          if (match && parseFloat(match[1]) > 5.4) continue
+          delete provider.models[modelId]
+        }
+
+        // Zero out costs for Codex (included with ChatGPT subscription)
+        for (const model of Object.values(provider.models)) {
+          model.cost = {
+            input: 0,
+            output: 0,
+            cache: { read: 0, write: 0 },
+          }
+
+          // gpt-5.5 models temporarily have restricted context window size for codex plans
+          if (model.id.includes("gpt-5.5")) {
+            model.limit = {
+              context: 400_000,
+              //@ts-expect-error incorrect type for v1 sdk but works
+              input: 272_000,
+              output: 128_000,
+            }
+          }
+        }
+
        return {
          apiKey: OAUTH_DUMMY_KEY,
          async fetch(requestInput: RequestInfo | URL, init?: RequestInit) {
@@ -17,7 +17,6 @@ import { CopilotAuthPlugin } from "./github-copilot/copilot"
 import { gitlabAuthPlugin as GitlabAuthPlugin } from "opencode-gitlab-auth"
 import { PoeAuthPlugin } from "opencode-poe-auth"
 import { CloudflareAIGatewayAuthPlugin, CloudflareWorkersAuthPlugin } from "./cloudflare"
-import { AzureAuthPlugin } from "./azure"
 import { Effect, Layer, Context, Stream } from "effect"
 import { EffectBridge } from "@/effect/bridge"
 import { InstanceState } from "@/effect/instance-state"
@@ -62,7 +61,6 @@ const INTERNAL_PLUGINS: PluginInstance[] = [
  PoeAuthPlugin,
  CloudflareWorkersAuthPlugin,
  CloudflareAIGatewayAuthPlugin,
-  AzureAuthPlugin,
 ]

 function isServerPlugin(value: unknown): value is PluginInstance {
@@ -7,7 +7,7 @@ import * as Project from "./project"
 import * as Vcs from "./vcs"
 import { Bus } from "../bus"
 import { Command } from "../command"
-import { InstanceState } from "@/effect/instance-state"
+import { Instance } from "./instance"
 import * as Log from "@opencode-ai/core/util/log"
 import { FileWatcher } from "@/file/watcher"
 import { ShareNext } from "@/share/share-next"
@@ -15,8 +15,7 @@ import * as Effect from "effect/Effect"
 import { Config } from "@/config/config"

 export const InstanceBootstrap = Effect.gen(function* () {
-  const ctx = yield* InstanceState.context
-  Log.Default.info("bootstrapping", { directory: ctx.directory })
+  Log.Default.info("bootstrapping", { directory: Instance.directory })
  // everything depends on config so eager load it for nice traces
  yield* Config.Service.use((svc) => svc.get())
  // Plugin can mutate config so it has to be initialized before anything else.
@@ -33,11 +32,10 @@ export const InstanceBootstrap = Effect.gen(function* () {
    ].map((s) => Effect.forkDetach(s.use((i) => i.init()))),
  ).pipe(Effect.withSpan("InstanceBootstrap.init"))

-  const projectID = ctx.project.id
  yield* Bus.Service.use((svc) =>
    svc.subscribeCallback(Command.Event.Executed, async (payload) => {
      if (payload.properties.name === Command.Default.INIT) {
-        Project.setInitialized(projectID)
+        Project.setInitialized(Instance.project.id)
      }
    }),
  )
@@ -16,21 +16,20 @@ import { NodePath } from "@effect/platform-node"
 import { AppFileSystem } from "@opencode-ai/core/filesystem"
 import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
 import { zod } from "@/util/effect-zod"
-import { NonNegativeInt, optionalOmitUndefined, withStatics } from "@/util/schema"
-import { serviceUse } from "@/effect/service-use"
+import { NonNegativeInt, withStatics } from "@/util/schema"

 const log = Log.create({ service: "project" })

 const ProjectVcs = Schema.Literal("git")

 const ProjectIcon = Schema.Struct({
-  url: optionalOmitUndefined(Schema.String),
-  override: optionalOmitUndefined(Schema.String),
-  color: optionalOmitUndefined(Schema.String),
+  url: Schema.optional(Schema.String),
+  override: Schema.optional(Schema.String),
+  color: Schema.optional(Schema.String),
 })

 const ProjectCommands = Schema.Struct({
-  start: optionalOmitUndefined(
+  start: Schema.optional(
    Schema.String.annotate({ description: "Startup script to run when creating a new workspace (worktree)" }),
  ),
 })
@@ -38,16 +37,16 @@ const ProjectCommands = Schema.Struct({
 const ProjectTime = Schema.Struct({
  created: NonNegativeInt,
  updated: NonNegativeInt,
-  initialized: optionalOmitUndefined(NonNegativeInt),
+  initialized: Schema.optional(NonNegativeInt),
 })

 export const Info = Schema.Struct({
  id: ProjectID,
  worktree: Schema.String,
-  vcs: optionalOmitUndefined(ProjectVcs),
-  name: optionalOmitUndefined(Schema.String),
-  icon: optionalOmitUndefined(ProjectIcon),
-  commands: optionalOmitUndefined(ProjectCommands),
+  vcs: Schema.optional(ProjectVcs),
+  name: Schema.optional(Schema.String),
+  icon: Schema.optional(ProjectIcon),
+  commands: Schema.optional(ProjectCommands),
  time: ProjectTime,
  sandboxes: Schema.Array(Schema.String),
 })
@@ -179,7 +178,7 @@ export const layer: Layer.Layer<
    const readCachedProjectId = Effect.fnUntraced(function* (dir: string) {
      return yield* fs.readFileString(pathSvc.join(dir, "opencode")).pipe(
        Effect.map((x) => x.trim()),
-        Effect.map((x) => ProjectID.make(x)),
+        Effect.map(ProjectID.make),
        Effect.catch(() => Effect.void),
      )
    })
@@ -486,8 +485,6 @@ export const defaultLayer = layer.pipe(
  Layer.provide(NodePath.layer),
 )

-export const use = serviceUse(Service)
-
 export function list() {
  return Database.use((db) =>
    db
@@ -3,7 +3,7 @@ import { Auth } from "@/auth"
 import { InstanceState } from "@/effect/instance-state"
 import { zod } from "@/util/effect-zod"
 import { namedSchemaError } from "@/util/named-schema-error"
-import { optionalOmitUndefined, withStatics } from "@/util/schema"
+import { withStatics } from "@/util/schema"
 import { Plugin } from "../plugin"
 import { ProviderID } from "./schema"
 import { Array as Arr, Effect, Layer, Record, Result, Context, Schema } from "effect"
@@ -18,14 +18,14 @@ const TextPrompt = Schema.Struct({
  type: Schema.Literal("text"),
  key: Schema.String,
  message: Schema.String,
-  placeholder: optionalOmitUndefined(Schema.String),
-  when: optionalOmitUndefined(When),
+  placeholder: Schema.optional(Schema.String),
+  when: Schema.optional(When),
 })

 const SelectOption = Schema.Struct({
  label: Schema.String,
  value: Schema.String,
-  hint: optionalOmitUndefined(Schema.String),
+  hint: Schema.optional(Schema.String),
 })

 const SelectPrompt = Schema.Struct({
@@ -33,7 +33,7 @@ const SelectPrompt = Schema.Struct({
  key: Schema.String,
  message: Schema.String,
  options: Schema.Array(SelectOption),
-  when: optionalOmitUndefined(When),
+  when: Schema.optional(When),
 })

 const Prompt = Schema.Union([TextPrompt, SelectPrompt])
@@ -41,7 +41,7 @@ const Prompt = Schema.Union([TextPrompt, SelectPrompt])
 export class Method extends Schema.Class<Method>("ProviderAuthMethod")({
  type: Schema.Literals(["oauth", "api"]),
  label: Schema.String,
-  prompts: optionalOmitUndefined(Schema.Array(Prompt)),
+  prompts: Schema.optional(Schema.Array(Prompt)),
 }) {
  static readonly zod = zod(this)
 }
@@ -135,25 +135,23 @@ export const layer: Layer.Layer<Service, never, Auth.Service | Plugin.Service> =
          item.methods.map((method) => ({
            type: method.type,
            label: method.label,
-            ...(method.prompts && {
-              prompts: method.prompts.map((prompt) => {
-                if (prompt.type === "select") {
-                  return {
-                    type: "select" as const,
-                    key: prompt.key,
-                    message: prompt.message,
-                    options: prompt.options,
-                    ...(prompt.when && { when: prompt.when }),
-                  }
-                }
+            prompts: method.prompts?.map((prompt) => {
+              if (prompt.type === "select") {
                return {
-                  type: "text" as const,
+                  type: "select" as const,
                  key: prompt.key,
                  message: prompt.message,
-                  ...(prompt.placeholder && { placeholder: prompt.placeholder }),
-                  ...(prompt.when && { when: prompt.when }),
+                  options: prompt.options,
+                  when: prompt.when,
                }
-              }),
+              }
+              return {
+                type: "text" as const,
+                key: prompt.key,
+                message: prompt.message,
+                placeholder: prompt.placeholder,
+                when: prompt.when,
+              }
            }),
          })),
        ),
@@ -24,7 +24,7 @@ import { EffectBridge } from "@/effect/bridge"
 import { InstanceState } from "@/effect/instance-state"
 import { AppFileSystem } from "@opencode-ai/core/filesystem"
 import { isRecord } from "@/util/record"
-import { optionalOmitUndefined, withStatics } from "@/util/schema"
+import { withStatics } from "@/util/schema"

 import * as ProviderTransform from "./transform"
 import { ModelID, ProviderID } from "./schema"
@@ -199,26 +199,12 @@ function custom(dep: CustomDep): Record<string, CustomLoader> {
      }),
    azure: Effect.fnUntraced(function* (provider: Info) {
      const env = yield* dep.env()
-      const auth = yield* dep.auth(provider.id)
      const resource = iife(() => {
-        return [
-          provider.options?.resourceName,
-          auth?.type === "api" ? auth.metadata?.resourceName : undefined,
-          env["AZURE_RESOURCE_NAME"],
-        ].find((name) => typeof name === "string" && name.trim() !== "")
+        const name = provider.options?.resourceName
+        if (typeof name === "string" && name.trim() !== "") return name
+        return env["AZURE_RESOURCE_NAME"]
      })

-      if (!resource && !provider.options?.baseURL) {
-        return {
-          autoload: false,
-          async getModel() {
-            throw new Error(
-              "AZURE_RESOURCE_NAME is missing, set it using env var or reconnecting the azure provider and setting it",
-            )
-          },
-        }
-      }
-
      return {
        autoload: false,
        async getModel(sdk: any, modelID: string, options?: Record<string, any>) {
@@ -229,16 +215,11 @@ function custom(dep: CustomDep): Record<string, CustomLoader> {
            return sdk.responses(modelID)
          }
        },
-        options: {
-          resourceName: resource,
-        },
-        vars(_options): Record<string, string> {
-          if (resource) {
-            return {
-              AZURE_RESOURCE_NAME: resource,
-            }
+        options: {},
+        vars(_options) {
+          return {
+            ...(resource && { AZURE_RESOURCE_NAME: resource }),
          }
-          return {}
        },
      }
    }),
@@ -875,7 +856,7 @@ const ProviderCost = Schema.Struct({
  input: Schema.Finite,
  output: Schema.Finite,
  cache: ProviderCacheCost,
-  experimentalOver200K: optionalOmitUndefined(
+  experimentalOver200K: Schema.optional(
    Schema.Struct({
      input: Schema.Finite,
      output: Schema.Finite,
@@ -886,7 +867,7 @@ const ProviderCost = Schema.Struct({

 const ProviderLimit = Schema.Struct({
  context: Schema.Finite,
-  input: optionalOmitUndefined(Schema.Finite),
+  input: Schema.optional(Schema.Finite),
  output: Schema.Finite,
 })

@@ -895,7 +876,7 @@ export const Model = Schema.Struct({
  providerID: ProviderID,
  api: ProviderApiInfo,
  name: Schema.String,
-  family: optionalOmitUndefined(Schema.String),
+  family: Schema.optional(Schema.String),
  capabilities: ProviderCapabilities,
  cost: ProviderCost,
  limit: ProviderLimit,
@@ -903,7 +884,7 @@ export const Model = Schema.Struct({
  options: Schema.Record(Schema.String, Schema.Any),
  headers: Schema.Record(Schema.String, Schema.String),
  release_date: Schema.String,
-  variants: optionalOmitUndefined(Schema.Record(Schema.String, Schema.Record(Schema.String, Schema.Any))),
+  variants: Schema.optional(Schema.Record(Schema.String, Schema.Record(Schema.String, Schema.Any))),
 })
  .annotate({ identifier: "Model" })
  .pipe(withStatics((s) => ({ zod: zod(s) })))
@@ -914,7 +895,7 @@ export const Info = Schema.Struct({
  name: Schema.String,
  source: Schema.Literals(["env", "config", "custom", "api"]),
  env: Schema.Array(Schema.String),
-  key: optionalOmitUndefined(Schema.String),
+  key: Schema.optional(Schema.String),
  options: Schema.Record(Schema.String, Schema.Any),
  models: Schema.Record(Schema.String, Model),
 })
@@ -1140,33 +1121,6 @@ const layer: Layer.Layer<
          return true
        }

-        for (const hook of plugins) {
-          const p = hook.provider
-          const models = p?.models
-          if (!p || !models) continue
-
-          const providerID = ProviderID.make(p.id)
-          if (disabled.has(providerID)) continue
-
-          const provider = database[providerID]
-          if (!provider) continue
-          const pluginAuth = yield* auth.get(providerID).pipe(Effect.orDie)
-
-          provider.models = yield* Effect.promise(async () => {
-            const next = await models(provider, { auth: pluginAuth })
-            return Object.fromEntries(
-              Object.entries(next).map(([id, model]) => [
-                id,
-                {
-                  ...model,
-                  id: ModelID.make(id),
-                  providerID,
-                },
-              ]),
-            )
-          })
-        }
-
        // extend database from config
        for (const [providerID, provider] of configProviders) {
          const existing = database[providerID]
@@ -1353,6 +1307,33 @@ const layer: Layer.Layer<
          })
        }

+        for (const hook of plugins) {
+          const p = hook.provider
+          const models = p?.models
+          if (!p || !models) continue
+
+          const providerID = ProviderID.make(p.id)
+          if (disabled.has(providerID)) continue
+
+          const provider = providers[providerID]
+          if (!provider) continue
+          const pluginAuth = yield* auth.get(providerID).pipe(Effect.orDie)
+
+          provider.models = yield* Effect.promise(async () => {
+            const next = await models(provider, { auth: pluginAuth })
+            return Object.fromEntries(
+              Object.entries(next).map(([id, model]) => [
+                id,
+                {
+                  ...model,
+                  id: ModelID.make(id),
+                  providerID,
+                },
+              ]),
+            )
+          })
+        }
+
        for (const [id, provider] of Object.entries(providers)) {
          const providerID = ProviderID.make(id)
          if (!isProviderAllowed(providerID)) {
@@ -1485,13 +1466,10 @@ const layer: Layer.Layer<
          if (combined) opts.signal = combined

          // Strip openai itemId metadata following what codex does
-          if (
-            (model.api.npm === "@ai-sdk/openai" || model.api.npm === "@ai-sdk/azure") &&
-            opts.body &&
-            opts.method === "POST"
-          ) {
+          if (model.api.npm === "@ai-sdk/openai" && opts.body && opts.method === "POST") {
            const body = JSON.parse(opts.body as string)
-            const keepIds = body.store === true
+            const isAzure = model.providerID.includes("azure")
+            const keepIds = isAzure && body.store === true
            if (!keepIds && Array.isArray(body.input)) {
              for (const item of body.input) {
                if ("id" in item) {
@@ -197,7 +197,7 @@ function normalizeMessages(
  }

  // Deepseek requires all assistant messages to have reasoning on them
-  if (model.api.id.toLowerCase().includes("deepseek")) {
+  if (model.api.id.includes("deepseek")) {
    msgs = msgs.map((msg) => {
      if (msg.role !== "assistant") return msg
      if (Array.isArray(msg.content)) {
@@ -573,7 +573,7 @@ export function variants(model: Provider.Model): Record<string, Record<string, a
    // https://docs.venice.ai/overview/guides/reasoning-models#reasoning-effort
    case "@ai-sdk/openai-compatible":
      const efforts = [...WIDELY_SUPPORTED_EFFORTS]
-      if (model.api.id.toLowerCase().includes("deepseek-v4")) {
+      if (model.api.id.includes("deepseek-v4")) {
        efforts.push("max")
      }
      return Object.fromEntries(efforts.map((effort) => [effort, { reasoningEffort: effort }]))
@@ -760,10 +760,9 @@ export function variants(model: Provider.Model): Record<string, Record<string, a
      // https://v5.ai-sdk.dev/providers/ai-sdk-providers/mistral
      // https://docs.mistral.ai/capabilities/reasoning/adjustable
      if (!model.capabilities.reasoning) return {}
-      // Only Mistral Small 4 and Medium 3.5 support reasoning
-      const MISTRAL_REASONING_IDS = ["mistral-small-2603", "mistral-small-latest", "mistral-medium-3.5"]
+      // Only Mistral Small 4 supports reasoning (mistral-small-2603, mistral-small-latest)
      const mistralId = model.api.id.toLowerCase()
-      if (!MISTRAL_REASONING_IDS.some((id) => mistralId.includes(id))) return {}
+      if (!mistralId.includes("mistral-small-2603") && !mistralId.includes("mistral-small-latest")) return {}
      return {
        high: { reasoningEffort: "high" },
      }
@@ -866,7 +865,7 @@ export function options(input: {
  }

  if (input.model.api.npm === "@ai-sdk/azure") {
-    result["store"] = false
+    result["store"] = true
    result["promptCacheKey"] = input.sessionID
  }

@@ -1058,16 +1057,7 @@ export function providerOptions(model: Provider.Model, options: { [x: string]: a
    return result
  }

-  // AI SDK packages that resolve providerOptionsName by splitting the
-  // provider name on "." (e.g. "wafer.ai" -> "wafer") need the same
-  // logic here so the key we write matches the key they read.
-  // Other SDKs (xai, mistral, groq, cohere, etc.) use hardcoded keys
-  // like "xai" or "cohere" - applying .split(".")[0] would break those.
-  const usesDotSplitOptions =
-    model.api.npm === "@ai-sdk/openai-compatible" ||
-    model.api.npm === "@ai-sdk/openai" ||
-    model.api.npm === "@ai-sdk/anthropic"
-  const key = sdkKey(model.api.npm) ?? (usesDotSplitOptions ? model.providerID.split(".")[0] : model.providerID)
+  const key = sdkKey(model.api.npm) ?? model.providerID
  // @ai-sdk/azure delegates to OpenAIChatLanguageModel which reads from
  // providerOptions["openai"], but OpenAIResponsesLanguageModel checks
  // "azure" first. Pass both so model options work on either code path.
@@ -5,6 +5,7 @@ import { InstanceState } from "@/effect/instance-state"
 import { EffectBridge } from "@/effect/bridge"
 import { lazy } from "@opencode-ai/core/util/lazy"
 import { Plugin } from "@/plugin"
+import { Instance } from "@/project/instance"
 import { Shell } from "@/shell/shell"
 import type { Proc } from "#pty"
 import * as Log from "@opencode-ai/core/util/log"
@@ -228,38 +229,42 @@ export const layer = Layer.effect(
        subscribers: new Map(),
      }
      s.sessions.set(id, session)
-      proc.onData((chunk) => {
-        session.cursor += chunk.length
+      proc.onData(
+        Instance.bind((chunk) => {
+          session.cursor += chunk.length

-        for (const [key, ws] of session.subscribers.entries()) {
-          if (ws.readyState !== 1) {
-            session.subscribers.delete(key)
-            continue
+          for (const [key, ws] of session.subscribers.entries()) {
+            if (ws.readyState !== 1) {
+              session.subscribers.delete(key)
+              continue
+            }
+            if (sock(ws) !== key) {
+              session.subscribers.delete(key)
+              continue
+            }
+            try {
+              ws.send(chunk)
+            } catch {
+              session.subscribers.delete(key)
+            }
          }
-          if (sock(ws) !== key) {
-            session.subscribers.delete(key)
-            continue
-          }
-          try {
-            ws.send(chunk)
-          } catch {
-            session.subscribers.delete(key)
-          }
-        }

-        session.buffer += chunk
-        if (session.buffer.length <= BUFFER_LIMIT) return
-        const excess = session.buffer.length - BUFFER_LIMIT
-        session.buffer = session.buffer.slice(excess)
-        session.bufferCursor += excess
-      })
-      proc.onExit(({ exitCode }) => {
-        if (session.info.status === "exited") return
-        log.info("session exited", { id, exitCode })
-        session.info.status = "exited"
-        bridge.fork(bus.publish(Event.Exited, { id, exitCode }))
-        bridge.fork(remove(id))
-      })
+          session.buffer += chunk
+          if (session.buffer.length <= BUFFER_LIMIT) return
+          const excess = session.buffer.length - BUFFER_LIMIT
+          session.buffer = session.buffer.slice(excess)
+          session.bufferCursor += excess
+        }),
+      )
+      proc.onExit(
+        Instance.bind(({ exitCode }) => {
+          if (session.info.status === "exited") return
+          log.info("session exited", { id, exitCode })
+          session.info.status = "exited"
+          bridge.fork(bus.publish(Event.Exited, { id, exitCode }))
+          bridge.fork(remove(id))
+        }),
+      )
      yield* bus.publish(Event.Created, { info })
      return info
    })
@@ -1,24 +0,0 @@
-import { Effect } from "effect"
-
-const inputDecoder = new TextDecoder("utf-8", { fatal: true })
-
-export function handlePtyInput(
-  handler: { onMessage: (message: string | ArrayBuffer) => void },
-  message: string | Uint8Array,
-) {
-  if (typeof message === "string") {
-    handler.onMessage(message)
-    return Effect.void
-  }
-  return Effect.try({
-    try: () => inputDecoder.decode(message),
-    catch: () => new Error("invalid PTY websocket input"),
-  }).pipe(
-    Effect.catch(() => Effect.succeed(undefined)),
-    Effect.flatMap((decoded) => {
-      if (decoded === undefined) return Effect.void
-      handler.onMessage(decoded)
-      return Effect.void
-    }),
-  )
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kit Langton	5b1feb4c54	fix(httpapi): preserve SDK schema parity	2026-04-28 22:56:18 -04:00
Kit Langton	ca2f54a68d	test(httpapi): compare request body schema kind	2026-04-28 22:20:10 -04:00
Kit Langton	0033c4474c	fix(httpapi): preserve legacy SDK error parity	2026-04-28 22:16:49 -04:00
Kit Langton	80bcc8d478	fix(httpapi): restore CI schema parity	2026-04-28 22:10:41 -04:00
Kit Langton	d0f6065e4c	feat: add SSE event schemas to HttpApi OpenAPI spec Add effectPayloads() to BusEvent and SyncEvent that build Effect Schemas from the same registries the Hono spec uses. Wire them into OpenCodeHttpApi via HttpApi.AdditionalSchemas so both specs emit identical Event/SyncEvent component schemas (55 event types).	2026-04-28 22:05:24 -04:00
Kit Langton	b6da0a9cda	refactor: replace Schema.Any ZodOverride with Effect schemas for error types Add EffectSchema to namedSchemaError for HttpApi OpenAPI generation. Replace Schema.Any + ZodOverride bridges on RetryPart.error and AssistantMessage.error with proper Effect Schema unions, producing concrete discriminated union types in the HttpApi spec instead of unknown.	2026-04-28 21:56:40 -04:00
Kit Langton	967fa4d3bb	fix: match Hono response descriptions in HttpApi OpenAPI spec Add ResponseDescriptions map to public.ts transform that overwrites the generic "Success" descriptions with the endpoint-specific descriptions from the Hono spec (115 endpoints).	2026-04-28 21:46:10 -04:00
Kit Langton	a35dc04d15	refactor: strip optional null from all component schemas, not just request bodies Extends stripOptionalNull to run over every component schema, closing ~200 null-vs-undefined mismatches between Hono and HttpApi SDK output. Removes LegacyBodyRefParameters since components are now pre-cleaned. Adds scripts/diff-sdk-types.sh for comparing Hono vs HttpApi SDK types.	2026-04-28 21:39:42 -04:00
Kit Langton	51bc4246d2	fix(httpapi): preserve session list query parity	2026-04-28 21:34:55 -04:00
Kit Langton	a5e6263c58	test(httpapi): cover workspace target routing	2026-04-28 21:33:50 -04:00
Kit Langton	966f5acef4	refactor: tighten numeric schemas and simplify public.ts OpenAPI transform - Replace Schema.Finite with NonNegativeInt/PositiveInt where values are always integers (timestamps, token counts, positions, PIDs, etc.) - Simplify public.ts: remove finite-number normalization, TUI event hoisting, and sync replay inlining (all now handled at schema level) - Add generic self-referencing $ref fixer for Effect OpenAPI generation bug where annotated union arms sharing AST nodes produce circular component schemas - Keep: optional null stripping, workspace re-nulling, SSE response override, instance query param injection, query param type overrides	2026-04-28 21:33:50 -04:00
Kit Langton	0b395cd13e	fix(httpapi): keep backend feature flagged	2026-04-28 21:33:50 -04:00
Kit Langton	35239bddef	refactor(httpapi): split groups from handlers	2026-04-28 21:33:50 -04:00
Kit Langton	41367fa3ba	refactor: use Schema.Finite instead of Schema.Number for OpenAPI-facing schemas Schema.Number emits anyOf:[number, string enum(Infinity/-Infinity/NaN)] in OpenAPI because JS numbers include non-finite values. Schema.Finite adds an isFinite check so the OpenAPI output is just {type:"number"}, eliminating the need for post-hoc normalization in public.ts.	2026-04-28 21:33:16 -04:00
Kit Langton	97caa6bf82	refactor(httpapi): simplify route layer composition	2026-04-28 21:33:15 -04:00
Kit Langton	191eb357bc	refactor(httpapi): encode event streams with effect sse	2026-04-28 21:33:15 -04:00
Kit Langton	b03d064127	test(httpapi): cover sdk prompt and stream parity	2026-04-28 21:33:15 -04:00
Kit Langton	945ad08380	test(httpapi): expand sdk backend parity	2026-04-28 21:33:15 -04:00
Kit Langton	cbc8847af8	fix(httpapi): align default backend parity	2026-04-28 21:33:15 -04:00
Kit Langton	d58ebc5cf4	Default dev and beta to HttpApi	2026-04-28 21:33:15 -04:00