fix: style multiple commands in input

2026-01-06 21:40:24 +00:00
170 changed files with 3374 additions and 46160 deletions
@@ -1,136 +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
-            const validPrefixes = ['feat:', 'fix:', 'docs:', 'chore:', 'refactor:', 'test:'];
-            const hasValidTitle = validPrefixes.some(prefix => title.startsWith(prefix));
-
-            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:\` new feature
-            - \`fix:\` bug fix
-            - \`docs:\` documentation changes
-            - \`chore:\` maintenance tasks
-            - \`refactor:\` code refactoring
-            - \`test:\` adding or updating tests
-
-            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 = title.startsWith('docs:') || title.startsWith('refactor:');
-            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) {
-                    closingIssuesReferences(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.closingIssuesReferences.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');
@@ -149,55 +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
-
-Examples:
-
- `docs: update contributing guidelines`
- `fix: resolve crash on startup`
- `feat: add dark mode support`
- `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

@@ -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
@@ -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 分支
@@ -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 以取得最新開發分支
@@ -193,5 +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) |
@@ -1,8 +1,9 @@
 ## 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
+- DO NOT do unnecessary destructuring of variables
+- DO NOT use `else` statements unless necessary
+- DO NOT use `try`/`catch` if it can be avoided
 - AVOID `try`/`catch` where possible
 - AVOID `else` statements
 - AVOID using `any` type
@@ -22,7 +22,7 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "1.1.6",
+      "version": "1.1.3",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -70,7 +70,7 @@
    },
    "packages/console/app": {
      "name": "@opencode-ai/console-app",
-      "version": "1.1.6",
+      "version": "1.1.3",
      "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.6",
+      "version": "1.1.3",
      "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.6",
+      "version": "1.1.3",
      "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.6",
+      "version": "1.1.3",
      "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.6",
+      "version": "1.1.3",
      "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.6",
+      "version": "1.1.3",
      "dependencies": {
        "@opencode-ai/ui": "workspace:*",
        "@opencode-ai/util": "workspace:*",
@@ -231,7 +230,7 @@
    },
    "packages/function": {
      "name": "@opencode-ai/function",
-      "version": "1.1.6",
+      "version": "1.1.3",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -247,7 +246,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "1.1.6",
+      "version": "1.1.3",
      "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:",
@@ -350,7 +349,7 @@
    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
-      "version": "1.1.6",
+      "version": "1.1.3",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "zod": "catalog:",
@@ -370,7 +369,7 @@
    },
    "packages/sdk/js": {
      "name": "@opencode-ai/sdk",
-      "version": "1.1.6",
+      "version": "1.1.3",
      "devDependencies": {
        "@hey-api/openapi-ts": "0.88.1",
        "@tsconfig/node22": "catalog:",
@@ -381,7 +380,7 @@
    },
    "packages/slack": {
      "name": "@opencode-ai/slack",
-      "version": "1.1.6",
+      "version": "1.1.3",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "@slack/bolt": "^3.17.1",
@@ -394,7 +393,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "1.1.6",
+      "version": "1.1.3",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -402,7 +401,6 @@
        "@pierre/diffs": "catalog:",
        "@shikijs/transformers": "3.9.2",
        "@solid-primitives/bounds": "0.1.3",
-        "@solid-primitives/media": "2.3.3",
        "@solid-primitives/resize-observer": "2.1.3",
        "@solidjs/meta": "catalog:",
        "@typescript/native-preview": "catalog:",
@@ -433,7 +431,7 @@
    },
    "packages/util": {
      "name": "@opencode-ai/util",
-      "version": "1.1.6",
+      "version": "1.1.3",
      "dependencies": {
        "zod": "catalog:",
      },
@@ -444,7 +442,7 @@
    },
    "packages/web": {
      "name": "@opencode-ai/web",
-      "version": "1.1.6",
+      "version": "1.1.3",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -911,8 +909,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 +1093,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=="],

@@ -1905,9 +1901,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 +2405,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 +2781,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 +3383,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 +3757,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 +4057,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 +4403,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=="],
@@ -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",
@@ -120,7 +119,6 @@ const ZEN_MODELS = [
  new sst.Secret("ZEN_MODELS6"),
  new sst.Secret("ZEN_MODELS7"),
 ]
-const ZEN_BLACK = new sst.Secret("ZEN_BLACK")
 const STRIPE_SECRET_KEY = new sst.Secret("STRIPE_SECRET_KEY")
 const AUTH_API_URL = new sst.Linkable("AUTH_API_URL", {
  properties: { value: auth.url.apply((url) => url!) },
@@ -162,7 +160,6 @@ new sst.cloudflare.x.SolidStart("Console", {
    EMAILOCTOPUS_API_KEY,
    AWS_SES_ACCESS_KEY_ID,
    AWS_SES_SECRET_ACCESS_KEY,
-    ZEN_BLACK,
    ...ZEN_MODELS,
    ...($dev
      ? [
@@ -1,3 +1,3 @@
 {
-  "nodeModules": "sha256-rNGq0yjL5ZHYVg+zyV4nFPug4gqhKhyOnfebaufyd34="
+  "nodeModules": "sha256-mZGKIkOLmesEhCpEZTLiPbBisZOxdZ1NgqnRnVHJlLU="
 }
@@ -60,12 +60,7 @@ const result = await Bun.build({
  compile: {
    target,
    outfile: "opencode",
-    autoloadBunfig: false,
-    autoloadDotenv: false,
-    //@ts-ignore (bun types aren't up to date)
-    autoloadTsconfig: true,
-    autoloadPackageJson: true,
-    execArgv: ["--user-agent=opencode/" + version, "--use-system-ca", "--"],
+    execArgv: ["--user-agent=opencode/" + version, '--env-file=""', "--"],
    windows: {},
  },
 })
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.1.6",
+  "version": "1.1.3",
  "description": "",
  "type": "module",
  "exports": {
@@ -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,56 +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={(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>
+    <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>
  )
 }
@@ -42,7 +42,7 @@ import { ModelSelectorPopover } from "@/components/dialog-select-model"
 import { DialogSelectModelUnpaid } from "@/components/dialog-select-model-unpaid"
 import { useProviders } from "@/hooks/use-providers"
 import { useCommand } from "@/context/command"
-import { Persist, persisted } from "@/utils/persist"
+import { persisted } from "@/utils/persist"
 import { Identifier } from "@/utils/id"
 import { SessionContextUsage } from "@/components/session-context-usage"
 import { usePermission } from "@/context/permission"
@@ -189,7 +189,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {

  const MAX_HISTORY = 100
  const [history, setHistory] = persisted(
-    Persist.global("prompt-history", ["prompt-history.v1"]),
+    "prompt-history.v1",
    createStore<{
      entries: Prompt[]
    }>({
@@ -197,7 +197,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    }),
  )
  const [shellHistory, setShellHistory] = persisted(
-    Persist.global("prompt-history-shell", ["prompt-history-shell.v1"]),
+    "prompt-history-shell.v1",
    createStore<{
      entries: Prompt[]
    }>({
@@ -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}
@@ -1592,14 +1593,14 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                      onClick={() => permission.toggleAutoAccept(params.id!, sdk.directory)}
                      classList={{
                        "_hidden group-hover/prompt-input:flex size-6 items-center justify-center": true,
-                        "text-text-base": !permission.isAutoAccepting(params.id!, sdk.directory),
-                        "hover:bg-surface-success-base": permission.isAutoAccepting(params.id!, sdk.directory),
+                        "text-text-base": !permission.isAutoAccepting(params.id!),
+                        "hover:bg-surface-success-base": permission.isAutoAccepting(params.id!),
                      }}
                    >
                      <Icon
                        name="chevron-double-right"
                        size="small"
-                        classList={{ "text-icon-success-base": permission.isAutoAccepting(params.id!, sdk.directory) }}
+                        classList={{ "text-icon-success-base": permission.isAutoAccepting(params.id!) }}
                      />
                    </Button>
                  </TooltipKeybind>
@@ -3,7 +3,7 @@ import { ComponentProps, createEffect, createSignal, onCleanup, onMount, splitPr
 import { useSDK } from "@/context/sdk"
 import { SerializeAddon } from "@/addons/serialize"
 import { LocalPTY } from "@/context/terminal"
-import { resolveThemeVariant, useTheme, withAlpha, type HexColor } from "@opencode-ai/ui/theme"
+import { resolveThemeVariant, useTheme } from "@opencode-ai/ui/theme"

 export interface TerminalProps extends ComponentProps<"div"> {
  pty: LocalPTY
@@ -16,7 +16,6 @@ type TerminalColors = {
  background: string
  foreground: string
  cursor: string
-  selectionBackground: string
 }

 const DEFAULT_TERMINAL_COLORS: Record<"light" | "dark", TerminalColors> = {
@@ -24,13 +23,11 @@ const DEFAULT_TERMINAL_COLORS: Record<"light" | "dark", TerminalColors> = {
    background: "#fcfcfc",
    foreground: "#211e1e",
    cursor: "#211e1e",
-    selectionBackground: withAlpha("#211e1e", 0.2),
  },
  dark: {
    background: "#191515",
    foreground: "#d4d4d4",
    cursor: "#d4d4d4",
-    selectionBackground: withAlpha("#d4d4d4", 0.25),
  },
 }

@@ -58,14 +55,10 @@ export const Terminal = (props: TerminalProps) => {
    const resolved = resolveThemeVariant(variant, mode === "dark")
    const text = resolved["text-stronger"] ?? fallback.foreground
    const background = resolved["background-stronger"] ?? fallback.background
-    const alpha = mode === "dark" ? 0.25 : 0.2
-    const base = text.startsWith("#") ? (text as HexColor) : (fallback.foreground as HexColor)
-    const selectionBackground = withAlpha(base, alpha)
    return {
      background,
      foreground: text,
      cursor: text,
-      selectionBackground,
    }
  }

@@ -1,4 +1,4 @@
-import { createEffect, createMemo, onCleanup } from "solid-js"
+import { createMemo, onCleanup } from "solid-js"
 import { createStore, produce } from "solid-js/store"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import type { FileContent } from "@opencode-ai/sdk/v2"
@@ -7,7 +7,7 @@ import { useParams } from "@solidjs/router"
 import { getFilename } from "@opencode-ai/util/path"
 import { useSDK } from "./sdk"
 import { useSync } from "./sync"
-import { Persist, persisted } from "@/utils/persist"
+import { persisted } from "@/utils/persist"

 export type FileSelection = {
  startLine: number
@@ -134,10 +134,10 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
      file: {},
    })

-    const legacyViewKey = createMemo(() => `${params.dir}/file${params.id ? "/" + params.id : ""}.v1`)
+    const viewKey = createMemo(() => `${params.dir}/file${params.id ? "/" + params.id : ""}.v1`)

    const [view, setView, _, ready] = persisted(
-      Persist.scoped(params.dir!, params.id, "file-view", [legacyViewKey()]),
+      viewKey(),
      createStore<{
        file: Record<string, FileViewState>
      }>({
@@ -145,32 +145,6 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
      }),
    )

-    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]
-          }
-        }),
-      )
-    }
-
-    createEffect(() => {
-      if (!ready()) return
-      if (viewMeta.pruned) return
-      viewMeta.pruned = true
-      pruneView()
-    })
-
    function ensure(path: string) {
      if (!path) return
      if (store.file[path]) return
@@ -259,7 +233,6 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
          scrollTop: top,
        }
      })
-      pruneView(path)
    }

    const setScrollLeft = (input: string, left: number) => {
@@ -271,7 +244,6 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
          scrollLeft: left,
        }
      })
-      pruneView(path)
    }

    const setSelectedLines = (input: string, range: SelectedLineRange | null) => {
@@ -284,7 +256,6 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
          selectedLines: next,
        }
      })
-      pruneView(path)
    }

    onCleanup(() => stop())
@@ -5,7 +5,7 @@ import { useGlobalSync } from "./global-sync"
 import { useGlobalSDK } from "./global-sdk"
 import { useServer } from "./server"
 import { Project } from "@opencode-ai/sdk/v2"
-import { Persist, persisted, removePersisted } from "@/utils/persist"
+import { persisted } from "@/utils/persist"
 import { same } from "@/utils/same"
 import { createScrollPersistence, type SessionScroll } from "./layout-scroll"

@@ -46,7 +46,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
    const globalSync = useGlobalSync()
    const server = useServer()
    const [store, setStore, _, ready] = persisted(
-      Persist.global("layout", ["layout.v6"]),
+      "layout.v6",
      createStore({
        sidebar: {
          opened: false,
@@ -75,29 +75,6 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
    const meta = { active: undefined as string | undefined, pruned: false }
    const used = new Map<string, number>()

-    const SESSION_STATE_KEYS = [
-      { key: "prompt", legacy: "prompt", version: "v2" },
-      { key: "terminal", legacy: "terminal", version: "v1" },
-      { key: "file-view", legacy: "file", version: "v1" },
-    ] as const
-
-    const dropSessionState = (keys: string[]) => {
-      for (const key of keys) {
-        const parts = key.split("/")
-        const dir = parts[0]
-        const session = parts[1]
-        if (!dir) continue
-
-        for (const entry of SESSION_STATE_KEYS) {
-          const target = session ? Persist.session(dir, session, entry.key) : Persist.workspace(dir, entry.key)
-          void removePersisted(target)
-
-          const legacyKey = `${dir}/${entry.legacy}${session ? "/" + session : ""}.${entry.version}`
-          void removePersisted({ key: legacyKey })
-        }
-      }
-    }
-
    function prune(keep?: string) {
      if (!keep) return

@@ -125,7 +102,6 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
      )

      scroll.drop(drop)
-      dropSessionState(drop)

      for (const key of drop) {
        used.delete(key)
@@ -8,7 +8,7 @@ import { useSync } from "./sync"
 import { base64Encode } from "@opencode-ai/util/encode"
 import { useProviders } from "@/hooks/use-providers"
 import { DateTime } from "luxon"
-import { Persist, persisted } from "@/utils/persist"
+import { persisted } from "@/utils/persist"
 import { showToast } from "@opencode-ai/ui/toast"

 export type LocalFile = FileNode &
@@ -111,7 +111,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({

    const model = (() => {
      const [store, setStore, _, modelReady] = persisted(
-        Persist.global("model", ["model.v1"]),
+        "model.v1",
        createStore<{
          user: (ModelKey & { visibility: "show" | "hide"; favorite?: boolean })[]
          recent: ModelKey[]
@@ -1,5 +1,5 @@
 import { createStore } from "solid-js/store"
-import { createEffect, onCleanup } from "solid-js"
+import { onCleanup } from "solid-js"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import { useGlobalSDK } from "./global-sdk"
 import { useGlobalSync } from "./global-sync"
@@ -10,7 +10,7 @@ import { EventSessionError } from "@opencode-ai/sdk/v2"
 import { makeAudioPlayer } from "@solid-primitives/audio"
 import idleSound from "@opencode-ai/ui/audio/staplebops-01.aac"
 import errorSound from "@opencode-ai/ui/audio/nope-03.aac"
-import { Persist, persisted } from "@/utils/persist"
+import { persisted } from "@/utils/persist"

 type NotificationBase = {
  directory?: string
@@ -31,16 +31,6 @@ type ErrorNotification = NotificationBase & {

 export type Notification = TurnCompleteNotification | ErrorNotification

-const MAX_NOTIFICATIONS = 500
-const NOTIFICATION_TTL_MS = 1000 * 60 * 60 * 24 * 30
-
-function pruneNotifications(list: Notification[]) {
-  const cutoff = Date.now() - NOTIFICATION_TTL_MS
-  const pruned = list.filter((n) => n.time >= cutoff)
-  if (pruned.length <= MAX_NOTIFICATIONS) return pruned
-  return pruned.slice(pruned.length - MAX_NOTIFICATIONS)
-}
-
 export const { use: useNotification, provider: NotificationProvider } = createSimpleContext({
  name: "Notification",
  init: () => {
@@ -59,25 +49,12 @@ export const { use: useNotification, provider: NotificationProvider } = createSi
    const platform = usePlatform()

    const [store, setStore, _, ready] = persisted(
-      Persist.global("notification", ["notification.v1"]),
+      "notification.v1",
      createStore({
        list: [] as Notification[],
      }),
    )

-    const meta = { pruned: false }
-
-    createEffect(() => {
-      if (!ready()) return
-      if (meta.pruned) return
-      meta.pruned = true
-      setStore("list", pruneNotifications(store.list))
-    })
-
-    const append = (notification: Notification) => {
-      setStore("list", (list) => pruneNotifications([...list, notification]))
-    }
-
    const unsub = globalSDK.event.listen((e) => {
      const directory = e.name
      const event = e.details
@@ -96,7 +73,7 @@ export const { use: useNotification, provider: NotificationProvider } = createSi
          try {
            idlePlayer?.play()
          } catch {}
-          append({
+          setStore("list", store.list.length, {
            ...base,
            type: "turn-complete",
            session: sessionID,
@@ -115,7 +92,7 @@ export const { use: useNotification, provider: NotificationProvider } = createSi
            errorPlayer?.play()
          } catch {}
          const error = "error" in event.properties ? event.properties.error : undefined
-          append({
+          setStore("list", store.list.length, {
            ...base,
            type: "error",
            session: sessionID ?? "global",
@@ -1,12 +1,12 @@
 import { createMemo, onCleanup } from "solid-js"
-import { createStore, produce } from "solid-js/store"
+import { createStore } from "solid-js/store"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import type { PermissionRequest } from "@opencode-ai/sdk/v2/client"
-import { Persist, persisted } from "@/utils/persist"
+import { persisted } from "@/utils/persist"
 import { useGlobalSDK } from "@/context/global-sdk"
 import { useGlobalSync } from "./global-sync"
 import { useParams } from "@solidjs/router"
-import { base64Decode, base64Encode } from "@opencode-ai/util/encode"
+import { base64Decode } from "@opencode-ai/util/encode"

 type PermissionRespondFn = (input: {
  sessionID: string
@@ -19,32 +19,6 @@ function shouldAutoAccept(perm: PermissionRequest) {
  return perm.permission === "edit"
 }

-function isNonAllowRule(rule: unknown) {
-  if (!rule) return false
-  if (typeof rule === "string") return rule !== "allow"
-  if (typeof rule !== "object") return false
-  if (Array.isArray(rule)) return false
-
-  for (const action of Object.values(rule)) {
-    if (action !== "allow") return true
-  }
-
-  return false
-}
-
-function hasAutoAcceptPermissionConfig(permission: unknown) {
-  if (!permission) return false
-  if (typeof permission === "string") return permission !== "allow"
-  if (typeof permission !== "object") return false
-  if (Array.isArray(permission)) return false
-
-  const config = permission as Record<string, unknown>
-  if (isNonAllowRule(config.edit)) return true
-  if (isNonAllowRule(config.write)) return true
-
-  return false
-}
-
 export const { use: usePermission, provider: PermissionProvider } = createSimpleContext({
  name: "Permission",
  init: () => {
@@ -53,14 +27,13 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
    const globalSync = useGlobalSync()

    const permissionsEnabled = createMemo(() => {
-      const directory = params.dir ? base64Decode(params.dir) : undefined
-      if (!directory) return false
-      const [store] = globalSync.child(directory)
-      return hasAutoAcceptPermissionConfig(store.config.permission)
+      if (!params.dir || !base64Decode(params.dir)) return false
+      const [store] = globalSync.child(base64Decode(params.dir))
+      return store.config.permission !== undefined
    })

    const [store, setStore, _, ready] = persisted(
-      Persist.global("permission", ["permission.v3"]),
+      "permission.v3",
      createStore({
        autoAcceptEdits: {} as Record<string, boolean>,
      }),
@@ -85,14 +58,8 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
      })
    }

-    function acceptKey(sessionID: string, directory?: string) {
-      if (!directory) return sessionID
-      return `${base64Encode(directory)}/${sessionID}`
-    }
-
-    function isAutoAccepting(sessionID: string, directory?: string) {
-      const key = acceptKey(sessionID, directory)
-      return store.autoAcceptEdits[key] ?? store.autoAcceptEdits[sessionID] ?? false
+    function isAutoAccepting(sessionID: string) {
+      return store.autoAcceptEdits[sessionID] ?? false
    }

    const unsubscribe = globalSDK.event.listen((e) => {
@@ -100,7 +67,7 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
      if (event?.type !== "permission.asked") return

      const perm = event.properties
-      if (!isAutoAccepting(perm.sessionID, e.name)) return
+      if (!isAutoAccepting(perm.sessionID)) return
      if (!shouldAutoAccept(perm)) return

      respondOnce(perm, e.name)
@@ -108,13 +75,7 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
    onCleanup(unsubscribe)

    function enable(sessionID: string, directory: string) {
-      const key = acceptKey(sessionID, directory)
-      setStore(
-        produce((draft) => {
-          draft.autoAcceptEdits[key] = true
-          delete draft.autoAcceptEdits[sessionID]
-        }),
-      )
+      setStore("autoAcceptEdits", sessionID, true)

      globalSDK.client.permission
        .list({ directory })
@@ -129,37 +90,31 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
        .catch(() => undefined)
    }

-    function disable(sessionID: string, directory?: string) {
-      const key = directory ? acceptKey(sessionID, directory) : undefined
-      setStore(
-        produce((draft) => {
-          if (key) delete draft.autoAcceptEdits[key]
-          delete draft.autoAcceptEdits[sessionID]
-        }),
-      )
+    function disable(sessionID: string) {
+      setStore("autoAcceptEdits", sessionID, false)
    }

    return {
      ready,
      respond,
-      autoResponds(permission: PermissionRequest, directory?: string) {
-        return isAutoAccepting(permission.sessionID, directory) && shouldAutoAccept(permission)
+      autoResponds(permission: PermissionRequest) {
+        return isAutoAccepting(permission.sessionID) && shouldAutoAccept(permission)
      },
      isAutoAccepting,
      toggleAutoAccept(sessionID: string, directory: string) {
-        if (isAutoAccepting(sessionID, directory)) {
-          disable(sessionID, directory)
+        if (isAutoAccepting(sessionID)) {
+          disable(sessionID)
          return
        }

        enable(sessionID, directory)
      },
      enableAutoAccept(sessionID: string, directory: string) {
-        if (isAutoAccepting(sessionID, directory)) return
+        if (isAutoAccepting(sessionID)) return
        enable(sessionID, directory)
      },
-      disableAutoAccept(sessionID: string, directory?: string) {
-        disable(sessionID, directory)
+      disableAutoAccept(sessionID: string) {
+        disable(sessionID)
      },
      permissionsEnabled,
    }
@@ -3,7 +3,7 @@ import { createSimpleContext } from "@opencode-ai/ui/context"
 import { batch, createMemo } from "solid-js"
 import { useParams } from "@solidjs/router"
 import type { FileSelection } from "@/context/file"
-import { Persist, persisted } from "@/utils/persist"
+import { persisted } from "@/utils/persist"

 interface PartBase {
  content: string
@@ -103,10 +103,10 @@ export const { use: usePrompt, provider: PromptProvider } = createSimpleContext(
  name: "Prompt",
  init: () => {
    const params = useParams()
-    const legacy = createMemo(() => `${params.dir}/prompt${params.id ? "/" + params.id : ""}.v2`)
+    const name = createMemo(() => `${params.dir}/prompt${params.id ? "/" + params.id : ""}.v2`)

    const [store, setStore, _, ready] = persisted(
-      Persist.scoped(params.dir!, params.id, "prompt", [legacy()]),
+      name(),
      createStore<{
        prompt: Prompt
        cursor?: number
@@ -3,7 +3,7 @@ import { createSimpleContext } from "@opencode-ai/ui/context"
 import { batch, createEffect, createMemo, createSignal, onCleanup } from "solid-js"
 import { createStore } from "solid-js/store"
 import { usePlatform } from "@/context/platform"
-import { Persist, persisted } from "@/utils/persist"
+import { persisted } from "@/utils/persist"

 type StoredProject = { worktree: string; expanded: boolean }

@@ -35,7 +35,7 @@ export const { use: useServer, provider: ServerProvider } = createSimpleContext(
    const platform = usePlatform()

    const [store, setStore, _, ready] = persisted(
-      Persist.global("server", ["server.v3"]),
+      "server.v3",
      createStore({
        list: [] as string[],
        projects: {} as Record<string, StoredProject[]>,
@@ -3,7 +3,7 @@ import { createSimpleContext } from "@opencode-ai/ui/context"
 import { batch, createMemo } from "solid-js"
 import { useParams } from "@solidjs/router"
 import { useSDK } from "./sdk"
-import { Persist, persisted } from "@/utils/persist"
+import { persisted } from "@/utils/persist"

 export type LocalPTY = {
  id: string
@@ -19,10 +19,10 @@ export const { use: useTerminal, provider: TerminalProvider } = createSimpleCont
  init: () => {
    const sdk = useSDK()
    const params = useParams()
-    const legacy = createMemo(() => `${params.dir}/terminal${params.id ? "/" + params.id : ""}.v1`)
+    const name = createMemo(() => `${params.dir}/terminal${params.id ? "/" + params.id : ""}.v1`)

    const [store, setStore, _, ready] = persisted(
-      Persist.scoped(params.dir!, params.id, "terminal", [legacy()]),
+      name(),
      createStore<{
        active?: string
        all: LocalPTY[]
@@ -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!,
@@ -1,2 +1,2 @@
 export { PlatformProvider, type Platform } from "./context/platform"
-export { AppBaseProviders, AppInterface } from "./app"
+export { App } from "./app"
@@ -170,7 +170,7 @@ export default function Layout(props: ParentProps) {
      if (e.details?.type !== "permission.asked") return
      const directory = e.name
      const perm = e.details.properties
-      if (permission.autoResponds(perm, directory)) return
+      if (permission.autoResponds(perm)) return

      const [store] = globalSync.child(directory)
      const session = store.session.find((s) => s.id === perm.sessionID)
@@ -266,30 +266,24 @@ export default function Layout(props: ParentProps) {
    }
  }

-  const currentProject = createMemo(() => {
-    const directory = params.dir ? base64Decode(params.dir) : undefined
-    if (!directory) return
-    return layout.projects.list().find((p) => p.worktree === directory || p.sandboxes?.includes(directory))
-  })
-
-  function projectSessions(project: LocalProject | undefined) {
-    if (!project) return []
-    const dirs = [project.worktree, ...(project.sandboxes ?? [])]
-    const stores = dirs.map((dir) => globalSync.child(dir)[0])
-    const sessions = stores
-      .flatMap((store) => store.session.filter((session) => session.directory === store.path.directory))
-      .toSorted(sortSessions)
-    return sessions.filter((s) => !s.parentID)
+  function projectSessions(directory: string) {
+    if (!directory) return []
+    const sessions = globalSync.child(directory)[0].session.toSorted(sortSessions)
+    return (sessions ?? []).filter((s) => !s.parentID)
  }

-  const currentSessions = createMemo(() => projectSessions(currentProject()))
+  const currentSessions = createMemo(() => {
+    if (!params.dir) return []
+    const directory = base64Decode(params.dir)
+    return projectSessions(directory)
+  })

  function navigateSessionByOffset(offset: number) {
    const projects = layout.projects.list()
    if (projects.length === 0) return

-    const project = currentProject()
-    const projectIndex = project ? projects.findIndex((p) => p.worktree === project.worktree) : -1
+    const currentDirectory = params.dir ? base64Decode(params.dir) : undefined
+    const projectIndex = currentDirectory ? projects.findIndex((p) => p.worktree === currentDirectory) : -1

    if (projectIndex === -1) {
      const targetProject = offset > 0 ? projects[0] : projects[projects.length - 1]
@@ -318,14 +312,14 @@ export default function Layout(props: ParentProps) {
    const nextProject = projects[nextProjectIndex]
    if (!nextProject) return

-    const nextProjectSessions = projectSessions(nextProject)
+    const nextProjectSessions = projectSessions(nextProject.worktree)
    if (nextProjectSessions.length === 0) {
      navigateToProject(nextProject.worktree)
      return
    }

    const targetSession = offset > 0 ? nextProjectSessions[0] : nextProjectSessions[nextProjectSessions.length - 1]
-    navigateToSession(targetSession)
+    navigate(`/${base64Encode(nextProject.worktree)}/session/${targetSession.id}`)
    queueMicrotask(() => scrollToSession(targetSession.id))
  }

@@ -471,7 +465,7 @@ export default function Layout(props: ParentProps) {

  function navigateToSession(session: Session | undefined) {
    if (!session) return
-    navigate(`/${base64Encode(session.directory)}/session/${session.id}`)
+    navigate(`/${params.dir}/session/${session?.id}`)
    layout.mobileSidebar.hide()
  }

@@ -520,8 +514,7 @@ export default function Layout(props: ParentProps) {
    const id = params.id
    setStore("lastSession", directory, id)
    notification.session.markViewed(id)
-    const project = currentProject()
-    untrack(() => layout.projects.expand(project?.worktree ?? directory))
+    untrack(() => layout.projects.expand(directory))
    requestAnimationFrame(() => scrollToSession(id))
  })

@@ -467,10 +467,7 @@ export default function Page() {
    },
    {
      id: "permissions.autoaccept",
-      title:
-        params.id && permission.isAutoAccepting(params.id, sdk.directory)
-          ? "Stop auto-accepting edits"
-          : "Auto-accept edits",
+      title: params.id && permission.isAutoAccepting(params.id) ? "Stop auto-accepting edits" : "Auto-accept edits",
      category: "Permissions",
      keybind: "mod+shift+a",
      disabled: !params.id || !permission.permissionsEnabled(),
@@ -479,10 +476,8 @@ export default function Page() {
        if (!sessionID) return
        permission.toggleAutoAccept(sessionID, sdk.directory)
        showToast({
-          title: permission.isAutoAccepting(sessionID, sdk.directory)
-            ? "Auto-accepting edits"
-            : "Stopped auto-accepting edits",
-          description: permission.isAutoAccepting(sessionID, sdk.directory)
+          title: permission.isAutoAccepting(sessionID) ? "Auto-accepting edits" : "Stopped auto-accepting edits",
+          description: permission.isAutoAccepting(sessionID)
            ? "Edit and write permissions will be automatically approved"
            : "Edit and write permissions will require approval",
        })
@@ -1,235 +1,17 @@
 import { usePlatform } from "@/context/platform"
-import { makePersisted, type AsyncStorage, type SyncStorage } from "@solid-primitives/storage"
-import { checksum } from "@opencode-ai/util/encode"
+import { makePersisted } from "@solid-primitives/storage"
 import { createResource, type Accessor } from "solid-js"
 import type { SetStoreFunction, Store } from "solid-js/store"

 type InitType = Promise<string> | string | null
 type PersistedWithReady<T> = [Store<T>, SetStoreFunction<T>, InitType, Accessor<boolean>]

-type PersistTarget = {
-  storage?: string
-  key: string
-  legacy?: string[]
-  migrate?: (value: unknown) => unknown
-}
-
-const LEGACY_STORAGE = "default.dat"
-const GLOBAL_STORAGE = "opencode.global.dat"
-
-function snapshot(value: unknown) {
-  return JSON.parse(JSON.stringify(value)) as unknown
-}
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value)
-}
-
-function merge(defaults: unknown, value: unknown): unknown {
-  if (value === undefined) return defaults
-  if (value === null) return value
-
-  if (Array.isArray(defaults)) {
-    if (Array.isArray(value)) return value
-    return defaults
-  }
-
-  if (isRecord(defaults)) {
-    if (!isRecord(value)) return defaults
-
-    const result: Record<string, unknown> = { ...defaults }
-    for (const key of Object.keys(value)) {
-      if (key in defaults) {
-        result[key] = merge((defaults as Record<string, unknown>)[key], (value as Record<string, unknown>)[key])
-      } else {
-        result[key] = (value as Record<string, unknown>)[key]
-      }
-    }
-    return result
-  }
-
-  return value
-}
-
-function parse(value: string) {
-  try {
-    return JSON.parse(value) as unknown
-  } catch {
-    return undefined
-  }
-}
-
-function workspaceStorage(dir: string) {
-  const head = dir.slice(0, 12) || "workspace"
-  const sum = checksum(dir) ?? "0"
-  return `opencode.workspace.${head}.${sum}.dat`
-}
-
-function localStorageWithPrefix(prefix: string): SyncStorage {
-  const base = `${prefix}:`
-  return {
-    getItem: (key) => localStorage.getItem(base + key),
-    setItem: (key, value) => localStorage.setItem(base + key, value),
-    removeItem: (key) => localStorage.removeItem(base + key),
-  }
-}
-
-export const Persist = {
-  global(key: string, legacy?: string[]): PersistTarget {
-    return { storage: GLOBAL_STORAGE, key, legacy }
-  },
-  workspace(dir: string, key: string, legacy?: string[]): PersistTarget {
-    return { storage: workspaceStorage(dir), key: `workspace:${key}`, legacy }
-  },
-  session(dir: string, session: string, key: string, legacy?: string[]): PersistTarget {
-    return { storage: workspaceStorage(dir), key: `session:${session}:${key}`, legacy }
-  },
-  scoped(dir: string, session: string | undefined, key: string, legacy?: string[]): PersistTarget {
-    if (session) return Persist.session(dir, session, key, legacy)
-    return Persist.workspace(dir, key, legacy)
-  },
-}
-
-export function removePersisted(target: { storage?: string; key: string }) {
+export function persisted<T>(key: string, store: [Store<T>, SetStoreFunction<T>]): PersistedWithReady<T> {
  const platform = usePlatform()
-  const isDesktop = platform.platform === "desktop" && !!platform.storage
-
-  if (isDesktop) {
-    return platform.storage?.(target.storage)?.removeItem(target.key)
-  }
-
-  if (!target.storage) {
-    localStorage.removeItem(target.key)
-    return
-  }
-
-  localStorageWithPrefix(target.storage).removeItem(target.key)
-}
-
-export function persisted<T>(
-  target: string | PersistTarget,
-  store: [Store<T>, SetStoreFunction<T>],
-): PersistedWithReady<T> {
-  const platform = usePlatform()
-  const config: PersistTarget = typeof target === "string" ? { key: target } : target
-
-  const defaults = snapshot(store[0])
-  const legacy = config.legacy ?? []
-
-  const isDesktop = platform.platform === "desktop" && !!platform.storage
-
-  const currentStorage = (() => {
-    if (isDesktop) return platform.storage?.(config.storage)
-    if (!config.storage) return localStorage
-    return localStorageWithPrefix(config.storage)
-  })()
-
-  const legacyStorage = (() => {
-    if (!isDesktop) return localStorage
-    if (!config.storage) return platform.storage?.()
-    return platform.storage?.(LEGACY_STORAGE)
-  })()
-
-  const storage = (() => {
-    if (!isDesktop) {
-      const current = currentStorage as SyncStorage
-      const legacyStore = legacyStorage as SyncStorage
-
-      const api: SyncStorage = {
-        getItem: (key) => {
-          const raw = current.getItem(key)
-          if (raw !== null) {
-            const parsed = parse(raw)
-            if (parsed === undefined) return raw
-
-            const migrated = config.migrate ? config.migrate(parsed) : parsed
-            const merged = merge(defaults, migrated)
-            const next = JSON.stringify(merged)
-            if (raw !== next) current.setItem(key, next)
-            return next
-          }
-
-          for (const legacyKey of legacy) {
-            const legacyRaw = legacyStore.getItem(legacyKey)
-            if (legacyRaw === null) continue
-
-            current.setItem(key, legacyRaw)
-            legacyStore.removeItem(legacyKey)
-
-            const parsed = parse(legacyRaw)
-            if (parsed === undefined) return legacyRaw
-
-            const migrated = config.migrate ? config.migrate(parsed) : parsed
-            const merged = merge(defaults, migrated)
-            const next = JSON.stringify(merged)
-            if (legacyRaw !== next) current.setItem(key, next)
-            return next
-          }
-
-          return null
-        },
-        setItem: (key, value) => {
-          current.setItem(key, value)
-        },
-        removeItem: (key) => {
-          current.removeItem(key)
-        },
-      }
-
-      return api
-    }
-
-    const current = currentStorage as AsyncStorage
-    const legacyStore = legacyStorage as AsyncStorage | undefined
-
-    const api: AsyncStorage = {
-      getItem: async (key) => {
-        const raw = await current.getItem(key)
-        if (raw !== null) {
-          const parsed = parse(raw)
-          if (parsed === undefined) return raw
-
-          const migrated = config.migrate ? config.migrate(parsed) : parsed
-          const merged = merge(defaults, migrated)
-          const next = JSON.stringify(merged)
-          if (raw !== next) await current.setItem(key, next)
-          return next
-        }
-
-        if (!legacyStore) return null
-
-        for (const legacyKey of legacy) {
-          const legacyRaw = await legacyStore.getItem(legacyKey)
-          if (legacyRaw === null) continue
-
-          await current.setItem(key, legacyRaw)
-          await legacyStore.removeItem(legacyKey)
-
-          const parsed = parse(legacyRaw)
-          if (parsed === undefined) return legacyRaw
-
-          const migrated = config.migrate ? config.migrate(parsed) : parsed
-          const merged = merge(defaults, migrated)
-          const next = JSON.stringify(merged)
-          if (legacyRaw !== next) await current.setItem(key, next)
-          return next
-        }
-
-        return null
-      },
-      setItem: async (key, value) => {
-        await current.setItem(key, value)
-      },
-      removeItem: async (key) => {
-        await current.removeItem(key)
-      },
-    }
-
-    return api
-  })()
-
-  const [state, setState, init] = makePersisted(store, { name: config.key, storage })
+  const [state, setState, init] = makePersisted(store, { name: key, storage: platform.storage?.() ?? localStorage })

+  // Create a resource that resolves when the store is initialized
+  // This integrates with Suspense and provides a ready signal
  const isAsync = init instanceof Promise
  const [ready] = createResource(
    () => init,
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-app",
-  "version": "1.1.6",
+  "version": "1.1.3",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -2,7 +2,6 @@ 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 } from "@opencode-ai/console-core/schema/billing.sql.js"
-import { UserTable } from "@opencode-ai/console-core/schema/user.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"
@@ -147,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.update(UserTable).set({ timeSubscribed: null }).where(eq(UserTable.workspaceID, workspaceID))
-      })
-    }
  })()
    .then((message) => {
      return Response.json({ message: message ?? "done" }, { status: 200 })
@@ -1,8 +0,0 @@
-.root {
-  [data-slot="title-row"] {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    gap: var(--space-4);
-  }
-}
@@ -1,58 +0,0 @@
-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>
-      </div>
-    </section>
-  )
-}
@@ -2,23 +2,19 @@ import { MonthlyLimitSection } from "./monthly-limit-section"
 import { BillingSection } from "./billing-section"
 import { ReloadSection } from "./reload-section"
 import { PaymentSection } from "./payment-section"
-import { BlackSection } from "./black-section"
 import { Show } from "solid-js"
 import { createAsync, useParams } from "@solidjs/router"
 import { queryBillingInfo, querySessionInfo } from "../../common"

 export default function () {
  const params = useParams()
-  const sessionInfo = createAsync(() => querySessionInfo(params.id!))
+  const userInfo = createAsync(() => querySessionInfo(params.id!))
  const billingInfo = createAsync(() => queryBillingInfo(params.id!))

  return (
    <div data-page="workspace-[id]">
      <div data-slot="sections">
-        <Show when={sessionInfo()?.isAdmin}>
-          <Show when={billingInfo()?.subscriptionID}>
-            <BlackSection />
-          </Show>
+        <Show when={userInfo()?.isAdmin}>
          <BillingSection />
          <Show when={billingInfo()?.customerID}>
            <ReloadSection />
@@ -169,9 +169,7 @@ export function UsageSection() {
                          </Show>
                        </div>
                      </td>
-                      <td data-slot="usage-cost">
-                        ${usage.enrichment?.plan === "sub" ? "0.0000" : ((usage.cost ?? 0) / 100000000).toFixed(4)}
-                      </td>
+                      <td data-slot="usage-cost">${((usage.cost ?? 0) / 100000000).toFixed(4)}</td>
                    </tr>
                  )
                }}
@@ -1,13 +1,6 @@
 export class AuthError extends Error {}
 export class CreditsError extends Error {}
 export class MonthlyLimitError extends Error {}
-export class SubscriptionError extends Error {
-  retryAfter?: number
-  constructor(message: string, retryAfter?: number) {
-    super(message)
-    this.retryAfter = retryAfter
-  }
-}
 export class UserLimitError extends Error {}
 export class ModelError extends Error {}
 export class RateLimitError extends Error {}
@@ -8,20 +8,11 @@ import { Billing } from "@opencode-ai/console-core/billing.js"
 import { Actor } from "@opencode-ai/console-core/actor.js"
 import { WorkspaceTable } from "@opencode-ai/console-core/schema/workspace.sql.js"
 import { ZenData } from "@opencode-ai/console-core/model.js"
-import { BlackData } from "@opencode-ai/console-core/black.js"
 import { UserTable } from "@opencode-ai/console-core/schema/user.sql.js"
 import { ModelTable } from "@opencode-ai/console-core/schema/model.sql.js"
 import { ProviderTable } from "@opencode-ai/console-core/schema/provider.sql.js"
 import { logger } from "./logger"
-import {
-  AuthError,
-  CreditsError,
-  MonthlyLimitError,
-  SubscriptionError,
-  UserLimitError,
-  ModelError,
-  RateLimitError,
-} from "./error"
+import { AuthError, CreditsError, MonthlyLimitError, UserLimitError, ModelError, RateLimitError } from "./error"
 import { createBodyConverter, createStreamPartConverter, createResponseConverter, UsageInfo } from "./provider/provider"
 import { anthropicHelper } from "./provider/anthropic"
 import { googleHelper } from "./provider/google"
@@ -82,9 +73,9 @@ export async function handler(
    await rateLimiter?.check()
    const stickyTracker = createStickyTracker(modelInfo.stickyProvider ?? false, sessionId)
    const stickyProvider = await stickyTracker?.get()
-    const authInfo = await authenticate(modelInfo)

    const retriableRequest = async (retry: RetryOptions = { excludeProviders: [], retryCount: 0 }) => {
+      const authInfo = await authenticate(modelInfo)
      const providerInfo = selectProvider(
        zenData,
        authInfo,
@@ -144,10 +135,10 @@ export async function handler(
        })
      }

-      return { providerInfo, reqBody, res, startTimestamp }
+      return { providerInfo, authInfo, reqBody, res, startTimestamp }
    }

-    const { providerInfo, reqBody, res, startTimestamp } = await retriableRequest()
+    const { providerInfo, authInfo, reqBody, res, startTimestamp } = await retriableRequest()

    // Store model request
    dataDumper?.provideModel(providerInfo.storeModel)
@@ -288,19 +279,14 @@ export async function handler(
        { status: 401 },
      )

-    if (error instanceof RateLimitError || error instanceof SubscriptionError) {
-      const headers = new Headers()
-      if (error instanceof SubscriptionError && error.retryAfter) {
-        headers.set("retry-after", String(error.retryAfter))
-      }
+    if (error instanceof RateLimitError)
      return new Response(
        JSON.stringify({
          type: "error",
          error: { type: error.constructor.name, message: error.message },
        }),
-        { status: 429, headers },
+        { status: 429 },
      )
-    }

    return new Response(
      JSON.stringify({
@@ -414,13 +400,6 @@ export async function handler(
            monthlyUsage: UserTable.monthlyUsage,
            timeMonthlyUsageUpdated: UserTable.timeMonthlyUsageUpdated,
          },
-          subscription: {
-            timeSubscribed: UserTable.timeSubscribed,
-            subIntervalUsage: UserTable.subIntervalUsage,
-            subMonthlyUsage: UserTable.subMonthlyUsage,
-            timeSubIntervalUsageUpdated: UserTable.timeSubIntervalUsageUpdated,
-            timeSubMonthlyUsageUpdated: UserTable.timeSubMonthlyUsageUpdated,
-          },
          provider: {
            credentials: ProviderTable.credentials,
          },
@@ -448,7 +427,6 @@ export async function handler(
    logger.metric({
      api_key: data.apiKey,
      workspace: data.workspaceID,
-      isSubscription: data.subscription.timeSubscribed ? true : false,
    })

    return {
@@ -456,7 +434,6 @@ export async function handler(
      workspaceID: data.workspaceID,
      billing: data.billing,
      user: data.user,
-      subscription: data.subscription.timeSubscribed ? data.subscription : undefined,
      provider: data.provider,
      isFree: FREE_WORKSPACES.includes(data.workspaceID),
      isDisabled: !!data.timeDisabled,
@@ -469,64 +446,6 @@ export async function handler(
    if (authInfo.isFree) return
    if (modelInfo.allowAnonymous) return

-    // Validate subscription billing
-    if (authInfo.subscription) {
-      const black = BlackData.get()
-      const sub = authInfo.subscription
-      const now = new Date()
-
-      const 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`
-      }
-
-      // 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,
-          )
-        }
-      }
-
-      // 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,
-          )
-        }
-      }
-
-      return
-    }
-
-    // Validate pay as you go billing
    const billing = authInfo.billing
    if (!billing.paymentMethodID)
      throw new CreditsError(
@@ -544,25 +463,29 @@ export async function handler(
      billing.monthlyLimit &&
      billing.monthlyUsage &&
      billing.timeMonthlyUsageUpdated &&
-      billing.monthlyUsage >= centsToMicroCents(billing.monthlyLimit * 100) &&
-      currentYear === billing.timeMonthlyUsageUpdated.getUTCFullYear() &&
-      currentMonth === billing.timeMonthlyUsageUpdated.getUTCMonth()
-    )
-      throw new MonthlyLimitError(
-        `Your workspace has reached its monthly spending limit of $${billing.monthlyLimit}. Manage your limits here: https://opencode.ai/workspace/${authInfo.workspaceID}/billing`,
-      )
+      billing.monthlyUsage >= centsToMicroCents(billing.monthlyLimit * 100)
+    ) {
+      const dateYear = billing.timeMonthlyUsageUpdated.getUTCFullYear()
+      const dateMonth = billing.timeMonthlyUsageUpdated.getUTCMonth()
+      if (currentYear === dateYear && currentMonth === dateMonth)
+        throw new MonthlyLimitError(
+          `Your workspace has reached its monthly spending limit of $${billing.monthlyLimit}. Manage your limits here: https://opencode.ai/workspace/${authInfo.workspaceID}/billing`,
+        )
+    }

    if (
      authInfo.user.monthlyLimit &&
      authInfo.user.monthlyUsage &&
      authInfo.user.timeMonthlyUsageUpdated &&
-      authInfo.user.monthlyUsage >= centsToMicroCents(authInfo.user.monthlyLimit * 100) &&
-      currentYear === authInfo.user.timeMonthlyUsageUpdated.getUTCFullYear() &&
-      currentMonth === authInfo.user.timeMonthlyUsageUpdated.getUTCMonth()
-    )
-      throw new UserLimitError(
-        `You have reached your monthly spending limit of $${authInfo.user.monthlyLimit}. Manage your limits here: https://opencode.ai/workspace/${authInfo.workspaceID}/members`,
-      )
+      authInfo.user.monthlyUsage >= centsToMicroCents(authInfo.user.monthlyLimit * 100)
+    ) {
+      const dateYear = authInfo.user.timeMonthlyUsageUpdated.getUTCFullYear()
+      const dateMonth = authInfo.user.timeMonthlyUsageUpdated.getUTCMonth()
+      if (currentYear === dateYear && currentMonth === dateMonth)
+        throw new UserLimitError(
+          `You have reached your monthly spending limit of $${authInfo.user.monthlyLimit}. Manage your limits here: https://opencode.ai/workspace/${authInfo.workspaceID}/members`,
+        )
+    }
  }

  function validateModelSettings(authInfo: AuthInfo) {
@@ -637,7 +560,7 @@ export async function handler(

    if (!authInfo) return

-    const cost = authInfo.provider?.credentials ? 0 : centsToMicroCents(totalCostInCent)
+    const cost = authInfo.isFree || authInfo.provider?.credentials ? 0 : centsToMicroCents(totalCostInCent)
    await Database.use((db) =>
      Promise.all([
        db.insert(UsageTable).values({
@@ -653,77 +576,36 @@ export async function handler(
          cacheWrite1hTokens,
          cost,
          keyID: authInfo.apiKeyId,
-          enrichment: authInfo.subscription ? { plan: "sub" } : undefined,
        }),
        db
-          .update(KeyTable)
-          .set({ timeUsed: sql`now()` })
-          .where(and(eq(KeyTable.workspaceID, authInfo.workspaceID), eq(KeyTable.id, authInfo.apiKeyId))),
-        ...(authInfo.subscription
-          ? (() => {
-              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(UserTable)
-                  .set({
-                    subMonthlyUsage: sql`
-              CASE
-                WHEN ${UserTable.timeSubMonthlyUsageUpdated} >= ${cycleStart} AND ${UserTable.timeSubMonthlyUsageUpdated} < ${cycleEnd} THEN ${UserTable.subMonthlyUsage} + ${cost}
-                ELSE ${cost}
-              END
-            `,
-                    timeSubMonthlyUsageUpdated: sql`now()`,
-                    subIntervalUsage: sql`
-              CASE
-                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
-            `,
-                    timeSubIntervalUsageUpdated: sql`now()`,
-                  })
-                  .where(and(eq(UserTable.workspaceID, authInfo.workspaceID), eq(UserTable.id, authInfo.user.id))),
-              ]
-            })()
-          : [
-              db
-                .update(BillingTable)
-                .set({
-                  balance: authInfo.isFree
-                    ? sql`${BillingTable.balance} - ${0}`
-                    : sql`${BillingTable.balance} - ${cost}`,
-                  monthlyUsage: sql`
+          .update(BillingTable)
+          .set({
+            balance: sql`${BillingTable.balance} - ${cost}`,
+            monthlyUsage: sql`
              CASE
                WHEN MONTH(${BillingTable.timeMonthlyUsageUpdated}) = MONTH(now()) AND YEAR(${BillingTable.timeMonthlyUsageUpdated}) = YEAR(now()) THEN ${BillingTable.monthlyUsage} + ${cost}
                ELSE ${cost}
              END
            `,
-                  timeMonthlyUsageUpdated: sql`now()`,
-                })
-                .where(eq(BillingTable.workspaceID, authInfo.workspaceID)),
-              db
-                .update(UserTable)
-                .set({
-                  monthlyUsage: sql`
+            timeMonthlyUsageUpdated: sql`now()`,
+          })
+          .where(eq(BillingTable.workspaceID, authInfo.workspaceID)),
+        db
+          .update(UserTable)
+          .set({
+            monthlyUsage: sql`
              CASE
                WHEN MONTH(${UserTable.timeMonthlyUsageUpdated}) = MONTH(now()) AND YEAR(${UserTable.timeMonthlyUsageUpdated}) = YEAR(now()) THEN ${UserTable.monthlyUsage} + ${cost}
                ELSE ${cost}
              END
            `,
-                  timeMonthlyUsageUpdated: sql`now()`,
-                })
-                .where(and(eq(UserTable.workspaceID, authInfo.workspaceID), eq(UserTable.id, authInfo.user.id))),
-            ]),
+            timeMonthlyUsageUpdated: sql`now()`,
+          })
+          .where(and(eq(UserTable.workspaceID, authInfo.workspaceID), eq(UserTable.id, authInfo.user.id))),
+        db
+          .update(KeyTable)
+          .set({ timeUsed: sql`now()` })
+          .where(and(eq(KeyTable.workspaceID, authInfo.workspaceID), eq(KeyTable.id, authInfo.apiKeyId))),
      ]),
    )

@@ -734,7 +616,6 @@ export async function handler(
    if (!authInfo) return
    if (authInfo.isFree) return
    if (authInfo.provider?.credentials) return
-    if (authInfo.subscription) return

    if (!costInfo) return

@@ -1,7 +0,0 @@
-ALTER TABLE `billing` ADD `subscription_id` varchar(28);--> statement-breakpoint
-ALTER TABLE `usage` ADD `data` json;--> statement-breakpoint
-ALTER TABLE `user` ADD `time_subscribed` timestamp(3);--> statement-breakpoint
-ALTER TABLE `user` ADD `sub_recent_usage` bigint;--> statement-breakpoint
-ALTER TABLE `user` ADD `sub_monthly_usage` bigint;--> statement-breakpoint
-ALTER TABLE `user` ADD `sub_time_recent_usage_updated` timestamp(3);--> statement-breakpoint
-ALTER TABLE `user` ADD `sub_time_monthly_usage_updated` timestamp(3);
@@ -1,2 +0,0 @@
-ALTER TABLE `user` RENAME COLUMN `sub_recent_usage` TO `sub_interval_usage`;--> statement-breakpoint
-ALTER TABLE `user` RENAME COLUMN `sub_time_recent_usage_updated` TO `sub_time_interval_usage_updated`;
@@ -1 +0,0 @@
-ALTER TABLE `usage` RENAME COLUMN `data` TO `enrichment`;
@@ -1 +0,0 @@
-ALTER TABLE `billing` ADD CONSTRAINT `global_subscription_id` UNIQUE(`subscription_id`);
@@ -295,34 +295,6 @@
      "when": 1767732559197,
      "tag": "0041_odd_misty_knight",
      "breakpoints": true
-    },
-    {
-      "idx": 42,
-      "version": "5",
-      "when": 1767744077346,
-      "tag": "0042_flat_nightmare",
-      "breakpoints": true
-    },
-    {
-      "idx": 43,
-      "version": "5",
-      "when": 1767752636118,
-      "tag": "0043_lame_calypso",
-      "breakpoints": true
-    },
-    {
-      "idx": 44,
-      "version": "5",
-      "when": 1767759322451,
-      "tag": "0044_tiny_captain_midlands",
-      "breakpoints": true
-    },
-    {
-      "idx": 45,
-      "version": "5",
-      "when": 1767765497502,
-      "tag": "0045_cuddly_diamondback",
-      "breakpoints": true
    }
  ]
 }
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/console-core",
-  "version": "1.1.6",
+  "version": "1.1.3",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -32,9 +32,6 @@
    "promote-models-to-dev": "script/promote-models.ts dev",
    "promote-models-to-prod": "script/promote-models.ts production",
    "pull-models-from-dev": "script/pull-models.ts dev",
-    "update-black": "script/update-black.ts",
-    "promote-black-to-dev": "script/promote-black.ts dev",
-    "promote-black-to-prod": "script/promote-black.ts production",
    "typecheck": "tsgo --noEmit"
  },
  "devDependencies": {
@@ -1,166 +0,0 @@
-import { Billing } from "../src/billing.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 } from "../src/schema/billing.sql.js"
-import { Identifier } from "../src/identifier.js"
-import { centsToMicroCents } from "../src/util/price.js"
-
-const workspaceID = process.argv[2]
-const email = process.argv[3]
-
-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: 1 })
-const customer = customers.data[0]
-if (!customer) {
-  console.error(`Error: No Stripe customer found for email ${email}`)
-  process.exit(1)
-}
-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 subscriptionID = subscription.id
-
-// Validate the subscription is $200
-const amountInCents = subscription.items.data[0]?.price.unit_amount ?? 0
-if (amountInCents !== 20000) {
-  console.error(`Error: Subscription amount is $${amountInCents / 100}, expected $200`)
-  process.exit(1)
-}
-
-// Check if subscription is already tied to another workspace
-const existingSubscription = await Database.use((tx) =>
-  tx
-    .select({ workspaceID: BillingTable.workspaceID })
-    .from(BillingTable)
-    .where(eq(BillingTable.subscriptionID, subscriptionID))
-    .then((rows) => rows[0]),
-)
-if (existingSubscription) {
-  console.error(
-    `Error: Subscription ${subscriptionID} is already tied to workspace ${existingSubscription.workspaceID}`,
-  )
-  process.exit(1)
-}
-
-// Look up the workspace billing and check if it already has a customer id or subscription
-const billing = await Database.use((tx) =>
-  tx
-    .select({ customerID: BillingTable.customerID, subscriptionID: BillingTable.subscriptionID })
-    .from(BillingTable)
-    .where(eq(BillingTable.workspaceID, workspaceID))
-    .then((rows) => rows[0]),
-)
-if (billing?.subscriptionID) {
-  console.error(`Error: Workspace ${workspaceID} already has a subscription: ${billing.subscriptionID}`)
-  process.exit(1)
-}
-if (billing?.customerID) {
-  console.warn(
-    `Warning: Workspace ${workspaceID} already has a customer id: ${billing.customerID}, replacing with ${customerID}`,
-  )
-}
-
-// Get the latest invoice and payment from the subscription
-const invoices = await Billing.stripe().invoices.list({
-  subscription: subscriptionID,
-  limit: 1,
-  expand: ["data.payments"],
-})
-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 by email via AuthTable
-const auth = await Database.use((tx) =>
-  tx
-    .select({ accountID: AuthTable.accountID })
-    .from(AuthTable)
-    .where(and(eq(AuthTable.provider, "email"), eq(AuthTable.subject, email)))
-    .then((rows) => rows[0]),
-)
-if (!auth) {
-  console.error(`Error: No user found with email ${email}`)
-  process.exit(1)
-}
-
-// 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} is not a member of workspace ${workspaceID}`)
-  process.exit(1)
-}
-
-// Set workspaceID in Stripe customer metadata
-await Billing.stripe().customers.update(customerID, {
-  metadata: {
-    workspaceID,
-  },
-})
-
-await Database.transaction(async (tx) => {
-  // Set customer id, subscription id, and payment method on workspace billing
-  await tx
-    .update(BillingTable)
-    .set({
-      customerID,
-      subscriptionID,
-      paymentMethodID,
-      paymentMethodLast4,
-      paymentMethodType,
-    })
-    .where(eq(BillingTable.workspaceID, workspaceID))
-
-  // 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({
-    workspaceID,
-    id: Identifier.create("payment"),
-    amount: centsToMicroCents(amountInCents),
-    customerID,
-    invoiceID,
-    paymentID,
-  })
-})
-
-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)"}`)
@@ -1,22 +0,0 @@
-#!/usr/bin/env bun
-
-import { $ } from "bun"
-import path from "path"
-import { BlackData } from "../src/black"
-
-const stage = process.argv[2]
-if (!stage) throw new Error("Stage is required")
-
-const root = path.resolve(process.cwd(), "..", "..", "..")
-
-// read the secret
-const ret = await $`bun sst secret list`.cwd(root).text()
-const lines = ret.split("\n")
-const value = lines.find((line) => line.startsWith("ZEN_BLACK"))?.split("=")[1]
-if (!value) throw new Error("ZEN_BLACK not found")
-
-// validate value
-BlackData.validate(JSON.parse(value))
-
-// update the secret
-await $`bun sst secret set ZEN_BLACK ${value} --stage ${stage}`
@@ -1,28 +0,0 @@
-#!/usr/bin/env bun
-
-import { $ } from "bun"
-import path from "path"
-import os from "os"
-import { BlackData } from "../src/black"
-
-const root = path.resolve(process.cwd(), "..", "..", "..")
-const secrets = await $`bun sst secret list`.cwd(root).text()
-
-// read the line starting with "ZEN_BLACK"
-const lines = secrets.split("\n")
-const oldValue = lines.find((line) => line.startsWith("ZEN_BLACK"))?.split("=")[1]
-if (!oldValue) throw new Error("ZEN_BLACK not found")
-
-// store the prettified json to a temp file
-const filename = `black-${Date.now()}.json`
-const tempFile = Bun.file(path.join(os.tmpdir(), filename))
-await tempFile.write(JSON.stringify(JSON.parse(oldValue), null, 2))
-console.log("tempFile", tempFile.name)
-
-// open temp file in vim and read the file on close
-await $`vim ${tempFile.name}`
-const newValue = JSON.stringify(JSON.parse(await tempFile.text()))
-BlackData.validate(JSON.parse(newValue))
-
-// update the secret
-await $`bun sst secret set ZEN_BLACK ${newValue}`
@@ -27,7 +27,6 @@ export namespace Billing {
      tx
        .select({
          customerID: BillingTable.customerID,
-          subscriptionID: BillingTable.subscriptionID,
          paymentMethodID: BillingTable.paymentMethodID,
          paymentMethodType: BillingTable.paymentMethodType,
          paymentMethodLast4: BillingTable.paymentMethodLast4,
@@ -1,20 +0,0 @@
-import { z } from "zod"
-import { fn } from "./util/fn"
-import { Resource } from "@opencode-ai/console-resource"
-
-export namespace BlackData {
-  const Schema = z.object({
-    monthlyLimit: z.number().int(),
-    intervalLimit: z.number().int(),
-    intervalLength: z.number().int(),
-  })
-
-  export const validate = fn(Schema, (input) => {
-    return input
-  })
-
-  export const get = fn(z.void(), () => {
-    const json = JSON.parse(Resource.ZEN_BLACK.value)
-    return Schema.parse(json)
-  })
-}
@@ -1,4 +1,4 @@
-import { bigint, boolean, index, int, json, mysqlTable, uniqueIndex, varchar } from "drizzle-orm/mysql-core"
+import { bigint, boolean, index, int, mysqlTable, uniqueIndex, varchar } from "drizzle-orm/mysql-core"
 import { timestamps, ulid, utc, workspaceColumns } from "../drizzle/types"
 import { workspaceIndexes } from "./workspace.sql"

@@ -21,13 +21,8 @@ export const BillingTable = mysqlTable(
    reloadError: varchar("reload_error", { length: 255 }),
    timeReloadError: utc("time_reload_error"),
    timeReloadLockedTill: utc("time_reload_locked_till"),
-    subscriptionID: varchar("subscription_id", { length: 28 }),
  },
-  (table) => [
-    ...workspaceIndexes(table),
-    uniqueIndex("global_customer_id").on(table.customerID),
-    uniqueIndex("global_subscription_id").on(table.subscriptionID),
-  ],
+  (table) => [...workspaceIndexes(table), uniqueIndex("global_customer_id").on(table.customerID)],
 )

 export const PaymentTable = mysqlTable(
@@ -59,9 +54,6 @@ export const UsageTable = mysqlTable(
    cacheWrite1hTokens: int("cache_write_1h_tokens"),
    cost: bigint("cost", { mode: "number" }).notNull(),
    keyID: ulid("key_id"),
-    enrichment: json("enrichment").$type<{
-      plan: "sub"
-    }>(),
  },
  (table) => [...workspaceIndexes(table), index("usage_time_created").on(table.workspaceID, table.timeCreated)],
 )
@@ -18,12 +18,6 @@ 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),
@@ -98,10 +98,6 @@ declare module "sst" {
      "type": "sst.cloudflare.StaticSite"
      "url": string
    }
-    "ZEN_BLACK": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
    "ZEN_MODELS1": {
      "type": "sst.sst.Secret"
      "value": string
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-function",
-  "version": "1.1.6",
+  "version": "1.1.3",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -98,10 +98,6 @@ declare module "sst" {
      "type": "sst.cloudflare.StaticSite"
      "url": string
    }
-    "ZEN_BLACK": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
    "ZEN_MODELS1": {
      "type": "sst.sst.Secret"
      "value": string
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-mail",
-  "version": "1.1.6",
+  "version": "1.1.3",
  "dependencies": {
    "@jsx-email/all": "2.2.3",
    "@jsx-email/cli": "1.4.3",
@@ -98,10 +98,6 @@ declare module "sst" {
      "type": "sst.cloudflare.StaticSite"
      "url": string
    }
-    "ZEN_BLACK": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
    "ZEN_MODELS1": {
      "type": "sst.sst.Secret"
      "value": string
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop",
  "private": true,
-  "version": "1.1.6",
+  "version": "1.1.3",
  "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",
@@ -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",
@@ -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]
@@ -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>
@@ -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,101 +9,23 @@ 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 tauri_plugin_store::StoreExt;
 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>>>);

 const MAX_LOG_ENTRIES: usize = 200;
-const GLOBAL_STORAGE: &str = "opencode.global.dat";
-
-/// Check if a URL's origin matches any configured server in the store.
-/// Returns true if the URL should be allowed for internal navigation.
-fn is_allowed_server(app: &AppHandle, url: &tauri::Url) -> bool {
-    // Always allow localhost and 127.0.0.1
-    if let Some(host) = url.host_str() {
-        if host == "localhost" || host == "127.0.0.1" {
-            return true;
-        }
-    }
-
-    // Try to read the server list from the store
-    let Ok(store) = app.store(GLOBAL_STORAGE) else {
-        return false;
-    };
-
-    let Some(server_data) = store.get("server") else {
-        return false;
-    };
-
-    // Parse the server list from the stored JSON
-    let Some(list) = server_data.get("list").and_then(|v| v.as_array()) else {
-        return false;
-    };
-
-    // Get the origin of the navigation URL (scheme + host + port)
-    let url_origin = format!(
-        "{}://{}{}",
-        url.scheme(),
-        url.host_str().unwrap_or(""),
-        url.port().map(|p| format!(":{}", p)).unwrap_or_default()
-    );
-
-    // Check if any configured server matches the URL's origin
-    for server in list {
-        let Some(server_url) = server.as_str() else {
-            continue;
-        };
-
-        // Parse the server URL to extract its origin
-        let Ok(parsed) = tauri::Url::parse(server_url) else {
-            continue;
-        };
-
-        let server_origin = format!(
-            "{}://{}{}",
-            parsed.scheme(),
-            parsed.host_str().unwrap_or(""),
-            parsed.port().map(|p| format!(":{}", p)).unwrap_or_default()
-        );
-
-        if url_origin == server_origin {
-            return true;
-        }
-    }
-
-    false
-}

 #[tauri::command]
 fn kill_sidecar(app: AppHandle) {
@@ -114,7 +35,7 @@ fn kill_sidecar(app: AppHandle) {
    };

    let Some(server_state) = server_state
-        .child
+        .0
        .lock()
        .expect("Failed to acquire mutex lock")
        .take()
@@ -128,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")?;

@@ -139,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())
@@ -199,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")
@@ -278,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();
@@ -287,110 +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 app_for_nav = app.clone();
-            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()
-                    .on_navigation(move |url| {
-                        // Allow internal navigation (tauri:// scheme)
-                        if url.scheme() == "tauri" {
-                            return true;
-                        }
-                        // Allow navigation to configured servers (localhost, 127.0.0.1, or remote)
-                        if is_allowed_server(&app_for_nav, url) {
-                            return true;
-                        }
-                        // Open external http/https URLs in default browser
-                        if url.scheme() == "http" || url.scheme() == "https" {
-                            let _ = app_for_nav.shell().open(url.as_str(), None);
-                            return false; // Cancel internal navigation
-                        }
-                        true
-                    })
-                    .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(())
@@ -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)) {
@@ -63,7 +60,7 @@ const platform: Platform = {
    void shellOpen(url).catch(() => undefined)
  },

-  storage: (() => {
+  storage: (name = "default.dat") => {
    type StoreLike = {
      get(key: string): Promise<string | null | undefined>
      set(key: string, value: string): Promise<unknown>
@@ -73,13 +70,7 @@ const platform: Platform = {
      length(): Promise<number>
    }

-    const WRITE_DEBOUNCE_MS = 250
-
-    const storeCache = new Map<string, Promise<StoreLike>>()
-    const apiCache = new Map<string, AsyncStorage & { flush: () => Promise<void> }>()
-    const memoryCache = new Map<string, StoreLike>()
-
-    const createMemoryStore = () => {
+    const memory = () => {
      const data = new Map<string, string>()
      const store: StoreLike = {
        get: async (key) => data.get(key),
@@ -98,108 +89,45 @@ const platform: Platform = {
      return store
    }

-    const getStore = (name: string) => {
-      const cached = storeCache.get(name)
-      if (cached) return cached
-
-      const store = Store.load(name).catch(() => {
-        const cached = memoryCache.get(name)
-        if (cached) return cached
-
-        const memory = createMemoryStore()
-        memoryCache.set(name, memory)
-        return memory
-      })
-
-      storeCache.set(name, store)
-      return store
+    const api: AsyncStorage & { _store: Promise<StoreLike> | null; _getStore: () => Promise<StoreLike> } = {
+      _store: null,
+      _getStore: async () => {
+        if (api._store) return api._store
+        api._store = Store.load(name).catch(() => memory())
+        return api._store
+      },
+      getItem: async (key: string) => {
+        const store = await api._getStore()
+        const value = await store.get(key).catch(() => null)
+        if (value === undefined) return null
+        return value
+      },
+      setItem: async (key: string, value: string) => {
+        const store = await api._getStore()
+        await store.set(key, value).catch(() => undefined)
+      },
+      removeItem: async (key: string) => {
+        const store = await api._getStore()
+        await store.delete(key).catch(() => undefined)
+      },
+      clear: async () => {
+        const store = await api._getStore()
+        await store.clear().catch(() => undefined)
+      },
+      key: async (index: number) => {
+        const store = await api._getStore()
+        return (await store.keys().catch(() => []))[index]
+      },
+      getLength: async () => {
+        const store = await api._getStore()
+        return await store.length().catch(() => 0)
+      },
+      get length() {
+        return api.getLength()
+      },
    }
-
-    const createStorage = (name: string) => {
-      const pending = new Map<string, string | null>()
-      let timer: ReturnType<typeof setTimeout> | undefined
-      let flushing: Promise<void> | undefined
-
-      const flush = async () => {
-        if (flushing) return flushing
-
-        flushing = (async () => {
-          const store = await getStore(name)
-          while (pending.size > 0) {
-            const batch = Array.from(pending.entries())
-            pending.clear()
-            for (const [key, value] of batch) {
-              if (value === null) {
-                await store.delete(key).catch(() => undefined)
-              } else {
-                await store.set(key, value).catch(() => undefined)
-              }
-            }
-          }
-        })().finally(() => {
-          flushing = undefined
-        })
-
-        return flushing
-      }
-
-      const schedule = () => {
-        if (timer) return
-        timer = setTimeout(() => {
-          timer = undefined
-          void flush()
-        }, WRITE_DEBOUNCE_MS)
-      }
-
-      const api: AsyncStorage & { flush: () => Promise<void> } = {
-        flush,
-        getItem: async (key: string) => {
-          const next = pending.get(key)
-          if (next !== undefined) return next
-
-          const store = await getStore(name)
-          const value = await store.get(key).catch(() => null)
-          if (value === undefined) return null
-          return value
-        },
-        setItem: async (key: string, value: string) => {
-          pending.set(key, value)
-          schedule()
-        },
-        removeItem: async (key: string) => {
-          pending.set(key, null)
-          schedule()
-        },
-        clear: async () => {
-          pending.clear()
-          const store = await getStore(name)
-          await store.clear().catch(() => undefined)
-        },
-        key: async (index: number) => {
-          const store = await getStore(name)
-          return (await store.keys().catch(() => []))[index]
-        },
-        getLength: async () => {
-          const store = await getStore(name)
-          return await store.length().catch(() => 0)
-        },
-        get length() {
-          return api.getLength()
-        },
-      }
-
-      return api
-    }
-
-    return (name = "default.dat") => {
-      const cached = apiCache.get(name)
-      if (cached) return cached
-
-      const api = createStorage(name)
-      apiCache.set(name, api)
-      return api
-    }
-  })(),
+    return api
+  },

  checkUpdate: async () => {
    if (!UPDATER_ENABLED) return { updateAvailable: false }
@@ -272,36 +200,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>
-  )
-}
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/enterprise",
-  "version": "1.1.6",
+  "version": "1.1.3",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -98,10 +98,6 @@ declare module "sst" {
      "type": "sst.cloudflare.StaticSite"
      "url": string
    }
-    "ZEN_BLACK": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
    "ZEN_MODELS1": {
      "type": "sst.sst.Secret"
      "value": string
@@ -1,7 +1,7 @@
 id = "opencode"
 name = "OpenCode"
 description = "The open source coding agent."
-version = "1.1.6"
+version = "1.1.3"
 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.6/opencode-darwin-arm64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.3/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.6/opencode-darwin-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.3/opencode-darwin-x64.zip"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.linux-aarch64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.6/opencode-linux-arm64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.3/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.6/opencode-linux-x64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.3/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.6/opencode-windows-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.3/opencode-windows-x64.zip"
 cmd = "./opencode.exe"
 args = ["acp"]
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/function",
-  "version": "1.1.6",
+  "version": "1.1.3",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -98,10 +98,6 @@ declare module "sst" {
      "type": "sst.cloudflare.StaticSite"
      "url": string
    }
-    "ZEN_BLACK": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
    "ZEN_MODELS1": {
      "type": "sst.sst.Secret"
      "value": string
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.1.6",
+  "version": "1.1.3",
  "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:",
@@ -135,7 +135,7 @@ for (const item of targets) {
      autoloadPackageJson: true,
      target: name.replace(pkg.name, "bun") as any,
      outfile: `dist/${name}/bin/opencode`,
-      execArgv: [`--user-agent=opencode/${Script.version}`, "--use-system-ca", "--"],
+      execArgv: [`--user-agent=opencode/${Script.version}`, "--"],
      windows: {},
    },
    entrypoints: ["./src/index.ts", parserWorker, workerPath],
@@ -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({
@@ -203,27 +188,11 @@ export namespace Agent {
      item.topP = value.top_p ?? item.topP
      item.mode = value.mode ?? item.mode
      item.color = value.color ?? item.color
-      item.hidden = value.hidden ?? item.hidden
      item.name = value.name ?? item.name
      item.steps = value.steps ?? item.steps
      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
  })

@@ -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>
@@ -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",
@@ -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 () => {
@@ -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)
@@ -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)
@@ -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 () => {
@@ -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", {
@@ -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")
@@ -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 () => {
@@ -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",
@@ -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
@@ -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
      })()

@@ -22,10 +22,11 @@ export const AttachCommand = cmd({
      }),
  handler: async (args) => {
    if (args.dir) process.chdir(args.dir)
+    const directory = process.cwd()
    await tui({
      url: args.url,
      args: { sessionID: args.session },
-      directory: args.dir ? process.cwd() : undefined,
+      directory,
    })
  },
 })
@@ -653,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
@@ -89,7 +89,9 @@ export function Prompt(props: PromptProps) {
  const fileStyleId = syntax().getStyleId("extmark.file")!
  const agentStyleId = syntax().getStyleId("extmark.agent")!
  const pasteStyleId = syntax().getStyleId("extmark.paste")!
+  const commandStyleId = syntax().getStyleId("extmark.command")!
  let promptPartTypeId: number
+  let commandHighlightRef = 0

  sdk.event.on(TuiEvent.PromptAppend.type, (evt) => {
    input.insertText(evt.properties.text)
@@ -397,6 +399,25 @@ export function Prompt(props: PromptProps) {
    )
  }

+  function highlightSlashCommands() {
+    // Remove previous command highlights
+    input.removeHighlightsByRef(commandHighlightRef)
+    commandHighlightRef++
+
+    const text = input.plainText
+    // Match all slash commands (e.g. /help, /status, /compact)
+    const regex = /\/[a-zA-Z_][a-zA-Z0-9_-]*/g
+    let match: RegExpExecArray | null
+    while ((match = regex.exec(text)) !== null) {
+      input.addHighlightByCharRange({
+        start: match.index,
+        end: match.index + match[0].length,
+        styleId: commandStyleId,
+        hlRef: commandHighlightRef,
+      })
+    }
+  }
+
  command.register(() => [
    {
      title: "Stash prompt",
@@ -772,6 +793,7 @@ export function Prompt(props: PromptProps) {
                setStore("prompt", "input", value)
                autocomplete.onInput(value)
                syncExtmarksWithPromptParts()
+                highlightSlashCommands()
              }}
              keyBindings={textareaKeybindings()}
              onKeyDown={async (e) => {
@@ -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)
@@ -75,10 +75,9 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
          })
        },
        color(name: string) {
-          const all = sync.data.agent
-          const agent = all.find((x) => x.name === name)
+          const agent = agents().find((x) => x.name === name)
          if (agent?.color) return RGBA.fromHex(agent.color)
-          const index = all.findIndex((x) => x.name === name)
+          const index = agents().findIndex((x) => x.name === name)
          if (index === -1) return colors()[0]
          return colors()[index % colors().length]
        },
@@ -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
@@ -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(() => {
@@ -681,6 +679,13 @@ function getSyntaxRules(theme: Theme) {
        bold: true,
      },
    },
+    {
+      scope: ["extmark.command"],
+      style: {
+        foreground: theme.accent,
+        bold: true,
+      },
+    },
    {
      scope: ["comment"],
      style: {
@@ -61,10 +61,6 @@
      "dark": "darkStep11",
      "light": "lightStep11"
    },
-    "selectedListItemText": {
-      "dark": "#0a0a0a",
-      "light": "#ffffff"
-    },
    "background": {
      "dark": "transparent",
      "light": "transparent"
@@ -77,10 +77,6 @@
      "dark": "darkStep11",
      "light": "lightStep11"
    },
-    "selectedListItemText": {
-      "dark": "#0a0a0a",
-      "light": "#ffffff"
-    },
    "background": {
      "dark": "darkStep1",
      "light": "lightStep1"
@@ -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>
@@ -1,5 +1,4 @@
 import {
-  batch,
  createContext,
  createEffect,
  createMemo,
@@ -24,7 +23,6 @@ import {
  MacOSScrollAccel,
  type ScrollAcceleration,
  TextAttributes,
-  RGBA,
 } from "@opentui/core"
 import { Prompt, type PromptRef } from "@tui/component/prompt"
 import type { AssistantMessage, Part, ToolPart, UserMessage, TextPart, ReasoningPart } from "@opencode-ai/sdk/v2"
@@ -42,7 +40,6 @@ import type { EditTool } from "@/tool/edit"
 import type { PatchTool } from "@/tool/patch"
 import type { WebFetchTool } from "@/tool/webfetch"
 import type { TaskTool } from "@/tool/task"
-import type { QuestionTool } from "@/tool/question"
 import { useKeyboard, useRenderer, useTerminalDimensions, type JSX } from "@opentui/solid"
 import { useSDK } from "@tui/context/sdk"
 import { useCommandDialog } from "@tui/component/dialog-command"
@@ -53,6 +50,7 @@ import { useDialog } from "../../ui/dialog"
 import { TodoItem } from "../../component/todo-item"
 import { DialogMessage } from "./dialog-message"
 import type { PromptInfo } from "../../component/prompt/history"
+import { iife } from "@/util/iife"
 import { DialogConfirm } from "@tui/ui/dialog-confirm"
 import { DialogTimeline } from "./dialog-timeline"
 import { DialogForkFromTimeline } from "./dialog-fork-from-timeline"
@@ -70,7 +68,6 @@ import { usePromptRef } from "../../context/prompt"
 import { useExit } from "../../context/exit"
 import { Filesystem } from "@/util/filesystem"
 import { PermissionPrompt } from "./permission"
-import { QuestionPrompt } from "./question"
 import { DialogExportOptions } from "../../ui/dialog-export-options"
 import { formatTranscript } from "../../util/transcript"

@@ -92,6 +89,7 @@ const context = createContext<{
  conceal: () => boolean
  showThinking: () => boolean
  showTimestamps: () => boolean
+  usernameVisible: () => boolean
  showDetails: () => boolean
  diffWrapMode: () => "word" | "none"
  sync: ReturnType<typeof useSync>
@@ -119,13 +117,9 @@ export function Session() {
  })
  const messages = createMemo(() => sync.data.message[route.sessionID] ?? [])
  const permissions = createMemo(() => {
-    if (session()?.parentID) return []
+    if (session()?.parentID) return sync.data.permission[route.sessionID] ?? []
    return children().flatMap((x) => sync.data.permission[x.id] ?? [])
  })
-  const questions = createMemo(() => {
-    if (session()?.parentID) return []
-    return children().flatMap((x) => sync.data.question[x.id] ?? [])
-  })

  const pending = createMemo(() => {
    return messages().findLast((x) => x.role === "assistant" && !x.time.completed)?.id
@@ -136,25 +130,24 @@ export function Session() {
  })

  const dimensions = useTerminalDimensions()
-  const [sidebar, setSidebar] = kv.signal<"auto" | "hide">("sidebar", "hide")
-  const [sidebarOpen, setSidebarOpen] = createSignal(false)
+  const [sidebar, setSidebar] = createSignal<"show" | "hide" | "auto">(kv.get("sidebar", "auto"))
  const [conceal, setConceal] = createSignal(true)
-  const [showThinking, setShowThinking] = kv.signal("thinking_visibility", true)
-  const [timestamps, setTimestamps] = kv.signal<"hide" | "show">("timestamps", "hide")
-  const [showDetails, setShowDetails] = kv.signal("tool_details_visibility", true)
-  const [showAssistantMetadata, setShowAssistantMetadata] = kv.signal("assistant_metadata_visibility", true)
-  const [showScrollbar, setShowScrollbar] = kv.signal("scrollbar_visible", false)
+  const [showThinking, setShowThinking] = createSignal(kv.get("thinking_visibility", true))
+  const [showTimestamps, setShowTimestamps] = createSignal(kv.get("timestamps", "hide") === "show")
+  const [usernameVisible, setUsernameVisible] = createSignal(kv.get("username_visible", true))
+  const [showDetails, setShowDetails] = createSignal(kv.get("tool_details_visibility", true))
+  const [showAssistantMetadata, setShowAssistantMetadata] = createSignal(kv.get("assistant_metadata_visibility", true))
+  const [showScrollbar, setShowScrollbar] = createSignal(kv.get("scrollbar_visible", false))
  const [diffWrapMode, setDiffWrapMode] = createSignal<"word" | "none">("word")
-  const [animationsEnabled, setAnimationsEnabled] = kv.signal("animations_enabled", true)
+  const [animationsEnabled, setAnimationsEnabled] = createSignal(kv.get("animations_enabled", true))

  const wide = createMemo(() => dimensions().width > 120)
  const sidebarVisible = createMemo(() => {
    if (session()?.parentID) return false
-    if (sidebarOpen()) return true
+    if (sidebar() === "show") return true
    if (sidebar() === "auto" && wide()) return true
    return false
  })
-  const showTimestamps = createMemo(() => timestamps() === "show")
  const contentWidth = createMemo(() => dimensions().width - (sidebarVisible() ? 42 : 0) - 4)

  const scrollAcceleration = createMemo(() => {
@@ -455,10 +448,26 @@ export function Session() {
      keybind: "sidebar_toggle",
      category: "Session",
      onSelect: (dialog) => {
-        batch(() => {
-          const isVisible = sidebarVisible()
-          setSidebar(() => (isVisible ? "hide" : "auto"))
-          setSidebarOpen(!isVisible)
+        setSidebar((prev) => {
+          if (prev === "auto") return sidebarVisible() ? "hide" : "show"
+          if (prev === "show") return "hide"
+          return "show"
+        })
+        if (sidebar() === "show") kv.set("sidebar", "auto")
+        if (sidebar() === "hide") kv.set("sidebar", "hide")
+        dialog.clear()
+      },
+    },
+    {
+      title: usernameVisible() ? "Hide username" : "Show username",
+      value: "session.username_visible.toggle",
+      keybind: "username_toggle",
+      category: "Session",
+      onSelect: (dialog) => {
+        setUsernameVisible((prev) => {
+          const next = !prev
+          kv.set("username_visible", next)
+          return next
        })
        dialog.clear()
      },
@@ -478,7 +487,11 @@ export function Session() {
      value: "session.toggle.timestamps",
      category: "Session",
      onSelect: (dialog) => {
-        setTimestamps((prev) => (prev === "show" ? "hide" : "show"))
+        setShowTimestamps((prev) => {
+          const next = !prev
+          kv.set("timestamps", next ? "show" : "hide")
+          return next
+        })
        dialog.clear()
      },
    },
@@ -487,7 +500,11 @@ export function Session() {
      value: "session.toggle.thinking",
      category: "Session",
      onSelect: (dialog) => {
-        setShowThinking((prev) => !prev)
+        setShowThinking((prev) => {
+          const next = !prev
+          kv.set("thinking_visibility", next)
+          return next
+        })
        dialog.clear()
      },
    },
@@ -506,7 +523,9 @@ export function Session() {
      keybind: "tool_details",
      category: "Session",
      onSelect: (dialog) => {
-        setShowDetails((prev) => !prev)
+        const newValue = !showDetails()
+        setShowDetails(newValue)
+        kv.set("tool_details_visibility", newValue)
        dialog.clear()
      },
    },
@@ -516,7 +535,11 @@ export function Session() {
      keybind: "scrollbar_toggle",
      category: "Session",
      onSelect: (dialog) => {
-        setShowScrollbar((prev) => !prev)
+        setShowScrollbar((prev) => {
+          const next = !prev
+          kv.set("scrollbar_visible", next)
+          return next
+        })
        dialog.clear()
      },
    },
@@ -525,7 +548,11 @@ export function Session() {
      value: "session.toggle.animations",
      category: "Session",
      onSelect: (dialog) => {
-        setAnimationsEnabled((prev) => !prev)
+        setAnimationsEnabled((prev) => {
+          const next = !prev
+          kv.set("animations_enabled", next)
+          return next
+        })
        dialog.clear()
      },
    },
@@ -879,6 +906,7 @@ export function Session() {
        conceal,
        showThinking,
        showTimestamps,
+        usernameVisible,
        showDetails,
        diffWrapMode,
        sync,
@@ -887,7 +915,7 @@ export function Session() {
      <box flexDirection="row">
        <box flexGrow={1} paddingBottom={1} paddingTop={1} paddingLeft={2} paddingRight={2} gap={1}>
          <Show when={session()}>
-            <Show when={!sidebarVisible() || !wide()}>
+            <Show when={!sidebarVisible()}>
              <Header />
            </Show>
            <scrollbox
@@ -1008,48 +1036,27 @@ export function Session() {
              <Show when={permissions().length > 0}>
                <PermissionPrompt request={permissions()[0]} />
              </Show>
-              <Show when={permissions().length === 0 && questions().length > 0}>
-                <QuestionPrompt request={questions()[0]} />
-              </Show>
              <Prompt
-                visible={!session()?.parentID && permissions().length === 0 && questions().length === 0}
+                visible={!session()?.parentID && permissions().length === 0}
                ref={(r) => {
                  prompt = r
                  promptRef.set(r)
-                  // Apply initial prompt when prompt component mounts (e.g., from fork)
-                  if (route.initialPrompt) {
-                    r.set(route.initialPrompt)
-                  }
                }}
-                disabled={permissions().length > 0 || questions().length > 0}
+                disabled={permissions().length > 0}
                onSubmit={() => {
                  toBottom()
                }}
                sessionID={route.sessionID}
              />
            </box>
+            <Show when={!sidebarVisible()}>
+              <Footer />
+            </Show>
          </Show>
          <Toast />
        </box>
        <Show when={sidebarVisible()}>
-          <Switch>
-            <Match when={wide()}>
-              <Sidebar sessionID={route.sessionID} />
-            </Match>
-            <Match when={!wide()}>
-              <box
-                position="absolute"
-                top={0}
-                left={0}
-                right={0}
-                bottom={0}
-                alignItems="flex-end"
-                backgroundColor={RGBA.fromInts(0, 0, 0, 70)}
-              >
-                <Sidebar sessionID={route.sessionID} />
-              </box>
-            </Match>
-          </Switch>
+          <Sidebar sessionID={route.sessionID} />
        </Show>
      </box>
    </context.Provider>
@@ -1082,7 +1089,6 @@ function UserMessage(props: {
  const [hover, setHover] = createSignal(false)
  const queued = createMemo(() => props.pending && props.message.id > props.pending)
  const color = createMemo(() => (queued() ? theme.accent : local.agent.color(props.message.agent)))
-  const metadataVisible = createMemo(() => queued() || ctx.showTimestamps())

  const compaction = createMemo(() => props.parts.find((x) => x.type === "compaction"))

@@ -1112,7 +1118,7 @@ function UserMessage(props: {
          >
            <text fg={theme.text}>{text()?.text}</text>
            <Show when={files().length}>
-              <box flexDirection="row" paddingBottom={metadataVisible() ? 1 : 0} paddingTop={1} gap={1} flexWrap="wrap">
+              <box flexDirection="row" paddingBottom={1} paddingTop={1} gap={1} flexWrap="wrap">
                <For each={files()}>
                  {(file) => {
                    const bg = createMemo(() => {
@@ -1130,22 +1136,23 @@ function UserMessage(props: {
                </For>
              </box>
            </Show>
-            <Show
-              when={queued()}
-              fallback={
-                <Show when={ctx.showTimestamps()}>
-                  <text fg={theme.textMuted}>
+            <text fg={theme.textMuted}>
+              {ctx.usernameVisible() ? `${sync.data.config.username ?? "You "}` : "You "}
+              <Show
+                when={queued()}
+                fallback={
+                  <Show when={ctx.showTimestamps()}>
                    <span style={{ fg: theme.textMuted }}>
+                      {ctx.usernameVisible() ? " · " : " "}
                      {Locale.todayTimeOrDateTime(props.message.time.created)}
                    </span>
-                  </text>
-                </Show>
-              }
-            >
-              <text fg={theme.textMuted}>
+                  </Show>
+                }
+              >
+                <span> </span>
                <span style={{ bg: theme.accent, fg: theme.backgroundPanel, bold: true }}> QUEUED </span>
-              </text>
-            </Show>
+              </Show>
+            </text>
          </box>
        </box>
      </Show>
@@ -1369,9 +1376,6 @@ function ToolPart(props: { last: boolean; part: ToolPart; message: AssistantMess
      <Match when={props.part.tool === "todowrite"}>
        <TodoWrite {...toolprops} />
      </Match>
-      <Match when={props.part.tool === "question"}>
-        <Question {...toolprops} />
-      </Match>
      <Match when={true}>
        <GenericTool {...toolprops} />
      </Match>
@@ -1406,14 +1410,7 @@ function ToolTitle(props: { fallback: string; when: any; icon: string; children:
  )
 }

-function InlineTool(props: {
-  icon: string
-  iconColor?: RGBA
-  complete: any
-  pending: string
-  children: JSX.Element
-  part: ToolPart
-}) {
+function InlineTool(props: { icon: string; complete: any; pending: string; children: JSX.Element; part: ToolPart }) {
  const [margin, setMargin] = createSignal(0)
  const { theme } = useTheme()
  const ctx = use()
@@ -1433,12 +1430,7 @@ function InlineTool(props: {

  const error = createMemo(() => (props.part.state.status === "error" ? props.part.state.error : undefined))

-  const denied = createMemo(
-    () =>
-      error()?.includes("rejected permission") ||
-      error()?.includes("specified a rule") ||
-      error()?.includes("user dismissed"),
-  )
+  const denied = createMemo(() => error()?.includes("rejected permission") || error()?.includes("specified a rule"))

  return (
    <box
@@ -1469,7 +1461,7 @@ function InlineTool(props: {
    >
      <text paddingLeft={3} fg={fg()} attributes={denied() ? TextAttributes.STRIKETHROUGH : undefined}>
        <Show fallback={<>~ {props.pending}</>} when={props.complete}>
-          <span style={{ fg: props.iconColor }}>{props.icon}</span> {props.children}
+          <span style={{ bold: true }}>{props.icon}</span> {props.children}
        </Show>
      </text>
      <Show when={error() && !denied()}>
@@ -1514,30 +1506,15 @@ function BlockTool(props: { title: string; children: JSX.Element; onClick?: () =
 }

 function Bash(props: ToolProps<typeof BashTool>) {
-  const { theme } = useTheme()
  const output = createMemo(() => stripAnsi(props.metadata.output?.trim() ?? ""))
-  const [expanded, setExpanded] = createSignal(false)
-  const lines = createMemo(() => output().split("\n"))
-  const overflow = createMemo(() => lines().length > 10)
-  const limited = createMemo(() => {
-    if (expanded() || !overflow()) return output()
-    return [...lines().slice(0, 10), "…"].join("\n")
-  })
-
+  const { theme } = useTheme()
  return (
    <Switch>
      <Match when={props.metadata.output !== undefined}>
-        <BlockTool
-          title={"# " + (props.input.description ?? "Shell")}
-          part={props.part}
-          onClick={overflow() ? () => setExpanded((prev) => !prev) : undefined}
-        >
+        <BlockTool title={"# " + (props.input.description ?? "Shell")} part={props.part}>
          <box gap={1}>
            <text fg={theme.text}>$ {props.input.command}</text>
-            <text fg={theme.text}>{limited()}</text>
-            <Show when={overflow()}>
-              <text fg={theme.textMuted}>{expanded() ? "Click to collapse" : "Click to expand"}</text>
-            </Show>
+            <text fg={theme.text}>{output()}</text>
          </box>
        </BlockTool>
      </Match>
@@ -1667,10 +1644,8 @@ function Task(props: ToolProps<typeof TaskTool>) {
  const { theme } = useTheme()
  const keybind = useKeybind()
  const { navigate } = useRoute()
-  const local = useLocal()

  const current = createMemo(() => props.metadata.summary?.findLast((x) => x.state.status !== "pending"))
-  const color = createMemo(() => local.agent.color(props.input.subagent_type ?? "unknown"))

  return (
    <Switch>
@@ -1704,13 +1679,11 @@ function Task(props: ToolProps<typeof TaskTool>) {
      <Match when={true}>
        <InlineTool
          icon="◉"
-          iconColor={color()}
          pending="Delegating..."
          complete={props.input.subagent_type ?? props.input.description}
          part={props.part}
        >
-          <span style={{ fg: theme.text }}>{Locale.titlecase(props.input.subagent_type ?? "unknown")}</span> Task "
-          {props.input.description}"
+          {Locale.titlecase(props.input.subagent_type ?? "unknown")} Task "{props.input.description}"
        </InlineTool>
      </Match>
    </Switch>
@@ -1827,34 +1800,6 @@ function TodoWrite(props: ToolProps<typeof TodoWriteTool>) {
  )
 }

-function Question(props: ToolProps<typeof QuestionTool>) {
-  const { theme } = useTheme()
-  const count = createMemo(() => props.input.questions?.length ?? 0)
-  return (
-    <Switch>
-      <Match when={props.metadata.answers}>
-        <BlockTool title="# Questions" part={props.part}>
-          <box>
-            <For each={props.input.questions ?? []}>
-              {(q, i) => (
-                <box flexDirection="row" gap={1}>
-                  <text fg={theme.textMuted}>{q.question}</text>
-                  <text fg={theme.text}>{props.metadata.answers?.[i()] || "(no answer)"}</text>
-                </box>
-              )}
-            </For>
-          </box>
-        </BlockTool>
-      </Match>
-      <Match when={true}>
-        <InlineTool icon="→" pending="Asking questions..." complete={count()} part={props.part}>
-          Asked {count()} question{count() !== 1 ? "s" : ""}
-        </InlineTool>
-      </Match>
-    </Switch>
-  )
-}
-
 function normalizePath(input?: string) {
  if (!input) return ""
  if (path.isAbsolute(input)) {
@@ -3,7 +3,7 @@ import { createMemo, For, Match, Show, Switch } from "solid-js"
 import { useKeyboard, useTerminalDimensions, type JSX } from "@opentui/solid"
 import type { TextareaRenderable } from "@opentui/core"
 import { useKeybind } from "../../context/keybind"
-import { useTheme, selectedForeground } from "../../context/theme"
+import { useTheme } from "../../context/theme"
 import type { PermissionRequest } from "@opencode-ai/sdk/v2"
 import { useSDK } from "../../context/sdk"
 import { SplitBorder } from "../../component/border"
@@ -395,7 +395,7 @@ function Prompt<const T extends Record<string, string>>(props: {
                paddingRight={1}
                backgroundColor={option === store.selected ? theme.warning : theme.backgroundMenu}
              >
-                <text fg={option === store.selected ? selectedForeground(theme, theme.warning) : theme.textMuted}>
+                <text fg={option === store.selected ? theme.selectedListItemText : theme.textMuted}>
                  {props.options[option]}
                </text>
              </box>
@@ -1,291 +0,0 @@
-import { createStore } from "solid-js/store"
-import { createMemo, For, Show } from "solid-js"
-import { useKeyboard } from "@opentui/solid"
-import type { TextareaRenderable } from "@opentui/core"
-import { useKeybind } from "../../context/keybind"
-import { useTheme } from "../../context/theme"
-import type { QuestionRequest } from "@opencode-ai/sdk/v2"
-import { useSDK } from "../../context/sdk"
-import { SplitBorder } from "../../component/border"
-import { useTextareaKeybindings } from "../../component/textarea-keybindings"
-import { useDialog } from "../../ui/dialog"
-
-export function QuestionPrompt(props: { request: QuestionRequest }) {
-  const sdk = useSDK()
-  const { theme } = useTheme()
-  const keybind = useKeybind()
-  const bindings = useTextareaKeybindings()
-
-  const questions = createMemo(() => props.request.questions)
-  const single = createMemo(() => questions().length === 1)
-  const tabs = createMemo(() => (single() ? 1 : questions().length + 1)) // questions + confirm tab (no confirm for single)
-  const [store, setStore] = createStore({
-    tab: 0,
-    answers: [] as string[],
-    custom: [] as string[],
-    selected: 0,
-    editing: false,
-  })
-
-  let textarea: TextareaRenderable | undefined
-
-  const question = createMemo(() => questions()[store.tab])
-  const confirm = createMemo(() => !single() && store.tab === questions().length)
-  const options = createMemo(() => question()?.options ?? [])
-  const other = createMemo(() => store.selected === options().length)
-  const input = createMemo(() => store.custom[store.tab] ?? "")
-
-  function submit() {
-    // Fill in empty answers with empty strings
-    const answers = questions().map((_, i) => store.answers[i] ?? "")
-    sdk.client.question.reply({
-      requestID: props.request.id,
-      answers,
-    })
-  }
-
-  function reject() {
-    sdk.client.question.reject({
-      requestID: props.request.id,
-    })
-  }
-
-  function pick(answer: string, custom: boolean = false) {
-    const answers = [...store.answers]
-    answers[store.tab] = answer
-    setStore("answers", answers)
-    if (custom) {
-      const inputs = [...store.custom]
-      inputs[store.tab] = answer
-      setStore("custom", inputs)
-    }
-    if (single()) {
-      sdk.client.question.reply({
-        requestID: props.request.id,
-        answers: [answer],
-      })
-      return
-    }
-    setStore("tab", store.tab + 1)
-    setStore("selected", 0)
-  }
-
-  const dialog = useDialog()
-
-  useKeyboard((evt) => {
-    // When editing "Other" textarea
-    if (store.editing && !confirm()) {
-      if (evt.name === "escape") {
-        evt.preventDefault()
-        setStore("editing", false)
-        return
-      }
-      if (evt.name === "return") {
-        evt.preventDefault()
-        const text = textarea?.plainText?.trim()
-        if (text) {
-          pick(text, true)
-          setStore("editing", false)
-        }
-        return
-      }
-      // Let textarea handle all other keys
-      return
-    }
-
-    if (evt.name === "left" || evt.name === "h") {
-      evt.preventDefault()
-      const next = (store.tab - 1 + tabs()) % tabs()
-      setStore("tab", next)
-      setStore("selected", 0)
-    }
-
-    if (evt.name === "right" || evt.name === "l") {
-      evt.preventDefault()
-      const next = (store.tab + 1) % tabs()
-      setStore("tab", next)
-      setStore("selected", 0)
-    }
-
-    if (confirm()) {
-      if (evt.name === "return") {
-        evt.preventDefault()
-        submit()
-      }
-      if (evt.name === "escape" || keybind.match("app_exit", evt)) {
-        evt.preventDefault()
-        reject()
-      }
-    } else {
-      const opts = options()
-      const total = opts.length + 1 // options + "Other"
-
-      if (evt.name === "up" || evt.name === "k") {
-        evt.preventDefault()
-        setStore("selected", (store.selected - 1 + total) % total)
-      }
-
-      if (evt.name === "down" || evt.name === "j") {
-        evt.preventDefault()
-        setStore("selected", (store.selected + 1) % total)
-      }
-
-      if (evt.name === "return") {
-        evt.preventDefault()
-        if (other()) {
-          setStore("editing", true)
-        } else {
-          const opt = opts[store.selected]
-          if (opt) {
-            pick(opt.label)
-          }
-        }
-      }
-
-      if (evt.name === "escape" || keybind.match("app_exit", evt)) {
-        evt.preventDefault()
-        reject()
-      }
-    }
-  })
-
-  return (
-    <box
-      backgroundColor={theme.backgroundPanel}
-      border={["left"]}
-      borderColor={theme.accent}
-      customBorderChars={SplitBorder.customBorderChars}
-    >
-      <box gap={1} paddingLeft={1} paddingRight={3} paddingTop={1} paddingBottom={1}>
-        <Show when={!single()}>
-          <box flexDirection="row" gap={1} paddingLeft={1}>
-            <For each={questions()}>
-              {(q, index) => {
-                const isActive = () => index() === store.tab
-                const isAnswered = () => store.answers[index()] !== undefined
-                return (
-                  <box
-                    paddingLeft={1}
-                    paddingRight={1}
-                    backgroundColor={isActive() ? theme.accent : theme.backgroundElement}
-                  >
-                    <text fg={isActive() ? theme.selectedListItemText : isAnswered() ? theme.text : theme.textMuted}>
-                      {q.header}
-                    </text>
-                  </box>
-                )
-              }}
-            </For>
-            <box paddingLeft={1} paddingRight={1} backgroundColor={confirm() ? theme.accent : theme.backgroundElement}>
-              <text fg={confirm() ? theme.selectedListItemText : theme.textMuted}>Confirm</text>
-            </box>
-          </box>
-        </Show>
-
-        <Show when={!confirm()}>
-          <box paddingLeft={1} gap={1}>
-            <box>
-              <text fg={theme.text}>{question()?.question}</text>
-            </box>
-            <box>
-              <For each={options()}>
-                {(opt, i) => {
-                  const active = () => i() === store.selected
-                  const picked = () => store.answers[store.tab] === opt.label
-                  return (
-                    <box>
-                      <box flexDirection="row" gap={1}>
-                        <box backgroundColor={active() ? theme.backgroundElement : undefined}>
-                          <text fg={active() ? theme.secondary : picked() ? theme.success : theme.text}>
-                            {i() + 1}. {opt.label}
-                          </text>
-                        </box>
-                        <text fg={theme.success}>{picked() ? "✓" : ""}</text>
-                      </box>
-                      <box paddingLeft={3}>
-                        <text fg={theme.textMuted}>{opt.description}</text>
-                      </box>
-                    </box>
-                  )
-                }}
-              </For>
-              <box>
-                <box flexDirection="row" gap={1}>
-                  <box backgroundColor={other() ? theme.backgroundElement : undefined}>
-                    <text fg={other() ? theme.secondary : input() ? theme.success : theme.text}>
-                      {options().length + 1}. Type your own answer
-                    </text>
-                  </box>
-                  <text fg={theme.success}>{input() ? "✓" : ""}</text>
-                </box>
-                <Show when={store.editing}>
-                  <box paddingLeft={3}>
-                    <textarea
-                      ref={(val: TextareaRenderable) => (textarea = val)}
-                      focused
-                      placeholder="Type your own answer"
-                      textColor={theme.text}
-                      focusedTextColor={theme.text}
-                      cursorColor={theme.primary}
-                      keyBindings={bindings()}
-                    />
-                  </box>
-                </Show>
-                <Show when={!store.editing && input()}>
-                  <box paddingLeft={3}>
-                    <text fg={theme.textMuted}>{input()}</text>
-                  </box>
-                </Show>
-              </box>
-            </box>
-          </box>
-        </Show>
-
-        <Show when={confirm() && !single()}>
-          <box paddingLeft={1}>
-            <text fg={theme.text}>Review</text>
-          </box>
-          <For each={questions()}>
-            {(q, index) => {
-              const answer = () => store.answers[index()]
-              return (
-                <box flexDirection="row" gap={1} paddingLeft={1}>
-                  <text fg={theme.textMuted}>{q.header}:</text>
-                  <text fg={answer() ? theme.text : theme.error}>{answer() ?? "(not answered)"}</text>
-                </box>
-              )
-            }}
-          </For>
-        </Show>
-      </box>
-      <box
-        flexDirection="row"
-        flexShrink={0}
-        gap={1}
-        paddingLeft={2}
-        paddingRight={3}
-        paddingBottom={1}
-        justifyContent="space-between"
-      >
-        <box flexDirection="row" gap={2}>
-          <Show when={!single()}>
-            <text fg={theme.text}>
-              {"⇆"} <span style={{ fg: theme.textMuted }}>tab</span>
-            </text>
-          </Show>
-          <Show when={!confirm()}>
-            <text fg={theme.text}>
-              {"↑↓"} <span style={{ fg: theme.textMuted }}>select</span>
-            </text>
-          </Show>
-          <text fg={theme.text}>
-            enter <span style={{ fg: theme.textMuted }}>{confirm() ? "submit" : single() ? "submit" : "confirm"}</span>
-          </text>
-          <text fg={theme.text}>
-            esc <span style={{ fg: theme.textMuted }}>dismiss</span>
-          </text>
-        </box>
-      </box>
-    </box>
-  )
-}
@@ -12,7 +12,7 @@ import { useDirectory } from "../../context/directory"
 import { useKV } from "../../context/kv"
 import { TodoItem } from "../../component/todo-item"

-export function Sidebar(props: { sessionID: string; overlay?: boolean }) {
+export function Sidebar(props: { sessionID: string }) {
  const sync = useSync()
  const { theme } = useTheme()
  const session = createMemo(() => sync.session.get(props.sessionID)!)
@@ -77,7 +77,6 @@ export function Sidebar(props: { sessionID: string; overlay?: boolean }) {
        paddingBottom={1}
        paddingLeft={2}
        paddingRight={2}
-        position={props.overlay ? "absolute" : "relative"}
      >
        <scrollbox flexGrow={1}>
          <box flexShrink={0} gap={1} paddingRight={1}>
@@ -32,7 +32,7 @@ export namespace Clipboard {
    if (os === "win32" || release().includes("WSL")) {
      const script =
        "Add-Type -AssemblyName System.Windows.Forms; $img = [System.Windows.Forms.Clipboard]::GetImage(); if ($img) { $ms = New-Object System.IO.MemoryStream; $img.Save($ms, [System.Drawing.Imaging.ImageFormat]::Png); [System.Convert]::ToBase64String($ms.ToArray()) }"
-      const base64 = await $`powershell.exe -NonInteractive -NoProfile -command "${script}"`.nothrow().text()
+      const base64 = await $`powershell.exe -command "${script}"`.nothrow().text()
      if (base64) {
        const imageBuffer = Buffer.from(base64.trim(), "base64")
        if (imageBuffer.length > 0) {
@@ -110,9 +110,8 @@ export namespace Clipboard {
    if (os === "win32") {
      console.log("clipboard: using powershell")
      return async (text: string) => {
-        // need to escape backticks because powershell uses them as escape code
-        const escaped = text.replace(/"/g, '""').replace(/`/g, "``")
-        await $`powershell -NonInteractive -NoProfile -Command "Set-Clipboard -Value \"${escaped}\""`.nothrow().quiet()
+        const escaped = text.replace(/"/g, '""')
+        await $`powershell -command "Set-Clipboard -Value \"${escaped}\""`.nothrow().quiet()
      }
    }

@@ -30,7 +30,7 @@ function getNetworkIPs() {
 export const WebCommand = cmd({
  command: "web",
  builder: (yargs) => withNetworkOptions(yargs),
-  describe: "start opencode server and open web interface",
+  describe: "starts a headless opencode server",
  handler: async (args) => {
    const opts = await resolveNetworkOptions(args)
    const server = Server.listen(opts)
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				ALTER TABLE `usage` RENAME COLUMN `data` TO `enrichment`;
				`@@ -1 +0,0 @@`
				ALTER TABLE `billing` ADD CONSTRAINT `global_subscription_id` UNIQUE(`subscription_id`);