diff --git a/.github/release/lib.sh b/.github/release/lib.sh
index 76ec08e6f308..8f058e233ed3 100644
--- a/.github/release/lib.sh
+++ b/.github/release/lib.sh
@@ -6,6 +6,11 @@
 # environment the workflow sets (OPENCODE_VERSION, OPENCODE_CHANNEL, OPENCODE_DRY_RUN, ...).
 
 set -euo pipefail
+# Without this, set -e does not apply inside $(...), so a failing command in a function called as
+# files=$(upload_files ...) is ignored. macOS /bin/bash is 3.2, which lacks the option.
+if [ "${BASH_VERSINFO[0]}" -gt 4 ] || { [ "${BASH_VERSINFO[0]}" = 4 ] && [ "${BASH_VERSINFO[1]}" -ge 4 ]; }; then
+  shopt -s inherit_errexit
+fi
 
 # shellcheck disable=SC2034 # used by the scripts that source this file
 release_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
@@ -51,10 +56,7 @@ upload_files() {
         r2_credentials
         credentials=true
       fi
-      aws s3 cp "$file" "s3://opencode-production-files/bin/$OPENCODE_VERSION/$name" --only-show-errors \
-        --endpoint-url "https://$CLOUDFLARE_ACCOUNT_ID.r2.cloudflarestorage.com" \
-        --content-type "$type" --content-disposition "attachment; filename=\"$name\"" \
-        --cache-control "public, max-age=31536000, immutable" >&2
+      upload_file "$file" "$name" "$type" || die "Upload failed: $name"
     fi
     jq -n --arg name "$name" --arg url "https://opencode.ai/files/bin/$OPENCODE_VERSION/$name" \
       --arg sha256 "$(sha256 "$file" | cut -c1-64)" --argjson size "$(size "$file")" \
@@ -62,15 +64,38 @@ upload_files() {
   done | jq -s 'add'
 }
 
+# Uploads one file to R2 and confirms the stored object has the local size: upload_file <file> <name> <type>.
+# R2 intermittently rejects CompleteMultipartUpload with InvalidPart, so failed uploads are retried.
+upload_file() {
+  local key="bin/$OPENCODE_VERSION/$2" endpoint="https://$CLOUDFLARE_ACCOUNT_ID.r2.cloudflarestorage.com" attempt
+  for attempt in 1 2 3; do
+    if aws s3 cp "$1" "s3://opencode-production-files/$key" --only-show-errors --endpoint-url "$endpoint" \
+      --content-type "$3" --content-disposition "attachment; filename=\"$2\"" \
+      --cache-control "public, max-age=31536000, immutable" >&2 &&
+      [ "$(aws s3api head-object --bucket opencode-production-files --key "$key" --endpoint-url "$endpoint" \
+        --query ContentLength --output text)" = "$(size "$1")" ]; then
+      return
+    fi
+    echo "::warning::Upload attempt $attempt failed: $2" >&2
+    sleep $((attempt * 5))
+  done
+  return 1
+}
+
 # R2 accepts the API token ID as the access key and SHA-256(token) as the secret.
 r2_credentials() {
   local id
   id=$(curl -fsS -H "Authorization: Bearer $CLOUDFLARE_API_TOKEN" \
-    "https://api.cloudflare.com/client/v4/accounts/$CLOUDFLARE_ACCOUNT_ID/tokens/verify" | jq -er .result.id)
+    "https://api.cloudflare.com/client/v4/accounts/$CLOUDFLARE_ACCOUNT_ID/tokens/verify" | jq -er .result.id) ||
+    die "Could not resolve R2 credentials"
   export AWS_ACCESS_KEY_ID="$id"
   AWS_SECRET_ACCESS_KEY=$(printf '%s' "$CLOUDFLARE_API_TOKEN" | sha256 | cut -c1-64)
   export AWS_SECRET_ACCESS_KEY
   export AWS_DEFAULT_REGION=auto AWS_REQUEST_CHECKSUM_CALCULATION=when_required AWS_RESPONSE_CHECKSUM_VALIDATION=when_required
+  # Larger parts mean fewer CompleteMultipartUpload parts for the 200-350 MB desktop builds.
+  AWS_CONFIG_FILE=$(mktemp)
+  export AWS_CONFIG_FILE
+  printf '[default]\ns3 =\n  multipart_threshold = 64MB\n  multipart_chunksize = 64MB\n' > "$AWS_CONFIG_FILE"
 }
 
 # Registers one artifact with the update server: publish_update <name> <distribution> <metadata json>.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62b870f15e30..b54ecd74ccc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,50 @@
 
 Release notes for OpenCode V2, newest first.
 
+## v2.2.5 — 2026-10-30
+
+### Highlights
+
+- **Worktree and Shell Mode Shortcuts**: Press `⌘⌥O` on macOS or `Ctrl+Alt+O` on Windows and Linux to choose a worktree, and `⌘⌥B` or `Ctrl+Alt+B` to choose its base branch. `⌘⇧X` or `Ctrl+Shift+X` now toggles shell mode in the composer. ([#60713](https://github.com/anomalyco/opencode/pull/60713))
+- **Send Quotes From the Comment Popup**: Hold `⌘` or `Ctrl` in the quote popup to turn its checkmark into send, or press `⌘Enter` or `Ctrl+Enter`, to send just that quote and comment while leaving the rest of the composer untouched. ([#60640](https://github.com/anomalyco/opencode/pull/60640))
+- **Percentage Compaction Buffer**: Set `"compaction": { "buffer": "20%" }` in `opencode.json` to keep a share of each model's context window free, so one setting fits models with small and large windows. Token counts still work. ([#60647](https://github.com/anomalyco/opencode/pull/60647))
+
+### Core
+
+#### Improvements
+
+- `compaction.buffer` accepts a percentage of the model's context window, such as `"20%"`, in addition to a token count. ([#60647](https://github.com/anomalyco/opencode/pull/60647))
+- When `read` misses because a folder is missing, the error names that folder and the nearest one that exists. ([#60688](https://github.com/anomalyco/opencode/pull/60688))
+- When `edit` can't find `oldString`, the error shows the file's closest lines, or says the change is already there. ([#60689](https://github.com/anomalyco/opencode/pull/60689))
+- Calls to a tool named `bash` now run as `shell` instead of failing, with the same permissions. A plugin tool actually named `bash` still takes precedence. ([#60687](https://github.com/anomalyco/opencode/pull/60687))
+
+#### Bug fixes
+
+- MCP servers that send stdio messages larger than 10 MiB no longer get disconnected, and large messages are read much faster. ([#60694](https://github.com/anomalyco/opencode/pull/60694))
+- Idle locations no longer restart their MCP servers right after shutting down. ([#60668](https://github.com/anomalyco/opencode/pull/60668))
+- Compaction now caps its prompt at the model's context window when the input limit is larger. ([#60660](https://github.com/anomalyco/opencode/pull/60660))
+- LiteLLM context window errors now trigger compaction instead of stopping the session. ([#60692](https://github.com/anomalyco/opencode/pull/60692))
+- Reasoning is no longer turned into plain text when you switch models or resume an interrupted response, which caused request errors on some providers. ([#60498](https://github.com/anomalyco/opencode/pull/60498))
+
+### TUI
+
+#### Bug fixes
+
+- The connect menu no longer lists MCP servers, which are managed in their own place. ([#60675](https://github.com/anomalyco/opencode/pull/60675))
+
+### Desktop
+
+#### Improvements
+
+- Added keyboard shortcuts to choose a worktree and its base branch, shown in tooltips, and a shortcut to toggle shell mode. The worktree path can be selected to copy the full directory. ([#60713](https://github.com/anomalyco/opencode/pull/60713))
+- Hold `⌘` or `Ctrl` in the quote popup to send a quote and its comment directly. ([#60640](https://github.com/anomalyco/opencode/pull/60640))
+- Added flat input surfaces and a compact input size. ([#60598](https://github.com/anomalyco/opencode/pull/60598))
+
+#### Bug fixes
+
+- The connect menu no longer lists MCP servers. ([#60675](https://github.com/anomalyco/opencode/pull/60675))
+- Added the missing top inset to the search field in the recently closed menu. ([#60652](https://github.com/anomalyco/opencode/pull/60652))
+
 ## v2.2.4 — 2026-10-30
 
 ### Highlights
diff --git a/bun.lock b/bun.lock
index 3e4662d8e133..35cd72f18ffe 100644
--- a/bun.lock
+++ b/bun.lock
@@ -29,7 +29,7 @@
     },
     "packages/ai": {
       "name": "@opencode/ai",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@aws-sdk/credential-providers": "3.1057.0",
         "@opencode/schema": "workspace:*",
@@ -66,7 +66,7 @@
     },
     "packages/app": {
       "name": "@opencode/app",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@corvu/drawer": "catalog:",
         "@dnd-kit/abstract": "0.5.0",
@@ -135,7 +135,7 @@
     },
     "packages/cli": {
       "name": "shuvcode",
-      "version": "2.2.4-shuv.1",
+      "version": "2.2.5-shuv.1",
       "bin": {
         "shuvcode": "./bin/shuvcode.mjs",
       },
@@ -199,7 +199,7 @@
     },
     "packages/client": {
       "name": "@opencode/client",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@opencode/protocol": "workspace:*",
         "@opencode/schema": "workspace:*",
@@ -225,7 +225,7 @@
     },
     "packages/codemode": {
       "name": "@opencode/codemode",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "acorn": "8.15.0",
         "effect": "catalog:",
@@ -238,7 +238,7 @@
     },
     "packages/console/app": {
       "name": "@opencode/console-app",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@ibm/plex": "6.4.1",
         "@kobalte/core": "catalog:",
@@ -276,7 +276,7 @@
     },
     "packages/core": {
       "name": "@opencode/core",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@ai-sdk/provider": "3.0.19",
         "@ai-sdk/provider-utils": "4.0.62",
@@ -347,7 +347,7 @@
     },
     "packages/desktop": {
       "name": "@opencode/desktop",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@zip.js/zip.js": "2.7.62",
         "electron-context-menu": "5.0.0",
@@ -395,7 +395,7 @@
     },
     "packages/function": {
       "name": "@opencode/function",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@octokit/auth-app": "8.0.1",
         "@octokit/rest": "catalog:",
@@ -429,7 +429,7 @@
     },
     "packages/gui-plugins": {
       "name": "@opencode/gui-plugins",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@betteroffice/docx": "0.4.3",
         "@betteroffice/fonts": "0.4.0",
@@ -474,7 +474,7 @@
     },
     "packages/http-recorder": {
       "name": "@opencode/http-recorder",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@effect/platform-node-shared": "catalog:",
       },
@@ -493,7 +493,7 @@
     },
     "packages/httpapi-codegen": {
       "name": "@opencode/httpapi-codegen",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "effect": "catalog:",
         "prettier": "3.6.2",
@@ -506,7 +506,7 @@
     },
     "packages/latex": {
       "name": "@opencode/latex",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@opencode/plugin": "workspace:*",
         "@opentui/core": "catalog:",
@@ -520,7 +520,7 @@
     },
     "packages/merman": {
       "name": "@opencode/merman",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@opencode/plugin": "workspace:*",
         "@opentui/core": "catalog:",
@@ -535,7 +535,7 @@
     },
     "packages/patchmark": {
       "name": "@opencode/patchmark",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "devDependencies": {
         "@tsconfig/bun": "catalog:",
         "@types/bun": "catalog:",
@@ -548,7 +548,7 @@
     },
     "packages/plugin": {
       "name": "@opencode/plugin",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@ai-sdk/provider": "3.0.8",
         "@opencode/ai": "workspace:*",
@@ -593,7 +593,7 @@
     },
     "packages/plugin-browser": {
       "name": "@opencode/plugin-browser",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@opencode/plugin": "workspace:*",
         "@opencode/schema": "workspace:*",
@@ -608,7 +608,7 @@
     },
     "packages/plugins/figma": {
       "name": "@opencode/plugin-figma",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "gray-matter": "4.0.3",
       },
@@ -638,7 +638,7 @@
     },
     "packages/protocol": {
       "name": "@opencode/protocol",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@opencode/schema": "workspace:*",
         "effect": "catalog:",
@@ -668,7 +668,7 @@
     },
     "packages/schema": {
       "name": "@opencode/schema",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@standard-schema/spec": "catalog:",
         "effect": "catalog:",
@@ -693,7 +693,7 @@
     },
     "packages/sdk": {
       "name": "@opencode/sdk",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@opencode/client": "workspace:*",
         "@opencode/core": "workspace:*",
@@ -714,7 +714,7 @@
     },
     "packages/server": {
       "name": "@opencode/server",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@effect/platform-node": "catalog:",
         "@effect/platform-node-shared": "catalog:",
@@ -737,7 +737,7 @@
     },
     "packages/session-ui": {
       "name": "@opencode/session-ui",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@kitlangton/solid-motion": "0.2.2",
         "@kobalte/core": "catalog:",
@@ -769,7 +769,7 @@
     },
     "packages/simulation": {
       "name": "@opencode/simulation",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@opencode/ai": "workspace:*",
         "@opencode/core": "workspace:*",
@@ -789,7 +789,7 @@
     },
     "packages/stats/app": {
       "name": "@opencode/stats-app",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@ibm/plex": "6.4.1",
         "@kobalte/core": "catalog:",
@@ -815,7 +815,7 @@
     },
     "packages/stats/core": {
       "name": "@opencode/stats-core",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@planetscale/database": "1.19.0",
         "drizzle-orm": "catalog:",
@@ -833,7 +833,7 @@
     },
     "packages/stats/server": {
       "name": "@opencode/stats-server",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@effect/platform-node": "catalog:",
         "@opencode/stats-core": "workspace:*",
@@ -868,7 +868,7 @@
     },
     "packages/theme": {
       "name": "@opencode/theme",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@opentui/core": "catalog:",
         "effect": "catalog:",
@@ -882,7 +882,7 @@
     },
     "packages/tui": {
       "name": "@opencode/tui",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@opencode/client": "workspace:*",
         "@opencode/core": "workspace:*",
@@ -918,7 +918,7 @@
     },
     "packages/ui": {
       "name": "@opencode/ui",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@kitlangton/solid-motion": "0.2.2",
         "@kobalte/core": "catalog:",
@@ -953,7 +953,7 @@
     },
     "packages/util": {
       "name": "@opencode/util",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@effect/opentelemetry": "catalog:",
         "@effect/platform-node": "catalog:",
@@ -992,7 +992,7 @@
     },
     "packages/web": {
       "name": "@opencode/web",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "@astrojs/cloudflare": "14.1.4",
         "@astrojs/markdown-remark": "7.3.2",
@@ -1044,7 +1044,7 @@
     },
     "services/update": {
       "name": "@opencode/update",
-      "version": "2.2.4",
+      "version": "2.2.5",
       "dependencies": {
         "jose": "6.0.11",
         "semver": "catalog:",
@@ -1083,6 +1083,7 @@
   "patchedDependencies": {
     "@ai-sdk/openai-compatible@2.0.41": "patches/@ai-sdk%2Fopenai-compatible@2.0.41.patch",
     "@tanstack/virtual-core@3.17.8": "patches/@tanstack%2Fvirtual-core@3.17.8.patch",
+    "@brendonovich/vite-plugin-opencode@0.1.3": "patches/@brendonovich%2Fvite-plugin-opencode@0.1.3.patch",
     "electron-updater@6.8.9": "patches/electron-updater@6.8.9.patch",
     "pacote@21.5.1": "patches/pacote@21.5.1.patch",
     "@opentunnel/protocol@0.6.1": "patches/@opentunnel%2Fprotocol@0.6.1.patch",
@@ -1196,13 +1197,13 @@
 
     "@anthropic-ai/claude-agent-sdk-darwin-x64": ["@anthropic-ai/claude-agent-sdk-darwin-x64@0.3.301", "", { "os": "darwin", "cpu": "x64" }, "sha512-k6jNdu9eEhkPLTPTwHTn3rbIpKHm0mcndkS4wAZtQehCIFc69tmZZ4yeEtQ4eZ2jR0+6ttLtRy+5Q82Q6Ohm0Q=="],
 
-    "@anthropic-ai/claude-agent-sdk-linux-arm64": ["@anthropic-ai/claude-agent-sdk-linux-arm64@0.3.301", "", { "os": "linux", "cpu": "arm64", "libc": "glibc" }, "sha512-Uqjy+YD6ImvelrFs7WHRMboT3BqknGLrDSdiejDqzFk62TZZOqIH9OFHyiyvHexoO31CpDEcn+d7LB+SgpNurA=="],
+    "@anthropic-ai/claude-agent-sdk-linux-arm64": ["@anthropic-ai/claude-agent-sdk-linux-arm64@0.3.301", "", { "os": "linux", "cpu": "arm64" }, "sha512-Uqjy+YD6ImvelrFs7WHRMboT3BqknGLrDSdiejDqzFk62TZZOqIH9OFHyiyvHexoO31CpDEcn+d7LB+SgpNurA=="],
 
-    "@anthropic-ai/claude-agent-sdk-linux-arm64-musl": ["@anthropic-ai/claude-agent-sdk-linux-arm64-musl@0.3.301", "", { "os": "linux", "cpu": "arm64", "libc": "musl" }, "sha512-C1+q1cYZY2bYxDYCfHHaq9ToGMTO/6FdbB0JShyPCyAt0lrRC+myNgsvPq/0ZsrtPWbcbrpX6QgbsFn2QzEWcw=="],
+    "@anthropic-ai/claude-agent-sdk-linux-arm64-musl": ["@anthropic-ai/claude-agent-sdk-linux-arm64-musl@0.3.301", "", { "os": "linux", "cpu": "arm64" }, "sha512-C1+q1cYZY2bYxDYCfHHaq9ToGMTO/6FdbB0JShyPCyAt0lrRC+myNgsvPq/0ZsrtPWbcbrpX6QgbsFn2QzEWcw=="],
 
-    "@anthropic-ai/claude-agent-sdk-linux-x64": ["@anthropic-ai/claude-agent-sdk-linux-x64@0.3.301", "", { "os": "linux", "cpu": "x64", "libc": "glibc" }, "sha512-V0zrxg59pBSp6PXPD70m/nRwUApKM/q5SJdeHq2ZAn7mcAr/GIBRoBEAIrA2kOAK9EkIyjKNKkrwuOVeyId/lA=="],
+    "@anthropic-ai/claude-agent-sdk-linux-x64": ["@anthropic-ai/claude-agent-sdk-linux-x64@0.3.301", "", { "os": "linux", "cpu": "x64" }, "sha512-V0zrxg59pBSp6PXPD70m/nRwUApKM/q5SJdeHq2ZAn7mcAr/GIBRoBEAIrA2kOAK9EkIyjKNKkrwuOVeyId/lA=="],
 
-    "@anthropic-ai/claude-agent-sdk-linux-x64-musl": ["@anthropic-ai/claude-agent-sdk-linux-x64-musl@0.3.301", "", { "os": "linux", "cpu": "x64", "libc": "musl" }, "sha512-qmHolcb+CgzYc4rfZrJd5iEIzOPRPz2edJBH+8V4W4R+bswsNaqf59NBkrDt3GdfmGr42touHYJ/4dV+g/b5eQ=="],
+    "@anthropic-ai/claude-agent-sdk-linux-x64-musl": ["@anthropic-ai/claude-agent-sdk-linux-x64-musl@0.3.301", "", { "os": "linux", "cpu": "x64" }, "sha512-qmHolcb+CgzYc4rfZrJd5iEIzOPRPz2edJBH+8V4W4R+bswsNaqf59NBkrDt3GdfmGr42touHYJ/4dV+g/b5eQ=="],
 
     "@anthropic-ai/claude-agent-sdk-win32-arm64": ["@anthropic-ai/claude-agent-sdk-win32-arm64@0.3.301", "", { "os": "win32", "cpu": "arm64" }, "sha512-V/iwQ3/wcxeQaycw2Daym9CzxssjYXIWtQJEFoU+Zrck3++2lD24KxFK0pwB3f258/uwdKoAM0x5p7+FEMRzwQ=="],
 
@@ -1246,13 +1247,13 @@
 
     "@astrojs/compiler-binding-darwin-x64": ["@astrojs/compiler-binding-darwin-x64@0.5.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-+kl35S7hiHJ2cb7eujwEsPFYYuSgE11uEE2Z20lAJ+undpgulMcW+weQqFPOSSZccEKHOiLIY+kQHkb4e4092w=="],
 
-    "@astrojs/compiler-binding-linux-arm64-gnu": ["@astrojs/compiler-binding-linux-arm64-gnu@0.5.2", "", { "os": "linux", "cpu": "arm64", "libc": "glibc" }, "sha512-BqlR0EHNQLPLwgL9+xogjsAc7zGf0cHho2CPdhv0P1yqbVMwGVaGAqrANP6VYAXCqSC43AF4Czcxc2n+oqdesg=="],
+    "@astrojs/compiler-binding-linux-arm64-gnu": ["@astrojs/compiler-binding-linux-arm64-gnu@0.5.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-BqlR0EHNQLPLwgL9+xogjsAc7zGf0cHho2CPdhv0P1yqbVMwGVaGAqrANP6VYAXCqSC43AF4Czcxc2n+oqdesg=="],
 
-    "@astrojs/compiler-binding-linux-arm64-musl": ["@astrojs/compiler-binding-linux-arm64-musl@0.5.2", "", { "os": "linux", "cpu": "arm64", "libc": "musl" }, "sha512-GRGyby3AZWw5d6JQzidyxPyvGgHWsSusrpgKyFVpDTKctABF7L3Pd5V1cRJbV36/rcu+Eh292/wL7pF7MkmGkQ=="],
+    "@astrojs/compiler-binding-linux-arm64-musl": ["@astrojs/compiler-binding-linux-arm64-musl@0.5.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-GRGyby3AZWw5d6JQzidyxPyvGgHWsSusrpgKyFVpDTKctABF7L3Pd5V1cRJbV36/rcu+Eh292/wL7pF7MkmGkQ=="],
 
-    "@astrojs/compiler-binding-linux-x64-gnu": ["@astrojs/compiler-binding-linux-x64-gnu@0.5.2", "", { "os": "linux", "cpu": "x64", "libc": "glibc" }, "sha512-9XAqGTMQAtIslMsjK3xdyY6OI9d59OZqcLBB6pvD/DcoR0daYswfrKx2azdDERDY4AqAnWPC7odVM1BmxYv3Vw=="],
+    "@astrojs/compiler-binding-linux-x64-gnu": ["@astrojs/compiler-binding-linux-x64-gnu@0.5.2", "", { "os": "linux", "cpu": "x64" }, "sha512-9XAqGTMQAtIslMsjK3xdyY6OI9d59OZqcLBB6pvD/DcoR0daYswfrKx2azdDERDY4AqAnWPC7odVM1BmxYv3Vw=="],
 
-    "@astrojs/compiler-binding-linux-x64-musl": ["@astrojs/compiler-binding-linux-x64-musl@0.5.2", "", { "os": "linux", "cpu": "x64", "libc": "musl" }, "sha512-jOViewGeTh9bSfS8vK72ECxoy2yvmA+Pd/ZcEvBI5c7+7IcfHwZ5qA4L9fRYuOhSrAifvQ2dV4vm1XAtloaWBw=="],
+    "@astrojs/compiler-binding-linux-x64-musl": ["@astrojs/compiler-binding-linux-x64-musl@0.5.2", "", { "os": "linux", "cpu": "x64" }, "sha512-jOViewGeTh9bSfS8vK72ECxoy2yvmA+Pd/ZcEvBI5c7+7IcfHwZ5qA4L9fRYuOhSrAifvQ2dV4vm1XAtloaWBw=="],
 
     "@astrojs/compiler-binding-wasm32-wasi": ["@astrojs/compiler-binding-wasm32-wasi@0.5.2", "", { "dependencies": { "@emnapi/core": "1.11.3", "@emnapi/runtime": "1.11.3", "@napi-rs/wasm-runtime": "^1.2.5" }, "cpu": "none" }, "sha512-Z7p64doar1uvR5C9Xs6j1CV9lGlPVQX7OQ2aAtZ/xKC5aGS6GB13nyc2UfQXTQLvZrvVwsyaflTQy6ziY5Bekw=="],
 
@@ -1542,13 +1543,13 @@
 
     "@bruits/satteri-darwin-x64": ["@bruits/satteri-darwin-x64@0.9.5", "", { "os": "darwin", "cpu": "x64" }, "sha512-6T26Z5Kf3cFW2PSlk9p7zT7yVxvuBSiJvYyz9u8KjYwMTqZyIDOj2wDyNpxKV4+6yUVG7rddq2QwvG/8LJA2+Q=="],
 
-    "@bruits/satteri-linux-arm64-gnu": ["@bruits/satteri-linux-arm64-gnu@0.9.5", "", { "os": "linux", "cpu": "arm64", "libc": "glibc" }, "sha512-u51id17uJwNEMK9nBlICsq6U31c+XVqQueVBkwRIzZG+gMpS8TOJctt5h5Wz33Z8xnMdTd+adtACVz0yHgGuOA=="],
+    "@bruits/satteri-linux-arm64-gnu": ["@bruits/satteri-linux-arm64-gnu@0.9.5", "", { "os": "linux", "cpu": "arm64" }, "sha512-u51id17uJwNEMK9nBlICsq6U31c+XVqQueVBkwRIzZG+gMpS8TOJctt5h5Wz33Z8xnMdTd+adtACVz0yHgGuOA=="],
 
-    "@bruits/satteri-linux-arm64-musl": ["@bruits/satteri-linux-arm64-musl@0.9.5", "", { "os": "linux", "cpu": "arm64", "libc": "musl" }, "sha512-v39HxiwGC5Rqm01HksP6+5Y+xKLPlsuVFgIgpEAo+SiQ22c+mJVhS3u7Z6ePAKdhL5NJoK1xq70kLz3L13AhpQ=="],
+    "@bruits/satteri-linux-arm64-musl": ["@bruits/satteri-linux-arm64-musl@0.9.5", "", { "os": "linux", "cpu": "arm64" }, "sha512-v39HxiwGC5Rqm01HksP6+5Y+xKLPlsuVFgIgpEAo+SiQ22c+mJVhS3u7Z6ePAKdhL5NJoK1xq70kLz3L13AhpQ=="],
 
-    "@bruits/satteri-linux-x64-gnu": ["@bruits/satteri-linux-x64-gnu@0.9.5", "", { "os": "linux", "cpu": "x64", "libc": "glibc" }, "sha512-F3uO8uFp3pAP5ZGXttwvh57GS7s0lL953tnNdyI2gRyP4kOOkp6pyGojNJzCjkDvWI2Cvb9iNrKok3aqQPauAw=="],
+    "@bruits/satteri-linux-x64-gnu": ["@bruits/satteri-linux-x64-gnu@0.9.5", "", { "os": "linux", "cpu": "x64" }, "sha512-F3uO8uFp3pAP5ZGXttwvh57GS7s0lL953tnNdyI2gRyP4kOOkp6pyGojNJzCjkDvWI2Cvb9iNrKok3aqQPauAw=="],
 
-    "@bruits/satteri-linux-x64-musl": ["@bruits/satteri-linux-x64-musl@0.9.5", "", { "os": "linux", "cpu": "x64", "libc": "musl" }, "sha512-bicEqglLlz++mWyADaZoP0JY20s4vDfLjaPYgQqC+NI4zZLTOOg1T4GB8aqtc822Pqji8SQBmSrTb7CrP8i08Q=="],
+    "@bruits/satteri-linux-x64-musl": ["@bruits/satteri-linux-x64-musl@0.9.5", "", { "os": "linux", "cpu": "x64" }, "sha512-bicEqglLlz++mWyADaZoP0JY20s4vDfLjaPYgQqC+NI4zZLTOOg1T4GB8aqtc822Pqji8SQBmSrTb7CrP8i08Q=="],
 
     "@bruits/satteri-wasm32-wasi": ["@bruits/satteri-wasm32-wasi@0.9.5", "", { "dependencies": { "@emnapi/core": "1.11.1", "@emnapi/runtime": "1.11.1", "@napi-rs/wasm-runtime": "^1.1.6" }, "cpu": "none" }, "sha512-zauAuMwfPnKPUkd4AFixRFpXdgKwP2mKgxrIIo2gJzW0/ZneF9dbHnLkojSpaBnCCp7VUL1hIi5WWZvB1CqmAQ=="],
 
@@ -1716,11 +1717,11 @@
 
     "@ff-labs/fff-bin-darwin-x64": ["@ff-labs/fff-bin-darwin-x64@0.10.5", "", { "os": "darwin", "cpu": "x64" }, "sha512-pwdFJUB/oeO4S/SfmRDdE5ipbAMYoVtRMwTZ12Wn2H46PgNU5DWnSjHhUNTLuKmkQU/ZIJL5Sn9j/fzwuIzcoA=="],
 
-    "@ff-labs/fff-bin-linux-arm64-gnu": ["@ff-labs/fff-bin-linux-arm64-gnu@0.10.5", "", { "os": "linux", "cpu": "arm64", "libc": "glibc" }, "sha512-prbY72gR+VPoSxl1InglwSwVHM0kErYMjUOpdvjQhS8eRdXYL3hTuYQv9L7fiB0mqaDzcwFa339uMr3p8ujDrw=="],
+    "@ff-labs/fff-bin-linux-arm64-gnu": ["@ff-labs/fff-bin-linux-arm64-gnu@0.10.5", "", { "os": "linux", "cpu": "arm64" }, "sha512-prbY72gR+VPoSxl1InglwSwVHM0kErYMjUOpdvjQhS8eRdXYL3hTuYQv9L7fiB0mqaDzcwFa339uMr3p8ujDrw=="],
 
     "@ff-labs/fff-bin-linux-arm64-musl": ["@ff-labs/fff-bin-linux-arm64-musl@0.10.5", "", { "os": "linux", "cpu": "arm64" }, "sha512-MQN/CEKn4c4toooGCmZ6N8cP9mhgE4tnR6rr6a4k9JjH0xi05fYdG4+BabPkr+l/mDc01DsRpSKVNBmvoZ3IlQ=="],
 
-    "@ff-labs/fff-bin-linux-x64-gnu": ["@ff-labs/fff-bin-linux-x64-gnu@0.10.5", "", { "os": "linux", "cpu": "x64", "libc": "glibc" }, "sha512-8NzFGGyqrFaCtb+SPTFd0xQGUlHCJMf0KYGwuca46IP37nN4OtDT1wnyZ9oaPDZ+2qqyxox10hCnqGlmj3PJzQ=="],
+    "@ff-labs/fff-bin-linux-x64-gnu": ["@ff-labs/fff-bin-linux-x64-gnu@0.10.5", "", { "os": "linux", "cpu": "x64" }, "sha512-8NzFGGyqrFaCtb+SPTFd0xQGUlHCJMf0KYGwuca46IP37nN4OtDT1wnyZ9oaPDZ+2qqyxox10hCnqGlmj3PJzQ=="],
 
     "@ff-labs/fff-bin-linux-x64-musl": ["@ff-labs/fff-bin-linux-x64-musl@0.10.5", "", { "os": "linux", "cpu": "x64" }, "sha512-mioRbn8aAW2Jmm4W0w3poePo65iSE+REfO+Jc0iqsjirImEy6pKt7dswj+7LSU6RPWwPsMb4POTMENwNLMlJww=="],
 
@@ -1776,37 +1777,37 @@
 
     "@img/sharp-libvips-darwin-x64": ["@img/sharp-libvips-darwin-x64@1.3.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-iR2OKH80yi0U+dUplyh3/xdpFvps6YkCwsXenIJxqxR1v9o+xtKTGbS9H7cps+2Vxjc8B1j96p75NmTGjIhtpQ=="],
 
-    "@img/sharp-libvips-linux-arm": ["@img/sharp-libvips-linux-arm@1.3.4", "", { "os": "linux", "cpu": "arm", "libc": "glibc" }, "sha512-LmRtTsOHuvM2+wlO2Db37dx5MiZhB0FvSunciw48YjdOkZz9KAiRbm8ujeMOA1INqmei5NapFxYEK1D1ZSidmw=="],
+    "@img/sharp-libvips-linux-arm": ["@img/sharp-libvips-linux-arm@1.3.4", "", { "os": "linux", "cpu": "arm" }, "sha512-LmRtTsOHuvM2+wlO2Db37dx5MiZhB0FvSunciw48YjdOkZz9KAiRbm8ujeMOA1INqmei5NapFxYEK1D1ZSidmw=="],
 
-    "@img/sharp-libvips-linux-arm64": ["@img/sharp-libvips-linux-arm64@1.3.4", "", { "os": "linux", "cpu": "arm64", "libc": "glibc" }, "sha512-Y3dgX/6lE2QhQb+Gxy0WZxfg9MEm/JBjamZpS2IklP7xIQoKN4hzAm7KcMVGtaVDt3neE9OKBC7vAfonA/Lr1A=="],
+    "@img/sharp-libvips-linux-arm64": ["@img/sharp-libvips-linux-arm64@1.3.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-Y3dgX/6lE2QhQb+Gxy0WZxfg9MEm/JBjamZpS2IklP7xIQoKN4hzAm7KcMVGtaVDt3neE9OKBC7vAfonA/Lr1A=="],
 
-    "@img/sharp-libvips-linux-ppc64": ["@img/sharp-libvips-linux-ppc64@1.3.4", "", { "os": "linux", "cpu": "ppc64", "libc": "glibc" }, "sha512-Le6boB8Tai0Nis+gIxIpKx68UDVVIqdR8Tin5Yf1z2LJJQLDJvCDRqRu+jC2qCoD+eIomonmOwB4smBRxfVpYQ=="],
+    "@img/sharp-libvips-linux-ppc64": ["@img/sharp-libvips-linux-ppc64@1.3.4", "", { "os": "linux", "cpu": "ppc64" }, "sha512-Le6boB8Tai0Nis+gIxIpKx68UDVVIqdR8Tin5Yf1z2LJJQLDJvCDRqRu+jC2qCoD+eIomonmOwB4smBRxfVpYQ=="],
 
-    "@img/sharp-libvips-linux-riscv64": ["@img/sharp-libvips-linux-riscv64@1.3.4", "", { "os": "linux", "cpu": "none", "libc": "glibc" }, "sha512-aHkkIEHPRdQEegJN20MLmGtxYD9R2wQr3Cwpddnu5+YKMt6Uzax7S9h5gpZTo8wyrGuZSlfQ63OevL5mTyOC7Q=="],
+    "@img/sharp-libvips-linux-riscv64": ["@img/sharp-libvips-linux-riscv64@1.3.4", "", { "os": "linux", "cpu": "none" }, "sha512-aHkkIEHPRdQEegJN20MLmGtxYD9R2wQr3Cwpddnu5+YKMt6Uzax7S9h5gpZTo8wyrGuZSlfQ63OevL5mTyOC7Q=="],
 
-    "@img/sharp-libvips-linux-s390x": ["@img/sharp-libvips-linux-s390x@1.3.4", "", { "os": "linux", "cpu": "s390x", "libc": "glibc" }, "sha512-ra/mB6MikESDUO7Yg+Mi95bFBb9GsObURuhnOv3OqknjGe9sZrG8tCe9q0xSIGrtLgvgw0gKnFWcK4blSgQOuQ=="],
+    "@img/sharp-libvips-linux-s390x": ["@img/sharp-libvips-linux-s390x@1.3.4", "", { "os": "linux", "cpu": "s390x" }, "sha512-ra/mB6MikESDUO7Yg+Mi95bFBb9GsObURuhnOv3OqknjGe9sZrG8tCe9q0xSIGrtLgvgw0gKnFWcK4blSgQOuQ=="],
 
-    "@img/sharp-libvips-linux-x64": ["@img/sharp-libvips-linux-x64@1.3.4", "", { "os": "linux", "cpu": "x64", "libc": "glibc" }, "sha512-GJ//SSXbnwSDes02umB3nDJLFcQzw8a18V8fyhqr6tV515tOEMdImjjxj1AoafMRz56F3PHgftnj1QEKSU1zkw=="],
+    "@img/sharp-libvips-linux-x64": ["@img/sharp-libvips-linux-x64@1.3.4", "", { "os": "linux", "cpu": "x64" }, "sha512-GJ//SSXbnwSDes02umB3nDJLFcQzw8a18V8fyhqr6tV515tOEMdImjjxj1AoafMRz56F3PHgftnj1QEKSU1zkw=="],
 
-    "@img/sharp-libvips-linuxmusl-arm64": ["@img/sharp-libvips-linuxmusl-arm64@1.3.4", "", { "os": "linux", "cpu": "arm64", "libc": "musl" }, "sha512-hvulFwtjUcagsis6BBxHwGFwWoNZjgYmULGVrZcyfNbjA8hKILbRxGg15/7w5HDyXHXUos/j6baAWqnCyQ2DWA=="],
+    "@img/sharp-libvips-linuxmusl-arm64": ["@img/sharp-libvips-linuxmusl-arm64@1.3.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-hvulFwtjUcagsis6BBxHwGFwWoNZjgYmULGVrZcyfNbjA8hKILbRxGg15/7w5HDyXHXUos/j6baAWqnCyQ2DWA=="],
 
-    "@img/sharp-libvips-linuxmusl-x64": ["@img/sharp-libvips-linuxmusl-x64@1.3.4", "", { "os": "linux", "cpu": "x64", "libc": "musl" }, "sha512-6zXKeE/p39I1AmA3cJG35eyBGNqNddLnUXjhwBnsGjFPWqf5VKkDBEqaEkPDoTEtkxwi2vv8Tcr2mDyP4So7Fg=="],
+    "@img/sharp-libvips-linuxmusl-x64": ["@img/sharp-libvips-linuxmusl-x64@1.3.4", "", { "os": "linux", "cpu": "x64" }, "sha512-6zXKeE/p39I1AmA3cJG35eyBGNqNddLnUXjhwBnsGjFPWqf5VKkDBEqaEkPDoTEtkxwi2vv8Tcr2mDyP4So7Fg=="],
 
-    "@img/sharp-linux-arm": ["@img/sharp-linux-arm@0.35.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm": "1.3.4" }, "os": "linux", "cpu": "arm", "libc": "glibc" }, "sha512-LEaXK2WdXVK5ykcw0buWyPMsmLLL2vpHLD6yrNSW+JGEL3BZPA4tpKN6iaMc4AxTTAoaX/sU1rOL51lcIz48ZQ=="],
+    "@img/sharp-linux-arm": ["@img/sharp-linux-arm@0.35.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm": "1.3.4" }, "os": "linux", "cpu": "arm" }, "sha512-LEaXK2WdXVK5ykcw0buWyPMsmLLL2vpHLD6yrNSW+JGEL3BZPA4tpKN6iaMc4AxTTAoaX/sU1rOL51lcIz48ZQ=="],
 
-    "@img/sharp-linux-arm64": ["@img/sharp-linux-arm64@0.35.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm64": "1.3.4" }, "os": "linux", "cpu": "arm64", "libc": "glibc" }, "sha512-LYVx5JTsOM2CBzmxreh+nl64/3H6Xb09iSLknqH47z2T2DFFxDeFLP5y4dJwe6H7uGQlHPyEEtIqyo3DYsRwdQ=="],
+    "@img/sharp-linux-arm64": ["@img/sharp-linux-arm64@0.35.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm64": "1.3.4" }, "os": "linux", "cpu": "arm64" }, "sha512-LYVx5JTsOM2CBzmxreh+nl64/3H6Xb09iSLknqH47z2T2DFFxDeFLP5y4dJwe6H7uGQlHPyEEtIqyo3DYsRwdQ=="],
 
-    "@img/sharp-linux-ppc64": ["@img/sharp-linux-ppc64@0.35.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-ppc64": "1.3.4" }, "os": "linux", "cpu": "ppc64", "libc": "glibc" }, "sha512-QVxAAq8evVRI9ia2vqgwrmWucn5Dfv+JdWzj75pD8omHLPSP7f8p20O8jxzjCcuCEQEOtYOZUmX1hkiZ0kdevA=="],
+    "@img/sharp-linux-ppc64": ["@img/sharp-linux-ppc64@0.35.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-ppc64": "1.3.4" }, "os": "linux", "cpu": "ppc64" }, "sha512-QVxAAq8evVRI9ia2vqgwrmWucn5Dfv+JdWzj75pD8omHLPSP7f8p20O8jxzjCcuCEQEOtYOZUmX1hkiZ0kdevA=="],
 
-    "@img/sharp-linux-riscv64": ["@img/sharp-linux-riscv64@0.35.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-riscv64": "1.3.4" }, "os": "linux", "cpu": "none", "libc": "glibc" }, "sha512-LtdreXguaavKODPIfzJ4kffx7UNt1omwtK0rch4EBbbSTXPnxWmYSayXdLJw0fJzQ97kHt1gL/yh4tvU+nCyRQ=="],
+    "@img/sharp-linux-riscv64": ["@img/sharp-linux-riscv64@0.35.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-riscv64": "1.3.4" }, "os": "linux", "cpu": "none" }, "sha512-LtdreXguaavKODPIfzJ4kffx7UNt1omwtK0rch4EBbbSTXPnxWmYSayXdLJw0fJzQ97kHt1gL/yh4tvU+nCyRQ=="],
 
-    "@img/sharp-linux-s390x": ["@img/sharp-linux-s390x@0.35.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-s390x": "1.3.4" }, "os": "linux", "cpu": "s390x", "libc": "glibc" }, "sha512-UZasTOFiYzotTsGOCu42BfUzP6Tu6Do/947iRm1RsLKvlllxwGcn4RN27LibGWceix4Y+Pmw3jsnTcCQIgWjqA=="],
+    "@img/sharp-linux-s390x": ["@img/sharp-linux-s390x@0.35.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-s390x": "1.3.4" }, "os": "linux", "cpu": "s390x" }, "sha512-UZasTOFiYzotTsGOCu42BfUzP6Tu6Do/947iRm1RsLKvlllxwGcn4RN27LibGWceix4Y+Pmw3jsnTcCQIgWjqA=="],
 
-    "@img/sharp-linux-x64": ["@img/sharp-linux-x64@0.35.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-x64": "1.3.4" }, "os": "linux", "cpu": "x64", "libc": "glibc" }, "sha512-SxFtLTeJInhAA9Q836kux2vZNeOBQEx658qvbboZScr0wIARym3IcGmW7KpVD5sbVg0Ojy+udFQdayYIZyoNog=="],
+    "@img/sharp-linux-x64": ["@img/sharp-linux-x64@0.35.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-x64": "1.3.4" }, "os": "linux", "cpu": "x64" }, "sha512-SxFtLTeJInhAA9Q836kux2vZNeOBQEx658qvbboZScr0wIARym3IcGmW7KpVD5sbVg0Ojy+udFQdayYIZyoNog=="],
 
-    "@img/sharp-linuxmusl-arm64": ["@img/sharp-linuxmusl-arm64@0.35.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-arm64": "1.3.4" }, "os": "linux", "cpu": "arm64", "libc": "musl" }, "sha512-9HbMclmI1zlNkFRs3z9/eBtDjfD0sGlrX1z6b1qwmiFY5ElDLh4BC0LPBdVp7z1DXFiKlIcznf+ZlsuZzLxQqg=="],
+    "@img/sharp-linuxmusl-arm64": ["@img/sharp-linuxmusl-arm64@0.35.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-arm64": "1.3.4" }, "os": "linux", "cpu": "arm64" }, "sha512-9HbMclmI1zlNkFRs3z9/eBtDjfD0sGlrX1z6b1qwmiFY5ElDLh4BC0LPBdVp7z1DXFiKlIcznf+ZlsuZzLxQqg=="],
 
-    "@img/sharp-linuxmusl-x64": ["@img/sharp-linuxmusl-x64@0.35.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-x64": "1.3.4" }, "os": "linux", "cpu": "x64", "libc": "musl" }, "sha512-4KOphqB035HrVdqLZfCgMzzERrQkkzOwRhl4OAkRO1YCldbaFjySXMaK534Mo0V+LndnlJk+sbUyLeU0ULyD1A=="],
+    "@img/sharp-linuxmusl-x64": ["@img/sharp-linuxmusl-x64@0.35.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-x64": "1.3.4" }, "os": "linux", "cpu": "x64" }, "sha512-4KOphqB035HrVdqLZfCgMzzERrQkkzOwRhl4OAkRO1YCldbaFjySXMaK534Mo0V+LndnlJk+sbUyLeU0ULyD1A=="],
 
     "@img/sharp-wasm32": ["@img/sharp-wasm32@0.34.5", "", { "dependencies": { "@emnapi/runtime": "^1.7.0" }, "cpu": "none" }, "sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw=="],
 
@@ -2012,13 +2013,13 @@
 
     "@opencode/pty-darwin-x64": ["@opencode/pty-darwin-x64@0.4.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-NvQfygGcsGmDCIUJ/VHLcS6SduC93Y/qP2hrHjtBpiL2sSQyeCDcifNhLvqY/wxGFNNZ4GeZwwZqe7rMEuBJbQ=="],
 
-    "@opencode/pty-linux-arm64-gnu": ["@opencode/pty-linux-arm64-gnu@0.4.0", "", { "os": "linux", "cpu": "arm64", "libc": "glibc" }, "sha512-VZXkYD+CT+zdodmTnKn9/VlmswksLPBLJryeBsG4IXUFXTsATr7+PVygJk96FxCh5nq68H3a/UJgyiIUMl1XCQ=="],
+    "@opencode/pty-linux-arm64-gnu": ["@opencode/pty-linux-arm64-gnu@0.4.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-VZXkYD+CT+zdodmTnKn9/VlmswksLPBLJryeBsG4IXUFXTsATr7+PVygJk96FxCh5nq68H3a/UJgyiIUMl1XCQ=="],
 
-    "@opencode/pty-linux-arm64-musl": ["@opencode/pty-linux-arm64-musl@0.4.0", "", { "os": "linux", "cpu": "arm64", "libc": "musl" }, "sha512-hCx25Hn9sALdnkx2Y4aPGVw3glTbX61XRiJs+XETPPIO9QTaav4OS4k2JR2uHC6/u161xKdN82iJ+OYfwcGUSg=="],
+    "@opencode/pty-linux-arm64-musl": ["@opencode/pty-linux-arm64-musl@0.4.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-hCx25Hn9sALdnkx2Y4aPGVw3glTbX61XRiJs+XETPPIO9QTaav4OS4k2JR2uHC6/u161xKdN82iJ+OYfwcGUSg=="],
 
-    "@opencode/pty-linux-x64-gnu": ["@opencode/pty-linux-x64-gnu@0.4.0", "", { "os": "linux", "cpu": "x64", "libc": "glibc" }, "sha512-Xal/d0+xp6XE4iCGUAw4JTQ4uf5l8V0EIbeKq+e03cHJewOMKZk4fooQjxpZvQIToBHRtnCJAmd+EEhVxXiDDw=="],
+    "@opencode/pty-linux-x64-gnu": ["@opencode/pty-linux-x64-gnu@0.4.0", "", { "os": "linux", "cpu": "x64" }, "sha512-Xal/d0+xp6XE4iCGUAw4JTQ4uf5l8V0EIbeKq+e03cHJewOMKZk4fooQjxpZvQIToBHRtnCJAmd+EEhVxXiDDw=="],
 
-    "@opencode/pty-linux-x64-musl": ["@opencode/pty-linux-x64-musl@0.4.0", "", { "os": "linux", "cpu": "x64", "libc": "musl" }, "sha512-dBVtKZoVKAN6/E+65GrJksgRKzPkPHUjWZBzf3mRANXt2adpdbV+/M1AMfPCZSju2mN1j9rNu8MCrxwr+ugEig=="],
+    "@opencode/pty-linux-x64-musl": ["@opencode/pty-linux-x64-musl@0.4.0", "", { "os": "linux", "cpu": "x64" }, "sha512-dBVtKZoVKAN6/E+65GrJksgRKzPkPHUjWZBzf3mRANXt2adpdbV+/M1AMfPCZSju2mN1j9rNu8MCrxwr+ugEig=="],
 
     "@opencode/pty-win32-arm64": ["@opencode/pty-win32-arm64@0.4.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-IKJMUnS2aluWqRj13enMWomYtwbXq8rStcf/mUbxBoAGTDMtWR/ZrRmKb2ptR7KUqDjdSEa+8C8rczS7uGFl9g=="],
 
@@ -2096,11 +2097,11 @@
 
     "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.8.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-b6D/VP9y0Z18tO86GSTp9BBykgR6r5CQM1ol9UMJfUt+PjN5HGksbOCDTMIQufXvt4WIUFHrSBProysJRFzbYw=="],
 
-    "@opentui/core-linux-arm64-musl": ["@opentui/core-linux-arm64-musl@0.8.0", "", { "os": "linux", "cpu": "arm64", "libc": "musl" }, "sha512-8ZPl/2DChcS7XIVRPIazigXaMNyxa2bwvuzPprNbzT0+cVJLIoGC19pjiV3bI3oVXBPVMNqgIcppOrEHBhlouw=="],
+    "@opentui/core-linux-arm64-musl": ["@opentui/core-linux-arm64-musl@0.8.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-8ZPl/2DChcS7XIVRPIazigXaMNyxa2bwvuzPprNbzT0+cVJLIoGC19pjiV3bI3oVXBPVMNqgIcppOrEHBhlouw=="],
 
     "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.8.0", "", { "os": "linux", "cpu": "x64" }, "sha512-aXBNIdE6iMf58/Tdnd6UzXeFjYfaHzQ6E0nukjLe2ir41/meJJYEAHUQ62EBr/gxvuCNZHTBQB4T9BzF7PdENQ=="],
 
-    "@opentui/core-linux-x64-musl": ["@opentui/core-linux-x64-musl@0.8.0", "", { "os": "linux", "cpu": "x64", "libc": "musl" }, "sha512-xGEYw6wkX0sPwPx6RosQZanuWF0+5cIup2alhHHQQfKJkcLS8r8NBWlcy2LK9CoEWH6SBtNXC+9Y5IrryCOvJQ=="],
+    "@opentui/core-linux-x64-musl": ["@opentui/core-linux-x64-musl@0.8.0", "", { "os": "linux", "cpu": "x64" }, "sha512-xGEYw6wkX0sPwPx6RosQZanuWF0+5cIup2alhHHQQfKJkcLS8r8NBWlcy2LK9CoEWH6SBtNXC+9Y5IrryCOvJQ=="],
 
     "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.8.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-XtK0QMyIiqeDmrIyyAXqqp7TKaRGaWnBlbnEsNrkRLrgP+aLwRhRSHdafxi+RMqj3h9qOlb1MgnPal1kx7wP4g=="],
 
@@ -2130,21 +2131,21 @@
 
     "@oxc-parser/binding-linux-arm-musleabihf": ["@oxc-parser/binding-linux-arm-musleabihf@0.141.0", "", { "os": "linux", "cpu": "arm" }, "sha512-e6hwQqd+3lvP13G2jxvFpoA7dzHcFLN+Mq47JCVMtdNHbbyBRo756JCtbbJH6ca8inTfyqZoqBmS3vhQlzAK2w=="],
 
-    "@oxc-parser/binding-linux-arm64-gnu": ["@oxc-parser/binding-linux-arm64-gnu@0.141.0", "", { "os": "linux", "cpu": "arm64", "libc": "glibc" }, "sha512-vXz2BLAuypA+4MLyBg94pzEo6THVnzYnCtAjXoihIIQo0t2pnp/AmW+SH1EI+4VbuJnC//KplIJ5yyaCGua4jA=="],
+    "@oxc-parser/binding-linux-arm64-gnu": ["@oxc-parser/binding-linux-arm64-gnu@0.141.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-vXz2BLAuypA+4MLyBg94pzEo6THVnzYnCtAjXoihIIQo0t2pnp/AmW+SH1EI+4VbuJnC//KplIJ5yyaCGua4jA=="],
 
-    "@oxc-parser/binding-linux-arm64-musl": ["@oxc-parser/binding-linux-arm64-musl@0.141.0", "", { "os": "linux", "cpu": "arm64", "libc": "musl" }, "sha512-jMkS/EztNW34HKsXIaT/SoHcmtocq/vWhwFOVduF9kduuuRIVwfwQ6uxzIO+qPKSXdd2TXt54of0BJ2zFMXnmw=="],
+    "@oxc-parser/binding-linux-arm64-musl": ["@oxc-parser/binding-linux-arm64-musl@0.141.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-jMkS/EztNW34HKsXIaT/SoHcmtocq/vWhwFOVduF9kduuuRIVwfwQ6uxzIO+qPKSXdd2TXt54of0BJ2zFMXnmw=="],
 
-    "@oxc-parser/binding-linux-ppc64-gnu": ["@oxc-parser/binding-linux-ppc64-gnu@0.141.0", "", { "os": "linux", "cpu": "ppc64", "libc": "glibc" }, "sha512-vo+MR+n3zQJ6Mq92hiP084NZcgDv5iJlVR02gMf28neMvVT1tKVm7VeiW/DxhdqOi3QLeaXIk9cUcLL1qrkngw=="],
+    "@oxc-parser/binding-linux-ppc64-gnu": ["@oxc-parser/binding-linux-ppc64-gnu@0.141.0", "", { "os": "linux", "cpu": "ppc64" }, "sha512-vo+MR+n3zQJ6Mq92hiP084NZcgDv5iJlVR02gMf28neMvVT1tKVm7VeiW/DxhdqOi3QLeaXIk9cUcLL1qrkngw=="],
 
-    "@oxc-parser/binding-linux-riscv64-gnu": ["@oxc-parser/binding-linux-riscv64-gnu@0.141.0", "", { "os": "linux", "cpu": "none", "libc": "glibc" }, "sha512-oh80w+7RuiO5gBp9Jnoa/H8Qlt3JsHL2MkW+0dwEdlDMdslVZX/YsekSK6EeyEenY66/mhCfypsNATQ7Ph3qlQ=="],
+    "@oxc-parser/binding-linux-riscv64-gnu": ["@oxc-parser/binding-linux-riscv64-gnu@0.141.0", "", { "os": "linux", "cpu": "none" }, "sha512-oh80w+7RuiO5gBp9Jnoa/H8Qlt3JsHL2MkW+0dwEdlDMdslVZX/YsekSK6EeyEenY66/mhCfypsNATQ7Ph3qlQ=="],
 
-    "@oxc-parser/binding-linux-riscv64-musl": ["@oxc-parser/binding-linux-riscv64-musl@0.141.0", "", { "os": "linux", "cpu": "none", "libc": "musl" }, "sha512-LOyEmFA8sCnYbEXP1+iQvCC/P1YXHMA/t6x1Ksp0Y9VwhLFsiBJFzV1zIxrOIE2LKaGGhDjQ29xq9cbq6omDXA=="],
+    "@oxc-parser/binding-linux-riscv64-musl": ["@oxc-parser/binding-linux-riscv64-musl@0.141.0", "", { "os": "linux", "cpu": "none" }, "sha512-LOyEmFA8sCnYbEXP1+iQvCC/P1YXHMA/t6x1Ksp0Y9VwhLFsiBJFzV1zIxrOIE2LKaGGhDjQ29xq9cbq6omDXA=="],
 
-    "@oxc-parser/binding-linux-s390x-gnu": ["@oxc-parser/binding-linux-s390x-gnu@0.141.0", "", { "os": "linux", "cpu": "s390x", "libc": "glibc" }, "sha512-3wnwk/l1CvszVE5TJR1wSl/zSEfydRqrNhn6s7Vr9IzSJpUQIroqVsIoPARHRFA+FQwkxAFDAHDAasa7v8OobQ=="],
+    "@oxc-parser/binding-linux-s390x-gnu": ["@oxc-parser/binding-linux-s390x-gnu@0.141.0", "", { "os": "linux", "cpu": "s390x" }, "sha512-3wnwk/l1CvszVE5TJR1wSl/zSEfydRqrNhn6s7Vr9IzSJpUQIroqVsIoPARHRFA+FQwkxAFDAHDAasa7v8OobQ=="],
 
-    "@oxc-parser/binding-linux-x64-gnu": ["@oxc-parser/binding-linux-x64-gnu@0.141.0", "", { "os": "linux", "cpu": "x64", "libc": "glibc" }, "sha512-qtyQVAAebFq57B2tifTlel3TgGqUtsYNI/e+p6aya9rN9lOZVTDvr215fGYSA9XWooxzMxDiVxkBLk2jQHbsOQ=="],
+    "@oxc-parser/binding-linux-x64-gnu": ["@oxc-parser/binding-linux-x64-gnu@0.141.0", "", { "os": "linux", "cpu": "x64" }, "sha512-qtyQVAAebFq57B2tifTlel3TgGqUtsYNI/e+p6aya9rN9lOZVTDvr215fGYSA9XWooxzMxDiVxkBLk2jQHbsOQ=="],
 
-    "@oxc-parser/binding-linux-x64-musl": ["@oxc-parser/binding-linux-x64-musl@0.141.0", "", { "os": "linux", "cpu": "x64", "libc": "musl" }, "sha512-SkGV1nKw40roEc94pv5EaaeH2ay14G6+roe8Q0wIUC1LcEKxzKW921h7+ZuZX0D3q2Mb/7aSFmxEVqnko3lPRw=="],
+    "@oxc-parser/binding-linux-x64-musl": ["@oxc-parser/binding-linux-x64-musl@0.141.0", "", { "os": "linux", "cpu": "x64" }, "sha512-SkGV1nKw40roEc94pv5EaaeH2ay14G6+roe8Q0wIUC1LcEKxzKW921h7+ZuZX0D3q2Mb/7aSFmxEVqnko3lPRw=="],
 
     "@oxc-parser/binding-openharmony-arm64": ["@oxc-parser/binding-openharmony-arm64@0.141.0", "", { "os": "none", "cpu": "arm64" }, "sha512-cVgDM7n8QziQqOaP5hNgUYfMG7S/ZeuPxFWXnnHRv7rh025COk0rfQ6eEdKG3j/GaUuyvNZN4ifF1J8KmuXLLA=="],
 
@@ -2228,11 +2229,11 @@
 
     "@parcel/watcher-linux-arm-musl": ["@parcel/watcher-linux-arm-musl@2.5.1", "", { "os": "linux", "cpu": "arm" }, "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q=="],
 
-    "@parcel/watcher-linux-arm64-glibc": ["@parcel/watcher-linux-arm64-glibc@2.5.1", "", { "os": "linux", "cpu": "arm64", "libc": "glibc" }, "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w=="],
+    "@parcel/watcher-linux-arm64-glibc": ["@parcel/watcher-linux-arm64-glibc@2.5.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w=="],
 
     "@parcel/watcher-linux-arm64-musl": ["@parcel/watcher-linux-arm64-musl@2.5.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg=="],
 
-    "@parcel/watcher-linux-x64-glibc": ["@parcel/watcher-linux-x64-glibc@2.5.1", "", { "os": "linux", "cpu": "x64", "libc": "glibc" }, "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A=="],
+    "@parcel/watcher-linux-x64-glibc": ["@parcel/watcher-linux-x64-glibc@2.5.1", "", { "os": "linux", "cpu": "x64" }, "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A=="],
 
     "@parcel/watcher-linux-x64-musl": ["@parcel/watcher-linux-x64-musl@2.5.1", "", { "os": "linux", "cpu": "x64" }, "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg=="],
 
@@ -2766,11 +2767,11 @@
 
     "@yuuang/ffi-rs-linux-arm-gnueabihf": ["@yuuang/ffi-rs-linux-arm-gnueabihf@1.3.7", "", { "os": "linux", "cpu": "arm" }, "sha512-9r//Z022QYVoIAY458Dpk8HWkisk/y4NJC3d52RlkdsLD+9p0zn0cKKSoMF/xUsOWDFSmOf+cwU/Xadi/wxFMQ=="],
 
-    "@yuuang/ffi-rs-linux-arm64-gnu": ["@yuuang/ffi-rs-linux-arm64-gnu@1.3.2", "", { "os": "linux", "cpu": "arm64", "libc": "glibc" }, "sha512-gWFO6xufUK9lPYUqDvKa6IR243dPqdetgl9Q7HrZWaDu7wLo06QQrosw8QTzndafQnOcBKm6LoLujmGCfTgJOA=="],
+    "@yuuang/ffi-rs-linux-arm64-gnu": ["@yuuang/ffi-rs-linux-arm64-gnu@1.3.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-gWFO6xufUK9lPYUqDvKa6IR243dPqdetgl9Q7HrZWaDu7wLo06QQrosw8QTzndafQnOcBKm6LoLujmGCfTgJOA=="],
 
     "@yuuang/ffi-rs-linux-arm64-musl": ["@yuuang/ffi-rs-linux-arm64-musl@1.3.7", "", { "os": "linux", "cpu": "arm64" }, "sha512-eLLx4P8DzNnuPif19nAvKPaf88lSf6KFbDetH3nAIRZvI495h0jigN835Ayr7uAADssohGfO9MPMH33DXmFErA=="],
 
-    "@yuuang/ffi-rs-linux-x64-gnu": ["@yuuang/ffi-rs-linux-x64-gnu@1.3.2", "", { "os": "linux", "cpu": "x64", "libc": "glibc" }, "sha512-s8VCFazaJKmgY2hgMTpWk4TtBY/zy5ovbaGgwyY0FvBD0YvyhcET4IrMsDJpHhFVTPCYfKZ1dN45clD/YiFp6g=="],
+    "@yuuang/ffi-rs-linux-x64-gnu": ["@yuuang/ffi-rs-linux-x64-gnu@1.3.2", "", { "os": "linux", "cpu": "x64" }, "sha512-s8VCFazaJKmgY2hgMTpWk4TtBY/zy5ovbaGgwyY0FvBD0YvyhcET4IrMsDJpHhFVTPCYfKZ1dN45clD/YiFp6g=="],
 
     "@yuuang/ffi-rs-linux-x64-musl": ["@yuuang/ffi-rs-linux-x64-musl@1.3.7", "", { "os": "linux", "cpu": "x64" }, "sha512-YOcOkIwVvIhpwuGJ428h15vpE0KnT3teFG0g2J31FrBxrVh9IH4HeTGXjelI3l9SI5gyiZDnD4PQnQ1U6oqTcA=="],
 
@@ -5448,13 +5449,13 @@
 
     "@astrojs/markdown-satteri/satteri/@bruits/satteri-darwin-x64": ["@bruits/satteri-darwin-x64@0.10.5", "", { "os": "darwin", "cpu": "x64" }, "sha512-IjnLe3nKspq6qaeqGgjT7MT8VrTV74yWRlaag7ZdNsI8TDAYZ0iPxMCo+9KQZHUk5EyVB+reBI/PFWL5KuFw9Q=="],
 
-    "@astrojs/markdown-satteri/satteri/@bruits/satteri-linux-arm64-gnu": ["@bruits/satteri-linux-arm64-gnu@0.10.5", "", { "os": "linux", "cpu": "arm64", "libc": "glibc" }, "sha512-glkYXZCJywjP13v67eAyAMSJdF+ncvEbYvgi/wOtffL9tQ27lr/zsyzUfgs+ovjJ9d8JNQKiXeiArJcX8PJL9w=="],
+    "@astrojs/markdown-satteri/satteri/@bruits/satteri-linux-arm64-gnu": ["@bruits/satteri-linux-arm64-gnu@0.10.5", "", { "os": "linux", "cpu": "arm64" }, "sha512-glkYXZCJywjP13v67eAyAMSJdF+ncvEbYvgi/wOtffL9tQ27lr/zsyzUfgs+ovjJ9d8JNQKiXeiArJcX8PJL9w=="],
 
-    "@astrojs/markdown-satteri/satteri/@bruits/satteri-linux-arm64-musl": ["@bruits/satteri-linux-arm64-musl@0.10.5", "", { "os": "linux", "cpu": "arm64", "libc": "musl" }, "sha512-yWdgG1g17Nh2QyGVlFUxGRa3FEFwiMcpZEyMNWkbM3deC94cmVc+/i9OuyFpdKuWo3GkgoCtYVOoxk1uCnCZIA=="],
+    "@astrojs/markdown-satteri/satteri/@bruits/satteri-linux-arm64-musl": ["@bruits/satteri-linux-arm64-musl@0.10.5", "", { "os": "linux", "cpu": "arm64" }, "sha512-yWdgG1g17Nh2QyGVlFUxGRa3FEFwiMcpZEyMNWkbM3deC94cmVc+/i9OuyFpdKuWo3GkgoCtYVOoxk1uCnCZIA=="],
 
-    "@astrojs/markdown-satteri/satteri/@bruits/satteri-linux-x64-gnu": ["@bruits/satteri-linux-x64-gnu@0.10.5", "", { "os": "linux", "cpu": "x64", "libc": "glibc" }, "sha512-FVaLoPT1fBgGl0J+AYebyyXJYBachGl8Oyyrf1lye4RTqCB4S0Gwkj1uM9RJyThUOvx5VUmAT1CnNh1SFHA+kw=="],
+    "@astrojs/markdown-satteri/satteri/@bruits/satteri-linux-x64-gnu": ["@bruits/satteri-linux-x64-gnu@0.10.5", "", { "os": "linux", "cpu": "x64" }, "sha512-FVaLoPT1fBgGl0J+AYebyyXJYBachGl8Oyyrf1lye4RTqCB4S0Gwkj1uM9RJyThUOvx5VUmAT1CnNh1SFHA+kw=="],
 
-    "@astrojs/markdown-satteri/satteri/@bruits/satteri-linux-x64-musl": ["@bruits/satteri-linux-x64-musl@0.10.5", "", { "os": "linux", "cpu": "x64", "libc": "musl" }, "sha512-EHpVAx2bqW3GINHTKkljtxVfQmVDGWIuwOYOP5YghTj+0PkBa2o8oKPRtQ9Kbsr1Fye8jtUcDjhwj2jMNugZKg=="],
+    "@astrojs/markdown-satteri/satteri/@bruits/satteri-linux-x64-musl": ["@bruits/satteri-linux-x64-musl@0.10.5", "", { "os": "linux", "cpu": "x64" }, "sha512-EHpVAx2bqW3GINHTKkljtxVfQmVDGWIuwOYOP5YghTj+0PkBa2o8oKPRtQ9Kbsr1Fye8jtUcDjhwj2jMNugZKg=="],
 
     "@astrojs/markdown-satteri/satteri/@bruits/satteri-wasm32-wasi": ["@bruits/satteri-wasm32-wasi@0.10.5", "", { "dependencies": { "@emnapi/core": "1.11.1", "@emnapi/runtime": "1.11.1", "@napi-rs/wasm-runtime": "^1.2.3" }, "cpu": "none" }, "sha512-ypz8c/Zmipxp4IoeDa228Gstv6TLzVmNs3yC6wKCoNSOjx1iwpgzu87Y3hTkXFdwChVGU85qeUDuOIarGUZQLw=="],
 
@@ -5622,17 +5623,17 @@
 
     "astro/rolldown/@rolldown/binding-linux-arm-gnueabihf": ["@rolldown/binding-linux-arm-gnueabihf@1.2.14", "", { "os": "linux", "cpu": "arm" }, "sha512-BqwKsdZQf6EqVWr8fv2MrDYzAvOZ7+NYFSJESRGs87fkseEhs0TU9TXgRJTkZoRRkxTizyEg1LKUXfU3/78uqg=="],
 
-    "astro/rolldown/@rolldown/binding-linux-arm64-gnu": ["@rolldown/binding-linux-arm64-gnu@1.2.14", "", { "os": "linux", "cpu": "arm64", "libc": "glibc" }, "sha512-SD9kY8M009x/7s57Z1dgUVlP5+uYBgKQK0Tkr1WIWngrtUJmRCW1RJFMY7QDla2khXhmg2i5Io7MUjcmZNZ/KQ=="],
+    "astro/rolldown/@rolldown/binding-linux-arm64-gnu": ["@rolldown/binding-linux-arm64-gnu@1.2.14", "", { "os": "linux", "cpu": "arm64" }, "sha512-SD9kY8M009x/7s57Z1dgUVlP5+uYBgKQK0Tkr1WIWngrtUJmRCW1RJFMY7QDla2khXhmg2i5Io7MUjcmZNZ/KQ=="],
 
-    "astro/rolldown/@rolldown/binding-linux-arm64-musl": ["@rolldown/binding-linux-arm64-musl@1.2.14", "", { "os": "linux", "cpu": "arm64", "libc": "musl" }, "sha512-BJ2CL19M6uuWesMgnqJzgxoI+N+eV7b0A9O9vLV42y+gitC41fNa8KElau1tHVzuLWX5GzEuxMPhAO0tQXQMkg=="],
+    "astro/rolldown/@rolldown/binding-linux-arm64-musl": ["@rolldown/binding-linux-arm64-musl@1.2.14", "", { "os": "linux", "cpu": "arm64" }, "sha512-BJ2CL19M6uuWesMgnqJzgxoI+N+eV7b0A9O9vLV42y+gitC41fNa8KElau1tHVzuLWX5GzEuxMPhAO0tQXQMkg=="],
 
-    "astro/rolldown/@rolldown/binding-linux-ppc64-gnu": ["@rolldown/binding-linux-ppc64-gnu@1.2.14", "", { "os": "linux", "cpu": "ppc64", "libc": "glibc" }, "sha512-4+Kl8daPV8NDHaD7mfCcc1pRM+Qg7ab8DyMm5FG5WoZgv4h2i3KFN1CybYBNbQqmuYm7ftJLvmMI1eHYJ22S/Q=="],
+    "astro/rolldown/@rolldown/binding-linux-ppc64-gnu": ["@rolldown/binding-linux-ppc64-gnu@1.2.14", "", { "os": "linux", "cpu": "ppc64" }, "sha512-4+Kl8daPV8NDHaD7mfCcc1pRM+Qg7ab8DyMm5FG5WoZgv4h2i3KFN1CybYBNbQqmuYm7ftJLvmMI1eHYJ22S/Q=="],
 
-    "astro/rolldown/@rolldown/binding-linux-s390x-gnu": ["@rolldown/binding-linux-s390x-gnu@1.2.14", "", { "os": "linux", "cpu": "s390x", "libc": "glibc" }, "sha512-V/h8ePq1fKDrmtFMz6xcCN3DKvuvMRrwwD1q0PkBeeo4DpK64biaKvqWGVxqCeYKqeRk7gE7/iKPxLCn08O97A=="],
+    "astro/rolldown/@rolldown/binding-linux-s390x-gnu": ["@rolldown/binding-linux-s390x-gnu@1.2.14", "", { "os": "linux", "cpu": "s390x" }, "sha512-V/h8ePq1fKDrmtFMz6xcCN3DKvuvMRrwwD1q0PkBeeo4DpK64biaKvqWGVxqCeYKqeRk7gE7/iKPxLCn08O97A=="],
 
-    "astro/rolldown/@rolldown/binding-linux-x64-gnu": ["@rolldown/binding-linux-x64-gnu@1.2.14", "", { "os": "linux", "cpu": "x64", "libc": "glibc" }, "sha512-WxalXzgrLVpKC93xfpaJ3gCXUWzeCr+FRCbDVD2mUAy4L6Vo3lNVz0epUEUpxPWJkLNYUwM4OSIikv36OJ9mLg=="],
+    "astro/rolldown/@rolldown/binding-linux-x64-gnu": ["@rolldown/binding-linux-x64-gnu@1.2.14", "", { "os": "linux", "cpu": "x64" }, "sha512-WxalXzgrLVpKC93xfpaJ3gCXUWzeCr+FRCbDVD2mUAy4L6Vo3lNVz0epUEUpxPWJkLNYUwM4OSIikv36OJ9mLg=="],
 
-    "astro/rolldown/@rolldown/binding-linux-x64-musl": ["@rolldown/binding-linux-x64-musl@1.2.14", "", { "os": "linux", "cpu": "x64", "libc": "musl" }, "sha512-3G3tnAmTpdk9jO3GQtyHXqeFD2SlecfTws/Y3M2mmj9nMBwwuLT4kur8sZKeu7ENUHSpVO3cIsm5A52LEWWwlg=="],
+    "astro/rolldown/@rolldown/binding-linux-x64-musl": ["@rolldown/binding-linux-x64-musl@1.2.14", "", { "os": "linux", "cpu": "x64" }, "sha512-3G3tnAmTpdk9jO3GQtyHXqeFD2SlecfTws/Y3M2mmj9nMBwwuLT4kur8sZKeu7ENUHSpVO3cIsm5A52LEWWwlg=="],
 
     "astro/rolldown/@rolldown/binding-openharmony-arm64": ["@rolldown/binding-openharmony-arm64@1.2.14", "", { "os": "none", "cpu": "arm64" }, "sha512-qyr5XiNGxm2ytx17vvtcJ9nXn6v1gENETi503bJx3OGwZ1tSonj7BosxbMa/xeAfSl5iS9X6KjEWYXLu6v1L7Q=="],
 
@@ -5752,17 +5753,17 @@
 
     "nitro/rolldown/@rolldown/binding-linux-arm-gnueabihf": ["@rolldown/binding-linux-arm-gnueabihf@1.2.14", "", { "os": "linux", "cpu": "arm" }, "sha512-BqwKsdZQf6EqVWr8fv2MrDYzAvOZ7+NYFSJESRGs87fkseEhs0TU9TXgRJTkZoRRkxTizyEg1LKUXfU3/78uqg=="],
 
-    "nitro/rolldown/@rolldown/binding-linux-arm64-gnu": ["@rolldown/binding-linux-arm64-gnu@1.2.14", "", { "os": "linux", "cpu": "arm64", "libc": "glibc" }, "sha512-SD9kY8M009x/7s57Z1dgUVlP5+uYBgKQK0Tkr1WIWngrtUJmRCW1RJFMY7QDla2khXhmg2i5Io7MUjcmZNZ/KQ=="],
+    "nitro/rolldown/@rolldown/binding-linux-arm64-gnu": ["@rolldown/binding-linux-arm64-gnu@1.2.14", "", { "os": "linux", "cpu": "arm64" }, "sha512-SD9kY8M009x/7s57Z1dgUVlP5+uYBgKQK0Tkr1WIWngrtUJmRCW1RJFMY7QDla2khXhmg2i5Io7MUjcmZNZ/KQ=="],
 
-    "nitro/rolldown/@rolldown/binding-linux-arm64-musl": ["@rolldown/binding-linux-arm64-musl@1.2.14", "", { "os": "linux", "cpu": "arm64", "libc": "musl" }, "sha512-BJ2CL19M6uuWesMgnqJzgxoI+N+eV7b0A9O9vLV42y+gitC41fNa8KElau1tHVzuLWX5GzEuxMPhAO0tQXQMkg=="],
+    "nitro/rolldown/@rolldown/binding-linux-arm64-musl": ["@rolldown/binding-linux-arm64-musl@1.2.14", "", { "os": "linux", "cpu": "arm64" }, "sha512-BJ2CL19M6uuWesMgnqJzgxoI+N+eV7b0A9O9vLV42y+gitC41fNa8KElau1tHVzuLWX5GzEuxMPhAO0tQXQMkg=="],
 
-    "nitro/rolldown/@rolldown/binding-linux-ppc64-gnu": ["@rolldown/binding-linux-ppc64-gnu@1.2.14", "", { "os": "linux", "cpu": "ppc64", "libc": "glibc" }, "sha512-4+Kl8daPV8NDHaD7mfCcc1pRM+Qg7ab8DyMm5FG5WoZgv4h2i3KFN1CybYBNbQqmuYm7ftJLvmMI1eHYJ22S/Q=="],
+    "nitro/rolldown/@rolldown/binding-linux-ppc64-gnu": ["@rolldown/binding-linux-ppc64-gnu@1.2.14", "", { "os": "linux", "cpu": "ppc64" }, "sha512-4+Kl8daPV8NDHaD7mfCcc1pRM+Qg7ab8DyMm5FG5WoZgv4h2i3KFN1CybYBNbQqmuYm7ftJLvmMI1eHYJ22S/Q=="],
 
-    "nitro/rolldown/@rolldown/binding-linux-s390x-gnu": ["@rolldown/binding-linux-s390x-gnu@1.2.14", "", { "os": "linux", "cpu": "s390x", "libc": "glibc" }, "sha512-V/h8ePq1fKDrmtFMz6xcCN3DKvuvMRrwwD1q0PkBeeo4DpK64biaKvqWGVxqCeYKqeRk7gE7/iKPxLCn08O97A=="],
+    "nitro/rolldown/@rolldown/binding-linux-s390x-gnu": ["@rolldown/binding-linux-s390x-gnu@1.2.14", "", { "os": "linux", "cpu": "s390x" }, "sha512-V/h8ePq1fKDrmtFMz6xcCN3DKvuvMRrwwD1q0PkBeeo4DpK64biaKvqWGVxqCeYKqeRk7gE7/iKPxLCn08O97A=="],
 
-    "nitro/rolldown/@rolldown/binding-linux-x64-gnu": ["@rolldown/binding-linux-x64-gnu@1.2.14", "", { "os": "linux", "cpu": "x64", "libc": "glibc" }, "sha512-WxalXzgrLVpKC93xfpaJ3gCXUWzeCr+FRCbDVD2mUAy4L6Vo3lNVz0epUEUpxPWJkLNYUwM4OSIikv36OJ9mLg=="],
+    "nitro/rolldown/@rolldown/binding-linux-x64-gnu": ["@rolldown/binding-linux-x64-gnu@1.2.14", "", { "os": "linux", "cpu": "x64" }, "sha512-WxalXzgrLVpKC93xfpaJ3gCXUWzeCr+FRCbDVD2mUAy4L6Vo3lNVz0epUEUpxPWJkLNYUwM4OSIikv36OJ9mLg=="],
 
-    "nitro/rolldown/@rolldown/binding-linux-x64-musl": ["@rolldown/binding-linux-x64-musl@1.2.14", "", { "os": "linux", "cpu": "x64", "libc": "musl" }, "sha512-3G3tnAmTpdk9jO3GQtyHXqeFD2SlecfTws/Y3M2mmj9nMBwwuLT4kur8sZKeu7ENUHSpVO3cIsm5A52LEWWwlg=="],
+    "nitro/rolldown/@rolldown/binding-linux-x64-musl": ["@rolldown/binding-linux-x64-musl@1.2.14", "", { "os": "linux", "cpu": "x64" }, "sha512-3G3tnAmTpdk9jO3GQtyHXqeFD2SlecfTws/Y3M2mmj9nMBwwuLT4kur8sZKeu7ENUHSpVO3cIsm5A52LEWWwlg=="],
 
     "nitro/rolldown/@rolldown/binding-openharmony-arm64": ["@rolldown/binding-openharmony-arm64@1.2.14", "", { "os": "none", "cpu": "arm64" }, "sha512-qyr5XiNGxm2ytx17vvtcJ9nXn6v1gENETi503bJx3OGwZ1tSonj7BosxbMa/xeAfSl5iS9X6KjEWYXLu6v1L7Q=="],
 
@@ -5878,17 +5879,17 @@
 
     "@astrojs/solid-js/vite/rolldown/@rolldown/binding-linux-arm-gnueabihf": ["@rolldown/binding-linux-arm-gnueabihf@1.2.14", "", { "os": "linux", "cpu": "arm" }, "sha512-BqwKsdZQf6EqVWr8fv2MrDYzAvOZ7+NYFSJESRGs87fkseEhs0TU9TXgRJTkZoRRkxTizyEg1LKUXfU3/78uqg=="],
 
-    "@astrojs/solid-js/vite/rolldown/@rolldown/binding-linux-arm64-gnu": ["@rolldown/binding-linux-arm64-gnu@1.2.14", "", { "os": "linux", "cpu": "arm64", "libc": "glibc" }, "sha512-SD9kY8M009x/7s57Z1dgUVlP5+uYBgKQK0Tkr1WIWngrtUJmRCW1RJFMY7QDla2khXhmg2i5Io7MUjcmZNZ/KQ=="],
+    "@astrojs/solid-js/vite/rolldown/@rolldown/binding-linux-arm64-gnu": ["@rolldown/binding-linux-arm64-gnu@1.2.14", "", { "os": "linux", "cpu": "arm64" }, "sha512-SD9kY8M009x/7s57Z1dgUVlP5+uYBgKQK0Tkr1WIWngrtUJmRCW1RJFMY7QDla2khXhmg2i5Io7MUjcmZNZ/KQ=="],
 
-    "@astrojs/solid-js/vite/rolldown/@rolldown/binding-linux-arm64-musl": ["@rolldown/binding-linux-arm64-musl@1.2.14", "", { "os": "linux", "cpu": "arm64", "libc": "musl" }, "sha512-BJ2CL19M6uuWesMgnqJzgxoI+N+eV7b0A9O9vLV42y+gitC41fNa8KElau1tHVzuLWX5GzEuxMPhAO0tQXQMkg=="],
+    "@astrojs/solid-js/vite/rolldown/@rolldown/binding-linux-arm64-musl": ["@rolldown/binding-linux-arm64-musl@1.2.14", "", { "os": "linux", "cpu": "arm64" }, "sha512-BJ2CL19M6uuWesMgnqJzgxoI+N+eV7b0A9O9vLV42y+gitC41fNa8KElau1tHVzuLWX5GzEuxMPhAO0tQXQMkg=="],
 
-    "@astrojs/solid-js/vite/rolldown/@rolldown/binding-linux-ppc64-gnu": ["@rolldown/binding-linux-ppc64-gnu@1.2.14", "", { "os": "linux", "cpu": "ppc64", "libc": "glibc" }, "sha512-4+Kl8daPV8NDHaD7mfCcc1pRM+Qg7ab8DyMm5FG5WoZgv4h2i3KFN1CybYBNbQqmuYm7ftJLvmMI1eHYJ22S/Q=="],
+    "@astrojs/solid-js/vite/rolldown/@rolldown/binding-linux-ppc64-gnu": ["@rolldown/binding-linux-ppc64-gnu@1.2.14", "", { "os": "linux", "cpu": "ppc64" }, "sha512-4+Kl8daPV8NDHaD7mfCcc1pRM+Qg7ab8DyMm5FG5WoZgv4h2i3KFN1CybYBNbQqmuYm7ftJLvmMI1eHYJ22S/Q=="],
 
-    "@astrojs/solid-js/vite/rolldown/@rolldown/binding-linux-s390x-gnu": ["@rolldown/binding-linux-s390x-gnu@1.2.14", "", { "os": "linux", "cpu": "s390x", "libc": "glibc" }, "sha512-V/h8ePq1fKDrmtFMz6xcCN3DKvuvMRrwwD1q0PkBeeo4DpK64biaKvqWGVxqCeYKqeRk7gE7/iKPxLCn08O97A=="],
+    "@astrojs/solid-js/vite/rolldown/@rolldown/binding-linux-s390x-gnu": ["@rolldown/binding-linux-s390x-gnu@1.2.14", "", { "os": "linux", "cpu": "s390x" }, "sha512-V/h8ePq1fKDrmtFMz6xcCN3DKvuvMRrwwD1q0PkBeeo4DpK64biaKvqWGVxqCeYKqeRk7gE7/iKPxLCn08O97A=="],
 
-    "@astrojs/solid-js/vite/rolldown/@rolldown/binding-linux-x64-gnu": ["@rolldown/binding-linux-x64-gnu@1.2.14", "", { "os": "linux", "cpu": "x64", "libc": "glibc" }, "sha512-WxalXzgrLVpKC93xfpaJ3gCXUWzeCr+FRCbDVD2mUAy4L6Vo3lNVz0epUEUpxPWJkLNYUwM4OSIikv36OJ9mLg=="],
+    "@astrojs/solid-js/vite/rolldown/@rolldown/binding-linux-x64-gnu": ["@rolldown/binding-linux-x64-gnu@1.2.14", "", { "os": "linux", "cpu": "x64" }, "sha512-WxalXzgrLVpKC93xfpaJ3gCXUWzeCr+FRCbDVD2mUAy4L6Vo3lNVz0epUEUpxPWJkLNYUwM4OSIikv36OJ9mLg=="],
 
-    "@astrojs/solid-js/vite/rolldown/@rolldown/binding-linux-x64-musl": ["@rolldown/binding-linux-x64-musl@1.2.14", "", { "os": "linux", "cpu": "x64", "libc": "musl" }, "sha512-3G3tnAmTpdk9jO3GQtyHXqeFD2SlecfTws/Y3M2mmj9nMBwwuLT4kur8sZKeu7ENUHSpVO3cIsm5A52LEWWwlg=="],
+    "@astrojs/solid-js/vite/rolldown/@rolldown/binding-linux-x64-musl": ["@rolldown/binding-linux-x64-musl@1.2.14", "", { "os": "linux", "cpu": "x64" }, "sha512-3G3tnAmTpdk9jO3GQtyHXqeFD2SlecfTws/Y3M2mmj9nMBwwuLT4kur8sZKeu7ENUHSpVO3cIsm5A52LEWWwlg=="],
 
     "@astrojs/solid-js/vite/rolldown/@rolldown/binding-openharmony-arm64": ["@rolldown/binding-openharmony-arm64@1.2.14", "", { "os": "none", "cpu": "arm64" }, "sha512-qyr5XiNGxm2ytx17vvtcJ9nXn6v1gENETi503bJx3OGwZ1tSonj7BosxbMa/xeAfSl5iS9X6KjEWYXLu6v1L7Q=="],
 
@@ -5902,13 +5903,13 @@
 
     "@astrojs/starlight/@astrojs/markdown-satteri/satteri/@bruits/satteri-darwin-x64": ["@bruits/satteri-darwin-x64@0.10.5", "", { "os": "darwin", "cpu": "x64" }, "sha512-IjnLe3nKspq6qaeqGgjT7MT8VrTV74yWRlaag7ZdNsI8TDAYZ0iPxMCo+9KQZHUk5EyVB+reBI/PFWL5KuFw9Q=="],
 
-    "@astrojs/starlight/@astrojs/markdown-satteri/satteri/@bruits/satteri-linux-arm64-gnu": ["@bruits/satteri-linux-arm64-gnu@0.10.5", "", { "os": "linux", "cpu": "arm64", "libc": "glibc" }, "sha512-glkYXZCJywjP13v67eAyAMSJdF+ncvEbYvgi/wOtffL9tQ27lr/zsyzUfgs+ovjJ9d8JNQKiXeiArJcX8PJL9w=="],
+    "@astrojs/starlight/@astrojs/markdown-satteri/satteri/@bruits/satteri-linux-arm64-gnu": ["@bruits/satteri-linux-arm64-gnu@0.10.5", "", { "os": "linux", "cpu": "arm64" }, "sha512-glkYXZCJywjP13v67eAyAMSJdF+ncvEbYvgi/wOtffL9tQ27lr/zsyzUfgs+ovjJ9d8JNQKiXeiArJcX8PJL9w=="],
 
-    "@astrojs/starlight/@astrojs/markdown-satteri/satteri/@bruits/satteri-linux-arm64-musl": ["@bruits/satteri-linux-arm64-musl@0.10.5", "", { "os": "linux", "cpu": "arm64", "libc": "musl" }, "sha512-yWdgG1g17Nh2QyGVlFUxGRa3FEFwiMcpZEyMNWkbM3deC94cmVc+/i9OuyFpdKuWo3GkgoCtYVOoxk1uCnCZIA=="],
+    "@astrojs/starlight/@astrojs/markdown-satteri/satteri/@bruits/satteri-linux-arm64-musl": ["@bruits/satteri-linux-arm64-musl@0.10.5", "", { "os": "linux", "cpu": "arm64" }, "sha512-yWdgG1g17Nh2QyGVlFUxGRa3FEFwiMcpZEyMNWkbM3deC94cmVc+/i9OuyFpdKuWo3GkgoCtYVOoxk1uCnCZIA=="],
 
-    "@astrojs/starlight/@astrojs/markdown-satteri/satteri/@bruits/satteri-linux-x64-gnu": ["@bruits/satteri-linux-x64-gnu@0.10.5", "", { "os": "linux", "cpu": "x64", "libc": "glibc" }, "sha512-FVaLoPT1fBgGl0J+AYebyyXJYBachGl8Oyyrf1lye4RTqCB4S0Gwkj1uM9RJyThUOvx5VUmAT1CnNh1SFHA+kw=="],
+    "@astrojs/starlight/@astrojs/markdown-satteri/satteri/@bruits/satteri-linux-x64-gnu": ["@bruits/satteri-linux-x64-gnu@0.10.5", "", { "os": "linux", "cpu": "x64" }, "sha512-FVaLoPT1fBgGl0J+AYebyyXJYBachGl8Oyyrf1lye4RTqCB4S0Gwkj1uM9RJyThUOvx5VUmAT1CnNh1SFHA+kw=="],
 
-    "@astrojs/starlight/@astrojs/markdown-satteri/satteri/@bruits/satteri-linux-x64-musl": ["@bruits/satteri-linux-x64-musl@0.10.5", "", { "os": "linux", "cpu": "x64", "libc": "musl" }, "sha512-EHpVAx2bqW3GINHTKkljtxVfQmVDGWIuwOYOP5YghTj+0PkBa2o8oKPRtQ9Kbsr1Fye8jtUcDjhwj2jMNugZKg=="],
+    "@astrojs/starlight/@astrojs/markdown-satteri/satteri/@bruits/satteri-linux-x64-musl": ["@bruits/satteri-linux-x64-musl@0.10.5", "", { "os": "linux", "cpu": "x64" }, "sha512-EHpVAx2bqW3GINHTKkljtxVfQmVDGWIuwOYOP5YghTj+0PkBa2o8oKPRtQ9Kbsr1Fye8jtUcDjhwj2jMNugZKg=="],
 
     "@astrojs/starlight/@astrojs/markdown-satteri/satteri/@bruits/satteri-wasm32-wasi": ["@bruits/satteri-wasm32-wasi@0.10.5", "", { "dependencies": { "@emnapi/core": "1.11.1", "@emnapi/runtime": "1.11.1", "@napi-rs/wasm-runtime": "^1.2.3" }, "cpu": "none" }, "sha512-ypz8c/Zmipxp4IoeDa228Gstv6TLzVmNs3yC6wKCoNSOjx1iwpgzu87Y3hTkXFdwChVGU85qeUDuOIarGUZQLw=="],
 
diff --git a/package.json b/package.json
index 03a0fb46c051..9f103c577e2a 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "$schema": "https://json.schemastore.org/package.json",
   "name": "opencode",
   "description": "AI-powered development tool",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "private": true,
   "type": "module",
   "packageManager": "bun@1.4.4",
@@ -183,6 +183,7 @@
     "electron-updater@6.8.9": "patches/electron-updater@6.8.9.patch",
     "@pierre/trees@1.0.0-beta.6": "patches/@pierre%2Ftrees@1.0.0-beta.6.patch",
     "@opentunnel/client@0.6.1": "patches/@opentunnel%2Fclient@0.6.1.patch",
-    "@opentunnel/protocol@0.6.1": "patches/@opentunnel%2Fprotocol@0.6.1.patch"
+    "@opentunnel/protocol@0.6.1": "patches/@opentunnel%2Fprotocol@0.6.1.patch",
+    "@brendonovich/vite-plugin-opencode@0.1.3": "patches/@brendonovich%2Fvite-plugin-opencode@0.1.3.patch"
   }
 }
diff --git a/packages/ai/package.json b/packages/ai/package.json
index c9354d71b25e..fd8bf980601d 100644
--- a/packages/ai/package.json
+++ b/packages/ai/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "name": "@opencode/ai",
   "type": "module",
   "license": "MIT",
diff --git a/packages/ai/src/protocols/anthropic-messages.ts b/packages/ai/src/protocols/anthropic-messages.ts
index 36eb59151acc..eb98402e373a 100644
--- a/packages/ai/src/protocols/anthropic-messages.ts
+++ b/packages/ai/src/protocols/anthropic-messages.ts
@@ -864,6 +864,7 @@ const requireThinkingSignature = (request: LLMRequest) => {
   )
     return false
   if (provider.includes("xiaomi") || model.includes("mimo") || baseURL.includes("xiaomimimo.com")) return false
+  if (model.startsWith("qwen") || model.startsWith("minimax-")) return false
   return true
 }
 
@@ -992,19 +993,9 @@ const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest, breakpoi
             continue
           }
           if (!signature || signature.trim().length === 0) {
-            if (part.text.trim().length === 0) continue
-            if (!requireThinkingSignature(request)) {
+            if (part.text.trim().length > 0 && !requireThinkingSignature(request)) {
               content.push({ type: "thinking", thinking: part.text, signature: "" })
-              continue
             }
-            // Without a signature this cannot be a valid thinking block per
-            // the SDK ThinkingBlockParam:3217 — demote to text so the
-            // conversation remains sendable.
-            content.push({
-              type: "text",
-              text: part.text,
-              cache_control: cacheControl(breakpoints, part.cache),
-            })
             continue
           }
           content.push({ type: "thinking", thinking: part.text, signature })
diff --git a/packages/ai/src/protocols/bedrock-converse.ts b/packages/ai/src/protocols/bedrock-converse.ts
index 8cdc5d897b06..758e7d8cf0ac 100644
--- a/packages/ai/src/protocols/bedrock-converse.ts
+++ b/packages/ai/src/protocols/bedrock-converse.ts
@@ -456,12 +456,7 @@ const lowerMessages = Effect.fnUntraced(function* (
             content.push({ reasoningContent: { redactedContent: redactedData } })
             continue
           }
-          if (signature === undefined || signature.trim().length === 0) {
-            // Interrupted streams and model switches can leave unsigned reasoning.
-            // Preserve readable history as text rather than replay invalid reasoningContent.
-            if (part.text.trim().length > 0) content.push(...textWithCache(breakpoints, part.text, part.cache))
-            continue
-          }
+          if (signature === undefined || signature.trim().length === 0) continue
           content.push({ reasoningContent: { reasoningText: { text: part.text, signature } } })
           continue
         }
diff --git a/packages/ai/src/protocols/gemini.ts b/packages/ai/src/protocols/gemini.ts
index ba5d67aa5ca8..327b42934f22 100644
--- a/packages/ai/src/protocols/gemini.ts
+++ b/packages/ai/src/protocols/gemini.ts
@@ -32,22 +32,12 @@ import { Lifecycle } from "./utils/lifecycle.js"
 
 const ADAPTER = "gemini"
 const CONTINUATION = "CONTINUATION"
-// Google documents this sentinel for replaying Gemini 3 function calls after their original signature was lost.
+// Google documents this sentinel for replaying function calls after their original signature was lost.
 const SKIP_THOUGHT_SIGNATURE_VALIDATOR = "skip_thought_signature_validator"
 // Gemini 2.5 rejects a budget under the model's minimum: 512 on Flash-Lite, the highest, and 128 on Pro.
 const MIN_THINKING_BUDGET = 512
 export const DEFAULT_BASE_URL = "https://generativelanguage.googleapis.com/v1beta"
 
-// Gemini 3 rejects replayed function calls without a thought signature. Google's SDKs avoid that in normal chats by
-// retaining complete model responses, but OpenCode reconstructs durable history and may encounter an unsigned call
-// from an older or external session. Model IDs are open-ended, so unknown Gemini aliases inherit current behavior.
-const requiresThoughtSignatureFallback = (modelID: string) => {
-  if (!/(^|\/)gemini-/i.test(modelID)) return false
-  if (/(^|\/)gemini-(?:1|2)(?:[.-]|$)/i.test(modelID)) return false
-  if (/(^|\/)gemini-pro(?:-vision)?$/i.test(modelID)) return false
-  return !/(^|\/)gemini-robotics-er-1\.5(?:[.-]|$)/i.test(modelID)
-}
-
 // Gemini 3 accepts media nested inside function responses; matched Gemini 2.5 variants reject it,
 // so their tool-result attachments lower as a separate user turn instead.
 const routesLegacyToolMedia = (modelID: string) => /gemini-2[.-]5(?:[.-]|$)/i.test(modelID)
@@ -390,11 +380,7 @@ const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest) {
           const signature = lowered.thoughtSignature
           parts.push({
             ...lowered,
-            thoughtSignature:
-              signature ??
-              (requiresThoughtSignatureFallback(request.model.id) && !hasSignedToolCall
-                ? SKIP_THOUGHT_SIGNATURE_VALIDATOR
-                : undefined),
+            thoughtSignature: signature ?? (!hasSignedToolCall ? SKIP_THOUGHT_SIGNATURE_VALIDATOR : undefined),
           })
           if (signature !== undefined) hasSignedToolCall = true
           continue
diff --git a/packages/ai/src/protocols/google-interactions.ts b/packages/ai/src/protocols/google-interactions.ts
index a04083fd0783..24d2179afb19 100644
--- a/packages/ai/src/protocols/google-interactions.ts
+++ b/packages/ai/src/protocols/google-interactions.ts
@@ -23,6 +23,7 @@ import { GeminiGenerateContent } from "./utils/gemini-generate-content.js"
 import { ToolStream } from "./utils/tool-stream.js"
 
 const ADAPTER = "google-interactions"
+const SKIP_THOUGHT_SIGNATURE_VALIDATOR = "skip_thought_signature_validator"
 export const DEFAULT_BASE_URL = "https://generativelanguage.googleapis.com/v1beta"
 
 // =============================================================================
@@ -259,6 +260,7 @@ const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest) {
         steps[steps.length - 1] = { type, content: [...last.content, content] }
       else steps.push({ type, content: [content] })
     }
+    let hasSignedStep = false
     for (const part of message.content) {
       if (message.role === "tool") {
         if (part.type !== "tool-result")
@@ -281,21 +283,25 @@ const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest) {
         continue
       }
       if (message.role === "assistant" && part.type === "reasoning") {
+        const thoughtSignature = signature(part.providerMetadata, key)
         steps.push({
           type: "thought",
-          signature: signature(part.providerMetadata, key),
+          signature: thoughtSignature,
           summary: part.text ? [{ type: "text", text: part.text }] : undefined,
         })
+        if (thoughtSignature !== undefined) hasSignedStep = true
         continue
       }
       if (message.role === "assistant" && part.type === "tool-call") {
+        const toolSignature = signature(part.providerMetadata, key)
         steps.push({
           type: "function_call",
           id: part.id,
           name: part.name,
           arguments: part.input,
-          signature: signature(part.providerMetadata, key),
+          signature: toolSignature ?? (!hasSignedStep ? SKIP_THOUGHT_SIGNATURE_VALIDATOR : undefined),
         })
+        if (toolSignature !== undefined) hasSignedStep = true
         continue
       }
       return yield* ProviderShared.unsupportedContent(
diff --git a/packages/ai/src/protocols/mistral-chat.ts b/packages/ai/src/protocols/mistral-chat.ts
index 284aad73a181..362fa64bb41b 100644
--- a/packages/ai/src/protocols/mistral-chat.ts
+++ b/packages/ai/src/protocols/mistral-chat.ts
@@ -254,7 +254,6 @@ const lowerToolCall = (part: ToolCallPart, normalizeID: (id: string) => string):
 const lowerAssistant = Effect.fnUntraced(function* (
   message: LLMRequest["messages"][number],
   normalizeID: (id: string) => string,
-  prefix: boolean,
 ) {
   const structured = message.content.some(
     (part) => part.type === "reasoning" && isMistralThinkingContent(part.providerMetadata?.mistral?.thinking),
@@ -271,8 +270,6 @@ const lowerAssistant = Effect.fnUntraced(function* (
     if (part.type === "reasoning") {
       const native = part.providerMetadata?.mistral?.thinking
       if (structured && isMistralThinkingContent(native)) content.push(native)
-      else if (structured) content.push({ type: "text", text: part.text })
-      else text.push(part.text)
       continue
     }
     if (part.type === "tool-call") {
@@ -285,7 +282,6 @@ const lowerAssistant = Effect.fnUntraced(function* (
     role: "assistant" as const,
     content: structured ? content : text.join(""),
     ...(toolCalls.length > 0 ? { tool_calls: toolCalls } : {}),
-    ...(prefix ? { prefix: true as const } : {}),
   }
 })
 
@@ -361,15 +357,17 @@ const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest) {
       const hasNativeThinking = message.content.some(
         (part) => part.type === "reasoning" && isMistralThinkingContent(part.providerMetadata?.mistral?.thinking),
       )
-      const text = message.content
-        .flatMap((part) => (part.type === "text" || part.type === "reasoning" ? [part.text] : []))
-        .join("")
+      const text = message.content.flatMap((part) => (part.type === "text" ? [part.text] : [])).join("")
       if (!hasToolCalls && !hasNativeThinking && text.trim() === "") continue
-      messages.push(yield* lowerAssistant(message, normalizeID, !hasToolCalls && message === request.messages.at(-1)))
+      messages.push(yield* lowerAssistant(message, normalizeID))
       continue
     }
     messages.push(...(yield* lowerToolResults(message, normalizeID)))
   }
+  const trailing = messages.at(-1)
+  if (trailing?.role === "assistant" && !trailing.tool_calls) {
+    messages[messages.length - 1] = { ...trailing, prefix: true }
+  }
   return messages
 })
 
diff --git a/packages/ai/src/provider-error.ts b/packages/ai/src/provider-error.ts
index e9c697c8e726..c85dc115b5f2 100644
--- a/packages/ai/src/provider-error.ts
+++ b/packages/ai/src/provider-error.ts
@@ -42,6 +42,8 @@ const patterns = [
   // Hugging Face Text Generation Inference, e.g. Together
   /`inputs` tokens \+ `max_new_tokens` must be <= \d+/i,
   /context window exceeds limit/i,
+  // LiteLLM's ContextWindowExceededError
+  /context window exceeded/i,
   /exceeded model token limit/i,
   /context[_ ]length[_ ]exceeded/i,
   /context length is only \d+ tokens/i,
diff --git a/packages/ai/src/providers/meta.ts b/packages/ai/src/providers/meta.ts
index eecbb8125479..13fac64f3b4f 100644
--- a/packages/ai/src/providers/meta.ts
+++ b/packages/ai/src/providers/meta.ts
@@ -138,7 +138,6 @@ export const configure = (input: Config = {}) => {
   const messages = (modelID: string | ModelID) =>
     configuredMessages.model<MessagesOptionsInput>({
       id: modelID,
-      compatibility: { requireSignature: false },
     })
   const media = MediaRoute.deployment(input, options.auth)
   const image = (modelID: string | ModelID) => MetaImages.model({ ...media, id: modelID })
diff --git a/packages/ai/src/providers/minimax.ts b/packages/ai/src/providers/minimax.ts
index 18c69016199c..ec5d77e7333b 100644
--- a/packages/ai/src/providers/minimax.ts
+++ b/packages/ai/src/providers/minimax.ts
@@ -117,7 +117,10 @@ export const configure = (input: Config = {}) => {
     auth,
   }
   const messages = (modelID: string | ModelID) =>
-    messagesRoute.with(defaults).model<MessagesOptionsInput>({ id: modelID })
+    messagesRoute.with(defaults).model<MessagesOptionsInput>({
+      id: modelID,
+      compatibility: { requireSignature: false },
+    })
   const chat = (modelID: string | ModelID) =>
     chatRoute.with(defaults).model<ChatOptionsInput>({
       id: modelID,
diff --git a/packages/ai/test/provider-error.test.ts b/packages/ai/test/provider-error.test.ts
index 228f6afc533d..89b959e518ef 100644
--- a/packages/ai/test/provider-error.test.ts
+++ b/packages/ai/test/provider-error.test.ts
@@ -21,6 +21,8 @@ describe("provider error classification", () => {
       "Prompt exceeds max length",
       "The input is too long for the selected model.",
       "This text request is too large for the model's configured input limit.",
+      // LiteLLM's own check, before it calls the model.
+      "litellm.ContextWindowExceededError: litellm.BadRequestError: litellm._pre_call_checks: Context Window exceeded for given call. No models have context window large enough for this call.",
     ]
 
     expect(messages.every(isContextOverflow)).toBe(true)
diff --git a/packages/ai/test/provider/anthropic-messages.test.ts b/packages/ai/test/provider/anthropic-messages.test.ts
index 3dd67aa7b841..111eb09f5cf7 100644
--- a/packages/ai/test/provider/anthropic-messages.test.ts
+++ b/packages/ai/test/provider/anthropic-messages.test.ts
@@ -1246,13 +1246,11 @@ describe("Anthropic Messages route", () => {
     }),
   )
 
-  it.effect("demotes unsigned reasoning when signatures are required", () =>
+  it.effect("drops unsigned reasoning when signatures are required", () =>
     Effect.gen(function* () {
       const prepared = yield* compileUnsignedReasoning(model)
 
-      expect(prepared.body.messages).toEqual([
-        { role: "assistant", content: [{ type: "text", text: "unsigned reasoning" }] },
-      ])
+      expect(prepared.body.messages).toEqual([])
     }),
   )
 
@@ -1272,19 +1270,19 @@ describe("Anthropic Messages route", () => {
         .model({ id: "kimi-k2.6" })
       const codingPrepared = yield* compileUnsignedReasoning(coding.model({ id: "k3" }))
       const moonshotPrepared = yield* compileUnsignedReasoning(moonshot)
+      const qwenPrepared = yield* compileUnsignedReasoning(coding.with({ provider: "opencode" }).model({ id: "qwen3.8-flash" }))
+      const minimaxPrepared = yield* compileUnsignedReasoning(
+        coding.with({ provider: "opencode-go" }).model({ id: "minimax-m3" }),
+      )
 
-      expect(codingPrepared.body.messages).toEqual([
-        {
-          role: "assistant",
-          content: [{ type: "thinking", thinking: "unsigned reasoning", signature: "" }],
-        },
-      ])
-      expect(moonshotPrepared.body.messages).toEqual([
-        {
-          role: "assistant",
-          content: [{ type: "thinking", thinking: "unsigned reasoning", signature: "" }],
-        },
-      ])
+      for (const prepared of [codingPrepared, moonshotPrepared, qwenPrepared, minimaxPrepared]) {
+        expect(prepared.body.messages).toEqual([
+          {
+            role: "assistant",
+            content: [{ type: "thinking", thinking: "unsigned reasoning", signature: "" }],
+          },
+        ])
+      }
     }),
   )
 
@@ -1299,9 +1297,7 @@ describe("Anthropic Messages route", () => {
         .model({ id: "k3", compatibility: { requireSignature: true } })
       const prepared = yield* compileUnsignedReasoning(compatible)
 
-      expect(prepared.body.messages).toEqual([
-        { role: "assistant", content: [{ type: "text", text: "unsigned reasoning" }] },
-      ])
+      expect(prepared.body.messages).toEqual([])
     }),
   )
 
diff --git a/packages/ai/test/provider/bedrock-converse-cache.test.ts b/packages/ai/test/provider/bedrock-converse-cache.test.ts
index 3ec178fdcec5..263ebd3b7772 100644
--- a/packages/ai/test/provider/bedrock-converse-cache.test.ts
+++ b/packages/ai/test/provider/bedrock-converse-cache.test.ts
@@ -61,7 +61,7 @@ describe("Bedrock Converse cache policy", () => {
               { role: "user", content: [{ text: "Question" }, { text: "<system-update>\nUpdate\n</system-update>" }] },
               {
                 role: "assistant",
-                content: [{ text: "Answer" }, { text: "Unsigned reasoning" }, { toolUse: { name: "lookup" } }],
+                content: [{ text: "Answer" }, { toolUse: { name: "lookup" } }],
               },
               { role: "user", content: [{ toolResult: { content: [{ json: "Result" }] } }] },
             ],
diff --git a/packages/ai/test/provider/bedrock-converse.test.ts b/packages/ai/test/provider/bedrock-converse.test.ts
index c895ba159bd0..4a0b6f72f63b 100644
--- a/packages/ai/test/provider/bedrock-converse.test.ts
+++ b/packages/ai/test/provider/bedrock-converse.test.ts
@@ -1416,7 +1416,7 @@ describe("Bedrock Converse route", () => {
 
   for (const signature of [undefined, "", "   "]) {
     for (const cache of ["none", "auto"] as const) {
-      it.effect(`demotes unsigned reasoning to text (${JSON.stringify(signature)}, cache: ${cache})`, () =>
+      it.effect(`drops unsigned reasoning (${JSON.stringify(signature)}, cache: ${cache})`, () =>
         Effect.gen(function* () {
           const prepared = yield* compileRequest(
             ai.request({
@@ -1436,10 +1436,15 @@ describe("Bedrock Converse route", () => {
               cache,
             }),
           )
-          expect(prepared.body.messages[1]).toEqual({
-            role: "assistant",
-            content: [{ text: "Partial thought" }, { cachePoint: { type: "default" } }],
-          })
+          expect(prepared.body.messages).toEqual([
+            {
+              role: "user",
+              content:
+                cache === "auto"
+                  ? [{ text: "Think" }, { text: "Continue" }, { cachePoint: { type: "default" } }]
+                  : [{ text: "Think" }, { text: "Continue" }],
+            },
+          ])
         }),
       )
     }
@@ -1471,7 +1476,7 @@ describe("Bedrock Converse route", () => {
     }),
   )
 
-  it.effect("demotes foreign reasoning while preserving signed, redacted, text, and tool blocks", () =>
+  it.effect("drops foreign reasoning while preserving signed, redacted, text, and tool blocks", () =>
     Effect.gen(function* () {
       const cache = new CacheHint({ type: "ephemeral" })
       const prepared = yield* compileRequest(
@@ -1500,7 +1505,6 @@ describe("Bedrock Converse route", () => {
         {
           role: "assistant",
           content: [
-            { text: "Foreign thought" },
             { reasoningContent: { reasoningText: { text: "Signed thought", signature: "sig_1" } } },
             { reasoningContent: { reasoningText: { text: "", signature: "sig_2" } } },
             { reasoningContent: { redactedContent: "cmVkYWN0ZWQ=" } },
diff --git a/packages/ai/test/provider/gemini.test.ts b/packages/ai/test/provider/gemini.test.ts
index a408907e80e4..967d28fa8790 100644
--- a/packages/ai/test/provider/gemini.test.ts
+++ b/packages/ai/test/provider/gemini.test.ts
@@ -175,7 +175,12 @@ describe("Gemini route", () => {
       expect(prepared.body.contents).toEqual([
         {
           role: "model",
-          parts: [{ functionCall: { name: "lookup", args: { query: "weather" } } }],
+          parts: [
+            {
+              functionCall: { name: "lookup", args: { query: "weather" } },
+              thoughtSignature: "skip_thought_signature_validator",
+            },
+          ],
         },
         {
           role: "user",
@@ -219,8 +224,14 @@ describe("Gemini route", () => {
         {
           role: "model",
           parts: [
-            { functionCall: { name: "lookup", args: { query: "weather" } } },
-            { functionCall: { name: "lookup", args: { query: "time" } } },
+            {
+              functionCall: { name: "lookup", args: { query: "weather" } },
+              thoughtSignature: "skip_thought_signature_validator",
+            },
+            {
+              functionCall: { name: "lookup", args: { query: "time" } },
+              thoughtSignature: "skip_thought_signature_validator",
+            },
           ],
         },
         {
@@ -302,7 +313,15 @@ describe("Gemini route", () => {
       )
 
       expect(legacy.body.contents).toEqual([
-        { role: "model", parts: [{ functionCall: { name: "lookup", args: { query: "weather" } } }] },
+        {
+          role: "model",
+          parts: [
+            {
+              functionCall: { name: "lookup", args: { query: "weather" } },
+              thoughtSignature: "skip_thought_signature_validator",
+            },
+          ],
+        },
         {
           role: "user",
           parts: [{ functionResponse: { name: "lookup", response: { name: "lookup", content: "done" } } }],
@@ -331,7 +350,15 @@ describe("Gemini route", () => {
       )
 
       expect(prepared.body.contents).toEqual([
-        { role: "model", parts: [{ functionCall: { id: "call_1", name: "lookup", args: { query: "weather" } } }] },
+        {
+          role: "model",
+          parts: [
+            {
+              functionCall: { id: "call_1", name: "lookup", args: { query: "weather" } },
+              thoughtSignature: "skip_thought_signature_validator",
+            },
+          ],
+        },
         {
           role: "user",
           parts: [
@@ -380,7 +407,12 @@ describe("Gemini route", () => {
           },
           {
             role: "model",
-            parts: [{ functionCall: { name: "lookup", args: { query: "weather" } } }],
+            parts: [
+              {
+                functionCall: { name: "lookup", args: { query: "weather" } },
+                thoughtSignature: "skip_thought_signature_validator",
+              },
+            ],
           },
           {
             role: "user",
@@ -434,7 +466,15 @@ describe("Gemini route", () => {
       )
 
       expect(prepared.body.contents).toEqual([
-        { role: "model", parts: [{ functionCall: { name: "read", args: { path: "pixel.png" } } }] },
+        {
+          role: "model",
+          parts: [
+            {
+              functionCall: { name: "read", args: { path: "pixel.png" } },
+              thoughtSignature: "skip_thought_signature_validator",
+            },
+          ],
+        },
         {
           role: "user",
           parts: [
@@ -670,7 +710,13 @@ describe("Gemini route", () => {
         model: "gemini-3-flash-preview",
         input: [
           { type: "user_input", content: [{ type: "video", uri, mime_type: "video/mp4" }] },
-          { type: "function_call", id: "call_video", name: "read", arguments: {} },
+          {
+            type: "function_call",
+            id: "call_video",
+            name: "read",
+            arguments: {},
+            signature: "skip_thought_signature_validator",
+          },
           {
             type: "function_result",
             call_id: "call_video",
@@ -714,7 +760,10 @@ describe("Gemini route", () => {
       )
 
       expect(prepared.body.contents).toEqual([
-        { role: "model", parts: [{ functionCall: { name: "shot", args: {} } }] },
+        {
+          role: "model",
+          parts: [{ functionCall: { name: "shot", args: {} }, thoughtSignature: "skip_thought_signature_validator" }],
+        },
         {
           role: "user",
           parts: [{ functionResponse: { name: "shot", response: { name: "shot", content: "" } } }],
@@ -764,7 +813,10 @@ describe("Gemini route", () => {
       expect(prepared.body.contents).toEqual([
         {
           role: "model",
-          parts: [{ functionCall: { name: "shot", args: {} } }, { functionCall: { name: "shot", args: {} } }],
+          parts: [
+            { functionCall: { name: "shot", args: {} }, thoughtSignature: "skip_thought_signature_validator" },
+            { functionCall: { name: "shot", args: {} }, thoughtSignature: "skip_thought_signature_validator" },
+          ],
         },
         {
           role: "user",
diff --git a/packages/ai/test/provider/google-vertex-interactions.test.ts b/packages/ai/test/provider/google-vertex-interactions.test.ts
index e3b34d021696..172e0ddd1dcc 100644
--- a/packages/ai/test/provider/google-vertex-interactions.test.ts
+++ b/packages/ai/test/provider/google-vertex-interactions.test.ts
@@ -259,6 +259,49 @@ describe("Google Vertex Interactions", () => {
         ],
       })
       expect(prepared.body.previous_interaction_id).toBeUndefined()
+
+      const unsigned = yield* compileRequest(
+        ai.request({
+          model,
+          messages: [
+            Message.assistant([
+              ToolCallPart.make({ id: "call_foreign", name: "lookup", input: { city: "Paris" } }),
+            ]),
+            Message.tool({ id: "call_foreign", name: "lookup", result: { weather: "sunny" } }),
+            Message.assistant([
+              ToolCallPart.make({
+                id: "call_signed",
+                name: "lookup",
+                input: { city: "Lyon" },
+                providerMetadata: { vertex: { interactionSignature: "sig_1" } },
+              }),
+              ToolCallPart.make({ id: "call_sibling", name: "lookup", input: { city: "Nice" } }),
+            ]),
+            Message.tool({ id: "call_signed", name: "lookup", result: { weather: "cloudy" } }),
+            Message.tool({ id: "call_sibling", name: "lookup", result: { weather: "warm" } }),
+          ],
+        }),
+      )
+      expect(unsigned.body.input).toEqual([
+        {
+          type: "function_call",
+          id: "call_foreign",
+          name: "lookup",
+          arguments: { city: "Paris" },
+          signature: "skip_thought_signature_validator",
+        },
+        { type: "function_result", call_id: "call_foreign", name: "lookup", result: { weather: "sunny" } },
+        {
+          type: "function_call",
+          id: "call_signed",
+          name: "lookup",
+          arguments: { city: "Lyon" },
+          signature: "sig_1",
+        },
+        { type: "function_call", id: "call_sibling", name: "lookup", arguments: { city: "Nice" } },
+        { type: "function_result", call_id: "call_signed", name: "lookup", result: { weather: "cloudy" } },
+        { type: "function_result", call_id: "call_sibling", name: "lookup", result: { weather: "warm" } },
+      ])
     }),
   )
 })
diff --git a/packages/ai/test/provider/mistral-chat.test.ts b/packages/ai/test/provider/mistral-chat.test.ts
index 3f4cd8e3d7de..40411f0837f6 100644
--- a/packages/ai/test/provider/mistral-chat.test.ts
+++ b/packages/ai/test/provider/mistral-chat.test.ts
@@ -123,7 +123,7 @@ describe("Mistral Chat", () => {
         },
         {
           role: "assistant",
-          content: "ThinkCalling",
+          content: "Calling",
         },
       ])
       const assistant = prepared.body.messages[3]
@@ -177,6 +177,21 @@ describe("Mistral Chat", () => {
         { role: "assistant", content: "Prefix", prefix: true },
       ])
 
+      const trailingDropped = yield* compileRequest(
+        ai.request({
+          model,
+          messages: [
+            Message.user("Continue"),
+            Message.assistant("Prefix"),
+            Message.assistant({ type: "reasoning", text: "Dropped unsigned reasoning" }),
+          ],
+        }),
+      )
+      expect(trailingDropped.body.messages).toEqual([
+        { role: "user", content: "Continue" },
+        { role: "assistant", content: "Prefix", prefix: true },
+      ])
+
       const uncached = yield* compileRequest(
         ai.request({
           model,
@@ -227,6 +242,7 @@ describe("Mistral Chat", () => {
           messages: [
             Message.assistant(" \n "),
             Message.assistant({ type: "reasoning", text: "\t" }),
+            Message.assistant({ type: "reasoning", text: "Foreign reasoning without mistral metadata" }),
             Message.assistant({ type: "tool-call", id: "Ab12Cd34E", name: "lookup", input: {} }),
           ],
         }),
diff --git a/packages/app/component-tests/input-surfaces.spec.ts b/packages/app/component-tests/input-surfaces.spec.ts
new file mode 100644
index 000000000000..b9679e188da6
--- /dev/null
+++ b/packages/app/component-tests/input-surfaces.spec.ts
@@ -0,0 +1,110 @@
+import { expect, story } from "../../stories/playwright/story"
+
+for (const control of ["text-input", "textarea"]) {
+  story(`${control} supports its surfaces with inset feedback and stable geometry`, async ({ mount, page }) => {
+    const root = await mount(`ui-${control}--surfaces`)
+
+    const fields = root.locator(`[data-component="${control}-v2"]`)
+
+    await page.addStyleTag({
+      content: `[data-component="${control}-v2"] {
+        --v2-background-bg-base: rgb(20, 30, 40);
+        --v2-background-bg-layer-01: rgb(50, 60, 70);
+        --v2-overlay-simple-overlay-hover: rgba(10, 20, 30, 0.1);
+        --v2-elevation-input: 0px 0px 0px 3px rgb(1, 2, 3);
+        --v2-elevation-button-neutral: 0px 0px 0px 7px rgb(4, 5, 6);
+      }`,
+    })
+
+    await expect(fields.nth(0)).toHaveCSS("background-color", "rgb(20, 30, 40)")
+    await expect(fields.nth(1)).toHaveCSS("background-color", "rgb(50, 60, 70)")
+    await expect(fields.nth(0)).toHaveCSS("box-shadow", "rgb(1, 2, 3) 0px 0px 0px 3px")
+    await expect(fields.nth(1)).toHaveCSS("box-shadow", "rgb(1, 2, 3) 0px 0px 0px 3px")
+
+    for (const field of await fields.all()) {
+      await expect(field).toHaveCSS("background-image", "none")
+    }
+
+    const base = fields.nth(0)
+
+    const geometry = await base.getByRole("textbox").boundingBox()
+
+    await base.hover()
+    await expect
+      .poll(() => base.evaluate((element) => getComputedStyle(element).boxShadow))
+      .toContain("rgb(1, 2, 3) 0px 0px 0px 3px")
+    await base.getByRole("textbox").fill("Still editable")
+    await expect(base.getByRole("textbox")).toHaveValue("Still editable")
+    await expect(base).toHaveCSS("outline-width", "1px")
+    await expect(base).toHaveCSS("outline-offset", "-1px")
+    await expect(base).not.toHaveCSS("outline-color", "rgba(0, 0, 0, 0)")
+    expect(await base.getByRole("textbox").boundingBox()).toEqual(geometry)
+
+    const invalid = root.locator("[data-invalid]")
+
+    const disabled = root.locator("[data-disabled]")
+
+    await expect(invalid).toHaveCSS("outline-width", "1px")
+    await expect(invalid).toHaveCSS("outline-offset", "-1px")
+    await expect(invalid).not.toHaveCSS("outline-color", "rgba(0, 0, 0, 0)")
+    await expect(invalid.getByRole("textbox")).toHaveAttribute("aria-invalid", "true")
+    await expect(disabled.getByRole("textbox")).toBeDisabled()
+
+    if (control === "textarea") return
+
+    const invisible = root.locator('[data-surface="invisible"]').first()
+
+    await base.getByRole("textbox").blur()
+    await expect(invisible).toHaveCSS("background-color", "rgba(0, 0, 0, 0)")
+    await invisible.hover()
+    await expect(invisible).toHaveCSS("background-color", "rgba(10, 20, 30, 0.1)")
+    await expect(invisible).toHaveCSS("box-shadow", "none")
+    await invisible.getByRole("textbox").focus()
+    await expect(invisible).toHaveCSS("background-color", "rgba(0, 0, 0, 0)")
+    await expect(invisible).toHaveCSS("outline-offset", "-1px")
+    await expect(invisible).not.toHaveCSS("outline-color", "rgba(0, 0, 0, 0)")
+    await expect(invalid).toHaveCSS("background-color", "rgba(0, 0, 0, 0)")
+    await expect(disabled).toHaveCSS("background-color", "rgba(0, 0, 0, 0)")
+    await expect(disabled).toHaveCSS("box-shadow", "none")
+  })
+}
+
+story(
+  "text inputs keep clear and copy actions equally sized and inset across sizes and directions",
+  async ({ mount, page }) => {
+    const root = await mount("ui-text-input--appearances")
+
+    const fields = root.locator('[data-component="text-input-v2"]')
+
+    for (const [index, height] of [24, 28, 32, 32, 24, 28, 32].entries()) {
+      await expect(fields.nth(index)).toHaveCSS("height", `${height}px`)
+    }
+
+    for (const direction of ["ltr", "rtl"]) {
+      await page.evaluate((dir) => (document.documentElement.dir = dir), direction)
+
+      for (const field of await fields.filter({ has: page.getByRole("button") }).all()) {
+        const button = field.getByRole("button")
+
+        await expect(button).toHaveCSS("width", "20px")
+        await expect(button).toHaveCSS("height", "20px")
+        await expect(button).toHaveCSS("padding", "2px")
+        await expect(button).toHaveCSS("border-radius", "4px")
+
+        expect(
+          await field.evaluate((element) => {
+            const bounds = element.getBoundingClientRect()
+
+            const action = element.querySelector("button")!.getBoundingClientRect()
+
+            return {
+              inset:
+                getComputedStyle(element).direction === "rtl" ? action.left - bounds.left : bounds.right - action.right,
+              center: action.y + action.height / 2 - bounds.y - bounds.height / 2,
+            }
+          }),
+        ).toEqual({ inset: 8, center: 0 })
+      }
+    }
+  },
+)
diff --git a/packages/app/e2e/regression/composer.spec.ts b/packages/app/e2e/regression/composer.spec.ts
index e57638b7cb12..8ea8c93d44dd 100644
--- a/packages/app/e2e/regression/composer.spec.ts
+++ b/packages/app/e2e/regression/composer.spec.ts
@@ -1133,6 +1133,39 @@ test("/reload reloads the server's configuration once and reports it", async ({
 
 const followUp = "Add follow-up, / for commands, @ for context…"
 
+test("the shell shortcut toggles modes and keeps explicit bindings", async ({ page }) => {
+  const view = await openDraft(page, {
+    name: "ShellToggle",
+    seed: {
+      settings: {
+        keybinds: { "prompt.mode.shell": "mod+alt+s", "prompt.mode.normal": "mod+alt+e" },
+      },
+    },
+  })
+
+  const modifier = await page.evaluate(() => (/Mac/i.test(navigator.platform) ? "Meta" : "Control"))
+
+  const exit = page.getByRole("button", { name: /^Exit/ })
+
+  await view.editor.fill("echo hello")
+  await view.editor.press(`${modifier}+Shift+x`)
+  await expect(exit).toBeVisible()
+  await expect(view.editor).toHaveText("echo hello")
+  await view.editor.press(`${modifier}+Shift+x`)
+  await expect(exit).toHaveCount(0)
+  await expect(view.editor).toHaveText("echo hello")
+  await view.editor.press(`${modifier}+Shift+x`)
+  await expect(exit).toBeVisible()
+  await view.editor.press("Escape")
+  await expect(exit).toHaveCount(0)
+  await expect(view.editor).toBeFocused()
+  await view.editor.press(`${modifier}+Alt+s`)
+  await expect(exit).toBeVisible()
+  await view.editor.press(`${modifier}+Alt+e`)
+  await expect(exit).toHaveCount(0)
+  await expect(view.editor).toHaveText("echo hello")
+})
+
 for (const row of [
   { state: "an idle", copy: "Ask anything, / for commands, @ for context…" },
   { state: "a running", copy: followUp, sessionStatus: { ses_placeholder: { type: "running" } } },
diff --git a/packages/app/e2e/regression/new-session.spec.ts b/packages/app/e2e/regression/new-session.spec.ts
index d2413619ba08..4f1ee96867d5 100644
--- a/packages/app/e2e/regression/new-session.spec.ts
+++ b/packages/app/e2e/regression/new-session.spec.ts
@@ -58,7 +58,7 @@ test("the new session screen does not show session details", async ({ page }) =>
   await expect(page.getByRole("button", { name: "Session details", exact: true })).toHaveCount(0)
 })
 
-test("the location shortcut keeps cycling after hovering its icon", async ({ page }) => {
+test("the location shortcuts choose worktrees from every state and keep cycling", async ({ page }) => {
   const existing = "C:/OpenCode/LocationShortcut/.worktrees/quiet-river"
 
   const view = await openDraft(page, {
@@ -67,27 +67,133 @@ test("the location shortcut keeps cycling after hovering its icon", async ({ pag
   })
 
   const modifier = await page.evaluate(() => (/Mac/i.test(navigator.platform) ? "Meta" : "Control"))
+
   const path = page.locator('[data-slot="new-session-location-path"]')
-  const icon = page.locator('[data-slot="new-session-location-icon"]')
 
-  // The worktree trigger already says Local, so the local path has no icon of its own.
+  const search = page.getByRole("combobox", { name: "Search worktrees", exact: true })
+
   await expect(path).toHaveText(view.directory)
-  await expect(icon).toHaveCount(0)
-  await newSessionWorktree(page).click()
+  await view.editor.press(`${modifier}+Alt+KeyO`)
+  await expect(search).toBeFocused()
   await page.getByRole("option", { name: /^quiet-river / }).click()
   await expect(view.editor).toBeFocused()
   await expect(path).toHaveText(existing)
-  await icon.hover()
-  await expect(page.getByRole("tooltip")).toContainText("Toggle session location")
-  await view.editor.press(`${modifier}+Alt+KeyL`)
-  await expect(newSessionWorktree(page)).toHaveText("Local")
-  await expect(icon).toHaveCount(0)
-  await expect(view.editor).toBeFocused()
+  await expect(page.locator('[data-slot="new-session-location-icon"]')).toHaveCount(0)
+  await view.editor.press(`${modifier}+Alt+KeyO`)
+  await expect(search).toBeFocused()
+  await page.getByRole("option", { name: /LocationShortcut C:\/OpenCode\/LocationShortcut$/ }).click()
   await view.editor.press(`${modifier}+Alt+KeyL`)
   await expect(newSessionWorktree(page)).toContainText("New worktree")
+  await view.editor.press(`${modifier}+Alt+KeyO`)
+  await expect(search).toBeFocused()
+  await page.getByRole("option", { name: /^quiet-river / }).click()
+  await expect(path).toHaveText(existing)
   await expect(view.editor).toBeFocused()
 })
 
+for (const binding of ["custom", "none"]) {
+  test(`the picker tooltips reflect ${binding} shortcuts`, async ({ page }) => {
+    const view = await openDraft(page, {
+      name: "PickerShortcuts",
+      seed: {
+        settings: {
+          keybinds: {
+            "project.select": binding === "custom" ? "mod+alt+p" : "none",
+            "session.location.select": binding === "custom" ? "mod+alt+x" : "none",
+            "session.location.cycle": binding === "custom" ? "mod+alt+k" : "none",
+          },
+        },
+      },
+    })
+
+    const tooltip = page.getByRole("tooltip").and(page.locator("[data-expanded]"))
+
+    const keys = tooltip.locator('[data-component="keybind-v2"]')
+
+    await newSessionLocation(page).hover()
+    await expect(tooltip).toContainText("Choose project")
+
+    await expect(keys).toHaveText(binding === "custom" ? [/P$/] : [])
+    await newSessionWorktree(page).hover()
+    await expect(tooltip).toContainText("Isolate sessions with worktrees")
+
+    await expect(keys).toHaveText(binding === "custom" ? [/X$/] : [])
+
+    const modifier = await page.evaluate(() => (/Mac/i.test(navigator.platform) ? "Meta" : "Control"))
+
+    if (binding === "none") {
+      await view.editor.press(`${modifier}+Alt+o`)
+      await expect(page.getByRole("dialog")).toHaveCount(0)
+      await expect(newSessionWorktree(page)).toHaveText("Local")
+
+      return
+    }
+
+    await view.editor.press(`${modifier}+Alt+k`)
+    await expect(newSessionWorktree(page)).toContainText("New worktree")
+    await view.editor.press(`${modifier}+Alt+x`)
+    const search = page.getByRole("combobox", { name: "Search worktrees", exact: true })
+
+    await expect(search).toBeFocused()
+    await search.press("Escape")
+    await expect(page.getByRole("dialog")).toHaveCount(0)
+    await expect(newSessionWorktree(page)).toContainText("New worktree")
+    await expect(view.editor).toBeFocused()
+    await view.editor.press(`${modifier}+Alt+p`)
+    await expect(page.getByRole("combobox", { name: "Search projects", exact: true })).toBeFocused()
+  })
+}
+
+test("the worktree picker shortcut is disabled for non-Git projects", async ({ page }) => {
+  const view = await openDraft(page, { name: "NoWorktrees", project: { vcs: undefined } })
+
+  const modifier = await page.evaluate(() => (/Mac/i.test(navigator.platform) ? "Meta" : "Control"))
+
+  await expect(newSessionWorktree(page)).toHaveCount(0)
+  await view.editor.press(`${modifier}+Alt+o`)
+  await expect(page.getByRole("dialog")).toHaveCount(0)
+  await view.editor.fill("Keep working locally")
+  await expect(view.editor).toHaveText("Keep working locally")
+})
+
+test("picker scrollbars overlay full-width rows and support dragging", async ({ page }) => {
+  const root = "C:/OpenCode/OverlayMenus"
+
+  await openDraft(page, {
+    name: "OverlayMenus",
+    worktrees: () => [
+      { directory: root },
+      ...Array.from({ length: 24 }, (_, index) => ({
+        directory: `${root}/worktree-${index}`,
+        strategy: "git" as const,
+      })),
+    ],
+  })
+  await newSessionWorktree(page).click()
+  await expect(page.getByRole("combobox", { name: "Search worktrees", exact: true })).toBeFocused()
+
+  const menu = page.locator('[data-component="menu-scroll"]')
+
+  const viewport = menu.locator('[data-slot="menu-scroll-viewport"]')
+
+  const thumb = menu.locator('[data-slot="menu-scroll-thumb"]')
+
+  await menu.hover()
+  await expect(thumb).toHaveCSS("opacity", "1")
+  await expect.poll(() => viewport.evaluate((el) => el.getBoundingClientRect().width - el.clientWidth)).toBe(0)
+
+  const track = (await menu.boundingBox())!
+
+  const handle = (await thumb.boundingBox())!
+
+  await thumb.hover()
+  await page.mouse.down()
+  await page.mouse.move(handle.x + handle.width / 2, track.y + track.height - 4)
+  await page.mouse.up()
+  await expect.poll(() => viewport.evaluate((el) => el.scrollTop > 0)).toBe(true)
+  await expect(page.getByRole("option", { name: /^worktree-23 / })).toBeInViewport()
+})
+
 for (const row of [
   {
     name: "POSIX",
@@ -108,6 +214,21 @@ for (const row of [
     await expect.poll(() => path.evaluate((el) => el.scrollWidth <= el.clientWidth)).toBe(true)
     await path.hover()
     await expect(page.getByRole("tooltip")).toHaveText(row.directory)
+
+    if (row.name !== "POSIX") return
+    await expect(path).toHaveCSS("user-select", "text")
+    await path.click()
+    await path.evaluate((element) => {
+      const range = document.createRange()
+
+      range.selectNodeContents(element)
+      window.getSelection()?.removeAllRanges()
+      window.getSelection()?.addRange(range)
+    })
+    const modifier = await page.evaluate(() => (/Mac/i.test(navigator.platform) ? "Meta" : "Control"))
+
+    await page.keyboard.press(`${modifier}+c`)
+    await expect.poll(() => page.evaluate(() => navigator.clipboard.readText())).toBe(row.directory)
   })
 }
 
@@ -234,11 +355,7 @@ test("the worktree trigger opens the current project's worktree step", async ({
   await local.click()
   await expect(search).toBeFocused()
   await expect(back).toHaveText("Run session in")
-  await expect(options.locator(".command-palette-title")).toHaveText([
-    "BranchWorktrees",
-    "New worktree",
-    "quiet-river",
-  ])
+  await expect(options.locator(".command-palette-title")).toHaveText(["BranchWorktrees", "New worktree", "quiet-river"])
   await expect(options.nth(0)).toHaveAttribute("aria-selected", "true")
 
   // Stepping back lands on the projects step with the drilled project active, as after drilling in with →.
@@ -247,15 +364,28 @@ test("the worktree trigger opens the current project's worktree step", async ({
   await expect(projects).toBeFocused()
   await expect(back).toHaveCount(0)
   await expect(options.filter({ hasText: "BranchWorktrees" })).toHaveAttribute("aria-selected", "true")
+  await projects.press("ArrowRight")
+  await expect(search).toBeFocused()
+  await search.press("Escape")
+  await expect(projects).toBeFocused()
   await projects.press("Escape")
   await expect(dialog).toHaveCount(0)
   await expect(view.editor).toBeFocused()
 
-  // Escape also steps back first, then closes.
+  // A directly opened worktree picker closes on Escape without showing projects first.
   await local.focus()
   await page.keyboard.press("Enter")
   await expect(search).toBeFocused()
   await search.press("Escape")
+  await expect(dialog).toHaveCount(0)
+  await expect(view.editor).toBeFocused()
+
+  // Drilling in from the project picker still makes Escape step back.
+  await newSessionLocation(page).click()
+  await expect(projects).toBeFocused()
+  await projects.press("ArrowRight")
+  await expect(search).toBeFocused()
+  await search.press("Escape")
   await expect(projects).toBeFocused()
   await projects.press("Escape")
   await expect(dialog).toHaveCount(0)
@@ -277,7 +407,7 @@ test("the branch shortcut chooses a base branch and stays inactive on Local", as
 
   const modifier = await page.evaluate(() => (/Mac/i.test(navigator.platform) ? "Meta" : "Control"))
 
-  const shortcut = `${modifier}+Alt+Period`
+  const shortcut = `${modifier}+Alt+KeyB`
 
   const base = page.getByRole("button", { name: "from dev", exact: true })
 
@@ -285,7 +415,7 @@ test("the branch shortcut chooses a base branch and stays inactive on Local", as
 
   await base.hover()
   await expect(page.getByRole("tooltip")).toContainText("Choose base branch")
-  await expect(page.getByRole("tooltip").locator('[data-component="keybind-v2"]')).toContainText(".")
+  await expect(page.getByRole("tooltip").locator('[data-component="keybind-v2"]')).toContainText("B")
   await expect(view.editor).toBeFocused()
   await view.editor.press(shortcut)
   await expect(search).toBeFocused()
diff --git a/packages/app/e2e/regression/settings.spec.ts b/packages/app/e2e/regression/settings.spec.ts
index 86f63ee26341..458da4daa79e 100644
--- a/packages/app/e2e/regression/settings.spec.ts
+++ b/packages/app/e2e/regression/settings.spec.ts
@@ -885,7 +885,13 @@ test.describe("pages open before slow data", () => {
         { name: "stripe", integrationID: "stripe-oauth", status: { status: "needs_auth", error: "Sign in required" } },
       ],
       integrations: [
-        { id: "stripe-oauth", name: "Stripe", methods: [{ id: "oauth", type: "oauth" }], connections: [] },
+        {
+          id: "stripe-oauth",
+          name: "Stripe",
+          methods: [{ id: "oauth", type: "oauth" }],
+          connections: [],
+          metadata: { source: "mcp" },
+        },
       ],
       onIntegrationOAuth: (input) => {
         signIns.push(input.integrationID)
@@ -1369,6 +1375,13 @@ test("providers: the connect dialog lists connected providers and manages their
         connections: accounts.toSorted((a, b) => Number(b.id === state.active) - Number(a.id === state.active)),
       },
       { id: "anthropic", name: "Anthropic", methods: [{ type: "key", label: "API key" }], connections: [] },
+      {
+        id: "linear",
+        name: "Linear",
+        methods: [{ id: "oauth", type: "oauth", label: "Sign in" }],
+        connections: [],
+        metadata: { source: "mcp" },
+      },
     ],
     onCredentialActivate: (credentialID) => {
       activated.push(credentialID)
@@ -1389,6 +1402,9 @@ test("providers: the connect dialog lists connected providers and manages their
   await expect(
     dialog.locator('[data-provider-id="anthropic"]').locator('[data-slot="provider-connected"]'),
   ).toHaveCount(0)
+  // MCP servers connect from the MCPs dialog and settings, not here.
+  await expect(dialog.locator('[data-provider-id="linear"]')).toHaveCount(0)
+  await expect(dialog.getByText("MCP", { exact: true })).toHaveCount(0)
   const container = page.locator('[data-slot="dialog-container"]')
   await expect.poll(async () => (await container.boundingBox())?.height).toBe(512)
   const picker = await container.boundingBox()
diff --git a/packages/app/e2e/regression/timeline-stream.spec.ts b/packages/app/e2e/regression/timeline-stream.spec.ts
index ef0608d0c8a4..2d4ff7b5a652 100644
--- a/packages/app/e2e/regression/timeline-stream.spec.ts
+++ b/packages/app/e2e/regression/timeline-stream.spec.ts
@@ -3,6 +3,7 @@ import type { SessionMessageAssistant, SessionMessageInfo, ShellInfo } from "@op
 import { timelinePresets } from "@opencode/session-ui/timeline/detail"
 import { createTwoFilesPatch } from "diff"
 import { readSessionDraftText } from "../utils/drafts"
+import { holdRoute } from "../utils/app"
 import {
   assistantID,
   assistantMessage,
@@ -2005,6 +2006,7 @@ test("quotes plain timeline text into the composer, with or without a comment",
   const user = '[data-slot="user-message-text"]'
   const answer = `[data-timeline-part-id="${renderedPartID("prt_quote_answer")}"] [data-slot="text-part-body"]`
   await expect(page.locator(answer).getByText("bundle", { exact: true })).toBeVisible()
+  await expect(page.locator('[data-component="composer-editor"]')).toBeFocused()
 
   const select = (from: string, to: string) =>
     page.evaluate(
@@ -2050,7 +2052,7 @@ test("quotes plain timeline text into the composer, with or without a comment",
   await comment.fill("Why three?")
   await expect(popover.getByRole("button")).toHaveCount(1)
   await expect(popover.getByRole("button", { name: "Add comment", exact: true })).toBeVisible()
-  await popover.getByRole("button", { name: "Add comment", exact: true }).click()
+  await comment.press("Alt+Enter")
   await expect(comment).toHaveCount(0)
   await expect(chips.nth(1)).toContainText("Why three?")
   await chips.nth(1).click()
@@ -2110,6 +2112,151 @@ test("quotes plain timeline text into the composer, with or without a comment",
   await expect(chips).toHaveCount(0)
 })
 
+test("quote popup sends independently without consuming the draft or other quotes", async ({ page }) => {
+  const sent: string[] = []
+
+  await setupTimeline(page, {
+    messages: [userMessage(), assistantMessage([textPart("prt_direct_quote", "Keep this quoted passage.")])],
+    onPrompt: (input) => void sent.push(String(input.body.delivery)),
+  })
+
+  const answer = page.locator(
+    `[data-timeline-part-id="${renderedPartID("prt_direct_quote")}"] [data-slot="text-part-body"]`,
+  )
+
+  const editor = page.locator('[data-component="composer-editor"]')
+
+  const quote = page
+    .getByRole("toolbar", { name: "Quote selection" })
+    .getByRole("button", { name: "Quote", exact: true })
+
+  await expect(answer).toHaveText("Keep this quoted passage.")
+  await editor.fill("Keep my separate draft")
+  await selectQuoteText(answer)
+  await quote.click({ modifiers: ["Alt"] })
+  await expect(editor).toBeFocused()
+  await selectQuoteText(answer)
+  await quote.click()
+  const popup = page.locator('[data-component="composer-quote-comment"]')
+
+  const comment = popup.locator("textarea")
+
+  const action = popup.getByRole("button")
+
+  const modifier = await page.evaluate(() => (/(Mac|iPod|iPhone|iPad)/.test(navigator.platform) ? "Meta" : "Control"))
+
+  await expect(comment).toBeFocused()
+  await comment.fill("Explain this please")
+  await action.focus()
+  await page.keyboard.down(modifier)
+  await expect(action).toHaveAccessibleName("Send quote")
+  await page.keyboard.press("Enter")
+  await page.keyboard.up(modifier)
+  await expect(popup).toHaveCount(0)
+  await expect.poll(() => sent).toEqual(["steer"])
+  await expect(editor).toHaveText("Keep my separate draft")
+  const remaining = page.locator('[data-component="composer-attachments"] [data-component="attachment-card"]')
+
+  await expect(remaining).toHaveCount(1)
+  await expect(remaining).toContainText("Keep this quoted passage.")
+  await expect(remaining).not.toContainText("Explain this please")
+})
+
+test("a pending quote send hides mentions and keeps the comment read-only", async ({ page }) => {
+  const sent: string[] = []
+
+  await setupTimeline(page, {
+    settings: { followUpBehavior: "steer" },
+    sessionStatus: { [sessionID]: { type: "busy" } },
+    messages: [userMessage(), assistantMessage([textPart("prt_quote_mentions", "Keep this quoted passage.")])],
+    findFiles: () => ["src/api.ts"],
+    onPrompt: (input) => void sent.push(String(input.body.delivery)),
+  })
+
+  const answer = page.locator(
+    `[data-timeline-part-id="${renderedPartID("prt_quote_mentions")}"] [data-slot="text-part-body"]`,
+  )
+
+  await expect(answer).toHaveText("Keep this quoted passage.")
+  await expect(page.locator('[data-component="composer-editor"]')).toBeFocused()
+  await selectQuoteText(answer)
+  await page
+    .getByRole("toolbar", { name: "Quote selection" })
+    .getByRole("button", { name: "Quote", exact: true })
+    .click()
+  const popup = page.locator('[data-component="composer-quote-comment"]')
+
+  const comment = popup.locator("textarea")
+
+  const modifier = await page.evaluate(() => (/(Mac|iPod|iPhone|iPad)/.test(navigator.platform) ? "Meta" : "Control"))
+
+  await comment.fill("Explain @src/a")
+  await expect(popup.locator('[data-slot="line-comment-v2-mention-item"]')).toHaveCount(1)
+  const admission = await holdRoute(page, new RegExp(`/api/session/${sessionID}/prompt(\\?|$)`), { method: "POST" })
+
+  await popup.locator('[data-slot="line-comment-v2-submit"]').click({ modifiers: [modifier] })
+  await admission.arrived
+  await expect(popup.getByRole("button")).toBeDisabled()
+  await expect(comment).toHaveAttribute("readonly", "")
+  await expect(popup.locator('[data-component="loader-v2"]')).toBeVisible()
+  await expect(popup.locator('[data-slot="line-comment-v2-mention-item"]')).toHaveCount(0)
+  await comment.press("Tab")
+  await expect(comment).toHaveValue("Explain @src/a")
+  expect(admission.requests).toHaveLength(1)
+  admission.release()
+  await expect(popup).toHaveCount(0)
+  await expect.poll(() => sent).toEqual(["queue"])
+})
+
+function selectQuoteText(target: Locator) {
+  return target.evaluate((element) => {
+    const range = document.createRange()
+
+    range.selectNodeContents(element)
+    window.getSelection()?.removeAllRanges()
+    window.getSelection()?.addRange(range)
+  })
+}
+
+test("a failed direct quote send keeps the popup and comment for retry", async ({ page }) => {
+  let reject = true
+
+  await setupTimeline(page, {
+    messages: [userMessage(), assistantMessage([textPart("prt_direct_quote_failure", "Keep this quoted passage.")])],
+    onPrompt: () => {
+      if (reject) throw new Error("Quote send failed")
+    },
+  })
+
+  const answer = page.locator(
+    `[data-timeline-part-id="${renderedPartID("prt_direct_quote_failure")}"] [data-slot="text-part-body"]`,
+  )
+
+  await expect(answer).toHaveText("Keep this quoted passage.")
+  await selectQuoteText(answer)
+  await page
+    .getByRole("toolbar", { name: "Quote selection" })
+    .getByRole("button", { name: "Quote", exact: true })
+    .click()
+  const popup = page.locator('[data-component="composer-quote-comment"]')
+
+  const comment = popup.locator("textarea")
+
+  const modifier = await page.evaluate(() => (/(Mac|iPod|iPhone|iPad)/.test(navigator.platform) ? "Meta" : "Control"))
+
+  await comment.fill("Keep my latest comment")
+  await comment.press(`${modifier}+Enter`)
+  await expect(popup.getByRole("alert")).toHaveText("Couldn’t send. Your comment is still here. Try again.")
+  await expect(comment).toHaveValue("Keep my latest comment")
+  await expect(comment).toBeEditable()
+  reject = false
+  await popup.getByRole("button").click({ modifiers: [modifier] })
+  await expect(popup).toHaveCount(0)
+  await expect(page.locator('[data-component="composer-attachments"] [data-component="attachment-card"]')).toHaveCount(
+    0,
+  )
+})
+
 test("highlights the exact duplicate passage whenever its quote comment is open", async ({ page }) => {
   let reject = true
   await setupTimeline(page, {
@@ -2230,6 +2377,7 @@ test("highlights the exact duplicate passage whenever its quote comment is open"
   await comment.press("Enter")
   await expect(comment).toHaveCount(0)
   await expect.poll(highlights).toEqual([[]])
+  await expect(editor).toBeFocused()
 
   await select(second, 23)
   await toolbar.getByRole("button", { name: "Quote", exact: true }).click({ modifiers: ["Alt"] })
diff --git a/packages/app/package.json b/packages/app/package.json
index cd67034c4541..7fc971833bf8 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode/app",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "description": "",
   "type": "module",
   "exports": {
diff --git a/packages/app/src/composer/editor/editor.tsx b/packages/app/src/composer/editor/editor.tsx
index ed030bfb1d89..47061d0ef6bd 100644
--- a/packages/app/src/composer/editor/editor.tsx
+++ b/packages/app/src/composer/editor/editor.tsx
@@ -270,6 +270,7 @@ export function ComposerEditor(props: ComposerEditorProps) {
               onQuoteFocus={props.controller.focusQuotePrompt}
               onEditQuote={props.controller.editQuote}
               onQuoteComment={(quote, comment) => props.controller.commentQuote(quote.key, comment)}
+              quoteSubmit={view.submit.quote}
               searchPaths={props.controller.searchPaths}
             />
           </Show>
@@ -686,6 +687,7 @@ function ComposerAttachments(props: {
   onQuoteFocus?: () => void
   onEditQuote?: (key?: string) => void
   onQuoteComment?: (quote: Extract<ComposerComment, { type: "quote" }>, comment: string) => void
+  quoteSubmit?: ComposerEditorModel["view"]["submit"]["quote"]
   searchPaths?: (query: string) => Promise<string[]>
 }) {
   const i18n = useI18n()
@@ -882,6 +884,13 @@ function ComposerAttachments(props: {
                   text={current.text}
                   comment={current.comment ?? ""}
                   mention={(query) => props.searchPaths?.(query) ?? Promise.resolve([])}
+                  send={
+                    props.quoteSubmit && {
+                      available: props.quoteSubmit.available(),
+                      delivery: props.quoteSubmit.delivery(),
+                      onSubmit: (comment) => props.quoteSubmit!.onSubmit(current.key, comment),
+                    }
+                  }
                   onSubmit={(comment) => {
                     props.onQuoteComment?.(current, comment)
                     props.onEditQuote?.()
diff --git a/packages/app/src/composer/editor/interaction.ts b/packages/app/src/composer/editor/interaction.ts
index 0044a37e4161..315ee2a7762c 100644
--- a/packages/app/src/composer/editor/interaction.ts
+++ b/packages/app/src/composer/editor/interaction.ts
@@ -23,7 +23,7 @@ import {
   type ComposerInteractionEvent,
 } from "../suggestions/machine"
 import { clonePrompt, isAttachment, promptLength } from "../prompt-parts"
-import type { ComposerQueue } from "../adapter"
+import type { ComposerDelivery, ComposerQueue } from "../adapter"
 import { isCommentItem } from "../state"
 import type { ComposerQuoteAnchor } from "@opencode/plugin/gui"
 
@@ -49,6 +49,11 @@ export type ComposerEditorView = {
     held?: Accessor<boolean>
     working?: Accessor<boolean>
     queue?: ComposerQueue
+    quote?: {
+      available: Accessor<boolean>
+      delivery: Accessor<ComposerDelivery | undefined>
+      onSubmit: (key: string, comment: string) => Promise<boolean>
+    }
     onSubmit: (options?: { alternate?: boolean }) => void
     onStop: () => void
   }
diff --git a/packages/app/src/composer/editor/quote-comment.tsx b/packages/app/src/composer/editor/quote-comment.tsx
index f59349d48461..3ebaf952cce8 100644
--- a/packages/app/src/composer/editor/quote-comment.tsx
+++ b/packages/app/src/composer/editor/quote-comment.tsx
@@ -1,4 +1,4 @@
-import { createMemo, onCleanup } from "solid-js"
+import { createMemo, onCleanup, Show } from "solid-js"
 import { createStore } from "solid-js/store"
 import { Portal } from "solid-js/web"
 import { makeEventListener } from "@solid-primitives/event-listener"
@@ -6,6 +6,15 @@ import { createResizeObserver } from "@solid-primitives/resize-observer"
 import { LineCommentEditor } from "@opencode/ui/line-comment"
 import { useLanguage } from "@/runtime/i18n/language"
 import type { ComposerQuoteAnchor } from "@opencode/plugin/gui"
+import type { ComposerDelivery } from "../adapter"
+
+const IS_MAC = /(Mac|iPod|iPhone|iPad)/.test(navigator.platform)
+
+const sendLabels = {
+  queue: "session.quote.queue",
+  steer: "session.quote.steer",
+  send: "session.quote.send",
+} as const
 
 const GAP = 8
 
@@ -19,6 +28,11 @@ export function QuoteCommentEditor(props: {
   mention: (query: string) => Promise<string[]>
   onSubmit: (comment: string) => void
   onClose: (focus?: boolean) => void
+  send?: {
+    available: boolean
+    delivery: ComposerDelivery | undefined
+    onSubmit: (comment: string) => Promise<boolean>
+  }
 }) {
   const language = useLanguage()
 
@@ -30,6 +44,8 @@ export function QuoteCommentEditor(props: {
     revision: 0,
     height: 0,
     openingHeight: 0,
+    sending: false,
+    failed: false,
   })
 
   const width = () => Math.min(WIDTH, state.viewport - GAP * 2)
@@ -47,6 +63,8 @@ export function QuoteCommentEditor(props: {
 
   let frame: number | undefined
 
+  let mounted = true
+
   const schedule = () => {
     if (frame !== undefined) return
     frame = requestAnimationFrame(() => {
@@ -61,6 +79,8 @@ export function QuoteCommentEditor(props: {
   }
 
   onCleanup(() => {
+    mounted = false
+
     if (frame !== undefined) cancelAnimationFrame(frame)
   })
 
@@ -72,7 +92,7 @@ export function QuoteCommentEditor(props: {
 
     if (target instanceof Node && (element?.contains(target) || props.anchor.contains(target))) return
 
-    if (state.draft.trim() === props.comment.trim()) props.onClose()
+    if (!state.sending && state.draft.trim() === props.comment.trim()) props.onClose()
   })
 
   const left = () => Math.min(Math.max(source()?.left ?? state.rect.left, GAP), state.viewport - width() - GAP)
@@ -88,6 +108,28 @@ export function QuoteCommentEditor(props: {
   const availableHeight = () => Math.max(0, bottom() - GAP)
   const top = () => Math.max(GAP, bottom() - state.height)
 
+  const alternateSubmit = createMemo(() => {
+    const send = props.send
+
+    if (!send) return
+
+    return {
+      label: language.t(sendLabels[send.delivery ?? "send"]),
+      keys: [IS_MAC ? "⌘" : language.t("common.key.ctrl"), "⏎"],
+      disabled: !send.available,
+      onSubmit: async (comment: string) => {
+        setState({ sending: true, failed: false })
+
+        const sent = await send.onSubmit(comment)
+
+        if (!mounted) return
+        setState({ sending: false, failed: !sent })
+
+        if (sent) props.onClose()
+      },
+    }
+  })
+
   return (
     <Portal>
       <div
@@ -125,6 +167,8 @@ export function QuoteCommentEditor(props: {
             onInput={(value) => setState("draft", value)}
             onCancel={() => props.onClose(true)}
             onSubmit={props.onSubmit}
+            submitting={state.sending}
+            alternateSubmit={alternateSubmit()}
             placeholder={language.t("session.quote.optionalCommentPlaceholder")}
             submitLabel={language.t(
               props.comment.trim()
@@ -137,6 +181,14 @@ export function QuoteCommentEditor(props: {
             mention={{ items: props.mention }}
             selection={<span dir="auto">{props.text}</span>}
           />
+          <Show when={state.failed}>
+            <p
+              role="alert"
+              class="rounded-b-[8px] bg-v2-background-bg-layer-01 px-3 pb-3 text-[12px] leading-[var(--line-height-compact)] text-v2-text-text-base"
+            >
+              {language.t("session.quote.sendFailed")}
+            </p>
+          </Show>
         </div>
       </div>
     </Portal>
diff --git a/packages/app/src/composer/model.ts b/packages/app/src/composer/model.ts
index 2350812be0b7..3ac0318debee 100644
--- a/packages/app/src/composer/model.ts
+++ b/packages/app/src/composer/model.ts
@@ -536,6 +536,15 @@ export function createComposerModel(adapter: ComposerAdapter, options?: { queue?
         held: submission.held,
         working: adapter.working,
         queue: options?.queue,
+        quote:
+          adapter.kind === "active-session"
+            ? {
+                available: () =>
+                  available() && !adapter.controls().model.loading && !submission.held() && !options?.queue?.undoing(),
+                delivery: () => (adapter.working() ? (options?.queue?.alternate() ?? "steer") : undefined),
+                onSubmit: submission.submitQuote,
+              }
+            : undefined,
         onSubmit: (submitOptions) => {
           if (!available()) return
           const queue = options?.queue
@@ -570,11 +579,18 @@ export function createComposerModel(adapter: ComposerAdapter, options?: { queue?
       disabled: controller.state.mode !== "normal",
       onSelect: () => controller.attach(),
     },
+    {
+      id: "prompt.mode.toggle",
+      title: language.t("command.prompt.mode.toggle"),
+      category: language.t("command.category.session"),
+      keybind: "mod+shift+x",
+      onSelect: () =>
+        void controller.dispatch({ type: controller.state.mode === "normal" ? "mode.shell" : "mode.normal" }),
+    },
     {
       id: "prompt.mode.shell",
       title: language.t("command.prompt.mode.shell"),
       category: language.t("command.category.session"),
-      keybind: "mod+shift+x",
       disabled: controller.state.mode === "shell",
       onSelect: () => void controller.dispatch({ type: "mode.shell" }),
     },
@@ -582,7 +598,6 @@ export function createComposerModel(adapter: ComposerAdapter, options?: { queue?
       id: "prompt.mode.normal",
       title: language.t("command.prompt.mode.normal"),
       category: language.t("command.category.session"),
-      keybind: "mod+shift+e",
       disabled: controller.state.mode === "normal",
       onSelect: () => void controller.dispatch({ type: "mode.normal" }),
     },
diff --git a/packages/app/src/composer/state.ts b/packages/app/src/composer/state.ts
index 13fdf1669da8..e3a38b70d4a4 100644
--- a/packages/app/src/composer/state.ts
+++ b/packages/app/src/composer/state.ts
@@ -185,17 +185,19 @@ function createComposerStateValue(store: ComposerStore, setStore: SetStoreFuncti
       },
       /** Edits the file comment, note, or quote with this commentID; only file comments carry a preview. */
       updateComment(commentID: string, next: { readonly comment?: string; readonly preview?: string }) {
-        setStore("context", "items", (items) =>
-          items.map((item) => {
-            if (item.commentID !== commentID) return item
-
-            if (item.type === "quote") return { ...item, comment: next.comment }
+        setStore(
+          "context",
+          "items",
+          (item) => item.commentID === commentID,
+          (item) => {
+            // Preserve quote identity so an open comment editor does not remount.
+            if (item.type === "quote") return { comment: next.comment }
 
             const value =
               item.type === "file" ? { ...item, ...next } : { ...item, comment: next.comment ?? item.comment }
 
             return { ...value, key: contextItemKey(value) }
-          }),
+          },
         )
         clearRetry()
       },
diff --git a/packages/app/src/composer/submit.test.ts b/packages/app/src/composer/submit.test.ts
index 0d0caa00ae36..79c84013fd78 100644
--- a/packages/app/src/composer/submit.test.ts
+++ b/packages/app/src/composer/submit.test.ts
@@ -84,14 +84,14 @@ function submitInput(
   commands: () => readonly { name: string }[] | undefined = () => [],
   history: string[] = [],
   clientCommand?: (text: string) => (() => void | Promise<void>) | undefined,
-  delivery: ComposerDelivery = "steer",
+  delivery: (alternate: boolean) => ComposerDelivery = () => "steer",
 ) {
   return createComposerSubmit({
     adapter,
     mode: () => mode,
     commands,
     clientCommand,
-    delivery: () => delivery,
+    delivery,
     editor: () => undefined,
     queueScroll() {},
     addToHistory: (prompt) =>
@@ -176,6 +176,108 @@ function session(input: {
 }
 
 describe("Composer submission", () => {
+  test.each(["steer", "queue"] as const)(
+    "sends only the selected quote as a %s, including its comment mentions, without clearing the draft",
+    async (delivery) => {
+      const state = createMemoryComposerState({ prompt: "/review keep this draft" }).capture()
+
+      const image = {
+        type: "image" as const,
+        id: "unrelated-image",
+        filename: "draft.png",
+        mime: "image/png",
+        blob: { id: "unrelated-image", url: "data:image/png;base64,YQ==" },
+      }
+
+      state.set([...state.current(), image], 5)
+      state.mode.set("shell")
+      state.context.add({ type: "quote", text: "Selected passage", commentID: "selected", comment: "Old comment" })
+      state.context.add({ type: "quote", text: "Unrelated passage", commentID: "other" })
+      state.context.add({ type: "file", path: "unrelated.ts" })
+      const before = state.current()
+
+      const requests: Parameters<ComposerSession["data"]["session"]["prompt"]>[0][] = []
+
+      const submission = submitInput(
+        active(state, session({ calls: [], prompt: async (value) => void requests.push(value) })),
+        undefined,
+        "shell",
+        undefined,
+        undefined,
+        undefined,
+        (alternate) => {
+          expect(alternate).toBe(true)
+
+          return delivery
+        },
+      )
+
+      expect(await submission.submitQuote("quote:c=selected", "Compare @src/api.ts")).toBe(true)
+      expect(requests).toHaveLength(1)
+      expect(requests[0]?.text).toBe(
+        "The user quoted the following from earlier in the conversation:\n> Selected passage\n\nThe user made the following comment regarding this quote: Compare @src/api.ts",
+      )
+      expect(requests[0]).toMatchObject({
+        delivery,
+        files: [{ uri: "file:///C:/repo/src/api.ts", name: "api.ts" }],
+        agents: [],
+        skills: [],
+        metadata: {
+          displayText: "",
+          comments: [{ type: "quote", text: "Selected passage", comment: "Compare @src/api.ts" }],
+          attachments: [],
+        },
+      })
+      expect(state.current()).toBe(before)
+      expect(state.cursor()).toBe(5)
+      expect(state.mode.current()).toBe("shell")
+      expect(state.context.items().map((item) => item.key)).toEqual([
+        "quote:c=other",
+        "file:unrelated.ts:undefined:undefined",
+      ])
+    },
+  )
+
+  test("a failed quote send retains its latest comment and prevents duplicate submissions while pending", async () => {
+    const state = createMemoryComposerState({ prompt: "Keep this draft" }).capture()
+
+    state.context.add({ type: "quote", text: "Selected passage", commentID: "selected" })
+    const failed = Promise.withResolvers<void>()
+
+    const started = Promise.withResolvers<void>()
+
+    const errors: string[] = []
+
+    const calls: string[] = []
+
+    const submission = submitInput(
+      active(
+        state,
+        session({
+          calls,
+          prompt: async () => {
+            started.resolve()
+            await failed.promise
+          },
+        }),
+      ),
+      { missingSelection() {}, unqueueable() {}, failed: (_kind, error) => void errors.push(String(error)) },
+    )
+
+    const pending = submission.submitQuote("quote:c=selected", "Latest comment")
+
+    await started.promise
+    expect(await submission.submitQuote("quote:c=selected", "Duplicate")).toBe(false)
+    failed.reject(new Error("Could not send"))
+    expect(await pending).toBe(false)
+    expect(errors).toHaveLength(1)
+    expect(state.current()).toEqual([{ type: "text", content: "Keep this draft", start: 0, end: 15 }])
+    expect(state.context.items()).toMatchObject([
+      { key: "quote:c=selected", text: "Selected passage", comment: "Latest comment" },
+    ])
+    expect(calls.filter((call) => call === "send")).toHaveLength(2)
+  })
+
   test("applies the selection and runs a client argument command without admitting it to the session", async () => {
     const state = createMemoryComposerState().capture()
 
@@ -319,9 +421,15 @@ describe("Composer submission", () => {
         switchModel: async () => committed.promise,
       })
 
-      await submitInput(active(state, target), undefined, "normal", undefined, undefined, undefined, delivery).submit(
-        new Event("submit"),
-      )
+      await submitInput(
+        active(state, target),
+        undefined,
+        "normal",
+        undefined,
+        undefined,
+        undefined,
+        () => delivery,
+      ).submit(new Event("submit"))
 
       expect(state.current()).toEqual([{ type: "text", content: "", start: 0, end: 0 }])
       expect(statuses).toEqual(["running"])
@@ -630,7 +738,7 @@ describe("Composer submission", () => {
           () => [],
           [],
           undefined,
-          delivery,
+          () => delivery,
         ).submit(new Event("submit"))
         // The send settles after submit returns; let it and the move that follows it finish.
         await new Promise((resolve) => setTimeout(resolve, 0))
diff --git a/packages/app/src/composer/submit.ts b/packages/app/src/composer/submit.ts
index 05398ad6d78e..4343af00721e 100644
--- a/packages/app/src/composer/submit.ts
+++ b/packages/app/src/composer/submit.ts
@@ -165,36 +165,7 @@ export function createComposerSubmit(input: ComposerSubmitInput) {
       const restore = () => restoreSubmission(input, submission, value, comments)
 
       if (value.mode === "normal" && !command) {
-        // The timeline shows a steer, and any switches it makes, as the composer clears; a queued prompt shows in
-        // the queue once admitted.
-        if (value.delivery === "steer")
-          session.handoff.set({
-            message: handoffMessage(value),
-            selection: {
-              agent: value.selection.agent,
-              model: {
-                id: value.selection.model.modelID,
-                providerID: value.selection.model.providerID,
-                variant: value.selection.variant,
-              },
-            },
-          })
-        const optimisticBusy = !input.adapter.working()
-
-        // Like iOS, a steer moves the run's blocking shells and subagents to the background. The move follows
-        // admission: the steer already waits in the inbox when the moved work ends the step, so that step reads it.
-        const background = value.delivery === "steer" && !optimisticBusy ? session.background?.() : undefined
-
-        if (optimisticBusy) session.data.session.setStatus(session.id, "running")
-
-        const sending = sendPrompt(session, value, input.adapter.controls().model.selection.trackSessionCommit).then(
-          () => {
-            void background?.move()
-
-            return { ok: true as const }
-          },
-          (error) => ({ ok: false as const, error }),
-        )
+        const dispatch = dispatchPrompt(input, session, value)
 
         await started.cleanupReady
         await started.complete?.()
@@ -203,12 +174,7 @@ export function createComposerSubmit(input: ComposerSubmitInput) {
         submission.context.forEach((item) => submission.target().context.remove(item.key))
         input.comments.clear()
         clearSubmission(input, submission)
-        void sending.then((result) => {
-          if (!result.ok)
-            failSubmission(input, session, "prompt", result.error, restore, value.id, () => {
-              if (optimisticBusy) session.data.session.setStatus(session.id, "idle")
-            })
-        })
+        void dispatch.sending.then((result) => dispatch.settle(result, restore))
 
         return
       }
@@ -239,6 +205,56 @@ export function createComposerSubmit(input: ComposerSubmitInput) {
 
   return {
     submit,
+    async submitQuote(key: string, comment: string) {
+      if (input.adapter.kind !== "active-session" || held() || submitting.has(input.adapter.state)) return false
+      const target = input.adapter.state
+
+      const quote = target.context.items().find((item) => item.key === key)
+
+      if (quote?.type !== "quote") return false
+      const selection = currentSelection(input)
+
+      if (!selection) {
+        input.notify.missingSelection()
+
+        return false
+      }
+
+      const session = input.adapter.session()
+
+      const value: ComposerSubmission = {
+        id: SessionMessage.ID.create(),
+        mode: "normal",
+        prompt: [],
+        context: [{ ...quote, comment, source: quote.source ? { ...quote.source } : undefined }],
+        text: "",
+        images: [],
+        selection,
+        delivery: input.delivery?.(true) ?? "steer",
+      }
+
+      submitting.add(input.adapter.state)
+
+      try {
+        const dispatch = dispatchPrompt(input, session, value)
+
+        const sent = dispatch.settle(await dispatch.sending, () => {
+          target.context.updateComment(quote.commentID, { comment })
+
+          return true
+        })
+
+        if (!sent) return false
+        target.context.remove(key)
+
+        if (target.quoteComment.key() === key) target.quoteComment.set()
+        input.adapter.submitted()
+
+        return true
+      } finally {
+        submitting.delete(input.adapter.state)
+      }
+    },
     held,
     stop: () => {
       // Stopping a held send cancels it and leaves the prompt in the composer.
@@ -395,6 +411,51 @@ function currentSelection(input: ComposerSubmitInput): ComposerSelection | undef
   }
 }
 
+function dispatchPrompt(input: ComposerSubmitInput, session: ComposerSession, value: ComposerSubmission) {
+  // A steer appears in the timeline before the composer clears; queued prompts appear in the queue on admission.
+  if (value.delivery === "steer")
+    session.handoff.set({
+      message: handoffMessage(value),
+      selection: {
+        agent: value.selection.agent,
+        model: {
+          id: value.selection.model.modelID,
+          providerID: value.selection.model.providerID,
+          variant: value.selection.variant,
+        },
+      },
+    })
+  const optimisticBusy = !input.adapter.working()
+
+  const background = value.delivery === "steer" && !optimisticBusy ? session.background?.() : undefined
+
+  if (optimisticBusy) session.data.session.setStatus(session.id, "running")
+
+  const sending = sendPrompt(session, value, input.adapter.controls().model.selection.trackSessionCommit).then(
+    () => ({ ok: true as const }),
+    (error) => ({ ok: false as const, error }),
+  )
+
+  return {
+    sending,
+    // The composer settles after clearing its captured draft; a quote settles before removing only its context.
+    settle(result: Awaited<typeof sending>, restore: () => boolean) {
+      const admitted =
+        result.ok ||
+        failSubmission(input, session, "prompt", result.error, restore, value.id, () => {
+          if (optimisticBusy) session.data.session.setStatus(session.id, "idle")
+        })
+
+      if (!admitted) return false
+
+      // Move blocking work only once the steer is admitted, so the next step can read it from the inbox.
+      void background?.move()
+
+      return true
+    },
+  }
+}
+
 function clearSubmission(input: ComposerSubmitInput, submission: ReturnType<typeof createComposerSubmission>) {
   submission.clear()
   submission.target().mode.set("normal")
@@ -654,10 +715,12 @@ function failSubmission(
   messageID?: string,
   rollback?: () => void,
 ) {
-  if (messageID && session.admitted(messageID)) return
+  if (messageID && session.admitted(messageID)) return true
 
   if (messageID) session.handoff.clear(messageID)
   rollback?.()
   restore()
   input.notify.failed(kind, error)
+
+  return false
 }
diff --git a/packages/app/src/new-session/location/dialog.css b/packages/app/src/new-session/location/dialog.css
index f9fa739e752c..bafc1911fa37 100644
--- a/packages/app/src/new-session/location/dialog.css
+++ b/packages/app/src/new-session/location/dialog.css
@@ -111,10 +111,6 @@
   color: var(--v2-text-text-faint);
 }
 
-.new-session-location-workspace .command-palette-row-icon {
-  color: var(--v2-icon-icon-base);
-}
-
 .new-session-location-workspace .command-palette-row-text > .command-palette-title {
   max-width: 60%;
   flex-shrink: 0;
diff --git a/packages/app/src/new-session/location/dialog.tsx b/packages/app/src/new-session/location/dialog.tsx
index dae5f1022794..0aba30d5fff7 100644
--- a/packages/app/src/new-session/location/dialog.tsx
+++ b/packages/app/src/new-session/location/dialog.tsx
@@ -3,6 +3,7 @@ import { Dialog, DialogBody } from "@opencode/ui/dialog"
 import { useDialog } from "@opencode/ui/context/dialog"
 import { Icon } from "@opencode/ui/icon"
 import { Keybind } from "@opencode/ui/keybind"
+import { MenuScroll } from "@opencode/ui/menu-scroll"
 import {
   displayName,
   getProjectAvatarGenerated,
@@ -77,6 +78,7 @@ function NewSessionLocationDialog(props: {
 
   const [store, setStore] = createStore<{
     drilled?: PromptProject
+    direct: boolean
     /** Picking the server to add a project to. */
     picking?: boolean
     /** Browsing server projects this client has not added. */
@@ -88,6 +90,7 @@ function NewSessionLocationDialog(props: {
     query: "",
     others: false,
     drilled: props.drilled,
+    direct: !!props.drilled,
     back: props.drilled ? { query: "", active: projectEntryID(props.drilled), others: false } : undefined,
   })
 
@@ -281,6 +284,7 @@ function NewSessionLocationDialog(props: {
     setStore({
       drilled: undefined,
       picking: undefined,
+      direct: false,
       others: store.drilled || store.picking ? (store.back?.others ?? false) : false,
       query: store.drilled || store.picking ? (store.back?.query ?? "") : "",
       back: undefined,
@@ -367,6 +371,14 @@ function NewSessionLocationDialog(props: {
       return
     }
 
+    if (event.key === "Escape" && store.direct && store.drilled) {
+      event.preventDefault()
+      event.stopPropagation()
+      dialog.close()
+
+      return
+    }
+
     if (
       (store.drilled || store.picking || store.others) &&
       ((event.key === backward && atStart) || (event.key === "Backspace" && !target.value) || event.key === "Escape")
@@ -405,7 +417,11 @@ function NewSessionLocationDialog(props: {
           />
         </div>
         <div class="new-session-location-divider" aria-hidden="true" />
-        <div class="command-palette-scroll" data-scrollable ref={(el) => (resultsRef = el)}>
+        <MenuScroll
+          class="min-h-0 flex-1"
+          viewportClass="command-palette-scroll"
+          viewportRef={(el) => (resultsRef = el)}
+        >
           <div id={typeahead.listID} class="command-palette-results" role="listbox">
             <div class="command-palette-group">
               <Show when={title()}>
@@ -563,7 +579,7 @@ function NewSessionLocationDialog(props: {
               </Show>
             </div>
           </div>
-        </div>
+        </MenuScroll>
       </DialogBody>
     </Dialog>
   )
diff --git a/packages/app/src/new-session/view.tsx b/packages/app/src/new-session/view.tsx
index a305a12e709c..5d44390bb0b9 100644
--- a/packages/app/src/new-session/view.tsx
+++ b/packages/app/src/new-session/view.tsx
@@ -294,6 +294,17 @@ function NewSessionLocation(props: {
   const command = useCommand()
   const [layout, setLayout] = createStore({ width: 0, font: "" })
 
+  command.register("new-session-worktree", () => [
+    {
+      id: "session.location.select",
+      title: language.t("session.location.worktree"),
+      category: language.t("command.category.workspace"),
+      keybind: "mod+alt+o",
+      disabled: !props.onWorktree,
+      onSelect: props.onWorktree,
+    },
+  ])
+
   const worktree = () => {
     if (props.workspace === "main") return
 
@@ -317,7 +328,14 @@ function NewSessionLocation(props: {
           <Tooltip
             placement="top"
             openDelay={800}
-            value={language.t("session.new.project.trigger.tooltip")}
+            value={
+              <span class="flex items-center gap-2">
+                {language.t("session.new.project.trigger.tooltip")}
+                <Show when={command.keybindParts("project.select").length}>
+                  <Keybind keys={command.keybindParts("project.select")} variant="neutral" />
+                </Show>
+              </span>
+            }
             class="flex min-w-0"
           >
             <button
@@ -347,8 +365,8 @@ function NewSessionLocation(props: {
                   placement="top"
                   openDelay={800}
                   value={
-                    props.onboarding ? (
-                      <div class="flex flex-col gap-1 text-start">
+                    <div class="flex flex-col gap-1 text-start">
+                      <Show when={props.onboarding}>
                         <div class="flex items-center gap-1.5 font-[530] text-v2-text-text-base">
                           <Icon name="outline-worktree" size="small" class="shrink-0 text-v2-text-text-accent" />
                           <span>{language.t("workspace.onboarding.title")}</span>
@@ -356,10 +374,17 @@ function NewSessionLocation(props: {
                         <span class="font-[440] text-v2-text-text-muted">
                           {language.t("workspace.onboarding.description")}
                         </span>
-                      </div>
-                    ) : (
-                      language.t("session.location.worktree")
-                    )
+                      </Show>
+                      <span
+                        class="flex items-center justify-between gap-2"
+                        classList={{ "font-[440] text-v2-text-text-muted": props.onboarding }}
+                      >
+                        {language.t("session.location.worktree")}
+                        <Show when={command.keybindParts("session.location.select").length}>
+                          <Keybind keys={command.keybindParts("session.location.select")} variant="neutral" />
+                        </Show>
+                      </span>
+                    </div>
                   }
                   contentClass={props.onboarding ? "max-w-[280px]" : undefined}
                   class="flex min-w-12 shrink-[1000]"
@@ -377,7 +402,9 @@ function NewSessionLocation(props: {
                       size="small"
                       class="shrink-0 text-v2-icon-icon-muted"
                     />
-                    <span class="min-w-0 truncate">{worktree() ?? language.t("session.new.workspace.triggerLocal")}</span>
+                    <span class="min-w-0 truncate">
+                      {worktree() ?? language.t("session.new.workspace.triggerLocal")}
+                    </span>
                     <Show when={props.onboarding}>
                       <span
                         data-slot="workspace-onboarding-dot"
@@ -398,7 +425,7 @@ function NewSessionLocation(props: {
         {(directory) => (
           <div
             class="flex min-w-0 flex-1 justify-end pe-1.5 @max-[560px]:hidden"
-            style={{ "min-width": `min(50%, ${Math.ceil(fitted().minimum) + 26}px)` }}
+            style={{ "min-width": `min(50%, ${Math.ceil(fitted().minimum) + 6}px)` }}
           >
             <Tooltip
               placement="top"
@@ -409,39 +436,24 @@ function NewSessionLocation(props: {
             >
               <span
                 ref={(row) =>
-                  createResizeObserver(row, () => {
-                    const icon = row.querySelector("[data-slot=new-session-location-icon]")
-                    const style = getComputedStyle(row)
-
+                  createResizeObserver(row, () =>
                     setLayout({
-                      width: row.clientWidth - (icon ? icon.clientWidth + parseFloat(style.columnGap) : 0),
-                      font: style.font,
-                    })
-                  })
+                      width: row.clientWidth,
+                      font: getComputedStyle(row).font,
+                    }),
+                  )
                 }
-                class="flex min-w-0 flex-1 items-center justify-end gap-1.5"
+                class="flex min-w-0 flex-1 items-center justify-end"
                 dir="ltr"
               >
-                {/* The worktree trigger already says Local, so only a worktree marks its path. */}
-                <Show when={worktree()}>
-                  <Tooltip
-                    placement="top"
-                    openDelay={800}
-                    value={
-                      <span class="flex items-center gap-2">
-                        {language.t("session.location.toggle")}
-                        <Keybind keys={command.keybindParts("session.location.cycle")} variant="neutral" />
-                      </span>
-                    }
-                  >
-                    <span class="flex shrink-0" data-slot="new-session-location-icon">
-                      <Icon name="outline-worktree" size="small" class="text-v2-icon-icon-muted" />
-                    </span>
-                  </Tooltip>
-                </Show>
                 <span
                   data-slot="new-session-location-path"
-                  class="min-w-0 overflow-hidden whitespace-nowrap text-v2-text-text-faint [direction:rtl] [text-align:end]"
+                  class="min-w-0 cursor-text select-text overflow-hidden whitespace-nowrap text-v2-text-text-faint [direction:rtl] [text-align:end]"
+                  onCopy={(event) => {
+                    if (!event.clipboardData || window.getSelection()?.toString() !== fitted().text) return
+                    event.clipboardData.setData("text/plain", directory)
+                    event.preventDefault()
+                  }}
                 >
                   <bdi dir="ltr">{fitted().text}</bdi>
                 </span>
diff --git a/packages/app/src/new-session/workspace/selector.tsx b/packages/app/src/new-session/workspace/selector.tsx
index 4d26aba40b0a..98e2202256bd 100644
--- a/packages/app/src/new-session/workspace/selector.tsx
+++ b/packages/app/src/new-session/workspace/selector.tsx
@@ -55,7 +55,7 @@ export function NewSessionBranch(props: { workspace: NewSessionWorkspaceControll
       id: "session.branch.choose",
       title: language.t("command.session.branch.choose"),
       category: language.t("command.category.workspace"),
-      keybind: "mod+alt+.",
+      keybind: "mod+alt+b",
       disabled: !creating() || !props.workspace.bar.branch(),
       onSelect: (source) => {
         changeOpen(source === "palette" || !state.open)
@@ -126,7 +126,7 @@ export function NewSessionBranch(props: { workspace: NewSessionWorkspaceControll
           when={creating()}
           fallback={
             <div class="flex h-7 min-w-0 max-w-[220px] items-center gap-1.5 ps-1.5 pe-2 text-v2-text-text-faint">
-              <Icon name="branch" size="small" class="shrink-0 text-v2-icon-icon-muted" />
+              <Icon name="branch" size="normal" class="shrink-0 text-v2-icon-icon-muted" />
               <span ref={observe} dir="auto" class="min-w-0 truncate">
                 {label()}
               </span>
@@ -140,7 +140,7 @@ export function NewSessionBranch(props: { workspace: NewSessionWorkspaceControll
               aria-description={language.t("command.session.branch.choose")}
               class="flex h-7 min-w-0 max-w-[220px] items-center gap-1.5 rounded-sm px-1.5 text-v2-text-text-muted transition-colors hover:bg-v2-overlay-simple-overlay-hover hover:text-v2-text-text-base focus-visible:bg-v2-overlay-simple-overlay-hover focus-visible:text-v2-text-text-base focus-visible:outline-none data-[expanded]:bg-v2-overlay-simple-overlay-pressed data-[expanded]:text-v2-text-text-base"
             >
-              <Icon name="branch-out" size="small" class="shrink-0 text-v2-icon-icon-muted" />
+              <Icon name="branch-out" size="normal" class="shrink-0 text-v2-icon-icon-muted" />
               <span ref={observe} dir="auto" class="min-w-0 truncate">
                 {label()}
               </span>
diff --git a/packages/app/src/providers/connect/dialog.tsx b/packages/app/src/providers/connect/dialog.tsx
index 78ecdf9d54d5..dad2689903ee 100644
--- a/packages/app/src/providers/connect/dialog.tsx
+++ b/packages/app/src/providers/connect/dialog.tsx
@@ -272,11 +272,6 @@ const POPULAR: readonly string[] = connectPopular
 function ProviderPicker(props: { directory?: string; onSelect: (provider: string) => void; onPrepare?: () => void }) {
   const integrations = useIntegrations(() => props.directory)
   const language = useLanguage()
-  const data = useData()
-  const location = () => (props.directory ? { directory: props.directory } : undefined)
-  const mcpServers = () => data.location.mcp.server.list(location()) ?? []
-
-  createEffect(() => void data.location.mcp.server.sync(location()).catch(() => undefined))
 
   const [store, setStore] = createStore<{
     filter: string
@@ -285,30 +280,23 @@ function ProviderPicker(props: { directory?: string; onSelect: (provider: string
     filter: "",
   })
 
+  // MCP servers are connected and managed from the MCP dialog, not here.
   const all = createMemo(() => {
     const query = store.filter.trim().toLowerCase()
 
-    if (!query) return integrations.list()
-
-    return integrations.list().filter((row) => `${row.id} ${row.name}`.toLowerCase().includes(query))
+    return integrations
+      .list()
+      .filter((row) => row.metadata?.source !== "mcp")
+      .filter((row) => !query || `${row.id} ${row.name}`.toLowerCase().includes(query))
   })
 
-  // MCP servers keep their own group whether or not they are signed in.
-  const providers = createMemo(() => all().filter((row) => row.metadata?.source !== "mcp"))
-
   const connected = createMemo(() =>
-    providers()
+    all()
       .filter((row) => row.connections.length > 0)
       .toSorted((a, b) => a.name.localeCompare(b.name)),
   )
 
-  const unconnected = createMemo(() => providers().filter((row) => row.connections.length === 0))
-
-  const mcp = createMemo(() =>
-    all()
-      .filter((row) => row.metadata?.source === "mcp")
-      .toSorted((a, b) => a.name.localeCompare(b.name)),
-  )
+  const unconnected = createMemo(() => all().filter((row) => row.connections.length === 0))
 
   const popular = createMemo(() =>
     unconnected()
@@ -324,7 +312,6 @@ function ProviderPicker(props: { directory?: string; onSelect: (provider: string
 
   const groups = () => [
     { title: language.t("dialog.provider.connected"), items: connected },
-    { title: language.t("dialog.provider.group.mcp"), items: mcp },
     { title: language.t("dialog.provider.group.popular"), items: popular },
     { title: language.t("dialog.provider.group.services"), items: services },
   ]
@@ -332,7 +319,7 @@ function ProviderPicker(props: { directory?: string; onSelect: (provider: string
   // An integration that only reads environment variables has nothing to connect from here.
   const disabled = (row: IntegrationInfo) => connectMethods(row).length === 0 && providerAccounts(row).length === 0
 
-  const rows = createMemo(() => [...connected(), ...mcp(), ...popular(), ...services()].filter((row) => !disabled(row)))
+  const rows = createMemo(() => [...connected(), ...popular(), ...services()].filter((row) => !disabled(row)))
 
   let picker: HTMLDivElement | undefined
   let search: HTMLInputElement | undefined
@@ -394,21 +381,13 @@ function ProviderPicker(props: { directory?: string; onSelect: (provider: string
                   </div>
                   <For each={group.items()}>
                     {(provider) => {
-                      const mcp = provider.metadata?.source === "mcp"
                       const connection = () => provider.connections[0]
 
-                      const needsSignIn = () =>
-                        !!connection()?.status ||
-                        (mcp &&
-                          mcpServers().some(
-                            (server) => server.integrationID === provider.id && server.status.status === "needs_auth",
-                          ))
-
                       // The server lists the active account first.
                       const account = () => {
                         const current = connection()
 
-                        if (mcp || !current) return
+                        if (!current) return
 
                         return current.type === "credential" ? current.label : `$${current.name}`
                       }
@@ -448,7 +427,7 @@ function ProviderPicker(props: { directory?: string; onSelect: (provider: string
                               </Badge>
                             )}
                           </Show>
-                          <Show when={needsSignIn()}>
+                          <Show when={!!connection()?.status}>
                             <span
                               data-slot="provider-status"
                               class="ms-auto shrink-0 pe-1 font-[440] text-[var(--v2-state-fg-warning)]"
@@ -551,9 +530,6 @@ function ProviderConnection(props: {
 
   const showAccounts = () => !!props.accounts && !state.adding && accounts().length > 0
 
-  const mcp = () =>
-    integrations.list().find((integration) => integration.id === props.provider)?.metadata?.source === "mcp"
-
   const controller = createProviderConnectionController({
     provider: () => integrationID,
     directory,
@@ -586,8 +562,7 @@ function ProviderConnection(props: {
     })
 
     // Like the TUI, every connection continues to that provider's models, not just the first.
-    // MCP servers have no models, so they close instead.
-    const first = mcp() ? undefined : connectionGroups()[0]?.models[0]
+    const first = connectionGroups()[0]?.models[0]
 
     if (first) {
       setState({ models: true, selectedModel: modelKey(first) })
diff --git a/packages/app/src/runtime/i18n/en.ts b/packages/app/src/runtime/i18n/en.ts
index 9708688912c1..08c854a20cea 100644
--- a/packages/app/src/runtime/i18n/en.ts
+++ b/packages/app/src/runtime/i18n/en.ts
@@ -103,6 +103,7 @@ export const dict = {
   "command.model.variant.cycle.description": "Switch to the next model variant",
   "command.prompt.mode.shell": "Shell",
   "command.prompt.mode.normal": "Prompt",
+  "command.prompt.mode.toggle": "Toggle shell mode",
   "command.permissions.autoaccept.enable": "Auto-accept permissions",
   "command.permissions.autoaccept.disable": "Stop auto-accepting permissions",
   "command.permissions.autoaccept.project": "Auto-accept permissions for this project",
@@ -135,7 +136,6 @@ export const dict = {
   "dialog.provider.search.placeholder": "Search providers",
   "dialog.provider.empty": "No providers found",
   "dialog.provider.group.popular": "Popular",
-  "dialog.provider.group.mcp": "MCP",
   "dialog.provider.group.services": "Services",
   "dialog.provider.environmentOnly": "Environment only",
   "dialog.provider.signInRequired": "Sign in required →",
@@ -687,6 +687,10 @@ export const dict = {
   "session.quote.optionalCommentPlaceholder": "Add an optional comment...",
   "session.quote.done": "Done",
   "session.quote.addComment": "Add comment",
+  "session.quote.send": "Send quote",
+  "session.quote.queue": "Queue quote",
+  "session.quote.steer": "Steer with quote",
+  "session.quote.sendFailed": "Couldn’t send. Your comment is still here. Try again.",
   "session.quote.commentPlaceholder": "Add a comment about this quote",
   "session.quote.tooLong": "Selection too long",
   "session.header.open.finder": "Finder",
diff --git a/packages/app/src/shell/titlebar/recently-closed-tabs-menu.tsx b/packages/app/src/shell/titlebar/recently-closed-tabs-menu.tsx
index 7a7891424935..cb5c0ffd3d9f 100644
--- a/packages/app/src/shell/titlebar/recently-closed-tabs-menu.tsx
+++ b/packages/app/src/shell/titlebar/recently-closed-tabs-menu.tsx
@@ -48,6 +48,7 @@ export function RecentlyClosedTabsMenu(props: {
   })
 
   const servers = createMemo(() => global.servers.list())
+
   const sessions = useQueries(() => ({
     queries: servers().map((conn) => {
       const ctx = global.serverCtx(ServerConnection.key(conn))
@@ -135,7 +136,7 @@ export function RecentlyClosedTabsMenu(props: {
             queueMicrotask(() => search?.focus())
           }}
         >
-          <div class="recently-closed-search mx-1 mb-1" data-empty={!state.query}>
+          <div class="recently-closed-search m-1" data-empty={!state.query}>
             <TextInput
               ref={search}
               type="search"
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 0e8efa65be5e..494a8327c49f 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "shuvcode",
-  "version": "2.2.4-shuv.1",
+  "version": "2.2.5-shuv.1",
   "type": "module",
   "license": "MIT",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 0a0265d479f5..dfd76419e1b5 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/client",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "type": "module",
   "license": "MIT",
   "repository": {
diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts
index c08cf73088e7..52c563fc9bb2 100644
--- a/packages/client/src/promise/generated/types.ts
+++ b/packages/client/src/promise/generated/types.ts
@@ -366,6 +366,8 @@ export type UsageLimitsMeter = { percent: number; limited: boolean; resetsAt: nu
 
 export type McpProtocol = "legacy" | "auto" | "2026-07-28"
 
+export type ConfigCompactionPercent = string
+
 export type ConfigWorktree = { directory: string }
 
 export type ConfigModelReasoning =
@@ -2454,7 +2456,7 @@ export type ConfigEntry =
                 }
           }
         }
-        compaction?: { auto?: boolean; keep?: { tokens?: number }; buffer?: number }
+        compaction?: { auto?: boolean; keep?: { tokens?: number }; buffer?: ConfigCompactionPercent | number }
         skills?: Array<string>
         commands?: {
           [x: string]: {
diff --git a/packages/codemode/package.json b/packages/codemode/package.json
index ca6e26d37846..34a41d3b3b3c 100644
--- a/packages/codemode/package.json
+++ b/packages/codemode/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/codemode",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "description": "Effect-native confined code execution over schema-described tools",
   "type": "module",
   "license": "MIT",
diff --git a/packages/console/app/package.json b/packages/console/app/package.json
index 6449307762a8..3cc3445ee410 100644
--- a/packages/console/app/package.json
+++ b/packages/console/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode/console-app",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/console/app/src/i18n/ar.ts b/packages/console/app/src/i18n/ar.ts
index 336722b9670c..c1a8b246e91c 100644
--- a/packages/console/app/src/i18n/ar.ts
+++ b/packages/console/app/src/i18n/ar.ts
@@ -112,7 +112,7 @@ export const dict = {
   "home.faq.a3.p4.beforeLocal": "ويمكنك أيضًا ربط",
   "home.faq.a3.p4.localLink": "النماذج المحلية",
   "home.faq.q4": "هل يمكنني استخدام اشتراكاتي الحالية مع OpenCode؟",
-  "home.faq.a4.p1": "نعم، يمكنك استخدام اشتراكات ChatGPT Plus/Pro أو GitHub Copilot، أو اشتراك Claude عبر Claude Code.",
+  "home.faq.a4.p1": "نعم، يمكنك استخدام اشتراكات ChatGPT Plus/Pro أو GitHub Copilot.",
   "home.faq.q5": "هل يمكنني استخدام OpenCode في الطرفية فقط؟",
   "home.faq.a5.beforeDesktop": "ليس بعد الآن! OpenCode متاح الآن كتطبيق لـ",
   "home.faq.a5.desktop": "سطح المكتب",
diff --git a/packages/console/app/src/i18n/br.ts b/packages/console/app/src/i18n/br.ts
index f5c0d5d8ae00..c10491232813 100644
--- a/packages/console/app/src/i18n/br.ts
+++ b/packages/console/app/src/i18n/br.ts
@@ -116,8 +116,7 @@ export const dict = {
   "home.faq.a3.p4.beforeLocal": "Você pode até conectar seus",
   "home.faq.a3.p4.localLink": "modelos locais",
   "home.faq.q4": "Posso usar minhas assinaturas de IA existentes com o OpenCode?",
-  "home.faq.a4.p1":
-    "Sim, você pode usar suas assinaturas ChatGPT Plus/Pro ou GitHub Copilot, ou sua assinatura do Claude pelo Claude Code.",
+  "home.faq.a4.p1": "Sim, você pode usar suas assinaturas ChatGPT Plus/Pro ou GitHub Copilot.",
   "home.faq.q5": "Posso usar o OpenCode apenas no terminal?",
   "home.faq.a5.beforeDesktop": "Não mais! OpenCode agora está disponível como um app para o seu",
   "home.faq.a5.desktop": "desktop",
diff --git a/packages/console/app/src/i18n/da.ts b/packages/console/app/src/i18n/da.ts
index 14c4ea971c70..27940d147ae1 100644
--- a/packages/console/app/src/i18n/da.ts
+++ b/packages/console/app/src/i18n/da.ts
@@ -115,8 +115,7 @@ export const dict = {
   "home.faq.a3.p4.beforeLocal": "Du kan endda forbinde dine",
   "home.faq.a3.p4.localLink": "lokale modeller",
   "home.faq.q4": "Kan jeg bruge mine eksisterende AI-abonnementer med OpenCode?",
-  "home.faq.a4.p1":
-    "Ja, du kan bruge dine ChatGPT Plus/Pro- eller GitHub Copilot-abonnementer eller dit Claude-abonnement via Claude Code.",
+  "home.faq.a4.p1": "Ja, du kan bruge dine ChatGPT Plus/Pro- eller GitHub Copilot-abonnementer.",
   "home.faq.q5": "Kan jeg kun bruge OpenCode i terminalen?",
   "home.faq.a5.beforeDesktop": "Ikke længere! OpenCode er nu tilgængelig som en app til",
   "home.faq.a5.desktop": "desktop",
diff --git a/packages/console/app/src/i18n/de.ts b/packages/console/app/src/i18n/de.ts
index 71e02fa796c7..5397fb14cbd9 100644
--- a/packages/console/app/src/i18n/de.ts
+++ b/packages/console/app/src/i18n/de.ts
@@ -115,8 +115,7 @@ export const dict = {
   "home.faq.a3.p4.beforeLocal": "Du kannst sogar deine",
   "home.faq.a3.p4.localLink": "lokalen Modelle verbinden",
   "home.faq.q4": "Kann ich meine bestehenden AI-Abos mit OpenCode nutzen?",
-  "home.faq.a4.p1":
-    "Ja, du kannst deine ChatGPT Plus/Pro- oder GitHub Copilot-Abos sowie dein Claude-Abo über Claude Code nutzen.",
+  "home.faq.a4.p1": "Ja, du kannst deine ChatGPT Plus/Pro- oder GitHub Copilot-Abos nutzen.",
   "home.faq.q5": "Kann ich OpenCode nur im Terminal nutzen?",
   "home.faq.a5.beforeDesktop": "Nicht mehr! OpenCode ist jetzt als App für",
   "home.faq.a5.desktop": "Desktop",
diff --git a/packages/console/app/src/i18n/en.ts b/packages/console/app/src/i18n/en.ts
index 03d84bfb4056..c321527b41bd 100644
--- a/packages/console/app/src/i18n/en.ts
+++ b/packages/console/app/src/i18n/en.ts
@@ -115,8 +115,7 @@ export const dict = {
   "home.faq.a3.p4.beforeLocal": "You can even connect your",
   "home.faq.a3.p4.localLink": "local models",
   "home.faq.q4": "Can I use my existing AI subscriptions with OpenCode?",
-  "home.faq.a4.p1":
-    "Yes, you can use your ChatGPT Plus/Pro or GitHub Copilot subscriptions, or your Claude subscription through Claude Code.",
+  "home.faq.a4.p1": "Yes, you can use your ChatGPT Plus/Pro or GitHub Copilot subscriptions.",
   "home.faq.q5": "Can I only use OpenCode in the terminal?",
   "home.faq.a5.beforeDesktop": "Not anymore! OpenCode is now available as an app for your",
   "home.faq.a5.desktop": "desktop",
diff --git a/packages/console/app/src/i18n/es.ts b/packages/console/app/src/i18n/es.ts
index 6db37ea70ac6..dd74a99f701c 100644
--- a/packages/console/app/src/i18n/es.ts
+++ b/packages/console/app/src/i18n/es.ts
@@ -116,8 +116,7 @@ export const dict = {
   "home.faq.a3.p4.beforeLocal": "Incluso puedes conectar tus",
   "home.faq.a3.p4.localLink": "modelos locales",
   "home.faq.q4": "¿Puedo usar mis suscripciones de IA existentes con OpenCode?",
-  "home.faq.a4.p1":
-    "Sí, puedes usar tus suscripciones de ChatGPT Plus/Pro o GitHub Copilot, o tu suscripción de Claude a través de Claude Code.",
+  "home.faq.a4.p1": "Sí, puedes usar tus suscripciones de ChatGPT Plus/Pro o GitHub Copilot.",
   "home.faq.q5": "¿Solo puedo usar OpenCode en la terminal?",
   "home.faq.a5.beforeDesktop": "¡Ya no! OpenCode ahora está disponible como una aplicación para tu",
   "home.faq.a5.desktop": "escritorio",
diff --git a/packages/console/app/src/i18n/fr.ts b/packages/console/app/src/i18n/fr.ts
index c21dae9553fd..542d00524689 100644
--- a/packages/console/app/src/i18n/fr.ts
+++ b/packages/console/app/src/i18n/fr.ts
@@ -115,8 +115,7 @@ export const dict = {
   "home.faq.a3.p4.beforeLocal": "Vous pouvez même connecter vos",
   "home.faq.a3.p4.localLink": "modèles locaux",
   "home.faq.q4": "Puis-je utiliser mes abonnements IA existants avec OpenCode ?",
-  "home.faq.a4.p1":
-    "Oui, vous pouvez utiliser vos abonnements ChatGPT Plus/Pro ou GitHub Copilot, ou votre abonnement Claude via Claude Code.",
+  "home.faq.a4.p1": "Oui, vous pouvez utiliser vos abonnements ChatGPT Plus/Pro ou GitHub Copilot.",
   "home.faq.q5": "Puis-je utiliser OpenCode uniquement dans le terminal ?",
   "home.faq.a5.beforeDesktop": "Plus maintenant ! OpenCode est désormais disponible en application pour",
   "home.faq.a5.desktop": "desktop",
diff --git a/packages/console/app/src/i18n/it.ts b/packages/console/app/src/i18n/it.ts
index 0ebc81ef9756..2cd7932ee0cc 100644
--- a/packages/console/app/src/i18n/it.ts
+++ b/packages/console/app/src/i18n/it.ts
@@ -114,8 +114,7 @@ export const dict = {
   "home.faq.a3.p4.beforeLocal": "Puoi anche collegare i tuoi",
   "home.faq.a3.p4.localLink": "modelli locali",
   "home.faq.q4": "Posso usare i miei abbonamenti IA esistenti con OpenCode?",
-  "home.faq.a4.p1":
-    "Sì, puoi usare i tuoi abbonamenti ChatGPT Plus/Pro o GitHub Copilot, oppure il tuo abbonamento Claude tramite Claude Code.",
+  "home.faq.a4.p1": "Sì, puoi usare i tuoi abbonamenti ChatGPT Plus/Pro o GitHub Copilot.",
   "home.faq.q5": "Posso usare OpenCode solo nel terminale?",
   "home.faq.a5.beforeDesktop": "Non più! OpenCode ora è disponibile come app per",
   "home.faq.a5.desktop": "desktop",
diff --git a/packages/console/app/src/i18n/ja.ts b/packages/console/app/src/i18n/ja.ts
index 2e9641d84e7f..96830361e1be 100644
--- a/packages/console/app/src/i18n/ja.ts
+++ b/packages/console/app/src/i18n/ja.ts
@@ -114,8 +114,7 @@ export const dict = {
   "home.faq.a3.p4.beforeLocal": "さらに、",
   "home.faq.a3.p4.localLink": "ローカルモデル",
   "home.faq.q4": "既存のAIサブスクリプションをOpenCodeで使えますか？",
-  "home.faq.a4.p1":
-    "はい、ChatGPT Plus/ProまたはGitHub Copilotのサブスクリプション、またはClaude Code経由でClaudeのサブスクリプションを利用できます。",
+  "home.faq.a4.p1": "はい、ChatGPT Plus/ProまたはGitHub Copilotのサブスクリプションを利用できます。",
   "home.faq.q5": "ターミナルだけで使えますか？",
   "home.faq.a5.beforeDesktop": "もう違います！OpenCodeは今は",
   "home.faq.a5.desktop": "デスクトップ",
diff --git a/packages/console/app/src/i18n/ko.ts b/packages/console/app/src/i18n/ko.ts
index a20b954d543a..1b11893edf0c 100644
--- a/packages/console/app/src/i18n/ko.ts
+++ b/packages/console/app/src/i18n/ko.ts
@@ -113,8 +113,7 @@ export const dict = {
   "home.faq.a3.p4.beforeLocal": "또한",
   "home.faq.a3.p4.localLink": "로컬 모델",
   "home.faq.q4": "기존 AI 구독을 OpenCode에서 사용할 수 있나요?",
-  "home.faq.a4.p1":
-    "네, ChatGPT Plus/Pro 또는 GitHub Copilot 구독을 사용할 수 있으며, Claude Code를 통해 Claude 구독도 사용할 수 있습니다.",
+  "home.faq.a4.p1": "네, ChatGPT Plus/Pro 또는 GitHub Copilot 구독을 사용할 수 있습니다.",
   "home.faq.q5": "OpenCode는 터미널에서만 사용할 수 있나요?",
   "home.faq.a5.beforeDesktop": "이제 아닙니다! OpenCode는 이제",
   "home.faq.a5.desktop": "데스크톱",
diff --git a/packages/console/app/src/i18n/no.ts b/packages/console/app/src/i18n/no.ts
index f55d62426c28..c8bbdf2201b6 100644
--- a/packages/console/app/src/i18n/no.ts
+++ b/packages/console/app/src/i18n/no.ts
@@ -115,8 +115,7 @@ export const dict = {
   "home.faq.a3.p4.beforeLocal": "Du kan til og med koble til dine",
   "home.faq.a3.p4.localLink": "lokale modeller",
   "home.faq.q4": "Kan jeg bruke mine eksisterende AI-abonnementer med OpenCode?",
-  "home.faq.a4.p1":
-    "Ja, du kan bruke ChatGPT Plus/Pro- eller GitHub Copilot-abonnementene dine, eller Claude-abonnementet ditt via Claude Code.",
+  "home.faq.a4.p1": "Ja, du kan bruke ChatGPT Plus/Pro- eller GitHub Copilot-abonnementene dine.",
   "home.faq.q5": "Kan jeg bare bruke OpenCode i terminalen?",
   "home.faq.a5.beforeDesktop": "Ikke lenger! OpenCode er nå tilgjengelig som en app for",
   "home.faq.a5.desktop": "desktop",
diff --git a/packages/console/app/src/i18n/pl.ts b/packages/console/app/src/i18n/pl.ts
index 2b585d006000..18a93ad4df05 100644
--- a/packages/console/app/src/i18n/pl.ts
+++ b/packages/console/app/src/i18n/pl.ts
@@ -114,8 +114,7 @@ export const dict = {
   "home.faq.a3.p4.beforeLocal": "Możesz nawet podłączyć swoje",
   "home.faq.a3.p4.localLink": "lokalne modele",
   "home.faq.q4": "Czy mogę używać moich istniejących subskrypcji AI z OpenCode?",
-  "home.faq.a4.p1":
-    "Tak, możesz używać swoich subskrypcji ChatGPT Plus/Pro lub GitHub Copilot albo subskrypcji Claude przez Claude Code.",
+  "home.faq.a4.p1": "Tak, możesz używać swoich subskrypcji ChatGPT Plus/Pro lub GitHub Copilot.",
   "home.faq.q5": "Czy mogę używać OpenCode tylko w terminalu?",
   "home.faq.a5.beforeDesktop": "Już nie! OpenCode jest teraz dostępny jako aplikacja na",
   "home.faq.a5.desktop": "pulpit (desktop)",
diff --git a/packages/console/app/src/i18n/ru.ts b/packages/console/app/src/i18n/ru.ts
index 025d3fa41202..4174c44de2cf 100644
--- a/packages/console/app/src/i18n/ru.ts
+++ b/packages/console/app/src/i18n/ru.ts
@@ -116,8 +116,7 @@ export const dict = {
   "home.faq.a3.p4.beforeLocal": "Вы даже можете подключить ваши",
   "home.faq.a3.p4.localLink": "локальные модели",
   "home.faq.q4": "Могу ли я использовать мои существующие AI-подписки с OpenCode?",
-  "home.faq.a4.p1":
-    "Да, вы можете использовать ваши подписки ChatGPT Plus/Pro или GitHub Copilot, а также подписку Claude через Claude Code.",
+  "home.faq.a4.p1": "Да, вы можете использовать ваши подписки ChatGPT Plus/Pro или GitHub Copilot.",
   "home.faq.q5": "Можно ли использовать OpenCode только в терминале?",
   "home.faq.a5.beforeDesktop": "Больше нет! OpenCode теперь доступен как приложение для",
   "home.faq.a5.desktop": "десктопа",
diff --git a/packages/console/app/src/i18n/th.ts b/packages/console/app/src/i18n/th.ts
index 62ea9763e7c2..74f82b6d6e6e 100644
--- a/packages/console/app/src/i18n/th.ts
+++ b/packages/console/app/src/i18n/th.ts
@@ -112,8 +112,7 @@ export const dict = {
   "home.faq.a3.p4.beforeLocal": "คุณยังสามารถเชื่อมต่อกับ",
   "home.faq.a3.p4.localLink": "โมเดล Local ของคุณ",
   "home.faq.q4": "ฉันสามารถใช้การสมัครสมาชิก AI ที่มีอยู่กับ OpenCode ได้หรือไม่?",
-  "home.faq.a4.p1":
-    "ได้ คุณสามารถใช้การสมัครสมาชิก ChatGPT Plus/Pro หรือ GitHub Copilot ของคุณได้ รวมถึงการสมัครสมาชิก Claude ผ่าน Claude Code",
+  "home.faq.a4.p1": "ได้ คุณสามารถใช้การสมัครสมาชิก ChatGPT Plus/Pro หรือ GitHub Copilot ของคุณได้",
   "home.faq.q5": "ฉันใช้ OpenCode ได้เฉพาะในเทอร์มินัลใช่หรือไม่?",
   "home.faq.a5.beforeDesktop": "ไม่อีกต่อไป! OpenCode มีแอปสำหรับ",
   "home.faq.a5.desktop": "เดสก์ท็อป",
diff --git a/packages/console/app/src/i18n/tr.ts b/packages/console/app/src/i18n/tr.ts
index b52b66b44950..3811ecc701aa 100644
--- a/packages/console/app/src/i18n/tr.ts
+++ b/packages/console/app/src/i18n/tr.ts
@@ -113,8 +113,7 @@ export const dict = {
   "home.faq.a3.p4.beforeLocal": "Hatta",
   "home.faq.a3.p4.localLink": "yerel modellerinizi bağlayabilirsiniz",
   "home.faq.q4": "Mevcut AI aboneliklerimi OpenCode ile kullanabilir miyim?",
-  "home.faq.a4.p1":
-    "Evet, ChatGPT Plus/Pro veya GitHub Copilot aboneliklerinizi ya da Claude Code üzerinden Claude aboneliğinizi kullanabilirsiniz.",
+  "home.faq.a4.p1": "Evet, ChatGPT Plus/Pro veya GitHub Copilot aboneliklerinizi kullanabilirsiniz.",
   "home.faq.q5": "OpenCode'u sadece terminalde mi kullanabilirim?",
   "home.faq.a5.beforeDesktop": "Artık hayır! OpenCode artık sizin bu cihazlarınıza",
   "home.faq.a5.desktop": "masaüstü",
diff --git a/packages/console/app/src/i18n/uk.ts b/packages/console/app/src/i18n/uk.ts
index 77ed565d92e4..6621951ea7fb 100644
--- a/packages/console/app/src/i18n/uk.ts
+++ b/packages/console/app/src/i18n/uk.ts
@@ -114,8 +114,7 @@ export const dict = {
   "home.faq.a3.p4.beforeLocal": "Ви навіть можете підключити свої",
   "home.faq.a3.p4.localLink": "локальні моделі",
   "home.faq.q4": "Чи можу я використовувати свої наявні AI-підписки з OpenCode?",
-  "home.faq.a4.p1":
-    "Так, ви можете використовувати підписки ChatGPT Plus/Pro або GitHub Copilot, а також підписку Claude через Claude Code.",
+  "home.faq.a4.p1": "Так, ви можете використовувати підписки ChatGPT Plus/Pro або GitHub Copilot.",
   "home.faq.q5": "Чи можна використовувати OpenCode лише в терміналі?",
   "home.faq.a5.beforeDesktop": "Вже ні! OpenCode тепер доступний як застосунок для",
   "home.faq.a5.desktop": "десктопа",
diff --git a/packages/console/app/src/i18n/zh.ts b/packages/console/app/src/i18n/zh.ts
index 70be85f117e1..2afaeb38cacb 100644
--- a/packages/console/app/src/i18n/zh.ts
+++ b/packages/console/app/src/i18n/zh.ts
@@ -110,8 +110,7 @@ export const dict = {
   "home.faq.a3.p4.beforeLocal": "您甚至可以连接您的",
   "home.faq.a3.p4.localLink": "本地模型",
   "home.faq.q4": "我可以使用现有的 AI 订阅吗？",
-  "home.faq.a4.p1":
-    "可以，您可以使用您的 ChatGPT Plus/Pro 或 GitHub Copilot 订阅，也可以通过 Claude Code 使用您的 Claude 订阅。",
+  "home.faq.a4.p1": "可以，您可以使用您的 ChatGPT Plus/Pro 或 GitHub Copilot 订阅。",
   "home.faq.q5": "OpenCode 只能在终端使用吗？",
   "home.faq.a5.beforeDesktop": "不再是了！OpenCode 现在也提供",
   "home.faq.a5.desktop": "桌面端应用",
diff --git a/packages/console/app/src/i18n/zht.ts b/packages/console/app/src/i18n/zht.ts
index b9dfa017a174..8852fc53472d 100644
--- a/packages/console/app/src/i18n/zht.ts
+++ b/packages/console/app/src/i18n/zht.ts
@@ -111,8 +111,7 @@ export const dict = {
   "home.faq.a3.p4.beforeLocal": "你還可以連接你的",
   "home.faq.a3.p4.localLink": "本地模型",
   "home.faq.q4": "可以使用我現有的 AI 訂閱嗎？",
-  "home.faq.a4.p1":
-    "可以，你可以使用 ChatGPT Plus/Pro 或 GitHub Copilot 訂閱，也可以透過 Claude Code 使用 Claude 訂閱。",
+  "home.faq.a4.p1": "可以，你可以使用 ChatGPT Plus/Pro 或 GitHub Copilot 訂閱。",
   "home.faq.q5": "OpenCode 只能在終端中使用嗎？",
   "home.faq.a5.beforeDesktop": "不再是了！OpenCode 現在也提供",
   "home.faq.a5.desktop": "桌面端",
diff --git a/packages/core/package.json b/packages/core/package.json
index fa9651d91920..4e2ba09f672e 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "name": "@opencode/core",
   "type": "module",
   "license": "MIT",
diff --git a/packages/core/src/mcp/index.ts b/packages/core/src/mcp/index.ts
index 9d1b286049db..285af0a9fc9d 100644
--- a/packages/core/src/mcp/index.ts
+++ b/packages/core/src/mcp/index.ts
@@ -184,6 +184,11 @@ export const layer = (options?: Options) =>
       // Server scopes close in parallel on shutdown, so one slow server's stop grace does not delay
       // the rest past a service restart's kill deadline and leave them orphaned.
       const servers = yield* Scope.fork(root, "parallel")
+      // Connection callbacks run here. Created after `servers`, so the layer scope closes this set first
+      // (finalizers run in reverse): in-flight callbacks are interrupted and later ones never start, so
+      // connections closing with the Location publish nothing. Clients re-fetch on MCP events, which
+      // would boot the Location straight back up.
+      const callbacks = yield* FiberSet.makeRuntime<never, void, never>()
 
       const entries = new Map<ServerName, ServerEntry>()
       const attached = new Map<ServerName, AttachedEntry[]>()
@@ -352,7 +357,7 @@ export const layer = (options?: Options) =>
       const whenLive =
         (name: ServerName, entry: ServerEntry, connection: McpClient.Connection) =>
         <E>(effect: Effect.Effect<void, E>) =>
-          fork(
+          callbacks(
             Effect.suspend(() => (entry.client === connection ? effect : Effect.void)).pipe(
               locks.withLock(name),
               Effect.ignore,
diff --git a/packages/core/src/mcp/stdio.ts b/packages/core/src/mcp/stdio.ts
index 31dd7f224e14..b21c2a717a70 100644
--- a/packages/core/src/mcp/stdio.ts
+++ b/packages/core/src/mcp/stdio.ts
@@ -1,7 +1,7 @@
 export * as McpStdio from "./stdio.js"
 
-import { ReadBuffer, serializeMessage, type JSONRPCMessage, type Transport } from "@modelcontextprotocol/client"
-import { Cause, Duration, Effect, Fiber, Option, Queue, Scope, Stream } from "effect"
+import { deserializeMessage, serializeMessage, type JSONRPCMessage, type Transport } from "@modelcontextprotocol/client"
+import { Cause, Duration, Effect, Fiber, Option, Queue, Result, Scope, Stream } from "effect"
 import { ChildProcess } from "effect/process"
 import type { ChildProcessHandle } from "effect/process/ChildProcessSpawner"
 import { Environment } from "../environment/index.js"
@@ -48,11 +48,13 @@ export const make = Effect.fnUntraced(function* (options: Options) {
   // Outgoing frames are queued rather than written to `handle.stdin` directly: the sink closes the
   // stream it is run with, and stdin must stay open across the whole session.
   const outgoing = yield* Queue.bounded<string, Cause.Done>(OUTGOING_CAPACITY)
-  const buffer = new ReadBuffer()
   const state: { phase: "ready" | "starting" | "open" | "closed"; handle?: ChildProcessHandle } = { phase: "ready" }
   let startup: Promise<void> | undefined
   let closing: Promise<void> | undefined
-  let trailingBytes = 0
+  // Bytes of the unterminated line, kept as chunk views and joined once its newline arrives.
+  let pending: Array<Uint8Array> = []
+  let pendingBytes = 0
+  const decoder = new TextDecoder()
   let stderr = ""
 
   const stop = Effect.fnUntraced(function* (handle: ChildProcessHandle) {
@@ -66,13 +68,15 @@ export const make = Effect.fnUntraced(function* (options: Options) {
     (closing ??= Effect.runPromise(
       Effect.gen(function* () {
         state.phase = "closed"
+        pending = []
+        pendingBytes = 0
         Queue.endUnsafe(outgoing)
         if (startup) yield* Effect.promise(() => startup!.catch(() => undefined))
         const handle = state.handle
         if (!handle) return
         state.handle = undefined
         yield* stop(handle)
-      }).pipe(Effect.ensuring(Queue.shutdown(outgoing)), Effect.ensuring(Effect.sync(() => buffer.clear()))),
+      }).pipe(Effect.ensuring(Queue.shutdown(outgoing))),
     ))
 
   const transport: Transport = {
@@ -114,32 +118,44 @@ export const make = Effect.fnUntraced(function* (options: Options) {
     close,
   }
 
-  const deliver = (chunk: Uint8Array) =>
-    Effect.gen(function* () {
-      for (const byte of chunk) {
-        trailingBytes = byte === 10 ? 0 : trailingBytes + 1
-        if (trailingBytes > MAX_FRAME_BYTES) return yield* Effect.fail(new Error("MCP stdio frame exceeded 16 MiB"))
-      }
-      buffer.append(Buffer.from(chunk.buffer, chunk.byteOffset, chunk.byteLength))
-      while (true) {
-        // `undefined` means the frame failed to parse: the buffer has already advanced past it, so
-        // keep draining. `null` means the buffer holds no complete frame yet.
-        const message = yield* Effect.try({
-          try: () => buffer.readMessage(),
-          catch: (cause) => (cause instanceof Error ? cause : new Error(String(cause))),
-        }).pipe(
-          Effect.catch((error) =>
-            Effect.sync(() => {
-              transport.onerror?.(error)
-              return undefined
-            }),
-          ),
-        )
-        if (message === undefined) continue
-        if (message === null) return
-        transport.onmessage?.(message)
-      }
+  const deliver = (chunk: Uint8Array) => {
+    let start = 0
+    let newline = chunk.indexOf(10)
+    while (newline !== -1 && state.phase !== "closed") {
+      const line = chunk.subarray(start, newline)
+      const size = pendingBytes + line.length
+      if (size > MAX_FRAME_BYTES) return oversized()
+      receive(pending.length === 0 ? line : Buffer.concat([...pending, line], size))
+      pending = []
+      pendingBytes = 0
+      start = newline + 1
+      newline = chunk.indexOf(10, start)
+    }
+    if (start === chunk.length || state.phase === "closed") return
+    pendingBytes += chunk.length - start
+    if (pendingBytes > MAX_FRAME_BYTES) return oversized()
+    // A view is enough: the runtime hands out a fresh buffer for every pipe read.
+    pending.push(start === 0 ? chunk : chunk.subarray(start))
+  }
+
+  const receive = (line: Uint8Array) => {
+    const text = decoder.decode(line.at(-1) === 13 ? line.subarray(0, -1) : line)
+    if (text.trim() === "") return
+    const message = Result.try({
+      try: () => deserializeMessage(text),
+      catch: (cause) => new Error(`Invalid MCP stdio message from ${options.server}: ${cause}`, { cause }),
     })
+    if (Result.isFailure(message)) return transport.onerror?.(message.failure)
+    transport.onmessage?.(message.success)
+  }
+
+  // Closing fails every pending request at once rather than leaving the one this line answered waiting.
+  const oversized = () => {
+    transport.onerror?.(
+      new Error(`MCP server ${options.server} wrote more than 16 MiB to stdout without a message boundary`),
+    )
+    void close()
+  }
 
   const startOutput = (handle: ChildProcessHandle) =>
     Effect.gen(function* () {
@@ -158,7 +174,7 @@ export const make = Effect.fnUntraced(function* (options: Options) {
       )
 
       yield* Effect.forkScoped(
-        Stream.runForEach(handle.stdout, deliver).pipe(
+        Stream.runForEach(handle.stdout, (chunk) => Effect.sync(() => deliver(chunk))).pipe(
           Effect.tapCause((cause) =>
             Effect.sync(() => {
               const error = Cause.squash(cause)
diff --git a/packages/core/src/permission.ts b/packages/core/src/permission.ts
index 87f867b741ed..74279a849825 100644
--- a/packages/core/src/permission.ts
+++ b/packages/core/src/permission.ts
@@ -105,6 +105,8 @@ export interface Interface {
   readonly assert: (input: AssertInput) => Effect.Effect<void, Error | SessionErrors.NotFoundError>
   /** Fails only when the rules deny the request; never asks the user. */
   readonly assertNotDenied: (input: AssertInput) => Effect.Effect<void, BlockedError | SessionErrors.NotFoundError>
+  /** True only when the rules already allow the request; never asks the user. */
+  readonly allows: (input: AssertInput) => Effect.Effect<boolean, SessionErrors.NotFoundError>
   readonly reply: (input: ReplyInput) => Effect.Effect<void, NotFoundError>
   readonly get: (id: ID) => Effect.Effect<Request | undefined>
   readonly forSession: (sessionID: SessionSchema.ID) => Effect.Effect<ReadonlyArray<Request>>
@@ -285,6 +287,11 @@ const layer = Layer.effect(
       })
     })
 
+    const allows = Effect.fn("Permission.allows")(function* (input: AssertInput) {
+      if (closed) return false
+      return (yield* evaluateInput(input)).effect === "allow"
+    })
+
     const reply = Effect.fn("Permission.reply")((input: ReplyInput) =>
       Effect.uninterruptible(
         Effect.gen(function* () {
@@ -360,7 +367,7 @@ const layer = Layer.effect(
       return Array.from(pending.values(), (item) => item.request).filter((request) => request.sessionID === sessionID)
     })
 
-    return Service.of({ ask, assert, assertNotDenied, reply, get, forSession, list, close })
+    return Service.of({ ask, assert, assertNotDenied, allows, reply, get, forSession, list, close })
   }),
 )
 
diff --git a/packages/core/src/plugin/tool-input-repair.ts b/packages/core/src/plugin/tool-input-repair.ts
index 984f7f343f1b..c2e1f03b3628 100644
--- a/packages/core/src/plugin/tool-input-repair.ts
+++ b/packages/core/src/plugin/tool-input-repair.ts
@@ -1,8 +1,9 @@
 export * as ToolInputRepairPlugin from "./tool-input-repair.js"
 
+import { ToolFailure } from "@opencode/ai/effect"
 import { define } from "@opencode/plugin/effect/plugin"
 import { Effect, JsonSchema, Option, Predicate, Schema } from "effect"
-import { definition } from "../tool/runtime.js"
+import { definition, normalizeContent } from "../tool/runtime.js"
 
 // Repairs apply only when the input schema unambiguously supports them:
 // - Stringified root or nested object: '{"limit":"20"}' -> { limit: 20 }
@@ -18,21 +19,56 @@ import { definition } from "../tool/runtime.js"
 const decodeJson = Schema.decodeUnknownOption(Schema.fromJsonString(Schema.Unknown))
 const maxDepth = 6
 
+// Tool names models carry over from other harnesses, used only when no tool has that name.
+// The result tells the model which tool ran, so it calls that one next time.
+const aliases = new Map([["bash", "shell"]])
+
 export const Plugin = define({
   id: "opencode.tool.input.repair",
   effect: (ctx) =>
-    ctx.tool.hook("execute.before", (event) =>
-      Effect.gen(function* () {
-        // The outer Code Mode tool is built per snapshot rather than registered, so it cannot be
-        // looked up here. Its `{ code }` input is trivial; the tools it calls are repaired normally.
-        if (event.tool === "execute") return
-        const tool = (yield* ctx.tool.list()).find((tool) => tool.id === event.tool)
-        if (!tool) return
-        const schema = definition(tool).inputSchema
-        if (schema.type !== "object") return
-        event.input = repair(event.input, schema, schema, 0)
-      }),
-    ),
+    Effect.gen(function* () {
+      const aliased = new Map<string, string>()
+      yield* ctx.tool.hook("execute.before", (event) =>
+        Effect.gen(function* () {
+          // The outer Code Mode tool is built per snapshot rather than registered, so it cannot be
+          // looked up here. Its `{ code }` input is trivial; the tools it calls are repaired normally.
+          if (event.tool === "execute") return
+          const tools = yield* ctx.tool.list()
+          const alias = aliases.get(event.tool)
+          const tool =
+            tools.find((tool) => tool.id === event.tool) ??
+            (alias === undefined ? undefined : tools.find((tool) => tool.id === alias))
+          if (!tool) return
+          if (tool.id !== event.tool) {
+            aliased.set(event.id, event.tool)
+            event.tool = tool.id
+          }
+          const schema = definition(tool).inputSchema
+          if (schema.type !== "object") return
+          event.input = repair(event.input, schema, schema, 0)
+        }),
+      )
+      yield* ctx.tool.hook("execute.after", (event) =>
+        Effect.sync(() => {
+          const called = aliased.get(event.id)
+          if (called === undefined) return
+          aliased.delete(event.id)
+          const note = `There is no "${called}" tool, so this ran as "${event.tool}". Call "${event.tool}" directly.`
+          if (event.status === "error") {
+            event.error = new ToolFailure({
+              message: `${event.error.message}\n\n${note}`,
+              error: event.error.error,
+              metadata: event.error.metadata,
+            })
+            return
+          }
+          event.result = {
+            ...event.result,
+            content: [...normalizeContent(event.result.content, event.result.output), { type: "text", text: note }],
+          }
+        }),
+      )
+    }),
 })
 
 function repair(value: unknown, schema: JsonSchema.JsonSchema, root: JsonSchema.JsonSchema, depth: number): unknown {
diff --git a/packages/core/src/session/compaction.ts b/packages/core/src/session/compaction.ts
index 49005f93db11..6c6b1ba85b75 100644
--- a/packages/core/src/session/compaction.ts
+++ b/packages/core/src/session/compaction.ts
@@ -42,8 +42,8 @@ import { SessionUsage } from "./usage.js"
 
 export type Settings = {
   auto: boolean
-  /** Tokens kept free below the model's limits before compacting. Unset keeps 15%, and at least 16k, free. */
-  buffer?: number
+  /** Room kept free below the model's limits before compacting: a share such as "20%", or tokens. Unset keeps 15%, and at least 16k, free. */
+  buffer?: number | string
   /** Tokens of recent conversation kept verbatim beside the summary. */
   keep: number
   /** Summarize in the background as the context nears the threshold, so automatic compaction can swap it in. */
@@ -271,7 +271,7 @@ export const layer = Layer.effect(
     /** The model that writes the summary, and the request size it aims for. */
     const selectModel = Effect.fnUntraced(function* (
       context: SessionContext.Loaded,
-      buffer: number | undefined,
+      buffer: Settings["buffer"],
       native: boolean,
     ) {
       const agent = native ? undefined : yield* agents.get(Agent.ID.make("compaction"))
@@ -1132,13 +1132,13 @@ export const estimatePrompt = (context: SessionContext.Loaded): Estimate => {
  * `RESERVE_MIN` when that is more. A summary request that must be shrunk is aimed at the same size. A window too small
  * to give up `RESERVE_MIN` keeps `RESERVE_SHARE`.
  */
-const calculateCeiling = (limit: SessionContext.Loaded["model"]["limit"], buffer: number | undefined) => {
-  // Unknown limits are reported as 0. An unknown input limit falls back to the context window; with no window at
-  // all, only a provider rejection can limit the request.
-  const window = limit.input || limit.context
+const calculateCeiling = (limit: SessionContext.Loaded["model"]["limit"], buffer: Settings["buffer"]) => {
+  // With no window at all, only a provider rejection can limit the request.
+  const window = inputWindow(limit)
   if (window <= 0) return Number.POSITIVE_INFINITY
+  const tokens = typeof buffer === "string" ? Math.round((window * Number.parseFloat(buffer)) / 100) : buffer
   // A buffer that leaves no room, such as one set for a larger model, is ignored.
-  if (buffer !== undefined && buffer < window) return window - buffer
+  if (tokens !== undefined && tokens < window) return window - tokens
   return window - Math.max(Math.floor(window * RESERVE_SHARE), window >= 2 * RESERVE_MIN ? RESERVE_MIN : 0)
 }
 
@@ -1147,7 +1147,15 @@ const calculateCeiling = (limit: SessionContext.Loaded["model"]["limit"], buffer
  * cannot generate that much. Zero for an unknown window.
  */
 const summaryRoom = (limit: SessionContext.Loaded["model"]["limit"], output = RESERVE_MIN) =>
-  Math.max(0, (limit.input || limit.context) - Math.min(RESERVE_MIN, output))
+  Math.max(0, inputWindow(limit) - Math.min(RESERVE_MIN, output))
+
+/**
+ * The largest prompt the model takes, or 0 when unknown. Unknown limits are reported as 0, and an unknown input limit
+ * falls back to the context window. The context window also holds the reply, so an input limit above it, as some
+ * catalogs and config overrides report, cannot be used in full.
+ */
+const inputWindow = (limit: SessionContext.Loaded["model"]["limit"]) =>
+  limit.input && limit.context ? Math.min(limit.input, limit.context) : limit.input || limit.context
 
 /**
  * Another provider's count may describe a native window this model cannot replay. History then holds the original
diff --git a/packages/core/src/session/runner/to-llm-message.ts b/packages/core/src/session/runner/to-llm-message.ts
index c688c9885c09..384ee6287c51 100644
--- a/packages/core/src/session/runner/to-llm-message.ts
+++ b/packages/core/src/session/runner/to-llm-message.ts
@@ -177,8 +177,9 @@ const assistant = (message: SessionMessage.Assistant, model: Model.Ref, provider
         },
       ]
     // Let the destination adapter handle readable reasoning after a model/provider switch.
-    if (item.type === "reasoning")
-      return reuseProviderMetadata && !reasoningInterrupted
+    if (item.type === "reasoning") {
+      if (message.error !== undefined || reasoningInterrupted) return []
+      return reuseProviderMetadata
         ? [
             {
               type: "reasoning",
@@ -187,8 +188,9 @@ const assistant = (message: SessionMessage.Assistant, model: Model.Ref, provider
             },
           ]
         : item.text.length > 0
-          ? [{ type: message.error === undefined && !reasoningInterrupted ? "reasoning" : "text", text: item.text }]
+          ? [{ type: "reasoning", text: item.text }]
           : []
+    }
     // Call-side metadata is model-scoped proof of generation (Gemini thought
     // signatures, OpenAI encrypted reasoning): only the producing model may
     // replay it.
diff --git a/packages/core/src/tool/plugin/edit.ts b/packages/core/src/tool/plugin/edit.ts
index 5165e7a5547b..b380b8312f3e 100644
--- a/packages/core/src/tool/plugin/edit.ts
+++ b/packages/core/src/tool/plugin/edit.ts
@@ -187,6 +187,59 @@ const matchView = (source: string, oldString: string, newString: string) => {
   }
 }
 
+const hintLines = 12
+const hintLineLength = 200
+
+/**
+ * A short hint for an oldString miss, so the next attempt can succeed without rereading the file: newString is
+ * already there (often an edit that already applied), or the lines closest to oldString, numbered like Read output.
+ * Lines vote for where oldString starts when they match ignoring all whitespace; at least half must agree. Only the
+ * span from the first to the last line that matched is shown, so padding oldString cannot reveal the lines after it.
+ */
+const missHint = (source: string, oldString: string, newString: string) => {
+  const view = source.replaceAll(crlf, "\n")
+  const replacement = newString.replaceAll(crlf, "\n")
+  if (replacement.trim().length >= 20 && normalizeForMatch(view).includes(normalizeForMatch(replacement)))
+    return "newString is already in the file, so this edit may already be applied."
+  const key = (line: string) => normalizeForMatch(line).replace(/\s+/g, " ").trim()
+  const distinct = (line: string) => /[\p{L}\p{N}]/u.test(line)
+  const lines = view.split("\n")
+  const search = oldString.replaceAll(crlf, "\n").split("\n")
+  const positions = new Map<string, number[]>()
+  lines.forEach((line, index) => {
+    const value = key(line)
+    if (!distinct(value)) return
+    const found = positions.get(value)
+    if (found) found.push(index)
+    else positions.set(value, [index])
+  })
+  const votes = new Map<number, number>()
+  const wanted = search.filter((line, offset) => {
+    const value = key(line)
+    if (!distinct(value)) return false
+    for (const index of positions.get(value) ?? []) votes.set(index - offset, (votes.get(index - offset) ?? 0) + 1)
+    return true
+  }).length
+  const [start, count] = [...votes].reduce((best, vote) => (vote[1] > best[1] ? vote : best), [0, 0])
+  if (count === 0 || count * 2 < wanted) return
+  const matched = search.flatMap((line, offset) => {
+    const value = key(line)
+    const index = start + offset
+    return value !== "" && index >= 0 && index < lines.length && key(lines[index]) === value ? [index] : []
+  })
+  const from = matched[0]
+  const to = Math.min(matched.at(-1)! + 1, from + hintLines)
+  return [
+    "The closest lines in the file:",
+    ...lines
+      .slice(from, to)
+      .map(
+        (line, index) =>
+          `${from + index + 1}: ${line.length > hintLineLength ? `${line.slice(0, hintLineLength)}…` : line}`,
+      ),
+  ].join("\n")
+}
+
 /** Number of sorted positions strictly before offset. */
 const countBefore = (positions: number[], offset: number) => {
   let low = 0
@@ -282,8 +335,18 @@ export const Plugin = {
                 source: permissionSource,
               })
               if (replacements === 0) {
+                // The hint shows file contents, so only when reading this file is already allowed.
+                const readable = yield* permission.allows({
+                  action: "read",
+                  resources: [target.resource],
+                  save: ["*"],
+                  sessionID: context.sessionID,
+                  agent: context.agent,
+                  source: permissionSource,
+                })
+                const hint = readable ? missHint(source, input.oldString, input.newString) : undefined
                 return yield* new ToolFailure({
-                  message: `Could not find oldString in ${input.path}. It must match exactly, including whitespace and indentation.`,
+                  message: `Could not find oldString in ${input.path}. It must match exactly, including whitespace and indentation.${hint ? `\n\n${hint}` : ""}`,
                 })
               }
               if (replacements > 1 && input.replaceAll !== true) {
diff --git a/packages/core/src/tool/plugin/read.ts b/packages/core/src/tool/plugin/read.ts
index 4c541ccda3f8..12923add2ad5 100644
--- a/packages/core/src/tool/plugin/read.ts
+++ b/packages/core/src/tool/plugin/read.ts
@@ -143,20 +143,53 @@ export const Plugin = {
       return join(dirname(absolute), matches[0].name)
     })
 
-    const missing = Effect.fn("ReadTool.missing")(function* (input: string, absolute: string) {
-      const base = basename(input).toLowerCase()
-      const suggestions = yield* fs.readDirectory(dirname(absolute)).pipe(
-        Effect.map((entries) =>
-          entries
-            .filter((entry) => {
-              const candidate = entry.toLowerCase()
-              return candidate.includes(base) || base.includes(candidate)
-            })
-            .map((entry) => join(dirname(input), entry))
-            .slice(0, 3),
-        ),
-        Effect.orElseSucceed(() => [] as string[]),
+    // Lists through the session's environment, which may be a remote workspace rather than this host.
+    const listing = (path: string) =>
+      reader.list(AbsolutePath.make(path)).pipe(
+        Effect.map((entries) => ({ type: "found" as const, names: entries.map((entry) => entry.name) })),
+        Effect.catchTag("Environment.NotFound", () => Effect.succeed({ type: "missing" as const })),
+        Effect.orElseSucceed(() => ({ type: "unknown" as const })),
       )
+
+    const similar = (names: readonly string[], name: string) => {
+      const base = name.toLowerCase()
+      return names
+        .filter((entry) => {
+          const candidate = entry.toLowerCase()
+          return candidate.includes(base) || base.includes(candidate)
+        })
+        .slice(0, 3)
+    }
+
+    // A missing folder usually means a removed worktree, a moved directory, or a relative path
+    // resolved from the wrong place, so name the first missing folder and its nearest existing parent.
+    const missingFolder = Effect.fn("ReadTool.missingFolder")(function* (input: string, folder: string) {
+      let child = folder
+      let parent = dirname(folder)
+      while (parent !== child) {
+        const found = yield* listing(parent)
+        if (found.type === "unknown") break
+        if (found.type === "found") {
+          const suggestions = similar(found.names, basename(child)).map((entry) => join(parent, entry))
+          const message = [
+            `File not found: ${input}`,
+            `The folder ${child} does not exist. The nearest folder that does is ${parent}.`,
+            ...(suggestions.length === 0 ? [] : [`Did you mean one of these?\n${suggestions.join("\n")}`]),
+          ].join("\n\n")
+          return yield* new ToolFailure({ message })
+        }
+        child = parent
+        parent = dirname(parent)
+      }
+      return yield* new ToolFailure({ message: `File not found: ${input}` })
+    })
+
+    const missing = Effect.fn("ReadTool.missing")(function* (input: string, absolute: string) {
+      const folder = dirname(absolute)
+      const found = yield* listing(folder)
+      if (found.type === "missing") return yield* missingFolder(input, folder)
+      const suggestions =
+        found.type === "found" ? similar(found.names, basename(input)).map((entry) => join(dirname(input), entry)) : []
       const message =
         suggestions.length === 0
           ? `File not found: ${input}`
diff --git a/packages/core/test/config/normalization.test.ts b/packages/core/test/config/normalization.test.ts
index ae7974047b19..bff416575be5 100644
--- a/packages/core/test/config/normalization.test.ts
+++ b/packages/core/test/config/normalization.test.ts
@@ -520,6 +520,13 @@ describe("ConfigNormalize", () => {
       ["conflict", ["compaction", "keep", "tokens"]],
       ["conflict", ["compaction", "buffer"]],
     ])
+
+    expect(normalized({ compaction: { buffer: "12.5%" } }).encoded.compaction).toEqual({ buffer: "12.5%" })
+    for (const buffer of ["0%", "100%", "150%"]) {
+      const result = normalized({ compaction: { buffer } })
+      expect(result.encoded.compaction).toBeUndefined()
+      expect(result.diagnostics.map((item) => [item.kind, item.path])).toEqual([["invalid", ["compaction", "buffer"]]])
+    }
   })
 
   test("distinguishes empty, mixed, and wholly malformed enabled provider lists", () => {
diff --git a/packages/core/test/mcp-stdio.test.ts b/packages/core/test/mcp-stdio.test.ts
new file mode 100644
index 000000000000..7e6d7ea308f3
--- /dev/null
+++ b/packages/core/test/mcp-stdio.test.ts
@@ -0,0 +1,130 @@
+import { expect, test } from "bun:test"
+import type { JSONRPCMessage } from "@modelcontextprotocol/client"
+import { Environment } from "@opencode/core/environment/index"
+import { McpStdio } from "@opencode/core/mcp/stdio"
+import { Deferred, Effect, Layer, Sink, Stream } from "effect"
+import { ChildProcessSpawner } from "effect/process"
+import { ExitCode, makeHandle, ProcessId } from "effect/process/ChildProcessSpawner"
+
+const encoder = new TextEncoder()
+const MiB = 1024 * 1024
+const after = encoder.encode('{"jsonrpc":"2.0","method":"after"}\n')
+
+test("receives a frame between 10 and 16 MiB split into pipe-sized chunks", async () => {
+  // 12 MiB sits between the SDK read buffer's 10 MiB default and our 16 MiB cap.
+  const output = await read(chunks(frame(12 * MiB), 64 * 1024))
+
+  expect(output.errors).toEqual([])
+  expect(output.messages).toHaveLength(1)
+  expect(output.messages[0]).toMatchObject({ jsonrpc: "2.0", id: 1 })
+})
+
+test("frames CRLF, blank lines, several messages per chunk and split UTF-8", async () => {
+  const bytes = encoder.encode(
+    [
+      '{"jsonrpc":"2.0","method":"first","params":{"text":"héllo 🙂"}}\r\n',
+      "\n",
+      "  \r\n",
+      "not json\n",
+      '{"jsonrpc":"2.0","method":"second"}\n{"jsonrpc":"2.0","method":"third"}\r\n',
+    ].join(""),
+  )
+
+  for (const size of [bytes.length, 1, 3]) {
+    const output = await read(chunks(bytes, size))
+    expect(output.messages).toEqual([
+      { jsonrpc: "2.0", method: "first", params: { text: "héllo 🙂" } },
+      { jsonrpc: "2.0", method: "second" },
+      { jsonrpc: "2.0", method: "third" },
+    ])
+    expect(output.errors).toEqual([expect.stringContaining("Invalid MCP stdio message")])
+  }
+})
+
+test("accepts a frame of exactly 16 MiB", async () => {
+  // Frame sizes include the newline.
+  const output = await read(chunks(frame(16 * MiB + 1), 64 * 1024))
+
+  expect(output.errors).toEqual([])
+  expect(output.messages).toEqual([expect.objectContaining({ id: 1, result: expect.anything() })])
+})
+
+test("closes the connection on a line one byte over 16 MiB", async () => {
+  // stdout stays open until the process is killed, so finishing at all means the transport closed
+  // itself, which is what fails the client's pending requests.
+  const output = await read([...chunks(frame(16 * MiB + 2), 64 * 1024), after], { open: true })
+
+  expect(output.errors).toEqual(["MCP server framing wrote more than 16 MiB to stdout without a message boundary"])
+  expect(output.messages).toEqual([])
+})
+
+function frame(size: number) {
+  const prefix = '{"jsonrpc":"2.0","id":1,"result":{"text":"'
+  const suffix = '"}}\n'
+  return encoder.encode(prefix + "x".repeat(size - prefix.length - suffix.length) + suffix)
+}
+
+function chunks(bytes: Uint8Array, size: number) {
+  return Array.from({ length: Math.ceil(bytes.length / size) }, (_, index) =>
+    bytes.subarray(index * size, (index + 1) * size),
+  )
+}
+
+/** Runs the transport against a process whose stdout yields `output`, then ends or, with `open`, waits to be killed. */
+async function read(output: ReadonlyArray<Uint8Array>, options?: { open: boolean }) {
+  const killed = Deferred.makeUnsafe<void>()
+  const messages: Array<JSONRPCMessage> = []
+  const errors: Array<string> = []
+  const driver = Environment.makeMemoryDriver()
+  const environment = Layer.succeed(
+    Environment.Service,
+    Environment.Service.of({
+      files: Environment.makeFiles(driver),
+      spawner: ChildProcessSpawner.make(() =>
+        Effect.succeed(
+          makeHandle({
+            pid: ProcessId(1),
+            exitCode: Effect.succeed(ExitCode(0)),
+            isRunning: Effect.succeed(false),
+            kill: () => Deferred.succeed(killed, undefined),
+            stdin: Sink.drain,
+            stdout: Stream.fromIterable(output).pipe(
+              Stream.concat(
+                options?.open ? Stream.fromEffect(Deferred.await(killed)).pipe(Stream.drain) : Stream.empty,
+              ),
+            ),
+            stderr: Stream.empty,
+            all: Stream.empty,
+            getInputFd: () => Sink.drain,
+            getOutputFd: () => Stream.empty,
+            unref: Effect.succeed(Effect.void),
+          }),
+        ),
+      ),
+    }),
+  )
+
+  await Effect.runPromise(
+    Effect.scoped(
+      Effect.gen(function* () {
+        const transport = yield* McpStdio.make({
+          server: "framing",
+          command: "unused",
+          args: [],
+          cwd: import.meta.dir,
+          environment: {},
+        })
+        const closed = new Promise<void>((resolve) => (transport.onclose = resolve))
+        transport.onmessage = (message) => messages.push(message)
+        // stdout ending reports the exit; only framing errors matter here.
+        transport.onerror = (error) => {
+          if (!error.message.startsWith("MCP server process exited")) errors.push(error.message)
+        }
+        yield* Effect.promise(() => transport.start())
+        yield* Effect.promise(() => closed)
+      }).pipe(Effect.provide(environment)),
+    ),
+  )
+
+  return { messages, errors }
+}
diff --git a/packages/core/test/mcp.test.ts b/packages/core/test/mcp.test.ts
index 89480a7c6e75..3cbeba6cfa30 100644
--- a/packages/core/test/mcp.test.ts
+++ b/packages/core/test/mcp.test.ts
@@ -1883,6 +1883,39 @@ test("isolates nested configured MCP mutations and reconciles them", async () =>
   )
 })
 
+test("publishes MCP changes while live but not while the location shuts down", async () => {
+  const published: string[] = []
+  await Effect.runPromise(
+    Effect.scoped(
+      Effect.gen(function* () {
+        const server = yield* resourceServer({ listChanged: true })
+        const scope = yield* Scope.make()
+        const context = yield* Layer.buildWithScope(
+          resourceMcpLayer(server.url, undefined, undefined, { published }),
+          scope,
+        )
+        yield* Effect.gen(function* () {
+          const service = yield* Mcp.Service
+          expect(yield* settled(service)).toEqual({ status: "connected" })
+          published.length = 0
+          yield* Effect.promise(server.sendResourceListChanged)
+          yield* Effect.sync(() => published).pipe(
+            Effect.filterOrFail(
+              (types) => types.includes(McpEvent.ResourcesChanged.type),
+              () => new Error("resource change was not published"),
+            ),
+            Effect.retry({ times: 200, schedule: Schedule.spaced("10 millis") }),
+          )
+        }).pipe(Effect.provide(context))
+        published.length = 0
+        // Location shutdown closes plugin registrations under State.shutdown, so config does not reconcile.
+        yield* State.shutdown(Scope.close(scope, Exit.void))
+        expect(published.filter((type) => type.startsWith("mcp."))).toEqual([])
+      }),
+    ),
+  )
+})
+
 testEffect(Layer.empty).live("batches MCP transforms without connecting intermediate configurations", () =>
   Effect.gen(function* () {
     const server = yield* resourceServer()
diff --git a/packages/core/test/permission.test.ts b/packages/core/test/permission.test.ts
index 8d5e6527bc1b..e616165d4b67 100644
--- a/packages/core/test/permission.test.ts
+++ b/packages/core/test/permission.test.ts
@@ -361,6 +361,19 @@ describe("Permission", () => {
     }),
   )
 
+  it.effect("reports whether a request is already allowed without asking", () =>
+    Effect.gen(function* () {
+      yield* setup([])
+      const service = yield* Permission.Service
+      expect(yield* service.allows(assertion())).toBe(false)
+      expect(yield* service.list()).toEqual([])
+      yield* setRules([{ action: "read", resource: "*", effect: "allow" }])
+      expect(yield* service.allows(assertion())).toBe(true)
+      yield* setRules([{ action: "read", resource: "*", effect: "deny" }])
+      expect(yield* service.allows(assertion())).toBe(false)
+    }),
+  )
+
   test("matches Windows rule resources against slash-normalized file access resources", () => {
     const rules: Permission.Ruleset = [
       { action: "external_directory", resource: "C:\\Users\\x\\proj\\*", effect: "allow" },
diff --git a/packages/core/test/plugin/fixture.ts b/packages/core/test/plugin/fixture.ts
index d3d3fcea05cf..e2e1574e1fe5 100644
--- a/packages/core/test/plugin/fixture.ts
+++ b/packages/core/test/plugin/fixture.ts
@@ -76,6 +76,7 @@ const permissionLayer = Layer.succeed(
     ask: (input) => Effect.succeed({ id: input.id ?? Permission.ID.create(), effect: "ask" }),
     assert: () => Effect.void,
     assertNotDenied: () => Effect.void,
+    allows: () => Effect.succeed(false),
     reply: () => Effect.void,
     get: () => Effect.succeed(undefined),
     forSession: () => Effect.succeed([]),
diff --git a/packages/core/test/plugin/permission-assert.test.ts b/packages/core/test/plugin/permission-assert.test.ts
index b7d468e2b0a3..ba6f91971fd3 100644
--- a/packages/core/test/plugin/permission-assert.test.ts
+++ b/packages/core/test/plugin/permission-assert.test.ts
@@ -27,6 +27,7 @@ const permission = Layer.succeed(
       return Effect.void
     },
     assertNotDenied: () => Effect.void,
+    allows: () => Effect.succeed(false),
     reply: () => Effect.void,
     get: () => Effect.succeed(undefined),
     forSession: () => Effect.succeed([]),
diff --git a/packages/core/test/plugin/tool-input-repair-integration.test.ts b/packages/core/test/plugin/tool-input-repair-integration.test.ts
index 3e3f9828cc3b..38578f105c81 100644
--- a/packages/core/test/plugin/tool-input-repair-integration.test.ts
+++ b/packages/core/test/plugin/tool-input-repair-integration.test.ts
@@ -83,6 +83,47 @@ it.effect("repairs tool input before validating its original schema", () =>
   }),
 )
 
+it.effect("runs a call to another harness's tool name as the matching tool and says so", () =>
+  Effect.gen(function* () {
+    const plugins = yield* Plugin.Service
+    const registry = yield* Tool.Service
+    const executed: unknown[] = []
+    yield* plugins.activate([
+      { ...ToolInputRepairPlugin.Plugin, revision: "1" },
+      {
+        id: "shell-tool",
+        revision: "1",
+        effect: (ctx) =>
+          ctx.tool.transform((draft) =>
+            draft.add({
+              name: "shell",
+              options: { codemode: false },
+              description: "Shell",
+              input: Schema.Struct({ command: Schema.String, timeout: Schema.optionalKey(Schema.Int) }),
+              execute: (input) => Effect.sync(() => executed.push(input)).pipe(Effect.as({ content: "done" })),
+            }),
+          ),
+      },
+    ])
+    const snapshot = yield* registry.snapshot()
+    const result = yield* snapshot.execute({
+      ...identity,
+      call: { type: "tool-call", id: "call-bash", name: "bash", input: { command: "ls", timeout: "5000" } },
+    })
+    expect(executed).toEqual([{ command: "ls", timeout: 5000 }])
+    expect(result.content).toEqual([
+      { type: "text", text: "done" },
+      { type: "text", text: 'There is no "bash" tool, so this ran as "shell". Call "shell" directly.' },
+    ])
+
+    const direct = yield* snapshot.execute({
+      ...identity,
+      call: { type: "tool-call", id: "call-shell", name: "shell", input: { command: "pwd" } },
+    })
+    expect(direct.content).toEqual([{ type: "text", text: "done" }])
+  }),
+)
+
 it.effect("repairs namespaced inner tool input called from Code Mode", () =>
   Effect.gen(function* () {
     const plugins = yield* Plugin.Service
diff --git a/packages/core/test/session-compaction.test.ts b/packages/core/test/session-compaction.test.ts
index 0b76ed771aff..ad64d7476f7a 100644
--- a/packages/core/test/session-compaction.test.ts
+++ b/packages/core/test/session-compaction.test.ts
@@ -478,6 +478,12 @@ it.effect("auto compaction estimates current content against the buffered prompt
     expect(yield* due(native(231_200))).toBe(true)
     expect(yield* due(native(1_000_000, { context: 0, input: undefined, output: 0 }))).toBe(false)
 
+    // An input limit above the context window, as some catalogs and config overrides report, cannot be used in full.
+    const overstated = { context: 128_000, input: 272_000, output: 128_000 }
+    expect(yield* due(input(108_799, overstated))).toBe(false)
+    expect(yield* due(input(108_800, overstated))).toBe(true)
+    expect(yield* due(input(200_000, { context: 0, input: 272_000, output: 0 }))).toBe(false)
+
     // The summary's 16k output limit is more than 15% of a 100k window, so it sets the ceiling.
     const contextLimited = { context: 100_000, output: 10_000 }
     expect(yield* due(input(83_999, contextLimited))).toBe(false)
@@ -497,6 +503,15 @@ it.effect("auto compaction estimates current content against the buffered prompt
       }),
     )
 
+    // A percentage buffer is a share of the model's window.
+    yield* Effect.scoped(
+      Effect.gen(function* () {
+        yield* compaction.transform((editor) => editor.configure({ buffer: "25%" }))
+        expect(yield* due(input(74_999, contextLimited))).toBe(false)
+        expect(yield* due(input(75_000, contextLimited))).toBe(true)
+      }),
+    )
+
     const assistant = input(89_000, contextLimited).messages[0]
     const tool = SessionMessage.AssistantTool.make({
       type: "tool",
diff --git a/packages/core/test/session-runner-message.test.ts b/packages/core/test/session-runner-message.test.ts
index 12335ca829c4..2b37a231d5b0 100644
--- a/packages/core/test/session-runner-message.test.ts
+++ b/packages/core/test/session-runner-message.test.ts
@@ -988,7 +988,7 @@ Earlier work
     ])
   })
 
-  test("lowers failed assistant reasoning to text", () => {
+  test("drops failed assistant reasoning while preserving settled hosted tools", () => {
     const messages = toLLMMessages(
       [
         SessionMessage.Assistant.make({
@@ -1038,7 +1038,6 @@ Earlier work
     )
 
     expect(messages[0]?.content).toEqual([
-      { type: "text", text: "Partial thought" },
       {
         type: "tool-call",
         id: "hosted-completed",
@@ -1084,7 +1083,7 @@ Earlier work
     ])
   })
 
-  test("drops unfinished reasoning metadata from an interrupted assistant message", () => {
+  test("omits unfinished reasoning from an interrupted assistant message", () => {
     const messages = toLLMMessages(
       [
         SessionMessage.Assistant.make({
@@ -1112,7 +1111,7 @@ Earlier work
       model,
     )
 
-    expect(messages[0]?.content).toEqual([{ type: "text", text: "Completed summary part" }])
+    expect(messages).toEqual([])
   })
 
   test("drops model-scoped continuation metadata after a model switch but keeps hosted result payloads", () => {
diff --git a/packages/core/test/session-runner.test.ts b/packages/core/test/session-runner.test.ts
index be622077fc61..b394b9afb66b 100644
--- a/packages/core/test/session-runner.test.ts
+++ b/packages/core/test/session-runner.test.ts
@@ -6406,6 +6406,26 @@ describe("SessionRunnerLLM", () => {
     })
   }
 
+  scenario("compacts when the provider cuts an oversized prompt to its window and replies with nothing", function* (s) {
+    // Xiaomi MiMo answers an oversized prompt with HTTP 200, finish "length", no output, and a prompt count that fills
+    // the window instead of rejecting it.
+    s.currentModel = recoveryModel
+    yield* s.llm.push(
+      TestLLM.complete({ reason: { normalized: "length" }, usage: { inputTokens: 199_994, nonCachedInputTokens: 199_994, outputTokens: 0 } }),
+      TestLLM.text("## Objective\n- summary", "summary"),
+      TestLLM.text("Done", "done"),
+    )
+
+    yield* s.runPrompt("Large prompt")
+
+    expect(s.requests).toHaveLength(3)
+    expect(userTexts(s.requests[1]).at(-1)).toContain("Summarize only what the user and the assistant said and did")
+    expect((yield* s.messages).filter((message) => message.type === "compaction")).toMatchObject([
+      { status: "completed" },
+    ])
+    expect((yield* s.context).at(-1)).toMatchObject(Expected.assistant({ finish: "stop" }, [Expected.text("Done")]))
+  })
+
   for (const tools of ["hosted", "unfinished"] as const) {
     scenario(`caps output token limit continuations and resets for new input (${tools})`, function* (s) {
       const toolEvents =
@@ -6607,7 +6627,7 @@ describe("SessionRunnerLLM", () => {
     ])
   })
 
-  scenario("lowers interrupted reasoning before continuing an incomplete stream", function* (s) {
+  scenario("drops interrupted reasoning before continuing an incomplete stream", function* (s) {
     yield* s.admit("Continue interrupted reasoning")
     yield* s.llm.push(
       TestLLM.failAfter(
@@ -6625,19 +6645,10 @@ describe("SessionRunnerLLM", () => {
     yield* TestClock.adjust("2400 millis")
     yield* Fiber.join(run)
 
-    expect(s.requests[1]?.messages.at(-2)).toMatchObject({
-      role: "assistant",
-      content: [{ type: "text", text: "Partial thought" }],
-    })
-    expect(s.requests[1]?.messages.at(-1)).toMatchObject({
-      role: "user",
-      content: [
-        {
-          type: "text",
-          text: INCOMPLETE_STREAM_CONTINUATION,
-        },
-      ],
-    })
+    expect(s.requests[1]?.messages.slice(-2)).toMatchObject([
+      { role: "user", content: [{ type: "text", text: "Continue interrupted reasoning" }] },
+      { role: "user", content: [{ type: "text", text: INCOMPLETE_STREAM_CONTINUATION }] },
+    ])
     expect(yield* s.context).toMatchObject([
       { type: "user" },
       Expected.assistant({ finish: "error" }, [Expected.reasoning("Partial thought")]),
diff --git a/packages/core/test/tool-edit.test.ts b/packages/core/test/tool-edit.test.ts
index fb716d215b4e..253b70a40d03 100644
--- a/packages/core/test/tool-edit.test.ts
+++ b/packages/core/test/tool-edit.test.ts
@@ -43,17 +43,20 @@ const makeEditFixture = () => {
     writes: string[]
     reads: number
     denyAction?: string
+    readAllowed: boolean
     afterRead: () => Effect.Effect<void>
     formatFile: (target: string) => Effect.Effect<boolean>
   } = {
     assertions: [],
     writes: [],
     reads: 0,
+    readAllowed: true,
     afterRead: () => Effect.void,
     formatFile: () => Effect.succeed(false),
   }
 
   const permission = permissionLayer({
+    allows: (input) => Effect.succeed(input.action === "read" && fixture.readAllowed),
     assert: (input) =>
       Effect.sync(() => fixture.assertions.push(input)).pipe(
         Effect.andThen(
@@ -430,6 +433,62 @@ describe("EditTool", () => {
     }),
   )
 
+  it.live("points a missed oldString at the closest lines, or at newString already applied, when read is allowed", () =>
+    withTempDir((tmp) => {
+      const edit = makeEditFixture()
+      const target = path.join(tmp.path, "miss.ts")
+      const miss = (oldString: string, newString: string) =>
+        withTool(tmp.path, edit, (registry) => executeTool(registry, call({ path: "miss.ts", oldString, newString })))
+      const missed = "Could not find oldString in miss.ts. It must match exactly, including whitespace and indentation."
+      return Effect.promise(() =>
+        fs.writeFile(
+          target,
+          "import { a } from './a'\n\nexport function run() {\n  const value = a()\n  return value + 1\n}\n",
+        ),
+      ).pipe(
+        Effect.andThen(
+          Effect.gen(function* () {
+            expect(yield* miss("export function run() {\n\tconst value = a()\n\treturn value + 2\n}", "x")).toEqual({
+              status: "error",
+              error: {
+                type: "tool.execution",
+                message: `${missed}\n\nThe closest lines in the file:\n3: export function run() {\n4:   const value = a()\n5:   return value + 1\n6: }`,
+              },
+            })
+            expect(yield* miss("  return value + 2", "  return value + 1")).toEqual({
+              status: "error",
+              error: { type: "tool.execution", message: missed },
+            })
+            expect(yield* miss("const value = b()", "  const value = a()\n  return value + 1")).toEqual({
+              status: "error",
+              error: {
+                type: "tool.execution",
+                message: `${missed}\n\nnewString is already in the file, so this edit may already be applied.`,
+              },
+            })
+            expect(yield* miss("nothing like it", "anything")).toEqual({
+              status: "error",
+              error: { type: "tool.execution", message: missed },
+            })
+            expect(yield* miss("import { a } from './a'\n\n\n\n\n\n", "x")).toEqual({
+              status: "error",
+              error: {
+                type: "tool.execution",
+                message: `${missed}\n\nThe closest lines in the file:\n1: import { a } from './a'`,
+              },
+            })
+            edit.readAllowed = false
+            expect(yield* miss("export function run() {\n\tconst value = a()\n\treturn value + 2\n}", "x")).toEqual({
+              status: "error",
+              error: { type: "tool.execution", message: missed },
+            })
+            expect(edit.writes).toEqual([])
+          }),
+        ),
+      )
+    }),
+  )
+
   it.live("returns specific missing file and directory errors", () =>
     withTempDir((tmp) => {
       const edit = makeEditFixture()
diff --git a/packages/core/test/tool-read.test.ts b/packages/core/test/tool-read.test.ts
index 795e7ac028a8..5c127a8a4dca 100644
--- a/packages/core/test/tool-read.test.ts
+++ b/packages/core/test/tool-read.test.ts
@@ -48,7 +48,7 @@ const readCalls: {
 }[] = []
 const listCalls: AbsolutePath[] = []
 let readDefect: unknown
-let directoryEntries: string[] = []
+let missingDirectories: string[] = []
 let directoryEntryDetails: Environment.DirEntry[] = []
 let readResult: ReadToolFileSystem.FileContent | ReadToolFileSystem.TextPage | ReadToolFileSystem.ListPage = {
   type: "file",
@@ -65,6 +65,7 @@ const reader = Layer.succeed(
   ReadToolFileSystem.Service.of({
     list: (input) => {
       listCalls.push(input)
+      if (missingDirectories.includes(input)) return Effect.fail(new Environment.NotFound({ path: input }))
       return Effect.succeed(directoryEntryDetails)
     },
     read: (input, resource, page = {}) => {
@@ -98,17 +99,6 @@ const permission = permissionLayer({
 })
 const config = Config.testLayer()
 const imageLayer = AppNodeBuilder.build(Image.node)
-const testFileSystem = Layer.effect(
-  FSUtil.Service,
-  FSUtil.Service.use((fs) =>
-    Effect.succeed(
-      FSUtil.Service.of({
-        ...fs,
-        readDirectory: () => Effect.succeed(directoryEntries),
-      }),
-    ),
-  ),
-).pipe(Layer.provide(LayerNode.compile(FSUtil.node)))
 const locationLayer = Layer.succeed(
   Location.Service,
   Location.Service.of(location({ directory: AbsolutePath.make(process.cwd()) })),
@@ -123,7 +113,6 @@ const readLayer = (imageLayer: Layer.Layer<Image.Service>) =>
       Permission.node.replace(permission),
       Config.node.replace(config),
       Image.node.replace(imageLayer),
-      FSUtil.node.replace(testFileSystem),
       Location.node.replace(locationLayer),
       Global.node.replace(Global.layerWith({ data: Global.Path.data })),
     ]),
@@ -143,7 +132,7 @@ describe("ReadTool", () => {
     allow = true
     deniedResource = undefined
     readDefect = undefined
-    directoryEntries = []
+    missingDirectories = []
     directoryEntryDetails = []
     readResult = {
       type: "file",
@@ -714,13 +703,13 @@ describe("ReadTool", () => {
   it.effect("returns missing paths as model-visible tool failures", () =>
     Effect.gen(function* () {
       readFailure = new Environment.NotFound({ path: missingAbsolutePath })
-      directoryEntries = [
+      directoryEntryDetails = [
         "__missing_read_target__.txt.bak",
         "copy___missing_read_target__.txt",
         "old___missing_read_target__.txt",
         "other___missing_read_target__.txt",
         "unrelated.txt",
-      ]
+      ].map((name) => ({ name, type: "file" as const }))
       const registry = yield* Tool.Service
 
       expect(
@@ -746,6 +735,63 @@ describe("ReadTool", () => {
     }),
   )
 
+  it.effect("names the first missing folder and its nearest existing parent", () =>
+    Effect.gen(function* () {
+      const requested = "__missing_read_folder__/src/file.ts"
+      readFailure = new Environment.NotFound({ path: path.join(process.cwd(), requested) })
+      missingDirectories = [
+        path.join(process.cwd(), "__missing_read_folder__", "src"),
+        path.join(process.cwd(), "__missing_read_folder__"),
+      ]
+      directoryEntryDetails = [
+        { name: "__missing_read_folder__-old", type: "directory" },
+        { name: "unrelated", type: "file" },
+      ]
+      const registry = yield* Tool.Service
+
+      expect(
+        yield* executeTool(registry, {
+          sessionID,
+          ...toolIdentity,
+          call: { type: "tool-call", id: "call-missing-folder", name: "read", input: { path: requested } },
+        }),
+      ).toEqual({
+        status: "error",
+        error: {
+          type: "tool.execution",
+          message: [
+            `File not found: ${requested}`,
+            `The folder ${path.join(process.cwd(), "__missing_read_folder__")} does not exist. The nearest folder that does is ${process.cwd()}.`,
+            `Did you mean one of these?\n${path.join(process.cwd(), "__missing_read_folder__-old")}`,
+          ].join("\n\n"),
+        },
+      })
+    }),
+  )
+
+  it.effect("trusts the environment, not this host, about which folders exist", () =>
+    Effect.gen(function* () {
+      const requested = path.join(process.cwd(), "__only_in_workspace__", "file.ts")
+      readFailure = new Environment.NotFound({ path: requested })
+      directoryEntryDetails = [{ name: "file.tsx", type: "file" }]
+      const registry = yield* Tool.Service
+
+      expect(
+        yield* executeTool(registry, {
+          sessionID,
+          ...toolIdentity,
+          call: { type: "tool-call", id: "call-workspace-folder", name: "read", input: { path: requested } },
+        }),
+      ).toEqual({
+        status: "error",
+        error: {
+          type: "tool.execution",
+          message: `File not found: ${requested}\n\nDid you mean one of these?\n${path.join(process.cwd(), "__only_in_workspace__", "file.tsx")}`,
+        },
+      })
+    }),
+  )
+
   it.effect("recovers a unique file whose non-breaking spaces differ", () =>
     Effect.gen(function* () {
       const requested = "Screenshot 2026-08-27 3.15 PM.png"
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index e6e2f56027eb..7646f1e35b06 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@opencode/desktop",
   "private": true,
-  "version": "2.2.4",
+  "version": "2.2.5",
   "type": "module",
   "license": "MIT",
   "homepage": "https://opencode.ai",
diff --git a/packages/desktop/script/picker.ts b/packages/desktop/script/picker.ts
index e1a2d50651ed..a7d96832d454 100644
--- a/packages/desktop/script/picker.ts
+++ b/packages/desktop/script/picker.ts
@@ -9,6 +9,7 @@ const attribute = "data-opencode-picker-source"
 export function pickerPlugin() {
   const plugin = picker()
   const client = "/__vite_opencode_picker_client.js"
+
   let workspaceRoot = ""
 
   return {
diff --git a/packages/function/package.json b/packages/function/package.json
index a367c48ca1ae..d2f5a6c1be6f 100644
--- a/packages/function/package.json
+++ b/packages/function/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode/function",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
   "type": "module",
diff --git a/packages/gui-plugins/package.json b/packages/gui-plugins/package.json
index 8ffa8de65412..2c9dadb7b17d 100644
--- a/packages/gui-plugins/package.json
+++ b/packages/gui-plugins/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/gui-plugins",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/http-recorder/package.json b/packages/http-recorder/package.json
index 8827af7f407d..5109afcddce5 100644
--- a/packages/http-recorder/package.json
+++ b/packages/http-recorder/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "name": "@opencode/http-recorder",
   "description": "Record and replay Effect HTTP and WebSocket traffic with deterministic cassettes",
   "type": "module",
diff --git a/packages/httpapi-codegen/package.json b/packages/httpapi-codegen/package.json
index 853f47d196ec..797ac847f710 100644
--- a/packages/httpapi-codegen/package.json
+++ b/packages/httpapi-codegen/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/httpapi-codegen",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "private": true,
   "type": "module",
   "exports": {
diff --git a/packages/latex/package.json b/packages/latex/package.json
index 0ed89093e6b9..29189a1a3cb0 100644
--- a/packages/latex/package.json
+++ b/packages/latex/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/latex",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "private": true,
   "type": "module",
   "exports": {
diff --git a/packages/merman/package.json b/packages/merman/package.json
index 35ef417872a4..5cc421fbe4dd 100644
--- a/packages/merman/package.json
+++ b/packages/merman/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/merman",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "private": true,
   "type": "module",
   "exports": {
diff --git a/packages/patchmark/package.json b/packages/patchmark/package.json
index 14d6943f9e53..bf15bb2d1a0c 100644
--- a/packages/patchmark/package.json
+++ b/packages/patchmark/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/patchmark",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/plugin-browser/package.json b/packages/plugin-browser/package.json
index 28d41384d096..619a40018aac 100644
--- a/packages/plugin-browser/package.json
+++ b/packages/plugin-browser/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/plugin-browser",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "description": "OpenCode's desktop browser plugin",
   "type": "module",
   "license": "MIT",
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index 56b29da17a62..71b65e2c3237 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/plugin",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/plugins/figma/package.json b/packages/plugins/figma/package.json
index f64c5e4ee7ff..b53595c25f34 100644
--- a/packages/plugins/figma/package.json
+++ b/packages/plugins/figma/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/plugin-figma",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "description": "Figma MCP integration and official Figma skills for OpenCode",
   "type": "module",
   "license": "MIT",
diff --git a/packages/protocol/openapi.json b/packages/protocol/openapi.json
index 1427579be03d..58e07698c18c 100644
--- a/packages/protocol/openapi.json
+++ b/packages/protocol/openapi.json
@@ -16899,6 +16899,10 @@
         "required": ["template"],
         "additionalProperties": false
       },
+      "Config.Compaction.Percent": {
+        "type": "string",
+        "pattern": "^([1-9]\\d?(\\.\\d+)?)%$"
+      },
       "Config.DirectoryEncoded": {
         "type": "object",
         "properties": {
@@ -17227,9 +17231,16 @@
                 "additionalProperties": false
               },
               "buffer": {
-                "type": "integer",
-                "minimum": 0,
-                "maximum": 9007199254740991
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/Config.Compaction.Percent"
+                  },
+                  {
+                    "type": "integer",
+                    "minimum": 0,
+                    "maximum": 9007199254740991
+                  }
+                ]
               }
             },
             "additionalProperties": false
diff --git a/packages/protocol/package.json b/packages/protocol/package.json
index 0493a9e06d76..3a106fd001e8 100644
--- a/packages/protocol/package.json
+++ b/packages/protocol/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/protocol",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "type": "module",
   "license": "MIT",
   "repository": {
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 8f4adbb00b96..36b13c6923ea 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/schema",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "type": "module",
   "license": "MIT",
   "repository": {
diff --git a/packages/schema/src/config/compaction.ts b/packages/schema/src/config/compaction.ts
index 7661e57d2a01..e1d4f650a43f 100644
--- a/packages/schema/src/config/compaction.ts
+++ b/packages/schema/src/config/compaction.ts
@@ -7,8 +7,17 @@ export class Keep extends Schema.Class<Keep>("Config.Compaction.Keep")({
   tokens: NonNegativeInt.pipe(optional),
 }) {}
 
+/** A share of the model's window such as "20%" or "12.5%", from 1% up to but not including 100%. */
+export const Percent = Schema.String.check(Schema.isPattern(/^([1-9]\d?(\.\d+)?)%$/u)).annotate({
+  identifier: "Config.Compaction.Percent",
+})
+export type Percent = typeof Percent.Type
+
 export class Info extends Schema.Class<Info>("Config.Compaction")({
   auto: Schema.Boolean.pipe(optional),
   keep: Keep.pipe(optional),
-  buffer: NonNegativeInt.pipe(optional),
+  buffer: Schema.Union([Percent, NonNegativeInt]).pipe(optional).annotate({
+    description:
+      'Room kept free below the model\'s context window before automatic compaction, as a share of the window from "1%" to "99%", such as "20%" to compact at 80% full. A token count is also accepted.',
+  }),
 }) {}
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index be674868d2ad..d3411fce70a5 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "name": "@opencode/sdk",
   "type": "module",
   "license": "MIT",
diff --git a/packages/server/package.json b/packages/server/package.json
index bf94847e3639..efdc624ac1ad 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/server",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "type": "module",
   "license": "MIT",
   "repository": {
diff --git a/packages/session-ui/package.json b/packages/session-ui/package.json
index ca6986620de5..530ecefb2f94 100644
--- a/packages/session-ui/package.json
+++ b/packages/session-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode/session-ui",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/simulation/package.json b/packages/simulation/package.json
index 29988f29a9a9..371cfb122213 100644
--- a/packages/simulation/package.json
+++ b/packages/simulation/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/simulation",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "type": "module",
   "license": "MIT",
   "repository": {
diff --git a/packages/stats/app/package.json b/packages/stats/app/package.json
index f13399941c76..a1c97728b94b 100644
--- a/packages/stats/app/package.json
+++ b/packages/stats/app/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/stats-app",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/stats/app/src/routes/index.tsx b/packages/stats/app/src/routes/index.tsx
index d76320b6980f..641da5c6c837 100644
--- a/packages/stats/app/src/routes/index.tsx
+++ b/packages/stats/app/src/routes/index.tsx
@@ -860,7 +860,8 @@ function isDenseColumnRange(range: UsageRange) {
 function scrollDenseChartToEnd(element: HTMLDivElement | undefined, range: UsageRange, count: number) {
   if (!element || count <= 0 || !isDenseColumnRange(range) || typeof window === "undefined") return
   window.requestAnimationFrame(() => {
-    element.scrollLeft = Number.MAX_SAFE_INTEGER
+    // WebKit ignores out-of-range values like Number.MAX_SAFE_INTEGER, so scroll to the real end.
+    element.scrollLeft = element.scrollWidth
   })
 }
 
diff --git a/packages/stats/core/package.json b/packages/stats/core/package.json
index dec98c188463..f396236bce3e 100644
--- a/packages/stats/core/package.json
+++ b/packages/stats/core/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/stats-core",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/stats/server/package.json b/packages/stats/server/package.json
index dd66af3fd396..775616e095c6 100644
--- a/packages/stats/server/package.json
+++ b/packages/stats/server/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/stats-server",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/theme/package.json b/packages/theme/package.json
index 30753a9c9ce0..cd503119282e 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/theme",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "type": "module",
   "license": "MIT",
   "repository": {
diff --git a/packages/tui/package.json b/packages/tui/package.json
index c642ed6ae32e..4276371a0bf1 100644
--- a/packages/tui/package.json
+++ b/packages/tui/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/tui",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/tui/src/component/dialog-integration.tsx b/packages/tui/src/component/dialog-integration.tsx
index 73539a0e8b53..934b2f467025 100644
--- a/packages/tui/src/component/dialog-integration.tsx
+++ b/packages/tui/src/component/dialog-integration.tsx
@@ -72,7 +72,6 @@ export function integrationOptions(list: IntegrationInfo[]) {
     .filter((item) => !isHiddenProvider(item.id))
     .toSorted(
       (a, b) =>
-        Number(b.metadata?.source === "mcp") - Number(a.metadata?.source === "mcp") ||
         (INTEGRATION_PRIORITY[a.id] ?? 99) - (INTEGRATION_PRIORITY[b.id] ?? 99) ||
         a.name.localeCompare(b.name) ||
         a.id.localeCompare(b.id),
@@ -108,9 +107,12 @@ export function DialogIntegration(
   const dialog = useDialog()
   const theme = useTheme().surface("dialog")
   const location = currentLocation.ref ?? data.location.default()
+  // The MCP dialog signs its servers in through `integrationID`; the connect menu leaves them to it.
   const integrations = createMemo(() =>
-    integrationOptions(data.location.integration.list(location) ?? []).filter(
-      (integration) => props.integrationID === undefined || integration.id === props.integrationID,
+    integrationOptions(data.location.integration.list(location) ?? []).filter((integration) =>
+      props.integrationID === undefined
+        ? integration.metadata?.source !== "mcp"
+        : integration.id === props.integrationID,
     ),
   )
 
@@ -132,7 +134,6 @@ export function DialogIntegration(
       const credentials = credentialConnections(integration)
       let category = "Services"
       if (integration.id in INTEGRATION_PRIORITY) category = "Popular"
-      if (integration.metadata?.source === "mcp") category = "MCP"
       const status = integration.connections[0]?.status
       return {
         title: integration.name,
@@ -1265,7 +1266,7 @@ async function connected(
     data.location.provider.sync(location),
   ])
   toast.show({ variant: "success", message: `Connected ${integration.name}` })
-  if (onConnected && integration.metadata?.source !== "mcp") {
+  if (onConnected) {
     onConnected(providerID(data, location, integration.id))
     return
   }
diff --git a/packages/tui/test/cli/cmd/tui/integration-options.test.ts b/packages/tui/test/cli/cmd/tui/integration-options.test.ts
index e8cc3b28803c..2ade5fccbbb8 100644
--- a/packages/tui/test/cli/cmd/tui/integration-options.test.ts
+++ b/packages/tui/test/cli/cmd/tui/integration-options.test.ts
@@ -35,18 +35,6 @@ describe("integrationOptions", () => {
       ]).map((item) => item.id),
     ).toEqual(["opencode", "opencode-go", "openai", "anthropic", "mistral", "custom-z"])
   })
-
-  test("keeps MCP integrations above popular integrations without relying on their IDs", () => {
-    expect(
-      integrationOptions([
-        integration({ id: "openai", name: "OpenAI" }),
-        integration({ id: "linear", name: "Linear", metadata: { source: "mcp" } }),
-        integration({ id: "github", name: "GitHub", metadata: { source: "mcp" } }),
-        integration({ id: "opencode", name: "OpenCode Zen" }),
-        integration({ id: "opencode-go", name: "OpenCode Go" }),
-      ]).map((item) => item.id),
-    ).toEqual(["github", "linear", "opencode", "opencode-go", "openai"])
-  })
 })
 
 describe("connectMethods", () => {
diff --git a/packages/tui/test/cli/tui/dialog-integration.test.tsx b/packages/tui/test/cli/tui/dialog-integration.test.tsx
index 744ec506f784..55ec1555ff51 100644
--- a/packages/tui/test/cli/tui/dialog-integration.test.tsx
+++ b/packages/tui/test/cli/tui/dialog-integration.test.tsx
@@ -247,6 +247,84 @@ test("uses the active location for integration data without scoping credential r
   }
 })
 
+test("leaves MCP integrations out of the connect menu", async () => {
+  await using fixture = await renderMenu()
+  await fixture.app.waitForFrame((frame) => frame.includes("OpenAI"))
+
+  const frame = fixture.app.captureCharFrame()
+  expect(frame).not.toContain("Linear")
+  expect(frame).not.toContain("MCP")
+})
+
+test("still offers an MCP integration when the MCP dialog asks for it", async () => {
+  await using fixture = await renderMenu("linear")
+  await fixture.app.waitForFrame((frame) => frame.includes("Linear"))
+
+  expect(fixture.app.captureCharFrame()).not.toContain("OpenAI")
+})
+
+async function renderMenu(integrationID?: string) {
+  const calls = createFetch(async (url, request) => {
+    if (url.pathname !== "/api/integration") return undefined
+    const directory = decodeURIComponent(request.headers.get("x-opencode-directory") ?? process.cwd())
+    return json({
+      location: { directory, project: { id: "proj_test", directory, canonical: directory } },
+      data: [
+        { id: "openai", name: "OpenAI", methods: [{ type: "key", label: "API key" }], connections: [] },
+        {
+          id: "linear",
+          name: "Linear",
+          methods: [{ type: "oauth", id: "mcp", label: "Sign in" }],
+          connections: [],
+          metadata: { source: "mcp" },
+        },
+      ],
+    })
+  })
+
+  function Probe() {
+    const data = useData()
+    const dialog = useDialog()
+    onMount(() => {
+      void data.location.integration
+        .sync()
+        .then(() => dialog.replace(() => <DialogIntegration integrationID={integrationID} />))
+    })
+    return null
+  }
+
+  const app = await testRender(
+    () => (
+      <TestTuiContexts>
+        <ConfigProvider config={createTuiResolvedConfig()}>
+          <Keymap.Provider>
+            <ToastProvider>
+              <ClientProvider api={createApi(calls.fetch)}>
+                <DataProvider directory={process.cwd()}>
+                  <LocationProvider>
+                    <ThemeProvider mode="dark" source={emptyThemeSource}>
+                      <DialogProvider>
+                        <Probe />
+                      </DialogProvider>
+                    </ThemeProvider>
+                  </LocationProvider>
+                </DataProvider>
+              </ClientProvider>
+            </ToastProvider>
+          </Keymap.Provider>
+        </ConfigProvider>
+      </TestTuiContexts>
+    ),
+    { width: 100, height: 30, kittyKeyboard: true },
+  )
+  app.renderer.start()
+
+  return {
+    app,
+    [Symbol.asyncDispose]: async () => app.renderer.destroy(),
+  }
+}
+
 async function renderIntegration(activeLocation?: LocationRef, form?: FormFields) {
   const events = createEventStream()
   const requests: Array<{ method: string; path: string; body?: unknown }> = []
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 7eef2f122bdc..be7422844af1 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode/ui",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "type": "module",
   "license": "MIT",
   "repository": {
diff --git a/packages/ui/src/components/menu-scroll.css b/packages/ui/src/components/menu-scroll.css
new file mode 100644
index 000000000000..6c79e324459d
--- /dev/null
+++ b/packages/ui/src/components/menu-scroll.css
@@ -0,0 +1,59 @@
+[data-component="menu-scroll"] {
+  position: relative;
+  display: flex;
+  min-height: 0;
+  flex-direction: column;
+  overflow: hidden;
+  isolation: isolate;
+}
+
+[data-slot="menu-scroll-viewport"] {
+  min-height: 0;
+  overflow-y: auto;
+}
+
+[data-slot="menu-scroll-thumb"] {
+  display: none;
+}
+
+@media (hover: hover) and (pointer: fine) {
+  [data-slot="menu-scroll-viewport"] {
+    scrollbar-width: none;
+  }
+
+  [data-slot="menu-scroll-viewport"]::-webkit-scrollbar {
+    display: none;
+  }
+
+  [data-slot="menu-scroll-thumb"] {
+    position: absolute;
+    z-index: 1;
+    inset-inline-end: 0;
+    top: 0;
+    display: block;
+    width: 8px;
+    opacity: 0;
+    pointer-events: none;
+    touch-action: none;
+    user-select: none;
+
+    &::after {
+      position: absolute;
+      inset: 0 2px;
+      border-radius: 9999px;
+      background: var(--v2-border-border-muted);
+      content: "";
+    }
+
+    &:hover::after,
+    &[data-dragging]::after {
+      background: var(--v2-border-border-strong);
+    }
+  }
+
+  [data-component="menu-scroll"]:hover > [data-slot="menu-scroll-thumb"],
+  [data-slot="menu-scroll-thumb"][data-dragging] {
+    opacity: 1;
+    pointer-events: auto;
+  }
+}
diff --git a/packages/ui/src/components/menu-scroll.tsx b/packages/ui/src/components/menu-scroll.tsx
new file mode 100644
index 000000000000..55e99e69e6cf
--- /dev/null
+++ b/packages/ui/src/components/menu-scroll.tsx
@@ -0,0 +1,84 @@
+import { createResizeObserver } from "@solid-primitives/resize-observer"
+import { onMount, Show, splitProps, type ComponentProps } from "solid-js"
+import { createStore } from "solid-js/store"
+import "./menu-scroll.css"
+
+export function MenuScroll(
+  props: Omit<ComponentProps<"div">, "ref" | "onScroll"> & {
+    viewportClass?: string
+    viewportRef?: (element: HTMLDivElement) => void
+  },
+) {
+  const [local, rest] = splitProps(props, ["class", "children", "viewportClass", "viewportRef"])
+
+  const [state, setState] = createStore<{ size: number; start: number; overflow: boolean; grab?: number }>({
+    size: 0,
+    start: 4,
+    overflow: false,
+  })
+
+  let viewport!: HTMLDivElement
+
+  let content!: HTMLDivElement
+
+  const measure = () => {
+    const track = Math.max(0, viewport.clientHeight - 8)
+
+    const size = Math.min(track, Math.max(32, (viewport.clientHeight / Math.max(1, viewport.scrollHeight)) * track))
+
+    const max = viewport.scrollHeight - viewport.clientHeight
+
+    setState({ size, start: 4 + (max > 0 ? (viewport.scrollTop / max) * (track - size) : 0), overflow: max > 0 })
+
+    if (max <= 0) setState("grab", undefined)
+  }
+
+  onMount(() => {
+    local.viewportRef?.(viewport)
+    createResizeObserver([viewport, content], measure)
+  })
+
+  return (
+    <div data-component="menu-scroll" class={local.class}>
+      <div
+        {...rest}
+        ref={viewport}
+        data-slot="menu-scroll-viewport"
+        data-scrollable
+        class={local.viewportClass}
+        onScroll={measure}
+      >
+        <div ref={content}>{local.children}</div>
+      </div>
+      <Show when={state.overflow}>
+        <div
+          data-slot="menu-scroll-thumb"
+          data-dragging={state.grab !== undefined ? "" : undefined}
+          aria-hidden="true"
+          style={{ height: `${state.size}px`, transform: `translateY(${state.start}px)` }}
+          onPointerDown={(event) => {
+            if (event.button !== 0) return
+            event.preventDefault()
+            event.stopPropagation()
+            setState("grab", event.clientY - event.currentTarget.getBoundingClientRect().top)
+            event.currentTarget.setPointerCapture(event.pointerId)
+          }}
+          onPointerMove={(event) => {
+            if (state.grab === undefined) return
+            const travel = viewport.clientHeight - 8 - state.size
+
+            if (travel <= 0) return
+            viewport.scrollTop =
+              ((event.clientY - viewport.getBoundingClientRect().top - 4 - state.grab) / travel) *
+              (viewport.scrollHeight - viewport.clientHeight)
+          }}
+          onPointerUp={(event) => {
+            if (state.grab === undefined) return
+            event.currentTarget.releasePointerCapture(event.pointerId)
+          }}
+          onLostPointerCapture={() => setState("grab", undefined)}
+        />
+      </Show>
+    </div>
+  )
+}
diff --git a/packages/ui/src/data-display/line-comment/line-comment.tsx b/packages/ui/src/data-display/line-comment/line-comment.tsx
index 933fe9d815a4..c218bdc9ad99 100644
--- a/packages/ui/src/data-display/line-comment/line-comment.tsx
+++ b/packages/ui/src/data-display/line-comment/line-comment.tsx
@@ -18,6 +18,8 @@ import { Icon } from "@opencode/ui/icon"
 import { IconButton } from "@opencode/ui/icon-button"
 import { Keybind } from "@opencode/ui/keybind"
 import { Tooltip } from "@opencode/ui/tooltip"
+import { Loader } from "@opencode/ui/loader"
+import { makeEventListener } from "@solid-primitives/event-listener"
 import check from "./quote-check.svg"
 import "./line-comment.css"
 
@@ -100,6 +102,15 @@ export interface LineCommentEditorProps extends Omit<ComponentProps<"div">, "chi
   /** Submit an empty value too, such as to clear a comment that exists (default: false). Compact empty actions otherwise cancel. */
   allowEmpty?: boolean
   mention?: LineCommentEditorMention
+  /** Compact editor action on Mod+Enter or modifier-click. */
+  alternateSubmit?: {
+    label: string
+    keys: string[]
+    disabled?: boolean
+    onSubmit: (value: string) => void
+  }
+  /** Keep the draft read-only and prevent duplicate actions while its submission settles. */
+  submitting?: boolean
 }
 
 function pathFilename(path: string) {
@@ -119,6 +130,8 @@ export function LineCommentEditor(props: LineCommentEditorProps) {
   let textareaRef: HTMLTextAreaElement | undefined
   const [mentionOpen, setMentionOpen] = createSignal(false)
 
+  const [alternate, setAlternate] = createSignal(false)
+
   const [local, rest] = splitProps(props, [
     "label",
     "value",
@@ -134,6 +147,8 @@ export function LineCommentEditor(props: LineCommentEditorProps) {
     "autofocus",
     "allowEmpty",
     "mention",
+    "alternateSubmit",
+    "submitting",
     "class",
     "classList",
   ])
@@ -141,10 +156,25 @@ export function LineCommentEditor(props: LineCommentEditorProps) {
   const canSubmit = () => !!local.allowEmpty || local.value.trim().length > 0
   const compactCancel = () => !canSubmit()
 
+  const alternateActive = () => !!local.alternateSubmit && alternate()
+
   const compactLabel = () =>
-    compactCancel()
-      ? (local.cancelLabel ?? i18n.t("ui.lineComment.cancel"))
-      : (local.submitLabel ?? i18n.t("ui.lineComment.submit"))
+    alternateActive()
+      ? local.alternateSubmit!.label
+      : compactCancel()
+        ? (local.cancelLabel ?? i18n.t("ui.lineComment.cancel"))
+        : (local.submitLabel ?? i18n.t("ui.lineComment.submit"))
+
+  createEffect(() => {
+    if (local.variant !== "compact" || !local.alternateSubmit) return
+
+    const update = (event: KeyboardEvent) => setAlternate(modified(event))
+
+    // Capture modifier releases; the textarea stops key propagation.
+    makeEventListener(document, "keydown", update, { capture: true })
+    makeEventListener(document, "keyup", update, { capture: true })
+    makeEventListener(window, "blur", () => setAlternate(false))
+  })
 
   const closeMention = () => {
     setMentionOpen(false)
@@ -228,10 +258,18 @@ export function LineCommentEditor(props: LineCommentEditorProps) {
     selectMention(items.find((item) => item.path === active) ?? items[0])
   }
 
-  const submit = () => {
+  const submit = (alternate = false) => {
+    if (local.submitting) return
     const v = local.value.trim()
 
     if (!v && !local.allowEmpty) return
+
+    if (alternate && local.alternateSubmit) {
+      if (!local.alternateSubmit.disabled) local.alternateSubmit.onSubmit(v)
+
+      return
+    }
+
     local.onSubmit(v)
   }
 
@@ -278,6 +316,7 @@ export function LineCommentEditor(props: LineCommentEditorProps) {
       data-component="line-comment-v2"
       data-variant="editor"
       data-layout={local.variant ?? "default"}
+      aria-busy={local.submitting || undefined}
       classList={{
         ...local.classList,
         [local.class ?? ""]: !!local.class,
@@ -300,6 +339,7 @@ export function LineCommentEditor(props: LineCommentEditorProps) {
               rows={local.rows ?? (local.variant === "compact" ? 1 : 4)}
               placeholder={local.placeholder ?? i18n.t("ui.lineComment.contextPlaceholder")}
               value={local.value}
+              readOnly={local.submitting}
               style={{ "unicode-bidi": "plaintext", "text-align": "start" }}
               onInput={(e) => {
                 local.onInput(e.currentTarget.value)
@@ -312,7 +352,7 @@ export function LineCommentEditor(props: LineCommentEditorProps) {
 
                 if (e.isComposing || e.keyCode === 229) return
 
-                if (mentionOpen()) {
+                if (mentionOpen() && !local.submitting) {
                   if (e.key === "Escape") {
                     e.preventDefault()
                     closeMention()
@@ -343,6 +383,8 @@ export function LineCommentEditor(props: LineCommentEditorProps) {
 
                 if (e.key === "Escape") {
                   e.preventDefault()
+
+                  if (local.submitting) return
                   e.currentTarget.blur()
                   local.onCancel()
 
@@ -351,11 +393,13 @@ export function LineCommentEditor(props: LineCommentEditorProps) {
 
                 if (e.key === "Enter" && !e.shiftKey) {
                   e.preventDefault()
-                  submit()
+
+                  if (e.repeat) return
+                  submit(modified(e))
                 }
               }}
             />
-            <Show when={mentionOpen() && mention.flat().length > 0}>
+            <Show when={!local.submitting && mentionOpen() && mention.flat().length > 0}>
               <div data-slot="line-comment-v2-mention-list">
                 <For each={mention.flat().slice(0, 10)}>
                   {(item) => {
@@ -388,9 +432,21 @@ export function LineCommentEditor(props: LineCommentEditorProps) {
           <Show when={local.variant === "compact"}>
             <Tooltip
               value={
-                <>
-                  {compactLabel()} <Keybind keys={[compactCancel() ? "Esc" : "⏎"]} variant="neutral" />
-                </>
+                <div class="flex flex-col gap-1.5">
+                  <div class="flex items-center gap-1.5">
+                    {compactLabel()}
+                    <Keybind
+                      keys={alternateActive() ? local.alternateSubmit!.keys : [compactCancel() ? "Esc" : "⏎"]}
+                      variant="neutral"
+                    />
+                  </div>
+                  <Show when={local.alternateSubmit && !alternateActive()}>
+                    <div class="flex items-center gap-1.5">
+                      {local.alternateSubmit!.label}
+                      <Keybind keys={local.alternateSubmit!.keys} variant="neutral" />
+                    </div>
+                  </Show>
+                </div>
               }
               placement="top"
             >
@@ -398,9 +454,16 @@ export function LineCommentEditor(props: LineCommentEditorProps) {
                 data-slot="line-comment-v2-submit"
                 type="button"
                 size="small"
-                variant={local.value.trim() ? "neutral" : "ghost-muted"}
+                variant={
+                  alternateActive() || local.submitting ? "submit" : local.value.trim() ? "neutral" : "ghost-muted"
+                }
+                disabled={local.submitting || (alternateActive() && local.alternateSubmit?.disabled)}
                 icon={
-                  compactCancel() ? (
+                  local.submitting ? (
+                    <Loader />
+                  ) : alternateActive() ? (
+                    <Icon name="arrow-up" />
+                  ) : compactCancel() ? (
                     <Icon name="close" />
                   ) : (
                     <span
@@ -411,12 +474,30 @@ export function LineCommentEditor(props: LineCommentEditorProps) {
                   )
                 }
                 aria-label={compactLabel()}
-                onClick={() => (compactCancel() ? local.onCancel() : submit())}
+                onPointerEnter={(event) => {
+                  if (modified(event)) setAlternate(true)
+                }}
+                onClick={(event) => {
+                  if (compactCancel() && !alternateActive()) return local.onCancel()
+                  submit(alternateActive() || modified(event))
+                }}
                 onKeyDown={(event) => {
-                  if (event.key !== "Escape" || event.isComposing) return
+                  if (event.isComposing) return
+
+                  if (event.key === "Enter" && modified(event) && local.alternateSubmit) {
+                    event.preventDefault()
+                    event.stopPropagation()
+
+                    if (!event.repeat) submit(true)
+
+                    return
+                  }
+
+                  if (event.key !== "Escape") return
                   event.preventDefault()
                   event.stopPropagation()
-                  local.onCancel()
+
+                  if (!local.submitting) local.onCancel()
                 }}
               />
             </Tooltip>
@@ -441,3 +522,7 @@ export function LineCommentEditor(props: LineCommentEditorProps) {
     </div>
   )
 }
+
+function modified(event: Pick<KeyboardEvent, "metaKey" | "ctrlKey" | "altKey" | "shiftKey">) {
+  return (event.metaKey || event.ctrlKey) && !event.altKey && !event.shiftKey
+}
diff --git a/packages/ui/src/forms/text-input/text-input.css b/packages/ui/src/forms/text-input/text-input.css
index a6a9c9776f32..93678c27f6fb 100644
--- a/packages/ui/src/forms/text-input/text-input.css
+++ b/packages/ui/src/forms/text-input/text-input.css
@@ -15,10 +15,9 @@
     border: 0;
     border-radius: 6px;
     outline: 1px solid transparent;
-    outline-offset: 0;
-    background:
-      linear-gradient(180deg, var(--v2-alpha-light-6) 0%, var(--v2-alpha-light-2) 100%), var(--v2-background-bg-base);
-    box-shadow: var(--v2-elevation-button-neutral);
+    outline-offset: -1px;
+    background: var(--v2-background-bg-base);
+    box-shadow: var(--v2-elevation-input);
     flex: none;
     align-self: stretch;
     transition:
@@ -27,14 +26,37 @@
       box-shadow 85ms ease-out;
   }
 
+  [data-component="text-input-v2"][data-appearance="small"] {
+    height: 24px;
+  }
+
   [data-component="text-input-v2"][data-appearance="large"] {
     height: 32px;
   }
 
-  [data-component="text-input-v2"]:where(:hover):not([data-disabled], [data-invalid]):not(:focus-within) {
-    background:
-      linear-gradient(0deg, var(--v2-overlay-simple-overlay-hover), var(--v2-overlay-simple-overlay-hover)),
-      linear-gradient(180deg, var(--v2-alpha-light-6) 0%, var(--v2-alpha-light-2) 100%), var(--v2-background-bg-base);
+  [data-component="text-input-v2"][data-surface="layer-1"] {
+    background: var(--v2-background-bg-layer-01);
+  }
+
+  [data-component="text-input-v2"][data-surface="invisible"] {
+    background: transparent;
+    box-shadow: none;
+  }
+
+  @media (hover: hover) {
+    [data-component="text-input-v2"]:where(:hover):not([data-disabled], [data-invalid], [data-surface="invisible"]):not(
+        :focus-within
+      ) {
+      box-shadow:
+        inset 0 0 0 100vmax var(--v2-overlay-simple-overlay-hover),
+        var(--v2-elevation-input);
+    }
+
+    [data-component="text-input-v2"][data-surface="invisible"]:where(:hover):not([data-disabled], [data-invalid]):not(
+        :focus-within
+      ) {
+      background: var(--v2-overlay-simple-overlay-hover);
+    }
   }
 
   [data-component="text-input-v2"]:where(:focus-within):not([data-disabled], [data-invalid]) {
@@ -166,14 +188,6 @@
     color: currentColor;
   }
 
-  [data-component="text-input-v2"] [data-slot="text-input-v2-icon-button"][data-variant="clear"] {
-    width: 28px;
-    height: 28px;
-    padding: 0;
-    border-radius: 6px;
-    margin-inline-end: -8px;
-  }
-
   /* Pulls the buttons' padding out so their glyphs sit at the same inset as the leading icon. */
   [data-component="text-input-v2"] [data-slot="text-input-v2-trailing"] {
     display: flex;
diff --git a/packages/ui/src/forms/text-input/text-input.stories.tsx b/packages/ui/src/forms/text-input/text-input.stories.tsx
index 6c2f8c0fd064..235b994509dd 100644
--- a/packages/ui/src/forms/text-input/text-input.stories.tsx
+++ b/packages/ui/src/forms/text-input/text-input.stories.tsx
@@ -12,14 +12,15 @@ Compact single-line text field with neutral elevation, optional trailing copy ac
 - \`copyLabel\`: Accessible name for the copy button (default: "Copy").
 - \`onCopyClick\`: Handler for the copy button.
 - \`invalid\`: Error outline and danger text color.
-- \`appearance\`: \`"base"\` (28px) or \`"large"\` (32px).
+- \`appearance\`: \`"small"\` (24px), \`"base"\` (28px), or \`"large"\` (32px).
+- \`surface\`: \`"base"\` (default) or \`"layer-1"\` for a flat fill; \`"invisible"\` is unfilled at rest, with hover fill and inset focus/error outlines.
 
 ### States
 - **Hover**: neutral overlay on the raised surface.
 - **Focus** (\`:focus-within\`): focus border, elevation removed.
 - **Invalid**: danger border and text.
 - **Disabled**: 50% opacity.
-- Uses \`data-component="text-input-v2"\` with \`--v2-background-bg-base\`, \`--v2-elevation-button-neutral\`, \`--v2-text-text-faint\` (placeholder), and \`--v2-icon-icon-muted\` (copy icon).
+- Uses \`data-component="text-input-v2"\` with \`--v2-background-bg-base\`, \`--v2-elevation-input\`, \`--v2-text-text-faint\` (placeholder), and \`--v2-icon-icon-muted\` (copy icon).
 
 ### Field
 Compose with \`Field\` for label, helper prefix/suffix, and tooltip — see the **Field** story.
@@ -45,11 +46,16 @@ export default {
     disabled: false,
     invalid: false,
     appearance: "base",
+    surface: "base",
   },
   argTypes: {
+    surface: {
+      control: "select",
+      options: ["base", "layer-1", "invisible"],
+    },
     appearance: {
       control: "select",
-      options: ["base", "large"],
+      options: ["small", "base", "large"],
     },
     showCopyButton: {
       control: "boolean",
@@ -68,6 +74,18 @@ export default {
 
 export const Playground = {}
 
+export const Surfaces = {
+  render: () => (
+    <div style={{ display: "grid", gap: "20px", width: "280px" }}>
+      <TextInput placeholder="Base (default)" />
+      <TextInput surface="layer-1" placeholder="Layer 1" />
+      <TextInput surface="invisible" placeholder="Invisible" />
+      <TextInput surface="invisible" placeholder="Invisible, invalid" invalid />
+      <TextInput surface="invisible" placeholder="Invisible, disabled" disabled />
+    </div>
+  ),
+}
+
 export const WithCopyButton = {
   args: {
     placeholder: "api.example.com/v1",
@@ -101,9 +119,13 @@ export const Controlled = {
 export const Appearances = {
   render: () => (
     <div style={{ display: "grid", gap: "20px", width: "280px" }}>
+      <TextInput appearance="small" placeholder="Small (24px)" />
       <TextInput appearance="base" placeholder="Base (28px)" defaultValue="Base" />
       <TextInput appearance="large" placeholder="Large (32px)" defaultValue="Large" />
       <TextInput appearance="large" placeholder="Large with copy" defaultValue="copy-me" showCopyButton />
+      <TextInput appearance="small" placeholder="Small with clear" showClearButton />
+      <TextInput appearance="base" placeholder="Base with clear" showClearButton />
+      <TextInput appearance="large" placeholder="Large with clear" showClearButton />
     </div>
   ),
 }
diff --git a/packages/ui/src/forms/text-input/text-input.tsx b/packages/ui/src/forms/text-input/text-input.tsx
index fdc98b7d8132..1e493868486a 100644
--- a/packages/ui/src/forms/text-input/text-input.tsx
+++ b/packages/ui/src/forms/text-input/text-input.tsx
@@ -24,8 +24,10 @@ export interface TextInputProps extends Omit<ComponentProps<"input">, "type"> {
   numeric?: boolean
   /** Error styling for the field and value text. */
   invalid?: boolean
-  /** `base` is 28px tall; `large` is 32px tall. */
-  appearance?: "base" | "large"
+  /** `small` is 24px tall; `base` is 28px tall; `large` is 32px tall. */
+  appearance?: "small" | "base" | "large"
+  /** Background surface; invisible gains a fill on hover. */
+  surface?: "base" | "layer-1" | "invisible"
   type?: ComponentProps<"input">["type"]
 }
 
@@ -47,6 +49,7 @@ export function TextInput(props: TextInputProps) {
     "numeric",
     "invalid",
     "appearance",
+    "surface",
     "disabled",
   ])
 
@@ -57,6 +60,7 @@ export function TextInput(props: TextInputProps) {
       data-invalid={local.invalid ? "" : undefined}
       data-numeric={local.numeric ? "" : undefined}
       data-appearance={local.appearance ?? "base"}
+      data-surface={local.surface ?? "base"}
       data-leading-icon={local.leadingIcon ? "" : undefined}
       classList={{
         ...local.classList,
diff --git a/packages/ui/src/forms/textarea/textarea.css b/packages/ui/src/forms/textarea/textarea.css
index 7c350ea4329d..b72dacee6e44 100644
--- a/packages/ui/src/forms/textarea/textarea.css
+++ b/packages/ui/src/forms/textarea/textarea.css
@@ -9,10 +9,9 @@
   border: 0;
   border-radius: 6px;
   outline: 1px solid transparent;
-  outline-offset: 0;
-  background:
-    linear-gradient(180deg, var(--v2-alpha-light-2) 0%, var(--v2-alpha-light-0) 100%), var(--v2-background-bg-base);
-  box-shadow: var(--v2-elevation-button-neutral);
+  outline-offset: -1px;
+  background: var(--v2-background-bg-base);
+  box-shadow: var(--v2-elevation-input);
   flex: none;
   align-self: stretch;
   transition:
@@ -21,10 +20,16 @@
     box-shadow 85ms ease-out;
 }
 
-[data-component="textarea-v2"]:where(:hover):not([data-disabled], [data-invalid]):not(:focus-within) {
-  background:
-    linear-gradient(0deg, var(--v2-overlay-simple-overlay-hover), var(--v2-overlay-simple-overlay-hover)),
-    linear-gradient(180deg, var(--v2-alpha-light-2) 0%, var(--v2-alpha-light-0) 100%), var(--v2-background-bg-base);
+[data-component="textarea-v2"][data-surface="layer-1"] {
+  background: var(--v2-background-bg-layer-01);
+}
+
+@media (hover: hover) {
+  [data-component="textarea-v2"]:where(:hover):not([data-disabled], [data-invalid]):not(:focus-within) {
+    box-shadow:
+      inset 0 0 0 100vmax var(--v2-overlay-simple-overlay-hover),
+      var(--v2-elevation-input);
+  }
 }
 
 [data-component="textarea-v2"]:where(:focus-within):not([data-disabled], [data-invalid]) {
diff --git a/packages/ui/src/forms/textarea/textarea.stories.tsx b/packages/ui/src/forms/textarea/textarea.stories.tsx
index 8482aa1110b3..a5144f9020af 100644
--- a/packages/ui/src/forms/textarea/textarea.stories.tsx
+++ b/packages/ui/src/forms/textarea/textarea.stories.tsx
@@ -9,6 +9,7 @@ Multiline text field with the same neutral elevation, states, and tokens as Text
 ### API
 - Forwards native \`textarea\` props (\`value\`, \`defaultValue\`, \`placeholder\`, \`disabled\`, \`name\`, \`rows\`, etc.).
 - \`invalid\`: Error outline and danger text color.
+- \`surface\`: \`"base"\` (default) or \`"layer-1"\` for a flat fill.
 
 ### States
 - **Hover**: neutral overlay on the raised surface.
@@ -39,8 +40,13 @@ export default {
     disabled: false,
     invalid: false,
     rows: 3,
+    surface: "base",
   },
   argTypes: {
+    surface: {
+      control: "select",
+      options: ["base", "layer-1"],
+    },
     disabled: {
       control: "boolean",
     },
@@ -58,6 +64,18 @@ export default {
 
 export const Playground = {}
 
+export const Surfaces = {
+  parameters: { frameHeight: "700px" },
+  render: () => (
+    <div style={{ display: "grid", gap: "20px", width: "280px" }}>
+      <Textarea placeholder="Base (default)" />
+      <Textarea surface="layer-1" placeholder="Layer 1" />
+      <Textarea surface="layer-1" placeholder="Layer 1, invalid" invalid />
+      <Textarea surface="layer-1" placeholder="Layer 1, disabled" disabled />
+    </div>
+  ),
+}
+
 export const Controlled = {
   render: () => {
     const [value, setValue] = createSignal("Controlled value")
diff --git a/packages/ui/src/forms/textarea/textarea.tsx b/packages/ui/src/forms/textarea/textarea.tsx
index 02bde2473aaf..efb6799f2398 100644
--- a/packages/ui/src/forms/textarea/textarea.tsx
+++ b/packages/ui/src/forms/textarea/textarea.tsx
@@ -4,14 +4,16 @@ import "./textarea.css"
 export interface TextareaProps extends ComponentProps<"textarea"> {
   /** Error styling for the field and value text. */
   invalid?: boolean
+  surface?: "base" | "layer-1"
 }
 
 export function Textarea(props: TextareaProps) {
-  const [local, textareaProps] = splitProps(props, ["class", "classList", "invalid", "disabled", "rows"])
+  const [local, textareaProps] = splitProps(props, ["class", "classList", "invalid", "disabled", "rows", "surface"])
 
   return (
     <div
       data-component="textarea-v2"
+      data-surface={local.surface ?? "base"}
       data-disabled={local.disabled ? "" : undefined}
       data-invalid={local.invalid ? "" : undefined}
       classList={{
diff --git a/packages/ui/src/forms/typeahead/typeahead.tsx b/packages/ui/src/forms/typeahead/typeahead.tsx
index 4c338e89320f..6535e129647f 100644
--- a/packages/ui/src/forms/typeahead/typeahead.tsx
+++ b/packages/ui/src/forms/typeahead/typeahead.tsx
@@ -5,6 +5,7 @@ import { Icon } from "@opencode/ui/icon"
 import { abort } from "@opencode/util/abort"
 import { useI18n } from "../../context/i18n"
 import { Loader } from "../../feedback/loader/loader"
+import { MenuScroll } from "../../components/menu-scroll"
 import { createTypeahead } from "./controller"
 
 export { createTypeahead } from "./controller"
@@ -165,12 +166,12 @@ export function Typeahead<T>(props: {
             )
           }
         >
-          {/* A stable gutter keeps rows from shifting when the list overflows; the end padding gives way to it. */}
-          <div
+          <MenuScroll
             id={typeahead.listID}
             role="listbox"
-            data-scrollable
-            class="max-h-56 overflow-y-auto py-1 ps-1 pe-[max(0px,calc(4px-var(--scrollbar-size,0px)))] [scrollbar-gutter:stable] empty:hidden"
+            class="max-h-56"
+            viewportClass="p-1"
+            classList={{ hidden: results().items.length === 0 }}
           >
             <For each={results().items}>
               {(item) => (
@@ -195,7 +196,7 @@ export function Typeahead<T>(props: {
                 </div>
               )}
             </For>
-          </div>
+          </MenuScroll>
           {/* Stays mounted while a retry or a newer query is pending, so the list never collapses to nothing. */}
           <Show when={results().items.length === 0}>
             <div
diff --git a/packages/ui/src/styles/tokens/theme.css b/packages/ui/src/styles/tokens/theme.css
index 902766b5dca9..0366a04538a0 100644
--- a/packages/ui/src/styles/tokens/theme.css
+++ b/packages/ui/src/styles/tokens/theme.css
@@ -112,6 +112,9 @@
     --v2-elevation-overlay:
       0px 16px 32px 0px var(--v2-alpha-dark-4), 0px 8px 16px 0px var(--v2-alpha-dark-8),
       0px 0px 0px 0.5px var(--v2-alpha-dark-12), 0px 0px 0px 0px var(--v2-alpha-dark-0);
+    --v2-elevation-input:
+      0px 1px 1.5px 0px var(--v2-alpha-dark-10), 0px 0px 0px 0.5px var(--v2-alpha-dark-14),
+      0px 0px 0px 0px var(--v2-alpha-dark-0);
     --v2-elevation-button-neutral:
       0px 1px 1.5px 0px var(--v2-alpha-dark-10), 0px 0px 0px 0.5px var(--v2-alpha-dark-14),
       0px 0px 0px 0px var(--v2-alpha-dark-0);
@@ -229,6 +232,10 @@
         0px 8px 16px 0px var(--v2-alpha-dark-30),
         0px 0px 0px 0.5px var(--v2-alpha-light-16),
         0px -0.5px 0px 0px var(--v2-alpha-light-6);
+      --v2-elevation-input:
+        0px 1px 2px 0px var(--v2-alpha-dark-0),
+        0px 0px 0px 0.5px var(--v2-alpha-light-16),
+        0px -0.5px 0px 0px var(--v2-alpha-light-6);
       --v2-elevation-button-neutral:
         0px 1px 2px 0px var(--v2-alpha-dark-40),
         0px 0px 0px 0.5px var(--v2-alpha-light-20),
@@ -342,6 +349,9 @@
     --v2-elevation-overlay:
       0px 16px 32px 0px var(--v2-alpha-dark-4), 0px 8px 16px 0px var(--v2-alpha-dark-8),
       0px 0px 0px 0.5px var(--v2-alpha-dark-12), 0px 0px 0px 0px var(--v2-alpha-dark-0);
+    --v2-elevation-input:
+      0px 1px 1.5px 0px var(--v2-alpha-dark-10), 0px 0px 0px 0.5px var(--v2-alpha-dark-14),
+      0px 0px 0px 0px var(--v2-alpha-dark-0);
     --v2-elevation-button-neutral:
       0px 1px 1.5px 0px var(--v2-alpha-dark-10), 0px 0px 0px 0.5px var(--v2-alpha-dark-14),
       0px 0px 0px 0px var(--v2-alpha-dark-0);
@@ -488,6 +498,9 @@
     --v2-elevation-overlay:
       0px 16px 32px 0px var(--v2-alpha-dark-30), 0px 8px 16px 0px var(--v2-alpha-dark-30),
       0px 0px 0px 0.5px var(--v2-alpha-light-16), 0px -0.5px 0px 0px var(--v2-alpha-light-6);
+    --v2-elevation-input:
+      0px 1px 2px 0px var(--v2-alpha-dark-0), 0px 0px 0px 0.5px var(--v2-alpha-light-16),
+      0px -0.5px 0px 0px var(--v2-alpha-light-6);
     --v2-elevation-button-neutral:
       0px 1px 2px 0px var(--v2-alpha-dark-40), 0px 0px 0px 0.5px var(--v2-alpha-light-20),
       0px -0.5px 0px 0px var(--v2-alpha-light-10);
diff --git a/packages/ui/src/theme/themes/oc-2.json b/packages/ui/src/theme/themes/oc-2.json
index bd3d4fff202e..08af378f7a1a 100644
--- a/packages/ui/src/theme/themes/oc-2.json
+++ b/packages/ui/src/theme/themes/oc-2.json
@@ -243,6 +243,7 @@
       "v2-elevation-raised": "0px 2px 4px 0px var(--v2-alpha-dark-4), 0px 1px 2px -1px var(--v2-alpha-dark-8), 0px 0px 0px 0.5px var(--v2-alpha-dark-12), 0px 0px 0px 0px var(--v2-alpha-dark-0)",
       "v2-elevation-floating": "0px 8px 16px 0px var(--v2-alpha-dark-4), 0px 4px 8px 0px var(--v2-alpha-dark-8), 0px 0px 0px 0.5px var(--v2-alpha-dark-12), 0px 0px 0px 0px var(--v2-alpha-dark-0)",
       "v2-elevation-overlay": "0px 16px 32px 0px var(--v2-alpha-dark-4), 0px 8px 16px 0px var(--v2-alpha-dark-8), 0px 0px 0px 0.5px var(--v2-alpha-dark-12), 0px 0px 0px 0px var(--v2-alpha-dark-0)",
+      "v2-elevation-input": "0px 1px 1.5px 0px var(--v2-alpha-dark-10), 0px 0px 0px 0.5px var(--v2-alpha-dark-14), 0px 0px 0px 0px var(--v2-alpha-dark-0)",
       "v2-elevation-button-neutral": "0px 1px 1.5px 0px var(--v2-alpha-dark-10), 0px 0px 0px 0.5px var(--v2-alpha-dark-14), 0px 0px 0px 0px var(--v2-alpha-dark-0)",
       "v2-elevation-button-contrast": "0px 1px 1.5px 0px var(--v2-alpha-dark-20), 0px 0px 0px 0.5px var(--v2-grey-800), inset 0px 1px 2px 0px var(--v2-alpha-light-14), inset 0px -1px 2px 0px var(--v2-alpha-dark-6), 0px 0px 0px 0px var(--v2-alpha-dark-0)",
       "v2-elevation-elements": "0px 0.5px 0.5px 0px var(--v2-alpha-dark-40)",
@@ -494,6 +495,7 @@
       "v2-elevation-raised": "0px 2px 4px 0px var(--v2-alpha-dark-30), 0px 1px 2px 0px var(--v2-alpha-dark-30), 0px 0px 0px 0.5px var(--v2-alpha-light-16), 0px -0.5px 0px 0px var(--v2-alpha-light-6)",
       "v2-elevation-floating": "0px 8px 16px 0px var(--v2-alpha-dark-30), 0px 4px 8px 0px var(--v2-alpha-dark-30), 0px 0px 0px 0.5px var(--v2-alpha-light-16), 0px -0.5px 0px 0px var(--v2-alpha-light-6)",
       "v2-elevation-overlay": "0px 16px 32px 0px var(--v2-alpha-dark-30), 0px 8px 16px 0px var(--v2-alpha-dark-30), 0px 0px 0px 0.5px var(--v2-alpha-light-16), 0px -0.5px 0px 0px var(--v2-alpha-light-6)",
+      "v2-elevation-input": "0px 1px 2px 0px var(--v2-alpha-dark-0), 0px 0px 0px 0.5px var(--v2-alpha-light-16), 0px -0.5px 0px 0px var(--v2-alpha-light-6)",
       "v2-elevation-button-neutral": "0px 1px 2px 0px var(--v2-alpha-dark-40), 0px 0px 0px 0.5px var(--v2-alpha-light-20), 0px -0.5px 0px 0px var(--v2-alpha-light-10)",
       "v2-elevation-button-contrast": "0px 1px 2px 0px var(--v2-alpha-dark-40), 0px 0px 0px 0.5px var(--v2-alpha-light-40), inset 0px 0px 0px 0px var(--v2-alpha-light-0), inset 0px 0px 0px 0px var(--v2-alpha-light-0), 0px -0.5px 0px 0px var(--v2-alpha-light-30)",
       "v2-elevation-elements": "0px 0.5px 0.5px 0px var(--v2-alpha-dark-40)",
diff --git a/packages/ui/src/theme/v2/mapping.ts b/packages/ui/src/theme/v2/mapping.ts
index 3c6e1a4f250c..78c007bb3e5d 100644
--- a/packages/ui/src/theme/v2/mapping.ts
+++ b/packages/ui/src/theme/v2/mapping.ts
@@ -3,7 +3,7 @@ import { V2_AVATAR_DARK, V2_AVATAR_LIGHT } from "./avatar"
 
 const ref = (name: string): V2ColorValue => `var(--${name})`
 
-const lightAgentTokens: Record<string, V2ColorValue> = {
+const lightAgentTokens = {
   "v2-agent-plan-solid": ref("v2-pink-800"),
   "v2-agent-plan-border": "rgba(200, 61, 139, 0.20)",
   "v2-agent-plan-background": "rgba(253, 236, 243, 0.10)",
@@ -15,9 +15,9 @@ const lightAgentTokens: Record<string, V2ColorValue> = {
   "v2-agent-explore-background": "rgba(254, 250, 236, 0.1)",
   "v2-agent-review-solid": ref("v2-green-800"),
   "v2-agent-writer-solid": ref("v2-purple-700"),
-}
+} satisfies Record<string, V2ColorValue>
 
-const darkAgentTokens: Record<string, V2ColorValue> = {
+const darkAgentTokens = {
   "v2-agent-plan-solid": ref("v2-pink-400"),
   "v2-agent-plan-border": "rgba(247, 153, 198, 0.20)",
   "v2-agent-plan-background": "rgba(170, 53, 118, 0.05)",
@@ -29,9 +29,9 @@ const darkAgentTokens: Record<string, V2ColorValue> = {
   "v2-agent-explore-background": "rgba(172, 136, 51, 0.05)",
   "v2-agent-review-solid": ref("v2-green-300"),
   "v2-agent-writer-solid": ref("v2-purple-400"),
-}
+} satisfies Record<string, V2ColorValue>
 
-const light: Record<string, V2ColorValue> = {
+const light = {
   "v2-background-bg-base": ref("v2-grey-100"),
   "v2-background-bg-deep": ref("v2-grey-200"),
   "v2-background-bg-layer-01": ref("v2-grey-300"),
@@ -85,6 +85,8 @@ const light: Record<string, V2ColorValue> = {
     "0px 8px 16px 0px var(--v2-alpha-dark-4), 0px 4px 8px 0px var(--v2-alpha-dark-8), 0px 0px 0px 0.5px var(--v2-alpha-dark-12), 0px 0px 0px 0px var(--v2-alpha-dark-0)",
   "v2-elevation-overlay":
     "0px 16px 32px 0px var(--v2-alpha-dark-4), 0px 8px 16px 0px var(--v2-alpha-dark-8), 0px 0px 0px 0.5px var(--v2-alpha-dark-12), 0px 0px 0px 0px var(--v2-alpha-dark-0)",
+  "v2-elevation-input":
+    "0px 1px 1.5px 0px var(--v2-alpha-dark-10), 0px 0px 0px 0.5px var(--v2-alpha-dark-14), 0px 0px 0px 0px var(--v2-alpha-dark-0)",
   "v2-elevation-button-neutral":
     "0px 1px 1.5px 0px var(--v2-alpha-dark-10), 0px 0px 0px 0.5px var(--v2-alpha-dark-14), 0px 0px 0px 0px var(--v2-alpha-dark-0)",
   "v2-elevation-button-contrast":
@@ -97,9 +99,9 @@ const light: Record<string, V2ColorValue> = {
   "v2-illustration-illustration-layer-01": ref("v2-grey-300"),
   "v2-illustration-illustration-layer-02": ref("v2-grey-400"),
   "v2-illustration-illustration-layer-03": ref("v2-grey-500"),
-}
+} satisfies Record<string, V2ColorValue>
 
-const dark: Record<string, V2ColorValue> = {
+const dark = {
   "v2-background-bg-base": ref("v2-grey-1000"),
   "v2-background-bg-deep": ref("v2-grey-1100"),
   "v2-background-bg-layer-01": ref("v2-grey-800"),
@@ -153,6 +155,8 @@ const dark: Record<string, V2ColorValue> = {
     "0px 8px 16px 0px var(--v2-alpha-dark-30), 0px 4px 8px 0px var(--v2-alpha-dark-30), 0px 0px 0px 0.5px var(--v2-alpha-light-16), 0px -0.5px 0px 0px var(--v2-alpha-light-6)",
   "v2-elevation-overlay":
     "0px 16px 32px 0px var(--v2-alpha-dark-30), 0px 8px 16px 0px var(--v2-alpha-dark-30), 0px 0px 0px 0.5px var(--v2-alpha-light-16), 0px -0.5px 0px 0px var(--v2-alpha-light-6)",
+  "v2-elevation-input":
+    "0px 1px 2px 0px var(--v2-alpha-dark-0), 0px 0px 0px 0.5px var(--v2-alpha-light-16), 0px -0.5px 0px 0px var(--v2-alpha-light-6)",
   "v2-elevation-button-neutral":
     "0px 1px 2px 0px var(--v2-alpha-dark-40), 0px 0px 0px 0.5px var(--v2-alpha-light-20), 0px -0.5px 0px 0px var(--v2-alpha-light-10)",
   "v2-elevation-button-contrast":
@@ -165,7 +169,7 @@ const dark: Record<string, V2ColorValue> = {
   "v2-illustration-illustration-layer-01": ref("v2-grey-900"),
   "v2-illustration-illustration-layer-02": ref("v2-grey-800"),
   "v2-illustration-illustration-layer-03": ref("v2-grey-700"),
-}
+} satisfies Record<string, V2ColorValue>
 
 export function mapV2Semantics(isDark: boolean): Record<string, V2ColorValue> {
   return isDark ? dark : light
diff --git a/packages/ui/src/theme/v2/resolve.test.ts b/packages/ui/src/theme/v2/resolve.test.ts
index 13850aa6e62b..b12e91284734 100644
--- a/packages/ui/src/theme/v2/resolve.test.ts
+++ b/packages/ui/src/theme/v2/resolve.test.ts
@@ -57,7 +57,38 @@ describe("contrast icon-button tokens", () => {
   })
 })
 
+describe("input elevation", () => {
+  test.each([
+    {
+      mode: "light",
+      input:
+        "0px 1px 1.5px 0px var(--v2-alpha-dark-10), 0px 0px 0px 0.5px var(--v2-alpha-dark-14), 0px 0px 0px 0px var(--v2-alpha-dark-0)",
+      button:
+        "0px 1px 1.5px 0px var(--v2-alpha-dark-10), 0px 0px 0px 0.5px var(--v2-alpha-dark-14), 0px 0px 0px 0px var(--v2-alpha-dark-0)",
+    },
+    {
+      mode: "dark",
+      input:
+        "0px 1px 2px 0px var(--v2-alpha-dark-0), 0px 0px 0px 0.5px var(--v2-alpha-light-16), 0px -0.5px 0px 0px var(--v2-alpha-light-6)",
+      button:
+        "0px 1px 2px 0px var(--v2-alpha-dark-40), 0px 0px 0px 0.5px var(--v2-alpha-light-20), 0px -0.5px 0px 0px var(--v2-alpha-light-10)",
+    },
+  ] as const)(
+    "$mode matches Figma in OC-2 and custom-theme fallbacks without changing buttons",
+    ({ mode, input, button }) => {
+      for (const tokens of [
+        resolveThemeV2(theme)[mode],
+        resolveThemeVariantV2({ ...theme[mode], v2Overrides: undefined }, mode === "dark"),
+      ]) {
+        expect(tokens["v2-elevation-input"]).toBe(input)
+        expect(tokens["v2-elevation-button-neutral"]).toBe(button)
+      }
+    },
+  )
+})
+
 function expectIconEmphasis(tokens: ResolvedV2Theme) {
+  // SAFETY: these resolved background/icon color tokens are hex colors or references to other hex color tokens.
   const resolve = (value: string): HexColor =>
     value.startsWith("var(--") ? resolve(tokens[value.slice(6, -1)]) : (value as HexColor)
 
diff --git a/packages/util/package.json b/packages/util/package.json
index a89d6816d2e9..93d95ea859b5 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/util",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "type": "module",
   "license": "MIT",
   "repository": {
diff --git a/packages/web/package.json b/packages/web/package.json
index d192d57ab993..4fc37b46c541 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -2,7 +2,7 @@
   "name": "@opencode/web",
   "type": "module",
   "license": "MIT",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "scripts": {
     "dev": "astro dev",
     "dev:remote": "VITE_API_URL=https://api.opencode.ai astro dev",
diff --git a/patches/@brendonovich%2Fvite-plugin-opencode@0.1.3.patch b/patches/@brendonovich%2Fvite-plugin-opencode@0.1.3.patch
new file mode 100644
index 000000000000..c4a696679041
--- /dev/null
+++ b/patches/@brendonovich%2Fvite-plugin-opencode@0.1.3.patch
@@ -0,0 +1,12 @@
+diff --git a/dist/index.js b/dist/index.js
+index 0bf00fc8965a8255e47694b450163f9cf6616bd8..5a901d835c022175ae45c393b34b12caf0686aaa 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -735,6 +735,7 @@ textarea.addEventListener("input", () => {
+   textarea.style.height = Math.min(textarea.scrollHeight, 140) + "px";
+ });
+ window.addEventListener("keydown", (event) => {
++  if (event.code === "KeyD" && !active && !event.composedPath().includes(host)) return;
+   if (
+     dialog.classList.contains("open") &&
+     (event.metaKey || event.ctrlKey) &&
diff --git a/sdks/vscode/package.json b/sdks/vscode/package.json
index fd791cfb6d3d..597f0fa088cd 100644
--- a/sdks/vscode/package.json
+++ b/sdks/vscode/package.json
@@ -2,7 +2,7 @@
   "name": "opencode",
   "displayName": "opencode",
   "description": "opencode for VS Code",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "publisher": "sst-dev",
   "repository": {
     "type": "git",
diff --git a/services/update/package.json b/services/update/package.json
index 1b112ba1cef8..c8b32d36cf4f 100644
--- a/services/update/package.json
+++ b/services/update/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/update",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/services/www/src/content.config.ts b/services/www/src/content.config.ts
index fd69fd947735..f58235009d37 100644
--- a/services/www/src/content.config.ts
+++ b/services/www/src/content.config.ts
@@ -11,6 +11,7 @@ export const collections = {
     schema: z.object({
       title: z.string(),
       description: z.string().optional(),
+      noindex: z.boolean().optional(),
       tableOfContents: z
         .union([
           z.boolean(),
diff --git a/services/www/src/docs/components/DocsPage.astro b/services/www/src/docs/components/DocsPage.astro
index 59df9257071c..eb405a064bd3 100644
--- a/services/www/src/docs/components/DocsPage.astro
+++ b/services/www/src/docs/components/DocsPage.astro
@@ -22,6 +22,7 @@ const rendered = await render(entry)
   currentSlug={entry.id}
   headings={rendered.headings}
   showTableOfContents={entry.data.tableOfContents !== false}
+  noindex={entry.data.noindex}
 >
   <rendered.Content components={{ Callout, Card, CardGroup, CodeBlock, CodeTabs, PlanTabs }} />
 </DocsLayout>
diff --git a/services/www/src/docs/content/agents.mdx b/services/www/src/docs/content/agents.mdx
index 9aa942e5dca5..f65cd9c5b5f0 100644
--- a/services/www/src/docs/content/agents.mdx
+++ b/services/www/src/docs/content/agents.mdx
@@ -130,7 +130,7 @@ Subagents run with fresh context in foreground or background child sessions. The
 }
 ```
 
-## Builtins
+## Built-ins
 
 OpenCode includes these visible agents:
 
diff --git a/services/www/src/docs/content/claude-agent.mdx b/services/www/src/docs/content/claude-agent.mdx
new file mode 100644
index 000000000000..d8bf9e41fd4c
--- /dev/null
+++ b/services/www/src/docs/content/claude-agent.mdx
@@ -0,0 +1,101 @@
+---
+title: "Claude Agent"
+noindex: true
+---
+
+Use your Claude plan or another Claude Code login. Claude Agent runs Claude Code on your machine, so install Claude Code
+2.1.248 or later and sign in first.
+
+```bash
+claude auth login
+```
+
+Then connect **Claude Agent** and choose a model. The model list comes from Claude Code. Effort levels are variants, such
+as `claude-agent/opus#high`.
+
+```text
+/connect
+# Select Claude Agent.
+/models
+```
+
+You can also connect from the CLI with `auth login claude-agent`.
+
+OpenCode finds `claude` on your `PATH`. To use another copy, set `OPENCODE_CLAUDE_PATH` on the server.
+
+```bash
+opencode service set env OPENCODE_CLAUDE_PATH /opt/claude/bin/claude
+```
+
+## How it works
+
+Claude Code calls the model, and OpenCode does everything else.
+
+- Claude gets Claude Code's system prompt, plus your agent's prompt, `AGENTS.md` files, skills, and MCP instructions.
+- Claude uses OpenCode's tools and permissions instead of Claude Code's built-in tools.
+- Your Claude Code settings, `CLAUDE.md` files, hooks, MCP servers, skills, and memory are not loaded.
+- OpenCode runs compaction and subagents.
+- You can switch between Claude Agent and other models in the same session.
+
+## Cost
+
+Cost depends on how Claude Code is signed in.
+
+| Login | Cost shown |
+| --- | --- |
+| Claude subscription | None, your plan covers it |
+| Anthropic API key, or Claude Platform on AWS or Google Cloud | Anthropic prices |
+| Amazon Bedrock | Bedrock prices, or Anthropic prices on Bedrock Mantle |
+| Google Vertex | Vertex prices |
+| Microsoft Foundry | Azure prices |
+| Custom base URL | None |
+
+## Configure
+
+Connection settings on the `claude-agent` provider are passed to Claude Code. They override the same variables set in
+your shell.
+
+```jsonc title="opencode.jsonc"
+{
+  "$schema": "https://opencode.ai/config.json",
+  "providers": {
+    "claude-agent": {
+      "settings": {
+        "baseURL": "https://llm-proxy.example.com/anthropic",
+      },
+      "headers": {
+        "X-Gateway-Tenant": "engineering",
+      },
+    },
+  },
+}
+```
+
+| Config | Claude Code variable |
+| --- | --- |
+| `settings.baseURL` | `ANTHROPIC_BASE_URL` |
+| `settings.apiKey` | `ANTHROPIC_API_KEY` |
+| `settings.authToken` | `ANTHROPIC_AUTH_TOKEN` |
+| `settings.headerTimeout` | `API_TIMEOUT_MS` |
+| `settings.chunkTimeout` | `CLAUDE_STREAM_IDLE_TIMEOUT_MS` |
+| `headers` | `ANTHROPIC_CUSTOM_HEADERS` |
+| `body` | `CLAUDE_CODE_EXTRA_BODY` |
+
+Set them on a model to override the provider's values for that model.
+
+## Limitations
+
+- Claude Code must be installed on the same machine as the OpenCode server. Claude Agent is not available in remote
+  workspaces.
+- Claude Code's system prompt replaces OpenCode's built-in prompt. Custom agent prompts still apply.
+- Temperature, top-p, top-k, seed, and stop sequences are not supported.
+- Plugin `http.request` and `http.response` hooks do not run, because Claude Code makes the API calls.
+- Claude Code features such as `/usage`, `/loop`, auto mode, and agent teams are not available.
+
+## Errors
+
+| Error or symptom | Check |
+| --- | --- |
+| `Claude Code is not installed` | Install Claude Code, or set `OPENCODE_CLAUDE_PATH` to its path. |
+| `Claude Code is not logged in` | Run `claude auth login`, then connect Claude Agent again. |
+| `Claude Code ... is too old` | Run `claude update`. |
diff --git a/services/www/src/docs/content/cli/keybinds.mdx b/services/www/src/docs/content/cli/keybinds.mdx
index 107f0461f0e2..d5e14aadd1d2 100644
--- a/services/www/src/docs/content/cli/keybinds.mdx
+++ b/services/www/src/docs/content/cli/keybinds.mdx
@@ -115,7 +115,7 @@ The `app.clear` command works only in [`opencode mini`](/cli). Press `ctrl+l` to
 | ----------- | -------- | ---------------- |
 | `app.clear` | `ctrl+l` | Clear the screen |
 
-## Diff Viewer
+## Diff viewer
 
 Press `d` (`diff.switch_source`) to choose **All**, **Committed**, **Uncommitted**, or **Last turn** (inside a session), or select **Base** to change the comparison branch. Choices are remembered until the TUI exits. Set the initial scope with [`diffs.source` in `cli.json`](/cli/config#diffs).
 
@@ -155,7 +155,7 @@ The shifted `diff.help` alternatives support terminals that report the Shift mod
 
 The retired `diff.toggle`, `diff.expand`, `diff.expand_all`, `diff.collapse`, and `diff.switch_focus` configuration entries are still accepted, but no longer register shortcuts.
 
-## Appearance And Navigation
+## Appearance and navigation
 
 | ID                         | Default         | Description                              |
 | -------------------------- | --------------- | ---------------------------------------- |
@@ -231,7 +231,7 @@ The retired `diff.toggle`, `diff.expand`, `diff.expand_all`, `diff.collapse`, an
 | `session.tab.select.9`                | `<leader>9,ctrl+9`      | Switch to session tab 9                  |
 | `session.tab.select.10`               | `<leader>0,ctrl+0`      | Switch to session tab 10                 |
 
-## Models And Agents
+## Models and agents
 
 | ID                             | Default     | Description                          |
 | ------------------------------ | ----------- | ------------------------------------ |
@@ -253,7 +253,7 @@ The retired `diff.toggle`, `diff.expand`, `diff.expand_all`, `diff.collapse`, an
 | `variant.cycle`                | `ctrl+t`    | Cycle model variants                 |
 | `variant.list`                 | `none`      | List model variants                  |
 
-## Session Navigation
+## Session navigation
 
 | ID                              | Default                | Description                       |
 | ------------------------------- | ---------------------- | --------------------------------- |
@@ -275,7 +275,7 @@ The retired `diff.toggle`, `diff.expand`, `diff.expand_all`, `diff.collapse`, an
 | `session.redo`                  | `<leader>r`            | Redo message                      |
 | `session.toggle.thinking`       | `none`                 | Toggle thinking blocks visibility |
 
-## Prompt Commands
+## Prompt commands
 
 | ID                            | Default          | Description            |
 | ----------------------------- | ---------------- | ---------------------- |
@@ -288,7 +288,7 @@ The retired `diff.toggle`, `diff.expand`, `diff.expand_all`, `diff.collapse`, an
 | `prompt.stash.pop`            | `none`           | Pop stashed prompt     |
 | `prompt.stash.list`           | `none`           | List stashed prompts   |
 
-## Input Editing
+## Input editing
 
 | ID                              | Default                                                                       | Description                             |
 | ------------------------------- | ----------------------------------------------------------------------------- | --------------------------------------- |
@@ -353,7 +353,7 @@ Select a running command in the **Shell** tab and press **Enter**, or click it,
 Use **↑/↓**, **Page Up/Down**, or **Home** to scroll, **End** to follow new output, and **Esc** to return without stopping the command.
 The viewer shows recent output and stays open after exit; output redirected to a file is not included.
 
-## Dialogs And Autocomplete
+## Dialogs and autocomplete
 
 | ID                             | Default       | Description                         |
 | ------------------------------ | ------------- | ----------------------------------- |
@@ -384,7 +384,7 @@ The viewer shows recent output and stays open after exit; output redirected to a
 | `dialog.plugins.update`        | `ctrl+u`      | Update plugin from plugin dialog    |
 | `dialog.plugins.check`         | `ctrl+r`      | Check for plugin updates            |
 
-## Terminal And Plugins
+## Terminal and plugins
 
 | ID                      | Default  | Description                |
 | ----------------------- | -------- | -------------------------- |
diff --git a/services/www/src/docs/content/cli/providers.mdx b/services/www/src/docs/content/cli/providers.mdx
index 5bfc63dce416..400bed786c8d 100644
--- a/services/www/src/docs/content/cli/providers.mdx
+++ b/services/www/src/docs/content/cli/providers.mdx
@@ -99,8 +99,6 @@ Some providers also use their native ambient credential chain instead of an API-
   `gcloud auth application-default login` and set `GOOGLE_CLOUD_PROJECT`.
 - Azure exposes **Microsoft Entra ID (Azure CLI)** as a connect method when `az` is installed. Run `az login` first, then
   select that method in `/connect` or `auth login azure`.
-- [Claude Agent](/providers#claude-agent) uses your Claude Code login. Run `claude auth login` first, then select
-  Claude Agent in `/connect` or run `auth login claude-agent`.
 
 ```bash
 gcloud auth application-default login
diff --git a/services/www/src/docs/content/cli/theme.mdx b/services/www/src/docs/content/cli/theme.mdx
index 9242237f0717..1f49ae0af1d2 100644
--- a/services/www/src/docs/content/cli/theme.mdx
+++ b/services/www/src/docs/content/cli/theme.mdx
@@ -40,7 +40,7 @@ Use `system` to follow your terminal's appearance, or lock the theme to light or
 
 This maps to the `mode` field inside `theme` in your CLI config. If a custom theme provides only one mode, OpenCode uses that mode when the other is requested.
 
-## Adding a Theme
+## Adding a theme
 
 To add a theme you downloaded or received from someone else, copy its JSON file into the global themes directory:
 
@@ -54,7 +54,7 @@ The filename becomes the theme name. For example, `my-theme.json` appears as `my
 
 OpenCode reads `.json` files only. A theme closer to the current directory replaces a global or parent theme with the same name.
 
-## Using Themes in Plugins
+## Using themes in plugins
 
 [TUI plugins](/build/plugins/cli) read resolved colors through `context.theme` and the active mode through `context.themeMode`. Use semantic tokens so your plugin follows the selected theme:
 
@@ -69,9 +69,9 @@ function Status() {
 
 The public TUI plugin API does not register themes. Add custom theme definitions with JSON files in the directories above.
 
-## Creating a Theme
+## Creating a theme
 
-Use our [Theme Tool](https://opencode.ai/theme/) to create or edit themes. This tool makes it easy to understand the structure, change it, and define custom colors. The explanation below is for reference.
+Use our [theme tool](https://opencode.ai/theme/) to create or edit themes. This tool makes it easy to understand the structure, change it, and define custom colors. The explanation below is for reference.
 
 A theme separates shared semantic tokens from mode-specific palettes:
 
diff --git a/services/www/src/docs/content/cli/web.mdx b/services/www/src/docs/content/cli/web.mdx
index a49c3fecc6fa..be765c767e96 100644
--- a/services/www/src/docs/content/cli/web.mdx
+++ b/services/www/src/docs/content/cli/web.mdx
@@ -4,7 +4,7 @@ description: "Run OpenCode in the browser."
 ---
 
 OpenCode ships with a web UI that is served from the same server that powers the
-TUI. It's available by default and password protected.
+TUI. It's available by default and password-protected.
 
 ## Access
 
diff --git a/services/www/src/docs/content/commands.mdx b/services/www/src/docs/content/commands.mdx
index bacf2397a0f7..a497cb65dc12 100644
--- a/services/www/src/docs/content/commands.mdx
+++ b/services/www/src/docs/content/commands.mdx
@@ -31,7 +31,7 @@ Only `.md` files are discovered. Nested paths become command names with `/` sepa
 Review $ARGUMENTS using the team's checklist.
 ```
 
-Run the nested command as `/team/review src/auth.ts`. The legacy singular directories `command/` are also discovered,
+Run the nested command as `/team/review src/auth.ts`. The legacy singular directory `command/` is also discovered,
 but use `commands/` for new files.
 
 Add YAML frontmatter when the command needs metadata. The trimmed Markdown body is always the prompt template.
diff --git a/services/www/src/docs/content/compaction.mdx b/services/www/src/docs/content/compaction.mdx
index a2c1357a1db3..8e2a06c50af3 100644
--- a/services/www/src/docs/content/compaction.mdx
+++ b/services/www/src/docs/content/compaction.mdx
@@ -75,7 +75,7 @@ Add `compaction` to any [OpenCode configuration file](/config):
   "compaction": {
     "auto": false,
     "keep": { "tokens": 24000 },
-    "buffer": 16000,
+    "buffer": "20%",
   },
 }
 ```
@@ -84,9 +84,23 @@ Add `compaction` to any [OpenCode configuration file](/config):
 | --- | ---: | --- |
 | `auto` | `true` | Compact automatically near the context limit, and recover once when a provider rejects a request as too long. Manual compaction always works. |
 | `keep.tokens` | `15000` | Approximate recent conversation kept beside the summary. Larger values preserve more detail but leave less room for new work. |
-| `buffer` | 15% of the limit, at least 16k | Tokens to keep free below the model's limit. Larger values start automatic compaction earlier. A buffer at least as large as the model's limit is ignored. |
+| `buffer` | `"15%"`, at least 16k | Share of the model's context window kept free. Automatic compaction starts once the conversation reaches the rest. Larger values compact earlier. |
 
-`keep.tokens` and `buffer` accept non-negative integers.
+`keep.tokens` accepts a non-negative integer.
+
+### Buffer
+
+`buffer` is a percentage of each model's window, so one setting fits every model:
+
+| Model window | `"buffer": "20%"` compacts at |
+| ---: | ---: |
+| 128k | ~102k |
+| 1M | 800k |
+
+- It is the room kept free, not the point where compaction starts: `"20%"` compacts at 80% full.
+- Accepts `"1%"` to `"99%"`, including decimals such as `"12.5%"`.
+- A token count such as `20000` also works. The same count is a large share of a small window and a small share of a large one.
+- A token count at least as large as the model's window is ignored and the default applies.
 
 ## Model
 
diff --git a/services/www/src/docs/content/config.mdx b/services/www/src/docs/content/config.mdx
index 83d5ddc56fe2..8aded5ef72b0 100644
--- a/services/www/src/docs/content/config.mdx
+++ b/services/www/src/docs/content/config.mdx
@@ -328,7 +328,7 @@ provider automatically.
 }
 ```
 
-See the [websearch guide](/websearch) for providers, credentials, selection,
+See the [web search guide](/websearch) for providers, credentials, selection,
 rate limits, and disabling search.
 
 ### MCP
@@ -363,11 +363,13 @@ Control automatic context compaction and how much recent context it preserves.
     "keep": {
       "tokens": 15000,
     },
-    "buffer": 20000,
+    "buffer": "15%",
   },
 }
 ```
 
+`buffer` is the share of the model's context window kept free before automatic compaction starts.
+
 Local summaries remain the default. Opt into native provider compaction for both
 automatic and manual requests with a provider or model policy:
 
diff --git a/services/www/src/docs/content/console/index.mdx b/services/www/src/docs/content/console/index.mdx
index 13c9eaaa52c0..28f10545eb75 100644
--- a/services/www/src/docs/content/console/index.mdx
+++ b/services/www/src/docs/content/console/index.mdx
@@ -9,7 +9,7 @@ using OpenCode, on your own or as a team.
 - [Inference](/console/models) for both proprietary and open source models
 - [Providers](/console/providers) for connecting your own provider accounts through the Console gateway
 - Usage tracking and [budget](/console/budgets) controls
-- Deploy team wide policies to control OpenCode behavior
+- Deploy team-wide policies to control OpenCode behavior
 - [Web search](/console/websearch)
 - [Harnesses](/console/harnesses) for using Console models from Claude Code, Codex, and other agents
 - [OpenCode Go, Go Plus, and Go Teams](/console/go), $10, $40, and $20/member monthly subscriptions for open source model access
diff --git a/services/www/src/docs/content/console/scim.mdx b/services/www/src/docs/content/console/scim.mdx
index 7574b6d08c63..b2545286d8e9 100644
--- a/services/www/src/docs/content/console/scim.mdx
+++ b/services/www/src/docs/content/console/scim.mdx
@@ -1,5 +1,5 @@
 ---
-title: "Directory Sync"
+title: "Directory sync"
 description: "Add and remove workspace members automatically from Okta, Microsoft Entra ID, or any SCIM 2.0 identity provider."
 ---
 
diff --git a/services/www/src/docs/content/console/websearch.mdx b/services/www/src/docs/content/console/websearch.mdx
index 9857874a154b..229b5351d910 100644
--- a/services/www/src/docs/content/console/websearch.mdx
+++ b/services/www/src/docs/content/console/websearch.mdx
@@ -1,5 +1,5 @@
 ---
-title: "Web Search"
+title: "Web search"
 description: "Hosted web search for OpenCode through Console."
 ---
 
@@ -31,7 +31,7 @@ Find the latest Bun release and summarize the changes with source links.
 
 The hosted provider searches the public web and returns up to eight results. OpenCode uses the results to answer the prompt and cite sources.
 
-See the [Websearch guide](/websearch) to configure permissions or disable the tool.
+See the [web search guide](/websearch) to configure permissions or disable the tool.
 
 ## Billing
 
diff --git a/services/www/src/docs/content/formatters.mdx b/services/www/src/docs/content/formatters.mdx
index e78821e0f6e8..0b9c1a9ec3dc 100644
--- a/services/www/src/docs/content/formatters.mdx
+++ b/services/www/src/docs/content/formatters.mdx
@@ -36,7 +36,7 @@ resets them to the built-ins.
 }
 ```
 
-## Builtins
+## Built-ins
 
 OpenCode includes these formatter definitions. Most require the named command
 to be available; definitions with extra detection rules list them below.
diff --git a/services/www/src/docs/content/index.mdx b/services/www/src/docs/content/index.mdx
index af9134d00584..f301444aa41d 100644
--- a/services/www/src/docs/content/index.mdx
+++ b/services/www/src/docs/content/index.mdx
@@ -73,7 +73,7 @@ directly [in the TUI](/cli/providers) with `/connect`.
 
 See [Providers](/providers) to configure custom providers.
 
-If you'd like easy access to all the best coding models you can try out
+If you'd like easy access to the best coding models, you can try out
 [OpenCode Console](/console).
 
 You can also try [OpenCode Go](/console/go), a $10/month subscription
@@ -91,6 +91,6 @@ settings](/cli/config).
 
 ## Learn
 
-If you are interested in an indepth course on OpenCode Boot.dev has created an excellent [AI Coding with
+If you are interested in an in-depth course on OpenCode, Boot.dev has created an excellent [AI Coding with
 OpenCode](https://www.boot.dev/courses/learn-ai-coding) course in consultation with our team. All the information in the course is
 free to read and watch, though some interactive features may require payment.
diff --git a/services/www/src/docs/content/migrate-v1.mdx b/services/www/src/docs/content/migrate-v1.mdx
index e00b89ca671a..85909f46f4c9 100644
--- a/services/www/src/docs/content/migrate-v1.mdx
+++ b/services/www/src/docs/content/migrate-v1.mdx
@@ -11,8 +11,8 @@ V2 has three intentional breaking changes:
 
 - [Plugins](/build/plugins/migrate-v1) use a new plugin API.
 - The [server API and clients](#server-api-and-clients) have new contracts.
-- [Terminal client configuration](/cli/config) moves from layered `tui.json(c)` files to one global `cli.json` file (auto
-  migrated).
+- [Terminal client configuration](/cli/config) moves from layered `tui.json(c)` files to one global `cli.json` file
+  (auto-migrated).
 
 Supported V1 functionality outside those areas is intended to remain compatible with V1. Some fields accepted by the V1
 schema never had a V2 equivalent and are intentionally ignored; these are listed under
@@ -29,7 +29,7 @@ compatibility bug rather than an expected migration requirement.
 
 ## Install V2
 
-Install the V2 terminal client with the [terminal startup guide](/cli).
+Install the V2 terminal client with the [installation instructions](/#cli).
 
 You do not need to rewrite everything before starting V2. A practical migration is:
 
@@ -61,7 +61,7 @@ V2 reads existing system, global, and project configuration from the same locati
 <project>/.opencode/opencode.json(c)
 ```
 
-V2 reads these same locations. It normalizes supported V1 and native V2 fields in memory without rewriting the source
+V2 normalizes supported V1 and native V2 fields in memory without rewriting the source
 file. Existing supported V1 configuration is intended to keep working, so you do not need to convert it to try or adopt
 V2.
 
@@ -288,6 +288,9 @@ V2 groups the retained-context token budget under `keep` and gives the reserve a
 }
 ```
 
+The V1 token count carries over as is. V2 also accepts a percentage of the model's window, such as `"buffer": "15%"`,
+which fits models with different window sizes.
+
 `auto` keeps its name. V2 has no native `tail_turns` or `prune` field; both legacy fields are ignored with a warning. Recent
 context is retained by token budget instead. See [Compaction](/compaction).
 
diff --git a/services/www/src/docs/content/models.mdx b/services/www/src/docs/content/models.mdx
index f6dd09fd0edf..bbeb54ccee8c 100644
--- a/services/www/src/docs/content/models.mdx
+++ b/services/www/src/docs/content/models.mdx
@@ -393,7 +393,7 @@ path prefix:
 - Omit `apiKey` when the endpoint does not require bearer authentication.
 - Disable discovery with `"plugins": ["-opencode.provider.ollama"]`.
 
-### LMStudio
+### LM Studio
 
 With an unauthenticated LM Studio server at `http://127.0.0.1:1234`, select a discovered model with the `lmstudio`
 provider ID:
diff --git a/services/www/src/docs/content/policies.mdx b/services/www/src/docs/content/policies.mdx
index d1998fe51297..bfd551cff6a8 100644
--- a/services/www/src/docs/content/policies.mdx
+++ b/services/www/src/docs/content/policies.mdx
@@ -215,7 +215,7 @@ it was configured.
 
 ### Upgrading from `integration.use`
 
-Before OpenCode 2.3.0, `integration.use` covered MCP servers, skills, and plugins
+Before OpenCode 2.2.3, `integration.use` covered MCP servers, skills, and plugins
 through an `mcp:`, `skill:`, or `plugin:` prefix. Prefixed statements still load and
 are converted to `mcp.use`, `skill.use`, or `plugin.use`.
 
@@ -243,8 +243,8 @@ the old meaning, replace it with:
 Exceptions move the same way: `integration.use` `mcp:github` becomes `mcp.use`
 `github`, and `skill:team:review` becomes `skill.use` `team:review`.
 
-Clients older than 2.3.0 ignore `integration.connect`, `integration.use` (in its new
-meaning), `mcp.use`, `skill.use`, and `plugin.use`, so require 2.3.0 or newer
+Clients older than 2.2.3 ignore `integration.connect`, `integration.use` (in its new
+meaning), `mcp.use`, `skill.use`, and `plugin.use`, so require 2.2.3 or newer
 wherever you rely on them.
 
 ## Precedence
diff --git a/services/www/src/docs/content/providers.mdx b/services/www/src/docs/content/providers.mdx
index 2be5b94e10c5..0d93bcb15b15 100644
--- a/services/www/src/docs/content/providers.mdx
+++ b/services/www/src/docs/content/providers.mdx
@@ -56,95 +56,6 @@ enabled.
 }
 ```
 
-## Claude Agent
-
-Use your Claude plan or another Claude Code login. Claude Agent runs Claude Code on your machine, so install Claude Code
-2.1.248 or later and sign in first.
-
-```bash
-claude auth login
-```
-
-Then connect **Claude Agent** and choose a model. The model list comes from Claude Code. Effort levels are variants, such
-as `claude-agent/opus#high`.
-
-```text
-/connect
-# Select Claude Agent.
-/models
-```
-
-OpenCode finds `claude` on your `PATH`. To use another copy, set `OPENCODE_CLAUDE_PATH` on the server.
-
-```bash
-opencode service set env OPENCODE_CLAUDE_PATH /opt/claude/bin/claude
-```
-
-### How it works
-
-Claude Code calls the model, and OpenCode does everything else.
-
-- Claude gets Claude Code's system prompt, plus your agent's prompt, `AGENTS.md` files, skills, and MCP instructions.
-- Claude uses OpenCode's tools and permissions instead of Claude Code's built-in tools.
-- Your Claude Code settings, `CLAUDE.md` files, hooks, MCP servers, skills, and memory are not loaded.
-- OpenCode runs compaction and subagents.
-- You can switch between Claude Agent and other models in the same session.
-
-### Cost
-
-Cost depends on how Claude Code is signed in.
-
-| Login | Cost shown |
-| --- | --- |
-| Claude subscription | None, your plan covers it |
-| Anthropic API key, or Claude Platform on AWS or Google Cloud | Anthropic prices |
-| Amazon Bedrock | Bedrock prices, or Anthropic prices on Bedrock Mantle |
-| Google Vertex | Vertex prices |
-| Microsoft Foundry | Azure prices |
-| Custom base URL | None |
-
-### Configure
-
-Connection settings on the `claude-agent` provider are passed to Claude Code. They override the same variables set in
-your shell.
-
-```jsonc title="opencode.jsonc"
-{
-  "$schema": "https://opencode.ai/config.json",
-  "providers": {
-    "claude-agent": {
-      "settings": {
-        "baseURL": "https://llm-proxy.example.com/anthropic",
-      },
-      "headers": {
-        "X-Gateway-Tenant": "engineering",
-      },
-    },
-  },
-}
-```
-
-| Config | Claude Code variable |
-| --- | --- |
-| `settings.baseURL` | `ANTHROPIC_BASE_URL` |
-| `settings.apiKey` | `ANTHROPIC_API_KEY` |
-| `settings.authToken` | `ANTHROPIC_AUTH_TOKEN` |
-| `settings.headerTimeout` | `API_TIMEOUT_MS` |
-| `settings.chunkTimeout` | `CLAUDE_STREAM_IDLE_TIMEOUT_MS` |
-| `headers` | `ANTHROPIC_CUSTOM_HEADERS` |
-| `body` | `CLAUDE_CODE_EXTRA_BODY` |
-
-Set them on a model to override the provider's values for that model.
-
-### Limitations
-
-- Claude Code must be installed on the same machine as the OpenCode server. Claude Agent is not available in remote
-  workspaces.
-- Claude Code's system prompt replaces OpenCode's built-in prompt. Custom agent prompts still apply.
-- Temperature, top-p, top-k, seed, and stop sequences are not supported.
-- Plugin `http.request` and `http.response` hooks do not run, because Claude Code makes the API calls.
-- Claude Code features such as `/usage`, `/loop`, auto mode, and agent teams are not available.
-
 ## Custom
 
 Add a provider when its API is not already in the catalog. This OpenAI-compatible example defines the credential,
@@ -735,9 +646,6 @@ ID before changing packages.
 | Bedrock does not appear | Provide a profile or another supported AWS credential-chain input. `AWS_REGION` by itself only selects a region. |
 | Ollama has no models | Confirm the server exposes `/api/tags` and `/api/show` at the path derived from `baseURL`, and that `/api/show` reports the `completion` capability. |
 | Copilot has no models | Confirm the active OAuth account has Copilot Chat access. A failed model sync is logged as `failed to sync GitHub Copilot models`. |
-| `Claude Code is not installed` | Install Claude Code, or set `OPENCODE_CLAUDE_PATH` to its path. |
-| `Claude Code is not logged in` | Run `claude auth login`, then connect Claude Agent again. |
-| `Claude Code ... is too old` | Run `claude update`. |
 
 V2 rejects the retired provider IDs with a direct replacement. Use `azure/<model>` instead of
 `azure-cognitive-services/<model>`, and `google-vertex/<model>` instead of `google-vertex-anthropic/<model>`.
diff --git a/services/www/src/docs/content/themes.mdx b/services/www/src/docs/content/themes.mdx
index eb360c5ae599..35f91656b052 100644
--- a/services/www/src/docs/content/themes.mdx
+++ b/services/www/src/docs/content/themes.mdx
@@ -38,7 +38,7 @@ Use `system` to follow your terminal's appearance, or lock the theme to one mode
 
 If a custom theme provides only one mode, OpenCode uses that mode when the other is requested.
 
-## Builtins
+## Built-ins
 
 Select a built-in theme by its name:
 
diff --git a/services/www/src/docs/content/tools.mdx b/services/www/src/docs/content/tools.mdx
index bddee93f41e8..0a46c5ca891d 100644
--- a/services/www/src/docs/content/tools.mdx
+++ b/services/www/src/docs/content/tools.mdx
@@ -154,7 +154,7 @@ input is a search `query`.
 Search the web for the latest Bun release notes.
 ```
 
-Permission: `websearch` with the query as its resource. See [Websearch](/websearch)
+Permission: `websearch` with the query as its resource. See [Web search](/websearch)
 for providers, selection, rate limits, and disabling the tool.
 
 ## Images
diff --git a/services/www/src/docs/content/websearch.mdx b/services/www/src/docs/content/websearch.mdx
index 8409cabfd2c5..c03848e33654 100644
--- a/services/www/src/docs/content/websearch.mdx
+++ b/services/www/src/docs/content/websearch.mdx
@@ -1,5 +1,5 @@
 ---
-title: "Websearch"
+title: "Web search"
 ---
 
 Ask OpenCode for current information and it can search the web, read the results, and include source links in its response.
diff --git a/services/www/src/docs/layouts/DocsLayout.astro b/services/www/src/docs/layouts/DocsLayout.astro
index 23e431d6a66a..e536187773b7 100644
--- a/services/www/src/docs/layouts/DocsLayout.astro
+++ b/services/www/src/docs/layouts/DocsLayout.astro
@@ -15,6 +15,7 @@ interface Props {
   headings: MarkdownHeading[]
   showTableOfContents?: boolean
   fullWidth?: boolean
+  noindex?: boolean
 }
 
 const section = getDocsSection(Astro.props.currentSlug)
@@ -29,6 +30,7 @@ const canonical = new URL(docsHref(Astro.props.currentSlug), "https://opencode.a
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="description" content={description} />
+    {Astro.props.noindex && <meta name="robots" content="noindex" />}
     <meta name="theme-color" content="#000000" />
     <script is:inline>
       const applyTheme = () => {
@@ -71,7 +73,11 @@ const canonical = new URL(docsHref(Astro.props.currentSlug), "https://opencode.a
               <DocsSidebar groups={section.groups} currentSlug={Astro.props.currentSlug} />
             </aside>
             <main id="docs-content">
-              <article class="prose" data-pagefind-body data-pagefind-meta={`title:${Astro.props.title}`}>
+              <article
+                class="prose"
+                data-pagefind-body={Astro.props.noindex ? undefined : ""}
+                data-pagefind-meta={`title:${Astro.props.title}`}
+              >
                 <h1>
                   {Astro.props.title}
                   <button type="button" aria-label="Copy page as Markdown" data-copy-markdown data-pagefind-ignore>
diff --git a/services/www/src/docs/lib/navigation.ts b/services/www/src/docs/lib/navigation.ts
index f0507cae4720..e92e40281313 100644
--- a/services/www/src/docs/lib/navigation.ts
+++ b/services/www/src/docs/lib/navigation.ts
@@ -39,7 +39,7 @@ export const docsSections: DocsSection[] = [
           { title: "Commands", slug: "commands" },
           { title: "Plugins", slug: "plugins" },
           { title: "Providers", slug: "providers" },
-          { title: "Websearch", slug: "websearch" },
+          { title: "Web search", slug: "websearch" },
           { title: "Network", slug: "network" },
           { title: "Snapshots", slug: "snapshots" },
           { title: "Compaction", slug: "compaction" },
@@ -139,7 +139,7 @@ export const docsSections: DocsSection[] = [
           { title: "Intro", slug: "console" },
           { title: "Models", slug: "console/models" },
           { title: "Providers", slug: "console/providers" },
-          { title: "Web Search", slug: "console/websearch" },
+          { title: "Web search", slug: "console/websearch" },
           { title: "Go", slug: "console/go" },
         ],
       },