core: make server runtime-agnostic by migrating from Bun to Node.js HTTP/WebSocket APIs

This enables running the opencode server on standard Node.js runtimes without requiring Bun-specific APIs. Users can now deploy the server in more environments including standard Node.js containers and cloud platforms that don't support Bun.

bun.lock

@@ -324,6 +324,8 @@
         "@clack/prompts": "1.0.0-alpha.1",
         "@gitlab/gitlab-ai-provider": "3.6.0",
         "@gitlab/opencode-gitlab-auth": "1.3.3",
+        "@hono/node-server": "1.19.11",
+        "@hono/node-ws": "1.3.0",
         "@hono/standard-validator": "0.1.5",
         "@hono/zod-validator": "catalog:",
         "@modelcontextprotocol/sdk": "1.25.2",
@@ -335,8 +337,8 @@
         "@opencode-ai/sdk": "workspace:*",
         "@opencode-ai/util": "workspace:*",
         "@openrouter/ai-sdk-provider": "1.5.4",
-        "@opentui/core": "0.1.87",
-        "@opentui/solid": "0.1.87",
+        "@opentui/core": "0.1.86",
+        "@opentui/solid": "0.1.86",
         "@parcel/watcher": "2.5.1",
         "@pierre/diffs": "catalog:",
         "@solid-primitives/event-bus": "1.1.2",
@@ -1110,7 +1112,9 @@
 
     "@hey-api/types": ["@hey-api/types@0.1.2", "", {}, "sha512-uNNtiVAWL7XNrV/tFXx7GLY9lwaaDazx1173cGW3+UEaw4RUPsHEmiB4DSpcjNxMIcrctfz2sGKLnVx5PBG2RA=="],
 
-    "@hono/node-server": ["@hono/node-server@1.19.9", "", { "peerDependencies": { "hono": "^4" } }, "sha512-vHL6w3ecZsky+8P5MD+eFfaGTyCeOHUIFYMGpQGbrBTSmNNoxv0if69rEZ5giu36weC5saFuznL411gRX7bJDw=="],
+    "@hono/node-server": ["@hono/node-server@1.19.11", "", { "peerDependencies": { "hono": "^4" } }, "sha512-dr8/3zEaB+p0D2n/IUrlPF1HZm586qgJNXK1a9fhg/PzdtkK7Ksd5l312tJX2yBuALqDYBlG20QEbayqPyxn+g=="],
+
+    "@hono/node-ws": ["@hono/node-ws@1.3.0", "", { "dependencies": { "ws": "^8.17.0" }, "peerDependencies": { "@hono/node-server": "^1.19.2", "hono": "^4.6.0" } }, "sha512-ju25YbbvLuXdqBCmLZLqnNYu1nbHIQjoyUqA8ApZOeL1k4skuiTcw5SW77/5SUYo2Xi2NVBJoVlfQurnKEp03Q=="],
 
     "@hono/standard-validator": ["@hono/standard-validator@0.1.5", "", { "peerDependencies": { "@standard-schema/spec": "1.0.0", "hono": ">=3.9.0" } }, "sha512-EIyZPPwkyLn6XKwFj5NBEWHXhXbgmnVh2ceIFo5GO7gKI9WmzTjPDKnppQB0KrqKeAkq3kpoW4SIbu5X1dgx3w=="],
 
@@ -1422,21 +1426,21 @@
 
     "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="],
 
-    "@opentui/core": ["@opentui/core@0.1.87", "", { "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.87", "@opentui/core-darwin-x64": "0.1.87", "@opentui/core-linux-arm64": "0.1.87", "@opentui/core-linux-x64": "0.1.87", "@opentui/core-win32-arm64": "0.1.87", "@opentui/core-win32-x64": "0.1.87", "bun-webgpu": "0.1.5", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-dhsmMv0IqKftwG7J/pBrLBj2armsYIg5R3LBvciRQI/6X89GufP4l1u0+QTACAx6iR4SYJJNVNQ2tdX8LM9rMw=="],
+    "@opentui/core": ["@opentui/core@0.1.86", "", { "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.86", "@opentui/core-darwin-x64": "0.1.86", "@opentui/core-linux-arm64": "0.1.86", "@opentui/core-linux-x64": "0.1.86", "@opentui/core-win32-arm64": "0.1.86", "@opentui/core-win32-x64": "0.1.86", "bun-webgpu": "0.1.5", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-3tRLbI9ADrQE1jEEn4x2aJexEOQZkv9Emk2BixMZqxfVhz2zr2SxtpimDAX0vmZK3+GnWAwBWxuaCAsxZpY4+w=="],
 
-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.1.87", "", { "os": "darwin", "cpu": "arm64" }, "sha512-G8oq85diOfkU6n0T1CxCle7oDmpKxwhcdhZ9khBMU5IrfLx9ZDuCM3F6MsiRQWdvPPCq2oomNbd64bYkPamYgw=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.1.86", "", { "os": "darwin", "cpu": "arm64" }, "sha512-Zp7q64+d+Dcx6YrH3mRcnHq8EOBnrfc1RvjgSWLhpXr49hY6LzuhqpfZM57aGErPYlR+ff8QM6e5FUkFnDfyjw=="],
 
-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.1.87", "", { "os": "darwin", "cpu": "x64" }, "sha512-MYTFQfOHm6qO7YaY4GHK9u/oJlXY6djaaxl5I+k4p2mk3vvuFIl/AP1ypITwBFjyV5gyp7PRWFp4nGfY9oN8bw=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.1.86", "", { "os": "darwin", "cpu": "x64" }, "sha512-NcxfjCJm1kLnTMVOpAPdRYNi8W8XdAXNa6N7i9khiVFrl2v5KRQfUjbrSOUYVxFJNc3jKFG6rsn3jEApvn92qA=="],
 
-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.1.87", "", { "os": "linux", "cpu": "arm64" }, "sha512-he8o1h5M6oskRJ7wE+xKJgmWnv5ZwN6gB3M/Z+SeHtOMPa5cZmi3TefTjG54llEgFfx0F9RcqHof7TJ/GNxRkw=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.1.86", "", { "os": "linux", "cpu": "arm64" }, "sha512-EDHAvqSOr8CXzbDvo1aE5blJ6wu1aSbR2LqoXtoeXHemr2T2W42D2TdIWewG6K+/BuRbzZnqt9wnYFBksLW6lw=="],
 
-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.1.87", "", { "os": "linux", "cpu": "x64" }, "sha512-aiUwjPlH4yDcB8/6YDKSmMkaoGAAltL0Xo0AzXyAtJXWK5tkCSaYjEVwzJ/rYRkr4Magnad+Mjth4AQUWdR2AA=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.1.86", "", { "os": "linux", "cpu": "x64" }, "sha512-VBaBkVdQDxYV4WcKjb+jgyMS5PiVHepvfaoKWpz1Bq+J01xXW4XPcXyPGkgR1+2R93KzaugEnLscTW4mWtLHlQ=="],
 
-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.1.87", "", { "os": "win32", "cpu": "arm64" }, "sha512-cmP0pOyREjWGniHqbDmaMY7U+1AyagrD8VseJbU0cGpNgVpG2/gbrJUGdfdLB0SNb+mzLdx6SOjdxtrElwRCQA=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.1.86", "", { "os": "win32", "cpu": "arm64" }, "sha512-xKbT7sEKYKGwUPkoqmLfHjbJU+vwHPDwf/r/mIunL41JXQBB35CSZ3/QgIwpp2kkteu7oE1tdBdg15ogUU4OMg=="],
 
-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.1.87", "", { "os": "win32", "cpu": "x64" }, "sha512-N2GErAAP8iODf2RPp86pilPaVKiD6G4pkpZL5nLGbKsl0bndrVTpSqZcn8+/nQwFZDPD/AsiRTYNOfWOblhzOw=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.1.86", "", { "os": "win32", "cpu": "x64" }, "sha512-HRfgAUlcu71/MrtgfX4Gj7PsDtfXZiuC506Pkn1OnRN1Xomcu10BVRDweUa0/g8ldU9i9kLjMGGnpw6/NjaBFg=="],
 
-    "@opentui/solid": ["@opentui/solid@0.1.87", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.1.87", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.9", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.9" } }, "sha512-lRT9t30l8+FtgOjjWJcdb2MT6hP8/RKqwGgYwTI7fXrOqdhxxwdP2SM+rH2l3suHeASheiTdlvPAo230iUcsvg=="],
+    "@opentui/solid": ["@opentui/solid@0.1.86", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.1.86", "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-pOZC9dlZIH+bpstVVZ2AvYukBnslZTKSl/y5H8FWcMTHGv/BzpGxXBxstL65E/IQASqPFbvFcs7yMRzdLhynmA=="],
 
     "@oslojs/asn1": ["@oslojs/asn1@1.0.0", "", { "dependencies": { "@oslojs/binary": "1.0.0" } }, "sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA=="],
 
@@ -5036,6 +5040,8 @@
 
     "@hey-api/openapi-ts/semver": ["semver@7.7.3", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q=="],
 
+    "@hono/node-ws/ws": ["ws@8.19.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg=="],
+
     "@hono/zod-validator/zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],
 
     "@jimp/plugin-blit/zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],
@@ -5084,6 +5090,8 @@
 
     "@mdx-js/mdx/source-map": ["source-map@0.7.6", "", {}, "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ=="],
 
+    "@modelcontextprotocol/sdk/@hono/node-server": ["@hono/node-server@1.19.9", "", { "peerDependencies": { "hono": "^4" } }, "sha512-vHL6w3ecZsky+8P5MD+eFfaGTyCeOHUIFYMGpQGbrBTSmNNoxv0if69rEZ5giu36weC5saFuznL411gRX7bJDw=="],
+
     "@modelcontextprotocol/sdk/express": ["express@5.2.1", "", { "dependencies": { "accepts": "^2.0.0", "body-parser": "^2.2.1", "content-disposition": "^1.0.0", "content-type": "^1.0.5", "cookie": "^0.7.1", "cookie-signature": "^1.2.1", "debug": "^4.4.0", "depd": "^2.0.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-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw=="],
 
     "@modelcontextprotocol/sdk/jose": ["jose@6.1.3", "", {}, "sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ=="],

nix/hashes.json

@@ -1,8 +1,8 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-duBedS4ZTc1as03OM0KB9mKKU21Cywv4o9GHwQZv6Ts=",
-    "aarch64-linux": "sha256-juvQfuNBqqzeB/TIY9PuUDqgpsdyI54ImowjQLrNhns=",
-    "aarch64-darwin": "sha256-kKgcuEN1oJqHJc+sGjcZ4INWvbZczSTDJ8VHIWAquD4=",
-    "x86_64-darwin": "sha256-hXkFWOL4wi9s8HSrChpqtH4PKSNzbzVgU+0GbAxEUT4="
+    "x86_64-linux": "sha256-4kjoJ06VNvHltPHfzQRBG0bC6R39jao10ffGzrNZ230=",
+    "aarch64-linux": "sha256-6Uio+S2rcyBWbBEeOZb9N1CCKgkbKi68lOIKi3Ws/pQ=",
+    "aarch64-darwin": "sha256-8ngN5KVN4vhdsk0QJ11BGgSVBrcaEbwSj23c77HBpgs=",
+    "x86_64-darwin": "sha256-v/ueYGb9a0Nymzy+mkO4uQr78DAuJnES1qOT0onFgnQ="
   }
 }

packages/app/src/components/debug-bar.tsx

@@ -1,441 +0,0 @@
-import { useIsRouting, useLocation } from "@solidjs/router"
-import { batch, createEffect, onCleanup, onMount } from "solid-js"
-import { createStore } from "solid-js/store"
-import { Tooltip } from "@opencode-ai/ui/tooltip"
-
-type Mem = Performance & {
-  memory?: {
-    usedJSHeapSize: number
-    jsHeapSizeLimit: number
-  }
-}
-
-type Evt = PerformanceEntry & {
-  interactionId?: number
-  processingStart?: number
-}
-
-type Shift = PerformanceEntry & {
-  hadRecentInput: boolean
-  value: number
-}
-
-type Obs = PerformanceObserverInit & {
-  durationThreshold?: number
-}
-
-const span = 5000
-
-const ms = (n?: number, d = 0) => {
-  if (n === undefined || Number.isNaN(n)) return "n/a"
-  return `${n.toFixed(d)}ms`
-}
-
-const time = (n?: number) => {
-  if (n === undefined || Number.isNaN(n)) return "n/a"
-  return `${Math.round(n)}`
-}
-
-const mb = (n?: number) => {
-  if (n === undefined || Number.isNaN(n)) return "n/a"
-  const v = n / 1024 / 1024
-  return `${v >= 1024 ? v.toFixed(0) : v.toFixed(1)}MB`
-}
-
-const bad = (n: number | undefined, limit: number, low = false) => {
-  if (n === undefined || Number.isNaN(n)) return false
-  return low ? n < limit : n > limit
-}
-
-const session = (path: string) => path.includes("/session")
-
-function Cell(props: { bad?: boolean; dim?: boolean; label: string; tip: string; value: string; wide?: boolean }) {
-  return (
-    <Tooltip value={props.tip} placement="top">
-      <div
-        classList={{
-          "flex min-h-[42px] w-full min-w-0 flex-col items-center justify-center rounded-[8px] bg-white/5 px-0.5 py-1 text-center": true,
-          "col-span-2": !!props.wide,
-        }}
-      >
-        <div class="text-[10px] leading-none font-black uppercase tracking-[0.04em] opacity-70">{props.label}</div>
-        <div
-          classList={{
-            "text-[13px] leading-none font-bold tabular-nums sm:text-[14px]": true,
-            "text-text-on-critical-base": !!props.bad,
-            "opacity-70": !!props.dim,
-          }}
-        >
-          {props.value}
-        </div>
-      </div>
-    </Tooltip>
-  )
-}
-
-export function DebugBar() {
-  const location = useLocation()
-  const routing = useIsRouting()
-  const [state, setState] = createStore({
-    cls: undefined as number | undefined,
-    delay: undefined as number | undefined,
-    fps: undefined as number | undefined,
-    gap: undefined as number | undefined,
-    heap: {
-      limit: undefined as number | undefined,
-      used: undefined as number | undefined,
-    },
-    inp: undefined as number | undefined,
-    jank: undefined as number | undefined,
-    long: {
-      block: undefined as number | undefined,
-      count: undefined as number | undefined,
-      max: undefined as number | undefined,
-    },
-    nav: {
-      dur: undefined as number | undefined,
-      pending: false,
-    },
-  })
-
-  const heap = () => (state.heap.limit ? (state.heap.used ?? 0) / state.heap.limit : undefined)
-  const heapv = () => {
-    const value = heap()
-    if (value === undefined) return "n/a"
-    return `${Math.round(value * 100)}%`
-  }
-  const longv = () => (state.long.count === undefined ? "n/a" : `${time(state.long.block)}/${state.long.count}`)
-  const navv = () => (state.nav.pending ? "..." : time(state.nav.dur))
-
-  let prev = ""
-  let start = 0
-  let init = false
-  let one = 0
-  let two = 0
-
-  createEffect(() => {
-    const busy = routing()
-    const next = `${location.pathname}${location.search}`
-
-    if (!init) {
-      init = true
-      prev = next
-      return
-    }
-
-    if (busy) {
-      if (one !== 0) cancelAnimationFrame(one)
-      if (two !== 0) cancelAnimationFrame(two)
-      one = 0
-      two = 0
-      if (start !== 0) return
-      start = performance.now()
-      if (session(prev)) setState("nav", { dur: undefined, pending: true })
-      return
-    }
-
-    if (start === 0) {
-      prev = next
-      return
-    }
-
-    const at = start
-    const from = prev
-    start = 0
-    prev = next
-
-    if (!(session(from) || session(next))) return
-
-    if (one !== 0) cancelAnimationFrame(one)
-    if (two !== 0) cancelAnimationFrame(two)
-    one = requestAnimationFrame(() => {
-      one = 0
-      two = requestAnimationFrame(() => {
-        two = 0
-        setState("nav", { dur: performance.now() - at, pending: false })
-      })
-    })
-  })
-
-  onMount(() => {
-    const obs: PerformanceObserver[] = []
-    const fps: Array<{ at: number; dur: number }> = []
-    const long: Array<{ at: number; dur: number }> = []
-    const seen = new Map<number | string, { at: number; delay: number; dur: number }>()
-    let hasLong = false
-    let poll: number | undefined
-    let raf = 0
-    let last = 0
-    let snap = 0
-
-    const trim = (list: Array<{ at: number; dur: number }>, span: number, at: number) => {
-      while (list[0] && at - list[0].at > span) list.shift()
-    }
-
-    const syncFrame = (at: number) => {
-      trim(fps, span, at)
-      const total = fps.reduce((sum, entry) => sum + entry.dur, 0)
-      const gap = fps.reduce((max, entry) => Math.max(max, entry.dur), 0)
-      const jank = fps.filter((entry) => entry.dur > 32).length
-      batch(() => {
-        setState("fps", total > 0 ? (fps.length * 1000) / total : undefined)
-        setState("gap", gap > 0 ? gap : undefined)
-        setState("jank", jank)
-      })
-    }
-
-    const syncLong = (at = performance.now()) => {
-      if (!hasLong) return
-      trim(long, span, at)
-      const block = long.reduce((sum, entry) => sum + Math.max(0, entry.dur - 50), 0)
-      const max = long.reduce((hi, entry) => Math.max(hi, entry.dur), 0)
-      setState("long", { block, count: long.length, max })
-    }
-
-    const syncInp = (at = performance.now()) => {
-      for (const [key, entry] of seen) {
-        if (at - entry.at > span) seen.delete(key)
-      }
-      let delay = 0
-      let inp = 0
-      for (const entry of seen.values()) {
-        delay = Math.max(delay, entry.delay)
-        inp = Math.max(inp, entry.dur)
-      }
-      batch(() => {
-        setState("delay", delay > 0 ? delay : undefined)
-        setState("inp", inp > 0 ? inp : undefined)
-      })
-    }
-
-    const syncHeap = () => {
-      const mem = (performance as Mem).memory
-      if (!mem) return
-      setState("heap", { limit: mem.jsHeapSizeLimit, used: mem.usedJSHeapSize })
-    }
-
-    const reset = () => {
-      fps.length = 0
-      long.length = 0
-      seen.clear()
-      last = 0
-      snap = 0
-      batch(() => {
-        setState("fps", undefined)
-        setState("gap", undefined)
-        setState("jank", undefined)
-        setState("delay", undefined)
-        setState("inp", undefined)
-        if (hasLong) setState("long", { block: 0, count: 0, max: 0 })
-      })
-    }
-
-    const watch = (type: string, init: Obs, fn: (entries: PerformanceEntry[]) => void) => {
-      if (typeof PerformanceObserver === "undefined") return false
-      if (!(PerformanceObserver.supportedEntryTypes ?? []).includes(type)) return false
-      const ob = new PerformanceObserver((list) => fn(list.getEntries()))
-      try {
-        ob.observe(init)
-        obs.push(ob)
-        return true
-      } catch {
-        ob.disconnect()
-        return false
-      }
-    }
-
-    if (
-      watch("layout-shift", { buffered: true, type: "layout-shift" }, (entries) => {
-        const add = entries.reduce((sum, entry) => {
-          const item = entry as Shift
-          if (item.hadRecentInput) return sum
-          return sum + item.value
-        }, 0)
-        if (add === 0) return
-        setState("cls", (value) => (value ?? 0) + add)
-      })
-    ) {
-      setState("cls", 0)
-    }
-
-    if (
-      watch("longtask", { buffered: true, type: "longtask" }, (entries) => {
-        const at = performance.now()
-        long.push(...entries.map((entry) => ({ at: entry.startTime, dur: entry.duration })))
-        syncLong(at)
-      })
-    ) {
-      hasLong = true
-      setState("long", { block: 0, count: 0, max: 0 })
-    }
-
-    watch("event", { buffered: true, durationThreshold: 16, type: "event" }, (entries) => {
-      for (const raw of entries) {
-        const entry = raw as Evt
-        if (entry.duration < 16) continue
-        const key =
-          entry.interactionId && entry.interactionId > 0
-            ? entry.interactionId
-            : `${entry.name}:${Math.round(entry.startTime)}`
-        const prev = seen.get(key)
-        const delay = Math.max(0, (entry.processingStart ?? entry.startTime) - entry.startTime)
-        seen.set(key, {
-          at: entry.startTime,
-          delay: Math.max(prev?.delay ?? 0, delay),
-          dur: Math.max(prev?.dur ?? 0, entry.duration),
-        })
-        if (seen.size <= 200) continue
-        const first = seen.keys().next().value
-        if (first !== undefined) seen.delete(first)
-      }
-      syncInp()
-    })
-
-    const loop = (at: number) => {
-      if (document.visibilityState !== "visible") {
-        raf = 0
-        return
-      }
-
-      if (last === 0) {
-        last = at
-        raf = requestAnimationFrame(loop)
-        return
-      }
-
-      fps.push({ at, dur: at - last })
-      last = at
-
-      if (at - snap >= 250) {
-        snap = at
-        syncFrame(at)
-      }
-
-      raf = requestAnimationFrame(loop)
-    }
-
-    const stop = () => {
-      if (raf !== 0) cancelAnimationFrame(raf)
-      raf = 0
-      if (poll === undefined) return
-      clearInterval(poll)
-      poll = undefined
-    }
-
-    const start = () => {
-      if (document.visibilityState !== "visible") return
-      if (poll === undefined) {
-        poll = window.setInterval(() => {
-          syncLong()
-          syncInp()
-          syncHeap()
-        }, 1000)
-      }
-      if (raf !== 0) return
-      raf = requestAnimationFrame(loop)
-    }
-
-    const vis = () => {
-      if (document.visibilityState !== "visible") {
-        stop()
-        return
-      }
-      reset()
-      start()
-    }
-
-    syncHeap()
-    start()
-    document.addEventListener("visibilitychange", vis)
-
-    onCleanup(() => {
-      if (one !== 0) cancelAnimationFrame(one)
-      if (two !== 0) cancelAnimationFrame(two)
-      stop()
-      document.removeEventListener("visibilitychange", vis)
-      for (const ob of obs) ob.disconnect()
-    })
-  })
-
-  return (
-    <aside
-      aria-label="Development performance diagnostics"
-      class="pointer-events-auto fixed bottom-3 right-3 z-50 w-[308px] max-w-[calc(100vw-1.5rem)] overflow-hidden rounded-xl border p-0.5 text-text-on-interactive-base shadow-[var(--shadow-lg-border-base)] sm:bottom-4 sm:right-4 sm:w-[324px]"
-      style={{
-        "background-color": "color-mix(in srgb, var(--icon-interactive-base) 42%, black)",
-        "border-color": "color-mix(in srgb, white 14%, transparent)",
-      }}
-    >
-      <div class="grid grid-cols-5 gap-px font-mono">
-        <Cell
-          label="NAV"
-          tip="Last completed route transition touching a session page, measured from router start until the first paint after it settles."
-          value={navv()}
-          bad={bad(state.nav.dur, 400)}
-          dim={state.nav.dur === undefined && !state.nav.pending}
-        />
-        <Cell
-          label="FPS"
-          tip="Rolling frames per second over the last 5 seconds."
-          value={state.fps === undefined ? "n/a" : `${Math.round(state.fps)}`}
-          bad={bad(state.fps, 50, true)}
-          dim={state.fps === undefined}
-        />
-        <Cell
-          label="FRM"
-          tip="Worst frame time over the last 5 seconds."
-          value={time(state.gap)}
-          bad={bad(state.gap, 50)}
-          dim={state.gap === undefined}
-        />
-        <Cell
-          label="JNK"
-          tip="Frames over 32ms in the last 5 seconds."
-          value={state.jank === undefined ? "n/a" : `${state.jank}`}
-          bad={bad(state.jank, 8)}
-          dim={state.jank === undefined}
-        />
-        <Cell
-          label="LNG"
-          tip={`Blocked time and long-task count in the last 5 seconds. Max task: ${ms(state.long.max)}.`}
-          value={longv()}
-          bad={bad(state.long.block, 200)}
-          dim={state.long.count === undefined}
-        />
-        <Cell
-          label="DLY"
-          tip="Worst observed input delay in the last 5 seconds."
-          value={time(state.delay)}
-          bad={bad(state.delay, 100)}
-          dim={state.delay === undefined}
-        />
-        <Cell
-          label="INP"
-          tip="Approximate interaction duration over the last 5 seconds. This is INP-like, not the official Web Vitals INP."
-          value={time(state.inp)}
-          bad={bad(state.inp, 200)}
-          dim={state.inp === undefined}
-        />
-        <Cell
-          label="CLS"
-          tip="Cumulative layout shift for the current app lifetime."
-          value={state.cls === undefined ? "n/a" : state.cls.toFixed(2)}
-          bad={bad(state.cls, 0.1)}
-          dim={state.cls === undefined}
-        />
-        <Cell
-          label="MEM"
-          tip={
-            state.heap.used === undefined
-              ? "Used JS heap vs heap limit. Chromium only."
-              : `Used JS heap vs heap limit. ${mb(state.heap.used)} of ${mb(state.heap.limit)}.`
-          }
-          value={heapv()}
-          bad={bad(heap(), 0.8)}
-          dim={state.heap.used === undefined}
-          wide
-        />
-      </div>
-    </aside>
-  )
-}

packages/app/src/context/terminal.test.ts

@@ -2,7 +2,6 @@ import { beforeAll, describe, expect, mock, test } from "bun:test"
 
 let getWorkspaceTerminalCacheKey: (dir: string) => string
 let getLegacyTerminalStorageKeys: (dir: string, legacySessionID?: string) => string[]
-let migrateTerminalState: (value: unknown) => unknown
 
 beforeAll(async () => {
   mock.module("@solidjs/router", () => ({
@@ -18,7 +17,6 @@ beforeAll(async () => {
   const mod = await import("./terminal")
   getWorkspaceTerminalCacheKey = mod.getWorkspaceTerminalCacheKey
   getLegacyTerminalStorageKeys = mod.getLegacyTerminalStorageKeys
-  migrateTerminalState = mod.migrateTerminalState
 })
 
 describe("getWorkspaceTerminalCacheKey", () => {
@@ -39,44 +37,3 @@ describe("getLegacyTerminalStorageKeys", () => {
     ])
   })
 })
-
-describe("migrateTerminalState", () => {
-  test("drops invalid terminals and restores a valid active terminal", () => {
-    expect(
-      migrateTerminalState({
-        active: "missing",
-        all: [
-          null,
-          { id: "one", title: "Terminal 2" },
-          { id: "one", title: "duplicate", titleNumber: 9 },
-          { id: "two", title: "logs", titleNumber: 4, rows: 24, cols: 80 },
-          { title: "no-id" },
-        ],
-      }),
-    ).toEqual({
-      active: "one",
-      all: [
-        { id: "one", title: "Terminal 2", titleNumber: 2 },
-        { id: "two", title: "logs", titleNumber: 4, rows: 24, cols: 80 },
-      ],
-    })
-  })
-
-  test("keeps a valid active id", () => {
-    expect(
-      migrateTerminalState({
-        active: "two",
-        all: [
-          { id: "one", title: "Terminal 1" },
-          { id: "two", title: "shell", titleNumber: 7 },
-        ],
-      }),
-    ).toEqual({
-      active: "two",
-      all: [
-        { id: "one", title: "Terminal 1", titleNumber: 1 },
-        { id: "two", title: "shell", titleNumber: 7 },
-      ],
-    })
-  })
-})

packages/app/src/context/terminal.tsx

@@ -20,71 +20,6 @@ export type LocalPTY = {
 const WORKSPACE_KEY = "__workspace__"
 const MAX_TERMINAL_SESSIONS = 20
 
-function record(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value)
-}
-
-function text(value: unknown) {
-  return typeof value === "string" ? value : undefined
-}
-
-function num(value: unknown) {
-  return typeof value === "number" && Number.isFinite(value) ? value : undefined
-}
-
-function numberFromTitle(title: string) {
-  const match = title.match(/^Terminal (\d+)$/)
-  if (!match) return
-  const value = Number(match[1])
-  if (!Number.isFinite(value) || value <= 0) return
-  return value
-}
-
-function pty(value: unknown): LocalPTY | undefined {
-  if (!record(value)) return
-
-  const id = text(value.id)
-  if (!id) return
-
-  const title = text(value.title) ?? ""
-  const number = num(value.titleNumber)
-  const rows = num(value.rows)
-  const cols = num(value.cols)
-  const buffer = text(value.buffer)
-  const scrollY = num(value.scrollY)
-  const cursor = num(value.cursor)
-
-  return {
-    id,
-    title,
-    titleNumber: number && number > 0 ? number : (numberFromTitle(title) ?? 0),
-    ...(rows !== undefined ? { rows } : {}),
-    ...(cols !== undefined ? { cols } : {}),
-    ...(buffer !== undefined ? { buffer } : {}),
-    ...(scrollY !== undefined ? { scrollY } : {}),
-    ...(cursor !== undefined ? { cursor } : {}),
-  }
-}
-
-export function migrateTerminalState(value: unknown) {
-  if (!record(value)) return value
-
-  const seen = new Set<string>()
-  const all = (Array.isArray(value.all) ? value.all : []).flatMap((item) => {
-    const next = pty(item)
-    if (!next || seen.has(next.id)) return []
-    seen.add(next.id)
-    return [next]
-  })
-
-  const active = text(value.active)
-
-  return {
-    active: active && seen.has(active) ? active : all[0]?.id,
-    all,
-  }
-}
-
 export function getWorkspaceTerminalCacheKey(dir: string) {
   return `${dir}:${WORKSPACE_KEY}`
 }
@@ -136,11 +71,16 @@ export function clearWorkspaceTerminals(dir: string, sessionIDs?: string[], plat
 function createWorkspaceTerminalSession(sdk: ReturnType<typeof useSDK>, dir: string, legacySessionID?: string) {
   const legacy = getLegacyTerminalStorageKeys(dir, legacySessionID)
 
+  const numberFromTitle = (title: string) => {
+    const match = title.match(/^Terminal (\d+)$/)
+    if (!match) return
+    const value = Number(match[1])
+    if (!Number.isFinite(value) || value <= 0) return
+    return value
+  }
+
   const [store, setStore, _, ready] = persisted(
-    {
-      ...Persist.workspace(dir, "terminal", legacy),
-      migrate: migrateTerminalState,
-    },
+    Persist.workspace(dir, "terminal", legacy),
     createStore<{
       active?: string
       all: LocalPTY[]
@@ -188,6 +128,26 @@ function createWorkspaceTerminalSession(sdk: ReturnType<typeof useSDK>, dir: str
   })
   onCleanup(unsub)
 
+  const meta = { migrated: false }
+
+  createEffect(() => {
+    if (!ready()) return
+    if (meta.migrated) return
+    meta.migrated = true
+
+    setStore("all", (all) => {
+      const next = all.map((pty) => {
+        const direct = Number.isFinite(pty.titleNumber) && pty.titleNumber > 0 ? pty.titleNumber : undefined
+        if (direct !== undefined) return pty
+        const parsed = numberFromTitle(pty.title)
+        if (parsed === undefined) return pty
+        return { ...pty, titleNumber: parsed }
+      })
+      if (next.every((pty, index) => pty === all[index])) return all
+      return next
+    })
+  })
+
   return {
     ready,
     all: createMemo(() => store.all),

packages/app/src/pages/layout.tsx

@@ -54,7 +54,6 @@ import { useCommand, type CommandOption } from "@/context/command"
 import { ConstrainDragXAxis } from "@/utils/solid-dnd"
 import { DialogSelectDirectory } from "@/components/dialog-select-directory"
 import { DialogEditProject } from "@/components/dialog-edit-project"
-import { DebugBar } from "@/components/debug-bar"
 import { Titlebar } from "@/components/titlebar"
 import { useServer } from "@/context/server"
 import { useLanguage, type Locale } from "@/context/language"
@@ -2136,204 +2135,193 @@ export default function Layout(props: ParentProps) {
   }
 
   return (
-    <div class="relative bg-background-base flex-1 min-h-0 min-w-0 flex flex-col select-none [&_input]:select-text [&_textarea]:select-text [&_[contenteditable]]:select-text">
+    <div class="relative bg-background-base flex-1 min-h-0 flex flex-col select-none [&_input]:select-text [&_textarea]:select-text [&_[contenteditable]]:select-text">
       <Titlebar />
-      <div class="flex-1 min-h-0 min-w-0 flex">
-        <div class="flex-1 min-h-0 relative">
-          <div class="size-full relative overflow-x-hidden">
-            <nav
-              aria-label={language.t("sidebar.nav.projectsAndSessions")}
-              data-component="sidebar-nav-desktop"
-              classList={{
-                "hidden xl:block": true,
-                "absolute inset-y-0 left-0": true,
-                "z-10": true,
-              }}
-              style={{ width: `${Math.max(layout.sidebar.width(), 244)}px` }}
-              ref={(el) => {
-                setState("nav", el)
-              }}
-              onMouseEnter={() => {
-                disarm()
-              }}
-              onMouseLeave={() => {
-                aim.reset()
-                if (!sidebarHovering()) return
+      <div class="flex-1 min-h-0 relative overflow-x-hidden">
+        <nav
+          aria-label={language.t("sidebar.nav.projectsAndSessions")}
+          data-component="sidebar-nav-desktop"
+          classList={{
+            "hidden xl:block": true,
+            "absolute inset-y-0 left-0": true,
+            "z-10": true,
+          }}
+          style={{ width: `${Math.max(layout.sidebar.width(), 244)}px` }}
+          ref={(el) => {
+            setState("nav", el)
+          }}
+          onMouseEnter={() => {
+            disarm()
+          }}
+          onMouseLeave={() => {
+            aim.reset()
+            if (!sidebarHovering()) return
 
-                arm()
-              }}
-            >
-              <div class="@container w-full h-full contain-strict">
-                <SidebarContent
-                  opened={() => layout.sidebar.opened()}
-                  aimMove={aim.move}
-                  projects={() => layout.projects.list()}
-                  renderProject={(project) => (
-                    <SortableProject ctx={projectSidebarCtx} project={project} sortNow={sortNow} />
-                  )}
-                  handleDragStart={handleDragStart}
-                  handleDragEnd={handleDragEnd}
-                  handleDragOver={handleDragOver}
-                  openProjectLabel={language.t("command.project.open")}
-                  openProjectKeybind={() => command.keybind("project.open")}
-                  onOpenProject={chooseProject}
-                  renderProjectOverlay={() => (
-                    <ProjectDragOverlay
-                      projects={() => layout.projects.list()}
-                      activeProject={() => store.activeProject}
-                    />
-                  )}
-                  settingsLabel={() => language.t("sidebar.settings")}
-                  settingsKeybind={() => command.keybind("settings.open")}
-                  onOpenSettings={openSettings}
-                  helpLabel={() => language.t("sidebar.help")}
-                  onOpenHelp={() => platform.openLink("https://opencode.ai/desktop-feedback")}
-                  renderPanel={() => (
-                    <Show when={currentProject()} keyed>
-                      {(project) => <SidebarPanel project={project} merged />}
-                    </Show>
-                  )}
-                />
-              </div>
-              <Show when={layout.sidebar.opened()}>
-                <div onPointerDown={() => setSizing(true)}>
-                  <ResizeHandle
-                    direction="horizontal"
-                    size={layout.sidebar.width()}
-                    min={244}
-                    max={typeof window === "undefined" ? 1000 : window.innerWidth * 0.3 + 64}
-                    collapseThreshold={244}
-                    onResize={(w) => {
-                      setSizing(true)
-                      if (sizet !== undefined) clearTimeout(sizet)
-                      sizet = window.setTimeout(() => setSizing(false), 120)
-                      layout.sidebar.resize(w)
-                    }}
-                    onCollapse={layout.sidebar.close}
-                  />
-                </div>
-              </Show>
-            </nav>
-
-            <div
-              class="hidden xl:block pointer-events-none absolute top-0 right-0 z-0 border-t border-border-weaker-base"
-              style={{ left: "calc(4rem + 12px)" }}
-            />
-
-            <div class="xl:hidden">
-              <div
-                classList={{
-                  "fixed inset-x-0 top-10 bottom-0 z-40 transition-opacity duration-200": true,
-                  "opacity-100 pointer-events-auto": layout.mobileSidebar.opened(),
-                  "opacity-0 pointer-events-none": !layout.mobileSidebar.opened(),
-                }}
-                onClick={(e) => {
-                  if (e.target === e.currentTarget) layout.mobileSidebar.hide()
-                }}
-              />
-              <nav
-                aria-label={language.t("sidebar.nav.projectsAndSessions")}
-                data-component="sidebar-nav-mobile"
-                classList={{
-                  "@container fixed top-10 bottom-0 left-0 z-50 w-full max-w-[400px] overflow-hidden border-r border-border-weaker-base bg-background-base transition-transform duration-200 ease-out": true,
-                  "translate-x-0": layout.mobileSidebar.opened(),
-                  "-translate-x-full": !layout.mobileSidebar.opened(),
-                }}
-                onClick={(e) => e.stopPropagation()}
-              >
-                <SidebarContent
-                  mobile
-                  opened={() => layout.sidebar.opened()}
-                  aimMove={aim.move}
-                  projects={() => layout.projects.list()}
-                  renderProject={(project) => (
-                    <SortableProject ctx={projectSidebarCtx} project={project} sortNow={sortNow} mobile />
-                  )}
-                  handleDragStart={handleDragStart}
-                  handleDragEnd={handleDragEnd}
-                  handleDragOver={handleDragOver}
-                  openProjectLabel={language.t("command.project.open")}
-                  openProjectKeybind={() => command.keybind("project.open")}
-                  onOpenProject={chooseProject}
-                  renderProjectOverlay={() => (
-                    <ProjectDragOverlay
-                      projects={() => layout.projects.list()}
-                      activeProject={() => store.activeProject}
-                    />
-                  )}
-                  settingsLabel={() => language.t("sidebar.settings")}
-                  settingsKeybind={() => command.keybind("settings.open")}
-                  onOpenSettings={openSettings}
-                  helpLabel={() => language.t("sidebar.help")}
-                  onOpenHelp={() => platform.openLink("https://opencode.ai/desktop-feedback")}
-                  renderPanel={() => <SidebarPanel project={currentProject()} mobile />}
-                />
-              </nav>
-            </div>
-
-            <div
-              classList={{
-                "absolute inset-0": true,
-                "xl:inset-y-0 xl:right-0 xl:left-[var(--main-left)]": true,
-                "z-20": true,
-                "transition-[left] duration-200 ease-[cubic-bezier(0.22,1,0.36,1)] will-change-[left] motion-reduce:transition-none":
-                  !sizing(),
-              }}
-              style={{
-                "--main-left": layout.sidebar.opened() ? `${Math.max(layout.sidebar.width(), 244)}px` : "4rem",
-              }}
-            >
-              <main
-                classList={{
-                  "size-full overflow-x-hidden flex flex-col items-start contain-strict border-t border-border-weak-base bg-background-base xl:border-l xl:rounded-tl-[12px]": true,
-                }}
-              >
-                <Show when={!autoselecting()} fallback={<div class="size-full" />}>
-                  {props.children}
+            arm()
+          }}
+        >
+          <div class="@container w-full h-full contain-strict">
+            <SidebarContent
+              opened={() => layout.sidebar.opened()}
+              aimMove={aim.move}
+              projects={() => layout.projects.list()}
+              renderProject={(project) => (
+                <SortableProject ctx={projectSidebarCtx} project={project} sortNow={sortNow} />
+              )}
+              handleDragStart={handleDragStart}
+              handleDragEnd={handleDragEnd}
+              handleDragOver={handleDragOver}
+              openProjectLabel={language.t("command.project.open")}
+              openProjectKeybind={() => command.keybind("project.open")}
+              onOpenProject={chooseProject}
+              renderProjectOverlay={() => (
+                <ProjectDragOverlay projects={() => layout.projects.list()} activeProject={() => store.activeProject} />
+              )}
+              settingsLabel={() => language.t("sidebar.settings")}
+              settingsKeybind={() => command.keybind("settings.open")}
+              onOpenSettings={openSettings}
+              helpLabel={() => language.t("sidebar.help")}
+              onOpenHelp={() => platform.openLink("https://opencode.ai/desktop-feedback")}
+              renderPanel={() => (
+                <Show when={currentProject()} keyed>
+                  {(project) => <SidebarPanel project={project} merged />}
                 </Show>
-              </main>
-            </div>
-
-            <div
-              classList={{
-                "hidden xl:flex absolute inset-y-0 left-16 z-30": true,
-                "opacity-100 translate-x-0 pointer-events-auto": peeked() && !layout.sidebar.opened(),
-                "opacity-0 -translate-x-2 pointer-events-none": !peeked() || layout.sidebar.opened(),
-                "transition-[opacity,transform] motion-reduce:transition-none": true,
-                "duration-180 ease-out": peeked() && !layout.sidebar.opened(),
-                "duration-120 ease-in": !peeked() || layout.sidebar.opened(),
-              }}
-              onMouseMove={disarm}
-              onMouseEnter={() => {
-                disarm()
-                aim.reset()
-              }}
-              onPointerDown={disarm}
-              onMouseLeave={() => {
-                arm()
-              }}
-            >
-              <Show when={peek()} keyed>
-                {(project) => <SidebarPanel project={project} merged={false} />}
-              </Show>
-            </div>
-
-            <div
-              classList={{
-                "hidden xl:block pointer-events-none absolute inset-y-0 right-0 z-25 overflow-hidden": true,
-                "opacity-100 translate-x-0": peeked() && !layout.sidebar.opened(),
-                "opacity-0 -translate-x-2": !peeked() || layout.sidebar.opened(),
-                "transition-[opacity,transform] motion-reduce:transition-none": true,
-                "duration-180 ease-out": peeked() && !layout.sidebar.opened(),
-                "duration-120 ease-in": !peeked() || layout.sidebar.opened(),
-              }}
-              style={{ left: `calc(4rem + ${Math.max(Math.max(layout.sidebar.width(), 244) - 64, 0)}px)` }}
-            >
-              <div class="h-full w-px" style={{ "box-shadow": "var(--shadow-sidebar-overlay)" }} />
-            </div>
+              )}
+            />
           </div>
+          <Show when={layout.sidebar.opened()}>
+            <div onPointerDown={() => setSizing(true)}>
+              <ResizeHandle
+                direction="horizontal"
+                size={layout.sidebar.width()}
+                min={244}
+                max={typeof window === "undefined" ? 1000 : window.innerWidth * 0.3 + 64}
+                collapseThreshold={244}
+                onResize={(w) => {
+                  setSizing(true)
+                  if (sizet !== undefined) clearTimeout(sizet)
+                  sizet = window.setTimeout(() => setSizing(false), 120)
+                  layout.sidebar.resize(w)
+                }}
+                onCollapse={layout.sidebar.close}
+              />
+            </div>
+          </Show>
+        </nav>
+
+        <div
+          class="hidden xl:block pointer-events-none absolute top-0 right-0 z-0 border-t border-border-weaker-base"
+          style={{ left: "calc(4rem + 12px)" }}
+        />
+
+        <div class="xl:hidden">
+          <div
+            classList={{
+              "fixed inset-x-0 top-10 bottom-0 z-40 transition-opacity duration-200": true,
+              "opacity-100 pointer-events-auto": layout.mobileSidebar.opened(),
+              "opacity-0 pointer-events-none": !layout.mobileSidebar.opened(),
+            }}
+            onClick={(e) => {
+              if (e.target === e.currentTarget) layout.mobileSidebar.hide()
+            }}
+          />
+          <nav
+            aria-label={language.t("sidebar.nav.projectsAndSessions")}
+            data-component="sidebar-nav-mobile"
+            classList={{
+              "@container fixed top-10 bottom-0 left-0 z-50 w-full max-w-[400px] overflow-hidden border-r border-border-weaker-base bg-background-base transition-transform duration-200 ease-out": true,
+              "translate-x-0": layout.mobileSidebar.opened(),
+              "-translate-x-full": !layout.mobileSidebar.opened(),
+            }}
+            onClick={(e) => e.stopPropagation()}
+          >
+            <SidebarContent
+              mobile
+              opened={() => layout.sidebar.opened()}
+              aimMove={aim.move}
+              projects={() => layout.projects.list()}
+              renderProject={(project) => (
+                <SortableProject ctx={projectSidebarCtx} project={project} sortNow={sortNow} mobile />
+              )}
+              handleDragStart={handleDragStart}
+              handleDragEnd={handleDragEnd}
+              handleDragOver={handleDragOver}
+              openProjectLabel={language.t("command.project.open")}
+              openProjectKeybind={() => command.keybind("project.open")}
+              onOpenProject={chooseProject}
+              renderProjectOverlay={() => (
+                <ProjectDragOverlay projects={() => layout.projects.list()} activeProject={() => store.activeProject} />
+              )}
+              settingsLabel={() => language.t("sidebar.settings")}
+              settingsKeybind={() => command.keybind("settings.open")}
+              onOpenSettings={openSettings}
+              helpLabel={() => language.t("sidebar.help")}
+              onOpenHelp={() => platform.openLink("https://opencode.ai/desktop-feedback")}
+              renderPanel={() => <SidebarPanel project={currentProject()} mobile />}
+            />
+          </nav>
+        </div>
+
+        <div
+          classList={{
+            "absolute inset-0": true,
+            "xl:inset-y-0 xl:right-0 xl:left-[var(--main-left)]": true,
+            "z-20": true,
+            "transition-[left] duration-200 ease-[cubic-bezier(0.22,1,0.36,1)] will-change-[left] motion-reduce:transition-none":
+              !sizing(),
+          }}
+          style={{
+            "--main-left": layout.sidebar.opened() ? `${Math.max(layout.sidebar.width(), 244)}px` : "4rem",
+          }}
+        >
+          <main
+            classList={{
+              "size-full overflow-x-hidden flex flex-col items-start contain-strict border-t border-border-weak-base bg-background-base xl:border-l xl:rounded-tl-[12px]": true,
+            }}
+          >
+            <Show when={!autoselecting()} fallback={<div class="size-full" />}>
+              {props.children}
+            </Show>
+          </main>
+        </div>
+
+        <div
+          classList={{
+            "hidden xl:flex absolute inset-y-0 left-16 z-30": true,
+            "opacity-100 translate-x-0 pointer-events-auto": peeked() && !layout.sidebar.opened(),
+            "opacity-0 -translate-x-2 pointer-events-none": !peeked() || layout.sidebar.opened(),
+            "transition-[opacity,transform] motion-reduce:transition-none": true,
+            "duration-180 ease-out": peeked() && !layout.sidebar.opened(),
+            "duration-120 ease-in": !peeked() || layout.sidebar.opened(),
+          }}
+          onMouseMove={disarm}
+          onMouseEnter={() => {
+            disarm()
+            aim.reset()
+          }}
+          onPointerDown={disarm}
+          onMouseLeave={() => {
+            arm()
+          }}
+        >
+          <Show when={peek()} keyed>
+            {(project) => <SidebarPanel project={project} merged={false} />}
+          </Show>
+        </div>
+
+        <div
+          classList={{
+            "hidden xl:block pointer-events-none absolute inset-y-0 right-0 z-25 overflow-hidden": true,
+            "opacity-100 translate-x-0": peeked() && !layout.sidebar.opened(),
+            "opacity-0 -translate-x-2": !peeked() || layout.sidebar.opened(),
+            "transition-[opacity,transform] motion-reduce:transition-none": true,
+            "duration-180 ease-out": peeked() && !layout.sidebar.opened(),
+            "duration-120 ease-in": !peeked() || layout.sidebar.opened(),
+          }}
+          style={{ left: `calc(4rem + ${Math.max(Math.max(layout.sidebar.width(), 244) - 64, 0)}px)` }}
+        >
+          <div class="h-full w-px" style={{ "box-shadow": "var(--shadow-sidebar-overlay)" }} />
         </div>
-        {import.meta.env.DEV && <DebugBar />}
       </div>
       <Toast.Region />
     </div>

packages/opencode/BUN_SHELL_MIGRATION_PLAN.md

@@ -1,136 +0,0 @@
-# Bun shell migration plan
-
-Practical phased replacement of Bun `$` calls.
-
-## Goal
-
-Replace runtime Bun shell template-tag usage in `packages/opencode/src` with a unified `Process` API in `util/process.ts`.
-
-Keep behavior stable while improving safety, testability, and observability.
-
-Current baseline from audit:
-
-- 143 runtime command invocations across 17 files
-- 84 are git commands
-- Largest hotspots:
-  - `src/cli/cmd/github.ts` (33)
-  - `src/worktree/index.ts` (22)
-  - `src/lsp/server.ts` (21)
-  - `src/installation/index.ts` (20)
-  - `src/snapshot/index.ts` (18)
-
-## Decisions
-
-- Extend `src/util/process.ts` (do not create a separate exec module).
-- Proceed with phased migration for both git and non-git paths.
-- Keep plugin `$` compatibility in 1.x and remove in 2.0.
-
-## Non-goals
-
-- Do not remove plugin `$` compatibility in this effort.
-- Do not redesign command semantics beyond what is needed to preserve behavior.
-
-## Constraints
-
-- Keep migration phased, not big-bang.
-- Minimize behavioral drift.
-- Keep these explicit shell-only exceptions:
-  - `src/session/prompt.ts` raw command execution
-  - worktree start scripts in `src/worktree/index.ts`
-
-## Process API proposal (`src/util/process.ts`)
-
-Add higher-level wrappers on top of current spawn support.
-
-Core methods:
-
-- `Process.run(cmd, opts)`
-- `Process.text(cmd, opts)`
-- `Process.lines(cmd, opts)`
-- `Process.status(cmd, opts)`
-- `Process.shell(command, opts)` for intentional shell execution
-
-Git helpers:
-
-- `Process.git(args, opts)`
-- `Process.gitText(args, opts)`
-
-Shared options:
-
-- `cwd`, `env`, `stdin`, `stdout`, `stderr`, `abort`, `timeout`, `kill`
-- `allowFailure` / non-throw mode
-- optional redaction + trace metadata
-
-Standard result shape:
-
-- `code`, `stdout`, `stderr`, `duration_ms`, `cmd`
-- helpers like `text()` and `arrayBuffer()` where useful
-
-## Phased rollout
-
-### Phase 0: Foundation
-
-- Implement Process wrappers in `src/util/process.ts`.
-- Refactor `src/util/git.ts` to use Process only.
-- Add tests for exit handling, timeout, abort, and output capture.
-
-### Phase 1: High-impact hotspots
-
-Migrate these first:
-
-- `src/cli/cmd/github.ts`
-- `src/worktree/index.ts`
-- `src/lsp/server.ts`
-- `src/installation/index.ts`
-- `src/snapshot/index.ts`
-
-Within each file, migrate git paths first where applicable.
-
-### Phase 2: Remaining git-heavy files
-
-Migrate git-centric call sites to `Process.git*` helpers:
-
-- `src/file/index.ts`
-- `src/project/vcs.ts`
-- `src/file/watcher.ts`
-- `src/storage/storage.ts`
-- `src/cli/cmd/pr.ts`
-
-### Phase 3: Remaining non-git files
-
-Migrate residual non-git usages:
-
-- `src/cli/cmd/tui/util/clipboard.ts`
-- `src/util/archive.ts`
-- `src/file/ripgrep.ts`
-- `src/tool/bash.ts`
-- `src/cli/cmd/uninstall.ts`
-
-### Phase 4: Stabilize
-
-- Remove dead wrappers and one-off patterns.
-- Keep plugin `$` compatibility isolated and documented as temporary.
-- Create linked 2.0 task for plugin `$` removal.
-
-## Validation strategy
-
-- Unit tests for new `Process` methods and options.
-- Integration tests on hotspot modules.
-- Smoke tests for install, snapshot, worktree, and GitHub flows.
-- Regression checks for output parsing behavior.
-
-## Risk mitigation
-
-- File-by-file PRs with small diffs.
-- Preserve behavior first, simplify second.
-- Keep shell-only exceptions explicit and documented.
-- Add consistent error shaping and logging at Process layer.
-
-## Definition of done
-
-- Runtime Bun `$` usage in `packages/opencode/src` is removed except:
-  - approved shell-only exceptions
-  - temporary plugin compatibility path (1.x)
-- Git paths use `Process.git*` consistently.
-- CI and targeted smoke tests pass.
-- 2.0 issue exists for plugin `$` removal.

packages/opencode/package.json

@@ -81,6 +81,8 @@
     "@gitlab/gitlab-ai-provider": "3.6.0",
     "@gitlab/opencode-gitlab-auth": "1.3.3",
     "@hono/standard-validator": "0.1.5",
+    "@hono/node-server": "1.19.11",
+    "@hono/node-ws": "1.3.0",
     "@hono/zod-validator": "catalog:",
     "@modelcontextprotocol/sdk": "1.25.2",
     "@octokit/graphql": "9.0.2",
@@ -91,8 +93,8 @@
     "@opencode-ai/sdk": "workspace:*",
     "@opencode-ai/util": "workspace:*",
     "@openrouter/ai-sdk-provider": "1.5.4",
-    "@opentui/core": "0.1.87",
-    "@opentui/solid": "0.1.87",
+    "@opentui/core": "0.1.86",
+    "@opentui/solid": "0.1.86",
     "@parcel/watcher": "2.5.1",
     "@pierre/diffs": "catalog:",
     "@solid-primitives/event-bus": "1.1.2",

packages/opencode/script/build-node.ts

@@ -0,0 +1,8 @@
+#!/usr/bin/env bun
+
+Bun.build({
+  entrypoints: ["./src/node.ts"],
+  target: "node",
+  outdir: "./dist",
+  format: "esm",
+})

packages/opencode/src/cli/cmd/run.ts

@@ -667,7 +667,7 @@ export const RunCommand = cmd({
     await bootstrap(process.cwd(), async () => {
       const fetchFn = (async (input: RequestInfo | URL, init?: RequestInit) => {
         const request = new Request(input, init)
-        return Server.Default().fetch(request)
+        return Server.App().fetch(request)
       }) as typeof globalThis.fetch
       const sdk = createOpencodeClient({ baseUrl: "http://opencode.internal", fetch: fetchFn })
       await execute(sdk)

packages/opencode/src/cli/cmd/tui/app.tsx

@@ -372,7 +372,7 @@ function App() {
         dialog.replace(() => <DialogSessionList />)
       },
     },
-    ...(Flag.OPENCODE_EXPERIMENTAL_WORKSPACES
+    ...(Flag.OPENCODE_EXPERIMENTAL_WORKSPACES_TUI
       ? [
           {
             title: "Manage workspaces",

packages/opencode/src/cli/cmd/tui/routes/session/header.tsx

@@ -103,7 +103,7 @@ export function Header() {
           <Match when={session()?.parentID}>
             <box flexDirection="column" gap={1}>
               <box flexDirection={narrow() ? "column" : "row"} justifyContent="space-between" gap={narrow() ? 1 : 0}>
-                {Flag.OPENCODE_EXPERIMENTAL_WORKSPACES ? (
+                {Flag.OPENCODE_EXPERIMENTAL_WORKSPACES_TUI ? (
                   <box flexDirection="column">
                     <text fg={theme.text}>
                       <b>Subagent session</b>
@@ -154,7 +154,7 @@ export function Header() {
           </Match>
           <Match when={true}>
             <box flexDirection={narrow() ? "column" : "row"} justifyContent="space-between" gap={1}>
-              {Flag.OPENCODE_EXPERIMENTAL_WORKSPACES ? (
+              {Flag.OPENCODE_EXPERIMENTAL_WORKSPACES_TUI ? (
                 <box flexDirection="column">
                   <Title session={session} />
                   <WorkspaceInfo workspace={workspace} />

packages/opencode/src/cli/cmd/tui/worker.ts

@@ -54,7 +54,7 @@ const startEventStream = (input: { directory: string; workspaceID?: string }) =>
     const request = new Request(input, init)
     const auth = getAuthorizationHeader()
     if (auth) request.headers.set("Authorization", auth)
-    return Server.Default().fetch(request)
+    return Server.App().fetch(request)
   }) as typeof globalThis.fetch
 
   const sdk = createOpencodeClient({
@@ -110,7 +110,7 @@ export const rpc = {
       headers,
       body: input.body,
     })
-    const response = await Server.Default().fetch(request)
+    const response = await Server.App().fetch(request)
     const body = await response.text()
     return {
       status: response.status,

packages/opencode/src/control-plane/workspace-router-middleware.ts

@@ -1,5 +1,6 @@
+import { Instance } from "@/project/instance"
 import type { MiddlewareHandler } from "hono"
-import { Flag } from "../flag/flag"
+import { Installation } from "../installation"
 import { getAdaptor } from "./adaptors"
 import { Workspace } from "./workspace"
 import { WorkspaceContext } from "./workspace-context"
@@ -37,7 +38,7 @@ async function routeRequest(req: Request) {
 
 export const WorkspaceRouterMiddleware: MiddlewareHandler = async (c, next) => {
   // Only available in development for now
-  if (!Flag.OPENCODE_EXPERIMENTAL_WORKSPACES) {
+  if (!Installation.isLocal()) {
     return next()
   }
 

packages/opencode/src/flag/flag.ts

@@ -57,7 +57,8 @@ export namespace Flag {
   export const OPENCODE_EXPERIMENTAL_LSP_TOOL = OPENCODE_EXPERIMENTAL || truthy("OPENCODE_EXPERIMENTAL_LSP_TOOL")
   export const OPENCODE_DISABLE_FILETIME_CHECK = truthy("OPENCODE_DISABLE_FILETIME_CHECK")
   export const OPENCODE_EXPERIMENTAL_PLAN_MODE = OPENCODE_EXPERIMENTAL || truthy("OPENCODE_EXPERIMENTAL_PLAN_MODE")
-  export const OPENCODE_EXPERIMENTAL_WORKSPACES = OPENCODE_EXPERIMENTAL || truthy("OPENCODE_EXPERIMENTAL_WORKSPACES")
+  export const OPENCODE_EXPERIMENTAL_WORKSPACES_TUI =
+    OPENCODE_EXPERIMENTAL || truthy("OPENCODE_EXPERIMENTAL_WORKSPACES_TUI")
   export const OPENCODE_EXPERIMENTAL_MARKDOWN = !falsy("OPENCODE_EXPERIMENTAL_MARKDOWN")
   export const OPENCODE_MODELS_URL = process.env["OPENCODE_MODELS_URL"]
   export const OPENCODE_MODELS_PATH = process.env["OPENCODE_MODELS_PATH"]

packages/opencode/src/mcp/index.ts

@@ -396,14 +396,8 @@ export namespace MCP {
         } catch (error) {
           lastError = error instanceof Error ? error : new Error(String(error))
 
-          // Handle OAuth-specific errors.
-          // The SDK throws UnauthorizedError when auth() returns 'REDIRECT',
-          // but may also throw plain Errors when auth() fails internally
-          // (e.g. during discovery, registration, or state generation).
-          // When an authProvider is attached, treat both cases as auth-related.
-          const isAuthError =
-            error instanceof UnauthorizedError || (authProvider && lastError.message.includes("OAuth"))
-          if (isAuthError) {
+          // Handle OAuth-specific errors
+          if (error instanceof UnauthorizedError) {
             log.info("mcp server requires authentication", { key, transport: name })
 
             // Check if this is a "needs registration" error

packages/opencode/src/mcp/oauth-provider.ts

@@ -144,19 +144,10 @@ export class McpOAuthProvider implements OAuthClientProvider {
 
   async state(): Promise<string> {
     const entry = await McpAuth.get(this.mcpName)
-    if (entry?.oauthState) {
-      return entry.oauthState
+    if (!entry?.oauthState) {
+      throw new Error(`No OAuth state saved for MCP server: ${this.mcpName}`)
     }
-
-    // Generate a new state if none exists — the SDK calls state() as a
-    // generator, not just a reader, so we need to produce a value even when
-    // startAuth() hasn't pre-saved one (e.g. during automatic auth on first
-    // connect).
-    const newState = Array.from(crypto.getRandomValues(new Uint8Array(32)))
-      .map((b) => b.toString(16).padStart(2, "0"))
-      .join("")
-    await McpAuth.updateOAuthState(this.mcpName, newState)
-    return newState
+    return entry.oauthState
   }
 
   async invalidateCredentials(type: "all" | "client" | "tokens"): Promise<void> {

packages/opencode/src/node.ts

@@ -0,0 +1 @@
+export { Server } from "./server/server"

packages/opencode/src/plugin/index.ts

@@ -25,7 +25,8 @@ export namespace Plugin {
     const client = createOpencodeClient({
       baseUrl: "http://localhost:4096",
       directory: Instance.directory,
-      fetch: async (...args) => Server.Default().fetch(...args),
+      // @ts-ignore - fetch type incompatibility
+      fetch: async (...args) => Server.App().fetch(...args),
     })
     const config = await Config.get()
     const hooks: Hooks[] = []
@@ -34,9 +35,7 @@ export namespace Plugin {
       project: Instance.project,
       worktree: Instance.worktree,
       directory: Instance.directory,
-      get serverUrl(): URL {
-        throw new Error("Server URL is no longer supported in plugins")
-      },
+      serverUrl: Server.url(),
       $: Bun.$,
     }
 

packages/opencode/src/server/routes/pty.ts

@@ -1,11 +1,11 @@
 import { Hono } from "hono"
 import { describeRoute, validator, resolver } from "hono-openapi"
-import { upgradeWebSocket } from "hono/bun"
 import z from "zod"
 import { Pty } from "@/pty"
 import { NotFoundError } from "../../storage/db"
 import { errors } from "../error"
 import { lazy } from "../../util/lazy"
+import { Server } from "../server"
 
 export const PtyRoutes = lazy(() =>
   new Hono()
@@ -149,7 +149,7 @@ export const PtyRoutes = lazy(() =>
         },
       }),
       validator("param", z.object({ ptyID: z.string() })),
-      upgradeWebSocket((c) => {
+      Server.upgradeWebSocket((c) => {
         const id = c.req.param("ptyID")
         const cursor = (() => {
           const value = c.req.query("cursor")

packages/opencode/src/session/message-v2.ts

@@ -8,12 +8,8 @@ import { Snapshot } from "@/snapshot"
 import { fn } from "@/util/fn"
 import { Database, eq, desc, inArray } from "@/storage/db"
 import { MessageTable, PartTable } from "./session.sql"
-import { ProviderTransform } from "@/provider/transform"
-import { STATUS_CODES } from "http"
-import { Storage } from "@/storage/storage"
 import { ProviderError } from "@/provider/error"
 import { iife } from "@/util/iife"
-import { type SystemError } from "bun"
 import type { Provider } from "@/provider/provider"
 
 export namespace MessageV2 {
@@ -843,15 +839,15 @@ export namespace MessageV2 {
           },
           { cause: e },
         ).toObject()
-      case (e as SystemError)?.code === "ECONNRESET":
+      case (e as any)?.code === "ECONNRESET":
         return new MessageV2.APIError(
           {
             message: "Connection reset by server",
             isRetryable: true,
             metadata: {
-              code: (e as SystemError).code ?? "",
-              syscall: (e as SystemError).syscall ?? "",
-              message: (e as SystemError).message ?? "",
+              code: (e as any).code ?? "",
+              syscall: (e as any).syscall ?? "",
+              message: (e as any).message ?? "",
             },
           },
           { cause: e },

packages/opencode/src/session/prompt.ts

@@ -29,9 +29,11 @@ import { ReadTool } from "../tool/read"
 import { FileTime } from "../file/time"
 import { Flag } from "../flag/flag"
 import { ulid } from "ulid"
+import { Process } from "../util/process"
 import { spawn } from "child_process"
+
 import { Command } from "../command"
-import { $ } from "bun"
+
 import { pathToFileURL, fileURLToPath } from "url"
 import { ConfigMarkdown } from "../config/markdown"
 import { SessionSummary } from "./summary"
@@ -1778,15 +1780,13 @@ NOTE: At any point in time through this workflow you should feel free to ask the
       template = template + "\n\n" + input.arguments
     }
 
-    const shell = ConfigMarkdown.shell(template)
-    if (shell.length > 0) {
+    const shellMatches = ConfigMarkdown.shell(template)
+    if (shellMatches.length > 0) {
+      const sh = Shell.preferred()
       const results = await Promise.all(
-        shell.map(async ([, cmd]) => {
-          try {
-            return await $`${{ raw: cmd }}`.quiet().nothrow().text()
-          } catch (error) {
-            return `Error executing command: ${error instanceof Error ? error.message : String(error)}`
-          }
+        shellMatches.map(async ([, cmd]) => {
+          const out = await Process.text([cmd], { shell: sh, nothrow: true })
+          return out.text
         }),
       )
       let index = 0

packages/opencode/src/util/process.ts

@@ -13,6 +13,7 @@ export namespace Process {
     abort?: AbortSignal
     kill?: NodeJS.Signals | number
     timeout?: number
+    shell?: string | boolean
   }
 
   export interface RunOptions extends Omit<Options, "stdout" | "stderr"> {
@@ -59,6 +60,7 @@ export namespace Process {
     const proc = launch(cmd[0], cmd.slice(1), {
       cwd: opts.cwd,
       env: opts.env === null ? {} : opts.env ? { ...process.env, ...opts.env } : undefined,
+      shell: opts.shell,
       stdio: [opts.stdin ?? "ignore", opts.stdout ?? "ignore", opts.stderr ?? "ignore"],
     })
 
@@ -108,6 +110,7 @@ export namespace Process {
     const proc = spawn(cmd, {
       cwd: opts.cwd,
       env: opts.env,
+      shell: opts.shell,
       stdin: opts.stdin,
       abort: opts.abort,
       kill: opts.kill,

packages/opencode/test/control-plane/session-proxy-middleware.test.ts

@@ -10,22 +10,12 @@ import { Database } from "../../src/storage/db"
 import { resetDatabase } from "../fixture/db"
 import * as adaptors from "../../src/control-plane/adaptors"
 import type { Adaptor } from "../../src/control-plane/types"
-import { Flag } from "../../src/flag/flag"
 
 afterEach(async () => {
   mock.restore()
   await resetDatabase()
 })
 
-const original = Flag.OPENCODE_EXPERIMENTAL_WORKSPACES
-// @ts-expect-error don't do this normally, but it works
-Flag.OPENCODE_EXPERIMENTAL_WORKSPACES = true
-
-afterEach(() => {
-  // @ts-expect-error don't do this normally, but it works
-  Flag.OPENCODE_EXPERIMENTAL_WORKSPACES = original
-})
-
 type State = {
   workspace?: "first" | "second"
   calls: Array<{ method: string; url: string; body?: string }>

packages/opencode/test/mcp/oauth-auto-connect.test.ts

@@ -1,199 +0,0 @@
-import { test, expect, mock, beforeEach } from "bun:test"
-
-// Mock UnauthorizedError to match the SDK's class
-class MockUnauthorizedError extends Error {
-  constructor(message?: string) {
-    super(message ?? "Unauthorized")
-    this.name = "UnauthorizedError"
-  }
-}
-
-// Track what options were passed to each transport constructor
-const transportCalls: Array<{
-  type: "streamable" | "sse"
-  url: string
-  options: { authProvider?: unknown }
-}> = []
-
-// Controls whether the mock transport simulates a 401 that triggers the SDK
-// auth flow (which calls provider.state()) or a simple UnauthorizedError.
-let simulateAuthFlow = true
-
-// Mock the transport constructors to simulate OAuth auto-auth on 401
-mock.module("@modelcontextprotocol/sdk/client/streamableHttp.js", () => ({
-  StreamableHTTPClientTransport: class MockStreamableHTTP {
-    authProvider:
-      | {
-          state?: () => Promise<string>
-          redirectToAuthorization?: (url: URL) => Promise<void>
-          saveCodeVerifier?: (v: string) => Promise<void>
-        }
-      | undefined
-    constructor(url: URL, options?: { authProvider?: unknown }) {
-      this.authProvider = options?.authProvider as typeof this.authProvider
-      transportCalls.push({
-        type: "streamable",
-        url: url.toString(),
-        options: options ?? {},
-      })
-    }
-    async start() {
-      // Simulate what the real SDK transport does on 401:
-      // It calls auth() which eventually calls provider.state(), then
-      // provider.redirectToAuthorization(), then throws UnauthorizedError.
-      if (simulateAuthFlow && this.authProvider) {
-        // The SDK calls provider.state() to get the OAuth state parameter
-        if (this.authProvider.state) {
-          await this.authProvider.state()
-        }
-        // The SDK calls saveCodeVerifier before redirecting
-        if (this.authProvider.saveCodeVerifier) {
-          await this.authProvider.saveCodeVerifier("test-verifier")
-        }
-        // The SDK calls redirectToAuthorization to redirect the user
-        if (this.authProvider.redirectToAuthorization) {
-          await this.authProvider.redirectToAuthorization(new URL("https://auth.example.com/authorize?state=test"))
-        }
-        throw new MockUnauthorizedError()
-      }
-      throw new MockUnauthorizedError()
-    }
-    async finishAuth(_code: string) {}
-  },
-}))
-
-mock.module("@modelcontextprotocol/sdk/client/sse.js", () => ({
-  SSEClientTransport: class MockSSE {
-    constructor(url: URL, options?: { authProvider?: unknown }) {
-      transportCalls.push({
-        type: "sse",
-        url: url.toString(),
-        options: options ?? {},
-      })
-    }
-    async start() {
-      throw new Error("Mock SSE transport cannot connect")
-    }
-  },
-}))
-
-// Mock the MCP SDK Client
-mock.module("@modelcontextprotocol/sdk/client/index.js", () => ({
-  Client: class MockClient {
-    async connect(transport: { start: () => Promise<void> }) {
-      await transport.start()
-    }
-  },
-}))
-
-// Mock UnauthorizedError in the auth module so instanceof checks work
-mock.module("@modelcontextprotocol/sdk/client/auth.js", () => ({
-  UnauthorizedError: MockUnauthorizedError,
-}))
-
-beforeEach(() => {
-  transportCalls.length = 0
-  simulateAuthFlow = true
-})
-
-// Import modules after mocking
-const { MCP } = await import("../../src/mcp/index")
-const { Instance } = await import("../../src/project/instance")
-const { tmpdir } = await import("../fixture/fixture")
-
-test("first connect to OAuth server shows needs_auth instead of failed", async () => {
-  await using tmp = await tmpdir({
-    init: async (dir) => {
-      await Bun.write(
-        `${dir}/opencode.json`,
-        JSON.stringify({
-          $schema: "https://opencode.ai/config.json",
-          mcp: {
-            "test-oauth": {
-              type: "remote",
-              url: "https://example.com/mcp",
-            },
-          },
-        }),
-      )
-    },
-  })
-
-  await Instance.provide({
-    directory: tmp.path,
-    fn: async () => {
-      const result = await MCP.add("test-oauth", {
-        type: "remote",
-        url: "https://example.com/mcp",
-      })
-
-      const serverStatus = result.status as Record<string, { status: string; error?: string }>
-
-      // The server should be detected as needing auth, NOT as failed.
-      // Before the fix, provider.state() would throw a plain Error
-      // ("No OAuth state saved for MCP server: test-oauth") which was
-      // not caught as UnauthorizedError, causing status to be "failed".
-      expect(serverStatus["test-oauth"]).toBeDefined()
-      expect(serverStatus["test-oauth"].status).toBe("needs_auth")
-    },
-  })
-})
-
-test("state() generates a new state when none is saved", async () => {
-  const { McpOAuthProvider } = await import("../../src/mcp/oauth-provider")
-  const { McpAuth } = await import("../../src/mcp/auth")
-
-  await using tmp = await tmpdir()
-
-  await Instance.provide({
-    directory: tmp.path,
-    fn: async () => {
-      const provider = new McpOAuthProvider(
-        "test-state-gen",
-        "https://example.com/mcp",
-        {},
-        { onRedirect: async () => {} },
-      )
-
-      // Ensure no state exists
-      const entryBefore = await McpAuth.get("test-state-gen")
-      expect(entryBefore?.oauthState).toBeUndefined()
-
-      // state() should generate and return a new state, not throw
-      const state = await provider.state()
-      expect(typeof state).toBe("string")
-      expect(state.length).toBe(64) // 32 bytes as hex
-
-      // The generated state should be persisted
-      const entryAfter = await McpAuth.get("test-state-gen")
-      expect(entryAfter?.oauthState).toBe(state)
-    },
-  })
-})
-
-test("state() returns existing state when one is saved", async () => {
-  const { McpOAuthProvider } = await import("../../src/mcp/oauth-provider")
-  const { McpAuth } = await import("../../src/mcp/auth")
-
-  await using tmp = await tmpdir()
-
-  await Instance.provide({
-    directory: tmp.path,
-    fn: async () => {
-      const provider = new McpOAuthProvider(
-        "test-state-existing",
-        "https://example.com/mcp",
-        {},
-        { onRedirect: async () => {} },
-      )
-
-      // Pre-save a state
-      const existingState = "pre-saved-state-value"
-      await McpAuth.updateOAuthState("test-state-existing", existingState)
-
-      // state() should return the existing state
-      const state = await provider.state()
-      expect(state).toBe(existingState)
-    },
-  })
-})

packages/opencode/test/server/project-init-git.test.ts

@@ -19,7 +19,7 @@ afterEach(async () => {
 describe("project.initGit endpoint", () => {
   test("initializes git and reloads immediately", async () => {
     await using tmp = await tmpdir()
-    const app = Server.Default()
+    const app = Server.App()
     const seen: { directory?: string; payload: { type: string } }[] = []
     const fn = (evt: { directory?: string; payload: { type: string } }) => {
       seen.push(evt)
@@ -75,7 +75,7 @@ describe("project.initGit endpoint", () => {
 
   test("does not reload when the project is already git", async () => {
     await using tmp = await tmpdir({ git: true })
-    const app = Server.Default()
+    const app = Server.App()
     const seen: { directory?: string; payload: { type: string } }[] = []
     const fn = (evt: { directory?: string; payload: { type: string } }) => {
       seen.push(evt)

packages/opencode/test/server/session-select.test.ts

@@ -17,7 +17,7 @@ describe("tui.selectSession endpoint", () => {
         const session = await Session.create({})
 
         // #when
-        const app = Server.Default()
+        const app = Server.App()
         const response = await app.request("/tui/select-session", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
@@ -42,7 +42,7 @@ describe("tui.selectSession endpoint", () => {
         const nonExistentSessionID = "ses_nonexistent123"
 
         // #when
-        const app = Server.Default()
+        const app = Server.App()
         const response = await app.request("/tui/select-session", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
@@ -63,7 +63,7 @@ describe("tui.selectSession endpoint", () => {
         const invalidSessionID = "invalid_session_id"
 
         // #when
-        const app = Server.Default()
+        const app = Server.App()
         const response = await app.request("/tui/select-session", {
           method: "POST",
           headers: { "Content-Type": "application/json" },

packages/ui/src/components/message-part.css

@@ -21,7 +21,7 @@
   align-self: stretch;
   width: 100%;
   max-width: 100%;
-  gap: 0;
+  gap: 8px;
 
   &[data-interrupted] {
     color: var(--text-weak);
@@ -98,10 +98,6 @@
     align-items: flex-end;
   }
 
-  [data-slot="user-message-attachments"] + [data-slot="user-message-body"] {
-    margin-top: 8px;
-  }
-
   [data-slot="user-message-text"] {
     display: inline-block;
     white-space: pre-wrap;
@@ -172,7 +168,7 @@
     align-items: center;
     justify-content: flex-end;
     overflow: hidden;
-    gap: 0;
+    gap: 6px;
   }
 
   [data-slot="user-message-meta-tail"] {

packages/ui/src/theme/color.ts

@@ -135,25 +135,12 @@ export function generateScale(seed: HexColor, isDark: boolean): HexColor[] {
   const scale: HexColor[] = []
 
   const lightSteps = isDark
-    ? [
-        0.182,
-        0.21,
-        0.261,
-        0.302,
-        0.341,
-        0.387,
-        0.443,
-        0.514,
-        base.l,
-        Math.max(0, base.l - 0.017),
-        Math.min(0.94, Math.max(0.84, base.l + 0.02)),
-        0.975,
-      ]
-    : [0.993, 0.983, 0.962, 0.936, 0.906, 0.866, 0.811, 0.74, base.l, Math.max(0, base.l - 0.036), 0.49, 0.27]
+    ? [0.182, 0.21, 0.261, 0.302, 0.341, 0.387, 0.443, 0.514, base.l, Math.max(0, base.l - 0.017), 0.8, 0.93]
+    : [0.993, 0.983, 0.962, 0.936, 0.906, 0.866, 0.811, 0.74, base.l, Math.max(0, base.l - 0.036), 0.548, 0.33]
 
   const chromaMultipliers = isDark
-    ? [0.34, 0.45, 0.64, 0.82, 0.96, 1.06, 1.14, 1.2, 1.24, 1.28, 1.34, 1.08]
-    : [0.12, 0.24, 0.46, 0.68, 0.84, 0.98, 1.08, 1.16, 1.22, 1.26, 1.18, 0.98]
+    ? [0.205, 0.275, 0.46, 0.62, 0.71, 0.79, 0.87, 0.97, 1.04, 1.03, 1, 0.58]
+    : [0.045, 0.128, 0.34, 0.5, 0.61, 0.69, 0.77, 0.89, 1, 1, 0.97, 0.56]
 
   for (let i = 0; i < 12; i++) {
     scale.push(
@@ -168,35 +155,10 @@ export function generateScale(seed: HexColor, isDark: boolean): HexColor[] {
   return scale
 }
 
-export function generateNeutralScale(seed: HexColor, isDark: boolean, ink?: HexColor): HexColor[] {
-  if (ink) {
-    const base = hexToOklch(seed)
-    const lift = (tone: number) =>
-      oklchToHex({
-        l: base.l + (1 - base.l) * tone,
-        c: base.c * Math.max(0, 1 - tone),
-        h: base.h,
-      })
-    const sink = (tone: number) =>
-      oklchToHex({
-        l: base.l * (1 - tone),
-        c: base.c * Math.max(0, 1 - tone * 0.3),
-        h: base.h,
-      })
-    const bg = isDark
-      ? sink(clamp(0.06 + Math.max(0, base.l - 0.18) * 0.22 + base.c * 1.4, 0.06, 0.14))
-      : base.l < 0.82
-        ? lift(0.86)
-        : lift(clamp(0.1 + base.c * 3.2 + Math.max(0, 0.95 - base.l) * 0.35, 0.1, 0.28))
-    const steps = isDark
-      ? [0, 0.03, 0.055, 0.085, 0.125, 0.18, 0.255, 0.35, 0.5, 0.67, 0.84, 0.975]
-      : [0, 0.022, 0.042, 0.068, 0.102, 0.146, 0.208, 0.296, 0.432, 0.61, 0.81, 0.965]
-    return steps.map((step) => mixColors(bg, ink, step))
-  }
-
+export function generateNeutralScale(seed: HexColor, isDark: boolean): HexColor[] {
   const base = hexToOklch(seed)
   const scale: HexColor[] = []
-  const neutralChroma = Math.min(base.c, isDark ? 0.05 : 0.04)
+  const neutralChroma = Math.min(base.c, 0.02)
 
   const lightSteps = isDark
     ? [0.2, 0.226, 0.256, 0.277, 0.301, 0.325, 0.364, 0.431, base.l, 0.593, 0.706, 0.946]

packages/ui/src/theme/resolve.ts

@@ -1,11 +1,11 @@
 import type { ColorValue, DesktopTheme, HexColor, ResolvedTheme, ThemeVariant } from "./types"
-import { blend, generateNeutralScale, generateScale, hexToOklch, hexToRgb, shift, withAlpha } from "./color"
+import { blend, generateNeutralScale, generateScale, hexToOklch, oklchToHex, shift, withAlpha } from "./color"
 
 export function resolveThemeVariant(variant: ThemeVariant, isDark: boolean): ResolvedTheme {
   const colors = getColors(variant)
   const { overrides = {} } = variant
 
-  const neutral = generateNeutralScale(colors.neutral, isDark, colors.ink)
+  const neutral = generateNeutralScale(colors.neutral, isDark)
   const primary = generateScale(colors.primary, isDark)
   const accent = generateScale(colors.accent, isDark)
   const success = generateScale(colors.success, isDark)
@@ -39,20 +39,12 @@ export function resolveThemeVariant(variant: ThemeVariant, isDark: boolean): Res
     isDark,
   )
   const ink = colors.ink ?? colors.neutral
-  const tint = hasInk ? hexToOklch(ink) : undefined
-  const body = tint
-    ? shift(ink, {
-        l: isDark ? Math.max(0, 0.88 - tint.l) * 0.4 : -Math.max(0, tint.l - 0.18) * 0.24,
-        c: isDark ? 1.04 : 1.02,
-      })
-    : undefined
   const backgroundOverride = overrides["background-base"]
   const backgroundHex = getHex(backgroundOverride)
   const overlay = noInk || (Boolean(backgroundOverride) && !backgroundHex)
   const content = (seed: HexColor, scale: HexColor[]) => {
-    const base = hexToOklch(seed)
-    const value = isDark ? (base.l > 0.84 ? shift(seed, { c: 1.18 }) : scale[10]) : scale[10]
-    return shift(value, { l: isDark ? 0.034 : -0.024, c: isDark ? 1.3 : 1.18 })
+    const value = isDark ? seed : hexToOklch(seed).l > 0.82 ? scale[10] : seed
+    return shift(value, { c: isDark ? 1.16 : 1.1 })
   }
   const modified = () => {
     if (!colors.compact) return isDark ? "#ffba92" : "#FF8C00"
@@ -95,9 +87,9 @@ export function resolveThemeVariant(variant: ThemeVariant, isDark: boolean): Res
   const compactInkBackground =
     colors.compact && hasInk && isDark
       ? {
-          base: neutral[0],
-          weak: neutral[1],
-          strong: neutral[0],
+          base: neutral[2],
+          weak: neutral[3],
+          strong: neutral[1],
           stronger: neutral[2],
         }
       : undefined
@@ -126,40 +118,6 @@ export function resolveThemeVariant(variant: ThemeVariant, isDark: boolean): Res
       )
 
   const neutralAlpha = noInk ? generateNeutralOverlayScale(neutral, isDark) : generateNeutralAlphaScale(neutral, isDark)
-  const brandb = brandl[isDark ? 9 : 8]
-  const brandh = brandl[isDark ? 10 : 9]
-  const interb = interactive[isDark ? 5 : 4]
-  const interh = interactive[isDark ? 6 : 5]
-  const interw = interactive[isDark ? 4 : 3]
-  const succb = success[isDark ? 5 : 4]
-  const succw = success[isDark ? 4 : 3]
-  const succs = success[10]
-  const warnb = (noInk && isDark ? warningl : warning)[isDark ? 5 : 4]
-  const warnw = (noInk && isDark ? warningl : warning)[isDark ? 4 : 3]
-  const warns = (noInk && isDark ? warningl : warning)[10]
-  const critb = error[isDark ? 5 : 4]
-  const critw = error[isDark ? 4 : 3]
-  const crits = error[10]
-  const infob = (noInk && isDark ? infol : info)[isDark ? 5 : 4]
-  const infow = (noInk && isDark ? infol : info)[isDark ? 4 : 3]
-  const infos = (noInk && isDark ? infol : info)[10]
-  const lum = (hex: HexColor) => {
-    const rgb = hexToRgb(hex)
-    const lift = (v: number) => (v <= 0.04045 ? v / 12.92 : Math.pow((v + 0.055) / 1.055, 2.4))
-    return 0.2126 * lift(rgb.r) + 0.7152 * lift(rgb.g) + 0.0722 * lift(rgb.b)
-  }
-  const hit = (a: HexColor, b: HexColor) => {
-    const x = lum(a)
-    const y = lum(b)
-    const light = Math.max(x, y)
-    const dark = Math.min(x, y)
-    return (light + 0.05) / (dark + 0.05)
-  }
-  const on = (fill: HexColor) => {
-    const light = "#ffffff" as HexColor
-    const dark = "#000000" as HexColor
-    return hit(light, fill) > hit(dark, fill) ? light : dark
-  }
 
   const tokens: ResolvedTheme = {}
 
@@ -183,8 +141,8 @@ export function resolveThemeVariant(variant: ThemeVariant, isDark: boolean): Res
     : (withAlpha(neutral[3], 0.09) as ColorValue)
   tokens["surface-inset-strong-hover"] = tokens["surface-inset-strong"]
   tokens["surface-raised-base"] = neutralAlpha[0]
-  tokens["surface-float-base"] = isDark ? (hasInk ? neutral[1] : neutral[0]) : noInk ? shadow[0] : neutral[11]
-  tokens["surface-float-base-hover"] = isDark ? (hasInk ? neutral[2] : neutral[1]) : noInk ? shadow[1] : neutral[10]
+  tokens["surface-float-base"] = isDark ? neutral[0] : noInk ? shadow[0] : neutral[11]
+  tokens["surface-float-base-hover"] = isDark ? neutral[1] : noInk ? shadow[1] : neutral[10]
   tokens["surface-raised-base-hover"] = neutralAlpha[1]
   tokens["surface-raised-base-active"] = neutralAlpha[2]
   tokens["surface-raised-strong"] = isDark ? neutralAlpha[3] : neutral[0]
@@ -196,26 +154,26 @@ export function resolveThemeVariant(variant: ThemeVariant, isDark: boolean): Res
   tokens["surface-strong"] = isDark ? neutralAlpha[6] : "#ffffff"
   tokens["surface-raised-stronger-non-alpha"] = isDark ? neutral[2] : "#ffffff"
 
-  tokens["surface-brand-base"] = brandb
-  tokens["surface-brand-hover"] = brandh
+  tokens["surface-brand-base"] = brandl[8]
+  tokens["surface-brand-hover"] = brandl[9]
 
-  tokens["surface-interactive-base"] = interb
-  tokens["surface-interactive-hover"] = interh
-  tokens["surface-interactive-weak"] = interw
-  tokens["surface-interactive-weak-hover"] = noInk && isDark ? interl[5] : interb
+  tokens["surface-interactive-base"] = interactive[isDark ? 4 : 3]
+  tokens["surface-interactive-hover"] = interactive[isDark ? 5 : 4]
+  tokens["surface-interactive-weak"] = interactive[isDark ? 3 : 2]
+  tokens["surface-interactive-weak-hover"] = noInk && isDark ? interl[4] : interactive[isDark ? 4 : 3]
 
-  tokens["surface-success-base"] = succb
-  tokens["surface-success-weak"] = succw
-  tokens["surface-success-strong"] = succs
-  tokens["surface-warning-base"] = warnb
-  tokens["surface-warning-weak"] = warnw
-  tokens["surface-warning-strong"] = warns
-  tokens["surface-critical-base"] = critb
-  tokens["surface-critical-weak"] = critw
-  tokens["surface-critical-strong"] = crits
-  tokens["surface-info-base"] = infob
-  tokens["surface-info-weak"] = infow
-  tokens["surface-info-strong"] = infos
+  tokens["surface-success-base"] = success[isDark ? 4 : 3]
+  tokens["surface-success-weak"] = success[isDark ? 3 : 2]
+  tokens["surface-success-strong"] = success[9]
+  tokens["surface-warning-base"] = (noInk && isDark ? warningl : warning)[isDark ? 4 : 3]
+  tokens["surface-warning-weak"] = (noInk && isDark ? warningl : warning)[isDark ? 3 : 2]
+  tokens["surface-warning-strong"] = (noInk && isDark ? warningl : warning)[9]
+  tokens["surface-critical-base"] = error[isDark ? 4 : 3]
+  tokens["surface-critical-weak"] = error[isDark ? 3 : 2]
+  tokens["surface-critical-strong"] = error[9]
+  tokens["surface-info-base"] = (noInk && isDark ? infol : info)[isDark ? 4 : 3]
+  tokens["surface-info-weak"] = (noInk && isDark ? infol : info)[isDark ? 3 : 2]
+  tokens["surface-info-strong"] = (noInk && isDark ? infol : info)[9]
 
   tokens["surface-diff-unchanged-base"] = isDark ? neutral[0] : "#ffffff00"
   tokens["surface-diff-skip-base"] = isDark ? neutralAlpha[0] : neutral[1]
@@ -242,16 +200,16 @@ export function resolveThemeVariant(variant: ThemeVariant, isDark: boolean): Res
   tokens["input-focus"] = interactive[0]
   tokens["input-disabled"] = neutral[3]
 
-  tokens["text-base"] = hasInk ? (body as HexColor) : noInk ? (isDark ? neutralAlpha[10] : neutral[10]) : neutral[10]
+  tokens["text-base"] = hasInk ? ink : noInk ? (isDark ? neutralAlpha[10] : neutral[10]) : neutral[10]
   tokens["text-weak"] = hasInk
-    ? shift(body as HexColor, { l: isDark ? -0.11 : 0.11, c: 0.9 })
+    ? shift(ink, { l: isDark ? -0.18 : 0.16, c: 0.88 })
     : noInk
       ? isDark
         ? neutralAlpha[8]
         : neutral[8]
       : neutral[8]
   tokens["text-weaker"] = hasInk
-    ? shift(body as HexColor, { l: isDark ? -0.2 : 0.21, c: isDark ? 0.78 : 0.72 })
+    ? shift(ink, { l: isDark ? -0.3 : 0.26, c: isDark ? 0.74 : 0.68 })
     : noInk
       ? isDark
         ? neutralAlpha[7]
@@ -259,8 +217,8 @@ export function resolveThemeVariant(variant: ThemeVariant, isDark: boolean): Res
       : neutral[7]
   tokens["text-strong"] = hasInk
     ? isDark && colors.compact
-      ? blend("#ffffff", body as HexColor, 0.9)
-      : shift(body as HexColor, { l: isDark ? 0.055 : -0.07, c: 1.04 })
+      ? blend("#ffffff", ink, 0.82)
+      : shift(ink, { l: isDark ? 0.06 : -0.09, c: 1 })
     : noInk
       ? isDark
         ? neutralAlpha[11]
@@ -276,29 +234,29 @@ export function resolveThemeVariant(variant: ThemeVariant, isDark: boolean): Res
   tokens["text-invert-weak"] = isDark ? neutral[8] : neutral[2]
   tokens["text-invert-weaker"] = isDark ? neutral[7] : neutral[3]
   tokens["text-invert-strong"] = isDark ? neutral[11] : neutral[0]
-  tokens["text-interactive-base"] = interactive[isDark ? 10 : 9]
-  tokens["text-on-brand-base"] = on(brandb)
-  tokens["text-on-interactive-base"] = on(interb)
-  tokens["text-on-interactive-weak"] = on(interb)
-  tokens["text-on-success-base"] = on(succb)
-  tokens["text-on-critical-base"] = on(critb)
-  tokens["text-on-critical-weak"] = on(critb)
-  tokens["text-on-critical-strong"] = on(crits)
-  tokens["text-on-warning-base"] = on(warnb)
-  tokens["text-on-info-base"] = on(infob)
+  tokens["text-interactive-base"] = interactive[isDark ? 10 : 8]
+  tokens["text-on-brand-base"] = neutralAlpha[10]
+  tokens["text-on-interactive-base"] = isDark ? neutral[11] : neutral[0]
+  tokens["text-on-interactive-weak"] = neutralAlpha[10]
+  tokens["text-on-success-base"] = success[isDark ? 8 : 9]
+  tokens["text-on-critical-base"] = error[isDark ? 8 : 9]
+  tokens["text-on-critical-weak"] = error[7]
+  tokens["text-on-critical-strong"] = error[11]
+  tokens["text-on-warning-base"] = neutralAlpha[10]
+  tokens["text-on-info-base"] = neutralAlpha[10]
   tokens["text-diff-add-base"] = diffAdd[10]
   tokens["text-diff-delete-base"] = diffDelete[isDark ? 8 : 9]
   tokens["text-diff-delete-strong"] = diffDelete[11]
   tokens["text-diff-add-strong"] = diffAdd[isDark ? 7 : 11]
-  tokens["text-on-info-weak"] = on(infob)
-  tokens["text-on-info-strong"] = on(infos)
-  tokens["text-on-warning-weak"] = on(warnb)
-  tokens["text-on-warning-strong"] = on(warns)
-  tokens["text-on-success-weak"] = on(succb)
-  tokens["text-on-success-strong"] = on(succs)
-  tokens["text-on-brand-weak"] = on(brandb)
-  tokens["text-on-brand-weaker"] = on(brandb)
-  tokens["text-on-brand-strong"] = on(brandh)
+  tokens["text-on-info-weak"] = neutralAlpha[8]
+  tokens["text-on-info-strong"] = neutralAlpha[11]
+  tokens["text-on-warning-weak"] = neutralAlpha[8]
+  tokens["text-on-warning-strong"] = neutralAlpha[11]
+  tokens["text-on-success-weak"] = success[isDark ? 7 : 5]
+  tokens["text-on-success-strong"] = success[11]
+  tokens["text-on-brand-weak"] = neutralAlpha[8]
+  tokens["text-on-brand-weaker"] = neutralAlpha[7]
+  tokens["text-on-brand-strong"] = neutralAlpha[11]
 
   tokens["button-primary-base"] = neutral[11]
   tokens["button-secondary-base"] = noInk ? (isDark ? neutral[1] : neutral[0]) : isDark ? neutral[2] : neutral[0]
@@ -309,27 +267,27 @@ export function resolveThemeVariant(variant: ThemeVariant, isDark: boolean): Res
   if (noInk) {
     const tone = (alpha: number) => alphaTone((isDark ? "#ffffff" : "#000000") as HexColor, alpha)
     if (isDark) {
-      tokens["surface-base"] = tone(0.045)
-      tokens["surface-base-hover"] = tone(0.065)
-      tokens["surface-base-active"] = tone(0.095)
-      tokens["surface-raised-base"] = tone(0.085)
-      tokens["surface-raised-base-hover"] = tone(0.115)
-      tokens["surface-raised-base-active"] = tone(0.15)
-      tokens["surface-raised-strong"] = tone(0.115)
-      tokens["surface-raised-strong-hover"] = tone(0.17)
-      tokens["surface-raised-stronger"] = tone(0.17)
-      tokens["surface-raised-stronger-hover"] = tone(0.22)
-      tokens["surface-weak"] = tone(0.115)
-      tokens["surface-weaker"] = tone(0.15)
-      tokens["surface-strong"] = tone(0.22)
+      tokens["surface-base"] = tone(0.031)
+      tokens["surface-base-hover"] = tone(0.039)
+      tokens["surface-base-active"] = tone(0.059)
+      tokens["surface-raised-base"] = tone(0.059)
+      tokens["surface-raised-base-hover"] = tone(0.078)
+      tokens["surface-raised-base-active"] = tone(0.102)
+      tokens["surface-raised-strong"] = tone(0.078)
+      tokens["surface-raised-strong-hover"] = tone(0.129)
+      tokens["surface-raised-stronger"] = tone(0.129)
+      tokens["surface-raised-stronger-hover"] = tone(0.169)
+      tokens["surface-weak"] = tone(0.078)
+      tokens["surface-weaker"] = tone(0.102)
+      tokens["surface-strong"] = tone(0.169)
       tokens["surface-raised-stronger-non-alpha"] = neutral[1]
       tokens["surface-inset-base"] = withAlpha("#000000", 0.5) as ColorValue
       tokens["surface-inset-base-hover"] = tokens["surface-inset-base"]
       tokens["surface-inset-strong"] = withAlpha("#000000", 0.8) as ColorValue
       tokens["surface-inset-strong-hover"] = tokens["surface-inset-strong"]
-      tokens["button-secondary-hover"] = tone(0.065)
-      tokens["button-ghost-hover"] = tone(0.045)
-      tokens["button-ghost-hover2"] = tone(0.095)
+      tokens["button-secondary-hover"] = tone(0.039)
+      tokens["button-ghost-hover"] = tone(0.031)
+      tokens["button-ghost-hover2"] = tone(0.059)
       tokens["input-base"] = neutral[1]
       tokens["input-hover"] = neutral[1]
       tokens["input-selected"] = interactive[1]
@@ -337,30 +295,30 @@ export function resolveThemeVariant(variant: ThemeVariant, isDark: boolean): Res
     }
 
     if (!isDark) {
-      tokens["surface-base"] = tone(0.045)
-      tokens["surface-base-hover"] = tone(0.08)
-      tokens["surface-base-active"] = tone(0.105)
-      tokens["surface-raised-base"] = tone(0.05)
-      tokens["surface-raised-base-hover"] = tone(0.08)
-      tokens["surface-raised-base-active"] = tone(0.125)
+      tokens["surface-base"] = tone(0.031)
+      tokens["surface-base-hover"] = tone(0.059)
+      tokens["surface-base-active"] = tone(0.051)
+      tokens["surface-raised-base"] = tone(0.031)
+      tokens["surface-raised-base-hover"] = tone(0.051)
+      tokens["surface-raised-base-active"] = tone(0.09)
       tokens["surface-raised-strong"] = neutral[0]
       tokens["surface-raised-strong-hover"] = "#ffffff"
       tokens["surface-raised-stronger"] = "#ffffff"
       tokens["surface-raised-stronger-hover"] = "#ffffff"
-      tokens["surface-weak"] = tone(0.08)
-      tokens["surface-weaker"] = tone(0.105)
+      tokens["surface-weak"] = tone(0.051)
+      tokens["surface-weaker"] = tone(0.071)
       tokens["surface-strong"] = "#ffffff"
       tokens["surface-raised-stronger-non-alpha"] = "#ffffff"
       tokens["surface-inset-strong"] = tone(0.09)
       tokens["surface-inset-strong-hover"] = tokens["surface-inset-strong"]
       tokens["button-secondary-hover"] = blend("#ffffff", background, 0.04)
-      tokens["button-ghost-hover"] = tone(0.045)
-      tokens["button-ghost-hover2"] = tone(0.08)
+      tokens["button-ghost-hover"] = tone(0.031)
+      tokens["button-ghost-hover2"] = tone(0.051)
       tokens["input-base"] = neutral[0]
       tokens["input-hover"] = neutral[1]
     }
 
-    tokens["surface-base-interactive-active"] = withAlpha(colors.interactive, isDark ? 0.18 : 0.12) as ColorValue
+    tokens["surface-base-interactive-active"] = withAlpha(colors.interactive, isDark ? 0.125 : 0.09) as ColorValue
   }
 
   tokens["border-base"] = hasInk ? borderTone(0.22, 0.16) : neutralAlpha[6]
@@ -412,25 +370,25 @@ export function resolveThemeVariant(variant: ThemeVariant, isDark: boolean): Res
     tokens["border-focus"] = tokens["border-active"]
   }
 
-  tokens["border-interactive-base"] = (noInk && isDark ? interl : interactive)[7]
-  tokens["border-interactive-hover"] = (noInk && isDark ? interl : interactive)[8]
-  tokens["border-interactive-active"] = (noInk && isDark ? interl : interactive)[9]
-  tokens["border-interactive-selected"] = (noInk && isDark ? interl : interactive)[9]
+  tokens["border-interactive-base"] = (noInk && isDark ? interl : interactive)[6]
+  tokens["border-interactive-hover"] = (noInk && isDark ? interl : interactive)[7]
+  tokens["border-interactive-active"] = (noInk && isDark ? interl : interactive)[8]
+  tokens["border-interactive-selected"] = (noInk && isDark ? interl : interactive)[8]
   tokens["border-interactive-disabled"] = neutral[7]
-  tokens["border-interactive-focus"] = (noInk && isDark ? interl : interactive)[9]
+  tokens["border-interactive-focus"] = (noInk && isDark ? interl : interactive)[8]
 
-  tokens["border-success-base"] = (noInk && isDark ? successl : success)[6]
-  tokens["border-success-hover"] = (noInk && isDark ? successl : success)[7]
-  tokens["border-success-selected"] = (noInk && isDark ? successl : success)[9]
-  tokens["border-warning-base"] = (noInk && isDark ? warningl : warning)[6]
-  tokens["border-warning-hover"] = (noInk && isDark ? warningl : warning)[7]
-  tokens["border-warning-selected"] = (noInk && isDark ? warningl : warning)[9]
-  tokens["border-critical-base"] = error[isDark ? 5 : 6]
-  tokens["border-critical-hover"] = error[7]
-  tokens["border-critical-selected"] = error[9]
-  tokens["border-info-base"] = (noInk && isDark ? infol : info)[6]
-  tokens["border-info-hover"] = (noInk && isDark ? infol : info)[7]
-  tokens["border-info-selected"] = (noInk && isDark ? infol : info)[9]
+  tokens["border-success-base"] = (noInk && isDark ? successl : success)[5]
+  tokens["border-success-hover"] = (noInk && isDark ? successl : success)[6]
+  tokens["border-success-selected"] = (noInk && isDark ? successl : success)[8]
+  tokens["border-warning-base"] = (noInk && isDark ? warningl : warning)[5]
+  tokens["border-warning-hover"] = (noInk && isDark ? warningl : warning)[6]
+  tokens["border-warning-selected"] = (noInk && isDark ? warningl : warning)[8]
+  tokens["border-critical-base"] = error[isDark ? 4 : 5]
+  tokens["border-critical-hover"] = error[6]
+  tokens["border-critical-selected"] = error[8]
+  tokens["border-info-base"] = (noInk && isDark ? infol : info)[5]
+  tokens["border-info-hover"] = (noInk && isDark ? infol : info)[6]
+  tokens["border-info-selected"] = (noInk && isDark ? infol : info)[8]
   tokens["border-color"] = "#ffffff"
 
   tokens["icon-base"] = hasInk && !isDark ? tokens["text-weak"] : neutral[isDark ? 9 : 8]
@@ -453,7 +411,7 @@ export function resolveThemeVariant(variant: ThemeVariant, isDark: boolean): Res
   tokens["icon-strong-disabled"] = noInk && isDark ? neutral[6] : neutral[7]
   tokens["icon-strong-focus"] = isDark ? "#fdfcfc" : "#020202"
   tokens["icon-brand-base"] = isDark ? "#ffffff" : neutral[11]
-  tokens["icon-interactive-base"] = interactive[9]
+  tokens["icon-interactive-base"] = interactive[8]
   tokens["icon-success-base"] = success[isDark ? 8 : 6]
   tokens["icon-success-hover"] = success[isDark ? 9 : 7]
   tokens["icon-success-active"] = success[10]
@@ -466,28 +424,28 @@ export function resolveThemeVariant(variant: ThemeVariant, isDark: boolean): Res
   tokens["icon-info-base"] = info[isDark ? 6 : 6]
   tokens["icon-info-hover"] = info[7]
   tokens["icon-info-active"] = info[10]
-  tokens["icon-on-brand-base"] = on(brandb)
-  tokens["icon-on-brand-hover"] = on(brandh)
-  tokens["icon-on-brand-selected"] = on(brandh)
-  tokens["icon-on-interactive-base"] = on(interb)
+  tokens["icon-on-brand-base"] = neutralAlpha[10]
+  tokens["icon-on-brand-hover"] = neutralAlpha[11]
+  tokens["icon-on-brand-selected"] = neutralAlpha[11]
+  tokens["icon-on-interactive-base"] = isDark ? neutral[11] : neutral[0]
 
   tokens["icon-agent-plan-base"] = info[8]
   tokens["icon-agent-docs-base"] = amber[8]
   tokens["icon-agent-ask-base"] = blue[8]
   tokens["icon-agent-build-base"] = interactive[isDark ? 10 : 8]
 
-  tokens["icon-on-success-base"] = on(succb)
-  tokens["icon-on-success-hover"] = on(succs)
-  tokens["icon-on-success-selected"] = on(succs)
-  tokens["icon-on-warning-base"] = on(warnb)
-  tokens["icon-on-warning-hover"] = on(warns)
-  tokens["icon-on-warning-selected"] = on(warns)
-  tokens["icon-on-critical-base"] = on(critb)
-  tokens["icon-on-critical-hover"] = on(crits)
-  tokens["icon-on-critical-selected"] = on(crits)
-  tokens["icon-on-info-base"] = on(infob)
-  tokens["icon-on-info-hover"] = on(infos)
-  tokens["icon-on-info-selected"] = on(infos)
+  tokens["icon-on-success-base"] = withAlpha(success[8], 0.9) as ColorValue
+  tokens["icon-on-success-hover"] = withAlpha(success[9], 0.9) as ColorValue
+  tokens["icon-on-success-selected"] = withAlpha(success[10], 0.9) as ColorValue
+  tokens["icon-on-warning-base"] = withAlpha(amber[8], 0.9) as ColorValue
+  tokens["icon-on-warning-hover"] = withAlpha(amber[9], 0.9) as ColorValue
+  tokens["icon-on-warning-selected"] = withAlpha(amber[10], 0.9) as ColorValue
+  tokens["icon-on-critical-base"] = withAlpha(error[8], 0.9) as ColorValue
+  tokens["icon-on-critical-hover"] = withAlpha(error[9], 0.9) as ColorValue
+  tokens["icon-on-critical-selected"] = withAlpha(error[10], 0.9) as ColorValue
+  tokens["icon-on-info-base"] = info[8]
+  tokens["icon-on-info-hover"] = withAlpha(info[9], 0.9) as ColorValue
+  tokens["icon-on-info-selected"] = withAlpha(info[10], 0.9) as ColorValue
 
   tokens["icon-diff-add-base"] = diffAdd[10]
   tokens["icon-diff-add-hover"] = diffAdd[isDark ? 9 : 11]
@@ -501,7 +459,7 @@ export function resolveThemeVariant(variant: ThemeVariant, isDark: boolean): Res
       tokens["syntax-comment"] = "var(--text-weak)"
       tokens["syntax-regexp"] = "var(--text-base)"
       tokens["syntax-string"] = isDark ? "#00ceb9" : "#006656"
-      tokens["syntax-keyword"] = content(colors.accent, accent)
+      tokens["syntax-keyword"] = "var(--text-weak)"
       tokens["syntax-primitive"] = isDark ? "#ffba92" : "#fb4804"
       tokens["syntax-operator"] = isDark ? "var(--text-weak)" : "var(--text-base)"
       tokens["syntax-variable"] = "var(--text-strong)"
@@ -510,9 +468,9 @@ export function resolveThemeVariant(variant: ThemeVariant, isDark: boolean): Res
       tokens["syntax-constant"] = isDark ? "#93e9f6" : "#007b80"
       tokens["syntax-punctuation"] = isDark ? "var(--text-weak)" : "var(--text-base)"
       tokens["syntax-object"] = "var(--text-strong)"
-      tokens["syntax-success"] = success[10]
-      tokens["syntax-warning"] = amber[10]
-      tokens["syntax-critical"] = error[10]
+      tokens["syntax-success"] = success[9]
+      tokens["syntax-warning"] = amber[9]
+      tokens["syntax-critical"] = error[9]
       tokens["syntax-info"] = isDark ? "#93e9f6" : "#0092a8"
       tokens["syntax-diff-add"] = diffAdd[10]
       tokens["syntax-diff-delete"] = diffDelete[10]
@@ -538,18 +496,18 @@ export function resolveThemeVariant(variant: ThemeVariant, isDark: boolean): Res
       tokens["syntax-comment"] = "var(--text-weak)"
       tokens["syntax-regexp"] = "var(--text-base)"
       tokens["syntax-string"] = content(colors.success, success)
-      tokens["syntax-keyword"] = content(colors.accent, accent)
-      tokens["syntax-primitive"] = content(colors.primary, primary)
+      tokens["syntax-keyword"] = "var(--text-weak)"
+      tokens["syntax-primitive"] = content(colors.accent, accent)
       tokens["syntax-operator"] = isDark ? "var(--text-weak)" : "var(--text-base)"
       tokens["syntax-variable"] = "var(--text-strong)"
-      tokens["syntax-property"] = content(colors.info, info)
+      tokens["syntax-property"] = content(colors.primary, primary)
       tokens["syntax-type"] = content(colors.warning, warning)
-      tokens["syntax-constant"] = content(colors.accent, accent)
+      tokens["syntax-constant"] = content(colors.info, info)
       tokens["syntax-punctuation"] = isDark ? "var(--text-weak)" : "var(--text-base)"
       tokens["syntax-object"] = "var(--text-strong)"
-      tokens["syntax-success"] = success[10]
-      tokens["syntax-warning"] = amber[10]
-      tokens["syntax-critical"] = error[10]
+      tokens["syntax-success"] = success[9]
+      tokens["syntax-warning"] = amber[9]
+      tokens["syntax-critical"] = error[9]
       tokens["syntax-info"] = content(colors.info, info)
       tokens["syntax-diff-add"] = diffAdd[10]
       tokens["syntax-diff-delete"] = diffDelete[10]
@@ -585,9 +543,9 @@ export function resolveThemeVariant(variant: ThemeVariant, isDark: boolean): Res
     tokens["syntax-constant"] = isDark ? "#93e9f6" : "#007b80"
     tokens["syntax-punctuation"] = isDark ? "var(--text-weak)" : "var(--text-base)"
     tokens["syntax-object"] = "var(--text-strong)"
-    tokens["syntax-success"] = success[10]
-    tokens["syntax-warning"] = amber[10]
-    tokens["syntax-critical"] = error[10]
+    tokens["syntax-success"] = success[9]
+    tokens["syntax-warning"] = amber[9]
+    tokens["syntax-critical"] = error[9]
     tokens["syntax-info"] = isDark ? "#93e9f6" : "#0092a8"
     tokens["syntax-diff-add"] = diffAdd[10]
     tokens["syntax-diff-delete"] = diffDelete[10]
@@ -719,10 +677,17 @@ function generateNeutralOverlayScale(neutralScale: HexColor[], isDark: boolean):
 
 function generateNeutralAlphaScale(neutralScale: HexColor[], isDark: boolean): HexColor[] {
   const alphas = isDark
-    ? [0.05, 0.085, 0.13, 0.18, 0.24, 0.31, 0.4, 0.52, 0.64, 0.76, 0.88, 0.98]
-    : [0.03, 0.06, 0.1, 0.145, 0.2, 0.265, 0.35, 0.47, 0.61, 0.74, 0.86, 0.97]
+    ? [0.024, 0.048, 0.088, 0.128, 0.17, 0.215, 0.275, 0.38, 0.46, 0.54, 0.74, 0.95]
+    : [0.014, 0.034, 0.066, 0.098, 0.128, 0.158, 0.208, 0.282, 0.47, 0.625, 0.515, 0.88]
 
-  return alphas.map((alpha) => blend(neutralScale[11], neutralScale[0], alpha))
+  return neutralScale.map((hex, i) => {
+    const baseOklch = hexToOklch(hex)
+    const targetL = isDark ? 0.1 + alphas[i] * 0.8 : 1 - alphas[i] * 0.8
+    return oklchToHex({
+      ...baseOklch,
+      l: baseOklch.l * alphas[i] + targetL * (1 - alphas[i]),
+    })
+  })
 }
 
 function getHex(value: ColorValue | undefined): HexColor | undefined {

packages/ui/src/theme/themes/aura.json

@@ -16,13 +16,7 @@
       "diffDelete": "#f5b3b3"
     },
     "overrides": {
-      "syntax-comment": "#8d88a3",
-      "syntax-keyword": "#7b5ae0",
-      "syntax-string": "#2b8a57",
-      "syntax-primitive": "#2f78b8",
-      "syntax-property": "#a96a22",
-      "syntax-type": "#2b8a57",
-      "syntax-constant": "#d94f4f"
+      "syntax-keyword": "#7b5ae0"
     }
   },
   "dark": {
@@ -39,13 +33,7 @@
       "diffDelete": "#ff6767"
     },
     "overrides": {
-      "syntax-comment": "#6d6a7e",
-      "syntax-keyword": "#a277ff",
-      "syntax-string": "#61ffca",
-      "syntax-primitive": "#82e2ff",
-      "syntax-property": "#ffca85",
-      "syntax-type": "#61ffca",
-      "syntax-constant": "#ff6767"
+      "syntax-keyword": "#a277ff"
     }
   }
 }

packages/ui/src/theme/themes/ayu.json

@@ -16,13 +16,7 @@
       "diffDelete": "#e6656a"
     },
     "overrides": {
-      "syntax-comment": "#6e7681",
-      "syntax-keyword": "#c76a1a",
-      "syntax-string": "#6f8f00",
-      "syntax-primitive": "#b87500",
-      "syntax-property": "#2f86b7",
-      "syntax-type": "#227fc0",
-      "syntax-constant": "#a37acc"
+      "syntax-keyword": "#ea9f41"
     }
   },
   "dark": {
@@ -39,13 +33,7 @@
       "diffDelete": "#f58572"
     },
     "overrides": {
-      "syntax-comment": "#5a6673",
-      "syntax-keyword": "#ff8f40",
-      "syntax-string": "#aad94c",
-      "syntax-primitive": "#ffb454",
-      "syntax-property": "#39bae6",
-      "syntax-type": "#59c2ff",
-      "syntax-constant": "#d2a6ff"
+      "syntax-keyword": "#ffad66"
     }
   }
 }

packages/ui/src/theme/themes/carbonfox.json

@@ -17,13 +17,7 @@
       "diffDelete": "#da1e28"
     },
     "overrides": {
-      "syntax-comment": "#6f6f6f",
-      "syntax-keyword": "#8a3ffc",
-      "syntax-string": "#198038",
-      "syntax-primitive": "#0f62fe",
-      "syntax-property": "#0043ce",
-      "syntax-type": "#8a5f00",
-      "syntax-constant": "#da1e28"
+      "syntax-keyword": "#8a3ffc"
     }
   },
   "dark": {
@@ -41,13 +35,7 @@
       "diffDelete": "#ff8389"
     },
     "overrides": {
-      "syntax-comment": "#6f6f6f",
-      "syntax-keyword": "#be95ff",
-      "syntax-string": "#42be65",
-      "syntax-primitive": "#33b1ff",
-      "syntax-property": "#78a9ff",
-      "syntax-type": "#f1c21b",
-      "syntax-constant": "#ff8389"
+      "syntax-keyword": "#be95ff"
     }
   }
 }

packages/ui/src/theme/themes/catppuccin.json

@@ -16,10 +16,8 @@
       "diffDelete": "#e78284"
     },
     "overrides": {
-      "syntax-comment": "#6c7086",
       "syntax-keyword": "#8839ef",
-      "syntax-primitive": "#1e66f5",
-      "syntax-constant": "#ca6702"
+      "syntax-primitive": "#fe640b"
     }
   },
   "dark": {
@@ -36,10 +34,8 @@
       "diffDelete": "#f38ba8"
     },
     "overrides": {
-      "syntax-comment": "#6c7086",
       "syntax-keyword": "#cba6f7",
-      "syntax-primitive": "#89b4fa",
-      "syntax-constant": "#fab387"
+      "syntax-primitive": "#fab387"
     }
   }
 }

packages/ui/src/theme/themes/dracula.json

@@ -16,12 +16,9 @@
       "diffDelete": "#f8a1b8"
     },
     "overrides": {
-      "syntax-comment": "#7d7f97",
       "syntax-keyword": "#d16090",
       "syntax-string": "#596600",
-      "syntax-primitive": "#2f8f57",
-      "syntax-property": "#1d7fc5",
-      "syntax-constant": "#7c6bf5"
+      "syntax-primitive": "#7c6bf5"
     }
   },
   "dark": {
@@ -38,12 +35,9 @@
       "diffDelete": "#ff6b81"
     },
     "overrides": {
-      "syntax-comment": "#6272a4",
       "syntax-keyword": "#ff79c6",
       "syntax-string": "#f1fa8c",
-      "syntax-primitive": "#50fa7b",
-      "syntax-property": "#8be9fd",
-      "syntax-constant": "#bd93f9"
+      "syntax-primitive": "#bd93f9"
     }
   }
 }

packages/ui/src/theme/themes/gruvbox.json

@@ -16,10 +16,8 @@
       "diffDelete": "#9d0006"
     },
     "overrides": {
-      "syntax-comment": "#928374",
       "syntax-keyword": "#9d0006",
-      "syntax-primitive": "#076678",
-      "syntax-constant": "#8f3f71"
+      "syntax-primitive": "#8f3f71"
     }
   },
   "dark": {
@@ -36,10 +34,8 @@
       "diffDelete": "#fb4934"
     },
     "overrides": {
-      "syntax-comment": "#928374",
       "syntax-keyword": "#fb4934",
-      "syntax-primitive": "#83a598",
-      "syntax-constant": "#d3869b"
+      "syntax-primitive": "#d3869b"
     }
   }
 }

packages/ui/src/theme/themes/monokai.json

@@ -16,12 +16,9 @@
       "diffDelete": "#f6a3ae"
     },
     "overrides": {
-      "syntax-comment": "#8a816f",
       "syntax-keyword": "#d9487c",
       "syntax-string": "#8a6500",
-      "syntax-primitive": "#3c8d2f",
-      "syntax-property": "#1f88c8",
-      "syntax-constant": "#9b5fe0"
+      "syntax-primitive": "#bf7bff"
     }
   },
   "dark": {
@@ -38,12 +35,9 @@
       "diffDelete": "#f4477c"
     },
     "overrides": {
-      "syntax-comment": "#75715e",
       "syntax-keyword": "#f92672",
       "syntax-string": "#e6db74",
-      "syntax-primitive": "#a6e22e",
-      "syntax-property": "#66d9ef",
-      "syntax-constant": "#ae81ff"
+      "syntax-primitive": "#ae81ff"
     }
   }
 }

packages/ui/src/theme/themes/nightowl.json

@@ -16,10 +16,7 @@
       "diffDelete": "#de3d3b"
     },
     "overrides": {
-      "syntax-comment": "#7a8181",
-      "syntax-keyword": "#994cc3",
-      "syntax-primitive": "#4876d6",
-      "syntax-constant": "#c96765"
+      "syntax-keyword": "#994cc3"
     }
   },
   "dark": {
@@ -39,8 +36,7 @@
       "syntax-comment": "#637777",
       "syntax-keyword": "#c792ea",
       "syntax-string": "#ecc48d",
-      "syntax-primitive": "#82aaff",
-      "syntax-constant": "#f78c6c"
+      "syntax-primitive": "#f78c6c"
     }
   }
 }

packages/ui/src/theme/themes/nord.json

@@ -16,11 +16,9 @@
       "diffDelete": "#bf616a"
     },
     "overrides": {
-      "syntax-comment": "#6b7282",
       "syntax-keyword": "#5e81ac",
-      "syntax-string": "#6f8758",
-      "syntax-primitive": "#5e81ac",
-      "syntax-constant": "#8d6886"
+      "syntax-string": "#a3be8c",
+      "syntax-primitive": "#b48ead"
     }
   },
   "dark": {
@@ -37,10 +35,8 @@
       "diffDelete": "#bf616a"
     },
     "overrides": {
-      "syntax-comment": "#616e88",
       "syntax-keyword": "#81a1c1",
-      "syntax-primitive": "#88c0d0",
-      "syntax-constant": "#b48ead"
+      "syntax-primitive": "#b48ead"
     }
   }
 }

packages/ui/src/theme/themes/oc-2.json

@@ -13,18 +13,6 @@
       "interactive": "#034cff",
       "diffAdd": "#9ff29a",
       "diffDelete": "#fc533a"
-    },
-    "overrides": {
-      "syntax-comment": "#7a7a7a",
-      "syntax-keyword": "#a753ae",
-      "syntax-string": "#0c8e12",
-      "syntax-primitive": "#034cff",
-      "syntax-property": "#a753ae",
-      "syntax-type": "#8a6f00",
-      "syntax-constant": "#007b80",
-      "syntax-critical": "#ff8c00",
-      "syntax-diff-delete": "#ff8c00",
-      "syntax-diff-unknown": "#a753ae"
     }
   },
   "dark": {
@@ -38,18 +26,6 @@
       "interactive": "#034cff",
       "diffAdd": "#c8ffc4",
       "diffDelete": "#fc533a"
-    },
-    "overrides": {
-      "syntax-comment": "#8f8f8f",
-      "syntax-keyword": "#edb2f1",
-      "syntax-string": "#12c905",
-      "syntax-primitive": "#8cb0ff",
-      "syntax-property": "#fab283",
-      "syntax-type": "#fcd53a",
-      "syntax-constant": "#93e9f6",
-      "syntax-critical": "#fab283",
-      "syntax-diff-delete": "#fab283",
-      "syntax-diff-unknown": "#edb2f1"
     }
   }
 }

packages/ui/src/theme/themes/onedarkpro.json

@@ -16,10 +16,8 @@
       "diffDelete": "#f7c1c5"
     },
     "overrides": {
-      "syntax-comment": "#6a717d",
       "syntax-keyword": "#a626a4",
-      "syntax-primitive": "#4078f2",
-      "syntax-constant": "#986801"
+      "syntax-primitive": "#986801"
     }
   },
   "dark": {
@@ -36,10 +34,8 @@
       "diffDelete": "#b2555f"
     },
     "overrides": {
-      "syntax-comment": "#5c6370",
       "syntax-keyword": "#c678dd",
-      "syntax-primitive": "#61afef",
-      "syntax-constant": "#d19a66"
+      "syntax-primitive": "#d19a66"
     }
   }
 }

packages/ui/src/theme/themes/shadesofpurple.json

@@ -16,13 +16,7 @@
       "diffDelete": "#ffc3ef"
     },
     "overrides": {
-      "syntax-comment": "#8e4be3",
-      "syntax-keyword": "#c45f00",
-      "syntax-string": "#2f8b32",
-      "syntax-primitive": "#a13bd6",
-      "syntax-property": "#008fb8",
-      "syntax-type": "#9d7a00",
-      "syntax-constant": "#e04d7a"
+      "syntax-keyword": "#ff6bd5"
     }
   },
   "dark": {
@@ -39,13 +33,7 @@
       "diffDelete": "#d85aa0"
     },
     "overrides": {
-      "syntax-comment": "#b362ff",
-      "syntax-keyword": "#ff9d00",
-      "syntax-string": "#a5ff90",
-      "syntax-primitive": "#fb94ff",
-      "syntax-property": "#9effff",
-      "syntax-type": "#fad000",
-      "syntax-constant": "#ff628c"
+      "syntax-keyword": "#ff7ac6"
     }
   }
 }

packages/ui/src/theme/themes/solarized.json

@@ -16,12 +16,8 @@
       "diffDelete": "#f2a1a1"
     },
     "overrides": {
-      "syntax-comment": "#657b83",
-      "syntax-keyword": "#728600",
-      "syntax-string": "#1f8f88",
-      "syntax-primitive": "#268bd2",
-      "syntax-property": "#268bd2",
-      "syntax-constant": "#d33682"
+      "syntax-keyword": "#859900",
+      "syntax-string": "#2aa198"
     }
   },
   "dark": {
@@ -38,12 +34,8 @@
       "diffDelete": "#c34b4b"
     },
     "overrides": {
-      "syntax-comment": "#586e75",
       "syntax-keyword": "#859900",
-      "syntax-string": "#2aa198",
-      "syntax-primitive": "#268bd2",
-      "syntax-property": "#268bd2",
-      "syntax-constant": "#d33682"
+      "syntax-string": "#2aa198"
     }
   }
 }

packages/ui/src/theme/themes/tokyonight.json

@@ -16,11 +16,7 @@
       "diffDelete": "#d05f7c"
     },
     "overrides": {
-      "syntax-comment": "#6b6f7a",
-      "syntax-keyword": "#9854f1",
-      "syntax-primitive": "#1f6fd4",
-      "syntax-property": "#007197",
-      "syntax-constant": "#b15c00"
+      "syntax-keyword": "#9854f1"
     }
   },
   "dark": {
@@ -37,11 +33,7 @@
       "diffDelete": "#c34043"
     },
     "overrides": {
-      "syntax-comment": "#565f89",
-      "syntax-keyword": "#bb9af7",
-      "syntax-primitive": "#7aa2f7",
-      "syntax-property": "#7dcfff",
-      "syntax-constant": "#ff9e64"
+      "syntax-keyword": "#bb9af7"
     }
   }
 }

packages/ui/src/theme/themes/vesper.json

@@ -16,13 +16,7 @@
       "diffDelete": "#FF8080"
     },
     "overrides": {
-      "syntax-comment": "#7a7a7a",
-      "syntax-keyword": "#6e6e6e",
-      "syntax-string": "#117e69",
-      "syntax-primitive": "#8d541c",
-      "syntax-property": "#101010",
-      "syntax-type": "#8d541c",
-      "syntax-constant": "#8d541c"
+      "syntax-keyword": "#b30000"
     }
   },
   "dark": {
@@ -39,13 +33,8 @@
       "diffDelete": "#FF8080"
     },
     "overrides": {
-      "syntax-comment": "#8b8b8b",
-      "syntax-keyword": "#a0a0a0",
-      "syntax-string": "#99ffe4",
-      "syntax-primitive": "#ffc799",
-      "syntax-property": "#ffffff",
-      "syntax-type": "#ffc799",
-      "syntax-constant": "#ffc799"
+      "syntax-keyword": "#ff8080",
+      "syntax-primitive": "#ffc799"
     }
   }
 }

packages/web/src/content/docs/ar/ecosystem.mdx

@@ -32,7 +32,7 @@ description: مشاريع وتكاملات مبنية باستخدام OpenCode.
 | [opencode-shell-strategy](https://github.com/JRedeker/opencode-shell-strategy)                     | تعليمات لأوامر shell غير التفاعلية - تمنع التعليق الناتج عن العمليات المعتمدة على TTY                          |
 | [opencode-wakatime](https://github.com/angristan/opencode-wakatime)                                | تتبع استخدام OpenCode باستخدام Wakatime                                                                        |
 | [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main)    | تنظيف جداول markdown التي تنتجها LLMs                                                                          |
-| [opencode-morph-plugin](https://github.com/morphllm/opencode-morph-plugin)                         | تحرير Fast Apply وبحث WarpGrep في قاعدة الكود وضغط السياق عبر Morph                                            |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply)                 | تحرير الكود أسرع بـ 10 مرات باستخدام Morph Fast Apply API وعلامات التحرير الكسولة                              |
 | [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode)                                   | وكلاء الخلفية، وأدوات LSP/AST/MCP المعدة مسبقًا، ووكلاء مختارون، متوافق مع Claude Code                         |
 | [opencode-notificator](https://github.com/panta82/opencode-notificator)                            | إشعارات سطح المكتب وتنبيهات صوتية لجلسات OpenCode                                                              |
 | [opencode-notifier](https://github.com/mohak34/opencode-notifier)                                  | إشعارات سطح المكتب وتنبيهات صوتية لأحداث الإذن والاكتمال والخطأ                                                |

packages/web/src/content/docs/bs/ecosystem.mdx

@@ -32,7 +32,7 @@ Također možete pogledati [awesome-opencode](https://github.com/awesome-opencod
 | [opencode-shell-strategy](https://github.com/JRedeker/opencode-shell-strategy)                     | Upute za neinteraktivne naredbe ljuske - sprječava visi od TTY ovisnih operacija                              |
 | [opencode-wakatime](https://github.com/angristan/opencode-wakatime)                                | Pratite upotrebu OpenCode sa Wakatime                                                                         |
 | [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main)    | Očistite tabele umanjenja vrijednosti koje su izradili LLM                                                    |
-| [opencode-morph-plugin](https://github.com/morphllm/opencode-morph-plugin)                         | Fast Apply uređivanje, WarpGrep pretraga koda i kompresija konteksta putem Morph-a                            |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply)                 | 10x brže uređivanje koda s Morph Fast Apply API-jem i markerima za lijeno uređivanje                          |
 | [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode)                                   | Pozadinski agenti, unapred izgrađeni LSP/AST/MCP alati, kurirani agenti, kompatibilni sa Claude Code          |
 | [opencode-notificator](https://github.com/panta82/opencode-notificator)                            | Obavještenja na radnoj površini i zvučna upozorenja za OpenCode sesije                                        |
 | [opencode-notifier](https://github.com/mohak34/opencode-notifier)                                  | Obavještenja na radnoj površini i zvučna upozorenja za dozvole, završetak i događaje greške                   |

packages/web/src/content/docs/da/ecosystem.mdx

@@ -32,7 +32,7 @@ Du kan også tjekke [awesome-opencode](https://github.com/awesome-opencode/aweso
 | [opencode-shell-strategy](https://github.com/JRedeker/opencode-shell-strategy)                     | Instruktioner til ikke-interaktive shell-kommandoer - forhindrer hænger fra TTY-afhængige operationer             |
 | [opencode-wakatime](https://github.com/angristan/opencode-wakatime)                                | Spor OpenCode brug med Wakatime                                                                                   |
 | [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main)    | Ryd op afmærkningstabeller produceret af LLMs                                                                     |
-| [opencode-morph-plugin](https://github.com/morphllm/opencode-morph-plugin)                         | Fast Apply-redigering, WarpGrep-kodesøgning og kontekstkomprimering via Morph                                     |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply)                 | 10x hurtigere koderedigering med Morph Fast Apply API og dovne redigeringsmarkører                                |
 | [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode)                                   | Baggrundsagenter, præbyggede LSP/AST/MCP værktøjer, kuraterede agenter, Claude Kodekompatibel                     |
 | [opencode-notificator](https://github.com/panta82/opencode-notificator)                            | Skrivebordsmeddelelser og lydadvarsler for OpenCode-sessioner                                                     |
 | [opencode-notifier](https://github.com/mohak34/opencode-notifier)                                  | Skrivebordsmeddelelser og lydadvarsler for tilladelser, fuldførelse og fejlhændelser                              |

packages/web/src/content/docs/de/ecosystem.mdx

@@ -32,7 +32,7 @@ Sie können sich auch [awesome-opencode](https://github.com/awesome-opencode/awe
 | [opencode-shell-strategy](https://github.com/JRedeker/opencode-shell-strategy)                     | Anweisungen für nicht interaktive Shell-Befehle – verhindert Abstürze bei TTY-abhängigen Vorgängen                            |
 | [opencode-wakatime](https://github.com/angristan/opencode-wakatime)                                | Verfolgen Sie die Nutzung von OpenCode mit Wakatime                                                                           |
 | [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main)    | Von LLMs erstellte Abschriftentabellen bereinigen                                                                             |
-| [opencode-morph-plugin](https://github.com/morphllm/opencode-morph-plugin)                         | Fast Apply-Bearbeitung, WarpGrep-Codesuche und Kontextkomprimierung über Morph                                                |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply)                 | 10x schnellere Codebearbeitung mit Morph Fast Apply API und Lazy-Edit-Markern                                                 |
 | [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode)                                   | Hintergrundagenten, vorgefertigte LSP/AST/MCP-Tools, kuratierte Agenten, Claude Code-kompatibel                               |
 | [opencode-notificator](https://github.com/panta82/opencode-notificator)                            | Desktop-Benachrichtigungen und akustische Warnungen für OpenCode-Sitzungen                                                    |
 | [opencode-notifier](https://github.com/mohak34/opencode-notifier)                                  | Desktop-Benachrichtigungen und akustische Warnungen für Berechtigungs-, Abschluss- und Fehlerereignisse                       |

packages/web/src/content/docs/ecosystem.mdx

@@ -32,7 +32,7 @@ You can also check out [awesome-opencode](https://github.com/awesome-opencode/aw
 | [opencode-shell-strategy](https://github.com/JRedeker/opencode-shell-strategy)                     | Instructions for non-interactive shell commands - prevents hangs from TTY-dependent operations    |
 | [opencode-wakatime](https://github.com/angristan/opencode-wakatime)                                | Track OpenCode usage with Wakatime                                                                |
 | [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main)    | Clean up markdown tables produced by LLMs                                                         |
-| [opencode-morph-plugin](https://github.com/morphllm/opencode-morph-plugin)                         | Fast Apply editing, WarpGrep codebase search, and context compaction via Morph                    |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply)                 | 10x faster code editing with Morph Fast Apply API and lazy edit markers                           |
 | [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode)                                   | Background agents, pre-built LSP/AST/MCP tools, curated agents, Claude Code compatible            |
 | [opencode-notificator](https://github.com/panta82/opencode-notificator)                            | Desktop notifications and sound alerts for OpenCode sessions                                      |
 | [opencode-notifier](https://github.com/mohak34/opencode-notifier)                                  | Desktop notifications and sound alerts for permission, completion, and error events               |

packages/web/src/content/docs/es/ecosystem.mdx

@@ -32,7 +32,7 @@ También puedes consultar [awesome-opencode](https://github.com/awesome-opencode
 | [opencode-shell-strategy](https://github.com/JRedeker/opencode-shell-strategy)                     | Instrucciones para comandos de shell no interactivos: evita bloqueos de operaciones dependientes de TTY                     |
 | [opencode-wakatime](https://github.com/angristan/opencode-wakatime)                                | Seguimiento del uso de OpenCode con Wakatime                                                                                |
 | [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main)    | Limpiar tablas de Markdown producidas por LLMs                                                                              |
-| [opencode-morph-plugin](https://github.com/morphllm/opencode-morph-plugin)                         | Edición Fast Apply, búsqueda de código con WarpGrep y compactación de contexto a través de Morph                            |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply)                 | Edición de código 10 veces más rápida con Morph Fast Apply API y marcadores de edición diferidos                            |
 | [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode)                                   | Agentes en segundo plano, herramientas LSP/AST/MCP prediseñadas, agentes seleccionados, compatible con Claude Code          |
 | [opencode-notificator](https://github.com/panta82/opencode-notificator)                            | Notificaciones de escritorio y alertas sonoras para sesiones OpenCode                                                       |
 | [opencode-notifier](https://github.com/mohak34/opencode-notifier)                                  | Notificaciones de escritorio y alertas sonoras para eventos de permiso, finalización y error                                |

packages/web/src/content/docs/fr/ecosystem.mdx

@@ -32,7 +32,7 @@ Vous pouvez également consulter [awesome-opencode](https://github.com/awesome-o
 | [opencode-shell-strategy](https://github.com/JRedeker/opencode-shell-strategy)                     | Instructions pour les commandes shell non interactives - empêche les blocages dus aux opérations dépendantes du TTY                    |
 | [opencode-wakatime](https://github.com/angristan/opencode-wakatime)                                | Suit l'utilisation d'OpenCode avec Wakatime                                                                                            |
 | [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main)    | Nettoie les tableaux Markdown produits par les LLM                                                                                     |
-| [opencode-morph-plugin](https://github.com/morphllm/opencode-morph-plugin)                         | Édition Fast Apply, recherche de code WarpGrep et compaction de contexte via Morph                                                     |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply)                 | Édition de code 10x plus rapide avec l'API Morph Fast Apply et des marqueurs d'édition différée                                        |
 | [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode)                                   | Agents d'arrière-plan, outils LSP/AST/MCP pré-construits, agents sélectionnés, compatible Claude Code                                  |
 | [opencode-notificator](https://github.com/panta82/opencode-notificator)                            | Notifications de bureau et alertes sonores pour les sessions OpenCode                                                                  |
 | [opencode-notifier](https://github.com/mohak34/opencode-notifier)                                  | Notifications de bureau et alertes sonores pour les événements de permission, d'achèvement et d'erreur                                 |

packages/web/src/content/docs/it/ecosystem.mdx

@@ -32,7 +32,7 @@ Puoi anche dare un'occhiata a [awesome-opencode](https://github.com/awesome-open
 | [opencode-shell-strategy](https://github.com/JRedeker/opencode-shell-strategy)                     | Istruzioni per comandi shell non interattivi: evita blocchi dovuti a operazioni dipendenti da TTY |
 | [opencode-wakatime](https://github.com/angristan/opencode-wakatime)                                | Traccia l'uso di OpenCode con Wakatime                                                            |
 | [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main)    | Ripulisce le tabelle markdown prodotte dai LLM                                                    |
-| [opencode-morph-plugin](https://github.com/morphllm/opencode-morph-plugin)                         | Editing Fast Apply, ricerca codebase WarpGrep e compattazione del contesto tramite Morph          |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply)                 | Editing del codice 10x più veloce con Morph Fast Apply API e marker lazy edit                     |
 | [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode)                                   | Agenti in background, tool LSP/AST/MCP predefiniti, agenti curati, compatibile con Claude Code    |
 | [opencode-notificator](https://github.com/panta82/opencode-notificator)                            | Notifiche desktop e avvisi sonori per le sessioni OpenCode                                        |
 | [opencode-notifier](https://github.com/mohak34/opencode-notifier)                                  | Notifiche desktop e avvisi sonori per eventi di permesso, completamento ed errore                 |

packages/web/src/content/docs/ja/ecosystem.mdx

@@ -32,7 +32,7 @@ OpenCode 関連プロジェクトをこのリストに追加したいですか?
 | [opencode-shell-strategy](https://github.com/JRedeker/opencode-shell-strategy)                     | 非対話型シェルコマンドの手順 - TTY に依存する操作によるハングの防止                                                  |
 | [opencode-wakatime](https://github.com/angristan/opencode-wakatime)                                | wakatime で OpenCode の使用状況を追跡する                                                                            |
 | [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main)    | LLM によって生成された Markdown テーブルをクリーンアップする                                                         |
-| [opencode-morph-plugin](https://github.com/morphllm/opencode-morph-plugin)                         | Morph による Fast Apply 編集、WarpGrep コードベース検索、コンテキスト圧縮                                            |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply)                 | Morph Fast apply API と遅延編集マーカーにより 10 倍高速なコード編集                                                  |
 | [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode)                                   | バックグラウンドエージェント、事前構築された LSP/AST/MCP ツール、厳選されたエージェント、Claude Code 互換            |
 | [opencode-notificator](https://github.com/panta82/opencode-notificator)                            | OpenCode セッションのデスクトップ通知とサウンドアラート                                                              |
 | [opencode-notifier](https://github.com/mohak34/opencode-notifier)                                  | 許可、完了、エラーイベントのデスクトップ通知とサウンドアラート                                                       |

packages/web/src/content/docs/ko/ecosystem.mdx

@@ -32,7 +32,7 @@ OpenCode를 기반으로 만들어진 커뮤니티 프로젝트 모음입니다.
 | [opencode-shell-strategy](https://github.com/JRedeker/opencode-shell-strategy)                     | 비대화형 shell 명령 실행 지침을 제공해 TTY 의존 작업으로 인한 멈춤을 방지합니다.                |
 | [opencode-wakatime](https://github.com/angristan/opencode-wakatime)                                | Wakatime으로 OpenCode 사용량을 추적합니다.                                                      |
 | [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main)    | LLM이 생성한 markdown 표를 정리합니다.                                                          |
-| [opencode-morph-plugin](https://github.com/morphllm/opencode-morph-plugin)                         | Morph를 통한 Fast Apply 편집, WarpGrep 코드베이스 검색 및 컨텍스트 압축                         |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply)                 | Morph Fast Apply API와 lazy edit marker를 활용해 코드 편집 속도를 크게 높입니다.                |
 | [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode)                                   | background agent, 사전 구성된 LSP/AST/MCP tool, curated agent, Claude Code 호환성을 제공합니다. |
 | [opencode-notificator](https://github.com/panta82/opencode-notificator)                            | OpenCode 세션에 데스크톱 알림과 사운드 알림을 제공합니다.                                       |
 | [opencode-notifier](https://github.com/mohak34/opencode-notifier)                                  | permission, 완료, 오류 이벤트에 대한 데스크톱 알림과 사운드 알림을 제공합니다.                  |

packages/web/src/content/docs/nb/ecosystem.mdx

@@ -32,7 +32,7 @@ Du kan også sjekke ut [awesome-opencode](https://github.com/awesome-opencode/aw
 | [opencode-shell-strategy](https://github.com/JRedeker/opencode-shell-strategy)                     | Instruksjoner for ikke-interaktive skallkommandoer - forhindrer heng ved TTY-avhengige operasjoner            |
 | [opencode-wakatime](https://github.com/angristan/opencode-wakatime)                                | Spor OpenCode-bruk med Wakatime                                                                               |
 | [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main)    | Rydd opp i markdown-tabeller produsert av LLMs                                                                |
-| [opencode-morph-plugin](https://github.com/morphllm/opencode-morph-plugin)                         | Fast Apply-redigering, WarpGrep-kodesøk og kontekstkomprimering via Morph                                     |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply)                 | 10 ganger raskere koderedigering med Morph Fast Apply API og lazy-redigeringsmarkører                         |
 | [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode)                                   | Bakgrunnsagenter, forhåndsbygde LSP/AST/MCP verktøy, kurerte agenter, Claude Code-kompatibel                  |
 | [opencode-notificator](https://github.com/panta82/opencode-notificator)                            | Skrivebordsvarsler og lydvarsler for OpenCode-økter                                                           |
 | [opencode-notifier](https://github.com/mohak34/opencode-notifier)                                  | Skrivebordsvarsler og lydvarsler for tillatelse, fullføring og feilhendelser                                  |

packages/web/src/content/docs/pl/ecosystem.mdx

@@ -32,7 +32,7 @@ Możesz również sprawdzić [awesome-opencode](https://github.com/awesome-openc
 | [opencode-shell-strategy](https://github.com/JRedeker/opencode-shell-strategy)                     | Instrukcje dla nieinteraktywnych poleceń powłoki - zapobiega zawieszeniom operacji zależnych od TTY                   |
 | [opencode-wakatime](https://github.com/angristan/opencode-wakatime)                                | Śledź użycie OpenCode za pomocą Wakatime                                                                              |
 | [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main)    | Oczyść tabele markdown generowane przez LLM                                                                           |
-| [opencode-morph-plugin](https://github.com/morphllm/opencode-morph-plugin)                         | Edycja Fast Apply, wyszukiwanie kodu WarpGrep i kompaktowanie kontekstu przez Morph                                   |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply)                 | 10x szybsza edycja kodu dzięki API Morph Fast Apply i leniwym znacznikom edycji                                       |
 | [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode)                                   | Agenci w tle, wbudowane narzędzia LSP/AST/MCP, wyselekcjonowani agenci, kompatybilność z Claude Code                  |
 | [opencode-notificator](https://github.com/panta82/opencode-notificator)                            | Powiadomienia na pulpicie i alerty dźwiękowe dla sesji OpenCode                                                       |
 | [opencode-notifier](https://github.com/mohak34/opencode-notifier)                                  | Powiadomienia na pulpicie i alerty dźwiękowe dla uprawnień, zakończeń zadań i błędów                                  |

packages/web/src/content/docs/pt-br/ecosystem.mdx

@@ -32,7 +32,7 @@ Você também pode conferir [awesome-opencode](https://github.com/awesome-openco
 | [opencode-shell-strategy](https://github.com/JRedeker/opencode-shell-strategy)                     | Instruções para comandos de shell não interativos - evita travamentos de operações dependentes de TTY                          |
 | [opencode-wakatime](https://github.com/angristan/opencode-wakatime)                                | Acompanhe o uso do OpenCode com Wakatime                                                                                       |
 | [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main)    | Limpe tabelas markdown produzidas por LLMs                                                                                     |
-| [opencode-morph-plugin](https://github.com/morphllm/opencode-morph-plugin)                         | Edição Fast Apply, busca de código WarpGrep e compactação de contexto via Morph                                                |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply)                 | Edição de código 10x mais rápida com a API Morph Fast Apply e marcadores de edição preguiçosos                                 |
 | [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode)                                   | Agentes em segundo plano, ferramentas LSP/AST/MCP pré-construídas, agentes curados, compatível com Claude Code                 |
 | [opencode-notificator](https://github.com/panta82/opencode-notificator)                            | Notificações de desktop e alertas sonoros para sessões do OpenCode                                                             |
 | [opencode-notifier](https://github.com/mohak34/opencode-notifier)                                  | Notificações de desktop e alertas sonoros para eventos de permissão, conclusão e erro                                          |

packages/web/src/content/docs/ru/ecosystem.mdx

@@ -32,7 +32,7 @@ description: Проекты и интеграции, созданные с по
 | [opencode-shell-strategy](https://github.com/JRedeker/opencode-shell-strategy)                     | Инструкции для неинтерактивных shell-команд — предотвращают зависания из-за операций, зависящих от TTY                                           |
 | [opencode-wakatime](https://github.com/angristan/opencode-wakatime)                                | Отслеживайте использование OpenCode с помощью Wakatime                                                                                           |
 | [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main)    | Очистка таблиц Markdown, созданных LLM                                                                                                           |
-| [opencode-morph-plugin](https://github.com/morphllm/opencode-morph-plugin)                         | Редактирование Fast Apply, поиск по кодовой базе WarpGrep и сжатие контекста через Morph                                                         |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply)                 | Редактирование кода в 10 раз быстрее с помощью API Morph Fast Apply и маркеров отложенного редактирования                                        |
 | [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode)                                   | Фоновые агенты, встроенные инструменты LSP/AST/MCP, курируемые агенты, совместимость с Claude Code                                               |
 | [opencode-notificator](https://github.com/panta82/opencode-notificator)                            | Уведомления на рабочем столе и звуковые оповещения для сеансов OpenCode                                                                          |
 | [opencode-notifier](https://github.com/mohak34/opencode-notifier)                                  | Уведомления на рабочем столе и звуковые оповещения о разрешениях, завершении и событиях ошибок                                                   |

packages/web/src/content/docs/th/ecosystem.mdx

@@ -32,7 +32,7 @@ description: โปรเจ็กต์และการผสานรวม
 | [opencode-shell-strategy](https://github.com/JRedeker/opencode-shell-strategy)                     | คำแนะนำสำหรับคำสั่ง shell แบบไม่โต้ตอบ - ป้องกันการแฮงค์จากการดำเนินการที่ขึ้นอยู่กับ TTY                             |
 | [opencode-wakatime](https://github.com/angristan/opencode-wakatime)                                | ติดตามการใช้งาน OpenCode ด้วย Wakatime                                                                                |
 | [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main)    | ทำความสะอาดตาราง Markdown ที่ผลิตโดย LLM                                                                              |
-| [opencode-morph-plugin](https://github.com/morphllm/opencode-morph-plugin)                         | การแก้ไข Fast Apply, การค้นหาโค้ดเบส WarpGrep และการบีบอัดบริบทผ่าน Morph                                             |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply)                 | การแก้ไขโค้ดเร็วขึ้น 10 เท่าด้วย Morph Fast Apply API และเครื่องหมายแก้ไขแบบ Lazy                                     |
 | [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode)                                   | ตัวแทนเบื้องหลัง, เครื่องมือ LSP/AST/MCP ที่สร้างไว้ล่วงหน้า, ตัวแทนที่ได้รับการดูแลจัดการ, เข้ากันได้กับ Claude Code |
 | [opencode-notificator](https://github.com/panta82/opencode-notificator)                            | การแจ้งเตือนบนเดสก์ท็อปและเสียงเตือนสำหรับเซสชัน OpenCode                                                             |
 | [opencode-notifier](https://github.com/mohak34/opencode-notifier)                                  | การแจ้งเตือนบนเดสก์ท็อปและเสียงเตือนสำหรับการอนุญาต การดำเนินการเสร็จสิ้น และเหตุการณ์ข้อผิดพลาด                      |

packages/web/src/content/docs/tr/ecosystem.mdx

@@ -32,7 +32,7 @@ Ayrıca ekosistemi ve topluluğu bir araya getiren [awesome-opencode](https://gi
 | [opencode-shell-strategy](https://github.com/JRedeker/opencode-shell-strategy)                     | Etkileşimli olmayan kabuk komutları için talimatlar - TTY bağımlı işlemlerden kaynaklanan takılmaları önler                   |
 | [opencode-wakatime](https://github.com/angristan/opencode-wakatime)                                | Wakatime ile OpenCode kullanımını takip edin                                                                                  |
 | [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main)    | LLM'ler tarafından üretilen markdown tablolarını temizleyin                                                                   |
-| [opencode-morph-plugin](https://github.com/morphllm/opencode-morph-plugin)                         | Fast Apply düzenleme, WarpGrep kod tabanı araması ve Morph ile bağlam sıkıştırma                                              |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply)                 | Morph Fast Apply API ve tembel düzenleme işaretçileriyle 10 kat daha hızlı kod düzenleme                                      |
 | [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode)                                   | Arka plan aracıları, hazır LSP/AST/MCP araçları, seçilmiş aracılar, Claude Code uyumlu                                        |
 | [opencode-notificator](https://github.com/panta82/opencode-notificator)                            | OpenCode oturumları için masaüstü bildirimleri ve sesli uyarılar                                                              |
 | [opencode-notifier](https://github.com/mohak34/opencode-notifier)                                  | İzin, tamamlanma ve hata olayları için masaüstü bildirimleri ve sesli uyarılar                                                |

packages/web/src/content/docs/zh-cn/ecosystem.mdx

@@ -32,7 +32,7 @@ description: 基于 OpenCode 构建的项目与集成。
 | [opencode-shell-strategy](https://github.com/JRedeker/opencode-shell-strategy)                     | 非交互式 shell 命令指令——防止依赖 TTY 的操作导致挂起                   |
 | [opencode-wakatime](https://github.com/angristan/opencode-wakatime)                                | 使用 Wakatime 追踪 OpenCode 的使用情况                                 |
 | [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main)    | 清理 LLM 生成的 Markdown 表格                                          |
-| [opencode-morph-plugin](https://github.com/morphllm/opencode-morph-plugin)                         | 通过 Morph 提供 Fast Apply 编辑、WarpGrep 代码搜索和上下文压缩         |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply)                 | 通过 Morph Fast Apply API 和惰性编辑标记实现 10 倍更快的代码编辑       |
 | [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode)                                   | 后台代理、预构建的 LSP/AST/MCP 工具、精选代理，兼容 Claude Code        |
 | [opencode-notificator](https://github.com/panta82/opencode-notificator)                            | OpenCode 会话的桌面通知和声音提醒                                      |
 | [opencode-notifier](https://github.com/mohak34/opencode-notifier)                                  | 针对权限请求、任务完成和错误事件的桌面通知与声音提醒                   |

packages/web/src/content/docs/zh-tw/ecosystem.mdx

@@ -32,7 +32,7 @@ description: 基於 OpenCode 建置的專案與整合。
 | [opencode-shell-strategy](https://github.com/JRedeker/opencode-shell-strategy)                     | 非互動式 shell 指令說明——防止依賴 TTY 的操作導致卡住                       |
 | [opencode-wakatime](https://github.com/angristan/opencode-wakatime)                                | 使用 Wakatime 追蹤 OpenCode 的使用情況                                     |
 | [opencode-md-table-formatter](https://github.com/franlol/opencode-md-table-formatter/tree/main)    | 清理 LLM 生成的 Markdown 表格                                              |
-| [opencode-morph-plugin](https://github.com/morphllm/opencode-morph-plugin)                         | 透過 Morph 提供 Fast Apply 編輯、WarpGrep 程式碼搜尋和上下文壓縮           |
+| [opencode-morph-fast-apply](https://github.com/JRedeker/opencode-morph-fast-apply)                 | 透過 Morph Fast Apply API 和惰性編輯標記實現 10 倍更快的程式碼編輯         |
 | [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode)                                   | 背景代理、預建置的 LSP/AST/MCP 工具、精選代理，相容 Claude Code            |
 | [opencode-notificator](https://github.com/panta82/opencode-notificator)                            | OpenCode 工作階段的桌面通知和聲音提醒                                      |
 | [opencode-notifier](https://github.com/mohak34/opencode-notifier)                                  | 針對權限請求、任務完成和錯誤事件的桌面通知與聲音提醒                       |