refactor(app): port the layout store to plain codecs

Same shapes, defaults and migration as before (workspaces flag to map, review panel flag inherited from the file tree, legacy file-tree width), expressed with the codec module instead of Effect Schema.
refactor(app): plain codecs for persisted state, starting with tabs
2026-09-20 23:57:40 +00:00 · 2026-09-20 16:36:59 +10:00 · 2026-09-20 16:36:58 +10:00
123 changed files with 1986 additions and 2321 deletions
@@ -32,7 +32,7 @@
    },
    "packages/ai": {
      "name": "@opencode/ai",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@aws-sdk/credential-providers": "3.1057.0",
        "@opencode/schema": "workspace:*",
@@ -54,7 +54,7 @@
    },
    "packages/app": {
      "name": "@opencode/app",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@corvu/drawer": "catalog:",
        "@dnd-kit/abstract": "0.5.0",
@@ -111,7 +111,7 @@
    },
    "packages/cli": {
      "name": "@opencode/cli",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "bin": {
        "opencode2": "./bin/opencode2.cjs",
      },
@@ -175,7 +175,7 @@
    },
    "packages/client": {
      "name": "@opencode/client",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@opencode/protocol": "workspace:*",
        "@opencode/schema": "workspace:*",
@@ -191,7 +191,7 @@
        "zod": "catalog:",
      },
      "peerDependencies": {
-        "effect": "4.0.0-rc.115",
+        "effect": "4.0.0-rc.112",
        "solid-js": ">=1.9.0",
      },
      "optionalPeers": [
@@ -201,7 +201,7 @@
    },
    "packages/codemode": {
      "name": "@opencode/codemode",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "acorn": "8.15.0",
        "effect": "catalog:",
@@ -214,7 +214,7 @@
    },
    "packages/console/app": {
      "name": "@opencode/console-app",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -250,7 +250,7 @@
    },
    "packages/console/core": {
      "name": "@opencode/console-core",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -277,7 +277,7 @@
    },
    "packages/console/function": {
      "name": "@opencode/console-function",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@openauthjs/openauth": "0.0.0-20250322224806",
        "@opencode/console-core": "workspace:*",
@@ -294,7 +294,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode/console-mail",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -318,7 +318,7 @@
    },
    "packages/console/support": {
      "name": "@opencode/console-support",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@opencode/console-core": "workspace:*",
@@ -338,7 +338,7 @@
    },
    "packages/core": {
      "name": "@opencode/core",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@ai-sdk/cohere": "3.0.27",
        "@ai-sdk/gateway": "3.0.104",
@@ -402,12 +402,11 @@
        "@types/node": "catalog:",
        "@types/which": "3.0.4",
        "drizzle-kit": "catalog:",
-        "fast-check": "catalog:",
      },
    },
    "packages/desktop": {
      "name": "@opencode/desktop",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@zip.js/zip.js": "2.7.62",
        "electron-context-menu": "4.1.2",
@@ -456,7 +455,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode/enterprise",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@hono/standard-validator": "catalog:",
        "@opencode-ai/sdk": "1.18.21",
@@ -493,7 +492,7 @@
    },
    "packages/function": {
      "name": "@opencode/function",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -509,9 +508,9 @@
    },
    "packages/http-recorder": {
      "name": "@opencode/http-recorder",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
-        "@effect/platform-node-shared": "4.0.0-rc.115",
+        "@effect/platform-node-shared": "4.0.0-rc.112",
      },
      "devDependencies": {
        "@effect/platform-node": "catalog:",
@@ -528,7 +527,7 @@
    },
    "packages/httpapi-codegen": {
      "name": "@opencode/httpapi-codegen",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "effect": "catalog:",
        "prettier": "3.6.2",
@@ -541,7 +540,7 @@
    },
    "packages/latex": {
      "name": "@opencode/latex",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opentui/core": "catalog:",
@@ -555,7 +554,7 @@
    },
    "packages/merman": {
      "name": "@opencode/merman",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opentui/core": "catalog:",
@@ -570,7 +569,7 @@
    },
    "packages/plugin": {
      "name": "@opencode/plugin",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@ai-sdk/provider": "3.0.8",
        "@opencode/ai": "workspace:*",
@@ -609,7 +608,7 @@
    },
    "packages/plugin-browser": {
      "name": "@opencode/plugin-browser",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opencode/schema": "workspace:*",
@@ -639,7 +638,7 @@
    },
    "packages/protocol": {
      "name": "@opencode/protocol",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@opencode/schema": "workspace:*",
        "effect": "catalog:",
@@ -654,7 +653,7 @@
    },
    "packages/schema": {
      "name": "@opencode/schema",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@standard-schema/spec": "catalog:",
        "effect": "catalog:",
@@ -678,7 +677,7 @@
    },
    "packages/sdk": {
      "name": "@opencode/sdk",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@opencode/client": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -699,7 +698,7 @@
    },
    "packages/server": {
      "name": "@opencode/server",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@effect/platform-node": "catalog:",
        "@effect/platform-node-shared": "catalog:",
@@ -721,7 +720,7 @@
    },
    "packages/session-ui": {
      "name": "@opencode/session-ui",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode/client": "workspace:*",
@@ -756,7 +755,7 @@
    },
    "packages/simulation": {
      "name": "@opencode/simulation",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@opencode/ai": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -776,7 +775,7 @@
    },
    "packages/stats/app": {
      "name": "@opencode/stats-app",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@ibm/plex": "6.4.1",
        "@kobalte/core": "catalog:",
@@ -810,7 +809,7 @@
    },
    "packages/stats/core": {
      "name": "@opencode/stats-core",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@aws-sdk/client-athena": "3.933.0",
        "@planetscale/database": "1.19.0",
@@ -829,7 +828,7 @@
    },
    "packages/stats/server": {
      "name": "@opencode/stats-server",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@aws-sdk/client-firehose": "3.933.0",
        "@effect/platform-node": "catalog:",
@@ -875,7 +874,7 @@
    },
    "packages/theme": {
      "name": "@opencode/theme",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@opentui/core": "catalog:",
        "effect": "catalog:",
@@ -889,7 +888,7 @@
    },
    "packages/tui": {
      "name": "@opencode/tui",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@opencode/client": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -924,7 +923,7 @@
    },
    "packages/ui": {
      "name": "@opencode/ui",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@pierre/diffs": "catalog:",
@@ -959,7 +958,7 @@
    },
    "packages/util": {
      "name": "@opencode/util",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@effect/opentelemetry": "catalog:",
        "@effect/platform-node": "catalog:",
@@ -992,7 +991,7 @@
    },
    "packages/web": {
      "name": "@opencode/web",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -1033,7 +1032,7 @@
    },
    "services/update": {
      "name": "@opencode/update",
-      "version": "2.0.11",
+      "version": "2.0.10",
      "dependencies": {
        "jose": "6.0.11",
        "semver": "catalog:",
@@ -1098,10 +1097,10 @@
  "catalog": {
    "@cloudflare/workers-types": "4.20251008.0",
    "@corvu/drawer": "0.2.4",
-    "@effect/opentelemetry": "4.0.0-rc.115",
-    "@effect/platform-node": "4.0.0-rc.115",
-    "@effect/platform-node-shared": "4.0.0-rc.115",
-    "@effect/sql-sqlite-bun": "4.0.0-rc.115",
+    "@effect/opentelemetry": "4.0.0-rc.112",
+    "@effect/platform-node": "4.0.0-rc.112",
+    "@effect/platform-node-shared": "4.0.0-rc.112",
+    "@effect/sql-sqlite-bun": "4.0.0-rc.112",
    "@hono/standard-validator": "0.2.0",
    "@hono/zod-validator": "0.4.2",
    "@kobalte/core": "0.13.13",
@@ -1141,8 +1140,7 @@
    "dompurify": "3.4.14",
    "drizzle-kit": "1.0.0-rc.5-ab785fc",
    "drizzle-orm": "1.0.0-rc.5-169397b",
-    "effect": "4.0.0-rc.115",
-    "fast-check": "4.9.0",
+    "effect": "4.0.0-rc.112",
    "fuzzysort": "3.1.0",
    "get-east-asian-width": "1.6.0",
    "hono": "4.10.7",
@@ -1674,13 +1672,13 @@

    "@drizzle-team/brocli": ["@drizzle-team/brocli@0.12.0", "", {}, "sha512-mlUE+rZ8CatQekLhnaiN91Iemdd+e2gFKooGlnRB3oPTL3VghLfX24dx7HrzMNeC1JrIB/0kpsfyty3f5HNfxQ=="],

-    "@effect/opentelemetry": ["@effect/opentelemetry@4.0.0-rc.115", "", { "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <2.0.0", "@opentelemetry/api-logs": ">=0.203.0 <0.300.0", "@opentelemetry/resources": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-logs": ">=0.203.0 <0.300.0", "@opentelemetry/sdk-metrics": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-base": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-node": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-web": ">=2.0.0 <3.0.0", "@opentelemetry/semantic-conventions": ">=1.33.0 <2.0.0", "effect": "^4.0.0-rc.115" }, "optionalPeers": ["@opentelemetry/api", "@opentelemetry/api-logs", "@opentelemetry/resources", "@opentelemetry/sdk-logs", "@opentelemetry/sdk-metrics", "@opentelemetry/sdk-trace-base", "@opentelemetry/sdk-trace-node", "@opentelemetry/sdk-trace-web"] }, "sha512-ITOqqf/Z0mrs6XhuV8wb4YYFt0sdMhXZGPtytr+YG87YG6mFdYkc8IaJj8cGQFKRkGota/2CN+zjBKhQVI64OQ=="],
+    "@effect/opentelemetry": ["@effect/opentelemetry@4.0.0-rc.112", "", { "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <2.0.0", "@opentelemetry/api-logs": ">=0.203.0 <0.300.0", "@opentelemetry/resources": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-logs": ">=0.203.0 <0.300.0", "@opentelemetry/sdk-metrics": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-base": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-node": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-web": ">=2.0.0 <3.0.0", "@opentelemetry/semantic-conventions": ">=1.33.0 <2.0.0", "effect": "^4.0.0-rc.112" }, "optionalPeers": ["@opentelemetry/api", "@opentelemetry/api-logs", "@opentelemetry/resources", "@opentelemetry/sdk-logs", "@opentelemetry/sdk-metrics", "@opentelemetry/sdk-trace-base", "@opentelemetry/sdk-trace-node", "@opentelemetry/sdk-trace-web"] }, "sha512-OTRv1DxTHUmnakgJ6XVM8wVgF1KgZH4UXnOemwSLUwUjXO+RCikzF8oR/rlVmOGq81KtQzj1URM4M4nchlQOuQ=="],

-    "@effect/platform-node": ["@effect/platform-node@4.0.0-rc.115", "", { "dependencies": { "@effect/platform-node-shared": "^4.0.0-rc.115", "undici": "^8.10.2" }, "peerDependencies": { "effect": "^4.0.0-rc.115", "redis": ">=5.0.0 <7.0.0" } }, "sha512-mW03Wjq2FiTL5oi9yOkaKpCyUNBaduKgTk7qMHNELvC21Jq2qOAfdsfH+p+s2zmpB9w2RSa+ApODv4WjO9wQfw=="],
+    "@effect/platform-node": ["@effect/platform-node@4.0.0-rc.112", "", { "dependencies": { "@effect/platform-node-shared": "^4.0.0-rc.112", "mime": "^4.1.0", "undici": "^8.10.0" }, "peerDependencies": { "effect": "^4.0.0-rc.112", "redis": ">=5.0.0 <7.0.0" } }, "sha512-/BMAcdNGQQskLmI0Zoa95KfTZkr9HV9N4NSxaSrusG6GeW6Ulp9KvZ+Rlaiw8lnOt43CXjFLdfll5/k5rxL4hQ=="],

-    "@effect/platform-node-shared": ["@effect/platform-node-shared@4.0.0-rc.115", "", { "dependencies": { "@types/ws": "^8.18.1", "ws": "^8.21.3" }, "peerDependencies": { "effect": "^4.0.0-rc.115" } }, "sha512-rcBwhDIfb82akJoTv7Vwh8K5x9vC/XfuePS7JjOr+z+dORXzsmKqI1BUQF27ARCN9fTAbDh7I6YvBlWhLjnqNg=="],
+    "@effect/platform-node-shared": ["@effect/platform-node-shared@4.0.0-rc.112", "", { "dependencies": { "@types/ws": "^8.18.1", "ws": "^8.21.3" }, "peerDependencies": { "effect": "^4.0.0-rc.112" } }, "sha512-ttjz0xKamFN7vL8pNDYVwddJLjZvqKePc05djlz2VcdaKbLsnYbtMnL1rbOfHgEnIUSHGh7FkjaN4DM1Ov81sQ=="],

-    "@effect/sql-sqlite-bun": ["@effect/sql-sqlite-bun@4.0.0-rc.115", "", { "peerDependencies": { "effect": "^4.0.0-rc.115" } }, "sha512-CypwmCPAUSOOhopcnSI9ocgpKHfpgOdERpei3GuXZm5cCGP31pk2NUETqNaYhonhr2bWd+6Rc8atctnEbIYKYQ=="],
+    "@effect/sql-sqlite-bun": ["@effect/sql-sqlite-bun@4.0.0-rc.112", "", { "peerDependencies": { "effect": "^4.0.0-rc.112" } }, "sha512-EqR8pWZo3VzedRvP6qo5HcfqNmFvSa+sQLWQl3oBMx2KY1FCc8NYjep79wYjNkW0qABnffrPUXCMTOncd1A+5g=="],

    "@electron-internal/extract-zip": ["@electron-internal/extract-zip@1.0.5", "", {}, "sha512-+bqFCP98pLI0Tt0XQo1TmlXtwjWchISndDOxCkEcIuUgXWpBnLyRI+2DU+mesvnMMX6L1XDqYNA0lXNDHd/yiA=="],

@@ -2014,6 +2012,18 @@

    "@motionone/utils": ["@motionone/utils@10.18.0", "", { "dependencies": { "@motionone/types": "^10.17.1", "hey-listen": "^1.0.8", "tslib": "^2.3.1" } }, "sha512-3XVF7sgyTSI2KWvTf6uLlBJ5iAgRgmvp3bpuOiQJvInd4nZ19ET8lX5unn30SlmRH7hXbBbH+Gxd0m0klJ3Xtw=="],

+    "@msgpackr-extract/msgpackr-extract-darwin-arm64": ["@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-LCkGo6JDfaBhgST7UpPWgNgLINpcpabaHfyz5OBx75nUYxBsaEPxjnyNjWpeb/xBup/682QnBfRBy2/LvPutZQ=="],
+
+    "@msgpackr-extract/msgpackr-extract-darwin-x64": ["@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-zExlW9zUJKZH/tOtVMttwjKa4Xm/3KcNjnE3dPN92uCktwavMxpgCA3MoJK/DOnTWsQgo224OaST27/mPNAf+w=="],
+
+    "@msgpackr-extract/msgpackr-extract-linux-arm": ["@msgpackr-extract/msgpackr-extract-linux-arm@3.0.4", "", { "os": "linux", "cpu": "arm" }, "sha512-Tg3yX65f5GbtXLkrYEHE5oibZG9epyYWas7FogTTEJeDEF9JlXJzKgXaNhT3UXlTOeA+AfZpYZYZ0uPj7Cfquw=="],
+
+    "@msgpackr-extract/msgpackr-extract-linux-arm64": ["@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-dgX0P/9wGPJeHFBG+ZmhgE6bmtMt7NP5CRBGyyktpopdk/mW4POnrpQsSLtKI1dwpc+pPLuXHDh6vvskyQE/sw=="],
+
+    "@msgpackr-extract/msgpackr-extract-linux-x64": ["@msgpackr-extract/msgpackr-extract-linux-x64@3.0.4", "", { "os": "linux", "cpu": "x64" }, "sha512-8TNXMEjJc3QEy7R/x1INhgiU+XakDAFUzBhaz7+Rbrs8NH5UQeHQxxmzsSBJGyV6I1jW79undiQm8tOI+D+8FQ=="],
+
+    "@msgpackr-extract/msgpackr-extract-win32-x64": ["@msgpackr-extract/msgpackr-extract-win32-x64@3.0.4", "", { "os": "win32", "cpu": "x64" }, "sha512-CmCXPQrkbwExx3j946/PtHWHbYJiCRBRDl4BlkRQcJB/YOwQxJRTpoo7aTsortjgoJ1x7opzTSxn7C+ASSLVjQ=="],
+
    "@napi-rs/lzma-linux-x64-gnu": ["@napi-rs/lzma-linux-x64-gnu@1.5.1", "", { "os": "linux", "cpu": "x64" }, "sha512-oTXEIha4SsuXdTA4Iyskj0kpdx2yVXdhd75c2v3xGrHFfVMsbhTPZU/nMPL4sWKo4pBHm3aucLaqGlF696dTyQ=="],

    "@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.2.3", "", { "dependencies": { "@tybys/wasm-util": "^0.10.3" }, "peerDependencies": { "@emnapi/core": "^1.7.1 || ^2.0.0-alpha.4", "@emnapi/runtime": "^1.7.1 || ^2.0.0-alpha.4" } }, "sha512-UMduMbqO5s5zF2NkNacMT/yK5Y5QiKvWr2+50bzIIxFDwVJ2h49b+oyjaCGPhJxd2/gC2x39EHv/gHVuu36x2Q=="],
@@ -3866,7 +3876,7 @@

    "editorconfig": ["editorconfig@1.0.7", "", { "dependencies": { "@one-ini/wasm": "0.1.1", "commander": "^10.0.0", "minimatch": "^9.0.1", "semver": "^7.5.3" }, "bin": { "editorconfig": "bin/editorconfig" } }, "sha512-e0GOtq/aTQhVdNyDU9e02+wz9oDDM+SIOQxWME2QRjzRX5yyLAuHDE+0aE8vHb9XRC8XD37eO2u57+F09JqFhw=="],

-    "effect": ["effect@4.0.0-rc.115", "", {}, "sha512-ogYulZ5ffeOzrJqQrG0XOkDO5lKn2s9KNHhoxJy/6wKUkF0i12dlVXWA9TgsgQ+zV/JzizyG0+XMPepZEQX6vw=="],
+    "effect": ["effect@4.0.0-rc.112", "", { "dependencies": { "fast-check": "^4.9.0", "msgpackr": "^2.0.5" } }, "sha512-wXxwuh1Ywnv4cPRM3Wfa0vDwuOHnZ1TsTgHJkG9XgzND6inhBH9n1vBxhg3iIXOia/OrpmvVmd3lrD4vq6bF3A=="],

    "ejs": ["ejs@3.1.10", "", { "dependencies": { "jake": "^10.8.5" }, "bin": { "ejs": "bin/cli.js" } }, "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA=="],

@@ -4702,7 +4712,7 @@

    "micromatch": ["micromatch@4.0.8", "", { "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" } }, "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA=="],

-    "mime": ["mime@3.0.0", "", { "bin": { "mime": "cli.js" } }, "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="],
+    "mime": ["mime@4.1.0", "", { "bin": { "mime": "bin/cli.js" } }, "sha512-X5ju04+cAzsojXKes0B/S4tcYtFAJ6tTMuSPBEn9CPGlrWr8Fiw7qYeLT0XyH80HSoAoqWCaz+MWKh22P7G1cw=="],

    "mime-db": ["mime-db@1.54.0", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="],

@@ -4750,6 +4760,10 @@

    "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="],

+    "msgpackr": ["msgpackr@2.0.5", "", { "optionalDependencies": { "msgpackr-extract": "^3.0.4" } }, "sha512-cef05H/dSYpLpqp3sj/qyZh5vhUYCalnaLO7j1yOmpsR0y/XwLVtK7r5gn+U/F7CTEfMowcGhlUQJDLcLf7jcA=="],
+
+    "msgpackr-extract": ["msgpackr-extract@3.0.4", "", { "dependencies": { "node-gyp-build-optional-packages": "5.2.2" }, "optionalDependencies": { "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.4", "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.4", "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.4", "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.4", "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.4", "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.4" }, "bin": { "download-msgpackr-prebuilds": "bin/download-prebuilds.js" } }, "sha512-4kmO/MdyUIkLIvTPr8VHLil4AtoKIoniWPIEk5+CDy0xnWC84azhSFmuJ7PxZdsYtiP5kEeQsORAVIeMgxT+Hw=="],
+
    "muggle-string": ["muggle-string@0.4.1", "", {}, "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ=="],

    "mustache": ["mustache@4.2.0", "", { "bin": { "mustache": "bin/mustache" } }, "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ=="],
@@ -4792,6 +4806,8 @@

    "node-gyp-build": ["node-gyp-build@4.8.4", "", { "bin": { "node-gyp-build": "bin.js", "node-gyp-build-optional": "optional.js", "node-gyp-build-test": "build-test.js" } }, "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ=="],

+    "node-gyp-build-optional-packages": ["node-gyp-build-optional-packages@5.2.2", "", { "dependencies": { "detect-libc": "^2.0.1" }, "bin": { "node-gyp-build-optional-packages": "bin.js", "node-gyp-build-optional-packages-optional": "optional.js", "node-gyp-build-optional-packages-test": "build-test.js" } }, "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw=="],
+
    "node-html-parser": ["node-html-parser@7.1.0", "", { "dependencies": { "css-select": "^5.1.0", "he": "1.2.0" } }, "sha512-iJo8b2uYGT40Y8BTyy5ufL6IVbN8rbm/1QK2xffXU/1a/v3AAa0d1YAoqBNYqaS4R/HajkWIpIfdE6KcyFh1AQ=="],

    "node-int64": ["node-int64@0.4.0", "", {}, "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="],
@@ -5588,7 +5604,7 @@

    "uncrypto": ["uncrypto@0.1.3", "", {}, "sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q=="],

-    "undici": ["undici@8.10.2", "", {}, "sha512-/y4/bH9YNU5hi9NIrpOuvGXFcxrj3CMrV+/AYpowAYTpHn8gX/XPFjNy766FPoYY0miQhdW977JFWKGNhBdwyQ=="],
+    "undici": ["undici@8.10.0", "", {}, "sha512-HvltHd7avK13QIw/oLe4qoOLyoVSoafqJ2jYOrtMRBkbYT31eiBQ8O0ehRKZiEZCMEyLFQNIADpgCWC5fALvYQ=="],

    "undici-types": ["undici-types@7.16.0", "", {}, "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw=="],

@@ -6042,6 +6058,8 @@

    "@bufbuild/protoplugin/typescript": ["typescript@5.4.5", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ=="],

+    "@cloudflare/kv-asset-handler/mime": ["mime@3.0.0", "", { "bin": { "mime": "cli.js" } }, "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="],
+
    "@cloudflare/vite-plugin/vite": ["vite@7.3.6", "", { "dependencies": { "esbuild": "^0.27.0 || ^0.28.0", "fdir": "^6.5.0", "picomatch": "^4.0.3", "postcss": "^8.5.6", "rollup": "^4.43.0", "tinyglobby": "^0.2.15" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "jiti": ">=1.21.0", "less": "^4.0.0", "lightningcss": "^1.21.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-4XP60spRGjSZFf1qYH+dJIkK2znL3zQfl9KkOV9MkkRR/3Dls0dxaBsQPTloEc5BLXWPL9vsOxopxyKoMmDueg=="],

    "@cloudflare/vite-plugin/ws": ["ws@8.18.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw=="],
@@ -6642,8 +6660,6 @@

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

-    "unifont/undici": ["undici@8.10.0", "", {}, "sha512-HvltHd7avK13QIw/oLe4qoOLyoVSoafqJ2jYOrtMRBkbYT31eiBQ8O0ehRKZiEZCMEyLFQNIADpgCWC5fALvYQ=="],
-
    "unplugin/acorn": ["acorn@8.18.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ=="],

    "unused-filename/escape-string-regexp": ["escape-string-regexp@5.0.0", "", {}, "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw=="],
@@ -2,7 +2,7 @@
  "$schema": "https://json.schemastore.org/package.json",
  "name": "opencode",
  "description": "AI-powered development tool",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "private": true,
  "type": "module",
  "packageManager": "bun@1.4.2",
@@ -42,10 +42,10 @@
      "packages/stats/*"
    ],
    "catalog": {
-      "@effect/opentelemetry": "4.0.0-rc.115",
-      "@effect/platform-node": "4.0.0-rc.115",
-      "@effect/platform-node-shared": "4.0.0-rc.115",
-      "@effect/sql-sqlite-bun": "4.0.0-rc.115",
+      "@effect/opentelemetry": "4.0.0-rc.112",
+      "@effect/platform-node": "4.0.0-rc.112",
+      "@effect/platform-node-shared": "4.0.0-rc.112",
+      "@effect/sql-sqlite-bun": "4.0.0-rc.112",
      "@npmcli/arborist": "9.4.0",
      "@types/bun": "1.4.0",
      "@types/cross-spawn": "6.0.6",
@@ -79,8 +79,7 @@
      "dompurify": "3.4.14",
      "drizzle-kit": "1.0.0-rc.5-ab785fc",
      "drizzle-orm": "1.0.0-rc.5-169397b",
-      "effect": "4.0.0-rc.115",
-      "fast-check": "4.9.0",
+      "effect": "4.0.0-rc.112",
      "ai": "6.0.168",
      "cross-spawn": "7.0.6",
      "hono": "4.10.7",
@@ -14,7 +14,7 @@ import { OpenAI } from "@opencode/ai/providers"
 * hover imports and local values to see how the public API is typed.
 */

-const apiKey = Config.Redacted("OPENAI_API_KEY")
+const apiKey = Config.redacted("OPENAI_API_KEY")

 // 1. Pick a model. The provider helper records provider identity, protocol
 // choice, capabilities, deployment options, authentication, and defaults.
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "name": "@opencode/ai",
  "type": "module",
  "license": "MIT",
@@ -278,7 +278,7 @@ const readEnvFile = Effect.fn("RecordingEnv.readFile")(function* () {
 })

 const readConfigString = (provider: ConfigProvider.ConfigProvider, name: string) =>
-  Config.String(name)
+  Config.string(name)
    .parse(provider)
    .pipe(
      Effect.match({
@@ -89,7 +89,7 @@ export const optional = (secret: Secret | undefined, source = "optional value")
    ? credential(Effect.fail(new MissingCredentialError(source)))
    : credentialFromSecret(secret, source)

-export const config = (name: string) => credentialFromSecret(Config.Redacted(name), name)
+export const config = (name: string) => credentialFromSecret(Config.redacted(name), name)

 export const effect = (load: Effect.Effect<Redacted.Redacted, CredentialError>) => credential(load)

@@ -30,7 +30,7 @@ type LanguageModel = {
 declare const auth: Auth.Definition
 declare const optionalAuthModel: LanguageModelFactory<BaseOptions, "optional", LanguageModel>
 declare const requiredAuthModel: LanguageModelFactory<BaseOptions, "required", LanguageModel>
-const configApiKey = Config.Redacted("OPENAI_API_KEY")
+const configApiKey = Config.redacted("OPENAI_API_KEY")

 OpenAIChat.route.model({ id: "gpt-4.1-mini" })

@@ -19,13 +19,6 @@ export function mountBrowserPane() {
      session: "Alpha",
      mounted: true,
      visible: true,
-      url: undefined as string | undefined,
-      loading: false,
-      generation: 0,
-      delayNavigation: false,
-      pendingURL: undefined as string | undefined,
-      loadErrors: {} as Record<string, string | undefined>,
-      error: undefined as string | undefined,
      layouts: {} as Record<string, BrowserPaneLayout | undefined>,
    })
    const tabs = ["Alpha", "Beta"].map((name) => ({
@@ -54,33 +47,13 @@ export function mountBrowserPane() {
      opened: () => !!registrations.get(store.session),
      state: () => ({ tabs: tabs.filter((tab) => tab.title === store.session), focusedTabID: null }),
      tabs: () => tabs.filter((tab) => tab.title === store.session),
-      active: () => {
-        const tab = tabs.find((tab) => tab.title === store.session) ?? tabs[0]
-        return {
-          ...tab,
-          url: store.url ?? tab.url,
-          loading: store.loading,
-          generation: store.generation,
-          loadError: store.loadErrors[store.session],
-        }
-      },
+      active: () => tabs.find((tab) => tab.title === store.session) ?? tabs[0],
      registration: () => registrations.get(store.session),
-      error: () => store.error ?? (store.loadErrors[store.session] ? "Request failed" : undefined),
+      error: () => undefined,
      suspended: () => false,
      close: () => undefined,
      open: () => undefined,
-      command: (command) => {
-        setStore("error", undefined)
-        if (command.type === "navigate" || command.type === "reload") setStore("loadErrors", store.session, undefined)
-        if (command.type === "navigate") {
-          if (store.delayNavigation) {
-            setStore("pendingURL", command.url)
-            return
-          }
-          setStore({ url: command.url, loading: false, generation: store.generation + 1 })
-        }
-        if (command.type === "stop") setStore("loading", false)
-      },
+      command: () => undefined,
    }
    return (
      <>
@@ -91,32 +64,6 @@ export function mountBrowserPane() {
            {(name) => <button onClick={() => setStore({ session: name, mounted: name !== "Empty" })}>{name}</button>}
          </For>
          <button onClick={() => setStore("mounted", false)}>Unmount pane</button>
-          <button onClick={() => setStore({ url: "about:blank", loading: false })}>Blank page</button>
-          <button onClick={() => setStore({ url: "about:blank", loading: true })}>Loading page</button>
-          <button
-            onClick={() =>
-              setStore({ loading: true, generation: store.generation + 1, loadErrors: { [store.session]: undefined } })
-            }
-          >
-            Load current page
-          </button>
-          <button onClick={() => setStore("loadErrors", store.session, "ERR_CONNECTION_REFUSED")}>Failed page</button>
-          <button onClick={() => setStore("delayNavigation", true)}>Delay navigation</button>
-          <button onClick={() => setStore({ error: "ERR_BLOCKED_BY_CLIENT", pendingURL: undefined })}>
-            Block navigation
-          </button>
-          <button
-            onClick={() =>
-              setStore({
-                url: store.pendingURL,
-                pendingURL: undefined,
-                loading: false,
-                generation: store.generation + 1,
-              })
-            }
-          >
-            Complete navigation
-          </button>
          <button onClick={() => setStore("visible", (visible) => !visible)}>Toggle Review tab</button>
        </nav>
        <div style={{ width: "640px", height: "360px", border: "1px solid #555" }}>
@@ -57,153 +57,3 @@ story("hides the native view immediately while the pane stays mounted", async ({
  await toggle.click()
  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
 })
-
-story("shows the empty state over a blank native page and restores navigation", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
-  await root.getByRole("button", { name: "Blank page", exact: true }).click()
-  await expect(root.getByText("Enter URL", { exact: true })).toBeVisible()
-  await expect(root.getByText('Or prompt "Open in the app browser"', { exact: true })).toBeVisible()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "false")
-  await expect(root.getByRole("button", { name: "Reload", exact: true })).toBeDisabled()
-
-  const address = root.getByRole("textbox", { name: "Browser address", exact: true })
-  await address.fill("https://example.com/")
-  await expect(root.getByText("Enter URL", { exact: true })).toBeVisible()
-  await address.press("Enter")
-  await expect(address).not.toBeFocused()
-  await expect(root.getByText("Enter URL", { exact: true })).toBeHidden()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
-  await expect(root.getByRole("button", { name: "Reload", exact: true })).toBeEnabled()
-})
-
-story("keeps Stop available and hides the empty state while a blank page loads", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
-  await root.getByRole("button", { name: "Loading page", exact: true }).click()
-  await expect(root.getByText("Enter URL", { exact: true })).toBeHidden()
-  await root.getByRole("button", { name: "Stop", exact: true }).click()
-  await expect(root.getByText("Enter URL", { exact: true })).toBeVisible()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "false")
-})
-
-story("keeps the submitted URL visible until the browser reports navigation", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
-  await root.getByRole("button", { name: "Blank page", exact: true }).click()
-  await root.getByRole("button", { name: "Delay navigation", exact: true }).click()
-  const address = root.getByRole("textbox", { name: "Browser address", exact: true })
-  await address.fill("https://example.com/")
-  await address.press("Enter")
-  await expect(address).not.toBeFocused()
-  await expect(address).toHaveValue("https://example.com/")
-  await expect(root.getByText("Enter URL", { exact: true })).toBeHidden()
-
-  await root.getByRole("button", { name: "Complete navigation", exact: true }).click()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
-  await expect(address).toHaveValue("https://example.com/")
-
-  await address.fill("https://unsubmitted.example/")
-  await root.getByRole("button", { name: "Delay navigation", exact: true }).click()
-  await expect(address).toHaveValue("https://example.com/")
-})
-
-story("restores the current URL when a submitted navigation is blocked", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
-  await root.getByRole("button", { name: "Delay navigation", exact: true }).click()
-  const address = root.getByRole("textbox", { name: "Browser address", exact: true })
-  await address.fill("https://blocked.example/")
-  await address.press("Enter")
-  await expect(address).toHaveValue("https://blocked.example/")
-  await root.getByRole("button", { name: "Block navigation", exact: true }).click()
-  await expect(root.getByText("ERR_BLOCKED_BY_CLIENT", { exact: true })).toBeVisible()
-  await expect(address).toHaveValue("https://alpha.example/")
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
-})
-
-story("shows a themed failure state for only the failed tab and allows retry", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
-  await root.getByRole("button", { name: "Failed page", exact: true }).click()
-  await expect(root.getByText("URL can't be reached", { exact: true })).toBeVisible()
-  await expect(root.getByText("Check the URL and your connection, then try again.", { exact: true })).toBeVisible()
-  await expect(root.getByText("Request failed", { exact: true })).toBeHidden()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "false")
-  await expect(root.getByRole("textbox", { name: "Browser address", exact: true })).toHaveValue(
-    "https://alpha.example/",
-  )
-
-  await root.getByRole("button", { name: "Beta", exact: true }).click()
-  await expect(root.getByText("URL can't be reached", { exact: true })).toBeHidden()
-  await expect(root.getByTestId("native-Beta")).toHaveAttribute("data-visible", "true")
-  await root.getByRole("button", { name: "Alpha", exact: true }).click()
-  await expect(root.getByText("URL can't be reached", { exact: true })).toBeVisible()
-
-  await root.getByRole("button", { name: "Reload", exact: true }).click()
-  await expect(root.getByText("URL can't be reached", { exact: true })).toBeHidden()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
-})
-
-story("returns a failed tab to the empty state when an empty URL is submitted", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
-  await root.getByRole("button", { name: "Failed page", exact: true }).click()
-  await expect(root.getByText("URL can't be reached", { exact: true })).toBeVisible()
-  await root.getByRole("button", { name: "Delay navigation", exact: true }).click()
-
-  const address = root.getByRole("textbox", { name: "Browser address", exact: true })
-  await address.fill("")
-  await address.press("Enter")
-  await expect(address).not.toBeFocused()
-  await expect(address).toHaveValue("")
-  await root.getByRole("button", { name: "Load current page", exact: true }).click()
-  await expect(root.getByRole("button", { name: "Stop", exact: true })).toBeEnabled()
-  await root.getByRole("button", { name: "Complete navigation", exact: true }).click()
-  await expect(root.getByText("URL can't be reached", { exact: true })).toBeHidden()
-  await expect(root.getByText("Enter URL", { exact: true })).toBeVisible()
-  await expect(root.getByRole("button", { name: "Reload", exact: true })).toBeDisabled()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "false")
-})
-
-story("selects the full URL when the address field gains focus", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
-  const address = root.getByRole("textbox", { name: "Browser address", exact: true })
-  await address.click()
-  await expect(address).toHaveJSProperty("selectionStart", 0)
-  await expect(address).toHaveJSProperty("selectionEnd", "https://alpha.example/".length)
-  await address.pressSequentially("https://example.com/")
-  await expect(address).toHaveValue("https://example.com/")
-  await address.press("Enter")
-  await expect(address).not.toBeFocused()
-  await address.focus()
-  await expect(address).toHaveJSProperty("selectionStart", 0)
-  await expect(address).toHaveJSProperty("selectionEnd", "https://example.com/".length)
-  await address.press("ArrowRight")
-  await address.click()
-  await expect(address).toHaveJSProperty("selectionStart", 0)
-  await expect(address).toHaveJSProperty("selectionEnd", "https://example.com/".length)
-})
-
-story("keeps the current page visible while a submitted URL loads", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
-  await root.getByRole("button", { name: "Delay navigation", exact: true }).click()
-  const address = root.getByRole("textbox", { name: "Browser address", exact: true })
-  await address.fill("https://example.com/")
-  await address.press("Enter")
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
-  await expect(address).toHaveValue("https://example.com/")
-
-  await root.getByRole("button", { name: "Load current page", exact: true }).click()
-  await expect(root.getByRole("button", { name: "Stop", exact: true })).toBeEnabled()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
-  await root.getByRole("button", { name: "Complete navigation", exact: true }).click()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
-  await expect(address).toHaveValue("https://example.com/")
-})
-
-story("keeps the current page and restores its URL when an empty address is submitted", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
-  const address = root.getByRole("textbox", { name: "Browser address", exact: true })
-  await address.fill("")
-  await address.press("Enter")
-  await expect(address).not.toBeFocused()
-  await expect(address).toHaveValue("https://alpha.example/")
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
-  await expect(root.getByText("Enter URL", { exact: true })).toBeHidden()
-  await expect(root.getByRole("button", { name: "Reload", exact: true })).toBeEnabled()
-})
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/app",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "description": "",
  "type": "module",
  "exports": {
@@ -65,14 +65,14 @@
  }

  /* Keep the 1000px conversation intact, with 320px for the summary and its gutters.
-     When they overlap, center the conversation in the space that remains beside the summary. */
-  @container session-chat (min-width: 1320px) and (width < 1640px) {
+     Move only as far as needed; wider panels already have enough space in the margin. */
+  @container session-chat (min-width: 1320px) {
    [data-slot="session-chat-panel"][data-summary-open="true"]
      :is([data-timeline-virtual-content], [data-component="session-composer-dock"] > div) {
-      --session-summary-translate: -160px;
+      --session-summary-translate: min(0px, calc(50cqi - 820px));

      &:dir(rtl) {
-        --session-summary-translate: 160px;
+        --session-summary-translate: max(0px, calc(820px - 50cqi));
      }
    }
  }
@@ -906,10 +906,6 @@ export const dict = {
  "session.browser.replaced": "Browser control moved to another desktop window.",
  "session.browser.suspended": "Browser suspended. Interact with this session to reconnect.",
  "session.browser.address.placeholder": "Enter URL",
-  "session.browser.empty.title": "Enter URL",
-  "session.browser.empty.description": 'Or prompt "Open in the app browser"',
-  "session.browser.failed.title": "URL can't be reached",
-  "session.browser.failed.description": "Check the URL and your connection, then try again.",

  "titlebar.update": "Update",
  "titlebar.tabs": "Tabs",
@@ -0,0 +1,17 @@
+import { expect, test } from "bun:test"
+import { Codec } from "./codec"
+
+// Type-level checks: these compile only if inference matches what `typeof schema.Type` gave callers.
+test("struct types infer optional and required fields", () => {
+  const s = Codec.struct({ id: Codec.string, tab: Codec.optional(Codec.string), n: Codec.lenientOptional(Codec.number) })
+  const value: typeof s.Type = { id: "x" }
+  const tab: string | undefined = value.tab
+  const n: number | undefined = value.n
+  const t = Codec.transform(s, { decode: (old) => old.tab ?? old.id, encode: (v) => ({ id: v }) })
+  const out: string | Codec.Invalid = t.decode({ id: "a" })
+  const onlyOptional = Codec.struct({ tab: Codec.optional(Codec.string) })
+  const empty: typeof onlyOptional.Type = {}
+  const maybe: string | undefined = empty.tab
+  const viaTransform = Codec.transform(onlyOptional, { decode: (old) => old.tab, encode: (tab) => ({ tab }) })
+  expect([tab, n, out, maybe, viaTransform.decode({})]).toEqual([undefined, undefined, "a", undefined, undefined])
+})
@@ -0,0 +1,85 @@
+import { describe, expect, test } from "bun:test"
+import { Codec } from "./codec"
+
+describe("Codec", () => {
+  test("primitives reject the wrong shape and finite numbers only", () => {
+    expect(Codec.string.decode("a")).toBe("a")
+    expect(Codec.string.decode(1)).toBe(Codec.INVALID)
+    expect(Codec.number.decode(1.5)).toBe(1.5)
+    expect(Codec.number.decode(Number.NaN)).toBe(Codec.INVALID)
+    expect(Codec.nonNegativeInt.decode(-1)).toBe(Codec.INVALID)
+    expect(Codec.literals(["a", "b"]).decode("c")).toBe(Codec.INVALID)
+    expect(Codec.literal("x").decode("x")).toBe("x")
+  })
+
+  test("struct keeps optional fields absent and rejects invalid required ones", () => {
+    const codec = Codec.struct({ id: Codec.string, title: Codec.optional(Codec.string), n: Codec.lenientOptional(Codec.number) })
+    expect(codec.decode({ id: "1" })).toEqual({ id: "1" })
+    expect(codec.decode({ id: "1", title: "t", n: "bad" })).toEqual({ id: "1", title: "t" })
+    expect(codec.decode({ id: "1", title: 3 })).toBe(Codec.INVALID)
+    expect(codec.decode({ title: "t" })).toBe(Codec.INVALID)
+    expect(codec.decode([])).toBe(Codec.INVALID)
+    expect(codec.encode({ id: "1" })).toEqual({ id: "1" })
+    const value: typeof codec.Type = { id: "1", title: undefined }
+    expect(value.id).toBe("1")
+  })
+
+  test("lenient collections recover what they can", () => {
+    const items = Codec.lenientArray(Codec.struct({ id: Codec.string }))
+    expect(items.decode([{ id: "a" }, { id: 1 }, "x", { id: "b" }])).toEqual([{ id: "a" }, { id: "b" }])
+    expect(items.decode("nope")).toEqual([])
+    expect(Codec.array(Codec.string).decode(["a", 1])).toBe(Codec.INVALID)
+    const map = Codec.lenientRecord(Codec.boolean)
+    expect(map.decode({ a: true, b: "x" })).toEqual({})
+    expect(map.decode({ a: true })).toEqual({ a: true })
+  })
+
+  test("union, transform and fallback compose", () => {
+    const session = Codec.struct({ type: Codec.literal("session"), id: Codec.string })
+    const draft = Codec.struct({ type: Codec.literal("draft"), directory: Codec.string })
+    const tab = Codec.union([session, draft])
+    expect(tab.decode({ type: "draft", directory: "/x" })).toEqual({ type: "draft", directory: "/x" })
+    expect(tab.decode({ type: "other" })).toBe(Codec.INVALID)
+    const upper = Codec.transform(Codec.string, { decode: (s) => s.toUpperCase(), encode: (s) => s.toLowerCase() })
+    expect(upper.decode("ab")).toBe("AB")
+    expect(upper.encode("AB")).toBe("ab")
+    const safe = Codec.fallback(Codec.number, () => 7)
+    expect(safe.decode("x")).toBe(7)
+    expect(safe.decode(undefined)).toBe(7)
+    expect(safe.decode(2)).toBe(2)
+  })
+
+  test("brand constructs and decodes as its base", () => {
+    const Key = Codec.brand<"ServerConnection.Key">()
+    const key = Key.make("http://a")
+    expect(Key.decode(key)).toBe(key)
+    expect(Key.decode(3)).toBe(Codec.INVALID)
+  })
+
+  test("withInitial recovers field by field and merges new defaults", () => {
+    const layout = Codec.struct({
+      sidebar: Codec.struct({ opened: Codec.boolean, width: Codec.number }),
+      theme: Codec.lenientOptional(Codec.literals(["light", "dark"])),
+    })
+    const initial: typeof layout.Type = { sidebar: { opened: true, width: 240 } }
+    const codec = Codec.fromJsonString(Codec.withInitial(layout, initial))
+    expect(codec.decode(JSON.stringify({ sidebar: { opened: false, width: "wide" }, theme: "dark" }))).toEqual({
+      sidebar: { opened: false, width: 240 },
+      theme: "dark",
+    })
+    expect(codec.decode(JSON.stringify({ sidebar: 5 }))).toEqual(initial)
+    expect(codec.decode("{not json")).toBe(Codec.INVALID)
+    expect(JSON.parse(codec.encode({ sidebar: { opened: true, width: 1 } }))).toEqual({ sidebar: { opened: true, width: 1 } })
+  })
+
+  test("migrate reads the old shape first", () => {
+    const current = Codec.struct({ tabs: Codec.array(Codec.string) })
+    const previous = Codec.struct({ tab: Codec.optional(Codec.string) })
+    const read = Codec.transform(previous, {
+      decode: (old) => ({ tabs: old.tab ? [old.tab] : [] }),
+      encode: (value) => ({ tab: value.tabs[0] }),
+    })
+    const codec = Codec.withInitial(Codec.migrate(current, read), { tabs: [] })
+    expect(codec.decode({ tab: "a" })).toEqual({ tabs: ["a"] })
+  })
+})
@@ -0,0 +1,325 @@
+export * as Codec from "./codec"
+
+// Plain codecs for persisted state. They replace Effect Schema in the renderer's initial module
+// graph, where Effect's own module initialisation was the single largest startup cost that was not
+// rendering. Semantics mirror the Persistence helpers: decoding never throws, `INVALID` marks a
+// value that cannot be recovered, and the lenient combinators recover what they can.
+
+export const INVALID: unique symbol = Symbol.for("opencode/persistence/codec/invalid")
+export type Invalid = typeof INVALID
+
+const tag: unique symbol = Symbol.for("opencode/persistence/codec")
+
+export interface Of<T, E = unknown> {
+  readonly [tag]: true
+  /** Phantom: `typeof codec.Type` is the decoded type, as with Effect schemas. */
+  readonly Type: T
+  readonly Encoded: E
+  readonly optional?: boolean
+  decode(input: unknown): T | Invalid
+  encode(value: T): E
+}
+
+export type Any = Of<any, any>
+export type Type<C extends Any> = C["Type"]
+
+export function isCodec(value: unknown): value is Any {
+  return typeof value === "object" && value !== null && tag in value
+}
+
+export function make<T, E = unknown>(decode: (input: unknown) => T | Invalid, encode: (value: T) => E): Of<T, E> {
+  return { [tag]: true, decode, encode } as Of<T, E>
+}
+
+export function is<T>(codec: Of<T>, input: unknown): input is T {
+  return codec.decode(input) !== INVALID
+}
+
+export function decodeOption<T>(codec: Of<T>, input: unknown): T | undefined {
+  const value = codec.decode(input)
+  return value === INVALID ? undefined : value
+}
+
+export function decodeOrThrow<T>(codec: Of<T>, input: unknown): T {
+  const value = codec.decode(input)
+  if (value === INVALID) throw new Error("Value does not match its codec")
+  return value
+}
+
+const identity = <T>(value: T) => value
+
+export const string: Of<string, string> = make((v) => (typeof v === "string" ? v : INVALID), identity)
+export const boolean: Of<boolean, boolean> = make((v) => (typeof v === "boolean" ? v : INVALID), identity)
+export const unknown: Of<unknown, unknown> = make((v) => v, identity)
+/** Finite numbers only: NaN and infinities are not JSON and never valid state. */
+export const number: Of<number, number> = make((v) => (typeof v === "number" && Number.isFinite(v) ? v : INVALID), identity)
+export const int: Of<number, number> = make((v) => (typeof v === "number" && Number.isInteger(v) ? v : INVALID), identity)
+export const nonNegativeInt: Of<number, number> = make(
+  (v) => (typeof v === "number" && Number.isInteger(v) && v >= 0 ? v : INVALID),
+  identity,
+)
+
+export function literal<const L extends string | number | boolean | null>(value: L): Of<L, L> {
+  return make((v) => (v === value ? value : INVALID), identity)
+}
+
+export function literals<const L extends ReadonlyArray<string | number | boolean | null>>(values: L): Of<L[number], L[number]> {
+  const set = new Set<unknown>(values)
+  return make((v) => (set.has(v) ? (v as L[number]) : INVALID), identity)
+}
+
+/** A string carrying a nominal brand, with the constructor Effect's `Schema.brand` gave callers. */
+export function brand<B extends string>(): Of<string & { readonly [K in B]: B }, string> & {
+  make(value: string): string & { readonly [K in B]: B }
+} {
+  return Object.assign(make<string & { readonly [K in B]: B }, string>((v) => (typeof v === "string" ? (v as never) : INVALID), identity), {
+    make: (value: string) => value as never,
+  })
+}
+
+export function nullOr<T, E>(codec: Of<T, E>): Of<T | null, E | null> {
+  return make((v) => (v === null ? null : codec.decode(v)), (v) => (v === null ? null : codec.encode(v)))
+}
+
+export function undefinedOr<T, E>(codec: Of<T, E>): Of<T | undefined, E | undefined> {
+  return make((v) => (v === undefined ? undefined : codec.decode(v)), (v) => (v === undefined ? undefined : codec.encode(v)))
+}
+
+/** A struct field that may be absent. Present but invalid values make the struct invalid. */
+export function optional<T, E>(codec: Of<T, E>): Of<T | undefined, E | undefined> & { readonly optional: true } {
+  return { ...undefinedOr(codec), optional: true } as never
+}
+
+/** A struct field that may be absent, and whose invalid values are dropped rather than rejected. */
+export function lenientOptional<T, E>(codec: Of<T, E>): Of<T | undefined, E | undefined> & { readonly optional: true } {
+  return {
+    ...make<T | undefined, E | undefined>(
+      (v) => {
+        if (v === undefined) return undefined
+        const value = codec.decode(v)
+        return value === INVALID ? undefined : value
+      },
+      (v) => (v === undefined ? undefined : codec.encode(v)),
+    ),
+    optional: true,
+  } as never
+}
+
+type Fields = Record<string, Any>
+type OptionalKeys<F extends Fields> = { [K in keyof F]: F[K] extends { optional: true } ? K : never }[keyof F]
+type RequiredKeys<F extends Fields> = Exclude<keyof F, OptionalKeys<F>>
+type Simplify<T> = { [K in keyof T]: T[K] } & {}
+export type StructType<F extends Fields> = Simplify<
+  { [K in RequiredKeys<F>]: F[K]["Type"] } & { [K in OptionalKeys<F>]?: F[K]["Type"] }
+>
+export type StructEncoded<F extends Fields> = Simplify<
+  { [K in RequiredKeys<F>]: F[K]["Encoded"] } & { [K in OptionalKeys<F>]?: F[K]["Encoded"] }
+>
+
+export interface Struct<F extends Fields> extends Of<StructType<F>, StructEncoded<F>> {
+  readonly fields: F
+}
+
+export function struct<const F extends Fields>(fields: F): Struct<F> {
+  const entries = Object.entries(fields)
+  return {
+    ...make<StructType<F>, StructEncoded<F>>(
+      (input) => {
+        if (typeof input !== "object" || input === null || Array.isArray(input)) return INVALID
+        const record = input as Record<string, unknown>
+        const out: Record<string, unknown> = {}
+        for (const [key, codec] of entries) {
+          const present = Object.hasOwn(record, key)
+          if (!present && codec.optional) continue
+          const value = codec.decode(record[key])
+          if (value === INVALID) return INVALID
+          if (value !== undefined || present) out[key] = value
+        }
+        return out as StructType<F>
+      },
+      (value) => {
+        const out: Record<string, unknown> = {}
+        for (const [key, codec] of entries) {
+          const field = (value as Record<string, unknown>)[key]
+          if (field === undefined && !Object.hasOwn(value as object, key)) continue
+          out[key] = codec.encode(field)
+        }
+        return out as StructEncoded<F>
+      },
+    ),
+    fields,
+  }
+}
+
+export function array<T, E>(codec: Of<T, E>): Of<T[], E[]> {
+  return make(
+    (input) => {
+      if (!Array.isArray(input)) return INVALID
+      const out: T[] = []
+      for (const item of input) {
+        const value = codec.decode(item)
+        if (value === INVALID) return INVALID
+        out.push(value)
+      }
+      return out
+    },
+    (value) => value.map((item) => codec.encode(item)),
+  )
+}
+
+/** Keeps the items that decode and drops the rest, like `Persistence.array`. */
+export function lenientArray<T, E>(codec: Of<T, E>): Of<T[], E[]> {
+  return make(
+    (input) => {
+      if (!Array.isArray(input)) return []
+      return input.flatMap((item) => {
+        const value = codec.decode(item)
+        return value === INVALID ? [] : [value]
+      })
+    },
+    (value) => value.map((item) => codec.encode(item)),
+  )
+}
+
+export function record<T, E>(codec: Of<T, E>): Of<Record<string, T>, Record<string, E>> {
+  return make(
+    (input) => {
+      if (typeof input !== "object" || input === null || Array.isArray(input)) return INVALID
+      const out: Record<string, T> = {}
+      for (const [key, item] of Object.entries(input)) {
+        const value = codec.decode(item)
+        if (value === INVALID) return INVALID
+        out[key] = value
+      }
+      return out
+    },
+    (value) => Object.fromEntries(Object.entries(value).map(([key, item]) => [key, codec.encode(item)])),
+  )
+}
+
+/** An invalid record becomes empty rather than failing the whole store, like `Persistence.record`. */
+export function lenientRecord<T, E>(codec: Of<T, E>): Of<Record<string, T>, Record<string, E>> {
+  const strict = record(codec)
+  return make(
+    (input) => {
+      const value = strict.decode(input)
+      return value === INVALID ? {} : value
+    },
+    strict.encode,
+  )
+}
+
+export function union<const C extends ReadonlyArray<Any>>(codecs: C): Of<C[number]["Type"], C[number]["Encoded"]> {
+  return make(
+    (input) => {
+      for (const codec of codecs) {
+        const value = codec.decode(input)
+        if (value !== INVALID) return value
+      }
+      return INVALID
+    },
+    (value) => {
+      // Encode with the first member that accepts the value's shape; members are disjoint in practice.
+      for (const codec of codecs) if (codec.decode(value) !== INVALID) return codec.encode(value)
+      return value as C[number]["Encoded"]
+    },
+  )
+}
+
+/** Maps a decoded value into another shape, the replacement for `decodeTo` + `SchemaGetter.transform`. */
+export function transform<T, E, T2>(
+  codec: Of<T, E>,
+  options: { decode: (value: T) => T2; encode: (value: T2) => T },
+): Of<T2, E> {
+  return make(
+    (input) => {
+      const value = codec.decode(input)
+      return value === INVALID ? INVALID : options.decode(value)
+    },
+    (value) => codec.encode(options.encode(value)),
+  )
+}
+
+/** Invalid and missing values become `value()`, like `Persistence.fallback`. */
+export function fallback<T, E>(codec: Of<T, E>, value: () => NoInfer<T>): Of<T, E> {
+  return make(
+    (input) => {
+      if (input === undefined) return value()
+      const decoded = codec.decode(input)
+      return decoded === INVALID ? value() : decoded
+    },
+    codec.encode,
+  )
+}
+
+export function fromJsonString<T, E>(codec: Of<T, E>): Of<T, string> {
+  return make(
+    (input) => {
+      if (typeof input !== "string") return INVALID
+      try {
+        return codec.decode(JSON.parse(input))
+      } catch {
+        return INVALID
+      }
+    },
+    (value) => JSON.stringify(codec.encode(value)),
+  )
+}
+
+export type Decoder = Pick<Of<unknown>, "decode">
+export type Migrated<C extends Any> = { readonly current: C; readonly read: Decoder }
+
+/** Older stored shapes go through `read` first; `current` describes what the store holds today. */
+export function migrate<C extends Any>(current: C, read: Decoder): Migrated<C> {
+  return { current, read }
+}
+
+function isMigrated<C extends Any>(definition: C | Migrated<C>): definition is Migrated<C> {
+  return !isCodec(definition) && "current" in definition
+}
+
+// Stored values recover field by field against the initial value: an object's valid fields are
+// kept, invalid or missing ones take their initial counterpart, and the result is merged over the
+// initial so new fields appear with their defaults. Mirrors `Persistence.withInitial`.
+export function withInitial<C extends Any>(definition: C | Migrated<C>, initial: Type<C>): Of<Type<C>, unknown> {
+  const codec = isMigrated(definition) ? definition.current : definition
+  const read = isMigrated(definition) ? definition.read : unknown
+  return make(
+    (input) => {
+      const stored = read.decode(input)
+      if (stored === INVALID) return INVALID
+      return merge(initial, recover(codec, stored, initial))
+    },
+    (value) => codec.encode(value),
+  )
+}
+
+function recover(codec: Any, value: unknown, initial: unknown): unknown {
+  if (value === undefined) return initial
+  if ("fields" in codec && isObject(value)) {
+    const fields = (codec as Struct<Fields>).fields
+    return Object.fromEntries(
+      Object.entries(fields).flatMap(([name, field]) => {
+        const defaults = isObject(initial) ? initial[name] : undefined
+        const next = recover(field, value[name], defaults)
+        if (next === undefined && !Object.hasOwn(value, name) && defaults === undefined) return []
+        return [[name, next]]
+      }),
+    )
+  }
+  const decoded = codec.decode(value)
+  return decoded === INVALID ? initial : decoded
+}
+
+function merge(initial: unknown, value: unknown): unknown {
+  if (value === undefined) return initial
+  if (!isObject(initial) || !isObject(value)) return value
+  return Object.fromEntries(
+    [...new Set([...Object.keys(initial), ...Object.keys(value)])].map((key) => [key, merge(initial[key], value[key])]),
+  )
+}
+
+function isObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value)
+}
+
@@ -24,14 +24,12 @@ export function withInitial<S extends Schema.ConstraintCodec<object, unknown>>(
 ) {
  const schema = isMigrated(definition) ? definition.current : definition
  const read = isMigrated(definition)
-    ? SchemaParser.decodeUnknownResult(
-        Schema.make<Schema.ConstraintDecoder<unknown>>(preserveExcess(definition.read.ast)),
-      )
+    ? SchemaParser.decodeUnknownResult(definition.read, { onExcessProperty: "preserve" })
    : Result.succeed<unknown>
  const encode = Schema.encodeUnknownSync(schema)
  return Schema.Unknown.pipe(
    Schema.decode<Schema.Unknown>({
-      decode: SchemaGetter.transformEffect((value) =>
+      decode: SchemaGetter.transformOrFail((value) =>
        Effect.fromResult(Result.map(read(value), (stored) => merge(initial, recover(schema.ast, stored, initial)))),
      ),
      encode: SchemaGetter.transform((value) => encode(value)),
@@ -40,45 +38,6 @@ export function withInitial<S extends Schema.ConstraintCodec<object, unknown>>(
  )
 }

-// Migration decoders must carry fields they do not know yet into the current schema. Effect 4.0
-// no longer exposes the parser-level `preserve` option, so make closed structs open recursively.
-function preserveExcess(ast: SchemaAST.AST): SchemaAST.AST {
-  const encoding = ast.encoding && preserveEncoding(ast.encoding)
-  const recurred = "recur" in ast && typeof ast.recur === "function" ? ast.recur(preserveExcess) : ast
-  const next = withEncoding(recurred, encoding)
-  if (next._tag !== "Objects") return next
-  const indexSignatures =
-    next.propertySignatures.length === 0 || next.indexSignatures.length > 0
-      ? next.indexSignatures
-      : [
-          new SchemaAST.IndexSignature(Schema.String.ast, Schema.Unknown.ast),
-          new SchemaAST.IndexSignature(Schema.Symbol.ast, Schema.Unknown.ast),
-        ]
-  return new SchemaAST.Objects(
-    next.propertySignatures,
-    indexSignatures,
-    next.annotations,
-    next.checks,
-    encoding,
-    next.context,
-    next.encodingChecks,
-  )
-}
-
-function preserveEncoding(encoding: SchemaAST.Encoding): SchemaAST.Encoding {
-  return [
-    new SchemaAST.Link(preserveExcess(encoding[0].to), encoding[0].transformation),
-    ...encoding.slice(1).map((link) => new SchemaAST.Link(preserveExcess(link.to), link.transformation)),
-  ]
-}
-
-function withEncoding(ast: SchemaAST.AST, encoding: SchemaAST.Encoding | undefined): SchemaAST.AST {
-  if (ast.encoding === encoding) return ast
-  const descriptors = Object.getOwnPropertyDescriptors(ast)
-  descriptors.encoding.value = encoding
-  return Object.create(Object.getPrototypeOf(ast), descriptors)
-}
-
 // Object-level codecs own their recovery. Plain structs can recover fields independently.
 function recover(ast: SchemaAST.AST, value: unknown, initial: unknown): unknown {
  if (value === undefined) return initial
@@ -6,6 +6,7 @@ import { createStore, type SetStoreFunction, type Store } from "solid-js/store"
 import { Option, Schema } from "effect"
 import { pathKey } from "@/workspaces/path-key"
 import { ScopedKey, ServerScope } from "@/runtime/server/scope"
+import { Codec } from "./codec"
 import { persistStore } from "./persist"
 import { Persistence } from "./schema"

@@ -472,25 +473,57 @@ export function removePersisted(
  }
 }

-export function persisted<S extends Schema.ConstraintCodec<object, unknown>>(
+type Definition<S extends Schema.ConstraintCodec<object, unknown> | Codec.Any> =
+  | S
+  | Persistence.Migrated<Extract<S, Schema.ConstraintCodec<object, unknown>>>
+  | Codec.Migrated<Extract<S, Codec.Any>>
+
+// Persisted stores are moving from Effect Schema to the plain codecs in ./codec so the renderer
+// stops paying for Effect at startup; both are accepted while the migration is underway.
+function serializer<S extends Schema.ConstraintCodec<object, unknown> | Codec.Any>(
+  definition: Definition<S>,
+  initial: S["Type"],
+) {
+  if (Codec.isCodec(definition) || (!("current" in definition) ? false : Codec.isCodec(definition.current))) {
+    const codec = Codec.withInitial(definition as Codec.Any | Codec.Migrated<Codec.Any>, initial)
+    const json = Codec.fromJsonString(codec)
+    return {
+      decode: (raw: string) => Codec.decodeOption(json, raw) as S["Type"] | undefined,
+      deserialize: (raw: unknown) => Codec.decodeOrThrow(json, raw) as S["Type"],
+      serialize: (value: S["Type"]) => json.encode(value),
+      encode: (value: S["Type"]) => codec.encode(value),
+      initial: Codec.decodeOrThrow(codec, codec.encode(initial)) as S["Type"],
+    }
+  }
+  const schema = definition as Schema.ConstraintCodec<object, unknown> | Persistence.Migrated<Schema.ConstraintCodec<object, unknown>>
+  const initialized = Persistence.withInitial(schema, initial as object)
+  const json = Schema.fromJsonString(initialized)
+  const decode = Schema.decodeUnknownOption(json)
+  return {
+    decode: (raw: string) => Option.getOrUndefined(decode(raw)) as S["Type"] | undefined,
+    deserialize: Schema.decodeUnknownSync(json) as (raw: unknown) => S["Type"],
+    serialize: Schema.encodeSync(json) as (value: S["Type"]) => string,
+    encode: Schema.encodeSync(initialized) as (value: S["Type"]) => unknown,
+    initial: Schema.decodeUnknownSync(Schema.toType(initialized))(initial as object) as S["Type"],
+  }
+}
+
+export function persisted<S extends Schema.ConstraintCodec<object, unknown> | Codec.Any>(
  target: string | PersistTarget,
-  schema: S | Persistence.Migrated<S>,
+  schema: Definition<S>,
  initial: NoInfer<S["Type"]>,
  platformOverride?: Platform,
 ): PersistedWithReady<S["Type"]> {
  const platform = platformOverride ?? usePlatform()
  const config = resolveTarget(typeof target === "string" ? { key: target } : target, platform)

-  const initialized = Persistence.withInitial(schema, initial)
-  const json = Schema.fromJsonString(initialized)
-  const decode = Schema.decodeUnknownOption(json)
-  const encode = Schema.encodeSync(initialized)
-  const serialize = Schema.encodeSync(json)
+  const codec = serializer<S>(schema, initial)
+  const { encode, serialize } = codec
  const normalize = (raw: string) => {
-    const value = decode(raw)
-    if (Option.isSome(value)) return serialize(value.value)
+    const value = codec.decode(raw)
+    if (value !== undefined) return serialize(value)
  }
-  const store = createStore<S["Type"]>(Schema.decodeUnknownSync(Schema.toType(initialized))(initial))
+  const store = createStore<S["Type"]>(codec.initial)
  const isDesktop = platform.platform === "desktop" && !!platform.storage
  const draft = config.draft ? platform.draftStore : undefined
  const prefix = `${config.storage ?? "default"}:`
@@ -602,7 +635,7 @@ export function persisted<S extends Schema.ConstraintCodec<object, unknown>>(
    name: config.key,
    storage,
    serialize,
-    deserialize: Schema.decodeUnknownSync(json),
+    deserialize: codec.deserialize,
    sync: channel ? messageSync(channel) : undefined,
    // Drafts take the encoded document itself so large text is externalized without the store
    // re-parsing the serialized form on every save.
@@ -0,0 +1,11 @@
+import type { Brand } from "effect"
+import { Codec } from "@/runtime/persistence/codec"
+
+// The server key's brand is shared with the Effect schema in ./persistence.ts (type only, so this
+// module loads nothing of Effect), letting stores port to plain codecs one at a time.
+export type ServerKey = string & Brand.Brand<"ServerConnection.Key">
+
+export const ServerKey: Codec.Of<ServerKey, string> & { make(value: string): ServerKey } = Object.assign(
+  Codec.make<ServerKey, string>((v) => (typeof v === "string" ? (v as ServerKey) : Codec.INVALID), (v) => v),
+  { make: (value: string) => value as ServerKey },
+)
@@ -20,18 +20,13 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes
  const command = useCommand()
  const state = props.browser.active
  const address = () => (state()?.url === "about:blank" ? "" : (state()?.url ?? ""))
-  const failed = () => !!state()?.loadError
  const registration = props.browser.registration
  const button = { variant: "ghost", size: "large" } as const
  const [store, setStore] = createStore({
    address: "",
    editing: false,
-    submitted: false,
-    // A submitted navigation the browser has not reported yet; keeps the empty state hidden meanwhile.
-    navigating: false,
    visible: typeof document === "undefined" || document.visibilityState === "visible",
  })
-  const empty = () => !address() && !state()?.loading && !store.navigating
  let surface: HTMLDivElement | undefined
  let addressDisplay: HTMLDivElement | undefined
  let frame: number | undefined
@@ -48,7 +43,7 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes
      title: language.t("command.browser.reload"),
      category: language.t("command.category.view"),
      keybind: "f5",
-      disabled: !props.visible || !address(),
+      disabled: !props.visible || !state(),
      onSelect: () => {
        const tab = state()
        if (tab) props.browser.command({ type: "reload", tabID: tab.id })
@@ -76,9 +71,7 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes
    const top = Math.round(rect.top * zoom)
    const right = Math.round(rect.right * zoom)
    const bottom = Math.round(rect.bottom * zoom)
-    // The desktop page hides blank and loading documents itself; only hide here
-    // while the pane shows its own empty or failed state over the surface.
-    const visible = props.visible && store.visible && !empty() && !failed() && !dialog.active && !covered(rect)
+    const visible = props.visible && store.visible && !dialog.active && !covered(rect)
    // The cutout exposes the app backdrop outside the rounded Review card,
    // not the browser surface inside it.
    const color = getComputedStyle(
@@ -114,25 +107,7 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes
    if (frame === undefined) frame = requestAnimationFrame(tick)
  }

-  createEffect(on([() => state()?.id, address], () => !store.editing && setStore("address", address())))
-  // Any reported movement, including a rejected or blocked request, ends the submitted navigation.
-  createEffect(
-    on(
-      [() => state()?.id, () => state()?.generation, () => state()?.loading, () => props.browser.error()],
-      () => setStore("navigating", false),
-      { defer: true },
-    ),
-  )
-  // A blocked or rejected submission leaves the page where it was; show that page's URL again.
-  createEffect(
-    on(
-      () => props.browser.error(),
-      (error) => {
-        if (error && !store.editing) setStore("address", address())
-      },
-      { defer: true },
-    ),
-  )
+  createEffect(() => !store.editing && setStore("address", address()))
  createEffect(
    on(registration, (current) => {
      // Session routes can change before this pane unmounts. Hide the registration
@@ -148,8 +123,6 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes
        () => store.visible,
        () => props.visible,
        () => state()?.id,
-        empty,
-        failed,
        registration,
      ],
      () => {
@@ -184,7 +157,7 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes

  return (
    <aside id="browser-panel" class="relative size-full min-w-0 overflow-hidden bg-v2-background-bg-base flex flex-col">
-      <div class="h-10 shrink-0 flex items-center gap-1 px-3 border-b border-v2-border-border-muted">
+      <div class="h-10 shrink-0 flex items-center gap-1 px-2 border-b border-v2-border-border-muted">
        <For each={["back", "forward"] as const}>
          {(direction) => (
            <Tooltip placement="top" value={language.t(direction === "back" ? "common.goBack" : "common.goForward")}>
@@ -220,7 +193,7 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes
        >
          <IconButton
            {...button}
-            disabled={!state()?.loading && !address()}
+            disabled={!state()}
            aria-label={language.t(state()?.loading ? "prompt.action.stop" : "error.page.action.reload")}
            onClick={() => {
              const tab = state()
@@ -239,13 +212,8 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes
          onSubmit={(event) => {
            event.preventDefault()
            const tab = state()
-            const url = store.address.trim()
-            if (!tab) return
-            if (url || failed()) {
-              setStore({ submitted: true, address: url, navigating: true })
-              props.browser.command({ type: "navigate", tabID: tab.id, url: url || "about:blank" })
-            }
-            event.currentTarget.querySelector("input")?.blur()
+            if (tab && store.address.trim())
+              props.browser.command({ type: "navigate", tabID: tab.id, url: store.address })
          }}
        >
          <input
@@ -256,14 +224,8 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes
            disabled={!state()}
            placeholder={language.t("session.browser.address.placeholder")}
            aria-label={language.t("session.browser.address")}
-            onFocus={(event) => {
-              setStore("editing", true)
-              event.currentTarget.select()
-            }}
-            onClick={(event) => event.currentTarget.select()}
-            onBlur={() =>
-              setStore({ editing: false, address: store.submitted ? store.address : address(), submitted: false })
-            }
+            onFocus={() => setStore("editing", true)}
+            onBlur={() => setStore({ editing: false, address: address() })}
            onInput={(event) => setStore("address", event.currentTarget.value)}
            onScroll={(event) => {
              if (addressDisplay) addressDisplay.scrollLeft = event.currentTarget.scrollLeft
@@ -281,27 +243,12 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes
          </div>
        </form>
      </div>
-      <Show when={props.browser.error() && !failed()}>
+      <Show when={props.browser.error()}>
        <div class="shrink-0 px-3 py-1.5 text-12-regular text-text-danger-base border-b border-v2-border-border-muted">
          {props.browser.error()}
        </div>
      </Show>
      <div ref={surface} class="min-h-0 flex-1 bg-v2-background-bg-base flex items-center justify-center">
-        <Show when={(empty() || failed()) && !props.browser.suspended()}>
-          {/* Add the 40px toolbar to the file empty state's 160px bottom padding to align their centers. */}
-          <div
-            dir="auto"
-            class="flex size-full flex-col items-center justify-center gap-2 p-6 pb-[200px] text-center text-text-weak"
-          >
-            <Icon name="globe" size="large" class="mb-2 shrink-0" />
-            <div class="text-[13px] font-medium leading-[var(--line-height-compact)] text-text-strong">
-              {language.t(failed() ? "session.browser.failed.title" : "session.browser.empty.title")}
-            </div>
-            <div class="text-13-regular leading-[var(--line-height-base)]">
-              {language.t(failed() ? "session.browser.failed.description" : "session.browser.empty.description")}
-            </div>
-          </div>
-        </Show>
        <Show when={props.browser.suspended()}>
          <p class="px-6 text-center text-13-regular text-v2-text-text-subtle" role="status">
            {language.t("session.browser.suspended")}
@@ -1,8 +1,6 @@
 import { children, createMemo, Show } from "solid-js"
 import type { JSX } from "solid-js"
 import { useSortable } from "@dnd-kit/solid/sortable"
-import { Icon } from "@opencode/ui/icon"
-import { IconButton } from "@opencode/ui/icon-button"
 import { Keybind } from "@opencode/ui/keybind"
 import { Tooltip } from "@opencode/ui/tooltip"
 import { Tabs } from "@opencode/ui/tabs"
@@ -71,19 +69,9 @@ export function SortableTab(props: {
              placement="bottom"
              gutter={10}
            >
-              <IconButton
-                size="small"
-                variant="ghost-muted"
-                onPointerDown={(event) => {
-                  event.preventDefault()
-                  event.stopPropagation()
-                }}
-                onClick={(event) => {
-                  event.preventDefault()
-                  event.stopPropagation()
-                  props.onTabClose(props.tab)
-                }}
-                icon={<Icon name="xmark-small" />}
+              <Tabs.CloseButton
+                class="h-5 w-5"
+                onClick={() => props.onTabClose(props.tab)}
                aria-label={language.t("common.closeTab")}
              />
            </Tooltip>
@@ -1,8 +1,7 @@
 import { describe, expect, test } from "bun:test"
 import { createRoot, createSignal } from "solid-js"
-import { Schema } from "effect"
 import { ServerConnection } from "@/runtime/server/registry"
-import { Persistence } from "@/runtime/persistence/schema"
+import { Codec } from "@/runtime/persistence/codec"
 import { currentRoute, initialLayout, layoutPersistence, layoutSchema } from "./layout"
 import { createSessionKeyReader, ensureSessionKey, pruneSessionKeys } from "./helpers"

@@ -11,21 +10,21 @@ test("settings has its own layout route", () => {
 })

 describe("layout persistence", () => {
-  const schema = Persistence.withInitial(layoutPersistence, initialLayout(ServerConnection.Key.make("local")))
-  const decode = Schema.decodeUnknownSync(schema)
+  const schema = Codec.withInitial(layoutPersistence, initialLayout(ServerConnection.Key.make("local")))
+  const decode = (input: unknown) => Codec.decodeOrThrow(schema, input)

  test("uses supplied initial preferences after legacy migration", () => {
    const initial = initialLayout(ServerConnection.Key.make("remote"))
    initial.sidebar.width = 420
    initial.fileTree.width = 300
    initial.review.panelOpened = true
-    const restore = Schema.decodeUnknownSync(Persistence.withInitial(layoutPersistence, initial))
+    const restore = (input: unknown) => Codec.decodeOrThrow(Codec.withInitial(layoutPersistence, initial), input)
    expect(restore({})).toEqual(initial)
    expect(restore({ sidebar: { width: "bad" } }).sidebar.width).toBe(420)
    expect(restore({ fileTree: { width: 260 } }).fileTree.width).toBe(200)
    expect(restore({ fileTree: {} }).fileTree.width).toBe(300)
    expect(restore({ review: {}, fileTree: { opened: false } }).review.panelOpened).toBe(false)
-    expect(() => Schema.decodeUnknownSync(layoutSchema)({})).toThrow()
+    expect(() => Codec.decodeOrThrow(layoutSchema, {})).toThrow()
  })

  test("restores shipped defaults for missing and invalid fields", () => {
@@ -56,8 +55,8 @@ describe("layout persistence", () => {
    expect(value.sidebar).toEqual({ opened: false, width: 344, workspaces: {}, workspacesDefault: true })
    expect(value.review).toEqual({ diffStyle: "split", panelOpened: true })
    expect(value.fileTree).toEqual({ opened: true, width: 200, tab: "changes" })
-    expect(Schema.encodeSync(schema)(value)).toEqual(value)
-    expect(decode(Schema.encodeSync(schema)(value))).toEqual(value)
+    expect(schema.encode(value)).toEqual(value)
+    expect(decode(schema.encode(value))).toEqual(value)
    expect(decode({ fileTree: { opened: true } }).review.panelOpened).toBe(false)
  })

@@ -169,3 +168,4 @@ describe("pruneSessionKeys", () => {
    expect(drop).toEqual([])
  })
 })
+
@@ -1,63 +1,58 @@
 export * as TabStorage from "./schema"

-import { Schema, SchemaGetter } from "effect"
-import { ServerKey } from "@/runtime/server/persistence"
-import { Persistence } from "@/runtime/persistence/schema"
+import { Codec } from "@/runtime/persistence/codec"
+import { ServerKey } from "@/runtime/server/key"

 export { ServerKey }

-export const Session = Persistence.struct({
-  type: Schema.Literal("session"),
+export const Session = Codec.struct({
+  type: Codec.literal("session"),
  server: ServerKey,
-  sessionId: Schema.String,
-  routeSessionId: Persistence.optional(Schema.String),
-  routeParentId: Persistence.optional(Schema.String),
+  sessionId: Codec.string,
+  routeSessionId: Codec.lenientOptional(Codec.string),
+  routeParentId: Codec.lenientOptional(Codec.string),
 })

-export const Draft = Persistence.struct({
-  type: Schema.Literal("draft"),
-  draftID: Schema.String,
+export const Draft = Codec.struct({
+  type: Codec.literal("draft"),
+  draftID: Codec.string,
  server: ServerKey,
-  directory: Schema.String,
-  worktree: Persistence.optional(Schema.String),
-  branch: Persistence.optional(Schema.String),
-  mcp: Persistence.optional(Persistence.struct({ target: Schema.String, states: Persistence.record(Schema.Boolean) })),
+  directory: Codec.string,
+  worktree: Codec.lenientOptional(Codec.string),
+  branch: Codec.lenientOptional(Codec.string),
+  mcp: Codec.lenientOptional(Codec.struct({ target: Codec.string, states: Codec.lenientRecord(Codec.boolean) })),
 })

-const SessionCodec = Session.pipe(
-  Schema.decodeTo(Schema.toType(Session), {
-    decode: SchemaGetter.transform((tab) => ({
-      type: tab.type,
-      server: tab.server,
-      sessionId: tab.sessionId,
-      ...(tab.routeSessionId && tab.routeSessionId !== tab.sessionId
-        ? { routeSessionId: tab.routeSessionId, ...(tab.routeParentId ? { routeParentId: tab.routeParentId } : {}) }
-        : {}),
-    })),
-    encode: SchemaGetter.transform((tab) => tab),
+// A stored route that only repeats the session id carries nothing; drop it and its parent.
+const SessionCodec = Codec.transform(Session, {
+  decode: (tab) => ({
+    type: tab.type,
+    server: tab.server,
+    sessionId: tab.sessionId,
+    ...(tab.routeSessionId && tab.routeSessionId !== tab.sessionId
+      ? { routeSessionId: tab.routeSessionId, ...(tab.routeParentId ? { routeParentId: tab.routeParentId } : {}) }
+      : {}),
+  }),
+  encode: (tab) => tab,
+})
+
+export const Tab = Codec.union([Session, Draft])
+export const Tabs = Codec.lenientArray(Codec.union([SessionCodec, Draft]))
+export const Recent = Codec.struct({
+  key: Codec.optional(Codec.string),
+})
+export const Info = Codec.struct({
+  title: Codec.optional(Codec.string),
+  directory: Codec.optional(Codec.string),
+})
+export const Infos = Codec.record(Info)
+export const Panes = Codec.record(
+  Codec.struct({
+    terminal: Codec.optional(Codec.boolean),
+    review: Codec.optional(Codec.boolean),
+    terminalHeight: Codec.optional(Codec.number),
+    sessionWidth: Codec.optional(Codec.number),
  }),
 )
-
-export const Tab = Schema.Union([Session, Draft])
-export const Tabs = Persistence.array(Schema.Union([SessionCodec, Draft]))
-export const Recent = Persistence.struct({
-  key: Schema.optional(Schema.String),
-})
-export const Info = Persistence.struct({
-  title: Schema.optional(Schema.String),
-  directory: Schema.optional(Schema.String),
-})
-export const Infos = Schema.Record(Schema.String, Schema.mutableKey(Info))
-export const Panes = Schema.Record(
-  Schema.String,
-  Schema.mutableKey(
-    Persistence.struct({
-      terminal: Schema.optional(Schema.Boolean),
-      review: Schema.optional(Schema.Boolean),
-      terminalHeight: Schema.optional(Schema.Finite),
-      sessionWidth: Schema.optional(Schema.Finite),
-    }),
-  ),
-)
-export const ClosedTab = Schema.Struct({ tab: SessionCodec, index: Schema.Int.check(Schema.isGreaterThanOrEqualTo(0)) })
-export const Closed = Persistence.array(ClosedTab)
+export const ClosedTab = Codec.struct({ tab: SessionCodec, index: Codec.nonNegativeInt })
+export const Closed = Codec.lenientArray(ClosedTab)
@@ -3,13 +3,12 @@ import { createRoot, getOwner, onCleanup } from "solid-js"
 import { createTabMemory } from "./memory"
 import { nextTabAfterClose, pushClosedTab, removeClosedTabs, takeClosedTab, type ClosedTab } from "./closed"
 import { findSessionTab, sessionIDHasOpenTab, tabHref, tabKey, type SessionTab, type Tab } from "./tabs"
-import { Schema } from "effect"
 import { TabStorage } from "./schema"
 import type { ServerConnection } from "@/runtime/server/registry"
-import { Persistence } from "@/runtime/persistence/schema"
+import { Codec } from "@/runtime/persistence/codec"

 const server = "local\nhttp://localhost:4096" as ServerConnection.Key
-const decodeTabs = Schema.decodeUnknownSync(Persistence.withInitial(TabStorage.Tabs, []))
+const decodeTabs = ((input: unknown) => Codec.decodeOrThrow(Codec.withInitial(TabStorage.Tabs, []), input))

 function sessionTab(sessionId: string): SessionTab {
  return { type: "session", server, sessionId }
@@ -26,7 +25,7 @@ describe("tab migration", () => {
    }
    const restored = decodeTabs([legacy, draft])
    expect(restored).toEqual([legacy, draft])
-    expect(decodeTabs(Schema.encodeSync(TabStorage.Tabs)(restored))).toEqual([legacy, draft])
+    expect(decodeTabs(TabStorage.Tabs.encode(restored))).toEqual([legacy, draft])
  })

  test("drops null and malformed persisted tabs", () => {
@@ -64,13 +63,13 @@ describe("tab migration", () => {
      draft,
    ])
    expect(tabs).toEqual([sessionTab("root"), draft])
-    expect(Schema.encodeSync(TabStorage.Tabs)(tabs)).toEqual(tabs)
-    expect(decodeTabs(Schema.encodeSync(TabStorage.Tabs)(tabs))).toEqual(tabs)
+    expect(TabStorage.Tabs.encode(tabs)).toEqual(tabs)
+    expect(decodeTabs(TabStorage.Tabs.encode(tabs))).toEqual(tabs)
  })

  test("salvages valid closed session tabs", () => {
    expect(
-      Schema.decodeUnknownSync(Persistence.withInitial(TabStorage.Closed, []))([
+      ((input: unknown) => Codec.decodeOrThrow(Codec.withInitial(TabStorage.Closed, []), input))([
        { tab: sessionTab("a"), index: 1 },
        { tab: sessionTab("b"), index: -1 },
        { tab: { type: "draft", server, draftID: "d", directory: "/project" }, index: 0 },
@@ -81,16 +80,16 @@ describe("tab migration", () => {

  test("validates auxiliary tab state", () => {
    expect(
-      Schema.decodeUnknownSync(Persistence.withInitial(TabStorage.Recent, { key: undefined }))({ key: 1 }),
+      ((input: unknown) => Codec.decodeOrThrow(Codec.withInitial(TabStorage.Recent, { key: undefined }), input))({ key: 1 }),
    ).toEqual({ key: undefined })
-    expect(Schema.decodeUnknownSync(TabStorage.Infos)({})).toEqual({})
-    expect(Schema.decodeUnknownSync(TabStorage.Panes)({})).toEqual({})
-    expect(Schema.decodeUnknownSync(TabStorage.Infos)({ tab: { title: "Title", directory: "/project" } })).toEqual({
+    expect(Codec.decodeOrThrow(TabStorage.Infos, {})).toEqual({})
+    expect(Codec.decodeOrThrow(TabStorage.Panes, {})).toEqual({})
+    expect(Codec.decodeOrThrow(TabStorage.Infos, { tab: { title: "Title", directory: "/project" } })).toEqual({
      tab: { title: "Title", directory: "/project" },
    })
-    const panes = Schema.decodeUnknownSync(TabStorage.Panes)({ tab: { terminal: true, terminalHeight: 300 } })
-    expect(Schema.encodeSync(TabStorage.Panes)(panes)).toEqual({ tab: { terminal: true, terminalHeight: 300 } })
-    expect(() => Schema.decodeUnknownSync(TabStorage.Panes)({ tab: { terminal: "yes" } })).toThrow()
+    const panes = Codec.decodeOrThrow(TabStorage.Panes, { tab: { terminal: true, terminalHeight: 300 } })
+    expect(TabStorage.Panes.encode(panes)).toEqual({ tab: { terminal: true, terminalHeight: 300 } })
+    expect(() => Codec.decodeOrThrow(TabStorage.Panes, { tab: { terminal: "yes" } })).toThrow()
  })
 })

@@ -209,3 +208,5 @@ describe("closed tab stack", () => {
    expect(nextTabAfterClose([sessionTab("a")], 0, true)).toBeNull()
  })
 })
+
+
@@ -9,8 +9,7 @@
  justify-content: center;
 }

-[data-titlebar-tab],
-[data-titlebar-tab-action] {
+[data-titlebar-tab] {
  --tab-base: var(--v2-background-bg-deep);
  --tab-overlay: transparent;
  background: linear-gradient(var(--tab-overlay), var(--tab-overlay)), var(--tab-base);
@@ -69,14 +68,6 @@
  --tab-overlay: var(--v2-overlay-simple-overlay-pressed);
 }

-[data-titlebar-tab-action]:is(:hover, :focus-visible) {
-  --tab-overlay: var(--v2-overlay-simple-overlay-hover);
-}
-
-[data-titlebar-tab-action]:is(:active, [data-state="pressed"]) {
-  --tab-overlay: var(--v2-overlay-simple-overlay-pressed);
-}
-
 [data-titlebar-tab]:is(:hover, [data-state="pressed"]) [data-slot="tab-close"] {
  background: linear-gradient(var(--tab-overlay), var(--tab-overlay)), var(--tab-base);
 }
@@ -351,10 +351,9 @@ export function Titlebar(props: {
              >
                <button
                  type="button"
-                  data-titlebar-tab-action
                  data-action="vertical-tabs-home"
                  data-state={layout.route().type === "home" ? "pressed" : undefined}
-                  class="group mb-1 flex h-7 w-full shrink-0 items-center gap-1.5 rounded-[6px] ps-1.5 pe-2 text-[13px] leading-4 text-v2-text-text-faint hover:text-v2-text-text-base data-[state=pressed]:text-v2-text-text-base"
+                  class="group mb-1 flex h-7 w-full shrink-0 items-center gap-1.5 rounded-[6px] ps-1.5 pe-2 text-[13px] leading-4 text-v2-text-text-faint hover:bg-v2-background-bg-layer-02 hover:text-v2-text-text-base data-[state=pressed]:bg-v2-background-bg-layer-02 data-[state=pressed]:text-v2-text-text-base"
                  onClick={toggleHome}
                  aria-label={language.t("home.title")}
                  aria-pressed={layout.route().type === "home"}
@@ -651,9 +650,8 @@ export function Titlebar(props: {
                            {homeButton(true)}
                            <button
                              type="button"
-                              data-titlebar-tab-action
                              data-action="vertical-tabs-new-session"
-                              class="group flex h-7 w-full shrink-0 items-center gap-1.5 rounded-[6px] ps-1.5 pe-2 text-[13px] leading-4 text-v2-text-text-faint hover:text-v2-text-text-base"
+                              class="group flex h-7 w-full shrink-0 items-center gap-1.5 rounded-[6px] ps-1.5 pe-2 text-[13px] leading-4 text-v2-text-text-faint hover:bg-v2-background-bg-layer-02 hover:text-v2-text-text-base"
                              onClick={openNewTab}
                              aria-label={language.t("command.session.new")}
                            >
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/cli",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "type": "module",
  "license": "MIT",
  "bin": {
@@ -3,8 +3,8 @@ import { Schema } from "effect"
 import { Spec } from "../framework/spec"
 import { Updater } from "../services/updater"

-export const PrintLogs = GlobalFlag.Setting("print-logs")({
-  flag: Flag.Boolean("print-logs").pipe(
+export const PrintLogs = GlobalFlag.setting("print-logs")({
+  flag: Flag.boolean("print-logs").pipe(
    Flag.withDescription("Print logs to stderr (server logs require --standalone)"),
    Flag.withDefault(false),
  ),
@@ -13,23 +13,23 @@ export const PrintLogs = GlobalFlag.Setting("print-logs")({
 declare const OPENCODE_CLI_NAME: string | undefined

 const ServerParams = {
-  standalone: Flag.Boolean("standalone").pipe(
+  standalone: Flag.boolean("standalone").pipe(
    Flag.withDescription("Run with a private server instead of the background service"),
    Flag.withDefault(false),
  ),
-  server: Flag.String("server").pipe(
+  server: Flag.string("server").pipe(
    Flag.withDescription("Connect to a server URL instead of the background service"),
    Flag.optional,
  ),
 }

 const PermissionParams = {
-  auto: Flag.Boolean("auto").pipe(
+  auto: Flag.boolean("auto").pipe(
    Flag.withDescription("Auto-approve permissions that are not explicitly denied"),
    Flag.withDefault(false),
  ),
-  yolo: Flag.Boolean("yolo").pipe(Flag.withDefault(false), Flag.withHidden),
-  dangerouslySkipPermissions: Flag.Boolean("dangerously-skip-permissions").pipe(
+  yolo: Flag.boolean("yolo").pipe(Flag.withDefault(false), Flag.withHidden),
+  dangerouslySkipPermissions: Flag.boolean("dangerously-skip-permissions").pipe(
    Flag.withDefault(false),
    Flag.withHidden,
  ),
@@ -40,32 +40,32 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
  params: {
    ...ServerParams,
    ...PermissionParams,
-    directory: Argument.String("directory").pipe(
+    directory: Argument.string("directory").pipe(
      Argument.withDescription("Directory to start OpenCode in"),
      Argument.optional,
    ),
-    continue: Flag.Boolean("continue").pipe(
+    continue: Flag.boolean("continue").pipe(
      Flag.withAlias("c"),
      Flag.withDescription("Continue the last session"),
      Flag.withDefault(false),
    ),
-    session: Flag.String("session").pipe(
+    session: Flag.string("session").pipe(
      Flag.withAlias("s"),
      Flag.withDescription("Session ID to continue"),
      Flag.optional,
    ),
-    prompt: Flag.String("prompt").pipe(Flag.withDescription("Prompt to use"), Flag.optional),
+    prompt: Flag.string("prompt").pipe(Flag.withDescription("Prompt to use"), Flag.optional),
  },
  commands: [
    Spec.make("upgrade", {
      description: "Upgrade OpenCode to the latest or a specific version",
      aliases: ["update"],
      params: {
-        target: Argument.String("target").pipe(
+        target: Argument.string("target").pipe(
          Argument.withDescription("Version to upgrade to (with or without a leading v)"),
          Argument.optional,
        ),
-        method: Flag.Literals("method", Updater.methods).pipe(
+        method: Flag.choice("method", Updater.methods).pipe(
          Flag.withAlias("m"),
          Flag.withDescription("Installation method to use"),
          Flag.optional,
@@ -75,21 +75,21 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
    Spec.make("uninstall", {
      description: "Uninstall OpenCode and remove all related files",
      params: {
-        keepConfig: Flag.Boolean("keep-config").pipe(
+        keepConfig: Flag.boolean("keep-config").pipe(
          Flag.withAlias("c"),
          Flag.withDescription("Keep configuration files"),
          Flag.withDefault(false),
        ),
-        keepData: Flag.Boolean("keep-data").pipe(
+        keepData: Flag.boolean("keep-data").pipe(
          Flag.withAlias("d"),
          Flag.withDescription("Keep session data and snapshots"),
          Flag.withDefault(false),
        ),
-        dryRun: Flag.Boolean("dry-run").pipe(
+        dryRun: Flag.boolean("dry-run").pipe(
          Flag.withDescription("Show what would be removed without removing"),
          Flag.withDefault(false),
        ),
-        force: Flag.Boolean("force").pipe(
+        force: Flag.boolean("force").pipe(
          Flag.withAlias("f"),
          Flag.withDescription("Skip confirmation prompts"),
          Flag.withDefault(false),
@@ -101,17 +101,17 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
      description: "Make a request to the running server",
      params: {
        ...ServerParams,
-        request: Argument.String("operation | method path").pipe(
+        request: Argument.string("operation | method path").pipe(
          Argument.withDescription("OpenAPI operation ID, or an HTTP method followed by a path"),
          Argument.variadic({ min: 1, max: 2 }),
        ),
-        data: Flag.String("data").pipe(Flag.withAlias("d"), Flag.withDescription("Request body"), Flag.optional),
-        header: Flag.String("header").pipe(
+        data: Flag.string("data").pipe(Flag.withAlias("d"), Flag.withDescription("Request body"), Flag.optional),
+        header: Flag.string("header").pipe(
          Flag.withAlias("H"),
          Flag.withDescription("Request header in name:value form"),
          Flag.atMost(100),
        ),
-        param: Flag.KeyValuePair("param").pipe(Flag.withDescription("OpenAPI path or query parameter"), Flag.optional),
+        param: Flag.keyValuePair("param").pipe(Flag.withDescription("OpenAPI path or query parameter"), Flag.optional),
      },
    }),
    Spec.make("debug", {
@@ -122,7 +122,7 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
        Spec.make("paths", {
          description: "Show global paths (data, config, cache, state)",
          params: {
-            name: Argument.Literals("name", [
+            name: Argument.choice("name", [
              "db",
              "home",
              "data",
@@ -134,9 +134,7 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
              "log",
              "repos",
            ]).pipe(
-              Argument.withDescription(
-                "Print only one path: db, home, data, config, cache, state, tmp, bin, log, repos",
-              ),
+              Argument.withDescription("Print only one path: db, home, data, config, cache, state, tmp, bin, log, repos"),
              Argument.optional,
            ),
          },
@@ -150,7 +148,7 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
          description: "list providers and credentials",
          params: {
            ...ServerParams,
-            format: Flag.Literals("format", ["default", "json"]).pipe(
+            format: Flag.choice("format", ["default", "json"]).pipe(
              Flag.withDescription("Output format"),
              Flag.withDefault("default"),
            ),
@@ -160,12 +158,12 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
          description: "log in to a provider",
          params: {
            ...ServerParams,
-            target: Argument.String("target").pipe(
+            target: Argument.string("target").pipe(
              Argument.withDescription("Integration ID, name, or well-known provider URL"),
              Argument.optional,
            ),
-            method: Flag.String("method").pipe(Flag.withDescription("Authentication method ID"), Flag.optional),
-            answer: Flag.String("answer").pipe(
+            method: Flag.string("method").pipe(Flag.withDescription("Authentication method ID"), Flag.optional),
+            answer: Flag.string("answer").pipe(
              Flag.withDescription("Provider form answer (key=value; repeat for multiple fields)"),
              Flag.atMost(100),
            ),
@@ -175,11 +173,11 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
          description: "log out of a saved account",
          params: {
            ...ServerParams,
-            target: Argument.String("target").pipe(
+            target: Argument.string("target").pipe(
              Argument.withDescription("Integration ID or name"),
              Argument.optional,
            ),
-            credential: Argument.String("credential").pipe(
+            credential: Argument.string("credential").pipe(
              Argument.withDescription("Credential ID or label (opens an account picker when omitted)"),
              Argument.optional,
            ),
@@ -189,11 +187,11 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
          description: "switch the active account for an integration",
          params: {
            ...ServerParams,
-            target: Argument.String("target").pipe(
+            target: Argument.string("target").pipe(
              Argument.withDescription("Integration ID or name"),
              Argument.optional,
            ),
-            credential: Argument.String("credential").pipe(
+            credential: Argument.string("credential").pipe(
              Argument.withDescription("Credential ID or label (opens an account picker when omitted)"),
              Argument.optional,
            ),
@@ -208,21 +206,21 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
        Spec.make("add", {
          description: "Add an MCP server to your configuration",
          params: {
-            name: Argument.String("name").pipe(Argument.withDescription("Name of the MCP server")),
-            command: Argument.String("command").pipe(
+            name: Argument.string("name").pipe(Argument.withDescription("Name of the MCP server")),
+            command: Argument.string("command").pipe(
              Argument.withDescription("Command and arguments for a local server, passed after --"),
              Argument.variadic({ min: 0 }),
            ),
-            url: Flag.String("url").pipe(Flag.withDescription("URL for a remote MCP server"), Flag.optional),
-            header: Flag.KeyValuePair("header").pipe(
+            url: Flag.string("url").pipe(Flag.withDescription("URL for a remote MCP server"), Flag.optional),
+            header: Flag.keyValuePair("header").pipe(
              Flag.withDescription("HTTP header for a remote server, as name=value"),
              Flag.optional,
            ),
-            env: Flag.KeyValuePair("env").pipe(
+            env: Flag.keyValuePair("env").pipe(
              Flag.withDescription("Environment variable for a local server, as name=value"),
              Flag.optional,
            ),
-            global: Flag.Boolean("global").pipe(
+            global: Flag.boolean("global").pipe(
              Flag.withDescription("Write to the global config instead of the project config"),
              Flag.withDefault(false),
            ),
@@ -230,11 +228,11 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
        }),
        Spec.make("auth", {
          description: "Authenticate with an OAuth-capable remote MCP server",
-          params: { name: Argument.String("name").pipe(Argument.withDescription("Name of the MCP server")) },
+          params: { name: Argument.string("name").pipe(Argument.withDescription("Name of the MCP server")) },
        }),
        Spec.make("logout", {
          description: "Remove stored OAuth credentials for an MCP server",
-          params: { name: Argument.String("name").pipe(Argument.withDescription("Name of the MCP server")) },
+          params: { name: Argument.string("name").pipe(Argument.withDescription("Name of the MCP server")) },
        }),
      ],
    }),
@@ -244,7 +242,7 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
        Spec.make("list", {
          description: "List plugins",
          params: {
-            builtin: Flag.Boolean("builtin").pipe(
+            builtin: Flag.boolean("builtin").pipe(
              Flag.withDescription("Include built-in server plugins"),
              Flag.withDefault(false),
            ),
@@ -253,13 +251,13 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
        Spec.make("add", {
          description: "Install a plugin and add it to the global configuration",
          params: {
-            package: Argument.String("package").pipe(Argument.withDescription("npm registry or Git package specifier")),
+            package: Argument.string("package").pipe(Argument.withDescription("npm registry or Git package specifier")),
          },
        }),
        Spec.make("check", {
          description: "Check package plugins for updates",
          params: {
-            target: Argument.String("target").pipe(
+            target: Argument.string("target").pipe(
              Argument.withDescription("Configured package target"),
              Argument.optional,
            ),
@@ -268,7 +266,7 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
        Spec.make("update", {
          description: "Update package plugins",
          params: {
-            target: Argument.String("target").pipe(
+            target: Argument.string("target").pipe(
              Argument.withDescription("Configured package target; omit to update all outdated plugins"),
              Argument.optional,
            ),
@@ -277,7 +275,7 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
        Spec.make("remove", {
          description: "Remove a plugin from global configuration",
          params: {
-            package: Argument.String("package").pipe(Argument.withDescription("configured package specifier")),
+            package: Argument.string("package").pipe(Argument.withDescription("configured package specifier")),
          },
        }),
      ],
@@ -290,108 +288,108 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
      description: "Show shareable usage statistics",
      params: {
        ...ServerParams,
-        days: Flag.Int("days").pipe(
+        days: Flag.integer("days").pipe(
          Flag.withSchema(Schema.Int.check(Schema.isGreaterThanOrEqualTo(0))),
          Flag.withDescription("Show the last N days; 0 means today"),
          Flag.optional,
        ),
-        year: Flag.Int("year").pipe(
+        year: Flag.integer("year").pipe(
          Flag.withSchema(Schema.Int.check(Schema.isBetween({ minimum: 1970, maximum: 9_999 }))),
          Flag.withDescription("Show a calendar year"),
          Flag.optional,
        ),
-        all: Flag.Boolean("all").pipe(Flag.withDescription("Show lifetime statistics"), Flag.withDefault(false)),
-        project: Flag.String("project").pipe(
+        all: Flag.boolean("all").pipe(Flag.withDescription("Show lifetime statistics"), Flag.withDefault(false)),
+        project: Flag.string("project").pipe(
          Flag.withDescription('Filter by project ID, or use "." for the current project'),
          Flag.optional,
        ),
-        models: Flag.Boolean("models").pipe(Flag.withDescription("Show model usage"), Flag.withDefault(false)),
-        tools: Flag.Boolean("tools").pipe(Flag.withDescription("Show tool reliability"), Flag.withDefault(false)),
-        cost: Flag.Boolean("cost").pipe(Flag.withDescription("Show cost and token details"), Flag.withDefault(false)),
-        full: Flag.Boolean("full").pipe(Flag.withDescription("Show every detailed section"), Flag.withDefault(false)),
-        limit: Flag.Int("limit").pipe(
+        models: Flag.boolean("models").pipe(Flag.withDescription("Show model usage"), Flag.withDefault(false)),
+        tools: Flag.boolean("tools").pipe(Flag.withDescription("Show tool reliability"), Flag.withDefault(false)),
+        cost: Flag.boolean("cost").pipe(Flag.withDescription("Show cost and token details"), Flag.withDefault(false)),
+        full: Flag.boolean("full").pipe(Flag.withDescription("Show every detailed section"), Flag.withDefault(false)),
+        limit: Flag.integer("limit").pipe(
          Flag.withSchema(Schema.Int.check(Schema.isGreaterThanOrEqualTo(1))),
          Flag.withDescription("Number of rows in detailed sections"),
          Flag.withDefault(5),
        ),
-        json: Flag.Boolean("json").pipe(Flag.withDescription("Output statistics as JSON"), Flag.withDefault(false)),
+        json: Flag.boolean("json").pipe(Flag.withDescription("Output statistics as JSON"), Flag.withDefault(false)),
      },
    }),
    Spec.make("mini", {
      description: "Start the minimal interactive interface",
      params: {
        ...ServerParams,
-        continue: Flag.Boolean("continue").pipe(
+        continue: Flag.boolean("continue").pipe(
          Flag.withAlias("c"),
          Flag.withDescription("Continue the last session"),
          Flag.withDefault(false),
        ),
-        session: Flag.String("session").pipe(
+        session: Flag.string("session").pipe(
          Flag.withAlias("s"),
          Flag.withDescription("Session ID to continue"),
          Flag.optional,
        ),
-        fork: Flag.Boolean("fork").pipe(
+        fork: Flag.boolean("fork").pipe(
          Flag.withDescription("Fork the session when continuing"),
          Flag.withDefault(false),
        ),
-        replay: Flag.Boolean("replay").pipe(
+        replay: Flag.boolean("replay").pipe(
          Flag.withDescription("Restore session history on resume and resize (disable with --no-replay)"),
          Flag.optional,
        ),
-        replayLimit: Flag.Int("replay-limit").pipe(
+        replayLimit: Flag.integer("replay-limit").pipe(
          Flag.withDescription("Limit replay to the newest N messages (default: 200)"),
          Flag.optional,
        ),
-        model: Flag.String("model").pipe(
+        model: Flag.string("model").pipe(
          Flag.withAlias("m"),
          Flag.withDescription("Model to use in the format provider/model"),
          Flag.optional,
        ),
-        agent: Flag.String("agent").pipe(Flag.withDescription("Agent to use"), Flag.optional),
-        prompt: Flag.String("prompt").pipe(Flag.withDescription("Prompt to use"), Flag.optional),
-        demo: Flag.Boolean("demo").pipe(Flag.withDefault(false), Flag.withHidden),
+        agent: Flag.string("agent").pipe(Flag.withDescription("Agent to use"), Flag.optional),
+        prompt: Flag.string("prompt").pipe(Flag.withDescription("Prompt to use"), Flag.optional),
+        demo: Flag.boolean("demo").pipe(Flag.withDefault(false), Flag.withHidden),
      },
    }),
    Spec.make("run", {
      description: "Run OpenCode with a message",
      params: {
        ...ServerParams,
-        message: Argument.String("message").pipe(
+        message: Argument.string("message").pipe(
          Argument.withDescription("Message to send"),
          Argument.variadic({ min: 0 }),
        ),
-        continue: Flag.Boolean("continue").pipe(
+        continue: Flag.boolean("continue").pipe(
          Flag.withAlias("c"),
          Flag.withDescription("Continue the last session"),
          Flag.withDefault(false),
        ),
-        session: Flag.String("session").pipe(
+        session: Flag.string("session").pipe(
          Flag.withAlias("s"),
          Flag.withDescription("Session ID to continue"),
          Flag.optional,
        ),
-        fork: Flag.Boolean("fork").pipe(
+        fork: Flag.boolean("fork").pipe(
          Flag.withDescription("Fork the session before continuing"),
          Flag.withDefault(false),
        ),
-        model: Flag.String("model").pipe(
+        model: Flag.string("model").pipe(
          Flag.withAlias("m"),
          Flag.withDescription("Model to use in the format provider/model#variant"),
          Flag.optional,
        ),
-        agent: Flag.String("agent").pipe(Flag.withDescription("Agent to use"), Flag.optional),
-        format: Flag.Literals("format", ["default", "json"]).pipe(
+        agent: Flag.string("agent").pipe(Flag.withDescription("Agent to use"), Flag.optional),
+        format: Flag.choice("format", ["default", "json"]).pipe(
          Flag.withDescription("Output format"),
          Flag.withDefault("default"),
        ),
-        file: Flag.String("file").pipe(
+        file: Flag.string("file").pipe(
          Flag.withAlias("f"),
          Flag.withDescription("File to attach to the message"),
          Flag.atMost(100),
        ),
-        title: Flag.String("title").pipe(Flag.withDescription("Session title"), Flag.optional),
-        thinking: Flag.Boolean("thinking").pipe(Flag.withDescription("Show thinking blocks"), Flag.withDefault(false)),
+        title: Flag.string("title").pipe(Flag.withDescription("Session title"), Flag.optional),
+        thinking: Flag.boolean("thinking").pipe(Flag.withDescription("Show thinking blocks"), Flag.withDefault(false)),
        ...PermissionParams,
      },
    }),
@@ -402,13 +400,13 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
          description: "List top-level sessions in the current project, newest first",
          params: {
            ...ServerParams,
-            maxCount: Flag.Int("max-count").pipe(
+            maxCount: Flag.integer("max-count").pipe(
              Flag.withAlias("n"),
              Flag.withSchema(Schema.Int.check(Schema.isGreaterThanOrEqualTo(1))),
              Flag.withDescription("Limit to N most recent sessions (default: 100)"),
              Flag.optional,
            ),
-            format: Flag.Literals("format", ["table", "json"]).pipe(
+            format: Flag.choice("format", ["table", "json"]).pipe(
              Flag.withDescription("Output format"),
              Flag.withDefault("table"),
            ),
@@ -418,18 +416,18 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
          description: "Delete a session and its child sessions",
          params: {
            ...ServerParams,
-            sessionID: Argument.String("sessionID").pipe(Argument.withDescription("Session ID to delete")),
+            sessionID: Argument.string("sessionID").pipe(Argument.withDescription("Session ID to delete")),
          },
        }),
        Spec.make("export", {
          description: "Export session data as JSON",
          params: {
            ...ServerParams,
-            session: Argument.String("session").pipe(
+            session: Argument.string("session").pipe(
              Argument.withDescription("Session ID to export"),
              Argument.optional,
            ),
-            sanitize: Flag.Boolean("sanitize").pipe(
+            sanitize: Flag.boolean("sanitize").pipe(
              Flag.withDescription("Redact sensitive transcript and file data"),
              Flag.withDefault(false),
            ),
@@ -439,8 +437,8 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
          description: "Import session data from a JSON file or URL",
          params: {
            ...ServerParams,
-            file: Argument.String("file").pipe(Argument.withDescription("JSON file or URL to import")),
-            directory: Flag.String("directory").pipe(
+            file: Argument.string("file").pipe(Argument.withDescription("JSON file or URL to import")),
+            directory: Flag.string("directory").pipe(
              Flag.withDescription("Directory in which to import the session"),
              Flag.optional,
            ),
@@ -458,8 +456,8 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
        Spec.make("get", {
          description: "Get service configuration",
          params: {
-            key: Argument.String("key").pipe(Argument.withDescription("Service setting or env"), Argument.optional),
-            name: Argument.String("name").pipe(
+            key: Argument.string("key").pipe(Argument.withDescription("Service setting or env"), Argument.optional),
+            name: Argument.string("name").pipe(
              Argument.withDescription("Environment variable name"),
              Argument.optional,
            ),
@@ -468,11 +466,11 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
        Spec.make("set", {
          description: "Set service configuration",
          params: {
-            key: Argument.String("key").pipe(Argument.withDescription("Service setting or env")),
-            value: Argument.String("value").pipe(
+            key: Argument.string("key").pipe(Argument.withDescription("Service setting or env")),
+            value: Argument.string("value").pipe(
              Argument.withDescription("Setting value or environment variable name"),
            ),
-            nestedValue: Argument.String("env-value").pipe(
+            nestedValue: Argument.string("env-value").pipe(
              Argument.withDescription("Environment variable value"),
              Argument.optional,
            ),
@@ -481,8 +479,8 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
        Spec.make("unset", {
          description: "Unset service configuration",
          params: {
-            key: Argument.String("key").pipe(Argument.withDescription("Service setting or env")),
-            name: Argument.String("name").pipe(
+            key: Argument.string("key").pipe(Argument.withDescription("Service setting or env")),
+            name: Argument.string("name").pipe(
              Argument.withDescription("Environment variable name"),
              Argument.optional,
            ),
@@ -499,7 +497,7 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
    Spec.make("pair", {
      description: "Show server pairing information",
      params: {
-        url: Flag.String("url").pipe(
+        url: Flag.string("url").pipe(
          Flag.withDescription("Advertise an external HTTP(S) server URL in the pairing QR code"),
          Flag.mapTryCatch(
            (value) => {
@@ -517,15 +515,15 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
    Spec.make("serve", {
      description: "Start the v2 API and web server",
      params: {
-        hostname: Flag.String("hostname").pipe(Flag.optional),
-        port: Flag.Int("port").pipe(Flag.optional),
-        cors: Flag.String("cors").pipe(
+        hostname: Flag.string("hostname").pipe(Flag.optional),
+        port: Flag.integer("port").pipe(Flag.optional),
+        cors: Flag.string("cors").pipe(
          Flag.withSchema(Schema.NonEmptyString),
          Flag.withDescription("Additional allowed CORS origin (repeat for multiple origins)"),
          Flag.atLeast(0),
        ),
-        service: Flag.Boolean("service").pipe(Flag.withDefault(false)),
-        stdio: Flag.Boolean("stdio").pipe(Flag.withDefault(false)),
+        service: Flag.boolean("service").pipe(Flag.withDefault(false)),
+        stdio: Flag.boolean("stdio").pipe(Flag.withDefault(false)),
      },
    }),
  ],
@@ -7,8 +7,8 @@ import { Config } from "effect"
 // The opencode server password: sent by clients connecting to an explicit
 // --server, and adopted by a manually run or standalone server. The legacy
 // name is still honored.
-export const password = Config.Redacted("OPENCODE_PASSWORD").pipe(
-  Config.orElse(() => Config.Redacted("OPENCODE_SERVER_PASSWORD")),
+export const password = Config.redacted("OPENCODE_PASSWORD").pipe(
+  Config.orElse(() => Config.redacted("OPENCODE_SERVER_PASSWORD")),
  Config.withDefault(undefined),
 )

@@ -4,7 +4,6 @@ import { Service, type Info } from "@opencode/client/effect/service"
 import path from "node:path"
 import { Effect, FileSystem, Schedule, Schema } from "effect"
 import { HttpServer } from "effect/unstable/http"
-import { NetAddress } from "effect/unstable/net"
 import { OPENCODE_VERSION } from "../version"

 const infoJson = Schema.fromJsonString(Service.Info)
@@ -12,7 +11,7 @@ const encodeInfo = Schema.encodeEffect(infoJson)
 const decodeInfo = Schema.decodeUnknownEffect(infoJson)

 export const register = Effect.fnUntraced(function* (options: {
-  readonly address: NetAddress.SocketAddress
+  readonly address: HttpServer.Address
  readonly password: string
  readonly id: string
  readonly file: string
@@ -1,6 +1,5 @@
 import { NodeSocket } from "@effect/platform-node"
 import { Effect, Schema, Stdio, Stream } from "effect"
-import { Socket } from "effect/unstable/socket"

 const Response = Schema.fromJsonString(Schema.Struct({ value: Schema.NullOr(Schema.String) }))
 const Port = Schema.NumberFromString.check(Schema.isInt(), Schema.isGreaterThan(0), Schema.isLessThanOrEqualTo(65535))
@@ -11,15 +10,16 @@ export const askpass = Effect.gen(function* () {
  const port = yield* Schema.decodeUnknownEffect(Port)(process.env.OPENCODE_SSH_ASKPASS_PORT)
  const stdio = yield* Stdio.Stdio
  const socket = yield* NodeSocket.makeNet({ host: "127.0.0.1", port })
-  const writer = yield* socket.writer
+  const write = yield* socket.writer
  const response = { text: "" }
  yield* Effect.all(
    [
-      Effect.gen(function* () {
-        const pull = yield* Socket.readerString(socket)
-        while (true) response.text += (yield* pull).join("")
-      }).pipe(Effect.catchReason("SocketError", "SocketCloseError", () => Effect.void)),
-      writer.write(
+      socket.runString((text) =>
+        Effect.sync(() => {
+          response.text += text
+        }),
+      ),
+      write(
        JSON.stringify({
          token: process.env.OPENCODE_SSH_ASKPASS_TOKEN,
          text: process.argv.slice(2).join(" "),
@@ -4,7 +4,6 @@ import { Global } from "@opencode/util/global"
 import { OPENCODE_VERSION } from "../src/version"
 import { expect, test } from "bun:test"
 import { Effect, Schema } from "effect"
-import { NetAddress } from "effect/unstable/net"
 import fs from "node:fs/promises"
 import os from "node:os"
 import path from "node:path"
@@ -502,7 +501,7 @@ test("service registration replaces a stale owner with the bound address", async
  try {
    const cleanup = await Effect.runPromise(
      ServiceRegistration.register({
-        address: NetAddress.inetAddressFromIpStringUnsafe("127.0.0.1", 4321),
+        address: { _tag: "TcpAddress", hostname: "127.0.0.1", port: 4321 },
        password: "secret",
        id: "owner",
        file: registration,
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/client",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -37,7 +37,7 @@
    "@opencode/protocol": "workspace:*"
  },
  "peerDependencies": {
-    "effect": "4.0.0-rc.115",
+    "effect": "4.0.0-rc.112",
    "solid-js": ">=1.9.0"
  },
  "peerDependenciesMeta": {
@@ -180,8 +180,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
      on any other value throws a catchable `TypeError` naming the callee: other built-in functions such as `Number`
      say `new` is unsupported and point at the plain call, user-defined functions report the constructor gap below,
      and non-callable values are not constructors. Error constructors take the ES2022 options object, so
-      `new Error(message, { cause })` installs a non-enumerable `cause` when the option is present. `Error.isError`
-      is true for every Error value.
+      `new Error(message, { cause })` installs a non-enumerable `cause` when the option is present.
 - [x] Arithmetic operators: `+`, `-`, `*`, `/`, `%`, and `**`.
 - [x] Equality and ordering: `==`, `!=`, `===`, `!==`, `<`, `<=`, `>`, and `>=`.
 - [x] Bitwise operators: `&`, `|`, `^`, `~`, `<<`, `>>`, and `>>>`.
@@ -271,8 +270,8 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 - [x] `Object.is` for supported data values.
 - [x] `Object.groupBy` over finite collections and custom synchronous iterators/generators, with string-key coercion
      and plain-object results.
- [x] `Object.prototype` methods on values: `toString` (`"[object Array]"`), `toLocaleString` (calls the value's
-      `toString`, as in JS), `valueOf`, `hasOwnProperty`, `isPrototypeOf`, and `propertyIsEnumerable`.
+- [x] `Object.prototype` methods on values: `toString` (`"[object Array]"`), `toLocaleString`, `valueOf`,
+      `hasOwnProperty`, `isPrototypeOf`, and `propertyIsEnumerable`.

 ## Arrays

@@ -286,8 +285,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
      `lastIndexOf`.
 - [x] Aggregation: `reduce` and `reduceRight`.
 - [x] Ordering: `sort`, `toSorted`, `reverse`, and `toReversed`.
- [x] Access/copying: `at`, `slice`, `concat`, `flat`, `with`, `join`, and `toLocaleString` (each element's
-      `toLocaleString`, holes and nullish elements as empty strings).
+- [x] Access/copying: `at`, `slice`, `concat`, `flat`, `with`, and `join`.
 - [x] Mutation: `push`, `pop`, `shift`, `unshift`, `splice`, `fill`, and `copyWithin`.
 - [x] `keys`, `values`, `entries`, and `[Symbol.iterator]` (the same function as `values`) return live iterator objects
      with `next()` and `[Symbol.iterator]`, as in JS. Iterator objects are opaque references: they print as
@@ -310,8 +308,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262

 ## Strings

- [x] Case/normalization: `toLowerCase`, `toUpperCase`, `normalize`, and the `toLocaleLowerCase`/`toLocaleUpperCase`
-      aliases, which ignore their locale argument and apply the default Unicode casing.
+- [x] Case/normalization: `toLowerCase`, `toUpperCase`, `normalize`.
 - [x] Trimming: `trim`, `trimStart`, and `trimEnd`, plus the Annex B `trimLeft` and `trimRight` aliases.
 - [x] Searching/tests: `includes`, `startsWith`, `endsWith`, `indexOf`, `lastIndexOf`, and `search`.
 - [x] Slicing/access: `slice`, `substring`, Annex B `substr`, `at`, `charAt`, `charCodeAt`, and `codePointAt`.
@@ -335,8 +332,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 - [x] Coercion functions: `Number`, `parseInt`, and `parseFloat`.
 - [x] Number predicates/parsers: `Number.isInteger`, `Number.isFinite`, `Number.isNaN`, `Number.isSafeInteger`,
      `Number.parseInt`, and `Number.parseFloat`.
- [x] Number formatting: `toFixed`, `toPrecision`, `toExponential`, `toString`, `valueOf`, and `toLocaleString`, which
-      always formats as `en-US` (`"1,234.5"`) so output does not depend on the host.
+- [x] Number formatting: `toFixed`, `toPrecision`, `toExponential`, `toString`, and `valueOf`.
 - [x] Number constants: `MAX_SAFE_INTEGER`, `MIN_SAFE_INTEGER`, `MAX_VALUE`, `MIN_VALUE`, `EPSILON`, `NaN`,
      `POSITIVE_INFINITY`, and `NEGATIVE_INFINITY`.
 - [x] Math constants: `PI`, `E`, `LN2`, `LN10`, `LOG2E`, `LOG10E`, `SQRT2`, and `SQRT1_2`.
@@ -383,8 +379,6 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
      `TimeClip` behavior.
 - [x] `Date.prototype.toUTCString` and its `toGMTString` alias.
 - [x] `toDateString` and `toTimeString` in the host's local timezone.
- [x] `toLocaleString`, `toLocaleDateString`, and `toLocaleTimeString` always format as `en-US` in UTC
-      (`"1/1/1970, 12:00:00 AM"`) so output does not depend on the host.
 - [x] Native one-argument Date coercion for supported values, including booleans, null, arrays, and plain objects.
 - [ ] Date setters and multi-argument construction coerce object arguments through `valueOf`/`toString` and surface
      their throws.
@@ -410,7 +404,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262

 - [x] Static `Map.groupBy` over finite collections and custom synchronous iterators/generators, preserving key identity.
 - [x] `new Map()` from synchronous iterables of entries.
- [x] Map `get`, `set`, `has`, `delete`, `clear`, `size`, `forEach`, `getOrInsert`, and `getOrInsertComputed`.
+- [x] Map `get`, `set`, `has`, `delete`, `clear`, `size`, and `forEach`.
 - [x] `new Set()` from synchronous iterables.
 - [x] Set `add`, `has`, `delete`, `clear`, `size`, and `forEach`.
 - [x] Live `keys`, `values`, `entries`, and `[Symbol.iterator]` iterators for Map and Set; a Set-like operand's `keys()`
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/codemode",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "description": "Effect-native confined code execution over schema-described tools",
  "type": "module",
  "license": "MIT",
@@ -1,7 +1,6 @@
 import { Effect, Exit } from "effect"
 import { coerceToNumber, coerceToString } from "../stdlib/value.js"
 import type { Interpreter } from "./interpreter.js"
-import { primitivePrototype } from "./intrinsics.js"
 import { typeError } from "./model.js"
 import { Callable, get, Native, DateObj, Obj } from "./objects.js"
 import { typeofValue } from "./references.js"
@@ -44,13 +43,6 @@ export const toPrimitive = <R>(
  })
 }

-/** Invoke(value, name): calls the method the value would find through its prototype. */
-export const invoke = <R>(ctx: Interpreter<R>, value: unknown, name: string, label: string) => {
-  const target = value instanceof Obj ? value : primitivePrototype(ctx.builtins, value)
-  if (target === undefined) throw typeError(`${label} called on null or undefined.`)
-  return ctx.call(get(target, name), value, [])
-}
-
 export const toPrimitiveString = <R>(ctx: Interpreter<R>, value: unknown) =>
  Effect.map(toPrimitive(ctx, value, "string"), coerceToString)

@@ -168,7 +168,6 @@ export const errorGlobal = <R>(type: ErrorType, ctx: Interpreter<R>) => {
    methods(builtins, prototype, [
      ["toString", 0, (thisValue) => errorToString(receiver(Obj, thisValue, "Error.prototype.toString"))],
    ])
-    methods(builtins, ctor, [["isError", 1, (_, args) => args[0] instanceof ErrorObj]])
  }
  return ctor
 }
@@ -62,7 +62,7 @@ import {
 } from "./model.js"
 import { checkStringLength } from "./limits.js"
 import { locate, materialize } from "./errors.js"
-import { type Builtins, primitivePrototype } from "./intrinsics.js"
+import type { Builtins } from "./intrinsics.js"
 import { globals } from "./globals.js"
 import {
  assign,
@@ -2071,14 +2071,16 @@ class Frame<R> {

      if (objectValue instanceof Obj) return { target: objectValue, key, receiver: objectValue }

-      // Strings own length and indexes; every other primitive property reads through the wrapper prototype.
+      // Primitives read through their wrapper prototype without being boxed; strings own length and indexes.
+      const builtins = self.ctx.builtins
      if (typeof objectValue === "string") {
        if (key === "length") return { value: objectValue.length }
        const index = typeof key === "symbol" ? undefined : parseArrayIndex(key)
        if (index !== undefined) return { value: objectValue[index] }
+        return { target: builtins.String, key, receiver: objectValue }
      }
-      const proto = primitivePrototype(self.ctx.builtins, objectValue)
-      if (proto !== undefined) return { target: proto, key, receiver: objectValue }
+      if (typeof objectValue === "number") return { target: builtins.Number, key, receiver: objectValue }
+      if (typeof objectValue === "boolean") return { target: builtins.Boolean, key, receiver: objectValue }

      if (objectValue === null || objectValue === undefined) {
        throw typeError(`Cannot read properties of ${objectValue} (reading '${String(key)}').`, objectNode)
@@ -52,14 +52,6 @@ export const createErrorValue = (prototype: Obj, message: string | undefined): E
  return value
 }

-/** The prototype a primitive reads its methods from without being boxed; none for null, undefined, and symbols. */
-export const primitivePrototype = (builtins: Builtins, value: unknown): Obj | undefined => {
-  if (typeof value === "string") return builtins.String
-  if (typeof value === "number") return builtins.Number
-  if (typeof value === "boolean") return builtins.Boolean
-  return undefined
-}
-
 export const createBuiltins = (): Builtins => {
  const object = new Obj(null)
  // Function.prototype is itself callable and returns undefined.
@@ -4,7 +4,7 @@ import { checkArrayLength, checkStringLength, MAX_ARRAY_LENGTH } from "../interp
 import { invalidData, IteratorSymbol, rangeError, typeError } from "../interpreter/model.js"
 import { define, get, hidden, Arr, GeneratorObj, IteratorObj, Obj } from "../interpreter/objects.js"
 import { describeValue, rejectCircularInsertion } from "../interpreter/references.js"
-import { applyCollectionCallback, invoke, preserveConsumerError } from "../interpreter/callback.js"
+import { applyCollectionCallback, preserveConsumerError } from "../interpreter/callback.js"
 import type { Interpreter } from "../interpreter/interpreter.js"
 import { compareText } from "../tool-runtime.js"
 import { coerceToNumber, coerceToString } from "./value.js"
@@ -340,19 +340,6 @@ export const arrayGlobal = <R>(ctx: Interpreter<R>) => {
        return target
      },
    ],
-    [
-      "toLocaleString",
-      0,
-      (thisValue) =>
-        Effect.map(
-          Effect.forEach(self(thisValue, "toLocaleString").items, (item) =>
-            item === null || item === undefined
-              ? Effect.succeed("")
-              : Effect.map(invoke(ctx, item, "toLocaleString", "Array.prototype.toLocaleString"), coerceToString),
-          ),
-          (parts) => parts.join(","),
-        ),
-    ],
    ["keys", 0, (thisValue) => new IteratorObj(builtins.Iterator, self(thisValue, "keys").items.keys())],
    ["values", 0, (thisValue) => new IteratorObj(builtins.Iterator, self(thisValue, "values").items.values())],
    [
@@ -145,29 +145,6 @@ export const mapGlobal = <R>(ctx: Interpreter<R>) => {
        return target
      },
    ],
-    [
-      "getOrInsert",
-      2,
-      (thisValue, args) => {
-        const target = self(thisValue, "getOrInsert").map
-        if (!target.has(args[0])) target.set(args[0], args[1])
-        return target.get(args[0])
-      },
-    ],
-    [
-      "getOrInsertComputed",
-      2,
-      (thisValue, args) => {
-        const target = self(thisValue, "getOrInsertComputed").map
-        const apply = applyCollectionCallback(ctx, args[1], "Map.getOrInsertComputed")
-        if (target.has(args[0])) return target.get(args[0])
-        // The callback sees the stored key (-0 is +0) and its result wins over anything it inserted itself.
-        return Effect.map(apply([args[0] === 0 ? 0 : args[0]]), (value) => {
-          target.set(args[0], value)
-          return value
-        })
-      },
-    ],
    ["delete", 1, (thisValue, args) => self(thisValue, "delete").map.delete(args[0])],
    [
      "clear",
@@ -105,13 +105,6 @@ export const dateGlobal = <R>(ctx: Interpreter<R>) => {
    ["toTimeString", 0, (thisValue) => new Date(self(thisValue, "toTimeString").time).toTimeString()],
    ["toUTCString", 0, (thisValue) => new Date(self(thisValue, "toUTCString").time).toUTCString()],
    ["toGMTString", 0, (thisValue) => new Date(self(thisValue, "toGMTString").time).toUTCString()],
-    ...(["toLocaleString", "toLocaleDateString", "toLocaleTimeString"] as const).map(
-      (name): Method => [
-        name,
-        0,
-        (thisValue) => new Date(self(thisValue, name).time)[name]("en-US", { timeZone: "UTC" }),
-      ],
-    ),
    ...getters.map((name): Method => [name, 0, (thisValue) => new Date(self(thisValue, name).time)[name]()]),
    ...setters.map(
      ([name, length]): Method => [
@@ -50,7 +50,6 @@ export const numberGlobal = <R>(ctx: Interpreter<R>) => {
  }
  methods(builtins, builtins.Number, [
    ["toFixed", 1, (thisValue, args) => self(thisValue, "toFixed").toFixed(optNum("toFixed", args[0]))],
-    ["toLocaleString", 0, (thisValue) => self(thisValue, "toLocaleString").toLocaleString("en-US")],
    [
      "toExponential",
      1,
@@ -29,7 +29,7 @@ import {
  set,
 } from "../interpreter/objects.js"
 import { containsOpaqueReference, describeValue, rejectCircularInsertion } from "../interpreter/references.js"
-import { invoke, preserveConsumerError } from "../interpreter/callback.js"
+import { preserveConsumerError } from "../interpreter/callback.js"
 import type { Interpreter } from "../interpreter/interpreter.js"
 import { ToolReference } from "../tool-runtime.js"
 import { groupBy } from "./collections.js"
@@ -196,7 +196,7 @@ export const objectGlobal = <R>(ctx: Interpreter<R>) => {
        true,
    ],
    ["toString", 0, (thisValue) => `[object ${classTag(thisValue)}]`],
-    ["toLocaleString", 0, (thisValue) => invoke(ctx, thisValue, "toString", "Object.prototype.toLocaleString")],
+    ["toLocaleString", 0, (thisValue) => `[object ${classTag(thisValue)}]`],
    [
      "valueOf",
      0,
@@ -150,8 +150,6 @@ export const stringGlobal = <R>(ctx: Interpreter<R>) => {
    simple("valueOf", 0, (value) => value),
    simple("toLowerCase", 0, (value) => value.toLowerCase()),
    simple("toUpperCase", 0, (value) => value.toUpperCase()),
-    simple("toLocaleLowerCase", 0, (value) => value.toLowerCase()),
-    simple("toLocaleUpperCase", 0, (value) => value.toUpperCase()),
    simple("trim", 0, (value) => value.trim()),
    simple("trimStart", 0, (value) => value.trimStart()),
    simple("trimLeft", 0, (value) => value.trimStart()),
@@ -22,16 +22,6 @@ describe("source syntax", () => {
 })

 describe("error identity", () => {
-  test("Error.isError is true for every Error value and nothing else", async () => {
-    expect(
-      await value(`
-        const caught = (() => { try { null.foo } catch (error) { return error } })()
-        return [Error.isError(new Error("x")), Error.isError(new RangeError("x")), Error.isError(caught),
-          Error.isError({ name: "Error", message: "x" }), Error.isError("Error"), Error.isError(null)]
-      `),
-    ).toEqual([true, true, true, false, false, false])
-  })
-
  test("awaiting the same rejected promise twice yields the same error object", async () => {
    expect(
      await value(`
@@ -898,42 +898,6 @@ describe("Map", () => {
    ).toEqual({ a: 3, b: 1, c: 1 })
  })

-  test("getOrInsert and getOrInsertComputed insert only when the key is missing", async () => {
-    expect(
-      await value(`
-      const groups = new Map()
-      groups.getOrInsert("a", []).push(1)
-      groups.getOrInsert("a", []).push(2)
-      let calls = 0
-      const computed = (key) => { calls++; return key + "!" }
-      const first = groups.getOrInsertComputed("b", computed)
-      const second = groups.getOrInsertComputed("b", computed)
-      const zero = groups.getOrInsertComputed(-0, (key) => 1 / key === Infinity)
-      return [[...groups], first, second, calls, zero]
-    `),
-    ).toEqual([
-      [
-        ["a", [1, 2]],
-        ["b", "b!"],
-        [0, true],
-      ],
-      "b!",
-      "b!",
-      1,
-      true,
-    ])
-    expect(
-      await value(`
-      const m = new Map()
-      const outer = m.getOrInsertComputed("k", () => { m.set("k", "inner"); return "outer" })
-      let thrown
-      try { m.getOrInsertComputed("j", () => { throw new Error("boom") }) } catch (error) { thrown = error.message }
-      return [outer, m.get("k"), thrown, m.has("j")]
-    `),
-    ).toEqual(["outer", "outer", "boom", false])
-    expect((await error(`new Map().getOrInsertComputed("k", 5)`)).message).toContain("expects a function callback")
-  })
-
  test("maps serialize to {} at the boundary, like JSON", async () => {
    expect(await value(`return new Map([["a", 1]])`)).toEqual({})
    expect(await value(`return JSON.stringify(new Map([["a", 1]]))`)).toBe("{}")
@@ -1097,7 +1061,7 @@ describe("Uint8Array", () => {
      console.log(b, new Uint8Array())
      return [String(b), b + "", +new Uint8Array([5]), Number.isNaN(Number(b)), b == "1,2", JSON.stringify(b), b.toLocaleString(), typeof b, b instanceof Uint8Array]
    `),
-    ).toEqual(["1,2", "1,2", 5, true, true, '{"0":1,"1":2}', "1,2", "object", true])
+    ).toEqual(["1,2", "1,2", 5, true, true, '{"0":1,"1":2}', "[object Uint8Array]", "object", true])
    expect((await run(`console.log(new Uint8Array([1, 2]), new Uint8Array())`)).logs).toEqual([
      "Uint8Array(2) [1,2] Uint8Array(0) []",
    ])
@@ -1267,49 +1231,6 @@ describe("built-in iterators", () => {
  })
 })

-describe("toLocaleString", () => {
-  test("numbers and dates format as en-US in UTC; everything else falls back to toString", async () => {
-    expect(
-      await value(`
-      return [
-        (1234567.891).toLocaleString(), new Date(0).toLocaleString(), new Date(0).toLocaleDateString(),
-        new Date(0).toLocaleTimeString(), "a".toLocaleString(), true.toLocaleString(), ({}).toLocaleString(),
-        ({ toString: () => "custom" }).toLocaleString(), new Uint8Array([1, 2]).toLocaleString(),
-      ]
-    `),
-    ).toEqual([
-      "1,234,567.891",
-      "1/1/1970, 12:00:00 AM",
-      "1/1/1970",
-      "12:00:00 AM",
-      "a",
-      "true",
-      "[object Object]",
-      "custom",
-      "1,2",
-    ])
-  })
-
-  test("arrays join each element's toLocaleString, skipping holes and nullish elements", async () => {
-    expect(
-      await value(`
-      let calls = 0
-      const item = { toLocaleString() { calls++; return "o" } }
-      return [[1234.5, "x", null, undefined, item, new Date(0)].toLocaleString(), [, item, , item].toLocaleString(), calls]
-    `),
-    ).toEqual(["1,234.5,x,,,o,1/1/1970, 12:00:00 AM", ",o,,o", 3])
-    expect((await error(`const f = ({}).toLocaleString; f()`)).message).toContain(
-      "Object.prototype.toLocaleString called on null or undefined",
-    )
-  })
-
-  test("toLocaleLowerCase and toLocaleUpperCase ignore the locale argument", async () => {
-    expect(
-      await value(`return ["ABC".toLocaleLowerCase("tr"), "abc".toLocaleUpperCase(), "İ".toLocaleLowerCase()]`),
-    ).toEqual(["abc", "ABC", "i̇"])
-  })
-})
-
 describe("stdlib integration", () => {
  test("constructor follows own keys, shadowing, writes, and new", async () => {
    expect(
@@ -225,6 +225,7 @@ built-ins/Array/prototype/splice/S15.4.4.12_A4_T1.js  # Array.prototype.splice c
 built-ins/Array/prototype/splice/S15.4.4.12_A4_T2.js  # Array.prototype.splice called on incompatible receiver a data object.
 built-ins/Array/prototype/splice/S15.4.4.12_A4_T3.js  # Array.prototype.splice called on incompatible receiver a data object.
 built-ins/Array/prototype/splice/create-ctor-non-object.js  # null value Expected a TypeError to be thrown but no exception was thrown at all
+built-ins/Array/prototype/toLocaleString/S15.4.4.3_A1_T1.js  # #1: var n = 0; var obj = {toLocaleString: function() {n++}}; var arr = [undefined, obj, null, obj, o
 built-ins/Array/prototype/toLocaleString/S15.4.4.3_A3_T1.js  # #1: var n = 0; var obj = {toLocaleString: function() {n++}}; Array.prototype[1] = obj; x = [obj]; x.
 built-ins/Array/prototype/toReversed/holes-not-preserved.js  # Actual [4, undefined, 2, undefined, 0] and expected [4, 3, 2, undefined, 0] should have the same con
 built-ins/Array/prototype/toSorted/holes-not-preserved.js  # Actual [1, 3, 4, undefined, undefined] and expected [1, 2, 3, 4, undefined] should have the same con
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/console-app",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/console-core",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/console-function",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/console-mail",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "dependencies": {
    "@jsx-email/all": "2.2.3",
    "@jsx-email/cli": "1.4.3",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/console-support",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "name": "@opencode/core",
  "type": "module",
  "license": "MIT",
@@ -98,8 +98,7 @@
    "@types/bun": "catalog:",
    "@types/node": "catalog:",
    "@types/which": "3.0.4",
-    "drizzle-kit": "catalog:",
-    "fast-check": "catalog:"
+    "drizzle-kit": "catalog:"
  },
  "dependencies": {
    "@ai-sdk/cohere": "3.0.27",
@@ -99,7 +99,7 @@ export const layer = (options?: Options) =>
      const wellknown = yield* WellKnown.Service
      const reloadLock = Semaphore.makeUnsafe(1)
      const updateLock = Semaphore.makeUnsafe(1)
-      const decodeOptions = { errors: "all", onExcessProperty: "ignore" } as const
+      const decodeOptions = { errors: "all", onExcessProperty: "ignore", propertyOrder: "original" } as const
      const decodeInfo = Schema.decodeUnknownOption(Info, decodeOptions)
      const parseInfo = Effect.fn("Config.parseInfo")(function* (text: string, source: string) {
        const errors: ParseError[] = []
@@ -330,8 +330,7 @@ export const layer = (options?: Options) =>
        function* (patch: Patch) {
          const directory = initial.global ?? AbsolutePath.make(globalService.config)
          const candidates = ConfigDiscovery.names.map((name) => path.join(directory, name))
-          const filepath =
-            (yield* Effect.filter(candidates, fs.isFile)).at(-1) ?? path.join(directory, "opencode.jsonc")
+          const filepath = (yield* Effect.filter(candidates, fs.isFile)).at(-1) ?? path.join(directory, "opencode.jsonc")
          const text = (yield* fs.readFileStringSafe(filepath)) ?? "{}\n"
          const updated = yield* Effect.try({
            try: () =>
@@ -42,7 +42,7 @@ export type Result =
    }
  | { readonly type: "rejected"; readonly diagnostics: readonly Diagnostic[] }

-const options = { errors: "all", onExcessProperty: "ignore" } as const
+const options = { errors: "all", onExcessProperty: "ignore", propertyOrder: "original" } as const
 const unsupportedTopLevel = ["logLevel", "server", "subagent_depth", "layout"] as const
 const unsupportedExperimental = [
  "disable_paste_summary",
@@ -196,11 +196,11 @@ function decode(file: { directory: string; filepath: string; primary: boolean },
  const agent = legacy
    ? Option.getOrUndefined(
        Option.map(
-          decodeLegacyAgent({ name, ...markdown.data, prompt: body }, { errors: "all" }),
+          decodeLegacyAgent({ name, ...markdown.data, prompt: body }, { errors: "all", propertyOrder: "original" }),
          ConfigMigrateV1.migrateAgent,
        ),
      )
-    : Option.getOrUndefined(decodeAgent({ ...data, system: body }, { errors: "all" }))
+    : Option.getOrUndefined(decodeAgent({ ...data, system: body }, { errors: "all", propertyOrder: "original" }))
  if (!agent) return
  const info = Option.getOrUndefined(
    decodeConfig({
@@ -48,9 +48,10 @@ const proxy = (value: string, environment: Environment = process.env) => {
  )
 }

-const constructorOptions = (input: Socket.WebSocketConstructorOptions | undefined): WebSocketOptions => {
+const constructorOptions = (input: string | Array<string> | undefined): WebSocketOptions => {
  if (typeof input === "string" || Array.isArray(input)) return { protocols: input }
-  return { headers: input?.headers === undefined ? undefined : Headers.fromInput(input.headers) }
+  // AI routes pass handshake options through Effect's browser-shaped constructor.
+  return (input ?? {}) as WebSocketOptions
 }

 const proxyAgent = (url: string, selectedProxy: string | undefined) => {
@@ -13,7 +13,7 @@ import { ConfigProviderOptionsV1 } from "./provider-options.js"
 import { Provider } from "../../provider.js"
 import { Model } from "../../model.js"

-const decodeOptions = { errors: "all", onExcessProperty: "ignore" } as const
+const decodeOptions = { errors: "all", onExcessProperty: "ignore", propertyOrder: "original" } as const
 const decodeInfo = Schema.decodeUnknownSync(Schema.fromJsonString(Info), decodeOptions)
 const encodeInfo = Schema.encodeSync(Info)
 const decodeAgent = Schema.decodeUnknownSync(Schema.fromJsonString(ConfigAgent.Info), decodeOptions)
@@ -11,8 +11,9 @@ export type Object = Schema.Schema.Type<typeof Object>
 export const Rule = Schema.Union([Action, Object]).annotate({ identifier: "PermissionRuleConfig" })
 export type Rule = Schema.Schema.Type<typeof Rule>

-// Known permission keys get explicit types in the Effect schema for generated docs/types.
-// StructWithRest also accepts custom permission names.
+// Known permission keys get explicit types in the Effect schema for generated
+// docs/types. Runtime config parsing uses Effect's `propertyOrder: "original"`
+// parse option so user key order is preserved for permission precedence.
 const InputObject = Schema.StructWithRest(
  Schema.Struct({
    read: Schema.optional(Rule),
@@ -27,7 +27,6 @@ export function resolve(model: Model.Info, supports: readonly Support[] = [{ typ
 const EFFORTS = ["low", "medium", "high"]
 const ENCRYPTED_REASONING = ["reasoning.encrypted_content"]
 const ADAPTIVE_THINKING = { type: "adaptive", display: "summarized" }
-const ANTHROPIC_OUTPUT_TOKEN_MAX = 32_000

 const variant = (id: string, overlay: Overlay): Variants[number] => ({ id: Model.VariantID.make(id), ...overlay })

@@ -40,9 +39,8 @@ function budgets(
  model: Model.Info,
  support: Extract<Support, { type: "budget_tokens" }>,
  spell: (tokens: number) => Overlay,
-  ceiling = model.limit.output,
 ): Variants {
-  const maximum = Math.min(support.max ?? ceiling - 1, model.limit.output - 1, ceiling - 1)
+  const maximum = Math.min(support.max ?? model.limit.output - 1, model.limit.output - 1)
  if (maximum <= 0) return []
  const high = Math.min(Math.max(support.min ?? 0, Math.floor((maximum + 1) / 2)), maximum)
  return [variant("high", spell(high)), variant("max", spell(maximum))]
@@ -275,12 +273,9 @@ const anthropicMessages: Protocol = (model, support) => {
      return toggle({ settings: { thinking: { type: "disabled" } } }, thinking)
    }
    case "budget_tokens":
-      return budgets(
-        model,
-        support,
-        (tokens) => ({ settings: { thinking: { type: "enabled", budgetTokens: tokens } } }),
-        ANTHROPIC_OUTPUT_TOKEN_MAX,
-      )
+      return budgets(model, support, (tokens) => ({
+        settings: { thinking: { type: "enabled", budgetTokens: tokens } },
+      }))
  }
 }

@@ -386,14 +381,10 @@ const bedrockConverse: Protocol = (model, support) => {
        ? toggle(fields({ thinking: { type: "disabled" } }), fields({ thinking: ADAPTIVE_THINKING }))
        : toggle(fields({ reasoningConfig: { type: "disabled" } }), fields({ reasoningConfig: { type: "enabled" } }))
    case "budget_tokens":
-      return budgets(
-        model,
-        support,
-        (tokens) =>
-          claude
-            ? fields({ thinking: { type: "enabled", budget_tokens: tokens } })
-            : fields({ reasoningConfig: { type: "enabled", budgetTokens: tokens } }),
-        claude ? ANTHROPIC_OUTPUT_TOKEN_MAX : model.limit.output,
+      return budgets(model, support, (tokens) =>
+        claude
+          ? fields({ thinking: { type: "enabled", budget_tokens: tokens } })
+          : fields({ reasoningConfig: { type: "enabled", budgetTokens: tokens } }),
      )
  }
 }
@@ -445,12 +436,9 @@ const bedrockAISDK: Protocol = (model, support) => {
            { settings: { additionalModelRequestFields: { reasoningConfig: { type: "enabled" } } } },
          )
    case "budget_tokens":
-      return budgets(
-        model,
-        support,
-        (tokens) => ({ settings: { reasoningConfig: { type: "enabled", budgetTokens: tokens } } }),
-        claude ? ANTHROPIC_OUTPUT_TOKEN_MAX : model.limit.output,
-      )
+      return budgets(model, support, (tokens) => ({
+        settings: { reasoningConfig: { type: "enabled", budgetTokens: tokens } },
+      }))
  }
 }

@@ -501,11 +489,8 @@ const sapAICore: Protocol = (model, support) => {
      return []
    case "budget_tokens":
      if (id.includes("anthropic"))
-        return budgets(
-          model,
-          support,
-          (tokens) => sap({ additionalModelRequestFields: { thinking: { type: "enabled", budget_tokens: tokens } } }),
-          ANTHROPIC_OUTPUT_TOKEN_MAX,
+        return budgets(model, support, (tokens) =>
+          sap({ additionalModelRequestFields: { thinking: { type: "enabled", budget_tokens: tokens } } }),
        )
      if (id.includes("gemini"))
        return budgets(model, support, (tokens) =>
@@ -2,7 +2,7 @@ import path from "path"
 import fs from "fs/promises"
 import { describe, expect, test } from "bun:test"
 import { Effect, Fiber, Layer, Logger, Schema, Stream } from "effect"
-import { Arbitrary } from "effect/unstable/arbitrary"
+import { FastCheck } from "effect/testing"
 import { Config } from "@opencode/core/config"
 import { Directory, Document, Event, Info } from "@opencode/schema/config"
 import { ConfigModel } from "@opencode/schema/config/model"
@@ -632,22 +632,17 @@ describe("Config", () => {
  })

  test("migrates arbitrary v1 configuration into valid v2 configuration", () => {
-    const result = Effect.runSync(
-      Arbitrary.checkEffect(
-        Arbitrary.schema(ConfigV1.Info),
-        (info) => {
-          const parsed = Schema.decodeUnknownSync(ConfigV1.Info)(
-            Schema.decodeUnknownSync(Schema.fromJsonString(Schema.Unknown))(
-              Schema.encodeUnknownSync(Schema.fromJsonString(Schema.Unknown))(info),
-            ),
-          )
-          Schema.decodeUnknownSync(Info)(ConfigMigrateV1.migrate(parsed), { errors: "all" })
-          return true
-        },
-        { runs: 100 },
-      ),
+    FastCheck.assert(
+      FastCheck.property(Schema.toArbitrary(ConfigV1.Info)(FastCheck), (info) => {
+        const parsed = Schema.decodeUnknownSync(ConfigV1.Info)(
+          Schema.decodeUnknownSync(Schema.fromJsonString(Schema.Unknown))(
+            Schema.encodeUnknownSync(Schema.fromJsonString(Schema.Unknown))(info),
+          ),
+        )
+        Schema.decodeUnknownSync(Info)(ConfigMigrateV1.migrate(parsed), { errors: "all" })
+      }),
+      { numRuns: 100 },
    )
-    expect(Arbitrary.formatCheckFailure(result)).toBeUndefined()
  }, 30_000)

  test("migrates the v1 experimental subagent depth", () => {
@@ -1,10 +1,10 @@
 import { describe, expect, test } from "bun:test"
-import { Duration, Effect, Schema } from "effect"
-import { Arbitrary } from "effect/unstable/arbitrary"
+import { Duration, Schema } from "effect"
+import { FastCheck } from "effect/testing"
 import { ConfigNormalize } from "@opencode/core/config/normalize"
 import { Info } from "@opencode/schema/config"

-const options = { errors: "all", onExcessProperty: "ignore" } as const
+const options = { errors: "all", onExcessProperty: "ignore", propertyOrder: "original" } as const

 function normalized(input: unknown) {
  const result = ConfigNormalize.normalize(input)
@@ -80,21 +80,16 @@ describe("ConfigNormalize", () => {
  })

  test("preserves arbitrary JSON-round-tripped native configuration", () => {
-    const result = Effect.runSync(
-      Arbitrary.checkEffect(
-        Arbitrary.schema(Info),
-        (info) => {
-          const source = JSON.parse(JSON.stringify(Schema.encodeSync(Info)(info)))
-          const result = normalized(source)
-          expect(Schema.decodeUnknownSync(Info)(result.encoded)).toEqual(
-            Schema.decodeUnknownSync(Info)(withoutEmptyCompatibilityContainers(source)),
-          )
-          return true
-        },
-        { runs: 100 },
-      ),
+    FastCheck.assert(
+      FastCheck.property(Schema.toArbitrary(Info)(FastCheck), (info) => {
+        const source = JSON.parse(JSON.stringify(Schema.encodeSync(Info)(info)))
+        const result = normalized(source)
+        expect(Schema.decodeUnknownSync(Info)(result.encoded)).toEqual(
+          Schema.decodeUnknownSync(Info)(withoutEmptyCompatibilityContainers(source)),
+        )
+      }),
+      { numRuns: 100 },
    )
-    expect(Arbitrary.formatCheckFailure(result)).toBeUndefined()
  })

  test("merges named maps by entry and gives valid native entries precedence", () => {
@@ -1018,11 +1018,11 @@ describe("ModelsDevPlugin", () => {
      const budgetModel = yield* modelState.get(Provider.ID.anthropic, Model.ID.make("claude-budget"))
      expect(budgetModel?.variants).toContainEqual({
        id: Model.VariantID.make("high"),
-        settings: { thinking: { type: "enabled", budgetTokens: 16000 } },
+        settings: { thinking: { type: "enabled", budgetTokens: 32000 } },
      })
      expect(budgetModel?.variants).toContainEqual({
        id: Model.VariantID.make("max"),
-        settings: { thinking: { type: "enabled", budgetTokens: 31999 } },
+        settings: { thinking: { type: "enabled", budgetTokens: 63999 } },
      })

      const anthropicEffortModel = yield* modelState.get(Provider.ID.anthropic, Model.ID.make("claude-opus-4.7"))
@@ -1,55 +0,0 @@
-import { expect } from "bun:test"
-import { Agent } from "@opencode/core/agent"
-import { Plugin } from "@opencode/core/plugin"
-import { PluginHost } from "@opencode/core/plugin/host"
-import { PluginPromise } from "@opencode/core/plugin/promise"
-import { Tool } from "@opencode/core/tool"
-import { Session } from "@opencode/schema/session"
-import { SessionMessage } from "@opencode/schema/session-message"
-import { Cause, Deferred, Effect, Exit, Fiber } from "effect"
-import { testEffect } from "../lib/effect"
-import { PluginTestLayer } from "./fixture"
-
-const it = testEffect(PluginTestLayer)
-
-it.live("Promise tool executors receive interruption through their AbortSignal", () =>
-  Effect.gen(function* () {
-    const plugins = yield* Plugin.Service
-    const tools = yield* Tool.Service
-    const started = yield* Deferred.make<AbortSignal>()
-    yield* PluginPromise.fromPromise({
-      id: "cancel-tool",
-      async setup(context) {
-        await context.tool.transform((editor) =>
-          editor.add({
-            name: "wait",
-            description: "Wait until cancelled",
-            input: { type: "object", properties: {}, additionalProperties: false },
-            options: { codemode: false },
-            execute: (_input, context) =>
-              new Promise<never>((_resolve, reject) => {
-                context.signal.addEventListener("abort", () => reject(new Error("cancelled")), { once: true })
-                Effect.runSync(Deferred.succeed(started, context.signal))
-              }),
-          }),
-        )
-      },
-    }).effect(yield* PluginHost.make(plugins))
-
-    const snapshot = yield* tools.snapshot()
-    const fiber = yield* snapshot
-      .execute({
-        sessionID: Session.ID.make("ses_promise_tool_cancel"),
-        agent: Agent.ID.make("build"),
-        messageID: SessionMessage.ID.make("msg_promise_tool_cancel"),
-        call: { type: "tool-call", id: "call_promise_tool_cancel", name: "wait", input: {} },
-      })
-      .pipe(Effect.forkScoped)
-    const signal = yield* Deferred.await(started)
-    expect(signal.aborted).toBe(false)
-    yield* Fiber.interrupt(fiber)
-    const exit = yield* Fiber.await(fiber)
-    expect(signal.aborted).toBe(true)
-    expect(Exit.isFailure(exit) && Cause.hasInterruptsOnly(exit.cause)).toBe(true)
-  }),
-)
@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test"
 import { State } from "@opencode/core/state"
 import { Effect } from "effect"
-import FastCheck from "fast-check"
+import { FastCheck } from "effect/testing"

 type Operation = { multiply: number; add: number }
 type Value = { value: number; order: number[] }
@@ -1042,7 +1042,7 @@ describe("Tool", () => {
              value: Schema.Boolean.pipe(
                Schema.decodeTo(Schema.String, {
                  decode: SchemaGetter.transform((value) => String(value)),
-                  encode: SchemaGetter.transformEffect((value) =>
+                  encode: SchemaGetter.transformOrFail((value) =>
                    value === "valid"
                      ? Effect.succeed(true)
                      : Effect.fail(new SchemaIssue.InvalidValue({ message: "invalid output" }, value)),
@@ -93,15 +93,6 @@ test("recognizes Claude version spellings and future models", () => {
      settings: { effort, thinking: { type: "adaptive", display: "summarized" } },
    })),
  )
-
-  expect(
-    resolve(model("@opencode/ai/providers/anthropic", "claude-haiku-4-5", 64_000), [
-      { type: "budget_tokens", min: 1_024, max: 64_000 },
-    ]),
-  ).toEqual([
-    { id: "high", settings: { thinking: { type: "enabled", budgetTokens: 16_000 } } },
-    { id: "max", settings: { thinking: { type: "enabled", budgetTokens: 31_999 } } },
-  ])
 })

 test("spells Cloudflare AI Gateway variants for their upstream routes", () => {
@@ -1,7 +1,7 @@
 {
  "name": "@opencode/desktop",
  "private": true,
-  "version": "2.0.11",
+  "version": "2.0.10",
  "type": "module",
  "license": "MIT",
  "homepage": "https://opencode.ai",
@@ -103,17 +103,11 @@ export function createBrowserPage(
    revision++
  })
  let closed = false
-  // Whether the native surface holds a real document worth showing. Chromium keeps the
-  // previous document painted until the next one renders, so a shown page stays shown
-  // through later navigations; blank and failed documents hide until a real one is ready.
-  let content = false
-  let failure: { url: string; message: string } | undefined
  const state = (): Browser.Tab => ({
    id: options.id,
-    url: (failure?.url ?? contents.getURL()).slice(0, 16_384),
+    url: contents.getURL().slice(0, 16_384),
    title: contents.getTitle().slice(0, 2_048),
    loading: contents.isLoading(),
-    ...(failure ? { loadError: failure.message } : {}),
    canGoBack: contents.navigationHistory.canGoBack(),
    canGoForward: contents.navigationHistory.canGoForward(),
    generation,
@@ -121,40 +115,16 @@ export function createBrowserPage(
  const publish = () => {
    if (!closed) options.publish()
  }
-  const reset = (event: Electron.Event<{ url: string; isMainFrame: boolean; isSameDocument: boolean }>) => {
+  const reset = (event: Electron.Event<{ isMainFrame: boolean; isSameDocument: boolean }>) => {
    if (!event.isMainFrame || event.isSameDocument) return
-    failure = undefined
    generation++
    documents.clear()
    refs.clear()
    diagnostics.clear()
    publish()
  }
-  const settle = () => {
-    content = contents.getURL() !== "about:blank" && !failure
-    updateVisibility()
-  }
  contents.on("did-start-navigation", reset)
-  contents.on("did-navigate", (_event, url, status, statusText) => {
-    // The server-network proxy answers an unreachable HTTP target with an empty 502. Other
-    // error statuses are real documents from the user's server and stay visible.
-    if (status === 502) failure = { url, message: `${status} ${statusText}`.trim().slice(0, 2_048) }
-    // A blank or failed document paints at commit; a real one waits for dom-ready.
-    if (url === "about:blank" || failure) settle()
-    publish()
-  })
-  contents.on("did-fail-load", (_event, code, description, url, isMainFrame) => {
-    // Cancelled navigation and failed subframes do not replace the current page.
-    if (!isMainFrame || code === -3) return
-    failure = { url, message: description.slice(0, 2_048) }
-    settle()
-    publish()
-  })
-  contents.on("dom-ready", settle)
-  contents.on("did-stop-loading", () => {
-    settle()
-    publish()
-  })
+  contents.on("did-stop-loading", publish)
  contents.on("did-navigate-in-page", publish)
  contents.on("page-title-updated", publish)
  contents.on("render-process-gone", () => {
@@ -282,14 +252,6 @@ export function createBrowserPage(
    corner.setVisible(false)
    win.contentView.addChildView(corner)
  })
-  let visible = false
-  const updateVisibility = () => {
-    // The renderer's layout requests may lag behind navigation; the page decides
-    // whether there is a document worth exposing over the themed background.
-    const show = visible && content
-    view.setVisible(show)
-    corners.forEach((corner) => corner.setVisible(show && !!cornerKey))
-  }
  const ready = Promise.all([
    files.ready,
    ...(options.initialize === false
@@ -340,9 +302,9 @@ export function createBrowserPage(
        )
      })
    },
-    setVisible(value: boolean) {
-      visible = value
-      updateVisibility()
+    setVisible(visible: boolean) {
+      view.setVisible(visible)
+      corners.forEach((corner) => corner.setVisible(visible && !!cornerKey))
    },
    async execute(command: Browser.Command, signal: AbortSignal): Promise<Browser.Result> {
      await ready
@@ -1,5 +1,5 @@
 import { randomUUID } from "node:crypto"
-import { ByteSize, Effect, FileSystem } from "effect"
+import { Effect, FileSystem } from "effect"
 import { nativeT } from "../native/translations"

 export const MAX_ATTACHMENT_BYTES = 20 * 1024 * 1024
@@ -43,7 +43,7 @@ export function readAttachment(filePath: string, maxBytes = MAX_ATTACHMENT_BYTES
      const fs = yield* FileSystem.FileSystem
      const file = yield* fs.open(filePath, { flag: "r" })
      const info = yield* file.stat
-      if (info.size > ByteSize.bytes(maxBytes))
+      if (info.size > FileSystem.Size(maxBytes))
        throw new Error(nativeT("desktop.picker.error.sizeLimit", { limit: MAX_ATTACHMENT_BYTES / 1024 / 1024 }))

      const bytes = new Uint8Array(Number(info.size))
@@ -1,7 +1,6 @@
 import { expect } from "bun:test"
 import { NodeSocket } from "@effect/platform-node"
 import { Deferred, Effect, Fiber, Layer, Queue, Scope, Exit } from "effect"
-import { Socket } from "effect/unstable/socket"
 import { testEffect } from "../../../../core/test/lib/effect"
 import { createAskpass } from "./askpass"

@@ -13,15 +12,16 @@ const request = Effect.fn("test.askpass.request")(function* (
  confirm = false,
 ) {
  const socket = yield* NodeSocket.makeNet({ host: "127.0.0.1", port: Number(env.OPENCODE_SSH_ASKPASS_PORT) })
-  const writer = yield* socket.writer
+  const write = yield* socket.writer
  const result = { text: "" }
  yield* Effect.all(
    [
-      Effect.gen(function* () {
-        const pull = yield* Socket.readerString(socket)
-        while (true) result.text += (yield* pull).join("")
-      }).pipe(Effect.ignore),
-      writer.write(JSON.stringify({ token: env.OPENCODE_SSH_ASKPASS_TOKEN, text, confirm }) + "\n").pipe(Effect.ignore),
+      socket
+        .runString((text) => {
+          result.text += text
+        })
+        .pipe(Effect.ignore),
+      write(JSON.stringify({ token: env.OPENCODE_SSH_ASKPASS_TOKEN, text, confirm }) + "\n").pipe(Effect.ignore),
    ],
    { concurrency: "unbounded" },
  )
@@ -1,6 +1,5 @@
 import { NodeSocketServer } from "@effect/platform-node"
 import { Deferred, Effect, Fiber, Schema, Semaphore } from "effect"
-import { Socket } from "effect/unstable/socket"
 import { randomUUID } from "node:crypto"
 import { SshFailure } from "./command"

@@ -17,27 +16,23 @@ export const createAskpass = Effect.fn("Ssh.askpass")(function* (input: {
  const pending = new Map<string, Deferred.Deferred<string>>()
  const prompts = yield* Semaphore.make(1)
  const server = yield* NodeSocketServer.make({ host: "127.0.0.1", port: 0 }).pipe(Effect.mapError(SshFailure.from))
-  if (server.address._tag === "UnixPathAddress") return yield* Effect.fail(new SshFailure("connection"))
+  if (server.address._tag !== "TcpAddress") return yield* Effect.fail(new SshFailure("connection"))

  const serving = yield* server
    .run((socket) =>
      Effect.gen(function* () {
        const request = yield* Deferred.make<string, SshFailure>()
        const state = { buffer: "", received: false }
-        const reader = yield* Effect.gen(function* () {
-          const pull = yield* Socket.readerString(socket)
-          while (true) {
-            const chunks = yield* pull
-            for (const chunk of chunks) {
-              if (state.received) return yield* Effect.fail(new SshFailure("connection"))
-              state.buffer += chunk
-              if (state.buffer.length > 16_384) return yield* Effect.fail(new SshFailure("connection"))
-              if (!state.buffer.includes("\n")) continue
-              state.received = true
-              yield* Deferred.succeed(request, state.buffer.trim())
-            }
-          }
-        }).pipe(Effect.ensuring(Deferred.fail(request, new SshFailure("connection"))), Effect.forkScoped)
+        const reader = yield* socket
+          .runString((chunk) => {
+            if (state.received) return Effect.fail(new SshFailure("connection"))
+            state.buffer += chunk
+            if (state.buffer.length > 16_384) return Effect.fail(new SshFailure("connection"))
+            if (!state.buffer.includes("\n")) return Effect.void
+            state.received = true
+            return Deferred.succeed(request, state.buffer.trim())
+          })
+          .pipe(Effect.ensuring(Deferred.fail(request, new SshFailure("connection"))), Effect.forkScoped)
        const message = yield* Deferred.await(request).pipe(Effect.flatMap(Schema.decodeUnknownEffect(Request)))
        if (message.token !== token) return

@@ -54,8 +49,8 @@ export const createAskpass = Effect.fn("Ssh.askpass")(function* (input: {
              )
              yield* input.prompt({ id, text: message.text, confirm: message.confirm })
              const value = yield* Deferred.await(response)
-              const writer = yield* socket.writer
-              yield* writer.write(JSON.stringify({ value }))
+              const write = yield* socket.writer
+              yield* write(JSON.stringify({ value }))
            }).pipe(Effect.scoped),
          )
          .pipe(Effect.raceFirst(Fiber.join(reader).pipe(Effect.andThen(Effect.fail(new SshFailure("connection"))))))
@@ -1,5 +1,5 @@
 import { expect } from "bun:test"
-import { NodeServices } from "@effect/platform-node"
+import { NodeServices, NodeSocketServer } from "@effect/platform-node"
 import { Deferred, Effect, Fiber, FileSystem, Layer, Path, Stream } from "effect"
 import { FetchHttpClient } from "effect/unstable/http"
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
@@ -228,18 +228,17 @@ it.live(
    const path = yield* Path.Path
    const config = path.join(yield* fs.makeTempDirectoryScoped({ prefix: "ssh-handshake-test-" }), "config")
    yield* fs.writeFileString(config, "")
-    const connected = Promise.withResolvers<void>()
-    const closed = Promise.withResolvers<void>()
-    const server = Bun.listen({
-      hostname: "127.0.0.1",
-      port: 0,
-      socket: {
-        open: () => connected.resolve(),
-        data: () => {},
-        close: () => closed.resolve(),
-      },
-    })
-    yield* Effect.addFinalizer(() => Effect.sync(() => server.stop(true)))
+    const connected = yield* Deferred.make<void>()
+    const closed = yield* Deferred.make<void>()
+    const server = yield* NodeSocketServer.make({ host: "127.0.0.1", port: 0 })
+    if (server.address._tag !== "TcpAddress") return yield* Effect.die("missing port")
+    yield* server
+      .run((socket) =>
+        socket
+          .run(() => Effect.void, { onOpen: Deferred.succeed(connected, undefined).pipe(Effect.asVoid) })
+          .pipe(Effect.ensuring(Deferred.succeed(closed, undefined)), Effect.ignore),
+      )
+      .pipe(Effect.forkScoped({ startImmediately: true }))
    const controller = yield* createSshController({
      configs: [],
      binary: "unused",
@@ -247,16 +246,15 @@ it.live(
      save: () => Effect.die("must not save"),
    })
    yield* controller.start(
-      { id: "fixture", target: `ssh -F ${quote(config)} -p ${server.port} 127.0.0.1`, name: "" },
+      { id: "fixture", target: `ssh -F ${quote(config)} -p ${server.address.port} 127.0.0.1`, name: "" },
      1,
    )
-    yield* Effect.promise(() => connected.promise)
-    const waiting = yield* controller.resolve("fixture").pipe(Effect.forkScoped({ startImmediately: true }))
+    yield* Deferred.await(connected)
+    const waiting = yield* controller.resolve("fixture").pipe(Effect.forkScoped)
    yield* controller.disconnect("fixture")
-    yield* Effect.promise(() => closed.promise)
+    yield* Deferred.await(closed)
    expect(yield* Fiber.join(waiting)).toBeNull()
    expect((yield* controller.state()).servers[0]?.stage).toBe("disconnected")
-    yield* controller.close
    return undefined
  }).pipe(Effect.timeout("10 seconds")),
 )
@@ -337,7 +337,7 @@ export const createSshController = Effect.fn("Ssh.controller")(function* (input:

 const freePort = Effect.gen(function* () {
  const server = yield* NodeSocketServer.make({ host: "127.0.0.1", port: 0 })
-  if (server.address._tag === "UnixPathAddress") return yield* Effect.fail(new SshFailure("connection"))
+  if (server.address._tag !== "TcpAddress") return yield* Effect.fail(new SshFailure("connection"))
  return server.address.port
 }).pipe(Effect.scoped)

@@ -31,25 +31,7 @@ async function main() {
  app.setPath("userData", path.join(root, "electron-data"))
  app.on("window-all-closed", () => {})
  await app.whenReady()
-  let unavailable = true
-  let finishLoading: (() => void) | undefined
  const web = createServer((request, response) => {
-    if (request.url === "/loading") {
-      response.writeHead(200, { "content-type": "text/html" })
-      response.write("<!doctype html><html><body>Loading")
-      finishLoading = () => response.end("</body></html>")
-      return
-    }
-    if (request.url === "/finish-loading") {
-      finishLoading?.()
-      finishLoading = undefined
-      response.end()
-      return
-    }
-    if (request.url === "/unreachable" && unavailable) {
-      request.socket.destroy()
-      return
-    }
    if (request.url === "/cors-allowed" || request.url === "/cors-denied") {
      if (request.url === "/cors-allowed") response.setHeader("access-control-allow-origin", "*")
      response.setHeader("content-type", "text/plain")
@@ -222,19 +204,6 @@ async function main() {
    assert.equal((await call("tabs.list", {})).tabs.length, 2)
    const tabID = first.id
    assert.equal(first.url, fixture + "/")
-    assert.equal((await call("navigate", { tabID, url: `${fixture}/unreachable` })).loadError, "502 Bad Gateway")
-    const failed = await until(async () => {
-      const tab = (await call("tabs.list", {})).tabs.find((tab) => tab.id === tabID)
-      return tab?.loadError && !tab.loading ? tab : undefined
-    })
-    assert.equal(failed.url, `${fixture}/unreachable`)
-    assert.equal(failed.loadError, "502 Bad Gateway")
-    await until(async () => inventories.get("suite")?.tabs.find((tab) => tab.id === tabID)?.loadError)
-    assert.equal((await call("tabs.list", {})).tabs.find((tab) => tab.id === second.id)?.loadError, undefined)
-    unavailable = false
-    assert.equal((await call("reload", { tabID })).loadError, undefined)
-    assert.equal((await call("navigate", { tabID, url: fixture })).loadError, undefined)
-    console.log("PASS browser navigation failure state and retry")
    const networkProof = await call("evaluate", {
      tabID,
      script: `(async () => ({
@@ -29,58 +29,6 @@ export async function verifyTargets(win: BrowserWindow, url: string) {
  }
  try {
    await page.ready
-    const started = new Promise<void>((resolve) => page.contents.once("did-navigate", () => resolve()))
-    page.setVisible(true)
-    const navigation = execute({ type: "navigate", tabID, url: url + "/loading" })
-    await started
-    assert(page.state().loading)
-    assert(win.contentView.children.slice(children).every((view) => !view.getVisible()))
-    page.setVisible(true)
-    assert(win.contentView.children.slice(children).every((view) => !view.getVisible()))
-    const stopped = new Promise<void>((resolve) => page.contents.once("did-stop-loading", () => resolve()))
-    await fetch(url + "/finish-loading")
-    await navigation
-    await stopped
-    assert.equal(page.state().loading, false)
-    assert(page.view.getVisible(), "The requested visibility must return after loading finishes")
-    console.log("PASS native loading from a blank page keeps the themed background visible until the document is ready")
-    const again = new Promise<void>((resolve) => page.contents.once("did-navigate", () => resolve()))
-    const reloading = execute({ type: "navigate", tabID, url: url + "/loading" })
-    await again
-    assert(page.state().loading)
-    assert(page.view.getVisible(), "A shown page must stay visible while the next document loads")
-    await fetch(url + "/finish-loading")
-    await reloading
-    assert(page.view.getVisible())
-    console.log("PASS native loading from a shown page keeps the previous document visible")
-    await execute({ type: "navigate", tabID, url: url + "/missing" })
-    assert.equal(page.state().loadError, undefined, "An HTTP error page from the server is a real document")
-    page.setVisible(true)
-    assert(page.view.getVisible(), "An HTTP error page from the server must stay visible")
-    console.log("PASS native HTTP error pages stay visible")
-    await assert.rejects(execute({ type: "navigate", tabID, url: url + "/unreachable" }), /ERR_EMPTY_RESPONSE/)
-    assert.equal(page.state().loadError, "ERR_EMPTY_RESPONSE")
-    assert.equal(page.state().url, url + "/unreachable")
-    page.setVisible(true)
-    assert(win.contentView.children.slice(children).every((view) => !view.getVisible()))
-    const clearing = new Promise<void>((resolve) => {
-      page.contents.once("did-start-navigation", () => {
-        page.setVisible(true)
-        assert(win.contentView.children.slice(children).every((view) => !view.getVisible()))
-        resolve()
-      })
-    })
-    await execute({ type: "navigate", tabID, url: "about:blank" })
-    await clearing
-    assert.equal(page.state().loadError, undefined)
-    page.setVisible(true)
-    assert(win.contentView.children.slice(children).every((view) => !view.getVisible()))
-    const restored = new Promise<void>((resolve) => page.contents.once("did-stop-loading", () => resolve()))
-    await execute({ type: "navigate", tabID, url })
-    await restored
-    page.setVisible(true)
-    assert(page.view.getVisible())
-    console.log("PASS native blank navigation stays hidden through stale layout updates")
    for (const color of [
      [255, 255, 255, 255],
      [20, 24, 30, 255],
@@ -143,7 +91,6 @@ export async function verifyTargets(win: BrowserWindow, url: string) {

    await execute({ type: "evaluate", tabID, script: "document.querySelector('a[href=\"/download\"]').click()" })
    const fileID = await waitForFile()
-    assert.equal(page.state().loadError, undefined, "A download must not mark the page as unreachable")
    const fileAction: Browser.Action = { type: "files.get", tabID, fileID }
    const original = await inspect(fileAction)
    assert(original.resources.includes(url + "/download"))
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/enterprise",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/function",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -111,18 +111,26 @@ Real applications often select WebSocket URLs inside domain services. Effect rep
 ```ts
 import { NodeSocket } from "@effect/platform-node"
 import { it } from "@effect/vitest"
-import { Effect, Layer } from "effect"
+import { Deferred, Effect, Layer } from "effect"
 import { Socket } from "effect/unstable/socket"
 import { HttpRecorder } from "@opencode/http-recorder"

 const roundTrip = Effect.fn("Echo.roundTrip")(function* (url: string, message: string) {
-  const socket = yield* Socket.makeWebSocket(url)
-  const writer = yield* socket.writer
-  const pull = yield* Socket.readerString(socket)
-  yield* writer.write(message)
-  const [echoed] = yield* pull
-  yield* writer.write(new Socket.CloseEvent(1000, "done"))
-  return echoed
+  const socket = yield* Socket.makeWebSocket(url, { closeCodeIsError: () => false })
+  const write = yield* socket.writer
+  const echoed = yield* Deferred.make<string>()
+
+  yield* socket.runString(
+    (response) => {
+      return Deferred.succeed(echoed, response).pipe(
+        Effect.andThen(write(new Socket.CloseEvent(1000, "done"))),
+        Effect.orDie,
+      )
+    },
+    { onOpen: write(message).pipe(Effect.orDie) },
+  )
+
+  return yield* Deferred.await(echoed)
 })

 it.effect("round trips a message", () =>
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "name": "@opencode/http-recorder",
  "description": "Record and replay Effect HTTP and WebSocket traffic with deterministic cassettes",
  "type": "module",
@@ -52,7 +52,7 @@
    "typescript": "catalog:"
  },
  "dependencies": {
-    "@effect/platform-node-shared": "4.0.0-rc.115"
+    "@effect/platform-node-shared": "4.0.0-rc.112"
  },
  "peerDependencies": {
    "effect": "catalog:"
@@ -1,5 +1,5 @@
 import { NodeFileSystem } from "@effect/platform-node-shared"
-import { Deferred, Effect, Exit, Layer, Ref, Scope, Semaphore } from "effect"
+import { Deferred, Effect, Exit, FiberSet, Layer, Option, Ref, Scope, Semaphore } from "effect"
 import { Socket } from "effect/unstable/socket"
 import { fileSystem, type Interface, Service } from "../cassette/store.js"
 import type { SocketRecorderOptions } from "../options.js"
@@ -28,7 +28,7 @@ interface ActiveRecording {
 interface PendingRecordings {
  readonly promises: Set<Promise<void>>
  readonly errors: Array<unknown>
-  readonly sockets: Set<Socket.WebSocketLike>
+  readonly sockets: Set<globalThis.WebSocket>
 }
 type Frame = string | Uint8Array

@@ -134,6 +134,46 @@ const assertEvent = (actual: WebSocketEvent, expected: WebSocketEvent | undefine
    if (expected && comparable(actual, asJson) === comparable(expected, asJson)) return
    throw new Error(`WebSocket event ${index + 1}: expected ${safeText(expected)}, received ${safeText(actual)}`)
  })
+const runHandler = <A, E, R>(handler: (value: A) => Effect.Effect<unknown, E, R> | void, value: A) =>
+  Effect.suspend(() => {
+    const result = handler(value)
+    return Effect.isEffect(result) ? Effect.asVoid(result) : Effect.void
+  })
+const runReplay = <A, E, R>(
+  state: ActiveReplay,
+  handler: (value: A) => Effect.Effect<unknown, E, R> | void,
+  decode: (event: WebSocketEvent) => A,
+  onOpen: Effect.Effect<void> | undefined,
+) =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const handlers = yield* FiberSet.make<unknown, E>()
+      const run = yield* FiberSet.runtime(handlers)<R>()
+      if (onOpen) yield* onOpen
+      const drive = Effect.gen(function* () {
+        while (true) {
+          const current = yield* Ref.get(state.progress)
+          const event = state.interaction.events[current.position]
+          if (!event) return
+          if (yield* Ref.get(state.closed))
+            return yield* Effect.die(
+              new Error(
+                `WebSocket closed with unconsumed events: used ${current.position} of ${state.interaction.events.length}`,
+              ),
+            )
+          if (event.direction === "server") {
+            yield* Ref.set(state.progress, { position: current.position + 1, changed: yield* Deferred.make<void>() })
+            run(runHandler(handler, decode(event)))
+            continue
+          }
+          yield* Deferred.await(current.changed)
+        }
+      })
+      yield* drive.pipe(Effect.raceFirst(FiberSet.join(handlers)))
+      yield* FiberSet.awaitEmpty(handlers).pipe(Effect.raceFirst(FiberSet.join(handlers)))
+    }),
+  )
+
 const makeRecordingSocket = (
  upstream: Socket.Socket,
  cassette: Interface,
@@ -145,95 +185,71 @@ const makeRecordingSocket = (
    const active = yield* Ref.make<ActiveRecording | undefined>(undefined)
    const writeLock = yield* Semaphore.make(1)
    return Socket.make({
-      reader: Effect.gen(function* () {
-        const state: ActiveRecording = {
-          events: [],
-          eventLock: yield* Semaphore.make(1),
-          accepting: yield* Ref.make(true),
-          opened: false,
-          valid: true,
-        }
-        const occupied = yield* Ref.modify(active, (current) => [current !== undefined, current ?? state])
-        if (occupied) return yield* Effect.die("Concurrent runs of a recorded WebSocket are not supported")
-        yield* Effect.addFinalizer((exit) =>
-          writeLock.withPermit(
-            state.eventLock.withPermit(
-              Effect.gen(function* () {
-                yield* Ref.set(state.accepting, false)
-                yield* Ref.set(active, undefined)
-                if (!Exit.isSuccess(exit) || !state.opened || !state.valid) return
-                yield* cassette
-                  .append(
-                    name,
-                    {
-                      transport: "websocket",
-                      events: [...state.events],
-                    },
-                    options.metadata,
-                  )
-                  .pipe(Effect.orDie)
-              }),
-            ),
-          ),
-        )
-        const reader = yield* upstream.reader
-        state.opened = true
-        return {
-          ...reader,
-          pull: reader.pull.pipe(
-            Effect.tap((messages) =>
-              state.eventLock.withPermit(
-                Effect.sync(() => {
-                  if (!Ref.getUnsafe(state.accepting)) throw new Error("WebSocket received a frame after closing")
-                  state.events.push(...messages.map((message) => redactEvent(encodeEvent("server", message), redactor)))
+      runRaw: (handler, runOptions) =>
+        Effect.gen(function* () {
+          const state: ActiveRecording = {
+            events: [],
+            eventLock: yield* Semaphore.make(1),
+            accepting: yield* Ref.make(true),
+            opened: false,
+            valid: true,
+          }
+          const occupied = yield* Ref.modify(active, (current) => [current !== undefined, current ?? state])
+          if (occupied) return yield* Effect.die("Concurrent runs of a recorded WebSocket are not supported")
+          yield* upstream
+            .runRaw(
+              (message) => {
+                if (!Ref.getUnsafe(state.accepting)) throw new Error("WebSocket received a frame after closing")
+                state.events.push(redactEvent(encodeEvent("server", message), redactor))
+                return handler(message)
+              },
+              {
+                ...runOptions,
+                onOpen: Effect.gen(function* () {
+                  state.opened = true
+                  if (runOptions?.onOpen) yield* runOptions.onOpen
                }),
+              },
+            )
+            .pipe(
+              Effect.onExit((exit) =>
+                writeLock.withPermit(
+                  state.eventLock.withPermit(
+                    Effect.gen(function* () {
+                      yield* Ref.set(state.accepting, false)
+                      yield* Ref.set(active, undefined)
+                      if (!Exit.isSuccess(exit) || !state.opened || !state.valid) return
+                      yield* cassette
+                        .append(
+                          name,
+                          {
+                            transport: "websocket",
+                            events: [...state.events],
+                          },
+                          options.metadata,
+                        )
+                        .pipe(Effect.orDie)
+                    }),
+                  ),
+                ),
              ),
-            ),
-            Effect.tapError((error) =>
-              Effect.sync(() => {
-                if (error.reason._tag !== "SocketCloseError") state.valid = false
-              }),
-            ),
-          ),
-        }
-      }),
+            )
+        }),
      writer: upstream.writer.pipe(
-        Effect.map((writer) => {
-          const write: Socket.Writer["write"] = (message) =>
+        Effect.map(
+          (write) => (message) =>
            writeLock.withPermit(
              Effect.gen(function* () {
-                if (Socket.isCloseEvent(message)) return yield* writer.write(message)
+                if (Socket.isCloseEvent(message)) return yield* write(message)
                const state = yield* Ref.get(active)
                if (!state || !(yield* Ref.get(state.accepting)))
                  return yield* Effect.die("WebSocket writer used without an active socket run")
-                yield* state.eventLock.withPermit(
-                  Effect.sync(() => state.events.push(redactEvent(encodeEvent("client", message), redactor))),
-                )
-                return yield* writer.write(message).pipe(Effect.onError(() => Effect.sync(() => (state.valid = false))))
+                const event = redactEvent(encodeEvent("client", message), redactor)
+                yield* state.eventLock.withPermit(Effect.sync(() => state.events.push(event)))
+                return yield* write(message).pipe(Effect.onError(() => Effect.sync(() => (state.valid = false))))
              }),
-            )
-          return {
-            write,
-            writeAll: (messages) =>
-              writeLock.withPermit(
-                Effect.gen(function* () {
-                  const state = yield* Ref.get(active)
-                  if (!state || !(yield* Ref.get(state.accepting)))
-                    return yield* Effect.die("WebSocket writer used without an active socket run")
-                  yield* state.eventLock.withPermit(
-                    Effect.sync(() =>
-                      state.events.push(
-                        ...messages.map((message) => redactEvent(encodeEvent("client", message), redactor)),
-                      ),
-                    ),
-                  )
-                  return yield* writer
-                    .writeAll(messages)
-                    .pipe(Effect.onError(() => Effect.sync(() => (state.valid = false))))
-                }),
-              ),
-          }
-        }),
+            ),
+        ),
      ),
    })
  })
@@ -249,109 +265,70 @@ const makeReplaySocket = (
    const active = yield* Ref.make<ActiveReplay | undefined>(undefined)
    const runLock = yield* Semaphore.make(1)
    return Socket.make({
-      reader: Effect.gen(function* () {
-        if (!(yield* runLock.takeIfAvailable(1)))
-          return yield* Effect.die("Concurrent runs of a replayed WebSocket are not supported")
-        yield* Effect.addFinalizer(() =>
-          Effect.all([Ref.set(active, undefined), runLock.release(1)], { discard: true }),
-        )
-        const claimed = yield* replay
-          .claim((interaction) => (interaction ? Effect.void : Effect.die("Missing recorded WebSocket interaction")))
-          .pipe(Effect.orDie)
-        const state = {
-          interaction: claimed.interaction,
-          progress: yield* Ref.make({ position: 0, changed: yield* Deferred.make<void>() }),
-          writeLock: yield* Semaphore.make(1),
-          closed: yield* Ref.make(false),
-        }
-        yield* Ref.set(active, state)
-        const pull: Socket.Reader["pull"] = Effect.suspend(() =>
-          Effect.gen(function* () {
-            const current = yield* Ref.get(state.progress)
-            if (yield* Ref.get(state.closed))
-              return yield* Effect.fail(new Socket.SocketError({ reason: new Socket.SocketCloseError({ code: 1000 }) }))
-            const remaining = state.interaction.events.slice(current.position)
-            const client = remaining.findIndex((event) => event.direction === "client")
-            const messages = client === -1 ? remaining : remaining.slice(0, client)
-            if (messages.length > 0) {
-              yield* Ref.set(state.progress, {
-                position: current.position + messages.length,
-                changed: yield* Deferred.make<void>(),
-              })
-              return messages.map(decodeEvent) as [Frame, ...Array<Frame>]
-            }
-            if (current.position === state.interaction.events.length)
-              return yield* Effect.fail(new Socket.SocketError({ reason: new Socket.SocketCloseError({ code: 1000 }) }))
-            yield* Deferred.await(current.changed)
-            return yield* pull
-          }),
-        )
-        return { pull, upgrade: Socket.SocketUpgradeError.unsupported }
-      }),
-      writer: Effect.succeed({
-        write: (message) =>
-          Ref.get(active).pipe(
-            Effect.flatMap((state) =>
-              state
-                ? state.writeLock.withPermit(
-                    Effect.gen(function* () {
-                      const current = yield* Ref.get(state.progress)
-                      if (Socket.isCloseEvent(message)) {
-                        yield* Ref.set(state.closed, true)
-                        yield* Deferred.succeed(current.changed, undefined)
-                        if (current.position === state.interaction.events.length) return
-                        return yield* Effect.die(
-                          new Error(
-                            `WebSocket closed with unconsumed events: used ${current.position} of ${state.interaction.events.length}`,
-                          ),
-                        )
-                      }
-                      const actual = redactEvent(encodeEvent("client", message), redactor)
-                      yield* assertEvent(
-                        actual,
-                        state.interaction.events[current.position],
-                        current.position,
-                        options.compareClientMessagesAsJson === true,
-                      )
-                      yield* Ref.set(state.progress, {
-                        position: current.position + 1,
-                        changed: yield* Deferred.make<void>(),
-                      })
-                      yield* Deferred.succeed(current.changed, undefined)
-                    }),
-                  )
-                : Effect.die("WebSocket writer used without an active socket run"),
+      runRaw: (handler, runOptions) =>
+        runLock
+          .withPermitsIfAvailable(1)(
+            Effect.gen(function* () {
+              const claimed = yield* replay
+                .claim((interaction) =>
+                  interaction ? Effect.void : Effect.die("Missing recorded WebSocket interaction"),
+                )
+                .pipe(Effect.orDie)
+              const state = {
+                interaction: claimed.interaction,
+                progress: yield* Ref.make({ position: 0, changed: yield* Deferred.make<void>() }),
+                writeLock: yield* Semaphore.make(1),
+                closed: yield* Ref.make(false),
+              }
+              yield* Ref.set(active, state)
+              yield* runReplay(state, handler, decodeEvent, runOptions?.onOpen).pipe(
+                Effect.ensuring(Ref.set(active, undefined)),
+              )
+            }),
+          )
+          .pipe(
+            Effect.flatMap(
+              Option.match({
+                onNone: () => Effect.die("Concurrent runs of a replayed WebSocket are not supported"),
+                onSome: () => Effect.void,
+              }),
            ),
          ),
-        writeAll: (messages) =>
-          Effect.forEach(
-            messages,
-            (message) =>
-              Ref.get(active).pipe(
-                Effect.flatMap((state) =>
-                  state
-                    ? state.writeLock.withPermit(
-                        Effect.gen(function* () {
-                          const current = yield* Ref.get(state.progress)
-                          yield* assertEvent(
-                            redactEvent(encodeEvent("client", message), redactor),
-                            state.interaction.events[current.position],
-                            current.position,
-                            options.compareClientMessagesAsJson === true,
-                          )
-                          yield* Ref.set(state.progress, {
-                            position: current.position + 1,
-                            changed: yield* Deferred.make<void>(),
-                          })
-                          yield* Deferred.succeed(current.changed, undefined)
-                        }),
+      writer: Effect.succeed((message) =>
+        Ref.get(active).pipe(
+          Effect.flatMap((state) =>
+            state
+              ? state.writeLock.withPermit(
+                  Effect.gen(function* () {
+                    const current = yield* Ref.get(state.progress)
+                    if (Socket.isCloseEvent(message)) {
+                      yield* Ref.set(state.closed, true)
+                      yield* Deferred.succeed(current.changed, undefined)
+                      if (current.position === state.interaction.events.length) return
+                      return yield* Effect.die(
+                        new Error(
+                          `WebSocket closed with unconsumed events: used ${current.position} of ${state.interaction.events.length}`,
+                        ),
                      )
-                    : Effect.die("WebSocket writer used without an active socket run"),
-                ),
-              ),
-            { discard: true },
+                    }
+                    const actual = redactEvent(encodeEvent("client", message), redactor)
+                    yield* assertEvent(
+                      actual,
+                      state.interaction.events[current.position],
+                      current.position,
+                      options.compareClientMessagesAsJson === true,
+                    )
+                    yield* Ref.set(state.progress, {
+                      position: current.position + 1,
+                      changed: yield* Deferred.make<void>(),
+                    })
+                    yield* Deferred.succeed(current.changed, undefined)
+                  }),
+                )
+              : Effect.die("WebSocket writer used without an active socket run"),
          ),
-      }),
+        ),
+      ),
    })
  })

@@ -422,13 +399,13 @@ const makeRecordingWebSocketConstructor = (
    const onOpen = () => {
      opened = true
    }
-    const onMessage = (event: Socket.WebSocketEvent) => {
+    const onMessage = (event: MessageEvent) => {
      appendEvent("server", event.data)
    }
    const onError = () => {
      failed = true
    }
-    const onClose = (event: Socket.WebSocketEvent) => {
+    const onClose = (event: CloseEvent) => {
      native.removeEventListener("open", onOpen)
      native.removeEventListener("message", onMessage)
      native.removeEventListener("error", onError)
@@ -444,7 +421,7 @@ const makeRecordingWebSocketConstructor = (
              sequence,
              url: request.url,
              protocols: requestedProtocols,
-              close: { code: event.code ?? 1006, reason: event.reason ?? "" },
+              close: { code: event.code, reason: event.reason },
            },
            events: [...events],
          }
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { Deferred, Effect, Exit, Fiber, FiberSet, Layer } from "effect"
+import { Deferred, Effect, Exit, Fiber, Layer } from "effect"
 import { Socket } from "effect/unstable/socket"
 import { existsSync } from "node:fs"
 import { HttpRecorder } from "../src"
@@ -7,58 +7,10 @@ import { layerSocketWithMode } from "../src/websocket/recorder"
 import { failureText, readCassette, seedCassetteDirectory, tempDirectory, withEnvironment } from "./support"

 const unavailableSocket = Socket.make({
-  reader: Effect.die(new Error("unexpected live WebSocket run")),
-  writer: Effect.succeed({
-    write: () => Effect.die(new Error("unexpected live WebSocket write")),
-    writeAll: () => Effect.die(new Error("unexpected live WebSocket write")),
-  }),
+  runRaw: () => Effect.die(new Error("unexpected live WebSocket run")),
+  writer: Effect.succeed(() => Effect.die(new Error("unexpected live WebSocket write"))),
 })

-const runRaw = <E, R>(
-  socket: Socket.Socket,
-  handler: (message: string | Uint8Array) => Effect.Effect<unknown, E, R> | void,
-  onOpen?: Effect.Effect<void, E, R>,
-) =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const handlers = yield* FiberSet.make<unknown, E>()
-      const run = yield* FiberSet.runtime(handlers)<R>()
-      const reader = yield* socket.reader
-      if (onOpen) yield* onOpen
-      yield* Effect.gen(function* () {
-        while (true) {
-          const messages = yield* reader.pull
-          messages.forEach((message) =>
-            run(
-              Effect.suspend(() => {
-                const result = handler(message)
-                return Effect.isEffect(result) ? Effect.asVoid(result) : Effect.void
-              }),
-            ),
-          )
-        }
-      }).pipe(
-        Effect.catchIf(
-          (error) => Socket.SocketError.is(error) && error.reason._tag === "SocketCloseError",
-          () => Effect.void,
-        ),
-        Effect.raceFirst(FiberSet.join(handlers)),
-      )
-      yield* FiberSet.awaitEmpty(handlers).pipe(Effect.raceFirst(FiberSet.join(handlers)))
-    }),
-  )
-
-const runString = <E, R>(
-  socket: Socket.Socket,
-  handler: (message: string) => Effect.Effect<unknown, E, R> | void,
-  onOpen?: Effect.Effect<void, E, R>,
-) =>
-  runRaw(
-    socket,
-    (message) => handler(typeof message === "string" ? message : new TextDecoder().decode(message)),
-    onOpen,
-  )
-
 class EchoWebSocket extends EventTarget {
  readonly protocol = ""
  readonly extensions = ""
@@ -101,13 +53,12 @@ describe("WebSocket", () => {
        Effect.gen(function* () {
          const socket = yield* Socket.makeWebSocket("wss://echo.example.test/one", {
            protocols: ["echo.v1"],
+            closeCodeIsError: () => false,
+          })
+          const write = yield* socket.writer
+          yield* socket.runString(() => write(new Socket.CloseEvent(1000, "complete")).pipe(Effect.orDie), {
+            onOpen: write("hello").pipe(Effect.orDie),
          })
-          const writer = yield* socket.writer
-          yield* runString(
-            socket,
-            () => writer.write(new Socket.CloseEvent(1000, "complete")).pipe(Effect.orDie),
-            writer.write("hello").pipe(Effect.orDie),
-          )
        }).pipe(Effect.scoped, Effect.provide(recorder)),
      ),
    )
@@ -190,15 +141,17 @@ describe("WebSocket", () => {
      Effect.gen(function* () {
        const socket = yield* Socket.makeWebSocket("wss://events.example.test/workspaces/one", {
          protocols: ["events.v1"],
+          closeCodeIsError: () => false,
        })
-        const writer = yield* socket.writer
+        const write = yield* socket.writer
        const received: string[] = []
-        yield* runString(
-          socket,
+        yield* socket.runString(
          (message) => {
            received.push(message)
          },
-          writer.write('{"type":"subscribe"}').pipe(Effect.orDie),
+          {
+            onOpen: write('{"type":"subscribe"}').pipe(Effect.orDie),
+          },
        )
        return received
      }).pipe(Effect.scoped, Effect.provide(recorder)),
@@ -234,7 +187,7 @@ describe("WebSocket", () => {
    const exit = await Effect.runPromise(
      Effect.gen(function* () {
        const socket = yield* Socket.makeWebSocket("wss://events.example.test/workspaces/two")
-        yield* runString<never, never>(socket, () => {})
+        yield* socket.runString(() => {})
      }).pipe(Effect.scoped, Effect.exit, Effect.provide(recorder)),
    )

@@ -247,28 +200,23 @@ describe("WebSocket", () => {
      type: "response.completed",
      token: "server-secret",
    })
-    let sent = false
    const upstream = Socket.make({
-      reader: Effect.succeed({
-        pull: Effect.suspend(() => {
-          if (sent) return Effect.fail(new Socket.SocketError({ reason: new Socket.SocketCloseError({ code: 1000 }) }))
-          sent = true
-          return Effect.succeed([response])
+      runRaw: (handler, options) =>
+        Effect.gen(function* () {
+          if (options?.onOpen) yield* options.onOpen
+          const result = handler(response)
+          if (Effect.isEffect(result)) yield* result
        }),
-        upgrade: Socket.SocketUpgradeError.unsupported,
-      }),
-      writer: Effect.succeed({ write: () => Effect.void, writeAll: () => Effect.void }),
+      writer: Effect.succeed(() => Effect.void),
    })

    await Effect.runPromise(
      Effect.gen(function* () {
        const socket = yield* Socket.Socket
-        const writer = yield* socket.writer
-        yield* runRaw(
-          socket,
-          () => {},
-          writer.write(JSON.stringify({ type: "response.create", token: "client-secret" })).pipe(Effect.orDie),
-        )
+        const write = yield* socket.writer
+        yield* socket.runRaw(() => {}, {
+          onOpen: write(JSON.stringify({ type: "response.create", token: "client-secret" })).pipe(Effect.orDie),
+        })
      }).pipe(
        Effect.scoped,
        Effect.provide(
@@ -331,14 +279,14 @@ describe("WebSocket", () => {
    await Effect.runPromise(
      Effect.gen(function* () {
        const socket = yield* Socket.Socket
-        const writer = yield* socket.writer
-        yield* runRaw(socket, (message) =>
+        const write = yield* socket.writer
+        yield* socket.runRaw((message) =>
          Effect.gen(function* () {
            if (typeof message !== "string") return
            received.push(message)
            const event: unknown = JSON.parse(message)
            if (typeof event !== "object" || event === null || !("type" in event)) return
-            if (event.type === "session.created") yield* writer.write('{"prompt":"hello","type":"response.create"}')
+            if (event.type === "session.created") yield* write('{"prompt":"hello","type":"response.create"}')
          }),
        )
      }).pipe(
@@ -395,21 +343,21 @@ describe("WebSocket", () => {
    await Effect.runPromise(
      Effect.gen(function* () {
        const socket = yield* Socket.Socket
-        const writer = yield* socket.writer
-        yield* runString(socket, (message) =>
+        const write = yield* socket.writer
+        yield* socket.runString((message) =>
          Effect.gen(function* () {
            received.push(message)
            const event: unknown = JSON.parse(message)
            if (typeof event !== "object" || event === null) return
            if ("type" in event && event.type === "session.created") {
-              yield* writer.write('{"prompt":"first","type":"response.create"}')
+              yield* write('{"prompt":"first","type":"response.create"}')
              return
            }
            if ("id" in event && event.id === "first") {
-              yield* writer.write('{"prompt":"second","type":"response.create"}')
+              yield* write('{"prompt":"second","type":"response.create"}')
              return
            }
-            yield* writer.write(new Socket.CloseEvent(1000, "done"))
+            yield* write(new Socket.CloseEvent(1000, "done"))
          }),
        )
      }).pipe(
@@ -445,7 +393,7 @@ describe("WebSocket", () => {
      Effect.gen(function* () {
        const socket = yield* Socket.Socket
        const second = yield* Deferred.make<void>()
-        yield* runString(socket, (message) =>
+        yield* socket.runString((message) =>
          message === "first" ? Deferred.await(second) : Deferred.succeed(second, undefined),
        )
      }).pipe(
@@ -472,21 +420,23 @@ describe("WebSocket", () => {
        const socket = yield* Socket.Socket
        const started = yield* Deferred.make<void>()
        const release = yield* Deferred.make<void>()
-        const first = yield* runString(socket, (message) =>
-          Effect.gen(function* () {
-            received.push(message)
-            yield* Deferred.succeed(started, undefined)
-            yield* Deferred.await(release)
-          }),
-        ).pipe(Effect.forkChild)
+        const first = yield* socket
+          .runString((message) =>
+            Effect.gen(function* () {
+              received.push(message)
+              yield* Deferred.succeed(started, undefined)
+              yield* Deferred.await(release)
+            }),
+          )
+          .pipe(Effect.forkChild)
        yield* Deferred.await(started)

-        const concurrent = yield* Effect.exit(runString(socket, () => Effect.void))
+        const concurrent = yield* Effect.exit(socket.runString(() => Effect.void))
        expect(failureText(concurrent)).toContain("Concurrent runs")

        yield* Deferred.succeed(release, undefined)
        yield* Fiber.join(first)
-        yield* runString(socket, (message) => Effect.sync(() => received.push(message)))
+        yield* socket.runString((message) => Effect.sync(() => received.push(message)))
      }).pipe(
        Effect.scoped,
        Effect.provide(
@@ -512,9 +462,11 @@ describe("WebSocket", () => {
    const exit = await Effect.runPromise(
      Effect.gen(function* () {
        const socket = yield* Socket.Socket
-        const writer = yield* socket.writer
+        const write = yield* socket.writer
        return yield* Effect.exit(
-          runRaw(socket, () => {}, writer.write(new Socket.CloseEvent(1000)).pipe(Effect.orDie)),
+          socket.runRaw(() => {}, {
+            onOpen: write(new Socket.CloseEvent(1000)).pipe(Effect.orDie),
+          }),
        )
      }).pipe(
        Effect.scoped,
@@ -534,7 +486,7 @@ describe("WebSocket", () => {
    const exit = await Effect.runPromise(
      Effect.gen(function* () {
        const socket = yield* Socket.Socket
-        return yield* Effect.exit(runRaw<never, never>(socket, () => {}))
+        return yield* Effect.exit(socket.runRaw(() => {}))
      }).pipe(
        Effect.scoped,
        Effect.provide(
@@ -543,8 +495,8 @@ describe("WebSocket", () => {
              Layer.succeed(
                Socket.Socket,
                Socket.make({
-                  reader: Effect.die(new Error("connection failed")),
-                  writer: Effect.succeed({ write: () => Effect.void, writeAll: () => Effect.void }),
+                  runRaw: () => Effect.die(new Error("connection failed")),
+                  writer: Effect.succeed(() => Effect.void),
                }),
              ),
            ),
@@ -582,14 +534,13 @@ describe("WebSocket", () => {
    await Effect.runPromise(
      Effect.gen(function* () {
        const socket = yield* Socket.Socket
-        const writer = yield* socket.writer
-        const run = runRaw(
-          socket,
+        const write = yield* socket.writer
+        const run = socket.runRaw(
          (message) => {
            if (typeof message === "string") throw new Error("Expected a binary WebSocket frame")
            received.push([...message])
          },
-          writer.write(new Uint8Array([1, 2])).pipe(Effect.orDie),
+          { onOpen: write(new Uint8Array([1, 2])).pipe(Effect.orDie) },
        )
        yield* run
        yield* run
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/httpapi-codegen",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "private": true,
  "type": "module",
  "exports": {
@@ -1,6 +1,6 @@
 import { describe, expect } from "bun:test"
 import { join } from "node:path"
-import { ByteSize, Effect, FileSystem, Option } from "effect"
+import { Effect, FileSystem, Option } from "effect"
 import { write, type Output } from "../src"
 import { it } from "./effect"

@@ -150,7 +150,7 @@ describe("HttpApiCodegen.write", () => {
              uid: Option.none(),
              gid: Option.none(),
              rdev: Option.none(),
-              size: ByteSize.bytes(0),
+              size: FileSystem.Size(0),
              blksize: Option.none(),
              blocks: Option.none(),
            }),
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/latex",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "private": true,
  "type": "module",
  "exports": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/merman",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "private": true,
  "type": "module",
  "exports": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/plugin-browser",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "description": "OpenCode's desktop browser plugin",
  "type": "module",
  "license": "MIT",
@@ -54,7 +54,6 @@ export const Tab = Schema.Struct({
  url: Schema.String.check(Schema.isMaxLength(16_384)),
  title: short,
  loading: Schema.Boolean,
-  loadError: optional(short),
  canGoBack: Schema.Boolean,
  canGoForward: Schema.Boolean,
  generation: count,
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/plugin",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -237,26 +237,25 @@ export function fromPromise(plugin: Plugin) {
        const VcsEndpoints = ClientApi.groups["server.vcs"].endpoints
        const WebSearchEndpoints = ClientApi.groups["server.websearch"].endpoints
        const WorktreeEndpoints = ClientApi.groups["server.worktree"].endpoints
-        const runtime = yield* Effect.context<Scope.Scope>()
+        const context = yield* Effect.context<Scope.Scope>()
        const streams = yield* makeStreams()

        // Run a hook registration on the plugin scope and resolve once it is registered.
        const register = (effect: Effect.Effect<HostRegistration, never, Scope.Scope>): Promise<Registration> =>
-          Effect.runPromiseWith(runtime)(effect).then((registration) => ({
-            dispose: () => Effect.runPromiseWith(runtime)(registration.dispose),
+          Effect.runPromiseWith(context)(effect).then((registration) => ({
+            dispose: () => Effect.runPromiseWith(context)(registration.dispose),
          }))

-        const run = <A, E>(effect: Effect.Effect<A, E>) => Effect.runPromiseWith(runtime)(effect)
+        const run = <A, E>(effect: Effect.Effect<A, E>) => Effect.runPromiseWith(context)(effect)

        const promiseExecutor =
          (execute: Tool.Info["execute"]): Info["execute"] =>
          (input, context) =>
-            Effect.runPromiseWith(runtime)(
+            run(
              execute(input, {
                ...context,
                progress: (update) => Effect.promise(() => context.progress(update)),
              }),
-              { signal: context.signal },
            )

        const adaptApiMethod = <PromiseMethod>(
@@ -274,7 +273,7 @@ export function fromPromise(plugin: Plugin) {
              const result = yield* method(Object.assign({}, ...decoded) as never)
              if (compiled.noContent) return undefined
              return yield* compiled.encode(result)
-            }).pipe(Effect.runPromiseWith(runtime))) as PromiseMethod
+            }).pipe(Effect.runPromiseWith(context))) as PromiseMethod
        }

        const transform =
@@ -425,8 +424,8 @@ export function fromPromise(plugin: Plugin) {
              ),
            reload: () => run(host.integration.reload()),
            connection: {
-              active: (id) => Effect.runPromiseWith(runtime)(host.integration.connection.active(id)),
-              resolve: (connection) => Effect.runPromiseWith(runtime)(host.integration.connection.resolve(connection)),
+              active: (id) => Effect.runPromiseWith(context)(host.integration.connection.active(id)),
+              resolve: (connection) => Effect.runPromiseWith(context)(host.integration.connection.resolve(connection)),
            },
          },
          mcp: {
@@ -613,10 +612,9 @@ function attempt<A>(evaluate: (signal: AbortSignal) => PromiseLike<A>) {
 type RuntimeSchema = Schema.Codec<unknown, unknown>

 const executePromiseTool = (tool: Info, input: any, context: Tool.Context) =>
-  Effect.promise((signal) =>
+  Effect.promise(() =>
    tool.execute(input, {
      ...context,
-      signal,
-      progress: (update) => Effect.runPromise(context.progress(update), { signal }),
+      progress: (update) => Effect.runPromise(context.progress(update)),
    }),
  )
@@ -9,7 +9,6 @@ import type { Types } from "effect"
 import type { Hooks, Transform } from "./registration.js"

 export interface ToolContext extends Omit<Tool.Context, "progress"> {
-  readonly signal: AbortSignal
  readonly progress: (update: Tool.Metadata) => Promise<void>
 }

@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/protocol",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/schema",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "name": "@opencode/sdk",
  "type": "module",
  "license": "MIT",
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/server",
-  "version": "2.0.11",
+  "version": "2.0.10",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -124,7 +124,7 @@ export const PersistentPtyHandler = HttpApiBuilder.group(Api, "server.experiment
          if (!Number.isSafeInteger(cursor) || cursor < 0) return HttpServerResponse.empty({ status: 400 })

          const socket = yield* Effect.orDie(ctx.request.upgrade)
-          const writer = yield* socket.writer
+          const write = yield* socket.writer
          const outbox = yield* Queue.unbounded<string | Uint8Array | Socket.CloseEvent>()
          const input = yield* Semaphore.make(1)
          let attachment: PersistentPty.Attachment | undefined
@@ -187,52 +187,41 @@ export const PersistentPtyHandler = HttpApiBuilder.group(Api, "server.experiment
          const drain = Effect.gen(function* () {
            while (true) {
              const item = yield* Queue.take(outbox)
-              yield* writer.write(item)
+              yield* write(item)
              if (item instanceof Socket.CloseEvent) return
            }
          })

          yield* runPtySocket(
            drain,
-            Effect.gen(function* () {
-              const reader = yield* socket.reader
-              yield* onOpen
-              while (true) {
-                const messages = yield* reader.pull
-                yield* Effect.forEach(
-                  messages,
-                  (message) =>
-                    input.withPermit(
-                      Effect.suspend(() => {
-                        if (!attachment) return Effect.void
-                        const data = typeof message === "string" ? Buffer.from(message) : message
-                        if (!framedInput)
-                          return pty
-                            .input(
-                              ctx.params.ptyID,
-                              attachmentID,
-                              attachment.info.size.cols,
-                              attachment.info.size.rows,
-                              data,
-                            )
-                            .pipe(Effect.ignore)
-                        if (data.byteLength < 5) return Effect.void
-                        const view = new DataView(data.buffer, data.byteOffset, data.byteLength)
-                        const type = data[0]
-                        const cols = view.getUint16(1)
-                        const rows = view.getUint16(3)
-                        if ((type !== 0 && type !== 1) || cols === 0 || rows === 0) return Effect.void
-                        if (type === 0)
-                          return pty.control(ctx.params.ptyID, attachmentID, cols, rows).pipe(Effect.ignore)
-                        return pty
-                          .input(ctx.params.ptyID, attachmentID, cols, rows, data.subarray(5))
-                          .pipe(Effect.ignore)
-                      }),
-                    ),
-                  { discard: true },
-                )
-              }
-            }),
+            socket.runRaw(
+              (message) =>
+                input.withPermit(
+                  Effect.suspend(() => {
+                    if (!attachment) return Effect.void
+                    const data = typeof message === "string" ? Buffer.from(message) : message
+                    if (!framedInput)
+                      return pty
+                        .input(
+                          ctx.params.ptyID,
+                          attachmentID,
+                          attachment.info.size.cols,
+                          attachment.info.size.rows,
+                          data,
+                        )
+                        .pipe(Effect.ignore)
+                    if (data.byteLength < 5) return Effect.void
+                    const view = new DataView(data.buffer, data.byteOffset, data.byteLength)
+                    const type = data[0]
+                    const cols = view.getUint16(1)
+                    const rows = view.getUint16(3)
+                    if ((type !== 0 && type !== 1) || cols === 0 || rows === 0) return Effect.void
+                    if (type === 0) return pty.control(ctx.params.ptyID, attachmentID, cols, rows).pipe(Effect.ignore)
+                    return pty.input(ctx.params.ptyID, attachmentID, cols, rows, data.subarray(5)).pipe(Effect.ignore)
+                  }),
+                ),
+              { onOpen },
+            ),
            () => attachment?.detach(),
          ).pipe(
            Effect.catchReason("SocketError", "SocketCloseError", () => Effect.void),
@@ -165,17 +165,15 @@ export const PtyHandler = HttpApiBuilder.group(Api, "server.pty", (handlers) =>
              : undefined

          const socket = yield* Effect.orDie(ctx.request.upgrade)
-          const writer = yield* socket.writer
+          const write = yield* socket.writer
          const closeAccepted = (event: Socket.CloseEvent) =>
-            Effect.gen(function* () {
-              const reader = yield* socket.reader
-              yield* writer.write(event).pipe(Effect.catch(() => Effect.void))
-              while (true) yield* reader.pull
-            }).pipe(
-              Effect.timeout("1 second"),
-              Effect.catchReason("SocketError", "SocketCloseError", () => Effect.void),
-              Effect.catch(() => Effect.void),
-            )
+            socket
+              .runRaw(() => Effect.void, { onOpen: write(event).pipe(Effect.catch(() => Effect.void)) })
+              .pipe(
+                Effect.timeout("1 second"),
+                Effect.catchReason("SocketError", "SocketCloseError", () => Effect.void),
+                Effect.catch(() => Effect.void),
+              )

          // Outbound frames flow through one queue drained by a single writer so replay, live
          // output, and the close frame keep their order.
@@ -204,22 +202,16 @@ export const PtyHandler = HttpApiBuilder.group(Api, "server.pty", (handlers) =>
          const drain = Effect.gen(function* () {
            while (true) {
              const item = yield* Queue.take(outbox)
-              yield* writer.write(item)
+              yield* write(item)
              if (item instanceof Socket.CloseEvent) return
            }
          })

          yield* runPtySocket(
            drain,
-            Effect.gen(function* () {
-              const reader = yield* socket.reader
-              while (true) {
-                const messages = yield* reader.pull
-                messages.forEach((message) => {
-                  const decoded = PtyProtocol.decodeInput(message)
-                  if (decoded !== undefined) attachment.write(decoded)
-                })
-              }
+            socket.runRaw((message) => {
+              const decoded = PtyProtocol.decodeInput(message)
+              if (decoded !== undefined) attachment.write(decoded)
            }),
            attachment.detach,
          ).pipe(
@@ -16,7 +16,6 @@ import {
  HttpServerRequest,
  HttpServerResponse,
 } from "effect/unstable/http"
-import { NetAddress } from "effect/unstable/net"
 import { createServer } from "node:http"
 import { ServerAuth } from "./auth"
 import { isAllowedCorsOrigin } from "./cors"
@@ -29,7 +28,7 @@ import type { ServerOptions } from "./options"

 export interface Lifecycle<E = never, R = never> {
  readonly onListen: (
-    address: NetAddress.SocketAddress,
+    address: HttpServer.Address,
    shutdown: Effect.Effect<void>,
  ) => Effect.Effect<Effect.Effect<void>, E, R>
 }
--- a/Show More
+++ b/Show More