feat: show LSP errors for apply_patch tool

.github/VOUCHED.td

@@ -10,7 +10,6 @@
 adamdotdevin
 -agusbasari29 AI PR slop
 ariane-emory
-edemaine
 -florianleibert
 fwang
 iamdavidhill

.github/actions/setup-bun/action.yml

@@ -1,10 +1,5 @@
 name: "Setup Bun"
 description: "Setup Bun with caching and install dependencies"
-inputs:
-  cross-compile:
-    description: "Pre-cache canary cross-compile binaries for all targets"
-    required: false
-    default: "false"
 runs:
   using: "composite"
   steps:
@@ -16,72 +11,10 @@ runs:
         restore-keys: |
           ${{ runner.os }}-bun-
 
-    - name: Get baseline download URL
-      id: bun-url
-      shell: bash
-      run: |
-        if [ "$RUNNER_ARCH" = "X64" ]; then
-          case "$RUNNER_OS" in
-            macOS)   OS=darwin ;;
-            Linux)   OS=linux ;;
-            Windows) OS=windows ;;
-          esac
-          echo "url=https://github.com/oven-sh/bun/releases/download/canary/bun-${OS}-x64-baseline.zip" >> "$GITHUB_OUTPUT"
-        fi
-
     - name: Setup Bun
       uses: oven-sh/setup-bun@v2
       with:
-        bun-version-file: ${{ !steps.bun-url.outputs.url && 'package.json' || '' }}
-        bun-download-url: ${{ steps.bun-url.outputs.url }}
-
-    - name: Pre-cache canary cross-compile binaries
-      if: inputs.cross-compile == 'true'
-      shell: bash
-      run: |
-        BUN_VERSION=$(bun --revision)
-        if echo "$BUN_VERSION" | grep -q "canary"; then
-          SEMVER=$(echo "$BUN_VERSION" | sed 's/^\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/')
-          echo "Bun version: $BUN_VERSION (semver: $SEMVER)"
-          CACHE_DIR="$HOME/.bun/install/cache"
-          mkdir -p "$CACHE_DIR"
-          TMP_DIR=$(mktemp -d)
-          for TARGET in linux-aarch64 linux-x64 linux-x64-baseline linux-aarch64-musl linux-x64-musl linux-x64-musl-baseline darwin-aarch64 darwin-x64 windows-x64 windows-x64-baseline; do
-            DEST="$CACHE_DIR/bun-${TARGET}-v${SEMVER}"
-            if [ -f "$DEST" ]; then
-              echo "Already cached: $DEST"
-              continue
-            fi
-            URL="https://github.com/oven-sh/bun/releases/download/canary/bun-${TARGET}.zip"
-            echo "Downloading $TARGET from $URL"
-            if curl -sfL -o "$TMP_DIR/bun.zip" "$URL"; then
-              unzip -qo "$TMP_DIR/bun.zip" -d "$TMP_DIR"
-              if echo "$TARGET" | grep -q "windows"; then
-                BIN_NAME="bun.exe"
-              else
-                BIN_NAME="bun"
-              fi
-              mv "$TMP_DIR/bun-${TARGET}/$BIN_NAME" "$DEST"
-              chmod +x "$DEST"
-              rm -rf "$TMP_DIR/bun-${TARGET}" "$TMP_DIR/bun.zip"
-              echo "Cached: $DEST"
-              # baseline bun resolves "bun-darwin-x64" to the baseline cache key
-              # so copy the modern binary there too
-              if [ "$TARGET" = "darwin-x64" ]; then
-                BASELINE_DEST="$CACHE_DIR/bun-darwin-x64-baseline-v${SEMVER}"
-                if [ ! -f "$BASELINE_DEST" ]; then
-                  cp "$DEST" "$BASELINE_DEST"
-                  echo "Cached (baseline alias): $BASELINE_DEST"
-                fi
-              fi
-            else
-              echo "Skipped: $TARGET (not available)"
-            fi
-          done
-          rm -rf "$TMP_DIR"
-        else
-          echo "Not a canary build ($BUN_VERSION), skipping pre-cache"
-        fi
+        bun-version-file: package.json
 
     - name: Install dependencies
       run: bun install

.github/workflows/compliance-close.yml

@@ -65,15 +65,6 @@ jobs:
                 body: closeMessage,
               });
 
-              try {
-                await github.rest.issues.removeLabel({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  issue_number: item.number,
-                  name: 'needs:compliance',
-                });
-              } catch (e) {}
-
               if (isPR) {
                 await github.rest.pulls.update({
                   owner: context.repo.owner,

.github/workflows/pr-standards.yml

@@ -108,11 +108,11 @@ jobs:
 
             await removeLabel('needs:title');
 
-            // Step 2: Check for linked issue (skip for docs/refactor/feat PRs)
-            const skipIssueCheck = /^(docs|refactor|feat)\s*(\([a-zA-Z0-9-]+\))?\s*:/.test(title);
+            // Step 2: Check for linked issue (skip for docs/refactor PRs)
+            const skipIssueCheck = /^(docs|refactor)\s*(\([a-zA-Z0-9-]+\))?\s*:/.test(title);
             if (skipIssueCheck) {
               await removeLabel('needs:issue');
-              console.log('Skipping issue check for docs/refactor/feat PR');
+              console.log('Skipping issue check for docs/refactor PR');
               return;
             }
             const query = `
@@ -189,7 +189,7 @@ jobs:
 
             const body = pr.body || '';
             const title = pr.title;
-            const isDocsRefactorOrFeat = /^(docs|refactor|feat)\s*(\([a-zA-Z0-9-]+\))?\s*:/.test(title);
+            const isDocsOrRefactor = /^(docs|refactor)\s*(\([a-zA-Z0-9-]+\))?\s*:/.test(title);
 
             const issues = [];
 
@@ -225,8 +225,8 @@ jobs:
               }
             }
 
-            // Check: issue reference (skip for docs/refactor/feat)
-            if (!isDocsRefactorOrFeat && hasIssueSection) {
+            // Check: issue reference (skip for docs/refactor)
+            if (!isDocsOrRefactor && hasIssueSection) {
               const issueMatch = body.match(/### Issue for this PR\s*\n([\s\S]*?)(?=###|$)/);
               const issueContent = issueMatch ? issueMatch[1].trim() : '';
               const hasIssueRef = /(closes|fixes|resolves)\s+#\d+/i.test(issueContent) || /#\d+/.test(issueContent);

.github/workflows/publish.yml

@@ -77,8 +77,6 @@ jobs:
           fetch-tags: true
 
       - uses: ./.github/actions/setup-bun
-        with:
-          cross-compile: "true"
 
       - name: Setup git committer
         id: committer
@@ -90,7 +88,7 @@ jobs:
       - name: Build
         id: build
         run: |
-          ./packages/opencode/script/build.ts --all
+          ./packages/opencode/script/build.ts
         env:
           OPENCODE_VERSION: ${{ needs.version.outputs.version }}
           OPENCODE_RELEASE: ${{ needs.version.outputs.release }}

.github/workflows/sign-cli.yml

@@ -20,12 +20,10 @@ jobs:
           fetch-tags: true
 
       - uses: ./.github/actions/setup-bun
-        with:
-          cross-compile: "true"
 
       - name: Build
         run: |
-          ./packages/opencode/script/build.ts --all
+          ./packages/opencode/script/build.ts
 
       - name: Upload unsigned Windows CLI
         id: upload_unsigned_windows_cli

.github/workflows/test.yml

@@ -8,16 +8,8 @@ on:
   workflow_dispatch:
 jobs:
   unit:
-    name: unit (${{ matrix.settings.name }})
-    strategy:
-      fail-fast: false
-      matrix:
-        settings:
-          - name: linux
-            host: blacksmith-4vcpu-ubuntu-2404
-          - name: windows
-            host: blacksmith-4vcpu-windows-2025
-    runs-on: ${{ matrix.settings.host }}
+    name: unit (linux)
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     defaults:
       run:
         shell: bash

bun.lock

@@ -304,8 +304,8 @@
         "@opencode-ai/sdk": "workspace:*",
         "@opencode-ai/util": "workspace:*",
         "@openrouter/ai-sdk-provider": "1.5.4",
-        "@opentui/core": "0.1.81",
-        "@opentui/solid": "0.1.81",
+        "@opentui/core": "0.1.79",
+        "@opentui/solid": "0.1.79",
         "@parcel/watcher": "2.5.1",
         "@pierre/diffs": "catalog:",
         "@solid-primitives/event-bus": "1.1.2",
@@ -1314,21 +1314,21 @@
 
     "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="],
 
-    "@opentui/core": ["@opentui/core@0.1.81", "", { "dependencies": { "bun-ffi-structs": "0.1.2", "diff": "8.0.2", "jimp": "1.6.0", "marked": "17.0.1", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.1.81", "@opentui/core-darwin-x64": "0.1.81", "@opentui/core-linux-arm64": "0.1.81", "@opentui/core-linux-x64": "0.1.81", "@opentui/core-win32-arm64": "0.1.81", "@opentui/core-win32-x64": "0.1.81", "bun-webgpu": "0.1.5", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-ooFjkkQ80DDC4X5eLvH8dBcLAtWwGp9RTaWsaeWet3GOv4N0SDcN8mi1XGhYnUlTuxmofby5eQrPegjtWHODlA=="],
+    "@opentui/core": ["@opentui/core@0.1.79", "", { "dependencies": { "bun-ffi-structs": "0.1.2", "diff": "8.0.2", "jimp": "1.6.0", "marked": "17.0.1", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.1.79", "@opentui/core-darwin-x64": "0.1.79", "@opentui/core-linux-arm64": "0.1.79", "@opentui/core-linux-x64": "0.1.79", "@opentui/core-win32-arm64": "0.1.79", "@opentui/core-win32-x64": "0.1.79", "bun-webgpu": "0.1.4", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-job/t09w8A/aHb/WuaVbimu5fIffyN+PCuVO5cYhXEg/NkOkC/WdFi80B8bwncR/DBPyLAh6oJ3EG86grOVo5g=="],
 
-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.1.81", "", { "os": "darwin", "cpu": "arm64" }, "sha512-I3Ry5JbkSQXs2g1me8yYr0v3CUcIIfLHzbWz9WMFla8kQDSa+HOr8IpZbqZDeIFgOVzolAXBmZhg0VJI3bZ7MA=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.1.79", "", { "os": "darwin", "cpu": "arm64" }, "sha512-kgsGniV+DM5G1P3GideyJhvfnthNKcVCAm2mPTIr9InQ3L0gS/Feh7zgwOS/jxDvdlQbOWGKMk2Z3JApeC1MLw=="],
 
-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.1.81", "", { "os": "darwin", "cpu": "x64" }, "sha512-CrtNKu41D6+bOQdUOmDX4Q3hTL6p+sT55wugPzbDq7cdqFZabCeguBAyOlvRl2g2aJ93kmOWW6MXG0bPPklEFg=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.1.79", "", { "os": "darwin", "cpu": "x64" }, "sha512-OpyAmFqAAKQ2CeFmf/oLWcNksmP6Ryx/3R5dbKXThOudMCeQvfvInJTRbc2jTn9VFpf+Qj4BgHkJg1h90tf/EA=="],
 
-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.1.81", "", { "os": "linux", "cpu": "arm64" }, "sha512-FJw9zmJop9WiMvtT07nSrfBLPLqskxL6xfV3GNft0mSYV+C3hdJ0qkiczGSHUX/6V7fmouM84RWwmY53Rb6hYQ=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.1.79", "", { "os": "linux", "cpu": "arm64" }, "sha512-DCa5YaknS4bWhFt8TMEGH+qmTinyzuY8hoZbO4crtWXAxofPP7Pas76Cwxlvis/PyLffA+pPxAl1l5sUZpsvqw=="],
 
-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.1.81", "", { "os": "linux", "cpu": "x64" }, "sha512-Rj2AFIiuWI0BEMIvh/Jeuxty9Gp5ZhLuQU7ZHJJhojKo/mpBpMs9X+5kwZPZya/tyR8uVDAVyB6AOLkhdRW5lw=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.1.79", "", { "os": "linux", "cpu": "x64" }, "sha512-V6xjvFfHh3NGvsuuDae1KHPRZXHMEE8XL0A/GM6v4I4OCC23kDmkK60Vn6OptQwAzwwbz0X0IX+Ut/GQU9qGgA=="],
 
-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.1.81", "", { "os": "win32", "cpu": "arm64" }, "sha512-AiZB+mZ1cVr8plAPrPT98e3kw6D0OdOSe2CQYLgJRbfRlPqq3jl26lHPzDb3ZO2OR0oVGRPJvXraus939mvoiQ=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.1.79", "", { "os": "win32", "cpu": "arm64" }, "sha512-sPRKnVzOdT5szI59tte7pxwwkYA+07EQN+6miFAvkFuiLmRUngONUD8HVjL7nCnxcPFqxaU4Rvl1y40ST86g8g=="],
 
-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.1.81", "", { "os": "win32", "cpu": "x64" }, "sha512-l8R2Ni1CR4eHi3DTmSkEL/EjHAtOZ/sndYs3VVw+Ej2esL3Mf0W7qSO5S0YNBanz2VXZhbkmM6ERm9keH8RD3w=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.1.79", "", { "os": "win32", "cpu": "x64" }, "sha512-vmQcFTvKf9fqajnDtgU6/uAsiTGwx8//khqHVBmiTEXUsiT792Ki9l8sgNughbuldqG5iZOiF6IaAWU1H67UpA=="],
 
-    "@opentui/solid": ["@opentui/solid@0.1.81", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.1.81", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.9", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.9" } }, "sha512-QRjS0wPuIhBRdY8tpG3yprCM4ZnOxWWHTuaZ4hhia2wFZygf7Ome6EuZnLXmtuOQjkjCwu0if8Yik6toc6QylA=="],
+    "@opentui/solid": ["@opentui/solid@0.1.79", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.1.79", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.9", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.9" } }, "sha512-c5+0jexKxb8GwRDDkQ/U6isZZqClAzHccXmYiLYmSnqdoQQp2lIGHLartL+K8lfIQrsKClzP2ZHumN6nexRfRg=="],
 
     "@oslojs/asn1": ["@oslojs/asn1@1.0.0", "", { "dependencies": { "@oslojs/binary": "1.0.0" } }, "sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA=="],
 
@@ -2226,7 +2226,7 @@
 
     "bun-types": ["bun-types@1.3.9", "", { "dependencies": { "@types/node": "*" } }, "sha512-+UBWWOakIP4Tswh0Bt0QD0alpTY8cb5hvgiYeWCMet9YukHbzuruIEeXC2D7nMJPB12kbh8C7XJykSexEqGKJg=="],
 
-    "bun-webgpu": ["bun-webgpu@0.1.5", "", { "dependencies": { "@webgpu/types": "^0.1.60" }, "optionalDependencies": { "bun-webgpu-darwin-arm64": "^0.1.5", "bun-webgpu-darwin-x64": "^0.1.5", "bun-webgpu-linux-x64": "^0.1.5", "bun-webgpu-win32-x64": "^0.1.5" } }, "sha512-91/K6S5whZKX7CWAm9AylhyKrLGRz6BUiiPiM/kXadSnD4rffljCD/q9cNFftm5YXhx4MvLqw33yEilxogJvwA=="],
+    "bun-webgpu": ["bun-webgpu@0.1.4", "", { "dependencies": { "@webgpu/types": "^0.1.60" }, "optionalDependencies": { "bun-webgpu-darwin-arm64": "^0.1.4", "bun-webgpu-darwin-x64": "^0.1.4", "bun-webgpu-linux-x64": "^0.1.4", "bun-webgpu-win32-x64": "^0.1.4" } }, "sha512-Kw+HoXl1PMWJTh9wvh63SSRofTA8vYBFCw0XEP1V1fFdQEDhI8Sgf73sdndE/oDpN/7CMx0Yv/q8FCvO39ROMQ=="],
 
     "bun-webgpu-darwin-arm64": ["bun-webgpu-darwin-arm64@0.1.5", "", { "os": "darwin", "cpu": "arm64" }, "sha512-qM7W5IaFpWYGPDcNiQ8DOng3noQ97gxpH2MFH1mGsdKwI0T4oy++egSh5Z7s6AQx8WKgc9GzAsTUM4KZkFdacw=="],
 

infra/console.ts

@@ -100,46 +100,26 @@ export const stripeWebhook = new stripe.WebhookEndpoint("StripeWebhookEndpoint",
   ],
 })
 
-const zenLiteProduct = new stripe.Product("ZenLite", {
-  name: "OpenCode Lite",
-})
-const zenLitePrice = new stripe.Price("ZenLitePrice", {
-  product: zenLiteProduct.id,
-  currency: "usd",
-  recurring: {
-    interval: "month",
-    intervalCount: 1,
-  },
-  unitAmount: 1000,
-})
-const ZEN_LITE_PRICE = new sst.Linkable("ZEN_LITE_PRICE", {
-  properties: {
-    product: zenLiteProduct.id,
-    price: zenLitePrice.id,
-  },
-})
-const ZEN_LITE_LIMITS = new sst.Secret("ZEN_LITE_LIMITS")
-
-const zenBlackProduct = new stripe.Product("ZenBlack", {
+const zenProduct = new stripe.Product("ZenBlack", {
   name: "OpenCode Black",
 })
-const zenBlackPriceProps = {
-  product: zenBlackProduct.id,
+const zenPriceProps = {
+  product: zenProduct.id,
   currency: "usd",
   recurring: {
     interval: "month",
     intervalCount: 1,
   },
 }
-const zenBlackPrice200 = new stripe.Price("ZenBlackPrice", { ...zenBlackPriceProps, unitAmount: 20000 })
-const zenBlackPrice100 = new stripe.Price("ZenBlack100Price", { ...zenBlackPriceProps, unitAmount: 10000 })
-const zenBlackPrice20 = new stripe.Price("ZenBlack20Price", { ...zenBlackPriceProps, unitAmount: 2000 })
+const zenPrice200 = new stripe.Price("ZenBlackPrice", { ...zenPriceProps, unitAmount: 20000 })
+const zenPrice100 = new stripe.Price("ZenBlack100Price", { ...zenPriceProps, unitAmount: 10000 })
+const zenPrice20 = new stripe.Price("ZenBlack20Price", { ...zenPriceProps, unitAmount: 2000 })
 const ZEN_BLACK_PRICE = new sst.Linkable("ZEN_BLACK_PRICE", {
   properties: {
-    product: zenBlackProduct.id,
-    plan200: zenBlackPrice200.id,
-    plan100: zenBlackPrice100.id,
-    plan20: zenBlackPrice20.id,
+    product: zenProduct.id,
+    plan200: zenPrice200.id,
+    plan100: zenPrice100.id,
+    plan20: zenPrice20.id,
   },
 })
 const ZEN_BLACK_LIMITS = new sst.Secret("ZEN_BLACK_LIMITS")
@@ -216,8 +196,6 @@ new sst.cloudflare.x.SolidStart("Console", {
     AWS_SES_SECRET_ACCESS_KEY,
     ZEN_BLACK_PRICE,
     ZEN_BLACK_LIMITS,
-    ZEN_LITE_PRICE,
-    ZEN_LITE_LIMITS,
     new sst.Secret("ZEN_SESSION_SECRET"),
     ...ZEN_MODELS,
     ...($dev

nix/hashes.json

@@ -1,8 +1,8 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-3hfy6nfEnGq4J6inH0pXANw05oas+81iuayn7J0pj9c=",
-    "aarch64-linux": "sha256-dxWaLtzSeI5NfHwB6u0K10yxoA0ESz/r+zTEQ3FdKFY=",
-    "aarch64-darwin": "sha256-kkK4rj4g0j2jJFXVmVH7CJcXlI8Dj/KmL/VC3iE4Z+8=",
-    "x86_64-darwin": "sha256-jt51irxZd48kb0BItd8InP7lfsELUh0unVYO2es+a98="
+    "x86_64-linux": "sha256-fjrvCgQ2PHYxzw8NsiEHOcor46qN95/cfilFHFqCp/k=",
+    "aarch64-linux": "sha256-xWp4LLJrbrCPFL1F6SSbProq/t/az4CqhTcymPvjOBQ=",
+    "aarch64-darwin": "sha256-Wbfyy/bruFHKUWsyJ2aiPXAzLkk5MNBfN6QdGPQwZS0=",
+    "x86_64-darwin": "sha256-wDnMbiaBCRj5STkaLoVCZTdXVde+/YKfwWzwJZ1AJXQ="
   }
 }

packages/app/e2e/utils.ts

@@ -1,7 +1,7 @@
 import { createOpencodeClient } from "@opencode-ai/sdk/v2/client"
 import { base64Encode } from "@opencode-ai/util/encode"
 
-export const serverHost = process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"
+export const serverHost = process.env.PLAYWRIGHT_SERVER_HOST ?? "localhost"
 export const serverPort = process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"
 
 export const serverUrl = `http://${serverHost}:${serverPort}`

packages/app/playwright.config.ts

@@ -1,8 +1,8 @@
 import { defineConfig, devices } from "@playwright/test"
 
 const port = Number(process.env.PLAYWRIGHT_PORT ?? 3000)
-const baseURL = process.env.PLAYWRIGHT_BASE_URL ?? `http://127.0.0.1:${port}`
-const serverHost = process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"
+const baseURL = process.env.PLAYWRIGHT_BASE_URL ?? `http://localhost:${port}`
+const serverHost = process.env.PLAYWRIGHT_SERVER_HOST ?? "localhost"
 const serverPort = process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"
 const command = `bun run dev -- --host 0.0.0.0 --port ${port}`
 const reuse = !process.env.CI

packages/app/src/components/settings-general.tsx

@@ -267,50 +267,18 @@ export const SettingsGeneral: Component = () => {
             )}
           </Select>
         </SettingsRow>
-      </div>
-    </div>
-  )
 
-  const FeedSection = () => (
-    <div class="flex flex-col gap-1">
-      <h3 class="text-14-medium text-text-strong pb-2">{language.t("settings.general.section.feed")}</h3>
-
-      <div class="bg-surface-raised-base px-4 rounded-lg">
         <SettingsRow
           title={language.t("settings.general.row.reasoningSummaries.title")}
           description={language.t("settings.general.row.reasoningSummaries.description")}
         >
-          <div data-action="settings-feed-reasoning-summaries">
+          <div data-action="settings-reasoning-summaries">
             <Switch
               checked={settings.general.showReasoningSummaries()}
               onChange={(checked) => settings.general.setShowReasoningSummaries(checked)}
             />
           </div>
         </SettingsRow>
-
-        <SettingsRow
-          title={language.t("settings.general.row.shellToolPartsExpanded.title")}
-          description={language.t("settings.general.row.shellToolPartsExpanded.description")}
-        >
-          <div data-action="settings-feed-shell-tool-parts-expanded">
-            <Switch
-              checked={settings.general.shellToolPartsExpanded()}
-              onChange={(checked) => settings.general.setShellToolPartsExpanded(checked)}
-            />
-          </div>
-        </SettingsRow>
-
-        <SettingsRow
-          title={language.t("settings.general.row.editToolPartsExpanded.title")}
-          description={language.t("settings.general.row.editToolPartsExpanded.description")}
-        >
-          <div data-action="settings-feed-edit-tool-parts-expanded">
-            <Switch
-              checked={settings.general.editToolPartsExpanded()}
-              onChange={(checked) => settings.general.setEditToolPartsExpanded(checked)}
-            />
-          </div>
-        </SettingsRow>
       </div>
     </div>
   )
@@ -467,8 +435,6 @@ export const SettingsGeneral: Component = () => {
       <div class="flex flex-col gap-8 w-full">
         <AppearanceSection />
 
-        <FeedSection />
-
         <NotificationsSection />
 
         <SoundsSection />

packages/app/src/context/file/path.test.ts

@@ -13,14 +13,6 @@ describe("file path helpers", () => {
     expect(path.pathFromTab("other://src/app.ts")).toBeUndefined()
   })
 
-  test("normalizes Windows absolute paths with mixed separators", () => {
-    const path = createPathHelpers(() => "C:\\repo")
-    expect(path.normalize("C:\\repo\\src\\app.ts")).toBe("src/app.ts")
-    expect(path.normalize("C:/repo/src/app.ts")).toBe("src/app.ts")
-    expect(path.normalize("file://C:/repo/src/app.ts")).toBe("src/app.ts")
-    expect(path.normalize("c:\\repo\\src\\app.ts")).toBe("src/app.ts")
-  })
-
   test("keeps query/hash stripping behavior stable", () => {
     expect(stripQueryAndHash("a/b.ts#L12?x=1")).toBe("a/b.ts")
     expect(stripQueryAndHash("a/b.ts?x=1#L12")).toBe("a/b.ts")

packages/app/src/context/file/path.ts

@@ -103,21 +103,16 @@ export function encodeFilePath(filepath: string): string {
 
 export function createPathHelpers(scope: () => string) {
   const normalize = (input: string) => {
-    const root = scope().replace(/\\/g, "/")
+    const root = scope()
+    const prefix = root.endsWith("/") ? root : root + "/"
 
-    let path = unquoteGitPath(decodeFilePath(stripQueryAndHash(stripFileProtocol(input)))).replace(/\\/g, "/")
+    let path = unquoteGitPath(decodeFilePath(stripQueryAndHash(stripFileProtocol(input))))
 
-    // Remove initial root prefix, if it's a complete match or followed by /
-    // (don't want /foo/bar to root of /f).
-    // For Windows paths, also check for case-insensitive match.
-    const windows = /^[A-Za-z]:/.test(root)
-    const canonRoot = windows ? root.toLowerCase() : root
-    const canonPath = windows ? path.toLowerCase() : path
-    if (
-      canonPath.startsWith(canonRoot) &&
-      (canonRoot.endsWith("/") || canonPath === canonRoot || canonPath.startsWith(canonRoot + "/"))
-    ) {
-      // If we match canonRoot + "/", the slash will be removed below.
+    if (path.startsWith(prefix)) {
+      path = path.slice(prefix.length)
+    }
+
+    if (path.startsWith(root)) {
       path = path.slice(root.length)
     }
 

packages/app/src/context/settings.tsx

@@ -23,8 +23,6 @@ export interface Settings {
     autoSave: boolean
     releaseNotes: boolean
     showReasoningSummaries: boolean
-    shellToolPartsExpanded: boolean
-    editToolPartsExpanded: boolean
   }
   updates: {
     startup: boolean
@@ -46,8 +44,6 @@ const defaultSettings: Settings = {
     autoSave: true,
     releaseNotes: true,
     showReasoningSummaries: false,
-    shellToolPartsExpanded: true,
-    editToolPartsExpanded: false,
   },
   updates: {
     startup: true,
@@ -133,20 +129,6 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
         setShowReasoningSummaries(value: boolean) {
           setStore("general", "showReasoningSummaries", value)
         },
-        shellToolPartsExpanded: withFallback(
-          () => store.general?.shellToolPartsExpanded,
-          defaultSettings.general.shellToolPartsExpanded,
-        ),
-        setShellToolPartsExpanded(value: boolean) {
-          setStore("general", "shellToolPartsExpanded", value)
-        },
-        editToolPartsExpanded: withFallback(
-          () => store.general?.editToolPartsExpanded,
-          defaultSettings.general.editToolPartsExpanded,
-        ),
-        setEditToolPartsExpanded(value: boolean) {
-          setStore("general", "editToolPartsExpanded", value)
-        },
       },
       updates: {
         startup: withFallback(() => store.updates?.startup, defaultSettings.updates.startup),

packages/app/src/i18n/ar.ts

@@ -529,7 +529,6 @@ export const dict = {
   "settings.general.section.notifications": "إشعارات النظام",
   "settings.general.section.updates": "التحديثات",
   "settings.general.section.sounds": "المؤثرات الصوتية",
-  "settings.general.section.feed": "الخلاصة",
   "settings.general.section.display": "شاشة العرض",
   "settings.general.row.language.title": "اللغة",
   "settings.general.row.language.description": "تغيير لغة العرض لـ OpenCode",
@@ -539,12 +538,6 @@ export const dict = {
   "settings.general.row.theme.description": "تخصيص سمة OpenCode.",
   "settings.general.row.font.title": "الخط",
   "settings.general.row.font.description": "تخصيص الخط الأحادي المستخدم في كتل التعليمات البرمجية",
-  "settings.general.row.shellToolPartsExpanded.title": "توسيع أجزاء أداة shell",
-  "settings.general.row.shellToolPartsExpanded.description":
-    "إظهار أجزاء أداة shell موسعة بشكل افتراضي في الشريط الزمني",
-  "settings.general.row.editToolPartsExpanded.title": "توسيع أجزاء أداة edit",
-  "settings.general.row.editToolPartsExpanded.description":
-    "إظهار أجزاء أدوات edit و write و patch موسعة بشكل افتراضي في الشريط الزمني",
   "settings.general.row.wayland.title": "استخدام Wayland الأصلي",
   "settings.general.row.wayland.description": "تعطيل التراجع إلى X11 على Wayland. يتطلب إعادة التشغيل.",
   "settings.general.row.wayland.tooltip":

packages/app/src/i18n/br.ts

@@ -535,7 +535,6 @@ export const dict = {
   "settings.general.section.notifications": "Notificações do sistema",
   "settings.general.section.updates": "Atualizações",
   "settings.general.section.sounds": "Efeitos sonoros",
-  "settings.general.section.feed": "Feed",
   "settings.general.section.display": "Tela",
   "settings.general.row.language.title": "Idioma",
   "settings.general.row.language.description": "Alterar o idioma de exibição do OpenCode",
@@ -545,12 +544,6 @@ export const dict = {
   "settings.general.row.theme.description": "Personalize como o OpenCode é tematizado.",
   "settings.general.row.font.title": "Fonte",
   "settings.general.row.font.description": "Personalize a fonte monoespaçada usada em blocos de código",
-  "settings.general.row.shellToolPartsExpanded.title": "Expandir partes da ferramenta shell",
-  "settings.general.row.shellToolPartsExpanded.description":
-    "Mostrar partes da ferramenta shell expandidas por padrão na linha do tempo",
-  "settings.general.row.editToolPartsExpanded.title": "Expandir partes da ferramenta de edição",
-  "settings.general.row.editToolPartsExpanded.description":
-    "Mostrar partes das ferramentas de edição, escrita e patch expandidas por padrão na linha do tempo",
   "settings.general.row.wayland.title": "Usar Wayland nativo",
   "settings.general.row.wayland.description": "Desabilitar fallback X11 no Wayland. Requer reinicialização.",
   "settings.general.row.wayland.tooltip":

packages/app/src/i18n/bs.ts

@@ -599,7 +599,6 @@ export const dict = {
   "settings.general.section.notifications": "Sistemske obavijesti",
   "settings.general.section.updates": "Ažuriranja",
   "settings.general.section.sounds": "Zvučni efekti",
-  "settings.general.section.feed": "Feed",
   "settings.general.section.display": "Prikaz",
 
   "settings.general.row.language.title": "Jezik",
@@ -611,12 +610,6 @@ export const dict = {
   "settings.general.row.font.title": "Font",
   "settings.general.row.font.description": "Prilagodi monospace font koji se koristi u blokovima koda",
 
-  "settings.general.row.shellToolPartsExpanded.title": "Proširi dijelove shell alata",
-  "settings.general.row.shellToolPartsExpanded.description":
-    "Prikaži dijelove shell alata podrazumijevano proširene na vremenskoj traci",
-  "settings.general.row.editToolPartsExpanded.title": "Proširi dijelove alata za uređivanje",
-  "settings.general.row.editToolPartsExpanded.description":
-    "Prikaži dijelove alata za uređivanje, pisanje i patch podrazumijevano proširene na vremenskoj traci",
   "settings.general.row.wayland.title": "Koristi nativni Wayland",
   "settings.general.row.wayland.description": "Onemogući X11 fallback na Waylandu. Zahtijeva restart.",
   "settings.general.row.wayland.tooltip":

packages/app/src/i18n/da.ts

@@ -594,7 +594,6 @@ export const dict = {
   "settings.general.section.notifications": "Systemmeddelelser",
   "settings.general.section.updates": "Opdateringer",
   "settings.general.section.sounds": "Lydeffekter",
-  "settings.general.section.feed": "Feed",
   "settings.general.section.display": "Skærm",
 
   "settings.general.row.language.title": "Sprog",
@@ -606,11 +605,6 @@ export const dict = {
   "settings.general.row.font.title": "Skrifttype",
   "settings.general.row.font.description": "Tilpas mono-skrifttypen brugt i kodeblokke",
 
-  "settings.general.row.shellToolPartsExpanded.title": "Udvid shell-værktøjsdele",
-  "settings.general.row.shellToolPartsExpanded.description": "Vis shell-værktøjsdele udvidet som standard i tidslinjen",
-  "settings.general.row.editToolPartsExpanded.title": "Udvid edit-værktøjsdele",
-  "settings.general.row.editToolPartsExpanded.description":
-    "Vis edit-, write- og patch-værktøjsdele udvidet som standard i tidslinjen",
   "settings.general.row.wayland.title": "Brug native Wayland",
   "settings.general.row.wayland.description": "Deaktiver X11-fallback på Wayland. Kræver genstart.",
   "settings.general.row.wayland.tooltip":

packages/app/src/i18n/de.ts

@@ -544,7 +544,6 @@ export const dict = {
   "settings.general.section.notifications": "Systembenachrichtigungen",
   "settings.general.section.updates": "Updates",
   "settings.general.section.sounds": "Soundeffekte",
-  "settings.general.section.feed": "Feed",
   "settings.general.section.display": "Anzeige",
   "settings.general.row.language.title": "Sprache",
   "settings.general.row.language.description": "Die Anzeigesprache für OpenCode ändern",
@@ -554,12 +553,6 @@ export const dict = {
   "settings.general.row.theme.description": "Das Thema von OpenCode anpassen.",
   "settings.general.row.font.title": "Schriftart",
   "settings.general.row.font.description": "Die in Codeblöcken verwendete Monospace-Schriftart anpassen",
-  "settings.general.row.shellToolPartsExpanded.title": "Shell-Tool-Abschnitte ausklappen",
-  "settings.general.row.shellToolPartsExpanded.description":
-    "Shell-Tool-Abschnitte standardmäßig in der Timeline ausgeklappt anzeigen",
-  "settings.general.row.editToolPartsExpanded.title": "Edit-Tool-Abschnitte ausklappen",
-  "settings.general.row.editToolPartsExpanded.description":
-    "Edit-, Write- und Patch-Tool-Abschnitte standardmäßig in der Timeline ausgeklappt anzeigen",
   "settings.general.row.wayland.title": "Natives Wayland verwenden",
   "settings.general.row.wayland.description": "X11-Fallback unter Wayland deaktivieren. Erfordert Neustart.",
   "settings.general.row.wayland.tooltip":

packages/app/src/i18n/en.ts

@@ -495,7 +495,6 @@ export const dict = {
   "session.review.change.other": "Changes",
   "session.review.loadingChanges": "Loading changes...",
   "session.review.empty": "No changes in this session yet",
-  "session.review.noVcs": "No git VCS detected, so session changes will not be detected",
   "session.review.noChanges": "No changes",
 
   "session.files.selectToOpen": "Select a file to open",
@@ -601,7 +600,6 @@ export const dict = {
   "settings.general.section.notifications": "System notifications",
   "settings.general.section.updates": "Updates",
   "settings.general.section.sounds": "Sound effects",
-  "settings.general.section.feed": "Feed",
   "settings.general.section.display": "Display",
 
   "settings.general.row.language.title": "Language",
@@ -614,12 +612,6 @@ export const dict = {
   "settings.general.row.font.description": "Customise the mono font used in code blocks",
   "settings.general.row.reasoningSummaries.title": "Show reasoning summaries",
   "settings.general.row.reasoningSummaries.description": "Display model reasoning summaries in the timeline",
-  "settings.general.row.shellToolPartsExpanded.title": "Expand shell tool parts",
-  "settings.general.row.shellToolPartsExpanded.description":
-    "Show shell tool parts expanded by default in the timeline",
-  "settings.general.row.editToolPartsExpanded.title": "Expand edit tool parts",
-  "settings.general.row.editToolPartsExpanded.description":
-    "Show edit, write, and patch tool parts expanded by default in the timeline",
 
   "settings.general.row.wayland.title": "Use native Wayland",
   "settings.general.row.wayland.description": "Disable X11 fallback on Wayland. Requires restart.",

packages/app/src/i18n/es.ts

@@ -602,7 +602,6 @@ export const dict = {
   "settings.general.section.notifications": "Notificaciones del sistema",
   "settings.general.section.updates": "Actualizaciones",
   "settings.general.section.sounds": "Efectos de sonido",
-  "settings.general.section.feed": "Feed",
   "settings.general.section.display": "Pantalla",
 
   "settings.general.row.language.title": "Idioma",
@@ -614,12 +613,6 @@ export const dict = {
   "settings.general.row.font.title": "Fuente",
   "settings.general.row.font.description": "Personaliza la fuente monoespaciada usada en bloques de código",
 
-  "settings.general.row.shellToolPartsExpanded.title": "Expandir partes de la herramienta shell",
-  "settings.general.row.shellToolPartsExpanded.description":
-    "Mostrar las partes de la herramienta shell expandidas por defecto en la línea de tiempo",
-  "settings.general.row.editToolPartsExpanded.title": "Expandir partes de la herramienta de edición",
-  "settings.general.row.editToolPartsExpanded.description":
-    "Mostrar las partes de las herramientas de edición, escritura y parcheado expandidas por defecto en la línea de tiempo",
   "settings.general.row.wayland.title": "Usar Wayland nativo",
   "settings.general.row.wayland.description": "Deshabilitar fallback a X11 en Wayland. Requiere reinicio.",
   "settings.general.row.wayland.tooltip":

packages/app/src/i18n/fr.ts

@@ -543,7 +543,6 @@ export const dict = {
   "settings.general.section.notifications": "Notifications système",
   "settings.general.section.updates": "Mises à jour",
   "settings.general.section.sounds": "Effets sonores",
-  "settings.general.section.feed": "Flux",
   "settings.general.section.display": "Affichage",
   "settings.general.row.language.title": "Langue",
   "settings.general.row.language.description": "Changer la langue d'affichage pour OpenCode",
@@ -553,12 +552,6 @@ export const dict = {
   "settings.general.row.theme.description": "Personnaliser le thème d'OpenCode.",
   "settings.general.row.font.title": "Police",
   "settings.general.row.font.description": "Personnaliser la police mono utilisée dans les blocs de code",
-  "settings.general.row.shellToolPartsExpanded.title": "Développer les parties de l'outil shell",
-  "settings.general.row.shellToolPartsExpanded.description":
-    "Afficher les parties de l'outil shell développées par défaut dans la chronologie",
-  "settings.general.row.editToolPartsExpanded.title": "Développer les parties de l'outil edit",
-  "settings.general.row.editToolPartsExpanded.description":
-    "Afficher les parties des outils edit, write et patch développées par défaut dans la chronologie",
   "settings.general.row.wayland.title": "Utiliser Wayland natif",
   "settings.general.row.wayland.description": "Désactiver le repli X11 sur Wayland. Nécessite un redémarrage.",
   "settings.general.row.wayland.tooltip":

packages/app/src/i18n/ja.ts

@@ -533,7 +533,6 @@ export const dict = {
   "settings.general.section.notifications": "システム通知",
   "settings.general.section.updates": "アップデート",
   "settings.general.section.sounds": "効果音",
-  "settings.general.section.feed": "フィード",
   "settings.general.section.display": "ディスプレイ",
   "settings.general.row.language.title": "言語",
   "settings.general.row.language.description": "OpenCodeの表示言語を変更します",
@@ -543,12 +542,6 @@ export const dict = {
   "settings.general.row.theme.description": "OpenCodeのテーマをカスタマイズします。",
   "settings.general.row.font.title": "フォント",
   "settings.general.row.font.description": "コードブロックで使用する等幅フォントをカスタマイズします",
-  "settings.general.row.shellToolPartsExpanded.title": "shell ツールパーツを展開",
-  "settings.general.row.shellToolPartsExpanded.description":
-    "タイムラインで shell ツールパーツをデフォルトで展開して表示します",
-  "settings.general.row.editToolPartsExpanded.title": "edit ツールパーツを展開",
-  "settings.general.row.editToolPartsExpanded.description":
-    "タイムラインで edit、write、patch ツールパーツをデフォルトで展開して表示します",
   "settings.general.row.wayland.title": "ネイティブWaylandを使用",
   "settings.general.row.wayland.description": "WaylandでのX11フォールバックを無効にします。再起動が必要です。",
   "settings.general.row.wayland.tooltip":

packages/app/src/i18n/ko.ts

@@ -534,7 +534,6 @@ export const dict = {
   "settings.general.section.notifications": "시스템 알림",
   "settings.general.section.updates": "업데이트",
   "settings.general.section.sounds": "효과음",
-  "settings.general.section.feed": "피드",
   "settings.general.section.display": "디스플레이",
   "settings.general.row.language.title": "언어",
   "settings.general.row.language.description": "OpenCode 표시 언어 변경",
@@ -544,12 +543,6 @@ export const dict = {
   "settings.general.row.theme.description": "OpenCode 테마 사용자 지정",
   "settings.general.row.font.title": "글꼴",
   "settings.general.row.font.description": "코드 블록에 사용되는 고정폭 글꼴 사용자 지정",
-  "settings.general.row.shellToolPartsExpanded.title": "shell 도구 파트 펼치기",
-  "settings.general.row.shellToolPartsExpanded.description":
-    "타임라인에서 기본적으로 shell 도구 파트를 펼친 상태로 표시합니다",
-  "settings.general.row.editToolPartsExpanded.title": "edit 도구 파트 펼치기",
-  "settings.general.row.editToolPartsExpanded.description":
-    "타임라인에서 기본적으로 edit, write, patch 도구 파트를 펼친 상태로 표시합니다",
   "settings.general.row.wayland.title": "네이티브 Wayland 사용",
   "settings.general.row.wayland.description": "Wayland에서 X11 폴백을 비활성화합니다. 다시 시작해야 합니다.",
   "settings.general.row.wayland.tooltip":

packages/app/src/i18n/no.ts

@@ -602,7 +602,6 @@ export const dict = {
   "settings.general.section.notifications": "Systemvarsler",
   "settings.general.section.updates": "Oppdateringer",
   "settings.general.section.sounds": "Lydeffekter",
-  "settings.general.section.feed": "Feed",
   "settings.general.section.display": "Skjerm",
 
   "settings.general.row.language.title": "Språk",
@@ -614,11 +613,6 @@ export const dict = {
   "settings.general.row.font.title": "Skrift",
   "settings.general.row.font.description": "Tilpass mono-skriften som brukes i kodeblokker",
 
-  "settings.general.row.shellToolPartsExpanded.title": "Utvid shell-verktøydeler",
-  "settings.general.row.shellToolPartsExpanded.description": "Vis shell-verktøydeler utvidet som standard i tidslinjen",
-  "settings.general.row.editToolPartsExpanded.title": "Utvid edit-verktøydeler",
-  "settings.general.row.editToolPartsExpanded.description":
-    "Vis edit-, write- og patch-verktøydeler utvidet som standard i tidslinjen",
   "settings.general.row.wayland.title": "Bruk innebygd Wayland",
   "settings.general.row.wayland.description": "Deaktiver X11-fallback på Wayland. Krever omstart.",
   "settings.general.row.wayland.tooltip":

packages/app/src/i18n/pl.ts

@@ -534,7 +534,6 @@ export const dict = {
   "settings.general.section.notifications": "Powiadomienia systemowe",
   "settings.general.section.updates": "Aktualizacje",
   "settings.general.section.sounds": "Efekty dźwiękowe",
-  "settings.general.section.feed": "Kanał",
   "settings.general.section.display": "Ekran",
   "settings.general.row.language.title": "Język",
   "settings.general.row.language.description": "Zmień język wyświetlania dla OpenCode",
@@ -544,12 +543,6 @@ export const dict = {
   "settings.general.row.theme.description": "Dostosuj motyw OpenCode.",
   "settings.general.row.font.title": "Czcionka",
   "settings.general.row.font.description": "Dostosuj czcionkę mono używaną w blokach kodu",
-  "settings.general.row.shellToolPartsExpanded.title": "Rozwijaj elementy narzędzia shell",
-  "settings.general.row.shellToolPartsExpanded.description":
-    "Domyślnie pokazuj rozwinięte elementy narzędzia shell na osi czasu",
-  "settings.general.row.editToolPartsExpanded.title": "Rozwijaj elementy narzędzia edit",
-  "settings.general.row.editToolPartsExpanded.description":
-    "Domyślnie pokazuj rozwinięte elementy narzędzi edit, write i patch na osi czasu",
   "settings.general.row.wayland.title": "Użyj natywnego Wayland",
   "settings.general.row.wayland.description": "Wyłącz fallback X11 na Wayland. Wymaga restartu.",
   "settings.general.row.wayland.tooltip":

packages/app/src/i18n/ru.ts

@@ -600,7 +600,6 @@ export const dict = {
   "settings.general.section.notifications": "Системные уведомления",
   "settings.general.section.updates": "Обновления",
   "settings.general.section.sounds": "Звуковые эффекты",
-  "settings.general.section.feed": "Лента",
   "settings.general.section.display": "Дисплей",
 
   "settings.general.row.language.title": "Язык",
@@ -612,12 +611,6 @@ export const dict = {
   "settings.general.row.font.title": "Шрифт",
   "settings.general.row.font.description": "Настройте моноширинный шрифт для блоков кода",
 
-  "settings.general.row.shellToolPartsExpanded.title": "Разворачивать элементы инструмента shell",
-  "settings.general.row.shellToolPartsExpanded.description":
-    "Показывать элементы инструмента shell в ленте развернутыми по умолчанию",
-  "settings.general.row.editToolPartsExpanded.title": "Разворачивать элементы инструмента edit",
-  "settings.general.row.editToolPartsExpanded.description":
-    "Показывать элементы инструментов edit, write и patch в ленте развернутыми по умолчанию",
   "settings.general.row.wayland.title": "Использовать нативный Wayland",
   "settings.general.row.wayland.description": "Отключить X11 fallback на Wayland. Требуется перезапуск.",
   "settings.general.row.wayland.tooltip":

packages/app/src/i18n/th.ts

@@ -594,7 +594,6 @@ export const dict = {
   "settings.general.section.notifications": "การแจ้งเตือนระบบ",
   "settings.general.section.updates": "การอัปเดต",
   "settings.general.section.sounds": "เสียงเอฟเฟกต์",
-  "settings.general.section.feed": "ฟีด",
   "settings.general.section.display": "การแสดงผล",
 
   "settings.general.row.language.title": "ภาษา",
@@ -606,11 +605,6 @@ export const dict = {
   "settings.general.row.font.title": "ฟอนต์",
   "settings.general.row.font.description": "ปรับแต่งฟอนต์โมโนที่ใช้ในบล็อกโค้ด",
 
-  "settings.general.row.shellToolPartsExpanded.title": "ขยายส่วนเครื่องมือ shell",
-  "settings.general.row.shellToolPartsExpanded.description": "แสดงส่วนเครื่องมือ shell แบบขยายตามค่าเริ่มต้นในไทม์ไลน์",
-  "settings.general.row.editToolPartsExpanded.title": "ขยายส่วนเครื่องมือ edit",
-  "settings.general.row.editToolPartsExpanded.description":
-    "แสดงส่วนเครื่องมือ edit, write และ patch แบบขยายตามค่าเริ่มต้นในไทม์ไลน์",
   "settings.general.row.wayland.title": "ใช้ Wayland แบบเนทีฟ",
   "settings.general.row.wayland.description": "ปิดใช้งาน X11 fallback บน Wayland ต้องรีสตาร์ท",
   "settings.general.row.wayland.tooltip": "บน Linux ที่มีจอภาพรีเฟรชเรตแบบผสม Wayland แบบเนทีฟอาจเสถียรกว่า",

packages/app/src/i18n/zh.ts

@@ -595,7 +595,6 @@ export const dict = {
   "settings.general.section.notifications": "系统通知",
   "settings.general.section.updates": "更新",
   "settings.general.section.sounds": "音效",
-  "settings.general.section.feed": "动态",
   "settings.general.section.display": "显示",
   "settings.general.row.language.title": "语言",
   "settings.general.row.language.description": "更改 OpenCode 的显示语言",
@@ -605,10 +604,6 @@ export const dict = {
   "settings.general.row.theme.description": "自定义 OpenCode 的主题。",
   "settings.general.row.font.title": "字体",
   "settings.general.row.font.description": "自定义代码块使用的等宽字体",
-  "settings.general.row.shellToolPartsExpanded.title": "展开 shell 工具部分",
-  "settings.general.row.shellToolPartsExpanded.description": "默认在时间线中展开 shell 工具部分",
-  "settings.general.row.editToolPartsExpanded.title": "展开编辑工具部分",
-  "settings.general.row.editToolPartsExpanded.description": "默认在时间线中展开 edit、write 和 patch 工具部分",
   "settings.general.row.wayland.title": "使用原生 Wayland",
   "settings.general.row.wayland.description": "在 Wayland 上禁用 X11 回退。需要重启。",
   "settings.general.row.wayland.tooltip": "在混合刷新率显示器的 Linux 系统上，原生 Wayland 可能更稳定。",

packages/app/src/i18n/zht.ts

@@ -589,7 +589,6 @@ export const dict = {
   "settings.general.section.notifications": "系統通知",
   "settings.general.section.updates": "更新",
   "settings.general.section.sounds": "音效",
-  "settings.general.section.feed": "資訊流",
   "settings.general.section.display": "顯示",
 
   "settings.general.row.language.title": "語言",
@@ -601,10 +600,6 @@ export const dict = {
   "settings.general.row.font.title": "字型",
   "settings.general.row.font.description": "自訂程式碼區塊使用的等寬字型",
 
-  "settings.general.row.shellToolPartsExpanded.title": "展開 shell 工具區塊",
-  "settings.general.row.shellToolPartsExpanded.description": "在時間軸中預設展開 shell 工具區塊",
-  "settings.general.row.editToolPartsExpanded.title": "展開 edit 工具區塊",
-  "settings.general.row.editToolPartsExpanded.description": "在時間軸中預設展開 edit、write 和 patch 工具區塊",
   "settings.general.row.wayland.title": "使用原生 Wayland",
   "settings.general.row.wayland.description": "在 Wayland 上停用 X11 後備模式。需要重新啟動。",
   "settings.general.row.wayland.tooltip": "在混合更新率螢幕的 Linux 系統上，原生 Wayland 可能更穩定。",

packages/app/src/pages/session.tsx

@@ -274,11 +274,6 @@ export default function Page() {
     if (!hasReview()) return true
     return sync.data.session_diff[id] !== undefined
   })
-  const reviewEmptyKey = createMemo(() => {
-    const project = sync.project
-    if (!project || project.vcs) return "session.review.empty"
-    return "session.review.noVcs"
-  })
 
   let inputRef!: HTMLDivElement
   let promptDock: HTMLDivElement | undefined
@@ -536,7 +531,7 @@ export default function Page() {
             ) : (
               <div class={input.emptyClass}>
                 <Mark class="w-14 opacity-10" />
-                <div class="text-14-regular text-text-weak max-w-56">{language.t(reviewEmptyKey())}</div>
+                <div class="text-14-regular text-text-weak max-w-56">{language.t("session.review.empty")}</div>
               </div>
             )
           }

packages/app/src/pages/session/composer/session-todo-dock.tsx

@@ -87,7 +87,7 @@ export function SessionTodoDock(props: { todos: Todo[]; title: string; collapseL
             icon="chevron-down"
             size="normal"
             variant="ghost"
-            classList={{ "rotate-180": store.collapsed }}
+            classList={{ "rotate-180": !store.collapsed }}
             onMouseDown={(event) => {
               event.preventDefault()
               event.stopPropagation()

packages/app/src/pages/session/helpers.ts

@@ -24,15 +24,13 @@ export const createOpenReviewFile = (input: {
   showAllFiles: () => void
   tabForPath: (path: string) => string
   openTab: (tab: string) => void
-  loadFile: (path: string) => any | Promise<void>
+  loadFile: (path: string) => void
 }) => {
   return (path: string) => {
     batch(() => {
       input.showAllFiles()
-      const maybePromise = input.loadFile(path)
-      const openTab = () => input.openTab(input.tabForPath(path))
-      if (maybePromise instanceof Promise) maybePromise.then(openTab)
-      else openTab()
+      input.openTab(input.tabForPath(path))
+      input.loadFile(path)
     })
   }
 }

packages/app/src/pages/session/message-timeline.tsx

@@ -539,8 +539,6 @@ export function MessageTimeline(props: {
                     messageID={message.id}
                     lastUserMessageID={props.lastUserMessageID}
                     showReasoningSummaries={settings.general.showReasoningSummaries()}
-                    shellToolDefaultOpen={settings.general.shellToolPartsExpanded()}
-                    editToolDefaultOpen={settings.general.editToolPartsExpanded()}
                     classes={{
                       root: "min-w-0 w-full relative",
                       content: "flex flex-col justify-between !overflow-visible",

packages/console/app/src/i18n/ar.ts

@@ -337,14 +337,12 @@ export const dict = {
   "workspace.usage.table.input": "الدخل",
   "workspace.usage.table.output": "الخرج",
   "workspace.usage.table.cost": "التكلفة",
-  "workspace.usage.table.session": "الجلسة",
   "workspace.usage.breakdown.input": "الدخل",
   "workspace.usage.breakdown.cacheRead": "قراءة الكاش",
   "workspace.usage.breakdown.cacheWrite": "كتابة الكاش",
   "workspace.usage.breakdown.output": "الخرج",
   "workspace.usage.breakdown.reasoning": "المنطق",
   "workspace.usage.subscription": "الاشتراك (${{amount}})",
-  "workspace.usage.byok": "BYOK (${{amount}})",
 
   "workspace.cost.title": "التكلفة",
   "workspace.cost.subtitle": "تكاليف الاستخدام مقسمة حسب النموذج.",

packages/console/app/src/i18n/br.ts

@@ -342,14 +342,12 @@ export const dict = {
   "workspace.usage.table.input": "Entrada",
   "workspace.usage.table.output": "Saída",
   "workspace.usage.table.cost": "Custo",
-  "workspace.usage.table.session": "Sessão",
   "workspace.usage.breakdown.input": "Entrada",
   "workspace.usage.breakdown.cacheRead": "Leitura de Cache",
   "workspace.usage.breakdown.cacheWrite": "Escrita em Cache",
   "workspace.usage.breakdown.output": "Saída",
   "workspace.usage.breakdown.reasoning": "Raciocínio",
   "workspace.usage.subscription": "assinatura (${{amount}})",
-  "workspace.usage.byok": "BYOK (${{amount}})",
 
   "workspace.cost.title": "Custo",
   "workspace.cost.subtitle": "Custos de uso discriminados por modelo.",

packages/console/app/src/i18n/da.ts

@@ -340,14 +340,12 @@ export const dict = {
   "workspace.usage.table.input": "Input",
   "workspace.usage.table.output": "Output",
   "workspace.usage.table.cost": "Omkostning",
-  "workspace.usage.table.session": "Session",
   "workspace.usage.breakdown.input": "Input",
   "workspace.usage.breakdown.cacheRead": "Cache læst",
   "workspace.usage.breakdown.cacheWrite": "Cache skriv",
   "workspace.usage.breakdown.output": "Output",
   "workspace.usage.breakdown.reasoning": "Ræsonnement",
   "workspace.usage.subscription": "abonnement (${{amount}})",
-  "workspace.usage.byok": "BYOK (${{amount}})",
 
   "workspace.cost.title": "Omkostninger",
   "workspace.cost.subtitle": "Brugsomkostninger opdelt efter model.",

packages/console/app/src/i18n/de.ts

@@ -342,14 +342,12 @@ export const dict = {
   "workspace.usage.table.input": "Input",
   "workspace.usage.table.output": "Output",
   "workspace.usage.table.cost": "Kosten",
-  "workspace.usage.table.session": "Sitzung",
   "workspace.usage.breakdown.input": "Input",
   "workspace.usage.breakdown.cacheRead": "Cache Read",
   "workspace.usage.breakdown.cacheWrite": "Cache Write",
   "workspace.usage.breakdown.output": "Output",
   "workspace.usage.breakdown.reasoning": "Reasoning",
   "workspace.usage.subscription": "Abonnement (${{amount}})",
-  "workspace.usage.byok": "BYOK (${{amount}})",
 
   "workspace.cost.title": "Kosten",
   "workspace.cost.subtitle": "Nutzungskosten aufgeschlüsselt nach Modell.",

packages/console/app/src/i18n/en.ts

@@ -334,14 +334,12 @@ export const dict = {
   "workspace.usage.table.input": "Input",
   "workspace.usage.table.output": "Output",
   "workspace.usage.table.cost": "Cost",
-  "workspace.usage.table.session": "Session",
   "workspace.usage.breakdown.input": "Input",
   "workspace.usage.breakdown.cacheRead": "Cache Read",
   "workspace.usage.breakdown.cacheWrite": "Cache Write",
   "workspace.usage.breakdown.output": "Output",
   "workspace.usage.breakdown.reasoning": "Reasoning",
   "workspace.usage.subscription": "subscription (${{amount}})",
-  "workspace.usage.byok": "BYOK (${{amount}})",
 
   "workspace.cost.title": "Cost",
   "workspace.cost.subtitle": "Usage costs broken down by model.",

packages/console/app/src/i18n/es.ts

@@ -343,14 +343,12 @@ export const dict = {
   "workspace.usage.table.input": "Entrada",
   "workspace.usage.table.output": "Salida",
   "workspace.usage.table.cost": "Costo",
-  "workspace.usage.table.session": "Sesión",
   "workspace.usage.breakdown.input": "Entrada",
   "workspace.usage.breakdown.cacheRead": "Lectura de Caché",
   "workspace.usage.breakdown.cacheWrite": "Escritura de Caché",
   "workspace.usage.breakdown.output": "Salida",
   "workspace.usage.breakdown.reasoning": "Razonamiento",
   "workspace.usage.subscription": "suscripción (${{amount}})",
-  "workspace.usage.byok": "BYOK (${{amount}})",
 
   "workspace.cost.title": "Costo",
   "workspace.cost.subtitle": "Costos de uso desglosados por modelo.",

packages/console/app/src/i18n/fr.ts

@@ -348,14 +348,12 @@ export const dict = {
   "workspace.usage.table.input": "Entrée",
   "workspace.usage.table.output": "Sortie",
   "workspace.usage.table.cost": "Coût",
-  "workspace.usage.table.session": "Session",
   "workspace.usage.breakdown.input": "Entrée",
   "workspace.usage.breakdown.cacheRead": "Lecture cache",
   "workspace.usage.breakdown.cacheWrite": "Écriture cache",
   "workspace.usage.breakdown.output": "Sortie",
   "workspace.usage.breakdown.reasoning": "Raisonnement",
   "workspace.usage.subscription": "abonnement ({{amount}} $)",
-  "workspace.usage.byok": "BYOK ({{amount}} $)",
 
   "workspace.cost.title": "Coût",
   "workspace.cost.subtitle": "Coûts d'utilisation répartis par modèle.",

packages/console/app/src/i18n/it.ts

@@ -342,14 +342,12 @@ export const dict = {
   "workspace.usage.table.input": "Input",
   "workspace.usage.table.output": "Output",
   "workspace.usage.table.cost": "Costo",
-  "workspace.usage.table.session": "Sessione",
   "workspace.usage.breakdown.input": "Input",
   "workspace.usage.breakdown.cacheRead": "Lettura Cache",
   "workspace.usage.breakdown.cacheWrite": "Scrittura Cache",
   "workspace.usage.breakdown.output": "Output",
   "workspace.usage.breakdown.reasoning": "Reasoning",
   "workspace.usage.subscription": "abbonamento (${{amount}})",
-  "workspace.usage.byok": "BYOK (${{amount}})",
 
   "workspace.cost.title": "Costo",
   "workspace.cost.subtitle": "Costi di utilizzo suddivisi per modello.",

packages/console/app/src/i18n/ja.ts

@@ -339,14 +339,12 @@ export const dict = {
   "workspace.usage.table.input": "入力",
   "workspace.usage.table.output": "出力",
   "workspace.usage.table.cost": "コスト",
-  "workspace.usage.table.session": "セッション",
   "workspace.usage.breakdown.input": "入力",
   "workspace.usage.breakdown.cacheRead": "キャッシュ読み取り",
   "workspace.usage.breakdown.cacheWrite": "キャッシュ書き込み",
   "workspace.usage.breakdown.output": "出力",
   "workspace.usage.breakdown.reasoning": "推論",
   "workspace.usage.subscription": "サブスクリプション (${{amount}})",
-  "workspace.usage.byok": "BYOK (${{amount}})",
 
   "workspace.cost.title": "コスト",
   "workspace.cost.subtitle": "モデルごとの使用料金の内訳。",

packages/console/app/src/i18n/ko.ts

@@ -336,14 +336,12 @@ export const dict = {
   "workspace.usage.table.input": "입력",
   "workspace.usage.table.output": "출력",
   "workspace.usage.table.cost": "비용",
-  "workspace.usage.table.session": "세션",
   "workspace.usage.breakdown.input": "입력",
   "workspace.usage.breakdown.cacheRead": "캐시 읽기",
   "workspace.usage.breakdown.cacheWrite": "캐시 쓰기",
   "workspace.usage.breakdown.output": "출력",
   "workspace.usage.breakdown.reasoning": "추론",
   "workspace.usage.subscription": "구독 (${{amount}})",
-  "workspace.usage.byok": "BYOK (${{amount}})",
 
   "workspace.cost.title": "비용",
   "workspace.cost.subtitle": "모델별 사용 비용 내역.",

packages/console/app/src/i18n/no.ts

@@ -340,14 +340,12 @@ export const dict = {
   "workspace.usage.table.input": "Input",
   "workspace.usage.table.output": "Output",
   "workspace.usage.table.cost": "Kostnad",
-  "workspace.usage.table.session": "Økt",
   "workspace.usage.breakdown.input": "Input",
   "workspace.usage.breakdown.cacheRead": "Cache Lest",
   "workspace.usage.breakdown.cacheWrite": "Cache Skrevet",
   "workspace.usage.breakdown.output": "Output",
   "workspace.usage.breakdown.reasoning": "Resonnering",
   "workspace.usage.subscription": "abonnement (${{amount}})",
-  "workspace.usage.byok": "BYOK (${{amount}})",
 
   "workspace.cost.title": "Kostnad",
   "workspace.cost.subtitle": "Brukskostnader fordelt på modell.",

packages/console/app/src/i18n/pl.ts

@@ -341,14 +341,12 @@ export const dict = {
   "workspace.usage.table.input": "Wejście",
   "workspace.usage.table.output": "Wyjście",
   "workspace.usage.table.cost": "Koszt",
-  "workspace.usage.table.session": "Sesja",
   "workspace.usage.breakdown.input": "Wejście",
   "workspace.usage.breakdown.cacheRead": "Odczyt Cache",
   "workspace.usage.breakdown.cacheWrite": "Zapis Cache",
   "workspace.usage.breakdown.output": "Wyjście",
   "workspace.usage.breakdown.reasoning": "Rozumowanie",
   "workspace.usage.subscription": "subskrypcja (${{amount}})",
-  "workspace.usage.byok": "BYOK (${{amount}})",
 
   "workspace.cost.title": "Koszt",
   "workspace.cost.subtitle": "Koszty użycia w podziale na modele.",

packages/console/app/src/i18n/ru.ts

@@ -346,14 +346,12 @@ export const dict = {
   "workspace.usage.table.input": "Вход",
   "workspace.usage.table.output": "Выход",
   "workspace.usage.table.cost": "Стоимость",
-  "workspace.usage.table.session": "Сессия",
   "workspace.usage.breakdown.input": "Вход",
   "workspace.usage.breakdown.cacheRead": "Чтение кэша",
   "workspace.usage.breakdown.cacheWrite": "Запись кэша",
   "workspace.usage.breakdown.output": "Выход",
   "workspace.usage.breakdown.reasoning": "Reasoning (рассуждения)",
   "workspace.usage.subscription": "подписка (${{amount}})",
-  "workspace.usage.byok": "BYOK (${{amount}})",
 
   "workspace.cost.title": "Расходы",
   "workspace.cost.subtitle": "Расходы на использование с разбивкой по моделям.",

packages/console/app/src/i18n/th.ts

@@ -339,14 +339,12 @@ export const dict = {
   "workspace.usage.table.input": "Input",
   "workspace.usage.table.output": "Output",
   "workspace.usage.table.cost": "ค่าใช้จ่าย",
-  "workspace.usage.table.session": "เซสชัน",
   "workspace.usage.breakdown.input": "Input",
   "workspace.usage.breakdown.cacheRead": "Cache Read",
   "workspace.usage.breakdown.cacheWrite": "Cache Write",
   "workspace.usage.breakdown.output": "Output",
   "workspace.usage.breakdown.reasoning": "Reasoning",
   "workspace.usage.subscription": "สมัครสมาชิก (${{amount}})",
-  "workspace.usage.byok": "BYOK (${{amount}})",
 
   "workspace.cost.title": "ค่าใช้จ่าย",
   "workspace.cost.subtitle": "ต้นทุนการใช้งานแยกตามโมเดล",

packages/console/app/src/i18n/tr.ts

@@ -342,14 +342,12 @@ export const dict = {
   "workspace.usage.table.input": "Giriş",
   "workspace.usage.table.output": "Çıkış",
   "workspace.usage.table.cost": "Maliyet",
-  "workspace.usage.table.session": "Oturum",
   "workspace.usage.breakdown.input": "Giriş",
   "workspace.usage.breakdown.cacheRead": "Önbellek Okuması",
   "workspace.usage.breakdown.cacheWrite": "Önbellek Yazma",
   "workspace.usage.breakdown.output": "Çıkış",
   "workspace.usage.breakdown.reasoning": "Muhakeme",
   "workspace.usage.subscription": "abonelik (${{amount}})",
-  "workspace.usage.byok": "BYOK (${{amount}})",
 
   "workspace.cost.title": "Maliyet",
   "workspace.cost.subtitle": "Modele göre ayrılmış kullanım maliyetleri.",

packages/console/app/src/i18n/zh.ts

@@ -327,14 +327,12 @@ export const dict = {
   "workspace.usage.table.input": "输入",
   "workspace.usage.table.output": "输出",
   "workspace.usage.table.cost": "成本",
-  "workspace.usage.table.session": "会话",
   "workspace.usage.breakdown.input": "输入",
   "workspace.usage.breakdown.cacheRead": "缓存读取",
   "workspace.usage.breakdown.cacheWrite": "缓存写入",
   "workspace.usage.breakdown.output": "输出",
   "workspace.usage.breakdown.reasoning": "推理",
   "workspace.usage.subscription": "订阅 (${{amount}})",
-  "workspace.usage.byok": "BYOK (${{amount}})",
 
   "workspace.cost.title": "成本",
   "workspace.cost.subtitle": "按模型细分的使用成本。",

packages/console/app/src/i18n/zht.ts

@@ -327,14 +327,12 @@ export const dict = {
   "workspace.usage.table.input": "輸入",
   "workspace.usage.table.output": "輸出",
   "workspace.usage.table.cost": "成本",
-  "workspace.usage.table.session": "會話",
   "workspace.usage.breakdown.input": "輸入",
   "workspace.usage.breakdown.cacheRead": "快取讀取",
   "workspace.usage.breakdown.cacheWrite": "快取寫入",
   "workspace.usage.breakdown.output": "輸出",
   "workspace.usage.breakdown.reasoning": "推理",
   "workspace.usage.subscription": "訂閱 (${{amount}})",
-  "workspace.usage.byok": "BYOK (${{amount}})",
 
   "workspace.cost.title": "成本",
   "workspace.cost.subtitle": "按模型細分的使用成本。",

packages/console/app/src/routes/workspace/[id]/billing/black-section.tsx

@@ -5,8 +5,7 @@ import { Billing } from "@opencode-ai/console-core/billing.js"
 import { Database, eq, and, isNull, sql } from "@opencode-ai/console-core/drizzle/index.js"
 import { BillingTable, SubscriptionTable } from "@opencode-ai/console-core/schema/billing.sql.js"
 import { Actor } from "@opencode-ai/console-core/actor.js"
-import { Subscription } from "@opencode-ai/console-core/subscription.js"
-import { BlackData } from "@opencode-ai/console-core/black.js"
+import { Black } from "@opencode-ai/console-core/black.js"
 import { withActor } from "~/context/auth.withActor"
 import { queryBillingInfo } from "../../common"
 import styles from "./black-section.module.css"
@@ -32,19 +31,17 @@ const querySubscription = query(async (workspaceID: string) => {
         .then((r) => r[0]),
     )
     if (!row?.subscription) return null
-    const blackData = BlackData.getLimits({ plan: row.subscription.plan })
 
     return {
       plan: row.subscription.plan,
       useBalance: row.subscription.useBalance ?? false,
-      rollingUsage: Subscription.analyzeRollingUsage({
-        limit: blackData.rollingLimit,
-        window: blackData.rollingWindow,
+      rollingUsage: Black.analyzeRollingUsage({
+        plan: row.subscription.plan,
         usage: row.rollingUsage ?? 0,
         timeUpdated: row.timeRollingUpdated ?? new Date(),
       }),
-      weeklyUsage: Subscription.analyzeWeeklyUsage({
-        limit: blackData.fixedLimit,
+      weeklyUsage: Black.analyzeWeeklyUsage({
+        plan: row.subscription.plan,
         usage: row.fixedUsage ?? 0,
         timeUpdated: row.timeFixedUpdated ?? new Date(),
       }),

packages/console/app/src/routes/workspace/[id]/usage-section.tsx

@@ -94,7 +94,6 @@ export function UsageSection() {
                 <th>{i18n.t("workspace.usage.table.input")}</th>
                 <th>{i18n.t("workspace.usage.table.output")}</th>
                 <th>{i18n.t("workspace.usage.table.cost")}</th>
-                <th>{i18n.t("workspace.usage.table.session")}</th>
               </tr>
             </thead>
             <tbody>
@@ -177,23 +176,13 @@ export function UsageSection() {
                       <td data-slot="usage-cost">
                         <Show
                           when={usage.enrichment?.plan === "sub"}
-                          fallback={
-                            <Show
-                              when={usage.enrichment?.plan === "byok"}
-                              fallback={<>${((usage.cost ?? 0) / 100000000).toFixed(4)}</>}
-                            >
-                              {i18n.t("workspace.usage.byok", {
-                                amount: ((usage.cost ?? 0) / 100000000).toFixed(4),
-                              })}
-                            </Show>
-                          }
+                          fallback={<>${((usage.cost ?? 0) / 100000000).toFixed(4)}</>}
                         >
                           {i18n.t("workspace.usage.subscription", {
                             amount: ((usage.cost ?? 0) / 100000000).toFixed(4),
                           })}
                         </Show>
                       </td>
-                      <td data-slot="usage-session">{usage.sessionID?.slice(-8) ?? "-"}</td>
                     </tr>
                   )
                 }}

packages/console/app/src/routes/zen/util/handler.ts

@@ -9,8 +9,7 @@ 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 { Subscription } from "@opencode-ai/console-core/subscription.js"
-import { BlackData } from "@opencode-ai/console-core/black.js"
+import { Black, 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"
@@ -197,7 +196,7 @@ export async function handler(
       const costInfo = calculateCost(modelInfo, usageInfo)
       await trialLimiter?.track(usageInfo)
       await rateLimiter?.track()
-      await trackUsage(sessionId, billingSource, authInfo, modelInfo, providerInfo, usageInfo, costInfo)
+      await trackUsage(billingSource, authInfo, modelInfo, providerInfo, usageInfo, costInfo)
       await reload(billingSource, authInfo, costInfo)
 
       const responseConverter = createResponseConverter(providerInfo.format, opts.format)
@@ -247,7 +246,7 @@ export async function handler(
                   const usageInfo = providerInfo.normalizeUsage(usage)
                   const costInfo = calculateCost(modelInfo, usageInfo)
                   await trialLimiter?.track(usageInfo)
-                  await trackUsage(sessionId, billingSource, authInfo, modelInfo, providerInfo, usageInfo, costInfo)
+                  await trackUsage(billingSource, authInfo, modelInfo, providerInfo, usageInfo, costInfo)
                   await reload(billingSource, authInfo, costInfo)
                   cost = calculateOccuredCost(billingSource, costInfo)
                 }
@@ -542,9 +541,8 @@ export async function handler(
 
         // Check weekly limit
         if (sub.fixedUsage && sub.timeFixedUpdated) {
-          const blackData = BlackData.getLimits({ plan })
-          const result = Subscription.analyzeWeeklyUsage({
-            limit: blackData.fixedLimit,
+          const result = Black.analyzeWeeklyUsage({
+            plan,
             usage: sub.fixedUsage,
             timeUpdated: sub.timeFixedUpdated,
           })
@@ -557,10 +555,8 @@ export async function handler(
 
         // Check rolling limit
         if (sub.rollingUsage && sub.timeRollingUpdated) {
-          const blackData = BlackData.getLimits({ plan })
-          const result = Subscription.analyzeRollingUsage({
-            limit: blackData.rollingLimit,
-            window: blackData.rollingWindow,
+          const result = Black.analyzeRollingUsage({
+            plan,
             usage: sub.rollingUsage,
             timeUpdated: sub.timeRollingUpdated,
           })
@@ -691,7 +687,6 @@ export async function handler(
   }
 
   async function trackUsage(
-    sessionId: string,
     billingSource: BillingSource,
     authInfo: AuthInfo,
     modelInfo: ModelInfo,
@@ -739,12 +734,7 @@ export async function handler(
           cacheWrite1hTokens,
           cost,
           keyID: authInfo.apiKeyId,
-          sessionID: sessionId.substring(0, 30),
-          enrichment: (() => {
-            if (billingSource === "subscription") return { plan: "sub" }
-            if (billingSource === "byok") return { plan: "byok" }
-            return undefined
-          })(),
+          enrichment: billingSource === "subscription" ? { plan: "sub" } : undefined,
         }),
         db
           .update(KeyTable)
@@ -792,10 +782,9 @@ export async function handler(
               db
                 .update(BillingTable)
                 .set({
-                  balance:
-                    billingSource === "free" || billingSource === "byok"
-                      ? sql`${BillingTable.balance} - ${0}`
-                      : sql`${BillingTable.balance} - ${cost}`,
+                  balance: authInfo.isFree
+                    ? sql`${BillingTable.balance} - ${0}`
+                    : sql`${BillingTable.balance} - ${cost}`,
                   monthlyUsage: sql`
               CASE
                 WHEN MONTH(${BillingTable.timeMonthlyUsageUpdated}) = MONTH(now()) AND YEAR(${BillingTable.timeMonthlyUsageUpdated}) = YEAR(now()) THEN ${BillingTable.monthlyUsage} + ${cost}