ignore: add truncation namespace

2026-02-17 14:24:22 +00:00 · 2026-01-07 01:24:50 -06:00
194 changed files with 4338 additions and 51051 deletions
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,3 +0,0 @@
-### What does this PR do?
-
-### How did you verify your code works?
--- a/.github/workflows/nix-desktop.yml
+++ b/.github/workflows/nix-desktop.yml
@@ -9,13 +9,6 @@ on:
      - "nix/**"
      - "packages/app/**"
      - "packages/desktop/**"
-  pull_request:
-    paths:
-      - "flake.nix"
-      - "flake.lock"
-      - "nix/**"
-      - "packages/app/**"
-      - "packages/desktop/**"
  workflow_dispatch:

 jobs:
--- a/.github/workflows/pr-standards.yml
+++ b/.github/workflows/pr-standards.yml
@@ -1,139 +0,0 @@
-name: PR Standards
-
-on:
-  pull_request_target:
-    types: [opened, edited, synchronize]
-
-jobs:
-  check-standards:
-    if: |
-      github.event.pull_request.user.login != 'actions-user' &&
-      github.event.pull_request.user.login != 'opencode' &&
-      github.event.pull_request.user.login != 'rekram1-node' &&
-      github.event.pull_request.user.login != 'thdxr' &&
-      github.event.pull_request.user.login != 'kommander' &&
-      github.event.pull_request.user.login != 'jayair' &&
-      github.event.pull_request.user.login != 'fwang' &&
-      github.event.pull_request.user.login != 'adamdotdevin' &&
-      github.event.pull_request.user.login != 'iamdavidhill' &&
-      github.event.pull_request.user.login != 'opencode-agent[bot]'
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - name: Check PR standards
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const pr = context.payload.pull_request;
-            const title = pr.title;
-
-            async function addLabel(label) {
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: pr.number,
-                labels: [label]
-              });
-            }
-
-            async function removeLabel(label) {
-              try {
-                await github.rest.issues.removeLabel({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  issue_number: pr.number,
-                  name: label
-                });
-              } catch (e) {
-                // Label wasn't present, ignore
-              }
-            }
-
-            async function comment(marker, body) {
-              const markerText = `<!-- pr-standards:${marker} -->`;
-              const { data: comments } = await github.rest.issues.listComments({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: pr.number
-              });
-              
-              const existing = comments.find(c => c.body.includes(markerText));
-              if (existing) return;
-              
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: pr.number,
-                body: markerText + '\n' + body
-              });
-            }
-
-            // Step 1: Check title format
-            // Matches: feat:, feat(scope):, feat (scope):, etc.
-            const titlePattern = /^(feat|fix|docs|chore|refactor|test)\s*(\([a-zA-Z0-9-]+\))?\s*:/;
-            const hasValidTitle = titlePattern.test(title);
-
-            if (!hasValidTitle) {
-              await addLabel('needs:title');
-              await comment('title', `Hey! Your PR title \`${title}\` doesn't follow conventional commit format.
-
-            Please update it to start with one of:
-            - \`feat:\` or \`feat(scope):\` new feature
-            - \`fix:\` or \`fix(scope):\` bug fix
-            - \`docs:\` or \`docs(scope):\` documentation changes
-            - \`chore:\` or \`chore(scope):\` maintenance tasks
-            - \`refactor:\` or \`refactor(scope):\` code refactoring
-            - \`test:\` or \`test(scope):\` adding or updating tests
-
-            Where \`scope\` is the package name (e.g., \`app\`, \`desktop\`, \`opencode\`).
-
-            See [CONTRIBUTING.md](../blob/dev/CONTRIBUTING.md#pr-titles) for details.`);
-              return;
-            }
-
-            await removeLabel('needs:title');
-
-            // Step 2: Check for linked issue (skip for docs/refactor PRs)
-            const skipIssueCheck = /^(docs|refactor)\s*(\([a-zA-Z0-9-]+\))?\s*:/.test(title);
-            if (skipIssueCheck) {
-              await removeLabel('needs:issue');
-              console.log('Skipping issue check for docs/refactor PR');
-              return;
-            }
-            const query = `
-              query($owner: String!, $repo: String!, $number: Int!) {
-                repository(owner: $owner, name: $repo) {
-                  pullRequest(number: $number) {
-                    issuesReferences(first: 1) {
-                      totalCount
-                    }
-                  }
-                }
-              }
-            `;
-
-            const result = await github.graphql(query, {
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              number: pr.number
-            });
-
-            const linkedIssues = result.repository.pullRequest.issuesReferences.totalCount;
-
-            if (linkedIssues === 0) {
-              await addLabel('needs:issue');
-              await comment('issue', `Thanks for your contribution!
-
-            This PR doesn't have a linked issue. All PRs must reference an existing issue.
-
-            Please:
-            1. Open an issue describing the bug/feature (if one doesn't exist)
-            2. Add \`Fixes #<number>\` or \`Closes #<number>\` to this PR description
-
-            See [CONTRIBUTING.md](../blob/dev/CONTRIBUTING.md#issue-first-policy) for details.`);
-              return;
-            }
-
-            await removeLabel('needs:issue');
-            console.log('PR meets all standards');
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -172,27 +172,13 @@ jobs:
      - name: Install tauri-cli from portable appimage branch
        if: contains(matrix.settings.host, 'ubuntu')
        run: |
-          cargo install tauri-cli --git https://github.com/tauri-apps/tauri --branch feat/truly-portable-appimage --force
+          cargo install tauri-cli --git https://github.com/tauri-apps/tauri --branch truly-portable-appimage --force
          echo "Installed tauri-cli version:"
          cargo tauri --version

      - name: Build and upload artifacts
-        uses: Wandalen/wretry.action@v3
-        timeout-minutes: 60
-        with:
-          attempt_limit: 3
-          attempt_delay: 10000
-          action: tauri-apps/tauri-action@390cbe447412ced1303d35abe75287949e43437a
-          with: |
-            projectPath: packages/desktop
-            uploadWorkflowArtifacts: true
-            tauriScript: ${{ (contains(matrix.settings.host, 'ubuntu') && 'cargo tauri') || '' }}
-            args: --target ${{ matrix.settings.target }} --config ./src-tauri/tauri.prod.conf.json --verbose
-            updaterJsonPreferNsis: true
-            releaseId: ${{ needs.publish.outputs.release }}
-            tagName: ${{ needs.publish.outputs.tag }}
-            releaseAssetNamePattern: opencode-desktop-[platform]-[arch][ext]
-            releaseDraft: true
+        timeout-minutes: 20
+        uses: tauri-apps/tauri-action@390cbe447412ced1303d35abe75287949e43437a
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          TAURI_BUNDLER_NEW_APPIMAGE_FORMAT: true
@@ -204,6 +190,16 @@ jobs:
          APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
          APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
          APPLE_API_KEY_PATH: ${{ runner.temp }}/apple-api-key.p8
+        with:
+          projectPath: packages/desktop
+          uploadWorkflowArtifacts: true
+          tauriScript: ${{ (contains(matrix.settings.host, 'ubuntu') && 'cargo tauri') || '' }}
+          args: --target ${{ matrix.settings.target }} --config ./src-tauri/tauri.prod.conf.json --verbose
+          updaterJsonPreferNsis: true
+          releaseId: ${{ needs.publish.outputs.release }}
+          tagName: ${{ needs.publish.outputs.tag }}
+          releaseAssetNamePattern: opencode-desktop-[platform]-[arch][ext]
+          releaseDraft: true

  publish-release:
    needs:
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -149,63 +149,11 @@ With that said, you may want to try these methods, as they might work for you.

 ## Pull Request Expectations

-### Issue First Policy
-
-**All PRs must reference an existing issue.** Before opening a PR, open an issue describing the bug or feature. This helps maintainers triage and prevents duplicate work. PRs without a linked issue may be closed without review.
-
- Use `Fixes #123` or `Closes #123` in your PR description to link the issue
- For small fixes, a brief issue is fine - just enough context for maintainers to understand the problem
-
-### General Requirements
-
- Keep pull requests small and focused
+- Try to keep pull requests small and focused.
+- Link relevant issue(s) in the description
 - Explain the issue and why your change fixes it
- Before adding new functionality, ensure it doesn't already exist elsewhere in the codebase
-
-### UI Changes
-
-If your PR includes UI changes, please include screenshots or videos showing the before and after. This helps maintainers review faster and gives you quicker feedback.
-
-### Logic Changes
-
-For non-UI changes (bug fixes, new features, refactors), explain **how you verified it works**:
-
- What did you test?
- How can a reviewer reproduce/confirm the fix?
-
-### No AI-Generated Walls of Text
-
-Long, AI-generated PR descriptions and issues are not acceptable and may be ignored. Respect the maintainers' time:
-
- Write short, focused descriptions
- Explain what changed and why in your own words
- If you can't explain it briefly, your PR might be too large
-
-### PR Titles
-
-PR titles should follow conventional commit standards:
-
- `feat:` new feature or functionality
- `fix:` bug fix
- `docs:` documentation or README changes
- `chore:` maintenance tasks, dependency updates, etc.
- `refactor:` code refactoring without changing behavior
- `test:` adding or updating tests
-
-You can optionally include a scope to indicate which package is affected:
-
- `feat(app):` feature in the app package
- `fix(desktop):` bug fix in the desktop package
- `chore(opencode):` maintenance in the opencode package
-
-Examples:
-
- `docs: update contributing guidelines`
- `fix: resolve crash on startup`
- `feat: add dark mode support`
- `feat(app): add dark mode support`
- `fix(desktop): resolve crash on startup`
- `chore: bump dependency versions`
+- Avoid having verbose LLM generated PR descriptions
+- Before adding new functions or functionality, ensure that such behavior doesn't already exist elsewhere in the codebase.

 ### Style Preferences

--- a/README.md
+++ b/README.md
@@ -28,8 +28,7 @@ curl -fsSL https://opencode.ai/install | bash
 npm i -g opencode-ai@latest        # or bun/pnpm/yarn
 scoop bucket add extras; scoop install extras/opencode  # Windows
 choco install opencode             # Windows
-brew install anomalyco/tap/opencode # macOS and Linux (recommended, always up to date)
-brew install opencode              # macOS and Linux (official brew formula, updated less frequently)
+brew install opencode              # macOS and Linux
 paru -S opencode-bin               # Arch Linux
 mise use -g opencode               # Any OS
 nix run nixpkgs#opencode           # or github:anomalyco/opencode for latest dev branch
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -28,8 +28,7 @@ curl -fsSL https://opencode.ai/install | bash
 npm i -g opencode-ai@latest        # 也可使用 bun/pnpm/yarn
 scoop bucket add extras; scoop install extras/opencode  # Windows
 choco install opencode             # Windows
-brew install anomalyco/tap/opencode # macOS 和 Linux（推荐，始终保持最新）
-brew install opencode              # macOS 和 Linux（官方 brew formula，更新频率较低）
+brew install opencode              # macOS 和 Linux
 paru -S opencode-bin               # Arch Linux
 mise use -g opencode               # 任意系统
 nix run nixpkgs#opencode           # 或用 github:anomalyco/opencode 获取最新 dev 分支
--- a/README.zh-TW.md
+++ b/README.zh-TW.md
@@ -28,8 +28,7 @@ curl -fsSL https://opencode.ai/install | bash
 npm i -g opencode-ai@latest        # 也可使用 bun/pnpm/yarn
 scoop bucket add extras; scoop install extras/opencode  # Windows
 choco install opencode             # Windows
-brew install anomalyco/tap/opencode # macOS 與 Linux（推薦，始終保持最新）
-brew install opencode              # macOS 與 Linux（官方 brew formula，更新頻率較低）
+brew install opencode              # macOS 與 Linux
 paru -S opencode-bin               # Arch Linux
 mise use -g github:anomalyco/opencode    # 任何作業系統
 nix run nixpkgs#opencode           # 或使用 github:anomalyco/opencode 以取得最新開發分支
--- a/STATS.md
+++ b/STATS.md
@@ -193,6 +193,3 @@
 | 2026-01-04 | 1,672,656 (+39,702)  | 1,339,883 (+7,969)  | 3,012,539 (+62,560)  |
 | 2026-01-05 | 1,738,171 (+65,515)  | 1,353,043 (+13,160) | 3,091,214 (+78,675)  |
 | 2026-01-06 | 1,960,988 (+222,817) | 1,377,377 (+24,334) | 3,338,365 (+247,151) |
-| 2026-01-07 | 2,123,239 (+162,251) | 1,398,648 (+21,271) | 3,521,887 (+183,522) |
-| 2026-01-08 | 2,272,630 (+149,391) | 1,432,480 (+33,832) | 3,705,110 (+183,223) |
-| 2026-01-09 | 2,443,565 (+170,935) | 1,469,451 (+36,971) | 3,913,016 (+207,906) |
--- a/STYLE_GUIDE.md
+++ b/STYLE_GUIDE.md
@@ -1,8 +1,7 @@
 ## Style Guide

 - Try to keep things in one function unless composable or reusable
- AVOID unnecessary destructuring of variables. instead of doing `const { a, b }
-= obj` just reference it as obj.a and obj.b. this preserves context
+- AVOID unnecessary destructuring of variables
 - AVOID `try`/`catch` where possible
 - AVOID `else` statements
 - AVOID using `any` type
--- a/bun.lock
+++ b/bun.lock
@@ -22,7 +22,7 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "1.1.8",
+      "version": "1.1.4",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -70,7 +70,7 @@
    },
    "packages/console/app": {
      "name": "@opencode-ai/console-app",
-      "version": "1.1.8",
+      "version": "1.1.4",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -98,7 +98,7 @@
    },
    "packages/console/core": {
      "name": "@opencode-ai/console-core",
-      "version": "1.1.8",
+      "version": "1.1.4",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -125,7 +125,7 @@
    },
    "packages/console/function": {
      "name": "@opencode-ai/console-function",
-      "version": "1.1.8",
+      "version": "1.1.4",
      "dependencies": {
        "@ai-sdk/anthropic": "2.0.0",
        "@ai-sdk/openai": "2.0.2",
@@ -149,7 +149,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode-ai/console-mail",
-      "version": "1.1.8",
+      "version": "1.1.4",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -173,10 +173,9 @@
    },
    "packages/desktop": {
      "name": "@opencode-ai/desktop",
-      "version": "1.1.8",
+      "version": "1.1.4",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
-        "@opencode-ai/ui": "workspace:*",
        "@solid-primitives/storage": "catalog:",
        "@tauri-apps/api": "^2",
        "@tauri-apps/plugin-dialog": "~2",
@@ -202,7 +201,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode-ai/enterprise",
-      "version": "1.1.8",
+      "version": "1.1.4",
      "dependencies": {
        "@opencode-ai/ui": "workspace:*",
        "@opencode-ai/util": "workspace:*",
@@ -231,7 +230,7 @@
    },
    "packages/function": {
      "name": "@opencode-ai/function",
-      "version": "1.1.8",
+      "version": "1.1.4",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -247,7 +246,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "1.1.8",
+      "version": "1.1.4",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -277,7 +276,7 @@
        "@clack/prompts": "1.0.0-alpha.1",
        "@hono/standard-validator": "0.1.5",
        "@hono/zod-validator": "catalog:",
-        "@modelcontextprotocol/sdk": "1.25.2",
+        "@modelcontextprotocol/sdk": "1.15.1",
        "@octokit/graphql": "9.0.2",
        "@octokit/rest": "catalog:",
        "@openauthjs/openauth": "catalog:",
@@ -286,8 +285,8 @@
        "@opencode-ai/sdk": "workspace:*",
        "@opencode-ai/util": "workspace:*",
        "@openrouter/ai-sdk-provider": "1.5.2",
-        "@opentui/core": "0.1.71",
-        "@opentui/solid": "0.1.71",
+        "@opentui/core": "0.1.69",
+        "@opentui/solid": "0.1.69",
        "@parcel/watcher": "2.5.1",
        "@pierre/diffs": "catalog:",
        "@solid-primitives/event-bus": "1.1.2",
@@ -350,7 +349,7 @@
    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
-      "version": "1.1.8",
+      "version": "1.1.4",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "zod": "catalog:",
@@ -370,7 +369,7 @@
    },
    "packages/sdk/js": {
      "name": "@opencode-ai/sdk",
-      "version": "1.1.8",
+      "version": "1.1.4",
      "devDependencies": {
        "@hey-api/openapi-ts": "0.88.1",
        "@tsconfig/node22": "catalog:",
@@ -381,7 +380,7 @@
    },
    "packages/slack": {
      "name": "@opencode-ai/slack",
-      "version": "1.1.8",
+      "version": "1.1.4",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "@slack/bolt": "^3.17.1",
@@ -394,7 +393,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "1.1.8",
+      "version": "1.1.4",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -433,7 +432,7 @@
    },
    "packages/util": {
      "name": "@opencode-ai/util",
-      "version": "1.1.8",
+      "version": "1.1.4",
      "dependencies": {
        "zod": "catalog:",
      },
@@ -444,7 +443,7 @@
    },
    "packages/web": {
      "name": "@opencode-ai/web",
-      "version": "1.1.8",
+      "version": "1.1.4",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -911,8 +910,6 @@

    "@hey-api/openapi-ts": ["@hey-api/openapi-ts@0.88.1", "", { "dependencies": { "@hey-api/codegen-core": "^0.3.3", "@hey-api/json-schema-ref-parser": "1.2.2", "ansi-colors": "4.1.3", "c12": "3.3.2", "color-support": "1.1.3", "commander": "14.0.2", "open": "11.0.0", "semver": "7.7.2" }, "peerDependencies": { "typescript": ">=5.5.3" }, "bin": { "openapi-ts": "bin/run.js" } }, "sha512-x/nDTupOnV9VuSeNIiJpgIpc915GHduhyseJeMTnI0JMsXaObmpa0rgPr3ASVEYMLgpvqozIEG1RTOOnal6zLQ=="],

-    "@hono/node-server": ["@hono/node-server@1.19.7", "", { "peerDependencies": { "hono": "^4" } }, "sha512-vUcD0uauS7EU2caukW8z5lJKtoGMokxNbJtBiwHgpqxEXokaHCBkQUmCHhjFB1VUTWdqj25QoMkMKzgjq+uhrw=="],
-
    "@hono/standard-validator": ["@hono/standard-validator@0.1.5", "", { "peerDependencies": { "@standard-schema/spec": "1.0.0", "hono": ">=3.9.0" } }, "sha512-EIyZPPwkyLn6XKwFj5NBEWHXhXbgmnVh2ceIFo5GO7gKI9WmzTjPDKnppQB0KrqKeAkq3kpoW4SIbu5X1dgx3w=="],

    "@hono/zod-validator": ["@hono/zod-validator@0.4.2", "", { "peerDependencies": { "hono": ">=3.9.0", "zod": "^3.19.1" } }, "sha512-1rrlBg+EpDPhzOV4hT9pxr5+xDVmKuz6YJl+la7VCwK6ass5ldyKm5fD+umJdV2zhHD6jROoCCv8NbTwyfhT0g=="],
@@ -1097,7 +1094,7 @@

    "@mixmark-io/domino": ["@mixmark-io/domino@2.2.0", "", {}, "sha512-Y28PR25bHXUg88kCV7nivXrP2Nj2RueZ3/l/jdx6J9f8J4nsEGcgX0Qe6lt7Pa+J79+kPiJU3LguR6O/6zrLOw=="],

-    "@modelcontextprotocol/sdk": ["@modelcontextprotocol/sdk@1.25.2", "", { "dependencies": { "@hono/node-server": "^1.19.7", "ajv": "^8.17.1", "ajv-formats": "^3.0.1", "content-type": "^1.0.5", "cors": "^2.8.5", "cross-spawn": "^7.0.5", "eventsource": "^3.0.2", "eventsource-parser": "^3.0.0", "express": "^5.0.1", "express-rate-limit": "^7.5.0", "jose": "^6.1.1", "json-schema-typed": "^8.0.2", "pkce-challenge": "^5.0.0", "raw-body": "^3.0.0", "zod": "^3.25 || ^4.0", "zod-to-json-schema": "^3.25.0" }, "peerDependencies": { "@cfworker/json-schema": "^4.1.1" }, "optionalPeers": ["@cfworker/json-schema"] }, "sha512-LZFeo4F9M5qOhC/Uc1aQSrBHxMrvxett+9KLHt7OhcExtoiRN9DKgbZffMP/nxjutWDQpfMDfP3nkHI4X9ijww=="],
+    "@modelcontextprotocol/sdk": ["@modelcontextprotocol/sdk@1.15.1", "", { "dependencies": { "ajv": "^6.12.6", "content-type": "^1.0.5", "cors": "^2.8.5", "cross-spawn": "^7.0.5", "eventsource": "^3.0.2", "eventsource-parser": "^3.0.0", "express": "^5.0.1", "express-rate-limit": "^7.5.0", "pkce-challenge": "^5.0.0", "raw-body": "^3.0.0", "zod": "^3.23.8", "zod-to-json-schema": "^3.24.1" } }, "sha512-W/XlN9c528yYn+9MQkVjxiTPgPxoxt+oczfjHBDsJx0+59+O7B75Zhsp0B16Xbwbz8ANISDajh6+V7nIcPMc5w=="],

    "@motionone/animation": ["@motionone/animation@10.18.0", "", { "dependencies": { "@motionone/easing": "^10.18.0", "@motionone/types": "^10.17.1", "@motionone/utils": "^10.18.0", "tslib": "^2.3.1" } }, "sha512-9z2p5GFGCm0gBsZbi8rVMOAJCtw1WqBTIPw3ozk06gDvZInBPIsQcHgYogEJ4yuHJ+akuW8g1SEIOpTOvYs8hw=="],

@@ -1201,21 +1198,21 @@

    "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="],

-    "@opentui/core": ["@opentui/core@0.1.71", "", { "dependencies": { "bun-ffi-structs": "0.1.2", "diff": "8.0.2", "jimp": "1.6.0", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.1.71", "@opentui/core-darwin-x64": "0.1.71", "@opentui/core-linux-arm64": "0.1.71", "@opentui/core-linux-x64": "0.1.71", "@opentui/core-win32-arm64": "0.1.71", "@opentui/core-win32-x64": "0.1.71", "bun-webgpu": "0.1.4", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-0gmqiBnM80QexPEpxv84QZn4h3IKrvLNn/9wIEzpHBtP7hunI1cJqb9fpMIlYDmf03PDW3KFHx9Oo2v+9jtosQ=="],
+    "@opentui/core": ["@opentui/core@0.1.69", "", { "dependencies": { "bun-ffi-structs": "0.1.2", "diff": "8.0.2", "jimp": "1.6.0", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.1.69", "@opentui/core-darwin-x64": "0.1.69", "@opentui/core-linux-arm64": "0.1.69", "@opentui/core-linux-x64": "0.1.69", "@opentui/core-win32-arm64": "0.1.69", "@opentui/core-win32-x64": "0.1.69", "bun-webgpu": "0.1.4", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-BcEFnAuMq4vgfb+zxOP/l+NO1AS3fVHkYjn+E8Wpmaxr0AzWNTi2NPAMtQf+Wqufxo0NYh0gY4c9B6n8OxTjGw=="],

-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.1.71", "", { "os": "darwin", "cpu": "arm64" }, "sha512-0H8tYWuBDmBuUyuoSFeLi1KTVAa7d4RpftS5E4XUfyRtS5afr08DxXft15Y4unMnKzRNQGYaU9Rk/JdbAy9MKg=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.1.69", "", { "os": "darwin", "cpu": "arm64" }, "sha512-d9RPAh84O2XIyMw+7+X0fEyi+4KH5sPk9AxLze8GHRBGOzkRunqagFCLBrN5VFs2e2nbhIYtjMszo7gcpWyh7g=="],

-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.1.71", "", { "os": "darwin", "cpu": "x64" }, "sha512-3fRfmfpH1GgjphMewETsykRj3FvTJaEf2WttzRPHNaX5zeJQEJYjFLCKFYRujAofvB4I1oxdjGhxEvwD+7AZ0A=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.1.69", "", { "os": "darwin", "cpu": "x64" }, "sha512-41K9zkL2IG0ahL+8Gd+e9ulMrnJF6lArPzG7grjWzo+FWEZwvw0WLCO1/Gn5K85G8Yx7gQXkZOUaw1BmHjxoRw=="],

-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.1.71", "", { "os": "linux", "cpu": "arm64" }, "sha512-dmLl53gGLEKCef7Cl4v97JmGc5QV9zDjL6djBLS4X88oVY5F0YU8eLW8/3d0DpD/gWQOOOvGvL6fUP1wON1WIg=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.1.69", "", { "os": "linux", "cpu": "arm64" }, "sha512-IcUjwjuIpX3BBG1a9kjMqWrHYCFHAVfjh5nIRozWZZoqaczLzJb3nJeF2eg8aDeIoGhXvERWB1r1gmqPW8u3vQ=="],

-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.1.71", "", { "os": "linux", "cpu": "x64" }, "sha512-ZhTfXqNqIb62O/GAjc6MCFheIQLwUULdes4oa0eCab14tyfooc7atzNQPNmsug0blBq0EfqlejRfaOp7f2D9Wg=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.1.69", "", { "os": "linux", "cpu": "x64" }, "sha512-5S9vqEIq7q+MEdp4cT0HLegBWu0pWLcletHZL80bsLbJt9OT8en3sQmL5bvas9sIuyeBFru9bfCmrQ/gnVTTiA=="],

-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.1.71", "", { "os": "win32", "cpu": "arm64" }, "sha512-F2zXQFBs/DncYCNIwFx6ps7/9N3tLJ3OZNZZrxUXmwKrO+kziB1lBehBlW5TzzBIPkNY9UBaQg+iekncwiDEcg=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.1.69", "", { "os": "win32", "cpu": "arm64" }, "sha512-eSKcGwbcnJJPtrTFJI7STZ7inSYeedHS0swwjZhh9SADAruEz08intamunOslffv5+mnlvRp7UBGK35cMjbv/w=="],

-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.1.71", "", { "os": "win32", "cpu": "x64" }, "sha512-IJBIrwgQFgPLDNEQVLSVaYZMbGETQlfZ1v/gz/zGtU2NwAHCllmPT1E1AauV/7Ex9Da082/dTrnl351IsipcPQ=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.1.69", "", { "os": "win32", "cpu": "x64" }, "sha512-OjG/0jqYXURqbbUwNgSPrBA6yuKF3OOFh8JSG7VvzoYHJFJRmwVWY0fztWv/hgGHe354ti37c7JDJBQ44HOCdA=="],

-    "@opentui/solid": ["@opentui/solid@0.1.71", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.1.71", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.9", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.9" } }, "sha512-09mimwa2eTkttE72BMv1SNvH/NSf088Ebz0nmrJ7qpmHjbngn7FwlTXK+98sukUTeR6fQqFOnMnuLQieF6QdiA=="],
+    "@opentui/solid": ["@opentui/solid@0.1.69", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.1.69", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.9", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.9" } }, "sha512-ls589N8P9gvcNW8uF+Il4xisF5Uouk0RRmSaLdzmItNJSW5J9Y0nPtMELta6hBp0yIRAurWUO1wtkKXVF+eaxg=="],

    "@oslojs/asn1": ["@oslojs/asn1@1.0.0", "", { "dependencies": { "@oslojs/binary": "1.0.0" } }, "sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA=="],

@@ -1905,9 +1902,7 @@

    "ai": ["ai@5.0.97", "", { "dependencies": { "@ai-sdk/gateway": "2.0.12", "@ai-sdk/provider": "2.0.0", "@ai-sdk/provider-utils": "3.0.17", "@opentelemetry/api": "1.9.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-8zBx0b/owis4eJI2tAlV8a1Rv0BANmLxontcAelkLNwEHhgfgXeKpDkhNB6OgV+BJSwboIUDkgd9312DdJnCOQ=="],

-    "ajv": ["ajv@8.17.1", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g=="],
-
-    "ajv-formats": ["ajv-formats@3.0.1", "", { "dependencies": { "ajv": "^8.0.0" } }, "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ=="],
+    "ajv": ["ajv@6.12.6", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="],

    "ansi-align": ["ansi-align@3.0.1", "", { "dependencies": { "string-width": "^4.1.0" } }, "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="],

@@ -2411,7 +2406,7 @@

    "fast-glob": ["fast-glob@3.3.3", "", { "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", "glob-parent": "^5.1.2", "merge2": "^1.3.0", "micromatch": "^4.0.8" } }, "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg=="],

-    "fast-uri": ["fast-uri@3.1.0", "", {}, "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA=="],
+    "fast-json-stable-stringify": ["fast-json-stable-stringify@2.1.0", "", {}, "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="],

    "fast-xml-parser": ["fast-xml-parser@4.4.1", "", { "dependencies": { "strnum": "^1.0.5" }, "bin": { "fxparser": "src/cli/cli.js" } }, "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw=="],

@@ -2787,9 +2782,7 @@

    "json-schema": ["json-schema@0.4.0", "", {}, "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="],

-    "json-schema-traverse": ["json-schema-traverse@1.0.0", "", {}, "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="],
-
-    "json-schema-typed": ["json-schema-typed@8.0.2", "", {}, "sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA=="],
+    "json-schema-traverse": ["json-schema-traverse@0.4.1", "", {}, "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="],

    "json5": ["json5@2.2.3", "", { "bin": { "json5": "lib/cli.js" } }, "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="],

@@ -3391,8 +3384,6 @@

    "remeda": ["remeda@2.26.0", "", { "dependencies": { "type-fest": "^4.41.0" } }, "sha512-lmNNwtaC6Co4m0WTTNoZ/JlpjEqAjPZO0+czC9YVRQUpkbS4x8Hmh+Mn9HPfJfiXqUQ5IXXgSXSOB2pBKAytdA=="],

-    "require-from-string": ["require-from-string@2.0.2", "", {}, "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="],
-
    "reselect": ["reselect@4.1.8", "", {}, "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ=="],

    "resolve": ["resolve@1.22.11", "", { "dependencies": { "is-core-module": "^2.16.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" } }, "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ=="],
@@ -3767,6 +3758,8 @@

    "update-browserslist-db": ["update-browserslist-db@1.1.4", "", { "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.1" }, "peerDependencies": { "browserslist": ">= 4.21.0" }, "bin": { "update-browserslist-db": "cli.js" } }, "sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A=="],

+    "uri-js": ["uri-js@4.4.1", "", { "dependencies": { "punycode": "^2.1.0" } }, "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="],
+
    "url": ["url@0.10.3", "", { "dependencies": { "punycode": "1.3.2", "querystring": "0.2.0" } }, "sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ=="],

    "use-callback-ref": ["use-callback-ref@1.3.3", "", { "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg=="],
@@ -4065,11 +4058,9 @@

    "@modelcontextprotocol/sdk/express": ["express@5.1.0", "", { "dependencies": { "accepts": "^2.0.0", "body-parser": "^2.2.0", "content-disposition": "^1.0.0", "content-type": "^1.0.5", "cookie": "^0.7.1", "cookie-signature": "^1.2.1", "debug": "^4.4.0", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "finalhandler": "^2.1.0", "fresh": "^2.0.0", "http-errors": "^2.0.0", "merge-descriptors": "^2.0.0", "mime-types": "^3.0.0", "on-finished": "^2.4.1", "once": "^1.4.0", "parseurl": "^1.3.3", "proxy-addr": "^2.0.7", "qs": "^6.14.0", "range-parser": "^1.2.1", "router": "^2.2.0", "send": "^1.1.0", "serve-static": "^2.2.0", "statuses": "^2.0.1", "type-is": "^2.0.1", "vary": "^1.1.2" } }, "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA=="],

-    "@modelcontextprotocol/sdk/jose": ["jose@6.1.3", "", {}, "sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ=="],
-
    "@modelcontextprotocol/sdk/raw-body": ["raw-body@3.0.2", "", { "dependencies": { "bytes": "~3.1.2", "http-errors": "~2.0.1", "iconv-lite": "~0.7.0", "unpipe": "~1.0.0" } }, "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA=="],

-    "@modelcontextprotocol/sdk/zod-to-json-schema": ["zod-to-json-schema@3.25.1", "", { "peerDependencies": { "zod": "^3.25 || ^4" } }, "sha512-pM/SU9d3YAggzi6MtR4h7ruuQlqKtad8e9S0fmxcMi+ueAK5Korys/aWcV9LIIHTVbj01NdzxcnXSN+O74ZIVA=="],
+    "@modelcontextprotocol/sdk/zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],

    "@octokit/auth-app/@octokit/request": ["@octokit/request@10.0.7", "", { "dependencies": { "@octokit/endpoint": "^11.0.2", "@octokit/request-error": "^7.0.2", "@octokit/types": "^16.0.0", "fast-content-type-parse": "^3.0.0", "universal-user-agent": "^7.0.2" } }, "sha512-v93h0i1yu4idj8qFPZwjehoJx4j3Ntn+JhXsdJrG9pYaX6j/XRz2RmasMUHtNgQD39nrv/VwTWSqK0RNXR8upA=="],

@@ -4413,6 +4404,8 @@

    "unifont/ofetch": ["ofetch@1.5.1", "", { "dependencies": { "destr": "^2.0.5", "node-fetch-native": "^1.6.7", "ufo": "^1.6.1" } }, "sha512-2W4oUZlVaqAPAil6FUg/difl6YhqhUR7x2eZY4bQCko22UXg3hptq9KLQdqFClV+Wu85UX7hNtdGTngi/1BxcA=="],

+    "uri-js/punycode": ["punycode@2.3.1", "", {}, "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="],
+
    "utif2/pako": ["pako@1.0.11", "", {}, "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="],

    "vitest/tinyexec": ["tinyexec@1.0.2", "", {}, "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg=="],
--- a/infra/console.ts
+++ b/infra/console.ts
@@ -76,7 +76,6 @@ export const stripeWebhook = new stripe.WebhookEndpoint("StripeWebhookEndpoint",
    "checkout.session.completed",
    "checkout.session.expired",
    "charge.refunded",
-    "invoice.payment_succeeded",
    "customer.created",
    "customer.deleted",
    "customer.updated",
--- a/nix/hashes.json
+++ b/nix/hashes.json
@@ -1,3 +1,3 @@
 {
-  "nodeModules": "sha256-vuv1AO4iW6cR/+IgPSLzAb1iif1fo9ti5VzSrX4fo5E="
+  "nodeModules": "sha256-Vi6auFnjZ6Ko7yGy73kyjE3gToreuhD81mZgcnxxxww="
 }
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.1.8",
+  "version": "1.1.4",
  "description": "",
  "type": "module",
  "exports": {
--- a/packages/app/src/app.tsx
+++ b/packages/app/src/app.tsx
@@ -1,5 +1,5 @@
 import "@/index.css"
-import { ErrorBoundary, Show, lazy, type ParentProps } from "solid-js"
+import { ErrorBoundary, Show, Suspense, lazy, type ParentProps } from "solid-js"
 import { Router, Route, Navigate } from "@solidjs/router"
 import { MetaProvider } from "@solidjs/meta"
 import { Font } from "@opencode-ai/ui/font"
@@ -20,12 +20,10 @@ import { FileProvider } from "@/context/file"
 import { NotificationProvider } from "@/context/notification"
 import { DialogProvider } from "@opencode-ai/ui/context/dialog"
 import { CommandProvider } from "@/context/command"
-import { Logo } from "@opencode-ai/ui/logo"
 import Layout from "@/pages/layout"
 import DirectoryLayout from "@/pages/directory-layout"
 import { ErrorPage } from "./pages/error"
 import { iife } from "@opencode-ai/util/iife"
-import { Suspense } from "solid-js"

 const Home = lazy(() => import("@/pages/home"))
 const Session = lazy(() => import("@/pages/session"))
@@ -33,7 +31,7 @@ const Loading = () => <div class="size-full flex items-center justify-center tex

 declare global {
  interface Window {
-    __OPENCODE__?: { updaterEnabled?: boolean; port?: number; serverReady?: boolean }
+    __OPENCODE__?: { updaterEnabled?: boolean; port?: number }
  }
 }

@@ -49,25 +47,6 @@ const defaultServerUrl = iife(() => {
  return window.location.origin
 })

-export function AppBaseProviders(props: ParentProps) {
-  return (
-    <MetaProvider>
-      <Font />
-      <ThemeProvider>
-        <ErrorBoundary fallback={(error) => <ErrorPage error={error} />}>
-          <DialogProvider>
-            <MarkedProvider>
-              <DiffComponentProvider component={Diff}>
-                <CodeComponentProvider component={Code}>{props.children}</CodeComponentProvider>
-              </DiffComponentProvider>
-            </MarkedProvider>
-          </DialogProvider>
-        </ErrorBoundary>
-      </ThemeProvider>
-    </MetaProvider>
-  )
-}
-
 function ServerKey(props: ParentProps) {
  const server = useServer()
  return (
@@ -77,54 +56,71 @@ function ServerKey(props: ParentProps) {
  )
 }

-export function AppInterface() {
+export function App() {
  return (
-    <ServerProvider defaultUrl={defaultServerUrl}>
-      <ServerKey>
-        <GlobalSDKProvider>
-          <GlobalSyncProvider>
-            <Router
-              root={(props) => (
-                <PermissionProvider>
-                  <LayoutProvider>
-                    <NotificationProvider>
-                      <CommandProvider>
-                        <Layout>{props.children}</Layout>
-                      </CommandProvider>
-                    </NotificationProvider>
-                  </LayoutProvider>
-                </PermissionProvider>
-              )}
-            >
-              <Route
-                path="/"
-                component={() => (
-                  <Suspense fallback={<Loading />}>
-                    <Home />
-                  </Suspense>
-                )}
-              />
-              <Route path="/:dir" component={DirectoryLayout}>
-                <Route path="/" component={() => <Navigate href="session" />} />
-                <Route
-                  path="/session/:id?"
-                  component={() => (
-                    <TerminalProvider>
-                      <FileProvider>
-                        <PromptProvider>
-                          <Suspense fallback={<Loading />}>
-                            <Session />
-                          </Suspense>
-                        </PromptProvider>
-                      </FileProvider>
-                    </TerminalProvider>
-                  )}
-                />
-              </Route>
-            </Router>
-          </GlobalSyncProvider>
-        </GlobalSDKProvider>
-      </ServerKey>
-    </ServerProvider>
+    <MetaProvider>
+      <Font />
+      <ThemeProvider>
+        <ErrorBoundary fallback={(error) => <ErrorPage error={error} />}>
+          <DialogProvider>
+            <MarkedProvider>
+              <DiffComponentProvider component={Diff}>
+                <CodeComponentProvider component={Code}>
+                  <ServerProvider defaultUrl={defaultServerUrl}>
+                    <ServerKey>
+                      <GlobalSDKProvider>
+                        <GlobalSyncProvider>
+                          <Router
+                            root={(props) => (
+                              <PermissionProvider>
+                                <LayoutProvider>
+                                  <NotificationProvider>
+                                    <CommandProvider>
+                                      <Layout>{props.children}</Layout>
+                                    </CommandProvider>
+                                  </NotificationProvider>
+                                </LayoutProvider>
+                              </PermissionProvider>
+                            )}
+                          >
+                            <Route
+                              path="/"
+                              component={() => (
+                                <Suspense fallback={<Loading />}>
+                                  <Home />
+                                </Suspense>
+                              )}
+                            />
+                            <Route path="/:dir" component={DirectoryLayout}>
+                              <Route path="/" component={() => <Navigate href="session" />} />
+                              <Route
+                                path="/session/:id?"
+                                component={(p) => (
+                                  <Show when={p.params.id ?? "new"} keyed>
+                                    <TerminalProvider>
+                                      <FileProvider>
+                                        <PromptProvider>
+                                          <Suspense fallback={<Loading />}>
+                                            <Session />
+                                          </Suspense>
+                                        </PromptProvider>
+                                      </FileProvider>
+                                    </TerminalProvider>
+                                  </Show>
+                                )}
+                              />
+                            </Route>
+                          </Router>
+                        </GlobalSyncProvider>
+                      </GlobalSDKProvider>
+                    </ServerKey>
+                  </ServerProvider>
+                </CodeComponentProvider>
+              </DiffComponentProvider>
+            </MarkedProvider>
+          </DialogProvider>
+        </ErrorBoundary>
+      </ThemeProvider>
+    </MetaProvider>
  )
 }
--- a/packages/app/src/components/dialog-edit-project.tsx
+++ b/packages/app/src/components/dialog-edit-project.tsx
@@ -7,11 +7,15 @@ import { createMemo, createSignal, For, Show } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useGlobalSDK } from "@/context/global-sdk"
 import { type LocalProject, getAvatarColors } from "@/context/layout"
-import { getFilename } from "@opencode-ai/util/path"
 import { Avatar } from "@opencode-ai/ui/avatar"

 const AVATAR_COLOR_KEYS = ["pink", "mint", "orange", "purple", "cyan", "lime"] as const

+function getFilename(input: string) {
+  const parts = input.split("/")
+  return parts[parts.length - 1] || input
+}
+
 export function DialogEditProject(props: { project: LocalProject }) {
  const dialog = useDialog()
  const globalSDK = useGlobalSDK()
--- a/packages/app/src/components/dialog-select-file.tsx
+++ b/packages/app/src/components/dialog-select-file.tsx
@@ -15,7 +15,6 @@ export function DialogSelectFile() {
  const params = useParams()
  const sessionKey = createMemo(() => `${params.dir}${params.id ? "/" + params.id : ""}`)
  const tabs = createMemo(() => layout.tabs(sessionKey()))
-  const view = createMemo(() => layout.view(sessionKey()))
  return (
    <Dialog title="Select file">
      <List
@@ -28,7 +27,7 @@ export function DialogSelectFile() {
            const value = file.tab(path)
            tabs().open(value)
            file.load(path)
-            view().reviewPanel.open()
+            layout.review.open()
          }
          dialog.close()
        }}
--- a/packages/app/src/components/dialog-select-model.tsx
+++ b/packages/app/src/components/dialog-select-model.tsx
@@ -76,7 +76,7 @@ export const ModelSelectorPopover: Component<{
    <Kobalte open={open()} onOpenChange={setOpen} placement="top-start" gutter={8}>
      <Kobalte.Trigger as="div">{props.children}</Kobalte.Trigger>
      <Kobalte.Portal>
-        <Kobalte.Content class="w-72 h-80 flex flex-col rounded-md border border-border-base bg-surface-raised-stronger-non-alpha shadow-md z-50 outline-none overflow-hidden">
+        <Kobalte.Content class="w-72 h-80 flex flex-col rounded-md border border-border-base bg-surface-raised-stronger-non-alpha shadow-md z-50 outline-none">
          <Kobalte.Title class="sr-only">Select model</Kobalte.Title>
          <ModelList provider={props.provider} onSelect={() => setOpen(false)} class="p-1" />
        </Kobalte.Content>
--- a/packages/app/src/components/prompt-input.tsx
+++ b/packages/app/src/components/prompt-input.tsx
@@ -248,8 +248,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    }
  }

-  const isFocused = createFocusSignal(() => editorRef)
-
  createEffect(() => {
    params.id
    editorRef.focus()
@@ -260,6 +258,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    onCleanup(() => clearInterval(interval))
  })

+  const isFocused = createFocusSignal(() => editorRef)
  const [composing, setComposing] = createSignal(false)
  const isImeComposing = (event: KeyboardEvent) => event.isComposing || composing() || event.keyCode === 229

@@ -293,13 +292,12 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    const clipboardData = event.clipboardData
    if (!clipboardData) return

-    event.preventDefault()
-    event.stopPropagation()
-
    const items = Array.from(clipboardData.items)
    const imageItems = items.filter((item) => ACCEPTED_FILE_TYPES.includes(item.type))

    if (imageItems.length > 0) {
+      event.preventDefault()
+      event.stopPropagation()
      for (const item of imageItems) {
        const file = item.getAsFile()
        if (file) await addImageAttachment(file)
@@ -307,6 +305,8 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
      return
    }

+    event.preventDefault()
+    event.stopPropagation()
    const plainText = clipboardData.getData("text/plain") ?? ""
    addPart({ type: "text", content: plainText, start: 0, end: 0 })
  }
@@ -347,11 +347,13 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
  }

  onMount(() => {
+    editorRef.addEventListener("paste", handlePaste)
    document.addEventListener("dragover", handleGlobalDragOver)
    document.addEventListener("dragleave", handleGlobalDragLeave)
    document.addEventListener("drop", handleGlobalDrop)
  })
  onCleanup(() => {
+    editorRef.removeEventListener("paste", handlePaste)
    document.removeEventListener("dragover", handleGlobalDragOver)
    document.removeEventListener("dragleave", handleGlobalDragLeave)
    document.removeEventListener("drop", handleGlobalDrop)
@@ -1506,7 +1508,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
            }}
            contenteditable="true"
            onInput={handleInput}
-            onPaste={handlePaste}
            onCompositionStart={() => setComposing(true)}
            onCompositionEnd={() => setComposing(false)}
            onKeyDown={handleKeyDown}
--- a/packages/app/src/components/session-context-usage.tsx
+++ b/packages/app/src/components/session-context-usage.tsx
@@ -20,7 +20,6 @@ export function SessionContextUsage(props: SessionContextUsageProps) {
  const variant = createMemo(() => props.variant ?? "button")
  const sessionKey = createMemo(() => `${params.dir}${params.id ? "/" + params.id : ""}`)
  const tabs = createMemo(() => layout.tabs(sessionKey()))
-  const view = createMemo(() => layout.view(sessionKey()))
  const messages = createMemo(() => (params.id ? (sync.data.message[params.id] ?? []) : []))

  const cost = createMemo(() => {
@@ -49,7 +48,7 @@ export function SessionContextUsage(props: SessionContextUsageProps) {

  const openContext = () => {
    if (!params.id) return
-    view().reviewPanel.open()
+    layout.review.open()
    tabs().open("context")
    tabs().setActive("context")
  }
--- a/packages/app/src/components/session/session-header.tsx
+++ b/packages/app/src/components/session/session-header.tsx
@@ -43,8 +43,6 @@ export function SessionHeader() {
  })
  const shareEnabled = createMemo(() => sync.data.config.share !== "disabled")
  const worktrees = createMemo(() => layout.projects.list().map((p) => p.worktree), [], { equals: same })
-  const sessionKey = createMemo(() => `${params.dir}${params.id ? "/" + params.id : ""}`)
-  const view = createMemo(() => layout.view(sessionKey()))

  function navigateToProject(directory: string) {
    navigate(`/${base64Encode(directory)}`)
@@ -173,24 +171,20 @@ export function SessionHeader() {
                title="Toggle review"
                keybind={command.keybind("review.toggle")}
              >
-                <Button
-                  variant="ghost"
-                  class="group/review-toggle size-6 p-0"
-                  onClick={() => view().reviewPanel.toggle()}
-                >
+                <Button variant="ghost" class="group/review-toggle size-6 p-0" onClick={layout.review.toggle}>
                  <div class="relative flex items-center justify-center size-4 [&>*]:absolute [&>*]:inset-0">
                    <Icon
-                      name={view().reviewPanel.opened() ? "layout-right" : "layout-left"}
+                      name={layout.review.opened() ? "layout-right" : "layout-left"}
                      size="small"
                      class="group-hover/review-toggle:hidden"
                    />
                    <Icon
-                      name={view().reviewPanel.opened() ? "layout-right-partial" : "layout-left-partial"}
+                      name={layout.review.opened() ? "layout-right-partial" : "layout-left-partial"}
                      size="small"
                      class="hidden group-hover/review-toggle:inline-block"
                    />
                    <Icon
-                      name={view().reviewPanel.opened() ? "layout-right-full" : "layout-left-full"}
+                      name={layout.review.opened() ? "layout-right-full" : "layout-left-full"}
                      size="small"
                      class="hidden group-active/review-toggle:inline-block"
                    />
@@ -203,11 +197,11 @@ export function SessionHeader() {
              title="Toggle terminal"
              keybind={command.keybind("terminal.toggle")}
            >
-              <Button variant="ghost" class="group/terminal-toggle size-6 p-0" onClick={() => view().terminal.toggle()}>
+              <Button variant="ghost" class="group/terminal-toggle size-6 p-0" onClick={layout.terminal.toggle}>
                <div class="relative flex items-center justify-center size-4 [&>*]:absolute [&>*]:inset-0">
                  <Icon
                    size="small"
-                    name={view().terminal.opened() ? "layout-bottom-full" : "layout-bottom"}
+                    name={layout.terminal.opened() ? "layout-bottom-full" : "layout-bottom"}
                    class="group-hover/terminal-toggle:hidden"
                  />
                  <Icon
@@ -217,7 +211,7 @@ export function SessionHeader() {
                  />
                  <Icon
                    size="small"
-                    name={view().terminal.opened() ? "layout-bottom" : "layout-bottom-full"}
+                    name={layout.terminal.opened() ? "layout-bottom" : "layout-bottom-full"}
                    class="hidden group-active/terminal-toggle:inline-block"
                  />
                </div>
--- a/packages/app/src/components/terminal.tsx
+++ b/packages/app/src/components/terminal.tsx
@@ -45,8 +45,6 @@ export const Terminal = (props: TerminalProps) => {
  let serializeAddon: SerializeAddon
  let fitAddon: FitAddon
  let handleResize: () => void
-  let handleTextareaFocus: () => void
-  let handleTextareaBlur: () => void
  let reconnect: number | undefined
  let disposed = false

@@ -107,7 +105,6 @@ export const Terminal = (props: TerminalProps) => {

    const t = new mod.Terminal({
      cursorBlink: true,
-      cursorStyle: "bar",
      fontSize: 14,
      fontFamily: "IBM Plex Mono, monospace",
      allowTransparency: true,
@@ -173,17 +170,6 @@ export const Terminal = (props: TerminalProps) => {

    t.open(container)
    container.addEventListener("pointerdown", handlePointerDown)
-
-    handleTextareaFocus = () => {
-      t.options.cursorBlink = true
-    }
-    handleTextareaBlur = () => {
-      t.options.cursorBlink = false
-    }
-
-    t.textarea?.addEventListener("focus", handleTextareaFocus)
-    t.textarea?.addEventListener("blur", handleTextareaBlur)
-
    focusTerminal()

    if (local.pty.buffer) {
@@ -256,8 +242,6 @@ export const Terminal = (props: TerminalProps) => {
      window.removeEventListener("resize", handleResize)
    }
    container.removeEventListener("pointerdown", handlePointerDown)
-    term?.textarea?.removeEventListener("focus", handleTextareaFocus)
-    term?.textarea?.removeEventListener("blur", handleTextareaBlur)

    const t = term
    if (serializeAddon && props.onCleanup && t) {
--- a/packages/app/src/context/file.tsx
+++ b/packages/app/src/context/file.tsx
@@ -1,4 +1,4 @@
-import { createEffect, createMemo, createRoot, onCleanup } from "solid-js"
+import { createEffect, createMemo, onCleanup } from "solid-js"
 import { createStore, produce } from "solid-js/store"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import type { FileContent } from "@opencode-ai/sdk/v2"
@@ -82,106 +82,8 @@ function normalizeSelectedLines(range: SelectedLineRange): SelectedLineRange {
  }
 }

-const WORKSPACE_KEY = "__workspace__"
-const MAX_FILE_VIEW_SESSIONS = 20
-const MAX_VIEW_FILES = 500
-
-type ViewSession = ReturnType<typeof createViewSession>
-
-type ViewCacheEntry = {
-  value: ViewSession
-  dispose: VoidFunction
-}
-
-function createViewSession(dir: string, id: string | undefined) {
-  const legacyViewKey = `${dir}/file${id ? "/" + id : ""}.v1`
-
-  const [view, setView, _, ready] = persisted(
-    Persist.scoped(dir, id, "file-view", [legacyViewKey]),
-    createStore<{
-      file: Record<string, FileViewState>
-    }>({
-      file: {},
-    }),
-  )
-
-  const meta = { pruned: false }
-
-  const pruneView = (keep?: string) => {
-    const keys = Object.keys(view.file)
-    if (keys.length <= MAX_VIEW_FILES) return
-
-    const drop = keys.filter((key) => key !== keep).slice(0, keys.length - MAX_VIEW_FILES)
-    if (drop.length === 0) return
-
-    setView(
-      produce((draft) => {
-        for (const key of drop) {
-          delete draft.file[key]
-        }
-      }),
-    )
-  }
-
-  createEffect(() => {
-    if (!ready()) return
-    if (meta.pruned) return
-    meta.pruned = true
-    pruneView()
-  })
-
-  const scrollTop = (path: string) => view.file[path]?.scrollTop
-  const scrollLeft = (path: string) => view.file[path]?.scrollLeft
-  const selectedLines = (path: string) => view.file[path]?.selectedLines
-
-  const setScrollTop = (path: string, top: number) => {
-    setView("file", path, (current) => {
-      if (current?.scrollTop === top) return current
-      return {
-        ...(current ?? {}),
-        scrollTop: top,
-      }
-    })
-    pruneView(path)
-  }
-
-  const setScrollLeft = (path: string, left: number) => {
-    setView("file", path, (current) => {
-      if (current?.scrollLeft === left) return current
-      return {
-        ...(current ?? {}),
-        scrollLeft: left,
-      }
-    })
-    pruneView(path)
-  }
-
-  const setSelectedLines = (path: string, range: SelectedLineRange | null) => {
-    const next = range ? normalizeSelectedLines(range) : null
-    setView("file", path, (current) => {
-      if (current?.selectedLines === next) return current
-      return {
-        ...(current ?? {}),
-        selectedLines: next,
-      }
-    })
-    pruneView(path)
-  }
-
-  return {
-    ready,
-    scrollTop,
-    scrollLeft,
-    selectedLines,
-    setScrollTop,
-    setScrollLeft,
-    setSelectedLines,
-  }
-}
-
 export const { use: useFile, provider: FileProvider } = createSimpleContext({
  name: "File",
-  gate: false,
  init: () => {
    const sdk = useSDK()
    const sync = useSync()
@@ -232,45 +134,42 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
      file: {},
    })

-    const viewCache = new Map<string, ViewCacheEntry>()
+    const legacyViewKey = createMemo(() => `${params.dir}/file${params.id ? "/" + params.id : ""}.v1`)

-    const disposeViews = () => {
-      for (const entry of viewCache.values()) {
-        entry.dispose()
-      }
-      viewCache.clear()
+    const [view, setView, _, ready] = persisted(
+      Persist.scoped(params.dir!, params.id, "file-view", [legacyViewKey()]),
+      createStore<{
+        file: Record<string, FileViewState>
+      }>({
+        file: {},
+      }),
+    )
+
+    const MAX_VIEW_FILES = 500
+    const viewMeta = { pruned: false }
+
+    const pruneView = (keep?: string) => {
+      const keys = Object.keys(view.file)
+      if (keys.length <= MAX_VIEW_FILES) return
+
+      const drop = keys.filter((key) => key !== keep).slice(0, keys.length - MAX_VIEW_FILES)
+      if (drop.length === 0) return
+
+      setView(
+        produce((draft) => {
+          for (const key of drop) {
+            delete draft.file[key]
+          }
+        }),
+      )
    }

-    const pruneViews = () => {
-      while (viewCache.size > MAX_FILE_VIEW_SESSIONS) {
-        const first = viewCache.keys().next().value
-        if (!first) return
-        const entry = viewCache.get(first)
-        entry?.dispose()
-        viewCache.delete(first)
-      }
-    }
-
-    const loadView = (dir: string, id: string | undefined) => {
-      const key = `${dir}:${id ?? WORKSPACE_KEY}`
-      const existing = viewCache.get(key)
-      if (existing) {
-        viewCache.delete(key)
-        viewCache.set(key, existing)
-        return existing.value
-      }
-
-      const entry = createRoot((dispose) => ({
-        value: createViewSession(dir, id),
-        dispose,
-      }))
-
-      viewCache.set(key, entry)
-      pruneViews()
-      return entry.value
-    }
-
-    const view = createMemo(() => loadView(params.dir!, params.id))
+    createEffect(() => {
+      if (!ready()) return
+      if (viewMeta.pruned) return
+      viewMeta.pruned = true
+      pruneView()
+    })

    function ensure(path: string) {
      if (!path) return
@@ -347,32 +246,51 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({

    const get = (input: string) => store.file[normalize(input)]

-    const scrollTop = (input: string) => view().scrollTop(normalize(input))
-    const scrollLeft = (input: string) => view().scrollLeft(normalize(input))
-    const selectedLines = (input: string) => view().selectedLines(normalize(input))
+    const scrollTop = (input: string) => view.file[normalize(input)]?.scrollTop
+    const scrollLeft = (input: string) => view.file[normalize(input)]?.scrollLeft
+    const selectedLines = (input: string) => view.file[normalize(input)]?.selectedLines

    const setScrollTop = (input: string, top: number) => {
      const path = normalize(input)
-      view().setScrollTop(path, top)
+      setView("file", path, (current) => {
+        if (current?.scrollTop === top) return current
+        return {
+          ...(current ?? {}),
+          scrollTop: top,
+        }
+      })
+      pruneView(path)
    }

    const setScrollLeft = (input: string, left: number) => {
      const path = normalize(input)
-      view().setScrollLeft(path, left)
+      setView("file", path, (current) => {
+        if (current?.scrollLeft === left) return current
+        return {
+          ...(current ?? {}),
+          scrollLeft: left,
+        }
+      })
+      pruneView(path)
    }

    const setSelectedLines = (input: string, range: SelectedLineRange | null) => {
      const path = normalize(input)
-      view().setSelectedLines(path, range)
+      const next = range ? normalizeSelectedLines(range) : null
+      setView("file", path, (current) => {
+        if (current?.selectedLines === next) return current
+        return {
+          ...(current ?? {}),
+          selectedLines: next,
+        }
+      })
+      pruneView(path)
    }

-    onCleanup(() => {
-      stop()
-      disposeViews()
-    })
+    onCleanup(() => stop())

    return {
-      ready: () => view().ready(),
+      ready,
      normalize,
      tab,
      pathFromTab,
--- a/packages/app/src/context/layout.tsx
+++ b/packages/app/src/context/layout.tsx
@@ -33,8 +33,6 @@ type SessionTabs = {
 type SessionView = {
  scroll: Record<string, SessionScroll>
  reviewOpen?: string[]
-  terminalOpened?: boolean
-  reviewPanelOpened?: boolean
 }

 export type LocalProject = Partial<Project> & { worktree: string; expanded: boolean }
@@ -55,9 +53,11 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
          width: 280,
        },
        terminal: {
+          opened: false,
          height: 280,
        },
        review: {
+          opened: true,
          diffStyle: "split" as ReviewDiffStyle,
        },
        session: {
@@ -150,7 +150,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
        const current = store.sessionView[sessionKey]
        const keep = meta.active ?? sessionKey
        if (!current) {
-          setStore("sessionView", sessionKey, { scroll: next, terminalOpened: false, reviewPanelOpened: true })
+          setStore("sessionView", sessionKey, { scroll: next })
          prune(keep)
          return
        }
@@ -306,20 +306,40 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
        },
      },
      terminal: {
+        opened: createMemo(() => store.terminal.opened),
+        open() {
+          setStore("terminal", "opened", true)
+        },
+        close() {
+          setStore("terminal", "opened", false)
+        },
+        toggle() {
+          setStore("terminal", "opened", (x) => !x)
+        },
        height: createMemo(() => store.terminal.height),
        resize(height: number) {
          setStore("terminal", "height", height)
        },
      },
      review: {
+        opened: createMemo(() => store.review?.opened ?? true),
        diffStyle: createMemo(() => store.review?.diffStyle ?? "split"),
        setDiffStyle(diffStyle: ReviewDiffStyle) {
          if (!store.review) {
-            setStore("review", { diffStyle })
+            setStore("review", { opened: true, diffStyle })
            return
          }
          setStore("review", "diffStyle", diffStyle)
        },
+        open() {
+          setStore("review", "opened", true)
+        },
+        close() {
+          setStore("review", "opened", false)
+        },
+        toggle() {
+          setStore("review", "opened", (x) => !x)
+        },
      },
      session: {
        width: createMemo(() => store.session?.width ?? 600),
@@ -347,33 +367,6 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
        touch(sessionKey)
        scroll.seed(sessionKey)
        const s = createMemo(() => store.sessionView[sessionKey] ?? { scroll: {} })
-        const terminalOpened = createMemo(() => s().terminalOpened ?? false)
-        const reviewPanelOpened = createMemo(() => s().reviewPanelOpened ?? true)
-
-        function setTerminalOpened(next: boolean) {
-          const current = store.sessionView[sessionKey]
-          if (!current) {
-            setStore("sessionView", sessionKey, { scroll: {}, terminalOpened: next, reviewPanelOpened: true })
-            return
-          }
-
-          const value = current.terminalOpened ?? false
-          if (value === next) return
-          setStore("sessionView", sessionKey, "terminalOpened", next)
-        }
-
-        function setReviewPanelOpened(next: boolean) {
-          const current = store.sessionView[sessionKey]
-          if (!current) {
-            setStore("sessionView", sessionKey, { scroll: {}, terminalOpened: false, reviewPanelOpened: next })
-            return
-          }
-
-          const value = current.reviewPanelOpened ?? true
-          if (value === next) return
-          setStore("sessionView", sessionKey, "reviewPanelOpened", next)
-        }
-
        return {
          scroll(tab: string) {
            return scroll.scroll(sessionKey, tab)
@@ -381,41 +374,12 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
          setScroll(tab: string, pos: SessionScroll) {
            scroll.setScroll(sessionKey, tab, pos)
          },
-          terminal: {
-            opened: terminalOpened,
-            open() {
-              setTerminalOpened(true)
-            },
-            close() {
-              setTerminalOpened(false)
-            },
-            toggle() {
-              setTerminalOpened(!terminalOpened())
-            },
-          },
-          reviewPanel: {
-            opened: reviewPanelOpened,
-            open() {
-              setReviewPanelOpened(true)
-            },
-            close() {
-              setReviewPanelOpened(false)
-            },
-            toggle() {
-              setReviewPanelOpened(!reviewPanelOpened())
-            },
-          },
          review: {
            open: createMemo(() => s().reviewOpen),
            setOpen(open: string[]) {
              const current = store.sessionView[sessionKey]
              if (!current) {
-                setStore("sessionView", sessionKey, {
-                  scroll: {},
-                  terminalOpened: false,
-                  reviewPanelOpened: true,
-                  reviewOpen: open,
-                })
+                setStore("sessionView", sessionKey, { scroll: {}, reviewOpen: open })
                return
              }

--- a/packages/app/src/context/local.tsx
+++ b/packages/app/src/context/local.tsx
@@ -276,13 +276,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
        visible(model: ModelKey) {
          const key = `${model.providerID}:${model.modelID}`
          const visibility = userVisibilityMap().get(key)
-          if (visibility === "hide") return false
-          if (visibility === "show") return true
-          if (latestSet().has(key)) return true
-          // For models without valid release_date (e.g. custom models), show by default
-          const m = find(model)
-          if (!m?.release_date || !DateTime.fromISO(m.release_date).isValid) return true
-          return false
+          return visibility !== "hide" && (latestSet().has(key) || visibility === "show")
        },
        setVisibility(model: ModelKey, visible: boolean) {
          updateVisibility(model, visible ? "show" : "hide")
--- a/packages/app/src/context/prompt.tsx
+++ b/packages/app/src/context/prompt.tsx
@@ -1,6 +1,6 @@
 import { createStore } from "solid-js/store"
 import { createSimpleContext } from "@opencode-ai/ui/context"
-import { batch, createMemo, createRoot, onCleanup } from "solid-js"
+import { batch, createMemo } from "solid-js"
 import { useParams } from "@solidjs/router"
 import type { FileSelection } from "@/context/file"
 import { Persist, persisted } from "@/utils/persist"
@@ -99,146 +99,74 @@ function clonePrompt(prompt: Prompt): Prompt {
  return prompt.map(clonePart)
 }

-const WORKSPACE_KEY = "__workspace__"
-const MAX_PROMPT_SESSIONS = 20
-
-type PromptSession = ReturnType<typeof createPromptSession>
-
-type PromptCacheEntry = {
-  value: PromptSession
-  dispose: VoidFunction
-}
-
-function createPromptSession(dir: string, id: string | undefined) {
-  const legacy = `${dir}/prompt${id ? "/" + id : ""}.v2`
-
-  const [store, setStore, _, ready] = persisted(
-    Persist.scoped(dir, id, "prompt", [legacy]),
-    createStore<{
-      prompt: Prompt
-      cursor?: number
-      context: {
-        activeTab: boolean
-        items: (ContextItem & { key: string })[]
-      }
-    }>({
-      prompt: clonePrompt(DEFAULT_PROMPT),
-      cursor: undefined,
-      context: {
-        activeTab: true,
-        items: [],
-      },
-    }),
-  )
-
-  function keyForItem(item: ContextItem) {
-    if (item.type !== "file") return item.type
-    const start = item.selection?.startLine
-    const end = item.selection?.endLine
-    return `${item.type}:${item.path}:${start}:${end}`
-  }
-
-  return {
-    ready,
-    current: createMemo(() => store.prompt),
-    cursor: createMemo(() => store.cursor),
-    dirty: createMemo(() => !isPromptEqual(store.prompt, DEFAULT_PROMPT)),
-    context: {
-      activeTab: createMemo(() => store.context.activeTab),
-      items: createMemo(() => store.context.items),
-      addActive() {
-        setStore("context", "activeTab", true)
-      },
-      removeActive() {
-        setStore("context", "activeTab", false)
-      },
-      add(item: ContextItem) {
-        const key = keyForItem(item)
-        if (store.context.items.find((x) => x.key === key)) return
-        setStore("context", "items", (items) => [...items, { key, ...item }])
-      },
-      remove(key: string) {
-        setStore("context", "items", (items) => items.filter((x) => x.key !== key))
-      },
-    },
-    set(prompt: Prompt, cursorPosition?: number) {
-      const next = clonePrompt(prompt)
-      batch(() => {
-        setStore("prompt", next)
-        if (cursorPosition !== undefined) setStore("cursor", cursorPosition)
-      })
-    },
-    reset() {
-      batch(() => {
-        setStore("prompt", clonePrompt(DEFAULT_PROMPT))
-        setStore("cursor", 0)
-      })
-    },
-  }
-}
-
 export const { use: usePrompt, provider: PromptProvider } = createSimpleContext({
  name: "Prompt",
-  gate: false,
  init: () => {
    const params = useParams()
-    const cache = new Map<string, PromptCacheEntry>()
+    const legacy = createMemo(() => `${params.dir}/prompt${params.id ? "/" + params.id : ""}.v2`)

-    const disposeAll = () => {
-      for (const entry of cache.values()) {
-        entry.dispose()
-      }
-      cache.clear()
+    const [store, setStore, _, ready] = persisted(
+      Persist.scoped(params.dir!, params.id, "prompt", [legacy()]),
+      createStore<{
+        prompt: Prompt
+        cursor?: number
+        context: {
+          activeTab: boolean
+          items: (ContextItem & { key: string })[]
+        }
+      }>({
+        prompt: clonePrompt(DEFAULT_PROMPT),
+        cursor: undefined,
+        context: {
+          activeTab: true,
+          items: [],
+        },
+      }),
+    )
+
+    function keyForItem(item: ContextItem) {
+      if (item.type !== "file") return item.type
+      const start = item.selection?.startLine
+      const end = item.selection?.endLine
+      return `${item.type}:${item.path}:${start}:${end}`
    }

-    onCleanup(disposeAll)
-
-    const prune = () => {
-      while (cache.size > MAX_PROMPT_SESSIONS) {
-        const first = cache.keys().next().value
-        if (!first) return
-        const entry = cache.get(first)
-        entry?.dispose()
-        cache.delete(first)
-      }
-    }
-
-    const load = (dir: string, id: string | undefined) => {
-      const key = `${dir}:${id ?? WORKSPACE_KEY}`
-      const existing = cache.get(key)
-      if (existing) {
-        cache.delete(key)
-        cache.set(key, existing)
-        return existing.value
-      }
-
-      const entry = createRoot((dispose) => ({
-        value: createPromptSession(dir, id),
-        dispose,
-      }))
-
-      cache.set(key, entry)
-      prune()
-      return entry.value
-    }
-
-    const session = createMemo(() => load(params.dir!, params.id))
-
    return {
-      ready: () => session().ready(),
-      current: () => session().current(),
-      cursor: () => session().cursor(),
-      dirty: () => session().dirty(),
+      ready,
+      current: createMemo(() => store.prompt),
+      cursor: createMemo(() => store.cursor),
+      dirty: createMemo(() => !isPromptEqual(store.prompt, DEFAULT_PROMPT)),
      context: {
-        activeTab: () => session().context.activeTab(),
-        items: () => session().context.items(),
-        addActive: () => session().context.addActive(),
-        removeActive: () => session().context.removeActive(),
-        add: (item: ContextItem) => session().context.add(item),
-        remove: (key: string) => session().context.remove(key),
+        activeTab: createMemo(() => store.context.activeTab),
+        items: createMemo(() => store.context.items),
+        addActive() {
+          setStore("context", "activeTab", true)
+        },
+        removeActive() {
+          setStore("context", "activeTab", false)
+        },
+        add(item: ContextItem) {
+          const key = keyForItem(item)
+          if (store.context.items.find((x) => x.key === key)) return
+          setStore("context", "items", (items) => [...items, { key, ...item }])
+        },
+        remove(key: string) {
+          setStore("context", "items", (items) => items.filter((x) => x.key !== key))
+        },
+      },
+      set(prompt: Prompt, cursorPosition?: number) {
+        const next = clonePrompt(prompt)
+        batch(() => {
+          setStore("prompt", next)
+          if (cursorPosition !== undefined) setStore("cursor", cursorPosition)
+        })
+      },
+      reset() {
+        batch(() => {
+          setStore("prompt", clonePrompt(DEFAULT_PROMPT))
+          setStore("cursor", 0)
+        })
      },
-      set: (prompt: Prompt, cursorPosition?: number) => session().set(prompt, cursorPosition),
-      reset: () => session().reset(),
    }
  },
 })
--- a/packages/app/src/context/sync.tsx
+++ b/packages/app/src/context/sync.tsx
@@ -1,5 +1,5 @@
 import { batch, createMemo } from "solid-js"
-import { createStore, produce, reconcile } from "solid-js/store"
+import { produce, reconcile } from "solid-js/store"
 import { Binary } from "@opencode-ai/util/binary"
 import { retry } from "@opencode-ai/util/retry"
 import { createSimpleContext } from "@opencode-ai/ui/context"
@@ -14,76 +14,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
    const sdk = useSDK()
    const [store, setStore] = globalSync.child(sdk.directory)
    const absolute = (path: string) => (store.path.directory + "/" + path).replace("//", "/")
-    const chunk = 200
-    const inflight = new Map<string, Promise<void>>()
-    const inflightDiff = new Map<string, Promise<void>>()
-    const inflightTodo = new Map<string, Promise<void>>()
-    const [meta, setMeta] = createStore({
-      limit: {} as Record<string, number>,
-      complete: {} as Record<string, boolean>,
-      loading: {} as Record<string, boolean>,
-    })
-
-    const getSession = (sessionID: string) => {
-      const match = Binary.search(store.session, sessionID, (s) => s.id)
-      if (match.found) return store.session[match.index]
-      return undefined
-    }
-
-    const limitFor = (count: number) => {
-      if (count <= chunk) return chunk
-      return Math.ceil(count / chunk) * chunk
-    }
-
-    const hydrateMessages = (sessionID: string) => {
-      if (meta.limit[sessionID] !== undefined) return
-
-      const messages = store.message[sessionID]
-      if (!messages) return
-
-      const limit = limitFor(messages.length)
-      setMeta("limit", sessionID, limit)
-      setMeta("complete", sessionID, messages.length < limit)
-    }
-
-    const loadMessages = async (sessionID: string, limit: number) => {
-      if (meta.loading[sessionID]) return
-
-      setMeta("loading", sessionID, true)
-      await retry(() => sdk.client.session.messages({ sessionID, limit }))
-        .then((messages) => {
-          const items = (messages.data ?? []).filter((x) => !!x?.info?.id)
-          const next = items
-            .map((x) => x.info)
-            .filter((m) => !!m?.id)
-            .slice()
-            .sort((a, b) => a.id.localeCompare(b.id))
-
-          batch(() => {
-            setStore("message", sessionID, reconcile(next, { key: "id" }))
-
-            for (const message of items) {
-              setStore(
-                "part",
-                message.info.id,
-                reconcile(
-                  message.parts
-                    .filter((p) => !!p?.id)
-                    .slice()
-                    .sort((a, b) => a.id.localeCompare(b.id)),
-                  { key: "id" },
-                ),
-              )
-            }
-
-            setMeta("limit", sessionID, limit)
-            setMeta("complete", sessionID, next.length < limit)
-          })
-        })
-        .finally(() => {
-          setMeta("loading", sessionID, false)
-        })
-    }

    return {
      data: store,
@@ -100,7 +30,11 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
        return undefined
      },
      session: {
-        get: getSession,
+        get(sessionID: string) {
+          const match = Binary.search(store.session, sessionID, (s) => s.id)
+          if (match.found) return store.session[match.index]
+          return undefined
+        },
        addOptimisticMessage(input: {
          sessionID: string
          messageID: string
@@ -132,98 +66,58 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
            }),
          )
        },
-        async sync(sessionID: string) {
-          const hasSession = getSession(sessionID) !== undefined
-          hydrateMessages(sessionID)
+        async sync(sessionID: string, _isRetry = false) {
+          const [session, messages, todo, diff] = await Promise.all([
+            retry(() => sdk.client.session.get({ sessionID })),
+            retry(() => sdk.client.session.messages({ sessionID, limit: 1000 })),
+            retry(() => sdk.client.session.todo({ sessionID })),
+            retry(() => sdk.client.session.diff({ sessionID })),
+          ])

-          const hasMessages = store.message[sessionID] !== undefined
-          if (hasSession && hasMessages) return
+          batch(() => {
+            setStore(
+              "session",
+              produce((draft) => {
+                const match = Binary.search(draft, sessionID, (s) => s.id)
+                if (match.found) {
+                  draft[match.index] = session.data!
+                  return
+                }
+                draft.splice(match.index, 0, session.data!)
+              }),
+            )

-          const pending = inflight.get(sessionID)
-          if (pending) return pending
+            setStore("todo", sessionID, reconcile(todo.data ?? [], { key: "id" }))
+            setStore(
+              "message",
+              sessionID,
+              reconcile(
+                (messages.data ?? [])
+                  .map((x) => x.info)
+                  .filter((m) => !!m?.id)
+                  .slice()
+                  .sort((a, b) => a.id.localeCompare(b.id)),
+                { key: "id" },
+              ),
+            )

-          const limit = meta.limit[sessionID] ?? chunk
+            for (const message of messages.data ?? []) {
+              if (!message?.info?.id) continue
+              setStore(
+                "part",
+                message.info.id,
+                reconcile(
+                  message.parts
+                    .filter((p) => !!p?.id)
+                    .slice()
+                    .sort((a, b) => a.id.localeCompare(b.id)),
+                  { key: "id" },
+                ),
+              )
+            }

-          const sessionReq = hasSession
-            ? Promise.resolve()
-            : retry(() => sdk.client.session.get({ sessionID })).then((session) => {
-                const data = session.data
-                if (!data) return
-                setStore(
-                  "session",
-                  produce((draft) => {
-                    const match = Binary.search(draft, sessionID, (s) => s.id)
-                    if (match.found) {
-                      draft[match.index] = data
-                      return
-                    }
-                    draft.splice(match.index, 0, data)
-                  }),
-                )
-              })
-
-          const messagesReq = hasMessages ? Promise.resolve() : loadMessages(sessionID, limit)
-
-          const promise = Promise.all([sessionReq, messagesReq])
-            .then(() => {})
-            .finally(() => {
-              inflight.delete(sessionID)
-            })
-
-          inflight.set(sessionID, promise)
-          return promise
-        },
-        async diff(sessionID: string) {
-          if (store.session_diff[sessionID] !== undefined) return
-
-          const pending = inflightDiff.get(sessionID)
-          if (pending) return pending
-
-          const promise = retry(() => sdk.client.session.diff({ sessionID }))
-            .then((diff) => {
-              setStore("session_diff", sessionID, reconcile(diff.data ?? [], { key: "file" }))
-            })
-            .finally(() => {
-              inflightDiff.delete(sessionID)
-            })
-
-          inflightDiff.set(sessionID, promise)
-          return promise
-        },
-        async todo(sessionID: string) {
-          if (store.todo[sessionID] !== undefined) return
-
-          const pending = inflightTodo.get(sessionID)
-          if (pending) return pending
-
-          const promise = retry(() => sdk.client.session.todo({ sessionID }))
-            .then((todo) => {
-              setStore("todo", sessionID, reconcile(todo.data ?? [], { key: "id" }))
-            })
-            .finally(() => {
-              inflightTodo.delete(sessionID)
-            })
-
-          inflightTodo.set(sessionID, promise)
-          return promise
-        },
-        history: {
-          more(sessionID: string) {
-            if (store.message[sessionID] === undefined) return false
-            if (meta.limit[sessionID] === undefined) return false
-            if (meta.complete[sessionID]) return false
-            return true
-          },
-          loading(sessionID: string) {
-            return meta.loading[sessionID] ?? false
-          },
-          async loadMore(sessionID: string, count = chunk) {
-            if (meta.loading[sessionID]) return
-            if (meta.complete[sessionID]) return
-
-            const current = meta.limit[sessionID] ?? chunk
-            await loadMessages(sessionID, current + count)
-          },
+            setStore("session_diff", sessionID, reconcile(diff.data ?? [], { key: "file" }))
+          })
        },
        fetch: async (count = 10) => {
          setStore("limit", (x) => x + count)
--- a/packages/app/src/context/terminal.tsx
+++ b/packages/app/src/context/terminal.tsx
@@ -1,6 +1,6 @@
 import { createStore, produce } from "solid-js/store"
 import { createSimpleContext } from "@opencode-ai/ui/context"
-import { batch, createMemo, createRoot, onCleanup } from "solid-js"
+import { batch, createMemo } from "solid-js"
 import { useParams } from "@solidjs/router"
 import { useSDK } from "./sdk"
 import { Persist, persisted } from "@/utils/persist"
@@ -14,175 +14,108 @@ export type LocalPTY = {
  scrollY?: number
 }

-const WORKSPACE_KEY = "__workspace__"
-const MAX_TERMINAL_SESSIONS = 20
-
-type TerminalSession = ReturnType<typeof createTerminalSession>
-
-type TerminalCacheEntry = {
-  value: TerminalSession
-  dispose: VoidFunction
-}
-
-function createTerminalSession(sdk: ReturnType<typeof useSDK>, dir: string, id: string | undefined) {
-  const legacy = `${dir}/terminal${id ? "/" + id : ""}.v1`
-
-  const [store, setStore, _, ready] = persisted(
-    Persist.scoped(dir, id, "terminal", [legacy]),
-    createStore<{
-      active?: string
-      all: LocalPTY[]
-    }>({
-      all: [],
-    }),
-  )
-
-  return {
-    ready,
-    all: createMemo(() => Object.values(store.all)),
-    active: createMemo(() => store.active),
-    new() {
-      sdk.client.pty
-        .create({ title: `Terminal ${store.all.length + 1}` })
-        .then((pty) => {
-          const id = pty.data?.id
-          if (!id) return
-          setStore("all", [
-            ...store.all,
-            {
-              id,
-              title: pty.data?.title ?? "Terminal",
-            },
-          ])
-          setStore("active", id)
-        })
-        .catch((e) => {
-          console.error("Failed to create terminal", e)
-        })
-    },
-    update(pty: Partial<LocalPTY> & { id: string }) {
-      setStore("all", (x) => x.map((x) => (x.id === pty.id ? { ...x, ...pty } : x)))
-      sdk.client.pty
-        .update({
-          ptyID: pty.id,
-          title: pty.title,
-          size: pty.cols && pty.rows ? { rows: pty.rows, cols: pty.cols } : undefined,
-        })
-        .catch((e) => {
-          console.error("Failed to update terminal", e)
-        })
-    },
-    async clone(id: string) {
-      const index = store.all.findIndex((x) => x.id === id)
-      const pty = store.all[index]
-      if (!pty) return
-      const clone = await sdk.client.pty
-        .create({
-          title: pty.title,
-        })
-        .catch((e) => {
-          console.error("Failed to clone terminal", e)
-          return undefined
-        })
-      if (!clone?.data) return
-      setStore("all", index, {
-        ...pty,
-        ...clone.data,
-      })
-      if (store.active === pty.id) {
-        setStore("active", clone.data.id)
-      }
-    },
-    open(id: string) {
-      setStore("active", id)
-    },
-    async close(id: string) {
-      batch(() => {
-        setStore(
-          "all",
-          store.all.filter((x) => x.id !== id),
-        )
-        if (store.active === id) {
-          const index = store.all.findIndex((f) => f.id === id)
-          const previous = store.all[Math.max(0, index - 1)]
-          setStore("active", previous?.id)
-        }
-      })
-      await sdk.client.pty.remove({ ptyID: id }).catch((e) => {
-        console.error("Failed to close terminal", e)
-      })
-    },
-    move(id: string, to: number) {
-      const index = store.all.findIndex((f) => f.id === id)
-      if (index === -1) return
-      setStore(
-        "all",
-        produce((all) => {
-          all.splice(to, 0, all.splice(index, 1)[0])
-        }),
-      )
-    },
-  }
-}
-
 export const { use: useTerminal, provider: TerminalProvider } = createSimpleContext({
  name: "Terminal",
-  gate: false,
  init: () => {
    const sdk = useSDK()
    const params = useParams()
-    const cache = new Map<string, TerminalCacheEntry>()
+    const legacy = createMemo(() => `${params.dir}/terminal${params.id ? "/" + params.id : ""}.v1`)

-    const disposeAll = () => {
-      for (const entry of cache.values()) {
-        entry.dispose()
-      }
-      cache.clear()
-    }
-
-    onCleanup(disposeAll)
-
-    const prune = () => {
-      while (cache.size > MAX_TERMINAL_SESSIONS) {
-        const first = cache.keys().next().value
-        if (!first) return
-        const entry = cache.get(first)
-        entry?.dispose()
-        cache.delete(first)
-      }
-    }
-
-    const load = (dir: string, id: string | undefined) => {
-      const key = `${dir}:${id ?? WORKSPACE_KEY}`
-      const existing = cache.get(key)
-      if (existing) {
-        cache.delete(key)
-        cache.set(key, existing)
-        return existing.value
-      }
-
-      const entry = createRoot((dispose) => ({
-        value: createTerminalSession(sdk, dir, id),
-        dispose,
-      }))
-
-      cache.set(key, entry)
-      prune()
-      return entry.value
-    }
-
-    const session = createMemo(() => load(params.dir!, params.id))
+    const [store, setStore, _, ready] = persisted(
+      Persist.scoped(params.dir!, params.id, "terminal", [legacy()]),
+      createStore<{
+        active?: string
+        all: LocalPTY[]
+      }>({
+        all: [],
+      }),
+    )

    return {
-      ready: () => session().ready(),
-      all: () => session().all(),
-      active: () => session().active(),
-      new: () => session().new(),
-      update: (pty: Partial<LocalPTY> & { id: string }) => session().update(pty),
-      clone: (id: string) => session().clone(id),
-      open: (id: string) => session().open(id),
-      close: (id: string) => session().close(id),
-      move: (id: string, to: number) => session().move(id, to),
+      ready,
+      all: createMemo(() => Object.values(store.all)),
+      active: createMemo(() => store.active),
+      new() {
+        sdk.client.pty
+          .create({ title: `Terminal ${store.all.length + 1}` })
+          .then((pty) => {
+            const id = pty.data?.id
+            if (!id) return
+            setStore("all", [
+              ...store.all,
+              {
+                id,
+                title: pty.data?.title ?? "Terminal",
+              },
+            ])
+            setStore("active", id)
+          })
+          .catch((e) => {
+            console.error("Failed to create terminal", e)
+          })
+      },
+      update(pty: Partial<LocalPTY> & { id: string }) {
+        setStore("all", (x) => x.map((x) => (x.id === pty.id ? { ...x, ...pty } : x)))
+        sdk.client.pty
+          .update({
+            ptyID: pty.id,
+            title: pty.title,
+            size: pty.cols && pty.rows ? { rows: pty.rows, cols: pty.cols } : undefined,
+          })
+          .catch((e) => {
+            console.error("Failed to update terminal", e)
+          })
+      },
+      async clone(id: string) {
+        const index = store.all.findIndex((x) => x.id === id)
+        const pty = store.all[index]
+        if (!pty) return
+        const clone = await sdk.client.pty
+          .create({
+            title: pty.title,
+          })
+          .catch((e) => {
+            console.error("Failed to clone terminal", e)
+            return undefined
+          })
+        if (!clone?.data) return
+        setStore("all", index, {
+          ...pty,
+          ...clone.data,
+        })
+        if (store.active === pty.id) {
+          setStore("active", clone.data.id)
+        }
+      },
+      open(id: string) {
+        setStore("active", id)
+      },
+      async close(id: string) {
+        batch(() => {
+          setStore(
+            "all",
+            store.all.filter((x) => x.id !== id),
+          )
+          if (store.active === id) {
+            const index = store.all.findIndex((f) => f.id === id)
+            const previous = store.all[Math.max(0, index - 1)]
+            setStore("active", previous?.id)
+          }
+        })
+        await sdk.client.pty.remove({ ptyID: id }).catch((e) => {
+          console.error("Failed to close terminal", e)
+        })
+      },
+      move(id: string, to: number) {
+        const index = store.all.findIndex((f) => f.id === id)
+        if (index === -1) return
+        setStore(
+          "all",
+          produce((all) => {
+            all.splice(to, 0, all.splice(index, 1)[0])
+          }),
+        )
+      },
    }
  },
 })
--- a/packages/app/src/entry.tsx
+++ b/packages/app/src/entry.tsx
@@ -1,6 +1,6 @@
 // @refresh reload
 import { render } from "solid-js/web"
-import { AppBaseProviders, AppInterface } from "@/app"
+import { App } from "@/app"
 import { Platform, PlatformProvider } from "@/context/platform"
 import pkg from "../package.json"

@@ -55,9 +55,7 @@ const platform: Platform = {
 render(
  () => (
    <PlatformProvider value={platform}>
-      <AppBaseProviders>
-        <AppInterface />
-      </AppBaseProviders>
+      <App />
    </PlatformProvider>
  ),
  root!,
--- a/packages/app/src/index.ts
+++ b/packages/app/src/index.ts
@@ -1,2 +1,2 @@
 export { PlatformProvider, type Platform } from "./context/platform"
-export { AppBaseProviders, AppInterface } from "./app"
+export { App } from "./app"
--- a/packages/app/src/pages/layout.tsx
+++ b/packages/app/src/pages/layout.tsx
@@ -1,5 +1,4 @@
 import {
-  batch,
  createEffect,
  createMemo,
  createSignal,
@@ -32,7 +31,7 @@ import { getFilename } from "@opencode-ai/util/path"
 import { DropdownMenu } from "@opencode-ai/ui/dropdown-menu"
 import { Session } from "@opencode-ai/sdk/v2/client"
 import { usePlatform } from "@/context/platform"
-import { createStore, produce, reconcile } from "solid-js/store"
+import { createStore, produce } from "solid-js/store"
 import {
  DragDropProvider,
  DragDropSensors,
@@ -48,7 +47,6 @@ import { useGlobalSDK } from "@/context/global-sdk"
 import { useNotification } from "@/context/notification"
 import { usePermission } from "@/context/permission"
 import { Binary } from "@opencode-ai/util/binary"
-import { retry } from "@opencode-ai/util/retry"

 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { useTheme, type ColorScheme } from "@opencode-ai/ui/theme"
@@ -57,7 +55,6 @@ import { DialogEditProject } from "@/components/dialog-edit-project"
 import { DialogSelectServer } from "@/components/dialog-select-server"
 import { useCommand, type CommandOption } from "@/context/command"
 import { ConstrainDragXAxis } from "@/utils/solid-dnd"
-import { navStart } from "@/utils/perf"
 import { DialogSelectDirectory } from "@/components/dialog-select-directory"
 import { useServer } from "@/context/server"

@@ -287,146 +284,6 @@ export default function Layout(props: ParentProps) {

  const currentSessions = createMemo(() => projectSessions(currentProject()))

-  type PrefetchQueue = {
-    inflight: Set<string>
-    pending: string[]
-    pendingSet: Set<string>
-    running: number
-  }
-
-  const prefetchChunk = 200
-  const prefetchConcurrency = 1
-  const prefetchPendingLimit = 6
-  const prefetchToken = { value: 0 }
-  const prefetchQueues = new Map<string, PrefetchQueue>()
-
-  createEffect(() => {
-    params.dir
-    globalSDK.url
-
-    prefetchToken.value += 1
-    for (const q of prefetchQueues.values()) {
-      q.pending.length = 0
-      q.pendingSet.clear()
-    }
-  })
-
-  const queueFor = (directory: string) => {
-    const existing = prefetchQueues.get(directory)
-    if (existing) return existing
-
-    const created: PrefetchQueue = {
-      inflight: new Set(),
-      pending: [],
-      pendingSet: new Set(),
-      running: 0,
-    }
-    prefetchQueues.set(directory, created)
-    return created
-  }
-
-  const prefetchMessages = (directory: string, sessionID: string, token: number) => {
-    const [, setStore] = globalSync.child(directory)
-
-    return retry(() => globalSDK.client.session.messages({ directory, sessionID, limit: prefetchChunk }))
-      .then((messages) => {
-        if (prefetchToken.value !== token) return
-
-        const items = (messages.data ?? []).filter((x) => !!x?.info?.id)
-        const next = items
-          .map((x) => x.info)
-          .filter((m) => !!m?.id)
-          .slice()
-          .sort((a, b) => a.id.localeCompare(b.id))
-
-        batch(() => {
-          setStore("message", sessionID, reconcile(next, { key: "id" }))
-
-          for (const message of items) {
-            setStore(
-              "part",
-              message.info.id,
-              reconcile(
-                message.parts
-                  .filter((p) => !!p?.id)
-                  .slice()
-                  .sort((a, b) => a.id.localeCompare(b.id)),
-                { key: "id" },
-              ),
-            )
-          }
-        })
-      })
-      .catch(() => undefined)
-  }
-
-  const pumpPrefetch = (directory: string) => {
-    const q = queueFor(directory)
-    if (q.running >= prefetchConcurrency) return
-
-    const sessionID = q.pending.shift()
-    if (!sessionID) return
-
-    q.pendingSet.delete(sessionID)
-    q.inflight.add(sessionID)
-    q.running += 1
-
-    const token = prefetchToken.value
-
-    void prefetchMessages(directory, sessionID, token).finally(() => {
-      q.running -= 1
-      q.inflight.delete(sessionID)
-      pumpPrefetch(directory)
-    })
-  }
-
-  const prefetchSession = (session: Session, priority: "high" | "low" = "low") => {
-    const directory = session.directory
-    if (!directory) return
-
-    const [store] = globalSync.child(directory)
-    if (store.message[session.id] !== undefined) return
-
-    const q = queueFor(directory)
-    if (q.inflight.has(session.id)) return
-    if (q.pendingSet.has(session.id)) return
-
-    if (priority === "high") q.pending.unshift(session.id)
-    if (priority !== "high") q.pending.push(session.id)
-    q.pendingSet.add(session.id)
-
-    while (q.pending.length > prefetchPendingLimit) {
-      const dropped = q.pending.pop()
-      if (!dropped) continue
-      q.pendingSet.delete(dropped)
-    }
-
-    pumpPrefetch(directory)
-  }
-
-  createEffect(() => {
-    const sessions = currentSessions()
-    const id = params.id
-
-    if (!id) {
-      const first = sessions[0]
-      if (first) prefetchSession(first)
-
-      const second = sessions[1]
-      if (second) prefetchSession(second)
-      return
-    }
-
-    const index = sessions.findIndex((s) => s.id === id)
-    if (index === -1) return
-
-    const next = sessions[index + 1]
-    if (next) prefetchSession(next)
-
-    const prev = sessions[index - 1]
-    if (prev) prefetchSession(prev)
-  })
-
  function navigateSessionByOffset(offset: number) {
    const projects = layout.projects.list()
    if (projects.length === 0) return
@@ -452,27 +309,6 @@ export default function Layout(props: ParentProps) {

    if (targetIndex >= 0 && targetIndex < sessions.length) {
      const session = sessions[targetIndex]
-      const next = sessions[targetIndex + 1]
-      const prev = sessions[targetIndex - 1]
-
-      if (offset > 0) {
-        if (next) prefetchSession(next, "high")
-        if (prev) prefetchSession(prev)
-      }
-
-      if (offset < 0) {
-        if (prev) prefetchSession(prev, "high")
-        if (next) prefetchSession(next)
-      }
-
-      if (import.meta.env.DEV) {
-        navStart({
-          dir: base64Encode(session.directory),
-          from: params.id,
-          to: session.id,
-          trigger: offset > 0 ? "alt+arrowdown" : "alt+arrowup",
-        })
-      }
      navigateToSession(session)
      queueMicrotask(() => scrollToSession(session.id))
      return
@@ -488,27 +324,7 @@ export default function Layout(props: ParentProps) {
      return
    }

-    const index = offset > 0 ? 0 : nextProjectSessions.length - 1
-    const targetSession = nextProjectSessions[index]
-    const nextSession = nextProjectSessions[index + 1]
-    const prevSession = nextProjectSessions[index - 1]
-
-    if (offset > 0) {
-      if (nextSession) prefetchSession(nextSession, "high")
-    }
-
-    if (offset < 0) {
-      if (prevSession) prefetchSession(prevSession, "high")
-    }
-
-    if (import.meta.env.DEV) {
-      navStart({
-        dir: base64Encode(targetSession.directory),
-        from: params.id,
-        to: targetSession.id,
-        trigger: offset > 0 ? "alt+arrowdown" : "alt+arrowup",
-      })
-    }
+    const targetSession = offset > 0 ? nextProjectSessions[0] : nextProjectSessions[nextProjectSessions.length - 1]
    navigateToSession(targetSession)
    queueMicrotask(() => scrollToSession(targetSession.id))
  }
@@ -863,8 +679,6 @@ export default function Layout(props: ParentProps) {
            <A
              href={`${props.slug}/session/${props.session.id}`}
              class="flex flex-col min-w-0 text-left w-full focus:outline-none pl-4 pr-2 py-1"
-              onMouseEnter={() => prefetchSession(props.session, "high")}
-              onFocus={() => prefetchSession(props.session, "high")}
            >
              <div class="flex items-center self-stretch gap-6 justify-between transition-[padding] group-hover/session:pr-7 group-focus-within/session:pr-7 group-active/session:pr-7">
                <span
@@ -1061,7 +875,7 @@ export default function Layout(props: ParentProps) {
            </Collapsible>
          </Match>
          <Match when={true}>
-            <Tooltip placement="right" value={getFilename(props.project.worktree)}>
+            <Tooltip placement="right" value={props.project.worktree}>
              <ProjectVisual project={props.project} />
            </Tooltip>
          </Match>
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -1,4 +1,4 @@
-import { For, onCleanup, onMount, Show, Match, Switch, createMemo, createEffect, on } from "solid-js"
+import { For, onCleanup, Show, Match, Switch, createMemo, createEffect, on } from "solid-js"
 import { createMediaQuery } from "@solid-primitives/media"
 import { createResizeObserver } from "@solid-primitives/resize-observer"
 import { Dynamic } from "solid-js/web"
@@ -8,7 +8,6 @@ import { createStore } from "solid-js/store"
 import { PromptInput } from "@/components/prompt-input"
 import { SessionContextUsage } from "@/components/session-context-usage"
 import { IconButton } from "@opencode-ai/ui/icon-button"
-import { Button } from "@opencode-ai/ui/button"
 import { Icon } from "@opencode-ai/ui/icon"
 import { Tooltip, TooltipKeybind } from "@opencode-ai/ui/tooltip"
 import { DiffChanges } from "@opencode-ai/ui/diff-changes"
@@ -50,17 +49,10 @@ import {
  NewSessionView,
 } from "@/components/session"
 import { usePlatform } from "@/context/platform"
-import { navMark, navParams } from "@/utils/perf"
 import { same } from "@/utils/same"

 type DiffStyle = "unified" | "split"

-const handoff = {
-  prompt: "",
-  terminals: [] as string[],
-  files: {} as Record<string, SelectedLineRange | null>,
-}
-
 interface SessionReviewTabProps {
  diffs: () => FileDiff[]
  view: () => ReturnType<ReturnType<typeof useLayout>["view"]>
@@ -170,46 +162,6 @@ export default function Page() {
  const tabs = createMemo(() => layout.tabs(sessionKey()))
  const view = createMemo(() => layout.view(sessionKey()))

-  if (import.meta.env.DEV) {
-    createEffect(
-      on(
-        () => [params.dir, params.id] as const,
-        ([dir, id], prev) => {
-          if (!id) return
-          navParams({ dir, from: prev?.[1], to: id })
-        },
-      ),
-    )
-
-    createEffect(() => {
-      const id = params.id
-      if (!id) return
-      if (!prompt.ready()) return
-      navMark({ dir: params.dir, to: id, name: "storage:prompt-ready" })
-    })
-
-    createEffect(() => {
-      const id = params.id
-      if (!id) return
-      if (!terminal.ready()) return
-      navMark({ dir: params.dir, to: id, name: "storage:terminal-ready" })
-    })
-
-    createEffect(() => {
-      const id = params.id
-      if (!id) return
-      if (!file.ready()) return
-      navMark({ dir: params.dir, to: id, name: "storage:file-view-ready" })
-    })
-
-    createEffect(() => {
-      const id = params.id
-      if (!id) return
-      if (sync.data.message[id] === undefined) return
-      navMark({ dir: params.dir, to: id, name: "session:data-ready" })
-    })
-  }
-
  const isDesktop = createMediaQuery("(min-width: 768px)")

  function normalizeTab(tab: string) {
@@ -264,8 +216,6 @@ export default function Page() {
  })

  const info = createMemo(() => (params.id ? sync.session.get(params.id) : undefined))
-  const reviewCount = createMemo(() => info()?.summary?.files ?? 0)
-  const hasReview = createMemo(() => reviewCount() > 0)
  const revertMessageID = createMemo(() => info()?.revert?.messageID)
  const messages = createMemo(() => (params.id ? (sync.data.message[params.id] ?? []) : []))
  const messagesReady = createMemo(() => {
@@ -273,16 +223,6 @@ export default function Page() {
    if (!id) return true
    return sync.data.message[id] !== undefined
  })
-  const historyMore = createMemo(() => {
-    const id = params.id
-    if (!id) return false
-    return sync.session.history.more(id)
-  })
-  const historyLoading = createMemo(() => {
-    const id = params.id
-    if (!id) return false
-    return sync.session.history.loading(id)
-  })
  const emptyUserMessages: UserMessage[] = []
  const userMessages = createMemo(() => messages().filter((m) => m.role === "user") as UserMessage[], emptyUserMessages)
  const visibleUserMessages = createMemo(() => {
@@ -309,20 +249,11 @@ export default function Page() {
    activeTerminalDraggable: undefined as string | undefined,
    expanded: {} as Record<string, boolean>,
    messageId: undefined as string | undefined,
-    turnStart: 0,
    mobileTab: "session" as "session" | "review",
    newSessionWorktree: "main",
    promptHeight: 0,
  })

-  const renderedUserMessages = createMemo(() => {
-    const msgs = visibleUserMessages()
-    const start = store.turnStart
-    if (start <= 0) return msgs
-    if (start >= msgs.length) return emptyUserMessages
-    return msgs.slice(start)
-  }, emptyUserMessages)
-
  const newSessionWorktree = createMemo(() => {
    if (store.newSessionWorktree === "create") return "create"
    const project = sync.project
@@ -359,12 +290,6 @@ export default function Page() {
  }

  const diffs = createMemo(() => (params.id ? (sync.data.session_diff[params.id] ?? []) : []))
-  const diffsReady = createMemo(() => {
-    const id = params.id
-    if (!id) return true
-    if (!hasReview()) return true
-    return sync.data.session_diff[id] !== undefined
-  })

  const idle = { type: "idle" as const }
  let inputRef!: HTMLDivElement
@@ -377,10 +302,11 @@ export default function Page() {
  })

  createEffect(() => {
-    if (!view().terminal.opened()) return
-    if (!terminal.ready()) return
-    if (terminal.all().length !== 0) return
-    terminal.new()
+    if (layout.terminal.opened()) {
+      if (terminal.all().length === 0) {
+        terminal.new()
+      }
+    }
  })

  createEffect(
@@ -440,7 +366,7 @@ export default function Page() {
      category: "View",
      keybind: "ctrl+`",
      slash: "terminal",
-      onSelect: () => view().terminal.toggle(),
+      onSelect: () => layout.terminal.toggle(),
    },
    {
      id: "review.toggle",
@@ -448,7 +374,7 @@ export default function Page() {
      description: "Show or hide the review panel",
      category: "View",
      keybind: "mod+shift+r",
-      onSelect: () => view().reviewPanel.toggle(),
+      onSelect: () => layout.review.toggle(),
    },
    {
      id: "terminal.new",
@@ -717,11 +643,11 @@ export default function Page() {
      .filter((tab) => tab !== "context"),
  )

-  const reviewTab = createMemo(() => hasReview() || tabs().active() === "review")
-  const mobileReview = createMemo(() => !isDesktop() && hasReview() && store.mobileTab === "review")
+  const reviewTab = createMemo(() => diffs().length > 0 || tabs().active() === "review")
+  const mobileReview = createMemo(() => !isDesktop() && diffs().length > 0 && store.mobileTab === "review")

  const showTabs = createMemo(
-    () => view().reviewPanel.opened() && (hasReview() || tabs().all().length > 0 || contextOpen()),
+    () => layout.review.opened() && (diffs().length > 0 || tabs().all().length > 0 || contextOpen()),
  )

  const activeTab = createMemo(() => {
@@ -738,22 +664,10 @@ export default function Page() {
  createEffect(() => {
    if (!layout.ready()) return
    if (tabs().active()) return
-    if (!hasReview() && openedTabs().length === 0 && !contextOpen()) return
+    if (diffs().length === 0 && openedTabs().length === 0 && !contextOpen()) return
    tabs().setActive(activeTab())
  })

-  createEffect(() => {
-    const id = params.id
-    if (!id) return
-    if (!hasReview()) return
-
-    const wants = isDesktop() ? view().reviewPanel.opened() && activeTab() === "review" : store.mobileTab === "review"
-    if (!wants) return
-    if (diffsReady()) return
-
-    sync.session.diff(id)
-  })
-
  const isWorking = createMemo(() => status().type !== "idle")
  const autoScroll = createAutoScroll({
    working: isWorking,
@@ -769,88 +683,6 @@ export default function Page() {
    autoScroll.scrollRef(el)
  }

-  const turnInit = 20
-  const turnBatch = 20
-  let turnHandle: number | undefined
-  let turnIdle = false
-
-  function cancelTurnBackfill() {
-    const handle = turnHandle
-    if (handle === undefined) return
-    turnHandle = undefined
-
-    if (turnIdle && window.cancelIdleCallback) {
-      window.cancelIdleCallback(handle)
-      return
-    }
-
-    clearTimeout(handle)
-  }
-
-  function scheduleTurnBackfill() {
-    if (turnHandle !== undefined) return
-    if (store.turnStart <= 0) return
-
-    if (window.requestIdleCallback) {
-      turnIdle = true
-      turnHandle = window.requestIdleCallback(() => {
-        turnHandle = undefined
-        backfillTurns()
-      })
-      return
-    }
-
-    turnIdle = false
-    turnHandle = window.setTimeout(() => {
-      turnHandle = undefined
-      backfillTurns()
-    }, 0)
-  }
-
-  function backfillTurns() {
-    const start = store.turnStart
-    if (start <= 0) return
-
-    const next = start - turnBatch
-    const nextStart = next > 0 ? next : 0
-
-    const el = scroller
-    if (!el) {
-      setStore("turnStart", nextStart)
-      scheduleTurnBackfill()
-      return
-    }
-
-    const beforeTop = el.scrollTop
-    const beforeHeight = el.scrollHeight
-
-    setStore("turnStart", nextStart)
-
-    requestAnimationFrame(() => {
-      const delta = el.scrollHeight - beforeHeight
-      if (delta) el.scrollTop = beforeTop + delta
-    })
-
-    scheduleTurnBackfill()
-  }
-
-  createEffect(
-    on(
-      () => [params.id, messagesReady()] as const,
-      ([id, ready]) => {
-        cancelTurnBackfill()
-        setStore("turnStart", 0)
-        if (!id || !ready) return
-
-        const len = visibleUserMessages().length
-        const start = len > turnInit ? len - turnInit : 0
-        setStore("turnStart", start)
-        scheduleTurnBackfill()
-      },
-      { defer: true },
-    ),
-  )
-
  createResizeObserver(
    () => promptDock,
    ({ height }) => {
@@ -878,21 +710,6 @@ export default function Page() {
  const scrollToMessage = (message: UserMessage, behavior: ScrollBehavior = "smooth") => {
    setActiveMessage(message)

-    const msgs = visibleUserMessages()
-    const index = msgs.findIndex((m) => m.id === message.id)
-    if (index !== -1 && index < store.turnStart) {
-      setStore("turnStart", index)
-      scheduleTurnBackfill()
-
-      requestAnimationFrame(() => {
-        const el = document.getElementById(anchor(message.id))
-        if (el) el.scrollIntoView({ behavior, block: "start" })
-      })
-
-      updateHash(message.id)
-      return
-    }
-
    const el = document.getElementById(anchor(message.id))
    if (el) el.scrollIntoView({ behavior, block: "start" })
    updateHash(message.id)
@@ -938,27 +755,12 @@ export default function Page() {
    if (!sessionID || !ready) return

    requestAnimationFrame(() => {
-      const hash = window.location.hash.slice(1)
-      if (!hash) {
-        autoScroll.forceScrollToBottom()
-        return
-      }
-
-      const hashTarget = document.getElementById(hash)
+      const id = window.location.hash.slice(1)
+      const hashTarget = id ? document.getElementById(id) : undefined
      if (hashTarget) {
        hashTarget.scrollIntoView({ behavior: "auto", block: "start" })
        return
      }
-
-      const match = hash.match(/^message-(.+)$/)
-      if (match) {
-        const msg = visibleUserMessages().find((m) => m.id === match[1])
-        if (msg) {
-          scrollToMessage(msg, "auto")
-          return
-        }
-      }
-
      autoScroll.forceScrollToBottom()
    })
  })
@@ -967,43 +769,7 @@ export default function Page() {
    document.addEventListener("keydown", handleKeyDown)
  })

-  const previewPrompt = () =>
-    prompt
-      .current()
-      .map((part) => {
-        if (part.type === "file") return `[file:${part.path}]`
-        if (part.type === "agent") return `@${part.name}`
-        if (part.type === "image") return `[image:${part.filename}]`
-        return part.content
-      })
-      .join("")
-      .trim()
-
-  createEffect(() => {
-    if (!prompt.ready()) return
-    handoff.prompt = previewPrompt()
-  })
-
-  createEffect(() => {
-    if (!terminal.ready()) return
-    handoff.terminals = terminal.all().map((t) => t.title)
-  })
-
-  createEffect(() => {
-    if (!file.ready()) return
-    handoff.files = Object.fromEntries(
-      tabs()
-        .all()
-        .flatMap((tab) => {
-          const path = file.pathFromTab(tab)
-          if (!path) return []
-          return [[path, file.selectedLines(path) ?? null] as const]
-        }),
-    )
-  })
-
  onCleanup(() => {
-    cancelTurnBackfill()
    document.removeEventListener("keydown", handleKeyDown)
    if (scrollSpyFrame !== undefined) cancelAnimationFrame(scrollSpyFrame)
  })
@@ -1013,7 +779,7 @@ export default function Page() {
      <SessionHeader />
      <div class="flex-1 min-h-0 flex flex-col md:flex-row">
        {/* Mobile tab bar - only shown on mobile when there are diffs */}
-        <Show when={!isDesktop() && hasReview()}>
+        <Show when={!isDesktop() && diffs().length > 0}>
          <Tabs class="h-auto">
            <Tabs.List>
              <Tabs.Trigger
@@ -1030,7 +796,7 @@ export default function Page() {
                classes={{ button: "w-full" }}
                onClick={() => setStore("mobileTab", "review")}
              >
-                {reviewCount()} Files Changed
+                {diffs().length} Files Changed
              </Tabs.Trigger>
            </Tabs.List>
          </Tabs>
@@ -1055,26 +821,21 @@ export default function Page() {
                    when={!mobileReview()}
                    fallback={
                      <div class="relative h-full overflow-hidden">
-                        <Show
-                          when={diffsReady()}
-                          fallback={<div class="px-4 py-4 text-text-weak">Loading changes...</div>}
-                        >
-                          <SessionReviewTab
-                            diffs={diffs}
-                            view={view}
-                            diffStyle="unified"
-                            onViewFile={(path) => {
-                              const value = file.tab(path)
-                              tabs().open(value)
-                              file.load(path)
-                            }}
-                            classes={{
-                              root: "pb-[calc(var(--prompt-height,8rem)+32px)]",
-                              header: "px-4",
-                              container: "px-4",
-                            }}
-                          />
-                        </Show>
+                        <SessionReviewTab
+                          diffs={diffs}
+                          view={view}
+                          diffStyle="unified"
+                          onViewFile={(path) => {
+                            const value = file.tab(path)
+                            tabs().open(value)
+                            file.load(path)
+                          }}
+                          classes={{
+                            root: "pb-[calc(var(--prompt-height,8rem)+32px)]",
+                            header: "px-4",
+                            container: "px-4",
+                          }}
+                        />
                      </div>
                    }
                  >
@@ -1107,82 +868,42 @@ export default function Page() {
                            "mt-0": showTabs(),
                          }}
                        >
-                          <Show when={store.turnStart > 0}>
-                            <div class="w-full flex justify-center">
-                              <Button
-                                variant="ghost"
-                                size="large"
-                                class="text-12-medium opacity-50"
-                                onClick={() => setStore("turnStart", 0)}
-                              >
-                                Render earlier messages
-                              </Button>
-                            </div>
-                          </Show>
-                          <Show when={historyMore()}>
-                            <div class="w-full flex justify-center">
-                              <Button
-                                variant="ghost"
-                                size="large"
-                                class="text-12-medium opacity-50"
-                                disabled={historyLoading()}
-                                onClick={() => {
-                                  const id = params.id
-                                  if (!id) return
-                                  setStore("turnStart", 0)
-                                  sync.session.history.loadMore(id)
+                          <For each={visibleUserMessages()}>
+                            {(message) => (
+                              <div
+                                id={anchor(message.id)}
+                                data-message-id={message.id}
+                                classList={{
+                                  "min-w-0 w-full max-w-full": true,
+                                  "last:min-h-[calc(100vh-5.5rem-var(--prompt-height,8rem)-64px)] md:last:min-h-[calc(100vh-4.5rem-var(--prompt-height,10rem)-64px)]":
+                                    platform.platform !== "desktop",
+                                  "last:min-h-[calc(100vh-7rem-var(--prompt-height,8rem)-64px)] md:last:min-h-[calc(100vh-6rem-var(--prompt-height,10rem)-64px)]":
+                                    platform.platform === "desktop",
                                }}
                              >
-                                {historyLoading() ? "Loading earlier messages..." : "Load earlier messages"}
-                              </Button>
-                            </div>
-                          </Show>
-                          <For each={renderedUserMessages()}>
-                            {(message) => {
-                              if (import.meta.env.DEV) {
-                                onMount(() => {
-                                  const id = params.id
-                                  if (!id) return
-                                  navMark({ dir: params.dir, to: id, name: "session:first-turn-mounted" })
-                                })
-                              }
-
-                              return (
-                                <div
-                                  id={anchor(message.id)}
-                                  data-message-id={message.id}
-                                  classList={{
-                                    "min-w-0 w-full max-w-full": true,
-                                    "last:min-h-[calc(100vh-5.5rem-var(--prompt-height,8rem)-64px)] md:last:min-h-[calc(100vh-4.5rem-var(--prompt-height,10rem)-64px)]":
-                                      platform.platform !== "desktop",
-                                    "last:min-h-[calc(100vh-7rem-var(--prompt-height,8rem)-64px)] md:last:min-h-[calc(100vh-6rem-var(--prompt-height,10rem)-64px)]":
-                                      platform.platform === "desktop",
+                                <SessionTurn
+                                  sessionID={params.id!}
+                                  messageID={message.id}
+                                  lastUserMessageID={lastUserMessage()?.id}
+                                  stepsExpanded={store.expanded[message.id] ?? false}
+                                  onStepsExpandedToggle={() =>
+                                    setStore("expanded", message.id, (open: boolean | undefined) => !open)
+                                  }
+                                  classes={{
+                                    root: "min-w-0 w-full relative",
+                                    content:
+                                      "flex flex-col justify-between !overflow-visible [&_[data-slot=session-turn-message-header]]:top-[-32px]",
+                                    container:
+                                      "px-4 md:px-6 " +
+                                      (!showTabs()
+                                        ? "md:max-w-200 md:mx-auto"
+                                        : visibleUserMessages().length > 1
+                                          ? "md:pr-6 md:pl-18"
+                                          : ""),
                                  }}
-                                >
-                                  <SessionTurn
-                                    sessionID={params.id!}
-                                    messageID={message.id}
-                                    lastUserMessageID={lastUserMessage()?.id}
-                                    stepsExpanded={store.expanded[message.id] ?? false}
-                                    onStepsExpandedToggle={() =>
-                                      setStore("expanded", message.id, (open: boolean | undefined) => !open)
-                                    }
-                                    classes={{
-                                      root: "min-w-0 w-full relative",
-                                      content:
-                                        "flex flex-col justify-between !overflow-visible [&_[data-slot=session-turn-message-header]]:top-[-32px]",
-                                      container:
-                                        "px-4 md:px-6 " +
-                                        (!showTabs()
-                                          ? "md:max-w-200 md:mx-auto"
-                                          : visibleUserMessages().length > 1
-                                            ? "md:pr-6 md:pl-18"
-                                            : ""),
-                                    }}
-                                  />
-                                </div>
-                              )
-                            }}
+                                />
+                              </div>
+                            )}
                          </For>
                        </div>
                      </div>
@@ -1223,22 +944,13 @@ export default function Page() {
                "md:max-w-200": !showTabs(),
              }}
            >
-              <Show
-                when={prompt.ready()}
-                fallback={
-                  <div class="w-full min-h-32 md:min-h-40 rounded-md border border-border-weak-base bg-background-base/50 px-4 py-3 text-text-weak whitespace-pre-wrap pointer-events-none">
-                    {handoff.prompt || "Loading prompt..."}
-                  </div>
-                }
-              >
-                <PromptInput
-                  ref={(el) => {
-                    inputRef = el
-                  }}
-                  newSessionWorktree={newSessionWorktree()}
-                  onNewSessionWorktreeReset={() => setStore("newSessionWorktree", "main")}
-                />
-              </Show>
+              <PromptInput
+                ref={(el) => {
+                  inputRef = el
+                }}
+                newSessionWorktree={newSessionWorktree()}
+                onNewSessionWorktreeReset={() => setStore("newSessionWorktree", "main")}
+              />
            </div>
          </div>

@@ -1322,40 +1034,31 @@ export default function Page() {
                </div>
                <Show when={reviewTab()}>
                  <Tabs.Content value="review" class="flex flex-col h-full overflow-hidden contain-strict">
-                    <Show when={activeTab() === "review"}>
-                      <div class="relative pt-2 flex-1 min-h-0 overflow-hidden">
-                        <Show
-                          when={diffsReady()}
-                          fallback={<div class="px-6 py-4 text-text-weak">Loading changes...</div>}
-                        >
-                          <SessionReviewTab
-                            diffs={diffs}
-                            view={view}
-                            diffStyle={layout.review.diffStyle()}
-                            onDiffStyleChange={layout.review.setDiffStyle}
-                            onViewFile={(path) => {
-                              const value = file.tab(path)
-                              tabs().open(value)
-                              file.load(path)
-                            }}
-                          />
-                        </Show>
-                      </div>
-                    </Show>
+                    <div class="relative pt-2 flex-1 min-h-0 overflow-hidden">
+                      <SessionReviewTab
+                        diffs={diffs}
+                        view={view}
+                        diffStyle={layout.review.diffStyle()}
+                        onDiffStyleChange={layout.review.setDiffStyle}
+                        onViewFile={(path) => {
+                          const value = file.tab(path)
+                          tabs().open(value)
+                          file.load(path)
+                        }}
+                      />
+                    </div>
                  </Tabs.Content>
                </Show>
                <Show when={contextOpen()}>
                  <Tabs.Content value="context" class="flex flex-col h-full overflow-hidden contain-strict">
-                    <Show when={activeTab() === "context"}>
-                      <div class="relative pt-2 flex-1 min-h-0 overflow-hidden">
-                        <SessionContextTab
-                          messages={messages}
-                          visibleUserMessages={visibleUserMessages}
-                          view={view}
-                          info={info}
-                        />
-                      </div>
-                    </Show>
+                    <div class="relative pt-2 flex-1 min-h-0 overflow-hidden">
+                      <SessionContextTab
+                        messages={messages}
+                        visibleUserMessages={visibleUserMessages}
+                        view={view}
+                        info={info}
+                      />
+                    </div>
                  </Tabs.Content>
                </Show>
                <For each={openedTabs()}>
@@ -1404,8 +1107,7 @@ export default function Page() {
                    const selectedLines = createMemo(() => {
                      const p = path()
                      if (!p) return null
-                      if (file.ready()) return file.selectedLines(p) ?? null
-                      return handoff.files[p] ?? null
+                      return file.selectedLines(p) ?? null
                    })
                    const selection = createMemo(() => {
                      const range = selectedLines()
@@ -1502,63 +1204,37 @@ export default function Page() {
                        }}
                        onScroll={handleScroll}
                      >
-                        <Show when={activeTab() === tab}>
-                          <Show when={selection()}>
-                            {(sel) => (
-                              <div class="hidden sticky top-0 z-10 px-6 py-2 _flex justify-end bg-background-base border-b border-border-weak-base">
-                                <button
-                                  type="button"
-                                  class="flex items-center gap-2 px-2 py-1 rounded-md bg-surface-base border border-border-base text-12-regular text-text-strong hover:bg-surface-raised-base-hover"
-                                  onClick={() => {
-                                    const p = path()
-                                    if (!p) return
-                                    prompt.context.add({ type: "file", path: p, selection: sel() })
-                                  }}
-                                >
-                                  <Icon name="plus-small" size="small" />
-                                  <span>Add {selectionLabel()} to context</span>
-                                </button>
-                              </div>
-                            )}
-                          </Show>
-                          <Switch>
-                            <Match when={state()?.loaded && isImage()}>
-                              <div class="px-6 py-4 pb-40">
-                                <img src={imageDataUrl()} alt={path()} class="max-w-full" />
-                              </div>
-                            </Match>
-                            <Match when={state()?.loaded && isSvg()}>
-                              <div class="flex flex-col gap-4 px-6 py-4">
-                                <Dynamic
-                                  component={codeComponent}
-                                  file={{
-                                    name: path() ?? "",
-                                    contents: svgContent() ?? "",
-                                    cacheKey: cacheKey(),
-                                  }}
-                                  enableLineSelection
-                                  selectedLines={selectedLines()}
-                                  onLineSelected={(range: SelectedLineRange | null) => {
-                                    const p = path()
-                                    if (!p) return
-                                    file.setSelectedLines(p, range)
-                                  }}
-                                  overflow="scroll"
-                                  class="select-text"
-                                />
-                                <Show when={svgPreviewUrl()}>
-                                  <div class="flex justify-center pb-40">
-                                    <img src={svgPreviewUrl()} alt={path()} class="max-w-full max-h-96" />
-                                  </div>
-                                </Show>
-                              </div>
-                            </Match>
-                            <Match when={state()?.loaded}>
+                        <Show when={selection()}>
+                          {(sel) => (
+                            <div class="hidden sticky top-0 z-10 px-6 py-2 _flex justify-end bg-background-base border-b border-border-weak-base">
+                              <button
+                                type="button"
+                                class="flex items-center gap-2 px-2 py-1 rounded-md bg-surface-base border border-border-base text-12-regular text-text-strong hover:bg-surface-raised-base-hover"
+                                onClick={() => {
+                                  const p = path()
+                                  if (!p) return
+                                  prompt.context.add({ type: "file", path: p, selection: sel() })
+                                }}
+                              >
+                                <Icon name="plus-small" size="small" />
+                                <span>Add {selectionLabel()} to context</span>
+                              </button>
+                            </div>
+                          )}
+                        </Show>
+                        <Switch>
+                          <Match when={state()?.loaded && isImage()}>
+                            <div class="px-6 py-4 pb-40">
+                              <img src={imageDataUrl()} alt={path()} class="max-w-full" />
+                            </div>
+                          </Match>
+                          <Match when={state()?.loaded && isSvg()}>
+                            <div class="flex flex-col gap-4 px-6 py-4">
                              <Dynamic
                                component={codeComponent}
                                file={{
                                  name: path() ?? "",
-                                  contents: contents(),
+                                  contents: svgContent() ?? "",
                                  cacheKey: cacheKey(),
                                }}
                                enableLineSelection
@@ -1569,17 +1245,41 @@ export default function Page() {
                                  file.setSelectedLines(p, range)
                                }}
                                overflow="scroll"
-                                class="select-text pb-40"
+                                class="select-text"
                              />
-                            </Match>
-                            <Match when={state()?.loading}>
-                              <div class="px-6 py-4 text-text-weak">Loading...</div>
-                            </Match>
-                            <Match when={state()?.error}>
-                              {(err) => <div class="px-6 py-4 text-text-weak">{err()}</div>}
-                            </Match>
-                          </Switch>
-                        </Show>
+                              <Show when={svgPreviewUrl()}>
+                                <div class="flex justify-center pb-40">
+                                  <img src={svgPreviewUrl()} alt={path()} class="max-w-full max-h-96" />
+                                </div>
+                              </Show>
+                            </div>
+                          </Match>
+                          <Match when={state()?.loaded}>
+                            <Dynamic
+                              component={codeComponent}
+                              file={{
+                                name: path() ?? "",
+                                contents: contents(),
+                                cacheKey: cacheKey(),
+                              }}
+                              enableLineSelection
+                              selectedLines={selectedLines()}
+                              onLineSelected={(range: SelectedLineRange | null) => {
+                                const p = path()
+                                if (!p) return
+                                file.setSelectedLines(p, range)
+                              }}
+                              overflow="scroll"
+                              class="select-text pb-40"
+                            />
+                          </Match>
+                          <Match when={state()?.loading}>
+                            <div class="px-6 py-4 text-text-weak">Loading...</div>
+                          </Match>
+                          <Match when={state()?.error}>
+                            {(err) => <div class="px-6 py-4 text-text-weak">{err()}</div>}
+                          </Match>
+                        </Switch>
                      </Tabs.Content>
                    )
                  }}
@@ -1602,7 +1302,7 @@ export default function Page() {
        </Show>
      </div>

-      <Show when={isDesktop() && view().terminal.opened()}>
+      <Show when={isDesktop() && layout.terminal.opened()}>
        <div
          class="relative w-full flex-col shrink-0 border-t border-border-weak-base"
          style={{ height: `${layout.terminal.height()}px` }}
@@ -1614,76 +1314,56 @@ export default function Page() {
            max={window.innerHeight * 0.6}
            collapseThreshold={50}
            onResize={layout.terminal.resize}
-            onCollapse={view().terminal.close}
+            onCollapse={layout.terminal.close}
          />
-          <Show
-            when={terminal.ready()}
-            fallback={
-              <div class="flex flex-col h-full pointer-events-none">
-                <div class="h-10 flex items-center gap-2 px-2 border-b border-border-weak-base bg-background-stronger overflow-hidden">
-                  <For each={handoff.terminals}>
-                    {(title) => (
-                      <div class="px-2 py-1 rounded-md bg-surface-base text-14-regular text-text-weak truncate max-w-40">
-                        {title}
-                      </div>
-                    )}
-                  </For>
-                  <div class="flex-1" />
-                  <div class="text-text-weak pr-2">Loading...</div>
-                </div>
-                <div class="flex-1 flex items-center justify-center text-text-weak">Loading terminal...</div>
-              </div>
-            }
+          <DragDropProvider
+            onDragStart={handleTerminalDragStart}
+            onDragEnd={handleTerminalDragEnd}
+            onDragOver={handleTerminalDragOver}
+            collisionDetector={closestCenter}
          >
-            <DragDropProvider
-              onDragStart={handleTerminalDragStart}
-              onDragEnd={handleTerminalDragEnd}
-              onDragOver={handleTerminalDragOver}
-              collisionDetector={closestCenter}
-            >
-              <DragDropSensors />
-              <ConstrainDragYAxis />
-              <Tabs variant="alt" value={terminal.active()} onChange={terminal.open}>
-                <Tabs.List class="h-10">
-                  <SortableProvider ids={terminal.all().map((t: LocalPTY) => t.id)}>
-                    <For each={terminal.all()}>{(pty) => <SortableTerminalTab terminal={pty} />}</For>
-                  </SortableProvider>
-                  <div class="h-full flex items-center justify-center">
-                    <TooltipKeybind
-                      title="New terminal"
-                      keybind={command.keybind("terminal.new")}
-                      class="flex items-center"
-                    >
-                      <IconButton icon="plus-small" variant="ghost" iconSize="large" onClick={terminal.new} />
-                    </TooltipKeybind>
-                  </div>
-                </Tabs.List>
-                <For each={terminal.all()}>
-                  {(pty) => (
-                    <Tabs.Content value={pty.id}>
-                      <Terminal pty={pty} onCleanup={terminal.update} onConnectError={() => terminal.clone(pty.id)} />
-                    </Tabs.Content>
-                  )}
-                </For>
-              </Tabs>
-              <DragOverlay>
-                <Show when={store.activeTerminalDraggable}>
-                  {(draggedId) => {
-                    const pty = createMemo(() => terminal.all().find((t: LocalPTY) => t.id === draggedId()))
-                    return (
-                      <Show when={pty()}>
-                        {(t) => (
-                          <div class="relative p-1 h-10 flex items-center bg-background-stronger text-14-regular">
-                            {t().title}
-                          </div>
-                        )}
-                      </Show>
-                    )
-                  }}
-                </Show>
-              </DragOverlay>
-            </DragDropProvider>
-          </Show>
+            <DragDropSensors />
+            <ConstrainDragYAxis />
+            <Tabs variant="alt" value={terminal.active()} onChange={terminal.open}>
+              <Tabs.List class="h-10">
+                <SortableProvider ids={terminal.all().map((t: LocalPTY) => t.id)}>
+                  <For each={terminal.all()}>{(pty) => <SortableTerminalTab terminal={pty} />}</For>
+                </SortableProvider>
+                <div class="h-full flex items-center justify-center">
+                  <TooltipKeybind
+                    title="New terminal"
+                    keybind={command.keybind("terminal.new")}
+                    class="flex items-center"
+                  >
+                    <IconButton icon="plus-small" variant="ghost" iconSize="large" onClick={terminal.new} />
+                  </TooltipKeybind>
+                </div>
+              </Tabs.List>
+              <For each={terminal.all()}>
+                {(pty) => (
+                  <Tabs.Content value={pty.id}>
+                    <Terminal pty={pty} onCleanup={terminal.update} onConnectError={() => terminal.clone(pty.id)} />
+                  </Tabs.Content>
+                )}
+              </For>
+            </Tabs>
+            <DragOverlay>
+              <Show when={store.activeTerminalDraggable}>
+                {(draggedId) => {
+                  const pty = createMemo(() => terminal.all().find((t: LocalPTY) => t.id === draggedId()))
+                  return (
+                    <Show when={pty()}>
+                      {(t) => (
+                        <div class="relative p-1 h-10 flex items-center bg-background-stronger text-14-regular">
+                          {t().title}
+                        </div>
+                      )}
+                    </Show>
+                  )
+                }}
+              </Show>
+            </DragOverlay>
+          </DragDropProvider>
        </div>
      </Show>
    </div>
--- a/packages/app/src/utils/perf.ts
+++ b/packages/app/src/utils/perf.ts
@@ -1,135 +0,0 @@
-type Nav = {
-  id: string
-  dir?: string
-  from?: string
-  to: string
-  trigger?: string
-  start: number
-  marks: Record<string, number>
-  logged: boolean
-  timer?: ReturnType<typeof setTimeout>
-}
-
-const dev = import.meta.env.DEV
-
-const key = (dir: string | undefined, to: string) => `${dir ?? ""}:${to}`
-
-const now = () => performance.now()
-
-const uid = () => crypto.randomUUID?.() ?? Math.random().toString(16).slice(2)
-
-const navs = new Map<string, Nav>()
-const pending = new Map<string, string>()
-const active = new Map<string, string>()
-
-const required = [
-  "session:params",
-  "session:data-ready",
-  "session:first-turn-mounted",
-  "storage:prompt-ready",
-  "storage:terminal-ready",
-  "storage:file-view-ready",
-]
-
-function flush(id: string, reason: "complete" | "timeout") {
-  if (!dev) return
-  const nav = navs.get(id)
-  if (!nav) return
-  if (nav.logged) return
-
-  nav.logged = true
-  if (nav.timer) clearTimeout(nav.timer)
-
-  const baseName = nav.marks["navigate:start"] !== undefined ? "navigate:start" : "session:params"
-  const base = nav.marks[baseName] ?? nav.start
-
-  const ms = Object.fromEntries(
-    Object.entries(nav.marks)
-      .slice()
-      .sort(([a], [b]) => a.localeCompare(b))
-      .map(([name, t]) => [name, Math.round((t - base) * 100) / 100]),
-  )
-
-  console.log(
-    "perf.session-nav " +
-      JSON.stringify({
-        type: "perf.session-nav.v0",
-        id: nav.id,
-        dir: nav.dir,
-        from: nav.from,
-        to: nav.to,
-        trigger: nav.trigger,
-        base: baseName,
-        reason,
-        ms,
-      }),
-  )
-
-  navs.delete(id)
-}
-
-function maybeFlush(id: string) {
-  if (!dev) return
-  const nav = navs.get(id)
-  if (!nav) return
-  if (nav.logged) return
-  if (!required.every((name) => nav.marks[name] !== undefined)) return
-  flush(id, "complete")
-}
-
-function ensure(id: string, data: Omit<Nav, "marks" | "logged" | "timer">) {
-  const existing = navs.get(id)
-  if (existing) return existing
-
-  const nav: Nav = {
-    ...data,
-    marks: {},
-    logged: false,
-  }
-  nav.timer = setTimeout(() => flush(id, "timeout"), 5000)
-  navs.set(id, nav)
-  return nav
-}
-
-export function navStart(input: { dir?: string; from?: string; to: string; trigger?: string }) {
-  if (!dev) return
-
-  const id = uid()
-  const start = now()
-  const nav = ensure(id, { ...input, id, start })
-  nav.marks["navigate:start"] = start
-
-  pending.set(key(input.dir, input.to), id)
-  return id
-}
-
-export function navParams(input: { dir?: string; from?: string; to: string }) {
-  if (!dev) return
-
-  const k = key(input.dir, input.to)
-  const pendingId = pending.get(k)
-  if (pendingId) pending.delete(k)
-  const id = pendingId ?? uid()
-
-  const start = now()
-  const nav = ensure(id, { ...input, id, start, trigger: pendingId ? "key" : "route" })
-  nav.marks["session:params"] = start
-
-  active.set(k, id)
-  maybeFlush(id)
-  return id
-}
-
-export function navMark(input: { dir?: string; to: string; name: string }) {
-  if (!dev) return
-
-  const id = active.get(key(input.dir, input.to))
-  if (!id) return
-
-  const nav = navs.get(id)
-  if (!nav) return
-  if (nav.marks[input.name] !== undefined) return
-
-  nav.marks[input.name] = now()
-  maybeFlush(id)
-}
--- a/packages/console/app/package.json
+++ b/packages/console/app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-app",
-  "version": "1.1.8",
+  "version": "1.1.4",
  "type": "module",
  "license": "MIT",
  "scripts": {
--- a/packages/console/app/src/routes/stripe/webhook.ts
+++ b/packages/console/app/src/routes/stripe/webhook.ts
@@ -1,7 +1,7 @@
 import { Billing } from "@opencode-ai/console-core/billing.js"
 import type { APIEvent } from "@solidjs/start/server"
 import { and, Database, eq, sql } from "@opencode-ai/console-core/drizzle/index.js"
-import { BillingTable, PaymentTable, SubscriptionTable } from "@opencode-ai/console-core/schema/billing.sql.js"
+import { BillingTable, PaymentTable } from "@opencode-ai/console-core/schema/billing.sql.js"
 import { Identifier } from "@opencode-ai/console-core/identifier.js"
 import { centsToMicroCents } from "@opencode-ai/console-core/util/price.js"
 import { Actor } from "@opencode-ai/console-core/actor.js"
@@ -146,242 +146,6 @@ export async function POST(input: APIEvent) {
          .where(eq(BillingTable.workspaceID, workspaceID))
      })
    }
-    if (body.type === "invoice.payment_succeeded" && body.data.object.billing_reason === "subscription_cycle") {
-      const invoiceID = body.data.object.id as string
-      const amountInCents = body.data.object.amount_paid
-      const customerID = body.data.object.customer as string
-      const subscriptionID = body.data.object.parent?.subscription_details?.subscription as string
-
-      if (!customerID) throw new Error("Customer ID not found")
-      if (!invoiceID) throw new Error("Invoice ID not found")
-      if (!subscriptionID) throw new Error("Subscription ID not found")
-
-      const invoice = await Billing.stripe().invoices.retrieve(invoiceID, {
-        expand: ["payments"],
-      })
-      const paymentID = invoice.payments?.data[0].payment.payment_intent as string
-      if (!paymentID) throw new Error("Payment ID not found")
-
-      const workspaceID = await Database.use((tx) =>
-        tx
-          .select({ workspaceID: BillingTable.workspaceID })
-          .from(BillingTable)
-          .where(eq(BillingTable.customerID, customerID))
-          .then((rows) => rows[0]?.workspaceID),
-      )
-      if (!workspaceID) throw new Error("Workspace ID not found for customer")
-
-      await Database.use((tx) =>
-        tx.insert(PaymentTable).values({
-          workspaceID,
-          id: Identifier.create("payment"),
-          amount: centsToMicroCents(amountInCents),
-          paymentID,
-          invoiceID,
-          customerID,
-        }),
-      )
-    }
-    if (body.type === "customer.subscription.created") {
-      const data = {
-        id: "evt_1Smq802SrMQ2Fneksse5FMNV",
-        object: "event",
-        api_version: "2025-07-30.basil",
-        created: 1767766916,
-        data: {
-          object: {
-            id: "sub_1Smq7x2SrMQ2Fnek8F1yf3ZD",
-            object: "subscription",
-            application: null,
-            application_fee_percent: null,
-            automatic_tax: {
-              disabled_reason: null,
-              enabled: false,
-              liability: null,
-            },
-            billing_cycle_anchor: 1770445200,
-            billing_cycle_anchor_config: null,
-            billing_mode: {
-              flexible: {
-                proration_discounts: "included",
-              },
-              type: "flexible",
-              updated_at: 1770445200,
-            },
-            billing_thresholds: null,
-            cancel_at: null,
-            cancel_at_period_end: false,
-            canceled_at: null,
-            cancellation_details: {
-              comment: null,
-              feedback: null,
-              reason: null,
-            },
-            collection_method: "charge_automatically",
-            created: 1770445200,
-            currency: "usd",
-            customer: "cus_TkKmZZvysJ2wej",
-            customer_account: null,
-            days_until_due: null,
-            default_payment_method: null,
-            default_source: "card_1Smq7u2SrMQ2FneknjyOa7sq",
-            default_tax_rates: [],
-            description: null,
-            discounts: [],
-            ended_at: null,
-            invoice_settings: {
-              account_tax_ids: null,
-              issuer: {
-                type: "self",
-              },
-            },
-            items: {
-              object: "list",
-              data: [
-                {
-                  id: "si_TkKnBKXFX76t0O",
-                  object: "subscription_item",
-                  billing_thresholds: null,
-                  created: 1770445200,
-                  current_period_end: 1772864400,
-                  current_period_start: 1770445200,
-                  discounts: [],
-                  metadata: {},
-                  plan: {
-                    id: "price_1SmfFG2SrMQ2FnekJuzwHMea",
-                    object: "plan",
-                    active: true,
-                    amount: 20000,
-                    amount_decimal: "20000",
-                    billing_scheme: "per_unit",
-                    created: 1767725082,
-                    currency: "usd",
-                    interval: "month",
-                    interval_count: 1,
-                    livemode: false,
-                    metadata: {},
-                    meter: null,
-                    nickname: null,
-                    product: "prod_Tk9LjWT1n0DgYm",
-                    tiers_mode: null,
-                    transform_usage: null,
-                    trial_period_days: null,
-                    usage_type: "licensed",
-                  },
-                  price: {
-                    id: "price_1SmfFG2SrMQ2FnekJuzwHMea",
-                    object: "price",
-                    active: true,
-                    billing_scheme: "per_unit",
-                    created: 1767725082,
-                    currency: "usd",
-                    custom_unit_amount: null,
-                    livemode: false,
-                    lookup_key: null,
-                    metadata: {},
-                    nickname: null,
-                    product: "prod_Tk9LjWT1n0DgYm",
-                    recurring: {
-                      interval: "month",
-                      interval_count: 1,
-                      meter: null,
-                      trial_period_days: null,
-                      usage_type: "licensed",
-                    },
-                    tax_behavior: "unspecified",
-                    tiers_mode: null,
-                    transform_quantity: null,
-                    type: "recurring",
-                    unit_amount: 20000,
-                    unit_amount_decimal: "20000",
-                  },
-                  quantity: 1,
-                  subscription: "sub_1Smq7x2SrMQ2Fnek8F1yf3ZD",
-                  tax_rates: [],
-                },
-              ],
-              has_more: false,
-              total_count: 1,
-              url: "/v1/subscription_items?subscription=sub_1Smq7x2SrMQ2Fnek8F1yf3ZD",
-            },
-            latest_invoice: "in_1Smq7x2SrMQ2FnekSJesfPwE",
-            livemode: false,
-            metadata: {},
-            next_pending_invoice_item_invoice: null,
-            on_behalf_of: null,
-            pause_collection: null,
-            payment_settings: {
-              payment_method_options: null,
-              payment_method_types: null,
-              save_default_payment_method: "off",
-            },
-            pending_invoice_item_interval: null,
-            pending_setup_intent: null,
-            pending_update: null,
-            plan: {
-              id: "price_1SmfFG2SrMQ2FnekJuzwHMea",
-              object: "plan",
-              active: true,
-              amount: 20000,
-              amount_decimal: "20000",
-              billing_scheme: "per_unit",
-              created: 1767725082,
-              currency: "usd",
-              interval: "month",
-              interval_count: 1,
-              livemode: false,
-              metadata: {},
-              meter: null,
-              nickname: null,
-              product: "prod_Tk9LjWT1n0DgYm",
-              tiers_mode: null,
-              transform_usage: null,
-              trial_period_days: null,
-              usage_type: "licensed",
-            },
-            quantity: 1,
-            schedule: null,
-            start_date: 1770445200,
-            status: "active",
-            test_clock: "clock_1Smq6n2SrMQ2FnekQw4yt2PZ",
-            transfer_data: null,
-            trial_end: null,
-            trial_settings: {
-              end_behavior: {
-                missing_payment_method: "create_invoice",
-              },
-            },
-            trial_start: null,
-          },
-        },
-        livemode: false,
-        pending_webhooks: 0,
-        request: {
-          id: "req_6YO9stvB155WJD",
-          idempotency_key: "581ba059-6f86-49b2-9c49-0d8450255322",
-        },
-        type: "customer.subscription.created",
-      }
-    }
-    if (body.type === "customer.subscription.deleted") {
-      const subscriptionID = body.data.object.id
-      if (!subscriptionID) throw new Error("Subscription ID not found")
-
-      const workspaceID = await Database.use((tx) =>
-        tx
-          .select({ workspaceID: BillingTable.workspaceID })
-          .from(BillingTable)
-          .where(eq(BillingTable.subscriptionID, subscriptionID))
-          .then((rows) => rows[0]?.workspaceID),
-      )
-      if (!workspaceID) throw new Error("Workspace ID not found for subscription")
-
-      await Database.transaction(async (tx) => {
-        await tx.update(BillingTable).set({ subscriptionID: null }).where(eq(BillingTable.workspaceID, workspaceID))
-
-        await tx.delete(SubscriptionTable).where(eq(SubscriptionTable.workspaceID, workspaceID))
-      })
-    }
  })()
    .then((message) => {
      return Response.json({ message: message ?? "done" }, { status: 200 })
--- a/packages/console/app/src/routes/workspace/[id]/billing/black-section.module.css
+++ b/packages/console/app/src/routes/workspace/[id]/billing/black-section.module.css
@@ -1,8 +1,2 @@
 .root {
-  [data-slot="title-row"] {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    gap: var(--space-4);
-  }
 }
--- a/packages/console/app/src/routes/workspace/[id]/billing/black-section.tsx
+++ b/packages/console/app/src/routes/workspace/[id]/billing/black-section.tsx
@@ -1,57 +1,11 @@
-import { action, useParams, useAction, useSubmission, json } from "@solidjs/router"
-import { createStore } from "solid-js/store"
-import { Billing } from "@opencode-ai/console-core/billing.js"
-import { withActor } from "~/context/auth.withActor"
-import { queryBillingInfo } from "../../common"
 import styles from "./black-section.module.css"

-const createSessionUrl = action(async (workspaceID: string, returnUrl: string) => {
-  "use server"
-  return json(
-    await withActor(
-      () =>
-        Billing.generateSessionUrl({ returnUrl })
-          .then((data) => ({ error: undefined, data }))
-          .catch((e) => ({
-            error: e.message as string,
-            data: undefined,
-          })),
-      workspaceID,
-    ),
-    { revalidate: queryBillingInfo.key },
-  )
-}, "sessionUrl")
-
 export function BlackSection() {
-  const params = useParams()
-  const sessionAction = useAction(createSessionUrl)
-  const sessionSubmission = useSubmission(createSessionUrl)
-  const [store, setStore] = createStore({
-    sessionRedirecting: false,
-  })
-
-  async function onClickSession() {
-    const result = await sessionAction(params.id!, window.location.href)
-    if (result.data) {
-      setStore("sessionRedirecting", true)
-      window.location.href = result.data
-    }
-  }
-
  return (
    <section class={styles.root}>
      <div data-slot="section-title">
-        <h2>Subscription</h2>
-        <div data-slot="title-row">
-          <p>You are subscribed to OpenCode Black for $200 per month.</p>
-          <button
-            data-color="primary"
-            disabled={sessionSubmission.pending || store.sessionRedirecting}
-            onClick={onClickSession}
-          >
-            {sessionSubmission.pending || store.sessionRedirecting ? "Loading..." : "Manage Subscription"}
-          </button>
-        </div>
+        <h2>Black</h2>
+        <p>You are subscribed to Black.</p>
      </div>
    </section>
  )
--- a/packages/console/app/src/routes/workspace/[id]/billing/index.tsx
+++ b/packages/console/app/src/routes/workspace/[id]/billing/index.tsx
@@ -16,7 +16,7 @@ export default function () {
    <div data-page="workspace-[id]">
      <div data-slot="sections">
        <Show when={sessionInfo()?.isAdmin}>
-          <Show when={billingInfo()?.subscriptionID}>
+          <Show when={sessionInfo()?.isBeta && billingInfo()?.subscriptionID}>
            <BlackSection />
          </Show>
          <BillingSection />
--- a/packages/console/app/src/routes/workspace/[id]/billing/payment-section.tsx
+++ b/packages/console/app/src/routes/workspace/[id]/billing/payment-section.tsx
@@ -1,6 +1,6 @@
 import { Billing } from "@opencode-ai/console-core/billing.js"
 import { query, action, useParams, createAsync, useAction } from "@solidjs/router"
-import { For, Match, Show, Switch } from "solid-js"
+import { For, Show } from "solid-js"
 import { withActor } from "~/context/auth.withActor"
 import { formatDateUTC, formatDateForTable } from "../../common"
 import styles from "./payment-section.module.css"
@@ -77,8 +77,7 @@ export function PaymentSection() {
              <For each={payments()!}>
                {(payment) => {
                  const date = new Date(payment.timeCreated)
-                  const amount =
-                    payment.enrichment?.type === "subscription" && payment.enrichment.couponID ? 0 : payment.amount
+                  const isCredit = !payment.paymentID
                  return (
                    <tr>
                      <td data-slot="payment-date" title={formatDateUTC(date)}>
@@ -86,14 +85,13 @@ export function PaymentSection() {
                      </td>
                      <td data-slot="payment-id">{payment.id}</td>
                      <td data-slot="payment-amount" data-refunded={!!payment.timeRefunded}>
-                        ${((amount ?? 0) / 100000000).toFixed(2)}
-                        <Switch>
-                          <Match when={payment.enrichment?.type === "credit"}> (credit)</Match>
-                          <Match when={payment.enrichment?.type === "subscription"}> (subscription)</Match>
-                        </Switch>
+                        ${((payment.amount ?? 0) / 100000000).toFixed(2)}
+                        {isCredit ? " (credit)" : ""}
                      </td>
                      <td data-slot="payment-receipt">
-                        {payment.paymentID ? (
+                        {isCredit ? (
+                          <span>-</span>
+                        ) : (
                          <button
                            onClick={async () => {
                              const receiptUrl = await downloadReceiptAction(params.id!, payment.paymentID!)
@@ -105,8 +103,6 @@ export function PaymentSection() {
                          >
                            View
                          </button>
-                        ) : (
-                          <span>-</span>
                        )}
                      </td>
                    </tr>
--- a/packages/console/app/src/routes/workspace/[id]/graph-section.tsx
+++ b/packages/console/app/src/routes/workspace/[id]/graph-section.tsx
@@ -44,7 +44,6 @@ async function getCosts(workspaceID: string, year: number, month: number) {
            eq(UsageTable.workspaceID, workspaceID),
            gte(UsageTable.timeCreated, startDate),
            lte(UsageTable.timeCreated, endDate),
-            or(isNull(UsageTable.enrichment), sql`JSON_EXTRACT(${UsageTable.enrichment}, '$.plan') != 'sub'`),
          ),
        )
        .groupBy(sql`DATE(${UsageTable.timeCreated})`, UsageTable.model, UsageTable.keyID)
--- a/packages/console/app/src/routes/zen/util/handler.ts
+++ b/packages/console/app/src/routes/zen/util/handler.ts
@@ -1,9 +1,8 @@
 import type { APIEvent } from "@solidjs/start/server"
 import { and, Database, eq, isNull, lt, or, sql } from "@opencode-ai/console-core/drizzle/index.js"
 import { KeyTable } from "@opencode-ai/console-core/schema/key.sql.js"
-import { BillingTable, SubscriptionTable, UsageTable } from "@opencode-ai/console-core/schema/billing.sql.js"
+import { BillingTable, UsageTable } from "@opencode-ai/console-core/schema/billing.sql.js"
 import { centsToMicroCents } from "@opencode-ai/console-core/util/price.js"
-import { getWeekBounds } from "@opencode-ai/console-core/util/date.js"
 import { Identifier } from "@opencode-ai/console-core/identifier.js"
 import { Billing } from "@opencode-ai/console-core/billing.js"
 import { Actor } from "@opencode-ai/console-core/actor.js"
@@ -416,11 +415,11 @@ export async function handler(
            timeMonthlyUsageUpdated: UserTable.timeMonthlyUsageUpdated,
          },
          subscription: {
-            id: SubscriptionTable.id,
-            rollingUsage: SubscriptionTable.rollingUsage,
-            fixedUsage: SubscriptionTable.fixedUsage,
-            timeRollingUpdated: SubscriptionTable.timeRollingUpdated,
-            timeFixedUpdated: SubscriptionTable.timeFixedUpdated,
+            timeSubscribed: UserTable.timeSubscribed,
+            subIntervalUsage: UserTable.subIntervalUsage,
+            subMonthlyUsage: UserTable.subMonthlyUsage,
+            timeSubIntervalUsageUpdated: UserTable.timeSubIntervalUsageUpdated,
+            timeSubMonthlyUsageUpdated: UserTable.timeSubMonthlyUsageUpdated,
          },
          provider: {
            credentials: ProviderTable.credentials,
@@ -441,14 +440,6 @@ export async function handler(
              )
            : sql`false`,
        )
-        .leftJoin(
-          SubscriptionTable,
-          and(
-            eq(SubscriptionTable.workspaceID, KeyTable.workspaceID),
-            eq(SubscriptionTable.userID, KeyTable.userID),
-            isNull(SubscriptionTable.timeDeleted),
-          ),
-        )
        .where(and(eq(KeyTable.key, apiKey), isNull(KeyTable.timeDeleted)))
        .then((rows) => rows[0]),
    )
@@ -457,7 +448,7 @@ export async function handler(
    logger.metric({
      api_key: data.apiKey,
      workspace: data.workspaceID,
-      isSubscription: data.subscription ? true : false,
+      isSubscription: data.subscription.timeSubscribed ? true : false,
    })

    return {
@@ -465,7 +456,7 @@ export async function handler(
      workspaceID: data.workspaceID,
      billing: data.billing,
      user: data.user,
-      subscription: data.subscription,
+      subscription: data.subscription.timeSubscribed ? data.subscription : undefined,
      provider: data.provider,
      isFree: FREE_WORKSPACES.includes(data.workspaceID),
      isDisabled: !!data.timeDisabled,
@@ -493,11 +484,23 @@ export async function handler(
        return `${minutes}min`
      }

-      // Check weekly limit
-      if (sub.fixedUsage && sub.timeFixedUpdated) {
-        const week = getWeekBounds(now)
-        if (sub.timeFixedUpdated >= week.start && sub.fixedUsage >= centsToMicroCents(black.fixedLimit * 100)) {
-          const retryAfter = Math.ceil((week.end.getTime() - now.getTime()) / 1000)
+      // Check monthly limit (based on subscription billing cycle)
+      if (
+        sub.subMonthlyUsage &&
+        sub.timeSubMonthlyUsageUpdated &&
+        sub.subMonthlyUsage >= centsToMicroCents(black.monthlyLimit * 100)
+      ) {
+        const subscribeDay = sub.timeSubscribed!.getUTCDate()
+        const cycleStart = new Date(
+          Date.UTC(
+            now.getUTCFullYear(),
+            now.getUTCDate() >= subscribeDay ? now.getUTCMonth() : now.getUTCMonth() - 1,
+            subscribeDay,
+          ),
+        )
+        const cycleEnd = new Date(Date.UTC(cycleStart.getUTCFullYear(), cycleStart.getUTCMonth() + 1, subscribeDay))
+        if (sub.timeSubMonthlyUsageUpdated >= cycleStart && sub.timeSubMonthlyUsageUpdated < cycleEnd) {
+          const retryAfter = Math.ceil((cycleEnd.getTime() - now.getTime()) / 1000)
          throw new SubscriptionError(
            `Subscription quota exceeded. Retry in ${formatRetryTime(retryAfter)}.`,
            retryAfter,
@@ -505,12 +508,14 @@ export async function handler(
        }
      }

-      // Check rolling limit
-      if (sub.rollingUsage && sub.timeRollingUpdated) {
-        const rollingWindowMs = black.rollingWindow * 3600 * 1000
-        const windowStart = new Date(now.getTime() - rollingWindowMs)
-        if (sub.timeRollingUpdated >= windowStart && sub.rollingUsage >= centsToMicroCents(black.rollingLimit * 100)) {
-          const retryAfter = Math.ceil((sub.timeRollingUpdated.getTime() + rollingWindowMs - now.getTime()) / 1000)
+      // Check interval limit
+      const intervalMs = black.intervalLength * 3600 * 1000
+      if (sub.subIntervalUsage && sub.timeSubIntervalUsageUpdated) {
+        const currentInterval = Math.floor(now.getTime() / intervalMs)
+        const usageInterval = Math.floor(sub.timeSubIntervalUsageUpdated.getTime() / intervalMs)
+        if (currentInterval === usageInterval && sub.subIntervalUsage >= centsToMicroCents(black.intervalLimit * 100)) {
+          const nextInterval = (currentInterval + 1) * intervalMs
+          const retryAfter = Math.ceil((nextInterval - now.getTime()) / 1000)
          throw new SubscriptionError(
            `Subscription quota exceeded. Retry in ${formatRetryTime(retryAfter)}.`,
            retryAfter,
@@ -656,39 +661,38 @@ export async function handler(
          .where(and(eq(KeyTable.workspaceID, authInfo.workspaceID), eq(KeyTable.id, authInfo.apiKeyId))),
        ...(authInfo.subscription
          ? (() => {
-              const black = BlackData.get()
-              const week = getWeekBounds(new Date())
-              const rollingWindowSeconds = black.rollingWindow * 3600
+              const now = new Date()
+              const subscribeDay = authInfo.subscription.timeSubscribed!.getUTCDate()
+              const cycleStart = new Date(
+                Date.UTC(
+                  now.getUTCFullYear(),
+                  now.getUTCDate() >= subscribeDay ? now.getUTCMonth() : now.getUTCMonth() - 1,
+                  subscribeDay,
+                ),
+              )
+              const cycleEnd = new Date(
+                Date.UTC(cycleStart.getUTCFullYear(), cycleStart.getUTCMonth() + 1, subscribeDay),
+              )
              return [
                db
-                  .update(SubscriptionTable)
+                  .update(UserTable)
                  .set({
-                    fixedUsage: sql`
+                    subMonthlyUsage: sql`
              CASE
-                WHEN ${SubscriptionTable.timeFixedUpdated} >= ${week.start} THEN ${SubscriptionTable.fixedUsage} + ${cost}
+                WHEN ${UserTable.timeSubMonthlyUsageUpdated} >= ${cycleStart} AND ${UserTable.timeSubMonthlyUsageUpdated} < ${cycleEnd} THEN ${UserTable.subMonthlyUsage} + ${cost}
                ELSE ${cost}
              END
            `,
-                    timeFixedUpdated: sql`now()`,
-                    rollingUsage: sql`
+                    timeSubMonthlyUsageUpdated: sql`now()`,
+                    subIntervalUsage: sql`
              CASE
-                WHEN UNIX_TIMESTAMP(${SubscriptionTable.timeRollingUpdated}) >= UNIX_TIMESTAMP(now()) - ${rollingWindowSeconds} THEN ${SubscriptionTable.rollingUsage} + ${cost}
+                WHEN FLOOR(UNIX_TIMESTAMP(${UserTable.timeSubIntervalUsageUpdated}) / (${BlackData.get().intervalLength} * 3600)) = FLOOR(UNIX_TIMESTAMP(now()) / (${BlackData.get().intervalLength} * 3600)) THEN ${UserTable.subIntervalUsage} + ${cost}
                ELSE ${cost}
              END
            `,
-                    timeRollingUpdated: sql`
-              CASE
-                WHEN UNIX_TIMESTAMP(${SubscriptionTable.timeRollingUpdated}) >= UNIX_TIMESTAMP(now()) - ${rollingWindowSeconds} THEN ${SubscriptionTable.timeRollingUpdated}
-                ELSE now()
-              END
-            `,
+                    timeSubIntervalUsageUpdated: sql`now()`,
                  })
-                  .where(
-                    and(
-                      eq(SubscriptionTable.workspaceID, authInfo.workspaceID),
-                      eq(SubscriptionTable.userID, authInfo.user.id),
-                    ),
-                  ),
+                  .where(and(eq(UserTable.workspaceID, authInfo.workspaceID), eq(UserTable.id, authInfo.user.id))),
              ]
            })()
          : [
--- a/packages/console/core/migrations/0045_cuddly_diamondback.sql
+++ b/packages/console/core/migrations/0045_cuddly_diamondback.sql
@@ -1 +0,0 @@
-ALTER TABLE `billing` ADD CONSTRAINT `global_subscription_id` UNIQUE(`subscription_id`);
--- a/packages/console/core/migrations/0046_charming_black_bolt.sql
+++ b/packages/console/core/migrations/0046_charming_black_bolt.sql
@@ -1,13 +0,0 @@
-CREATE TABLE `subscription` (
-	`id` varchar(30) NOT NULL,
-	`workspace_id` varchar(30) NOT NULL,
-	`time_created` timestamp(3) NOT NULL DEFAULT (now()),
-	`time_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
-	`time_deleted` timestamp(3),
-	`user_id` varchar(30) NOT NULL,
-	`rolling_usage` bigint,
-	`fixed_usage` bigint,
-	`time_rolling_updated` timestamp(3),
-	`time_fixed_updated` timestamp(3),
-	CONSTRAINT `subscription_workspace_id_id_pk` PRIMARY KEY(`workspace_id`,`id`)
-);
--- a/packages/console/core/migrations/0047_huge_omega_red.sql
+++ b/packages/console/core/migrations/0047_huge_omega_red.sql
@@ -1,6 +0,0 @@
-CREATE INDEX `workspace_user_id` ON `subscription` (`workspace_id`,`user_id`);--> statement-breakpoint
-ALTER TABLE `user` DROP COLUMN `time_subscribed`;--> statement-breakpoint
-ALTER TABLE `user` DROP COLUMN `sub_interval_usage`;--> statement-breakpoint
-ALTER TABLE `user` DROP COLUMN `sub_monthly_usage`;--> statement-breakpoint
-ALTER TABLE `user` DROP COLUMN `sub_time_interval_usage_updated`;--> statement-breakpoint
-ALTER TABLE `user` DROP COLUMN `sub_time_monthly_usage_updated`;
--- a/packages/console/core/migrations/0048_mean_frank_castle.sql
+++ b/packages/console/core/migrations/0048_mean_frank_castle.sql
@@ -1,2 +0,0 @@
-DROP INDEX `workspace_user_id` ON `subscription`;--> statement-breakpoint
-ALTER TABLE `subscription` ADD CONSTRAINT `workspace_user_id` UNIQUE(`workspace_id`,`user_id`);
--- a/packages/console/core/migrations/0049_noisy_domino.sql
+++ b/packages/console/core/migrations/0049_noisy_domino.sql
@@ -1 +0,0 @@
-ALTER TABLE `billing` ADD `subscription_coupon_id` varchar(28);
--- a/packages/console/core/migrations/0050_bumpy_mephistopheles.sql
+++ b/packages/console/core/migrations/0050_bumpy_mephistopheles.sql
@@ -1 +0,0 @@
-ALTER TABLE `payment` ADD `enrichment` json;
--- a/packages/console/core/migrations/meta/0045_snapshot.json
+++ b/packages/console/core/migrations/meta/0045_snapshot.json
--- a/packages/console/core/migrations/meta/0046_snapshot.json
+++ b/packages/console/core/migrations/meta/0046_snapshot.json
--- a/packages/console/core/migrations/meta/0047_snapshot.json
+++ b/packages/console/core/migrations/meta/0047_snapshot.json
--- a/packages/console/core/migrations/meta/0048_snapshot.json
+++ b/packages/console/core/migrations/meta/0048_snapshot.json
--- a/packages/console/core/migrations/meta/0049_snapshot.json
+++ b/packages/console/core/migrations/meta/0049_snapshot.json
--- a/packages/console/core/migrations/meta/0050_snapshot.json
+++ b/packages/console/core/migrations/meta/0050_snapshot.json
--- a/packages/console/core/migrations/meta/_journal.json
+++ b/packages/console/core/migrations/meta/_journal.json
@@ -316,48 +316,6 @@
      "when": 1767759322451,
      "tag": "0044_tiny_captain_midlands",
      "breakpoints": true
-    },
-    {
-      "idx": 45,
-      "version": "5",
-      "when": 1767765497502,
-      "tag": "0045_cuddly_diamondback",
-      "breakpoints": true
-    },
-    {
-      "idx": 46,
-      "version": "5",
-      "when": 1767912262458,
-      "tag": "0046_charming_black_bolt",
-      "breakpoints": true
-    },
-    {
-      "idx": 47,
-      "version": "5",
-      "when": 1767916965243,
-      "tag": "0047_huge_omega_red",
-      "breakpoints": true
-    },
-    {
-      "idx": 48,
-      "version": "5",
-      "when": 1767917785224,
-      "tag": "0048_mean_frank_castle",
-      "breakpoints": true
-    },
-    {
-      "idx": 49,
-      "version": "5",
-      "when": 1767922954153,
-      "tag": "0049_noisy_domino",
-      "breakpoints": true
-    },
-    {
-      "idx": 50,
-      "version": "5",
-      "when": 1767931290031,
-      "tag": "0050_bumpy_mephistopheles",
-      "breakpoints": true
    }
  ]
 }
--- 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.1.8",
+  "version": "1.1.4",
  "private": true,
  "type": "module",
  "license": "MIT",
--- a/packages/console/core/script/lookup-user.ts
+++ b/packages/console/core/script/lookup-user.ts
@@ -1,11 +1,8 @@
-import { Database, and, eq, sql } from "../src/drizzle/index.js"
+import { Database, eq, sql, inArray } from "../src/drizzle/index.js"
 import { AuthTable } from "../src/schema/auth.sql.js"
 import { UserTable } from "../src/schema/user.sql.js"
-import { BillingTable, PaymentTable, SubscriptionTable, UsageTable } from "../src/schema/billing.sql.js"
+import { BillingTable, PaymentTable, UsageTable } from "../src/schema/billing.sql.js"
 import { WorkspaceTable } from "../src/schema/workspace.sql.js"
-import { BlackData } from "../src/black.js"
-import { centsToMicroCents } from "../src/util/price.js"
-import { getWeekBounds } from "../src/util/date.js"

 // get input from command line
 const identifier = process.argv[2]
@@ -59,44 +56,6 @@ async function printWorkspace(workspaceID: string) {

  printHeader(`Workspace "${workspace.name}" (${workspace.id})`)

-  await printTable("Users", (tx) =>
-    tx
-      .select({
-        authEmail: AuthTable.subject,
-        inviteEmail: UserTable.email,
-        role: UserTable.role,
-        timeSeen: UserTable.timeSeen,
-        monthlyLimit: UserTable.monthlyLimit,
-        monthlyUsage: UserTable.monthlyUsage,
-        timeDeleted: UserTable.timeDeleted,
-        fixedUsage: SubscriptionTable.fixedUsage,
-        rollingUsage: SubscriptionTable.rollingUsage,
-        timeFixedUpdated: SubscriptionTable.timeFixedUpdated,
-        timeRollingUpdated: SubscriptionTable.timeRollingUpdated,
-        timeSubscriptionCreated: SubscriptionTable.timeCreated,
-      })
-      .from(UserTable)
-      .leftJoin(AuthTable, and(eq(UserTable.accountID, AuthTable.accountID), eq(AuthTable.provider, "email")))
-      .leftJoin(SubscriptionTable, eq(SubscriptionTable.userID, UserTable.id))
-      .where(eq(UserTable.workspaceID, workspace.id))
-      .then((rows) =>
-        rows.map((row) => {
-          const subStatus = getSubscriptionStatus(row)
-          return {
-            email: (row.timeDeleted ? "❌ " : "") + (row.authEmail ?? row.inviteEmail),
-            role: row.role,
-            timeSeen: formatDate(row.timeSeen),
-            monthly: formatMonthlyUsage(row.monthlyUsage, row.monthlyLimit),
-            subscribed: formatDate(row.timeSubscriptionCreated),
-            subWeekly: subStatus.weekly,
-            subRolling: subStatus.rolling,
-            rateLimited: subStatus.rateLimited,
-            retryIn: subStatus.retryIn,
-          }
-        }),
-      ),
-  )
-
  await printTable("Billing", (tx) =>
    tx
      .select({
@@ -165,80 +124,6 @@ async function printWorkspace(workspaceID: string) {
  )
 }

-function formatMicroCents(value: number | null | undefined) {
-  if (value === null || value === undefined) return null
-  return `$${(value / 100000000).toFixed(2)}`
-}
-
-function formatDate(value: Date | null | undefined) {
-  if (!value) return null
-  return value.toISOString().split("T")[0]
-}
-
-function formatMonthlyUsage(usage: number | null | undefined, limit: number | null | undefined) {
-  const usageText = formatMicroCents(usage) ?? "$0.00"
-  if (limit === null || limit === undefined) return `${usageText} / no limit`
-  return `${usageText} / $${limit.toFixed(2)}`
-}
-
-function formatRetryTime(seconds: number) {
-  const days = Math.floor(seconds / 86400)
-  if (days >= 1) return `${days} day${days > 1 ? "s" : ""}`
-  const hours = Math.floor(seconds / 3600)
-  const minutes = Math.ceil((seconds % 3600) / 60)
-  if (hours >= 1) return `${hours}hr ${minutes}min`
-  return `${minutes}min`
-}
-
-function getSubscriptionStatus(row: {
-  timeSubscriptionCreated: Date | null
-  fixedUsage: number | null
-  rollingUsage: number | null
-  timeFixedUpdated: Date | null
-  timeRollingUpdated: Date | null
-}) {
-  if (!row.timeSubscriptionCreated) {
-    return { weekly: null, rolling: null, rateLimited: null, retryIn: null }
-  }
-
-  const black = BlackData.get()
-  const now = new Date()
-  const week = getWeekBounds(now)
-
-  const fixedLimit = black.fixedLimit ? centsToMicroCents(black.fixedLimit * 100) : null
-  const rollingLimit = black.rollingLimit ? centsToMicroCents(black.rollingLimit * 100) : null
-  const rollingWindowMs = (black.rollingWindow ?? 5) * 3600 * 1000
-
-  // Calculate current weekly usage (reset if outside current week)
-  const currentWeekly =
-    row.fixedUsage && row.timeFixedUpdated && row.timeFixedUpdated >= week.start ? row.fixedUsage : 0
-
-  // Calculate current rolling usage
-  const windowStart = new Date(now.getTime() - rollingWindowMs)
-  const currentRolling =
-    row.rollingUsage && row.timeRollingUpdated && row.timeRollingUpdated >= windowStart ? row.rollingUsage : 0
-
-  // Check rate limiting
-  const isWeeklyLimited = fixedLimit !== null && currentWeekly >= fixedLimit
-  const isRollingLimited = rollingLimit !== null && currentRolling >= rollingLimit
-
-  let retryIn: string | null = null
-  if (isWeeklyLimited) {
-    const retryAfter = Math.ceil((week.end.getTime() - now.getTime()) / 1000)
-    retryIn = formatRetryTime(retryAfter)
-  } else if (isRollingLimited && row.timeRollingUpdated) {
-    const retryAfter = Math.ceil((row.timeRollingUpdated.getTime() + rollingWindowMs - now.getTime()) / 1000)
-    retryIn = formatRetryTime(retryAfter)
-  }
-
-  return {
-    weekly: fixedLimit !== null ? `${formatMicroCents(currentWeekly)} / $${black.fixedLimit}` : null,
-    rolling: rollingLimit !== null ? `${formatMicroCents(currentRolling)} / $${black.rollingLimit}` : null,
-    rateLimited: isWeeklyLimited || isRollingLimited ? "yes" : "no",
-    retryIn,
-  }
-}
-
 function printHeader(title: string) {
  console.log()
  console.log("─".repeat(title.length))
--- a/packages/console/core/script/onboard-zen-black.ts
+++ b/packages/console/core/script/onboard-zen-black.ts
@@ -1,35 +1,35 @@
 import { Billing } from "../src/billing.js"
-import { and, Database, eq, isNull, sql } from "../src/drizzle/index.js"
+import { Database, eq, and, sql } from "../src/drizzle/index.js"
+import { AuthTable } from "../src/schema/auth.sql.js"
 import { UserTable } from "../src/schema/user.sql.js"
-import { BillingTable, PaymentTable, SubscriptionTable } from "../src/schema/billing.sql.js"
+import { BillingTable, PaymentTable } from "../src/schema/billing.sql.js"
 import { Identifier } from "../src/identifier.js"
 import { centsToMicroCents } from "../src/util/price.js"
-import { AuthTable } from "../src/schema/auth.sql.js"

 const workspaceID = process.argv[2]
 const email = process.argv[3]

-console.log(`Onboarding workspace ${workspaceID} for email ${email}`)
-
 if (!workspaceID || !email) {
  console.error("Usage: bun onboard-zen-black.ts <workspaceID> <email>")
  process.exit(1)
 }

 // Look up the Stripe customer by email
-const customers = await Billing.stripe().customers.list({ email, limit: 10, expand: ["data.subscriptions"] })
-if (!customers.data) {
+const customers = await Billing.stripe().customers.list({ email, limit: 1 })
+const customer = customers.data[0]
+if (!customer) {
  console.error(`Error: No Stripe customer found for email ${email}`)
  process.exit(1)
 }
-const customer = customers.data.find((c) => c.subscriptions?.data[0]?.items.data[0]?.price.unit_amount === 20000)
-if (!customer) {
-  console.error(`Error: No Stripe customer found for email ${email} with $200 subscription`)
+const customerID = customer.id
+
+// Get the subscription id
+const subscriptions = await Billing.stripe().subscriptions.list({ customer: customerID, limit: 1 })
+const subscription = subscriptions.data[0]
+if (!subscription) {
+  console.error(`Error: Customer ${customerID} does not have a subscription`)
  process.exit(1)
 }
-
-const customerID = customer.id
-const subscription = customer.subscriptions!.data[0]
 const subscriptionID = subscription.id

 // Validate the subscription is $200
@@ -39,12 +39,6 @@ if (amountInCents !== 20000) {
  process.exit(1)
 }

-const subscriptionData = await Billing.stripe().subscriptions.retrieve(subscription.id, { expand: ["discounts"] })
-const couponID =
-  typeof subscriptionData.discounts[0] === "string"
-    ? subscriptionData.discounts[0]
-    : subscriptionData.discounts[0]?.coupon?.id
-
 // Check if subscription is already tied to another workspace
 const existingSubscription = await Database.use((tx) =>
  tx
@@ -88,29 +82,29 @@ const invoice = invoices.data[0]
 const invoiceID = invoice?.id
 const paymentID = invoice?.payments?.data[0]?.payment.payment_intent as string | undefined

-// Get the default payment method from the customer
-const paymentMethodID = (customer.invoice_settings.default_payment_method ?? subscription.default_payment_method) as
-  | string
-  | null
-const paymentMethod = paymentMethodID ? await Billing.stripe().paymentMethods.retrieve(paymentMethodID) : null
-const paymentMethodLast4 = paymentMethod?.card?.last4 ?? null
-const paymentMethodType = paymentMethod?.type ?? null
-
-// Look up the user in the workspace
-const users = await Database.use((tx) =>
+// Look up the user by email via AuthTable
+const auth = await Database.use((tx) =>
  tx
-    .select({ id: UserTable.id, email: AuthTable.subject })
-    .from(UserTable)
-    .innerJoin(AuthTable, and(eq(AuthTable.accountID, UserTable.accountID), eq(AuthTable.provider, "email")))
-    .where(and(eq(UserTable.workspaceID, workspaceID), isNull(UserTable.timeDeleted))),
+    .select({ accountID: AuthTable.accountID })
+    .from(AuthTable)
+    .where(and(eq(AuthTable.provider, "email"), eq(AuthTable.subject, email)))
+    .then((rows) => rows[0]),
 )
-if (users.length === 0) {
-  console.error(`Error: No users found in workspace ${workspaceID}`)
+if (!auth) {
+  console.error(`Error: No user found with email ${email}`)
  process.exit(1)
 }
-const user = users.length === 1 ? users[0] : users.find((u) => u.email === email)
+
+// Look up the user in the workspace
+const user = await Database.use((tx) =>
+  tx
+    .select({ id: UserTable.id })
+    .from(UserTable)
+    .where(and(eq(UserTable.workspaceID, workspaceID), eq(UserTable.accountID, auth.accountID)))
+    .then((rows) => rows[0]),
+)
 if (!user) {
-  console.error(`Error: User with email ${email} not found in workspace ${workspaceID}`)
+  console.error(`Error: User with email ${email} is not a member of workspace ${workspaceID}`)
  process.exit(1)
 }

@@ -122,25 +116,22 @@ await Billing.stripe().customers.update(customerID, {
 })

 await Database.transaction(async (tx) => {
-  // Set customer id, subscription id, and payment method on workspace billing
+  // Set customer id and subscription id on workspace billing
  await tx
    .update(BillingTable)
    .set({
      customerID,
      subscriptionID,
-      subscriptionCouponID: couponID,
-      paymentMethodID,
-      paymentMethodLast4,
-      paymentMethodType,
    })
    .where(eq(BillingTable.workspaceID, workspaceID))

-  // Create a row in subscription table
-  await tx.insert(SubscriptionTable).values({
-    workspaceID,
-    id: Identifier.create("subscription"),
-    userID: user.id,
-  })
+  // Set current time as timeSubscribed on user
+  await tx
+    .update(UserTable)
+    .set({
+      timeSubscribed: sql`now()`,
+    })
+    .where(eq(UserTable.id, user.id))

  // Create a row in payments table
  await tx.insert(PaymentTable).values({
@@ -150,19 +141,12 @@ await Database.transaction(async (tx) => {
    customerID,
    invoiceID,
    paymentID,
-    enrichment: {
-      type: "subscription",
-      couponID,
-    },
  })
 })

 console.log(`Successfully onboarded workspace ${workspaceID}`)
 console.log(`  Customer ID: ${customerID}`)
 console.log(`  Subscription ID: ${subscriptionID}`)
-console.log(
-  `  Payment Method: ${paymentMethodID ?? "(none)"} (${paymentMethodType ?? "unknown"} ending in ${paymentMethodLast4 ?? "????"})`,
-)
 console.log(`  User ID: ${user.id}`)
 console.log(`  Invoice ID: ${invoiceID ?? "(none)"}`)
 console.log(`  Payment ID: ${paymentID ?? "(none)"}`)
--- a/packages/console/core/src/billing.ts
+++ b/packages/console/core/src/billing.ts
@@ -171,9 +171,6 @@ export namespace Billing {
        workspaceID,
        id: Identifier.create("payment"),
        amount: amountInMicroCents,
-        enrichment: {
-          type: "credit",
-        },
      })
    })
    return amountInMicroCents
--- a/packages/console/core/src/black.ts
+++ b/packages/console/core/src/black.ts
@@ -4,9 +4,9 @@ import { Resource } from "@opencode-ai/console-resource"

 export namespace BlackData {
  const Schema = z.object({
-    fixedLimit: z.number().int(),
-    rollingLimit: z.number().int(),
-    rollingWindow: z.number().int(),
+    monthlyLimit: z.number().int(),
+    intervalLimit: z.number().int(),
+    intervalLength: z.number().int(),
  })

  export const validate = fn(Schema, (input) => {
--- a/packages/console/core/src/identifier.ts
+++ b/packages/console/core/src/identifier.ts
@@ -11,7 +11,6 @@ export namespace Identifier {
    model: "mod",
    payment: "pay",
    provider: "prv",
-    subscription: "sub",
    usage: "usg",
    user: "usr",
    workspace: "wrk",
--- a/packages/console/core/src/schema/billing.sql.ts
+++ b/packages/console/core/src/schema/billing.sql.ts
@@ -22,27 +22,8 @@ export const BillingTable = mysqlTable(
    timeReloadError: utc("time_reload_error"),
    timeReloadLockedTill: utc("time_reload_locked_till"),
    subscriptionID: varchar("subscription_id", { length: 28 }),
-    subscriptionCouponID: varchar("subscription_coupon_id", { length: 28 }),
  },
-  (table) => [
-    ...workspaceIndexes(table),
-    uniqueIndex("global_customer_id").on(table.customerID),
-    uniqueIndex("global_subscription_id").on(table.subscriptionID),
-  ],
-)
-
-export const SubscriptionTable = mysqlTable(
-  "subscription",
-  {
-    ...workspaceColumns,
-    ...timestamps,
-    userID: ulid("user_id").notNull(),
-    rollingUsage: bigint("rolling_usage", { mode: "number" }),
-    fixedUsage: bigint("fixed_usage", { mode: "number" }),
-    timeRollingUpdated: utc("time_rolling_updated"),
-    timeFixedUpdated: utc("time_fixed_updated"),
-  },
-  (table) => [...workspaceIndexes(table), uniqueIndex("workspace_user_id").on(table.workspaceID, table.userID)],
+  (table) => [...workspaceIndexes(table), uniqueIndex("global_customer_id").on(table.customerID)],
 )

 export const PaymentTable = mysqlTable(
@@ -55,15 +36,6 @@ export const PaymentTable = mysqlTable(
    paymentID: varchar("payment_id", { length: 255 }),
    amount: bigint("amount", { mode: "number" }).notNull(),
    timeRefunded: utc("time_refunded"),
-    enrichment: json("enrichment").$type<
-      | {
-          type: "subscription"
-          couponID?: string
-        }
-      | {
-          type: "credit"
-        }
-    >(),
  },
  (table) => [...workspaceIndexes(table)],
 )
--- a/packages/console/core/src/schema/user.sql.ts
+++ b/packages/console/core/src/schema/user.sql.ts
@@ -18,6 +18,12 @@ export const UserTable = mysqlTable(
    monthlyLimit: int("monthly_limit"),
    monthlyUsage: bigint("monthly_usage", { mode: "number" }),
    timeMonthlyUsageUpdated: utc("time_monthly_usage_updated"),
+    // subscription
+    timeSubscribed: utc("time_subscribed"),
+    subIntervalUsage: bigint("sub_interval_usage", { mode: "number" }),
+    subMonthlyUsage: bigint("sub_monthly_usage", { mode: "number" }),
+    timeSubIntervalUsageUpdated: utc("sub_time_interval_usage_updated"),
+    timeSubMonthlyUsageUpdated: utc("sub_time_monthly_usage_updated"),
  },
  (table) => [
    ...workspaceIndexes(table),
--- a/packages/console/core/src/util/date.ts
+++ b/packages/console/core/src/util/date.ts
@@ -1,9 +0,0 @@
-export function getWeekBounds(date: Date) {
-  const dayOfWeek = date.getUTCDay()
-  const start = new Date(date)
-  start.setUTCDate(date.getUTCDate() - dayOfWeek + 1)
-  start.setUTCHours(0, 0, 0, 0)
-  const end = new Date(start)
-  end.setUTCDate(start.getUTCDate() + 7)
-  return { start, end }
-}
--- a/packages/console/function/package.json
+++ b/packages/console/function/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-function",
-  "version": "1.1.8",
+  "version": "1.1.4",
  "$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.1.8",
+  "version": "1.1.4",
  "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.1.8",
+  "version": "1.1.4",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -14,7 +14,6 @@
  },
  "dependencies": {
    "@opencode-ai/app": "workspace:*",
-    "@opencode-ai/ui": "workspace:*",
    "@solid-primitives/storage": "catalog:",
    "@tauri-apps/api": "^2",
    "@tauri-apps/plugin-dialog": "~2",
--- a/packages/desktop/src-tauri/Cargo.lock
+++ b/packages/desktop/src-tauri/Cargo.lock
@@ -1177,21 +1177,6 @@ dependencies = [
 "new_debug_unreachable",
 ]

-[[package]]
-name = "futures"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
 [[package]]
 name = "futures-channel"
 version = "0.3.31"
@@ -1199,7 +1184,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
 "futures-core",
- "futures-sink",
 ]

 [[package]]
@@ -1267,7 +1251,6 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
- "futures-channel",
 "futures-core",
 "futures-io",
 "futures-macro",
@@ -2792,7 +2775,6 @@ dependencies = [
 name = "opencode-desktop"
 version = "0.0.0"
 dependencies = [
- "futures",
 "gtk",
 "listeners",
 "semver",
--- a/packages/desktop/src-tauri/Cargo.toml
+++ b/packages/desktop/src-tauri/Cargo.toml
@@ -36,7 +36,6 @@ serde_json = "1"
 tokio = "1.48.0"
 listeners = "0.3"
 tauri-plugin-os = "2"
-futures = "0.3.31"
 semver = "1.0.27"

 [target.'cfg(target_os = "linux")'.dependencies]
--- a/packages/desktop/src-tauri/entitlements.plist
+++ b/packages/desktop/src-tauri/entitlements.plist
@@ -12,19 +12,5 @@
    <true/>
    <key>com.apple.security.cs.disable-library-validation</key>
    <true/>
-    <key>com.apple.security.automation.apple-events</key>
-    <true/>
-    <key>com.apple.security.device.audio-input</key>
-    <true/>
-    <key>com.apple.security.device.camera</key>
-    <true/>
-    <key>com.apple.security.personal-information.addressbook</key>
-    <true/>
-    <key>com.apple.security.personal-information.calendars</key>
-    <true/>
-    <key>com.apple.security.personal-information.location</key>
-    <true/>
-    <key>com.apple.security.personal-information.photos-library</key>
-    <true/>
 </dict>
 </plist>
--- a/packages/desktop/src-tauri/src/cli.rs
+++ b/packages/desktop/src-tauri/src/cli.rs
@@ -1,5 +1,3 @@
-use tauri::Manager;
-
 const CLI_INSTALL_DIR: &str = ".opencode/bin";
 const CLI_BINARY_NAME: &str = "opencode";

@@ -11,10 +9,9 @@ fn get_cli_install_path() -> Option<std::path::PathBuf> {
    })
 }

-pub fn get_sidecar_path(app: &tauri::AppHandle) -> std::path::PathBuf {
-    // Get binary with symlinks support
-    tauri::process::current_binary(&app.env())
-        .expect("Failed to get current binary")
+pub fn get_sidecar_path() -> std::path::PathBuf {
+    tauri::utils::platform::current_exe()
+        .expect("Failed to get current exe")
        .parent()
        .expect("Failed to get parent dir")
        .join("opencode-cli")
@@ -29,12 +26,12 @@ fn is_cli_installed() -> bool {
 const INSTALL_SCRIPT: &str = include_str!("../../../../install");

 #[tauri::command]
-pub fn install_cli(app: tauri::AppHandle) -> Result<String, String> {
+pub fn install_cli() -> Result<String, String> {
    if cfg!(not(unix)) {
        return Err("CLI installation is only supported on macOS & Linux".to_string());
    }

-    let sidecar = get_sidecar_path(&app);
+    let sidecar = get_sidecar_path();
    if !sidecar.exists() {
        return Err("Sidecar binary not found".to_string());
    }
@@ -111,7 +108,7 @@ pub fn sync_cli(app: tauri::AppHandle) -> Result<(), String> {
        cli_version, app_version
    );

-    install_cli(app)?;
+    install_cli()?;

    println!("Synced installed CLI");

--- a/packages/desktop/src-tauri/src/lib.rs
+++ b/packages/desktop/src-tauri/src/lib.rs
@@ -2,7 +2,6 @@ mod cli;
 mod window_customizer;

 use cli::{get_sidecar_path, install_cli, sync_cli};
-use futures::FutureExt;
 use std::{
    collections::VecDeque,
    net::{SocketAddr, TcpListener},
@@ -10,9 +9,10 @@ use std::{
    time::{Duration, Instant},
 };
 use tauri::{
-    path::BaseDirectory, AppHandle, LogicalSize, Manager, RunEvent, State, WebviewUrl,
-    WebviewWindow,
+    path::BaseDirectory, AppHandle, LogicalSize, Manager, RunEvent, WebviewUrl, WebviewWindow,
 };
+use tauri_plugin_clipboard_manager::ClipboardExt;
+use tauri_plugin_dialog::{DialogExt, MessageDialogButtons, MessageDialogResult};
 use tauri_plugin_shell::process::{CommandChild, CommandEvent};
 use tauri_plugin_shell::ShellExt;
 use tokio::net::TcpSocket;
@@ -20,26 +20,7 @@ use tokio::net::TcpSocket;
 use crate::window_customizer::PinchZoomDisablePlugin;

 #[derive(Clone)]
-struct ServerState {
-    child: Arc<Mutex<Option<CommandChild>>>,
-    status: futures::future::Shared<tokio::sync::oneshot::Receiver<Result<(), String>>>,
-}
-
-impl ServerState {
-    pub fn new(
-        child: Option<CommandChild>,
-        status: tokio::sync::oneshot::Receiver<Result<(), String>>,
-    ) -> Self {
-        Self {
-            child: Arc::new(Mutex::new(child)),
-            status: status.shared(),
-        }
-    }
-
-    pub fn set_child(&self, child: Option<CommandChild>) {
-        *self.child.lock().unwrap() = child;
-    }
-}
+struct ServerState(Arc<Mutex<Option<CommandChild>>>);

 #[derive(Clone)]
 struct LogState(Arc<Mutex<VecDeque<String>>>);
@@ -54,7 +35,7 @@ fn kill_sidecar(app: AppHandle) {
    };

    let Some(server_state) = server_state
-        .child
+        .0
        .lock()
        .expect("Failed to acquire mutex lock")
        .take()
@@ -68,6 +49,25 @@ fn kill_sidecar(app: AppHandle) {
    println!("Killed server");
 }

+#[tauri::command]
+async fn copy_logs_to_clipboard(app: AppHandle) -> Result<(), String> {
+    let log_state = app.try_state::<LogState>().ok_or("Log state not found")?;
+
+    let logs = log_state
+        .0
+        .lock()
+        .map_err(|_| "Failed to acquire log lock")?;
+
+    let log_text = logs.iter().cloned().collect::<Vec<_>>().join("");
+
+    app.clipboard()
+        .write_text(log_text)
+        .map_err(|e| format!("Failed to copy to clipboard: {}", e))?;
+
+    Ok(())
+}
+
+#[tauri::command]
 async fn get_logs(app: AppHandle) -> Result<String, String> {
    let log_state = app.try_state::<LogState>().ok_or("Log state not found")?;

@@ -79,15 +79,6 @@ async fn get_logs(app: AppHandle) -> Result<String, String> {
    Ok(logs.iter().cloned().collect::<Vec<_>>().join(""))
 }

-#[tauri::command]
-async fn ensure_server_started(state: State<'_, ServerState>) -> Result<(), String> {
-    state
-        .status
-        .clone()
-        .await
-        .map_err(|_| "Failed to get server status".to_string())?
-}
-
 fn get_sidecar_port() -> u32 {
    option_env!("OPENCODE_PORT")
        .map(|s| s.to_string())
@@ -129,7 +120,7 @@ fn spawn_sidecar(app: &AppHandle, port: u32) -> CommandChild {

    #[cfg(not(target_os = "windows"))]
    let (mut rx, child) = {
-        let sidecar = get_sidecar_path(app);
+        let sidecar = get_sidecar_path();
        let shell = get_user_shell();
        app.shell()
            .command(&shell)
@@ -139,7 +130,7 @@ fn spawn_sidecar(app: &AppHandle, port: u32) -> CommandChild {
            .args([
                "-il",
                "-c",
-                &format!("\"{}\" serve --port={}", sidecar.display(), port),
+                &format!("{} serve --port={}", sidecar.display(), port),
            ])
            .spawn()
            .expect("Failed to spawn opencode")
@@ -218,8 +209,9 @@ pub fn run() {
        .plugin(PinchZoomDisablePlugin)
        .invoke_handler(tauri::generate_handler![
            kill_sidecar,
-            install_cli,
-            ensure_server_started
+            copy_logs_to_clipboard,
+            get_logs,
+            install_cli
        ])
        .setup(move |app| {
            let app = app.handle().clone();
@@ -227,93 +219,94 @@ pub fn run() {
            // Initialize log state
            app.manage(LogState(Arc::new(Mutex::new(VecDeque::new()))));

-            // Get port and create window immediately for faster perceived startup
-            let port = get_sidecar_port();
-
-            let primary_monitor = app.primary_monitor().ok().flatten();
-            let size = primary_monitor
-                .map(|m| m.size().to_logical(m.scale_factor()))
-                .unwrap_or(LogicalSize::new(1920, 1080));
-
-            // Create window immediately with serverReady = false
-            let mut window_builder =
-                WebviewWindow::builder(&app, "main", WebviewUrl::App("/".into()))
-                    .title("OpenCode")
-                    .inner_size(size.width as f64, size.height as f64)
-                    .decorations(true)
-                    .zoom_hotkeys_enabled(true)
-                    .disable_drag_drop_handler()
-                    .initialization_script(format!(
-                        r#"
-                      window.__OPENCODE__ ??= {{}};
-                      window.__OPENCODE__.updaterEnabled = {updater_enabled};
-                      window.__OPENCODE__.port = {port};
-                    "#
-                    ));
-
-            #[cfg(target_os = "macos")]
            {
-                window_builder = window_builder
-                    .title_bar_style(tauri::TitleBarStyle::Overlay)
-                    .hidden_title(true);
-            }
+              let app = app.clone();
+              tauri::async_runtime::spawn(async move {
+                  let port = get_sidecar_port();

-            let window = window_builder.build().expect("Failed to create window");
+                  let should_spawn_sidecar = !is_server_running(port).await;

-            let (tx, rx) = tokio::sync::oneshot::channel();
-            app.manage(ServerState::new(None, rx));
+                  let child = if should_spawn_sidecar {
+                      let child = spawn_sidecar(&app, port);

-            {
-                let app = app.clone();
-                tauri::async_runtime::spawn(async move {
-                    let should_spawn_sidecar = !is_server_running(port).await;
+                      let timestamp = Instant::now();
+                      loop {
+                          if timestamp.elapsed() > Duration::from_secs(7) {
+                              let res = app.dialog()
+                                .message("Failed to spawn OpenCode Server. Copy logs using the button below and send them to the team for assistance.")
+                                .title("Startup Failed")
+                                .buttons(MessageDialogButtons::OkCancelCustom("Copy Logs And Exit".to_string(), "Exit".to_string()))
+                                .blocking_show_with_result();

-                    let (child, res) = if should_spawn_sidecar {
-                        let child = spawn_sidecar(&app, port);
+                              if matches!(&res, MessageDialogResult::Custom(name) if name == "Copy Logs And Exit") {
+                                  match copy_logs_to_clipboard(app.clone()).await {
+                                      Ok(()) => println!("Logs copied to clipboard successfully"),
+                                      Err(e) => println!("Failed to copy logs to clipboard: {}", e),
+                                  }
+                              }

-                        let timestamp = Instant::now();
-                        let res = loop {
-                            if timestamp.elapsed() > Duration::from_secs(7) {
-                                break Err(format!(
-                                    "Failed to spawn OpenCode Server. Logs:\n{}",
-                                    get_logs(app.clone()).await.unwrap()
-                                ));
-                            }
+                              app.exit(1);

-                            tokio::time::sleep(Duration::from_millis(10)).await;
+                              return;
+                          }

-                            if is_server_running(port).await {
-                                // give the server a little bit more time to warm up
-                                tokio::time::sleep(Duration::from_millis(10)).await;
+                          tokio::time::sleep(Duration::from_millis(10)).await;

-                                break Ok(());
-                            }
-                        };
+                          if is_server_running(port).await {
+                              // give the server a little bit more time to warm up
+                              tokio::time::sleep(Duration::from_millis(10)).await;

-                        println!("Server ready after {:?}", timestamp.elapsed());
+                              break;
+                          }
+                      }

-                        (Some(child), res)
-                    } else {
-                        (None, Ok(()))
-                    };
+                      println!("Server ready after {:?}", timestamp.elapsed());

-                    app.state::<ServerState>().set_child(child);
+                      Some(child)
+                  } else {
+                      None
+                  };

-                    if res.is_ok() {
-                        let _ = window.eval("window.__OPENCODE__.serverReady = true;");
-                    }
+                  let primary_monitor = app.primary_monitor().ok().flatten();
+                  let size = primary_monitor
+                      .map(|m| m.size().to_logical(m.scale_factor()))
+                      .unwrap_or(LogicalSize::new(1920, 1080));

-                    let _ = tx.send(res);
-                });
+                  let mut window_builder =
+                      WebviewWindow::builder(&app, "main", WebviewUrl::App("/".into()))
+                          .title("OpenCode")
+                          .inner_size(size.width as f64, size.height as f64)
+                          .decorations(true)
+                          .zoom_hotkeys_enabled(true)
+                          .disable_drag_drop_handler()
+                          .initialization_script(format!(
+                              r#"
+                            window.__OPENCODE__ ??= {{}};
+                            window.__OPENCODE__.updaterEnabled = {updater_enabled};
+                            window.__OPENCODE__.port = {port};
+                          "#
+                          ));
+
+                  #[cfg(target_os = "macos")]
+                  {
+                      window_builder = window_builder
+                          .title_bar_style(tauri::TitleBarStyle::Overlay)
+                          .hidden_title(true);
+                  }
+
+                  window_builder.build().expect("Failed to create window");
+
+                  app.manage(ServerState(Arc::new(Mutex::new(child))));
+              });
            }

            {
-                let app = app.clone();
-                tauri::async_runtime::spawn(async move {
-                    if let Err(e) = sync_cli(app) {
-                        eprintln!("Failed to sync CLI: {e}");
-                    }
-                });
+              let app = app.clone();
+              tauri::async_runtime::spawn(async move {
+                if let Err(e) = sync_cli(app) {
+                  eprintln!("Failed to sync CLI: {e}");
+                }
+              });
            }

            Ok(())
--- a/packages/desktop/src/index.tsx
+++ b/packages/desktop/src/index.tsx
@@ -1,24 +1,21 @@
 // @refresh reload
 import { render } from "solid-js/web"
-import { AppBaseProviders, AppInterface, PlatformProvider, Platform } from "@opencode-ai/app"
+import { App, PlatformProvider, Platform } from "@opencode-ai/app"
 import { open, save } from "@tauri-apps/plugin-dialog"
 import { open as shellOpen } from "@tauri-apps/plugin-shell"
 import { type as ostype } from "@tauri-apps/plugin-os"
+import { AsyncStorage } from "@solid-primitives/storage"
+import { fetch as tauriFetch } from "@tauri-apps/plugin-http"
+import { Store } from "@tauri-apps/plugin-store"
+
+import { UPDATER_ENABLED } from "./updater"
+import { createMenu } from "./menu"
 import { check, Update } from "@tauri-apps/plugin-updater"
 import { invoke } from "@tauri-apps/api/core"
 import { getCurrentWindow } from "@tauri-apps/api/window"
 import { isPermissionGranted, requestPermission } from "@tauri-apps/plugin-notification"
 import { relaunch } from "@tauri-apps/plugin-process"
-import { AsyncStorage } from "@solid-primitives/storage"
-import { fetch as tauriFetch } from "@tauri-apps/plugin-http"
-import { Store } from "@tauri-apps/plugin-store"
-import { Logo } from "@opencode-ai/ui/logo"
-import { Suspense, createResource, ParentProps } from "solid-js"
-
-import { UPDATER_ENABLED } from "./updater"
-import { createMenu } from "./menu"
 import pkg from "../package.json"
-import { Show } from "solid-js"

 const root = document.getElementById("root")
 if (import.meta.env.DEV && !(root instanceof HTMLElement)) {
@@ -272,36 +269,7 @@ render(() => {
      {ostype() === "macos" && (
        <div class="mx-px bg-background-base border-b border-border-weak-base h-8" data-tauri-drag-region />
      )}
-      <AppBaseProviders>
-        <ServerGate>
-          <AppInterface />
-        </ServerGate>
-      </AppBaseProviders>
+      <App />
    </PlatformProvider>
  )
 }, root!)
-
-// Gate component that waits for the server to be ready
-function ServerGate(props: ParentProps) {
-  const [status] = createResource(async () => {
-    if (window.__OPENCODE__?.serverReady) return
-    return await invoke("ensure_server_started")
-  })
-
-  return (
-    // Not using suspense as not all components are compatible with it (undefined refs)
-    <Show
-      when={status.state !== "pending"}
-      fallback={
-        <div class="h-screen w-screen flex flex-col items-center justify-center bg-background-base">
-          <Logo class="w-xl opacity-12 animate-pulse" />
-          <div class="mt-8 text-14-regular text-text-weak">Starting server...</div>
-        </div>
-      }
-    >
-      {/* Trigger error boundary without rendering the returned value */}
-      {(status(), null)}
-      {props.children}
-    </Show>
-  )
-}
--- a/packages/enterprise/package.json
+++ b/packages/enterprise/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/enterprise",
-  "version": "1.1.8",
+  "version": "1.1.4",
  "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.1.8"
+version = "1.1.4"
 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.1.8/opencode-darwin-arm64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.4/opencode-darwin-arm64.zip"
 cmd = "./opencode"
 args = ["acp"]

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

 [agent_servers.opencode.targets.linux-aarch64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.8/opencode-linux-arm64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.4/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.1.8/opencode-linux-x64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.4/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.1.8/opencode-windows-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.4/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.1.8",
+  "version": "1.1.4",
  "$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.1.8",
+  "version": "1.1.4",
  "name": "opencode",
  "type": "module",
  "license": "MIT",
@@ -72,7 +72,7 @@
    "@clack/prompts": "1.0.0-alpha.1",
    "@hono/standard-validator": "0.1.5",
    "@hono/zod-validator": "catalog:",
-    "@modelcontextprotocol/sdk": "1.25.2",
+    "@modelcontextprotocol/sdk": "1.15.1",
    "@octokit/graphql": "9.0.2",
    "@octokit/rest": "catalog:",
    "@openauthjs/openauth": "catalog:",
@@ -81,8 +81,8 @@
    "@opencode-ai/sdk": "workspace:*",
    "@opencode-ai/util": "workspace:*",
    "@openrouter/ai-sdk-provider": "1.5.2",
-    "@opentui/core": "0.1.71",
-    "@opentui/solid": "0.1.71",
+    "@opentui/core": "0.1.69",
+    "@opentui/solid": "0.1.69",
    "@parcel/watcher": "2.5.1",
    "@pierre/diffs": "catalog:",
    "@solid-primitives/event-bus": "1.1.2",
--- a/packages/opencode/src/acp/agent.ts
+++ b/packages/opencode/src/acp/agent.ts
@@ -167,8 +167,6 @@ export namespace ACP {
                            sessionUpdate: "tool_call_update",
                            toolCallId: part.callID,
                            status: "in_progress",
-                            kind: toToolKind(part.tool),
-                            title: part.tool,
                            locations: toLocations(part.tool, part.state.input),
                            rawInput: part.state.input,
                          },
@@ -244,7 +242,6 @@ export namespace ACP {
                            kind,
                            content,
                            title: part.state.title,
-                            rawInput: part.state.input,
                            rawOutput: {
                              output: part.state.output,
                              metadata: part.state.metadata,
@@ -263,9 +260,6 @@ export namespace ACP {
                            sessionUpdate: "tool_call_update",
                            toolCallId: part.callID,
                            status: "failed",
-                            kind: toToolKind(part.tool),
-                            title: part.tool,
-                            rawInput: part.state.input,
                            content: [
                              {
                                type: "content",
@@ -497,8 +491,6 @@ export namespace ACP {
                    sessionUpdate: "tool_call_update",
                    toolCallId: part.callID,
                    status: "in_progress",
-                    kind: toToolKind(part.tool),
-                    title: part.tool,
                    locations: toLocations(part.tool, part.state.input),
                    rawInput: part.state.input,
                  },
@@ -574,7 +566,6 @@ export namespace ACP {
                    kind,
                    content,
                    title: part.state.title,
-                    rawInput: part.state.input,
                    rawOutput: {
                      output: part.state.output,
                      metadata: part.state.metadata,
@@ -593,9 +584,6 @@ export namespace ACP {
                    sessionUpdate: "tool_call_update",
                    toolCallId: part.callID,
                    status: "failed",
-                    kind: toToolKind(part.tool),
-                    title: part.tool,
-                    rawInput: part.state.input,
                    content: [
                      {
                        type: "content",
--- a/packages/opencode/src/agent/agent.ts
+++ b/packages/opencode/src/agent/agent.ts
@@ -4,7 +4,6 @@ import { Provider } from "../provider/provider"
 import { generateObject, type ModelMessage } from "ai"
 import { SystemPrompt } from "../session/system"
 import { Instance } from "../project/instance"
-import { Truncate } from "../tool/truncation"

 import PROMPT_GENERATE from "./generate.txt"
 import PROMPT_COMPACTION from "./prompt/compaction.txt"
@@ -47,11 +46,7 @@ export namespace Agent {
    const defaults = PermissionNext.fromConfig({
      "*": "allow",
      doom_loop: "ask",
-      external_directory: {
-        "*": "ask",
-        [Truncate.DIR]: "allow",
-      },
-      question: "deny",
+      external_directory: "ask",
      // mirrors github.com/github/gitignore Node.gitignore pattern for .env files
      read: {
        "*": "allow",
@@ -66,13 +61,7 @@ export namespace Agent {
      build: {
        name: "build",
        options: {},
-        permission: PermissionNext.merge(
-          defaults,
-          PermissionNext.fromConfig({
-            question: "allow",
-          }),
-          user,
-        ),
+        permission: PermissionNext.merge(defaults, user),
        mode: "primary",
        native: true,
      },
@@ -82,7 +71,6 @@ export namespace Agent {
        permission: PermissionNext.merge(
          defaults,
          PermissionNext.fromConfig({
-            question: "allow",
            edit: {
              "*": "deny",
              ".opencode/plan/*.md": "allow",
@@ -107,6 +95,7 @@ export namespace Agent {
        options: {},
        mode: "subagent",
        native: true,
+        hidden: true,
      },
      explore: {
        name: "explore",
@@ -122,9 +111,6 @@ export namespace Agent {
            websearch: "allow",
            codesearch: "allow",
            read: "allow",
-            external_directory: {
-              [Truncate.DIR]: "allow",
-            },
          }),
          user,
        ),
@@ -155,7 +141,6 @@ export namespace Agent {
        options: {},
        native: true,
        hidden: true,
-        temperature: 0.5,
        permission: PermissionNext.merge(
          defaults,
          PermissionNext.fromConfig({
@@ -209,21 +194,6 @@ export namespace Agent {
      item.options = mergeDeep(item.options, value.options ?? {})
      item.permission = PermissionNext.merge(item.permission, PermissionNext.fromConfig(value.permission ?? {}))
    }
-
-    // Ensure Truncate.DIR is allowed unless explicitly configured
-    for (const name in result) {
-      const agent = result[name]
-      const explicit = agent.permission.some(
-        (r) => r.permission === "external_directory" && r.pattern === Truncate.DIR && r.action === "deny",
-      )
-      if (explicit) continue
-
-      result[name].permission = PermissionNext.merge(
-        result[name].permission,
-        PermissionNext.fromConfig({ external_directory: { [Truncate.DIR]: "allow" } }),
-      )
-    }
-
    return result
  })

--- a/packages/opencode/src/agent/prompt/title.txt
+++ b/packages/opencode/src/agent/prompt/title.txt
@@ -12,11 +12,8 @@ Your output must be:
 </task>

 <rules>
- Title must be grammatically correct and read naturally - no word salad
- Never include tool names in the title (e.g. "read tool", "bash tool", "edit tool")
 - Focus on the main topic or question the user needs to retrieve
- Vary your phrasing - avoid repetitive patterns like always starting with "Analyzing"
- When a file is mentioned, focus on WHAT the user wants to do WITH the file, not just that they shared it
+- Use -ing verbs for actions (Debugging, Implementing, Analyzing)
 - Keep exact: technical terms, numbers, filenames, HTTP codes
 - Remove: the, this, my, a, an
 - Never assume tech stack
@@ -32,12 +29,8 @@ Your output must be:
 <examples>
 "debug 500 errors in production" → Debugging production 500 errors
 "refactor user service" → Refactoring user service
-"why is app.js failing" → app.js failure investigation
-"implement rate limiting" → Rate limiting implementation
-"how do I connect postgres to my API" → Postgres API connection
+"why is app.js failing" → Analyzing app.js failure
+"implement rate limiting" → Implementing rate limiting
+"how do I connect postgres to my API" → Connecting Postgres to API
 "best practices for React hooks" → React hooks best practices
-"@src/auth.ts can you add refresh token support" → Auth refresh token support
-"@utils/parser.ts this is broken" → Parser bug fix
-"look at @config.json" → Config review
-"@App.tsx add dark mode toggle" → Dark mode toggle in App
 </examples>
--- a/packages/opencode/src/cli/cmd/debug/agent.ts
+++ b/packages/opencode/src/cli/cmd/debug/agent.ts
@@ -6,7 +6,6 @@ import { cmd } from "../cmd"

 export const AgentCommand = cmd({
  command: "agent <name>",
-  describe: "show agent configuration details",
  builder: (yargs) =>
    yargs.positional("name", {
      type: "string",
--- a/packages/opencode/src/cli/cmd/debug/config.ts
+++ b/packages/opencode/src/cli/cmd/debug/config.ts
@@ -5,7 +5,6 @@ import { cmd } from "../cmd"

 export const ConfigCommand = cmd({
  command: "config",
-  describe: "show resolved configuration",
  builder: (yargs) => yargs,
  async handler() {
    await bootstrap(process.cwd(), async () => {
--- a/packages/opencode/src/cli/cmd/debug/file.ts
+++ b/packages/opencode/src/cli/cmd/debug/file.ts
@@ -6,7 +6,6 @@ import { Ripgrep } from "@/file/ripgrep"

 const FileSearchCommand = cmd({
  command: "search <query>",
-  describe: "search files by query",
  builder: (yargs) =>
    yargs.positional("query", {
      type: "string",
@@ -23,7 +22,6 @@ const FileSearchCommand = cmd({

 const FileReadCommand = cmd({
  command: "read <path>",
-  describe: "read file contents as JSON",
  builder: (yargs) =>
    yargs.positional("path", {
      type: "string",
@@ -40,7 +38,6 @@ const FileReadCommand = cmd({

 const FileStatusCommand = cmd({
  command: "status",
-  describe: "show file status information",
  builder: (yargs) => yargs,
  async handler() {
    await bootstrap(process.cwd(), async () => {
@@ -52,7 +49,6 @@ const FileStatusCommand = cmd({

 const FileListCommand = cmd({
  command: "list <path>",
-  describe: "list files in a directory",
  builder: (yargs) =>
    yargs.positional("path", {
      type: "string",
@@ -69,7 +65,6 @@ const FileListCommand = cmd({

 const FileTreeCommand = cmd({
  command: "tree [dir]",
-  describe: "show directory tree",
  builder: (yargs) =>
    yargs.positional("dir", {
      type: "string",
@@ -84,7 +79,6 @@ const FileTreeCommand = cmd({

 export const FileCommand = cmd({
  command: "file",
-  describe: "file system debugging utilities",
  builder: (yargs) =>
    yargs
      .command(FileReadCommand)
--- a/packages/opencode/src/cli/cmd/debug/index.ts
+++ b/packages/opencode/src/cli/cmd/debug/index.ts
@@ -12,7 +12,6 @@ import { AgentCommand } from "./agent"

 export const DebugCommand = cmd({
  command: "debug",
-  describe: "debugging and troubleshooting tools",
  builder: (yargs) =>
    yargs
      .command(ConfigCommand)
@@ -26,7 +25,6 @@ export const DebugCommand = cmd({
      .command(PathsCommand)
      .command({
        command: "wait",
-        describe: "wait indefinitely (for debugging)",
        async handler() {
          await bootstrap(process.cwd(), async () => {
            await new Promise((resolve) => setTimeout(resolve, 1_000 * 60 * 60 * 24))
@@ -39,7 +37,6 @@ export const DebugCommand = cmd({

 const PathsCommand = cmd({
  command: "paths",
-  describe: "show global paths (data, config, cache, state)",
  handler() {
    for (const [key, value] of Object.entries(Global.Path)) {
      console.log(key.padEnd(10), value)
--- a/packages/opencode/src/cli/cmd/debug/lsp.ts
+++ b/packages/opencode/src/cli/cmd/debug/lsp.ts
@@ -6,7 +6,6 @@ import { EOL } from "os"

 export const LSPCommand = cmd({
  command: "lsp",
-  describe: "LSP debugging utilities",
  builder: (yargs) =>
    yargs.command(DiagnosticsCommand).command(SymbolsCommand).command(DocumentSymbolsCommand).demandCommand(),
  async handler() {},
@@ -14,7 +13,6 @@ export const LSPCommand = cmd({

 const DiagnosticsCommand = cmd({
  command: "diagnostics <file>",
-  describe: "get diagnostics for a file",
  builder: (yargs) => yargs.positional("file", { type: "string", demandOption: true }),
  async handler(args) {
    await bootstrap(process.cwd(), async () => {
@@ -27,7 +25,6 @@ const DiagnosticsCommand = cmd({

 export const SymbolsCommand = cmd({
  command: "symbols <query>",
-  describe: "search workspace symbols",
  builder: (yargs) => yargs.positional("query", { type: "string", demandOption: true }),
  async handler(args) {
    await bootstrap(process.cwd(), async () => {
@@ -40,7 +37,6 @@ export const SymbolsCommand = cmd({

 export const DocumentSymbolsCommand = cmd({
  command: "document-symbols <uri>",
-  describe: "get symbols from a document",
  builder: (yargs) => yargs.positional("uri", { type: "string", demandOption: true }),
  async handler(args) {
    await bootstrap(process.cwd(), async () => {
--- a/packages/opencode/src/cli/cmd/debug/ripgrep.ts
+++ b/packages/opencode/src/cli/cmd/debug/ripgrep.ts
@@ -6,14 +6,12 @@ import { cmd } from "../cmd"

 export const RipgrepCommand = cmd({
  command: "rg",
-  describe: "ripgrep debugging utilities",
  builder: (yargs) => yargs.command(TreeCommand).command(FilesCommand).command(SearchCommand).demandCommand(),
  async handler() {},
 })

 const TreeCommand = cmd({
  command: "tree",
-  describe: "show file tree using ripgrep",
  builder: (yargs) =>
    yargs.option("limit", {
      type: "number",
@@ -27,7 +25,6 @@ const TreeCommand = cmd({

 const FilesCommand = cmd({
  command: "files",
-  describe: "list files using ripgrep",
  builder: (yargs) =>
    yargs
      .option("query", {
@@ -59,7 +56,6 @@ const FilesCommand = cmd({

 const SearchCommand = cmd({
  command: "search <pattern>",
-  describe: "search file contents using ripgrep",
  builder: (yargs) =>
    yargs
      .positional("pattern", {
--- a/packages/opencode/src/cli/cmd/debug/scrap.ts
+++ b/packages/opencode/src/cli/cmd/debug/scrap.ts
@@ -5,7 +5,6 @@ import { cmd } from "../cmd"

 export const ScrapCommand = cmd({
  command: "scrap",
-  describe: "list all known projects",
  builder: (yargs) => yargs,
  async handler() {
    const timer = Log.Default.time("scrap")
--- a/packages/opencode/src/cli/cmd/debug/skill.ts
+++ b/packages/opencode/src/cli/cmd/debug/skill.ts
@@ -5,7 +5,6 @@ import { cmd } from "../cmd"

 export const SkillCommand = cmd({
  command: "skill",
-  describe: "list all available skills",
  builder: (yargs) => yargs,
  async handler() {
    await bootstrap(process.cwd(), async () => {
--- a/packages/opencode/src/cli/cmd/debug/snapshot.ts
+++ b/packages/opencode/src/cli/cmd/debug/snapshot.ts
@@ -4,14 +4,12 @@ import { cmd } from "../cmd"

 export const SnapshotCommand = cmd({
  command: "snapshot",
-  describe: "snapshot debugging utilities",
  builder: (yargs) => yargs.command(TrackCommand).command(PatchCommand).command(DiffCommand).demandCommand(),
  async handler() {},
 })

 const TrackCommand = cmd({
  command: "track",
-  describe: "track current snapshot state",
  async handler() {
    await bootstrap(process.cwd(), async () => {
      console.log(await Snapshot.track())
@@ -21,7 +19,6 @@ const TrackCommand = cmd({

 const PatchCommand = cmd({
  command: "patch <hash>",
-  describe: "show patch for a snapshot hash",
  builder: (yargs) =>
    yargs.positional("hash", {
      type: "string",
@@ -37,7 +34,6 @@ const PatchCommand = cmd({

 const DiffCommand = cmd({
  command: "diff <hash>",
-  describe: "show diff for a snapshot hash",
  builder: (yargs) =>
    yargs.positional("hash", {
      type: "string",
--- a/packages/opencode/src/cli/cmd/github.ts
+++ b/packages/opencode/src/cli/cmd/github.ts
@@ -515,15 +515,7 @@ export const GithubRunCommand = cmd({

        // Setup opencode session
        const repoData = await fetchRepo()
-        session = await Session.create({
-          permission: [
-            {
-              permission: "question",
-              action: "deny",
-              pattern: "*",
-            },
-          ],
-        })
+        session = await Session.create({})
        subscribeSessionEvents()
        shareId = await (async () => {
          if (share === false) return
--- a/packages/opencode/src/cli/cmd/run.ts
+++ b/packages/opencode/src/cli/cmd/run.ts
@@ -292,28 +292,7 @@ export const RunCommand = cmd({
              : args.title
            : undefined

-        const result = await sdk.session.create(
-          title
-            ? {
-                title,
-                permission: [
-                  {
-                    permission: "question",
-                    action: "deny",
-                    pattern: "*",
-                  },
-                ],
-              }
-            : {
-                permission: [
-                  {
-                    permission: "question",
-                    action: "deny",
-                    pattern: "*",
-                  },
-                ],
-              },
-        )
+        const result = await sdk.session.create(title ? { title } : {})
        return result.data?.id
      })()

--- a/packages/opencode/src/cli/cmd/tui/app.tsx
+++ b/packages/opencode/src/cli/cmd/tui/app.tsx
@@ -97,16 +97,7 @@ async function getTerminalBackgroundColor(): Promise<"dark" | "light"> {
  })
 }

-import type { EventSource } from "./context/sdk"
-
-export function tui(input: {
-  url: string
-  args: Args
-  directory?: string
-  fetch?: typeof fetch
-  events?: EventSource
-  onExit?: () => Promise<void>
-}) {
+export function tui(input: { url: string; args: Args; directory?: string; onExit?: () => Promise<void> }) {
  // promise to prevent immediate exit
  return new Promise<void>(async (resolve) => {
    const mode = await getTerminalBackgroundColor()
@@ -126,12 +117,7 @@ export function tui(input: {
                <KVProvider>
                  <ToastProvider>
                    <RouteProvider>
-                      <SDKProvider
-                        url={input.url}
-                        directory={input.directory}
-                        fetch={input.fetch}
-                        events={input.events}
-                      >
+                      <SDKProvider url={input.url} directory={input.directory}>
                        <SyncProvider>
                          <ThemeProvider mode={mode}>
                            <LocalProvider>
@@ -667,17 +653,9 @@ function ErrorComponent(props: {
  mode?: "dark" | "light"
 }) {
  const term = useTerminalDimensions()
-  const renderer = useRenderer()
-
-  const handleExit = async () => {
-    renderer.setTerminalTitle("")
-    renderer.destroy()
-    props.onExit()
-  }
-
  useKeyboard((evt) => {
    if (evt.ctrl && evt.name === "c") {
-      handleExit()
+      props.onExit()
    }
  })
  const [copied, setCopied] = createSignal(false)
@@ -730,7 +708,7 @@ function ErrorComponent(props: {
        <box onMouseUp={props.reset} backgroundColor={colors.primary} padding={1}>
          <text fg={colors.bg}>Reset TUI</text>
        </box>
-        <box onMouseUp={handleExit} backgroundColor={colors.primary} padding={1}>
+        <box onMouseUp={props.onExit} backgroundColor={colors.primary} padding={1}>
          <text fg={colors.bg}>Exit</text>
        </box>
      </box>
--- a/packages/opencode/src/cli/cmd/tui/component/dialog-model.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-model.tsx
@@ -33,82 +33,76 @@ export function DialogModel(props: { providerID?: string }) {

  const options = createMemo(() => {
    const q = query()
-    const needle = q.trim()
-    const showSections = showExtra() && needle.length === 0
-    const favorites = connected() ? local.model.favorite() : []
+    const favorites = showExtra() ? local.model.favorite() : []
    const recents = local.model.recent()

-    const recentList = showSections
+    const recentList = showExtra()
      ? recents.filter(
          (item) => !favorites.some((fav) => fav.providerID === item.providerID && fav.modelID === item.modelID),
        )
      : []

-    const favoriteOptions = showSections
-      ? favorites.flatMap((item) => {
-          const provider = sync.data.provider.find((x) => x.id === item.providerID)
-          if (!provider) return []
-          const model = provider.models[item.modelID]
-          if (!model) return []
-          return [
-            {
-              key: item,
-              value: {
+    const favoriteOptions = favorites.flatMap((item) => {
+      const provider = sync.data.provider.find((x) => x.id === item.providerID)
+      if (!provider) return []
+      const model = provider.models[item.modelID]
+      if (!model) return []
+      return [
+        {
+          key: item,
+          value: {
+            providerID: provider.id,
+            modelID: model.id,
+          },
+          title: model.name ?? item.modelID,
+          description: provider.name,
+          category: "Favorites",
+          disabled: provider.id === "opencode" && model.id.includes("-nano"),
+          footer: model.cost?.input === 0 && provider.id === "opencode" ? "Free" : undefined,
+          onSelect: () => {
+            dialog.clear()
+            local.model.set(
+              {
                providerID: provider.id,
                modelID: model.id,
              },
-              title: model.name ?? item.modelID,
-              description: provider.name,
-              category: "Favorites",
-              disabled: provider.id === "opencode" && model.id.includes("-nano"),
-              footer: model.cost?.input === 0 && provider.id === "opencode" ? "Free" : undefined,
-              onSelect: () => {
-                dialog.clear()
-                local.model.set(
-                  {
-                    providerID: provider.id,
-                    modelID: model.id,
-                  },
-                  { recent: true },
-                )
-              },
-            },
-          ]
-        })
-      : []
+              { recent: true },
+            )
+          },
+        },
+      ]
+    })

-    const recentOptions = showSections
-      ? recentList.flatMap((item) => {
-          const provider = sync.data.provider.find((x) => x.id === item.providerID)
-          if (!provider) return []
-          const model = provider.models[item.modelID]
-          if (!model) return []
-          return [
-            {
-              key: item,
-              value: {
+    const recentOptions = recentList.flatMap((item) => {
+      const provider = sync.data.provider.find((x) => x.id === item.providerID)
+      if (!provider) return []
+      const model = provider.models[item.modelID]
+      if (!model) return []
+      return [
+        {
+          key: item,
+          value: {
+            providerID: provider.id,
+            modelID: model.id,
+          },
+          title: model.name ?? item.modelID,
+          description: provider.name,
+          category: "Recent",
+          disabled: provider.id === "opencode" && model.id.includes("-nano"),
+          footer: model.cost?.input === 0 && provider.id === "opencode" ? "Free" : undefined,
+          onSelect: () => {
+            dialog.clear()
+            local.model.set(
+              {
                providerID: provider.id,
                modelID: model.id,
              },
-              title: model.name ?? item.modelID,
-              description: provider.name,
-              category: "Recent",
-              disabled: provider.id === "opencode" && model.id.includes("-nano"),
-              footer: model.cost?.input === 0 && provider.id === "opencode" ? "Free" : undefined,
-              onSelect: () => {
-                dialog.clear()
-                local.model.set(
-                  {
-                    providerID: provider.id,
-                    modelID: model.id,
-                  },
-                  { recent: true },
-                )
-              },
-            },
-          ]
-        })
-      : []
+              { recent: true },
+            )
+          },
+        },
+      ]
+    })

    const providerOptions = pipe(
      sync.data.provider,
@@ -151,7 +145,6 @@ export function DialogModel(props: { providerID?: string }) {
            }
          }),
          filter((x) => {
-            if (!showSections) return true
            const value = x.value
            const inFavorites = favorites.some(
              (item) => item.providerID === value.providerID && item.modelID === value.modelID,
@@ -184,11 +177,16 @@ export function DialogModel(props: { providerID?: string }) {
        )
      : []

-    // Search shows a single merged list (favorites inline)
-    if (needle) {
-      const filteredProviders = fuzzysort.go(needle, providerOptions, { keys: ["title", "category"] }).map((x) => x.obj)
-      const filteredPopular = fuzzysort.go(needle, popularProviders, { keys: ["title"] }).map((x) => x.obj)
-      return [...filteredProviders, ...filteredPopular]
+    // Apply fuzzy filtering to each section separately, maintaining section order
+    if (q) {
+      const filteredFavorites = fuzzysort.go(q, favoriteOptions, { keys: ["title"] }).map((x) => x.obj)
+      const filteredRecents = fuzzysort
+        .go(q, recentOptions, { keys: ["title"] })
+        .map((x) => x.obj)
+        .slice(0, 5)
+      const filteredProviders = fuzzysort.go(q, providerOptions, { keys: ["title", "category"] }).map((x) => x.obj)
+      const filteredPopular = fuzzysort.go(q, popularProviders, { keys: ["title"] }).map((x) => x.obj)
+      return [...filteredFavorites, ...filteredRecents, ...filteredProviders, ...filteredPopular]
    }

    return [...favoriteOptions, ...recentOptions, ...providerOptions, ...popularProviders]
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
@@ -53,7 +53,6 @@ export type AutocompleteRef = {

 export type AutocompleteOption = {
  display: string
-  value?: string
  aliases?: string[]
  disabled?: boolean
  description?: string
@@ -222,7 +221,6 @@ export function Autocomplete(props: {
            const isDir = item.endsWith("/")
            return {
              display: Locale.truncateMiddle(filename, width),
-              value: filename,
              isDirectory: isDir,
              path: item,
              onSelect: () => {
@@ -261,10 +259,8 @@ export function Autocomplete(props: {
    const width = props.anchor().width - 4

    for (const res of Object.values(sync.data.mcp_resource)) {
-      const text = `${res.name} (${res.uri})`
      options.push({
-        display: Locale.truncateMiddle(text, width),
-        value: text,
+        display: Locale.truncateMiddle(`${res.name} (${res.uri})`, width),
        description: res.description,
        onSelect: () => {
          insertPart(res.name, {
@@ -489,11 +485,7 @@ export function Autocomplete(props: {
    }

    const result = fuzzysort.go(removeLineRange(currentFilter), mixed, {
-      keys: [
-        (obj) => removeLineRange((obj.value ?? obj.display).trimEnd()),
-        "description",
-        (obj) => obj.aliases?.join(" ") ?? "",
-      ],
+      keys: [(obj) => removeLineRange(obj.display.trimEnd()), "description", (obj) => obj.aliases?.join(" ") ?? ""],
      limit: 10,
      scoreFn: (objResults) => {
        const displayResult = objResults[0]
@@ -661,10 +653,8 @@ export function Autocomplete(props: {
  })

  const height = createMemo(() => {
-    const count = options().length || 1
-    if (!store.visible) return Math.min(10, count)
-    positionTick()
-    return Math.min(10, count, Math.max(1, props.anchor().y))
+    if (options().length) return Math.min(10, options().length)
+    return 1
  })

  let scroll: ScrollBoxRenderable
--- a/packages/opencode/src/cli/cmd/tui/context/kv.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/kv.tsx
@@ -26,7 +26,7 @@ export const { use: useKV, provider: KVProvider } = createSimpleContext({
        return ready()
      },
      signal<T>(name: string, defaultValue: T) {
-        if (kvStore[name] === undefined) setKvStore(name, defaultValue)
+        if (!kvStore[name]) setKvStore(name, defaultValue)
        return [
          function () {
            return result.get(name)
--- a/packages/opencode/src/cli/cmd/tui/context/sdk.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/sdk.tsx
@@ -3,66 +3,21 @@ import { createSimpleContext } from "./helper"
 import { createGlobalEmitter } from "@solid-primitives/event-bus"
 import { batch, onCleanup, onMount } from "solid-js"

-export type EventSource = {
-  on: (handler: (event: Event) => void) => () => void
-}
-
 export const { use: useSDK, provider: SDKProvider } = createSimpleContext({
  name: "SDK",
-  init: (props: { url: string; directory?: string; fetch?: typeof fetch; events?: EventSource }) => {
+  init: (props: { url: string; directory?: string }) => {
    const abort = new AbortController()
    const sdk = createOpencodeClient({
      baseUrl: props.url,
      signal: abort.signal,
      directory: props.directory,
-      fetch: props.fetch,
    })

    const emitter = createGlobalEmitter<{
      [key in Event["type"]]: Extract<Event, { type: key }>
    }>()

-    let queue: Event[] = []
-    let timer: Timer | undefined
-    let last = 0
-
-    const flush = () => {
-      if (queue.length === 0) return
-      const events = queue
-      queue = []
-      timer = undefined
-      last = Date.now()
-      // Batch all event emissions so all store updates result in a single render
-      batch(() => {
-        for (const event of events) {
-          emitter.emit(event.type, event)
-        }
-      })
-    }
-
-    const handleEvent = (event: Event) => {
-      queue.push(event)
-      const elapsed = Date.now() - last
-
-      if (timer) return
-      // If we just flushed recently (within 16ms), batch this with future events
-      // Otherwise, process immediately to avoid latency
-      if (elapsed < 16) {
-        timer = setTimeout(flush, 16)
-        return
-      }
-      flush()
-    }
-
    onMount(async () => {
-      // If an event source is provided, use it instead of SSE
-      if (props.events) {
-        const unsub = props.events.on(handleEvent)
-        onCleanup(unsub)
-        return
-      }
-
-      // Fall back to SSE
      while (true) {
        if (abort.signal.aborted) break
        const events = await sdk.event.subscribe(
@@ -71,9 +26,36 @@ export const { use: useSDK, provider: SDKProvider } = createSimpleContext({
            signal: abort.signal,
          },
        )
+        let queue: Event[] = []
+        let timer: Timer | undefined
+        let last = 0
+
+        const flush = () => {
+          if (queue.length === 0) return
+          const events = queue
+          queue = []
+          timer = undefined
+          last = Date.now()
+          // Batch all event emissions so all store updates result in a single render
+          batch(() => {
+            for (const event of events) {
+              emitter.emit(event.type, event)
+            }
+          })
+        }

        for await (const event of events.stream) {
-          handleEvent(event)
+          queue.push(event)
+          const elapsed = Date.now() - last
+
+          if (timer) continue
+          // If we just flushed recently (within 16ms), batch this with future events
+          // Otherwise, process immediately to avoid latency
+          if (elapsed < 16) {
+            timer = setTimeout(flush, 16)
+            continue
+          }
+          flush()
        }

        // Flush any remaining events
@@ -86,7 +68,6 @@ export const { use: useSDK, provider: SDKProvider } = createSimpleContext({

    onCleanup(() => {
      abort.abort()
-      if (timer) clearTimeout(timer)
    })

    return { client: sdk, event: emitter, url: props.url }
--- a/packages/opencode/src/cli/cmd/tui/context/sync.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/sync.tsx
@@ -8,7 +8,6 @@ import type {
  Todo,
  Command,
  PermissionRequest,
-  QuestionRequest,
  LspStatus,
  McpStatus,
  McpResource,
@@ -43,9 +42,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
      permission: {
        [sessionID: string]: PermissionRequest[]
      }
-      question: {
-        [sessionID: string]: QuestionRequest[]
-      }
      config: Config
      session: Session[]
      session_status: {
@@ -84,7 +80,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
      status: "loading",
      agent: [],
      permission: {},
-      question: {},
      command: [],
      provider: [],
      provider_default: {},
@@ -147,44 +142,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
          break
        }

-        case "question.replied":
-        case "question.rejected": {
-          const requests = store.question[event.properties.sessionID]
-          if (!requests) break
-          const match = Binary.search(requests, event.properties.requestID, (r) => r.id)
-          if (!match.found) break
-          setStore(
-            "question",
-            event.properties.sessionID,
-            produce((draft) => {
-              draft.splice(match.index, 1)
-            }),
-          )
-          break
-        }
-
-        case "question.asked": {
-          const request = event.properties
-          const requests = store.question[request.sessionID]
-          if (!requests) {
-            setStore("question", request.sessionID, [request])
-            break
-          }
-          const match = Binary.search(requests, request.id, (r) => r.id)
-          if (match.found) {
-            setStore("question", request.sessionID, match.index, reconcile(request))
-            break
-          }
-          setStore(
-            "question",
-            request.sessionID,
-            produce((draft) => {
-              draft.splice(match.index, 0, request)
-            }),
-          )
-          break
-        }
-
        case "todo.updated":
          setStore("todo", event.properties.sessionID, event.properties.todos)
          break
--- a/packages/opencode/src/cli/cmd/tui/context/theme.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/theme.tsx
@@ -102,16 +102,15 @@ type Theme = ThemeColors & {
  thinkingOpacity: number
 }

-export function selectedForeground(theme: Theme, bg?: RGBA): RGBA {
+export function selectedForeground(theme: Theme): RGBA {
  // If theme explicitly defines selectedListItemText, use it
  if (theme._hasSelectedListItemText) {
    return theme.selectedListItemText
  }

-  // For transparent backgrounds, calculate contrast based on the actual bg (or fallback to primary)
+  // For transparent backgrounds, calculate contrast based on primary color
  if (theme.background.a === 0) {
-    const targetColor = bg ?? theme.primary
-    const { r, g, b } = targetColor
+    const { r, g, b } = theme.primary
    const luminance = 0.299 * r + 0.587 * g + 0.114 * b
    return luminance > 0.5 ? RGBA.fromInts(0, 0, 0) : RGBA.fromInts(255, 255, 255)
  }
@@ -289,11 +288,11 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({

    createEffect(() => {
      const theme = sync.data.config.theme
+      console.log("theme", theme)
      if (theme) setStore("active", theme)
    })

-    function init() {
-      resolveSystemTheme()
+    createEffect(() => {
      getCustomThemes()
        .then((custom) => {
          setStore(
@@ -310,18 +309,15 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
            setStore("ready", true)
          }
        })
-    }
-
-    onMount(init)
+    })

    function resolveSystemTheme() {
-      console.log("resolveSystemTheme")
+      console.log("resolved system theme")
      renderer
        .getPalette({
          size: 16,
        })
        .then((colors) => {
-          console.log(colors.palette)
          if (!colors.palette[0]) {
            if (store.active === "system") {
              setStore(
@@ -345,9 +341,11 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
    }

    const renderer = useRenderer()
-    process.on("SIGUSR2", async () => {
-      renderer.clearPaletteCache()
-      init()
+    resolveSystemTheme()
+
+    const sdk = useSDK()
+    sdk.event.on("server.instance.disposed", () => {
+      resolveSystemTheme()
    })

    const values = createMemo(() => {
--- a/packages/opencode/src/cli/cmd/tui/context/theme/lucent-orng.json
+++ b/packages/opencode/src/cli/cmd/tui/context/theme/lucent-orng.json
@@ -61,10 +61,6 @@
      "dark": "darkStep11",
      "light": "lightStep11"
    },
-    "selectedListItemText": {
-      "dark": "#0a0a0a",
-      "light": "#ffffff"
-    },
    "background": {
      "dark": "transparent",
      "light": "transparent"
--- a/packages/opencode/src/cli/cmd/tui/context/theme/orng.json
+++ b/packages/opencode/src/cli/cmd/tui/context/theme/orng.json
@@ -77,10 +77,6 @@
      "dark": "darkStep11",
      "light": "lightStep11"
    },
-    "selectedListItemText": {
-      "dark": "#0a0a0a",
-      "light": "#ffffff"
-    },
    "background": {
      "dark": "darkStep1",
      "light": "lightStep1"
--- a/packages/opencode/src/cli/cmd/tui/routes/session/header.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/header.tsx
@@ -3,8 +3,9 @@ import { useRouteData } from "@tui/context/route"
 import { useSync } from "@tui/context/sync"
 import { pipe, sumBy } from "remeda"
 import { useTheme } from "@tui/context/theme"
-import { SplitBorder } from "@tui/component/border"
+import { SplitBorder, EmptyBorder } from "@tui/component/border"
 import type { AssistantMessage, Session } from "@opencode-ai/sdk/v2"
+import { useDirectory } from "../../context/directory"
 import { useKeybind } from "../../context/keybind"

 const Title = (props: { session: Accessor<Session> }) => {
@@ -32,6 +33,7 @@ export function Header() {
  const sync = useSync()
  const session = createMemo(() => sync.session.get(route.sessionID)!)
  const messages = createMemo(() => sync.data.message[route.sessionID] ?? [])
+  const shareEnabled = createMemo(() => sync.data.config.share !== "disabled")

  const cost = createMemo(() => {
    const total = pipe(
@@ -97,6 +99,24 @@ export function Header() {
              <Title session={session} />
              <ContextInfo context={context} cost={cost} />
            </box>
+            <Show when={shareEnabled()}>
+              <box flexDirection="row" justifyContent="space-between" gap={1}>
+                <box flexGrow={1} flexShrink={1}>
+                  <Switch>
+                    <Match when={session().share?.url}>
+                      <text fg={theme.textMuted} wrapMode="word">
+                        {session().share!.url}
+                      </text>
+                    </Match>
+                    <Match when={true}>
+                      <text fg={theme.text} wrapMode="word">
+                        /share <span style={{ fg: theme.textMuted }}>copy link</span>
+                      </text>
+                    </Match>
+                  </Switch>
+                </box>
+              </box>
+            </Show>
          </Match>
        </Switch>
      </box>
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				ALTER TABLE `billing` ADD CONSTRAINT `global_subscription_id` UNIQUE(`subscription_id`);
				`@@ -1 +0,0 @@`
				ALTER TABLE `billing` ADD `subscription_coupon_id` varchar(28);