perf(desktop): remember window bounds without electron-window-state

electron-window-state pulls jsonfile, mkdirp and the deep-equal tree (~25 packages) into every launch: 26 ms of CommonJS requires in the startup trace before any of our code ran. The desktop only needs the saved bounds, the maximized / fullscreen flags and a manage() that tracks the window until it closes. Implement that in window-state.ts with the same JSON file and validation rules (bounds must still fit a current display, otherwise default size on the primary display) so existing profiles restore where they were. Packaged build, warm service, median of 6 launches: first main-process log line 401 -> 380 ms after spawn.
refactor(core): move native compaction mechanisms into a plugin (#49575 )
2026-09-18 14:56:27 +00:00 · 2026-09-19 00:31:39 +10:00 · 2026-09-18 17:15:44 +05:30 · 2026-09-18 19:32:15 +10:00 · 2026-09-18 09:12:33 +00:00 · 2026-09-18 08:45:27 +00:00
92 changed files with 879 additions and 1006 deletions
@@ -184,6 +184,7 @@ const table = sqliteTable("session", {
 - Keep `SessionRunner`, model resolution, tool registry, permissions, and filesystem Location-scoped. Omitted `Location.workspaceID` means implicit-local placement; explicit workspace identity remains reserved for future placement semantics.
 - Preserve one explicit `llm.stream(request)` call per Physical Attempt and reload projected history before durable continuation. A logical Step may use generic pre-output retries, one full-context retry after continuation rejection, incomplete-stream continuation, or one overflow-compaction rebuild. Generic retries retain the logical step number and do not consume another agent-step allowance. Do not delegate orchestration to an in-memory tool loop.
 - Keep local Session drains process-local until clustering is implemented. `SessionRunCoordinator` joins explicit same-Session resumes, coalesces prompt wakeups, and allows different Sessions to run concurrently. A write-ahead execution claim marks a process-local busy period for restart recovery: terminal completion, failure, or user interruption releases it, while shutdown interruption and process death preserve it. Startup recovery resumes claimed top-level Sessions with durable per-execution attempt accounting. The claim is a recovery marker, not clustered ownership, fencing, or an exactly-once guarantee.
+- Keep native compaction mechanisms out of `SessionCompaction`. Plugins register `native` strategies through the `SessionCompaction` editor that turn a prepared request into a replacement window (the built-in `NativeCompactionPlugin` handles `@opencode/ai` compaction operations); later registrations win. Core owns the provider-mode decision, route provenance, the retry policy, overflow recovery, interruption, usage accounting, and checkpoint persistence.
 - Keep delivery vocabulary explicit. Prompts steer by default. At safe step boundaries, steered compaction takes priority up to the first steered move control; other steers retain enqueue order. At an idle boundary, steers take priority; otherwise exactly one queued item delivers before the runner reevaluates continuation. Inbox items may be cancelled or changed between queue and steer before delivery. Promoting new user input resets the selected agent's step allowance; a batch of steers resets it once.
 - One step is one logical LLM call; its durable record covers only the model-visible span. Do not write "provider turn", and do not use bare "turn" for a single call: "turn" is reserved for the future assistant-turn unit containing all steps from prompt promotion until the session would go idle.
 - Keep event replay ownership separate from clustered Session execution ownership.
@@ -32,7 +32,7 @@
    },
    "packages/ai": {
      "name": "@opencode/ai",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@aws-sdk/credential-providers": "3.1057.0",
        "@opencode/schema": "workspace:*",
@@ -54,7 +54,7 @@
    },
    "packages/app": {
      "name": "@opencode/app",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@corvu/drawer": "catalog:",
        "@dnd-kit/abstract": "0.5.0",
@@ -113,7 +113,7 @@
    },
    "packages/cli": {
      "name": "@opencode/cli",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "bin": {
        "opencode2": "./bin/opencode2.cjs",
      },
@@ -177,7 +177,7 @@
    },
    "packages/client": {
      "name": "@opencode/client",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@opencode/protocol": "workspace:*",
        "@opencode/schema": "workspace:*",
@@ -203,7 +203,7 @@
    },
    "packages/codemode": {
      "name": "@opencode/codemode",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "acorn": "8.15.0",
        "effect": "catalog:",
@@ -217,7 +217,7 @@
    },
    "packages/console/app": {
      "name": "@opencode/console-app",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -253,7 +253,7 @@
    },
    "packages/console/core": {
      "name": "@opencode/console-core",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -280,7 +280,7 @@
    },
    "packages/console/function": {
      "name": "@opencode/console-function",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@openauthjs/openauth": "0.0.0-20250322224806",
        "@opencode/console-core": "workspace:*",
@@ -297,7 +297,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode/console-mail",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -321,7 +321,7 @@
    },
    "packages/console/support": {
      "name": "@opencode/console-support",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@opencode/console-core": "workspace:*",
@@ -341,7 +341,7 @@
    },
    "packages/core": {
      "name": "@opencode/core",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@ai-sdk/cohere": "3.0.27",
        "@ai-sdk/gateway": "3.0.104",
@@ -409,14 +409,13 @@
    },
    "packages/desktop": {
      "name": "@opencode/desktop",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@zip.js/zip.js": "2.7.62",
        "electron-context-menu": "4.1.2",
        "electron-log": "^5",
        "electron-store": "11.0.2",
        "electron-updater": "6.8.9",
-        "electron-window-state": "^5.0.3",
        "lighthouse": "13.4.1",
      },
      "devDependencies": {
@@ -456,12 +455,11 @@
        "@lydell/node-pty-linux-x64": "1.2.0-beta.12",
        "@lydell/node-pty-win32-arm64": "1.2.0-beta.12",
        "@lydell/node-pty-win32-x64": "1.2.0-beta.12",
-        "msgpackr-extract": "3.0.4",
      },
    },
    "packages/enterprise": {
      "name": "@opencode/enterprise",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@hono/standard-validator": "catalog:",
        "@opencode-ai/sdk": "1.18.21",
@@ -498,7 +496,7 @@
    },
    "packages/function": {
      "name": "@opencode/function",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -514,7 +512,7 @@
    },
    "packages/http-recorder": {
      "name": "@opencode/http-recorder",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@effect/platform-node-shared": "4.0.0-rc.112",
      },
@@ -533,7 +531,7 @@
    },
    "packages/httpapi-codegen": {
      "name": "@opencode/httpapi-codegen",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "effect": "catalog:",
        "prettier": "3.6.2",
@@ -546,7 +544,7 @@
    },
    "packages/latex": {
      "name": "@opencode/latex",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opentui/core": "catalog:",
@@ -560,7 +558,7 @@
    },
    "packages/merman": {
      "name": "@opencode/merman",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opentui/core": "catalog:",
@@ -575,7 +573,7 @@
    },
    "packages/plugin": {
      "name": "@opencode/plugin",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@ai-sdk/provider": "3.0.8",
        "@opencode/ai": "workspace:*",
@@ -614,7 +612,7 @@
    },
    "packages/plugin-browser": {
      "name": "@opencode/plugin-browser",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opencode/schema": "workspace:*",
@@ -644,7 +642,7 @@
    },
    "packages/protocol": {
      "name": "@opencode/protocol",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@opencode/schema": "workspace:*",
        "effect": "catalog:",
@@ -659,7 +657,7 @@
    },
    "packages/schema": {
      "name": "@opencode/schema",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@standard-schema/spec": "catalog:",
        "effect": "catalog:",
@@ -683,7 +681,7 @@
    },
    "packages/sdk": {
      "name": "@opencode/sdk",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@opencode/client": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -704,7 +702,7 @@
    },
    "packages/server": {
      "name": "@opencode/server",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@effect/platform-node": "catalog:",
        "@effect/platform-node-shared": "catalog:",
@@ -726,7 +724,7 @@
    },
    "packages/session-ui": {
      "name": "@opencode/session-ui",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode/client": "workspace:*",
@@ -761,7 +759,7 @@
    },
    "packages/simulation": {
      "name": "@opencode/simulation",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@opencode/ai": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -781,7 +779,7 @@
    },
    "packages/stats/app": {
      "name": "@opencode/stats-app",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@ibm/plex": "6.4.1",
        "@kobalte/core": "catalog:",
@@ -815,7 +813,7 @@
    },
    "packages/stats/core": {
      "name": "@opencode/stats-core",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@aws-sdk/client-athena": "3.933.0",
        "@planetscale/database": "1.19.0",
@@ -834,7 +832,7 @@
    },
    "packages/stats/server": {
      "name": "@opencode/stats-server",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@aws-sdk/client-firehose": "3.933.0",
        "@effect/platform-node": "catalog:",
@@ -880,7 +878,7 @@
    },
    "packages/theme": {
      "name": "@opencode/theme",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@opentui/core": "catalog:",
        "effect": "catalog:",
@@ -894,7 +892,7 @@
    },
    "packages/tui": {
      "name": "@opencode/tui",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@opencode/client": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -929,7 +927,7 @@
    },
    "packages/ui": {
      "name": "@opencode/ui",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@pierre/diffs": "catalog:",
@@ -964,7 +962,7 @@
    },
    "packages/util": {
      "name": "@opencode/util",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@effect/opentelemetry": "catalog:",
        "@effect/platform-node": "catalog:",
@@ -997,7 +995,7 @@
    },
    "packages/web": {
      "name": "@opencode/web",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -1038,7 +1036,7 @@
    },
    "services/update": {
      "name": "@opencode/update",
-      "version": "2.0.7",
+      "version": "2.0.8",
      "dependencies": {
        "jose": "6.0.11",
        "semver": "catalog:",
@@ -3916,8 +3914,6 @@

    "electron-vite": ["electron-vite@6.0.0-beta.1", "", { "dependencies": { "@babel/core": "^7.29.0", "@babel/plugin-transform-arrow-functions": "^7.27.1", "cac": "^7.0.0", "esbuild": "^0.25.11", "magic-string": "^0.30.21", "picocolors": "^1.1.1" }, "peerDependencies": { "@swc/core": "^1.0.0", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "optionalPeers": ["@swc/core"], "bin": { "electron-vite": "bin/electron-vite.js" } }, "sha512-jltST77AwNxIeTTDtYhnIEA8ZM0RW9jmSJcqS8x/dQcgeeLlxlcJoYNNJ1tv7/Swor0AbXMYteBGdezoAOt+Nw=="],

-    "electron-window-state": ["electron-window-state@5.0.3", "", { "dependencies": { "jsonfile": "^4.0.0", "mkdirp": "^0.5.1" } }, "sha512-1mNTwCfkolXl3kMf50yW3vE2lZj0y92P/HYWFBrb+v2S/pCka5mdwN3cagKm458A7NjndSwijynXgcLWRodsVg=="],
-
    "electron-winstaller": ["electron-winstaller@5.4.0", "", { "dependencies": { "@electron/asar": "^3.2.1", "debug": "^4.1.1", "fs-extra": "^7.0.1", "lodash": "^4.17.21", "temp": "^0.9.0" }, "optionalDependencies": { "@electron/windows-sign": "^1.1.2" } }, "sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg=="],

    "emmet": ["emmet@2.4.11", "", { "dependencies": { "@emmetio/abbreviation": "^2.3.3", "@emmetio/css-abbreviation": "^2.1.8" } }, "sha512-23QPJB3moh/U9sT4rQzGgeyyGIrcM+GH5uVYg2C6wZIxAIJq7Ng3QLT79tl8FUwDXhyq9SusfknOrofAKqvgyQ=="],
@@ -4474,7 +4470,7 @@

    "jsonc-parser": ["jsonc-parser@3.3.1", "", {}, "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ=="],

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

    "jsonparse": ["jsonparse@1.3.1", "", {}, "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg=="],

@@ -6522,8 +6518,6 @@

    "form-data/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],

-    "fs-extra/jsonfile": ["jsonfile@6.2.1", "", { "dependencies": { "universalify": "^2.0.0" }, "optionalDependencies": { "graceful-fs": "^4.1.6" } }, "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q=="],
-
    "gaxios/node-fetch": ["node-fetch@3.3.2", "", { "dependencies": { "data-uri-to-buffer": "^4.0.0", "fetch-blob": "^3.1.4", "formdata-polyfill": "^4.0.10" } }, "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA=="],

    "gcp-metadata/gaxios": ["gaxios@7.1.3", "", { "dependencies": { "extend": "^3.0.2", "https-proxy-agent": "^7.0.1", "node-fetch": "^3.3.2", "rimraf": "^5.0.1" } }, "sha512-YGGyuEdVIjqxkxVH1pUTMY/XtmmsApXrCVv5EU25iX6inEPbV+VakJfLealkBtJN69AQmh1eGOdCl9Sm1UP6XQ=="],
@@ -6926,18 +6920,12 @@

    "@electron/asar/minimatch/brace-expansion": ["brace-expansion@1.1.18", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw=="],

-    "@electron/fuses/fs-extra/jsonfile": ["jsonfile@6.2.1", "", { "dependencies": { "universalify": "^2.0.0" }, "optionalDependencies": { "graceful-fs": "^4.1.6" } }, "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q=="],
+    "@electron/get/fs-extra/jsonfile": ["jsonfile@4.0.0", "", { "optionalDependencies": { "graceful-fs": "^4.1.6" } }, "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg=="],

    "@electron/get/fs-extra/universalify": ["universalify@0.1.2", "", {}, "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="],

-    "@electron/notarize/fs-extra/jsonfile": ["jsonfile@6.2.1", "", { "dependencies": { "universalify": "^2.0.0" }, "optionalDependencies": { "graceful-fs": "^4.1.6" } }, "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q=="],
-
-    "@electron/universal/fs-extra/jsonfile": ["jsonfile@6.2.1", "", { "dependencies": { "universalify": "^2.0.0" }, "optionalDependencies": { "graceful-fs": "^4.1.6" } }, "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q=="],
-
    "@electron/universal/minimatch/brace-expansion": ["brace-expansion@2.1.4", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg=="],

-    "@electron/windows-sign/fs-extra/jsonfile": ["jsonfile@6.2.1", "", { "dependencies": { "universalify": "^2.0.0" }, "optionalDependencies": { "graceful-fs": "^4.1.6" } }, "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q=="],
-
    "@expressive-code/plugin-shiki/shiki/@shikijs/core": ["@shikijs/core@3.23.0", "", { "dependencies": { "@shikijs/types": "3.23.0", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4", "hast-util-to-html": "^9.0.5" } }, "sha512-NSWQz0riNb67xthdm5br6lAkvpDJRTgB36fxlo37ZzM2yq0PQFFzbd8psqC2XMPgCzo1fW6cVi18+ArJ44wqgA=="],

    "@expressive-code/plugin-shiki/shiki/@shikijs/engine-javascript": ["@shikijs/engine-javascript@3.23.0", "", { "dependencies": { "@shikijs/types": "3.23.0", "@shikijs/vscode-textmate": "^10.0.2", "oniguruma-to-es": "^4.3.4" } }, "sha512-aHt9eiGFobmWR5uqJUViySI1bHMqrAgamWE1TYSUoftkAeCCAiGawPMwM+VCadylQtF4V3VNOZ5LmfItH5f3yA=="],
@@ -7014,8 +7002,6 @@

    "@jsx-email/doiuse-email/htmlparser2/entities": ["entities@4.5.0", "", {}, "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="],

-    "@malept/flatpak-bundler/fs-extra/jsonfile": ["jsonfile@6.2.1", "", { "dependencies": { "universalify": "^2.0.0" }, "optionalDependencies": { "graceful-fs": "^4.1.6" } }, "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q=="],
-
    "@octokit/auth-app/@octokit/request/@octokit/endpoint": ["@octokit/endpoint@11.0.4", "", { "dependencies": { "@octokit/types": "^17.0.0", "universal-user-agent": "^7.0.2" } }, "sha512-f1cOWoHPmxryJFknxbtDdjODWfV8A9tc8Aae6ermXPNgHFZ/x91AtHIz4gicEjL8hkJiip+u21QHJORfBv/qiA=="],

    "@octokit/auth-app/@octokit/request/@octokit/types": ["@octokit/types@17.0.0", "", { "dependencies": { "@octokit/openapi-types": "^28.0.0" } }, "sha512-ByP1v7YL5SMveFPP7+sj0/ZuWCOOg/Chs4NafOMpq6WNIM/hdGY0S7C0TCGDBWu1aGmOxmUIhMx3cO+IdwYZ1Q=="],
@@ -7420,6 +7406,8 @@

    "electron-updater/js-yaml/argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="],

+    "electron-winstaller/fs-extra/jsonfile": ["jsonfile@4.0.0", "", { "optionalDependencies": { "graceful-fs": "^4.1.6" } }, "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg=="],
+
    "electron-winstaller/fs-extra/universalify": ["universalify@0.1.2", "", {}, "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="],

    "electron/@electron/get/env-paths": ["env-paths@3.0.0", "", {}, "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A=="],
@@ -7568,8 +7556,6 @@

    "tw-to-css/tailwindcss/postcss": ["postcss@8.5.26", "", { "dependencies": { "nanoid": "^3.3.17", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ=="],

-    "unzipper/fs-extra/jsonfile": ["jsonfile@6.2.1", "", { "dependencies": { "universalify": "^2.0.0" }, "optionalDependencies": { "graceful-fs": "^4.1.6" } }, "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q=="],
-
    "venice-ai-sdk-provider/@ai-sdk/openai-compatible/@ai-sdk/provider": ["@ai-sdk/provider@3.0.15", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-XeZW1CcDF2GMbH4wejW6xBRI2QCOgnkVYUnxoeDadB1mf85riL2bMUeDoh+6gJ/r4mjNfzUPW8OjLjvwTP0u1Q=="],

    "venice-ai-sdk-provider/@ai-sdk/openai-compatible/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.46", "", { "dependencies": { "@ai-sdk/provider": "3.0.15", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8", "undici": "^6.28.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-tEtld97plCFiYevsJuOkGkeuhQndeMWFBVrJS4AjnbD5AqrNSXRCe0p+BZ3Cju/sxDeeZ9ym3q9YUV8fASA7aQ=="],
@@ -7578,8 +7564,6 @@

    "vscode-languageserver/vscode-languageserver-protocol/vscode-jsonrpc": ["vscode-jsonrpc@8.2.0", "", {}, "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA=="],

-    "workbox-build/fs-extra/jsonfile": ["jsonfile@6.2.1", "", { "dependencies": { "universalify": "^2.0.0" }, "optionalDependencies": { "graceful-fs": "^4.1.6" } }, "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q=="],
-
    "wrangler/esbuild/@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.25.4", "", { "os": "aix", "cpu": "ppc64" }, "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q=="],

    "wrangler/esbuild/@esbuild/android-arm": ["@esbuild/android-arm@0.25.4", "", { "os": "android", "cpu": "arm" }, "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ=="],
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-U9IuP/ev6w4urvogOwQyl3rdumY6W4YaY18NkFaOVHU=",
-    "aarch64-linux": "sha256-Wc8OT2DRZpVo56KaoGE0Hsj1NDknakbWXO9w2qy6j+0=",
-    "aarch64-darwin": "sha256-wAea8+jajnMDxZ6XJL+Hsrf0621hwtBtWyD1+dS45dE=",
-    "x86_64-darwin": "sha256-g8PCNBSV6rO+VQjKU9AtYqj+r18o+fhLDXEQq+X2EZ4="
+    "x86_64-linux": "sha256-TlCPtuIvTNF01fLI0yHCLzVkx53yF9xxvAObDMGeo8M=",
+    "aarch64-linux": "sha256-aEjyPIXHeA5w1iZXbPKJAOIJQBfXg+LAx/y7C5uFz4g=",
+    "aarch64-darwin": "sha256-lthMTio2qNy+H2tL9cAPmqC41O+wdSADI61cnW4dIb0=",
+    "x86_64-darwin": "sha256-ONFbRQnwzOYHo0Pyh327QfJG2uzqzNEn/SS2vbYYMdM="
  }
 }
@@ -2,7 +2,7 @@
  "$schema": "https://json.schemastore.org/package.json",
  "name": "opencode",
  "description": "AI-powered development tool",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "private": true,
  "type": "module",
  "packageManager": "bun@1.4.2",
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "name": "@opencode/ai",
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/app",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "description": "",
  "type": "module",
  "exports": {
@@ -52,14 +52,14 @@ export function createComposerAttachments(
  // Uploads this composer started; they finish (or fail) even if the composer unmounts.
  const [pending, setPending] = createStore<{ ids: string[] }>({ ids: [] })

-  // A file the model reads natively travels inline with the prompt, so its bytes live in the draft
-  // store. Anything else reaches the model as a path on the server and never enters the store:
-  // hashing and copying a large archive through it is what used to freeze the window.
+  // Media the model reads natively travels inline with the prompt, so its bytes live in the draft
+  // store. Everything else, including text, reaches the model as a path on the server that its
+  // tools open; those bytes never enter the store, and never get base64-encoded into the request.
  const add = async (file: File, target = capture(), clipboard = false) => {
    if (!target) return false
    const mime = await attachmentMime(file)
    const destination = input.destination()
-    if (native(mime, destination.input)) return addInline(file, mime, target, clipboard)
+    if (native(mime, destination.input) && file.size <= MAX_INLINE_BYTES) return addInline(file, mime, target, clipboard)
    const sourcePath = input.getPathForFile?.(file) || undefined
    if (destination.local && sourcePath) return addPath(target, { filename: file.name, mime, path: sourcePath })
    void stage(file, mime, target, destination)
@@ -213,9 +213,11 @@ export function createComposerAttachments(

 const imageMimes = new Set(["image/png", "image/jpeg", "image/gif", "image/webp"])

-// Mirrors the attachment kinds the server forwards to the model as message content.
+// The server rejects inline attachments above this size, so larger media takes the path route.
+const MAX_INLINE_BYTES = 20 * 1024 * 1024
+
+// Mirrors the media the server forwards to the model as message content.
 function native(mime: string, input: AttachmentDestination["input"]) {
-  if (mime === "text/plain") return true
  if (imageMimes.has(mime)) return input.image
  if (mime === "application/pdf") return input.pdf
  return false
@@ -238,8 +240,8 @@ const textMimes = new Set([
  "application/yaml",
 ])

-// Text-like files normalize to text/plain so the server inlines their content; every other
-// file keeps a binary type and is delivered to the model by path or as native media.
+// Text-like files normalize to text/plain so the chip labels them as text; every other file keeps
+// a binary type. Delivery is decided separately: native media inline, everything else by path.
 async function attachmentMime(file: File) {
  const type = file.type.split(";", 1)[0]?.trim().toLowerCase() ?? ""
  if (imageMimes.has(type) || type === "application/pdf") return type
@@ -1,9 +1,10 @@
-import { createEffect, createMemo, createSignal, For, onCleanup, onMount, Show, type JSX } from "solid-js"
+import { createEffect, createMemo, createResource, createSignal, For, onCleanup, onMount, Show, type JSX } from "solid-js"
 import { createStore } from "solid-js/store"
 import { FileIcon } from "@opencode/ui/file-icon"
 import { Icon } from "@opencode/ui/icon"
 import { IconButton } from "@opencode/ui/icon-button"
 import { createAnimatedPresence } from "@/runtime/animated-presence"
+import { resolveBlobUrl } from "@/runtime/persistence/drafts"
 import { ProviderIcon } from "@opencode/ui/provider-icon"
 import { useI18n } from "@opencode/ui/context/i18n"
 import { Button } from "@opencode/ui/button"
@@ -545,17 +546,21 @@ export function ComposerAttachments(props: {
                      </AttachmentCard>
                    }
                  >
-                    {(image) => (
-                      <>
-                    <img
-                      src={image().blob.url}
-                      alt={attachment.filename}
-                      class="w-[58px] h-[46px] rounded-[6px] object-cover"
-                      onClick={() => props.onAttachmentClick?.(attachment)}
-                    />
-                    <div class="absolute inset-0 rounded-[6px] shadow-[inset_0_0_0_0.5px_var(--v2-border-border-base)] pointer-events-none" />
-                      </>
-                    )}
+                    {(image) => {
+                      // Restored drafts and history carry image ids only; bytes load when shown.
+                      const [url] = createResource(() => image().blob, resolveBlobUrl)
+                      return (
+                        <>
+                          <img
+                            src={url() ?? ""}
+                            alt={attachment.filename}
+                            class="w-[58px] h-[46px] rounded-[6px] object-cover"
+                            onClick={() => props.onAttachmentClick?.(attachment)}
+                          />
+                          <div class="absolute inset-0 rounded-[6px] shadow-[inset_0_0_0_0.5px_var(--v2-border-border-base)] pointer-events-none" />
+                        </>
+                      )
+                    }}
                  </Show>
                </Tooltip>
                <button
@@ -11,6 +11,7 @@ import { useLanguage } from "@/runtime/i18n/language"
 import { useLayout } from "@/shell/state/layout"
 import { usePlatform } from "@/runtime/platform/platform"
 import { useWorkspaceLocation } from "@/workspaces/location"
+import { resolveBlobUrl } from "@/runtime/persistence/drafts"
 import { useData, useServer } from "@/runtime/server/current"
 import { createSessionTabs } from "@/session/helpers"
 import { showToast } from "@/shell/notifications/toast"
@@ -322,7 +323,9 @@ export function createComposerModel(adapter: ComposerAdapter, options?: { queue?
    },
    openAttachment: (attachment) => {
      if (attachment.type !== "image") return
-      dialog.show(() => createComponent(ImagePreview, { src: attachment.blob.url, alt: attachment.filename }))
+      void resolveBlobUrl(attachment.blob).then((src) => {
+        if (src) dialog.show(() => createComponent(ImagePreview, { src, alt: attachment.filename }))
+      })
    },
    openContext(key) {
      const item = controller.contextItem(key)
@@ -136,7 +136,7 @@ describe("composer persistence schemas", () => {
    ).toEqual(value)
  })

-  test("migrates inline images but never encodes dataUrl or unresolved references", () => {
+  test("migrates inline images, keeps store references without a URL, and never encodes dataUrl", () => {
    const value = Schema.decodeUnknownSync(
      Persistence.withInitial(ComposerStore, { prompt: DEFAULT_PROMPT, context: { items: [] } }),
    )({
@@ -149,12 +149,16 @@ describe("composer persistence schemas", () => {
        { ...image, blob: { id: "missing" }, dataUrl: "data:image/png;base64,YQ==" },
      ],
    })
-    expect(value.prompt).toHaveLength(3)
+    expect(value.prompt).toHaveLength(6)
    expect(value.prompt[0]).toEqual({
      ...image,
      sourcePath: "/image.png",
      blob: { id: "data:image/png;base64,YQ==", url: "data:image/png;base64,YQ==" },
    })
+    // Bytes still in the draft store resolve on use; a non-blob URL is discarded in favour of the id.
+    expect(value.prompt[3]).toEqual({ ...image, blob: { id: "missing", url: "" } })
+    expect(value.prompt[4]).toEqual({ ...image, blob: { id: "bad", url: "" } })
+    expect(value.prompt[5]).toEqual({ ...image, blob: { id: "missing", url: "" } })
    const encoded = Schema.encodeSync(ComposerStore)(value)
    expect(JSON.stringify(encoded)).not.toContain("dataUrl")
    expect(
@@ -61,11 +61,12 @@ const ImageFields = {
 }
 const Image = Persistence.struct({
  ...ImageFields,
-  blob: Schema.Struct({ id: Schema.NonEmptyString, url: Schema.String.check(Schema.isPattern(/^(blob:|data:)/)) }),
+  // An empty URL is an image whose bytes are still in the draft store; see `resolveBlobUrl`.
+  blob: Schema.Struct({ id: Schema.NonEmptyString, url: Schema.String.check(Schema.isPattern(/^(blob:|data:|$)/)) }),
 })

-// Draft storage hydrates content-addressed blobs before this codec runs. Legacy
-// inline data remains usable, but unresolved references are not renderable.
+// Draft storage keeps content-addressed blobs in the store until an image is shown or sent; a
+// reference without a URL resolves through `resolveBlobUrl`. Legacy inline data remains usable.
 export const ImageAttachmentPart = Schema.Struct({
  ...ImageFields,
  blob: Persistence.optional(
@@ -88,6 +88,15 @@ describe("prompt state initialization", () => {
          start: 5,
          end: 12,
        },
+        // A reference without a usable URL keeps its id; the bytes resolve from the draft store on use.
+        {
+          type: "image",
+          id: "missing-blob",
+          filename: "missing.png",
+          mime: "image/png",
+          blob: { id: "content-hash-without-a-url", url: "" },
+        },
+        { type: "image", id: "invalid-url", filename: "invalid.png", mime: "image/png", blob: { id: "hash", url: "" } },
        {
          type: "image",
          id: "legacy",
@@ -8,7 +8,7 @@ import type { ComposerAdapter, ComposerDelivery, ComposerSelection, ComposerSess
 import { createComposerSubmission } from "./submission-state"
 import { buildPromptRequest } from "./request"
 import { setCursorPosition } from "./editor/dom"
-import { blobDataUrl } from "@/runtime/persistence/drafts"
+import { blobDataUrl, resolveBlobUrl } from "@/runtime/persistence/drafts"
 import { isAttachment } from "./prompt-parts"
 import type { ModelSelection } from "@/providers/models/selection"

@@ -59,12 +59,22 @@ export function createComposerSubmit(input: ComposerSubmitInput) {
        selection: item.selection ? { ...item.selection } : undefined,
      })),
    })
-    const value = readSubmission(input, submission.prompt, submission.context, options?.alternate ?? false)
-    if (!value) {
+    const read = readSubmission(input, submission.prompt, submission.context, options?.alternate ?? false)
+    if (!read) {
      if (input.adapter.working() && input.adapter.kind === "active-session") void input.adapter.interrupt()
      return
    }
    if (submitting.has(input.adapter.state)) return
+    // Images restored from a draft or history carry ids only; the optimistic message shows their URLs.
+    const value = {
+      ...read,
+      images: await Promise.all(
+        read.images.map(async (image) => ({
+          ...image,
+          blob: { ...image.blob, url: (await resolveBlobUrl(image.blob)) ?? image.blob.url },
+        })),
+      ),
+    }
    submitting.add(input.adapter.state)
    const comments = input.comments.capture()
    // Capture command intent before starting a session in a worktree whose catalog has not loaded.
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { createDraftStore, draftTextChunk, draftTextThreshold } from "./drafts"
+import { createDraftStore, draftTextChunk, draftTextThreshold, resolveBlobUrl } from "./drafts"

 function memoryDriver() {
  const documents = new Map<string, string>()
@@ -287,15 +287,34 @@ describe("draft store image retention", () => {
    expect(await released(store, 5, shared.url)).toBe(true)
  })

-  test("loading a document pins the images it references", async () => {
+  test("loading a document pins the images it references without fetching their bytes", async () => {
    const { memory, store } = fresh()
+    const reads: string[] = []
+    const getBlob = memory.driver.getBlob
+    memory.driver.getBlob = (id) => {
+      reads.push(id)
+      return getBlob(id)
+    }
    const id = await memory.driver.putBlob(image(6))
    memory.documents.set("loaded", JSON.stringify({ prompt: [{ type: "image", blob: { id } }] }))
-    const url = JSON.parse((await store.getItem("loaded"))!).prompt[0].blob.url
+    const loaded = JSON.parse((await store.getItem("loaded"))!).prompt[0].blob
+    expect(loaded).toEqual({ id })
+    expect(reads).toEqual([])
+    // The first consumer that shows or sends the image loads it; the pin from the load keeps it.
+    const url = (await resolveBlobUrl(loaded))!
+    expect(url.startsWith("blob:")).toBe(true)
+    expect(reads).toEqual([id])
+    expect(await resolveBlobUrl(loaded)).toBe(url)
+    expect(reads).toEqual([id])
    await tick()
    expect(await released(store, 6, url)).toBe(false)
    await store.removeItem("loaded")
    await tick()
    expect(await released(store, 6, url)).toBe(true)
  })
+
+  test("a reference to bytes the store no longer holds resolves to nothing", async () => {
+    fresh()
+    expect(await resolveBlobUrl({ id: "gone" })).toBeUndefined()
+  })
 })
@@ -42,6 +42,18 @@ const refs = new Map<string, Set<string>>()
 // Image ids that were restored under a different id (a store without WebCrypto assigns fresh
 // ones); live references still carry the original.
 const aliases = new Map<string, string>()
+// Fetches image bytes from the store created last. Documents load without their bytes; a consumer
+// that renders or sends an image resolves its URL through here, so a history full of large
+// attachments costs nothing at startup.
+let loader: ((id: string) => Promise<string | undefined>) | undefined
+
+/** The object URL for an image reference, loading its bytes from the draft store on first use. */
+export function resolveBlobUrl(blob: { id: string; url?: string }) {
+  if (blob.url) return Promise.resolve(blob.url)
+  const existing = retained.get(aliases.get(blob.id) ?? blob.id)
+  if (existing) return Promise.resolve(existing.url)
+  return loader?.(blob.id) ?? Promise.resolve(undefined)
+}

 function blobUrl(id: string, blob: Blob, grace?: number) {
  const existing = retained.get(id)
@@ -120,7 +132,7 @@ export function createDraftStore(driver: Driver, options: { grace?: number } = {
  const loading = new Map<string, Promise<string | undefined>>()
  const loadBlobUrl = (id: string) => {
    const existing = retained.get(id)
-    if (existing) return existing.url
+    if (existing) return Promise.resolve(existing.url)
    const pending = loading.get(id)
    if (pending) return pending
    const next = driver
@@ -130,6 +142,7 @@ export function createDraftStore(driver: Driver, options: { grace?: number } = {
    loading.set(id, next)
    return next
  }
+  loader = loadBlobUrl
  const putBlob = async (blob: Blob) => {
    const id = await driver.putBlob(blob)
    return { id, url: blobUrl(id, blob, grace) }
@@ -221,9 +234,11 @@ export function createDraftStore(driver: Driver, options: { grace?: number } = {
      if (ref.kind === "text" && Array.isArray(ref.ids)) {
        return (await Promise.all(ref.ids.map((id) => loadChunk(String(id))))).join("")
      }
+      // Bytes stay in the store until something renders or sends the image (see resolveBlobUrl);
+      // only an image already pinned in this page gets its URL back immediately.
      if (typeof ref.id === "string") {
-        const url = await loadBlobUrl(ref.id)
-        if (url) return { ...item, blob: { id: ref.id, url } }
+        const url = retained.get(aliases.get(ref.id) ?? ref.id)?.url
+        return { ...item, blob: url ? { id: ref.id, url } : { id: ref.id } }
      }
    }
    return Object.fromEntries(
@@ -423,7 +438,9 @@ function referenced(json: string) {

 export async function blobDataUrl(blob: BlobReference, mime: string) {
  const kept = retained.get(aliases.get(blob.id) ?? blob.id)
-  const data = kept ? kept.blob : await fetch(blob.url).then((response) => response.blob())
+  const url = kept ? undefined : await resolveBlobUrl(blob)
+  if (!kept && !url) throw new Error(`Attachment ${blob.id} has no stored bytes`)
+  const data = kept ? kept.blob : await fetch(url!).then((response) => response.blob())
  return new Promise<string>((resolve, reject) => {
    const reader = new FileReader()
    reader.addEventListener("error", () => reject(reader.error))
@@ -0,0 +1,23 @@
+import { createResource } from "solid-js"
+import { usePlatform } from "@/runtime/platform/platform"
+
+export function createCameraAvailability() {
+  const platform = usePlatform()
+  const supported = platform.platform === "web" && window.isSecureContext && !!navigator.mediaDevices?.getUserMedia
+  const [available, actions] = createResource(
+    async () => {
+      if (!supported || !navigator.mediaDevices.enumerateDevices) return false
+      const denied = await navigator.permissions?.query({ name: "camera" }).then(
+        (permission) => permission.state === "denied",
+        () => false,
+      )
+      if (denied) return false
+      return navigator.mediaDevices.enumerateDevices().then(
+        (devices) => devices.some((device) => device.kind === "videoinput"),
+        () => false,
+      )
+    },
+    { initialValue: false },
+  )
+  return { supported, available, refetch: actions.refetch }
+}
@@ -4,7 +4,17 @@ import { Divider } from "@opencode/ui/divider"
 import { TextInput } from "@opencode/ui/text-input"
 import { useDialog } from "@opencode/ui/context/dialog"
 import { useMutation } from "@tanstack/solid-query"
-import { type Component, Show, createEffect, createMemo, createSignal, onCleanup, onMount } from "solid-js"
+import {
+  type Component,
+  Show,
+  Suspense,
+  createEffect,
+  createMemo,
+  createSignal,
+  lazy,
+  onCleanup,
+  onMount,
+} from "solid-js"
 import { createStore } from "solid-js/store"
 import {
  createServerHealthPreview,
@@ -18,8 +28,12 @@ import { useTabs } from "@/shell/tabs/tabs"
 import { useCheckServerHealth } from "@/runtime/server/health"
 import { usePlatform } from "@/runtime/platform/platform"
 import { isMixedContent } from "./browser"
+import { createCameraAvailability } from "./camera"
+import { decodePairingCode } from "./pairing"
 import "@/settings/settings.css"

+const PairingScanner = lazy(() => import("./scanner").then((module) => ({ default: module.PairingScanner })))
+
 type FormMode = "list" | "add" | "edit"

 export const DialogServer: Component<{
@@ -29,6 +43,8 @@ export const DialogServer: Component<{
 }> = (props) => {
  const dialog = useDialog()
  const language = useLanguage()
+  const platform = usePlatform()
+  const camera = createCameraAvailability()
  const form = createFormController({
    onSelect: (server) => {
      props.onSave?.(server)
@@ -75,64 +91,112 @@ export const DialogServer: Component<{
      </DialogHeader>
      <Divider />
      <DialogBody class="flex w-full min-w-0 flex-1 flex-col px-4 pt-4 pb-2">
-        <div class="flex w-full min-w-0 flex-col gap-6">
-          <div class="flex w-full min-w-0 flex-col gap-2">
-            <label class="settings-server-dialog-label">{language.t("dialog.server.add.url")}</label>
-            <TextInput
-              type="text"
-              appearance="large"
-              class="!w-full self-stretch"
-              value={form.state.value()}
-              placeholder={language.t("dialog.server.add.placeholder")}
-              invalid={!!form.state.error()}
-              disabled={form.state.busy()}
-              autofocus
-              aria-describedby={form.state.error() ? "dialog-server-error" : undefined}
-              onInput={(event) => form.change.value(event.currentTarget.value)}
-              onKeyDown={keyDown}
-            />
-            <Show when={form.state.error()}>
-              <span id="dialog-server-error" class="settings-server-dialog-error" role="alert">
-                {form.state.error()}
-              </span>
+        <Show
+          when={!form.state.scanning()}
+          fallback={
+            <Suspense fallback={<p role="status">{language.t("server.connect.camera.starting")}</p>}>
+              <PairingScanner
+                onCancel={() => {
+                  form.scan.stop()
+                  void camera.refetch()
+                }}
+                onScan={form.scan.complete}
+              />
+            </Suspense>
+          }
+        >
+          <div class="flex w-full min-w-0 flex-col gap-6">
+            <div class="flex w-full min-w-0 flex-col gap-2">
+              <label class="settings-server-dialog-label">{language.t("dialog.server.add.url")}</label>
+              <TextInput
+                type="text"
+                appearance="large"
+                class="!w-full self-stretch"
+                value={form.state.value()}
+                placeholder={language.t("dialog.server.add.placeholder")}
+                invalid={!!form.state.error()}
+                disabled={form.state.busy()}
+                autofocus
+                list="dialog-server-addresses"
+                aria-describedby={form.state.error() ? "dialog-server-error" : undefined}
+                onInput={(event) => form.change.value(event.currentTarget.value)}
+                onKeyDown={keyDown}
+              />
+              <datalist id="dialog-server-addresses">
+                {form.state.urls().map((url) => (
+                  <option value={url} />
+                ))}
+              </datalist>
+              <Show when={form.state.error()}>
+                <span id="dialog-server-error" class="settings-server-dialog-error" role="alert">
+                  {form.state.error()}
+                </span>
+              </Show>
+            </div>
+            <div class="flex w-full min-w-0 flex-col gap-2">
+              <label class="settings-server-dialog-label">{language.t("dialog.server.add.name")}</label>
+              <TextInput
+                type="text"
+                appearance="large"
+                class="!w-full self-stretch"
+                value={form.state.name()}
+                placeholder={language.t("dialog.server.add.namePlaceholder")}
+                disabled={form.state.busy()}
+                onInput={(event) => form.change.name(event.currentTarget.value)}
+                onKeyDown={keyDown}
+              />
+            </div>
+            <div class="flex w-full min-w-0 flex-col gap-2">
+              <label class="settings-server-dialog-label">{language.t("dialog.server.add.password")}</label>
+              <TextInput
+                type="password"
+                appearance="large"
+                class="!w-full self-stretch"
+                value={form.state.password()}
+                placeholder={language.t("dialog.server.add.passwordPlaceholder")}
+                disabled={form.state.busy()}
+                onInput={(event) => form.change.password(event.currentTarget.value)}
+                onKeyDown={keyDown}
+              />
+            </div>
+            <Show when={props.mode === "add" && platform.platform === "web"}>
+              <div class="flex w-full min-w-0 flex-col gap-2">
+                <Button
+                  variant="neutral"
+                  size="large"
+                  class="!w-full self-stretch"
+                  disabled={form.state.busy() || !camera.available.latest}
+                  aria-describedby={
+                    !camera.available.latest && !camera.available.loading
+                      ? "dialog-server-camera-unavailable"
+                      : undefined
+                  }
+                  onClick={form.scan.start}
+                >
+                  {language.t("server.connect.scan")}
+                </Button>
+                <Show when={!camera.available.latest && !camera.available.loading}>
+                  <span id="dialog-server-camera-unavailable" class="settings-server-dialog-hint">
+                    {language.t(
+                      window.isSecureContext ? "server.connect.camera.unavailable" : "server.connect.camera.insecure",
+                    )}
+                  </span>
+                </Show>
+              </div>
            </Show>
          </div>
-          <div class="flex w-full min-w-0 flex-col gap-2">
-            <label class="settings-server-dialog-label">{language.t("dialog.server.add.name")}</label>
-            <TextInput
-              type="text"
-              appearance="large"
-              class="!w-full self-stretch"
-              value={form.state.name()}
-              placeholder={language.t("dialog.server.add.namePlaceholder")}
-              disabled={form.state.busy()}
-              onInput={(event) => form.change.name(event.currentTarget.value)}
-              onKeyDown={keyDown}
-            />
-          </div>
-          <div class="flex w-full min-w-0 flex-col gap-2">
-            <label class="settings-server-dialog-label">{language.t("dialog.server.add.password")}</label>
-            <TextInput
-              type="password"
-              appearance="large"
-              class="!w-full self-stretch"
-              value={form.state.password()}
-              placeholder={language.t("dialog.server.add.passwordPlaceholder")}
-              disabled={form.state.busy()}
-              onInput={(event) => form.change.password(event.currentTarget.value)}
-              onKeyDown={keyDown}
-            />
-          </div>
-        </div>
+        </Show>
      </DialogBody>
-      <DialogFooter>
-        <Button variant="neutral" disabled={form.state.busy()} onClick={() => dialog.close()}>
-          {language.t("common.cancel")}
-        </Button>
-        <Button variant="contrast" disabled={form.state.busy()} onClick={form.submit}>
-          {submitLabel()}
-        </Button>
-      </DialogFooter>
+      <Show when={!form.state.scanning()}>
+        <DialogFooter>
+          <Button variant="neutral" disabled={form.state.busy()} onClick={() => dialog.close()}>
+            {language.t("common.cancel")}
+          </Button>
+          <Button variant="contrast" disabled={form.state.busy()} onClick={form.submit}>
+            {submitLabel()}
+          </Button>
+        </DialogFooter>
+      </Show>
    </Dialog>
  )
 }
@@ -149,6 +213,8 @@ function createFormController(options: { onSelect?: (server: ServerConnection.Ht
    mode: "list" as FormMode,
    originalUrl: undefined as string | undefined,
    values: { url: "", name: "", password: "" },
+    urls: [] as string[],
+    scanning: false,
    error: "",
    status: undefined as boolean | undefined,
  })
@@ -161,6 +227,8 @@ function createFormController(options: { onSelect?: (server: ServerConnection.Ht
      mode: "list",
      originalUrl: undefined,
      values: { url: "", name: "", password: "" },
+      urls: [],
+      scanning: false,
      error: "",
      status: undefined,
    })
@@ -265,6 +333,16 @@ function createFormController(options: { onSelect?: (server: ServerConnection.Ht
    setStore("error", "")
    request.mutate()
  }
+  const pair = (pairing: NonNullable<ReturnType<typeof decodePairingCode>>) => {
+    healthPreview.cancel()
+    setStore({
+      values: { ...store.values, url: pairing.urls[0], password: pairing.password },
+      urls: pairing.urls,
+      scanning: false,
+      error: "",
+    })
+    request.mutate()
+  }

  createEffect(() => {
    if (store.mode !== "edit") return
@@ -281,6 +359,8 @@ function createFormController(options: { onSelect?: (server: ServerConnection.Ht
      value: () => store.values.url,
      name: () => store.values.name,
      password: () => store.values.password,
+      urls: () => store.urls,
+      scanning: () => store.scanning,
      error: () => store.error,
      status: () => store.status,
    },
@@ -289,6 +369,11 @@ function createFormController(options: { onSelect?: (server: ServerConnection.Ht
      name: (value: string) => change("name", value),
      password: (value: string) => change("password", value),
    },
+    scan: {
+      start: () => setStore("scanning", true),
+      stop: () => setStore("scanning", false),
+      complete: pair,
+    },
    start: { add: startAdd, edit: startEdit },
    reset,
    submit,
@@ -0,0 +1,41 @@
+.server-connect-scanner {
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+
+  p {
+    font-size: 13px;
+    line-height: var(--line-height-base);
+    color: var(--v2-text-text-muted);
+  }
+
+  button {
+    min-height: 44px;
+    width: 100%;
+  }
+
+  .server-connect-error {
+    color: var(--v2-state-fg-danger);
+  }
+
+  .server-connect-video {
+    position: relative;
+    aspect-ratio: 1;
+    overflow: hidden;
+    border-radius: 12px;
+    background: var(--v2-background-bg-deep);
+  }
+
+  video {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
+
+  .server-connect-video [role="status"] {
+    position: absolute;
+    inset: 0;
+    display: grid;
+    place-items: center;
+  }
+}
@@ -4,6 +4,7 @@ import { createStore } from "solid-js/store"
 import { Button } from "@opencode/ui/button"
 import { useLanguage } from "@/runtime/i18n/language"
 import { decodePairingCode } from "./pairing"
+import "./scanner.css"

 export function PairingScanner(props: {
  onScan: (value: NonNullable<ReturnType<typeof decodePairingCode>>) => void
@@ -41,8 +41,7 @@
    color: var(--v2-text-text-muted);
  }

-  form,
-  .server-connect-scanner {
+  form {
    display: flex;
    flex-direction: column;
    gap: 20px;
@@ -95,25 +94,4 @@
    background: var(--v2-background-bg-layer-01);
    user-select: all;
  }
-
-  .server-connect-video {
-    position: relative;
-    aspect-ratio: 1;
-    overflow: hidden;
-    border-radius: 12px;
-    background: var(--v2-background-bg-deep);
-  }
-
-  video {
-    width: 100%;
-    height: 100%;
-    object-fit: cover;
-  }
-
-  .server-connect-video [role="status"] {
-    position: absolute;
-    inset: 0;
-    display: grid;
-    place-items: center;
-  }
 }
@@ -1,4 +1,4 @@
-import { createResource, lazy, Show, Suspense } from "solid-js"
+import { lazy, Show, Suspense } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useMutation } from "@tanstack/solid-query"
 import { Button } from "@opencode/ui/button"
@@ -10,6 +10,7 @@ import { useCheckServerHealth } from "@/runtime/server/health"
 import { useServers } from "@/runtime/server/registry"
 import { serverAddress } from "./pairing"
 import { isMixedContent } from "./browser"
+import { createCameraAvailability } from "./camera"
 import "./screen.css"

 const PairingScanner = lazy(() => import("./scanner").then((module) => ({ default: module.PairingScanner })))
@@ -19,23 +20,7 @@ export function ConnectServerScreen() {
  const platform = usePlatform()
  const servers = useServers()
  const check = useCheckServerHealth()
-  const cameraSupported =
-    platform.platform === "web" && window.isSecureContext && !!navigator.mediaDevices?.getUserMedia
-  const [camera, cameraActions] = createResource(
-    async () => {
-      if (!cameraSupported || !navigator.mediaDevices.enumerateDevices) return false
-      const denied = await navigator.permissions?.query({ name: "camera" }).then(
-        (permission) => permission.state === "denied",
-        () => false,
-      )
-      if (denied) return false
-      return navigator.mediaDevices.enumerateDevices().then(
-        (devices) => devices.some((device) => device.kind === "videoinput"),
-        () => false,
-      )
-    },
-    { initialValue: false },
-  )
+  const camera = createCameraAvailability()
  const [state, setState] = createStore({ url: "", password: "", urls: [] as string[], error: "", scanning: false })
  const connectionError = () =>
    language.t(
@@ -78,7 +63,7 @@ export function ConnectServerScreen() {
              <PairingScanner
                onCancel={() => {
                  setState("scanning", false)
-                  void cameraActions.refetch()
+                  void camera.refetch()
                }}
                onScan={(pairing) => {
                  setState({
@@ -154,13 +139,15 @@ export function ConnectServerScreen() {
            <Button
              variant="neutral"
              size="large"
-              disabled={request.isPending || !camera.latest}
-              aria-describedby={!camera.latest && !camera.loading ? "server-connect-camera-unavailable" : undefined}
+              disabled={request.isPending || !camera.available.latest}
+              aria-describedby={
+                !camera.available.latest && !camera.available.loading ? "server-connect-camera-unavailable" : undefined
+              }
              onClick={() => setState("scanning", true)}
            >
              {language.t("server.connect.scan")}
            </Button>
-            <Show when={!camera.latest && !camera.loading}>
+            <Show when={!camera.available.latest && !camera.available.loading}>
              <p id="server-connect-camera-unavailable">
                {language.t(
                  window.isSecureContext ? "server.connect.camera.unavailable" : "server.connect.camera.insecure",
@@ -1517,6 +1517,12 @@
  color: var(--v2-state-fg-danger);
 }

+.settings-server-dialog-hint {
+  font-size: 13px;
+  line-height: var(--line-height-base);
+  color: var(--v2-text-text-muted);
+}
+
 .settings-extensions-tabs[data-component="tabs-v2"][data-variant="pill"] > [data-slot="tabs-v2-list"] {
  width: min(280px, 100%);
 }
@@ -1,6 +1,6 @@
 import { expect, test } from "bun:test"
 import { resolveObjectURL } from "node:buffer"
-import { createDraftStore } from "@/runtime/persistence/drafts"
+import { createDraftStore, resolveBlobUrl } from "@/runtime/persistence/drafts"

 function fixture(id: string, getBlob: () => Promise<Blob | null>) {
  const documents = new Map([
@@ -20,7 +20,19 @@ function fixture(id: string, getBlob: () => Promise<Blob | null>) {
  return { store, documents }
 }

-test("deduplicates concurrent history and draft reads without invalidating either live reference", async () => {
+test("loading history and a draft reads no image bytes", async () => {
+  let reads = 0
+  const { store } = fixture("history-cache-lazy", async () => {
+    reads++
+    return new Blob(["shared screenshot"])
+  })
+  const [history, draft] = await Promise.all([store.getItem("history"), store.getItem("draft")])
+  expect(JSON.parse(history!).entries[0].prompt[0].blob).toEqual({ id: "history-cache-lazy" })
+  expect(JSON.parse(draft!).prompt[0].blob).toEqual({ id: "history-cache-lazy" })
+  expect(reads).toBe(0)
+})
+
+test("deduplicates concurrent resolves without invalidating either live reference", async () => {
  const pending = Promise.withResolvers<Blob | null>()
  const started = Promise.withResolvers<void>()
  let reads = 0
@@ -29,55 +41,33 @@ test("deduplicates concurrent history and draft reads without invalidating eithe
    started.resolve()
    return pending.promise
  })
-  const history = store.getItem("history")
-  const draft = store.getItem("draft")
+  await store.getItem("history")
+  const first = resolveBlobUrl({ id: "history-cache-concurrent" })
+  const second = resolveBlobUrl({ id: "history-cache-concurrent" })
  await started.promise
  pending.resolve(new Blob(["shared screenshot"]))
-  const [saved, active] = await Promise.all([history, draft])
-  const reference = JSON.parse(saved!).entries[0].prompt[0].blob
-  expect(JSON.parse(active!).prompt[0].blob).toEqual(reference)
+  const [a, b] = await Promise.all([first, second])
+  expect(a).toBe(b!)
  expect(reads).toBe(1)
  await store.removeItem("history")
-  expect(await resolveObjectURL(reference.url)?.text()).toBe("shared screenshot")
-  expect(JSON.parse((await store.getItem("draft"))!).prompt[0].blob).toEqual(reference)
+  expect(await resolveObjectURL(a!)?.text()).toBe("shared screenshot")
+  expect(await resolveBlobUrl({ id: "history-cache-concurrent" })).toBe(a!)
  expect(reads).toBe(1)
 })

-test("hydrates repeated references once within one history document", async () => {
-  let reads = 0
-  const { store, documents } = fixture("history-cache-repeated", async () => {
-    reads++
-    return new Blob(["repeated screenshot"])
-  })
-  documents.set(
-    "history",
-    JSON.stringify({
-      entries: Array.from({ length: 100 }, () => ({
-        prompt: [{ type: "image", blob: { id: "history-cache-repeated" } }],
-      })),
-    }),
-  )
-  const value = JSON.parse((await store.getItem("history"))!)
-  expect(value.entries).toHaveLength(100)
-  expect(
-    new Set(value.entries.map((entry: { prompt: { blob: { url: string } }[] }) => entry.prompt[0].blob.url)).size,
-  ).toBe(1)
-  expect(reads).toBe(1)
-})
-
-test("reuses a live URL on remount but reads the latest document", async () => {
+test("a document re-read while its image is live gets the URL back without a read", async () => {
  let reads = 0
  const { store, documents } = fixture("history-cache-remount", async () => {
    reads++
    return new Blob(["saved screenshot"])
  })
-  const first = JSON.parse((await store.getItem("history"))!)
+  const url = await resolveBlobUrl({ id: "history-cache-remount" })
  const changed = JSON.parse(documents.get("history")!)
  changed.entries[0].prompt.unshift({ type: "text", content: "new admission" })
  documents.set("history", JSON.stringify(changed))
  const second = JSON.parse((await store.getItem("history"))!)
  expect(second.entries[0].prompt[0].content).toBe("new admission")
-  expect(second.entries[0].prompt[1].blob).toEqual(first.entries[0].prompt[0].blob)
+  expect(second.entries[0].prompt[1].blob).toEqual({ id: "history-cache-remount", url })
  expect(reads).toBe(1)
 })

@@ -89,33 +79,34 @@ test("reuses a just-stored attachment without a round trip", async () => {
  })
  const reference = await store.putBlob(new Blob(["pending admission"]))
  expect(JSON.parse((await store.getItem("draft"))!).prompt[0].blob).toEqual(reference)
+  expect(await resolveBlobUrl({ id: reference.id })).toBe(reference.url)
  expect(reads).toBe(0)
  expect(await resolveObjectURL(reference.url)?.text()).toBe("pending admission")
 })

 test("does not retain a missing blob result", async () => {
  let reads = 0
-  const { store } = fixture("history-cache-missing", async () => (++reads === 1 ? null : new Blob(["arrived"])))
-  expect(JSON.parse((await store.getItem("draft"))!).prompt[0].blob.url).toBeUndefined()
-  expect(JSON.parse((await store.getItem("draft"))!).prompt[0].blob.url).toStartWith("blob:")
+  fixture("history-cache-missing", async () => (++reads === 1 ? null : new Blob(["arrived"])))
+  expect(await resolveBlobUrl({ id: "history-cache-missing" })).toBeUndefined()
+  expect(await resolveBlobUrl({ id: "history-cache-missing" })).toStartWith("blob:")
  expect(reads).toBe(2)
 })

 test("retries after a failed blob read", async () => {
  let reads = 0
-  const { store } = fixture("history-cache-failure", async () => {
+  fixture("history-cache-failure", async () => {
    if (++reads === 1) throw new Error("temporary storage failure")
    return new Blob(["recovered"])
  })
-  await expect(store.getItem("history")).rejects.toThrow("temporary storage failure")
-  expect(JSON.parse((await store.getItem("history"))!).entries[0].prompt[0].blob.url).toStartWith("blob:")
+  await expect(resolveBlobUrl({ id: "history-cache-failure" })).rejects.toThrow("temporary storage failure")
+  expect(await resolveBlobUrl({ id: "history-cache-failure" })).toStartWith("blob:")
  expect(reads).toBe(2)
 })

 test("keeps different blob IDs independent", async () => {
  const reads: string[] = []
-  const store = createDraftStore({
-    get: async () => JSON.stringify(["history-cache-first", "history-cache-second"].map((id) => ({ blob: { id } }))),
+  createDraftStore({
+    get: async () => null,
    set: async () => [],
    remove: async () => {},
    putBlob: async () => "unused",
@@ -124,10 +115,8 @@ test("keeps different blob IDs independent", async () => {
      return new Blob([id])
    },
  })
-  const value = JSON.parse((await store.getItem("history"))!)
-  expect(value[0].blob.url).not.toBe(value[1].blob.url)
-  expect(
-    await Promise.all(value.map((item: { blob: { url: string } }) => resolveObjectURL(item.blob.url)?.text())),
-  ).toEqual(reads)
+  const urls = await Promise.all(["history-cache-first", "history-cache-second"].map((id) => resolveBlobUrl({ id })))
+  expect(urls[0]).not.toBe(urls[1])
+  expect(await Promise.all(urls.map((url) => resolveObjectURL(url!)?.text()))).toEqual(reads)
  expect(reads).toEqual(["history-cache-first", "history-cache-second"])
 })
@@ -5,7 +5,7 @@ import { Schema } from "effect"
 import type { Platform } from "@/runtime/platform/platform"
 import { createComposerReady, createComposerState } from "@/composer/state"
 import { ServerScope } from "@/runtime/server/scope"
-import { createDraftStore } from "@/runtime/persistence/drafts"
+import { createDraftStore, resolveBlobUrl } from "@/runtime/persistence/drafts"
 import { flushPersisted } from "@/runtime/persistence/persist"
 import { Persist, persisted } from "@/runtime/persistence/storage"

@@ -103,15 +103,11 @@ describe("prompt persistence", () => {
      }),
    }))
    await root.session.ready.promise
+    // Bytes stay in the store until the image is shown or sent.
    expect(root.session.current()).toEqual([
-      {
-        type: "image",
-        id: "image",
-        filename: "image.png",
-        mime: "image/png",
-        blob: { id: "composer-image", url: expect.stringMatching(/^blob:/) },
-      },
+      { type: "image", id: "image", filename: "image.png", mime: "image/png", blob: { id: "composer-image", url: "" } },
    ])
+    expect(await resolveBlobUrl(root.session.current()[0]!.blob)).toStartWith("blob:")
    root.session.set([{ type: "text", content: "hello", start: 0, end: 5 }, ...root.session.current()])
    flushPersisted()
    await Bun.sleep(0)
@@ -237,7 +233,7 @@ describe("prompt persistence", () => {
  })
 })

-test("moves image data URLs into blobs and hydrates object URLs", async () => {
+test("moves image data URLs into blobs and resolves object URLs on demand", async () => {
  const documents = new Map<string, string>()
  const blobs = new Map<string, Blob>()
  const store = createDraftStore({
@@ -258,8 +254,8 @@ test("moves image data URLs into blobs and hydrates object URLs", async () => {
  await store.setItem("prompt", JSON.stringify({ prompt: [{ type: "image", dataUrl: "data:image/png;base64,YQ==" }] }))
  expect(documents.get("prompt")).not.toContain("dataUrl")
  const value = JSON.parse((await store.getItem("prompt"))!)
-  expect(value.prompt[0].blob.id).toBe("1")
-  expect(value.prompt[0].blob.url).toStartWith("blob:")
+  expect(value.prompt[0].blob).toEqual({ id: "1" })
+  expect(await resolveBlobUrl(value.prompt[0].blob)).toStartWith("blob:")
 })

 test("does not let delayed blob migration overwrite a newer draft", async () => {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/cli",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "type": "module",
  "license": "MIT",
  "bin": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/client",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -13,8 +13,8 @@ The idea of code mode was originally introduced by Cloudflare. See

 ## How it differs from JavaScript

- **Only supported APIs are available.** Programs can use the provided tools, supported JavaScript built-ins, and the
-  globals the host adds through extensions. Timers, `process`, filesystem access, imports, and modules are unavailable.
+- **Only supported APIs are available.** Programs can use the provided tools and supported JavaScript built-ins. APIs
+  such as `fetch`, timers, `process`, filesystem access, imports, and modules are unavailable.
 - **Unfinished work is interrupted.** Tool calls and async functions start when called. When the program finishes,
  anything still running is interrupted. Unhandled rejections from un-awaited promises are returned as warnings.
 - **REPL-style results.** Without an explicit `return`, the final top-level expression becomes the result. `undefined`
@@ -94,19 +94,11 @@ receive `{ extension, name, args }`. An `after` hook also receives how the call
 `failure` with its error, or `interrupted`). A failing `before` hook denies the call, and the program catches the
 failure as a thrown error.

-### `Extension.make`
+### `Values`

-Extensions are host functions a program calls directly as globals, such as `fetch`. Unlike tools they are not in the
-catalog, not counted against `maxToolCalls`, and not described to the model; the host decides what they mean.
-
-```ts
-const web = Extension.make({ name: "web", globals: { fetch: (url: string) => globalThis.fetch(url) } })
-const runtime = CodeMode.make({ tools, extensions: [web] })
-```
-
-Every value crossing in either direction is converted, never shared: arguments come in as copies, results go out as
-copies, and a function inside a result is callable the same way. A global that shadows a built-in or another
-extension throws at `CodeMode.make`.
+`Values` exports the runtime's non-JSON value classes: `Values.URL`, `Values.URLSearchParams`, `Values.Date`,
+`Values.RegExp`, `Values.Map`, `Values.Set`, and `Values.Promise`. The interpreter recognizes these by class; a
+program's `new URL(...)` is a `Values.URL` wrapping the host `URL`. `Values.isValue` narrows to the data-like kinds.

 ### OpenAPI tools

@@ -29,7 +29,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
      Uint8Array is rejected with a hint to encode as text, and own `__proto__` keys are dropped so merging tool
      inputs or results cannot replace a prototype. In-program `JSON.stringify` keeps JS behavior except for the
      Error form and a promise, which is a `TypeError` with an await hint rather than a silent `{}`.
- [x] Live Date, RegExp, Map, Set, URL, URLSearchParams, Headers, and Uint8Array values inside CodeMode.
+- [x] Live Date, RegExp, Map, Set, URL, URLSearchParams, and Uint8Array values inside CodeMode.
 - [x] Tool calls through the host-provided `tools` tree only.
 - [x] The global `search(...)` built-in: synchronous tool discovery that counts as an admitted tool call and is
      shadowable by program declarations like other globals.
@@ -47,8 +47,8 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 ## Values and literals

 - [x] `null`, `undefined`, booleans, finite and non-finite numbers, and strings.
- [x] Array literals, including holes and spread from arrays, strings, Maps, Sets, URLSearchParams, Headers, custom
-      synchronous iterators, and synchronous generators.
+- [x] Array literals, including holes and spread from arrays, strings, Maps, Sets, URLSearchParams, custom synchronous
+      iterators, and synchronous generators.
 - [x] Object literals with shorthand, computed string/number keys, and spread following ToObject: data objects and
      arrays copy own enumerable keys, strings copy index keys, and other values contribute nothing.
 - [x] Template literals with interpolation.
@@ -95,8 +95,8 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 - [x] `if`/`else` and conditional expressions.
 - [x] `switch`, including default clauses and fallthrough.
 - [x] `for`, `while`, and `do...while`.
- [x] `for...of` over arrays, strings, Maps, Sets, URLSearchParams, Headers, custom synchronous iterators, and
-      confined synchronous generators. Abrupt completion invokes the iterator's optional `return()`.
+- [x] `for...of` over arrays, strings, Maps, Sets, URLSearchParams, custom synchronous iterators, and confined
+      synchronous generators. Abrupt completion invokes the iterator's optional `return()`.
 - [x] `for...in` over own keys of plain objects, arrays, strings, and tool references; other values iterate nothing.
 - [x] Unlabeled `break` and `continue`.
 - [x] `try`, `catch`, optional catch bindings, and `finally`.
@@ -127,7 +127,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
      string). A detached method loses its receiver, as in JS: `values.filter("abc".includes)` is a `TypeError`
      because `includes` is called without a string `this`.
 - [x] Constructors work as callbacks with JS call semantics: `Error` types construct (`messages.map(Error)`),
-      and new-requiring constructors (`Map`, `Set`, `URL`, `URLSearchParams`, `Headers`, `Promise`) throw a `TypeError`,
+      and new-requiring constructors (`Map`, `Set`, `URL`, `URLSearchParams`, `Promise`) throw a `TypeError`,
      like JS.
 - [x] Tool references and detached `Promise` statics are rejected as callbacks with a hint to wrap them in an
      arrow function.
@@ -179,10 +179,10 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 - [x] Sequence expressions (the comma operator).
 - [x] `await` for CodeMode promises and callable thenables; a plain value passes through unchanged, though every
      `await` still defers its continuation one reaction turn.
- [x] `new` for Array, Object, Error types, Date, RegExp, Map, Set, URL, URLSearchParams, Headers, and Promise. `new`
-      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
+- [x] `new` for Array, Object, Error types, Date, RegExp, Map, Set, URL, URLSearchParams, and Promise. `new` 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.
 - [x] Arithmetic operators: `+`, `-`, `*`, `/`, `%`, and `**`.
 - [x] Equality and ordering: `==`, `!=`, `===`, `!==`, `<`, `<=`, `>`, and `>=`.
@@ -451,13 +451,7 @@ with a hint to encode as text first (`TextDecoder`, `toBase64`, `toHex`).
 - [x] `crypto.randomUUID()` and `crypto.getRandomValues(uint8Array)`.
 - [x] `TextEncoder` and `TextDecoder` for UTF-8 only: any other label is a `RangeError`. `TextDecoder` accepts the
      `fatal` and `ignoreBOM` options; `decode` takes a Uint8Array or nothing.
- [x] `new Headers()` from records, synchronous iterables of pairs, and Headers, wrapping the host's `Headers`: names
-      fold to lowercase, values are normalized and combined, and invalid names or values throw a `TypeError`.
- [x] Headers `append`, `delete`, `get`, `getSetCookie`, `has`, `set`, `forEach`, `keys`, `values`, and `entries`;
-      iteration is live and sorted by name, with `set-cookie` values kept apart.
- [x] Headers serialize to a `{ name: value }` object in JSON, in results, and in tool arguments.
- [ ] `Request`, `Response`, and `Blob`.
- [ ] `crypto.subtle` and `TextDecoder` streaming or non-UTF-8 encodings.
+- [ ] `crypto.subtle`, `Blob`, and `TextDecoder` streaming or non-UTF-8 encodings.

 ## Extensions

@@ -467,8 +461,8 @@ Nothing is exposed unless a host provides it; extension calls are not tool calls
 - [x] Each global is a function, callable but not constructible, run with `this` undefined. A global that shadows
      a built-in or another extension throws at `make`.
 - [x] Every value crossing in either direction is converted, never shared: plain objects and arrays are copied,
-      `Date`, `RegExp`, `URL`, `URLSearchParams`, `Headers`, `Map`, `Set`, and `Uint8Array` become fresh copies with
-      their contents converted (a host `ArrayBuffer` comes in as a `Uint8Array`; other typed arrays cannot come out),
+      `Date`, `RegExp`, `URL`, `URLSearchParams`, `Map`, `Set`, and `Uint8Array` become fresh copies with their
+      contents converted (a host `ArrayBuffer` comes in as a `Uint8Array`; other typed arrays cannot come out),
      errors cross as errors with their name and message, and a `__proto__` key is dropped. Functions, generators,
      un-awaited promises, and symbols cannot be passed in; a class instance, a symbol, or a BigInt cannot come out.
 - [x] A host function inside a result becomes a program function whose calls cross the same way, so a result can
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/codemode",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "description": "Effect-native confined code execution over schema-described tools",
  "type": "module",
  "license": "MIT",
@@ -17,7 +17,6 @@ import {
  record,
  SetObj,
  URLSearchParamsObj,
-  HeadersObj,
 } from "./interpreter/objects.js"
 import { typeofValue } from "./interpreter/references.js"

@@ -70,7 +69,6 @@ const walk = <R>(
        )
      }
      if (boundary && value instanceof URLSearchParamsObj) return value.params.toString()
-      if (value instanceof HeadersObj) return Object.fromEntries(value.headers)
      const target = boundary && value instanceof SetObj ? new Arr(ctx.builtins.Array, [...value.set]) : value
      if (stack.has(target)) throw typeError("Converting circular structure to JSON.")
      stack.add(target)
@@ -27,7 +27,6 @@ import {
  SetObj,
  URLObj,
  URLSearchParamsObj,
-  HeadersObj,
 } from "./objects.js"
 import { describeValue } from "./references.js"

@@ -53,7 +52,6 @@ export const extensionGlobals = <R>(
    if (value instanceof RegExpObj) return new RegExp(value.regex.source, value.regex.flags)
    if (value instanceof URLObj) return new URL(value.url.href)
    if (value instanceof URLSearchParamsObj) return new URLSearchParams(value.params)
-    if (value instanceof HeadersObj) return new Headers(value.headers)
    const next = (item: unknown) => toHost(item, label, depth + 1, seen)
    if (value instanceof MapObj) return new Map([...value.map].map(([key, item]) => [next(key), next(item)]))
    if (value instanceof SetObj) return new Set([...value.set].map(next))
@@ -127,7 +125,6 @@ export const extensionGlobals = <R>(
      if (value instanceof URLSearchParams) {
        return new URLSearchParamsObj(builtins.URLSearchParams, new URLSearchParams(value))
      }
-      if (value instanceof Headers) return new HeadersObj(builtins.Headers, new Headers(value))
      if (value instanceof Map) {
        const wrapped = new MapObj(builtins.Map)
        for (const [key, item] of value) wrapped.map.set(next(key, label), next(item, label))
@@ -11,7 +11,6 @@ import { objectGlobal } from "../stdlib/object.js"
 import { regexpGlobal } from "../stdlib/regexp.js"
 import { stringGlobal } from "../stdlib/string.js"
 import { uriGlobal, urlGlobal, urlSearchParamsGlobal } from "../stdlib/url.js"
-import { headersGlobal } from "../stdlib/headers.js"
 import { coercion } from "../stdlib/value.js"
 import { base64Global, cryptoGlobal } from "../stdlib/web.js"
 import { ToolReference } from "../tool-runtime.js"
@@ -81,7 +80,6 @@ const table: Record<string, Factory> = {
  Set: (ctx) => setGlobal(ctx),
  URL: (ctx) => urlGlobal(ctx),
  URLSearchParams: (ctx) => urlSearchParamsGlobal(ctx),
-  Headers: (ctx) => headersGlobal(ctx),
  Uint8Array: (ctx) => uint8ArrayGlobal(ctx),
  TextEncoder: (ctx) => textEncoderGlobal(ctx),
  TextDecoder: (ctx) => textDecoderGlobal(ctx),
@@ -84,7 +84,6 @@ import {
  PromiseObj,
  SetObj,
  URLSearchParamsObj,
-  HeadersObj,
  record,
  remove,
  set,
@@ -654,7 +653,7 @@ class Frame<R> {
      const cursor = iterator === undefined ? yield* self.iterate(right, node) : undefined
      if (iterator === undefined && cursor === undefined) {
        throw invalidData(
-          `${awaiting ? "for await...of" : "for...of"} requires an array, string, Map, Set, URLSearchParams, or Headers, or custom iterator value.`,
+          `${awaiting ? "for await...of" : "for...of"} requires an array, string, Map, Set, or URLSearchParams, or custom iterator value.`,
          node,
        )
      }
@@ -757,11 +756,9 @@ class Frame<R> {
              ? value.set.values()
              : value instanceof URLSearchParamsObj
                ? value.params.entries()
-                : value instanceof HeadersObj
-                  ? value.headers.entries()
-                  : value instanceof Bytes
-                    ? value.bytes.values()
-                    : undefined
+                : value instanceof Bytes
+                  ? value.bytes.values()
+                  : undefined
    if (iterator !== undefined) {
      const proto = this.ctx.builtins.Array
      return Effect.succeed({
@@ -1851,7 +1848,6 @@ class Frame<R> {
        value instanceof MapObj ||
        value instanceof SetObj ||
        value instanceof URLSearchParamsObj ||
-        value instanceof HeadersObj ||
        value instanceof Bytes
      ) {
        const cursor = yield* self.iterate(value, node)
@@ -29,7 +29,6 @@ const builtins = [
  "Set",
  "URL",
  "URLSearchParams",
-  "Headers",
  "Uint8Array",
  "TextEncoder",
  "TextDecoder",
@@ -81,7 +80,6 @@ export const createBuiltins = (): Builtins => {
    Set: plain(),
    URL: plain(),
    URLSearchParams: plain(),
-    Headers: plain(),
    Uint8Array: plain(),
    TextEncoder: plain(),
    TextDecoder: plain(),
@@ -156,15 +156,6 @@ export class URLSearchParamsObj extends Obj {
  }
 }

-export class HeadersObj extends Obj {
-  constructor(
-    proto: Obj,
-    readonly headers: Headers,
-  ) {
-    super(proto)
-  }
-}
-
 export class URLObj extends Obj {
  readonly searchParams: URLSearchParamsObj
  constructor(
@@ -190,14 +181,13 @@ export class Bytes extends Obj {
 /** Built-in objects that wrap a host value; data-like, but never plain data. */
 export const isWrapper = (
  value: unknown,
-): value is DateObj | RegExpObj | MapObj | SetObj | URLObj | URLSearchParamsObj | HeadersObj | Bytes =>
+): value is DateObj | RegExpObj | MapObj | SetObj | URLObj | URLSearchParamsObj | Bytes =>
  value instanceof DateObj ||
  value instanceof RegExpObj ||
  value instanceof MapObj ||
  value instanceof SetObj ||
  value instanceof URLObj ||
  value instanceof URLSearchParamsObj ||
-  value instanceof HeadersObj ||
  value instanceof Bytes

 const MAX_ARRAY_INDEX = 4_294_967_295
@@ -16,7 +16,6 @@ import {
  SetObj,
  URLObj,
  URLSearchParamsObj,
-  HeadersObj,
 } from "./objects.js"

 /** Values that cannot cross the data boundary. */
@@ -86,7 +85,6 @@ export const describeValue = (value: unknown): string => {
  if (value instanceof SetObj) return "a Set"
  if (value instanceof URLObj) return "a URL"
  if (value instanceof URLSearchParamsObj) return "a URLSearchParams"
-  if (value instanceof HeadersObj) return "a Headers"
  if (value instanceof Bytes) return "a Uint8Array"
  if (value instanceof GeneratorObj) return "a generator"
  if (isRuntimeReference(value)) return "a function"
@@ -12,7 +12,6 @@ import {
  SetObj,
  URLObj,
  URLSearchParamsObj,
-  HeadersObj,
 } from "../interpreter/objects.js"
 import { containsOpaqueReference, isRuntimeReference } from "../interpreter/references.js"
 import type { Interpreter } from "../interpreter/interpreter.js"
@@ -67,7 +66,6 @@ const formatConsoleValue = (value: unknown, seen: Set<object>, depth: number): s
  if (value instanceof RegExpObj) return coerceToString(value)
  if (value instanceof URLObj) return coerceToString(value)
  if (value instanceof URLSearchParamsObj) return coerceToString(value)
-  if (value instanceof HeadersObj) return `Headers ${JSON.stringify(Object.fromEntries(value.headers))}`
  if (value instanceof Bytes) return `Uint8Array(${value.bytes.length}) [${value.bytes.join(",")}]`
  if (depth > MAX_CONSOLE_DEPTH) return "..."
  if (seen.has(value)) return "[Circular]"
@@ -1,119 +0,0 @@
-import { Effect } from "effect"
-import { constructor, methods, prototypeFrom, receiver, requiresNew } from "../interpreter/native.js"
-import { typeError } from "../interpreter/model.js"
-import { entries, Arr, HeadersObj, Obj } from "../interpreter/objects.js"
-import { applyCollectionCallback } from "../interpreter/callback.js"
-import { isRuntimeReference } from "../interpreter/references.js"
-import type { Interpreter } from "../interpreter/interpreter.js"
-import { coerceToString } from "./value.js"
-import { readPairs } from "./url.js"
-
-// The host validates header names and values and throws its own TypeError; the program gets one of its own.
-const attempt = <T>(run: () => T): T => {
-  try {
-    return run()
-  } catch (error) {
-    throw typeError(error instanceof Error ? error.message : String(error))
-  }
-}
-
-const constructHeaders = <R>(ctx: Interpreter<R>, init: unknown, proto: Obj): Effect.Effect<HeadersObj, unknown, R> => {
-  const wrap = (headers: Headers) => new HeadersObj(proto, headers)
-  if (init === undefined) return Effect.succeed(wrap(new Headers()))
-  return Effect.gen(function* () {
-    const pairs = init instanceof Obj ? yield* readPairs(ctx, init, "new Headers(...)") : undefined
-    if (pairs !== undefined) return wrap(attempt(() => new Headers(pairs)))
-    if (!(init instanceof Obj) || isRuntimeReference(init)) {
-      throw typeError("new Headers(...) expects a record of names to values, iterable [name, value] pairs, or Headers.")
-    }
-    return wrap(
-      attempt(() => new Headers(Object.fromEntries(entries(init).map(([key, value]) => [key, coerceToString(value)])))),
-    )
-  })
-}
-
-export const headersGlobal = <R>(ctx: Interpreter<R>) => {
-  const builtins = ctx.builtins
-  const proto = builtins.Headers
-  const headers = constructor<R>(builtins, proto, {
-    name: "Headers",
-    call: requiresNew("Headers"),
-    construct: (args, newTarget) => constructHeaders(ctx, args[0], prototypeFrom(newTarget, proto)),
-  })
-  const self = (thisValue: unknown, name: string) => receiver(HeadersObj, thisValue, `Headers.prototype.${name}`)
-  const wrap = (items: Array<unknown>) => new Arr(builtins.Array, items)
-  const arg = (args: Array<unknown>, index: number): string => coerceToString(args[index])
-  const requireArgs = (name: string, args: Array<unknown>, count: number): void => {
-    if (args.length < count) throw typeError(`Headers.${name} requires ${count} argument${count === 1 ? "" : "s"}.`)
-  }
-  methods(builtins, proto, [
-    [
-      "append",
-      2,
-      (thisValue, args) => {
-        requireArgs("append", args, 2)
-        const target = self(thisValue, "append").headers
-        return attempt(() => target.append(arg(args, 0), arg(args, 1)))
-      },
-    ],
-    [
-      "delete",
-      1,
-      (thisValue, args) => {
-        requireArgs("delete", args, 1)
-        const target = self(thisValue, "delete").headers
-        return attempt(() => target.delete(arg(args, 0)))
-      },
-    ],
-    [
-      "get",
-      1,
-      (thisValue, args) => {
-        requireArgs("get", args, 1)
-        const target = self(thisValue, "get").headers
-        return attempt(() => target.get(arg(args, 0)))
-      },
-    ],
-    ["getSetCookie", 0, (thisValue) => wrap(self(thisValue, "getSetCookie").headers.getSetCookie())],
-    [
-      "has",
-      1,
-      (thisValue, args) => {
-        requireArgs("has", args, 1)
-        const target = self(thisValue, "has").headers
-        return attempt(() => target.has(arg(args, 0)))
-      },
-    ],
-    [
-      "set",
-      2,
-      (thisValue, args) => {
-        requireArgs("set", args, 2)
-        const target = self(thisValue, "set").headers
-        return attempt(() => target.set(arg(args, 0), arg(args, 1)))
-      },
-    ],
-    ["keys", 0, (thisValue) => wrap(Array.from(self(thisValue, "keys").headers.keys()))],
-    ["values", 0, (thisValue) => wrap(Array.from(self(thisValue, "values").headers.values()))],
-    [
-      "entries",
-      0,
-      (thisValue) =>
-        wrap(Array.from(self(thisValue, "entries").headers.entries(), ([key, value]) => wrap([key, value]))),
-    ],
-    [
-      "forEach",
-      1,
-      (thisValue, args) => {
-        requireArgs("forEach", args, 1)
-        const target = self(thisValue, "forEach")
-        const apply = applyCollectionCallback(ctx, args[0], "Headers.forEach")
-        return Effect.gen(function* () {
-          for (const [key, value] of Array.from(target.headers.entries())) yield* apply([value, key, target])
-          return undefined
-        })
-      },
-    ],
-  ])
-  return headers
-}
@@ -107,10 +107,12 @@ export const urlGlobal = <R>(ctx: Interpreter<R>) => {
  return url
 }

-const readPair = <R>(ctx: Interpreter<R>, value: unknown, label: string): Effect.Effect<Array<string>, unknown, R> =>
+const readPair = <R>(ctx: Interpreter<R>, value: unknown): Effect.Effect<Array<string>, unknown, R> =>
  Effect.gen(function* () {
    const cursor = yield* ctx.iterate(value)
-    if (cursor === undefined) throw typeError(`${label} expects iterable [name, value] pairs.`)
+    if (cursor === undefined) {
+      throw typeError("new URLSearchParams(...) expects iterable [name, value] pairs.")
+    }
    const items: Array<string> = []
    while (true) {
      const step = yield* cursor.next
@@ -124,29 +126,6 @@ const readPair = <R>(ctx: Interpreter<R>, value: unknown, label: string): Effect
    }
  })

-/**
- * Reads a synchronous iterable of `[name, value]` pairs as strings; `undefined` when `init` is not iterable. As in
- * WebIDL, the whole sequence is converted before any pair's length is checked.
- */
-export const readPairs = <R>(
-  ctx: Interpreter<R>,
-  init: unknown,
-  label: string,
-): Effect.Effect<Array<[string, string]> | undefined, unknown, R> =>
-  Effect.gen(function* () {
-    const cursor = yield* ctx.iterate(init)
-    if (cursor === undefined) return undefined
-    const pairs: Array<Array<string>> = []
-    while (true) {
-      const step = yield* cursor.next
-      if (step.done) {
-        if (pairs.some((entry) => entry.length !== 2)) throw typeError(`${label} expects iterable [name, value] pairs.`)
-        return pairs as Array<[string, string]>
-      }
-      pairs.push(yield* preserveConsumerError(cursor, readPair(ctx, step.value, label)))
-    }
-  })
-
 const constructURLSearchParams = <R>(
  ctx: Interpreter<R>,
  init: unknown,
@@ -160,8 +139,20 @@ const constructURLSearchParams = <R>(
    return Effect.succeed(wrap(new URLSearchParams(coerceToString(init))))
  }
  return Effect.gen(function* () {
-    const pairs = yield* readPairs(ctx, init, "new URLSearchParams(...)")
-    if (pairs !== undefined) return wrap(new URLSearchParams(pairs))
+    const cursor = yield* ctx.iterate(init)
+    if (cursor !== undefined) {
+      const pairs: Array<Array<string>> = []
+      while (true) {
+        const step = yield* cursor.next
+        if (step.done) {
+          if (pairs.some((entry) => entry.length !== 2)) {
+            throw typeError("new URLSearchParams(...) expects iterable [name, value] pairs.")
+          }
+          return wrap(new URLSearchParams(pairs.map((entry): [string, string] => [entry[0] ?? "", entry[1] ?? ""])))
+        }
+        pairs.push(yield* preserveConsumerError(cursor, readPair(ctx, step.value)))
+      }
+    }
    if (isRuntimeReference(init)) {
      throw typeError("new URLSearchParams(...) expects a query string, data object, or synchronous iterable pairs.")
    }
@@ -13,7 +13,6 @@ import {
  SetObj,
  URLObj,
  URLSearchParamsObj,
-  HeadersObj,
 } from "../interpreter/objects.js"
 import type { Interpreter } from "../interpreter/interpreter.js"

@@ -29,7 +28,6 @@ export const coerceToString = (value: unknown): string => {
  if (value instanceof SetObj) return "[object Set]"
  if (value instanceof URLObj) return value.url.href
  if (value instanceof URLSearchParamsObj) return value.params.toString()
-  if (value instanceof HeadersObj) return "[object Headers]"
  if (value instanceof Bytes) return value.bytes.join(",")
  if (value instanceof ErrorObj) {
    // Match Error.prototype.toString: "name: message", or just one when the other is empty.
@@ -128,34 +128,6 @@ describe("values are converted at the boundary, never shared", () => {
    expect([...(held[0] as Set<{ z: number }>)][0]).toEqual({ z: 1 })
  })

-  test("Headers cross as copies in both directions", async () => {
-    const stored = new Headers({ "X-A": "1" })
-    const target = CodeMode.make({
-      extensions: [
-        Extension.make({
-          name: "http",
-          globals: {
-            headers: () => stored,
-            keep: (value: Headers) => {
-              held.push(value)
-              return value
-            },
-          },
-        }),
-      ],
-    })
-    held.length = 0
-    expect(
-      await value(
-        `const h = headers(); h.set("x-a", "2"); const back = keep(h); back.set("x-a", "3"); return [h instanceof Headers, h.get("x-a"), back === h, back.get("x-a"), [...back]]`,
-        target,
-      ),
-    ).toEqual([true, "2", false, "3", [["x-a", "3"]]])
-    expect(stored.get("x-a")).toBe("1")
-    expect(held[0]).toBeInstanceOf(Headers)
-    expect((held[0] as Headers).get("x-a")).toBe("2")
-  })
-
  test("bytes cross as copies in both directions; ArrayBuffer comes in as Uint8Array", async () => {
    const stored = new Uint8Array([1, 2, 3])
    const target = CodeMode.make({
@@ -635,154 +635,6 @@ describe("URL and URI helpers", () => {
  })
 })

-describe("Headers", () => {
-  test("constructs from records, pairs, Maps, and Headers; names fold to lowercase and values combine", async () => {
-    expect(
-      await value(`
-        const headers = new Headers({ "Content-Type": "text/plain", "X-Count": 1, "X-Null": null })
-        headers.append("Accept", "text/html")
-        headers.append("accept", "application/json")
-        headers.set("x-count", "2")
-        headers.delete("x-null")
-        const copy = new Headers(headers)
-        copy.set("content-type", "text/html")
-        return {
-          get: headers.get("content-type"),
-          missing: headers.get("x-missing"),
-          combined: headers.get("ACCEPT"),
-          has: [headers.has("Accept"), headers.has("x-null")],
-          count: headers.get("x-count"),
-          copied: [headers.get("content-type"), copy.get("content-type")],
-          pairs: [...new Headers([["b", "2"], ["A", "1"]])],
-          map: [...new Headers(new Map([["k", "v"]]))],
-          keys: headers.keys(),
-          values: headers.values(),
-          entries: headers.entries(),
-        }
-      `),
-    ).toEqual({
-      get: "text/plain",
-      missing: null,
-      combined: "text/html, application/json",
-      has: [true, false],
-      count: "2",
-      copied: ["text/plain", "text/html"],
-      pairs: [
-        ["a", "1"],
-        ["b", "2"],
-      ],
-      map: [["k", "v"]],
-      keys: ["accept", "content-type", "x-count"],
-      values: ["text/html, application/json", "text/plain", "2"],
-      entries: [
-        ["accept", "text/html, application/json"],
-        ["content-type", "text/plain"],
-        ["x-count", "2"],
-      ],
-    })
-  })
-
-  test("iterates in sorted order everywhere iteration is allowed, and getSetCookie keeps cookies apart", async () => {
-    expect(
-      await value(`
-        const headers = new Headers({ b: "2", a: "1" })
-        headers.append("Set-Cookie", "x=1")
-        headers.append("set-cookie", "y=2")
-        const seen = []
-        headers.forEach((value, name, self) => seen.push(name + "=" + value + ":" + (self === headers)))
-        const [first] = headers
-        function* pairs() { yield* headers }
-        return {
-          seen,
-          first,
-          spread: [...headers],
-          from: Array.from(headers).length,
-          generator: [...pairs()].length,
-          object: Object.fromEntries(headers),
-          cookies: headers.getSetCookie(),
-        }
-      `),
-    ).toEqual({
-      seen: ["a=1:true", "b=2:true", "set-cookie=x=1:true", "set-cookie=y=2:true"],
-      first: ["a", "1"],
-      spread: [
-        ["a", "1"],
-        ["b", "2"],
-        ["set-cookie", "x=1"],
-        ["set-cookie", "y=2"],
-      ],
-      from: 4,
-      generator: 4,
-      object: { a: "1", b: "2", "set-cookie": "y=2" },
-      cookies: ["x=1", "y=2"],
-    })
-  })
-
-  test("serializes as a name-to-value object at the boundary and in JSON; prints for console", async () => {
-    const result = await run(`
-      const headers = new Headers({ "X-A": "1", b: "2" })
-      console.log(headers)
-      return { headers, json: JSON.stringify({ headers }), text: String(headers), type: typeof headers, is: headers instanceof Headers }
-    `)
-    expect(result.ok && result.value).toEqual({
-      headers: { b: "2", "x-a": "1" },
-      json: '{"headers":{"b":"2","x-a":"1"}}',
-      text: "[object Headers]",
-      type: "object",
-      is: true,
-    })
-    expect(result.ok && result.logs?.[0]).toBe('Headers {"b":"2","x-a":"1"}')
-  })
-
-  test("rejects what it cannot build from, and invalid names and values, with TypeErrors the program can catch", async () => {
-    expect(
-      await value(`
-        function message(run) {
-          try { run(); return null } catch (error) { return error instanceof TypeError ? error.message : error }
-        }
-        const headers = new Headers()
-        return [
-          message(() => Headers()),
-          message(() => new Headers(null)),
-          message(() => new Headers(1)),
-          message(() => new Headers("a=1")),
-          message(() => new Headers(new Date())),
-          message(() => new Headers(() => 1)),
-          message(() => new Headers([["name"]])),
-          message(() => new Headers([["a", "b", "c"]])),
-          message(() => new Headers({ "bad name": "x" })),
-          message(() => new Headers({ name: "bad\u0000value" })),
-          message(() => headers.get("invalid\u0100")),
-          message(() => headers.has({})),
-          message(() => headers.set("a", "invalid\u0100")),
-          message(() => headers.append("a")),
-          message(() => headers.forEach()),
-          message(() => headers.forEach(1)),
-          message(() => { const get = headers.get; return get("a") }),
-        ]
-      `),
-    ).toEqual([
-      "Constructor Headers requires 'new'.",
-      "new Headers(...) expects a record of names to values, iterable [name, value] pairs, or Headers.",
-      "new Headers(...) expects a record of names to values, iterable [name, value] pairs, or Headers.",
-      "new Headers(...) expects a record of names to values, iterable [name, value] pairs, or Headers.",
-      "new Headers(...) expects a record of names to values, iterable [name, value] pairs, or Headers.",
-      "new Headers(...) expects a record of names to values, iterable [name, value] pairs, or Headers.",
-      "new Headers(...) expects iterable [name, value] pairs.",
-      "new Headers(...) expects iterable [name, value] pairs.",
-      expect.stringContaining("bad name"),
-      expect.stringContaining("invalid value"),
-      expect.stringContaining("Invalid header name"),
-      expect.stringContaining("[object Object]"),
-      expect.stringContaining("invalid value"),
-      "Headers.append requires 2 arguments.",
-      "Headers.forEach requires 1 argument.",
-      "Headers.forEach expects a function callback.",
-      "Headers.prototype.get called on incompatible receiver undefined.",
-    ])
-  })
-})
-
 describe("Map", () => {
  test("get/set/has/size with chaining", async () => {
    expect(
@@ -3,13 +3,10 @@
 * - html/webappapis/atob/base64.any.js (btoa reference encoder, input list, and atob WebIDL cases)
 * - fetch/data-urls/resources/base64.json (copied to fixtures/wpt-base64.json)
 * - WebCryptoAPI/randomUUID.https.any.js
- * - fetch/api/headers/{headers-basic,headers-errors}.any.js
 *
 * Copyright © web-platform-tests contributors. Governed by the 3-Clause BSD license in LICENSE.wpt.
 *
 * `assert_throws_dom("InvalidCharacterError", …)` becomes a check for a TypeError: CodeMode has no DOMException.
- * Headers cases that need `Symbol.iterator`, iterator objects from `keys()`/`values()`/`entries()` (CodeMode returns
- * arrays), or a custom iterator on a Headers instance are left out.
 */
 import { describe, expect, test } from "bun:test"
 import { Effect } from "effect"
@@ -169,225 +166,3 @@ describe("crypto.randomUUID WPT parity (WebCryptoAPI/randomUUID.https.any.js)",
    ).toEqual([true, true, true, 768])
  })
 })
-
-// Enough of testharness.js to run the Headers files close to verbatim; each `test` records its failure, if any.
-const testharness = `
-  const failures = []
-  function test(run, name) { try { run() } catch (error) { failures.push(name + ": " + (error && error.message ? error.message : error)) } }
-  function assert_equals(actual, expected, message) { if (actual !== expected) throw new Error((message || "") + " expected " + JSON.stringify(expected) + " got " + JSON.stringify(actual)) }
-  function assert_true(actual, message) { assert_equals(actual, true, message) }
-  function assert_false(actual, message) { assert_equals(actual, false, message) }
-  function assert_array_equals(actual, expected, message) { assert_equals(JSON.stringify(actual), JSON.stringify(expected), message) }
-  function assert_throws_js(type, run) { try { run() } catch (error) { if (error instanceof type) return; throw new Error("threw " + error.name) } throw new Error("did not throw") }
-  function assert_unreached() { throw new Error("unreachable") }
-`
-
-describe("Headers WPT parity (fetch/api/headers)", () => {
-  test("headers-basic.any.js", async () => {
-    expect(
-      await value(`
-        ${testharness}
-        test(function() { new Headers() }, "Create headers from no parameter")
-        test(function() { new Headers(undefined) }, "Create headers from undefined parameter")
-        test(function() { new Headers({}) }, "Create headers from empty object")
-        var parameters = [null, 1]
-        parameters.forEach(function(parameter) {
-          test(function() { assert_throws_js(TypeError, function() { new Headers(parameter) }) }, "Create headers with " + parameter + " should throw")
-        })
-        var headerDict = {"name1": "value1", "name2": "value2", "name3": "value3", "name4": null, "name5": undefined, "name6": 1, "Content-Type": "value4"}
-        var headerSeq = []
-        for (var name in headerDict) headerSeq.push([name, headerDict[name]])
-        test(function() {
-          var headers = new Headers(headerSeq)
-          for (name in headerDict) assert_equals(headers.get(name), String(headerDict[name]), "name: " + name + " has value: " + headerDict[name])
-          assert_equals(headers.get("length"), null, "init should be treated as a sequence, not as a dictionary")
-        }, "Create headers with sequence")
-        test(function() {
-          var headers = new Headers(headerDict)
-          for (name in headerDict) assert_equals(headers.get(name), String(headerDict[name]), "name: " + name + " has value: " + headerDict[name])
-        }, "Create headers with record")
-        test(function() {
-          var headers = new Headers(headerDict)
-          var headers2 = new Headers(headers)
-          for (name in headerDict) assert_equals(headers2.get(name), String(headerDict[name]), "name: " + name + " has value: " + headerDict[name])
-        }, "Create headers with existing headers")
-        test(function() {
-          var headers = new Headers()
-          for (name in headerDict) {
-            headers.append(name, headerDict[name])
-            assert_equals(headers.get(name), String(headerDict[name]), "name: " + name + " has value: " + headerDict[name])
-          }
-        }, "Check append method")
-        test(function() {
-          var headers = new Headers()
-          for (name in headerDict) {
-            headers.set(name, headerDict[name])
-            assert_equals(headers.get(name), String(headerDict[name]), "name: " + name + " has value: " + headerDict[name])
-          }
-        }, "Check set method")
-        test(function() {
-          var headers = new Headers(headerDict)
-          for (name in headerDict) assert_true(headers.has(name), "headers has name " + name)
-          assert_false(headers.has("nameNotInHeaders"), "headers do not have header: nameNotInHeaders")
-        }, "Check has method")
-        test(function() {
-          var headers = new Headers(headerDict)
-          for (name in headerDict) {
-            assert_true(headers.has(name), "headers have a header: " + name)
-            headers.delete(name)
-            assert_true(!headers.has(name), "headers do not have anymore a header: " + name)
-          }
-        }, "Check delete method")
-        test(function() {
-          var headers = new Headers(headerDict)
-          for (name in headerDict) assert_equals(headers.get(name), String(headerDict[name]), "name: " + name + " has value: " + headerDict[name])
-          assert_equals(headers.get("nameNotInHeaders"), null, "header: nameNotInHeaders has no value")
-        }, "Check get method")
-        var headerEntriesDict = {"name1": "value1", "Name2": "value2", "name": "value3", "content-Type": "value4", "Content-Typ": "value5", "Content-Types": "value6"}
-        var sortedHeaderDict = {}
-        var headerValues = []
-        var sortedHeaderKeys = Object.keys(headerEntriesDict).map(function(value) {
-          sortedHeaderDict[value.toLowerCase()] = headerEntriesDict[value]
-          headerValues.push(headerEntriesDict[value])
-          return value.toLowerCase()
-        }).sort()
-        test(function() {
-          var headers = new Headers(headerEntriesDict)
-          assert_array_equals(headers.keys(), sortedHeaderKeys)
-          for (const key of headers.keys()) assert_true(sortedHeaderKeys.indexOf(key) != -1)
-        }, "Check keys method")
-        test(function() {
-          var headers = new Headers(headerEntriesDict)
-          assert_array_equals(headers.values(), sortedHeaderKeys.map((key) => sortedHeaderDict[key]))
-          for (const value of headers.values()) assert_true(headerValues.indexOf(value) != -1)
-        }, "Check values method")
-        test(function() {
-          var headers = new Headers(headerEntriesDict)
-          assert_array_equals(headers.entries(), sortedHeaderKeys.map((key) => [key, sortedHeaderDict[key]]))
-          for (const entry of headers.entries()) assert_equals(entry[1], sortedHeaderDict[entry[0]])
-        }, "Check entries method")
-        test(function() {
-          var headers = new Headers(headerEntriesDict)
-          assert_array_equals([...headers], sortedHeaderKeys.map((key) => [key, sortedHeaderDict[key]]))
-        }, "Check Symbol.iterator method")
-        test(function() {
-          var headers = new Headers(headerEntriesDict)
-          var index = 0
-          headers.forEach(function(value, key, container) {
-            assert_equals(headers, container)
-            assert_equals(key, sortedHeaderKeys[index])
-            assert_equals(value, sortedHeaderDict[sortedHeaderKeys[index]])
-            index++
-          })
-          assert_equals(index, sortedHeaderKeys.length)
-        }, "Check forEach method")
-        test(() => {
-          const headers = new Headers({"foo": "2", "baz": "1", "BAR": "0"})
-          const actualKeys = []
-          const actualValues = []
-          for (const [header, value] of headers) {
-            actualKeys.push(header)
-            actualValues.push(value)
-            headers.delete("foo")
-          }
-          assert_array_equals(actualKeys, ["bar", "baz"])
-          assert_array_equals(actualValues, ["0", "1"])
-        }, "Iteration skips elements removed while iterating")
-        test(() => {
-          const headers = new Headers({"foo": "2", "baz": "1", "BAR": "0", "quux": "3"})
-          const actualKeys = []
-          const actualValues = []
-          for (const [header, value] of headers) {
-            actualKeys.push(header)
-            actualValues.push(value)
-            if (header === "baz") headers.delete("bar")
-          }
-          assert_array_equals(actualKeys, ["bar", "baz", "quux"])
-          assert_array_equals(actualValues, ["0", "1", "3"])
-        }, "Removing elements already iterated over causes an element to be skipped during iteration")
-        test(() => {
-          const headers = new Headers({"foo": "2", "baz": "1", "BAR": "0", "quux": "3"})
-          const actualKeys = []
-          const actualValues = []
-          for (const [header, value] of headers) {
-            actualKeys.push(header)
-            actualValues.push(value)
-            if (header === "baz") headers.append("X-yZ", "4")
-          }
-          assert_array_equals(actualKeys, ["bar", "baz", "foo", "quux", "x-yz"])
-          assert_array_equals(actualValues, ["0", "1", "2", "3", "4"])
-        }, "Appending a value pair during iteration causes it to be reached during iteration")
-        test(() => {
-          const headers = new Headers({"foo": "2", "baz": "1", "BAR": "0", "quux": "3"})
-          const actualKeys = []
-          const actualValues = []
-          for (const [header, value] of headers) {
-            actualKeys.push(header)
-            actualValues.push(value)
-            if (header === "baz") headers.append("abc", "-1")
-          }
-          assert_array_equals(actualKeys, ["bar", "baz", "baz", "foo", "quux"])
-          assert_array_equals(actualValues, ["0", "1", "1", "2", "3"])
-        }, "Prepending a value pair before the current element position causes it to be skipped during iteration and adds the current element a second time")
-        return failures
-      `),
-    ).toEqual([])
-  })
-
-  test("headers-errors.any.js", async () => {
-    expect(
-      await value(`
-        ${testharness}
-        test(function() { assert_throws_js(TypeError, function() { new Headers([["name"]]) }) }, "Create headers giving an array having one string as init argument")
-        test(function() { assert_throws_js(TypeError, function() { new Headers([["invalid", "invalidValue1", "invalidValue2"]]) }) }, "Create headers giving an array having three strings as init argument")
-        test(function() { assert_throws_js(TypeError, function() { new Headers([["invalid\u0100", "Value1"]]) }) }, "Create headers giving bad header name as init argument")
-        test(function() { assert_throws_js(TypeError, function() { new Headers([["name", "invalidValue\u0100"]]) }) }, "Create headers giving bad header value as init argument")
-        var badNames = ["invalid\u0100", {}]
-        var badValues = ["invalid\u0100"]
-        badNames.forEach(function(name) {
-          test(function() { var headers = new Headers(); assert_throws_js(TypeError, function() { headers.get(name) }) }, "Check headers get with an invalid name " + name)
-        })
-        badNames.forEach(function(name) {
-          test(function() { var headers = new Headers(); assert_throws_js(TypeError, function() { headers.delete(name) }) }, "Check headers delete with an invalid name " + name)
-        })
-        badNames.forEach(function(name) {
-          test(function() { var headers = new Headers(); assert_throws_js(TypeError, function() { headers.has(name) }) }, "Check headers has with an invalid name " + name)
-        })
-        badNames.forEach(function(name) {
-          test(function() { var headers = new Headers(); assert_throws_js(TypeError, function() { headers.set(name, "Value1") }) }, "Check headers set with an invalid name " + name)
-        })
-        badValues.forEach(function(value) {
-          test(function() { var headers = new Headers(); assert_throws_js(TypeError, function() { headers.set("name", value) }) }, "Check headers set with an invalid value " + value)
-        })
-        badNames.forEach(function(name) {
-          test(function() { var headers = new Headers(); assert_throws_js(TypeError, function() { headers.append("invalid\u0100", "Value1") }) }, "Check headers append with an invalid name " + name)
-        })
-        badValues.forEach(function(value) {
-          test(function() { var headers = new Headers(); assert_throws_js(TypeError, function() { headers.append("name", value) }) }, "Check headers append with an invalid value " + value)
-        })
-        test(function() {
-          var headers = new Headers([["name", "value"]])
-          assert_throws_js(TypeError, function() { headers.forEach() })
-          assert_throws_js(TypeError, function() { headers.forEach(undefined) })
-          assert_throws_js(TypeError, function() { headers.forEach(1) })
-        }, "Headers forEach throws if argument is not callable")
-        test(function() {
-          var headers = new Headers([["name1", "value1"], ["name2", "value2"], ["name3", "value3"]])
-          var counter = 0
-          try {
-            headers.forEach(function(value, name) {
-              counter++
-              if (name == "name2") throw "error"
-            })
-          } catch (e) {
-            assert_equals(counter, 2)
-            assert_equals(e, "error")
-            return
-          }
-          assert_unreached()
-        }, "Headers forEach loop should stop if callback is throwing exception")
-        return failures
-      `),
-    ).toEqual([])
-  })
-})
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/console-app",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/console-core",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/console-function",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/console-mail",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "dependencies": {
    "@jsx-email/all": "2.2.3",
    "@jsx-email/cli": "1.4.3",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/console-support",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "name": "@opencode/core",
  "type": "module",
  "license": "MIT",
@@ -0,0 +1,29 @@
+export * as NativeCompactionPlugin from "./compaction.js"
+
+import { LLMClient, Message } from "@opencode/ai"
+import { define } from "@opencode/plugin/effect/plugin"
+import { Effect } from "effect"
+import { SessionCompaction } from "../session/compaction.js"
+import type { PluginInternal } from "./internal.js"
+
+export const Plugin = define({
+  id: "opencode.compaction.native",
+  effect: Effect.fn("NativeCompactionPlugin")(function* () {
+    const llm = yield* LLMClient.Service
+    const compaction = yield* SessionCompaction.Service
+    yield* compaction.transform((editor) => {
+      editor.native((input) => {
+        const request = input.request
+        if (LLMClient.canCompact(request, { mechanism: "trigger" }))
+          return Effect.gen(function* () {
+            const retained = yield* input.retained
+            const result = yield* llm.compact(request, { ...input.options, mechanism: "trigger" })
+            return { replacement: [...retained, Message.assistant(result.checkpoint)], usage: result.usage }
+          })
+        if (LLMClient.canCompact(request))
+          return llm.compact(request, { mechanism: "endpoint", http: input.options.http })
+        return undefined
+      })
+    })
+  }),
+} satisfies PluginInternal.InternalPlugin)
@@ -1,5 +1,6 @@
 export * as PluginInternal from "./internal.js"

+import { LLMClient } from "@opencode/ai"
 import type { Plugin } from "@opencode/plugin/effect/plugin"
 import { LayerNode } from "@opencode/util/effect/layer-node"
 import { httpClient } from "@opencode/util/effect/app-node-platform"
@@ -12,6 +13,7 @@ import { Provider } from "../provider.js"
 import { Command } from "../command.js"
 import { Config } from "../config.js"
 import { Credential } from "../credential.js"
+import { llmClient } from "../effect/app-node-platform.js"
 import { ConfigAgentPlugin } from "../config/plugin/agent.js"
 import { ConfigCommandPlugin } from "../config/plugin/command.js"
 import { ConfigCompactionPlugin } from "../config/plugin/compaction.js"
@@ -84,6 +86,7 @@ import { WriteTool } from "../tool/plugin/write.js"
 import { AgentPlugin } from "./agent.js"
 import BrowserPlugin from "@opencode/plugin-browser"
 import { CommandPlugin } from "./command.js"
+import { NativeCompactionPlugin } from "./compaction.js"
 import { IdentityPlugin } from "./identity.js"
 import { PlanPlugin } from "./plan.js"
 import { ModelsDevPlugin } from "./models-dev.js"
@@ -120,6 +123,7 @@ const services = [
  Integration.Service,
  Job.Service,
  KV.Service,
+  LLMClient.Service,
  Location.Service,
  ModelsDev.Service,
  Mcp.Service,
@@ -171,6 +175,7 @@ export const requirements = LayerNode.group([
  Integration.node,
  Job.node,
  KV.node,
+  llmClient,
  Location.node,
  ModelsDev.node,
  Mcp.node,
@@ -212,6 +217,7 @@ const pre = [
  SkillPlugin.Plugin,
  VcsHgPlugin.Plugin,
  ModelsDevPlugin,
+  NativeCompactionPlugin.Plugin,
  ...ProviderPlugins,
  ...WebSearchPlugins,
  PatchTool.Plugin,
@@ -10,7 +10,9 @@ import {
  LLMRequest,
  Message,
  type ContentPart,
+  type Usage,
 } from "@opencode/ai"
+import type { StreamOptions } from "@opencode/ai/route"
 import type { SessionCompactionResult } from "@opencode/plugin/effect/session"
 import { SessionError } from "@opencode/schema/session-error"
 import { Context, Effect, Layer, Stream } from "effect"
@@ -91,8 +93,25 @@ export type Settings = {
  tokens: number
 }

+export type NativeInput = {
+  readonly request: LLMRequest
+  readonly options: StreamOptions
+  /** Whole, real user messages within the retained-token allowance, for checkpoint-only mechanisms. */
+  readonly retained: Effect.Effect<ReadonlyArray<Message>>
+}
+
+export type NativeResult = {
+  readonly replacement: ReadonlyArray<Message>
+  readonly usage?: Usage
+}
+
+/** Returns the provider's replacement window, or `undefined` when this strategy has no mechanism for the route. */
+export type NativeStrategy = (input: NativeInput) => Effect.Effect<NativeResult, AIError> | undefined
+
 export type Editor = {
  configure: (settings: Partial<Settings>) => void
+  /** Later registrations take precedence. */
+  native: (strategy: NativeStrategy) => void
 }

 export type AutoInput = {
@@ -380,15 +399,18 @@ export const layer = Layer.effect(
    const llm = yield* LLMClient.Service
    const db = (yield* Database.Service).db

-    const state = State.create<Settings, Editor>({
+    const state = State.create<Settings & { readonly native: NativeStrategy[] }, Editor>({
      name: "session-compaction",
-      initial: () => ({ auto: true, buffer: DEFAULT_BUFFER, tokens: DEFAULT_KEEP_TOKENS }),
+      initial: () => ({ auto: true, buffer: DEFAULT_BUFFER, tokens: DEFAULT_KEEP_TOKENS, native: [] }),
      editor: (editor) => ({
        configure: (settings) => {
          if (settings.auto !== undefined) editor.auto = settings.auto
          if (settings.buffer !== undefined) editor.buffer = settings.buffer
          if (settings.tokens !== undefined) editor.tokens = settings.tokens
        },
+        native: (strategy) => {
+          editor.native.push(strategy)
+        },
      }),
    })
    const failed = Effect.fnUntraced(function* (input: SessionEvent.Compaction.Failed["data"]) {
@@ -504,6 +526,23 @@ export const layer = Layer.effect(
        return yield* reject(
          "Provider compaction requires the endpoint in provider/model settings, not a model.request rewrite",
        )
+      const native = state
+        .get()
+        .native.toReversed()
+        .map((strategy) =>
+          strategy({
+            request,
+            options: prepared.options,
+            retained: original(context.session.id).pipe(
+              Effect.map((messages) => retainUsers(messages, context.model, state.get().tokens)),
+            ),
+          }),
+        )
+        .find((effect) => effect !== undefined)
+      if (!native)
+        return yield* reject(
+          `No plugin provides native compaction for ${request.model.provider}/${request.model.route.id}`,
+        )
      const transient = SessionRunnerRetry.transient(yield* SessionRunnerRetry.policy(context.session.id), {
        agent: context.agent.id,
        model: context.model.ref,
@@ -514,25 +553,7 @@ export const layer = Layer.effect(
        Effect.gen(function* () {
          // Transient provider failures retry like any other request; only a known automatic overflow permits
          // local recovery, and nothing is installed until the provider returns a checkpoint.
-          const result = yield* restore(
-            Effect.gen(function* () {
-              if (LLMClient.canCompact(request, { mechanism: "trigger" })) {
-                const retained = retainUsers(yield* original(context.session.id), context.model, state.get().tokens)
-                const result = yield* llm
-                  .compact(request, { ...prepared.options, mechanism: "trigger" })
-                  .pipe(transient)
-                return { replacement: [...retained, Message.assistant(result.checkpoint)], usage: result.usage }
-              }
-              if (LLMClient.canCompact(request))
-                return yield* llm
-                  .compact(request, { mechanism: "endpoint", http: prepared.options.http })
-                  .pipe(transient)
-              // Model resolution admits provider policies only for routes with a compaction operation.
-              return yield* Effect.die(
-                new Error(`${request.model.provider}/${request.model.route.id} has no compaction operation`),
-              )
-            }),
-          )
+          const result = yield* restore(native.pipe(transient))
          const usage = result.usage ? SessionUsage.record(result.usage, context.model.cost) : undefined
          if (usage)
            yield* bus.publish(SessionEvent.UsageRecorded, {
@@ -93,9 +93,10 @@ export const prepare = Effect.fn("SessionPrompt.prepare")(function* (request: {
 const materializeAttachment = Effect.fn("SessionPrompt.materializeAttachment")(function* (
  input: PromptInput.FileAttachment,
 ) {
+  const label = attachmentLabel(input)
  const resolved = input.uri.startsWith("data:")
    ? {
-        bytes: yield* decodeDataURL(input.uri),
+        bytes: yield* decodeDataURL(input.uri, label),
        source: { type: "inline" as const },
        start: undefined,
        end: undefined,
@@ -105,8 +106,8 @@ const materializeAttachment = Effect.fn("SessionPrompt.materializeAttachment")(f
    : yield* readFileAttachment(input.uri)
  if (resolved.bytes.byteLength > MAX_ATTACHMENT_BYTES)
    return yield* new AttachmentError({
-      uri: input.uri,
-      message: `Attachment exceeds the ${MAX_ATTACHMENT_BYTES} byte limit: ${input.uri}`,
+      uri: label,
+      message: `Attachment exceeds the ${MAX_ATTACHMENT_BYTES} byte limit: ${label}`,
    })

  const mime = resolved.mime ?? Mime.detect(resolved.bytes)
@@ -138,7 +139,7 @@ const normalizeImageAttachment = Effect.fn("SessionPrompt.normalizeImageAttachme
 ) {
  if (!mime.startsWith("image/")) return { data: Base64.make(data), mime }
  const image = yield* Image.Service
-  const label = input.name ?? (input.uri.startsWith("data:") ? "inline attachment" : input.uri)
+  const label = attachmentLabel(input)
  const content = { uri: label, content: data, encoding: "base64" as const, mime }
  const normalized = yield* image.normalize(label, content).pipe(
    Effect.catchTag("Image.ResizerUnavailableError", () => Effect.succeed(content)),
@@ -201,7 +202,12 @@ const readFileAttachment = Effect.fn("SessionPrompt.readFileAttachment")(functio

 const MAX_ATTACHMENT_BYTES = 20 * 1024 * 1024

-function decodeDataURL(uri: string) {
+// A data URL is the whole file; errors and logs must name the attachment, not echo its bytes.
+function attachmentLabel(input: PromptInput.FileAttachment) {
+  return input.name ?? (input.uri.startsWith("data:") ? "inline attachment" : input.uri)
+}
+
+function decodeDataURL(uri: string, label: string) {
  return Effect.try({
    try: () => {
      const comma = uri.indexOf(",")
@@ -214,7 +220,7 @@ function decodeDataURL(uri: string) {
      if (bytes.toString("base64") !== payload) throw new Error("Non-canonical base64")
      return bytes
    },
-    catch: () => new AttachmentError({ uri, message: "Invalid attachment data URL" }),
+    catch: () => new AttachmentError({ uri: label, message: `Invalid attachment data URL: ${label}` }),
  })
 }

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { LLMClient, LanguageModel, Message, ToolDefinition } from "@opencode/ai"
+import { LLMClient, LanguageModel, Message, ToolDefinition, Usage } from "@opencode/ai"
 import { OpenAI } from "@opencode/ai/providers"
 import { Agent } from "@opencode/core/agent"
 import { Bus } from "@opencode/core/bus"
@@ -7,6 +7,7 @@ import { Database } from "@opencode/core/database/database"
 import { AppNodeBuilder } from "@opencode/core/effect/app-node-builder"
 import { llmClient } from "@opencode/core/effect/app-node-platform"
 import { Instructions } from "@opencode/core/instructions/index"
+import { NativeCompactionPlugin } from "@opencode/core/plugin/compaction"
 import { PluginHooks } from "@opencode/core/plugin/hooks"
 import { Project } from "@opencode/core/project"
 import { ProjectTable } from "@opencode/core/project/sql"
@@ -26,6 +27,7 @@ import { SessionStore } from "@opencode/core/session/store"
 import { LayerNode } from "@opencode/util/effect/layer-node"
 import { DateTime, Deferred, Effect, Fiber, Schema } from "effect"
 import { testEffect } from "./lib/effect"
+import { host } from "./plugin/host"

 const it = testEffect(
  AppNodeBuilder.build(
@@ -44,7 +46,8 @@ const it = testEffect(
  ),
 )

-const setup = Effect.fnUntraced(function* (endpoint = false) {
+const setup = Effect.fnUntraced(function* (options: { endpoint?: boolean; plugin?: boolean } = {}) {
+  const endpoint = options.endpoint ?? false
  const db = (yield* Database.Service).db
  const bus = yield* Bus.Service
  const inbox = yield* SessionInbox.Service
@@ -185,6 +188,7 @@ const setup = Effect.fnUntraced(function* (endpoint = false) {
    render: { initial: String, changed: (_previous, value) => value, removed: () => "removed" },
  })
  yield* InstructionState.prepare(db, bus, instructions, sessionID)
+  if (options.plugin !== false) yield* NativeCompactionPlugin.Plugin.effect(host())
  yield* hooks.register("session", "model.request", (event) =>
    Effect.sync(() => {
      event.headers["x-test-hook"] = event.kind
@@ -261,6 +265,7 @@ const setup = Effect.fnUntraced(function* (endpoint = false) {
    store,
    hooks,
    model,
+    compaction,
  }
 })

@@ -348,7 +353,7 @@ it.live(

 it.live("manual and automatic endpoint compaction keep the provider replacement unchanged", () =>
  Effect.gen(function* () {
-    const fixture = yield* setup(true)
+    const fixture = yield* setup({ endpoint: true })
    yield* fixture.prompt("Original user")
    expect(yield* fixture.compact).toEqual({ status: "completed" })
    expect(yield* fixture.automatic).toEqual({ status: "completed" })
@@ -445,6 +450,31 @@ it.live("rejects request-hook route rewrites before provider compaction", () =>
  }),
 )

+it.live("provider compaction fails without a native strategy and persists a registered strategy's window", () =>
+  Effect.gen(function* () {
+    const fixture = yield* setup({ plugin: false })
+    yield* fixture.prompt("Original user")
+    expect(yield* fixture.compact).toMatchObject({
+      status: "failed",
+      error: { type: "provider.unsupported-operation", message: expect.stringContaining("openai/openai-responses") },
+    })
+    yield* fixture.compaction.transform((editor) => {
+      editor.native(() =>
+        Effect.succeed({
+          replacement: [Message.assistant("plugin window")],
+          usage: new Usage({ nonCachedInputTokens: 20, outputTokens: 4 }),
+        }),
+      )
+    })
+    expect(yield* fixture.compact).toEqual({ status: "completed" })
+    expect(fixture.state.calls).toBe(0)
+    const installed = yield* fixture.checkpoint
+    expect(installed.provenance).toEqual(SessionProviderContext.provenance(fixture.model)!)
+    expect(SessionProviderContext.decode(installed)).toEqual([Message.assistant("plugin window")])
+    expect(yield* fixture.store.get(fixture.sessionID)).toMatchObject({ tokens: { input: 20, output: 4 } })
+  }),
+)
+
 test("retained user budget counts attachments and drops whole oldest messages", () => {
  const model = SessionRunnerModel.resolved(OpenAI.responses("gpt-5.4-mini"), {
    capabilities: { tools: true, input: ["text", "image"], output: ["text"] },
@@ -501,8 +501,31 @@ describe("Session.prompt", () => {

      expect(error).toMatchObject({
        _tag: "Session.AttachmentError",
-        uri,
-        message: "Invalid attachment data URL",
+        uri: "image.png",
+        message: "Invalid attachment data URL: image.png",
+      })
+    }),
+  )
+
+  it.effect("rejects oversized inline attachments without echoing their bytes", () =>
+    Effect.gen(function* () {
+      yield* setup
+      const session = yield* Session.Service
+      const uri = `data:application/octet-stream;base64,${Buffer.alloc(20 * 1024 * 1024 + 1).toString("base64")}`
+
+      const error = yield* session
+        .prompt({
+          sessionID,
+          text: "Inspect this",
+          files: [{ uri }],
+          resume: false,
+        })
+        .pipe(Effect.flip)
+
+      expect(error).toMatchObject({
+        _tag: "Session.AttachmentError",
+        uri: "inline attachment",
+        message: "Attachment exceeds the 20971520 byte limit: inline attachment",
      })
    }),
  )
@@ -56,6 +56,7 @@ import { Plugin } from "@opencode/core/plugin"
 import { PluginHooks } from "@opencode/core/plugin/hooks"
 import { OptimizePlugin } from "@opencode/core/plugin/optimize"
 import { IdentityPlugin } from "@opencode/core/plugin/identity"
+import { NativeCompactionPlugin } from "@opencode/core/plugin/compaction"
 import { QuestionTool } from "@opencode/core/tool/plugin/question"
 import { Agent } from "@opencode/core/agent"
 import { Config } from "@opencode/core/config"
@@ -470,6 +471,7 @@ const layer = Layer.unwrap(
        Config.node,
        Snapshot.node,
        SessionCompaction.node,
+        LayerNodePlatform.llmClient,
        SessionRunnerLLM.node,
        SessionExecution.node,
        Session.node,
@@ -523,6 +525,7 @@ const setup = Effect.gen(function* () {
    discard: true,
  })
  yield* IdentityPlugin.Plugin.effect(pluginHost)
+  yield* NativeCompactionPlugin.Plugin.effect(pluginHost)
  yield* agents.transform((editor) =>
    editor.update(Agent.ID.make("build"), (agent) => {
      agent.mode = "primary"
@@ -48,7 +48,8 @@ test("does not package external copies of bundled dependencies", () => {
  expect(pkg.devDependencies.effect).toBe("catalog:")
  expect(pkg.devDependencies["@effect/platform-node"]).toBe("catalog:")
  expect(pkg.devDependencies["drizzle-orm"]).toBe("catalog:")
-  expect(pkg.optionalDependencies["msgpackr-extract"]).toBe("3.0.4")
+  // IPC crosses the port by structured clone; no MessagePack runtime or native accelerator ships.
+  expect(Object.keys(pkg.optionalDependencies)).not.toContain("msgpackr-extract")
 })

 test("keeps PTY binaries without stale native packaging", () => {
@@ -101,6 +102,6 @@ test("bundles one Effect runtime and Drizzle while keeping native dependencies e
  expect(imports).toContain("node:sqlite")
  expect(chunks.some((chunk) => chunk.dynamicImports.includes("@zip.js/zip.js"))).toBe(true)
  expect(imports).toContain(`@lydell/node-pty-${process.platform}-${process.arch}`)
-  expect(modules.some((id) => id.includes("/node_modules/msgpackr-extract/"))).toBe(false)
-  expect(chunks.some((chunk) => chunk.code.includes("msgpackr-extract"))).toBe(true)
+  expect(modules.some((id) => id.includes("/node_modules/msgpackr"))).toBe(false)
+  expect(chunks.some((chunk) => chunk.code.includes("msgpackr"))).toBe(false)
 }, 30_000)
@@ -58,9 +58,9 @@ const require = __cjs_mod__.createRequire(import.meta.url);
        },
      },
      externalizeDeps: {
-        // Bundle the Effect family together; native MessagePack acceleration stays optional and external.
+        // Bundle the Effect family together.
        exclude: ["effect", "@effect/platform-node", "@effect/platform-node-shared", "drizzle-orm"],
-        include: [nodePtyPkg, "msgpackr-extract"],
+        include: [nodePtyPkg],
      },
    },
    plugins: [
@@ -1,7 +1,7 @@
 {
  "name": "@opencode/desktop",
  "private": true,
-  "version": "2.0.7",
+  "version": "2.0.8",
  "type": "module",
  "license": "MIT",
  "homepage": "https://opencode.ai",
@@ -29,7 +29,6 @@
    "electron-log": "^5",
    "electron-store": "11.0.2",
    "electron-updater": "6.8.9",
-    "electron-window-state": "^5.0.3",
    "lighthouse": "13.4.1"
  },
  "devDependencies": {
@@ -68,7 +67,6 @@
    "@lydell/node-pty-linux-arm64": "1.2.0-beta.12",
    "@lydell/node-pty-linux-x64": "1.2.0-beta.12",
    "@lydell/node-pty-win32-arm64": "1.2.0-beta.12",
-    "@lydell/node-pty-win32-x64": "1.2.0-beta.12",
-    "msgpackr-extract": "3.0.4"
+    "@lydell/node-pty-win32-x64": "1.2.0-beta.12"
  }
 }
@@ -3,17 +3,22 @@ import { EventEmitter } from "node:events"
 import { MessageChannel } from "node:worker_threads"
 import type { MessagePortMain, WebContents } from "electron"
 import { Context, Effect, Layer, ManagedRuntime, Option, Queue, Schema, Stream } from "effect"
-import { Rpc, RpcClient, RpcClientError, RpcGroup, RpcMessage, RpcSerialization, RpcServer } from "effect/unstable/rpc"
+import { Rpc, RpcClient, RpcClientError, RpcGroup, RpcMessage, RpcServer } from "effect/unstable/rpc"
+import { Transferable } from "effect/unstable/workers"
 import { IpcPortHandoff, IpcServerProtocolLive } from "./ipc-transport"

 describe("desktop RPC transport", () => {
  test("keeps multiple renderer ports independent", async () => {
+    let received: unknown
    const handlers = TestRpcs.toLayer(
      Effect.gen(function* () {
        const handoff = yield* IpcPortHandoff
        return TestRpcs.of({
          "test.focused": (_request, context) => Effect.succeed(handoff.sender(context.client.id)?.id === 1),
-          "test.blob.put": ({ data }) => Effect.succeed([...data].join(",")),
+          "test.blob.put": ({ data }) => {
+            received = data
+            return Effect.succeed([...data].join(","))
+          },
          "test.blob.get": () => Effect.succeed(new Uint8Array([3, 1, 4])),
          "test.events": () => Stream.make(new TestEvent({ value: "session.new" })),
        })
@@ -34,6 +39,8 @@ describe("desktop RPC transport", () => {
    expect(focused).toBe(true)
    expect(unfocused).toBe(false)
    expect(await putBlob(firstClient, new Uint8Array([2, 7, 1]))).toBe("2,7,1")
+    // Binary payloads arrive as bytes, not as base64 text.
+    expect(received).toBeInstanceOf(Uint8Array)
    expect(await getBlob(firstClient)).toEqual(new Uint8Array([3, 1, 4]))
    expect(await firstEvent(firstClient)).toEqual(new TestEvent({ value: "session.new" }))

@@ -54,8 +61,8 @@ describe("desktop RPC transport", () => {
 class TestEvent extends Schema.TaggedClass<TestEvent>()("TestEvent", { value: Schema.String }) {}
 const TestRpcs = RpcGroup.make(
  Rpc.make("test.focused", { success: Schema.Boolean }),
-  Rpc.make("test.blob.put", { payload: { data: Schema.Uint8Array }, success: Schema.String }),
-  Rpc.make("test.blob.get", { success: Schema.Uint8Array }),
+  Rpc.make("test.blob.put", { payload: { data: Transferable.Uint8Array }, success: Schema.String }),
+  Rpc.make("test.blob.get", { success: Transferable.Uint8Array }),
  Rpc.make("test.events", { success: TestEvent, stream: true }),
 )
 type TestRpcClient = RpcClient.FromGroup<typeof TestRpcs, RpcClientError.RpcClientError>
@@ -109,13 +116,9 @@ function clientProtocol(port: MessagePort) {
    RpcClient.Protocol,
    RpcClient.Protocol.make(
      Effect.fnUntraced(function* (writeResponse, clientIds) {
-        const serialization = yield* RpcSerialization.RpcSerialization
-        const parser = serialization.makeUnsafe()
        const inbound = yield* Queue.unbounded<RpcMessage.FromServerEncoded>()
        const onMessage = (event: MessageEvent) =>
-          parser
-            .decode(event.data)
-            .forEach((message) => Queue.offerUnsafe(inbound, message as RpcMessage.FromServerEncoded))
+          Queue.offerUnsafe(inbound, event.data as RpcMessage.FromServerEncoded)
        port.addEventListener("message", onMessage)
        port.start()
        yield* Effect.addFinalizer(() =>
@@ -131,18 +134,15 @@ function clientProtocol(port: MessagePort) {
          Effect.forkScoped,
        )
        return {
-          codecFor: serialization.codecFor,
+          codecFor: Schema.toCodecJson,
          send: (_clientId: number, request: RpcMessage.FromClientEncoded) =>
-            Effect.sync(() => {
-              const encoded = parser.encode(request)
-              if (encoded !== undefined) port.postMessage(encoded)
-            }),
+            Effect.sync(() => port.postMessage(request)),
          supportsAck: true,
          supportsTransferables: false,
        }
      }),
    ),
-  ).pipe(Layer.provide(RpcSerialization.layerMsgPack))
+  )
 }

 function sender(id: number) {
@@ -1,13 +1,12 @@
 import type { MessagePortMain, WebContents } from "electron"
-import { Context, Effect, Layer, Option, Queue, Stream } from "effect"
-import { RpcMessage, RpcSerialization, RpcServer } from "effect/unstable/rpc"
+import { Context, Effect, Layer, Option, Queue, Schema, Stream } from "effect"
+import { RpcMessage, RpcServer } from "effect/unstable/rpc"
 import { bindIpcEvents } from "./ipc-events"

 type PortBinding = {
  readonly id: number
  readonly sender: WebContents
  readonly port: MessagePortMain
-  readonly parser: RpcSerialization.Parser
  readonly onMessage: (event: Electron.MessageEvent) => void
  readonly onClose: () => void
  readonly unbindEvents: Effect.Effect<void>
@@ -20,6 +19,9 @@ type Handoff = {

 export class IpcPortHandoff extends Context.Service<IpcPortHandoff, Handoff>()("opencode/desktop/IpcPortHandoff") {}

+// Messages cross the port by structured clone, like Effect's worker protocol: no serialization
+// layer, so binary payloads stay binary and nothing is packed into a shared buffer. Electron's
+// MessagePortMain can only transfer ports, so byte payloads are cloned in both directions.
 export const IpcServerProtocolLive = Layer.unwrap(
  Effect.gen(function* () {
    const handoffs = yield* Queue.unbounded<readonly [WebContents, MessagePortMain]>()
@@ -30,7 +32,6 @@ export const IpcServerProtocolLive = Layer.unwrap(
      RpcServer.Protocol,
      RpcServer.Protocol.make(
        Effect.fnUntraced(function* (writeRequest) {
-          const serialization = yield* RpcSerialization.RpcSerialization
          const disconnects = yield* Queue.unbounded<number>()
          const inbound = yield* Queue.unbounded<readonly [number, RpcMessage.FromClientEncoded]>()
          const runFork = Effect.runForkWith(yield* Effect.context())
@@ -58,21 +59,12 @@ export const IpcServerProtocolLive = Layer.unwrap(
            }

            const id = nextClientId++
-            const parser = serialization.makeUnsafe()
            const onMessage = (event: Electron.MessageEvent) => {
-              try {
-                parser
-                  .decode(event.data)
-                  .forEach((message) =>
-                    Queue.offerUnsafe(inbound, [id, message as RpcMessage.FromClientEncoded] as const),
-                  )
-              } catch {
-                return
-              }
+              Queue.offerUnsafe(inbound, [id, event.data as RpcMessage.FromClientEncoded] as const)
            }
            const onClose = () => runFork(disconnect(id))
            const unbindEvents = yield* bindIpcEvents(sender.id)
-            const binding = { id, sender, port, parser, onMessage, onClose, unbindEvents }
+            const binding = { id, sender, port, onMessage, onClose, unbindEvents }
            bindings.set(id, binding)
            senderBindings.set(sender.id, id)
            port.on("message", onMessage)
@@ -92,14 +84,11 @@ export const IpcServerProtocolLive = Layer.unwrap(
          yield* Effect.addFinalizer(() => Effect.forEach([...bindings.keys()], disconnect, { discard: true }))

          return {
-            codecFor: serialization.codecFor,
+            codecFor: Schema.toCodecJson,
            disconnects,
            send: (clientId, response) =>
              Effect.sync(() => {
-                const binding = bindings.get(clientId)
-                if (!binding) return
-                const encoded = binding.parser.encode(response)
-                if (encoded !== undefined) binding.port.postMessage(encoded)
+                bindings.get(clientId)?.port.postMessage(response)
              }),
            end: disconnect,
            clientIds: Effect.sync(() => new Set(bindings.keys())),
@@ -123,4 +112,4 @@ export const IpcServerProtocolLive = Layer.unwrap(
      }),
    )
  }),
-).pipe(Layer.provide(RpcSerialization.layerMsgPack))
+)
@@ -98,8 +98,10 @@ export function createDraftStore(
      orphans = true
      return id
    },
-    getBlob(id: string): Uint8Array | null {
-      return db.select({ data: blobs.data }).from(blobs).where(eq(blobs.id, id)).get()?.data ?? null
+    getBlob(id: string): Uint8Array<ArrayBuffer> | null {
+      const data = db.select({ data: blobs.data }).from(blobs).where(eq(blobs.id, id)).get()?.data
+      // node:sqlite allocates a dedicated ArrayBuffer per BLOB column value.
+      return data ? (data as Uint8Array<ArrayBuffer>) : null
    },
    flush: writer.flush,
    close: writer.close,
@@ -1,6 +1,5 @@
-import windowState from "electron-window-state"
 import { randomUUID } from "node:crypto"
-import { app, BrowserWindow } from "electron"
+import { app, BrowserWindow, screen } from "electron"
 import { Effect, FileSystem, Path } from "effect"
 import { openExternalURL } from "../files"
 import { scoped } from "../native/logging"
@@ -25,9 +24,15 @@ import {
 import { loadWindow, registerRendererProtocol } from "./protocol"
 import { createWindowRegistry } from "./registry"
 import { makeWindowRecovery } from "./recovery"
+import { manageWindowState, readWindowState, resolveWindowState } from "./window-state"
 import { allowRendererPermissions, wireNavigationPolicy, wireRendererHeaders } from "./security"

 const themeReady = new WeakMap<BrowserWindow, () => void>()
+const displays = {
+  all: () => screen.getAllDisplays().map((display) => display.bounds),
+  primary: () => screen.getPrimaryDisplay().bounds,
+  matching: (bounds: Electron.Rectangle) => screen.getDisplayMatching(bounds).bounds,
+}
 const registry = createWindowRegistry<BrowserWindow>({
  read: () => getStore().get(WINDOW_IDS_KEY),
  write: (ids) => getStore().set(WINDOW_IDS_KEY, ids),
@@ -88,7 +93,8 @@ export const makeMainWindows = Effect.fn("Window.make")(function* () {
  }

  const create = (id: string = randomUUID()) => {
-    const state = windowState({ file: windowStateFile(id), defaultWidth: 1280, defaultHeight: 800 })
+    const stateFile = path.join(app.getPath("userData"), windowStateFile(id))
+    const state = resolveWindowState(readWindowState(stateFile), { width: 1280, height: 800 }, displays)
    const appearance = windowAppearance(path, paths)
    const win = new BrowserWindow({
      x: state.x,
@@ -108,7 +114,7 @@ export const makeMainWindows = Effect.fn("Window.make")(function* () {
    wireWindowRecovery(win, id, () => relaunchHandler())
    wireNavigationPolicy(win, (url) => runFork(openExternalURL(url)))
    wireRendererHeaders(win)
-    state.manage(win)
+    manageWindowState(win, stateFile, state, displays)
    register(win, id)
    wireFullscreen(win)
    loadWindow(win, "index.html")
@@ -0,0 +1,56 @@
+import { describe, expect, test } from "bun:test"
+import { mkdtempSync, writeFileSync } from "node:fs"
+import { tmpdir } from "node:os"
+import path from "node:path"
+import { readWindowState, resolveWindowState } from "./window-state"
+
+const defaults = { width: 1280, height: 800 }
+const primary = { x: 0, y: 0, width: 1920, height: 1080 }
+const displays = {
+  all: () => [primary, { x: 1920, y: 0, width: 2560, height: 1440 }],
+  primary: () => primary,
+  matching: () => primary,
+}
+
+describe("window state", () => {
+  test("keeps bounds that still fit on a display", () => {
+    const saved = { x: 2000, y: 100, width: 1000, height: 700, displayBounds: { x: 1920, y: 0, width: 2560, height: 1440 } }
+    expect(resolveWindowState(saved, defaults, displays)).toEqual(saved)
+  })
+
+  test("falls back to the default size on the primary display when the saved display is gone", () => {
+    const saved = { x: 5000, y: 100, width: 1000, height: 700, displayBounds: { x: 4480, y: 0, width: 1920, height: 1080 } }
+    expect(resolveWindowState(saved, defaults, displays)).toEqual({ ...defaults, x: 0, y: 0, displayBounds: primary })
+  })
+
+  test("uses defaults without a position when nothing usable was saved", () => {
+    expect(resolveWindowState(undefined, defaults, displays)).toEqual(defaults)
+    expect(resolveWindowState({ width: 0, height: -1 }, defaults, displays)).toEqual(defaults)
+    expect(resolveWindowState("junk", defaults, displays)).toEqual(defaults)
+  })
+
+  test("keeps a maximized flag even without bounds", () => {
+    expect(resolveWindowState({ isMaximized: true }, defaults, displays)).toEqual({ ...defaults, isMaximized: true })
+  })
+
+  test("reads the file electron-window-state wrote and ignores an unreadable one", () => {
+    const dir = mkdtempSync(path.join(tmpdir(), "opencode-window-state-"))
+    const file = path.join(dir, "window-state-a.json")
+    writeFileSync(
+      file,
+      '{"width":1280,"height":800,"x":0,"y":0,"displayBounds":{"x":0,"y":0,"width":3440,"height":1440},"isMaximized":false,"isFullScreen":false}',
+    )
+    expect(resolveWindowState(readWindowState(file), defaults, displays)).toEqual({
+      width: 1280,
+      height: 800,
+      x: 0,
+      y: 0,
+      displayBounds: { x: 0, y: 0, width: 3440, height: 1440 },
+      isMaximized: false,
+      isFullScreen: false,
+    })
+    writeFileSync(file, "{oops")
+    expect(readWindowState(file)).toBeUndefined()
+    expect(readWindowState(path.join(dir, "missing.json"))).toBeUndefined()
+  })
+})
@@ -0,0 +1,118 @@
+import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs"
+import path from "node:path"
+import type { BrowserWindow, Rectangle } from "electron"
+
+// Remembers a window's bounds and maximized / fullscreen flags across launches in the same JSON
+// file electron-window-state wrote, so existing profiles restore where they were.
+
+export type WindowState = {
+  x?: number
+  y?: number
+  width: number
+  height: number
+  displayBounds?: Rectangle
+  isMaximized?: boolean
+  isFullScreen?: boolean
+}
+
+export type Displays = {
+  all: () => Rectangle[]
+  primary: () => Rectangle
+  matching: (bounds: Rectangle) => Rectangle
+}
+
+// Bounds are only trusted when they still fit on one of the current displays; otherwise the window
+// falls back to the default size on the primary display. A saved maximized or fullscreen state
+// without bounds is kept so manage() can restore it.
+export function resolveWindowState(saved: unknown, defaults: { width: number; height: number }, displays: Displays) {
+  const state = isState(saved) ? saved : undefined
+  if (!state) return { width: defaults.width, height: defaults.height } satisfies WindowState
+  if (!hasBounds(state)) {
+    return state.isMaximized || state.isFullScreen
+      ? ({ ...state, width: defaults.width, height: defaults.height } satisfies WindowState)
+      : ({ width: defaults.width, height: defaults.height } satisfies WindowState)
+  }
+  if (!state.displayBounds) return state
+  const visible = displays.all().some((bounds) => within(state, bounds))
+  if (visible) return state
+  return {
+    width: defaults.width,
+    height: defaults.height,
+    x: 0,
+    y: 0,
+    displayBounds: displays.primary(),
+  } satisfies WindowState
+}
+
+export function readWindowState(file: string): unknown {
+  if (!existsSync(file)) return undefined
+  try {
+    return JSON.parse(readFileSync(file, "utf8"))
+  } catch {
+    return undefined
+  }
+}
+
+// Tracks the window until it closes and writes the final state then. Bounds are recorded while
+// the window is in its normal state so a maximized window restores to its previous size.
+export function manageWindowState(win: BrowserWindow, file: string, initial: WindowState, displays: Displays) {
+  const state = { ...initial }
+  if (state.isMaximized) win.maximize()
+  if (state.isFullScreen) win.setFullScreen(true)
+  let timer: ReturnType<typeof setTimeout> | undefined
+  const update = () => {
+    if (win.isDestroyed()) return
+    const bounds = win.getBounds()
+    if (!win.isMaximized() && !win.isMinimized() && !win.isFullScreen()) {
+      state.x = bounds.x
+      state.y = bounds.y
+      state.width = bounds.width
+      state.height = bounds.height
+    }
+    state.isMaximized = win.isMaximized()
+    state.isFullScreen = win.isFullScreen()
+    state.displayBounds = displays.matching(bounds)
+  }
+  const changed = () => {
+    clearTimeout(timer)
+    timer = setTimeout(update, 100)
+  }
+  const closed = () => {
+    clearTimeout(timer)
+    win.off("resize", changed)
+    win.off("move", changed)
+    win.off("close", update)
+    win.off("closed", closed)
+    mkdirSync(path.dirname(file), { recursive: true })
+    writeFileSync(`${file}.tmp`, JSON.stringify(state))
+    renameSync(`${file}.tmp`, file)
+  }
+  win.on("resize", changed)
+  win.on("move", changed)
+  win.on("close", update)
+  win.on("closed", closed)
+}
+
+function isState(value: unknown): value is WindowState {
+  return typeof value === "object" && value !== null
+}
+
+function hasBounds(state: WindowState): state is WindowState & Required<Pick<WindowState, "x" | "y">> {
+  return (
+    Number.isInteger(state.x) &&
+    Number.isInteger(state.y) &&
+    Number.isInteger(state.width) &&
+    state.width > 0 &&
+    Number.isInteger(state.height) &&
+    state.height > 0
+  )
+}
+
+function within(state: WindowState & { x: number; y: number }, bounds: Rectangle) {
+  return (
+    state.x >= bounds.x &&
+    state.y >= bounds.y &&
+    state.x + state.width <= bounds.x + bounds.width &&
+    state.y + state.height <= bounds.y + bounds.height
+  )
+}
@@ -1,5 +1,5 @@
-import { Context, Effect, Layer, ManagedRuntime, Queue, Stream } from "effect"
-import { RpcClient, RpcMessage, RpcSerialization } from "effect/unstable/rpc"
+import { Context, Effect, Layer, ManagedRuntime, Queue, Schema, Stream } from "effect"
+import { RpcClient, RpcMessage } from "effect/unstable/rpc"
 import { DesktopRpcs, type DesktopRpcClient } from "../shared/ipc-rpc"
 import type { DesktopEvent } from "../shared/ipc-rpc/events"
 import { IpcTransportPort } from "../shared/ipc-transport"
@@ -79,22 +79,17 @@ export function listen<Tag extends EventTag>(tag: Tag, listener: (value: EventVa
  }
 }

+// Structured clone over the port, like Effect's worker protocol: no serialization layer, so binary
+// payloads stay binary. Buffers are cloned rather than transferred: Electron's MessagePortMain
+// drops transferred ArrayBuffers, so a request carrying one would never arrive.
 function clientProtocol(value: MessagePort) {
  return Layer.effect(
    RpcClient.Protocol,
    RpcClient.Protocol.make(
      Effect.fnUntraced(function* (writeResponse, clientIds) {
-        const serialization = yield* RpcSerialization.RpcSerialization
-        const parser = serialization.makeUnsafe()
        const inbound = yield* Queue.unbounded<RpcMessage.FromServerEncoded>()
        const onMessage = (event: MessageEvent) => {
-          try {
-            parser
-              .decode(event.data)
-              .forEach((message) => Queue.offerUnsafe(inbound, message as RpcMessage.FromServerEncoded))
-          } catch {
-            return
-          }
+          Queue.offerUnsafe(inbound, event.data as RpcMessage.FromServerEncoded)
        }
        value.addEventListener("message", onMessage)
        value.start()
@@ -111,16 +106,15 @@ function clientProtocol(value: MessagePort) {
          Effect.forkScoped,
        )
        return {
-          codecFor: serialization.codecFor,
+          codecFor: Schema.toCodecJson,
          send: (_clientId, request) =>
            Effect.sync(() => {
-              const encoded = parser.encode(request)
-              if (encoded !== undefined) value.postMessage(encoded)
+              value.postMessage(request)
            }),
          supportsAck: true,
          supportsTransferables: false,
        }
      }),
    ),
-  ).pipe(Layer.provide(RpcSerialization.layerMsgPack))
+  )
 }
@@ -1,5 +1,6 @@
 import { Schema } from "effect"
 import { Rpc, RpcGroup } from "effect/unstable/rpc"
+import { Transferable } from "effect/unstable/workers"

 const OptionalString = Schema.optional(Schema.String)
 const PickerOptions = Schema.Struct({
@@ -18,7 +19,7 @@ const PickedFiles = Schema.Struct({
  token: Schema.String,
  files: Schema.Array(Schema.Struct({ path: Schema.String, name: Schema.String, size: Schema.Number })),
 })
-const ClipboardImage = Schema.Struct({ buffer: Schema.Uint8Array, width: Schema.Number, height: Schema.Number })
+const ClipboardImage = Schema.Struct({ buffer: Transferable.Uint8Array, width: Schema.Number, height: Schema.Number })

 export const FilesOpenDirectoryPicker = Rpc.make("FilesOpenDirectoryPicker", {
  payload: { options: Schema.optional(PickerOptions) },
@@ -30,7 +31,7 @@ export const FilesOpenFilePicker = Rpc.make("FilesOpenFilePicker", {
 })
 export const FilesReadPickedFile = Rpc.make("FilesReadPickedFile", {
  payload: { token: Schema.String, path: Schema.String },
-  success: Schema.Uint8Array,
+  success: Transferable.Uint8Array,
 })
 export const FilesReleasePickedFiles = Rpc.make("FilesReleasePickedFiles", {
  payload: { token: Schema.String },
@@ -1,5 +1,6 @@
 import { Schema } from "effect"
 import { Rpc, RpcGroup } from "effect/unstable/rpc"
+import { Transferable } from "effect/unstable/workers"

 export const StorageItems = Rpc.make("StorageItems", {
  payload: { name: Schema.String },
@@ -24,12 +25,12 @@ export const DraftsSet = Rpc.make("DraftsSet", {
 })
 export const DraftsDelete = Rpc.make("DraftsDelete", { payload: { key: Schema.String } })
 export const DraftsPutBlob = Rpc.make("DraftsPutBlob", {
-  payload: { data: Schema.Uint8Array },
+  payload: { data: Transferable.Uint8Array },
  success: Schema.String,
 })
 export const DraftsGetBlob = Rpc.make("DraftsGetBlob", {
  payload: { id: Schema.String },
-  success: Schema.NullOr(Schema.Uint8Array),
+  success: Schema.NullOr(Transferable.Uint8Array),
 })

 export const StorageRpcs = RpcGroup.make(
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/enterprise",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/function",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "name": "@opencode/http-recorder",
  "description": "Record and replay Effect HTTP and WebSocket traffic with deterministic cassettes",
  "type": "module",
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/httpapi-codegen",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "private": true,
  "type": "module",
  "exports": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/latex",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "private": true,
  "type": "module",
  "exports": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/merman",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "private": true,
  "type": "module",
  "exports": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/plugin-browser",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "description": "OpenCode's desktop browser plugin",
  "type": "module",
  "license": "MIT",
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/plugin",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/protocol",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/schema",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "name": "@opencode/sdk",
  "type": "module",
  "license": "MIT",
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/server",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/session-ui",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/simulation",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/stats-app",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/stats-core",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/stats-server",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/theme",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/tui",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/ui",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/util",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -2,7 +2,7 @@
  "name": "@opencode/web",
  "type": "module",
  "license": "MIT",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "scripts": {
    "dev": "astro dev",
    "dev:remote": "VITE_API_URL=https://api.opencode.ai astro dev",
@@ -2,7 +2,7 @@
  "name": "opencode",
  "displayName": "opencode",
  "description": "opencode for VS Code",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "publisher": "sst-dev",
  "repository": {
    "type": "git",
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/update",
-  "version": "2.0.7",
+  "version": "2.0.8",
  "private": true,
  "type": "module",
  "scripts": {
Author	SHA1	Message	Date
LukeParkerDev	26d0f18f7e	perf(desktop): remember window bounds without electron-window-state electron-window-state pulls jsonfile, mkdirp and the deep-equal tree (~25 packages) into every launch: 26 ms of CommonJS requires in the startup trace before any of our code ran. The desktop only needs the saved bounds, the maximized / fullscreen flags and a manage() that tracks the window until it closes. Implement that in window-state.ts with the same JSON file and validation rules (bounds must still fit a current display, otherwise default size on the primary display) so existing profiles restore where they were. Packaged build, warm service, median of 6 launches: first main-process log line 401 -> 380 ms after spawn.	2026-09-19 00:31:39 +10:00
Shoubhit Dash	db80806651	refactor(core): move native compaction mechanisms into a plugin (#49575 )	2026-09-18 17:15:44 +05:30
Luke Parker	47f66de8dd	perf(app): load draft image bytes on demand (#49703 )	2026-09-18 19:32:15 +10:00
opencode	c076066c33	sync release versions for v2.0.8	2026-09-18 09:12:33 +00:00
opencode-agent[bot]	5c09d051e5	chore: update nix node_modules hashes	2026-09-18 08:45:27 +00:00
Luke Parker	0a6111291e	refactor(desktop): send IPC messages by structured clone (#49701 )	2026-09-18 18:28:20 +10:00
Luke Parker	609044ef0a	feat(app): scan pairing QR code from add server dialog (#49699 )	2026-09-18 17:36:30 +10:00
Luke Parker	4f32bfca57	fix(desktop): copy IPC payloads out of the shared msgpack buffer (#49696 )	2026-09-18 17:14:29 +10:00
Luke Parker	90112f52db	fix(app): deliver text and oversized attachments by path (#49682 )	2026-09-18 06:30:57 +00:00