fix: keep cleared modified files hidden across new diff updates

fix: let users clear sidebar modified files without mutating diff state
2026-02-18 14:54:17 +00:00 · 2026-02-14 17:03:23 -05:00 · 2026-02-14 15:59:53 -05:00
148 changed files with 932 additions and 2171 deletions
--- a/.opencode/agent/translator.md
+++ b/.opencode/agent/translator.md
@@ -359,7 +359,6 @@ opencode serve --hostname 0.0.0.0 --port 4096
 opencode serve [--port <number>] [--hostname <string>] [--cors <origin>]
 opencode session [command]
 opencode session list
-opencode session delete <sessionID>
 opencode stats
 opencode uninstall
 opencode upgrade
@@ -599,7 +598,6 @@ OPENCODE_EXPERIMENTAL_MARKDOWN
 OPENCODE_EXPERIMENTAL_OUTPUT_TOKEN_MAX
 OPENCODE_EXPERIMENTAL_OXFMT
 OPENCODE_EXPERIMENTAL_PLAN_MODE
-OPENCODE_ENABLE_QUESTION_TOOL
 OPENCODE_FAKE_VCS
 OPENCODE_GIT_BASH_PATH
 OPENCODE_MODEL
--- a/.opencode/opencode.jsonc
+++ b/.opencode/opencode.jsonc
@@ -1,5 +1,8 @@
 {
  "$schema": "https://opencode.ai/config.json",
+  // "enterprise": {
+  //   "url": "https://enterprise.dev.opencode.ai",
+  // },
  "provider": {
    "opencode": {
      "options": {},
--- a/README.ar.md
+++ b/README.ar.md
@@ -31,8 +31,7 @@
  <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.tr.md">Türkçe</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.br.md
+++ b/README.br.md
@@ -31,8 +31,7 @@
  <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.tr.md">Türkçe</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.bs.md
+++ b/README.bs.md
@@ -32,8 +32,7 @@
  <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.tr.md">Türkçe</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.da.md
+++ b/README.da.md
@@ -31,8 +31,7 @@
  <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.tr.md">Türkçe</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.de.md
+++ b/README.de.md
@@ -31,8 +31,7 @@
  <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.tr.md">Türkçe</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.es.md
+++ b/README.es.md
@@ -31,8 +31,7 @@
  <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.tr.md">Türkçe</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.fr.md
+++ b/README.fr.md
@@ -31,8 +31,7 @@
  <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.tr.md">Türkçe</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.it.md
+++ b/README.it.md
@@ -31,8 +31,7 @@
  <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.tr.md">Türkçe</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.ja.md
+++ b/README.ja.md
@@ -31,8 +31,7 @@
  <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.tr.md">Türkçe</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.ko.md
+++ b/README.ko.md
@@ -31,8 +31,7 @@
  <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.tr.md">Türkçe</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.md
+++ b/README.md
@@ -32,8 +32,7 @@
  <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.tr.md">Türkçe</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.no.md
+++ b/README.no.md
@@ -31,8 +31,7 @@
  <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.tr.md">Türkçe</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.pl.md
+++ b/README.pl.md
@@ -31,8 +31,7 @@
  <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.tr.md">Türkçe</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.ru.md
+++ b/README.ru.md
@@ -31,8 +31,7 @@
  <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.tr.md">Türkçe</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.th.md
+++ b/README.th.md
@@ -31,8 +31,7 @@
  <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.tr.md">Türkçe</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.tr.md
+++ b/README.tr.md
@@ -31,8 +31,7 @@
  <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.tr.md">Türkçe</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.uk.md
+++ b/README.uk.md
@@ -1,139 +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">AI-агент для програмування з відкритим кодом.</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>
-</p>
-
-[![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
-
---
-
-### Встановлення
-
-```bash
-# YOLO
-curl -fsSL https://opencode.ai/install | bash
-
-# Менеджери пакетів
-npm i -g opencode-ai@latest        # або bun/pnpm/yarn
-scoop install opencode             # Windows
-choco install opencode             # Windows
-brew install anomalyco/tap/opencode # macOS і Linux (рекомендовано, завжди актуально)
-brew install opencode              # macOS і Linux (офіційна формула Homebrew, оновлюється рідше)
-sudo pacman -S opencode            # Arch Linux (Stable)
-paru -S opencode-bin               # Arch Linux (Latest from AUR)
-mise use -g opencode               # Будь-яка ОС
-nix run nixpkgs#opencode           # або github:anomalyco/opencode для найновішої dev-гілки
-```
-
-> [!TIP]
-> Перед встановленням видаліть версії старші за 0.1.x.
-
-### Десктопний застосунок (BETA)
-
-OpenCode також доступний як десктопний застосунок. Завантажуйте напряму зі [сторінки релізів](https://github.com/anomalyco/opencode/releases) або [opencode.ai/download](https://opencode.ai/download).
-
-| Платформа             | Завантаження                          |
-| --------------------- | ------------------------------------- |
-| macOS (Apple Silicon) | `opencode-desktop-darwin-aarch64.dmg` |
-| macOS (Intel)         | `opencode-desktop-darwin-x64.dmg`     |
-| Windows               | `opencode-desktop-windows-x64.exe`    |
-| Linux                 | `.deb`, `.rpm` або AppImage           |
-
-```bash
-# macOS (Homebrew)
-brew install --cask opencode-desktop
-# Windows (Scoop)
-scoop bucket add extras; scoop install extras/opencode-desktop
-```
-
-#### Каталог встановлення
-
-Скрипт встановлення дотримується такого порядку пріоритету для шляху встановлення:
-
-1. `$OPENCODE_INSTALL_DIR` - Користувацький каталог встановлення
-2. `$XDG_BIN_DIR` - Шлях, сумісний зі специфікацією XDG Base Directory
-3. `$HOME/bin` - Стандартний каталог користувацьких бінарників (якщо існує або його можна створити)
-4. `$HOME/.opencode/bin` - Резервний варіант за замовчуванням
-
-```bash
-# Приклади
-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
-```
-
-### Агенти
-
-OpenCode містить два вбудовані агенти, між якими можна перемикатися клавішею `Tab`.
-
- **build** - Агент за замовчуванням із повним доступом для завдань розробки
- **plan** - Агент лише для читання для аналізу та дослідження коду
-  - За замовчуванням забороняє редагування файлів
-  - Запитує дозвіл перед запуском bash-команд
-  - Ідеально підходить для дослідження незнайомих кодових баз або планування змін
-
-Також доступний допоміжний агент **general** для складного пошуку та багатокрокових завдань.
-Він використовується всередині системи й може бути викликаний у повідомленнях через `@general`.
-
-Дізнайтеся більше про [agents](https://opencode.ai/docs/agents).
-
-### Документація
-
-Щоб дізнатися більше про налаштування OpenCode, [**перейдіть до нашої документації**](https://opencode.ai/docs).
-
-### Внесок
-
-Якщо ви хочете зробити внесок в OpenCode, будь ласка, прочитайте нашу [документацію для контриб'юторів](./CONTRIBUTING.md) перед надсиланням pull request.
-
-### Проєкти на базі OpenCode
-
-Якщо ви працюєте над проєктом, пов'язаним з OpenCode, і використовуєте "opencode" у назві, наприклад "opencode-dashboard" або "opencode-mobile", додайте примітку до свого README.
-Уточніть, що цей проєкт не створений командою OpenCode і жодним чином не афілійований із нами.
-
-### FAQ
-
-#### Чим це відрізняється від Claude Code?
-
-За можливостями це дуже схоже на Claude Code. Ось ключові відмінності:
-
- 100% open source
- Немає прив'язки до конкретного провайдера. Ми рекомендуємо моделі, які надаємо через [OpenCode Zen](https://opencode.ai/zen), але OpenCode також працює з Claude, OpenAI, Google і навіть локальними моделями. З розвитком моделей різниця між ними зменшуватиметься, а ціни падатимуть, тому незалежність від провайдера має значення.
- Підтримка LSP з коробки
- Фокус на TUI. OpenCode створено користувачами neovim та авторами [terminal.shop](https://terminal.shop); ми й надалі розширюватимемо межі можливого в терміналі.
- Клієнт-серверна архітектура. Наприклад, це дає змогу запускати OpenCode на вашому комп'ютері й керувати ним віддалено з мобільного застосунку, тобто TUI-фронтенд - лише один із можливих клієнтів.
-
---
-
-**Приєднуйтеся до нашої спільноти** [Discord](https://discord.gg/opencode) | [X.com](https://x.com/opencode)
--- a/README.zh.md
+++ b/README.zh.md
@@ -31,8 +31,7 @@
  <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.tr.md">Türkçe</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/README.zht.md
+++ b/README.zht.md
@@ -31,8 +31,7 @@
  <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.tr.md">Türkçe</a>
 </p>

 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
--- a/bun.lock
+++ b/bun.lock
@@ -23,7 +23,7 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "1.2.6",
+      "version": "1.2.2",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -73,7 +73,7 @@
    },
    "packages/console/app": {
      "name": "@opencode-ai/console-app",
-      "version": "1.2.6",
+      "version": "1.2.2",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -107,7 +107,7 @@
    },
    "packages/console/core": {
      "name": "@opencode-ai/console-core",
-      "version": "1.2.6",
+      "version": "1.2.2",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -134,7 +134,7 @@
    },
    "packages/console/function": {
      "name": "@opencode-ai/console-function",
-      "version": "1.2.6",
+      "version": "1.2.2",
      "dependencies": {
        "@ai-sdk/anthropic": "2.0.0",
        "@ai-sdk/openai": "2.0.2",
@@ -158,7 +158,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode-ai/console-mail",
-      "version": "1.2.6",
+      "version": "1.2.2",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -182,7 +182,7 @@
    },
    "packages/desktop": {
      "name": "@opencode-ai/desktop",
-      "version": "1.2.6",
+      "version": "1.2.2",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -215,7 +215,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode-ai/enterprise",
-      "version": "1.2.6",
+      "version": "1.2.2",
      "dependencies": {
        "@opencode-ai/ui": "workspace:*",
        "@opencode-ai/util": "workspace:*",
@@ -244,7 +244,7 @@
    },
    "packages/function": {
      "name": "@opencode-ai/function",
-      "version": "1.2.6",
+      "version": "1.2.2",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -260,7 +260,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "1.2.6",
+      "version": "1.2.2",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -288,8 +288,8 @@
        "@ai-sdk/vercel": "1.0.33",
        "@ai-sdk/xai": "2.0.51",
        "@clack/prompts": "1.0.0-alpha.1",
-        "@gitlab/gitlab-ai-provider": "3.5.1",
-        "@gitlab/opencode-gitlab-auth": "1.3.3",
+        "@gitlab/gitlab-ai-provider": "3.5.0",
+        "@gitlab/opencode-gitlab-auth": "1.3.2",
        "@hono/standard-validator": "0.1.5",
        "@hono/zod-validator": "catalog:",
        "@modelcontextprotocol/sdk": "1.25.2",
@@ -369,7 +369,7 @@
    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
-      "version": "1.2.6",
+      "version": "1.2.2",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "zod": "catalog:",
@@ -389,7 +389,7 @@
    },
    "packages/sdk/js": {
      "name": "@opencode-ai/sdk",
-      "version": "1.2.6",
+      "version": "1.2.2",
      "devDependencies": {
        "@hey-api/openapi-ts": "0.90.10",
        "@tsconfig/node22": "catalog:",
@@ -400,7 +400,7 @@
    },
    "packages/slack": {
      "name": "@opencode-ai/slack",
-      "version": "1.2.6",
+      "version": "1.2.2",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "@slack/bolt": "^3.17.1",
@@ -413,7 +413,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "1.2.6",
+      "version": "1.2.2",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -455,7 +455,7 @@
    },
    "packages/util": {
      "name": "@opencode-ai/util",
-      "version": "1.2.6",
+      "version": "1.2.2",
      "dependencies": {
        "zod": "catalog:",
      },
@@ -466,7 +466,7 @@
    },
    "packages/web": {
      "name": "@opencode-ai/web",
-      "version": "1.2.6",
+      "version": "1.2.2",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -989,9 +989,9 @@

    "@fontsource/inter": ["@fontsource/inter@5.2.8", "", {}, "sha512-P6r5WnJoKiNVV+zvW2xM13gNdFhAEpQ9dQJHt3naLvfg+LkF2ldgSLiF4T41lf1SQCM9QmkqPTn4TH568IRagg=="],

-    "@gitlab/gitlab-ai-provider": ["@gitlab/gitlab-ai-provider@3.5.1", "", { "dependencies": { "@anthropic-ai/sdk": "^0.71.0", "@anycable/core": "^0.9.2", "graphql-request": "^6.1.0", "isomorphic-ws": "^5.0.0", "openai": "^6.16.0", "socket.io-client": "^4.8.1", "vscode-jsonrpc": "^8.2.1", "zod": "^3.25.76" }, "peerDependencies": { "@ai-sdk/provider": ">=2.0.0", "@ai-sdk/provider-utils": ">=3.0.0" } }, "sha512-I8+EGdUeKmGJSjAdFobHtqpxM9Fm00w0j7NJbtln/D/XQ1SKEGoZIuqJko4v0pV2mkhGUIs7qezljH/2kbXovA=="],
+    "@gitlab/gitlab-ai-provider": ["@gitlab/gitlab-ai-provider@3.5.0", "", { "dependencies": { "@anthropic-ai/sdk": "^0.71.0", "@anycable/core": "^0.9.2", "graphql-request": "^6.1.0", "isomorphic-ws": "^5.0.0", "openai": "^6.16.0", "socket.io-client": "^4.8.1", "vscode-jsonrpc": "^8.2.1", "zod": "^3.25.76" }, "peerDependencies": { "@ai-sdk/provider": ">=2.0.0", "@ai-sdk/provider-utils": ">=3.0.0" } }, "sha512-OoAwCz4fOci3h/2l+PRHMclclh3IaFq8w1es2wvBJ8ca7vtglKsBYT7dvmYpsXlu7pg9mopbjcexvmVCQEUTAQ=="],

-    "@gitlab/opencode-gitlab-auth": ["@gitlab/opencode-gitlab-auth@1.3.3", "", { "dependencies": { "@fastify/rate-limit": "^10.2.0", "@opencode-ai/plugin": "*", "fastify": "^5.2.0", "open": "^10.0.0" } }, "sha512-FT+KsCmAJjtqWr1YAq0MywGgL9kaLQ4apmsoowAXrPqHtoYf2i/nY10/A+L06kNj22EATeEDRpbB1NWXMto/SA=="],
+    "@gitlab/opencode-gitlab-auth": ["@gitlab/opencode-gitlab-auth@1.3.2", "", { "dependencies": { "@fastify/rate-limit": "^10.2.0", "@opencode-ai/plugin": "*", "fastify": "^5.2.0", "open": "^10.0.0" } }, "sha512-pvGrC+aDVLY8bRCC/fZaG/Qihvt2r4by5xbTo5JTSz9O7yIcR6xG2d9Wkuu4bcXFz674z2C+i5bUk+J/RSdBpg=="],

    "@graphql-typed-document-node/core": ["@graphql-typed-document-node/core@3.2.0", "", { "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" } }, "sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ=="],

--- a/nix/hashes.json
+++ b/nix/hashes.json
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-C3WIEER2XgzO85wk2sp3BzQ6dknW026zslD8nKZjo2U=",
-    "aarch64-linux": "sha256-+tTJHZMZ/+8fAjI/1fUTuca8J2MZfB+5vhBoZ7jgqcE=",
-    "aarch64-darwin": "sha256-vS82puFGBBToxyIBa8Zi0KLKdJYr64T6HZL2rL32mH8=",
-    "x86_64-darwin": "sha256-Tr8JMTCxV6WVt3dXV7iq3PNCm2Cn+RXAbU9+o7pKKV0="
+    "x86_64-linux": "sha256-5pgd2xuvIIkTbIOGIdK5MIXo6O9qRpvk1RKQZ1e1R+8=",
+    "aarch64-linux": "sha256-FZiHwihM4b82ipQ9XfW08X+sd5CvZhx/+pU/8X1zsns=",
+    "aarch64-darwin": "sha256-iZv0w1NthV53pY5uvuf3JlI14GeKmCu7WHwGSRdEQeM=",
+    "x86_64-darwin": "sha256-c3Zm3P1goFPgg3vNAZPMFOhHX/gyTmsCN/PKbGO/v0E="
  }
 }
--- a/package.json
+++ b/package.json
@@ -87,8 +87,6 @@
    "url": "https://github.com/anomalyco/opencode"
  },
  "license": "MIT",
-  "randomField": "hello-world-12345",
-  "anotherRandomField": "xyz-abc-789",
  "prettier": {
    "semi": false,
    "printWidth": 120
--- a/packages/app/e2e/selectors.ts
+++ b/packages/app/e2e/selectors.ts
@@ -30,9 +30,6 @@ export const projectMenuTriggerSelector = (slug: string) =>

 export const projectCloseMenuSelector = (slug: string) => `[data-action="project-close-menu"][data-project="${slug}"]`

-export const projectClearNotificationsSelector = (slug: string) =>
-  `[data-action="project-clear-notifications"][data-project="${slug}"]`
-
 export const projectWorkspacesToggleSelector = (slug: string) =>
  `[data-action="project-workspaces-toggle"][data-project="${slug}"]`

--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.2.6",
+  "version": "1.2.2",
  "description": "",
  "type": "module",
  "exports": {
--- a/packages/app/src/components/file-tree.tsx
+++ b/packages/app/src/components/file-tree.tsx
@@ -21,8 +21,6 @@ import {
 import { Dynamic } from "solid-js/web"
 import type { FileNode } from "@opencode-ai/sdk/v2"

-const MAX_DEPTH = 128
-
 function pathToFileUrl(filepath: string): string {
  return `file://${encodeFilePath(filepath)}`
 }
@@ -262,20 +260,12 @@ export default function FileTree(props: {
  _marks?: Set<string>
  _deeps?: Map<string, number>
  _kinds?: ReadonlyMap<string, Kind>
-  _chain?: readonly string[]
 }) {
  const file = useFile()
  const level = props.level ?? 0
  const draggable = () => props.draggable ?? true
  const tooltip = () => props.tooltip ?? true

-  const key = (p: string) =>
-    file
-      .normalize(p)
-      .replace(/[\\/]+$/, "")
-      .replaceAll("\\", "/")
-  const chain = props._chain ? [...props._chain, key(props.path)] : [key(props.path)]
-
  const filter = createMemo(() => {
    if (props._filter) return props._filter

@@ -317,45 +307,23 @@ export default function FileTree(props: {

    const out = new Map<string, number>()

-    const root = props.path
-    if (!(file.tree.state(root)?.expanded ?? false)) return out
+    const visit = (dir: string, lvl: number): number => {
+      const expanded = file.tree.state(dir)?.expanded ?? false
+      if (!expanded) return -1

-    const seen = new Set<string>()
-    const stack: { dir: string; lvl: number; i: number; kids: string[]; max: number }[] = []
+      const nodes = file.tree.children(dir)
+      const max = nodes.reduce((max, node) => {
+        if (node.type !== "directory") return max
+        const open = file.tree.state(node.path)?.expanded ?? false
+        if (!open) return max
+        return Math.max(max, visit(node.path, lvl + 1))
+      }, lvl)

-    const push = (dir: string, lvl: number) => {
-      const id = key(dir)
-      if (seen.has(id)) return
-      seen.add(id)
-
-      const kids = file.tree
-        .children(dir)
-        .filter((node) => node.type === "directory" && (file.tree.state(node.path)?.expanded ?? false))
-        .map((node) => node.path)
-
-      stack.push({ dir, lvl, i: 0, kids, max: lvl })
-    }
-
-    push(root, level - 1)
-
-    while (stack.length > 0) {
-      const top = stack[stack.length - 1]!
-
-      if (top.i < top.kids.length) {
-        const next = top.kids[top.i]!
-        top.i++
-        push(next, top.lvl + 1)
-        continue
-      }
-
-      out.set(top.dir, top.max)
-      stack.pop()
-
-      const parent = stack[stack.length - 1]
-      if (!parent) continue
-      parent.max = Math.max(parent.max, top.max)
+      out.set(dir, max)
+      return max
    }

+    visit(props.path, level - 1)
    return out
  })

@@ -491,27 +459,21 @@ export default function FileTree(props: {
                      }}
                      style={`left: ${Math.max(0, 8 + level * 12 - 4) + 8}px`}
                    />
-                    <Show
-                      when={level < MAX_DEPTH && !chain.includes(key(node.path))}
-                      fallback={<div class="px-2 py-1 text-12-regular text-text-weak">...</div>}
-                    >
-                      <FileTree
-                        path={node.path}
-                        level={level + 1}
-                        allowed={props.allowed}
-                        modified={props.modified}
-                        kinds={props.kinds}
-                        active={props.active}
-                        draggable={props.draggable}
-                        tooltip={props.tooltip}
-                        onFileClick={props.onFileClick}
-                        _filter={filter()}
-                        _marks={marks()}
-                        _deeps={deeps()}
-                        _kinds={kinds()}
-                        _chain={chain}
-                      />
-                    </Show>
+                    <FileTree
+                      path={node.path}
+                      level={level + 1}
+                      allowed={props.allowed}
+                      modified={props.modified}
+                      kinds={props.kinds}
+                      active={props.active}
+                      draggable={props.draggable}
+                      tooltip={props.tooltip}
+                      onFileClick={props.onFileClick}
+                      _filter={filter()}
+                      _marks={marks()}
+                      _deeps={deeps()}
+                      _kinds={kinds()}
+                    />
                  </Collapsible.Content>
                </Collapsible>
              </Match>
--- a/packages/app/src/components/prompt-input.tsx
+++ b/packages/app/src/components/prompt-input.tsx
@@ -911,13 +911,31 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
      if (!collapsed) return

      const cursorPosition = getCursorPosition(editorRef)
+      const textLength = promptLength(prompt.current())
      const textContent = prompt
        .current()
        .map((part) => ("content" in part ? part.content : ""))
        .join("")
      const direction = event.key === "ArrowUp" ? "up" : "down"
-      if (!canNavigateHistoryAtCursor(direction, textContent, cursorPosition, store.historyIndex >= 0)) return
-      if (navigateHistory(direction)) {
+      if (!canNavigateHistoryAtCursor(direction, textContent, cursorPosition)) return
+      const isEmpty = textContent.trim() === "" || textLength <= 1
+      const hasNewlines = textContent.includes("\n")
+      const inHistory = store.historyIndex >= 0
+      const atStart = cursorPosition <= (isEmpty ? 1 : 0)
+      const atEnd = cursorPosition >= (isEmpty ? textLength - 1 : textLength)
+      const allowUp = isEmpty || atStart || (!hasNewlines && !inHistory) || (inHistory && atEnd)
+      const allowDown = isEmpty || atEnd || (!hasNewlines && !inHistory) || (inHistory && atStart)
+
+      if (direction === "up") {
+        if (!allowUp) return
+        if (navigateHistory("up")) {
+          event.preventDefault()
+        }
+        return
+      }
+
+      if (!allowDown) return
+      if (navigateHistory("down")) {
        event.preventDefault()
      }
      return
--- a/packages/app/src/components/prompt-input/history.test.ts
+++ b/packages/app/src/components/prompt-input/history.test.ts
@@ -73,7 +73,7 @@ describe("prompt-input history", () => {
    expect(original[1].selection?.startLine).toBe(1)
  })

-  test("canNavigateHistoryAtCursor only allows prompt boundaries", () => {
+  test("canNavigateHistoryAtCursor only allows multiline boundaries", () => {
    const value = "a\nb\nc"

    expect(canNavigateHistoryAtCursor("up", value, 0)).toBe(true)
@@ -85,16 +85,7 @@ describe("prompt-input history", () => {
    expect(canNavigateHistoryAtCursor("up", value, 5)).toBe(false)
    expect(canNavigateHistoryAtCursor("down", value, 5)).toBe(true)

-    expect(canNavigateHistoryAtCursor("up", "abc", 0)).toBe(true)
-    expect(canNavigateHistoryAtCursor("down", "abc", 3)).toBe(true)
-    expect(canNavigateHistoryAtCursor("up", "abc", 1)).toBe(false)
-    expect(canNavigateHistoryAtCursor("down", "abc", 1)).toBe(false)
-
-    expect(canNavigateHistoryAtCursor("up", "abc", 0, true)).toBe(true)
-    expect(canNavigateHistoryAtCursor("up", "abc", 3, true)).toBe(true)
-    expect(canNavigateHistoryAtCursor("down", "abc", 0, true)).toBe(true)
-    expect(canNavigateHistoryAtCursor("down", "abc", 3, true)).toBe(true)
-    expect(canNavigateHistoryAtCursor("up", "abc", 1, true)).toBe(false)
-    expect(canNavigateHistoryAtCursor("down", "abc", 1, true)).toBe(false)
+    expect(canNavigateHistoryAtCursor("up", "abc", 1)).toBe(true)
+    expect(canNavigateHistoryAtCursor("down", "abc", 1)).toBe(true)
  })
 })
--- a/packages/app/src/components/prompt-input/history.ts
+++ b/packages/app/src/components/prompt-input/history.ts
@@ -4,13 +4,11 @@ const DEFAULT_PROMPT: Prompt = [{ type: "text", content: "", start: 0, end: 0 }]

 export const MAX_HISTORY = 100

-export function canNavigateHistoryAtCursor(direction: "up" | "down", text: string, cursor: number, inHistory = false) {
+export function canNavigateHistoryAtCursor(direction: "up" | "down", text: string, cursor: number) {
+  if (!text.includes("\n")) return true
  const position = Math.max(0, Math.min(cursor, text.length))
-  const atStart = position === 0
-  const atEnd = position === text.length
-  if (inHistory) return atStart || atEnd
-  if (direction === "up") return position === 0
-  return position === text.length
+  if (direction === "up") return !text.slice(0, position).includes("\n")
+  return !text.slice(position).includes("\n")
 }

 export function clonePromptParts(prompt: Prompt): Prompt {
--- a/packages/app/src/components/settings-general.tsx
+++ b/packages/app/src/components/settings-general.tsx
@@ -128,7 +128,6 @@ export const SettingsGeneral: Component = () => {
    { value: "roboto-mono", label: "font.option.robotoMono" },
    { value: "source-code-pro", label: "font.option.sourceCodePro" },
    { value: "ubuntu-mono", label: "font.option.ubuntuMono" },
-    { value: "geist-mono", label: "font.option.geistMono" },
  ] as const
  const fontOptionsList = [...fontOptions]

--- a/packages/app/src/context/command.tsx
+++ b/packages/app/src/context/command.tsx
@@ -316,10 +316,8 @@ export const { use: useCommand, provider: CommandProvider } = createSimpleContex
      const isPalette = palette().has(sig)
      const option = keymap().get(sig)
      const modified = event.ctrlKey || event.metaKey || event.altKey
-      const isTab = event.key === "Tab"

-      if (isEditableTarget(event.target) && !isPalette && !isAllowedEditableKeybind(option?.id) && !modified && !isTab)
-        return
+      if (isEditableTarget(event.target) && !isPalette && !isAllowedEditableKeybind(option?.id) && !modified) return

      if (isPalette) {
        event.preventDefault()
--- a/packages/app/src/context/settings.tsx
+++ b/packages/app/src/context/settings.tsx
@@ -85,7 +85,6 @@ const monoFonts: Record<string, string> = {
  "roboto-mono": `"Roboto Mono Nerd Font", "RobotoMono Nerd Font", "RobotoMono Nerd Font Mono", "IBM Plex Mono", "IBM Plex Mono Fallback", ${monoFallback}`,
  "source-code-pro": `"Source Code Pro Nerd Font", "SauceCodePro Nerd Font", "SauceCodePro Nerd Font Mono", "IBM Plex Mono", "IBM Plex Mono Fallback", ${monoFallback}`,
  "ubuntu-mono": `"Ubuntu Mono Nerd Font", "UbuntuMono Nerd Font", "UbuntuMono Nerd Font Mono", "IBM Plex Mono", "IBM Plex Mono Fallback", ${monoFallback}`,
-  "geist-mono": `"GeistMono Nerd Font", "GeistMono Nerd Font Mono", "IBM Plex Mono", "IBM Plex Mono Fallback", ${monoFallback}`,
 }

 export function monoFontFamily(font: string | undefined) {
--- a/packages/app/src/i18n/ar.ts
+++ b/packages/app/src/i18n/ar.ts
@@ -509,7 +509,6 @@ export const dict = {
  "sidebar.gettingStarted.line2": "قم بتوصيل أي موفر لاستخدام النماذج، بما في ذلك Claude و GPT و Gemini وما إلى ذلك.",
  "sidebar.project.recentSessions": "الجلسات الحديثة",
  "sidebar.project.viewAllSessions": "عرض جميع الجلسات",
-  "sidebar.project.clearNotifications": "مسح الإشعارات",
  "app.name.desktop": "OpenCode Desktop",
  "settings.section.desktop": "سطح المكتب",
  "settings.section.server": "الخادم",
@@ -557,7 +556,6 @@ export const dict = {
  "font.option.robotoMono": "Roboto Mono",
  "font.option.sourceCodePro": "Source Code Pro",
  "font.option.ubuntuMono": "Ubuntu Mono",
-  "font.option.geistMono": "Geist Mono",
  "sound.option.alert01": "تنبيه 01",
  "sound.option.alert02": "تنبيه 02",
  "sound.option.alert03": "تنبيه 03",
--- a/packages/app/src/i18n/br.ts
+++ b/packages/app/src/i18n/br.ts
@@ -515,7 +515,6 @@ export const dict = {
  "sidebar.gettingStarted.line2": "Conecte qualquer provedor para usar modelos, incluindo Claude, GPT, Gemini etc.",
  "sidebar.project.recentSessions": "Sessões recentes",
  "sidebar.project.viewAllSessions": "Ver todas as sessões",
-  "sidebar.project.clearNotifications": "Limpar notificações",
  "app.name.desktop": "OpenCode Desktop",
  "settings.section.desktop": "Desktop",
  "settings.section.server": "Servidor",
@@ -563,7 +562,6 @@ export const dict = {
  "font.option.robotoMono": "Roboto Mono",
  "font.option.sourceCodePro": "Source Code Pro",
  "font.option.ubuntuMono": "Ubuntu Mono",
-  "font.option.geistMono": "Geist Mono",
  "sound.option.alert01": "Alerta 01",
  "sound.option.alert02": "Alerta 02",
  "sound.option.alert03": "Alerta 03",
--- a/packages/app/src/i18n/bs.ts
+++ b/packages/app/src/i18n/bs.ts
@@ -576,7 +576,6 @@ export const dict = {
  "sidebar.gettingStarted.line2": "Poveži bilo kojeg provajdera da koristiš modele, npr. Claude, GPT, Gemini itd.",
  "sidebar.project.recentSessions": "Nedavne sesije",
  "sidebar.project.viewAllSessions": "Prikaži sve sesije",
-  "sidebar.project.clearNotifications": "Očisti obavijesti",

  "app.name.desktop": "OpenCode Desktop",

@@ -631,7 +630,6 @@ export const dict = {
  "font.option.robotoMono": "Roboto Mono",
  "font.option.sourceCodePro": "Source Code Pro",
  "font.option.ubuntuMono": "Ubuntu Mono",
-  "font.option.geistMono": "Geist Mono",
  "sound.option.alert01": "Upozorenje 01",
  "sound.option.alert02": "Upozorenje 02",
  "sound.option.alert03": "Upozorenje 03",
--- a/packages/app/src/i18n/da.ts
+++ b/packages/app/src/i18n/da.ts
@@ -572,7 +572,6 @@ export const dict = {
  "sidebar.gettingStarted.line2": "Forbind enhver udbyder for at bruge modeller, inkl. Claude, GPT, Gemini osv.",
  "sidebar.project.recentSessions": "Seneste sessioner",
  "sidebar.project.viewAllSessions": "Vis alle sessioner",
-  "sidebar.project.clearNotifications": "Ryd notifikationer",

  "app.name.desktop": "OpenCode Desktop",
  "settings.section.desktop": "Desktop",
@@ -627,7 +626,6 @@ export const dict = {
  "font.option.robotoMono": "Roboto Mono",
  "font.option.sourceCodePro": "Source Code Pro",
  "font.option.ubuntuMono": "Ubuntu Mono",
-  "font.option.geistMono": "Geist Mono",
  "sound.option.alert01": "Alarm 01",
  "sound.option.alert02": "Alarm 02",
  "sound.option.alert03": "Alarm 03",
--- a/packages/app/src/i18n/de.ts
+++ b/packages/app/src/i18n/de.ts
@@ -524,7 +524,6 @@ export const dict = {
    "Verbinden Sie einen beliebigen Anbieter, um Modelle wie Claude, GPT, Gemini usw. zu nutzen.",
  "sidebar.project.recentSessions": "Letzte Sitzungen",
  "sidebar.project.viewAllSessions": "Alle Sitzungen anzeigen",
-  "sidebar.project.clearNotifications": "Benachrichtigungen löschen",
  "app.name.desktop": "OpenCode Desktop",
  "settings.section.desktop": "Desktop",
  "settings.section.server": "Server",
@@ -572,7 +571,6 @@ export const dict = {
  "font.option.robotoMono": "Roboto Mono",
  "font.option.sourceCodePro": "Source Code Pro",
  "font.option.ubuntuMono": "Ubuntu Mono",
-  "font.option.geistMono": "Geist Mono",
  "sound.option.alert01": "Alarm 01",
  "sound.option.alert02": "Alarm 02",
  "sound.option.alert03": "Alarm 03",
--- a/packages/app/src/i18n/en.ts
+++ b/packages/app/src/i18n/en.ts
@@ -577,7 +577,6 @@ export const dict = {
  "sidebar.gettingStarted.line2": "Connect any provider to use models, inc. Claude, GPT, Gemini etc.",
  "sidebar.project.recentSessions": "Recent sessions",
  "sidebar.project.viewAllSessions": "View all sessions",
-  "sidebar.project.clearNotifications": "Clear notifications",

  "app.name.desktop": "OpenCode Desktop",

@@ -632,7 +631,6 @@ export const dict = {
  "font.option.robotoMono": "Roboto Mono",
  "font.option.sourceCodePro": "Source Code Pro",
  "font.option.ubuntuMono": "Ubuntu Mono",
-  "font.option.geistMono": "Geist Mono",
  "sound.option.alert01": "Alert 01",
  "sound.option.alert02": "Alert 02",
  "sound.option.alert03": "Alert 03",
--- a/packages/app/src/i18n/es.ts
+++ b/packages/app/src/i18n/es.ts
@@ -579,7 +579,6 @@ export const dict = {
  "sidebar.gettingStarted.line2": "Conecta cualquier proveedor para usar modelos, inc. Claude, GPT, Gemini etc.",
  "sidebar.project.recentSessions": "Sesiones recientes",
  "sidebar.project.viewAllSessions": "Ver todas las sesiones",
-  "sidebar.project.clearNotifications": "Borrar notificaciones",

  "app.name.desktop": "OpenCode Desktop",

@@ -635,7 +634,6 @@ export const dict = {
  "font.option.robotoMono": "Roboto Mono",
  "font.option.sourceCodePro": "Source Code Pro",
  "font.option.ubuntuMono": "Ubuntu Mono",
-  "font.option.geistMono": "Geist Mono",
  "sound.option.alert01": "Alerta 01",
  "sound.option.alert02": "Alerta 02",
  "sound.option.alert03": "Alerta 03",
--- a/packages/app/src/i18n/fr.ts
+++ b/packages/app/src/i18n/fr.ts
@@ -523,7 +523,6 @@ export const dict = {
    "Connectez n'importe quel fournisseur pour utiliser des modèles, y compris Claude, GPT, Gemini etc.",
  "sidebar.project.recentSessions": "Sessions récentes",
  "sidebar.project.viewAllSessions": "Voir toutes les sessions",
-  "sidebar.project.clearNotifications": "Effacer les notifications",
  "app.name.desktop": "OpenCode Desktop",
  "settings.section.desktop": "Bureau",
  "settings.section.server": "Serveur",
@@ -571,7 +570,6 @@ export const dict = {
  "font.option.robotoMono": "Roboto Mono",
  "font.option.sourceCodePro": "Source Code Pro",
  "font.option.ubuntuMono": "Ubuntu Mono",
-  "font.option.geistMono": "Geist Mono",
  "sound.option.alert01": "Alerte 01",
  "sound.option.alert02": "Alerte 02",
  "sound.option.alert03": "Alerte 03",
--- a/packages/app/src/i18n/ja.ts
+++ b/packages/app/src/i18n/ja.ts
@@ -513,7 +513,6 @@ export const dict = {
  "sidebar.gettingStarted.line2": "プロバイダーを接続して、Claude、GPT、Geminiなどのモデルを使用できます。",
  "sidebar.project.recentSessions": "最近のセッション",
  "sidebar.project.viewAllSessions": "すべてのセッションを表示",
-  "sidebar.project.clearNotifications": "通知をクリア",
  "app.name.desktop": "OpenCode Desktop",
  "settings.section.desktop": "デスクトップ",
  "settings.section.server": "サーバー",
@@ -561,7 +560,6 @@ export const dict = {
  "font.option.robotoMono": "Roboto Mono",
  "font.option.sourceCodePro": "Source Code Pro",
  "font.option.ubuntuMono": "Ubuntu Mono",
-  "font.option.geistMono": "Geist Mono",
  "sound.option.alert01": "アラート 01",
  "sound.option.alert02": "アラート 02",
  "sound.option.alert03": "アラート 03",
--- a/packages/app/src/i18n/ko.ts
+++ b/packages/app/src/i18n/ko.ts
@@ -514,7 +514,6 @@ export const dict = {
  "sidebar.gettingStarted.line2": "Claude, GPT, Gemini 등을 포함한 모델을 사용하려면 공급자를 연결하세요.",
  "sidebar.project.recentSessions": "최근 세션",
  "sidebar.project.viewAllSessions": "모든 세션 보기",
-  "sidebar.project.clearNotifications": "알림 지우기",
  "app.name.desktop": "OpenCode Desktop",
  "settings.section.desktop": "데스크톱",
  "settings.section.server": "서버",
@@ -562,7 +561,6 @@ export const dict = {
  "font.option.robotoMono": "Roboto Mono",
  "font.option.sourceCodePro": "Source Code Pro",
  "font.option.ubuntuMono": "Ubuntu Mono",
-  "font.option.geistMono": "Geist Mono",
  "sound.option.alert01": "알림 01",
  "sound.option.alert02": "알림 02",
  "sound.option.alert03": "알림 03",
--- a/packages/app/src/i18n/no.ts
+++ b/packages/app/src/i18n/no.ts
@@ -579,7 +579,6 @@ export const dict = {
  "sidebar.gettingStarted.line2": "Koble til en leverandør for å bruke modeller, inkl. Claude, GPT, Gemini osv.",
  "sidebar.project.recentSessions": "Nylige sesjoner",
  "sidebar.project.viewAllSessions": "Vis alle sesjoner",
-  "sidebar.project.clearNotifications": "Fjern varsler",

  "app.name.desktop": "OpenCode Desktop",

@@ -634,7 +633,6 @@ export const dict = {
  "font.option.robotoMono": "Roboto Mono",
  "font.option.sourceCodePro": "Source Code Pro",
  "font.option.ubuntuMono": "Ubuntu Mono",
-  "font.option.geistMono": "Geist Mono",
  "sound.option.alert01": "Varsel 01",
  "sound.option.alert02": "Varsel 02",
  "sound.option.alert03": "Varsel 03",
--- a/packages/app/src/i18n/pl.ts
+++ b/packages/app/src/i18n/pl.ts
@@ -514,7 +514,6 @@ export const dict = {
  "sidebar.gettingStarted.line2": "Połącz dowolnego dostawcę, aby używać modeli, w tym Claude, GPT, Gemini itp.",
  "sidebar.project.recentSessions": "Ostatnie sesje",
  "sidebar.project.viewAllSessions": "Zobacz wszystkie sesje",
-  "sidebar.project.clearNotifications": "Wyczyść powiadomienia",
  "app.name.desktop": "OpenCode Desktop",
  "settings.section.desktop": "Pulpit",
  "settings.section.server": "Serwer",
@@ -562,7 +561,6 @@ export const dict = {
  "font.option.robotoMono": "Roboto Mono",
  "font.option.sourceCodePro": "Source Code Pro",
  "font.option.ubuntuMono": "Ubuntu Mono",
-  "font.option.geistMono": "Geist Mono",
  "sound.option.alert01": "Alert 01",
  "sound.option.alert02": "Alert 02",
  "sound.option.alert03": "Alert 03",
--- a/packages/app/src/i18n/ru.ts
+++ b/packages/app/src/i18n/ru.ts
@@ -578,7 +578,6 @@ export const dict = {
    "Подключите любого провайдера для использования моделей, включая Claude, GPT, Gemini и др.",
  "sidebar.project.recentSessions": "Недавние сессии",
  "sidebar.project.viewAllSessions": "Посмотреть все сессии",
-  "sidebar.project.clearNotifications": "Очистить уведомления",

  "app.name.desktop": "OpenCode Desktop",
  "settings.section.desktop": "Приложение",
@@ -632,7 +631,6 @@ export const dict = {
  "font.option.robotoMono": "Roboto Mono",
  "font.option.sourceCodePro": "Source Code Pro",
  "font.option.ubuntuMono": "Ubuntu Mono",
-  "font.option.geistMono": "Geist Mono",
  "sound.option.alert01": "Alert 01",
  "sound.option.alert02": "Alert 02",
  "sound.option.alert03": "Alert 03",
--- a/packages/app/src/i18n/th.ts
+++ b/packages/app/src/i18n/th.ts
@@ -571,7 +571,6 @@ export const dict = {
  "sidebar.gettingStarted.line2": "เชื่อมต่อผู้ให้บริการใด ๆ เพื่อใช้โมเดล รวมถึง Claude, GPT, Gemini ฯลฯ",
  "sidebar.project.recentSessions": "เซสชันล่าสุด",
  "sidebar.project.viewAllSessions": "ดูเซสชันทั้งหมด",
-  "sidebar.project.clearNotifications": "ล้างการแจ้งเตือน",

  "app.name.desktop": "OpenCode Desktop",

@@ -626,7 +625,6 @@ export const dict = {
  "font.option.robotoMono": "Roboto Mono",
  "font.option.sourceCodePro": "Source Code Pro",
  "font.option.ubuntuMono": "Ubuntu Mono",
-  "font.option.geistMono": "Geist Mono",
  "sound.option.alert01": "เสียงเตือน 01",
  "sound.option.alert02": "เสียงเตือน 02",
  "sound.option.alert03": "เสียงเตือน 03",
--- a/packages/app/src/i18n/zh.ts
+++ b/packages/app/src/i18n/zh.ts
@@ -569,7 +569,6 @@ export const dict = {
  "sidebar.gettingStarted.line2": "连接任意提供商即可使用更多模型，如 Claude、GPT、Gemini 等。",
  "sidebar.project.recentSessions": "最近会话",
  "sidebar.project.viewAllSessions": "查看全部会话",
-  "sidebar.project.clearNotifications": "清除通知",

  "app.name.desktop": "OpenCode Desktop",

@@ -623,7 +622,6 @@ export const dict = {
  "font.option.robotoMono": "Roboto Mono",
  "font.option.sourceCodePro": "Source Code Pro",
  "font.option.ubuntuMono": "Ubuntu Mono",
-  "font.option.geistMono": "Geist Mono",

  "sound.option.alert01": "警报 01",
  "sound.option.alert02": "警报 02",
--- a/packages/app/src/i18n/zht.ts
+++ b/packages/app/src/i18n/zht.ts
@@ -567,7 +567,6 @@ export const dict = {
  "sidebar.gettingStarted.line2": "連線任意提供者即可使用更多模型，如 Claude、GPT、Gemini 等。",
  "sidebar.project.recentSessions": "最近工作階段",
  "sidebar.project.viewAllSessions": "查看全部工作階段",
-  "sidebar.project.clearNotifications": "清除通知",

  "app.name.desktop": "OpenCode Desktop",
  "settings.section.desktop": "桌面",
@@ -621,7 +620,6 @@ export const dict = {
  "font.option.robotoMono": "Roboto Mono",
  "font.option.sourceCodePro": "Source Code Pro",
  "font.option.ubuntuMono": "Ubuntu Mono",
-  "font.option.geistMono": "Geist Mono",
  "sound.option.alert01": "警報 01",
  "sound.option.alert02": "警報 02",
  "sound.option.alert03": "警報 03",
--- a/packages/app/src/pages/layout.tsx
+++ b/packages/app/src/pages/layout.tsx
@@ -1692,13 +1692,6 @@ export default function Layout(props: ParentProps) {
    })
    const projectId = createMemo(() => panelProps.project?.id ?? "")
    const workspaces = createMemo(() => workspaceIds(panelProps.project))
-    const unseenCount = createMemo(() =>
-      workspaces().reduce((total, directory) => total + notification.project.unseenCount(directory), 0),
-    )
-    const clearNotifications = () =>
-      workspaces()
-        .filter((directory) => notification.project.unseenCount(directory) > 0)
-        .forEach((directory) => notification.project.markViewed(directory))
    const workspacesEnabled = createMemo(() => {
      const project = panelProps.project
      if (!project) return false
@@ -1776,16 +1769,6 @@ export default function Layout(props: ParentProps) {
                              : language.t("sidebar.workspaces.enable")}
                          </DropdownMenu.ItemLabel>
                        </DropdownMenu.Item>
-                        <DropdownMenu.Item
-                          data-action="project-clear-notifications"
-                          data-project={base64Encode(p().worktree)}
-                          disabled={unseenCount() === 0}
-                          onSelect={clearNotifications}
-                        >
-                          <DropdownMenu.ItemLabel>
-                            {language.t("sidebar.project.clearNotifications")}
-                          </DropdownMenu.ItemLabel>
-                        </DropdownMenu.Item>
                        <DropdownMenu.Separator />
                        <DropdownMenu.Item
                          data-action="project-close-menu"
--- a/packages/app/src/pages/layout/sidebar-project.tsx
+++ b/packages/app/src/pages/layout/sidebar-project.tsx
@@ -10,7 +10,6 @@ import { createSortable } from "@thisbeyond/solid-dnd"
 import { type LocalProject } from "@/context/layout"
 import { useGlobalSync } from "@/context/global-sync"
 import { useLanguage } from "@/context/language"
-import { useNotification } from "@/context/notification"
 import { ProjectIcon, SessionItem, type SessionItemProps } from "./sidebar-items"
 import { childMapByParent, displayName, sortedRootSessions } from "./helpers"
 import { projectSelected, projectTileActive } from "./sidebar-project-helpers"
@@ -60,7 +59,6 @@ const ProjectTile = (props: {
  selected: Accessor<boolean>
  active: Accessor<boolean>
  overlay: Accessor<boolean>
-  dirs: Accessor<string[]>
  onProjectMouseEnter: (worktree: string, event: MouseEvent) => void
  onProjectMouseLeave: (worktree: string) => void
  onProjectFocus: (worktree: string) => void
@@ -72,94 +70,73 @@ const ProjectTile = (props: {
  setMenu: (value: boolean) => void
  setOpen: (value: boolean) => void
  language: ReturnType<typeof useLanguage>
-}): JSX.Element => {
-  const notification = useNotification()
-  const unseenCount = createMemo(() =>
-    props.dirs().reduce((total, directory) => total + notification.project.unseenCount(directory), 0),
-  )
-
-  const clear = () =>
-    props
-      .dirs()
-      .filter((directory) => notification.project.unseenCount(directory) > 0)
-      .forEach((directory) => notification.project.markViewed(directory))
-
-  return (
-    <ContextMenu
-      modal={!props.sidebarHovering()}
-      onOpenChange={(value) => {
-        props.setMenu(value)
-        if (value) props.setOpen(false)
+}): JSX.Element => (
+  <ContextMenu
+    modal={!props.sidebarHovering()}
+    onOpenChange={(value) => {
+      props.setMenu(value)
+      if (value) props.setOpen(false)
+    }}
+  >
+    <ContextMenu.Trigger
+      as="button"
+      type="button"
+      aria-label={displayName(props.project)}
+      data-action="project-switch"
+      data-project={base64Encode(props.project.worktree)}
+      classList={{
+        "flex items-center justify-center size-10 p-1 rounded-lg overflow-hidden transition-colors cursor-default": true,
+        "bg-transparent border-2 border-icon-strong-base hover:bg-surface-base-hover": props.selected(),
+        "bg-transparent border border-transparent hover:bg-surface-base-hover hover:border-border-weak-base":
+          !props.selected() && !props.active(),
+        "bg-surface-base-hover border border-border-weak-base": !props.selected() && props.active(),
      }}
+      onMouseEnter={(event: MouseEvent) => {
+        if (!props.overlay()) return
+        props.onProjectMouseEnter(props.project.worktree, event)
+      }}
+      onMouseLeave={() => {
+        if (!props.overlay()) return
+        props.onProjectMouseLeave(props.project.worktree)
+      }}
+      onFocus={() => {
+        if (!props.overlay()) return
+        props.onProjectFocus(props.project.worktree)
+      }}
+      onClick={() => props.navigateToProject(props.project.worktree)}
+      onBlur={() => props.setOpen(false)}
    >
-      <ContextMenu.Trigger
-        as="button"
-        type="button"
-        aria-label={displayName(props.project)}
-        data-action="project-switch"
-        data-project={base64Encode(props.project.worktree)}
-        classList={{
-          "flex items-center justify-center size-10 p-1 rounded-lg overflow-hidden transition-colors cursor-default": true,
-          "bg-transparent border-2 border-icon-strong-base hover:bg-surface-base-hover": props.selected(),
-          "bg-transparent border border-transparent hover:bg-surface-base-hover hover:border-border-weak-base":
-            !props.selected() && !props.active(),
-          "bg-surface-base-hover border border-border-weak-base": !props.selected() && props.active(),
-        }}
-        onMouseEnter={(event: MouseEvent) => {
-          if (!props.overlay()) return
-          props.onProjectMouseEnter(props.project.worktree, event)
-        }}
-        onMouseLeave={() => {
-          if (!props.overlay()) return
-          props.onProjectMouseLeave(props.project.worktree)
-        }}
-        onFocus={() => {
-          if (!props.overlay()) return
-          props.onProjectFocus(props.project.worktree)
-        }}
-        onClick={() => props.navigateToProject(props.project.worktree)}
-        onBlur={() => props.setOpen(false)}
-      >
-        <ProjectIcon project={props.project} notify />
-      </ContextMenu.Trigger>
-      <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>
-          </ContextMenu.Item>
-          <ContextMenu.Item
-            data-action="project-workspaces-toggle"
-            data-project={base64Encode(props.project.worktree)}
-            disabled={props.project.vcs !== "git" && !props.workspacesEnabled(props.project)}
-            onSelect={() => props.toggleProjectWorkspaces(props.project)}
-          >
-            <ContextMenu.ItemLabel>
-              {props.workspacesEnabled(props.project)
-                ? props.language.t("sidebar.workspaces.disable")
-                : props.language.t("sidebar.workspaces.enable")}
-            </ContextMenu.ItemLabel>
-          </ContextMenu.Item>
-          <ContextMenu.Item
-            data-action="project-clear-notifications"
-            data-project={base64Encode(props.project.worktree)}
-            disabled={unseenCount() === 0}
-            onSelect={clear}
-          >
-            <ContextMenu.ItemLabel>{props.language.t("sidebar.project.clearNotifications")}</ContextMenu.ItemLabel>
-          </ContextMenu.Item>
-          <ContextMenu.Separator />
-          <ContextMenu.Item
-            data-action="project-close-menu"
-            data-project={base64Encode(props.project.worktree)}
-            onSelect={() => props.closeProject(props.project.worktree)}
-          >
-            <ContextMenu.ItemLabel>{props.language.t("common.close")}</ContextMenu.ItemLabel>
-          </ContextMenu.Item>
-        </ContextMenu.Content>
-      </ContextMenu.Portal>
-    </ContextMenu>
-  )
-}
+      <ProjectIcon project={props.project} notify />
+    </ContextMenu.Trigger>
+    <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>
+        </ContextMenu.Item>
+        <ContextMenu.Item
+          data-action="project-workspaces-toggle"
+          data-project={base64Encode(props.project.worktree)}
+          disabled={props.project.vcs !== "git" && !props.workspacesEnabled(props.project)}
+          onSelect={() => props.toggleProjectWorkspaces(props.project)}
+        >
+          <ContextMenu.ItemLabel>
+            {props.workspacesEnabled(props.project)
+              ? props.language.t("sidebar.workspaces.disable")
+              : props.language.t("sidebar.workspaces.enable")}
+          </ContextMenu.ItemLabel>
+        </ContextMenu.Item>
+        <ContextMenu.Separator />
+        <ContextMenu.Item
+          data-action="project-close-menu"
+          data-project={base64Encode(props.project.worktree)}
+          onSelect={() => props.closeProject(props.project.worktree)}
+        >
+          <ContextMenu.ItemLabel>{props.language.t("common.close")}</ContextMenu.ItemLabel>
+        </ContextMenu.Item>
+      </ContextMenu.Content>
+    </ContextMenu.Portal>
+  </ContextMenu>
+)

 const ProjectPreviewPanel = (props: {
  project: LocalProject
@@ -277,7 +254,6 @@ export const SortableProject = (props: {
  )
  const workspaces = createMemo(() => props.ctx.workspaceIds(props.project).slice(0, 2))
  const workspaceEnabled = createMemo(() => props.ctx.workspacesEnabled(props.project))
-  const dirs = createMemo(() => props.ctx.workspaceIds(props.project))
  const [open, setOpen] = createSignal(false)
  const [menu, setMenu] = createSignal(false)

@@ -328,7 +304,6 @@ export const SortableProject = (props: {
      selected={selected}
      active={active}
      overlay={overlay}
-      dirs={dirs}
      onProjectMouseEnter={props.ctx.onProjectMouseEnter}
      onProjectMouseLeave={props.ctx.onProjectMouseLeave}
      onProjectFocus={props.ctx.onProjectFocus}
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -23,6 +23,7 @@ import { useSync } from "@/context/sync"
 import { useTerminal, type LocalPTY } from "@/context/terminal"
 import { useLayout } from "@/context/layout"
 import { checksum, base64Encode } from "@opencode-ai/util/encode"
+import { findLast } from "@opencode-ai/util/array"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { DialogSelectFile } from "@/components/dialog-select-file"
 import FileTree from "@/components/file-tree"
@@ -34,6 +35,7 @@ import { useSDK } from "@/context/sdk"
 import { usePrompt } from "@/context/prompt"
 import { useComments } from "@/context/comments"
 import { ConstrainDragYAxis, getDraggableId } from "@/utils/solid-dnd"
+import { usePermission } from "@/context/permission"
 import { showToast } from "@opencode-ai/ui/toast"
 import { SessionHeader, SessionContextTab, SortableTab, FileVisual, NewSessionView } from "@/components/session"
 import { navMark, navParams } from "@/utils/perf"
@@ -99,6 +101,7 @@ export default function Page() {
  const sdk = useSDK()
  const prompt = usePrompt()
  const comments = useComments()
+  const permission = usePermission()

  const permRequest = createMemo(() => {
    const sessionID = params.id
@@ -269,7 +272,6 @@ export default function Page() {
    if (!path) return
    file.load(path)
    openReviewPanel()
-    tabs().setActive(next)
  }

  createEffect(() => {
@@ -767,6 +769,11 @@ export default function Page() {
    return lines.slice(0, 2).join("\n")
  }

+  const addSelectionToContext = (path: string, selection: FileSelection) => {
+    const preview = selectionPreview(path, selection)
+    prompt.context.add({ type: "file", path, selection, preview })
+  }
+
  const addCommentToContext = (input: {
    file: string
    selection: SelectedLineRange
@@ -905,11 +912,31 @@ export default function Page() {
  const focusInput = () => inputRef?.focus()

  useSessionCommands({
+    command,
+    dialog,
+    file,
+    language,
+    local,
+    permission,
+    prompt,
+    sdk,
+    sync,
+    terminal,
+    layout,
+    params,
+    navigate,
+    tabs,
+    view,
+    info,
+    status,
+    userMessages,
+    visibleUserMessages,
    activeMessage,
    showAllFiles,
    navigateMessageByOffset,
    setExpanded: (id, fn) => setStore("expanded", id, fn),
    setActiveMessage,
+    addSelectionToContext,
    focusInput,
  })

--- a/packages/app/src/pages/session/helpers.test.ts
+++ b/packages/app/src/pages/session/helpers.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { createOpenReviewFile, focusTerminalById, getTabReorderIndex } from "./helpers"
+import { combineCommandSections, createOpenReviewFile, focusTerminalById, getTabReorderIndex } from "./helpers"

 describe("createOpenReviewFile", () => {
  test("opens and loads selected review file", () => {
@@ -46,6 +46,20 @@ describe("focusTerminalById", () => {
  })
 })

+describe("combineCommandSections", () => {
+  test("keeps section order stable", () => {
+    const result = combineCommandSections([
+      [{ id: "a", title: "A" }],
+      [
+        { id: "b", title: "B" },
+        { id: "c", title: "C" },
+      ],
+    ])
+
+    expect(result.map((item) => item.id)).toEqual(["a", "b", "c"])
+  })
+})
+
 describe("getTabReorderIndex", () => {
  test("returns target index for valid drag reorder", () => {
    expect(getTabReorderIndex(["a", "b", "c"], "a", "c")).toBe(2)
--- a/packages/app/src/pages/session/helpers.ts
+++ b/packages/app/src/pages/session/helpers.ts
@@ -1,3 +1,4 @@
+import type { CommandOption } from "@/context/command"
 import { batch } from "solid-js"

 export const focusTerminalById = (id: string) => {
@@ -35,6 +36,10 @@ export const createOpenReviewFile = (input: {
  }
 }

+export const combineCommandSections = (sections: readonly (readonly CommandOption[])[]) => {
+  return sections.flatMap((section) => section)
+}
+
 export const getTabReorderIndex = (tabs: readonly string[], from: string, to: string) => {
  const fromIndex = tabs.indexOf(from)
  const toIndex = tabs.indexOf(to)
--- a/packages/app/src/pages/session/use-session-commands.tsx
+++ b/packages/app/src/pages/session/use-session-commands.tsx
@@ -19,14 +19,35 @@ import { showToast } from "@opencode-ai/ui/toast"
 import { findLast } from "@opencode-ai/util/array"
 import { extractPromptFromParts } from "@/utils/prompt"
 import { UserMessage } from "@opencode-ai/sdk/v2"
+import { combineCommandSections } from "@/pages/session/helpers"
 import { canAddSelectionContext } from "@/pages/session/session-command-helpers"

 export type SessionCommandContext = {
+  command: ReturnType<typeof useCommand>
+  dialog: ReturnType<typeof useDialog>
+  file: ReturnType<typeof useFile>
+  language: ReturnType<typeof useLanguage>
+  local: ReturnType<typeof useLocal>
+  permission: ReturnType<typeof usePermission>
+  prompt: ReturnType<typeof usePrompt>
+  sdk: ReturnType<typeof useSDK>
+  sync: ReturnType<typeof useSync>
+  terminal: ReturnType<typeof useTerminal>
+  layout: ReturnType<typeof useLayout>
+  params: ReturnType<typeof useParams>
+  navigate: ReturnType<typeof useNavigate>
+  tabs: () => ReturnType<ReturnType<typeof useLayout>["tabs"]>
+  view: () => ReturnType<ReturnType<typeof useLayout>["view"]>
+  info: () => { revert?: { messageID?: string }; share?: { url?: string } } | undefined
+  status: () => { type: string }
+  userMessages: () => UserMessage[]
+  visibleUserMessages: () => UserMessage[]
  activeMessage: () => UserMessage | undefined
  showAllFiles: () => void
  navigateMessageByOffset: (offset: number) => void
  setExpanded: (id: string, fn: (open: boolean | undefined) => boolean) => void
  setActiveMessage: (message: UserMessage | undefined) => void
+  addSelectionToContext: (path: string, selection: FileSelection) => void
  focusInput: () => void
 }

@@ -37,88 +58,45 @@ const withCategory = (category: string) => {
  })
 }

-export const useSessionCommands = (args: SessionCommandContext) => {
-  const command = useCommand()
-  const dialog = useDialog()
-  const file = useFile()
-  const language = useLanguage()
-  const local = useLocal()
-  const permission = usePermission()
-  const prompt = usePrompt()
-  const sdk = useSDK()
-  const sync = useSync()
-  const terminal = useTerminal()
-  const layout = useLayout()
-  const params = useParams()
-  const navigate = useNavigate()
-
-  const sessionKey = createMemo(() => `${params.dir}${params.id ? "/" + params.id : ""}`)
-  const tabs = createMemo(() => layout.tabs(sessionKey))
-  const view = createMemo(() => layout.view(sessionKey))
-  const info = createMemo(() => (params.id ? sync.session.get(params.id) : undefined))
-  const idle = { type: "idle" as const }
-  const status = createMemo(() => sync.data.session_status[params.id ?? ""] ?? idle)
-  const messages = createMemo(() => (params.id ? (sync.data.message[params.id] ?? []) : []))
-  const userMessages = createMemo(() => messages().filter((m) => m.role === "user") as UserMessage[])
-  const visibleUserMessages = createMemo(() => {
-    const revert = info()?.revert?.messageID
-    if (!revert) return userMessages()
-    return userMessages().filter((m) => m.id < revert)
-  })
-
-  const selectionPreview = (path: string, selection: FileSelection) => {
-    const content = file.get(path)?.content?.content
-    if (!content) return undefined
-    const start = Math.max(1, Math.min(selection.startLine, selection.endLine))
-    const end = Math.max(selection.startLine, selection.endLine)
-    const lines = content.split("\n").slice(start - 1, end)
-    if (lines.length === 0) return undefined
-    return lines.slice(0, 2).join("\n")
-  }
-
-  const addSelectionToContext = (path: string, selection: FileSelection) => {
-    const preview = selectionPreview(path, selection)
-    prompt.context.add({ type: "file", path, selection, preview })
-  }
-
-  const sessionCommand = withCategory(language.t("command.category.session"))
-  const fileCommand = withCategory(language.t("command.category.file"))
-  const contextCommand = withCategory(language.t("command.category.context"))
-  const viewCommand = withCategory(language.t("command.category.view"))
-  const terminalCommand = withCategory(language.t("command.category.terminal"))
-  const modelCommand = withCategory(language.t("command.category.model"))
-  const mcpCommand = withCategory(language.t("command.category.mcp"))
-  const agentCommand = withCategory(language.t("command.category.agent"))
-  const permissionsCommand = withCategory(language.t("command.category.permissions"))
+export const useSessionCommands = (input: SessionCommandContext) => {
+  const sessionCommand = withCategory(input.language.t("command.category.session"))
+  const fileCommand = withCategory(input.language.t("command.category.file"))
+  const contextCommand = withCategory(input.language.t("command.category.context"))
+  const viewCommand = withCategory(input.language.t("command.category.view"))
+  const terminalCommand = withCategory(input.language.t("command.category.terminal"))
+  const modelCommand = withCategory(input.language.t("command.category.model"))
+  const mcpCommand = withCategory(input.language.t("command.category.mcp"))
+  const agentCommand = withCategory(input.language.t("command.category.agent"))
+  const permissionsCommand = withCategory(input.language.t("command.category.permissions"))

  const sessionCommands = createMemo(() => [
    sessionCommand({
      id: "session.new",
-      title: language.t("command.session.new"),
+      title: input.language.t("command.session.new"),
      keybind: "mod+shift+s",
      slash: "new",
-      onSelect: () => navigate(`/${params.dir}/session`),
+      onSelect: () => input.navigate(`/${input.params.dir}/session`),
    }),
  ])

  const fileCommands = createMemo(() => [
    fileCommand({
      id: "file.open",
-      title: language.t("command.file.open"),
-      description: language.t("palette.search.placeholder"),
+      title: input.language.t("command.file.open"),
+      description: input.language.t("palette.search.placeholder"),
      keybind: "mod+p",
      slash: "open",
-      onSelect: () => dialog.show(() => <DialogSelectFile onOpenFile={args.showAllFiles} />),
+      onSelect: () => input.dialog.show(() => <DialogSelectFile onOpenFile={input.showAllFiles} />),
    }),
    fileCommand({
      id: "tab.close",
-      title: language.t("command.tab.close"),
+      title: input.language.t("command.tab.close"),
      keybind: "mod+w",
-      disabled: !tabs().active(),
+      disabled: !input.tabs().active(),
      onSelect: () => {
-        const active = tabs().active()
+        const active = input.tabs().active()
        if (!active) return
-        tabs().close(active)
+        input.tabs().close(active)
      },
    }),
  ])
@@ -126,30 +104,30 @@ export const useSessionCommands = (args: SessionCommandContext) => {
  const contextCommands = createMemo(() => [
    contextCommand({
      id: "context.addSelection",
-      title: language.t("command.context.addSelection"),
-      description: language.t("command.context.addSelection.description"),
+      title: input.language.t("command.context.addSelection"),
+      description: input.language.t("command.context.addSelection.description"),
      keybind: "mod+shift+l",
      disabled: !canAddSelectionContext({
-        active: tabs().active(),
-        pathFromTab: file.pathFromTab,
-        selectedLines: file.selectedLines,
+        active: input.tabs().active(),
+        pathFromTab: input.file.pathFromTab,
+        selectedLines: input.file.selectedLines,
      }),
      onSelect: () => {
-        const active = tabs().active()
+        const active = input.tabs().active()
        if (!active) return
-        const path = file.pathFromTab(active)
+        const path = input.file.pathFromTab(active)
        if (!path) return

-        const range = file.selectedLines(path) as SelectedLineRange | null | undefined
+        const range = input.file.selectedLines(path) as SelectedLineRange | null | undefined
        if (!range) {
          showToast({
-            title: language.t("toast.context.noLineSelection.title"),
-            description: language.t("toast.context.noLineSelection.description"),
+            title: input.language.t("toast.context.noLineSelection.title"),
+            description: input.language.t("toast.context.noLineSelection.description"),
          })
          return
        }

-        addSelectionToContext(path, selectionFromLines(range))
+        input.addSelectionToContext(path, selectionFromLines(range))
      },
    }),
  ])
@@ -157,50 +135,50 @@ export const useSessionCommands = (args: SessionCommandContext) => {
  const viewCommands = createMemo(() => [
    viewCommand({
      id: "terminal.toggle",
-      title: language.t("command.terminal.toggle"),
+      title: input.language.t("command.terminal.toggle"),
      keybind: "ctrl+`",
      slash: "terminal",
-      onSelect: () => view().terminal.toggle(),
+      onSelect: () => input.view().terminal.toggle(),
    }),
    viewCommand({
      id: "review.toggle",
-      title: language.t("command.review.toggle"),
+      title: input.language.t("command.review.toggle"),
      keybind: "mod+shift+r",
-      onSelect: () => view().reviewPanel.toggle(),
+      onSelect: () => input.view().reviewPanel.toggle(),
    }),
    viewCommand({
      id: "fileTree.toggle",
-      title: language.t("command.fileTree.toggle"),
+      title: input.language.t("command.fileTree.toggle"),
      keybind: "mod+\\",
-      onSelect: () => layout.fileTree.toggle(),
+      onSelect: () => input.layout.fileTree.toggle(),
    }),
    viewCommand({
      id: "input.focus",
-      title: language.t("command.input.focus"),
+      title: input.language.t("command.input.focus"),
      keybind: "ctrl+l",
-      onSelect: () => args.focusInput(),
+      onSelect: () => input.focusInput(),
    }),
    terminalCommand({
      id: "terminal.new",
-      title: language.t("command.terminal.new"),
-      description: language.t("command.terminal.new.description"),
+      title: input.language.t("command.terminal.new"),
+      description: input.language.t("command.terminal.new.description"),
      keybind: "ctrl+alt+t",
      onSelect: () => {
-        if (terminal.all().length > 0) terminal.new()
-        view().terminal.open()
+        if (input.terminal.all().length > 0) input.terminal.new()
+        input.view().terminal.open()
      },
    }),
    viewCommand({
      id: "steps.toggle",
-      title: language.t("command.steps.toggle"),
-      description: language.t("command.steps.toggle.description"),
+      title: input.language.t("command.steps.toggle"),
+      description: input.language.t("command.steps.toggle.description"),
      keybind: "mod+e",
      slash: "steps",
-      disabled: !params.id,
+      disabled: !input.params.id,
      onSelect: () => {
-        const msg = args.activeMessage()
+        const msg = input.activeMessage()
        if (!msg) return
-        args.setExpanded(msg.id, (open: boolean | undefined) => !open)
+        input.setExpanded(msg.id, (open: boolean | undefined) => !open)
      },
    }),
  ])
@@ -208,61 +186,61 @@ export const useSessionCommands = (args: SessionCommandContext) => {
  const messageCommands = createMemo(() => [
    sessionCommand({
      id: "message.previous",
-      title: language.t("command.message.previous"),
-      description: language.t("command.message.previous.description"),
+      title: input.language.t("command.message.previous"),
+      description: input.language.t("command.message.previous.description"),
      keybind: "mod+arrowup",
-      disabled: !params.id,
-      onSelect: () => args.navigateMessageByOffset(-1),
+      disabled: !input.params.id,
+      onSelect: () => input.navigateMessageByOffset(-1),
    }),
    sessionCommand({
      id: "message.next",
-      title: language.t("command.message.next"),
-      description: language.t("command.message.next.description"),
+      title: input.language.t("command.message.next"),
+      description: input.language.t("command.message.next.description"),
      keybind: "mod+arrowdown",
-      disabled: !params.id,
-      onSelect: () => args.navigateMessageByOffset(1),
+      disabled: !input.params.id,
+      onSelect: () => input.navigateMessageByOffset(1),
    }),
  ])

  const agentCommands = createMemo(() => [
    modelCommand({
      id: "model.choose",
-      title: language.t("command.model.choose"),
-      description: language.t("command.model.choose.description"),
+      title: input.language.t("command.model.choose"),
+      description: input.language.t("command.model.choose.description"),
      keybind: "mod+'",
      slash: "model",
-      onSelect: () => dialog.show(() => <DialogSelectModel />),
+      onSelect: () => input.dialog.show(() => <DialogSelectModel />),
    }),
    mcpCommand({
      id: "mcp.toggle",
-      title: language.t("command.mcp.toggle"),
-      description: language.t("command.mcp.toggle.description"),
+      title: input.language.t("command.mcp.toggle"),
+      description: input.language.t("command.mcp.toggle.description"),
      keybind: "mod+;",
      slash: "mcp",
-      onSelect: () => dialog.show(() => <DialogSelectMcp />),
+      onSelect: () => input.dialog.show(() => <DialogSelectMcp />),
    }),
    agentCommand({
      id: "agent.cycle",
-      title: language.t("command.agent.cycle"),
-      description: language.t("command.agent.cycle.description"),
+      title: input.language.t("command.agent.cycle"),
+      description: input.language.t("command.agent.cycle.description"),
      keybind: "mod+.",
      slash: "agent",
-      onSelect: () => local.agent.move(1),
+      onSelect: () => input.local.agent.move(1),
    }),
    agentCommand({
      id: "agent.cycle.reverse",
-      title: language.t("command.agent.cycle.reverse"),
-      description: language.t("command.agent.cycle.reverse.description"),
+      title: input.language.t("command.agent.cycle.reverse"),
+      description: input.language.t("command.agent.cycle.reverse.description"),
      keybind: "shift+mod+.",
-      onSelect: () => local.agent.move(-1),
+      onSelect: () => input.local.agent.move(-1),
    }),
    modelCommand({
      id: "model.variant.cycle",
-      title: language.t("command.model.variant.cycle"),
-      description: language.t("command.model.variant.cycle.description"),
+      title: input.language.t("command.model.variant.cycle"),
+      description: input.language.t("command.model.variant.cycle.description"),
      keybind: "shift+mod+d",
      onSelect: () => {
-        local.model.variant.cycle()
+        input.local.model.variant.cycle()
      },
    }),
  ])
@@ -271,22 +249,22 @@ export const useSessionCommands = (args: SessionCommandContext) => {
    permissionsCommand({
      id: "permissions.autoaccept",
      title:
-        params.id && permission.isAutoAccepting(params.id, sdk.directory)
-          ? language.t("command.permissions.autoaccept.disable")
-          : language.t("command.permissions.autoaccept.enable"),
+        input.params.id && input.permission.isAutoAccepting(input.params.id, input.sdk.directory)
+          ? input.language.t("command.permissions.autoaccept.disable")
+          : input.language.t("command.permissions.autoaccept.enable"),
      keybind: "mod+shift+a",
-      disabled: !params.id || !permission.permissionsEnabled(),
+      disabled: !input.params.id || !input.permission.permissionsEnabled(),
      onSelect: () => {
-        const sessionID = params.id
+        const sessionID = input.params.id
        if (!sessionID) return
-        permission.toggleAutoAccept(sessionID, sdk.directory)
+        input.permission.toggleAutoAccept(sessionID, input.sdk.directory)
        showToast({
-          title: permission.isAutoAccepting(sessionID, sdk.directory)
-            ? language.t("toast.permissions.autoaccept.on.title")
-            : language.t("toast.permissions.autoaccept.off.title"),
-          description: permission.isAutoAccepting(sessionID, sdk.directory)
-            ? language.t("toast.permissions.autoaccept.on.description")
-            : language.t("toast.permissions.autoaccept.off.description"),
+          title: input.permission.isAutoAccepting(sessionID, input.sdk.directory)
+            ? input.language.t("toast.permissions.autoaccept.on.title")
+            : input.language.t("toast.permissions.autoaccept.off.title"),
+          description: input.permission.isAutoAccepting(sessionID, input.sdk.directory)
+            ? input.language.t("toast.permissions.autoaccept.on.description")
+            : input.language.t("toast.permissions.autoaccept.off.description"),
        })
      },
    }),
@@ -295,71 +273,71 @@ export const useSessionCommands = (args: SessionCommandContext) => {
  const sessionActionCommands = createMemo(() => [
    sessionCommand({
      id: "session.undo",
-      title: language.t("command.session.undo"),
-      description: language.t("command.session.undo.description"),
+      title: input.language.t("command.session.undo"),
+      description: input.language.t("command.session.undo.description"),
      slash: "undo",
-      disabled: !params.id || visibleUserMessages().length === 0,
+      disabled: !input.params.id || input.visibleUserMessages().length === 0,
      onSelect: async () => {
-        const sessionID = params.id
+        const sessionID = input.params.id
        if (!sessionID) return
-        if (status()?.type !== "idle") {
-          await sdk.client.session.abort({ sessionID }).catch(() => {})
+        if (input.status()?.type !== "idle") {
+          await input.sdk.client.session.abort({ sessionID }).catch(() => {})
        }
-        const revert = info()?.revert?.messageID
-        const message = findLast(userMessages(), (x) => !revert || x.id < revert)
+        const revert = input.info()?.revert?.messageID
+        const message = findLast(input.userMessages(), (x) => !revert || x.id < revert)
        if (!message) return
-        await sdk.client.session.revert({ sessionID, messageID: message.id })
-        const parts = sync.data.part[message.id]
+        await input.sdk.client.session.revert({ sessionID, messageID: message.id })
+        const parts = input.sync.data.part[message.id]
        if (parts) {
-          const restored = extractPromptFromParts(parts, { directory: sdk.directory })
-          prompt.set(restored)
+          const restored = extractPromptFromParts(parts, { directory: input.sdk.directory })
+          input.prompt.set(restored)
        }
-        const priorMessage = findLast(userMessages(), (x) => x.id < message.id)
-        args.setActiveMessage(priorMessage)
+        const priorMessage = findLast(input.userMessages(), (x) => x.id < message.id)
+        input.setActiveMessage(priorMessage)
      },
    }),
    sessionCommand({
      id: "session.redo",
-      title: language.t("command.session.redo"),
-      description: language.t("command.session.redo.description"),
+      title: input.language.t("command.session.redo"),
+      description: input.language.t("command.session.redo.description"),
      slash: "redo",
-      disabled: !params.id || !info()?.revert?.messageID,
+      disabled: !input.params.id || !input.info()?.revert?.messageID,
      onSelect: async () => {
-        const sessionID = params.id
+        const sessionID = input.params.id
        if (!sessionID) return
-        const revertMessageID = info()?.revert?.messageID
+        const revertMessageID = input.info()?.revert?.messageID
        if (!revertMessageID) return
-        const nextMessage = userMessages().find((x) => x.id > revertMessageID)
+        const nextMessage = input.userMessages().find((x) => x.id > revertMessageID)
        if (!nextMessage) {
-          await sdk.client.session.unrevert({ sessionID })
-          prompt.reset()
-          const lastMsg = findLast(userMessages(), (x) => x.id >= revertMessageID)
-          args.setActiveMessage(lastMsg)
+          await input.sdk.client.session.unrevert({ sessionID })
+          input.prompt.reset()
+          const lastMsg = findLast(input.userMessages(), (x) => x.id >= revertMessageID)
+          input.setActiveMessage(lastMsg)
          return
        }
-        await sdk.client.session.revert({ sessionID, messageID: nextMessage.id })
-        const priorMsg = findLast(userMessages(), (x) => x.id < nextMessage.id)
-        args.setActiveMessage(priorMsg)
+        await input.sdk.client.session.revert({ sessionID, messageID: nextMessage.id })
+        const priorMsg = findLast(input.userMessages(), (x) => x.id < nextMessage.id)
+        input.setActiveMessage(priorMsg)
      },
    }),
    sessionCommand({
      id: "session.compact",
-      title: language.t("command.session.compact"),
-      description: language.t("command.session.compact.description"),
+      title: input.language.t("command.session.compact"),
+      description: input.language.t("command.session.compact.description"),
      slash: "compact",
-      disabled: !params.id || visibleUserMessages().length === 0,
+      disabled: !input.params.id || input.visibleUserMessages().length === 0,
      onSelect: async () => {
-        const sessionID = params.id
+        const sessionID = input.params.id
        if (!sessionID) return
-        const model = local.model.current()
+        const model = input.local.model.current()
        if (!model) {
          showToast({
-            title: language.t("toast.model.none.title"),
-            description: language.t("toast.model.none.description"),
+            title: input.language.t("toast.model.none.title"),
+            description: input.language.t("toast.model.none.description"),
          })
          return
        }
-        await sdk.client.session.summarize({
+        await input.sdk.client.session.summarize({
          sessionID,
          modelID: model.id,
          providerID: model.provider.id,
@@ -368,27 +346,29 @@ export const useSessionCommands = (args: SessionCommandContext) => {
    }),
    sessionCommand({
      id: "session.fork",
-      title: language.t("command.session.fork"),
-      description: language.t("command.session.fork.description"),
+      title: input.language.t("command.session.fork"),
+      description: input.language.t("command.session.fork.description"),
      slash: "fork",
-      disabled: !params.id || visibleUserMessages().length === 0,
-      onSelect: () => dialog.show(() => <DialogFork />),
+      disabled: !input.params.id || input.visibleUserMessages().length === 0,
+      onSelect: () => input.dialog.show(() => <DialogFork />),
    }),
  ])

  const shareCommands = createMemo(() => {
-    if (sync.data.config.share === "disabled") return []
+    if (input.sync.data.config.share === "disabled") return []
    return [
      sessionCommand({
        id: "session.share",
-        title: info()?.share?.url ? language.t("session.share.copy.copyLink") : language.t("command.session.share"),
-        description: info()?.share?.url
-          ? language.t("toast.session.share.success.description")
-          : language.t("command.session.share.description"),
+        title: input.info()?.share?.url
+          ? input.language.t("session.share.copy.copyLink")
+          : input.language.t("command.session.share"),
+        description: input.info()?.share?.url
+          ? input.language.t("toast.session.share.success.description")
+          : input.language.t("command.session.share.description"),
        slash: "share",
-        disabled: !params.id,
+        disabled: !input.params.id,
        onSelect: async () => {
-          if (!params.id) return
+          if (!input.params.id) return

          const write = (value: string) => {
            const body = typeof document === "undefined" ? undefined : document.body
@@ -418,7 +398,7 @@ export const useSessionCommands = (args: SessionCommandContext) => {
            const ok = await write(url)
            if (!ok) {
              showToast({
-                title: language.t("toast.session.share.copyFailed.title"),
+                title: input.language.t("toast.session.share.copyFailed.title"),
                variant: "error",
              })
              return
@@ -426,27 +406,27 @@ export const useSessionCommands = (args: SessionCommandContext) => {

            showToast({
              title: existing
-                ? language.t("session.share.copy.copied")
-                : language.t("toast.session.share.success.title"),
-              description: language.t("toast.session.share.success.description"),
+                ? input.language.t("session.share.copy.copied")
+                : input.language.t("toast.session.share.success.title"),
+              description: input.language.t("toast.session.share.success.description"),
              variant: "success",
            })
          }

-          const existing = info()?.share?.url
+          const existing = input.info()?.share?.url
          if (existing) {
            await copy(existing, true)
            return
          }

-          const url = await sdk.client.session
-            .share({ sessionID: params.id })
+          const url = await input.sdk.client.session
+            .share({ sessionID: input.params.id })
            .then((res) => res.data?.share?.url)
            .catch(() => undefined)
          if (!url) {
            showToast({
-              title: language.t("toast.session.share.failed.title"),
-              description: language.t("toast.session.share.failed.description"),
+              title: input.language.t("toast.session.share.failed.title"),
+              description: input.language.t("toast.session.share.failed.description"),
              variant: "error",
            })
            return
@@ -457,25 +437,25 @@ export const useSessionCommands = (args: SessionCommandContext) => {
      }),
      sessionCommand({
        id: "session.unshare",
-        title: language.t("command.session.unshare"),
-        description: language.t("command.session.unshare.description"),
+        title: input.language.t("command.session.unshare"),
+        description: input.language.t("command.session.unshare.description"),
        slash: "unshare",
-        disabled: !params.id || !info()?.share?.url,
+        disabled: !input.params.id || !input.info()?.share?.url,
        onSelect: async () => {
-          if (!params.id) return
-          await sdk.client.session
-            .unshare({ sessionID: params.id })
+          if (!input.params.id) return
+          await input.sdk.client.session
+            .unshare({ sessionID: input.params.id })
            .then(() =>
              showToast({
-                title: language.t("toast.session.unshare.success.title"),
-                description: language.t("toast.session.unshare.success.description"),
+                title: input.language.t("toast.session.unshare.success.title"),
+                description: input.language.t("toast.session.unshare.success.description"),
                variant: "success",
              }),
            )
            .catch(() =>
              showToast({
-                title: language.t("toast.session.unshare.failed.title"),
-                description: language.t("toast.session.unshare.failed.description"),
+                title: input.language.t("toast.session.unshare.failed.title"),
+                description: input.language.t("toast.session.unshare.failed.description"),
                variant: "error",
              }),
            )
@@ -484,8 +464,8 @@ export const useSessionCommands = (args: SessionCommandContext) => {
    ]
  })

-  command.register("session", () =>
-    [
+  input.command.register("session", () =>
+    combineCommandSections([
      sessionCommands(),
      fileCommands(),
      contextCommands(),
@@ -495,6 +475,6 @@ export const useSessionCommands = (args: SessionCommandContext) => {
      permissionCommands(),
      sessionActionCommands(),
      shareCommands(),
-    ].flatMap((section) => section),
+    ]),
  )
 }
--- a/packages/console/app/package.json
+++ b/packages/console/app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-app",
-  "version": "1.2.6",
+  "version": "1.2.2",
  "type": "module",
  "license": "MIT",
  "scripts": {
--- a/packages/console/app/src/routes/index.css
+++ b/packages/console/app/src/routes/index.css
@@ -174,6 +174,21 @@ body {
    }
  }

+  input:-webkit-autofill,
+  input:-webkit-autofill:hover,
+  input:-webkit-autofill:focus,
+  input:-webkit-autofill:active {
+    transition: background-color 5000000s ease-in-out 0s;
+  }
+
+  input:-webkit-autofill {
+    -webkit-text-fill-color: var(--color-text-strong) !important;
+  }
+
+  input:-moz-autofill {
+    -moz-text-fill-color: var(--color-text-strong) !important;
+  }
+
  [data-component="container"] {
    max-width: 67.5rem;
    margin: 0 auto;
@@ -1234,19 +1249,4 @@ body {
      text-decoration: underline;
    }
  }
-
-  input:-webkit-autofill,
-  input:-webkit-autofill:hover,
-  input:-webkit-autofill:focus,
-  input:-webkit-autofill:active {
-    transition: background-color 5000000s ease-in-out 0s;
-  }
-
-  input:-webkit-autofill {
-    -webkit-text-fill-color: var(--color-text-strong) !important;
-  }
-
-  input:-moz-autofill {
-    -moz-text-fill-color: var(--color-text-strong) !important;
-  }
 }
--- a/packages/console/core/package.json
+++ b/packages/console/core/package.json
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/console-core",
-  "version": "1.2.6",
+  "version": "1.2.2",
  "private": true,
  "type": "module",
  "license": "MIT",
--- a/packages/console/function/package.json
+++ b/packages/console/function/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-function",
-  "version": "1.2.6",
+  "version": "1.2.2",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
--- a/packages/console/mail/package.json
+++ b/packages/console/mail/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-mail",
-  "version": "1.2.6",
+  "version": "1.2.2",
  "dependencies": {
    "@jsx-email/all": "2.2.3",
    "@jsx-email/cli": "1.4.3",
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop",
  "private": true,
-  "version": "1.2.6",
+  "version": "1.2.2",
  "type": "module",
  "license": "MIT",
  "scripts": {
--- a/packages/desktop/src-tauri/Cargo.lock
+++ b/packages/desktop/src-tauri/Cargo.lock
@@ -2343,9 +2343,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.180"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"

 [[package]]
 name = "libloading"
@@ -2663,18 +2663,6 @@ dependencies = [
 "memoffset",
 ]

-[[package]]
-name = "nix"
-version = "0.31.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225e7cfe711e0ba79a68baeddb2982723e4235247aefce1482f2f16c27865b66"
-dependencies = [
- "bitflags 2.10.0",
- "cfg-if",
- "cfg_aliases",
- "libc",
-]
-
 [[package]]
 name = "nodrop"
 version = "0.1.14"
@@ -3105,7 +3093,6 @@ dependencies = [
 "listeners",
 "objc2 0.6.3",
 "objc2-web-kit",
- "process-wrap",
 "reqwest 0.12.24",
 "semver",
 "serde",
@@ -3136,6 +3123,7 @@ dependencies = [
 "tracing-subscriber",
 "uuid",
 "webkit2gtk",
+ "windows 0.61.3",
 ]

 [[package]]
@@ -3650,20 +3638,6 @@ dependencies = [
 "unicode-ident",
 ]

-[[package]]
-name = "process-wrap"
-version = "9.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccd9713fe2c91c3c85ac388b31b89de339365d2c995146e630b5e0da9d06526a"
-dependencies = [
- "futures",
- "indexmap 2.12.1",
- "nix 0.31.1",
- "tokio",
- "tracing",
- "windows 0.62.2",
-]
-
 [[package]]
 name = "psl-types"
 version = "2.0.11"
@@ -6486,23 +6460,11 @@ version = "0.61.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
 dependencies = [
- "windows-collections 0.2.0",
+ "windows-collections",
 "windows-core 0.61.2",
- "windows-future 0.2.1",
+ "windows-future",
 "windows-link 0.1.3",
- "windows-numerics 0.2.0",
-]
-
-[[package]]
-name = "windows"
-version = "0.62.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
-dependencies = [
- "windows-collections 0.3.2",
- "windows-core 0.62.2",
- "windows-future 0.3.2",
- "windows-numerics 0.3.1",
+ "windows-numerics",
 ]

 [[package]]
@@ -6514,15 +6476,6 @@ dependencies = [
 "windows-core 0.61.2",
 ]

-[[package]]
-name = "windows-collections"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
-dependencies = [
- "windows-core 0.62.2",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.51.1"
@@ -6566,18 +6519,7 @@ checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
 dependencies = [
 "windows-core 0.61.2",
 "windows-link 0.1.3",
- "windows-threading 0.1.0",
-]
-
-[[package]]
-name = "windows-future"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
-dependencies = [
- "windows-core 0.62.2",
- "windows-link 0.2.1",
- "windows-threading 0.2.1",
+ "windows-threading",
 ]

 [[package]]
@@ -6624,16 +6566,6 @@ dependencies = [
 "windows-link 0.1.3",
 ]

-[[package]]
-name = "windows-numerics"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
-dependencies = [
- "windows-core 0.62.2",
- "windows-link 0.2.1",
-]
-
 [[package]]
 name = "windows-registry"
 version = "0.5.3"
@@ -6809,15 +6741,6 @@ dependencies = [
 "windows-link 0.1.3",
 ]

-[[package]]
-name = "windows-threading"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
-dependencies = [
- "windows-link 0.2.1",
-]
-
 [[package]]
 name = "windows-version"
 version = "0.1.7"
--- a/packages/desktop/src-tauri/Cargo.toml
+++ b/packages/desktop/src-tauri/Cargo.toml
@@ -34,7 +34,7 @@ tauri-plugin-single-instance = { version = "2", features = ["deep-link"] }

 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-tokio = { version = "1.48.0", features = ["process"] }
+tokio = "1.48.0"
 listeners = "0.3"
 tauri-plugin-os = "2"
 futures = "0.3.31"
@@ -52,7 +52,6 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 tracing-appender = "0.2"
 chrono = "0.4"
 tokio-stream = { version = "0.1.18", features = ["sync"] }
-process-wrap = { version = "9.0.3", features = ["tokio1"] }

 [target.'cfg(target_os = "linux")'.dependencies]
 gtk = "0.18.2"
@@ -63,6 +62,14 @@ objc2 = "0.6"
 objc2-web-kit = "0.3"


+[target.'cfg(windows)'.dependencies]
+windows = { version = "0.61", features = [
+    "Win32_Foundation",
+    "Win32_System_JobObjects",
+    "Win32_System_Threading",
+    "Win32_Security"
+] }
+
 [patch.crates-io]
 specta = { git = "https://github.com/specta-rs/specta", rev = "591a5f3ddc78348abf4cbb541d599d65306d92b9" }
 specta-typescript = { git = "https://github.com/specta-rs/specta", rev = "591a5f3ddc78348abf4cbb541d599d65306d92b9" }
--- a/packages/desktop/src-tauri/src/cli.rs
+++ b/packages/desktop/src-tauri/src/cli.rs
@@ -1,19 +1,12 @@
 use futures::{FutureExt, Stream, StreamExt, future};
-use process_wrap::tokio::CommandWrap;
-#[cfg(unix)]
-use process_wrap::tokio::ProcessGroup;
-#[cfg(windows)]
-use process_wrap::tokio::{JobObject, KillOnDrop};
-#[cfg(unix)]
-use std::os::unix::process::ExitStatusExt;
-use std::{process::Stdio, time::Duration};
 use tauri::{AppHandle, Manager, path::BaseDirectory};
+use tauri_plugin_shell::{
+    ShellExt,
+    process::{CommandChild, CommandEvent, TerminatedPayload},
+};
 use tauri_plugin_store::StoreExt;
 use tauri_specta::Event;
-use tokio::io::{AsyncBufReadExt, BufReader};
-use tokio::process::Command;
-use tokio::sync::{mpsc, oneshot};
-use tokio_stream::wrappers::ReceiverStream;
+use tokio::sync::oneshot;
 use tracing::Instrument;

 use crate::constants::{SETTINGS_STORE, WSL_ENABLED_KEY};
@@ -32,33 +25,6 @@ pub struct Config {
    pub server: Option<ServerConfig>,
 }

-#[derive(Clone, Debug)]
-pub enum CommandEvent {
-    Stdout(Vec<u8>),
-    Stderr(Vec<u8>),
-    Error(String),
-    Terminated(TerminatedPayload),
-}
-
-#[derive(Clone, Copy, Debug)]
-pub struct TerminatedPayload {
-    pub code: Option<i32>,
-    pub signal: Option<i32>,
-}
-
-#[derive(Clone, Debug)]
-pub struct CommandChild {
-    kill: mpsc::Sender<()>,
-}
-
-impl CommandChild {
-    pub fn kill(&self) -> std::io::Result<()> {
-        self.kill
-            .try_send(())
-            .map_err(|e| std::io::Error::other(e.to_string()))
-    }
-}
-
 pub async fn get_config(app: &AppHandle) -> Option<Config> {
    let (events, _) = spawn_command(app, "debug config", &[]).ok()?;

@@ -224,7 +190,7 @@ pub fn spawn_command(
    app: &tauri::AppHandle,
    args: &str,
    extra_env: &[(&str, String)],
-) -> Result<(impl Stream<Item = CommandEvent> + 'static, CommandChild), std::io::Error> {
+) -> Result<(impl Stream<Item = CommandEvent> + 'static, CommandChild), tauri_plugin_shell::Error> {
    let state_dir = app
        .path()
        .resolve("", BaseDirectory::AppLocalData)
@@ -251,7 +217,7 @@ pub fn spawn_command(
            .map(|(key, value)| (key.to_string(), value.clone())),
    );

-    let mut cmd = if cfg!(windows) {
+    let cmd = if cfg!(windows) {
        if is_wsl_enabled(app) {
            tracing::info!("WSL is enabled, spawning CLI server in WSL");
            let version = app.package_info().version.to_string();
@@ -283,16 +249,18 @@ pub fn spawn_command(

            script.push(format!("{} exec \"$BIN\" {}", env_prefix.join(" "), args));

-            let mut cmd = Command::new("wsl");
-            cmd.args(["-e", "bash", "-lc", &script.join("\n")]);
-            cmd
+            app.shell()
+                .command("wsl")
+                .args(["-e", "bash", "-lc", &script.join("\n")])
        } else {
-            let sidecar = get_sidecar_path(app);
-            let mut cmd = Command::new(sidecar);
-            cmd.args(args.split_whitespace());
+            let mut cmd = app
+                .shell()
+                .sidecar("opencode-cli")
+                .unwrap()
+                .args(args.split_whitespace());

            for (key, value) in envs {
-                cmd.env(key, value);
+                cmd = cmd.env(key, value);
            }

            cmd
@@ -301,111 +269,26 @@ pub fn spawn_command(
        let sidecar = get_sidecar_path(app);
        let shell = get_user_shell();

-        let line = if shell.ends_with("/nu") {
+        let cmd = if shell.ends_with("/nu") {
            format!("^\"{}\" {}", sidecar.display(), args)
        } else {
            format!("\"{}\" {}", sidecar.display(), args)
        };

-        let mut cmd = Command::new(shell);
-        cmd.args(["-il", "-c", &line]);
+        let mut cmd = app.shell().command(&shell).args(["-il", "-c", &cmd]);

        for (key, value) in envs {
-            cmd.env(key, value);
+            cmd = cmd.env(key, value);
        }

        cmd
    };

-    cmd.stdin(Stdio::null())
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped());
-
-    let mut wrap = CommandWrap::from(cmd);
-
-    #[cfg(unix)]
-    {
-        wrap.wrap(ProcessGroup::leader());
-    }
-
-    #[cfg(windows)]
-    {
-        wrap.wrap(JobObject).wrap(KillOnDrop);
-    }
-
-    let mut child = wrap.spawn()?;
-    let stdout = child.stdout().take();
-    let stderr = child.stderr().take();
-    let (tx, rx) = mpsc::channel(256);
-    let (kill_tx, mut kill_rx) = mpsc::channel(1);
-
-    if let Some(stdout) = stdout {
-        let tx = tx.clone();
-        tokio::spawn(async move {
-            let mut lines = BufReader::new(stdout).lines();
-            while let Ok(Some(line)) = lines.next_line().await {
-                let _ = tx.send(CommandEvent::Stdout(line.into_bytes())).await;
-            }
-        });
-    }
-
-    if let Some(stderr) = stderr {
-        let tx = tx.clone();
-        tokio::spawn(async move {
-            let mut lines = BufReader::new(stderr).lines();
-            while let Ok(Some(line)) = lines.next_line().await {
-                let _ = tx.send(CommandEvent::Stderr(line.into_bytes())).await;
-            }
-        });
-    }
-
-    tokio::spawn(async move {
-        let status = loop {
-            match child.try_wait() {
-                Ok(Some(status)) => break Ok(status),
-                Ok(None) => {}
-                Err(err) => break Err(err),
-            }
-
-            tokio::select! {
-                _ = kill_rx.recv() => {
-                    let _ = child.start_kill();
-                }
-                _ = tokio::time::sleep(Duration::from_millis(100)) => {}
-            }
-        };
-
-        match status {
-            Ok(status) => {
-                let payload = TerminatedPayload {
-                    code: status.code(),
-                    signal: signal_from_status(status),
-                };
-                let _ = tx.send(CommandEvent::Terminated(payload)).await;
-            }
-            Err(err) => {
-                let _ = tx.send(CommandEvent::Error(err.to_string())).await;
-            }
-        }
-    });
-
-    let event_stream = ReceiverStream::new(rx);
+    let (rx, child) = cmd.spawn()?;
+    let event_stream = tokio_stream::wrappers::ReceiverStream::new(rx);
    let event_stream = sqlite_migration::logs_middleware(app.clone(), event_stream);

-    Ok((event_stream, CommandChild { kill: kill_tx }))
-}
-
-fn signal_from_status(status: std::process::ExitStatus) -> Option<i32> {
-    #[cfg(unix)]
-    {
-        return status.signal();
-    }
-
-    #[cfg(not(unix))]
-    {
-        let _ = status;
-        None
-    }
+    Ok((event_stream, child))
 }

 pub fn serve(
@@ -457,6 +340,7 @@ pub fn serve(
                            let _ = tx.send(payload);
                        }
                    }
+                    _ => {}
                }

                future::ready(())
--- a/packages/desktop/src-tauri/src/job_object.rs
+++ b/packages/desktop/src-tauri/src/job_object.rs
@@ -0,0 +1,145 @@
+//! Windows Job Object for reliable child process cleanup.
+//!
+//! This module provides a wrapper around Windows Job Objects with the
+//! `JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE` flag set. When the job object handle
+//! is closed (including when the parent process exits or crashes), Windows
+//! automatically terminates all processes assigned to the job.
+//!
+//! This is more reliable than manual cleanup because it works even if:
+//! - The parent process crashes
+//! - The parent is killed via Task Manager
+//! - The RunEvent::Exit handler fails to run
+
+use std::io::{Error, Result};
+#[cfg(windows)]
+use std::sync::Mutex;
+use windows::Win32::Foundation::{CloseHandle, HANDLE};
+use windows::Win32::System::JobObjects::{
+    AssignProcessToJobObject, CreateJobObjectW, JobObjectExtendedLimitInformation,
+    SetInformationJobObject, JOBOBJECT_EXTENDED_LIMIT_INFORMATION,
+    JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE,
+};
+use windows::Win32::System::Threading::{OpenProcess, PROCESS_SET_QUOTA, PROCESS_TERMINATE};
+
+/// A Windows Job Object configured to kill all assigned processes when closed.
+///
+/// When this struct is dropped or when the owning process exits (even abnormally),
+/// Windows will automatically terminate all processes that have been assigned to it.
+pub struct JobObject(HANDLE);
+
+// SAFETY: HANDLE is just a pointer-sized value, and Windows job objects
+// can be safely accessed from multiple threads.
+unsafe impl Send for JobObject {}
+unsafe impl Sync for JobObject {}
+
+impl JobObject {
+    /// Creates a new anonymous job object with `JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE` set.
+    ///
+    /// When the last handle to this job is closed (including on process exit),
+    /// Windows will terminate all processes assigned to the job.
+    pub fn new() -> Result<Self> {
+        unsafe {
+            // Create an anonymous job object
+            let job = CreateJobObjectW(None, None).map_err(|e| Error::other(e.message()))?;
+
+            // Configure the job to kill all processes when the handle is closed
+            let mut info = JOBOBJECT_EXTENDED_LIMIT_INFORMATION::default();
+            info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;
+
+            SetInformationJobObject(
+                job,
+                JobObjectExtendedLimitInformation,
+                &info as *const _ as *const std::ffi::c_void,
+                std::mem::size_of::<JOBOBJECT_EXTENDED_LIMIT_INFORMATION>() as u32,
+            )
+            .map_err(|e| Error::other(e.message()))?;
+
+            Ok(Self(job))
+        }
+    }
+
+    /// Assigns a process to this job object by its process ID.
+    ///
+    /// Once assigned, the process will be terminated when this job object is dropped
+    /// or when the owning process exits.
+    ///
+    /// # Arguments
+    /// * `pid` - The process ID of the process to assign
+    pub fn assign_pid(&self, pid: u32) -> Result<()> {
+        unsafe {
+            // Open a handle to the process with the minimum required permissions
+            // PROCESS_SET_QUOTA and PROCESS_TERMINATE are required by AssignProcessToJobObject
+            let process = OpenProcess(PROCESS_SET_QUOTA | PROCESS_TERMINATE, false, pid)
+                .map_err(|e| Error::other(e.message()))?;
+
+            // Assign the process to the job
+            let result = AssignProcessToJobObject(self.0, process);
+
+            // Close our handle to the process - the job object maintains its own reference
+            let _ = CloseHandle(process);
+
+            result.map_err(|e| Error::other(e.message()))
+        }
+    }
+}
+
+impl Drop for JobObject {
+    fn drop(&mut self) {
+        unsafe {
+            // When this handle is closed and it's the last handle to the job,
+            // Windows will terminate all processes in the job due to KILL_ON_JOB_CLOSE
+            let _ = CloseHandle(self.0);
+        }
+    }
+}
+
+/// Holds the Windows Job Object that ensures child processes are killed when the app exits.
+/// On Windows, when the job object handle is closed (including on crash), all assigned
+/// processes are automatically terminated by the OS.
+#[cfg(windows)]
+pub struct JobObjectState {
+    job: Mutex<Option<JobObject>>,
+    error: Mutex<Option<String>>,
+}
+
+#[cfg(windows)]
+impl JobObjectState {
+    pub fn new() -> Self {
+        match JobObject::new() {
+            Ok(job) => Self {
+                job: Mutex::new(Some(job)),
+                error: Mutex::new(None),
+            },
+            Err(e) => {
+                tracing::error!("Failed to create job object: {e}");
+                Self {
+                    job: Mutex::new(None),
+                    error: Mutex::new(Some(format!("Failed to create job object: {e}"))),
+                }
+            }
+        }
+    }
+
+    pub fn assign_pid(&self, pid: u32) {
+        if let Some(job) = self.job.lock().unwrap().as_ref() {
+            if let Err(e) = job.assign_pid(pid) {
+                tracing::error!(pid, "Failed to assign process to job object: {e}");
+                *self.error.lock().unwrap() =
+                    Some(format!("Failed to assign process to job object: {e}"));
+            } else {
+                tracing::info!(pid, "Assigned process to job object for automatic cleanup");
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_job_object_creation() {
+        let job = JobObject::new();
+        assert!(job.is_ok(), "Failed to create job object: {:?}", job.err());
+    }
+}
--- a/packages/desktop/src-tauri/src/lib.rs
+++ b/packages/desktop/src-tauri/src/lib.rs
@@ -1,20 +1,21 @@
 mod cli;
 mod constants;
+#[cfg(windows)]
+mod job_object;
 #[cfg(target_os = "linux")]
 pub mod linux_display;
-#[cfg(target_os = "linux")]
-pub mod linux_windowing;
 mod logging;
 mod markdown;
 mod server;
 mod window_customizer;
 mod windows;

-use crate::cli::CommandChild;
 use futures::{
    FutureExt, TryFutureExt,
    future::{self, Shared},
 };
+#[cfg(windows)]
+use job_object::*;
 use std::{
    env,
    net::TcpListener,
@@ -26,6 +27,7 @@ use std::{
 use tauri::{AppHandle, Listener, Manager, RunEvent, State, ipc::Channel};
 #[cfg(any(target_os = "linux", all(debug_assertions, windows)))]
 use tauri_plugin_deep_link::DeepLinkExt;
+use tauri_plugin_shell::process::CommandChild;
 use tauri_specta::Event;
 use tokio::{
    sync::{oneshot, watch},
@@ -629,6 +631,12 @@ async fn initialize(app: AppHandle) {

                            tracing::info!("CLI health check OK");

+                            #[cfg(windows)]
+                            {
+                                let job_state = app.state::<JobObjectState>();
+                                job_state.assign_pid(child.pid());
+                            }
+
                            app.state::<ServerState>().set_child(Some(child));

                            Ok(ServerReadyData { url, password })
@@ -702,6 +710,9 @@ fn setup_app(app: &tauri::AppHandle, init_rx: watch::Receiver<InitStep>) {
    #[cfg(any(target_os = "linux", all(debug_assertions, windows)))]
    app.deep_link().register_all().ok();

+    #[cfg(windows)]
+    app.manage(JobObjectState::new());
+
    app.manage(InitState { current: init_rx });
 }

--- a/packages/desktop/src-tauri/src/linux_windowing.rs
+++ b/packages/desktop/src-tauri/src/linux_windowing.rs
@@ -1,475 +0,0 @@
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum Backend {
-    Auto,
-    Wayland,
-    X11,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct BackendDecision {
-    pub backend: Backend,
-    pub note: String,
-}
-
-#[derive(Debug, Clone, Default)]
-pub struct SessionEnv {
-    pub wayland_display: bool,
-    pub xdg_session_type: Option<String>,
-    pub display: bool,
-    pub xdg_current_desktop: Option<String>,
-    pub xdg_session_desktop: Option<String>,
-    pub desktop_session: Option<String>,
-    pub oc_allow_wayland: Option<String>,
-    pub oc_force_x11: Option<String>,
-    pub oc_force_wayland: Option<String>,
-    pub oc_linux_decorations: Option<String>,
-    pub oc_force_decorations: Option<String>,
-    pub oc_no_decorations: Option<String>,
-    pub i3_sock: bool,
-}
-
-impl SessionEnv {
-    pub fn capture() -> Self {
-        Self {
-            wayland_display: std::env::var_os("WAYLAND_DISPLAY").is_some(),
-            xdg_session_type: std::env::var("XDG_SESSION_TYPE").ok(),
-            display: std::env::var_os("DISPLAY").is_some(),
-            xdg_current_desktop: std::env::var("XDG_CURRENT_DESKTOP").ok(),
-            xdg_session_desktop: std::env::var("XDG_SESSION_DESKTOP").ok(),
-            desktop_session: std::env::var("DESKTOP_SESSION").ok(),
-            oc_allow_wayland: std::env::var("OC_ALLOW_WAYLAND").ok(),
-            oc_force_x11: std::env::var("OC_FORCE_X11").ok(),
-            oc_force_wayland: std::env::var("OC_FORCE_WAYLAND").ok(),
-            oc_linux_decorations: std::env::var("OC_LINUX_DECORATIONS").ok(),
-            oc_force_decorations: std::env::var("OC_FORCE_DECORATIONS").ok(),
-            oc_no_decorations: std::env::var("OC_NO_DECORATIONS").ok(),
-            i3_sock: std::env::var_os("I3SOCK").is_some(),
-        }
-    }
-}
-
-pub fn select_backend(env: &SessionEnv, prefer_wayland: bool) -> Option<BackendDecision> {
-    if is_truthy(env.oc_force_x11.as_deref()) {
-        return Some(BackendDecision {
-            backend: Backend::X11,
-            note: "Forcing X11 due to OC_FORCE_X11=1".into(),
-        });
-    }
-
-    if is_truthy(env.oc_force_wayland.as_deref()) {
-        return Some(BackendDecision {
-            backend: Backend::Wayland,
-            note: "Forcing native Wayland due to OC_FORCE_WAYLAND=1".into(),
-        });
-    }
-
-    if !is_wayland_session(env) {
-        return None;
-    }
-
-    if prefer_wayland {
-        return Some(BackendDecision {
-            backend: Backend::Wayland,
-            note: "Wayland session detected; forcing native Wayland from settings".into(),
-        });
-    }
-
-    if is_truthy(env.oc_allow_wayland.as_deref()) {
-        return Some(BackendDecision {
-            backend: Backend::Wayland,
-            note: "Wayland session detected; forcing native Wayland due to OC_ALLOW_WAYLAND=1"
-                .into(),
-        });
-    }
-
-    Some(BackendDecision {
-        backend: Backend::Auto,
-        note: "Wayland session detected; using native Wayland first with X11 fallback (auto backend). Set OC_FORCE_X11=1 to force X11."
-            .into(),
-    })
-}
-
-pub fn use_decorations(env: &SessionEnv) -> bool {
-    if let Some(mode) = decoration_override(env.oc_linux_decorations.as_deref()) {
-        return match mode {
-            DecorationOverride::Native => true,
-            DecorationOverride::None => false,
-            DecorationOverride::Auto => default_use_decorations(env),
-        };
-    }
-
-    if is_truthy(env.oc_force_decorations.as_deref()) {
-        return true;
-    }
-    if is_truthy(env.oc_no_decorations.as_deref()) {
-        return false;
-    }
-
-    default_use_decorations(env)
-}
-
-fn default_use_decorations(env: &SessionEnv) -> bool {
-    if is_known_tiling_session(env) {
-        return false;
-    }
-    if !is_wayland_session(env) {
-        return true;
-    }
-    is_full_desktop_session(env)
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum DecorationOverride {
-    Auto,
-    Native,
-    None,
-}
-
-fn decoration_override(value: Option<&str>) -> Option<DecorationOverride> {
-    let value = value?.trim().to_ascii_lowercase();
-    if matches!(value.as_str(), "auto") {
-        return Some(DecorationOverride::Auto);
-    }
-    if matches!(
-        value.as_str(),
-        "native" | "server" | "de" | "wayland" | "on" | "true" | "1"
-    ) {
-        return Some(DecorationOverride::Native);
-    }
-    if matches!(
-        value.as_str(),
-        "none" | "off" | "false" | "0" | "client" | "csd"
-    ) {
-        return Some(DecorationOverride::None);
-    }
-    None
-}
-
-fn is_truthy(value: Option<&str>) -> bool {
-    matches!(
-        value.map(|v| v.trim().to_ascii_lowercase()),
-        Some(v) if matches!(v.as_str(), "1" | "true" | "yes" | "on")
-    )
-}
-
-fn is_wayland_session(env: &SessionEnv) -> bool {
-    env.wayland_display
-        || matches!(
-            env.xdg_session_type.as_deref(),
-            Some(value) if value.eq_ignore_ascii_case("wayland")
-        )
-}
-
-fn is_full_desktop_session(env: &SessionEnv) -> bool {
-    desktop_tokens(env).any(|value| {
-        matches!(
-            value.as_str(),
-            "gnome"
-                | "kde"
-                | "plasma"
-                | "xfce"
-                | "xfce4"
-                | "x-cinnamon"
-                | "cinnamon"
-                | "mate"
-                | "lxqt"
-                | "budgie"
-                | "pantheon"
-                | "deepin"
-                | "unity"
-                | "cosmic"
-        )
-    })
-}
-
-fn is_known_tiling_session(env: &SessionEnv) -> bool {
-    if env.i3_sock {
-        return true;
-    }
-
-    desktop_tokens(env).any(|value| {
-        matches!(
-            value.as_str(),
-            "niri"
-                | "sway"
-                | "swayfx"
-                | "hyprland"
-                | "river"
-                | "i3"
-                | "i3wm"
-                | "bspwm"
-                | "dwm"
-                | "qtile"
-                | "xmonad"
-                | "leftwm"
-                | "dwl"
-                | "awesome"
-                | "herbstluftwm"
-                | "spectrwm"
-                | "worm"
-                | "i3-gnome"
-        )
-    })
-}
-
-fn desktop_tokens<'a>(env: &'a SessionEnv) -> impl Iterator<Item = String> + 'a {
-    [
-        env.xdg_current_desktop.as_deref(),
-        env.xdg_session_desktop.as_deref(),
-        env.desktop_session.as_deref(),
-    ]
-    .into_iter()
-    .flatten()
-    .flat_map(|desktop| desktop.split(':'))
-    .map(|value| value.trim().to_ascii_lowercase())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn prefers_wayland_first_on_wayland_session() {
-        let env = SessionEnv {
-            wayland_display: true,
-            display: true,
-            ..Default::default()
-        };
-
-        let decision = select_backend(&env, false).expect("missing decision");
-        assert_eq!(decision.backend, Backend::Auto);
-    }
-
-    #[test]
-    fn force_x11_override_wins() {
-        let env = SessionEnv {
-            wayland_display: true,
-            display: true,
-            oc_force_x11: Some("1".into()),
-            oc_allow_wayland: Some("1".into()),
-            oc_force_wayland: Some("1".into()),
-            ..Default::default()
-        };
-
-        let decision = select_backend(&env, true).expect("missing decision");
-        assert_eq!(decision.backend, Backend::X11);
-    }
-
-    #[test]
-    fn prefer_wayland_forces_wayland_backend() {
-        let env = SessionEnv {
-            wayland_display: true,
-            display: true,
-            ..Default::default()
-        };
-
-        let decision = select_backend(&env, true).expect("missing decision");
-        assert_eq!(decision.backend, Backend::Wayland);
-    }
-
-    #[test]
-    fn force_wayland_override_works_outside_wayland_session() {
-        let env = SessionEnv {
-            display: true,
-            oc_force_wayland: Some("1".into()),
-            ..Default::default()
-        };
-
-        let decision = select_backend(&env, false).expect("missing decision");
-        assert_eq!(decision.backend, Backend::Wayland);
-    }
-
-    #[test]
-    fn allow_wayland_forces_wayland_backend() {
-        let env = SessionEnv {
-            wayland_display: true,
-            display: true,
-            oc_allow_wayland: Some("1".into()),
-            ..Default::default()
-        };
-
-        let decision = select_backend(&env, false).expect("missing decision");
-        assert_eq!(decision.backend, Backend::Wayland);
-    }
-
-    #[test]
-    fn xdg_session_type_wayland_is_detected() {
-        let env = SessionEnv {
-            xdg_session_type: Some("wayland".into()),
-            ..Default::default()
-        };
-
-        let decision = select_backend(&env, false).expect("missing decision");
-        assert_eq!(decision.backend, Backend::Auto);
-    }
-
-    #[test]
-    fn returns_none_when_not_wayland_and_no_overrides() {
-        let env = SessionEnv {
-            display: true,
-            xdg_current_desktop: Some("GNOME".into()),
-            ..Default::default()
-        };
-
-        assert!(select_backend(&env, false).is_none());
-    }
-
-    #[test]
-    fn prefer_wayland_setting_does_not_override_x11_session() {
-        let env = SessionEnv {
-            display: true,
-            xdg_current_desktop: Some("GNOME".into()),
-            ..Default::default()
-        };
-
-        assert!(select_backend(&env, true).is_none());
-    }
-
-    #[test]
-    fn disables_decorations_on_niri() {
-        let env = SessionEnv {
-            xdg_current_desktop: Some("niri".into()),
-            wayland_display: true,
-            ..Default::default()
-        };
-
-        assert!(!use_decorations(&env));
-    }
-
-    #[test]
-    fn keeps_decorations_on_gnome() {
-        let env = SessionEnv {
-            xdg_current_desktop: Some("GNOME".into()),
-            wayland_display: true,
-            ..Default::default()
-        };
-
-        assert!(use_decorations(&env));
-    }
-
-    #[test]
-    fn disables_decorations_when_session_desktop_is_tiling() {
-        let env = SessionEnv {
-            xdg_session_desktop: Some("Hyprland".into()),
-            wayland_display: true,
-            ..Default::default()
-        };
-
-        assert!(!use_decorations(&env));
-    }
-
-    #[test]
-    fn disables_decorations_for_unknown_wayland_session() {
-        let env = SessionEnv {
-            xdg_current_desktop: Some("labwc".into()),
-            wayland_display: true,
-            ..Default::default()
-        };
-
-        assert!(!use_decorations(&env));
-    }
-
-    #[test]
-    fn disables_decorations_for_dwm_on_x11() {
-        let env = SessionEnv {
-            xdg_current_desktop: Some("dwm".into()),
-            display: true,
-            ..Default::default()
-        };
-
-        assert!(!use_decorations(&env));
-    }
-
-    #[test]
-    fn disables_decorations_for_i3_on_x11() {
-        let env = SessionEnv {
-            xdg_current_desktop: Some("i3".into()),
-            display: true,
-            ..Default::default()
-        };
-
-        assert!(!use_decorations(&env));
-    }
-
-    #[test]
-    fn disables_decorations_for_i3sock_without_xdg_tokens() {
-        let env = SessionEnv {
-            display: true,
-            i3_sock: true,
-            ..Default::default()
-        };
-
-        assert!(!use_decorations(&env));
-    }
-
-    #[test]
-    fn keeps_decorations_for_gnome_on_x11() {
-        let env = SessionEnv {
-            xdg_current_desktop: Some("GNOME".into()),
-            display: true,
-            ..Default::default()
-        };
-
-        assert!(use_decorations(&env));
-    }
-
-    #[test]
-    fn no_decorations_override_wins() {
-        let env = SessionEnv {
-            xdg_current_desktop: Some("GNOME".into()),
-            oc_no_decorations: Some("1".into()),
-            ..Default::default()
-        };
-
-        assert!(!use_decorations(&env));
-    }
-
-    #[test]
-    fn linux_decorations_native_override_wins() {
-        let env = SessionEnv {
-            xdg_current_desktop: Some("niri".into()),
-            wayland_display: true,
-            oc_linux_decorations: Some("native".into()),
-            ..Default::default()
-        };
-
-        assert!(use_decorations(&env));
-    }
-
-    #[test]
-    fn linux_decorations_none_override_wins() {
-        let env = SessionEnv {
-            xdg_current_desktop: Some("GNOME".into()),
-            wayland_display: true,
-            oc_linux_decorations: Some("none".into()),
-            ..Default::default()
-        };
-
-        assert!(!use_decorations(&env));
-    }
-
-    #[test]
-    fn linux_decorations_auto_uses_default_policy() {
-        let env = SessionEnv {
-            xdg_current_desktop: Some("sway".into()),
-            wayland_display: true,
-            oc_linux_decorations: Some("auto".into()),
-            ..Default::default()
-        };
-
-        assert!(!use_decorations(&env));
-    }
-
-    #[test]
-    fn linux_decorations_override_beats_legacy_overrides() {
-        let env = SessionEnv {
-            xdg_current_desktop: Some("GNOME".into()),
-            wayland_display: true,
-            oc_linux_decorations: Some("none".into()),
-            oc_force_decorations: Some("1".into()),
-            ..Default::default()
-        };
-
-        assert!(!use_decorations(&env));
-    }
-}
--- a/packages/desktop/src-tauri/src/logging.rs
+++ b/packages/desktop/src-tauri/src/logging.rs
@@ -36,7 +36,11 @@ pub fn init(log_dir: &Path) -> WorkerGuard {
    tracing_subscriber::registry()
        .with(filter)
        .with(fmt::layer().with_writer(std::io::stderr))
-        .with(fmt::layer().with_writer(non_blocking).with_ansi(false))
+        .with(
+            fmt::layer()
+                .with_writer(non_blocking)
+                .with_ansi(false),
+        )
        .init();

    guard
@@ -51,7 +55,10 @@ pub fn tail() -> String {
        return String::new();
    };

-    let lines: Vec<String> = BufReader::new(file).lines().map_while(Result::ok).collect();
+    let lines: Vec<String> = BufReader::new(file)
+        .lines()
+        .map_while(Result::ok)
+        .collect();

    let start = lines.len().saturating_sub(TAIL_LINES);
    lines[start..].join("\n")
--- a/packages/desktop/src-tauri/src/main.rs
+++ b/packages/desktop/src-tauri/src/main.rs
@@ -4,7 +4,6 @@
 // borrowed from https://github.com/skyline69/balatro-mod-manager
 #[cfg(target_os = "linux")]
 fn configure_display_backend() -> Option<String> {
-    use opencode_lib::linux_windowing::{Backend, SessionEnv, select_backend};
    use std::env;

    let set_env_if_absent = |key: &str, value: &str| {
@@ -15,28 +14,45 @@ fn configure_display_backend() -> Option<String> {
        }
    };

-    let session = SessionEnv::capture();
-    let prefer_wayland = opencode_lib::linux_display::read_wayland().unwrap_or(false);
-    let decision = select_backend(&session, prefer_wayland)?;
-
-    match decision.backend {
-        Backend::X11 => {
-            set_env_if_absent("WINIT_UNIX_BACKEND", "x11");
-            set_env_if_absent("GDK_BACKEND", "x11");
-            set_env_if_absent("WEBKIT_DISABLE_DMABUF_RENDERER", "1");
-        }
-        Backend::Wayland => {
-            set_env_if_absent("WINIT_UNIX_BACKEND", "wayland");
-            set_env_if_absent("GDK_BACKEND", "wayland");
-            set_env_if_absent("WEBKIT_DISABLE_DMABUF_RENDERER", "1");
-        }
-        Backend::Auto => {
-            set_env_if_absent("GDK_BACKEND", "wayland,x11");
-            set_env_if_absent("WEBKIT_DISABLE_DMABUF_RENDERER", "1");
-        }
+    let on_wayland = env::var_os("WAYLAND_DISPLAY").is_some()
+        || matches!(
+            env::var("XDG_SESSION_TYPE"),
+            Ok(v) if v.eq_ignore_ascii_case("wayland")
+        );
+    if !on_wayland {
+        return None;
    }

-    Some(decision.note)
+    let prefer_wayland = opencode_lib::linux_display::read_wayland().unwrap_or(false);
+    let allow_wayland = prefer_wayland
+        || matches!(
+            env::var("OC_ALLOW_WAYLAND"),
+            Ok(v) if matches!(v.to_ascii_lowercase().as_str(), "1" | "true" | "yes")
+        );
+    if allow_wayland {
+        if prefer_wayland {
+            return Some("Wayland session detected; using native Wayland from settings".into());
+        }
+        return Some("Wayland session detected; respecting OC_ALLOW_WAYLAND=1".into());
+    }
+
+    // Prefer XWayland when available to avoid Wayland protocol errors seen during startup.
+    if env::var_os("DISPLAY").is_some() {
+        set_env_if_absent("WINIT_UNIX_BACKEND", "x11");
+        set_env_if_absent("GDK_BACKEND", "x11");
+        set_env_if_absent("WEBKIT_DISABLE_DMABUF_RENDERER", "1");
+        return Some(
+            "Wayland session detected; forcing X11 backend to avoid compositor protocol errors. \
+                Set OC_ALLOW_WAYLAND=1 to keep native Wayland."
+                .into(),
+        );
+    }
+
+    set_env_if_absent("WEBKIT_DISABLE_DMABUF_RENDERER", "1");
+    Some(
+        "Wayland session detected without X11; leaving Wayland enabled (set WINIT_UNIX_BACKEND/GDK_BACKEND manually if needed)."
+            .into(),
+    )
 }

 fn main() {
--- a/packages/desktop/src-tauri/src/server.rs
+++ b/packages/desktop/src-tauri/src/server.rs
@@ -2,12 +2,12 @@ use std::time::{Duration, Instant};

 use tauri::AppHandle;
 use tauri_plugin_dialog::{DialogExt, MessageDialogButtons, MessageDialogResult};
+use tauri_plugin_shell::process::CommandChild;
 use tauri_plugin_store::StoreExt;
 use tokio::task::JoinHandle;

 use crate::{
    cli,
-    cli::CommandChild,
    constants::{DEFAULT_SERVER_URL_KEY, SETTINGS_STORE, WSL_ENABLED_KEY},
 };

--- a/packages/desktop/src-tauri/src/windows.rs
+++ b/packages/desktop/src-tauri/src/windows.rs
@@ -7,22 +7,6 @@ use tauri::{AppHandle, Manager, Runtime, WebviewUrl, WebviewWindow, WebviewWindo
 use tauri_plugin_window_state::AppHandleExt;
 use tokio::sync::mpsc;

-#[cfg(target_os = "linux")]
-use std::sync::OnceLock;
-
-#[cfg(target_os = "linux")]
-fn use_decorations() -> bool {
-    static DECORATIONS: OnceLock<bool> = OnceLock::new();
-    *DECORATIONS.get_or_init(|| {
-        crate::linux_windowing::use_decorations(&crate::linux_windowing::SessionEnv::capture())
-    })
-}
-
-#[cfg(not(target_os = "linux"))]
-fn use_decorations() -> bool {
-    true
-}
-
 pub struct MainWindow(WebviewWindow);

 impl Deref for MainWindow {
@@ -38,8 +22,6 @@ impl MainWindow {

    pub fn create(app: &AppHandle) -> Result<Self, tauri::Error> {
        if let Some(window) = app.get_webview_window(Self::LABEL) {
-            let _ = window.set_focus();
-            let _ = window.unminimize();
            return Ok(Self(window));
        }

@@ -47,13 +29,13 @@ impl MainWindow {
            .ok()
            .map(|v| v.enabled)
            .unwrap_or(false);
-        let decorations = use_decorations();
+
        let window_builder = base_window_config(
            WebviewWindowBuilder::new(app, Self::LABEL, WebviewUrl::App("/".into())),
            app,
-            decorations,
        )
        .title("OpenCode")
+        .decorations(true)
        .disable_drag_drop_handler()
        .zoom_hotkeys_enabled(false)
        .visible(true)
@@ -68,9 +50,6 @@ impl MainWindow {

        let window = window_builder.build()?;

-        // Ensure window is focused after creation (e.g., after update/relaunch)
-        let _ = window.set_focus();
-
        setup_window_state_listener(app, &window);

        #[cfg(windows)]
@@ -129,12 +108,9 @@ impl LoadingWindow {
    pub const LABEL: &str = "loading";

    pub fn create(app: &AppHandle) -> Result<Self, tauri::Error> {
-        let decorations = use_decorations();
-
        let window_builder = base_window_config(
            WebviewWindowBuilder::new(app, Self::LABEL, tauri::WebviewUrl::App("/loading".into())),
            app,
-            decorations,
        )
        .center()
        .resizable(false)
@@ -148,9 +124,8 @@ impl LoadingWindow {
 fn base_window_config<'a, R: Runtime, M: Manager<R>>(
    window_builder: WebviewWindowBuilder<'a, R, M>,
    _app: &AppHandle,
-    decorations: bool,
 ) -> WebviewWindowBuilder<'a, R, M> {
-    let window_builder = window_builder.decorations(decorations);
+    let window_builder = window_builder.decorations(true);

    #[cfg(windows)]
    let window_builder = window_builder
--- a/packages/enterprise/package.json
+++ b/packages/enterprise/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/enterprise",
-  "version": "1.2.6",
+  "version": "1.2.2",
  "private": true,
  "type": "module",
  "license": "MIT",
--- a/packages/extensions/zed/extension.toml
+++ b/packages/extensions/zed/extension.toml
@@ -1,7 +1,7 @@
 id = "opencode"
 name = "OpenCode"
 description = "The open source coding agent."
-version = "1.2.6"
+version = "1.2.2"
 schema_version = 1
 authors = ["Anomaly"]
 repository = "https://github.com/anomalyco/opencode"
@@ -11,26 +11,26 @@ name = "OpenCode"
 icon = "./icons/opencode.svg"

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

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

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

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

 [agent_servers.opencode.targets.windows-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.2.6/opencode-windows-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.2.2/opencode-windows-x64.zip"
 cmd = "./opencode.exe"
 args = ["acp"]
--- a/packages/function/package.json
+++ b/packages/function/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/function",
-  "version": "1.2.6",
+  "version": "1.2.2",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.2.6",
+  "version": "1.2.2",
  "name": "opencode",
  "type": "module",
  "license": "MIT",
@@ -74,8 +74,8 @@
    "@ai-sdk/vercel": "1.0.33",
    "@ai-sdk/xai": "2.0.51",
    "@clack/prompts": "1.0.0-alpha.1",
-    "@gitlab/gitlab-ai-provider": "3.5.1",
-    "@gitlab/opencode-gitlab-auth": "1.3.3",
+    "@gitlab/gitlab-ai-provider": "3.5.0",
+    "@gitlab/opencode-gitlab-auth": "1.3.2",
    "@hono/standard-validator": "0.1.5",
    "@hono/zod-validator": "catalog:",
    "@modelcontextprotocol/sdk": "1.25.2",
--- a/packages/opencode/src/acp/README.md
+++ b/packages/opencode/src/acp/README.md
@@ -44,16 +44,6 @@ opencode acp
 opencode acp --cwd /path/to/project
 ```

-### Question Tool Opt-In
-
-ACP excludes `QuestionTool` by default.
-
-```bash
-OPENCODE_ENABLE_QUESTION_TOOL=1 opencode acp
-```
-
-Enable this only for ACP clients that support interactive question prompts.
-
 ### Programmatic

 ```typescript
--- a/packages/opencode/src/acp/session.ts
+++ b/packages/opencode/src/acp/session.ts
@@ -21,6 +21,7 @@ export class ACPSessionManager {
    const session = await this.sdk.session
      .create(
        {
+          title: `ACP Session ${crypto.randomUUID()}`,
          directory: cwd,
        },
        { throwOnError: true },
--- a/packages/opencode/src/cli/cmd/db.ts
+++ b/packages/opencode/src/cli/cmd/db.ts
@@ -1,118 +0,0 @@
-import type { Argv } from "yargs"
-import { spawn } from "child_process"
-import { Database } from "../../storage/db"
-import { Database as BunDatabase } from "bun:sqlite"
-import { UI } from "../ui"
-import { cmd } from "./cmd"
-import { JsonMigration } from "../../storage/json-migration"
-import { EOL } from "os"
-
-const QueryCommand = cmd({
-  command: "$0 [query]",
-  describe: "open an interactive sqlite3 shell or run a query",
-  builder: (yargs: Argv) => {
-    return yargs
-      .positional("query", {
-        type: "string",
-        describe: "SQL query to execute",
-      })
-      .option("format", {
-        type: "string",
-        choices: ["json", "tsv"],
-        default: "tsv",
-        describe: "Output format",
-      })
-  },
-  handler: async (args: { query?: string; format: string }) => {
-    const query = args.query as string | undefined
-    if (query) {
-      const db = new BunDatabase(Database.Path, { readonly: true })
-      try {
-        const result = db.query(query).all() as Record<string, unknown>[]
-        if (args.format === "json") {
-          console.log(JSON.stringify(result, null, 2))
-        } else if (result.length > 0) {
-          const keys = Object.keys(result[0])
-          console.log(keys.join("\t"))
-          for (const row of result) {
-            console.log(keys.map((k) => row[k]).join("\t"))
-          }
-        }
-      } catch (err) {
-        UI.error(err instanceof Error ? err.message : String(err))
-        process.exit(1)
-      }
-      db.close()
-      return
-    }
-    const child = spawn("sqlite3", [Database.Path], {
-      stdio: "inherit",
-    })
-    await new Promise((resolve) => child.on("close", resolve))
-  },
-})
-
-const PathCommand = cmd({
-  command: "path",
-  describe: "print the database path",
-  handler: () => {
-    console.log(Database.Path)
-  },
-})
-
-const MigrateCommand = cmd({
-  command: "migrate",
-  describe: "migrate JSON data to SQLite (merges with existing data)",
-  handler: async () => {
-    const sqlite = new BunDatabase(Database.Path)
-    const tty = process.stderr.isTTY
-    const width = 36
-    const orange = "\x1b[38;5;214m"
-    const muted = "\x1b[0;2m"
-    const reset = "\x1b[0m"
-    let last = -1
-    if (tty) process.stderr.write("\x1b[?25l")
-    try {
-      const stats = await JsonMigration.run(sqlite, {
-        progress: (event) => {
-          const percent = Math.floor((event.current / event.total) * 100)
-          if (percent === last) return
-          last = percent
-          if (tty) {
-            const fill = Math.round((percent / 100) * width)
-            const bar = `${"■".repeat(fill)}${"･".repeat(width - fill)}`
-            process.stderr.write(
-              `\r${orange}${bar} ${percent.toString().padStart(3)}%${reset} ${muted}${event.current}/${event.total}${reset} `,
-            )
-          } else {
-            process.stderr.write(`sqlite-migration:${percent}${EOL}`)
-          }
-        },
-      })
-      if (tty) process.stderr.write("\n")
-      if (tty) process.stderr.write("\x1b[?25h")
-      else process.stderr.write(`sqlite-migration:done${EOL}`)
-      UI.println(
-        `Migration complete: ${stats.projects} projects, ${stats.sessions} sessions, ${stats.messages} messages`,
-      )
-      if (stats.errors.length > 0) {
-        UI.println(`${stats.errors.length} errors occurred during migration`)
-      }
-    } catch (err) {
-      if (tty) process.stderr.write("\x1b[?25h")
-      UI.error(`Migration failed: ${err instanceof Error ? err.message : String(err)}`)
-      process.exit(1)
-    } finally {
-      sqlite.close()
-    }
-  },
-})
-
-export const DbCommand = cmd({
-  command: "db",
-  describe: "database tools",
-  builder: (yargs: Argv) => {
-    return yargs.command(QueryCommand).command(PathCommand).command(MigrateCommand).demandCommand()
-  },
-  handler: () => {},
-})
--- a/packages/opencode/src/cli/cmd/session.ts
+++ b/packages/opencode/src/cli/cmd/session.ts
@@ -38,34 +38,10 @@ function pagerCmd(): string[] {
 export const SessionCommand = cmd({
  command: "session",
  describe: "manage sessions",
-  builder: (yargs: Argv) => yargs.command(SessionListCommand).command(SessionDeleteCommand).demandCommand(),
+  builder: (yargs: Argv) => yargs.command(SessionListCommand).demandCommand(),
  async handler() {},
 })

-export const SessionDeleteCommand = cmd({
-  command: "delete <sessionID>",
-  describe: "delete a session",
-  builder: (yargs: Argv) => {
-    return yargs.positional("sessionID", {
-      describe: "session ID to delete",
-      type: "string",
-      demandOption: true,
-    })
-  },
-  handler: async (args) => {
-    await bootstrap(process.cwd(), async () => {
-      try {
-        await Session.get(args.sessionID)
-      } catch {
-        UI.error(`Session not found: ${args.sessionID}`)
-        process.exit(1)
-      }
-      await Session.remove(args.sessionID)
-      UI.println(UI.Style.TEXT_SUCCESS_BOLD + `Session ${args.sessionID} deleted` + UI.Style.TEXT_NORMAL)
-    })
-  },
-})
-
 export const SessionListCommand = cmd({
  command: "list",
  describe: "list sessions",
--- a/packages/opencode/src/cli/cmd/tui/attach.ts
+++ b/packages/opencode/src/cli/cmd/tui/attach.ts
@@ -1,5 +1,4 @@
 import { cmd } from "../cmd"
-import { UI } from "@/cli/ui"
 import { tui } from "./app"
 import { win32DisableProcessedInput, win32InstallCtrlCGuard } from "./win32"

@@ -17,20 +16,11 @@ export const AttachCommand = cmd({
        type: "string",
        description: "directory to run in",
      })
-      .option("continue", {
-        alias: ["c"],
-        describe: "continue the last session",
-        type: "boolean",
-      })
      .option("session", {
        alias: ["s"],
        type: "string",
        describe: "session id to continue",
      })
-      .option("fork", {
-        type: "boolean",
-        describe: "fork the session when continuing (use with --continue or --session)",
-      })
      .option("password", {
        alias: ["p"],
        type: "string",
@@ -41,12 +31,6 @@ export const AttachCommand = cmd({
    try {
      win32DisableProcessedInput()

-      if (args.fork && !args.continue && !args.session) {
-        UI.error("--fork requires --continue or --session")
-        process.exitCode = 1
-        return
-      }
-
      const directory = (() => {
        if (!args.dir) return undefined
        try {
@@ -65,11 +49,7 @@ export const AttachCommand = cmd({
      })()
      await tui({
        url: args.url,
-        args: {
-          continue: args.continue,
-          sessionID: args.session,
-          fork: args.fork,
-        },
+        args: { sessionID: args.session },
        directory,
        headers,
      })
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
@@ -247,8 +247,7 @@ export function Autocomplete(props: {
        const width = props.anchor().width - 4
        options.push(
          ...sortedFiles.map((item): AutocompleteOption => {
-            const baseDir = (sync.data.path.directory || process.cwd()).replace(/\/+$/, "")
-            const fullPath = `${baseDir}/${item}`
+            const fullPath = `${process.cwd()}/${item}`
            const urlObj = pathToFileURL(fullPath)
            let filename = item
            if (lineRange && !item.endsWith("/")) {
--- a/packages/opencode/src/cli/cmd/tui/component/tips.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/tips.tsx
@@ -2,7 +2,7 @@ import { createMemo, createSignal, For } from "solid-js"
 import { DEFAULT_THEMES, useTheme } from "@tui/context/theme"

 const themeCount = Object.keys(DEFAULT_THEMES).length
-const themeTip = `Use {highlight}/themes{/highlight} or {highlight}Ctrl+X T{/highlight} to switch between ${themeCount} built-in themes`
+const themeTip = `Use {highlight}/theme{/highlight} or {highlight}Ctrl+X T{/highlight} to switch between ${themeCount} built-in themes`

 type TipPart = { text: string; highlight: boolean }

@@ -126,7 +126,7 @@ const TIPS = [
  "Use {highlight}{file:path}{/highlight} to include file contents in config values",
  "Use {highlight}instructions{/highlight} in config to load additional rules files",
  "Set agent {highlight}temperature{/highlight} from 0.0 (focused) to 1.0 (creative)",
-  "Configure {highlight}steps{/highlight} to limit agentic iterations per request",
+  "Configure {highlight}maxSteps{/highlight} to limit agentic iterations per request",
  'Set {highlight}"tools": {"bash": false}{/highlight} to disable specific tools',
  'Set {highlight}"mcp_*": false{/highlight} to disable all tools from an MCP server',
  "Override global tool settings per agent configuration",
@@ -147,6 +147,7 @@ const TIPS = [
  "Commit your project's {highlight}AGENTS.md{/highlight} file to Git for team sharing",
  "Use {highlight}/review{/highlight} to review uncommitted changes, branches, or PRs",
  "Run {highlight}/help{/highlight} or {highlight}Ctrl+X H{/highlight} to show the help dialog",
+  "Use {highlight}/details{/highlight} to toggle tool execution details visibility",
  "Use {highlight}/rename{/highlight} to rename the current session",
  "Press {highlight}Ctrl+Z{/highlight} to suspend the terminal and return to your shell",
 ]
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -152,6 +152,12 @@ export function Session() {
  const [showHeader, setShowHeader] = kv.signal("header_visible", true)
  const [diffWrapMode] = kv.signal<"word" | "none">("diff_wrap_mode", "word")
  const [animationsEnabled, setAnimationsEnabled] = kv.signal("animations_enabled", true)
+  const [clearedDiff, setClearedDiff] = createSignal<Record<string, Record<string, true>>>({})
+  const diff = createMemo(() => sync.data.session_diff[route.sessionID] ?? [])
+  const diffKey = (item: { file: string; additions: number; deletions: number }) =>
+    `${item.file}:${item.additions}:${item.deletions}`
+  const hiddenDiff = createMemo(() => clearedDiff()[route.sessionID] ?? {})
+  const visibleDiff = createMemo(() => diff().filter((item) => !hiddenDiff()[diffKey(item)]))

  const wide = createMemo(() => dimensions().width > 120)
  const sidebarVisible = createMemo(() => {
@@ -163,6 +169,32 @@ export function Session() {
  const showTimestamps = createMemo(() => timestamps() === "show")
  const contentWidth = createMemo(() => dimensions().width - (sidebarVisible() ? 42 : 0) - 4)

+  createEffect(() => {
+    const current = new Set(diff().map((item) => diffKey(item)))
+    const hidden = hiddenDiff()
+    const keys = Object.keys(hidden)
+    if (!keys.length) return
+    const nextHidden = keys.reduce<Record<string, true>>((acc, key) => {
+      if (!current.has(key)) return acc
+      acc[key] = true
+      return acc
+    }, {})
+    if (Object.keys(nextHidden).length === keys.length) return
+    setClearedDiff((prev) => {
+      const target = prev[route.sessionID]
+      if (!target) return prev
+      if (!Object.keys(nextHidden).length) {
+        const next = { ...prev }
+        delete next[route.sessionID]
+        return next
+      }
+      return {
+        ...prev,
+        [route.sessionID]: nextHidden,
+      }
+    })
+  })
+
  const scrollAcceleration = createMemo(() => {
    const tui = sync.data.config.tui
    if (tui?.scroll_acceleration?.enabled) {
@@ -526,6 +558,26 @@ export function Session() {
        dialog.clear()
      },
    },
+    {
+      title: "Clear Modified",
+      value: "session.modified.clear",
+      category: "Session",
+      enabled: !session()?.parentID && visibleDiff().length > 0,
+      onSelect: (dialog) => {
+        const nextHidden = diff().reduce<Record<string, true>>((acc, item) => {
+          acc[diffKey(item)] = true
+          return acc
+        }, {})
+        setClearedDiff((prev) => ({
+          ...prev,
+          [route.sessionID]: {
+            ...(prev[route.sessionID] ?? {}),
+            ...nextHidden,
+          },
+        }))
+        dialog.clear()
+      },
+    },
    {
      title: conceal() ? "Disable code concealment" : "Enable code concealment",
      value: "session.toggle.conceal",
@@ -1120,7 +1172,7 @@ export function Session() {
        <Show when={sidebarVisible()}>
          <Switch>
            <Match when={wide()}>
-              <Sidebar sessionID={route.sessionID} />
+              <Sidebar sessionID={route.sessionID} hiddenDiff={hiddenDiff()} />
            </Match>
            <Match when={!wide()}>
              <box
@@ -1132,7 +1184,7 @@ export function Session() {
                alignItems="flex-end"
                backgroundColor={RGBA.fromInts(0, 0, 0, 70)}
              >
-                <Sidebar sessionID={route.sessionID} />
+                <Sidebar sessionID={route.sessionID} hiddenDiff={hiddenDiff()} />
              </box>
            </Match>
          </Switch>
--- a/packages/opencode/src/cli/cmd/tui/routes/session/sidebar.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/sidebar.tsx
@@ -12,11 +12,16 @@ import { useDirectory } from "../../context/directory"
 import { useKV } from "../../context/kv"
 import { TodoItem } from "../../component/todo-item"

-export function Sidebar(props: { sessionID: string; overlay?: boolean }) {
+export function Sidebar(props: { sessionID: string; overlay?: boolean; hiddenDiff?: Record<string, true> }) {
  const sync = useSync()
  const { theme } = useTheme()
  const session = createMemo(() => sync.session.get(props.sessionID)!)
-  const diff = createMemo(() => sync.data.session_diff[props.sessionID] ?? [])
+  const diff = createMemo(() => {
+    const hidden = props.hiddenDiff ?? {}
+    return (sync.data.session_diff[props.sessionID] ?? []).filter(
+      (item) => !hidden[`${item.file}:${item.additions}:${item.deletions}`],
+    )
+  })
  const todo = createMemo(() => sync.data.todo[props.sessionID] ?? [])
  const messages = createMemo(() => sync.data.message[props.sessionID] ?? [])

--- a/packages/opencode/src/flag/flag.ts
+++ b/packages/opencode/src/flag/flag.ts
@@ -30,7 +30,6 @@ export namespace Flag {
  export declare const OPENCODE_CLIENT: string
  export const OPENCODE_SERVER_PASSWORD = process.env["OPENCODE_SERVER_PASSWORD"]
  export const OPENCODE_SERVER_USERNAME = process.env["OPENCODE_SERVER_USERNAME"]
-  export const OPENCODE_ENABLE_QUESTION_TOOL = truthy("OPENCODE_ENABLE_QUESTION_TOOL")

  // Experimental
  export const OPENCODE_EXPERIMENTAL = truthy("OPENCODE_EXPERIMENTAL")
--- a/packages/opencode/src/format/formatter.ts
+++ b/packages/opencode/src/format/formatter.ts
@@ -364,21 +364,3 @@ export const ormolu: Info = {
    return Bun.which("ormolu") !== null
  },
 }
-
-export const cljfmt: Info = {
-  name: "cljfmt",
-  command: ["cljfmt", "fix", "--quiet", "$FILE"],
-  extensions: [".clj", ".cljs", ".cljc", ".edn"],
-  async enabled() {
-    return Bun.which("cljfmt") !== null
-  },
-}
-
-export const dfmt: Info = {
-  name: "dfmt",
-  command: ["dfmt", "-i", "$FILE"],
-  extensions: [".d"],
-  async enabled() {
-    return Bun.which("dfmt") !== null
-  },
-}
--- a/packages/opencode/src/index.ts
+++ b/packages/opencode/src/index.ts
@@ -26,7 +26,6 @@ import { EOL } from "os"
 import { WebCommand } from "./cli/cmd/web"
 import { PrCommand } from "./cli/cmd/pr"
 import { SessionCommand } from "./cli/cmd/session"
-import { DbCommand } from "./cli/cmd/db"
 import path from "path"
 import { Global } from "./global"
 import { JsonMigration } from "./storage/json-migration"
@@ -82,14 +81,14 @@ const cli = yargs(hideBin(process.argv))

    const marker = path.join(Global.Path.data, "opencode.db")
    if (!(await Bun.file(marker).exists())) {
-      const tty = process.stderr.isTTY
-      process.stderr.write("Performing one time database migration, may take a few minutes..." + EOL)
+      console.log("Performing one time database migration, may take a few minutes...")
+      const tty = process.stdout.isTTY
      const width = 36
      const orange = "\x1b[38;5;214m"
      const muted = "\x1b[0;2m"
      const reset = "\x1b[0m"
      let last = -1
-      if (tty) process.stderr.write("\x1b[?25l")
+      if (tty) process.stdout.write("\x1b[?25l")
      try {
        await JsonMigration.run(Database.Client().$client, {
          progress: (event) => {
@@ -99,22 +98,22 @@ const cli = yargs(hideBin(process.argv))
            if (tty) {
              const fill = Math.round((percent / 100) * width)
              const bar = `${"■".repeat(fill)}${"･".repeat(width - fill)}`
-              process.stderr.write(
+              process.stdout.write(
                `\r${orange}${bar} ${percent.toString().padStart(3)}%${reset} ${muted}${event.label.padEnd(12)} ${event.current}/${event.total}${reset}`,
              )
-              if (event.current === event.total) process.stderr.write("\n")
+              if (event.current === event.total) process.stdout.write("\n")
            } else {
-              process.stderr.write(`sqlite-migration:${percent}${EOL}`)
+              console.log(`sqlite-migration:${percent}`)
            }
          },
        })
      } finally {
-        if (tty) process.stderr.write("\x1b[?25h")
+        if (tty) process.stdout.write("\x1b[?25h")
        else {
-          process.stderr.write(`sqlite-migration:done${EOL}`)
+          console.log(`sqlite-migration:done`)
        }
      }
-      process.stderr.write("Database migration complete." + EOL)
+      console.log("Database migration complete.")
    }
  })
  .usage("\n" + UI.logo())
@@ -139,7 +138,6 @@ const cli = yargs(hideBin(process.argv))
  .command(GithubCommand)
  .command(PrCommand)
  .command(SessionCommand)
-  .command(DbCommand)
  .fail((msg, err) => {
    if (
      msg?.startsWith("Unknown argument") ||
@@ -190,7 +188,7 @@ try {
  if (formatted) UI.error(formatted)
  if (formatted === undefined) {
    UI.error("Unexpected error, check log file at " + Log.file() + " for more details" + EOL)
-    process.stderr.write((e instanceof Error ? e.message : String(e)) + EOL)
+    console.error(e instanceof Error ? e.message : String(e))
  }
  process.exitCode = 1
 } finally {
--- a/packages/opencode/src/provider/provider.ts
+++ b/packages/opencode/src/provider/provider.ts
@@ -57,30 +57,6 @@ export namespace Provider {
    return isGpt5OrLater(modelID) && !modelID.startsWith("gpt-5-mini")
  }

-  function googleVertexVars(options: Record<string, any>) {
-    const project =
-      options["project"] ?? Env.get("GOOGLE_CLOUD_PROJECT") ?? Env.get("GCP_PROJECT") ?? Env.get("GCLOUD_PROJECT")
-    const location =
-      options["location"] ?? Env.get("GOOGLE_CLOUD_LOCATION") ?? Env.get("VERTEX_LOCATION") ?? "us-central1"
-    const endpoint = location === "global" ? "aiplatform.googleapis.com" : `${location}-aiplatform.googleapis.com`
-
-    return {
-      GOOGLE_VERTEX_PROJECT: project,
-      GOOGLE_VERTEX_LOCATION: location,
-      GOOGLE_VERTEX_ENDPOINT: endpoint,
-    }
-  }
-
-  function loadBaseURL(model: Model, options: Record<string, any>) {
-    const raw = options["baseURL"] ?? model.api.url
-    if (typeof raw !== "string") return raw
-    const vars = model.providerID === "google-vertex" ? googleVertexVars(options) : undefined
-    return raw.replace(/\$\{([^}]+)\}/g, (match, key) => {
-      const val = Env.get(String(key)) ?? vars?.[String(key) as keyof typeof vars]
-      return val ?? match
-    })
-  }
-
  const BUNDLED_PROVIDERS: Record<string, (options: any) => SDK> = {
    "@ai-sdk/amazon-bedrock": createAmazonBedrock,
    "@ai-sdk/anthropic": createAnthropic,
@@ -377,16 +353,9 @@ export namespace Provider {
        },
      }
    },
-    "google-vertex": async (provider) => {
-      const project =
-        provider.options?.project ??
-        Env.get("GOOGLE_CLOUD_PROJECT") ??
-        Env.get("GCP_PROJECT") ??
-        Env.get("GCLOUD_PROJECT")
-
-      const location =
-        provider.options?.location ?? Env.get("GOOGLE_CLOUD_LOCATION") ?? Env.get("VERTEX_LOCATION") ?? "us-central1"
-
+    "google-vertex": async () => {
+      const project = Env.get("GOOGLE_CLOUD_PROJECT") ?? Env.get("GCP_PROJECT") ?? Env.get("GCLOUD_PROJECT")
+      const location = Env.get("GOOGLE_CLOUD_LOCATION") ?? Env.get("VERTEX_LOCATION") ?? "us-east5"
      const autoload = Boolean(project)
      if (!autoload) return { autoload: false }
      return {
@@ -394,18 +363,6 @@ export namespace Provider {
        options: {
          project,
          location,
-          fetch: async (input: RequestInfo | URL, init?: RequestInit) => {
-            const { GoogleAuth } = await import(await BunProc.install("google-auth-library"))
-            const auth = new GoogleAuth()
-            const client = await auth.getApplicationDefault()
-            const credentials = await client.credential
-            const token = await credentials.getAccessToken()
-
-            const headers = new Headers(init?.headers)
-            headers.set("Authorization", `Bearer ${token.token}`)
-
-            return fetch(input, { ...init, headers })
-          },
        },
        async getModel(sdk: any, modelID: string) {
          const id = String(modelID).trim()
@@ -1037,16 +994,11 @@ export namespace Provider {
      const provider = s.providers[model.providerID]
      const options = { ...provider.options }

-      if (model.providerID === "google-vertex" && !model.api.npm.includes("@ai-sdk/openai-compatible")) {
-        delete options.fetch
-      }
-
      if (model.api.npm.includes("@ai-sdk/openai-compatible") && options["includeUsage"] !== false) {
        options["includeUsage"] = true
      }

-      const baseURL = loadBaseURL(model, options)
-      if (baseURL !== undefined) options["baseURL"] = baseURL
+      if (!options["baseURL"]) options["baseURL"] = model.api.url
      if (options["apiKey"] === undefined && provider.key) options["apiKey"] = provider.key
      if (model.headers)
        options["headers"] = {
--- a/packages/opencode/src/provider/transform.ts
+++ b/packages/opencode/src/provider/transform.ts
@@ -298,8 +298,8 @@ export namespace ProviderTransform {
    if (id.includes("glm-4.7")) return 1.0
    if (id.includes("minimax-m2")) return 1.0
    if (id.includes("kimi-k2")) {
-      // kimi-k2-thinking & kimi-k2.5 && kimi-k2p5 && kimi-k2-5
-      if (["thinking", "k2.", "k2p", "k2-5"].some((s) => id.includes(s))) {
+      // kimi-k2-thinking & kimi-k2.5 && kimi-k2p5
+      if (id.includes("thinking") || id.includes("k2.") || id.includes("k2p")) {
        return 1.0
      }
      return 0.6
@@ -310,7 +310,7 @@ export namespace ProviderTransform {
  export function topP(model: Provider.Model) {
    const id = model.id.toLowerCase()
    if (id.includes("qwen")) return 1
-    if (["minimax-m2", "gemini", "kimi-k2.5", "kimi-k2p5", "kimi-k2-5"].some((s) => id.includes(s))) {
+    if (id.includes("minimax-m2") || id.includes("kimi-k2.5") || id.includes("kimi-k2p5") || id.includes("gemini")) {
      return 0.95
    }
    return undefined
@@ -319,7 +319,7 @@ export namespace ProviderTransform {
  export function topK(model: Provider.Model) {
    const id = model.id.toLowerCase()
    if (id.includes("minimax-m2")) {
-      if (["m2.", "m25", "m21"].some((s) => id.includes(s))) return 40
+      if (id.includes("m2.1")) return 40
      return 20
    }
    if (id.includes("gemini")) return 64
@@ -802,11 +802,6 @@ export namespace ProviderTransform {
      }
      return { reasoningEffort: "minimal" }
    }
-
-    if (model.providerID === "venice") {
-      return { veniceParameters: { disableThinking: true } }
-    }
-
    return {}
  }

--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -445,12 +445,6 @@ export namespace SessionPrompt {
          log.error("subtask execution failed", { error, agent: task.agent, description: task.description })
          return undefined
        })
-        const attachments = result?.attachments?.map((attachment) => ({
-          ...attachment,
-          id: Identifier.ascending("part"),
-          sessionID,
-          messageID: assistantMessage.id,
-        }))
        await Plugin.trigger(
          "tool.execute.after",
          {
@@ -473,7 +467,7 @@ export namespace SessionPrompt {
              title: result.title,
              metadata: result.metadata,
              output: result.output,
-              attachments,
+              attachments: result.attachments,
              time: {
                ...part.state.time,
                end: Date.now(),
@@ -803,15 +797,6 @@ export namespace SessionPrompt {
            },
          )
          const result = await item.execute(args, ctx)
-          const output = {
-            ...result,
-            attachments: result.attachments?.map((attachment) => ({
-              ...attachment,
-              id: Identifier.ascending("part"),
-              sessionID: ctx.sessionID,
-              messageID: input.processor.message.id,
-            })),
-          }
          await Plugin.trigger(
            "tool.execute.after",
            {
@@ -820,9 +805,9 @@ export namespace SessionPrompt {
              callID: ctx.callID,
              args,
            },
-            output,
+            result,
          )
-          return output
+          return result
        },
      })
    }
@@ -870,13 +855,16 @@ export namespace SessionPrompt {
        )

        const textParts: string[] = []
-        const attachments: Omit<MessageV2.FilePart, "id" | "sessionID" | "messageID">[] = []
+        const attachments: MessageV2.FilePart[] = []

        for (const contentItem of result.content) {
          if (contentItem.type === "text") {
            textParts.push(contentItem.text)
          } else if (contentItem.type === "image") {
            attachments.push({
+              id: Identifier.ascending("part"),
+              sessionID: input.session.id,
+              messageID: input.processor.message.id,
              type: "file",
              mime: contentItem.mimeType,
              url: `data:${contentItem.mimeType};base64,${contentItem.data}`,
@@ -888,6 +876,9 @@ export namespace SessionPrompt {
            }
            if (resource.blob) {
              attachments.push({
+                id: Identifier.ascending("part"),
+                sessionID: input.session.id,
+                messageID: input.processor.message.id,
                type: "file",
                mime: resource.mimeType ?? "application/octet-stream",
                url: `data:${resource.mimeType ?? "application/octet-stream"};base64,${resource.blob}`,
@@ -1166,7 +1157,6 @@ export namespace SessionPrompt {
                      pieces.push(
                        ...result.attachments.map((attachment) => ({
                          ...attachment,
-                          id: Identifier.ascending("part"),
                          synthetic: true,
                          filename: attachment.filename ?? part.filename,
                          messageID: info.id,
--- a/packages/opencode/src/session/summary.ts
+++ b/packages/opencode/src/session/summary.ts
@@ -1,3 +1,5 @@
+import { Provider } from "@/provider/provider"
+
 import { fn } from "@/util/fn"
 import z from "zod"
 import { Session } from "."
@@ -6,10 +8,16 @@ import { MessageV2 } from "./message-v2"
 import { Identifier } from "@/id/id"
 import { Snapshot } from "@/snapshot"

+import { Log } from "@/util/log"
 import { Storage } from "@/storage/storage"
 import { Bus } from "@/bus"

+import { LLM } from "./llm"
+import { Agent } from "@/agent/agent"
+
 export namespace SessionSummary {
+  const log = Log.create({ service: "session.summary" })
+
  function unquoteGitPath(input: string) {
    if (!input.startsWith('"')) return input
    if (!input.endsWith('"')) return input
@@ -109,6 +117,41 @@ export namespace SessionSummary {
      diffs,
    }
    await Session.updateMessage(userMsg)
+
+    const textPart = msgWithParts.parts.find((p) => p.type === "text" && !p.synthetic) as MessageV2.TextPart
+    if (textPart && !userMsg.summary?.title) {
+      const agent = await Agent.get("title")
+      if (!agent) return
+      const stream = await LLM.stream({
+        agent,
+        user: userMsg,
+        tools: {},
+        model: agent.model
+          ? await Provider.getModel(agent.model.providerID, agent.model.modelID)
+          : ((await Provider.getSmallModel(userMsg.model.providerID)) ??
+            (await Provider.getModel(userMsg.model.providerID, userMsg.model.modelID))),
+        small: true,
+        messages: [
+          {
+            role: "user" as const,
+            content: `
+              The following is the text to summarize:
+              <text>
+              ${textPart?.text ?? ""}
+              </text>
+            `,
+          },
+        ],
+        abort: new AbortController().signal,
+        sessionID: userMsg.sessionID,
+        system: [],
+        retries: 3,
+      })
+      const result = await stream.text
+      log.info("title", { title: result })
+      userMsg.summary.title = result
+      await Session.updateMessage(userMsg)
+    }
  }

  export const diff = fn(
--- a/packages/opencode/src/storage/db.ts
+++ b/packages/opencode/src/storage/db.ts
@@ -25,7 +25,6 @@ export const NotFoundError = NamedError.create(
 const log = Log.create({ service: "db" })

 export namespace Database {
-  export const Path = path.join(Global.Path.data, "opencode.db")
  type Schema = typeof schema
  export type Transaction = SQLiteTransaction<"sync", void, Schema>

--- a/packages/opencode/src/storage/json-migration.ts
+++ b/packages/opencode/src/storage/json-migration.ts
@@ -152,7 +152,6 @@ export namespace JsonMigration {
    sqlite.exec("BEGIN TRANSACTION")

    // Migrate projects first (no FK deps)
-    // Derive all IDs from file paths, not JSON content
    const projectIds = new Set<string>()
    const projectValues = [] as any[]
    for (let i = 0; i < projectFiles.length; i += batchSize) {
@@ -162,10 +161,13 @@ export namespace JsonMigration {
      for (let j = 0; j < batch.length; j++) {
        const data = batch[j]
        if (!data) continue
-        const id = path.basename(projectFiles[i + j], ".json")
-        projectIds.add(id)
+        if (!data?.id) {
+          errs.push(`project missing id: ${projectFiles[i + j]}`)
+          continue
+        }
+        projectIds.add(data.id)
        projectValues.push({
-          id,
+          id: data.id,
          worktree: data.worktree ?? "/",
          vcs: data.vcs,
          name: data.name ?? undefined,
@@ -184,9 +186,6 @@ export namespace JsonMigration {
    log.info("migrated projects", { count: stats.projects, duration: Math.round(performance.now() - start) })

    // Migrate sessions (depends on projects)
-    // Derive all IDs from directory/file paths, not JSON content, since earlier
-    // migrations may have moved sessions to new directories without updating the JSON
-    const sessionProjects = sessionFiles.map((file) => path.basename(path.dirname(file)))
    const sessionIds = new Set<string>()
    const sessionValues = [] as any[]
    for (let i = 0; i < sessionFiles.length; i += batchSize) {
@@ -196,16 +195,18 @@ export namespace JsonMigration {
      for (let j = 0; j < batch.length; j++) {
        const data = batch[j]
        if (!data) continue
-        const id = path.basename(sessionFiles[i + j], ".json")
-        const projectID = sessionProjects[i + j]
-        if (!projectIds.has(projectID)) {
+        if (!data?.id || !data?.projectID) {
+          errs.push(`session missing id or projectID: ${sessionFiles[i + j]}`)
+          continue
+        }
+        if (!projectIds.has(data.projectID)) {
          orphans.sessions++
          continue
        }
-        sessionIds.add(id)
+        sessionIds.add(data.id)
        sessionValues.push({
-          id,
-          project_id: projectID,
+          id: data.id,
+          project_id: data.projectID,
          parent_id: data.parentID ?? null,
          slug: data.slug ?? "",
          directory: data.directory ?? "",
@@ -252,7 +253,11 @@ export namespace JsonMigration {
        const data = batch[j]
        if (!data) continue
        const file = allMessageFiles[i + j]
-        const id = path.basename(file, ".json")
+        const id = data.id ?? path.basename(file, ".json")
+        if (!id) {
+          errs.push(`message missing id: ${file}`)
+          continue
+        }
        const sessionID = allMessageSessions[i + j]
        messageSessions.set(id, sessionID)
        const rest = data
@@ -282,8 +287,12 @@ export namespace JsonMigration {
        const data = batch[j]
        if (!data) continue
        const file = partFiles[i + j]
-        const id = path.basename(file, ".json")
-        const messageID = path.basename(path.dirname(file))
+        const id = data.id ?? path.basename(file, ".json")
+        const messageID = data.messageID ?? path.basename(path.dirname(file))
+        if (!id || !messageID) {
+          errs.push(`part missing id/messageID/sessionID: ${file}`)
+          continue
+        }
        const sessionID = messageSessions.get(messageID)
        if (!sessionID) {
          errs.push(`part missing message session: ${file}`)
--- a/packages/opencode/src/tool/batch.ts
+++ b/packages/opencode/src/tool/batch.ts
@@ -77,12 +77,6 @@ export const BatchTool = Tool.define("batch", async () => {
          })

          const result = await tool.execute(validatedParams, { ...ctx, callID: partID })
-          const attachments = result.attachments?.map((attachment) => ({
-            ...attachment,
-            id: Identifier.ascending("part"),
-            sessionID: ctx.sessionID,
-            messageID: ctx.messageID,
-          }))

          await Session.updatePart({
            id: partID,
@@ -97,7 +91,7 @@ export const BatchTool = Tool.define("batch", async () => {
              output: result.output,
              title: result.title,
              metadata: result.metadata,
-              attachments,
+              attachments: result.attachments,
              time: {
                start: callStartTime,
                end: Date.now(),
--- a/packages/opencode/src/tool/read.ts
+++ b/packages/opencode/src/tool/read.ts
@@ -6,6 +6,7 @@ import { LSP } from "../lsp"
 import { FileTime } from "../file/time"
 import DESCRIPTION from "./read.txt"
 import { Instance } from "../project/instance"
+import { Identifier } from "../id/id"
 import { assertExternalDirectory } from "./external-directory"
 import { InstructionPrompt } from "../session/instruction"

@@ -126,6 +127,9 @@ export const ReadTool = Tool.define("read", {
        },
        attachments: [
          {
+            id: Identifier.ascending("part"),
+            sessionID: ctx.sessionID,
+            messageID: ctx.messageID,
            type: "file",
            mime,
            url: `data:${mime};base64,${Buffer.from(await file.bytes()).toString("base64")}`,
--- a/packages/opencode/src/tool/registry.ts
+++ b/packages/opencode/src/tool/registry.ts
@@ -94,11 +94,10 @@ export namespace ToolRegistry {
  async function all(): Promise<Tool.Info[]> {
    const custom = await state().then((x) => x.custom)
    const config = await Config.get()
-    const question = ["app", "cli", "desktop"].includes(Flag.OPENCODE_CLIENT) || Flag.OPENCODE_ENABLE_QUESTION_TOOL

    return [
      InvalidTool,
-      ...(question ? [QuestionTool] : []),
+      ...(["app", "cli", "desktop"].includes(Flag.OPENCODE_CLIENT) ? [QuestionTool] : []),
      BashTool,
      ReadTool,
      GlobTool,
--- a/packages/opencode/src/tool/tool.ts
+++ b/packages/opencode/src/tool/tool.ts
@@ -36,7 +36,7 @@ export namespace Tool {
        title: string
        metadata: M
        output: string
-        attachments?: Omit<MessageV2.FilePart, "id" | "sessionID" | "messageID">[]
+        attachments?: MessageV2.FilePart[]
      }>
      formatValidationError?(error: z.ZodError): string
    }>
--- a/packages/opencode/src/tool/webfetch.ts
+++ b/packages/opencode/src/tool/webfetch.ts
@@ -3,6 +3,7 @@ import { Tool } from "./tool"
 import TurndownService from "turndown"
 import DESCRIPTION from "./webfetch.txt"
 import { abortAfterAny } from "../util/abort"
+import { Identifier } from "../id/id"

 const MAX_RESPONSE_SIZE = 5 * 1024 * 1024 // 5MB
 const DEFAULT_TIMEOUT = 30 * 1000 // 30 seconds
@@ -102,6 +103,9 @@ export const WebFetchTool = Tool.define("webfetch", {
        metadata: {},
        attachments: [
          {
+            id: Identifier.ascending("part"),
+            sessionID: ctx.sessionID,
+            messageID: ctx.messageID,
            type: "file",
            mime,
            url: `data:${mime};base64,${base64Content}`,
--- a/packages/opencode/test/provider/provider.test.ts
+++ b/packages/opencode/test/provider/provider.test.ts
@@ -2127,94 +2127,3 @@ test("custom model with variants enabled and disabled", async () => {
    },
  })
 })
-
-test("Google Vertex: retains baseURL for custom proxy", async () => {
-  await using tmp = await tmpdir({
-    init: async (dir) => {
-      await Bun.write(
-        path.join(dir, "opencode.json"),
-        JSON.stringify({
-          $schema: "https://opencode.ai/config.json",
-          provider: {
-            "vertex-proxy": {
-              name: "Vertex Proxy",
-              npm: "@ai-sdk/google-vertex",
-              api: "https://my-proxy.com/v1",
-              env: ["GOOGLE_APPLICATION_CREDENTIALS"], // Mock env var requirement
-              models: {
-                "gemini-pro": {
-                  name: "Gemini Pro",
-                  tool_call: true,
-                },
-              },
-              options: {
-                project: "test-project",
-                location: "us-central1",
-                baseURL: "https://my-proxy.com/v1", // Should be retained
-              },
-            },
-          },
-        }),
-      )
-    },
-  })
-
-  await Instance.provide({
-    directory: tmp.path,
-    init: async () => {
-      Env.set("GOOGLE_APPLICATION_CREDENTIALS", "test-creds")
-    },
-    fn: async () => {
-      const providers = await Provider.list()
-      expect(providers["vertex-proxy"]).toBeDefined()
-      expect(providers["vertex-proxy"].options.baseURL).toBe("https://my-proxy.com/v1")
-    },
-  })
-})
-
-test("Google Vertex: supports OpenAI compatible models", async () => {
-  await using tmp = await tmpdir({
-    init: async (dir) => {
-      await Bun.write(
-        path.join(dir, "opencode.json"),
-        JSON.stringify({
-          $schema: "https://opencode.ai/config.json",
-          provider: {
-            "vertex-openai": {
-              name: "Vertex OpenAI",
-              npm: "@ai-sdk/google-vertex",
-              env: ["GOOGLE_APPLICATION_CREDENTIALS"],
-              models: {
-                "gpt-4": {
-                  name: "GPT-4",
-                  provider: {
-                    npm: "@ai-sdk/openai-compatible",
-                    api: "https://api.openai.com/v1",
-                  },
-                },
-              },
-              options: {
-                project: "test-project",
-                location: "us-central1",
-              },
-            },
-          },
-        }),
-      )
-    },
-  })
-
-  await Instance.provide({
-    directory: tmp.path,
-    init: async () => {
-      Env.set("GOOGLE_APPLICATION_CREDENTIALS", "test-creds")
-    },
-    fn: async () => {
-      const providers = await Provider.list()
-      const model = providers["vertex-openai"].models["gpt-4"]
-
-      expect(model).toBeDefined()
-      expect(model.api.npm).toBe("@ai-sdk/openai-compatible")
-    },
-  })
-})
--- a/packages/opencode/test/storage/json-migration.test.ts
+++ b/packages/opencode/test/storage/json-migration.test.ts
@@ -128,28 +128,6 @@ describe("JSON to SQLite migration", () => {
    expect(projects[0].sandboxes).toEqual(["/test/sandbox"])
  })

-  test("uses filename for project id when JSON has different value", async () => {
-    await Bun.write(
-      path.join(storageDir, "project", "proj_filename.json"),
-      JSON.stringify({
-        id: "proj_different_in_json", // Stale! Should be ignored
-        worktree: "/test/path",
-        vcs: "git",
-        name: "Test Project",
-        sandboxes: [],
-      }),
-    )
-
-    const stats = await JsonMigration.run(sqlite)
-
-    expect(stats?.projects).toBe(1)
-
-    const db = drizzle({ client: sqlite })
-    const projects = db.select().from(ProjectTable).all()
-    expect(projects.length).toBe(1)
-    expect(projects[0].id).toBe("proj_filename") // Uses filename, not JSON id
-  })
-
  test("migrates project with commands", async () => {
    await writeProject(storageDir, {
      id: "proj_with_commands",
@@ -307,74 +285,6 @@ describe("JSON to SQLite migration", () => {
    expect(parts[0].data).not.toHaveProperty("sessionID")
  })

-  test("uses filename for message id when JSON has different value", async () => {
-    await writeProject(storageDir, {
-      id: "proj_test123abc",
-      worktree: "/",
-      time: { created: Date.now(), updated: Date.now() },
-      sandboxes: [],
-    })
-    await writeSession(storageDir, "proj_test123abc", { ...fixtures.session })
-    await Bun.write(
-      path.join(storageDir, "message", "ses_test456def", "msg_from_filename.json"),
-      JSON.stringify({
-        id: "msg_different_in_json", // Stale! Should be ignored
-        sessionID: "ses_test456def",
-        role: "user",
-        agent: "default",
-        time: { created: 1700000000000 },
-      }),
-    )
-
-    const stats = await JsonMigration.run(sqlite)
-
-    expect(stats?.messages).toBe(1)
-
-    const db = drizzle({ client: sqlite })
-    const messages = db.select().from(MessageTable).all()
-    expect(messages.length).toBe(1)
-    expect(messages[0].id).toBe("msg_from_filename") // Uses filename, not JSON id
-    expect(messages[0].session_id).toBe("ses_test456def")
-  })
-
-  test("uses paths for part id and messageID when JSON has different values", async () => {
-    await writeProject(storageDir, {
-      id: "proj_test123abc",
-      worktree: "/",
-      time: { created: Date.now(), updated: Date.now() },
-      sandboxes: [],
-    })
-    await writeSession(storageDir, "proj_test123abc", { ...fixtures.session })
-    await Bun.write(
-      path.join(storageDir, "message", "ses_test456def", "msg_realmsgid.json"),
-      JSON.stringify({
-        role: "user",
-        agent: "default",
-        time: { created: 1700000000000 },
-      }),
-    )
-    await Bun.write(
-      path.join(storageDir, "part", "msg_realmsgid", "prt_from_filename.json"),
-      JSON.stringify({
-        id: "prt_different_in_json", // Stale! Should be ignored
-        messageID: "msg_different_in_json", // Stale! Should be ignored
-        sessionID: "ses_test456def",
-        type: "text",
-        text: "Hello",
-      }),
-    )
-
-    const stats = await JsonMigration.run(sqlite)
-
-    expect(stats?.parts).toBe(1)
-
-    const db = drizzle({ client: sqlite })
-    const parts = db.select().from(PartTable).all()
-    expect(parts.length).toBe(1)
-    expect(parts[0].id).toBe("prt_from_filename") // Uses filename, not JSON id
-    expect(parts[0].message_id).toBe("msg_realmsgid") // Uses parent dir, not JSON messageID
-  })
-
  test("skips orphaned sessions (no parent project)", async () => {
    await Bun.write(
      path.join(storageDir, "session", "proj_test123abc", "ses_orphan.json"),
@@ -394,72 +304,6 @@ describe("JSON to SQLite migration", () => {
    expect(stats?.sessions).toBe(0)
  })

-  test("uses directory path for projectID when JSON has stale value", async () => {
-    // Simulates the scenario where earlier migration moved sessions to new
-    // git-based project directories but didn't update the projectID field
-    const gitBasedProjectID = "abc123gitcommit"
-    await writeProject(storageDir, {
-      id: gitBasedProjectID,
-      worktree: "/test/path",
-      vcs: "git",
-      time: { created: Date.now(), updated: Date.now() },
-      sandboxes: [],
-    })
-
-    // Session is in the git-based directory but JSON still has old projectID
-    await writeSession(storageDir, gitBasedProjectID, {
-      id: "ses_migrated",
-      projectID: "old-project-name", // Stale! Should be ignored
-      slug: "migrated-session",
-      directory: "/test/path",
-      title: "Migrated Session",
-      version: "1.0.0",
-      time: { created: 1700000000000, updated: 1700000001000 },
-    })
-
-    const stats = await JsonMigration.run(sqlite)
-
-    expect(stats?.sessions).toBe(1)
-
-    const db = drizzle({ client: sqlite })
-    const sessions = db.select().from(SessionTable).all()
-    expect(sessions.length).toBe(1)
-    expect(sessions[0].id).toBe("ses_migrated")
-    expect(sessions[0].project_id).toBe(gitBasedProjectID) // Uses directory, not stale JSON
-  })
-
-  test("uses filename for session id when JSON has different value", async () => {
-    await writeProject(storageDir, {
-      id: "proj_test123abc",
-      worktree: "/test/path",
-      time: { created: Date.now(), updated: Date.now() },
-      sandboxes: [],
-    })
-
-    await Bun.write(
-      path.join(storageDir, "session", "proj_test123abc", "ses_from_filename.json"),
-      JSON.stringify({
-        id: "ses_different_in_json", // Stale! Should be ignored
-        projectID: "proj_test123abc",
-        slug: "test-session",
-        directory: "/test/path",
-        title: "Test Session",
-        version: "1.0.0",
-        time: { created: 1700000000000, updated: 1700000001000 },
-      }),
-    )
-
-    const stats = await JsonMigration.run(sqlite)
-
-    expect(stats?.sessions).toBe(1)
-
-    const db = drizzle({ client: sqlite })
-    const sessions = db.select().from(SessionTable).all()
-    expect(sessions.length).toBe(1)
-    expect(sessions[0].id).toBe("ses_from_filename") // Uses filename, not JSON id
-    expect(sessions[0].project_id).toBe("proj_test123abc")
-  })
-
  test("is idempotent (running twice doesn't duplicate)", async () => {
    await writeProject(storageDir, {
      id: "proj_test123abc",
@@ -822,11 +666,8 @@ describe("JSON to SQLite migration", () => {

    const stats = await JsonMigration.run(sqlite)

-    // Projects: proj_test123abc (valid), proj_missing_id (now derives id from filename)
-    // Sessions: ses_test456def (valid), ses_missing_project (now uses dir path),
-    // ses_orphan (now uses dir path, ignores stale projectID)
-    expect(stats.projects).toBe(2)
-    expect(stats.sessions).toBe(3)
+    expect(stats.projects).toBe(1)
+    expect(stats.sessions).toBe(1)
    expect(stats.messages).toBe(1)
    expect(stats.parts).toBe(1)
    expect(stats.todos).toBe(1)
@@ -835,8 +676,8 @@ describe("JSON to SQLite migration", () => {
    expect(stats.errors.length).toBeGreaterThanOrEqual(6)

    const db = drizzle({ client: sqlite })
-    expect(db.select().from(ProjectTable).all().length).toBe(2)
-    expect(db.select().from(SessionTable).all().length).toBe(3)
+    expect(db.select().from(ProjectTable).all().length).toBe(1)
+    expect(db.select().from(SessionTable).all().length).toBe(1)
    expect(db.select().from(MessageTable).all().length).toBe(1)
    expect(db.select().from(PartTable).all().length).toBe(1)
    expect(db.select().from(TodoTable).all().length).toBe(1)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ryan Vogel	22f69cd315	fix: keep cleared modified files hidden across new diff updates	2026-02-14 17:03:23 -05:00
Ryan Vogel	b67fd167c9	fix: let users clear sidebar modified files without mutating diff state	2026-02-14 15:59:53 -05:00