wip(app): mcp settings

2026-03-08 07:33:58 +00:00 · 2026-03-05 08:46:49 -06:00 · 2026-03-05 08:46:49 -06:00
376 changed files with 7826 additions and 18432 deletions
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -115,8 +115,6 @@ jobs:
            target: x86_64-apple-darwin
          - host: macos-latest
            target: aarch64-apple-darwin
-          - host: blacksmith-4vcpu-windows-2025
-            target: aarch64-pc-windows-msvc
          - host: blacksmith-4vcpu-windows-2025
            target: x86_64-pc-windows-msvc
          - host: blacksmith-4vcpu-ubuntu-2404
@@ -214,27 +212,6 @@ jobs:
          opencode-app-id: ${{ vars.OPENCODE_APP_ID }}
          opencode-app-secret: ${{ secrets.OPENCODE_APP_SECRET }}

-      - name: Setup Windows ARM64 clang
-        if: runner.os == 'Windows' && matrix.settings.target == 'aarch64-pc-windows-msvc'
-        shell: pwsh
-        run: |
-          $vswhere = Join-Path ${env:ProgramFiles(x86)} "Microsoft Visual Studio\Installer\vswhere.exe"
-          if (!(Test-Path $vswhere)) { throw "vswhere.exe not found at $vswhere" }
-          $root = & $vswhere -latest -products * -property installationPath
-          if (!$root) { throw "Visual Studio installation not found" }
-          $llvm = Join-Path $root "VC\Tools\Llvm"
-          $bin = @(
-            (Join-Path $llvm "x64\bin"),
-            (Join-Path $llvm "bin")
-          ) | Where-Object { Test-Path (Join-Path $_ "clang.exe") } | Select-Object -First 1
-          if (!$bin -and (Test-Path $llvm)) {
-            $bin = Get-ChildItem -Path $llvm -Filter clang.exe -Recurse -File | Select-Object -First 1 | ForEach-Object { $_.DirectoryName }
-          }
-          if (!$bin) { throw "clang.exe not found under $llvm" }
-          $env:PATH = "$bin;$env:PATH"
-          Add-Content -Path $env:GITHUB_PATH -Value $bin
-          clang --version
-
      - name: Build and upload artifacts
        uses: tauri-apps/tauri-action@390cbe447412ced1303d35abe75287949e43437a
        timeout-minutes: 60
@@ -277,9 +254,6 @@ jobs:
          - host: macos-latest
            target: aarch64-apple-darwin
            platform_flag: --mac --arm64
-          - host: "blacksmith-4vcpu-windows-2025"
-            target: aarch64-pc-windows-msvc
-            platform_flag: --win --arm64
          - host: "blacksmith-4vcpu-windows-2025"
            target: x86_64-pc-windows-msvc
            platform_flag: --win
--- a/.opencode/tool/github-pr-search.txt
+++ b/.opencode/tool/github-pr-search.txt
@@ -1,6 +1,6 @@
 Use this tool to search GitHub pull requests by title and description.

-This tool searches PRs in the anomalyco/opencode repository and returns LLM-friendly results including:
+This tool searches PRs in the sst/opencode repository and returns LLM-friendly results including:
 - PR number and title
 - Author
 - State (open/closed/merged)
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -122,7 +122,3 @@ const table = sqliteTable("session", {
 - Avoid mocks as much as possible
 - Test actual implementation, do not duplicate logic into tests
 - Tests cannot run from repo root (guard: `do-not-run-tests-from-root`); run from package dirs like `packages/opencode`.
-
-## Type Checking
-
- Always run `bun typecheck` from package directories (e.g., `packages/opencode`), never `tsc` directly.
--- a/README.ar.md
+++ b/README.ar.md
@@ -35,8 +35,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.bn.md
+++ b/README.bn.md
@@ -35,8 +35,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.br.md
+++ b/README.br.md
@@ -27,7 +27,6 @@
  <a href="README.ja.md">日本語</a> |
  <a href="README.pl.md">Polski</a> |
  <a href="README.ru.md">Русский</a> |
-  <a href="README.bs.md">Bosanski</a> |
  <a href="README.ar.md">العربية</a> |
  <a href="README.no.md">Norsk</a> |
  <a href="README.br.md">Português (Brasil)</a> |
@@ -35,8 +34,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.bs.md
+++ b/README.bs.md
@@ -35,8 +35,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.da.md
+++ b/README.da.md
@@ -27,7 +27,6 @@
  <a href="README.ja.md">日本語</a> |
  <a href="README.pl.md">Polski</a> |
  <a href="README.ru.md">Русский</a> |
-  <a href="README.bs.md">Bosanski</a> |
  <a href="README.ar.md">العربية</a> |
  <a href="README.no.md">Norsk</a> |
  <a href="README.br.md">Português (Brasil)</a> |
@@ -35,8 +34,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.de.md
+++ b/README.de.md
@@ -27,7 +27,6 @@
  <a href="README.ja.md">日本語</a> |
  <a href="README.pl.md">Polski</a> |
  <a href="README.ru.md">Русский</a> |
-  <a href="README.bs.md">Bosanski</a> |
  <a href="README.ar.md">العربية</a> |
  <a href="README.no.md">Norsk</a> |
  <a href="README.br.md">Português (Brasil)</a> |
@@ -35,8 +34,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.es.md
+++ b/README.es.md
@@ -27,7 +27,6 @@
  <a href="README.ja.md">日本語</a> |
  <a href="README.pl.md">Polski</a> |
  <a href="README.ru.md">Русский</a> |
-  <a href="README.bs.md">Bosanski</a> |
  <a href="README.ar.md">العربية</a> |
  <a href="README.no.md">Norsk</a> |
  <a href="README.br.md">Português (Brasil)</a> |
@@ -35,8 +34,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.fr.md
+++ b/README.fr.md
@@ -27,7 +27,6 @@
  <a href="README.ja.md">日本語</a> |
  <a href="README.pl.md">Polski</a> |
  <a href="README.ru.md">Русский</a> |
-  <a href="README.bs.md">Bosanski</a> |
  <a href="README.ar.md">العربية</a> |
  <a href="README.no.md">Norsk</a> |
  <a href="README.br.md">Português (Brasil)</a> |
@@ -35,8 +34,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.gr.md
+++ b/README.gr.md
@@ -35,8 +35,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.it.md
+++ b/README.it.md
@@ -27,7 +27,6 @@
  <a href="README.ja.md">日本語</a> |
  <a href="README.pl.md">Polski</a> |
  <a href="README.ru.md">Русский</a> |
-  <a href="README.bs.md">Bosanski</a> |
  <a href="README.ar.md">العربية</a> |
  <a href="README.no.md">Norsk</a> |
  <a href="README.br.md">Português (Brasil)</a> |
@@ -35,8 +34,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.ja.md
+++ b/README.ja.md
@@ -27,7 +27,6 @@
  <a href="README.ja.md">日本語</a> |
  <a href="README.pl.md">Polski</a> |
  <a href="README.ru.md">Русский</a> |
-  <a href="README.bs.md">Bosanski</a> |
  <a href="README.ar.md">العربية</a> |
  <a href="README.no.md">Norsk</a> |
  <a href="README.br.md">Português (Brasil)</a> |
@@ -35,8 +34,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.ko.md
+++ b/README.ko.md
@@ -27,7 +27,6 @@
  <a href="README.ja.md">日本語</a> |
  <a href="README.pl.md">Polski</a> |
  <a href="README.ru.md">Русский</a> |
-  <a href="README.bs.md">Bosanski</a> |
  <a href="README.ar.md">العربية</a> |
  <a href="README.no.md">Norsk</a> |
  <a href="README.br.md">Português (Brasil)</a> |
@@ -35,8 +34,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.md
+++ b/README.md
@@ -35,8 +35,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.no.md
+++ b/README.no.md
@@ -27,7 +27,6 @@
  <a href="README.ja.md">日本語</a> |
  <a href="README.pl.md">Polski</a> |
  <a href="README.ru.md">Русский</a> |
-  <a href="README.bs.md">Bosanski</a> |
  <a href="README.ar.md">العربية</a> |
  <a href="README.no.md">Norsk</a> |
  <a href="README.br.md">Português (Brasil)</a> |
@@ -35,8 +34,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.pl.md
+++ b/README.pl.md
@@ -27,7 +27,6 @@
  <a href="README.ja.md">日本語</a> |
  <a href="README.pl.md">Polski</a> |
  <a href="README.ru.md">Русский</a> |
-  <a href="README.bs.md">Bosanski</a> |
  <a href="README.ar.md">العربية</a> |
  <a href="README.no.md">Norsk</a> |
  <a href="README.br.md">Português (Brasil)</a> |
@@ -35,8 +34,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.ru.md
+++ b/README.ru.md
@@ -27,7 +27,6 @@
  <a href="README.ja.md">日本語</a> |
  <a href="README.pl.md">Polski</a> |
  <a href="README.ru.md">Русский</a> |
-  <a href="README.bs.md">Bosanski</a> |
  <a href="README.ar.md">العربية</a> |
  <a href="README.no.md">Norsk</a> |
  <a href="README.br.md">Português (Brasil)</a> |
@@ -35,8 +34,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.th.md
+++ b/README.th.md
@@ -27,7 +27,6 @@
  <a href="README.ja.md">日本語</a> |
  <a href="README.pl.md">Polski</a> |
  <a href="README.ru.md">Русский</a> |
-  <a href="README.bs.md">Bosanski</a> |
  <a href="README.ar.md">العربية</a> |
  <a href="README.no.md">Norsk</a> |
  <a href="README.br.md">Português (Brasil)</a> |
@@ -35,8 +34,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.tr.md
+++ b/README.tr.md
@@ -27,7 +27,6 @@
  <a href="README.ja.md">日本語</a> |
  <a href="README.pl.md">Polski</a> |
  <a href="README.ru.md">Русский</a> |
-  <a href="README.bs.md">Bosanski</a> |
  <a href="README.ar.md">العربية</a> |
  <a href="README.no.md">Norsk</a> |
  <a href="README.br.md">Português (Brasil)</a> |
@@ -35,8 +34,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.uk.md
+++ b/README.uk.md
@@ -35,8 +35,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.vi.md
+++ b/README.vi.md
@@ -1,141 +0,0 @@
-<p align="center">
-  <a href="https://opencode.ai">
-    <picture>
-      <source srcset="packages/console/app/src/asset/logo-ornate-dark.svg" media="(prefers-color-scheme: dark)">
-      <source srcset="packages/console/app/src/asset/logo-ornate-light.svg" media="(prefers-color-scheme: light)">
-      <img src="packages/console/app/src/asset/logo-ornate-light.svg" alt="OpenCode logo">
-    </picture>
-  </a>
-</p>
-<p align="center">Trợ lý lập trình AI mã nguồn mở.</p>
-<p align="center">
-  <a href="https://opencode.ai/discord"><img alt="Discord" src="https://img.shields.io/discord/1391832426048651334?style=flat-square&label=discord" /></a>
-  <a href="https://www.npmjs.com/package/opencode-ai"><img alt="npm" src="https://img.shields.io/npm/v/opencode-ai?style=flat-square" /></a>
-  <a href="https://github.com/anomalyco/opencode/actions/workflows/publish.yml"><img alt="Build status" src="https://img.shields.io/github/actions/workflow/status/anomalyco/opencode/publish.yml?style=flat-square&branch=dev" /></a>
-</p>
-
-<p align="center">
-  <a href="README.md">English</a> |
-  <a href="README.zh.md">简体中文</a> |
-  <a href="README.zht.md">繁體中文</a> |
-  <a href="README.ko.md">한국어</a> |
-  <a href="README.de.md">Deutsch</a> |
-  <a href="README.es.md">Español</a> |
-  <a href="README.fr.md">Français</a> |
-  <a href="README.it.md">Italiano</a> |
-  <a href="README.da.md">Dansk</a> |
-  <a href="README.ja.md">日本語</a> |
-  <a href="README.pl.md">Polski</a> |
-  <a href="README.ru.md">Русский</a> |
-  <a href="README.bs.md">Bosanski</a> |
-  <a href="README.ar.md">العربية</a> |
-  <a href="README.no.md">Norsk</a> |
-  <a href="README.br.md">Português (Brasil)</a> |
-  <a href="README.th.md">ไทย</a> |
-  <a href="README.tr.md">Türkçe</a> |
-  <a href="README.uk.md">Українська</a> |
-  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
-</p>
-
-[![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
-
---
-
-### Cài đặt
-
-```bash
-# YOLO
-curl -fsSL https://opencode.ai/install | bash
-
-# Các trình quản lý gói (Package managers)
-npm i -g opencode-ai@latest        # hoặc bun/pnpm/yarn
-scoop install opencode             # Windows
-choco install opencode             # Windows
-brew install anomalyco/tap/opencode # macOS và Linux (khuyên dùng, luôn cập nhật)
-brew install opencode              # macOS và Linux (công thức brew chính thức, ít cập nhật hơn)
-sudo pacman -S opencode            # Arch Linux (Bản ổn định)
-paru -S opencode-bin               # Arch Linux (Bản mới nhất từ AUR)
-mise use -g opencode               # Mọi hệ điều hành
-nix run nixpkgs#opencode           # hoặc github:anomalyco/opencode cho nhánh dev mới nhất
-```
-
-> [!TIP]
-> Hãy xóa các phiên bản cũ hơn 0.1.x trước khi cài đặt.
-
-### Ứng dụng Desktop (BETA)
-
-OpenCode cũng có sẵn dưới dạng ứng dụng desktop. Tải trực tiếp từ [trang releases](https://github.com/anomalyco/opencode/releases) hoặc [opencode.ai/download](https://opencode.ai/download).
-
-| Nền tảng              | Tải xuống                             |
-| --------------------- | ------------------------------------- |
-| macOS (Apple Silicon) | `opencode-desktop-darwin-aarch64.dmg` |
-| macOS (Intel)         | `opencode-desktop-darwin-x64.dmg`     |
-| Windows               | `opencode-desktop-windows-x64.exe`    |
-| Linux                 | `.deb`, `.rpm`, hoặc AppImage         |
-
-```bash
-# macOS (Homebrew)
-brew install --cask opencode-desktop
-# Windows (Scoop)
-scoop bucket add extras; scoop install extras/opencode-desktop
-```
-
-#### Thư mục cài đặt
-
-Tập lệnh cài đặt tuân theo thứ tự ưu tiên sau cho đường dẫn cài đặt:
-
-1. `$OPENCODE_INSTALL_DIR` - Thư mục cài đặt tùy chỉnh
-2. `$XDG_BIN_DIR` - Đường dẫn tuân thủ XDG Base Directory Specification
-3. `$HOME/bin` - Thư mục nhị phân tiêu chuẩn của người dùng (nếu tồn tại hoặc có thể tạo)
-4. `$HOME/.opencode/bin` - Mặc định dự phòng
-
-```bash
-# Ví dụ
-OPENCODE_INSTALL_DIR=/usr/local/bin curl -fsSL https://opencode.ai/install | bash
-XDG_BIN_DIR=$HOME/.local/bin curl -fsSL https://opencode.ai/install | bash
-```
-
-### Agents (Đại diện)
-
-OpenCode bao gồm hai agent được tích hợp sẵn mà bạn có thể chuyển đổi bằng phím `Tab`.
-
- **build** - Agent mặc định, có toàn quyền truy cập cho công việc lập trình
- **plan** - Agent chỉ đọc dùng để phân tích và khám phá mã nguồn
-  - Mặc định từ chối việc chỉnh sửa tệp
-  - Hỏi quyền trước khi chạy các lệnh bash
-  - Lý tưởng để khám phá các codebase lạ hoặc lên kế hoạch thay đổi
-
-Ngoài ra còn có một subagent **general** dùng cho các tìm kiếm phức tạp và tác vụ nhiều bước.
-Agent này được sử dụng nội bộ và có thể gọi bằng cách dùng `@general` trong tin nhắn.
-
-Tìm hiểu thêm về [agents](https://opencode.ai/docs/agents).
-
-### Tài liệu
-
-Để biết thêm thông tin về cách cấu hình OpenCode, [**hãy truy cập tài liệu của chúng tôi**](https://opencode.ai/docs).
-
-### Đóng góp
-
-Nếu bạn muốn đóng góp cho OpenCode, vui lòng đọc [tài liệu hướng dẫn đóng góp](./CONTRIBUTING.md) trước khi gửi pull request.
-
-### Xây dựng trên nền tảng OpenCode
-
-Nếu bạn đang làm việc trên một dự án liên quan đến OpenCode và sử dụng "opencode" như một phần của tên dự án, ví dụ "opencode-dashboard" hoặc "opencode-mobile", vui lòng thêm một ghi chú vào README của bạn để làm rõ rằng dự án đó không được xây dựng bởi đội ngũ OpenCode và không liên kết với chúng tôi dưới bất kỳ hình thức nào.
-
-### Các câu hỏi thường gặp (FAQ)
-
-#### OpenCode khác biệt thế nào so với Claude Code?
-
-Về mặt tính năng, nó rất giống Claude Code. Dưới đây là những điểm khác biệt chính:
-
- 100% mã nguồn mở
- Không bị ràng buộc với bất kỳ nhà cung cấp nào. Mặc dù chúng tôi khuyên dùng các mô hình được cung cấp qua [OpenCode Zen](https://opencode.ai/zen), OpenCode có thể được sử dụng với Claude, OpenAI, Google, hoặc thậm chí các mô hình chạy cục bộ. Khi các mô hình phát triển, khoảng cách giữa chúng sẽ thu hẹp lại và giá cả sẽ giảm, vì vậy việc không phụ thuộc vào nhà cung cấp là rất quan trọng.
- Hỗ trợ LSP ngay từ đầu
- Tập trung vào TUI (Giao diện người dùng dòng lệnh). OpenCode được xây dựng bởi những người dùng neovim và đội ngũ tạo ra [terminal.shop](https://terminal.shop); chúng tôi sẽ đẩy giới hạn của những gì có thể làm được trên terminal lên mức tối đa.
- Kiến trúc client/server. Chẳng hạn, điều này cho phép OpenCode chạy trên máy tính của bạn trong khi bạn điều khiển nó từ xa qua một ứng dụng di động, nghĩa là frontend TUI chỉ là một trong những client có thể dùng.
-
---
-
-**Tham gia cộng đồng của chúng tôi** [Discord](https://discord.gg/opencode) | [X.com](https://x.com/opencode)
--- a/README.zh.md
+++ b/README.zh.md
@@ -27,7 +27,6 @@
  <a href="README.ja.md">日本語</a> |
  <a href="README.pl.md">Polski</a> |
  <a href="README.ru.md">Русский</a> |
-  <a href="README.bs.md">Bosanski</a> |
  <a href="README.ar.md">العربية</a> |
  <a href="README.no.md">Norsk</a> |
  <a href="README.br.md">Português (Brasil)</a> |
@@ -35,8 +34,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.zht.md
+++ b/README.zht.md
@@ -27,7 +27,6 @@
  <a href="README.ja.md">日本語</a> |
  <a href="README.pl.md">Polski</a> |
  <a href="README.ru.md">Русский</a> |
-  <a href="README.bs.md">Bosanski</a> |
  <a href="README.ar.md">العربية</a> |
  <a href="README.no.md">Norsk</a> |
  <a href="README.br.md">Português (Brasil)</a> |
@@ -35,8 +34,7 @@
  <a href="README.tr.md">Türkçe</a> |
  <a href="README.uk.md">Українська</a> |
  <a href="README.bn.md">বাংলা</a> |
-  <a href="README.gr.md">Ελληνικά</a> |
-  <a href="README.vi.md">Tiếng Việt</a>
+  <a href="README.gr.md">Ελληνικά</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/bun.lock
+++ b/bun.lock
--- a/github/index.ts
+++ b/github/index.ts
@@ -8,7 +8,6 @@ import type { Context as GitHubContext } from "@actions/github/lib/context"
 import type { IssueCommentEvent, PullRequestReviewCommentEvent } from "@octokit/webhooks-types"
 import { createOpencodeClient } from "@opencode-ai/sdk"
 import { spawn } from "node:child_process"
-import { setTimeout as sleep } from "node:timers/promises"

 type GitHubAuthor = {
  login: string
@@ -282,7 +281,7 @@ async function assertOpencodeConnected() {
      connected = true
      break
    } catch (e) {}
-    await sleep(300)
+    await Bun.sleep(300)
  } while (retry++ < 30)

  if (!connected) {
--- a/nix/hashes.json
+++ b/nix/hashes.json
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-4kjoJ06VNvHltPHfzQRBG0bC6R39jao10ffGzrNZ230=",
-    "aarch64-linux": "sha256-6Uio+S2rcyBWbBEeOZb9N1CCKgkbKi68lOIKi3Ws/pQ=",
-    "aarch64-darwin": "sha256-8ngN5KVN4vhdsk0QJ11BGgSVBrcaEbwSj23c77HBpgs=",
-    "x86_64-darwin": "sha256-v/ueYGb9a0Nymzy+mkO4uQr78DAuJnES1qOT0onFgnQ="
+    "x86_64-linux": "sha256-ZmxeRNy2chc9py4m1iW6B+c/NSccMnVZ0lfni/EMdHw=",
+    "aarch64-linux": "sha256-R+1mxsmAQicerN8ixVy0ff6V8bZ4GH18MHpihvWnaTg=",
+    "aarch64-darwin": "sha256-m+QT20ohlqo9e86qXu67eKthZm6VDRLwlqJ9CNlEV+0=",
+    "x86_64-darwin": "sha256-4GeNPyTT2Hq4rxHGSON23ul5Ud3yFGE0QUVsB03Gidc="
  }
 }
--- a/package.json
+++ b/package.json
@@ -41,9 +41,8 @@
      "@tailwindcss/vite": "4.1.11",
      "diff": "8.0.2",
      "dompurify": "3.3.1",
-      "drizzle-kit": "1.0.0-beta.16-ea816b6",
-      "drizzle-orm": "1.0.0-beta.16-ea816b6",
-      "effect": "4.0.0-beta.27",
+      "drizzle-kit": "1.0.0-beta.12-a5629fb",
+      "drizzle-orm": "1.0.0-beta.12-a5629fb",
      "ai": "5.0.124",
      "hono": "4.10.7",
      "hono-openapi": "1.1.2",
@@ -101,7 +100,6 @@
    "protobufjs",
    "tree-sitter",
    "tree-sitter-bash",
-    "tree-sitter-powershell",
    "web-tree-sitter",
    "electron"
  ],
--- a/packages/app/e2e/AGENTS.md
+++ b/packages/app/e2e/AGENTS.md
@@ -71,12 +71,6 @@ test("test description", async ({ page, sdk, gotoSession }) => {
 - `closeDialog(page, dialog)` - Close any dialog
 - `openSidebar(page)` / `closeSidebar(page)` - Toggle sidebar
 - `withSession(sdk, title, callback)` - Create temp session
- `withProject(...)` - Create temp project/workspace
- `sessionIDFromUrl(url)` - Read session ID from URL
- `slugFromUrl(url)` - Read workspace slug from URL
- `waitSlug(page, skip?)` - Wait for resolved workspace slug
- `trackSession(sessionID, directory?)` - Register session for fixture cleanup
- `trackDirectory(directory)` - Register directory for fixture cleanup
 - `clickListItem(container, filter)` - Click list item by key/text

 **Selectors** (`selectors.ts`):
@@ -115,7 +109,7 @@ import { test, expect } from "@playwright/test"

 ### Error Handling

-Tests should clean up after themselves. Prefer fixture-managed cleanup:
+Tests should clean up after themselves:

 ```typescript
 test("test with cleanup", async ({ page, sdk, gotoSession }) => {
@@ -126,11 +120,6 @@ test("test with cleanup", async ({ page, sdk, gotoSession }) => {
 })
 ```

- Prefer `withSession(...)` for temp sessions
- In `withProject(...)` tests that create sessions or extra workspaces, call `trackSession(sessionID, directory?)` and `trackDirectory(directory)`
- This lets fixture teardown abort, wait for idle, and clean up safely under CI concurrency
- Avoid calling `sdk.session.delete(...)` directly
-
 ### Timeouts

 Default: 60s per test, 10s per assertion. Override when needed:
@@ -172,10 +161,9 @@ await page.keyboard.press(`${modKey}+Comma`) // Open settings
 1. Choose appropriate folder or create new one
 2. Import from `../fixtures`
 3. Use helper functions from `../actions` and `../selectors`
-4. When validating routing, use shared helpers from `../actions`. Workspace URL slugs can be canonicalized on Windows, so assert against canonical or resolved workspace slugs.
-5. Clean up any created resources
-6. Use specific selectors (avoid CSS classes)
-7. Test one feature per test file
+4. Clean up any created resources
+5. Use specific selectors (avoid CSS classes)
+6. Test one feature per test file

 ## Local Development

--- a/packages/app/e2e/actions.ts
+++ b/packages/app/e2e/actions.ts
@@ -3,13 +3,12 @@ import fs from "node:fs/promises"
 import os from "node:os"
 import path from "node:path"
 import { execSync } from "node:child_process"
-import { createSdk, modKey, resolveDirectory, serverUrl } from "./utils"
+import { modKey, serverUrl } from "./utils"
 import {
+  sessionItemSelector,
  dropdownMenuTriggerSelector,
  dropdownMenuContentSelector,
-  sessionTimelineHeaderSelector,
  projectMenuTriggerSelector,
-  projectCloseMenuSelector,
  projectWorkspacesToggleSelector,
  titlebarRightSelector,
  popoverBodySelector,
@@ -19,6 +18,7 @@ import {
  workspaceItemSelector,
  workspaceMenuTriggerSelector,
 } from "./selectors"
+import type { createSdk } from "./utils"

 export async function defocus(page: Page) {
  await page
@@ -61,9 +61,9 @@ export async function closeDialog(page: Page, dialog: Locator) {
 }

 export async function isSidebarClosed(page: Page) {
-  const button = page.getByRole("button", { name: /toggle sidebar/i }).first()
-  await expect(button).toBeVisible()
-  return (await button.getAttribute("aria-expanded")) !== "true"
+  const main = page.locator("main")
+  const classes = (await main.getAttribute("class")) ?? ""
+  return classes.includes("xl:border-l")
 }

 export async function toggleSidebar(page: Page) {
@@ -75,34 +75,48 @@ export async function openSidebar(page: Page) {
  if (!(await isSidebarClosed(page))) return

  const button = page.getByRole("button", { name: /toggle sidebar/i }).first()
-  await button.click()
+  const visible = await button
+    .isVisible()
+    .then((x) => x)
+    .catch(() => false)

-  const opened = await expect(button)
-    .toHaveAttribute("aria-expanded", "true", { timeout: 1500 })
+  if (visible) await button.click()
+  if (!visible) await toggleSidebar(page)
+
+  const main = page.locator("main")
+  const opened = await expect(main)
+    .not.toHaveClass(/xl:border-l/, { timeout: 1500 })
    .then(() => true)
    .catch(() => false)

  if (opened) return

  await toggleSidebar(page)
-  await expect(button).toHaveAttribute("aria-expanded", "true")
+  await expect(main).not.toHaveClass(/xl:border-l/)
 }

 export async function closeSidebar(page: Page) {
  if (await isSidebarClosed(page)) return

  const button = page.getByRole("button", { name: /toggle sidebar/i }).first()
-  await button.click()
+  const visible = await button
+    .isVisible()
+    .then((x) => x)
+    .catch(() => false)

-  const closed = await expect(button)
-    .toHaveAttribute("aria-expanded", "false", { timeout: 1500 })
+  if (visible) await button.click()
+  if (!visible) await toggleSidebar(page)
+
+  const main = page.locator("main")
+  const closed = await expect(main)
+    .toHaveClass(/xl:border-l/, { timeout: 1500 })
    .then(() => true)
    .catch(() => false)

  if (closed) return

  await toggleSidebar(page)
-  await expect(button).toHaveAttribute("aria-expanded", "false")
+  await expect(main).toHaveClass(/xl:border-l/)
 }

 export async function openSettings(page: Page) {
@@ -183,48 +197,17 @@ export async function createTestProject() {
  await fs.writeFile(path.join(root, "README.md"), "# e2e\n")

  execSync("git init", { cwd: root, stdio: "ignore" })
-  execSync("git config core.fsmonitor false", { cwd: root, stdio: "ignore" })
  execSync("git add -A", { cwd: root, stdio: "ignore" })
  execSync('git -c user.name="e2e" -c user.email="e2e@example.com" commit -m "init" --allow-empty', {
    cwd: root,
    stdio: "ignore",
  })

-  return resolveDirectory(root)
+  return root
 }

 export async function cleanupTestProject(directory: string) {
-  try {
-    execSync("git fsmonitor--daemon stop", { cwd: directory, stdio: "ignore" })
-  } catch {}
-  await fs.rm(directory, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 }).catch(() => undefined)
-}
-
-export function slugFromUrl(url: string) {
-  return /\/([^/]+)\/session(?:[/?#]|$)/.exec(url)?.[1] ?? ""
-}
-
-export async function waitSlug(page: Page, skip: string[] = []) {
-  let prev = ""
-  let next = ""
-  await expect
-    .poll(
-      () => {
-        const slug = slugFromUrl(page.url())
-        if (!slug) return ""
-        if (skip.includes(slug)) return ""
-        if (slug !== prev) {
-          prev = slug
-          next = ""
-          return ""
-        }
-        next = slug
-        return slug
-      },
-      { timeout: 45_000 },
-    )
-    .not.toBe("")
-  return next
+  await fs.rm(directory, { recursive: true, force: true }).catch(() => undefined)
 }

 export function sessionIDFromUrl(url: string) {
@@ -233,7 +216,7 @@ export function sessionIDFromUrl(url: string) {
 }

 export async function hoverSessionItem(page: Page, sessionID: string) {
-  const sessionEl = page.locator(`[data-session-id="${sessionID}"]`).last()
+  const sessionEl = page.locator(sessionItemSelector(sessionID)).first()
  await expect(sessionEl).toBeVisible()
  await sessionEl.hover()
  return sessionEl
@@ -244,9 +227,7 @@ export async function openSessionMoreMenu(page: Page, sessionID: string) {

  const scroller = page.locator(".scroll-view__viewport").first()
  await expect(scroller).toBeVisible()
-  const header = page.locator(sessionTimelineHeaderSelector).first()
-  await expect(header).toBeVisible({ timeout: 30_000 })
-  await expect(header.getByRole("heading", { level: 1 }).first()).toBeVisible({ timeout: 30_000 })
+  await expect(scroller.getByRole("heading", { level: 1 }).first()).toBeVisible({ timeout: 30_000 })

  const menu = page
    .locator(dropdownMenuContentSelector)
@@ -262,7 +243,7 @@ export async function openSessionMoreMenu(page: Page, sessionID: string) {

  if (opened) return menu

-  const menuTrigger = header.getByRole("button", { name: /more options/i }).first()
+  const menuTrigger = scroller.getByRole("button", { name: /more options/i }).first()
  await expect(menuTrigger).toBeVisible()
  await menuTrigger.click()

@@ -336,57 +317,6 @@ export async function clickListItem(
  return item
 }

-async function status(sdk: ReturnType<typeof createSdk>, sessionID: string) {
-  const data = await sdk.session
-    .status()
-    .then((x) => x.data ?? {})
-    .catch(() => undefined)
-  return data?.[sessionID]
-}
-
-async function stable(sdk: ReturnType<typeof createSdk>, sessionID: string, timeout = 10_000) {
-  let prev = ""
-  await expect
-    .poll(
-      async () => {
-        const info = await sdk.session
-          .get({ sessionID })
-          .then((x) => x.data)
-          .catch(() => undefined)
-        if (!info) return true
-        const next = `${info.title}:${info.time.updated ?? info.time.created}`
-        if (next !== prev) {
-          prev = next
-          return false
-        }
-        return true
-      },
-      { timeout },
-    )
-    .toBe(true)
-}
-
-export async function waitSessionIdle(sdk: ReturnType<typeof createSdk>, sessionID: string, timeout = 30_000) {
-  await expect.poll(() => status(sdk, sessionID).then((x) => !x || x.type === "idle"), { timeout }).toBe(true)
-}
-
-export async function cleanupSession(input: {
-  sessionID: string
-  directory?: string
-  sdk?: ReturnType<typeof createSdk>
-}) {
-  const sdk = input.sdk ?? (input.directory ? createSdk(input.directory) : undefined)
-  if (!sdk) throw new Error("cleanupSession requires sdk or directory")
-  await waitSessionIdle(sdk, input.sessionID, 5_000).catch(() => undefined)
-  const current = await status(sdk, input.sessionID).catch(() => undefined)
-  if (current && current.type !== "idle") {
-    await sdk.session.abort({ sessionID: input.sessionID }).catch(() => undefined)
-    await waitSessionIdle(sdk, input.sessionID).catch(() => undefined)
-  }
-  await stable(sdk, input.sessionID).catch(() => undefined)
-  await sdk.session.delete({ sessionID: input.sessionID }).catch(() => undefined)
-}
-
 export async function withSession<T>(
  sdk: ReturnType<typeof createSdk>,
  title: string,
@@ -398,7 +328,7 @@ export async function withSession<T>(
  try {
    return await callback(session)
  } finally {
-    await cleanupSession({ sdk, sessionID: session.id })
+    await sdk.session.delete({ sessionID: session.id }).catch(() => undefined)
  }
 }

@@ -511,57 +441,6 @@ export async function seedSessionPermission(
  return { id: result.id }
 }

-export async function seedSessionTask(
-  sdk: ReturnType<typeof createSdk>,
-  input: {
-    sessionID: string
-    description: string
-    prompt: string
-    subagentType?: string
-  },
-) {
-  const text = [
-    "Your only valid response is one task tool call.",
-    `Use this JSON input: ${JSON.stringify({
-      description: input.description,
-      prompt: input.prompt,
-      subagent_type: input.subagentType ?? "general",
-    })}`,
-    "Do not output plain text.",
-    "Wait for the task to start and return the child session id.",
-  ].join("\n")
-
-  const result = await seed({
-    sdk,
-    sessionID: input.sessionID,
-    prompt: text,
-    timeout: 90_000,
-    probe: async () => {
-      const messages = await sdk.session.messages({ sessionID: input.sessionID, limit: 50 }).then((x) => x.data ?? [])
-      const part = messages
-        .flatMap((message) => message.parts)
-        .find((part) => {
-          if (part.type !== "tool" || part.tool !== "task") return false
-          if (part.state.input?.description !== input.description) return false
-          return typeof part.state.metadata?.sessionId === "string" && part.state.metadata.sessionId.length > 0
-        })
-
-      if (!part) return
-      const id = part.state.metadata?.sessionId
-      if (typeof id !== "string" || !id) return
-      const child = await sdk.session
-        .get({ sessionID: id })
-        .then((x) => x.data)
-        .catch(() => undefined)
-      if (!child?.id) return
-      return { sessionID: id }
-    },
-  })
-
-  if (!result) throw new Error("Timed out seeding task tool")
-  return result
-}
-
 export async function seedSessionTodos(
  sdk: ReturnType<typeof createSdk>,
  input: {
@@ -636,42 +515,32 @@ export async function openProjectMenu(page: Page, projectSlug: string) {
  const trigger = page.locator(projectMenuTriggerSelector(projectSlug)).first()
  await expect(trigger).toHaveCount(1)

-  const menu = page
-    .locator(dropdownMenuContentSelector)
-    .filter({ has: page.locator(projectCloseMenuSelector(projectSlug)) })
-    .first()
-  const close = menu.locator(projectCloseMenuSelector(projectSlug)).first()
-
-  const clicked = await trigger
-    .click({ timeout: 1500 })
-    .then(() => true)
-    .catch(() => false)
-
-  if (clicked) {
-    const opened = await menu
-      .waitFor({ state: "visible", timeout: 1500 })
-      .then(() => true)
-      .catch(() => false)
-    if (opened) {
-      await expect(close).toBeVisible()
-      return menu
-    }
-  }
-
  await trigger.focus()
  await page.keyboard.press("Enter")

+  const menu = page.locator(dropdownMenuContentSelector).first()
  const opened = await menu
    .waitFor({ state: "visible", timeout: 1500 })
    .then(() => true)
    .catch(() => false)

  if (opened) {
-    await expect(close).toBeVisible()
+    const viewport = page.viewportSize()
+    const x = viewport ? Math.max(viewport.width - 5, 0) : 1200
+    const y = viewport ? Math.max(viewport.height - 5, 0) : 800
+    await page.mouse.move(x, y)
    return menu
  }

-  throw new Error(`Failed to open project menu: ${projectSlug}`)
+  await trigger.click({ force: true })
+
+  await expect(menu).toBeVisible()
+
+  const viewport = page.viewportSize()
+  const x = viewport ? Math.max(viewport.width - 5, 0) : 1200
+  const y = viewport ? Math.max(viewport.height - 5, 0) : 800
+  await page.mouse.move(x, y)
+  return menu
 }

 export async function setWorkspacesEnabled(page: Page, projectSlug: string, enabled: boolean) {
@@ -684,18 +553,11 @@ export async function setWorkspacesEnabled(page: Page, projectSlug: string, enab

  if (current === enabled) return

-  const flip = async (timeout?: number) => {
-    const menu = await openProjectMenu(page, projectSlug)
-    const toggle = menu.locator(projectWorkspacesToggleSelector(projectSlug)).first()
-    await expect(toggle).toBeVisible()
-    return toggle.click({ force: true, timeout })
-  }
+  await openProjectMenu(page, projectSlug)

-  const flipped = await flip(1500)
-    .then(() => true)
-    .catch(() => false)
-
-  if (!flipped) await flip()
+  const toggle = page.locator(projectWorkspacesToggleSelector(projectSlug)).first()
+  await expect(toggle).toBeVisible()
+  await toggle.click({ force: true })

  const expected = enabled ? "New workspace" : "New session"
  await expect(page.getByRole("button", { name: expected }).first()).toBeVisible()
--- a/packages/app/e2e/app/home.spec.ts
+++ b/packages/app/e2e/app/home.spec.ts
@@ -1,17 +1,17 @@
 import { test, expect } from "../fixtures"
-import { serverNamePattern } from "../utils"
+import { serverName } from "../utils"

 test("home renders and shows core entrypoints", async ({ page }) => {
  await page.goto("/")

  await expect(page.getByRole("button", { name: "Open project" }).first()).toBeVisible()
-  await expect(page.getByRole("button", { name: serverNamePattern })).toBeVisible()
+  await expect(page.getByRole("button", { name: serverName })).toBeVisible()
 })

 test("server picker dialog opens from home", async ({ page }) => {
  await page.goto("/")

-  const trigger = page.getByRole("button", { name: serverNamePattern })
+  const trigger = page.getByRole("button", { name: serverName })
  await expect(trigger).toBeVisible()
  await trigger.click()

--- a/packages/app/e2e/app/server-default.spec.ts
+++ b/packages/app/e2e/app/server-default.spec.ts
@@ -1,6 +1,6 @@
 import { test, expect } from "../fixtures"
-import { serverNamePattern, serverUrls } from "../utils"
-import { closeDialog, clickMenuItem } from "../actions"
+import { serverName, serverUrl } from "../utils"
+import { clickListItem, closeDialog, clickMenuItem } from "../actions"

 const DEFAULT_SERVER_URL_KEY = "opencode.settings.dat:defaultServerUrl"

@@ -31,9 +31,10 @@ test("can set a default server on web", async ({ page, gotoSession }) => {
  const dialog = page.getByRole("dialog")
  await expect(dialog).toBeVisible()

-  await expect(dialog.getByText(serverNamePattern).first()).toBeVisible()
+  const row = dialog.locator('[data-slot="list-item"]').filter({ hasText: serverName }).first()
+  await expect(row).toBeVisible()

-  const menuTrigger = dialog.locator('[data-slot="dropdown-menu-trigger"]').first()
+  const menuTrigger = row.locator('[data-slot="dropdown-menu-trigger"]').first()
  await expect(menuTrigger).toBeVisible()
  await menuTrigger.click({ force: true })

@@ -41,18 +42,14 @@ test("can set a default server on web", async ({ page, gotoSession }) => {
  await expect(menu).toBeVisible()
  await clickMenuItem(menu, /set as default/i)

-  await expect
-    .poll(async () =>
-      serverUrls.includes((await page.evaluate((key) => localStorage.getItem(key), DEFAULT_SERVER_URL_KEY)) ?? ""),
-    )
-    .toBe(true)
-  await expect(dialog.getByText("Default", { exact: true })).toBeVisible()
+  await expect.poll(() => page.evaluate((key) => localStorage.getItem(key), DEFAULT_SERVER_URL_KEY)).toBe(serverUrl)
+  await expect(row.getByText("Default", { exact: true })).toBeVisible()

  await closeDialog(page, dialog)

  await ensurePopoverOpen()

-  const serverRow = popover.locator("button").filter({ hasText: serverNamePattern }).first()
+  const serverRow = popover.locator("button").filter({ hasText: serverName }).first()
  await expect(serverRow).toBeVisible()
  await expect(serverRow.getByText("Default", { exact: true })).toBeVisible()
 })
--- a/packages/app/e2e/app/titlebar-history.spec.ts
+++ b/packages/app/e2e/app/titlebar-history.spec.ts
@@ -16,6 +16,7 @@ test("titlebar back/forward navigates between sessions", async ({ page, slug, sd

      const link = page.locator(`[data-session-id="${two.id}"] a`).first()
      await expect(link).toBeVisible()
+      await link.scrollIntoViewIfNeeded()
      await link.click()

      await expect(page).toHaveURL(new RegExp(`/${slug}/session/${two.id}(?:\\?|#|$)`))
@@ -55,6 +56,7 @@ test("titlebar forward is cleared after branching history from sidebar", async (

        const second = page.locator(`[data-session-id="${b.id}"] a`).first()
        await expect(second).toBeVisible()
+        await second.scrollIntoViewIfNeeded()
        await second.click()

        await expect(page).toHaveURL(new RegExp(`/${slug}/session/${b.id}(?:\\?|#|$)`))
@@ -74,6 +76,7 @@ test("titlebar forward is cleared after branching history from sidebar", async (

        const third = page.locator(`[data-session-id="${c.id}"] a`).first()
        await expect(third).toBeVisible()
+        await third.scrollIntoViewIfNeeded()
        await third.click()

        await expect(page).toHaveURL(new RegExp(`/${slug}/session/${c.id}(?:\\?|#|$)`))
@@ -99,6 +102,7 @@ test("keyboard shortcuts navigate titlebar history", async ({ page, slug, sdk, g

      const link = page.locator(`[data-session-id="${two.id}"] a`).first()
      await expect(link).toBeVisible()
+      await link.scrollIntoViewIfNeeded()
      await link.click()

      await expect(page).toHaveURL(new RegExp(`/${slug}/session/${two.id}(?:\\?|#|$)`))
--- a/packages/app/e2e/commands/panels.spec.ts
+++ b/packages/app/e2e/commands/panels.spec.ts
@@ -10,8 +10,6 @@ const expanded = async (el: { getAttribute: (name: string) => Promise<string | n
 test("review panel can be toggled via keybind", async ({ page, gotoSession }) => {
  await gotoSession()

-  const reviewPanel = page.locator("#review-panel")
-
  const treeToggle = page.getByRole("button", { name: "Toggle file tree" }).first()
  await expect(treeToggle).toBeVisible()
  if (await expanded(treeToggle)) await treeToggle.click()
@@ -21,13 +19,13 @@ test("review panel can be toggled via keybind", async ({ page, gotoSession }) =>
  await expect(reviewToggle).toBeVisible()
  if (await expanded(reviewToggle)) await reviewToggle.click()
  await expect(reviewToggle).toHaveAttribute("aria-expanded", "false")
-  await expect(reviewPanel).toHaveAttribute("aria-hidden", "true")
+  await expect(page.locator("#review-panel")).toHaveCount(0)

  await page.keyboard.press(`${modKey}+Shift+R`)
  await expect(reviewToggle).toHaveAttribute("aria-expanded", "true")
-  await expect(reviewPanel).toHaveAttribute("aria-hidden", "false")
+  await expect(page.locator("#review-panel")).toBeVisible()

  await page.keyboard.press(`${modKey}+Shift+R`)
  await expect(reviewToggle).toHaveAttribute("aria-expanded", "false")
-  await expect(reviewPanel).toHaveAttribute("aria-hidden", "true")
+  await expect(page.locator("#review-panel")).toHaveCount(0)
 })
--- a/packages/app/e2e/files/file-tree.spec.ts
+++ b/packages/app/e2e/files/file-tree.spec.ts
@@ -43,13 +43,6 @@ test("file tree can expand folders and open a file", async ({ page, gotoSession
  await tab.click()
  await expect(tab).toHaveAttribute("aria-selected", "true")

-  await toggle.click()
-  await expect(toggle).toHaveAttribute("aria-expanded", "false")
-
-  await toggle.click()
-  await expect(toggle).toHaveAttribute("aria-expanded", "true")
-  await expect(allTab).toHaveAttribute("aria-selected", "true")
-
  const viewer = page.locator('[data-component="file"][data-mode="text"]').first()
  await expect(viewer).toBeVisible()
  await expect(viewer).toContainText("export default function FileTree")
--- a/packages/app/e2e/fixtures.ts
+++ b/packages/app/e2e/fixtures.ts
@@ -1,5 +1,5 @@
 import { test as base, expect, type Page } from "@playwright/test"
-import { cleanupSession, cleanupTestProject, createTestProject, seedProjects, sessionIDFromUrl } from "./actions"
+import { cleanupTestProject, createTestProject, seedProjects } from "./actions"
 import { promptSelector } from "./selectors"
 import { createSdk, dirSlug, getWorktree, sessionPath } from "./utils"

@@ -13,8 +13,6 @@ type TestFixtures = {
      directory: string
      slug: string
      gotoSession: (sessionID?: string) => Promise<void>
-      trackSession: (sessionID: string, directory?: string) => void
-      trackDirectory: (directory: string) => void
    }) => Promise<T>,
    options?: { extra?: string[] },
  ) => Promise<T>
@@ -53,36 +51,20 @@ export const test = base.extend<TestFixtures, WorkerFixtures>({
  },
  withProject: async ({ page }, use) => {
    await use(async (callback, options) => {
-      const root = await createTestProject()
-      const slug = dirSlug(root)
-      const sessions = new Map<string, string>()
-      const dirs = new Set<string>()
-      await seedStorage(page, { directory: root, extra: options?.extra })
+      const directory = await createTestProject()
+      const slug = dirSlug(directory)
+      await seedStorage(page, { directory, extra: options?.extra })

      const gotoSession = async (sessionID?: string) => {
-        await page.goto(sessionPath(root, sessionID))
+        await page.goto(sessionPath(directory, sessionID))
        await expect(page.locator(promptSelector)).toBeVisible()
-        const current = sessionIDFromUrl(page.url())
-        if (current) trackSession(current)
-      }
-
-      const trackSession = (sessionID: string, directory?: string) => {
-        sessions.set(sessionID, directory ?? root)
-      }
-
-      const trackDirectory = (directory: string) => {
-        if (directory !== root) dirs.add(directory)
      }

      try {
        await gotoSession()
-        return await callback({ directory: root, slug, gotoSession, trackSession, trackDirectory })
+        return await callback({ directory, slug, gotoSession })
      } finally {
-        await Promise.allSettled(
-          Array.from(sessions, ([sessionID, directory]) => cleanupSession({ sessionID, directory })),
-        )
-        await Promise.allSettled(Array.from(dirs, (directory) => cleanupTestProject(directory)))
-        await cleanupTestProject(root)
+        await cleanupTestProject(directory)
      }
    })
  },
--- a/packages/app/e2e/projects/project-edit.spec.ts
+++ b/packages/app/e2e/projects/project-edit.spec.ts
@@ -1,15 +1,25 @@
 import { test, expect } from "../fixtures"
-import { clickMenuItem, openProjectMenu, openSidebar } from "../actions"
+import { openSidebar } from "../actions"

 test("dialog edit project updates name and startup script", async ({ page, withProject }) => {
  await page.setViewportSize({ width: 1400, height: 800 })

-  await withProject(async ({ slug }) => {
+  await withProject(async () => {
    await openSidebar(page)

    const open = async () => {
-      const menu = await openProjectMenu(page, slug)
-      await clickMenuItem(menu, /^Edit$/i, { force: true })
+      const header = page.locator(".group\\/project").first()
+      await header.hover()
+      const trigger = header.getByRole("button", { name: "More options" }).first()
+      await expect(trigger).toBeVisible()
+      await trigger.click({ force: true })
+
+      const menu = page.locator('[data-component="dropdown-menu-content"]').first()
+      await expect(menu).toBeVisible()
+
+      const editItem = menu.getByRole("menuitem", { name: "Edit" }).first()
+      await expect(editItem).toBeVisible()
+      await editItem.click({ force: true })

      const dialog = page.getByRole("dialog")
      await expect(dialog).toBeVisible()
--- a/packages/app/e2e/projects/projects-close.spec.ts
+++ b/packages/app/e2e/projects/projects-close.spec.ts
@@ -1,8 +1,36 @@
 import { test, expect } from "../fixtures"
 import { createTestProject, cleanupTestProject, openSidebar, clickMenuItem, openProjectMenu } from "../actions"
-import { projectSwitchSelector } from "../selectors"
+import { projectCloseHoverSelector, projectSwitchSelector } from "../selectors"
 import { dirSlug } from "../utils"

+test("can close a project via hover card close button", async ({ page, withProject }) => {
+  await page.setViewportSize({ width: 1400, height: 800 })
+
+  const other = await createTestProject()
+  const otherSlug = dirSlug(other)
+
+  try {
+    await withProject(
+      async () => {
+        await openSidebar(page)
+
+        const otherButton = page.locator(projectSwitchSelector(otherSlug)).first()
+        await expect(otherButton).toBeVisible()
+        await otherButton.hover()
+
+        const close = page.locator(projectCloseHoverSelector(otherSlug)).first()
+        await expect(close).toBeVisible()
+        await close.click()
+
+        await expect(otherButton).toHaveCount(0)
+      },
+      { extra: [other] },
+    )
+  } finally {
+    await cleanupTestProject(other)
+  }
+})
+
 test("closing active project navigates to another open project", async ({ page, withProject }) => {
  await page.setViewportSize({ width: 1400, height: 800 })

--- a/packages/app/e2e/projects/projects-switch.spec.ts
+++ b/packages/app/e2e/projects/projects-switch.spec.ts
@@ -1,39 +1,18 @@
 import { base64Decode } from "@opencode-ai/util/encode"
-import type { Page } from "@playwright/test"
 import { test, expect } from "../fixtures"
-import { defocus, createTestProject, cleanupTestProject, openSidebar, sessionIDFromUrl, waitSlug } from "../actions"
+import {
+  defocus,
+  createTestProject,
+  cleanupTestProject,
+  openSidebar,
+  setWorkspacesEnabled,
+  sessionIDFromUrl,
+} from "../actions"
 import { projectSwitchSelector, promptSelector, workspaceItemSelector, workspaceNewSessionSelector } from "../selectors"
-import { dirSlug, resolveDirectory } from "../utils"
+import { createSdk, dirSlug, sessionPath } from "../utils"

-async function workspaces(page: Page, directory: string, enabled: boolean) {
-  await page.evaluate(
-    ({ directory, enabled }: { directory: string; enabled: boolean }) => {
-      const key = "opencode.global.dat:layout"
-      const raw = localStorage.getItem(key)
-      const data = raw ? JSON.parse(raw) : {}
-      const sidebar = data.sidebar && typeof data.sidebar === "object" ? data.sidebar : {}
-      const current =
-        sidebar.workspaces && typeof sidebar.workspaces === "object" && !Array.isArray(sidebar.workspaces)
-          ? sidebar.workspaces
-          : {}
-      const next = { ...current }
-
-      if (enabled) next[directory] = true
-      if (!enabled) delete next[directory]
-
-      localStorage.setItem(
-        key,
-        JSON.stringify({
-          ...data,
-          sidebar: {
-            ...sidebar,
-            workspaces: next,
-          },
-        }),
-      )
-    },
-    { directory, enabled },
-  )
+function slugFromUrl(url: string) {
+  return /\/([^/]+)\/session(?:\/|$)/.exec(url)?.[1] ?? ""
 }

 test("can switch between projects from sidebar", async ({ page, withProject }) => {
@@ -72,39 +51,46 @@ test("switching back to a project opens the latest workspace session", async ({

  const other = await createTestProject()
  const otherSlug = dirSlug(other)
+  let rootDir: string | undefined
+  let workspaceDir: string | undefined
+  let sessionID: string | undefined
+
  try {
    await withProject(
-      async ({ directory, slug, trackSession, trackDirectory }) => {
+      async ({ directory, slug }) => {
+        rootDir = directory
        await defocus(page)
-        await workspaces(page, directory, true)
-        await page.reload()
-        await expect(page.locator(promptSelector)).toBeVisible()
        await openSidebar(page)
-        await expect(page.getByRole("button", { name: "New workspace" }).first()).toBeVisible()
+        await setWorkspacesEnabled(page, slug, true)

        await page.getByRole("button", { name: "New workspace" }).first().click()

-        const raw = await waitSlug(page, [slug])
-        const dir = base64Decode(raw)
-        if (!dir) throw new Error(`Failed to decode workspace slug: ${raw}`)
-        const space = await resolveDirectory(dir)
-        const next = dirSlug(space)
-        trackDirectory(space)
+        await expect
+          .poll(
+            () => {
+              const next = slugFromUrl(page.url())
+              if (!next) return ""
+              if (next === slug) return ""
+              return next
+            },
+            { timeout: 45_000 },
+          )
+          .not.toBe("")
+
+        const workspaceSlug = slugFromUrl(page.url())
+        workspaceDir = base64Decode(workspaceSlug)
+        if (!workspaceDir) throw new Error(`Failed to decode workspace slug: ${workspaceSlug}`)
        await openSidebar(page)

-        const item = page.locator(`${workspaceItemSelector(next)}, ${workspaceItemSelector(raw)}`).first()
-        await expect(item).toBeVisible()
-        await item.hover()
+        const workspace = page.locator(workspaceItemSelector(workspaceSlug)).first()
+        await expect(workspace).toBeVisible()
+        await workspace.hover()

-        const btn = page.locator(`${workspaceNewSessionSelector(next)}, ${workspaceNewSessionSelector(raw)}`).first()
-        await expect(btn).toBeVisible()
-        await btn.click({ force: true })
+        const newSession = page.locator(workspaceNewSessionSelector(workspaceSlug)).first()
+        await expect(newSession).toBeVisible()
+        await newSession.click({ force: true })

-        // A new workspace can be discovered via a transient slug before the route and sidebar
-        // settle to the canonical workspace path on Windows, so interact with either and assert
-        // against the resolved workspace slug.
-        await waitSlug(page)
-        await expect(page).toHaveURL(new RegExp(`/${next}/session(?:[/?#]|$)`))
+        await expect(page).toHaveURL(new RegExp(`/${workspaceSlug}/session(?:[/?#]|$)`))

        // Create a session by sending a prompt
        const prompt = page.locator(promptSelector)
@@ -117,9 +103,9 @@ test("switching back to a project opens the latest workspace session", async ({

        const created = sessionIDFromUrl(page.url())
        if (!created) throw new Error(`Failed to get session ID from url: ${page.url()}`)
-        trackSession(created, space)
+        sessionID = created

-        await expect(page).toHaveURL(new RegExp(`/${next}/session/${created}(?:[/?#]|$)`))
+        await expect(page).toHaveURL(new RegExp(`/${workspaceSlug}/session/${created}(?:[/?#]|$)`))

        await openSidebar(page)

@@ -138,6 +124,20 @@ test("switching back to a project opens the latest workspace session", async ({
      { extra: [other] },
    )
  } finally {
+    if (sessionID) {
+      const id = sessionID
+      const dirs = [rootDir, workspaceDir].filter((x): x is string => !!x)
+      await Promise.all(
+        dirs.map((directory) =>
+          createSdk(directory)
+            .session.delete({ sessionID: id })
+            .catch(() => undefined),
+        ),
+      )
+    }
+    if (workspaceDir) {
+      await cleanupTestProject(workspaceDir)
+    }
    await cleanupTestProject(other)
  }
 })
--- a/packages/app/e2e/projects/workspace-new-session.spec.ts
+++ b/packages/app/e2e/projects/workspace-new-session.spec.ts
@@ -1,10 +1,14 @@
 import { base64Decode } from "@opencode-ai/util/encode"
 import type { Page } from "@playwright/test"
 import { test, expect } from "../fixtures"
-import { openSidebar, sessionIDFromUrl, setWorkspacesEnabled, slugFromUrl, waitSlug } from "../actions"
+import { cleanupTestProject, openSidebar, sessionIDFromUrl, setWorkspacesEnabled } from "../actions"
 import { promptSelector, workspaceItemSelector, workspaceNewSessionSelector } from "../selectors"
 import { createSdk } from "../utils"

+function slugFromUrl(url: string) {
+  return /\/([^/]+)\/session(?:\/|$)/.exec(url)?.[1] ?? ""
+}
+
 async function waitWorkspaceReady(page: Page, slug: string) {
  await openSidebar(page)
  await expect
@@ -27,7 +31,20 @@ async function createWorkspace(page: Page, root: string, seen: string[]) {
  await openSidebar(page)
  await page.getByRole("button", { name: "New workspace" }).first().click()

-  const slug = await waitSlug(page, [root, ...seen])
+  await expect
+    .poll(
+      () => {
+        const slug = slugFromUrl(page.url())
+        if (!slug) return ""
+        if (slug === root) return ""
+        if (seen.includes(slug)) return ""
+        return slug
+      },
+      { timeout: 45_000 },
+    )
+    .not.toBe("")
+
+  const slug = slugFromUrl(page.url())
  const directory = base64Decode(slug)
  if (!directory) throw new Error(`Failed to decode workspace slug: ${slug}`)
  return { slug, directory }
@@ -43,13 +60,12 @@ async function openWorkspaceNewSession(page: Page, slug: string) {
  await expect(button).toBeVisible()
  await button.click({ force: true })

-  const next = await waitSlug(page)
-  await expect(page).toHaveURL(new RegExp(`/${next}/session(?:[/?#]|$)`))
-  return next
+  await expect.poll(() => slugFromUrl(page.url())).toBe(slug)
+  await expect(page).toHaveURL(new RegExp(`/${slug}/session(?:[/?#]|$)`))
 }

 async function createSessionFromWorkspace(page: Page, slug: string, text: string) {
-  const next = await openWorkspaceNewSession(page, slug)
+  await openWorkspaceNewSession(page, slug)

  const prompt = page.locator(promptSelector)
  await expect(prompt).toBeVisible()
@@ -60,13 +76,13 @@ async function createSessionFromWorkspace(page: Page, slug: string, text: string
  await expect.poll(async () => ((await prompt.textContent()) ?? "").trim()).toContain(text)
  await prompt.press("Enter")

-  await expect.poll(() => slugFromUrl(page.url())).toBe(next)
+  await expect.poll(() => slugFromUrl(page.url())).toBe(slug)
  await expect.poll(() => sessionIDFromUrl(page.url()) ?? "", { timeout: 30_000 }).not.toBe("")

  const sessionID = sessionIDFromUrl(page.url())
  if (!sessionID) throw new Error(`Failed to parse session id from url: ${page.url()}`)
-  await expect(page).toHaveURL(new RegExp(`/${next}/session/${sessionID}(?:[/?#]|$)`))
-  return { sessionID, slug: next }
+  await expect(page).toHaveURL(new RegExp(`/${slug}/session/${sessionID}(?:[/?#]|$)`))
+  return sessionID
 }

 async function sessionDirectory(directory: string, sessionID: string) {
@@ -81,29 +97,48 @@ async function sessionDirectory(directory: string, sessionID: string) {
 test("new sessions from sidebar workspace actions stay in selected workspace", async ({ page, withProject }) => {
  await page.setViewportSize({ width: 1400, height: 800 })

-  await withProject(async ({ directory, slug: root, trackSession, trackDirectory }) => {
-    await openSidebar(page)
-    await setWorkspacesEnabled(page, root, true)
+  await withProject(async ({ directory, slug: root }) => {
+    const workspaces = [] as { slug: string; directory: string }[]
+    const sessions = [] as string[]

-    const first = await createWorkspace(page, root, [])
-    trackDirectory(first.directory)
-    await waitWorkspaceReady(page, first.slug)
+    try {
+      await openSidebar(page)
+      await setWorkspacesEnabled(page, root, true)

-    const second = await createWorkspace(page, root, [first.slug])
-    trackDirectory(second.directory)
-    await waitWorkspaceReady(page, second.slug)
+      const first = await createWorkspace(page, root, [])
+      workspaces.push(first)
+      await waitWorkspaceReady(page, first.slug)

-    const firstSession = await createSessionFromWorkspace(page, first.slug, `workspace one ${Date.now()}`)
-    trackSession(firstSession.sessionID, first.directory)
+      const second = await createWorkspace(page, root, [first.slug])
+      workspaces.push(second)
+      await waitWorkspaceReady(page, second.slug)

-    const secondSession = await createSessionFromWorkspace(page, second.slug, `workspace two ${Date.now()}`)
-    trackSession(secondSession.sessionID, second.directory)
+      const firstSession = await createSessionFromWorkspace(page, first.slug, `workspace one ${Date.now()}`)
+      sessions.push(firstSession)

-    const thirdSession = await createSessionFromWorkspace(page, first.slug, `workspace one again ${Date.now()}`)
-    trackSession(thirdSession.sessionID, first.directory)
+      const secondSession = await createSessionFromWorkspace(page, second.slug, `workspace two ${Date.now()}`)
+      sessions.push(secondSession)

-    await expect.poll(() => sessionDirectory(first.directory, firstSession.sessionID)).toBe(first.directory)
-    await expect.poll(() => sessionDirectory(second.directory, secondSession.sessionID)).toBe(second.directory)
-    await expect.poll(() => sessionDirectory(first.directory, thirdSession.sessionID)).toBe(first.directory)
+      const thirdSession = await createSessionFromWorkspace(page, first.slug, `workspace one again ${Date.now()}`)
+      sessions.push(thirdSession)
+
+      await expect.poll(() => sessionDirectory(first.directory, firstSession)).toBe(first.directory)
+      await expect.poll(() => sessionDirectory(second.directory, secondSession)).toBe(second.directory)
+      await expect.poll(() => sessionDirectory(first.directory, thirdSession)).toBe(first.directory)
+    } finally {
+      const dirs = [directory, ...workspaces.map((workspace) => workspace.directory)]
+      await Promise.all(
+        sessions.map((sessionID) =>
+          Promise.all(
+            dirs.map((dir) =>
+              createSdk(dir)
+                .session.delete({ sessionID })
+                .catch(() => undefined),
+            ),
+          ),
+        ),
+      )
+      await Promise.all(workspaces.map((workspace) => cleanupTestProject(workspace.directory)))
+    }
  })
 })
--- a/packages/app/e2e/projects/workspaces.spec.ts
+++ b/packages/app/e2e/projects/workspaces.spec.ts
@@ -14,12 +14,14 @@ import {
  openSidebar,
  openWorkspaceMenu,
  setWorkspacesEnabled,
-  slugFromUrl,
-  waitSlug,
 } from "../actions"
 import { dropdownMenuContentSelector, inlineInputSelector, workspaceItemSelector } from "../selectors"
 import { createSdk, dirSlug } from "../utils"

+function slugFromUrl(url: string) {
+  return /\/([^/]+)\/session(?:\/|$)/.exec(url)?.[1] ?? ""
+}
+
 async function setupWorkspaceTest(page: Page, project: { slug: string }) {
  const rootSlug = project.slug
  await openSidebar(page)
@@ -27,7 +29,17 @@ async function setupWorkspaceTest(page: Page, project: { slug: string }) {
  await setWorkspacesEnabled(page, rootSlug, true)

  await page.getByRole("button", { name: "New workspace" }).first().click()
-  const slug = await waitSlug(page, [rootSlug])
+  await expect
+    .poll(
+      () => {
+        const slug = slugFromUrl(page.url())
+        return slug.length > 0 && slug !== rootSlug
+      },
+      { timeout: 45_000 },
+    )
+    .toBe(true)
+
+  const slug = slugFromUrl(page.url())
  const dir = base64Decode(slug)

  await openSidebar(page)
@@ -79,7 +91,18 @@ test("can create a workspace", async ({ page, withProject }) => {
    await expect(page.getByRole("button", { name: "New workspace" }).first()).toBeVisible()

    await page.getByRole("button", { name: "New workspace" }).first().click()
-    const workspaceSlug = await waitSlug(page, [slug])
+
+    await expect
+      .poll(
+        () => {
+          const currentSlug = slugFromUrl(page.url())
+          return currentSlug.length > 0 && currentSlug !== slug
+        },
+        { timeout: 45_000 },
+      )
+      .toBe(true)
+
+    const workspaceSlug = slugFromUrl(page.url())
    const workspaceDir = base64Decode(workspaceSlug)

    await openSidebar(page)
@@ -256,7 +279,7 @@ test("can delete a workspace", async ({ page, withProject }) => {
    await clickMenuItem(menu, /^Delete$/i, { force: true })
    await confirmDialog(page, /^Delete workspace$/i)

-    await expect.poll(() => base64Decode(slugFromUrl(page.url()))).toBe(project.directory)
+    await expect(page).toHaveURL(new RegExp(`/${rootSlug}/session`))

    await expect
      .poll(
@@ -313,6 +336,9 @@ test("can reorder workspaces by drag and drop", async ({ page, withProject }) =>
      const src = page.locator(workspaceItemSelector(from)).first()
      const dst = page.locator(workspaceItemSelector(to)).first()

+      await src.scrollIntoViewIfNeeded()
+      await dst.scrollIntoViewIfNeeded()
+
      const a = await src.boundingBox()
      const b = await dst.boundingBox()
      if (!a || !b) throw new Error("Failed to resolve workspace drag bounds")
@@ -331,7 +357,17 @@ test("can reorder workspaces by drag and drop", async ({ page, withProject }) =>
      for (const _ of [0, 1]) {
        const prev = slugFromUrl(page.url())
        await page.getByRole("button", { name: "New workspace" }).first().click()
-        const slug = await waitSlug(page, [rootSlug, prev])
+        await expect
+          .poll(
+            () => {
+              const slug = slugFromUrl(page.url())
+              return slug.length > 0 && slug !== rootSlug && slug !== prev
+            },
+            { timeout: 45_000 },
+          )
+          .toBe(true)
+
+        const slug = slugFromUrl(page.url())
        const dir = base64Decode(slug)
        workspaces.push({ slug, directory: dir })

--- a/packages/app/e2e/prompt/prompt-async.spec.ts
+++ b/packages/app/e2e/prompt/prompt-async.spec.ts
@@ -1,8 +1,6 @@
 import { test, expect } from "../fixtures"
 import { promptSelector } from "../selectors"
-import { cleanupSession, sessionIDFromUrl, withSession } from "../actions"
-
-const text = (value: string | null) => (value ?? "").replace(/\u200B/g, "").trim()
+import { sessionIDFromUrl } from "../actions"

 // Regression test for Issue #12453: the synchronous POST /message endpoint holds
 // the connection open while the agent works, causing "Failed to fetch" over
@@ -40,37 +38,6 @@ test("prompt succeeds when sync message endpoint is unreachable", async ({ page,
      )
      .toContain(token)
  } finally {
-    await cleanupSession({ sdk, sessionID })
+    await sdk.session.delete({ sessionID }).catch(() => undefined)
  }
 })
-
-test("failed prompt send restores the composer input", async ({ page, sdk, gotoSession }) => {
-  await withSession(sdk, `e2e prompt failure ${Date.now()}`, async (session) => {
-    const prompt = page.locator(promptSelector)
-    const value = `restore ${Date.now()}`
-
-    await page.route(`**/session/${session.id}/prompt_async`, (route) =>
-      route.fulfill({
-        status: 500,
-        contentType: "application/json",
-        body: JSON.stringify({ message: "e2e prompt failure" }),
-      }),
-    )
-
-    await gotoSession(session.id)
-    await prompt.click()
-    await page.keyboard.type(value)
-    await page.keyboard.press("Enter")
-
-    await expect.poll(async () => text(await prompt.textContent())).toBe(value)
-    await expect
-      .poll(
-        async () => {
-          const messages = await sdk.session.messages({ sessionID: session.id, limit: 50 }).then((r) => r.data ?? [])
-          return messages.length
-        },
-        { timeout: 15_000 },
-      )
-      .toBe(0)
-  })
-})
--- a/packages/app/e2e/prompt/prompt-history.spec.ts
+++ b/packages/app/e2e/prompt/prompt-history.spec.ts
@@ -1,181 +0,0 @@
-import type { ToolPart } from "@opencode-ai/sdk/v2/client"
-import type { Page } from "@playwright/test"
-import { test, expect } from "../fixtures"
-import { withSession } from "../actions"
-import { promptSelector } from "../selectors"
-
-const text = (value: string | null) => (value ?? "").replace(/\u200B/g, "").trim()
-
-const isBash = (part: unknown): part is ToolPart => {
-  if (!part || typeof part !== "object") return false
-  if (!("type" in part) || part.type !== "tool") return false
-  if (!("tool" in part) || part.tool !== "bash") return false
-  return "state" in part
-}
-
-async function edge(page: Page, pos: "start" | "end") {
-  await page.locator(promptSelector).evaluate((el: HTMLDivElement, pos: "start" | "end") => {
-    const selection = window.getSelection()
-    if (!selection) return
-
-    const walk = document.createTreeWalker(el, NodeFilter.SHOW_TEXT)
-    const nodes: Text[] = []
-    for (let node = walk.nextNode(); node; node = walk.nextNode()) {
-      nodes.push(node as Text)
-    }
-
-    if (nodes.length === 0) {
-      const node = document.createTextNode("")
-      el.appendChild(node)
-      nodes.push(node)
-    }
-
-    const node = pos === "start" ? nodes[0]! : nodes[nodes.length - 1]!
-    const range = document.createRange()
-    range.setStart(node, pos === "start" ? 0 : (node.textContent ?? "").length)
-    range.collapse(true)
-    selection.removeAllRanges()
-    selection.addRange(range)
-  }, pos)
-}
-
-async function wait(page: Page, value: string) {
-  await expect.poll(async () => text(await page.locator(promptSelector).textContent())).toBe(value)
-}
-
-async function reply(sdk: Parameters<typeof withSession>[0], sessionID: string, token: string) {
-  await expect
-    .poll(
-      async () => {
-        const messages = await sdk.session.messages({ sessionID, limit: 50 }).then((r) => r.data ?? [])
-        return messages
-          .filter((item) => item.info.role === "assistant")
-          .flatMap((item) => item.parts)
-          .filter((item) => item.type === "text")
-          .map((item) => item.text)
-          .join("\n")
-      },
-      { timeout: 90_000 },
-    )
-    .toContain(token)
-}
-
-async function shell(sdk: Parameters<typeof withSession>[0], sessionID: string, cmd: string, token: string) {
-  await expect
-    .poll(
-      async () => {
-        const messages = await sdk.session.messages({ sessionID, limit: 50 }).then((r) => r.data ?? [])
-        const part = messages
-          .filter((item) => item.info.role === "assistant")
-          .flatMap((item) => item.parts)
-          .filter(isBash)
-          .find((item) => item.state.input?.command === cmd && item.state.status === "completed")
-
-        if (!part || part.state.status !== "completed") return
-        return typeof part.state.metadata?.output === "string" ? part.state.metadata.output : part.state.output
-      },
-      { timeout: 90_000 },
-    )
-    .toContain(token)
-}
-
-test("prompt history restores unsent draft with arrow navigation", async ({ page, sdk, gotoSession }) => {
-  test.setTimeout(120_000)
-
-  await withSession(sdk, `e2e prompt history ${Date.now()}`, async (session) => {
-    await gotoSession(session.id)
-
-    const prompt = page.locator(promptSelector)
-    const firstToken = `E2E_HISTORY_ONE_${Date.now()}`
-    const secondToken = `E2E_HISTORY_TWO_${Date.now()}`
-    const first = `Reply with exactly: ${firstToken}`
-    const second = `Reply with exactly: ${secondToken}`
-    const draft = `draft ${Date.now()}`
-
-    await prompt.click()
-    await page.keyboard.type(first)
-    await page.keyboard.press("Enter")
-    await wait(page, "")
-    await reply(sdk, session.id, firstToken)
-
-    await prompt.click()
-    await page.keyboard.type(second)
-    await page.keyboard.press("Enter")
-    await wait(page, "")
-    await reply(sdk, session.id, secondToken)
-
-    await prompt.click()
-    await page.keyboard.type(draft)
-    await wait(page, draft)
-
-    await edge(page, "start")
-    await page.keyboard.press("ArrowUp")
-    await wait(page, second)
-
-    await page.keyboard.press("ArrowUp")
-    await wait(page, first)
-
-    await page.keyboard.press("ArrowDown")
-    await wait(page, second)
-
-    await page.keyboard.press("ArrowDown")
-    await wait(page, draft)
-  })
-})
-
-test("shell history stays separate from normal prompt history", async ({ page, sdk, gotoSession }) => {
-  test.setTimeout(120_000)
-
-  await withSession(sdk, `e2e shell history ${Date.now()}`, async (session) => {
-    await gotoSession(session.id)
-
-    const prompt = page.locator(promptSelector)
-    const firstToken = `E2E_SHELL_ONE_${Date.now()}`
-    const secondToken = `E2E_SHELL_TWO_${Date.now()}`
-    const normalToken = `E2E_NORMAL_${Date.now()}`
-    const first = `echo ${firstToken}`
-    const second = `echo ${secondToken}`
-    const normal = `Reply with exactly: ${normalToken}`
-
-    await prompt.click()
-    await page.keyboard.type("!")
-    await page.keyboard.type(first)
-    await page.keyboard.press("Enter")
-    await wait(page, "")
-    await shell(sdk, session.id, first, firstToken)
-
-    await prompt.click()
-    await page.keyboard.type("!")
-    await page.keyboard.type(second)
-    await page.keyboard.press("Enter")
-    await wait(page, "")
-    await shell(sdk, session.id, second, secondToken)
-
-    await prompt.click()
-    await page.keyboard.type("!")
-    await page.keyboard.press("ArrowUp")
-    await wait(page, second)
-
-    await page.keyboard.press("ArrowUp")
-    await wait(page, first)
-
-    await page.keyboard.press("ArrowDown")
-    await wait(page, second)
-
-    await page.keyboard.press("ArrowDown")
-    await wait(page, "")
-
-    await page.keyboard.press("Escape")
-    await wait(page, "")
-
-    await prompt.click()
-    await page.keyboard.type(normal)
-    await page.keyboard.press("Enter")
-    await wait(page, "")
-    await reply(sdk, session.id, normalToken)
-
-    await prompt.click()
-    await page.keyboard.press("ArrowUp")
-    await wait(page, normal)
-  })
-})
--- a/packages/app/e2e/prompt/prompt-shell.spec.ts
+++ b/packages/app/e2e/prompt/prompt-shell.spec.ts
@@ -1,62 +0,0 @@
-import type { ToolPart } from "@opencode-ai/sdk/v2/client"
-import { test, expect } from "../fixtures"
-import { sessionIDFromUrl } from "../actions"
-import { promptSelector } from "../selectors"
-import { createSdk } from "../utils"
-
-const isBash = (part: unknown): part is ToolPart => {
-  if (!part || typeof part !== "object") return false
-  if (!("type" in part) || part.type !== "tool") return false
-  if (!("tool" in part) || part.tool !== "bash") return false
-  return "state" in part
-}
-
-test("shell mode runs a command in the project directory", async ({ page, withProject }) => {
-  test.setTimeout(120_000)
-
-  await withProject(async ({ directory, gotoSession, trackSession }) => {
-    const sdk = createSdk(directory)
-    const prompt = page.locator(promptSelector)
-    const cmd = process.platform === "win32" ? "dir" : "ls"
-
-    await gotoSession()
-    await prompt.click()
-    await page.keyboard.type("!")
-    await expect(prompt).toHaveAttribute("aria-label", /enter shell command/i)
-
-    await page.keyboard.type(cmd)
-    await page.keyboard.press("Enter")
-
-    await expect(page).toHaveURL(/\/session\/[^/?#]+/, { timeout: 30_000 })
-
-    const id = sessionIDFromUrl(page.url())
-    if (!id) throw new Error(`Failed to parse session id from url: ${page.url()}`)
-    trackSession(id, directory)
-
-    await expect
-      .poll(
-        async () => {
-          const list = await sdk.session.messages({ sessionID: id, limit: 50 }).then((x) => x.data ?? [])
-          const msg = list.findLast(
-            (item) => item.info.role === "assistant" && "path" in item.info && item.info.path.cwd === directory,
-          )
-          if (!msg) return
-
-          const part = msg.parts
-            .filter(isBash)
-            .find((item) => item.state.input?.command === cmd && item.state.status === "completed")
-
-          if (!part || part.state.status !== "completed") return
-          const output =
-            typeof part.state.metadata?.output === "string" ? part.state.metadata.output : part.state.output
-          if (!output.includes("README.md")) return
-
-          return { cwd: directory, output }
-        },
-        { timeout: 90_000 },
-      )
-      .toEqual(expect.objectContaining({ cwd: directory, output: expect.stringContaining("README.md") }))
-
-    await expect(prompt).toHaveText("")
-  })
-})
--- a/packages/app/e2e/prompt/prompt-slash-share.spec.ts
+++ b/packages/app/e2e/prompt/prompt-slash-share.spec.ts
@@ -1,64 +0,0 @@
-import { test, expect } from "../fixtures"
-import { promptSelector } from "../selectors"
-import { withSession } from "../actions"
-
-const shareDisabled = process.env.OPENCODE_DISABLE_SHARE === "true" || process.env.OPENCODE_DISABLE_SHARE === "1"
-
-async function seed(sdk: Parameters<typeof withSession>[0], sessionID: string) {
-  await sdk.session.promptAsync({
-    sessionID,
-    noReply: true,
-    parts: [{ type: "text", text: "e2e share seed" }],
-  })
-
-  await expect
-    .poll(
-      async () => {
-        const messages = await sdk.session.messages({ sessionID, limit: 1 }).then((r) => r.data ?? [])
-        return messages.length
-      },
-      { timeout: 30_000 },
-    )
-    .toBeGreaterThan(0)
-}
-
-test("/share and /unshare update session share state", async ({ page, sdk, gotoSession }) => {
-  test.skip(shareDisabled, "Share is disabled in this environment (OPENCODE_DISABLE_SHARE).")
-
-  await withSession(sdk, `e2e slash share ${Date.now()}`, async (session) => {
-    const prompt = page.locator(promptSelector)
-
-    await seed(sdk, session.id)
-    await gotoSession(session.id)
-
-    await prompt.click()
-    await page.keyboard.type("/share")
-    await expect(page.locator('[data-slash-id="session.share"]').first()).toBeVisible()
-    await page.keyboard.press("Enter")
-
-    await expect
-      .poll(
-        async () => {
-          const data = await sdk.session.get({ sessionID: session.id }).then((r) => r.data)
-          return data?.share?.url || undefined
-        },
-        { timeout: 30_000 },
-      )
-      .not.toBeUndefined()
-
-    await prompt.click()
-    await page.keyboard.type("/unshare")
-    await expect(page.locator('[data-slash-id="session.unshare"]').first()).toBeVisible()
-    await page.keyboard.press("Enter")
-
-    await expect
-      .poll(
-        async () => {
-          const data = await sdk.session.get({ sessionID: session.id }).then((r) => r.data)
-          return data?.share?.url || undefined
-        },
-        { timeout: 30_000 },
-      )
-      .toBeUndefined()
-  })
-})
--- a/packages/app/e2e/prompt/prompt.spec.ts
+++ b/packages/app/e2e/prompt/prompt.spec.ts
@@ -1,6 +1,6 @@
 import { test, expect } from "../fixtures"
 import { promptSelector } from "../selectors"
-import { cleanupSession, sessionIDFromUrl, withSession } from "../actions"
+import { sessionIDFromUrl, withSession } from "../actions"

 test("can send a prompt and receive a reply", async ({ page, sdk, gotoSession }) => {
  test.setTimeout(120_000)
@@ -46,7 +46,7 @@ test("can send a prompt and receive a reply", async ({ page, sdk, gotoSession })
      .toContain(token)
  } finally {
    page.off("pageerror", onPageError)
-    await cleanupSession({ sdk, sessionID })
+    await sdk.session.delete({ sessionID }).catch(() => undefined)
  }

  if (pageErrors.length > 0) {
--- a/packages/app/e2e/selectors.ts
+++ b/packages/app/e2e/selectors.ts
@@ -30,6 +30,8 @@ export const sidebarNavSelector = '[data-component="sidebar-nav-desktop"]'
 export const projectSwitchSelector = (slug: string) =>
  `${sidebarNavSelector} [data-action="project-switch"][data-project="${slug}"]`

+export const projectCloseHoverSelector = (slug: string) => `[data-action="project-close-hover"][data-project="${slug}"]`
+
 export const projectMenuTriggerSelector = (slug: string) =>
  `${sidebarNavSelector} [data-action="project-menu"][data-project="${slug}"]`

@@ -51,8 +53,6 @@ export const dropdownMenuContentSelector = '[data-component="dropdown-menu-conte

 export const inlineInputSelector = '[data-component="inline-input"]'

-export const sessionTimelineHeaderSelector = "[data-session-title]"
-
 export const sessionItemSelector = (sessionID: string) => `${sidebarNavSelector} [data-session-id="${sessionID}"]`

 export const workspaceItemSelector = (slug: string) =>
--- a/packages/app/e2e/session/session-child-navigation.spec.ts
+++ b/packages/app/e2e/session/session-child-navigation.spec.ts
@@ -1,37 +0,0 @@
-import { seedSessionTask, withSession } from "../actions"
-import { test, expect } from "../fixtures"
-
-test("task tool child-session link does not trigger stale show errors", async ({ page, sdk, gotoSession }) => {
-  test.setTimeout(120_000)
-
-  const errs: string[] = []
-  const onError = (err: Error) => {
-    errs.push(err.message)
-  }
-  page.on("pageerror", onError)
-
-  await withSession(sdk, `e2e child nav ${Date.now()}`, async (session) => {
-    const child = await seedSessionTask(sdk, {
-      sessionID: session.id,
-      description: "Open child session",
-      prompt: "Search the repository for AssistantParts and then reply with exactly CHILD_OK.",
-    })
-
-    try {
-      await gotoSession(session.id)
-
-      const link = page
-        .locator("a.subagent-link")
-        .filter({ hasText: /open child session/i })
-        .first()
-      await expect(link).toBeVisible({ timeout: 30_000 })
-      await link.click()
-
-      await expect(page).toHaveURL(new RegExp(`/session/${child.sessionID}(?:[/?#]|$)`), { timeout: 30_000 })
-      await page.waitForTimeout(1000)
-      expect(errs).toEqual([])
-    } finally {
-      page.off("pageerror", onError)
-    }
-  })
-})
--- a/packages/app/e2e/session/session-composer-dock.spec.ts
+++ b/packages/app/e2e/session/session-composer-dock.spec.ts
@@ -1,5 +1,5 @@
 import { test, expect } from "../fixtures"
-import { cleanupSession, clearSessionDockSeed, seedSessionQuestion, seedSessionTodos } from "../actions"
+import { clearSessionDockSeed, seedSessionQuestion, seedSessionTodos } from "../actions"
 import {
  permissionDockSelector,
  promptSelector,
@@ -26,7 +26,7 @@ async function withDockSession<T>(
  try {
    return await fn(session)
  } finally {
-    await cleanupSession({ sdk, sessionID: session.id })
+    await sdk.session.delete({ sessionID: session.id }).catch(() => undefined)
  }
 }

@@ -311,7 +311,7 @@ test("child session question request blocks parent dock and unblocks after submi
        await expect(page.locator(promptSelector)).toBeVisible()
      })
    } finally {
-      await cleanupSession({ sdk, sessionID: child.id })
+      await sdk.session.delete({ sessionID: child.id }).catch(() => undefined)
    }
  })
 })
@@ -358,7 +358,7 @@ test("child session permission request blocks parent dock and supports allow onc
        },
      )
    } finally {
-      await cleanupSession({ sdk, sessionID: child.id })
+      await sdk.session.delete({ sessionID: child.id }).catch(() => undefined)
    }
  })
 })
--- a/packages/app/e2e/session/session-undo-redo.spec.ts
+++ b/packages/app/e2e/session/session-undo-redo.spec.ts
@@ -45,7 +45,7 @@ async function seedConversation(input: {
    .toBe(true)

  if (!userMessageID) throw new Error("Expected a user message id")
-  await expect(input.page.locator(`[data-message-id="${userMessageID}"]`)).toHaveCount(1, { timeout: 30_000 })
+  await expect(input.page.locator(`[data-message-id="${userMessageID}"]`).first()).toBeVisible({ timeout: 30_000 })
  return { prompt, userMessageID }
 }

@@ -123,7 +123,7 @@ test("slash redo clears revert and restores latest state", async ({ page, withPr
        .toBeUndefined()

      await expect(seeded.prompt).not.toContainText(token)
-      await expect(page.locator(`[data-message-id="${seeded.userMessageID}"]`)).toHaveCount(1)
+      await expect(page.locator(`[data-message-id="${seeded.userMessageID}"]`).first()).toBeVisible()
    })
  })
 })
@@ -158,8 +158,8 @@ test("slash undo/redo traverses multi-step revert stack", async ({ page, withPro
      const firstMessage = page.locator(`[data-message-id="${first.userMessageID}"]`)
      const secondMessage = page.locator(`[data-message-id="${second.userMessageID}"]`)

-      await expect(firstMessage).toHaveCount(1)
-      await expect(secondMessage).toHaveCount(1)
+      await expect(firstMessage.first()).toBeVisible()
+      await expect(secondMessage.first()).toBeVisible()

      await second.prompt.click()
      await page.keyboard.press(`${modKey}+A`)
@@ -176,7 +176,7 @@ test("slash undo/redo traverses multi-step revert stack", async ({ page, withPro
        })
        .toBe(second.userMessageID)

-      await expect(firstMessage).toHaveCount(1)
+      await expect(firstMessage.first()).toBeVisible()
      await expect(secondMessage).toHaveCount(0)

      await second.prompt.click()
@@ -210,7 +210,7 @@ test("slash undo/redo traverses multi-step revert stack", async ({ page, withPro
        })
        .toBe(second.userMessageID)

-      await expect(firstMessage).toHaveCount(1)
+      await expect(firstMessage.first()).toBeVisible()
      await expect(secondMessage).toHaveCount(0)

      await second.prompt.click()
@@ -226,8 +226,8 @@ test("slash undo/redo traverses multi-step revert stack", async ({ page, withPro
        })
        .toBeUndefined()

-      await expect(firstMessage).toHaveCount(1)
-      await expect(secondMessage).toHaveCount(1)
+      await expect(firstMessage.first()).toBeVisible()
+      await expect(secondMessage.first()).toBeVisible()
    })
  })
 })
--- a/packages/app/e2e/session/session.spec.ts
+++ b/packages/app/e2e/session/session.spec.ts
@@ -7,7 +7,7 @@ import {
  openSharePopover,
  withSession,
 } from "../actions"
-import { sessionItemSelector, inlineInputSelector, sessionTimelineHeaderSelector } from "../selectors"
+import { sessionItemSelector, inlineInputSelector } from "../selectors"

 const shareDisabled = process.env.OPENCODE_DISABLE_SHARE === "true" || process.env.OPENCODE_DISABLE_SHARE === "1"

@@ -39,14 +39,12 @@ test("session can be renamed via header menu", async ({ page, sdk, gotoSession }
  await withSession(sdk, originalTitle, async (session) => {
    await seedMessage(sdk, session.id)
    await gotoSession(session.id)
-    await expect(page.locator(sessionTimelineHeaderSelector).getByRole("heading", { level: 1 }).first()).toHaveText(
-      originalTitle,
-    )
+    await expect(page.getByRole("heading", { level: 1 }).first()).toHaveText(originalTitle)

    const menu = await openSessionMoreMenu(page, session.id)
    await clickMenuItem(menu, /rename/i)

-    const input = page.locator(sessionTimelineHeaderSelector).locator(inlineInputSelector).first()
+    const input = page.locator(".scroll-view__viewport").locator(inlineInputSelector).first()
    await expect(input).toBeVisible()
    await expect(input).toBeFocused()
    await input.fill(renamedTitle)
@@ -63,9 +61,7 @@ test("session can be renamed via header menu", async ({ page, sdk, gotoSession }
      )
      .toBe(renamedTitle)

-    await expect(page.locator(sessionTimelineHeaderSelector).getByRole("heading", { level: 1 }).first()).toHaveText(
-      renamedTitle,
-    )
+    await expect(page.getByRole("heading", { level: 1 }).first()).toHaveText(renamedTitle)
  })
 })

--- a/packages/app/e2e/settings/settings-keybinds.spec.ts
+++ b/packages/app/e2e/settings/settings-keybinds.spec.ts
@@ -32,19 +32,22 @@ test("changing sidebar toggle keybind works", async ({ page, gotoSession }) => {

  await closeDialog(page, dialog)

-  const button = page.getByRole("button", { name: /toggle sidebar/i }).first()
-  const initiallyClosed = (await button.getAttribute("aria-expanded")) !== "true"
+  const main = page.locator("main")
+  const initialClasses = (await main.getAttribute("class")) ?? ""
+  const initiallyClosed = initialClasses.includes("xl:border-l")

  await page.keyboard.press(`${modKey}+Shift+H`)
-  await expect(button).toHaveAttribute("aria-expanded", initiallyClosed ? "true" : "false")
+  await page.waitForTimeout(100)

-  const afterToggleClosed = (await button.getAttribute("aria-expanded")) !== "true"
+  const afterToggleClasses = (await main.getAttribute("class")) ?? ""
+  const afterToggleClosed = afterToggleClasses.includes("xl:border-l")
  expect(afterToggleClosed).toBe(!initiallyClosed)

  await page.keyboard.press(`${modKey}+Shift+H`)
-  await expect(button).toHaveAttribute("aria-expanded", initiallyClosed ? "false" : "true")
+  await page.waitForTimeout(100)

-  const finalClosed = (await button.getAttribute("aria-expanded")) !== "true"
+  const finalClasses = (await main.getAttribute("class")) ?? ""
+  const finalClosed = finalClasses.includes("xl:border-l")
  expect(finalClosed).toBe(initiallyClosed)
 })

--- a/packages/app/e2e/sidebar/sidebar-popover-actions.spec.ts
+++ b/packages/app/e2e/sidebar/sidebar-popover-actions.spec.ts
@@ -1,6 +1,6 @@
 import { test, expect } from "../fixtures"
-import { cleanupSession, closeSidebar, hoverSessionItem } from "../actions"
-import { projectSwitchSelector } from "../selectors"
+import { closeSidebar, hoverSessionItem } from "../actions"
+import { projectSwitchSelector, sessionItemSelector } from "../selectors"

 test("collapsed sidebar popover stays open when archiving a session", async ({ page, slug, sdk, gotoSession }) => {
  const stamp = Date.now()
@@ -15,15 +15,12 @@ test("collapsed sidebar popover stays open when archiving a session", async ({ p
    await gotoSession(one.id)
    await closeSidebar(page)

-    const oneItem = page.locator(`[data-session-id="${one.id}"]`).last()
-    const twoItem = page.locator(`[data-session-id="${two.id}"]`).last()
-
    const project = page.locator(projectSwitchSelector(slug)).first()
    await expect(project).toBeVisible()
    await project.hover()

-    await expect(oneItem).toBeVisible()
-    await expect(twoItem).toBeVisible()
+    await expect(page.locator(sessionItemSelector(one.id)).first()).toBeVisible()
+    await expect(page.locator(sessionItemSelector(two.id)).first()).toBeVisible()

    const item = await hoverSessionItem(page, one.id)
    await item
@@ -31,9 +28,9 @@ test("collapsed sidebar popover stays open when archiving a session", async ({ p
      .first()
      .click()

-    await expect(twoItem).toBeVisible()
+    await expect(page.locator(sessionItemSelector(two.id)).first()).toBeVisible()
  } finally {
-    await cleanupSession({ sdk, sessionID: one.id })
-    await cleanupSession({ sdk, sessionID: two.id })
+    await sdk.session.delete({ sessionID: one.id }).catch(() => undefined)
+    await sdk.session.delete({ sessionID: two.id }).catch(() => undefined)
  }
 })
--- a/packages/app/e2e/sidebar/sidebar-session-links.spec.ts
+++ b/packages/app/e2e/sidebar/sidebar-session-links.spec.ts
@@ -1,5 +1,5 @@
 import { test, expect } from "../fixtures"
-import { cleanupSession, openSidebar, withSession } from "../actions"
+import { openSidebar, withSession } from "../actions"
 import { promptSelector } from "../selectors"

 test("sidebar session links navigate to the selected session", async ({ page, slug, sdk, gotoSession }) => {
@@ -18,13 +18,14 @@ test("sidebar session links navigate to the selected session", async ({ page, sl

    const target = page.locator(`[data-session-id="${two.id}"] a`).first()
    await expect(target).toBeVisible()
+    await target.scrollIntoViewIfNeeded()
    await target.click()

    await expect(page).toHaveURL(new RegExp(`/${slug}/session/${two.id}(?:\\?|#|$)`))
    await expect(page.locator(promptSelector)).toBeVisible()
    await expect(page.locator(`[data-session-id="${two.id}"] a`).first()).toHaveClass(/\bactive\b/)
  } finally {
-    await cleanupSession({ sdk, sessionID: one.id })
-    await cleanupSession({ sdk, sessionID: two.id })
+    await sdk.session.delete({ sessionID: one.id }).catch(() => undefined)
+    await sdk.session.delete({ sessionID: two.id }).catch(() => undefined)
  }
 })
--- a/packages/app/e2e/sidebar/sidebar.spec.ts
+++ b/packages/app/e2e/sidebar/sidebar.spec.ts
@@ -5,14 +5,12 @@ test("sidebar can be collapsed and expanded", async ({ page, gotoSession }) => {
  await gotoSession()

  await openSidebar(page)
-  const button = page.getByRole("button", { name: /toggle sidebar/i }).first()
-  await expect(button).toHaveAttribute("aria-expanded", "true")

  await toggleSidebar(page)
-  await expect(button).toHaveAttribute("aria-expanded", "false")
+  await expect(page.locator("main")).toHaveClass(/xl:border-l/)

  await toggleSidebar(page)
-  await expect(button).toHaveAttribute("aria-expanded", "true")
+  await expect(page.locator("main")).not.toHaveClass(/xl:border-l/)
 })

 test("sidebar collapsed state persists across navigation and reload", async ({ page, sdk, gotoSession }) => {
@@ -21,15 +19,14 @@ test("sidebar collapsed state persists across navigation and reload", async ({ p
      await gotoSession(session1.id)

      await openSidebar(page)
-      const button = page.getByRole("button", { name: /toggle sidebar/i }).first()
      await toggleSidebar(page)
-      await expect(button).toHaveAttribute("aria-expanded", "false")
+      await expect(page.locator("main")).toHaveClass(/xl:border-l/)

      await gotoSession(session2.id)
-      await expect(button).toHaveAttribute("aria-expanded", "false")
+      await expect(page.locator("main")).toHaveClass(/xl:border-l/)

      await page.reload()
-      await expect(button).toHaveAttribute("aria-expanded", "false")
+      await expect(page.locator("main")).toHaveClass(/xl:border-l/)

      const opened = await page.evaluate(
        () => JSON.parse(localStorage.getItem("opencode.global.dat:layout") ?? "{}").sidebar?.opened,
--- a/packages/app/e2e/terminal/terminal-tabs.spec.ts
+++ b/packages/app/e2e/terminal/terminal-tabs.spec.ts
@@ -1,122 +0,0 @@
-import type { Page } from "@playwright/test"
-import { test, expect } from "../fixtures"
-import { terminalSelector } from "../selectors"
-import { terminalToggleKey, workspacePersistKey } from "../utils"
-
-type State = {
-  active?: string
-  all: Array<{
-    id: string
-    title: string
-    titleNumber: number
-    buffer?: string
-  }>
-}
-
-async function open(page: Page) {
-  const terminal = page.locator(terminalSelector)
-  const visible = await terminal.isVisible().catch(() => false)
-  if (!visible) await page.keyboard.press(terminalToggleKey)
-  await expect(terminal).toBeVisible()
-  await expect(terminal.locator("textarea")).toHaveCount(1)
-}
-
-async function run(page: Page, cmd: string) {
-  const terminal = page.locator(terminalSelector)
-  await expect(terminal).toBeVisible()
-  await terminal.click()
-  await page.keyboard.type(cmd)
-  await page.keyboard.press("Enter")
-  // powershell + windows just isnt that fast... we need to wait
-  await page.waitForTimeout(3_000)
-}
-
-async function store(page: Page, key: string) {
-  return page.evaluate((key) => {
-    const raw = localStorage.getItem(key)
-    if (raw) return JSON.parse(raw) as State
-
-    for (let i = 0; i < localStorage.length; i++) {
-      const next = localStorage.key(i)
-      if (!next?.endsWith(":workspace:terminal")) continue
-      const value = localStorage.getItem(next)
-      if (!value) continue
-      return JSON.parse(value) as State
-    }
-  }, key)
-}
-
-test("terminal tab buffers persist across tab switches", async ({ page, withProject }) => {
-  await withProject(async ({ directory, gotoSession }) => {
-    const key = workspacePersistKey(directory, "terminal")
-    const one = `E2E_TERM_ONE_${Date.now()}`
-    const two = `E2E_TERM_TWO_${Date.now()}`
-    const tabs = page.locator('#terminal-panel [data-slot="tabs-trigger"]')
-
-    await gotoSession()
-    await open(page)
-
-    await run(page, `echo ${one}`)
-
-    await page.getByRole("button", { name: /new terminal/i }).click()
-    await expect(tabs).toHaveCount(2)
-
-    await run(page, `echo ${two}`)
-
-    await tabs
-      .filter({ hasText: /Terminal 1/ })
-      .first()
-      .click()
-
-    await expect
-      .poll(
-        async () => {
-          const state = await store(page, key)
-          const first = state?.all.find((item) => item.titleNumber === 1)?.buffer ?? ""
-          const second = state?.all.find((item) => item.titleNumber === 2)?.buffer ?? ""
-          return first.includes(one) && second.includes(two)
-        },
-        { timeout: 30_000 },
-      )
-      .toBe(true)
-  })
-})
-
-test("closing the active terminal tab falls back to the previous tab", async ({ page, withProject }) => {
-  await withProject(async ({ directory, gotoSession }) => {
-    const key = workspacePersistKey(directory, "terminal")
-    const tabs = page.locator('#terminal-panel [data-slot="tabs-trigger"]')
-
-    await gotoSession()
-    await open(page)
-
-    await page.getByRole("button", { name: /new terminal/i }).click()
-    await expect(tabs).toHaveCount(2)
-
-    const second = tabs.filter({ hasText: /Terminal 2/ }).first()
-    await second.click()
-    await expect(second).toHaveAttribute("aria-selected", "true")
-
-    await second.hover()
-    await page
-      .getByRole("button", { name: /close terminal/i })
-      .nth(1)
-      .click({ force: true })
-
-    const first = tabs.filter({ hasText: /Terminal 1/ }).first()
-    await expect(tabs).toHaveCount(1)
-    await expect(first).toHaveAttribute("aria-selected", "true")
-    await expect
-      .poll(
-        async () => {
-          const state = await store(page, key)
-          return {
-            count: state?.all.length ?? 0,
-            first: state?.all.some((item) => item.titleNumber === 1) ?? false,
-          }
-        },
-        { timeout: 15_000 },
-      )
-      .toEqual({ count: 1, first: true })
-  })
-})
--- a/packages/app/e2e/utils.ts
+++ b/packages/app/e2e/utils.ts
@@ -1,5 +1,5 @@
 import { createOpencodeClient } from "@opencode-ai/sdk/v2/client"
-import { base64Encode, checksum } from "@opencode-ai/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"

 export const serverHost = process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"
 export const serverPort = process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"
@@ -7,22 +7,6 @@ export const serverPort = process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"
 export const serverUrl = `http://${serverHost}:${serverPort}`
 export const serverName = `${serverHost}:${serverPort}`

-const localHosts = ["127.0.0.1", "localhost"]
-
-const serverLabels = (() => {
-  const url = new URL(serverUrl)
-  if (!localHosts.includes(url.hostname)) return [serverName]
-  return localHosts.map((host) => `${host}:${url.port}`)
-})()
-
-export const serverNames = [...new Set(serverLabels)]
-
-export const serverUrls = serverNames.map((name) => `http://${name}`)
-
-const escape = (value: string) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
-
-export const serverNamePattern = new RegExp(`(?:${serverNames.map(escape).join("|")})`)
-
 export const modKey = process.platform === "darwin" ? "Meta" : "Control"
 export const terminalToggleKey = "Control+Backquote"

@@ -30,12 +14,6 @@ export function createSdk(directory?: string) {
  return createOpencodeClient({ baseUrl: serverUrl, directory, throwOnError: true })
 }

-export async function resolveDirectory(directory: string) {
-  return createSdk(directory)
-    .path.get()
-    .then((x) => x.data?.directory ?? directory)
-}
-
 export async function getWorktree() {
  const sdk = createSdk()
  const result = await sdk.path.get()
@@ -55,9 +33,3 @@ export function dirPath(directory: string) {
 export function sessionPath(directory: string, sessionID?: string) {
  return `${dirPath(directory)}/session${sessionID ? `/${sessionID}` : ""}`
 }
-
-export function workspacePersistKey(directory: string, key: string) {
-  const head = directory.slice(0, 12) || "workspace"
-  const sum = checksum(directory) ?? "0"
-  return `opencode.workspace.${head}.${sum}.dat:workspace:${key}`
-}
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.2.21",
+  "version": "1.2.17",
  "description": "",
  "type": "module",
  "exports": {
@@ -57,7 +57,7 @@
    "@thisbeyond/solid-dnd": "0.7.5",
    "diff": "catalog:",
    "fuzzysort": "catalog:",
-    "ghostty-web": "github:anomalyco/ghostty-web#main",
+    "ghostty-web": "0.4.0",
    "luxon": "catalog:",
    "marked": "catalog:",
    "marked-shiki": "catalog:",
--- a/packages/app/src/components/dialog-settings.tsx
+++ b/packages/app/src/components/dialog-settings.tsx
@@ -8,6 +8,7 @@ import { SettingsGeneral } from "./settings-general"
 import { SettingsKeybinds } from "./settings-keybinds"
 import { SettingsProviders } from "./settings-providers"
 import { SettingsModels } from "./settings-models"
+import { SettingsMcp } from "./settings-mcp"

 export const DialogSettings: Component = () => {
  const language = useLanguage()
@@ -45,6 +46,10 @@ export const DialogSettings: Component = () => {
                      <Icon name="models" />
                      {language.t("settings.models.title")}
                    </Tabs.Trigger>
+                    <Tabs.Trigger value="mcp">
+                      <Icon name="mcp" />
+                      {language.t("settings.mcp.title")}
+                    </Tabs.Trigger>
                  </div>
                </div>
              </div>
@@ -67,6 +72,9 @@ export const DialogSettings: Component = () => {
        <Tabs.Content value="models" class="no-scrollbar">
          <SettingsModels />
        </Tabs.Content>
+        <Tabs.Content value="mcp" class="no-scrollbar">
+          <SettingsMcp />
+        </Tabs.Content>
      </Tabs>
    </Dialog>
  )
--- a/packages/app/src/components/prompt-input.tsx
+++ b/packages/app/src/components/prompt-input.tsx
@@ -244,6 +244,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    draggingType: "image" | "@mention" | null
    mode: "normal" | "shell"
    applyingHistory: boolean
+    pendingAutoAccept: boolean
  }>({
    popover: null,
    historyIndex: -1,
@@ -252,6 +253,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    draggingType: null,
    mode: "normal",
    applyingHistory: false,
+    pendingAutoAccept: false,
  })

  const buttonsSpring = useSpring(() => (store.mode === "normal" ? 1 : 0), { visualDuration: 0.2, bounce: 0 })
@@ -304,6 +306,12 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    }),
  )

+  createEffect(
+    on(sessionKey, () => {
+      setStore("pendingAutoAccept", false)
+    }),
+  )
+
  const historyComments = () => {
    const byID = new Map(comments.all().map((item) => [`${item.file}\n${item.id}`, item] as const))
    return prompt.context.items().flatMap((item) => {
@@ -953,7 +961,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
  const variants = createMemo(() => ["default", ...local.model.variant.list()])
  const accepting = createMemo(() => {
    const id = params.id
-    if (!id) return permission.isAutoAcceptingDirectory(sdk.directory)
+    if (!id) return store.pendingAutoAccept
    return permission.isAutoAccepting(id, sdk.directory)
  })

@@ -1203,9 +1211,9 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
              aria-multiline="true"
              aria-label={placeholder()}
              contenteditable="true"
-              autocapitalize={store.mode === "normal" ? "sentences" : "off"}
-              autocorrect={store.mode === "normal" ? "on" : "off"}
-              spellcheck={store.mode === "normal"}
+              autocapitalize="off"
+              autocorrect="off"
+              spellcheck={false}
              onInput={handleInput}
              onPaste={handlePaste}
              onCompositionStart={() => setComposing(true)}
@@ -1328,7 +1336,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                  variant="ghost"
                  onClick={() => {
                    if (!params.id) {
-                      permission.toggleAutoAcceptDirectory(sdk.directory)
+                      setStore("pendingAutoAccept", (value) => !value)
                      return
                    }
                    permission.toggleAutoAccept(params.id, sdk.directory)
--- a/packages/app/src/components/prompt-input/submit.test.ts
+++ b/packages/app/src/components/prompt-input/submit.test.ts
@@ -6,19 +6,10 @@ let createPromptSubmit: typeof import("./submit").createPromptSubmit
 const createdClients: string[] = []
 const createdSessions: string[] = []
 const enabledAutoAccept: Array<{ sessionID: string; directory: string }> = []
-const optimistic: Array<{
-  message: {
-    agent: string
-    model: { providerID: string; modelID: string }
-    variant?: string
-  }
-}> = []
 const sentShell: string[] = []
 const syncedDirectories: string[] = []

-let params: { id?: string } = {}
 let selected = "/repo/worktree-a"
-let variant: string | undefined

 const promptValue: Prompt = [{ type: "text", content: "ls", start: 0, end: 2 }]

@@ -35,7 +26,6 @@ const clientFor = (directory: string) => {
        return { data: undefined }
      },
      prompt: async () => ({ data: undefined }),
-      promptAsync: async () => ({ data: undefined }),
      command: async () => ({ data: undefined }),
      abort: async () => ({ data: undefined }),
    },
@@ -50,7 +40,7 @@ beforeAll(async () => {

  mock.module("@solidjs/router", () => ({
    useNavigate: () => () => undefined,
-    useParams: () => params,
+    useParams: () => ({}),
  }))

  mock.module("@opencode-ai/sdk/v2/client", () => ({
@@ -72,7 +62,7 @@ beforeAll(async () => {
    useLocal: () => ({
      model: {
        current: () => ({ id: "model", provider: { id: "provider" } }),
-        variant: { current: () => variant },
+        variant: { current: () => undefined },
      },
      agent: {
        current: () => ({ name: "agent" }),
@@ -128,11 +118,7 @@ beforeAll(async () => {
      data: { command: [] },
      session: {
        optimistic: {
-          add: (value: {
-            message: { agent: string; model: { providerID: string; modelID: string }; variant?: string }
-          }) => {
-            optimistic.push(value)
-          },
+          add: () => undefined,
          remove: () => undefined,
        },
      },
@@ -169,12 +155,9 @@ beforeEach(() => {
  createdClients.length = 0
  createdSessions.length = 0
  enabledAutoAccept.length = 0
-  optimistic.length = 0
-  params = {}
  sentShell.length = 0
  syncedDirectories.length = 0
  selected = "/repo/worktree-a"
-  variant = undefined
 })

 describe("prompt submit worktree selection", () => {
@@ -236,39 +219,4 @@ describe("prompt submit worktree selection", () => {

    expect(enabledAutoAccept).toEqual([{ sessionID: "session-1", directory: "/repo/worktree-a" }])
  })
-
-  test("includes the selected variant on optimistic prompts", async () => {
-    params = { id: "session-1" }
-    variant = "high"
-
-    const submit = createPromptSubmit({
-      info: () => ({ id: "session-1" }),
-      imageAttachments: () => [],
-      commentCount: () => 0,
-      autoAccept: () => false,
-      mode: () => "normal",
-      working: () => false,
-      editor: () => undefined,
-      queueScroll: () => undefined,
-      promptLength: (value) => value.reduce((sum, part) => sum + ("content" in part ? part.content.length : 0), 0),
-      addToHistory: () => undefined,
-      resetHistoryNavigation: () => undefined,
-      setMode: () => undefined,
-      setPopover: () => undefined,
-      onSubmit: () => undefined,
-    })
-
-    const event = { preventDefault: () => undefined } as unknown as Event
-
-    await submit.handleSubmit(event)
-
-    expect(optimistic).toHaveLength(1)
-    expect(optimistic[0]).toMatchObject({
-      message: {
-        agent: "agent",
-        model: { providerID: "provider", modelID: "model" },
-        variant: "high",
-      },
-    })
-  })
 })
--- a/packages/app/src/components/prompt-input/submit.ts
+++ b/packages/app/src/components/prompt-input/submit.ts
@@ -316,7 +316,6 @@ export function createPromptSubmit(input: PromptSubmitInput) {
      time: { created: Date.now() },
      agent,
      model,
-      variant,
    }

    const addOptimisticMessage = () =>
--- a/packages/app/src/components/session/find-assistant-messages.test.ts
+++ b/packages/app/src/components/session/find-assistant-messages.test.ts
@@ -1,81 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import type { Message } from "@opencode-ai/sdk/v2/client"
-import { findAssistantMessages } from "@opencode-ai/ui/find-assistant-messages"
-
-function user(id: string): Message {
-  return {
-    id,
-    role: "user",
-    sessionID: "session-1",
-    time: { created: 1 },
-  } as unknown as Message
-}
-
-function assistant(id: string, parentID: string): Message {
-  return {
-    id,
-    role: "assistant",
-    sessionID: "session-1",
-    parentID,
-    time: { created: 1 },
-  } as unknown as Message
-}
-
-describe("findAssistantMessages", () => {
-  test("normal ordering: assistant after user in array → found via forward scan", () => {
-    const messages = [user("u1"), assistant("a1", "u1")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("clock skew: assistant before user in array → found via backward scan", () => {
-    // When client clock is ahead, user ID sorts after assistant ID,
-    // so assistant appears earlier in the ID-sorted message array
-    const messages = [assistant("a1", "u1"), user("u1")]
-    const result = findAssistantMessages(messages, 1, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("no assistant messages → returns empty array", () => {
-    const messages = [user("u1"), user("u2")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(0)
-  })
-
-  test("multiple assistant messages with matching parentID → all found", () => {
-    const messages = [user("u1"), assistant("a1", "u1"), assistant("a2", "u1")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(2)
-    expect(result[0].id).toBe("a1")
-    expect(result[1].id).toBe("a2")
-  })
-
-  test("does not return assistant messages with different parentID", () => {
-    const messages = [user("u1"), assistant("a1", "u1"), assistant("a2", "other")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("stops forward scan at next user message", () => {
-    const messages = [user("u1"), assistant("a1", "u1"), user("u2"), assistant("a2", "u1")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("stops backward scan at previous user message", () => {
-    const messages = [assistant("a0", "u1"), user("u0"), assistant("a1", "u1"), user("u1")]
-    const result = findAssistantMessages(messages, 3, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("invalid index returns empty array", () => {
-    const messages = [user("u1")]
-    expect(findAssistantMessages(messages, -1, "u1")).toHaveLength(0)
-    expect(findAssistantMessages(messages, 5, "u1")).toHaveLength(0)
-  })
-})
--- a/packages/app/src/components/session/session-header.tsx
+++ b/packages/app/src/components/session/session-header.tsx
@@ -303,12 +303,7 @@ export function SessionHeader() {
  })

  const canOpen = createMemo(() => platform.platform === "desktop" && !!platform.openPath && server.isLocal())
-  const current = createMemo(
-    () =>
-      options().find((o) => o.id === prefs.app) ??
-      options()[0] ??
-      ({ id: "finder", label: fileManager().label, icon: fileManager().icon } as const),
-  )
+  const current = createMemo(() => options().find((o) => o.id === prefs.app) ?? options()[0])
  const opening = createMemo(() => openRequest.app !== undefined)

  const selectApp = (app: OpenApp) => {
--- a/packages/app/src/components/session/session-new-view.tsx
+++ b/packages/app/src/components/session/session-new-view.tsx
@@ -4,12 +4,12 @@ import { useSync } from "@/context/sync"
 import { useSDK } from "@/context/sdk"
 import { useLanguage } from "@/context/language"
 import { Icon } from "@opencode-ai/ui/icon"
-import { Mark } from "@opencode-ai/ui/logo"
 import { getDirectory, getFilename } from "@opencode-ai/util/path"

 const MAIN_WORKTREE = "main"
 const CREATE_WORKTREE = "create"
-const ROOT_CLASS = "size-full flex flex-col"
+const ROOT_CLASS =
+  "size-full flex flex-col justify-end items-start gap-4 flex-[1_0_0] self-stretch max-w-200 mx-auto 2xl:max-w-[1000px] px-6 pb-16"

 interface NewSessionViewProps {
  worktree: string
@@ -50,43 +50,33 @@ export function NewSessionView(props: NewSessionViewProps) {

  return (
    <div class={ROOT_CLASS}>
-      <div class="h-12 shrink-0" aria-hidden />
-      <div class="flex-1 px-6 pb-30 flex items-center justify-center text-center">
-        <div class="w-full max-w-200 flex flex-col items-center text-center gap-4">
-          <div class="flex flex-col items-center gap-6">
-            <Mark class="w-10" />
-            <div class="text-20-medium text-text-strong">{language.t("session.new.title")}</div>
-          </div>
-          <div class="w-full flex flex-col gap-4 items-center">
-            <div class="flex items-start justify-center gap-3 min-h-5">
-              <div class="text-12-medium text-text-weak select-text leading-5 min-w-0 max-w-160 break-words text-center">
-                {getDirectory(projectRoot())}
-                <span class="text-text-strong">{getFilename(projectRoot())}</span>
-              </div>
-            </div>
-            <div class="flex items-start justify-center gap-1.5 min-h-5">
-              <Icon name="branch" size="small" class="mt-0.5 shrink-0" />
-              <div class="text-12-medium text-text-weak select-text leading-5 min-w-0 max-w-160 break-words text-center">
-                {label(current())}
-              </div>
-            </div>
-            <Show when={sync.project}>
-              {(project) => (
-                <div class="flex items-start justify-center gap-3 min-h-5">
-                  <div class="text-12-medium text-text-weak leading-5 min-w-0 max-w-160 break-words text-center">
-                    {language.t("session.new.lastModified")}&nbsp;
-                    <span class="text-text-strong">
-                      {DateTime.fromMillis(project().time.updated ?? project().time.created)
-                        .setLocale(language.intl())
-                        .toRelative()}
-                    </span>
-                  </div>
-                </div>
-              )}
-            </Show>
-          </div>
+      <div class="text-20-medium text-text-weaker">{language.t("command.session.new")}</div>
+      <div class="flex justify-center items-start gap-3 min-h-5">
+        <Icon name="folder" size="small" class="mt-0.5 shrink-0" />
+        <div class="text-12-medium text-text-weak select-text leading-5">
+          {getDirectory(projectRoot())}
+          <span class="text-text-strong">{getFilename(projectRoot())}</span>
        </div>
      </div>
+      <div class="flex justify-center items-start gap-3 min-h-5">
+        <Icon name="branch" size="small" class="mt-0.5 shrink-0" />
+        <div class="text-12-medium text-text-weak select-text leading-5">{label(current())}</div>
+      </div>
+      <Show when={sync.project}>
+        {(project) => (
+          <div class="flex justify-center items-start gap-3 min-h-5">
+            <Icon name="pencil-line" size="small" class="mt-0.5 shrink-0" />
+            <div class="text-12-medium text-text-weak leading-5">
+              {language.t("session.new.lastModified")}&nbsp;
+              <span class="text-text-strong">
+                {DateTime.fromMillis(project().time.updated ?? project().time.created)
+                  .setLocale(language.intl())
+                  .toRelative()}
+              </span>
+            </div>
+          </div>
+        )}
+      </Show>
    </div>
  )
 }
--- a/packages/app/src/components/settings-mcp.tsx
+++ b/packages/app/src/components/settings-mcp.tsx
@@ -1,15 +1,665 @@
-import { Component } from "solid-js"
+import type { Config, McpLocalConfig, McpRemoteConfig, McpStatus } from "@opencode-ai/sdk/v2/client"
+import { Button } from "@opencode-ai/ui/button"
+import { Icon, type IconProps } from "@opencode-ai/ui/icon"
+import { Tag } from "@opencode-ai/ui/tag"
+import { Switch } from "@opencode-ai/ui/switch"
+import { TextField } from "@opencode-ai/ui/text-field"
+import { showToast } from "@opencode-ai/ui/toast"
+import { For, Show, createMemo, onMount, type Component } from "solid-js"
+import { createStore } from "solid-js/store"
+import { useGlobalSDK } from "@/context/global-sdk"
+import { useGlobalSync } from "@/context/global-sync"
 import { useLanguage } from "@/context/language"

+type Mode = "remote" | "local"
+type McpMap = NonNullable<Config["mcp"]>
+type McpEntry = McpMap[string]
+type McpConfig = McpLocalConfig | McpRemoteConfig
+type McpState = McpStatus["status"]
+
+const FEATURED = [
+  {
+    name: "playwright",
+    title: "Playwright",
+    description: "Browser automation tools for testing, scraping, and repros.",
+    icon: "window-cursor",
+    panel: "linear-gradient(135deg, rgba(59, 130, 246, 0.14), rgba(15, 23, 42, 0.04))",
+    glow: "rgba(96, 165, 250, 0.18)",
+    badge: "rgba(37, 99, 235, 0.14)",
+    color: "rgb(37, 99, 235)",
+    config: {
+      type: "local",
+      command: ["npx", "-y", "@playwright/mcp@latest"],
+    },
+  },
+  {
+    name: "context7",
+    title: "Context7",
+    description: "Fresh framework docs and API references in one remote server.",
+    icon: "code-lines",
+    panel: "linear-gradient(135deg, rgba(14, 165, 233, 0.16), rgba(15, 23, 42, 0.04))",
+    glow: "rgba(56, 189, 248, 0.2)",
+    badge: "rgba(8, 145, 178, 0.14)",
+    color: "rgb(8, 145, 178)",
+    config: {
+      type: "remote",
+      url: "https://mcp.context7.com/mcp",
+    },
+  },
+  {
+    name: "linear",
+    title: "Linear",
+    description: "Issue and project workflows from your Linear workspace.",
+    icon: "branch",
+    panel: "linear-gradient(135deg, rgba(124, 58, 237, 0.14), rgba(30, 41, 59, 0.04))",
+    glow: "rgba(139, 92, 246, 0.18)",
+    badge: "rgba(109, 40, 217, 0.14)",
+    color: "rgb(109, 40, 217)",
+    config: {
+      type: "remote",
+      url: "https://mcp.linear.app/sse",
+      oauth: {},
+    },
+  },
+  {
+    name: "sentry",
+    title: "Sentry",
+    description: "Error monitoring, traces, and issue triage in one place.",
+    icon: "warning",
+    panel: "linear-gradient(135deg, rgba(14, 116, 144, 0.16), rgba(15, 23, 42, 0.04))",
+    glow: "rgba(6, 182, 212, 0.16)",
+    badge: "rgba(8, 145, 178, 0.14)",
+    color: "rgb(8, 145, 178)",
+    config: {
+      type: "remote",
+      url: "https://mcp.sentry.dev/mcp",
+      oauth: {},
+    },
+  },
+] satisfies Array<{
+  name: string
+  title: string
+  description: string
+  icon: IconProps["name"]
+  panel: string
+  glow: string
+  badge: string
+  color: string
+  config: McpConfig
+}>
+
+const STATUS = {
+  connected: "mcp.status.connected",
+  failed: "mcp.status.failed",
+  needs_auth: "mcp.status.needs_auth",
+  disabled: "mcp.status.disabled",
+  needs_client_registration: "settings.mcp.status.needs_client_registration",
+} satisfies Record<McpState, string>
+
+const empty = (mode: Mode = "remote") => ({
+  mode,
+  name: "",
+  url: "",
+  command: "",
+  headers: "",
+  environment: "",
+  timeout: "",
+})
+
+const isConfig = (value: McpEntry | undefined): value is McpConfig =>
+  typeof value === "object" && value !== null && "type" in value
+
+const split = (value: string) =>
+  value
+    .split("\n")
+    .map((line) => line.trim())
+    .filter(Boolean)
+
+const parseMap = (value: string, allowColon: boolean) => {
+  const out: Record<string, string> = {}
+
+  for (const line of split(value)) {
+    const eq = line.indexOf("=")
+    const cut = !allowColon ? eq : ([line.indexOf(":"), eq].filter((part) => part > 0).sort((a, b) => a - b)[0] ?? -1)
+
+    if (cut < 1) return { error: line }
+
+    const key = line.slice(0, cut).trim()
+    const item = line.slice(cut + 1).trim()
+    if (!key || !item) return { error: line }
+    out[key] = item
+  }
+
+  return { value: Object.keys(out).length > 0 ? out : undefined }
+}
+
+const parseCmd = (value: string) =>
+  (value.match(/"[^"]*"|'[^']*'|[^\s]+/g) ?? []).map((part) => {
+    if (part.startsWith('"') && part.endsWith('"')) return part.slice(1, -1)
+    if (part.startsWith("'") && part.endsWith("'")) return part.slice(1, -1)
+    return part
+  })
+
 export const SettingsMcp: Component = () => {
-  // TODO: Replace this placeholder with full MCP settings controls.
-  const language = useLanguage()
+  const lang = useLanguage()
+  const sdk = useGlobalSDK()
+  const sync = useGlobalSync()
+  const [state, setState] = createStore({
+    form: empty(),
+    submitting: "",
+    statusLoading: false,
+    status: {} as Record<string, McpStatus>,
+  })
+
+  const busy = createMemo(() => state.submitting.length > 0)
+
+  const items = createMemo(() => {
+    return Object.entries(sync.data.config.mcp ?? {})
+      .filter((item): item is [string, McpConfig] => isConfig(item[1]))
+      .map(([name, config]) => ({ name, config }))
+      .sort((a, b) => a.name.localeCompare(b.name))
+  })
+
+  const names = createMemo(() => new Set(items().map((item) => item.name)))
+
+  const spin = () => `${lang.t("common.loading")}${lang.t("common.loading.ellipsis")}`
+
+  const kind = (value: Mode) => {
+    if (value === "remote") return lang.t("settings.mcp.type.remote")
+    return lang.t("settings.mcp.type.local")
+  }
+
+  const fail = (description: string) => {
+    showToast({
+      variant: "error",
+      title: lang.t("common.requestFailed"),
+      description,
+    })
+  }
+
+  const load = () => {
+    setState("statusLoading", true)
+    return sdk.client.mcp
+      .status()
+      .then((x) => {
+        setState("status", x.data ?? {})
+      })
+      .catch(() => undefined)
+      .finally(() => {
+        setState("statusLoading", false)
+      })
+  }
+
+  const save = (next: McpMap, job: string, onSuccess: () => void, title: string, description: string) => {
+    const prev = sync.data.config.mcp
+    setState("submitting", job)
+    sync.set("config", "mcp", next)
+
+    sync
+      .updateConfig({ mcp: next })
+      .then(() => {
+        onSuccess()
+        void load()
+        showToast({
+          variant: "success",
+          icon: "circle-check",
+          title,
+          description,
+        })
+      })
+      .catch((err: unknown) => {
+        sync.set("config", "mcp", prev)
+        fail(err instanceof Error ? err.message : String(err))
+      })
+      .finally(() => {
+        setState("submitting", "")
+      })
+  }
+
+  const add = (name: string, config: McpConfig, job: string, reset: boolean) => {
+    const key = name.trim()
+    if (!key) {
+      fail(lang.t("settings.mcp.validation.name"))
+      return
+    }
+
+    if (names().has(key)) {
+      fail(lang.t("settings.mcp.validation.duplicate", { name: key }))
+      return
+    }
+
+    const next = {
+      ...(sync.data.config.mcp ?? {}),
+      [key]: config,
+    }
+
+    save(
+      next,
+      job,
+      () => {
+        if (!reset) return
+        setState("form", empty(state.form.mode))
+      },
+      lang.t("settings.mcp.toast.added.title"),
+      lang.t("settings.mcp.toast.added.description", { name: key }),
+    )
+  }
+
+  const addForm = () => {
+    if (busy()) return
+
+    const timeout = state.form.timeout.trim()
+    const wait = timeout ? Number(timeout) : undefined
+    if (wait !== undefined && (!Number.isInteger(wait) || wait <= 0)) {
+      fail(lang.t("settings.mcp.validation.timeout"))
+      return
+    }
+
+    if (state.form.mode === "remote") {
+      const url = state.form.url.trim()
+      if (!url) {
+        fail(lang.t("settings.mcp.validation.url"))
+        return
+      }
+
+      const headers = parseMap(state.form.headers, true)
+      if (headers.error) {
+        fail(lang.t("settings.mcp.validation.headers", { line: headers.error }))
+        return
+      }
+
+      add(
+        state.form.name,
+        {
+          type: "remote",
+          url,
+          ...(headers.value ? { headers: headers.value } : {}),
+          ...(wait ? { timeout: wait } : {}),
+        },
+        "form",
+        true,
+      )
+      return
+    }
+
+    const command = parseCmd(state.form.command.trim())
+    if (command.length === 0) {
+      fail(lang.t("settings.mcp.validation.command"))
+      return
+    }
+
+    const environment = parseMap(state.form.environment, false)
+    if (environment.error) {
+      fail(lang.t("settings.mcp.validation.environment", { line: environment.error }))
+      return
+    }
+
+    add(
+      state.form.name,
+      {
+        type: "local",
+        command,
+        ...(environment.value ? { environment: environment.value } : {}),
+        ...(wait ? { timeout: wait } : {}),
+      },
+      "form",
+      true,
+    )
+  }
+
+  const addFeatured = (item: (typeof FEATURED)[number]) => {
+    if (busy()) return
+    add(item.name, item.config, `featured:${item.name}`, false)
+  }
+
+  const toggle = (name: string, enabled: boolean) => {
+    if (busy()) return
+    const current = (sync.data.config.mcp ?? {})[name]
+    if (!isConfig(current)) return
+
+    const next = {
+      ...(sync.data.config.mcp ?? {}),
+      [name]: {
+        ...current,
+        enabled,
+      },
+    }
+
+    save(
+      next,
+      `toggle:${name}`,
+      () => undefined,
+      lang.t("settings.mcp.toast.updated.title"),
+      lang.t("settings.mcp.toast.updated.description", {
+        name,
+        state: enabled ? lang.t("settings.mcp.state.enabled") : lang.t("settings.mcp.state.disabled"),
+      }),
+    )
+  }
+
+  const remove = (name: string) => {
+    if (busy()) return
+
+    const next = { ...(sync.data.config.mcp ?? {}) }
+    delete next[name]
+
+    save(
+      next,
+      `remove:${name}`,
+      () => undefined,
+      lang.t("settings.mcp.toast.removed.title"),
+      lang.t("settings.mcp.toast.removed.description", { name }),
+    )
+  }
+
+  const label = (name: string) => {
+    const value = state.status[name]?.status
+    if (!value) return
+    return lang.t(STATUS[value])
+  }
+
+  const issue = (name: string) => {
+    const value = state.status[name]
+    if (!value || !("error" in value)) return
+    return value.error
+  }
+
+  const line = (config: McpConfig) => {
+    if (config.type === "remote") return config.url
+    return config.command.join(" ")
+  }
+
+  onMount(() => {
+    void load()
+  })

  return (
-    <div class="flex flex-col h-full overflow-y-auto">
-      <div class="flex flex-col gap-6 p-6 max-w-[600px]">
-        <h2 class="text-16-medium text-text-strong">{language.t("settings.mcp.title")}</h2>
-        <p class="text-14-regular text-text-weak">{language.t("settings.mcp.description")}</p>
+    <div class="flex flex-col h-full overflow-y-auto no-scrollbar px-4 pb-10 sm:px-10 sm:pb-10">
+      <div class="sticky top-0 z-10 bg-[linear-gradient(to_bottom,var(--surface-stronger-non-alpha)_calc(100%_-_24px),transparent)]">
+        <div class="flex flex-col gap-1 pt-6 pb-8 max-w-[720px]">
+          <h2 class="text-16-medium text-text-strong">{lang.t("settings.mcp.title")}</h2>
+          <p class="text-14-regular text-text-weak">{lang.t("settings.mcp.description")}</p>
+        </div>
+      </div>
+
+      <div class="flex flex-col gap-8 max-w-[720px]">
+        <div class="flex flex-col gap-3">
+          <div class="flex flex-col gap-1">
+            <h3 class="text-14-medium text-text-strong">{lang.t("settings.mcp.section.featured")}</h3>
+            <p class="text-12-regular text-text-weak">{lang.t("settings.mcp.section.featured.description")}</p>
+          </div>
+
+          <div class="grid gap-3 sm:grid-cols-2">
+            <For each={FEATURED}>
+              {(item) => {
+                const added = () => names().has(item.name)
+                const pending = () => state.submitting === `featured:${item.name}`
+
+                return (
+                  <button
+                    type="button"
+                    class="group relative overflow-hidden rounded-2xl border border-border-weak-base p-4 text-left transition-transform duration-200 disabled:cursor-default"
+                    classList={{
+                      "hover:-translate-y-0.5": !added() && !busy(),
+                      "opacity-60": added(),
+                    }}
+                    disabled={added() || busy()}
+                    onClick={() => addFeatured(item)}
+                  >
+                    <div class="absolute inset-0" aria-hidden="true">
+                      <div class="absolute inset-0" style={{ background: item.panel }} />
+                      <div
+                        class="absolute -right-6 -top-6 size-24 rounded-full blur-2xl"
+                        style={{ background: item.glow }}
+                      />
+                    </div>
+
+                    <div class="relative flex flex-col gap-4">
+                      <div class="flex items-start justify-between gap-3">
+                        <div
+                          class="flex size-11 shrink-0 items-center justify-center rounded-2xl border border-border-weak-base"
+                          style={{ background: item.badge, color: item.color }}
+                        >
+                          <Icon name={item.icon} class="size-5" />
+                        </div>
+                        <span class="rounded-full bg-surface-base px-2.5 py-1 text-11-medium text-text-weak">
+                          {kind(item.config.type)}
+                        </span>
+                      </div>
+
+                      <div class="flex flex-col gap-1">
+                        <div class="flex flex-wrap items-center gap-2">
+                          <span class="text-14-medium text-text-strong">{item.title}</span>
+                          <Show when={added()}>
+                            <span class="rounded-full bg-surface-base px-2 py-0.5 text-11-medium text-text-weak">
+                              {lang.t("settings.mcp.featured.added")}
+                            </span>
+                          </Show>
+                          <Show when={pending()}>
+                            <span class="text-11-regular text-text-weak">{spin()}</span>
+                          </Show>
+                        </div>
+                        <span class="text-12-regular leading-5 text-text-weak">{item.description}</span>
+                      </div>
+                    </div>
+                  </button>
+                )
+              }}
+            </For>
+          </div>
+        </div>
+
+        <div class="flex flex-col gap-3">
+          <div class="flex flex-col gap-1">
+            <div class="flex flex-wrap items-center gap-2">
+              <h3 class="text-14-medium text-text-strong">{lang.t("settings.mcp.section.configured")}</h3>
+              <Show when={state.statusLoading}>
+                <span class="text-11-regular text-text-weak">{spin()}</span>
+              </Show>
+            </div>
+            <p class="text-12-regular text-text-weak">{lang.t("settings.mcp.section.configured.description")}</p>
+          </div>
+
+          <div class="bg-surface-raised-base px-4 rounded-lg">
+            <Show
+              when={items().length > 0}
+              fallback={<div class="py-4 text-14-regular text-text-weak">{lang.t("dialog.mcp.empty")}</div>}
+            >
+              <For each={items()}>
+                {(item) => {
+                  const current = () => state.status[item.name]?.status
+                  const text = () => label(item.name)
+                  const problem = () => issue(item.name)
+                  const enabled = () => item.config.enabled !== false
+                  const pendingToggle = () => state.submitting === `toggle:${item.name}`
+                  const pending = () => state.submitting === `remove:${item.name}`
+
+                  return (
+                    <div class="flex flex-wrap items-start justify-between gap-4 py-4 border-b border-border-weak-base last:border-none">
+                      <div class="min-w-0 flex-1 flex flex-col gap-2">
+                        <div class="flex flex-wrap items-center gap-2">
+                          <span class="text-14-medium text-text-strong">{item.name}</span>
+                          <Tag>{kind(item.config.type)}</Tag>
+                          <Show when={text()}>
+                            <span
+                              class="rounded-full bg-surface-base px-2 py-0.5 text-11-medium"
+                              classList={{
+                                "text-icon-success-base": current() === "connected",
+                                "text-icon-warning-base": current() === "needs_auth",
+                                "text-icon-critical-base":
+                                  current() === "failed" || current() === "needs_client_registration",
+                                "text-text-weak": current() === "disabled",
+                              }}
+                            >
+                              {text()}
+                            </span>
+                          </Show>
+                        </div>
+
+                        <span class="text-12-regular text-text-weak break-all">{line(item.config)}</span>
+
+                        <Show when={problem()}>
+                          <span class="text-12-regular text-icon-critical-base break-all">{problem()}</span>
+                        </Show>
+                      </div>
+
+                      <div class="flex items-center gap-3" onClick={(e) => e.stopPropagation()}>
+                        <div class="flex items-center gap-2 pl-1">
+                          <Show when={pendingToggle()}>
+                            <span class="text-11-regular text-text-weak">{spin()}</span>
+                          </Show>
+                          <Switch
+                            checked={enabled()}
+                            disabled={busy()}
+                            onChange={(next) => toggle(item.name, next)}
+                            hideLabel
+                          >
+                            {item.name}
+                          </Switch>
+                          <span class="text-12-regular text-text-weak">
+                            {enabled() ? lang.t("settings.mcp.state.enabled") : lang.t("settings.mcp.state.disabled")}
+                          </span>
+                        </div>
+
+                        <Button size="large" variant="ghost" disabled={busy()} onClick={() => remove(item.name)}>
+                          {pending() ? spin() : lang.t("settings.mcp.action.remove")}
+                        </Button>
+                      </div>
+                    </div>
+                  )
+                }}
+              </For>
+            </Show>
+          </div>
+        </div>
+
+        <div class="flex flex-col gap-3">
+          <div class="flex flex-col gap-1">
+            <h3 class="text-14-medium text-text-strong">{lang.t("settings.mcp.section.add")}</h3>
+            <p class="text-12-regular text-text-weak">{lang.t("settings.mcp.section.add.description")}</p>
+          </div>
+
+          <div class="rounded-2xl border border-border-weak-base bg-surface-raised-base p-4 sm:p-5">
+            <div class="flex flex-col gap-4">
+              <div class="flex flex-col gap-2">
+                <span class="text-12-medium text-text-strong">{lang.t("settings.mcp.form.type.label")}</span>
+                <div class="inline-flex w-full gap-1 rounded-xl bg-surface-base p-1 sm:w-auto">
+                  <For each={["remote", "local"] as const}>
+                    {(mode) => (
+                      <button
+                        type="button"
+                        class="h-9 flex-1 rounded-lg px-3 text-12-medium transition-colors sm:flex-none"
+                        classList={{
+                          "bg-surface-raised-base text-text-strong": state.form.mode === mode,
+                          "text-text-weak": state.form.mode !== mode,
+                        }}
+                        onClick={() => {
+                          if (busy()) return
+                          setState("form", "mode", mode)
+                        }}
+                      >
+                        {kind(mode)}
+                      </button>
+                    )}
+                  </For>
+                </div>
+              </div>
+
+              <div class="grid gap-4 sm:grid-cols-2">
+                <TextField
+                  label={lang.t("settings.mcp.form.name.label")}
+                  value={state.form.name}
+                  onChange={(value) => setState("form", "name", value)}
+                  placeholder={lang.t("settings.mcp.form.name.placeholder")}
+                  spellcheck={false}
+                  autocorrect="off"
+                  autocomplete="off"
+                  autocapitalize="off"
+                />
+
+                <TextField
+                  label={lang.t("settings.mcp.form.timeout.label")}
+                  value={state.form.timeout}
+                  onChange={(value) => setState("form", "timeout", value)}
+                  placeholder={lang.t("settings.mcp.form.timeout.placeholder")}
+                  inputMode="numeric"
+                  spellcheck={false}
+                  autocorrect="off"
+                  autocomplete="off"
+                  autocapitalize="off"
+                />
+              </div>
+
+              <Show
+                when={state.form.mode === "remote"}
+                fallback={
+                  <>
+                    <TextField
+                      label={lang.t("settings.mcp.form.command.label")}
+                      value={state.form.command}
+                      onChange={(value) => setState("form", "command", value)}
+                      placeholder={lang.t("settings.mcp.form.command.placeholder")}
+                      spellcheck={false}
+                      autocorrect="off"
+                      autocomplete="off"
+                      autocapitalize="off"
+                    />
+
+                    <TextField
+                      label={lang.t("settings.mcp.form.environment.label")}
+                      description={lang.t("settings.mcp.form.environment.description")}
+                      value={state.form.environment}
+                      onChange={(value) => setState("form", "environment", value)}
+                      placeholder="API_KEY={env:API_KEY}"
+                      multiline
+                      rows={4}
+                      spellcheck={false}
+                      autocorrect="off"
+                      autocomplete="off"
+                      autocapitalize="off"
+                    />
+                  </>
+                }
+              >
+                <TextField
+                  label={lang.t("settings.mcp.form.url.label")}
+                  value={state.form.url}
+                  onChange={(value) => setState("form", "url", value)}
+                  placeholder={lang.t("settings.mcp.form.url.placeholder")}
+                  spellcheck={false}
+                  autocorrect="off"
+                  autocomplete="off"
+                  autocapitalize="off"
+                />
+
+                <TextField
+                  label={lang.t("settings.mcp.form.headers.label")}
+                  description={lang.t("settings.mcp.form.headers.description")}
+                  value={state.form.headers}
+                  onChange={(value) => setState("form", "headers", value)}
+                  placeholder="Authorization: Bearer {env:API_KEY}"
+                  multiline
+                  rows={4}
+                  spellcheck={false}
+                  autocorrect="off"
+                  autocomplete="off"
+                  autocapitalize="off"
+                />
+              </Show>
+
+              <Button
+                size="large"
+                variant="secondary"
+                icon="plus-small"
+                class="w-full justify-center sm:w-auto"
+                disabled={busy()}
+                onClick={addForm}
+              >
+                {state.submitting === "form" ? spin() : lang.t("settings.mcp.action.add")}
+              </Button>
+            </div>
+          </div>
+        </div>
      </div>
    </div>
  )
--- a/packages/app/src/components/titlebar.tsx
+++ b/packages/app/src/components/titlebar.tsx
@@ -155,7 +155,7 @@ export function Titlebar() {

  return (
    <header
-      class="h-10 shrink-0 bg-background-base relative grid grid-cols-[minmax(0,1fr)_auto_minmax(0,1fr)] items-center"
+      class="h-10 shrink-0 bg-background-base relative grid grid-cols-[auto_minmax(0,1fr)_auto] items-center"
      style={{ "min-height": minHeight() }}
      data-tauri-drag-region
      onMouseDown={drag}
@@ -266,13 +266,10 @@ export function Titlebar() {
          </div>
        </div>
        <div id="opencode-titlebar-left" class="flex items-center gap-3 min-w-0 px-2" />
-        <div class="bg-icon-interactive-base text-background-base font-medium px-2 rounded-sm uppercase font-mono">
-          BETA
-        </div>
      </div>

      <div class="min-w-0 flex items-center justify-center pointer-events-none">
-        <div id="opencode-titlebar-center" class="pointer-events-auto min-w-0 flex justify-center w-fit max-w-full" />
+        <div id="opencode-titlebar-center" class="pointer-events-auto w-full min-w-0 flex justify-center lg:w-fit" />
      </div>

      <div
--- a/packages/app/src/context/language.tsx
+++ b/packages/app/src/context/language.tsx
@@ -146,7 +146,6 @@ const DICT: Record<Locale, Dictionary> = {
 }

 const localeMatchers: Array<{ locale: Locale; match: (language: string) => boolean }> = [
-  { locale: "en", match: (language) => language.startsWith("en") },
  { locale: "zht", match: (language) => language.startsWith("zh") && language.includes("hant") },
  { locale: "zh", match: (language) => language.startsWith("zh") },
  { locale: "ko", match: (language) => language.startsWith("ko") },
@@ -218,7 +217,6 @@ export const { use: useLanguage, provider: LanguageProvider } = createSimpleCont
    )

    const locale = createMemo<Locale>(() => normalizeLocale(store.locale))
-    console.log("locale", locale())
    const intl = createMemo(() => INTL[locale()])

    const dict = createMemo<Dictionary>(() => DICT[locale()])
--- a/packages/app/src/context/permission-auto-respond.test.ts
+++ b/packages/app/src/context/permission-auto-respond.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test"
 import type { PermissionRequest, Session } from "@opencode-ai/sdk/v2/client"
 import { base64Encode } from "@opencode-ai/util/encode"
-import { autoRespondsPermission, isDirectoryAutoAccepting } from "./permission-auto-respond"
+import { autoRespondsPermission } from "./permission-auto-respond"

 const session = (input: { id: string; parentID?: string }) =>
  ({
@@ -60,43 +60,4 @@ describe("autoRespondsPermission", () => {

    expect(autoRespondsPermission(autoAccept, sessions, permission("child"), directory)).toBe(true)
  })
-
-  test("falls back to directory-level auto-accept", () => {
-    const directory = "/tmp/project"
-    const sessions = [session({ id: "root" })]
-    const autoAccept = {
-      [`${base64Encode(directory)}/*`]: true,
-    }
-
-    expect(autoRespondsPermission(autoAccept, sessions, permission("root"), directory)).toBe(true)
-  })
-
-  test("session-level override takes precedence over directory-level", () => {
-    const directory = "/tmp/project"
-    const sessions = [session({ id: "root" })]
-    const autoAccept = {
-      [`${base64Encode(directory)}/*`]: true,
-      [`${base64Encode(directory)}/root`]: false,
-    }
-
-    expect(autoRespondsPermission(autoAccept, sessions, permission("root"), directory)).toBe(false)
-  })
-})
-
-describe("isDirectoryAutoAccepting", () => {
-  test("returns true when directory key is set", () => {
-    const directory = "/tmp/project"
-    const autoAccept = { [`${base64Encode(directory)}/*`]: true }
-    expect(isDirectoryAutoAccepting(autoAccept, directory)).toBe(true)
-  })
-
-  test("returns false when directory key is not set", () => {
-    expect(isDirectoryAutoAccepting({}, "/tmp/project")).toBe(false)
-  })
-
-  test("returns false when directory key is explicitly false", () => {
-    const directory = "/tmp/project"
-    const autoAccept = { [`${base64Encode(directory)}/*`]: false }
-    expect(isDirectoryAutoAccepting(autoAccept, directory)).toBe(false)
-  })
 })
--- a/packages/app/src/context/permission-auto-respond.ts
+++ b/packages/app/src/context/permission-auto-respond.ts
@@ -5,19 +5,9 @@ export function acceptKey(sessionID: string, directory?: string) {
  return `${base64Encode(directory)}/${sessionID}`
 }

-export function directoryAcceptKey(directory: string) {
-  return `${base64Encode(directory)}/*`
-}
-
 function accepted(autoAccept: Record<string, boolean>, sessionID: string, directory?: string) {
  const key = acceptKey(sessionID, directory)
-  const directoryKey = directory ? directoryAcceptKey(directory) : undefined
-  return autoAccept[key] ?? autoAccept[sessionID] ?? (directoryKey ? autoAccept[directoryKey] : undefined)
-}
-
-export function isDirectoryAutoAccepting(autoAccept: Record<string, boolean>, directory: string) {
-  const key = directoryAcceptKey(directory)
-  return autoAccept[key] ?? false
+  return autoAccept[key] ?? autoAccept[sessionID]
 }

 function sessionLineage(session: { id: string; parentID?: string }[], sessionID: string) {
--- a/packages/app/src/context/permission.tsx
+++ b/packages/app/src/context/permission.tsx
@@ -1,4 +1,4 @@
-import { createEffect, createMemo, onCleanup } from "solid-js"
+import { createMemo, onCleanup } from "solid-js"
 import { createStore, produce } from "solid-js/store"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import type { PermissionRequest } from "@opencode-ai/sdk/v2/client"
@@ -7,12 +7,7 @@ import { useGlobalSDK } from "@/context/global-sdk"
 import { useGlobalSync } from "./global-sync"
 import { useParams } from "@solidjs/router"
 import { decode64 } from "@/utils/base64"
-import {
-  acceptKey,
-  directoryAcceptKey,
-  isDirectoryAutoAccepting,
-  autoRespondsPermission,
-} from "./permission-auto-respond"
+import { acceptKey, autoRespondsPermission } from "./permission-auto-respond"

 type PermissionRespondFn = (input: {
  sessionID: string
@@ -81,25 +76,6 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
      }),
    )

-    // When config has permission: "allow", auto-enable directory-level auto-accept
-    createEffect(() => {
-      if (!ready()) return
-      const directory = decode64(params.dir)
-      if (!directory) return
-      const [childStore] = globalSync.child(directory)
-      const perm = childStore.config.permission
-      if (typeof perm === "string" && perm === "allow") {
-        const key = directoryAcceptKey(directory)
-        if (store.autoAccept[key] === undefined) {
-          setStore(
-            produce((draft) => {
-              draft.autoAccept[key] = true
-            }),
-          )
-        }
-      }
-    })
-
    const MAX_RESPONDED = 1000
    const RESPONDED_TTL_MS = 60 * 60 * 1000
    const responded = new Map<string, number>()
@@ -143,10 +119,6 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
      return autoRespondsPermission(store.autoAccept, session, { sessionID }, directory)
    }

-    function isAutoAcceptingDirectory(directory: string) {
-      return isDirectoryAutoAccepting(store.autoAccept, directory)
-    }
-
    function shouldAutoRespond(permission: PermissionRequest, directory?: string) {
      const session = directory ? globalSync.child(directory, { bootstrap: false })[0].session : []
      return autoRespondsPermission(store.autoAccept, session, permission, directory)
@@ -170,36 +142,6 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
    })
    onCleanup(unsubscribe)

-    function enableDirectory(directory: string) {
-      const key = directoryAcceptKey(directory)
-      setStore(
-        produce((draft) => {
-          draft.autoAccept[key] = true
-        }),
-      )
-
-      globalSDK.client.permission
-        .list({ directory })
-        .then((x) => {
-          if (!isAutoAcceptingDirectory(directory)) return
-          for (const perm of x.data ?? []) {
-            if (!perm?.id) continue
-            if (!shouldAutoRespond(perm, directory)) continue
-            respondOnce(perm, directory)
-          }
-        })
-        .catch(() => undefined)
-    }
-
-    function disableDirectory(directory: string) {
-      const key = directoryAcceptKey(directory)
-      setStore(
-        produce((draft) => {
-          draft.autoAccept[key] = false
-        }),
-      )
-    }
-
    function enable(sessionID: string, directory: string) {
      const key = acceptKey(sessionID, directory)
      const version = bumpEnableVersion(sessionID, directory)
@@ -243,7 +185,6 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
        return shouldAutoRespond(permission, directory)
      },
      isAutoAccepting,
-      isAutoAcceptingDirectory,
      toggleAutoAccept(sessionID: string, directory: string) {
        if (isAutoAccepting(sessionID, directory)) {
          disable(sessionID, directory)
@@ -252,13 +193,6 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple

        enable(sessionID, directory)
      },
-      toggleAutoAcceptDirectory(directory: string) {
-        if (isAutoAcceptingDirectory(directory)) {
-          disableDirectory(directory)
-          return
-        }
-        enableDirectory(directory)
-      },
      enableAutoAccept(sessionID: string, directory: string) {
        if (isAutoAccepting(sessionID, directory)) return
        enable(sessionID, directory)
@@ -267,11 +201,6 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
        disable(sessionID, directory)
      },
      permissionsEnabled,
-      isPermissionAllowAll(directory: string) {
-        const [childStore] = globalSync.child(directory)
-        const perm = childStore.config.permission
-        return typeof perm === "string" && perm === "allow"
-      },
    }
  },
 })
--- a/packages/app/src/context/sync.tsx
+++ b/packages/app/src/context/sync.tsx
@@ -199,7 +199,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
          parts: Part[]
          agent: string
          model: { providerID: string; modelID: string }
-          variant?: string
        }) {
          const message: Message = {
            id: input.messageID,
@@ -208,7 +207,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
            time: { created: Date.now() },
            agent: input.agent,
            model: input.model,
-            variant: input.variant,
          }
          const [, setStore] = target()
          setOptimisticAdd(setStore as (...args: unknown[]) => void, {
--- a/packages/app/src/i18n/ar.ts
+++ b/packages/app/src/i18n/ar.ts
@@ -456,7 +456,6 @@ export const dict = {
  "session.todo.title": "المهام",
  "session.todo.collapse": "طي",
  "session.todo.expand": "توسيع",
-  "session.new.title": "ابنِ أي شيء",
  "session.new.worktree.main": "الفرع الرئيسي",
  "session.new.worktree.mainWithBranch": "الفرع الرئيسي ({{branch}})",
  "session.new.worktree.create": "إنشاء شجرة عمل جديدة",
@@ -666,6 +665,47 @@ export const dict = {
  "settings.commands.description": "ستكون إعدادات الأمر قابلة للتكوين هنا.",
  "settings.mcp.title": "MCP",
  "settings.mcp.description": "ستكون إعدادات MCP قابلة للتكوين هنا.",
+  "settings.mcp.section.featured": "مميّز",
+  "settings.mcp.section.featured.description": "أضف إعدادًا مسبقًا لخوادم MCP الشهيرة بنقرة واحدة.",
+  "settings.mcp.section.configured": "الخوادم المهيأة",
+  "settings.mcp.section.configured.description":
+    "اطلع على خوادم MCP المثبتة، وكيفية اتصالها، وقم بإزالة تلك التي لم تعد بحاجة إليها.",
+  "settings.mcp.section.add": "أضف خادمًا",
+  "settings.mcp.section.add.description": "أنشئ تكوين خادم MCP محلي أو بعيد خاص بك.",
+  "settings.mcp.type.local": "محلي",
+  "settings.mcp.type.remote": "بعيد",
+  "settings.mcp.featured.added": "تمت الإضافة",
+  "settings.mcp.action.add": "أضف خادمًا",
+  "settings.mcp.action.remove": "إزالة",
+  "settings.mcp.state.enabled": "مفعل",
+  "settings.mcp.state.disabled": "معطل",
+  "settings.mcp.form.type.label": "نوع الاتصال",
+  "settings.mcp.form.name.label": "اسم الخادم",
+  "settings.mcp.form.name.placeholder": "my-mcp-server",
+  "settings.mcp.form.url.label": "عنوان URL البعيد",
+  "settings.mcp.form.url.placeholder": "https://mcp.example.com/mcp",
+  "settings.mcp.form.command.label": "الأمر",
+  "settings.mcp.form.command.placeholder": "npx -y @modelcontextprotocol/server-memory",
+  "settings.mcp.form.headers.label": "الرؤوس (Headers)",
+  "settings.mcp.form.headers.description": "اختياري. أضف رأسًا واحدًا في كل سطر بصيغة KEY: value.",
+  "settings.mcp.form.environment.label": "البيئة",
+  "settings.mcp.form.environment.description": "اختياري. أضف متغيرًا واحدًا في كل سطر بصيغة KEY=value.",
+  "settings.mcp.form.timeout.label": "المهلة (مللي ثانية)",
+  "settings.mcp.form.timeout.placeholder": "5000",
+  "settings.mcp.toast.added.title": "تمت إضافة خادم MCP",
+  "settings.mcp.toast.added.description": "تم حفظ {{name}} في إعدادات MCP الخاصة بك.",
+  "settings.mcp.toast.updated.title": "تم تحديث خادم MCP",
+  "settings.mcp.toast.updated.description": "أصبح {{name}} الآن {{state}}.",
+  "settings.mcp.toast.removed.title": "تمت إزالة خادم MCP",
+  "settings.mcp.toast.removed.description": "تمت إزالة {{name}} من إعدادات MCP الخاصة بك.",
+  "settings.mcp.validation.name": "أدخل اسم الخادم قبل الحفظ.",
+  "settings.mcp.validation.duplicate": "{{name}} مهيأ بالفعل.",
+  "settings.mcp.validation.url": "أدخل عنوان URL لخادم MCP البعيد.",
+  "settings.mcp.validation.command": "أدخل الأمر المستخدم لبدء تشغيل خادم MCP المحلي.",
+  "settings.mcp.validation.timeout": "يجب أن تكون المهلة عددًا صحيحًا موجبًا.",
+  "settings.mcp.validation.headers": "تعذر تحليل سطر الرأس: {{line}}",
+  "settings.mcp.validation.environment": "تعذر تحليل سطر البيئة: {{line}}",
+  "settings.mcp.status.needs_client_registration": "يحتاج إلى تسجيل العميل",
  "settings.permissions.title": "الأذونات",
  "settings.permissions.description": "تحكم في الأدوات التي يمكن للخادم استخدامها بشكل افتراضي.",
  "settings.permissions.section.tools": "الأدوات",
--- a/packages/app/src/i18n/br.ts
+++ b/packages/app/src/i18n/br.ts
@@ -459,7 +459,6 @@ export const dict = {
  "session.todo.title": "Tarefas",
  "session.todo.collapse": "Recolher",
  "session.todo.expand": "Expandir",
-  "session.new.title": "Crie qualquer coisa",
  "session.new.worktree.main": "Branch principal",
  "session.new.worktree.mainWithBranch": "Branch principal ({{branch}})",
  "session.new.worktree.create": "Criar novo worktree",
@@ -674,6 +673,48 @@ export const dict = {
  "settings.commands.description": "Configurações de comandos estarão disponíveis aqui.",
  "settings.mcp.title": "MCP",
  "settings.mcp.description": "Configurações de MCP estarão disponíveis aqui.",
+  "settings.mcp.section.featured": "Destaques",
+  "settings.mcp.section.featured.description":
+    "Adicione uma predefinição refinada para servidores MCP populares com um clique.",
+  "settings.mcp.section.configured": "Servidores configurados",
+  "settings.mcp.section.configured.description":
+    "Veja quais servidores MCP estão instalados, como eles se conectam e remova os que você não precisa mais.",
+  "settings.mcp.section.add": "Adicionar servidor",
+  "settings.mcp.section.add.description": "Crie sua própria configuração de servidor MCP local ou remoto.",
+  "settings.mcp.type.local": "Local",
+  "settings.mcp.type.remote": "Remoto",
+  "settings.mcp.featured.added": "Adicionado",
+  "settings.mcp.action.add": "Adicionar servidor",
+  "settings.mcp.action.remove": "Remover",
+  "settings.mcp.state.enabled": "Habilitado",
+  "settings.mcp.state.disabled": "Desabilitado",
+  "settings.mcp.form.type.label": "Tipo de conexão",
+  "settings.mcp.form.name.label": "Nome do servidor",
+  "settings.mcp.form.name.placeholder": "my-mcp-server",
+  "settings.mcp.form.url.label": "URL remota",
+  "settings.mcp.form.url.placeholder": "https://mcp.example.com/mcp",
+  "settings.mcp.form.command.label": "Comando",
+  "settings.mcp.form.command.placeholder": "npx -y @modelcontextprotocol/server-memory",
+  "settings.mcp.form.headers.label": "Cabeçalhos",
+  "settings.mcp.form.headers.description": "Opcional. Adicione um cabeçalho por linha usando KEY: value.",
+  "settings.mcp.form.environment.label": "Ambiente",
+  "settings.mcp.form.environment.description": "Opcional. Adicione uma variável por linha usando KEY=value.",
+  "settings.mcp.form.timeout.label": "Tempo limite (ms)",
+  "settings.mcp.form.timeout.placeholder": "5000",
+  "settings.mcp.toast.added.title": "Servidor MCP adicionado",
+  "settings.mcp.toast.added.description": "{{name}} foi salvo nas suas configurações do MCP.",
+  "settings.mcp.toast.updated.title": "Servidor MCP atualizado",
+  "settings.mcp.toast.updated.description": "{{name}} está agora {{state}}.",
+  "settings.mcp.toast.removed.title": "Servidor MCP removido",
+  "settings.mcp.toast.removed.description": "{{name}} foi removido das suas configurações do MCP.",
+  "settings.mcp.validation.name": "Insira um nome para o servidor antes de salvar.",
+  "settings.mcp.validation.duplicate": "{{name}} já está configurado.",
+  "settings.mcp.validation.url": "Insira uma URL de servidor MCP remoto.",
+  "settings.mcp.validation.command": "Insira o comando usado para iniciar o servidor MCP local.",
+  "settings.mcp.validation.timeout": "O tempo limite deve ser um número inteiro positivo.",
+  "settings.mcp.validation.headers": "Não foi possível analisar a linha do cabeçalho: {{line}}",
+  "settings.mcp.validation.environment": "Não foi possível analisar a linha de ambiente: {{line}}",
+  "settings.mcp.status.needs_client_registration": "Requer registro do cliente",
  "settings.permissions.title": "Permissões",
  "settings.permissions.description": "Controle quais ferramentas o servidor pode usar por padrão.",
  "settings.permissions.section.tools": "Ferramentas",
--- a/packages/app/src/i18n/bs.ts
+++ b/packages/app/src/i18n/bs.ts
@@ -515,7 +515,6 @@ export const dict = {
  "session.todo.collapse": "Sažmi",
  "session.todo.expand": "Proširi",

-  "session.new.title": "Napravi bilo šta",
  "session.new.worktree.main": "Glavna grana",
  "session.new.worktree.mainWithBranch": "Glavna grana ({{branch}})",
  "session.new.worktree.create": "Kreiraj novi worktree",
@@ -746,6 +745,47 @@ export const dict = {
  "settings.commands.description": "Postavke komandi će se ovdje moći podešavati.",
  "settings.mcp.title": "MCP",
  "settings.mcp.description": "MCP postavke će se ovdje moći podešavati.",
+  "settings.mcp.section.featured": "Izdvojeno",
+  "settings.mcp.section.featured.description": "Dodajte gotovu postavku za popularne MCP servere jednim klikom.",
+  "settings.mcp.section.configured": "Konfigurisani serveri",
+  "settings.mcp.section.configured.description":
+    "Pogledajte koji su MCP serveri instalirani, kako se povezuju i uklonite one koji vam više ne trebaju.",
+  "settings.mcp.section.add": "Dodaj server",
+  "settings.mcp.section.add.description": "Kreirajte vlastitu konfiguraciju lokalnog ili udaljenog MCP servera.",
+  "settings.mcp.type.local": "Lokalno",
+  "settings.mcp.type.remote": "Udaljeno",
+  "settings.mcp.featured.added": "Dodano",
+  "settings.mcp.action.add": "Dodaj server",
+  "settings.mcp.action.remove": "Ukloni",
+  "settings.mcp.state.enabled": "Omogućeno",
+  "settings.mcp.state.disabled": "Onemogućeno",
+  "settings.mcp.form.type.label": "Tip konekcije",
+  "settings.mcp.form.name.label": "Naziv servera",
+  "settings.mcp.form.name.placeholder": "my-mcp-server",
+  "settings.mcp.form.url.label": "Udaljeni URL",
+  "settings.mcp.form.url.placeholder": "https://mcp.example.com/mcp",
+  "settings.mcp.form.command.label": "Komanda",
+  "settings.mcp.form.command.placeholder": "npx -y @modelcontextprotocol/server-memory",
+  "settings.mcp.form.headers.label": "Zaglavlja",
+  "settings.mcp.form.headers.description": "Opcionalno. Dodajte jedno zaglavlje po liniji koristeći KEY: value.",
+  "settings.mcp.form.environment.label": "Okruženje",
+  "settings.mcp.form.environment.description": "Opcionalno. Dodajte jednu varijablu po liniji koristeći KEY=value.",
+  "settings.mcp.form.timeout.label": "Istek vremena (ms)",
+  "settings.mcp.form.timeout.placeholder": "5000",
+  "settings.mcp.toast.added.title": "MCP server dodan",
+  "settings.mcp.toast.added.description": "{{name}} je sačuvan u vaše MCP postavke.",
+  "settings.mcp.toast.updated.title": "MCP server ažuriran",
+  "settings.mcp.toast.updated.description": "{{name}} je sada {{state}}.",
+  "settings.mcp.toast.removed.title": "MCP server uklonjen",
+  "settings.mcp.toast.removed.description": "{{name}} je uklonjen iz vaših MCP postavki.",
+  "settings.mcp.validation.name": "Unesite naziv servera prije čuvanja.",
+  "settings.mcp.validation.duplicate": "{{name}} je već konfigurisan.",
+  "settings.mcp.validation.url": "Unesite URL udaljenog MCP servera.",
+  "settings.mcp.validation.command": "Unesite komandu koja se koristi za pokretanje lokalnog MCP servera.",
+  "settings.mcp.validation.timeout": "Istek vremena mora biti pozitivan cijeli broj.",
+  "settings.mcp.validation.headers": "Nije moguće parsirati liniju zaglavlja: {{line}}",
+  "settings.mcp.validation.environment": "Nije moguće parsirati liniju okruženja: {{line}}",
+  "settings.mcp.status.needs_client_registration": "Potrebna registracija klijenta",

  "settings.permissions.title": "Dozvole",
  "settings.permissions.description": "Kontroliši koje alate server smije koristiti po defaultu.",
--- a/packages/app/src/i18n/da.ts
+++ b/packages/app/src/i18n/da.ts
@@ -510,7 +510,6 @@ export const dict = {
  "session.todo.collapse": "Skjul",
  "session.todo.expand": "Udvid",

-  "session.new.title": "Byg hvad som helst",
  "session.new.worktree.main": "Hovedgren",
  "session.new.worktree.mainWithBranch": "Hovedgren ({{branch}})",
  "session.new.worktree.create": "Opret nyt worktree",
@@ -740,6 +739,48 @@ export const dict = {
  "settings.commands.description": "Kommandoindstillinger vil kunne konfigureres her.",
  "settings.mcp.title": "MCP",
  "settings.mcp.description": "MCP-indstillinger vil kunne konfigureres her.",
+  "settings.mcp.section.featured": "Udvalgte",
+  "settings.mcp.section.featured.description":
+    "Tilføj en poleret forudindstilling for populære MCP-servere med ét klik.",
+  "settings.mcp.section.configured": "Konfigurerede servere",
+  "settings.mcp.section.configured.description":
+    "Se hvilke MCP-servere der er installeret, hvordan de forbinder, og fjern dem du ikke længere har brug for.",
+  "settings.mcp.section.add": "Tilføj en server",
+  "settings.mcp.section.add.description": "Opret din egen lokale eller fjern MCP-serverkonfiguration.",
+  "settings.mcp.type.local": "Lokal",
+  "settings.mcp.type.remote": "Fjern",
+  "settings.mcp.featured.added": "Tilføjet",
+  "settings.mcp.action.add": "Tilføj server",
+  "settings.mcp.action.remove": "Fjern",
+  "settings.mcp.state.enabled": "Aktiveret",
+  "settings.mcp.state.disabled": "Deaktiveret",
+  "settings.mcp.form.type.label": "Forbindelsestype",
+  "settings.mcp.form.name.label": "Servernavn",
+  "settings.mcp.form.name.placeholder": "my-mcp-server",
+  "settings.mcp.form.url.label": "Fjern-URL",
+  "settings.mcp.form.url.placeholder": "https://mcp.example.com/mcp",
+  "settings.mcp.form.command.label": "Kommando",
+  "settings.mcp.form.command.placeholder": "npx -y @modelcontextprotocol/server-memory",
+  "settings.mcp.form.headers.label": "Headere",
+  "settings.mcp.form.headers.description": "Valgfrit. Tilføj én header pr. linje ved brug af KEY: value.",
+  "settings.mcp.form.environment.label": "Miljø",
+  "settings.mcp.form.environment.description": "Valgfrit. Tilføj én variabel pr. linje ved brug af KEY=value.",
+  "settings.mcp.form.timeout.label": "Timeout (ms)",
+  "settings.mcp.form.timeout.placeholder": "5000",
+  "settings.mcp.toast.added.title": "MCP-server tilføjet",
+  "settings.mcp.toast.added.description": "{{name}} er blevet gemt i dine MCP-indstillinger.",
+  "settings.mcp.toast.updated.title": "MCP-server opdateret",
+  "settings.mcp.toast.updated.description": "{{name}} er nu {{state}}.",
+  "settings.mcp.toast.removed.title": "MCP-server fjernet",
+  "settings.mcp.toast.removed.description": "{{name}} er blevet fjernet fra dine MCP-indstillinger.",
+  "settings.mcp.validation.name": "Indtast et servernavn før du gemmer.",
+  "settings.mcp.validation.duplicate": "{{name}} er allerede konfigureret.",
+  "settings.mcp.validation.url": "Indtast en URL til en fjern MCP-server.",
+  "settings.mcp.validation.command": "Indtast kommandoen, der bruges til at starte den lokale MCP-server.",
+  "settings.mcp.validation.timeout": "Timeout skal være et positivt heltal.",
+  "settings.mcp.validation.headers": "Kunne ikke fortolke header-linje: {{line}}",
+  "settings.mcp.validation.environment": "Kunne ikke fortolke miljø-linje: {{line}}",
+  "settings.mcp.status.needs_client_registration": "Kræver klientregistrering",

  "settings.permissions.title": "Tilladelser",
  "settings.permissions.description": "Styr hvilke værktøjer serveren kan bruge som standard.",
--- a/packages/app/src/i18n/de.ts
+++ b/packages/app/src/i18n/de.ts
@@ -467,7 +467,6 @@ export const dict = {
  "session.todo.title": "Aufgaben",
  "session.todo.collapse": "Einklappen",
  "session.todo.expand": "Ausklappen",
-  "session.new.title": "Baue, was du willst",
  "session.new.worktree.main": "Haupt-Branch",
  "session.new.worktree.mainWithBranch": "Haupt-Branch ({{branch}})",
  "session.new.worktree.create": "Neuen Worktree erstellen",
@@ -683,6 +682,47 @@ export const dict = {
  "settings.commands.description": "Befehlseinstellungen können hier konfiguriert werden.",
  "settings.mcp.title": "MCP",
  "settings.mcp.description": "MCP-Einstellungen können hier konfiguriert werden.",
+  "settings.mcp.section.featured": "Vorgestellt",
+  "settings.mcp.section.featured.description": "Fügen Sie mit einem Klick eine Vorlage für beliebte MCP-Server hinzu.",
+  "settings.mcp.section.configured": "Konfigurierte Server",
+  "settings.mcp.section.configured.description":
+    "Sehen Sie, welche MCP-Server installiert sind, wie sie verbunden sind, und entfernen Sie nicht mehr benötigte.",
+  "settings.mcp.section.add": "Server hinzufügen",
+  "settings.mcp.section.add.description": "Erstellen Sie Ihre eigene lokale oder Remote-MCP-Server-Konfiguration.",
+  "settings.mcp.type.local": "Lokal",
+  "settings.mcp.type.remote": "Remote",
+  "settings.mcp.featured.added": "Hinzugefügt",
+  "settings.mcp.action.add": "Server hinzufügen",
+  "settings.mcp.action.remove": "Entfernen",
+  "settings.mcp.state.enabled": "Aktiviert",
+  "settings.mcp.state.disabled": "Deaktiviert",
+  "settings.mcp.form.type.label": "Verbindungstyp",
+  "settings.mcp.form.name.label": "Servername",
+  "settings.mcp.form.name.placeholder": "my-mcp-server",
+  "settings.mcp.form.url.label": "Remote-URL",
+  "settings.mcp.form.url.placeholder": "https://mcp.example.com/mcp",
+  "settings.mcp.form.command.label": "Befehl",
+  "settings.mcp.form.command.placeholder": "npx -y @modelcontextprotocol/server-memory",
+  "settings.mcp.form.headers.label": "Header",
+  "settings.mcp.form.headers.description": "Optional. Fügen Sie einen Header pro Zeile im Format KEY: value hinzu.",
+  "settings.mcp.form.environment.label": "Umgebung",
+  "settings.mcp.form.environment.description": "Optional. Fügen Sie eine Variable pro Zeile im Format KEY=value hinzu.",
+  "settings.mcp.form.timeout.label": "Timeout (ms)",
+  "settings.mcp.form.timeout.placeholder": "5000",
+  "settings.mcp.toast.added.title": "MCP-Server hinzugefügt",
+  "settings.mcp.toast.added.description": "{{name}} wurde in Ihren MCP-Einstellungen gespeichert.",
+  "settings.mcp.toast.updated.title": "MCP-Server aktualisiert",
+  "settings.mcp.toast.updated.description": "{{name}} ist jetzt {{state}}.",
+  "settings.mcp.toast.removed.title": "MCP-Server entfernt",
+  "settings.mcp.toast.removed.description": "{{name}} wurde aus Ihren MCP-Einstellungen entfernt.",
+  "settings.mcp.validation.name": "Geben Sie vor dem Speichern einen Servernamen ein.",
+  "settings.mcp.validation.duplicate": "{{name}} ist bereits konfiguriert.",
+  "settings.mcp.validation.url": "Geben Sie eine Remote-MCP-Server-URL ein.",
+  "settings.mcp.validation.command": "Geben Sie den Befehl zum Starten des lokalen MCP-Servers ein.",
+  "settings.mcp.validation.timeout": "Das Timeout muss eine positive ganze Zahl sein.",
+  "settings.mcp.validation.headers": "Header-Zeile konnte nicht verarbeitet werden: {{line}}",
+  "settings.mcp.validation.environment": "Umgebungsvariablen-Zeile konnte nicht verarbeitet werden: {{line}}",
+  "settings.mcp.status.needs_client_registration": "Client-Registrierung erforderlich",
  "settings.permissions.title": "Berechtigungen",
  "settings.permissions.description": "Steuern Sie, welche Tools der Server standardmäßig verwenden darf.",
  "settings.permissions.section.tools": "Tools",
--- a/packages/app/src/i18n/en.ts
+++ b/packages/app/src/i18n/en.ts
@@ -511,13 +511,11 @@ export const dict = {
  "session.review.change.other": "Changes",
  "session.review.loadingChanges": "Loading changes...",
  "session.review.empty": "No changes in this session yet",
-  "session.review.noVcs": "No Git Version Control System detected, changes not displayed",
-  "session.review.noSnapshot": "Snapshot tracking is disabled in config, so session changes are unavailable",
+  "session.review.noVcs": "No git VCS detected, so session changes will not be detected",
  "session.review.noChanges": "No changes",

  "session.files.selectToOpen": "Select a file to open",
  "session.files.all": "All files",
-  "session.files.empty": "No files",
  "session.files.binaryContent": "Binary file (content cannot be displayed)",

  "session.messages.renderEarlier": "Render earlier messages",
@@ -531,7 +529,6 @@ export const dict = {
  "session.todo.collapse": "Collapse",
  "session.todo.expand": "Expand",

-  "session.new.title": "Build anything",
  "session.new.worktree.main": "Main branch",
  "session.new.worktree.mainWithBranch": "Main branch ({{branch}})",
  "session.new.worktree.create": "Create new worktree",
@@ -773,7 +770,48 @@ export const dict = {
  "settings.commands.title": "Commands",
  "settings.commands.description": "Command settings will be configurable here.",
  "settings.mcp.title": "MCP",
-  "settings.mcp.description": "MCP settings will be configurable here.",
+  "settings.mcp.description": "Manage local and remote MCP servers that OpenCode can use across your workspaces.",
+  "settings.mcp.section.featured": "Featured",
+  "settings.mcp.section.featured.description": "Add a polished preset for popular MCP servers in one click.",
+  "settings.mcp.section.configured": "Configured servers",
+  "settings.mcp.section.configured.description":
+    "See which MCP servers are installed, how they connect, and remove the ones you no longer need.",
+  "settings.mcp.section.add": "Add a server",
+  "settings.mcp.section.add.description": "Create your own local or remote MCP server configuration.",
+  "settings.mcp.type.local": "Local",
+  "settings.mcp.type.remote": "Remote",
+  "settings.mcp.featured.added": "Added",
+  "settings.mcp.action.add": "Add server",
+  "settings.mcp.action.remove": "Remove",
+  "settings.mcp.state.enabled": "Enabled",
+  "settings.mcp.state.disabled": "Disabled",
+  "settings.mcp.form.type.label": "Connection type",
+  "settings.mcp.form.name.label": "Server name",
+  "settings.mcp.form.name.placeholder": "my-mcp-server",
+  "settings.mcp.form.url.label": "Remote URL",
+  "settings.mcp.form.url.placeholder": "https://mcp.example.com/mcp",
+  "settings.mcp.form.command.label": "Command",
+  "settings.mcp.form.command.placeholder": "npx -y @modelcontextprotocol/server-memory",
+  "settings.mcp.form.headers.label": "Headers",
+  "settings.mcp.form.headers.description": "Optional. Add one header per line using KEY: value.",
+  "settings.mcp.form.environment.label": "Environment",
+  "settings.mcp.form.environment.description": "Optional. Add one variable per line using KEY=value.",
+  "settings.mcp.form.timeout.label": "Timeout (ms)",
+  "settings.mcp.form.timeout.placeholder": "5000",
+  "settings.mcp.toast.added.title": "MCP server added",
+  "settings.mcp.toast.added.description": "{{name}} has been saved to your MCP settings.",
+  "settings.mcp.toast.updated.title": "MCP server updated",
+  "settings.mcp.toast.updated.description": "{{name}} is now {{state}}.",
+  "settings.mcp.toast.removed.title": "MCP server removed",
+  "settings.mcp.toast.removed.description": "{{name}} has been removed from your MCP settings.",
+  "settings.mcp.validation.name": "Enter a server name before saving.",
+  "settings.mcp.validation.duplicate": "{{name}} is already configured.",
+  "settings.mcp.validation.url": "Enter a remote MCP server URL.",
+  "settings.mcp.validation.command": "Enter the command used to start the local MCP server.",
+  "settings.mcp.validation.timeout": "Timeout must be a positive whole number.",
+  "settings.mcp.validation.headers": "Couldn't parse header line: {{line}}",
+  "settings.mcp.validation.environment": "Couldn't parse environment line: {{line}}",
+  "settings.mcp.status.needs_client_registration": "Needs client registration",

  "settings.permissions.title": "Permissions",
  "settings.permissions.description": "Control what tools the server can use by default.",
--- a/packages/app/src/i18n/es.ts
+++ b/packages/app/src/i18n/es.ts
@@ -516,7 +516,6 @@ export const dict = {
  "session.todo.collapse": "Contraer",
  "session.todo.expand": "Expandir",

-  "session.new.title": "Construye lo que quieras",
  "session.new.worktree.main": "Rama principal",
  "session.new.worktree.mainWithBranch": "Rama principal ({{branch}})",
  "session.new.worktree.create": "Crear nuevo árbol de trabajo",
@@ -752,6 +751,48 @@ export const dict = {
  "settings.commands.description": "La configuración de comandos estará disponible aquí.",
  "settings.mcp.title": "MCP",
  "settings.mcp.description": "La configuración de MCP estará disponible aquí.",
+  "settings.mcp.section.featured": "Destacados",
+  "settings.mcp.section.featured.description":
+    "Añade un ajuste preestablecido para servidores MCP populares con un solo clic.",
+  "settings.mcp.section.configured": "Servidores configurados",
+  "settings.mcp.section.configured.description":
+    "Consulta qué servidores MCP están instalados, cómo se conectan y elimina los que ya no necesites.",
+  "settings.mcp.section.add": "Añadir un servidor",
+  "settings.mcp.section.add.description": "Crea tu propia configuración de servidor MCP local o remoto.",
+  "settings.mcp.type.local": "Local",
+  "settings.mcp.type.remote": "Remoto",
+  "settings.mcp.featured.added": "Añadido",
+  "settings.mcp.action.add": "Añadir servidor",
+  "settings.mcp.action.remove": "Eliminar",
+  "settings.mcp.state.enabled": "Habilitado",
+  "settings.mcp.state.disabled": "Deshabilitado",
+  "settings.mcp.form.type.label": "Tipo de conexión",
+  "settings.mcp.form.name.label": "Nombre del servidor",
+  "settings.mcp.form.name.placeholder": "my-mcp-server",
+  "settings.mcp.form.url.label": "URL remota",
+  "settings.mcp.form.url.placeholder": "https://mcp.example.com/mcp",
+  "settings.mcp.form.command.label": "Comando",
+  "settings.mcp.form.command.placeholder": "npx -y @modelcontextprotocol/server-memory",
+  "settings.mcp.form.headers.label": "Encabezados",
+  "settings.mcp.form.headers.description": "Opcional. Añade un encabezado por línea usando KEY: value.",
+  "settings.mcp.form.environment.label": "Entorno",
+  "settings.mcp.form.environment.description": "Opcional. Añade una variable por línea usando KEY=value.",
+  "settings.mcp.form.timeout.label": "Tiempo de espera (ms)",
+  "settings.mcp.form.timeout.placeholder": "5000",
+  "settings.mcp.toast.added.title": "Servidor MCP añadido",
+  "settings.mcp.toast.added.description": "{{name}} se ha guardado en tu configuración de MCP.",
+  "settings.mcp.toast.updated.title": "Servidor MCP actualizado",
+  "settings.mcp.toast.updated.description": "{{name}} está ahora {{state}}.",
+  "settings.mcp.toast.removed.title": "Servidor MCP eliminado",
+  "settings.mcp.toast.removed.description": "{{name}} se ha eliminado de tu configuración de MCP.",
+  "settings.mcp.validation.name": "Introduce un nombre de servidor antes de guardar.",
+  "settings.mcp.validation.duplicate": "{{name}} ya está configurado.",
+  "settings.mcp.validation.url": "Introduce una URL de servidor MCP remoto.",
+  "settings.mcp.validation.command": "Introduce el comando utilizado para iniciar el servidor MCP local.",
+  "settings.mcp.validation.timeout": "El tiempo de espera debe ser un número entero positivo.",
+  "settings.mcp.validation.headers": "No se pudo analizar la línea de encabezado: {{line}}",
+  "settings.mcp.validation.environment": "No se pudo analizar la línea de entorno: {{line}}",
+  "settings.mcp.status.needs_client_registration": "Requiere registro de cliente",

  "settings.permissions.title": "Permisos",
  "settings.permissions.description": "Controla qué herramientas puede usar el servidor por defecto.",
--- a/packages/app/src/i18n/fr.ts
+++ b/packages/app/src/i18n/fr.ts
@@ -463,7 +463,6 @@ export const dict = {
  "session.todo.title": "Tâches",
  "session.todo.collapse": "Réduire",
  "session.todo.expand": "Développer",
-  "session.new.title": "Créez ce que vous voulez",
  "session.new.worktree.main": "Branche principale",
  "session.new.worktree.mainWithBranch": "Branche principale ({{branch}})",
  "session.new.worktree.create": "Créer un nouvel arbre de travail",
@@ -680,6 +679,48 @@ export const dict = {
  "settings.commands.description": "Les paramètres des commandes seront configurables ici.",
  "settings.mcp.title": "MCP",
  "settings.mcp.description": "Les paramètres MCP seront configurables ici.",
+  "settings.mcp.section.featured": "En vedette",
+  "settings.mcp.section.featured.description":
+    "Ajoutez un préréglage soigné pour les serveurs MCP populaires en un clic.",
+  "settings.mcp.section.configured": "Serveurs configurés",
+  "settings.mcp.section.configured.description":
+    "Consultez les serveurs MCP installés, leur mode de connexion, et supprimez ceux dont vous n'avez plus besoin.",
+  "settings.mcp.section.add": "Ajouter un serveur",
+  "settings.mcp.section.add.description": "Créez votre propre configuration de serveur MCP local ou distant.",
+  "settings.mcp.type.local": "Local",
+  "settings.mcp.type.remote": "Distant",
+  "settings.mcp.featured.added": "Ajouté",
+  "settings.mcp.action.add": "Ajouter un serveur",
+  "settings.mcp.action.remove": "Supprimer",
+  "settings.mcp.state.enabled": "Activé",
+  "settings.mcp.state.disabled": "Désactivé",
+  "settings.mcp.form.type.label": "Type de connexion",
+  "settings.mcp.form.name.label": "Nom du serveur",
+  "settings.mcp.form.name.placeholder": "my-mcp-server",
+  "settings.mcp.form.url.label": "URL distante",
+  "settings.mcp.form.url.placeholder": "https://mcp.example.com/mcp",
+  "settings.mcp.form.command.label": "Commande",
+  "settings.mcp.form.command.placeholder": "npx -y @modelcontextprotocol/server-memory",
+  "settings.mcp.form.headers.label": "En-têtes",
+  "settings.mcp.form.headers.description": "Facultatif. Ajoutez un en-tête par ligne au format KEY: value.",
+  "settings.mcp.form.environment.label": "Environnement",
+  "settings.mcp.form.environment.description": "Facultatif. Ajoutez une variable par ligne au format KEY=value.",
+  "settings.mcp.form.timeout.label": "Délai d'attente (ms)",
+  "settings.mcp.form.timeout.placeholder": "5000",
+  "settings.mcp.toast.added.title": "Serveur MCP ajouté",
+  "settings.mcp.toast.added.description": "{{name}} a été enregistré dans vos paramètres MCP.",
+  "settings.mcp.toast.updated.title": "Serveur MCP mis à jour",
+  "settings.mcp.toast.updated.description": "{{name}} est désormais {{state}}.",
+  "settings.mcp.toast.removed.title": "Serveur MCP supprimé",
+  "settings.mcp.toast.removed.description": "{{name}} a été supprimé de vos paramètres MCP.",
+  "settings.mcp.validation.name": "Saisissez un nom de serveur avant d'enregistrer.",
+  "settings.mcp.validation.duplicate": "{{name}} est déjà configuré.",
+  "settings.mcp.validation.url": "Saisissez une URL de serveur MCP distant.",
+  "settings.mcp.validation.command": "Saisissez la commande utilisée pour démarrer le serveur MCP local.",
+  "settings.mcp.validation.timeout": "Le délai d'attente doit être un nombre entier positif.",
+  "settings.mcp.validation.headers": "Impossible d'analyser la ligne d'en-tête : {{line}}",
+  "settings.mcp.validation.environment": "Impossible d'analyser la ligne d'environnement : {{line}}",
+  "settings.mcp.status.needs_client_registration": "Nécessite l'enregistrement du client",
  "settings.permissions.title": "Permissions",
  "settings.permissions.description": "Contrôlez les outils que le serveur peut utiliser par défaut.",
  "settings.permissions.section.tools": "Outils",
--- a/packages/app/src/i18n/ja.ts
+++ b/packages/app/src/i18n/ja.ts
@@ -457,7 +457,6 @@ export const dict = {
  "session.todo.title": "ToDo",
  "session.todo.collapse": "折りたたむ",
  "session.todo.expand": "展開",
-  "session.new.title": "何でも作る",
  "session.new.worktree.main": "メインブランチ",
  "session.new.worktree.mainWithBranch": "メインブランチ ({{branch}})",
  "session.new.worktree.create": "新しいワークツリーを作成",
@@ -671,6 +670,48 @@ export const dict = {
  "settings.commands.description": "コマンド設定はここで構成できます。",
  "settings.mcp.title": "MCP",
  "settings.mcp.description": "MCP設定はここで構成できます。",
+  "settings.mcp.section.featured": "おすすめ",
+  "settings.mcp.section.featured.description":
+    "人気のMCPサーバー向けに調整されたプリセットをワンクリックで追加できます。",
+  "settings.mcp.section.configured": "設定済みのサーバー",
+  "settings.mcp.section.configured.description":
+    "インストールされているMCPサーバーや接続方法を確認したり、不要になったサーバーを削除したりできます。",
+  "settings.mcp.section.add": "サーバーを追加",
+  "settings.mcp.section.add.description": "ローカルまたはリモートの独自のMCPサーバー設定を作成します。",
+  "settings.mcp.type.local": "ローカル",
+  "settings.mcp.type.remote": "リモート",
+  "settings.mcp.featured.added": "追加済み",
+  "settings.mcp.action.add": "サーバーを追加",
+  "settings.mcp.action.remove": "削除",
+  "settings.mcp.state.enabled": "有効",
+  "settings.mcp.state.disabled": "無効",
+  "settings.mcp.form.type.label": "接続タイプ",
+  "settings.mcp.form.name.label": "サーバー名",
+  "settings.mcp.form.name.placeholder": "my-mcp-server",
+  "settings.mcp.form.url.label": "リモートURL",
+  "settings.mcp.form.url.placeholder": "https://mcp.example.com/mcp",
+  "settings.mcp.form.command.label": "コマンド",
+  "settings.mcp.form.command.placeholder": "npx -y @modelcontextprotocol/server-memory",
+  "settings.mcp.form.headers.label": "ヘッダー",
+  "settings.mcp.form.headers.description": "任意。1行につき1つのヘッダーを KEY: value の形式で追加してください。",
+  "settings.mcp.form.environment.label": "環境変数",
+  "settings.mcp.form.environment.description": "任意。1行につき1つの変数を KEY=value の形式で追加してください。",
+  "settings.mcp.form.timeout.label": "タイムアウト (ms)",
+  "settings.mcp.form.timeout.placeholder": "5000",
+  "settings.mcp.toast.added.title": "MCPサーバーを追加しました",
+  "settings.mcp.toast.added.description": "{{name}} をMCP設定に保存しました。",
+  "settings.mcp.toast.updated.title": "MCPサーバーを更新しました",
+  "settings.mcp.toast.updated.description": "{{name}} は現在{{state}}です。",
+  "settings.mcp.toast.removed.title": "MCPサーバーを削除しました",
+  "settings.mcp.toast.removed.description": "MCP設定から {{name}} を削除しました。",
+  "settings.mcp.validation.name": "保存する前にサーバー名を入力してください。",
+  "settings.mcp.validation.duplicate": "{{name}} は既に設定されています。",
+  "settings.mcp.validation.url": "リモートMCPサーバーのURLを入力してください。",
+  "settings.mcp.validation.command": "ローカルMCPサーバーの起動コマンドを入力してください。",
+  "settings.mcp.validation.timeout": "タイムアウトには正の整数を指定してください。",
+  "settings.mcp.validation.headers": "ヘッダー行を解析できませんでした: {{line}}",
+  "settings.mcp.validation.environment": "環境変数の行を解析できませんでした: {{line}}",
+  "settings.mcp.status.needs_client_registration": "クライアント登録が必要です",
  "settings.permissions.title": "権限",
  "settings.permissions.description": "サーバーがデフォルトで使用できるツールを制御します。",
  "settings.permissions.section.tools": "ツール",
--- a/packages/app/src/i18n/ko.ts
+++ b/packages/app/src/i18n/ko.ts
@@ -459,7 +459,6 @@ export const dict = {
  "session.todo.title": "할 일",
  "session.todo.collapse": "접기",
  "session.todo.expand": "펼치기",
-  "session.new.title": "무엇이든 만들기",
  "session.new.worktree.main": "메인 브랜치",
  "session.new.worktree.mainWithBranch": "메인 브랜치 ({{branch}})",
  "session.new.worktree.create": "새 작업 트리 생성",
@@ -671,6 +670,49 @@ export const dict = {
  "settings.commands.description": "명령어 설정은 여기서 구성할 수 있습니다.",
  "settings.mcp.title": "MCP",
  "settings.mcp.description": "MCP 설정은 여기서 구성할 수 있습니다.",
+  "settings.mcp.section.featured": "추천",
+  "settings.mcp.section.featured.description": "클릭 한 번으로 인기 있는 MCP 서버에 대한 프리셋을 추가하세요.",
+  "settings.mcp.section.configured": "구성된 서버",
+  "settings.mcp.section.configured.description":
+    "설치된 MCP 서버와 연결 방식을 확인하고, 더 이상 필요하지 않은 서버를 제거하세요.",
+  "settings.mcp.section.add": "서버 추가",
+  "settings.mcp.section.add.description": "로컬 또는 원격 MCP 서버 구성을 직접 생성하세요.",
+  "settings.mcp.type.local": "로컬",
+  "settings.mcp.type.remote": "원격",
+  "settings.mcp.featured.added": "추가됨",
+  "settings.mcp.action.add": "서버 추가",
+  "settings.mcp.action.remove": "제거",
+  "settings.mcp.state.enabled": "활성화됨",
+  "settings.mcp.state.disabled": "비활성화됨",
+  "settings.mcp.form.type.label": "연결 유형",
+  "settings.mcp.form.name.label": "서버 이름",
+  "settings.mcp.form.name.placeholder": "my-mcp-server",
+  "settings.mcp.form.url.label": "원격 URL",
+  "settings.mcp.form.url.placeholder": "https://mcp.example.com/mcp",
+  "settings.mcp.form.command.label": "명령",
+  "settings.mcp.form.command.placeholder": "npx -y @modelcontextprotocol/server-memory",
+  "settings.mcp.form.headers.label": "헤더",
+  "settings.mcp.form.headers.description":
+    "선택 사항입니다. KEY: value 형식을 사용하여 한 줄에 하나의 헤더를 추가하세요.",
+  "settings.mcp.form.environment.label": "환경 변수",
+  "settings.mcp.form.environment.description":
+    "선택 사항입니다. KEY=value 형식을 사용하여 한 줄에 하나의 변수를 추가하세요.",
+  "settings.mcp.form.timeout.label": "시간 초과 (ms)",
+  "settings.mcp.form.timeout.placeholder": "5000",
+  "settings.mcp.toast.added.title": "MCP 서버 추가됨",
+  "settings.mcp.toast.added.description": "{{name}} 서버가 MCP 설정에 저장되었습니다.",
+  "settings.mcp.toast.updated.title": "MCP 서버 업데이트됨",
+  "settings.mcp.toast.updated.description": "{{name}}이(가) 이제 {{state}} 상태입니다.",
+  "settings.mcp.toast.removed.title": "MCP 서버 제거됨",
+  "settings.mcp.toast.removed.description": "{{name}} 서버가 MCP 설정에서 제거되었습니다.",
+  "settings.mcp.validation.name": "저장하기 전에 서버 이름을 입력하세요.",
+  "settings.mcp.validation.duplicate": "{{name}}은(는) 이미 구성되어 있습니다.",
+  "settings.mcp.validation.url": "원격 MCP 서버 URL을 입력하세요.",
+  "settings.mcp.validation.command": "로컬 MCP 서버를 시작하는 데 사용되는 명령을 입력하세요.",
+  "settings.mcp.validation.timeout": "시간 초과는 양의 정수여야 합니다.",
+  "settings.mcp.validation.headers": "헤더 줄을 구문 분석할 수 없습니다: {{line}}",
+  "settings.mcp.validation.environment": "환경 변수 줄을 구문 분석할 수 없습니다: {{line}}",
+  "settings.mcp.status.needs_client_registration": "클라이언트 등록 필요",
  "settings.permissions.title": "권한",
  "settings.permissions.description": "서버가 기본적으로 사용할 수 있는 도구를 제어합니다.",
  "settings.permissions.section.tools": "도구",
--- a/packages/app/src/i18n/no.ts
+++ b/packages/app/src/i18n/no.ts
@@ -516,7 +516,6 @@ export const dict = {
  "session.todo.collapse": "Skjul",
  "session.todo.expand": "Utvid",

-  "session.new.title": "Bygg hva som helst",
  "session.new.worktree.main": "Hovedgren",
  "session.new.worktree.mainWithBranch": "Hovedgren ({{branch}})",
  "session.new.worktree.create": "Opprett nytt worktree",
@@ -748,6 +747,47 @@ export const dict = {
  "settings.commands.description": "Kommandoinnstillinger vil kunne konfigureres her.",
  "settings.mcp.title": "MCP",
  "settings.mcp.description": "MCP-innstillinger vil kunne konfigureres her.",
+  "settings.mcp.section.featured": "Utvalgte",
+  "settings.mcp.section.featured.description": "Legg til et ferdig oppsett for populære MCP-servere med ett klikk.",
+  "settings.mcp.section.configured": "Konfigurerte servere",
+  "settings.mcp.section.configured.description":
+    "Se hvilke MCP-servere som er installert, hvordan de kobler til, og fjern de du ikke lenger trenger.",
+  "settings.mcp.section.add": "Legg til en server",
+  "settings.mcp.section.add.description": "Opprett din egen konfigurasjon for lokal eller ekstern MCP-server.",
+  "settings.mcp.type.local": "Lokal",
+  "settings.mcp.type.remote": "Ekstern",
+  "settings.mcp.featured.added": "Lagt til",
+  "settings.mcp.action.add": "Legg til server",
+  "settings.mcp.action.remove": "Fjern",
+  "settings.mcp.state.enabled": "Aktivert",
+  "settings.mcp.state.disabled": "Deaktivert",
+  "settings.mcp.form.type.label": "Tilkoblingstype",
+  "settings.mcp.form.name.label": "Servernavn",
+  "settings.mcp.form.name.placeholder": "my-mcp-server",
+  "settings.mcp.form.url.label": "Ekstern URL",
+  "settings.mcp.form.url.placeholder": "https://mcp.example.com/mcp",
+  "settings.mcp.form.command.label": "Kommando",
+  "settings.mcp.form.command.placeholder": "npx -y @modelcontextprotocol/server-memory",
+  "settings.mcp.form.headers.label": "Headere",
+  "settings.mcp.form.headers.description": "Valgfritt. Legg til én header per linje med KEY: value.",
+  "settings.mcp.form.environment.label": "Miljø",
+  "settings.mcp.form.environment.description": "Valgfritt. Legg til én variabel per linje med KEY=value.",
+  "settings.mcp.form.timeout.label": "Tidsavbrudd (ms)",
+  "settings.mcp.form.timeout.placeholder": "5000",
+  "settings.mcp.toast.added.title": "MCP-server lagt til",
+  "settings.mcp.toast.added.description": "{{name}} er lagret i dine MCP-innstillinger.",
+  "settings.mcp.toast.updated.title": "MCP-server oppdatert",
+  "settings.mcp.toast.updated.description": "{{name}} er nå {{state}}.",
+  "settings.mcp.toast.removed.title": "MCP-server fjernet",
+  "settings.mcp.toast.removed.description": "{{name}} er fjernet fra dine MCP-innstillinger.",
+  "settings.mcp.validation.name": "Skriv inn et servernavn før du lagrer.",
+  "settings.mcp.validation.duplicate": "{{name}} er allerede konfigurert.",
+  "settings.mcp.validation.url": "Skriv inn URL for ekstern MCP-server.",
+  "settings.mcp.validation.command": "Skriv inn kommandoen for å starte den lokale MCP-serveren.",
+  "settings.mcp.validation.timeout": "Tidsavbrudd må være et positivt heltall.",
+  "settings.mcp.validation.headers": "Kunne ikke tolke header-linje: {{line}}",
+  "settings.mcp.validation.environment": "Kunne ikke tolke miljøvariabel-linje: {{line}}",
+  "settings.mcp.status.needs_client_registration": "Krever klientregistrering",

  "settings.permissions.title": "Tillatelser",
  "settings.permissions.description": "Kontroller hvilke verktøy serveren kan bruke som standard.",
--- a/packages/app/src/i18n/pl.ts
+++ b/packages/app/src/i18n/pl.ts
@@ -458,7 +458,6 @@ export const dict = {
  "session.todo.title": "Zadania",
  "session.todo.collapse": "Zwiń",
  "session.todo.expand": "Rozwiń",
-  "session.new.title": "Zbuduj cokolwiek",
  "session.new.worktree.main": "Główna gałąź",
  "session.new.worktree.mainWithBranch": "Główna gałąź ({{branch}})",
  "session.new.worktree.create": "Utwórz nowe drzewo robocze",
@@ -673,6 +672,48 @@ export const dict = {
  "settings.commands.description": "Ustawienia poleceń będą tutaj konfigurowalne.",
  "settings.mcp.title": "MCP",
  "settings.mcp.description": "Ustawienia MCP będą tutaj konfigurowalne.",
+  "settings.mcp.section.featured": "Wyróżnione",
+  "settings.mcp.section.featured.description":
+    "Dodaj dopracowany zestaw dla popularnych serwerów MCP jednym kliknięciem.",
+  "settings.mcp.section.configured": "Skonfigurowane serwery",
+  "settings.mcp.section.configured.description":
+    "Zobacz, które serwery MCP są zainstalowane, jak się łączą, i usuń te, których już nie potrzebujesz.",
+  "settings.mcp.section.add": "Dodaj serwer",
+  "settings.mcp.section.add.description": "Utwórz własną konfigurację lokalnego lub zdalnego serwera MCP.",
+  "settings.mcp.type.local": "Lokalny",
+  "settings.mcp.type.remote": "Zdalny",
+  "settings.mcp.featured.added": "Dodano",
+  "settings.mcp.action.add": "Dodaj serwer",
+  "settings.mcp.action.remove": "Usuń",
+  "settings.mcp.state.enabled": "Włączony",
+  "settings.mcp.state.disabled": "Wyłączony",
+  "settings.mcp.form.type.label": "Typ połączenia",
+  "settings.mcp.form.name.label": "Nazwa serwera",
+  "settings.mcp.form.name.placeholder": "my-mcp-server",
+  "settings.mcp.form.url.label": "Zdalny adres URL",
+  "settings.mcp.form.url.placeholder": "https://mcp.example.com/mcp",
+  "settings.mcp.form.command.label": "Polecenie",
+  "settings.mcp.form.command.placeholder": "npx -y @modelcontextprotocol/server-memory",
+  "settings.mcp.form.headers.label": "Nagłówki",
+  "settings.mcp.form.headers.description": "Opcjonalne. Dodaj jeden nagłówek w wierszu używając formatu KEY: value.",
+  "settings.mcp.form.environment.label": "Środowisko",
+  "settings.mcp.form.environment.description": "Opcjonalne. Dodaj jedną zmienną w wierszu używając formatu KEY=value.",
+  "settings.mcp.form.timeout.label": "Limit czasu (ms)",
+  "settings.mcp.form.timeout.placeholder": "5000",
+  "settings.mcp.toast.added.title": "Dodano serwer MCP",
+  "settings.mcp.toast.added.description": "{{name}} został zapisany w ustawieniach MCP.",
+  "settings.mcp.toast.updated.title": "Zaktualizowano serwer MCP",
+  "settings.mcp.toast.updated.description": "{{name}} jest teraz {{state}}.",
+  "settings.mcp.toast.removed.title": "Usunięto serwer MCP",
+  "settings.mcp.toast.removed.description": "{{name}} został usunięty z ustawień MCP.",
+  "settings.mcp.validation.name": "Wprowadź nazwę serwera przed zapisaniem.",
+  "settings.mcp.validation.duplicate": "{{name}} jest już skonfigurowany.",
+  "settings.mcp.validation.url": "Wprowadź adres URL zdalnego serwera MCP.",
+  "settings.mcp.validation.command": "Wprowadź polecenie służące do uruchomienia lokalnego serwera MCP.",
+  "settings.mcp.validation.timeout": "Limit czasu musi być dodatnią liczbą całkowitą.",
+  "settings.mcp.validation.headers": "Nie udało się przetworzyć wiersza nagłówka: {{line}}",
+  "settings.mcp.validation.environment": "Nie udało się przetworzyć wiersza środowiska: {{line}}",
+  "settings.mcp.status.needs_client_registration": "Wymaga rejestracji klienta",
  "settings.permissions.title": "Uprawnienia",
  "settings.permissions.description": "Kontroluj, jakich narzędzi serwer może używać domyślnie.",
  "settings.permissions.section.tools": "Narzędzia",
--- a/packages/app/src/i18n/ru.ts
+++ b/packages/app/src/i18n/ru.ts
@@ -514,7 +514,6 @@ export const dict = {
  "session.todo.collapse": "Свернуть",
  "session.todo.expand": "Развернуть",

-  "session.new.title": "Создавайте что угодно",
  "session.new.worktree.main": "Основная ветка",
  "session.new.worktree.mainWithBranch": "Основная ветка ({{branch}})",
  "session.new.worktree.create": "Создать новый worktree",
@@ -748,6 +747,49 @@ export const dict = {
  "settings.commands.description": "Настройки команд будут доступны здесь.",
  "settings.mcp.title": "MCP",
  "settings.mcp.description": "Настройки MCP будут доступны здесь.",
+  "settings.mcp.section.featured": "Рекомендуемые",
+  "settings.mcp.section.featured.description": "Добавляйте готовые настройки для популярных серверов MCP в один клик.",
+  "settings.mcp.section.configured": "Настроенные серверы",
+  "settings.mcp.section.configured.description":
+    "Просматривайте установленные серверы MCP, способы их подключения и удаляйте ненужные.",
+  "settings.mcp.section.add": "Добавить сервер",
+  "settings.mcp.section.add.description": "Создайте собственную конфигурацию локального или удаленного сервера MCP.",
+  "settings.mcp.type.local": "Локальный",
+  "settings.mcp.type.remote": "Удаленный",
+  "settings.mcp.featured.added": "Добавлено",
+  "settings.mcp.action.add": "Добавить сервер",
+  "settings.mcp.action.remove": "Удалить",
+  "settings.mcp.state.enabled": "Включено",
+  "settings.mcp.state.disabled": "Отключено",
+  "settings.mcp.form.type.label": "Тип подключения",
+  "settings.mcp.form.name.label": "Имя сервера",
+  "settings.mcp.form.name.placeholder": "my-mcp-server",
+  "settings.mcp.form.url.label": "URL удаленного сервера",
+  "settings.mcp.form.url.placeholder": "https://mcp.example.com/mcp",
+  "settings.mcp.form.command.label": "Команда",
+  "settings.mcp.form.command.placeholder": "npx -y @modelcontextprotocol/server-memory",
+  "settings.mcp.form.headers.label": "Заголовки",
+  "settings.mcp.form.headers.description":
+    "Необязательно. Добавьте по одному заголовку на строку в формате KEY: value.",
+  "settings.mcp.form.environment.label": "Окружение",
+  "settings.mcp.form.environment.description":
+    "Необязательно. Добавьте по одной переменной на строку в формате KEY=value.",
+  "settings.mcp.form.timeout.label": "Тайм-аут (мс)",
+  "settings.mcp.form.timeout.placeholder": "5000",
+  "settings.mcp.toast.added.title": "Сервер MCP добавлен",
+  "settings.mcp.toast.added.description": "{{name}} сохранен в настройках MCP.",
+  "settings.mcp.toast.updated.title": "Сервер MCP обновлен",
+  "settings.mcp.toast.updated.description": "{{name}} теперь {{state}}.",
+  "settings.mcp.toast.removed.title": "Сервер MCP удален",
+  "settings.mcp.toast.removed.description": "{{name}} удален из настроек MCP.",
+  "settings.mcp.validation.name": "Введите имя сервера перед сохранением.",
+  "settings.mcp.validation.duplicate": "{{name}} уже настроен.",
+  "settings.mcp.validation.url": "Введите URL удаленного сервера MCP.",
+  "settings.mcp.validation.command": "Введите команду для запуска локального сервера MCP.",
+  "settings.mcp.validation.timeout": "Тайм-аут должен быть положительным целым числом.",
+  "settings.mcp.validation.headers": "Не удалось разобрать строку заголовка: {{line}}",
+  "settings.mcp.validation.environment": "Не удалось разобрать строку окружения: {{line}}",
+  "settings.mcp.status.needs_client_registration": "Требуется регистрация клиента",

  "settings.permissions.title": "Разрешения",
  "settings.permissions.description": "Контролируйте какие инструменты сервер может использовать по умолчанию.",
--- a/packages/app/src/i18n/th.ts
+++ b/packages/app/src/i18n/th.ts
@@ -511,7 +511,6 @@ export const dict = {
  "session.todo.collapse": "ย่อ",
  "session.todo.expand": "ขยาย",

-  "session.new.title": "สร้างอะไรก็ได้",
  "session.new.worktree.main": "สาขาหลัก",
  "session.new.worktree.mainWithBranch": "สาขาหลัก ({{branch}})",
  "session.new.worktree.create": "สร้าง worktree ใหม่",
@@ -739,6 +738,47 @@ export const dict = {
  "settings.commands.description": "การตั้งค่าคำสั่งจะสามารถกำหนดค่าได้ที่นี่",
  "settings.mcp.title": "MCP",
  "settings.mcp.description": "การตั้งค่า MCP จะสามารถกำหนดค่าได้ที่นี่",
+  "settings.mcp.section.featured": "แนะนำ",
+  "settings.mcp.section.featured.description": "เพิ่มค่าที่ตั้งไว้ล่วงหน้าสำหรับเซิร์ฟเวอร์ MCP ยอดนิยมได้ในคลิกเดียว",
+  "settings.mcp.section.configured": "เซิร์ฟเวอร์ที่กำหนดค่าแล้ว",
+  "settings.mcp.section.configured.description":
+    "ดูว่าเซิร์ฟเวอร์ MCP ใดติดตั้งอยู่ เชื่อมต่ออย่างไร และลบสิ่งที่ไม่ต้องการออก",
+  "settings.mcp.section.add": "เพิ่มเซิร์ฟเวอร์",
+  "settings.mcp.section.add.description": "สร้างการกำหนดค่าเซิร์ฟเวอร์ MCP แบบ Local หรือ Remote ของคุณเอง",
+  "settings.mcp.type.local": "Local",
+  "settings.mcp.type.remote": "Remote",
+  "settings.mcp.featured.added": "เพิ่มแล้ว",
+  "settings.mcp.action.add": "เพิ่มเซิร์ฟเวอร์",
+  "settings.mcp.action.remove": "ลบ",
+  "settings.mcp.state.enabled": "เปิดใช้งาน",
+  "settings.mcp.state.disabled": "ปิดใช้งาน",
+  "settings.mcp.form.type.label": "ประเภทการเชื่อมต่อ",
+  "settings.mcp.form.name.label": "ชื่อเซิร์ฟเวอร์",
+  "settings.mcp.form.name.placeholder": "my-mcp-server",
+  "settings.mcp.form.url.label": "URL ระยะไกล",
+  "settings.mcp.form.url.placeholder": "https://mcp.example.com/mcp",
+  "settings.mcp.form.command.label": "คำสั่ง",
+  "settings.mcp.form.command.placeholder": "npx -y @modelcontextprotocol/server-memory",
+  "settings.mcp.form.headers.label": "Headers",
+  "settings.mcp.form.headers.description": "ไม่บังคับ เพิ่มหนึ่ง header ต่อบรรทัดโดยใช้ KEY: value",
+  "settings.mcp.form.environment.label": "Environment",
+  "settings.mcp.form.environment.description": "ไม่บังคับ เพิ่มหนึ่งตัวแปรต่อบรรทัดโดยใช้ KEY=value",
+  "settings.mcp.form.timeout.label": "Timeout (ms)",
+  "settings.mcp.form.timeout.placeholder": "5000",
+  "settings.mcp.toast.added.title": "เพิ่มเซิร์ฟเวอร์ MCP แล้ว",
+  "settings.mcp.toast.added.description": "บันทึก {{name}} ลงในค่าติดตั้ง MCP ของคุณแล้ว",
+  "settings.mcp.toast.updated.title": "อัปเดตเซิร์ฟเวอร์ MCP แล้ว",
+  "settings.mcp.toast.updated.description": "ขณะนี้ {{name}} อยู่ในสถานะ {{state}}",
+  "settings.mcp.toast.removed.title": "ลบเซิร์ฟเวอร์ MCP แล้ว",
+  "settings.mcp.toast.removed.description": "ลบ {{name}} ออกจากค่าติดตั้ง MCP ของคุณแล้ว",
+  "settings.mcp.validation.name": "ป้อนชื่อเซิร์ฟเวอร์ก่อนบันทึก",
+  "settings.mcp.validation.duplicate": "มีการกำหนดค่า {{name}} ไว้แล้ว",
+  "settings.mcp.validation.url": "ป้อน URL ของเซิร์ฟเวอร์ MCP ระยะไกล",
+  "settings.mcp.validation.command": "ป้อนคำสั่งที่ใช้เริ่มต้นเซิร์ฟเวอร์ MCP แบบ Local",
+  "settings.mcp.validation.timeout": "Timeout ต้องเป็นจำนวนเต็มบวก",
+  "settings.mcp.validation.headers": "ไม่สามารถแยกวิเคราะห์บรรทัด header: {{line}}",
+  "settings.mcp.validation.environment": "ไม่สามารถแยกวิเคราะห์บรรทัด environment: {{line}}",
+  "settings.mcp.status.needs_client_registration": "ต้องลงทะเบียนไคลเอนต์",

  "settings.permissions.title": "สิทธิ์",
  "settings.permissions.description": "ควบคุมเครื่องมือที่เซิร์ฟเวอร์สามารถใช้โดยค่าเริ่มต้น",
--- a/packages/app/src/i18n/tr.ts
+++ b/packages/app/src/i18n/tr.ts
@@ -523,7 +523,6 @@ export const dict = {
  "session.todo.collapse": "Daralt",
  "session.todo.expand": "Genişlet",

-  "session.new.title": "İstediğini yap",
  "session.new.worktree.main": "Ana dal",
  "session.new.worktree.mainWithBranch": "Ana dal ({{branch}})",
  "session.new.worktree.create": "Yeni çalışma ağacı oluştur",
@@ -760,6 +759,50 @@ export const dict = {
  "settings.commands.description": "Komut ayarları burada yapılandırılabilecek.",
  "settings.mcp.title": "MCP",
  "settings.mcp.description": "MCP ayarları burada yapılandırılabilecek.",
+  "settings.mcp.section.featured": "Öne Çıkanlar",
+  "settings.mcp.section.featured.description":
+    "Tek tıkla popüler MCP sunucuları için cilalanmış bir hazır ayar ekleyin.",
+  "settings.mcp.section.configured": "Yapılandırılmış sunucular",
+  "settings.mcp.section.configured.description":
+    "Hangi MCP sunucularının yüklü olduğunu ve nasıl bağlandıklarını görün; artık ihtiyaç duymadıklarınızı kaldırın.",
+  "settings.mcp.section.add": "Sunucu ekle",
+  "settings.mcp.section.add.description": "Kendi yerel veya uzak MCP sunucu yapılandırmanızı oluşturun.",
+  "settings.mcp.type.local": "Yerel",
+  "settings.mcp.type.remote": "Uzak",
+  "settings.mcp.featured.added": "Eklendi",
+  "settings.mcp.action.add": "Sunucu ekle",
+  "settings.mcp.action.remove": "Kaldır",
+  "settings.mcp.state.enabled": "Etkin",
+  "settings.mcp.state.disabled": "Devre Dışı",
+  "settings.mcp.form.type.label": "Bağlantı türü",
+  "settings.mcp.form.name.label": "Sunucu adı",
+  "settings.mcp.form.name.placeholder": "my-mcp-server",
+  "settings.mcp.form.url.label": "Uzak URL",
+  "settings.mcp.form.url.placeholder": "https://mcp.example.com/mcp",
+  "settings.mcp.form.command.label": "Komut",
+  "settings.mcp.form.command.placeholder": "npx -y @modelcontextprotocol/server-memory",
+  "settings.mcp.form.headers.label": "Başlıklar",
+  "settings.mcp.form.headers.description":
+    "İsteğe bağlı. Her satıra bir başlık olacak şekilde KEY: value biçiminde ekleyin.",
+  "settings.mcp.form.environment.label": "Ortam",
+  "settings.mcp.form.environment.description":
+    "İsteğe bağlı. Her satıra bir değişken olacak şekilde KEY=value biçiminde ekleyin.",
+  "settings.mcp.form.timeout.label": "Zaman aşımı (ms)",
+  "settings.mcp.form.timeout.placeholder": "5000",
+  "settings.mcp.toast.added.title": "MCP sunucusu eklendi",
+  "settings.mcp.toast.added.description": "{{name}}, MCP ayarlarınıza kaydedildi.",
+  "settings.mcp.toast.updated.title": "MCP sunucusu güncellendi",
+  "settings.mcp.toast.updated.description": "{{name}} artık {{state}}.",
+  "settings.mcp.toast.removed.title": "MCP sunucusu kaldırıldı",
+  "settings.mcp.toast.removed.description": "{{name}}, MCP ayarlarınızdan kaldırıldı.",
+  "settings.mcp.validation.name": "Kaydetmeden önce bir sunucu adı girin.",
+  "settings.mcp.validation.duplicate": "{{name}} zaten yapılandırılmış.",
+  "settings.mcp.validation.url": "Bir uzak MCP sunucu URL'si girin.",
+  "settings.mcp.validation.command": "Yerel MCP sunucusunu başlatmak için kullanılan komutu girin.",
+  "settings.mcp.validation.timeout": "Zaman aşımı pozitif bir tam sayı olmalıdır.",
+  "settings.mcp.validation.headers": "Başlık satırı ayrıştırılamadı: {{line}}",
+  "settings.mcp.validation.environment": "Ortam satırı ayrıştırılamadı: {{line}}",
+  "settings.mcp.status.needs_client_registration": "İstemci kaydı gerekiyor",

  "settings.permissions.title": "İzinler",
  "settings.permissions.description": "Sunucunun varsayılan olarak hangi araçları kullanabileceğini kontrol edin.",
--- a/packages/app/src/i18n/zh.ts
+++ b/packages/app/src/i18n/zh.ts
@@ -510,7 +510,6 @@ export const dict = {
  "session.todo.title": "待办事项",
  "session.todo.collapse": "折叠",
  "session.todo.expand": "展开",
-  "session.new.title": "构建任何东西",
  "session.new.worktree.main": "主分支",
  "session.new.worktree.mainWithBranch": "主分支（{{branch}}）",
  "session.new.worktree.create": "创建新的 worktree",
@@ -739,6 +738,46 @@ export const dict = {

  "settings.mcp.title": "MCP",
  "settings.mcp.description": "MCP 设置将在此处可配置。",
+  "settings.mcp.section.featured": "精选",
+  "settings.mcp.section.featured.description": "一键添加经过精心优化的热门 MCP 服务器预设。",
+  "settings.mcp.section.configured": "已配置的服务器",
+  "settings.mcp.section.configured.description": "查看已安装的 MCP 服务器及其连接方式，并移除不再需要的服务器。",
+  "settings.mcp.section.add": "添加服务器",
+  "settings.mcp.section.add.description": "创建您自己的本地或远程 MCP 服务器配置。",
+  "settings.mcp.type.local": "本地",
+  "settings.mcp.type.remote": "远程",
+  "settings.mcp.featured.added": "已添加",
+  "settings.mcp.action.add": "添加服务器",
+  "settings.mcp.action.remove": "移除",
+  "settings.mcp.state.enabled": "已启用",
+  "settings.mcp.state.disabled": "已禁用",
+  "settings.mcp.form.type.label": "连接类型",
+  "settings.mcp.form.name.label": "服务器名称",
+  "settings.mcp.form.name.placeholder": "my-mcp-server",
+  "settings.mcp.form.url.label": "远程 URL",
+  "settings.mcp.form.url.placeholder": "https://mcp.example.com/mcp",
+  "settings.mcp.form.command.label": "命令",
+  "settings.mcp.form.command.placeholder": "npx -y @modelcontextprotocol/server-memory",
+  "settings.mcp.form.headers.label": "请求头",
+  "settings.mcp.form.headers.description": "可选。每行添加一个请求头，格式为 KEY: value。",
+  "settings.mcp.form.environment.label": "环境变量",
+  "settings.mcp.form.environment.description": "可选。每行添加一个变量，格式为 KEY=value。",
+  "settings.mcp.form.timeout.label": "超时 (ms)",
+  "settings.mcp.form.timeout.placeholder": "5000",
+  "settings.mcp.toast.added.title": "MCP 服务器已添加",
+  "settings.mcp.toast.added.description": "{{name}} 已保存到您的 MCP 设置中。",
+  "settings.mcp.toast.updated.title": "MCP 服务器已更新",
+  "settings.mcp.toast.updated.description": "{{name}} 现已{{state}}。",
+  "settings.mcp.toast.removed.title": "MCP 服务器已移除",
+  "settings.mcp.toast.removed.description": "{{name}} 已从您的 MCP 设置中移除。",
+  "settings.mcp.validation.name": "保存前请输入服务器名称。",
+  "settings.mcp.validation.duplicate": "{{name}} 已配置。",
+  "settings.mcp.validation.url": "请输入远程 MCP 服务器 URL。",
+  "settings.mcp.validation.command": "请输入用于启动本地 MCP 服务器的命令。",
+  "settings.mcp.validation.timeout": "超时必须为正整数。",
+  "settings.mcp.validation.headers": "无法解析请求头行：{{line}}",
+  "settings.mcp.validation.environment": "无法解析环境行：{{line}}",
+  "settings.mcp.status.needs_client_registration": "需要客户端注册",

  "settings.permissions.title": "权限",
  "settings.permissions.description": "控制服务器默认可以使用哪些工具。",
--- a/packages/app/src/i18n/zht.ts
+++ b/packages/app/src/i18n/zht.ts
@@ -507,7 +507,6 @@ export const dict = {
  "session.todo.collapse": "折疊",
  "session.todo.expand": "展開",

-  "session.new.title": "建構任何東西",
  "session.new.worktree.main": "主分支",
  "session.new.worktree.mainWithBranch": "主分支 ({{branch}})",
  "session.new.worktree.create": "建立新的 worktree",
@@ -732,6 +731,46 @@ export const dict = {
  "settings.commands.description": "命令設定將在此處可設定。",
  "settings.mcp.title": "MCP",
  "settings.mcp.description": "MCP 設定將在此處可設定。",
+  "settings.mcp.section.featured": "精選",
+  "settings.mcp.section.featured.description": "一鍵新增熱門 MCP 伺服器的精選預設設定。",
+  "settings.mcp.section.configured": "已設定的伺服器",
+  "settings.mcp.section.configured.description": "查看已安裝的 MCP 伺服器及其連線方式，並移除不再需要的伺服器。",
+  "settings.mcp.section.add": "新增伺服器",
+  "settings.mcp.section.add.description": "建立您自己的本機或遠端 MCP 伺服器設定。",
+  "settings.mcp.type.local": "本機",
+  "settings.mcp.type.remote": "遠端",
+  "settings.mcp.featured.added": "已新增",
+  "settings.mcp.action.add": "新增伺服器",
+  "settings.mcp.action.remove": "移除",
+  "settings.mcp.state.enabled": "已啟用",
+  "settings.mcp.state.disabled": "已停用",
+  "settings.mcp.form.type.label": "連線類型",
+  "settings.mcp.form.name.label": "伺服器名稱",
+  "settings.mcp.form.name.placeholder": "my-mcp-server",
+  "settings.mcp.form.url.label": "遠端 URL",
+  "settings.mcp.form.url.placeholder": "https://mcp.example.com/mcp",
+  "settings.mcp.form.command.label": "指令",
+  "settings.mcp.form.command.placeholder": "npx -y @modelcontextprotocol/server-memory",
+  "settings.mcp.form.headers.label": "標頭",
+  "settings.mcp.form.headers.description": "選用。每行新增一個標頭，格式為 KEY: value。",
+  "settings.mcp.form.environment.label": "環境變數",
+  "settings.mcp.form.environment.description": "選用。每行新增一個變數，格式為 KEY=value。",
+  "settings.mcp.form.timeout.label": "逾時 (ms)",
+  "settings.mcp.form.timeout.placeholder": "5000",
+  "settings.mcp.toast.added.title": "已新增 MCP 伺服器",
+  "settings.mcp.toast.added.description": "{{name}} 已儲存至您的 MCP 設定。",
+  "settings.mcp.toast.updated.title": "MCP 伺服器已更新",
+  "settings.mcp.toast.updated.description": "{{name}} 現已{{state}}。",
+  "settings.mcp.toast.removed.title": "已移除 MCP 伺服器",
+  "settings.mcp.toast.removed.description": "{{name}} 已從您的 MCP 設定中移除。",
+  "settings.mcp.validation.name": "儲存前請輸入伺服器名稱。",
+  "settings.mcp.validation.duplicate": "{{name}} 已經設定過了。",
+  "settings.mcp.validation.url": "請輸入遠端 MCP 伺服器 URL。",
+  "settings.mcp.validation.command": "請輸入用於啟動本機 MCP 伺服器的指令。",
+  "settings.mcp.validation.timeout": "逾時必須是正整數。",
+  "settings.mcp.validation.headers": "無法解析標頭行：{{line}}",
+  "settings.mcp.validation.environment": "無法解析環境變數行：{{line}}",
+  "settings.mcp.status.needs_client_registration": "需要用戶端註冊",

  "settings.permissions.title": "權限",
  "settings.permissions.description": "控制伺服器預設可以使用哪些工具。",
--- a/packages/app/src/index.css
+++ b/packages/app/src/index.css
@@ -1,29 +1 @@
@import "@opencode-ai/ui/styles/tailwind";
-
-@layer components {
-  [data-component="getting-started"] {
-    container-type: inline-size;
-    container-name: getting-started;
-  }
-
-  [data-component="getting-started-actions"] {
-    display: flex;
-    flex-direction: column;
-    gap: 0.75rem; /* gap-3 */
-  }
-
-  [data-component="getting-started-actions"] > [data-component="button"] {
-    width: 100%;
-  }
-
-  @container getting-started (min-width: 17rem) {
-    [data-component="getting-started-actions"] {
-      flex-direction: row;
-      align-items: center;
-    }
-
-    [data-component="getting-started-actions"] > [data-component="button"] {
-      width: auto;
-    }
-  }
-}
--- a/packages/app/src/pages/directory-layout.tsx
+++ b/packages/app/src/pages/directory-layout.tsx
@@ -1,27 +1,26 @@
-import { batch, createEffect, createMemo, Show, type ParentProps } from "solid-js"
+import { createEffect, createMemo, Show, type ParentProps } from "solid-js"
 import { createStore } from "solid-js/store"
-import { useLocation, useNavigate, useParams } from "@solidjs/router"
+import { useNavigate, useParams } from "@solidjs/router"
 import { SDKProvider } from "@/context/sdk"
 import { SyncProvider, useSync } from "@/context/sync"
 import { LocalProvider } from "@/context/local"
-import { useGlobalSDK } from "@/context/global-sdk"

 import { DataProvider } from "@opencode-ai/ui/context"
-import { base64Encode } from "@opencode-ai/util/encode"
 import { decode64 } from "@/utils/base64"
 import { showToast } from "@opencode-ai/ui/toast"
 import { useLanguage } from "@/context/language"
+
 function DirectoryDataProvider(props: ParentProps<{ directory: string }>) {
+  const params = useParams()
  const navigate = useNavigate()
  const sync = useSync()
-  const slug = createMemo(() => base64Encode(props.directory))

  return (
    <DataProvider
      data={sync.data}
      directory={props.directory}
-      onNavigateToSession={(sessionID: string) => navigate(`/${slug()}/session/${sessionID}`)}
-      onSessionHref={(sessionID: string) => `/${slug()}/session/${sessionID}`}
+      onNavigateToSession={(sessionID: string) => navigate(`/${params.dir}/session/${sessionID}`)}
+      onSessionHref={(sessionID: string) => `/${params.dir}/session/${sessionID}`}
    >
      <LocalProvider>{props.children}</LocalProvider>
    </DataProvider>
@@ -31,63 +30,31 @@ function DirectoryDataProvider(props: ParentProps<{ directory: string }>) {
 export default function Layout(props: ParentProps) {
  const params = useParams()
  const navigate = useNavigate()
-  const location = useLocation()
  const language = useLanguage()
-  const globalSDK = useGlobalSDK()
-  const directory = createMemo(() => decode64(params.dir) ?? "")
-  const [state, setState] = createStore({ invalid: "", resolved: "" })
+  const [store, setStore] = createStore({ invalid: "" })
+  const directory = createMemo(() => {
+    return decode64(params.dir) ?? ""
+  })

  createEffect(() => {
    if (!params.dir) return
-    const raw = directory()
-    if (!raw) {
-      if (state.invalid === params.dir) return
-      setState("invalid", params.dir)
-      showToast({
-        variant: "error",
-        title: language.t("common.requestFailed"),
-        description: language.t("directory.error.invalidUrl"),
-      })
-      navigate("/", { replace: true })
-      return
-    }
-
-    const current = params.dir
-    globalSDK
-      .createClient({
-        directory: raw,
-        throwOnError: true,
-      })
-      .path.get()
-      .then((x) => {
-        if (params.dir !== current) return
-        const next = x.data?.directory ?? raw
-        batch(() => {
-          setState("invalid", "")
-          setState("resolved", next)
-        })
-        if (next === raw) return
-        const path = location.pathname.slice(current.length + 1)
-        navigate(`/${base64Encode(next)}${path}${location.search}${location.hash}`, { replace: true })
-      })
-      .catch(() => {
-        if (params.dir !== current) return
-        batch(() => {
-          setState("invalid", "")
-          setState("resolved", raw)
-        })
-      })
+    if (directory()) return
+    if (store.invalid === params.dir) return
+    setStore("invalid", params.dir)
+    showToast({
+      variant: "error",
+      title: language.t("common.requestFailed"),
+      description: language.t("directory.error.invalidUrl"),
+    })
+    navigate("/", { replace: true })
  })
-
  return (
-    <Show when={state.resolved}>
-      {(resolved) => (
-        <SDKProvider directory={resolved}>
-          <SyncProvider>
-            <DirectoryDataProvider directory={resolved()}>{props.children}</DirectoryDataProvider>
-          </SyncProvider>
-        </SDKProvider>
-      )}
+    <Show when={directory()}>
+      <SDKProvider directory={directory}>
+        <SyncProvider>
+          <DirectoryDataProvider directory={directory()}>{props.children}</DirectoryDataProvider>
+        </SyncProvider>
+      </SDKProvider>
    </Show>
  )
 }
--- a/packages/app/src/pages/layout.tsx
+++ b/packages/app/src/pages/layout.tsx
@@ -10,8 +10,9 @@ import {
  ParentProps,
  Show,
  untrack,
+  type JSX,
 } from "solid-js"
-import { useNavigate, useParams } from "@solidjs/router"
+import { A, useNavigate, useParams } from "@solidjs/router"
 import { useLayout, LocalProject } from "@/context/layout"
 import { useGlobalSync } from "@/context/global-sync"
 import { Persist, persisted } from "@/utils/persist"
@@ -19,8 +20,9 @@ import { base64Encode } from "@opencode-ai/util/encode"
 import { decode64 } from "@/utils/base64"
 import { ResizeHandle } from "@opencode-ai/ui/resize-handle"
 import { Button } from "@opencode-ai/ui/button"
+import { Icon } from "@opencode-ai/ui/icon"
 import { IconButton } from "@opencode-ai/ui/icon-button"
-import { Tooltip } from "@opencode-ai/ui/tooltip"
+import { Tooltip, TooltipKeybind } from "@opencode-ai/ui/tooltip"
 import { DropdownMenu } from "@opencode-ai/ui/dropdown-menu"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { getFilename } from "@opencode-ai/util/path"
@@ -57,6 +59,7 @@ import { Titlebar } from "@/components/titlebar"
 import { useServer } from "@/context/server"
 import { useLanguage, type Locale } from "@/context/language"
 import {
+  childMapByParent,
  displayName,
  effectiveWorkspaceOrder,
  errorMessage,
@@ -93,7 +96,6 @@ export default function Layout(props: ParentProps) {
      workspaceName: {} as Record<string, string>,
      workspaceBranchName: {} as Record<string, Record<string, string>>,
      workspaceExpanded: {} as Record<string, boolean>,
-      gettingStartedDismissed: false,
    }),
  )

@@ -155,8 +157,6 @@ export default function Layout(props: ParentProps) {
  const isBusy = (directory: string) => !!state.busyWorkspaces[workspaceKey(directory)]
  const navLeave = { current: undefined as number | undefined }
  const [sortNow, setSortNow] = createSignal(Date.now())
-  const [sizing, setSizing] = createSignal(false)
-  let sizet: number | undefined
  let sortNowInterval: ReturnType<typeof setInterval> | undefined
  const sortNowTimeout = setTimeout(
    () => {
@@ -169,7 +169,7 @@ export default function Layout(props: ParentProps) {
  const aim = createAim({
    enabled: () => !layout.sidebar.opened(),
    active: () => state.hoverProject,
-    el: () => state.nav?.querySelector<HTMLElement>("[data-component='sidebar-rail']") ?? state.nav,
+    el: () => state.nav,
    onActivate: (directory) => {
      globalSync.child(directory)
      setState("hoverProject", directory)
@@ -181,23 +181,9 @@ export default function Layout(props: ParentProps) {
    if (navLeave.current !== undefined) clearTimeout(navLeave.current)
    clearTimeout(sortNowTimeout)
    if (sortNowInterval) clearInterval(sortNowInterval)
-    if (sizet !== undefined) clearTimeout(sizet)
-    if (peekt !== undefined) clearTimeout(peekt)
    aim.reset()
  })

-  onMount(() => {
-    const stop = () => setSizing(false)
-    window.addEventListener("pointerup", stop)
-    window.addEventListener("pointercancel", stop)
-    window.addEventListener("blur", stop)
-    onCleanup(() => {
-      window.removeEventListener("pointerup", stop)
-      window.removeEventListener("pointercancel", stop)
-      window.removeEventListener("blur", stop)
-    })
-  })
-
  const sidebarHovering = createMemo(() => !layout.sidebar.opened() && state.hoverProject !== undefined)
  const sidebarExpanded = createMemo(() => layout.sidebar.opened() || sidebarHovering())
  const setHoverProject = (value: string | undefined) => {
@@ -208,54 +194,12 @@ export default function Layout(props: ParentProps) {
  const clearHoverProjectSoon = () => queueMicrotask(() => setHoverProject(undefined))
  const setHoverSession = (id: string | undefined) => setState("hoverSession", id)

-  const disarm = () => {
-    if (navLeave.current === undefined) return
-    clearTimeout(navLeave.current)
-    navLeave.current = undefined
-  }
-
-  const arm = () => {
-    if (layout.sidebar.opened()) return
-    if (state.hoverProject === undefined) return
-    disarm()
-    navLeave.current = window.setTimeout(() => {
-      navLeave.current = undefined
-      setHoverProject(undefined)
-      setState("hoverSession", undefined)
-    }, 300)
-  }
-
-  const [peek, setPeek] = createSignal<LocalProject | undefined>(undefined)
-  const [peeked, setPeeked] = createSignal(false)
-  let peekt: number | undefined
-
  const hoverProjectData = createMemo(() => {
    const id = state.hoverProject
    if (!id) return
    return layout.projects.list().find((project) => project.worktree === id)
  })

-  createEffect(() => {
-    const p = hoverProjectData()
-    if (p) {
-      if (peekt !== undefined) {
-        clearTimeout(peekt)
-        peekt = undefined
-      }
-      setPeek(p)
-      setPeeked(true)
-      return
-    }
-
-    setPeeked(false)
-    if (peek() === undefined) return
-    if (peekt !== undefined) clearTimeout(peekt)
-    peekt = window.setTimeout(() => {
-      peekt = undefined
-      setPeek(undefined)
-    }, 180)
-  })
-
  createEffect(() => {
    if (!layout.sidebar.opened()) return
    setHoverProject(undefined)
@@ -1181,12 +1125,6 @@ export default function Layout(props: ParentProps) {
    }
    const openSession = async (target: { directory: string; id: string }) => {
      if (!canOpen(target.directory)) return false
-      const [data] = globalSync.child(target.directory, { bootstrap: false })
-      if (data.session.some((item) => item.id === target.id)) {
-        setStore("lastProjectSession", root, { directory: target.directory, id: target.id, at: Date.now() })
-        navigateWithSidebarReset(`/${base64Encode(target.directory)}/session/${target.id}`)
-        return true
-      }
      const resolved = await globalSDK.client.session
        .get({ sessionID: target.id })
        .then((x) => x.data)
@@ -1877,8 +1815,7 @@ export default function Layout(props: ParentProps) {
    setHoverSession,
  }

-  const SidebarPanel = (panelProps: { project: LocalProject | undefined; mobile?: boolean; merged?: boolean }) => {
-    const merged = createMemo(() => panelProps.mobile || (panelProps.merged ?? layout.sidebar.opened()))
+  const SidebarPanel = (panelProps: { project: LocalProject | undefined; mobile?: boolean }) => {
    const projectName = createMemo(() => {
      const project = panelProps.project
      if (!project) return ""
@@ -1904,19 +1841,12 @@ export default function Layout(props: ParentProps) {
    return (
      <div
        classList={{
-          "flex flex-col min-h-0 min-w-0 rounded-tl-[12px] px-2": true,
-          "border border-b-0 border-border-weak-base": !merged(),
-          "border-l border-t border-border-weaker-base": merged(),
-          "bg-background-base": merged(),
-          "bg-background-stronger": !merged(),
+          "flex flex-col min-h-0 bg-background-stronger border border-b-0 border-border-weak-base rounded-tl-[12px]": true,
          "flex-1 min-w-0": panelProps.mobile,
-          "max-w-full overflow-hidden": panelProps.mobile,
-        }}
-        style={{
-          width: panelProps.mobile ? undefined : `${Math.max(Math.max(layout.sidebar.width(), 244) - 64, 0)}px`,
        }}
+        style={{ width: panelProps.mobile ? undefined : `${Math.max(layout.sidebar.width() - 64, 0)}px` }}
      >
-        <Show when={panelProps.project}>
+        <Show when={panelProps.project} keyed>
          {(p) => (
            <>
              <div class="shrink-0 px-2 py-1">
@@ -1925,7 +1855,7 @@ export default function Layout(props: ParentProps) {
                    <InlineEditor
                      id={`project:${projectId()}`}
                      value={projectName}
-                      onSave={(next) => renameProject(p(), next)}
+                      onSave={(next) => renameProject(p, next)}
                      class="text-14-medium text-text-strong truncate"
                      displayClass="text-14-medium text-text-strong truncate"
                      stopPropagation
@@ -1934,7 +1864,7 @@ export default function Layout(props: ParentProps) {
                    <Tooltip
                      placement="bottom"
                      gutter={2}
-                      value={p().worktree}
+                      value={p.worktree}
                      class="shrink-0"
                      contentStyle={{
                        "max-width": "640px",
@@ -1942,7 +1872,7 @@ export default function Layout(props: ParentProps) {
                      }}
                    >
                      <span class="text-12-regular text-text-base truncate select-text">
-                        {p().worktree.replace(homedir(), "~")}
+                        {p.worktree.replace(homedir(), "~")}
                      </span>
                    </Tooltip>
                  </div>
@@ -1953,33 +1883,33 @@ export default function Layout(props: ParentProps) {
                      icon="dot-grid"
                      variant="ghost"
                      data-action="project-menu"
-                      data-project={base64Encode(p().worktree)}
+                      data-project={base64Encode(p.worktree)}
                      class="shrink-0 size-6 rounded-md data-[expanded]:bg-surface-base-active"
                      classList={{
                        "opacity-0 group-hover/project:opacity-100 data-[expanded]:opacity-100": !panelProps.mobile,
                      }}
                      aria-label={language.t("common.moreOptions")}
                    />
-                    <DropdownMenu.Portal>
+                    <DropdownMenu.Portal mount={!panelProps.mobile ? state.nav : undefined}>
                      <DropdownMenu.Content class="mt-1">
-                        <DropdownMenu.Item onSelect={() => showEditProjectDialog(p())}>
+                        <DropdownMenu.Item onSelect={() => showEditProjectDialog(p)}>
                          <DropdownMenu.ItemLabel>{language.t("common.edit")}</DropdownMenu.ItemLabel>
                        </DropdownMenu.Item>
                        <DropdownMenu.Item
                          data-action="project-workspaces-toggle"
-                          data-project={base64Encode(p().worktree)}
-                          disabled={p().vcs !== "git" && !layout.sidebar.workspaces(p().worktree)()}
-                          onSelect={() => toggleProjectWorkspaces(p())}
+                          data-project={base64Encode(p.worktree)}
+                          disabled={p.vcs !== "git" && !layout.sidebar.workspaces(p.worktree)()}
+                          onSelect={() => toggleProjectWorkspaces(p)}
                        >
                          <DropdownMenu.ItemLabel>
-                            {layout.sidebar.workspaces(p().worktree)()
+                            {layout.sidebar.workspaces(p.worktree)()
                              ? language.t("sidebar.workspaces.disable")
                              : language.t("sidebar.workspaces.enable")}
                          </DropdownMenu.ItemLabel>
                        </DropdownMenu.Item>
                        <DropdownMenu.Item
                          data-action="project-clear-notifications"
-                          data-project={base64Encode(p().worktree)}
+                          data-project={base64Encode(p.worktree)}
                          disabled={unseenCount() === 0}
                          onSelect={clearNotifications}
                        >
@@ -1990,8 +1920,8 @@ export default function Layout(props: ParentProps) {
                        <DropdownMenu.Separator />
                        <DropdownMenu.Item
                          data-action="project-close-menu"
-                          data-project={base64Encode(p().worktree)}
-                          onSelect={() => closeProject(p().worktree)}
+                          data-project={base64Encode(p.worktree)}
+                          onSelect={() => closeProject(p.worktree)}
                        >
                          <DropdownMenu.ItemLabel>{language.t("common.close")}</DropdownMenu.ItemLabel>
                        </DropdownMenu.Item>
@@ -2007,19 +1937,25 @@ export default function Layout(props: ParentProps) {
                  fallback={
                    <>
                      <div class="shrink-0 py-4 px-3">
-                        <Button
-                          size="large"
-                          icon="plus-small"
-                          class="w-full"
-                          onClick={() => navigateWithSidebarReset(`/${base64Encode(p().worktree)}/session`)}
+                        <TooltipKeybind
+                          title={language.t("command.session.new")}
+                          keybind={command.keybind("session.new")}
+                          placement="top"
                        >
-                          {language.t("command.session.new")}
-                        </Button>
+                          <Button
+                            size="large"
+                            icon="plus-small"
+                            class="w-full"
+                            onClick={() => navigateWithSidebarReset(`/${base64Encode(p.worktree)}/session`)}
+                          >
+                            {language.t("command.session.new")}
+                          </Button>
+                        </TooltipKeybind>
                      </div>
                      <div class="flex-1 min-h-0">
                        <LocalWorkspace
                          ctx={workspaceSidebarCtx}
-                          project={p()}
+                          project={p}
                          sortNow={sortNow}
                          mobile={panelProps.mobile}
                        />
@@ -2029,9 +1965,15 @@ export default function Layout(props: ParentProps) {
                >
                  <>
                    <div class="shrink-0 py-4 px-3">
-                      <Button size="large" icon="plus-small" class="w-full" onClick={() => createWorkspace(p())}>
-                        {language.t("workspace.new")}
-                      </Button>
+                      <TooltipKeybind
+                        title={language.t("workspace.new")}
+                        keybind={command.keybind("workspace.new")}
+                        placement="top"
+                      >
+                        <Button size="large" icon="plus-small" class="w-full" onClick={() => createWorkspace(p)}>
+                          {language.t("workspace.new")}
+                        </Button>
+                      </TooltipKeybind>
                    </div>
                    <div class="relative flex-1 min-h-0">
                      <DragDropProvider
@@ -2054,7 +1996,7 @@ export default function Layout(props: ParentProps) {
                                <SortableWorkspace
                                  ctx={workspaceSidebarCtx}
                                  directory={directory}
-                                  project={p()}
+                                  project={p}
                                  sortNow={sortNow}
                                  mobile={panelProps.mobile}
                                />
@@ -2079,31 +2021,25 @@ export default function Layout(props: ParentProps) {
        </Show>

        <div
-          class="shrink-0 px-3 py-3"
+          class="shrink-0 px-2 py-3 border-t border-border-weak-base"
          classList={{
-            hidden: store.gettingStartedDismissed || !(providers.all().length > 0 && providers.paid().length === 0),
+            hidden: !(providers.all().length > 0 && providers.paid().length === 0),
          }}
        >
-          <div class="rounded-xl bg-background-base shadow-xs-border-base" data-component="getting-started">
-            <div class="p-3 flex flex-col gap-6">
-              <div class="flex flex-col gap-2">
-                <div class="text-14-medium text-text-strong">{language.t("sidebar.gettingStarted.title")}</div>
-                <div class="text-14-regular text-text-base" style={{ "line-height": "var(--line-height-normal)" }}>
-                  {language.t("sidebar.gettingStarted.line1")}
-                </div>
-                <div class="text-14-regular text-text-base" style={{ "line-height": "var(--line-height-normal)" }}>
-                  {language.t("sidebar.gettingStarted.line2")}
-                </div>
-              </div>
-              <div data-component="getting-started-actions">
-                <Button size="large" icon="plus-small" onClick={connectProvider}>
-                  {language.t("command.provider.connect")}
-                </Button>
-                <Button size="large" variant="ghost" onClick={() => setStore("gettingStartedDismissed", true)}>
-                  Not yet
-                </Button>
-              </div>
+          <div class="rounded-md bg-background-base shadow-xs-border-base">
+            <div class="p-3 flex flex-col gap-2">
+              <div class="text-12-medium text-text-strong">{language.t("sidebar.gettingStarted.title")}</div>
+              <div class="text-text-base">{language.t("sidebar.gettingStarted.line1")}</div>
+              <div class="text-text-base">{language.t("sidebar.gettingStarted.line2")}</div>
            </div>
+            <Button
+              class="flex w-full text-left justify-start text-12-medium text-text-strong stroke-[1.5px] rounded-md rounded-t-none shadow-none border-t border-border-weak-base px-3"
+              size="large"
+              icon="plus"
+              onClick={connectProvider}
+            >
+              {language.t("command.provider.connect")}
+            </Button>
          </div>
        </div>
      </div>
@@ -2113,27 +2049,33 @@ export default function Layout(props: ParentProps) {
  return (
    <div class="relative bg-background-base flex-1 min-h-0 flex flex-col select-none [&_input]:select-text [&_textarea]:select-text [&_[contenteditable]]:select-text">
      <Titlebar />
-      <div class="flex-1 min-h-0 relative overflow-x-hidden">
+      <div class="flex-1 min-h-0 flex">
        <nav
          aria-label={language.t("sidebar.nav.projectsAndSessions")}
          data-component="sidebar-nav-desktop"
          classList={{
            "hidden xl:block": true,
-            "absolute inset-y-0 left-0": true,
-            "z-10": true,
+            "relative shrink-0": true,
          }}
-          style={{ width: `${Math.max(layout.sidebar.width(), 244)}px` }}
+          style={{ width: layout.sidebar.opened() ? `${Math.max(layout.sidebar.width(), 244)}px` : "64px" }}
          ref={(el) => {
            setState("nav", el)
          }}
          onMouseEnter={() => {
-            disarm()
+            if (navLeave.current === undefined) return
+            clearTimeout(navLeave.current)
+            navLeave.current = undefined
          }}
          onMouseLeave={() => {
            aim.reset()
            if (!sidebarHovering()) return

-            arm()
+            if (navLeave.current !== undefined) clearTimeout(navLeave.current)
+            navLeave.current = window.setTimeout(() => {
+              navLeave.current = undefined
+              setHoverProject(undefined)
+              setState("hoverSession", undefined)
+            }, 300)
          }}
        >
          <div class="@container w-full h-full contain-strict">
@@ -2160,36 +2102,30 @@ export default function Layout(props: ParentProps) {
              onOpenHelp={() => platform.openLink("https://opencode.ai/desktop-feedback")}
              renderPanel={() => (
                <Show when={currentProject()} keyed>
-                  {(project) => <SidebarPanel project={project} merged />}
+                  {(project) => <SidebarPanel project={project} />}
                </Show>
              )}
            />
          </div>
+          <Show when={!layout.sidebar.opened() ? hoverProjectData()?.worktree : undefined} keyed>
+            {(worktree) => (
+              <div class="absolute inset-y-0 left-16 z-50 flex" onMouseEnter={aim.reset}>
+                <SidebarPanel project={hoverProjectData()} />
+              </div>
+            )}
+          </Show>
          <Show when={layout.sidebar.opened()}>
-            <div onPointerDown={() => setSizing(true)}>
-              <ResizeHandle
-                direction="horizontal"
-                size={layout.sidebar.width()}
-                min={244}
-                max={typeof window === "undefined" ? 1000 : window.innerWidth * 0.3 + 64}
-                collapseThreshold={244}
-                onResize={(w) => {
-                  setSizing(true)
-                  if (sizet !== undefined) clearTimeout(sizet)
-                  sizet = window.setTimeout(() => setSizing(false), 120)
-                  layout.sidebar.resize(w)
-                }}
-                onCollapse={layout.sidebar.close}
-              />
-            </div>
+            <ResizeHandle
+              direction="horizontal"
+              size={layout.sidebar.width()}
+              min={244}
+              max={typeof window === "undefined" ? 1000 : window.innerWidth * 0.3 + 64}
+              collapseThreshold={244}
+              onResize={layout.sidebar.resize}
+              onCollapse={layout.sidebar.close}
+            />
          </Show>
        </nav>
-
-        <div
-          class="hidden xl:block pointer-events-none absolute top-0 right-0 z-0 border-t border-border-weaker-base"
-          style={{ left: "calc(4rem + 12px)" }}
-        />
-
        <div class="xl:hidden">
          <div
            classList={{
@@ -2205,7 +2141,7 @@ export default function Layout(props: ParentProps) {
            aria-label={language.t("sidebar.nav.projectsAndSessions")}
            data-component="sidebar-nav-mobile"
            classList={{
-              "@container fixed top-10 bottom-0 left-0 z-50 w-full max-w-[400px] overflow-hidden border-r border-border-weaker-base bg-background-base transition-transform duration-200 ease-out": true,
+              "@container fixed top-10 bottom-0 left-0 z-50 w-72 bg-background-base transition-transform duration-200 ease-out": true,
              "translate-x-0": layout.mobileSidebar.opened(),
              "-translate-x-full": !layout.mobileSidebar.opened(),
            }}
@@ -2238,66 +2174,16 @@ export default function Layout(props: ParentProps) {
          </nav>
        </div>

-        <div
+        <main
          classList={{
-            "absolute inset-0": true,
-            "xl:inset-y-0 xl:right-0 xl:left-[var(--main-left)]": true,
-            "z-20": true,
-            "transition-[left] duration-200 ease-[cubic-bezier(0.22,1,0.36,1)] will-change-[left] motion-reduce:transition-none":
-              !sizing(),
-          }}
-          style={{
-            "--main-left": layout.sidebar.opened() ? `${Math.max(layout.sidebar.width(), 244)}px` : "4rem",
+            "size-full overflow-x-hidden flex flex-col items-start contain-strict border-t border-border-weak-base": true,
+            "xl:border-l xl:rounded-tl-[12px]": !layout.sidebar.opened(),
          }}
        >
-          <main
-            classList={{
-              "size-full overflow-x-hidden flex flex-col items-start contain-strict border-t border-border-weak-base bg-background-base xl:border-l xl:rounded-tl-[12px]": true,
-            }}
-          >
-            <Show when={!autoselecting()} fallback={<div class="size-full" />}>
-              {props.children}
-            </Show>
-          </main>
-        </div>
-
-        <div
-          classList={{
-            "hidden xl:flex absolute inset-y-0 left-16 z-30": true,
-            "opacity-100 translate-x-0 pointer-events-auto": peeked() && !layout.sidebar.opened(),
-            "opacity-0 -translate-x-2 pointer-events-none": !peeked() || layout.sidebar.opened(),
-            "transition-[opacity,transform] motion-reduce:transition-none": true,
-            "duration-180 ease-out": peeked() && !layout.sidebar.opened(),
-            "duration-120 ease-in": !peeked() || layout.sidebar.opened(),
-          }}
-          onMouseMove={disarm}
-          onMouseEnter={() => {
-            disarm()
-            aim.reset()
-          }}
-          onPointerDown={disarm}
-          onMouseLeave={() => {
-            arm()
-          }}
-        >
-          <Show when={peek()} keyed>
-            {(project) => <SidebarPanel project={project} merged={false} />}
+          <Show when={!autoselecting()} fallback={<div class="size-full" />}>
+            {props.children}
          </Show>
-        </div>
-
-        <div
-          classList={{
-            "hidden xl:block pointer-events-none absolute inset-y-0 right-0 z-25 overflow-hidden": true,
-            "opacity-100 translate-x-0": peeked() && !layout.sidebar.opened(),
-            "opacity-0 -translate-x-2": !peeked() || layout.sidebar.opened(),
-            "transition-[opacity,transform] motion-reduce:transition-none": true,
-            "duration-180 ease-out": peeked() && !layout.sidebar.opened(),
-            "duration-120 ease-in": !peeked() || layout.sidebar.opened(),
-          }}
-          style={{ left: `calc(4rem + ${Math.max(Math.max(layout.sidebar.width(), 244) - 64, 0)}px)` }}
-        >
-          <div class="h-full w-px" style={{ "box-shadow": "var(--shadow-sidebar-overlay)" }} />
-        </div>
+        </main>
      </div>
      <Toast.Region />
    </div>
--- a/packages/app/src/pages/layout/sidebar-items.tsx
+++ b/packages/app/src/pages/layout/sidebar-items.tsx
@@ -163,6 +163,7 @@ const SessionHoverPreview = (props: {
    gutter={16}
    shift={-2}
    trigger={props.trigger}
+    mount={!props.mobile ? props.nav() : undefined}
    open={props.hoverSession() === props.session.id}
    onOpenChange={(open) => props.setHoverSession(open ? props.session.id : undefined)}
  >
--- a/packages/app/src/pages/layout/sidebar-project.tsx
+++ b/packages/app/src/pages/layout/sidebar-project.tsx
@@ -5,6 +5,8 @@ import { Button } from "@opencode-ai/ui/button"
 import { ContextMenu } from "@opencode-ai/ui/context-menu"
 import { HoverCard } from "@opencode-ai/ui/hover-card"
 import { Icon } from "@opencode-ai/ui/icon"
+import { IconButton } from "@opencode-ai/ui/icon-button"
+import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { createSortable } from "@thisbeyond/solid-dnd"
 import { useLayout, type LocalProject } from "@/context/layout"
 import { useGlobalSync } from "@/context/global-sync"
@@ -135,7 +137,7 @@ const ProjectTile = (props: {
      >
        <ProjectIcon project={props.project} notify />
      </ContextMenu.Trigger>
-      <ContextMenu.Portal>
+      <ContextMenu.Portal mount={!props.mobile ? props.nav() : undefined}>
        <ContextMenu.Content>
          <ContextMenu.Item onSelect={() => props.showEditProjectDialog(props.project)}>
            <ContextMenu.ItemLabel>{props.language.t("common.edit")}</ContextMenu.ItemLabel>
@@ -192,6 +194,21 @@ const ProjectPreviewPanel = (props: {
  <div class="-m-3 p-2 flex flex-col w-72">
    <div class="px-4 pt-2 pb-1 flex items-center gap-2">
      <div class="text-14-medium text-text-strong truncate grow">{displayName(props.project)}</div>
+      <Tooltip value={props.language.t("common.close")} placement="top" gutter={6}>
+        <IconButton
+          icon="circle-x"
+          variant="ghost"
+          class="shrink-0"
+          data-action="project-close-hover"
+          data-project={base64Encode(props.project.worktree)}
+          aria-label={props.language.t("common.close")}
+          onClick={(event) => {
+            event.stopPropagation()
+            props.setOpen(false)
+            props.ctx.closeProject(props.project.worktree)
+          }}
+        />
+      </Tooltip>
    </div>
    <div class="px-4 pb-2 text-12-medium text-text-weak">{props.language.t("sidebar.project.recentSessions")}</div>
    <div class="px-2 pb-2 flex flex-col gap-2">
--- a/packages/app/src/pages/layout/sidebar-shell.tsx
+++ b/packages/app/src/pages/layout/sidebar-shell.tsx
@@ -1,4 +1,4 @@
-import { createEffect, createMemo, For, Show, type Accessor, type JSX } from "solid-js"
+import { createMemo, For, Show, type Accessor, type JSX } from "solid-js"
 import {
  DragDropProvider,
  DragDropSensors,
@@ -35,22 +35,10 @@ export const SidebarContent = (props: {
 }): JSX.Element => {
  const expanded = createMemo(() => sidebarExpanded(props.mobile, props.opened()))
  const placement = () => (props.mobile ? "bottom" : "right")
-  let panel: HTMLDivElement | undefined
-
-  createEffect(() => {
-    const el = panel
-    if (!el) return
-    if (expanded()) {
-      el.removeAttribute("inert")
-      return
-    }
-    el.setAttribute("inert", "")
-  })

  return (
-    <div class="flex h-full w-full min-w-0 overflow-hidden">
+    <div class="flex h-full w-full overflow-hidden">
      <div
-        data-component="sidebar-rail"
        class="w-16 shrink-0 bg-background-base flex flex-col items-center overflow-hidden"
        onMouseMove={props.aimMove}
      >
@@ -112,15 +100,7 @@ export const SidebarContent = (props: {
        </div>
      </div>

-      <div
-        ref={(el) => {
-          panel = el
-        }}
-        classList={{ "flex h-full min-h-0 min-w-0 overflow-hidden": true, "pointer-events-none": !expanded() }}
-        aria-hidden={!expanded()}
-      >
-        {props.renderPanel()}
-      </div>
+      <Show when={expanded()}>{props.renderPanel()}</Show>
    </div>
  )
 }
--- a/packages/app/src/pages/layout/sidebar-workspace.tsx
+++ b/packages/app/src/pages/layout/sidebar-workspace.tsx
@@ -182,7 +182,7 @@ const WorkspaceActions = (props: {
          aria-label={props.language.t("common.moreOptions")}
        />
      </Tooltip>
-      <DropdownMenu.Portal>
+      <DropdownMenu.Portal mount={!props.mobile ? props.nav() : undefined}>
        <DropdownMenu.Content
          onCloseAutoFocus={(event) => {
            if (!props.pendingRename()) return
@@ -249,7 +249,7 @@ const WorkspaceSessionList = (props: {
  loadMore: () => Promise<void>
  language: ReturnType<typeof useLanguage>
 }): JSX.Element => (
-  <nav class="flex flex-col gap-1 px-3">
+  <nav class="flex flex-col gap-1 px-2">
    <Show when={props.showNew()}>
      <NewSessionItem
        slug={props.slug()}
@@ -490,7 +490,7 @@ export const LocalWorkspace = (props: {
      ref={(el) => props.ctx.setScrollContainerRef(el, props.mobile)}
      class="size-full flex flex-col py-2 overflow-y-auto no-scrollbar [overflow-anchor:none]"
    >
-      <nav class="flex flex-col gap-1 px-3">
+      <nav class="flex flex-col gap-1 px-2">
        <Show when={loading()}>
          <SessionSkeleton />
        </Show>
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -1,4 +1,4 @@
-import type { Project, UserMessage } from "@opencode-ai/sdk/v2"
+import type { UserMessage } from "@opencode-ai/sdk/v2"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import {
  onCleanup,
@@ -20,31 +20,27 @@ import { createStore } from "solid-js/store"
 import { ResizeHandle } from "@opencode-ai/ui/resize-handle"
 import { Select } from "@opencode-ai/ui/select"
 import { createAutoScroll } from "@opencode-ai/ui/hooks"
-import { Button } from "@opencode-ai/ui/button"
-import { showToast } from "@opencode-ai/ui/toast"
+import { Mark } from "@opencode-ai/ui/logo"
 import { base64Encode, checksum } from "@opencode-ai/util/encode"
 import { useNavigate, useParams, useSearchParams } from "@solidjs/router"
 import { NewSessionView, SessionHeader } from "@/components/session"
 import { useComments } from "@/context/comments"
-import { useGlobalSync } from "@/context/global-sync"
 import { useLanguage } from "@/context/language"
 import { useLayout } from "@/context/layout"
 import { usePrompt } from "@/context/prompt"
 import { useSDK } from "@/context/sdk"
 import { useSync } from "@/context/sync"
 import { createSessionComposerState, SessionComposerRegion } from "@/pages/session/composer"
-import { createOpenReviewFile, createSizing } from "@/pages/session/helpers"
+import { createOpenReviewFile } from "@/pages/session/helpers"
 import { MessageTimeline } from "@/pages/session/message-timeline"
 import { type DiffStyle, SessionReviewTab, type SessionReviewTabProps } from "@/pages/session/review-tab"
-import { resetSessionModel, syncSessionModel } from "@/pages/session/session-model-helpers"
 import { createScrollSpy } from "@/pages/session/scroll-spy"
 import { SessionMobileTabs } from "@/pages/session/session-mobile-tabs"
 import { SessionSidePanel } from "@/pages/session/session-side-panel"
 import { TerminalPanel } from "@/pages/session/terminal-panel"
 import { useSessionCommands } from "@/pages/session/use-session-commands"
 import { useSessionHashScroll } from "@/pages/session/use-session-hash-scroll"
-import { formatServerError } from "@/utils/server-errors"
-import { same } from "@opencode-ai/util/array"
+import { same } from "@/utils/same"

 const emptyUserMessages: UserMessage[] = []

@@ -122,9 +118,13 @@ function createSessionHistoryWindow(input: SessionHistoryWindowInput) {
      return
    }
    const beforeTop = el.scrollTop
+    const beforeHeight = el.scrollHeight
    fn()
-    void el.scrollHeight
-    el.scrollTop = beforeTop
+    requestAnimationFrame(() => {
+      const delta = el.scrollHeight - beforeHeight
+      if (!delta) return
+      el.scrollTop = beforeTop + delta
+    })
  }

  const backfillTurns = () => {
@@ -207,7 +207,7 @@ function createSessionHistoryWindow(input: SessionHistoryWindowInput) {
    if (!input.userScrolled()) return
    const el = input.scroller()
    if (!el) return
-    if (el.scrollHeight - el.clientHeight + el.scrollTop >= turnScrollThreshold) return
+    if (el.scrollTop >= turnScrollThreshold) return

    const start = turnStart()
    if (start > 0) {
@@ -252,7 +252,6 @@ function createSessionHistoryWindow(input: SessionHistoryWindowInput) {
 }

 export default function Page() {
-  const globalSync = useGlobalSync()
  const layout = useLayout()
  const local = useLocal()
  const file = useFile()
@@ -279,7 +278,6 @@ export default function Page() {
  })

  const [ui, setUi] = createStore({
-    git: false,
    pendingMessage: undefined as string | undefined,
    scrollGesture: 0,
    scroll: {
@@ -333,7 +331,6 @@ export default function Page() {
  )

  const isDesktop = createMediaQuery("(min-width: 768px)")
-  const size = createSizing()
  const desktopReviewOpen = createMemo(() => isDesktop() && view().reviewPanel.opened())
  const desktopFileTreeOpen = createMemo(() => isDesktop() && layout.fileTree.opened())
  const desktopSidePanelOpen = createMemo(() => desktopReviewOpen() || desktopFileTreeOpen())
@@ -419,22 +416,15 @@ export default function Page() {
      () => {
        const msg = lastUserMessage()
        if (!msg) return
-        syncSessionModel(local, msg)
+        if (msg.agent) {
+          local.agent.set(msg.agent)
+          if (local.agent.current()?.model) return
+        }
+        if (msg.model) local.model.set(msg.model)
      },
    ),
  )

-  createEffect(
-    on(
-      () => params.id,
-      (id, prev) => {
-        if (id || !prev) return
-        resetSessionModel(local)
-      },
-      { defer: true },
-    ),
-  )
-
  const [store, setStore] = createStore({
    messageId: undefined as string | undefined,
    mobileTab: "session" as "session" | "changes",
@@ -500,51 +490,10 @@ export default function Page() {
  })
  const reviewEmptyKey = createMemo(() => {
    const project = sync.project
-    if (project && !project.vcs) return "session.review.noVcs"
-    if (sync.data.config.snapshot === false) return "session.review.noSnapshot"
-    return "session.review.empty"
+    if (!project || project.vcs) return "session.review.empty"
+    return "session.review.noVcs"
  })

-  function upsert(next: Project) {
-    const list = globalSync.data.project
-    sync.set("project", next.id)
-    const idx = list.findIndex((item) => item.id === next.id)
-    if (idx >= 0) {
-      globalSync.set(
-        "project",
-        list.map((item, i) => (i === idx ? { ...item, ...next } : item)),
-      )
-      return
-    }
-    const at = list.findIndex((item) => item.id > next.id)
-    if (at >= 0) {
-      globalSync.set("project", [...list.slice(0, at), next, ...list.slice(at)])
-      return
-    }
-    globalSync.set("project", [...list, next])
-  }
-
-  function initGit() {
-    if (ui.git) return
-    setUi("git", true)
-    void sdk.client.project
-      .initGit()
-      .then((x) => {
-        if (!x.data) return
-        upsert(x.data)
-      })
-      .catch((err) => {
-        showToast({
-          variant: "error",
-          title: language.t("common.requestFailed"),
-          description: formatServerError(err, language.t),
-        })
-      })
-      .finally(() => {
-        setUi("git", false)
-      })
-  }
-
  let inputRef!: HTMLDivElement
  let promptDock: HTMLDivElement | undefined
  let dockHeight = 0
@@ -771,35 +720,29 @@ export default function Page() {
    showAllFiles,
    tabForPath: file.tab,
    openTab: tabs().open,
-    setActive: tabs().setActive,
    loadFile: file.load,
  })

  const changesOptions = ["session", "turn"] as const
  const changesOptionsList = [...changesOptions]

-  const changesTitle = () => {
-    if (!hasReview()) {
-      return null
-    }
-
-    return (
-      <Select
-        options={changesOptionsList}
-        current={store.changes}
-        label={(option) =>
-          option === "session" ? language.t("ui.sessionReview.title") : language.t("ui.sessionReview.title.lastTurn")
-        }
-        onSelect={(option) => option && setStore("changes", option)}
-        variant="ghost"
-        size="small"
-        valueClass="text-14-medium"
-      />
-    )
-  }
+  const changesTitle = () => (
+    <Select
+      options={changesOptionsList}
+      current={store.changes}
+      label={(option) =>
+        option === "session" ? language.t("ui.sessionReview.title") : language.t("ui.sessionReview.title.lastTurn")
+      }
+      onSelect={(option) => option && setStore("changes", option)}
+      variant="ghost"
+      size="small"
+      valueClass="text-14-medium"
+    />
+  )

  const emptyTurn = () => (
-    <div class="h-full pb-64 -mt-4 flex flex-col items-center justify-center text-center gap-6">
+    <div class="h-full pb-30 flex flex-col items-center justify-center text-center gap-6">
+      <Mark class="w-14 opacity-10" />
      <div class="text-14-regular text-text-weak max-w-56">{language.t("session.review.noChanges")}</div>
    </div>
  )
@@ -865,23 +808,9 @@ export default function Page() {
            empty={
              store.changes === "turn" ? (
                emptyTurn()
-              ) : reviewEmptyKey() === "session.review.noVcs" ? (
-                <div class={input.emptyClass}>
-                  <div class="flex flex-col gap-3">
-                    <div class="text-14-medium text-text-strong">Create a Git repository</div>
-                    <div
-                      class="text-14-regular text-text-base max-w-md"
-                      style={{ "line-height": "var(--line-height-normal)" }}
-                    >
-                      Track, review, and undo changes in this project
-                    </div>
-                  </div>
-                  <Button size="large" disabled={ui.git} onClick={initGit}>
-                    {ui.git ? "Creating Git repository..." : "Create Git repository"}
-                  </Button>
-                </div>
              ) : (
                <div class={input.emptyClass}>
+                  <Mark class="w-14 opacity-10" />
                  <div class="text-14-regular text-text-weak max-w-56">{language.t(reviewEmptyKey())}</div>
                </div>
              )
@@ -914,7 +843,7 @@ export default function Page() {
          diffStyle: layout.review.diffStyle(),
          onDiffStyleChange: layout.review.setDiffStyle,
          loadingClass: "px-6 py-4 text-text-weak",
-          emptyClass: "h-full pb-64 -mt-4 flex flex-col items-center justify-center text-center gap-6",
+          emptyClass: "h-full pb-30 flex flex-col items-center justify-center text-center gap-6",
        })}
      </div>
    </div>
@@ -1038,6 +967,23 @@ export default function Page() {
    tabs().setActive(next)
  })

+  createEffect(
+    on(
+      () => layout.fileTree.opened(),
+      (opened, prev) => {
+        if (prev === undefined) return
+        if (!isDesktop()) return
+
+        if (opened) {
+          const active = tabs().active()
+          const tab = active === "review" || (!active && hasReview()) ? "changes" : "all"
+          layout.fileTree.setTab(tab)
+        }
+      },
+      { defer: true },
+    ),
+  )
+
  createEffect(() => {
    const id = params.id
    if (!id) return
@@ -1098,7 +1044,7 @@ export default function Page() {
  const updateScrollState = (el: HTMLDivElement) => {
    const max = el.scrollHeight - el.clientHeight
    const overflow = max > 1
-    const bottom = !overflow || Math.abs(el.scrollTop) <= 2 || !autoScroll.userScrolled()
+    const bottom = !overflow || el.scrollTop >= max - 2

    if (ui.scroll.overflow === overflow && ui.scroll.bottom === bottom) return
    setUi("scroll", { overflow, bottom })
@@ -1121,7 +1067,7 @@ export default function Page() {

  const resumeScroll = () => {
    setStore("messageId", undefined)
-    autoScroll.smoothScrollToBottom()
+    autoScroll.forceScrollToBottom()
    clearMessageHash()

    const el = scroller
@@ -1189,11 +1135,13 @@ export default function Page() {

      const el = scroller
      const delta = next - dockHeight
-      const stick = el ? Math.abs(el.scrollTop) < 10 + Math.max(0, delta) : false
+      const stick = el
+        ? !autoScroll.userScrolled() || el.scrollHeight - el.clientHeight - el.scrollTop < 10 + Math.max(0, delta)
+        : false

      dockHeight = next

-      if (stick) autoScroll.smoothScrollToBottom()
+      if (stick) autoScroll.forceScrollToBottom()

      if (el) scheduleScrollState(el)
      scrollSpy.markDirty()
@@ -1244,9 +1192,9 @@ export default function Page() {
        {/* Session panel */}
        <div
          classList={{
-            "@container relative shrink-0 flex flex-col min-h-0 h-full bg-background-stronger flex-1 md:flex-none": true,
-            "transition-[width] duration-[240ms] ease-[cubic-bezier(0.22,1,0.36,1)] will-change-[width] motion-reduce:transition-none":
-              !size.active(),
+            "@container relative shrink-0 flex flex-col min-h-0 h-full bg-background-stronger": true,
+            "flex-1": true,
+            "md:flex-none": desktopSidePanelOpen(),
          }}
          style={{
            width: sessionPanelWidth(),
@@ -1266,7 +1214,7 @@ export default function Page() {
                        container: "px-4",
                      },
                      loadingClass: "px-4 py-4 text-text-weak",
-                      emptyClass: "h-full pb-64 -mt-4 flex flex-col items-center justify-center text-center gap-6",
+                      emptyClass: "h-full pb-30 flex flex-col items-center justify-center text-center gap-6",
                    })}
                    scroll={ui.scroll}
                    onResumeScroll={resumeScroll}
@@ -1279,7 +1227,6 @@ export default function Page() {
                    onScrollSpyScroll={scrollSpy.onScroll}
                    onTurnBackfillScroll={historyWindow.onScrollerScroll}
                    onAutoScrollInteraction={autoScroll.handleInteraction}
-                    onPreserveScrollAnchor={autoScroll.preserve}
                    centered={centered()}
                    setContentRef={(el) => {
                      content = el
@@ -1343,27 +1290,17 @@ export default function Page() {
          />

          <Show when={desktopReviewOpen()}>
-            <div onPointerDown={() => size.start()}>
-              <ResizeHandle
-                direction="horizontal"
-                size={layout.session.width()}
-                min={450}
-                max={typeof window === "undefined" ? 1000 : window.innerWidth * 0.45}
-                onResize={(width) => {
-                  size.touch()
-                  layout.session.resize(width)
-                }}
-              />
-            </div>
+            <ResizeHandle
+              direction="horizontal"
+              size={layout.session.width()}
+              min={450}
+              max={typeof window === "undefined" ? 1000 : window.innerWidth * 0.45}
+              onResize={layout.session.resize}
+            />
          </Show>
        </div>

-        <SessionSidePanel
-          reviewPanel={reviewPanel}
-          activeDiff={tree.activeDiff}
-          focusReviewDiff={focusReviewDiff}
-          size={size}
-        />
+        <SessionSidePanel reviewPanel={reviewPanel} activeDiff={tree.activeDiff} focusReviewDiff={focusReviewDiff} />
      </div>

      <TerminalPanel />
--- a/packages/app/src/pages/session/composer/session-composer-region.tsx
+++ b/packages/app/src/pages/session/composer/session-composer-region.tsx
@@ -140,7 +140,7 @@ export function SessionComposerRegion(props: {
      <div
        classList={{
          "w-full px-3 pointer-events-auto": true,
-          "md:max-w-[500px] md:mx-auto 2xl:max-w-[700px]": props.centered,
+          "md:max-w-200 md:mx-auto 2xl:max-w-[1000px]": props.centered,
        }}
      >
        <Show when={props.state.questionRequest()} keyed>
--- a/packages/app/src/pages/session/composer/session-question-dock.tsx
+++ b/packages/app/src/pages/session/composer/session-question-dock.tsx
@@ -3,7 +3,6 @@ import { createStore } from "solid-js/store"
 import { Button } from "@opencode-ai/ui/button"
 import { DockPrompt } from "@opencode-ai/ui/dock-prompt"
 import { Icon } from "@opencode-ai/ui/icon"
-import { IconButton } from "@opencode-ai/ui/icon-button"
 import { showToast } from "@opencode-ai/ui/toast"
 import type { QuestionAnswer, QuestionRequest } from "@opencode-ai/sdk/v2"
 import { useLanguage } from "@/context/language"
@@ -26,7 +25,6 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
    customOn: cached?.customOn ?? ([] as boolean[]),
    editing: false,
    sending: false,
-    collapsed: false,
  })

  let root: HTMLDivElement | undefined
@@ -37,7 +35,6 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
  const input = createMemo(() => store.custom[store.tab] ?? "")
  const on = createMemo(() => store.customOn[store.tab] === true)
  const multi = createMemo(() => question()?.multiple === true)
-  const picked = createMemo(() => store.answers[store.tab]?.length ?? 0)

  const summary = createMemo(() => {
    const n = Math.min(store.tab + 1, total())
@@ -46,8 +43,6 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit

  const last = createMemo(() => store.tab >= total() - 1)

-  const fold = () => setStore("collapsed", (value) => !value)
-
  const customUpdate = (value: string, selected: boolean = on()) => {
    const prev = input().trim()
    const next = value.trim()
@@ -262,21 +257,9 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
      kind="question"
      ref={(el) => (root = el)}
      header={
-        <div
-          data-action="session-question-toggle"
-          class="flex flex-1 min-w-0 items-center gap-2 cursor-default select-none"
-          role="button"
-          tabIndex={0}
-          style={{ margin: "0 -10px", padding: "0 0 0 10px" }}
-          onClick={fold}
-          onKeyDown={(event) => {
-            if (event.key !== "Enter" && event.key !== " ") return
-            event.preventDefault()
-            fold()
-          }}
-        >
+        <>
          <div data-slot="question-header-title">{summary()}</div>
-          <div data-slot="question-progress" class="ml-auto mr-1">
+          <div data-slot="question-progress">
            <For each={questions()}>
              {(_, i) => (
                <button
@@ -288,38 +271,13 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
                    (store.customOn[i()] === true && (store.custom[i()] ?? "").trim().length > 0)
                  }
                  disabled={store.sending}
-                  onMouseDown={(event) => {
-                    event.preventDefault()
-                    event.stopPropagation()
-                  }}
-                  onClick={(event) => {
-                    event.stopPropagation()
-                    jump(i())
-                  }}
+                  onClick={() => jump(i())}
                  aria-label={`${language.t("ui.tool.questions")} ${i() + 1}`}
                />
              )}
            </For>
          </div>
-          <div>
-            <IconButton
-              data-action="session-question-toggle-button"
-              icon="chevron-down"
-              size="normal"
-              variant="ghost"
-              classList={{ "rotate-180": store.collapsed }}
-              onMouseDown={(event) => {
-                event.preventDefault()
-                event.stopPropagation()
-              }}
-              onClick={(event) => {
-                event.stopPropagation()
-                fold()
-              }}
-              aria-label={store.collapsed ? language.t("session.todo.expand") : language.t("session.todo.collapse")}
-            />
-          </div>
-        </div>
+        </>
      }
      footer={
        <>
@@ -339,121 +297,56 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
        </>
      }
    >
-      <div
-        data-slot="question-text"
-        class="cursor-default"
-        classList={{
-          "mb-6": store.collapsed && picked() === 0,
-        }}
-        role={store.collapsed ? "button" : undefined}
-        tabIndex={store.collapsed ? 0 : undefined}
-        onClick={fold}
-        onKeyDown={(event) => {
-          if (!store.collapsed) return
-          if (event.key !== "Enter" && event.key !== " ") return
-          event.preventDefault()
-          fold()
-        }}
-      >
-        {question()?.question}
-      </div>
-      <Show when={store.collapsed && picked() > 0}>
-        <div data-slot="question-hint" class="cursor-default mb-6">
-          {picked()} answer{picked() === 1 ? "" : "s"} selected
-        </div>
+      <div data-slot="question-text">{question()?.question}</div>
+      <Show when={multi()} fallback={<div data-slot="question-hint">{language.t("ui.question.singleHint")}</div>}>
+        <div data-slot="question-hint">{language.t("ui.question.multiHint")}</div>
      </Show>
-      <div data-slot="question-answers" hidden={store.collapsed} aria-hidden={store.collapsed}>
-        <Show when={multi()} fallback={<div data-slot="question-hint">{language.t("ui.question.singleHint")}</div>}>
-          <div data-slot="question-hint">{language.t("ui.question.multiHint")}</div>
-        </Show>
-        <div data-slot="question-options">
-          <For each={options()}>
-            {(opt, i) => {
-              const picked = () => store.answers[store.tab]?.includes(opt.label) ?? false
-              return (
-                <button
-                  data-slot="question-option"
-                  data-picked={picked()}
-                  role={multi() ? "checkbox" : "radio"}
-                  aria-checked={picked()}
-                  disabled={store.sending}
-                  onClick={() => selectOption(i())}
-                >
-                  <span data-slot="question-option-check" aria-hidden="true">
-                    <span
-                      data-slot="question-option-box"
-                      data-type={multi() ? "checkbox" : "radio"}
-                      data-picked={picked()}
-                    >
-                      <Show when={multi()} fallback={<span data-slot="question-option-radio-dot" />}>
-                        <Icon name="check-small" size="small" />
-                      </Show>
-                    </span>
-                  </span>
-                  <span data-slot="question-option-main">
-                    <span data-slot="option-label">{opt.label}</span>
-                    <Show when={opt.description}>
-                      <span data-slot="option-description">{opt.description}</span>
-                    </Show>
-                  </span>
-                </button>
-              )
-            }}
-          </For>
-
-          <Show
-            when={store.editing}
-            fallback={
+      <div data-slot="question-options">
+        <For each={options()}>
+          {(opt, i) => {
+            const picked = () => store.answers[store.tab]?.includes(opt.label) ?? false
+            return (
              <button
                data-slot="question-option"
-                data-custom="true"
-                data-picked={on()}
+                data-picked={picked()}
                role={multi() ? "checkbox" : "radio"}
-                aria-checked={on()}
+                aria-checked={picked()}
                disabled={store.sending}
-                onClick={customOpen}
+                onClick={() => selectOption(i())}
              >
-                <span
-                  data-slot="question-option-check"
-                  aria-hidden="true"
-                  onClick={(e) => {
-                    e.preventDefault()
-                    e.stopPropagation()
-                    customToggle()
-                  }}
-                >
-                  <span data-slot="question-option-box" data-type={multi() ? "checkbox" : "radio"} data-picked={on()}>
+                <span data-slot="question-option-check" aria-hidden="true">
+                  <span
+                    data-slot="question-option-box"
+                    data-type={multi() ? "checkbox" : "radio"}
+                    data-picked={picked()}
+                  >
                    <Show when={multi()} fallback={<span data-slot="question-option-radio-dot" />}>
                      <Icon name="check-small" size="small" />
                    </Show>
                  </span>
                </span>
                <span data-slot="question-option-main">
-                  <span data-slot="option-label">{language.t("ui.messagePart.option.typeOwnAnswer")}</span>
-                  <span data-slot="option-description">{input() || language.t("ui.question.custom.placeholder")}</span>
+                  <span data-slot="option-label">{opt.label}</span>
+                  <Show when={opt.description}>
+                    <span data-slot="option-description">{opt.description}</span>
+                  </Show>
                </span>
              </button>
-            }
-          >
-            <form
+            )
+          }}
+        </For>
+
+        <Show
+          when={store.editing}
+          fallback={
+            <button
              data-slot="question-option"
              data-custom="true"
              data-picked={on()}
              role={multi() ? "checkbox" : "radio"}
              aria-checked={on()}
-              onMouseDown={(e) => {
-                if (store.sending) {
-                  e.preventDefault()
-                  return
-                }
-                if (e.target instanceof HTMLTextAreaElement) return
-                const input = e.currentTarget.querySelector('[data-slot="question-custom-input"]')
-                if (input instanceof HTMLTextAreaElement) input.focus()
-              }}
-              onSubmit={(e) => {
-                e.preventDefault()
-                commitCustom()
-              }}
+              disabled={store.sending}
+              onClick={customOpen}
            >
              <span
                data-slot="question-option-check"
@@ -472,39 +365,80 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
              </span>
              <span data-slot="question-option-main">
                <span data-slot="option-label">{language.t("ui.messagePart.option.typeOwnAnswer")}</span>
-                <textarea
-                  ref={(el) =>
-                    setTimeout(() => {
-                      el.focus()
-                      el.style.height = "0px"
-                      el.style.height = `${el.scrollHeight}px`
-                    }, 0)
-                  }
-                  data-slot="question-custom-input"
-                  placeholder={language.t("ui.question.custom.placeholder")}
-                  value={input()}
-                  rows={1}
-                  disabled={store.sending}
-                  onKeyDown={(e) => {
-                    if (e.key === "Escape") {
-                      e.preventDefault()
-                      setStore("editing", false)
-                      return
-                    }
-                    if (e.key !== "Enter" || e.shiftKey) return
-                    e.preventDefault()
-                    commitCustom()
-                  }}
-                  onInput={(e) => {
-                    customUpdate(e.currentTarget.value)
-                    e.currentTarget.style.height = "0px"
-                    e.currentTarget.style.height = `${e.currentTarget.scrollHeight}px`
-                  }}
-                />
+                <span data-slot="option-description">{input() || language.t("ui.question.custom.placeholder")}</span>
              </span>
-            </form>
-          </Show>
-        </div>
+            </button>
+          }
+        >
+          <form
+            data-slot="question-option"
+            data-custom="true"
+            data-picked={on()}
+            role={multi() ? "checkbox" : "radio"}
+            aria-checked={on()}
+            onMouseDown={(e) => {
+              if (store.sending) {
+                e.preventDefault()
+                return
+              }
+              if (e.target instanceof HTMLTextAreaElement) return
+              const input = e.currentTarget.querySelector('[data-slot="question-custom-input"]')
+              if (input instanceof HTMLTextAreaElement) input.focus()
+            }}
+            onSubmit={(e) => {
+              e.preventDefault()
+              commitCustom()
+            }}
+          >
+            <span
+              data-slot="question-option-check"
+              aria-hidden="true"
+              onClick={(e) => {
+                e.preventDefault()
+                e.stopPropagation()
+                customToggle()
+              }}
+            >
+              <span data-slot="question-option-box" data-type={multi() ? "checkbox" : "radio"} data-picked={on()}>
+                <Show when={multi()} fallback={<span data-slot="question-option-radio-dot" />}>
+                  <Icon name="check-small" size="small" />
+                </Show>
+              </span>
+            </span>
+            <span data-slot="question-option-main">
+              <span data-slot="option-label">{language.t("ui.messagePart.option.typeOwnAnswer")}</span>
+              <textarea
+                ref={(el) =>
+                  setTimeout(() => {
+                    el.focus()
+                    el.style.height = "0px"
+                    el.style.height = `${el.scrollHeight}px`
+                  }, 0)
+                }
+                data-slot="question-custom-input"
+                placeholder={language.t("ui.question.custom.placeholder")}
+                value={input()}
+                rows={1}
+                disabled={store.sending}
+                onKeyDown={(e) => {
+                  if (e.key === "Escape") {
+                    e.preventDefault()
+                    setStore("editing", false)
+                    return
+                  }
+                  if (e.key !== "Enter" || e.shiftKey) return
+                  e.preventDefault()
+                  commitCustom()
+                }}
+                onInput={(e) => {
+                  customUpdate(e.currentTarget.value)
+                  e.currentTarget.style.height = "0px"
+                  e.currentTarget.style.height = `${e.currentTarget.scrollHeight}px`
+                }}
+              />
+            </span>
+          </form>
+        </Show>
      </div>
    </DockPrompt>
  )
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Adam	70eaf3545e	wip(app): mcp settings	2026-03-05 08:46:49 -06:00
Adam	664f4c0a68	wip(app): mcp settings	2026-03-05 08:46:49 -06:00