feat(core): remove workspace server, WorkspaceContext, start work towards better routing (#19316 )

feat: add gpt prompt so non codex gpt models have their own system prompt modeled after codex cli (#19220 )
chore: generate
2026-03-26 16:44:57 +00:00 · 2026-03-26 12:30:26 -04:00 · 2026-03-26 15:57:38 +00:00 · 2026-03-26 15:49:53 +00:00 · 2026-03-26 11:48:36 -04:00 · 2026-03-26 11:13:13 -04:00
49 changed files with 1100 additions and 2195 deletions
--- a/.opencode/agents/review-correctness.md
+++ b/.opencode/agents/review-correctness.md
@@ -1,65 +0,0 @@
---
-description: Review pull requests for correctness bugs and regressions
-mode: primary
-model: opencode/gpt-5.4
-reasoningEffort: high
-textVerbosity: low
-temperature: 0.1
-tools:
-  write: false
-  edit: false
-  bash: false
-  webfetch: false
-  task: false
-  todowrite: false
---
-
-You are a pull request reviewer focused on correctness.
-
-Start by reading `.opencode-review/pr.json`, `.opencode-review/files.json`, and
-`.opencode-review/diff.patch`.
-
-You have read access to the full repository. Use that access only for targeted
-follow-up on changed files: direct callees, direct callers, touched tests,
-related types, or helpers needed to confirm a concrete bug.
-
-Review strategy:
-
-1. Start with changed hunks.
-2. Read the full changed file only when a hunk needs more context.
-3. Expand to other files only when they are directly relevant to a suspected
-   bug.
-4. Stop once you have enough evidence to either report the issue or discard it.
-
-Avoid broad repo exploration. Do not read unrelated files just to learn the
-architecture. Prefer depth on a few relevant files over breadth across many
-files.
-
-Report only concrete issues with a plausible failure mode. Ignore formatting,
-micro-optimizations, and weak style opinions.
-
-Do not report more than 5 findings.
-
-Return only JSON. The response must be an array of objects with this exact
-shape:
-
-```json
-[
-  {
-    "category": "correctness",
-    "severity": "must-fix",
-    "confidence": "high",
-    "file": "path/to/file.ts",
-    "line": 12,
-    "summary": "Short one-line bug summary",
-    "evidence": "Why this is a real issue in the current code",
-    "suggestion": "Optional fix direction",
-    "introduced": true
-  }
-]
-```
-
-Severity must be one of `must-fix`, `should-fix`, or `suggestion`.
-Confidence must be one of `high`, `medium`, or `low`.
-
-If there are no issues, return `[]`.
--- a/.opencode/agents/review-maintainability.md
+++ b/.opencode/agents/review-maintainability.md
@@ -1,64 +0,0 @@
---
-description: Review pull requests for high-signal maintainability issues
-mode: primary
-model: opencode/gpt-5.4
-reasoningEffort: high
-textVerbosity: low
-temperature: 0.1
-tools:
-  write: false
-  edit: false
-  bash: false
-  webfetch: false
-  task: false
-  todowrite: false
---
-
-You are a pull request reviewer focused on maintainability.
-
-Start by reading `.opencode-review/pr.json`, `.opencode-review/files.json`, and
-`.opencode-review/diff.patch`.
-
-Use repository guidance from `AGENTS.md` and `REVIEW.md` when present. Be
-strict about real repo conventions, but do not nitpick personal taste.
-
-Review strategy:
-
-1. Start with changed hunks.
-2. Read the full changed file when needed.
-3. Expand to nearby helpers, tests, or conventions only when the diff suggests
-   a real maintainability problem.
-4. Stop when you have enough evidence.
-
-Avoid repo-wide convention hunts. Do not search broadly for every possible
-style rule.
-
-Only report issues that create meaningful maintenance cost, hide bugs, or break
-clear project conventions. Ignore harmless formatting or one-off stylistic
-differences.
-
-Do not report more than 5 findings.
-
-Return only JSON. The response must be an array of objects with this exact
-shape:
-
-```json
-[
-  {
-    "category": "maintainability",
-    "severity": "should-fix",
-    "confidence": "high",
-    "file": "path/to/file.ts",
-    "line": 12,
-    "summary": "Short one-line maintainability issue summary",
-    "evidence": "Why this matters in this codebase",
-    "suggestion": "Optional fix direction",
-    "introduced": true
-  }
-]
-```
-
-Severity must be one of `must-fix`, `should-fix`, or `suggestion`.
-Confidence must be one of `high`, `medium`, or `low`.
-
-If there are no issues, return `[]`.
--- a/.opencode/agents/review-security.md
+++ b/.opencode/agents/review-security.md
@@ -1,63 +0,0 @@
---
-description: Review pull requests for security issues and unsafe changes
-mode: primary
-model: opencode/gpt-5.4
-reasoningEffort: high
-textVerbosity: low
-temperature: 0.1
-tools:
-  write: false
-  edit: false
-  bash: false
-  webfetch: false
-  task: false
-  todowrite: false
---
-
-You are a pull request reviewer focused on security.
-
-Start by reading `.opencode-review/pr.json`, `.opencode-review/files.json`, and
-`.opencode-review/diff.patch`.
-
-You have read access to the full repository. Inspect related code only when it
-is directly connected to changed code, especially auth, validation,
-persistence, secrets handling, logging, and data exposure paths.
-
-Review strategy:
-
-1. Start with changed hunks.
-2. Read the full changed file only when needed.
-3. Expand only to directly connected validation, auth, storage, or transport
-   code.
-4. Stop once you can prove or reject the issue.
-
-Avoid broad repo sweeps or generic checklist-driven exploration.
-
-Only report concrete issues introduced or exposed by this pull request. Ignore
-generic OWASP checklists unless the code actually shows the problem.
-
-Do not report more than 5 findings.
-
-Return only JSON. The response must be an array of objects with this exact
-shape:
-
-```json
-[
-  {
-    "category": "security",
-    "severity": "must-fix",
-    "confidence": "high",
-    "file": "path/to/file.ts",
-    "line": 12,
-    "summary": "Short one-line security issue summary",
-    "evidence": "Why this is a real issue in the current code",
-    "suggestion": "Optional fix direction",
-    "introduced": true
-  }
-]
-```
-
-Severity must be one of `must-fix`, `should-fix`, or `suggestion`.
-Confidence must be one of `high`, `medium`, or `low`.
-
-If there are no issues, return `[]`.
--- a/.opencode/agents/review-verify.md
+++ b/.opencode/agents/review-verify.md
@@ -1,56 +0,0 @@
---
-description: Verify pull request review findings and remove weak claims
-mode: primary
-model: opencode/gpt-5.4
-reasoningEffort: high
-textVerbosity: low
-temperature: 0.1
-tools:
-  write: false
-  edit: false
-  bash: false
-  webfetch: false
-  task: false
-  todowrite: false
---
-
-You are a verification pass for pull request review findings.
-
-Start by reading `.opencode-review/pr.json`, `.opencode-review/files.json`,
-`.opencode-review/diff.patch`, and `.opencode-review/candidates.json`.
-
-For each candidate, inspect the cited code and reject anything that is:
-
- vague or speculative
- duplicated by a stronger finding
- unsupported by the current code
- not meaningfully attributable to this pull request
- a harmless style preference
-
-Keep only findings with concrete evidence and an actionable explanation.
-
-Prefer reading the cited file and directly related context only. Do not do a
-broad repo search unless a candidate specifically depends on another file.
-
-Return no more than 8 findings.
-
-Return only JSON. The response must be an array of objects with this exact
-shape:
-
-```json
-[
-  {
-    "category": "correctness",
-    "severity": "must-fix",
-    "confidence": "high",
-    "file": "path/to/file.ts",
-    "line": 12,
-    "summary": "Short one-line issue summary",
-    "evidence": "Why this survived verification",
-    "suggestion": "Optional fix direction",
-    "introduced": true
-  }
-]
-```
-
-If there are no verified issues, return `[]`.
--- a/.opencode/command/changelog.md
+++ b/.opencode/command/changelog.md
@@ -7,15 +7,17 @@ create UPCOMING_CHANGELOG.md
 it should have sections

 ```
-# TUI
+## TUI

-# Desktop
+## Desktop

-# Core
+## Core

-# Misc
+## Misc
 ```

-go through each PR merged since the last tag
+fetch the latest github release for this repository to determine the last release version.
+
+find each PR that was merged since the last release

 for each PR spawn a subagent to summarize what the PR was about. focus on user facing changes. if it was entirely internal or code related you can ignore it. also skip docs updates. each subagent should append its summary to UPCOMING_CHANGELOG.md into the appropriate section.
--- a/REVIEW.md
+++ b/REVIEW.md
@@ -1,21 +0,0 @@
-# Review Guidelines
-
-## Prioritize
-
- correctness bugs, regressions, and unsafe edge cases
- security issues with concrete impact
- maintainability problems that clearly violate repo conventions
-
-## Flag
-
- unnecessary `any` in new code when a precise type is practical
- deep nesting when early returns would make the flow clearer
- duplicated logic that should obviously reuse existing helpers
- new routes, migrations, or persistence changes that look untested or unsafe
-
-## Skip
-
- harmless formatting differences
- stylistic nits without clear repo guidance
- optional micro-optimizations without user impact
- pre-existing issues unrelated to the pull request
--- a/bun.lock
+++ b/bun.lock
@@ -26,7 +26,7 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "1.3.2",
+      "version": "1.3.3",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -79,7 +79,7 @@
    },
    "packages/console/app": {
      "name": "@opencode-ai/console-app",
-      "version": "1.3.2",
+      "version": "1.3.3",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -113,7 +113,7 @@
    },
    "packages/console/core": {
      "name": "@opencode-ai/console-core",
-      "version": "1.3.2",
+      "version": "1.3.3",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -140,7 +140,7 @@
    },
    "packages/console/function": {
      "name": "@opencode-ai/console-function",
-      "version": "1.3.2",
+      "version": "1.3.3",
      "dependencies": {
        "@ai-sdk/anthropic": "2.0.0",
        "@ai-sdk/openai": "2.0.2",
@@ -164,7 +164,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode-ai/console-mail",
-      "version": "1.3.2",
+      "version": "1.3.3",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -188,7 +188,7 @@
    },
    "packages/desktop": {
      "name": "@opencode-ai/desktop",
-      "version": "1.3.2",
+      "version": "1.3.3",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -221,7 +221,7 @@
    },
    "packages/desktop-electron": {
      "name": "@opencode-ai/desktop-electron",
-      "version": "1.3.2",
+      "version": "1.3.3",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -252,7 +252,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode-ai/enterprise",
-      "version": "1.3.2",
+      "version": "1.3.3",
      "dependencies": {
        "@opencode-ai/ui": "workspace:*",
        "@opencode-ai/util": "workspace:*",
@@ -281,7 +281,7 @@
    },
    "packages/function": {
      "name": "@opencode-ai/function",
-      "version": "1.3.2",
+      "version": "1.3.3",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -297,7 +297,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "1.3.2",
+      "version": "1.3.3",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -422,7 +422,7 @@
    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
-      "version": "1.3.2",
+      "version": "1.3.3",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "zod": "catalog:",
@@ -446,7 +446,7 @@
    },
    "packages/sdk/js": {
      "name": "@opencode-ai/sdk",
-      "version": "1.3.2",
+      "version": "1.3.3",
      "devDependencies": {
        "@hey-api/openapi-ts": "0.90.10",
        "@tsconfig/node22": "catalog:",
@@ -457,7 +457,7 @@
    },
    "packages/slack": {
      "name": "@opencode-ai/slack",
-      "version": "1.3.2",
+      "version": "1.3.3",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "@slack/bolt": "^3.17.1",
@@ -492,7 +492,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "1.3.2",
+      "version": "1.3.3",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -538,7 +538,7 @@
    },
    "packages/util": {
      "name": "@opencode-ai/util",
-      "version": "1.3.2",
+      "version": "1.3.3",
      "dependencies": {
        "zod": "catalog:",
      },
@@ -549,7 +549,7 @@
    },
    "packages/web": {
      "name": "@opencode-ai/web",
-      "version": "1.3.2",
+      "version": "1.3.3",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.3.2",
+  "version": "1.3.3",
  "description": "",
  "type": "module",
  "exports": {
--- a/packages/console/app/package.json
+++ b/packages/console/app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-app",
-  "version": "1.3.2",
+  "version": "1.3.3",
  "type": "module",
  "license": "MIT",
  "scripts": {
--- a/packages/console/core/package.json
+++ b/packages/console/core/package.json
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/console-core",
-  "version": "1.3.2",
+  "version": "1.3.3",
  "private": true,
  "type": "module",
  "license": "MIT",
--- a/packages/console/function/package.json
+++ b/packages/console/function/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-function",
-  "version": "1.3.2",
+  "version": "1.3.3",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
--- a/packages/console/mail/package.json
+++ b/packages/console/mail/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-mail",
-  "version": "1.3.2",
+  "version": "1.3.3",
  "dependencies": {
    "@jsx-email/all": "2.2.3",
    "@jsx-email/cli": "1.4.3",
--- a/packages/desktop-electron/package.json
+++ b/packages/desktop-electron/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop-electron",
  "private": true,
-  "version": "1.3.2",
+  "version": "1.3.3",
  "type": "module",
  "license": "MIT",
  "homepage": "https://opencode.ai",
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop",
  "private": true,
-  "version": "1.3.2",
+  "version": "1.3.3",
  "type": "module",
  "license": "MIT",
  "scripts": {
--- a/packages/enterprise/package.json
+++ b/packages/enterprise/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/enterprise",
-  "version": "1.3.2",
+  "version": "1.3.3",
  "private": true,
  "type": "module",
  "license": "MIT",
--- a/packages/extensions/zed/extension.toml
+++ b/packages/extensions/zed/extension.toml
@@ -1,7 +1,7 @@
 id = "opencode"
 name = "OpenCode"
 description = "The open source coding agent."
-version = "1.3.2"
+version = "1.3.3"
 schema_version = 1
 authors = ["Anomaly"]
 repository = "https://github.com/anomalyco/opencode"
@@ -11,26 +11,26 @@ name = "OpenCode"
 icon = "./icons/opencode.svg"

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

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

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

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

 [agent_servers.opencode.targets.windows-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.2/opencode-windows-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.3/opencode-windows-x64.zip"
 cmd = "./opencode.exe"
 args = ["acp"]
--- a/packages/function/package.json
+++ b/packages/function/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/function",
-  "version": "1.3.2",
+  "version": "1.3.3",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.3.2",
+  "version": "1.3.3",
  "name": "opencode",
  "type": "module",
  "license": "MIT",
--- a/packages/opencode/script/build.ts
+++ b/packages/opencode/script/build.ts
@@ -63,6 +63,25 @@ console.log(`Loaded ${migrations.length} migrations`)
 const singleFlag = process.argv.includes("--single")
 const baselineFlag = process.argv.includes("--baseline")
 const skipInstall = process.argv.includes("--skip-install")
+const skipEmbedWebUi = process.argv.includes("--skip-embed-web-ui")
+
+const createEmbeddedWebUIBundle = async () => {
+  console.log(`Building Web UI to embed in the binary`)
+  const appDir = path.join(import.meta.dirname, "../../app")
+  await $`bun run --cwd ${appDir} build`
+  const allFiles = await Array.fromAsync(new Bun.Glob("**/*").scan({ cwd: path.join(appDir, "dist") }))
+  const fileMap = `
+    // Import all files as file_$i with type: "file" 
+    ${allFiles.map((filePath, i) => `import file_${i} from "${path.join(appDir, "dist", filePath)}" with { type: "file" };`).join("\n")}
+    // Export with original mappings
+    export default {
+      ${allFiles.map((filePath, i) => `"${filePath}": file_${i},`).join("\n")}
+    }
+    `.trim()
+  return fileMap
+}
+
+const embeddedFileMap = skipEmbedWebUi ? null : await createEmbeddedWebUIBundle()

 const allTargets: {
  os: string
@@ -192,7 +211,10 @@ for (const item of targets) {
      execArgv: [`--user-agent=opencode/${Script.version}`, "--use-system-ca", "--"],
      windows: {},
    },
-    entrypoints: ["./src/index.ts", parserWorker, workerPath],
+    files: {
+      ...(embeddedFileMap ? { "opencode-web-ui.gen.ts": embeddedFileMap } : {}),
+    },
+    entrypoints: ["./src/index.ts", parserWorker, workerPath, ...(embeddedFileMap ? ["opencode-web-ui.gen.ts"] : [])],
    define: {
      OPENCODE_VERSION: `'${Script.version}'`,
      OPENCODE_MIGRATIONS: JSON.stringify(migrations),
--- a/packages/opencode/script/review.ts
+++ b/packages/opencode/script/review.ts
@@ -1,664 +0,0 @@
-#!/usr/bin/env bun
-
-import { NodeFileSystem, NodePath } from "@effect/platform-node"
-import * as CrossSpawnSpawner from "../src/effect/cross-spawn-spawner"
-import { makeRuntime } from "../src/effect/run-service"
-import path from "path"
-import { Duration, Effect, Fiber, FileSystem, Layer, Schema, Schedule, ServiceMap, Stream } from "effect"
-import type { PlatformError } from "effect/PlatformError"
-import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
-
-const Category = Schema.Union([
-  Schema.Literal("correctness"),
-  Schema.Literal("security"),
-  Schema.Literal("maintainability"),
-])
-
-const Severity = Schema.Union([Schema.Literal("must-fix"), Schema.Literal("should-fix"), Schema.Literal("suggestion")])
-
-const Confidence = Schema.Union([Schema.Literal("high"), Schema.Literal("medium"), Schema.Literal("low")])
-
-class Base extends Schema.Class<Base>("ReviewBase")({
-  ref: Schema.String,
-}) {}
-
-class Head extends Schema.Class<Head>("ReviewHead")({
-  sha: Schema.String,
-  ref: Schema.String,
-}) {}
-
-class Pull extends Schema.Class<Pull>("ReviewPull")({
-  number: Schema.Number,
-  title: Schema.String,
-  body: Schema.NullOr(Schema.String),
-  head: Head,
-  base: Base,
-}) {}
-
-class PullFile extends Schema.Class<PullFile>("ReviewPullFile")({
-  filename: Schema.String,
-  status: Schema.String,
-  patch: Schema.optional(Schema.String),
-}) {}
-
-class PullContext extends Schema.Class<PullContext>("ReviewPullContext")({
-  repo: Schema.String,
-  mergeBase: Schema.String,
-  pull: Pull,
-}) {}
-
-class Finding extends Schema.Class<Finding>("ReviewFinding")({
-  category: Category,
-  severity: Severity,
-  confidence: Confidence,
-  file: Schema.String,
-  line: Schema.Number,
-  summary: Schema.String,
-  evidence: Schema.String,
-  suggestion: Schema.String,
-  introduced: Schema.Boolean,
-}) {}
-
-class ReviewError extends Schema.TaggedErrorClass<ReviewError>()("ReviewError", {
-  message: Schema.String,
-  cause: Schema.optional(Schema.Defect),
-}) {}
-
-const PullFiles = Schema.Array(PullFile)
-const Findings = Schema.Array(Finding)
-const decodePullJson = Schema.decodeSync(Schema.fromJsonString(Pull))
-const decodePullFilesJson = Schema.decodeSync(Schema.fromJsonString(PullFiles))
-const decodeFindingsJson = Schema.decodeSync(Schema.fromJsonString(Findings))
-const encodePullContext = Schema.encodeSync(Schema.fromJsonString(PullContext))
-const encodePullFiles = Schema.encodeSync(Schema.fromJsonString(PullFiles))
-const encodeFindings = Schema.encodeSync(Schema.fromJsonString(Findings))
-
-const args = parse(process.argv.slice(2))
-
-export namespace Review {
-  export interface Interface {
-    readonly run: (input: {
-      repo: string
-      pr: number
-      post: boolean
-    }) => Effect.Effect<void, ReviewError | PlatformError>
-  }
-
-  export class Service extends ServiceMap.Service<Service, Interface>()("@opencode/Review") {}
-
-  export const layer = Layer.effect(
-    Service,
-    Effect.gen(function* () {
-      const fs = yield* FileSystem.FileSystem
-      const spawner = yield* ChildProcessSpawner.ChildProcessSpawner
-      const root = process.cwd()
-      const bin = process.env.OPENCODE_BIN ?? "opencode"
-
-      const note = (text: string) => Effect.sync(() => console.error(`[review] ${text}`))
-
-      const fail = (message: string) => (cause: unknown) =>
-        new ReviewError({
-          message,
-          cause,
-        })
-
-      const cmd = Effect.fn("Review.cmd")(function* (file: string, argv: string[], cwd: string) {
-        const handle = yield* spawner.spawn(
-          ChildProcess.make(file, argv, {
-            cwd,
-            extendEnv: true,
-            stdin: "ignore",
-            stdout: "pipe",
-            stderr: "pipe",
-          }),
-        )
-
-        const [stdout, stderr, code] = yield* Effect.all(
-          [
-            Stream.mkString(Stream.decodeText(handle.stdout)),
-            Stream.mkString(Stream.decodeText(handle.stderr)),
-            handle.exitCode,
-          ],
-          { concurrency: 3 },
-        )
-
-        if (code !== ChildProcessSpawner.ExitCode(0)) {
-          return yield* new ReviewError({
-            message: `${file} ${argv.join(" ")} failed`,
-            cause: new Error(stderr.trim() || stdout.trim() || `exit=${code}`),
-          })
-        }
-
-        return stdout
-      }, Effect.scoped)
-
-      const pull = (text: string) =>
-        Effect.try({
-          try: () => decodePullJson(text),
-          catch: fail("pull decode failed"),
-        })
-
-      const files = (text: string) =>
-        Effect.try({
-          try: () => decodePullFilesJson(text),
-          catch: fail("pull files decode failed"),
-        })
-
-      const findings = (text: string) =>
-        Effect.try({
-          try: () => decodeFindingsJson(text),
-          catch: fail("findings decode failed"),
-        })
-
-      const gh = Effect.fn("Review.gh")(function* (argv: string[]) {
-        return yield* cmd("gh", argv, root)
-      })
-
-      const git = Effect.fn("Review.git")(function* (argv: string[], cwd: string) {
-        return yield* cmd("git", argv, cwd)
-      })
-
-      const sync = Effect.fn("Review.sync")(function* (dir: string, box: string) {
-        const src = path.join(root, ".opencode", "agents")
-        const dst = path.join(dir, ".opencode", "agents")
-        yield* fs.makeDirectory(dst, { recursive: true }).pipe(Effect.mapError(fail("create agents dir failed")))
-
-        for (const name of [
-          "review-correctness.md",
-          "review-security.md",
-          "review-maintainability.md",
-          "review-verify.md",
-        ]) {
-          const text = yield* fs.readFileString(path.join(src, name)).pipe(Effect.mapError(fail(`read ${name} failed`)))
-          yield* fs.writeFileString(path.join(dst, name), text).pipe(Effect.mapError(fail(`write ${name} failed`)))
-        }
-
-        const review = yield* fs
-          .readFileString(path.join(root, "REVIEW.md"))
-          .pipe(Effect.mapError(fail("read REVIEW.md failed")))
-        yield* fs
-          .writeFileString(path.join(box, "REVIEW.md"), review)
-          .pipe(Effect.mapError(fail("write REVIEW.md failed")))
-      })
-
-      const parseText = Effect.fn("Review.parseText")(function* (text: string) {
-        const body = text.trim()
-        if (!body) return yield* new ReviewError({ message: "review agent returned no text" })
-
-        const clean = strip(body)
-
-        try {
-          return decodeFindingsJson(clean)
-        } catch {}
-
-        const start = clean.indexOf("[")
-        const end = clean.lastIndexOf("]")
-        if (start !== -1 && end > start) {
-          return yield* findings(clean.slice(start, end + 1))
-        }
-
-        return yield* new ReviewError({ message: `could not parse findings JSON\n\n${clean}` })
-      })
-
-      const talk = Effect.fn("Review.talk")(function* (agent: string, prompt: string, cwd: string) {
-        const out: string[] = []
-        const err: string[] = []
-        const handle = yield* spawner.spawn(
-          ChildProcess.make(bin, ["run", "--agent", agent, "--format", "json", prompt], {
-            cwd,
-            extendEnv: true,
-            stdin: "ignore",
-            stdout: "pipe",
-            stderr: "pipe",
-          }),
-        )
-
-        const [, , code] = yield* Effect.all(
-          [
-            handle.stdout.pipe(
-              Stream.decodeText(),
-              Stream.splitLines,
-              Stream.runForEach((line) =>
-                Effect.sync(() => {
-                  out.push(line)
-                  trace(agent, line)
-                }),
-              ),
-            ),
-            handle.stderr.pipe(
-              Stream.decodeText(),
-              Stream.splitLines,
-              Stream.runForEach((line) =>
-                Effect.sync(() => {
-                  err.push(line)
-                  if (line.trim()) console.error(`[review:${agent}] ${line}`)
-                }),
-              ),
-            ),
-            handle.exitCode,
-          ],
-          { concurrency: 3 },
-        )
-
-        if (code !== ChildProcessSpawner.ExitCode(0)) {
-          return yield* new ReviewError({
-            message: `${agent} failed`,
-            cause: new Error(err.join("\n").trim() || out.join("\n").trim() || `exit=${code}`),
-          })
-        }
-
-        return out.join("\n")
-      }, Effect.scoped)
-
-      const pass = Effect.fn("Review.pass")(function* (agent: string, prompt: string, cwd: string) {
-        yield* note(`${agent} tools: read/glob/grep/list allowed; write/edit/bash denied`)
-        const raw = yield* talk(agent, prompt, cwd)
-        return yield* parseText(collect(raw))
-      })
-
-      const job = Effect.fn("Review.job")(function* (
-        name: string,
-        fx: Effect.Effect<readonly Finding[], ReviewError | PlatformError>,
-      ) {
-        yield* note(`${name} started`)
-
-        const beat = yield* note(`${name} still running`).pipe(
-          Effect.repeat(Schedule.spaced(Duration.seconds(15))),
-          Effect.delay(Duration.seconds(15)),
-          Effect.forkScoped,
-        )
-
-        const out = yield* fx.pipe(
-          Effect.timeout(Duration.minutes(10)),
-          Effect.catchTag("TimeoutError", () =>
-            Effect.fail(new ReviewError({ message: `${name} timed out after 600s` })),
-          ),
-          Effect.ensuring(Fiber.interrupt(beat)),
-        )
-
-        yield* note(`${name} finished (${out.length} findings)`)
-        return out
-      }, Effect.scoped)
-
-      const safe = (name: string, fx: Effect.Effect<readonly Finding[], ReviewError | PlatformError>) =>
-        fx.pipe(Effect.catch((err) => note(`pass failed: ${name}: ${err.message}`).pipe(Effect.as([] as const))))
-
-      const inline = Effect.fn("Review.inline")(function* (repo: string, pr: number, sha: string, item: Finding) {
-        yield* gh([
-          "api",
-          "--method",
-          "POST",
-          "-H",
-          "Accept: application/vnd.github+json",
-          "-H",
-          "X-GitHub-Api-Version: 2022-11-28",
-          `/repos/${repo}/pulls/${pr}/comments`,
-          "-f",
-          `body=${body(item)}`,
-          "-f",
-          `commit_id=${sha}`,
-          "-f",
-          `path=${item.file}`,
-          "-F",
-          `line=${Math.trunc(item.line)}`,
-          "-f",
-          "side=RIGHT",
-        ])
-      })
-
-      const top = Effect.fn("Review.top")(function* (repo: string, pr: number, text: string) {
-        yield* gh(["pr", "comment", String(pr), "--repo", repo, "--body", text])
-      })
-
-      const run = Effect.fn("Review.run")(function* (input: { repo: string; pr: number; post: boolean }) {
-        yield* note(`loading PR #${input.pr}`)
-        const data = yield* gh(["api", `/repos/${input.repo}/pulls/${input.pr}`]).pipe(Effect.flatMap(pull))
-        const list = yield* gh(["api", `/repos/${input.repo}/pulls/${input.pr}/files?per_page=100`]).pipe(
-          Effect.flatMap(files),
-        )
-
-        const tmp = yield* fs
-          .makeTempDirectoryScoped({ prefix: "opencode-review-" })
-          .pipe(Effect.mapError(fail("create temp dir failed")))
-        const dir = path.join(tmp, `pr-${input.pr}`)
-
-        yield* note("preparing worktree")
-        yield* git(
-          ["fetch", "origin", data.base.ref, `refs/pull/${input.pr}/head:refs/remotes/origin/pr-${input.pr}`],
-          root,
-        )
-        yield* Effect.acquireRelease(
-          git(["worktree", "add", "--detach", dir, `refs/remotes/origin/pr-${input.pr}`], root),
-          () => git(["worktree", "remove", "--force", dir], root).pipe(Effect.catch(() => Effect.void)),
-        )
-
-        const base = (yield* git(["merge-base", `origin/${data.base.ref}`, "HEAD"], dir)).trim()
-        const diff = yield* git(["diff", "--unified=3", `${base}...HEAD`], dir)
-        const box = path.join(dir, ".opencode-review")
-
-        yield* fs.makeDirectory(box, { recursive: true }).pipe(Effect.mapError(fail("create review dir failed")))
-        yield* sync(dir, box)
-        yield* fs
-          .writeFileString(
-            path.join(box, "pr.json"),
-            encodePullContext(
-              new PullContext({
-                repo: input.repo,
-                mergeBase: base,
-                pull: data,
-              }),
-            ),
-          )
-          .pipe(Effect.mapError(fail("write pr.json failed")))
-        yield* fs
-          .writeFileString(path.join(box, "files.json"), encodePullFiles(list))
-          .pipe(Effect.mapError(fail("write files.json failed")))
-        yield* fs
-          .writeFileString(path.join(box, "diff.patch"), diff)
-          .pipe(Effect.mapError(fail("write diff.patch failed")))
-
-        const out = yield* Effect.all(
-          [
-            safe("correctness", job("correctness", pass("review-correctness", correctness(data, list), dir))),
-            safe("security", job("security", pass("review-security", security(data, list), dir))),
-            safe(
-              "maintainability",
-              job("maintainability", pass("review-maintainability", maintainability(data, list), dir)),
-            ),
-          ],
-          { concurrency: 3 },
-        )
-
-        const merged = dedupe(out.flatMap((item) => [...item]))
-        yield* fs
-          .writeFileString(path.join(box, "candidates.json"), encodeFindings(merged))
-          .pipe(Effect.mapError(fail("write candidates.json failed")))
-
-        const kept = merged.length
-          ? dedupe(yield* job("verifier", pass("review-verify", verify(data, merged), dir)))
-          : []
-        const ranges = new Map(list.map((item) => [item.filename, hunks(item.patch)]))
-        const notes = kept.filter((item) => inDiff(ranges.get(item.file), item.line))
-        const rest = kept.filter((item) => !inDiff(ranges.get(item.file), item.line))
-
-        if (!input.post) {
-          yield* Effect.sync(() => print(kept, notes, rest))
-          return
-        }
-
-        if (!kept.length) {
-          yield* top(input.repo, input.pr, "lgtm")
-          return
-        }
-
-        yield* Effect.all(
-          notes.map((item) => inline(input.repo, input.pr, data.head.sha, item)),
-          { concurrency: 1 },
-        )
-        if (rest.length) yield* top(input.repo, input.pr, summary(rest))
-      })
-
-      return Service.of({
-        run: (input) => run(input).pipe(Effect.scoped),
-      })
-    }),
-  )
-
-  export const defaultLayer = layer.pipe(
-    Layer.provide(CrossSpawnSpawner.layer),
-    Layer.provide(NodeFileSystem.layer),
-    Layer.provide(NodePath.layer),
-  )
-
-  const { runPromise } = makeRuntime(Service, defaultLayer)
-
-  export function run(input: { repo: string; pr: number; post: boolean }) {
-    return runPromise((svc) => svc.run(input))
-  }
-}
-
-await Review.run(args)
-
-function parse(argv: string[]) {
-  let repo: string | undefined
-  let pr: number | undefined
-  let post = false
-
-  for (let i = 0; i < argv.length; i++) {
-    const arg = argv[i]
-    if (arg === "--repo") repo = argv[++i]
-    if (arg === "--pr") pr = Number(argv[++i])
-    if (arg === "--post") post = true
-  }
-
-  if (!repo) throw new Error("Missing --repo")
-  if (!pr) throw new Error("Missing --pr")
-  return { repo, pr, post }
-}
-
-function collect(raw: string) {
-  const seen = new Set<string>()
-  const out: string[] = []
-
-  for (const row of raw.split(/\r?\n/)) {
-    if (!row.trim()) continue
-
-    let item: unknown
-    try {
-      item = JSON.parse(row)
-    } catch {
-      continue
-    }
-
-    if (!item || typeof item !== "object" || !("type" in item) || item.type !== "text") continue
-    if (!("part" in item) || !item.part || typeof item.part !== "object") continue
-
-    const part = item.part as { id?: string; text?: string }
-    if (!part.id || seen.has(part.id)) continue
-    seen.add(part.id)
-    if (typeof part.text === "string") out.push(part.text)
-  }
-
-  return out.join("\n")
-}
-
-function trace(agent: string, row: string) {
-  if (!row.trim()) return
-
-  let item: unknown
-  try {
-    item = JSON.parse(row)
-  } catch {
-    console.error(`[review:${agent}] ${row}`)
-    return
-  }
-
-  if (!item || typeof item !== "object") return
-  const type = "type" in item && typeof item.type === "string" ? item.type : undefined
-  if (!type) return
-  if (type === "tool_use") {
-    const part = "part" in item && item.part && typeof item.part === "object" ? item.part : undefined
-    const tool = part && "tool" in part && typeof part.tool === "string" ? part.tool : "tool"
-    const state = part && "state" in part && part.state && typeof part.state === "object" ? part.state : undefined
-    const input = state && "input" in state ? brief(state.input) : ""
-    console.error(`[review:${agent}] ${tool}${input ? ` ${input}` : ""}`)
-    return
-  }
-  if (type === "step_start") {
-    console.error(`[review:${agent}] step started`)
-    return
-  }
-  if (type === "step_finish") {
-    const part = "part" in item && item.part && typeof item.part === "object" ? item.part : undefined
-    const reason = part && "reason" in part && typeof part.reason === "string" ? part.reason : "step"
-    console.error(`[review:${agent}] step finished (${reason})`)
-  }
-}
-
-function brief(input: unknown) {
-  if (!input || typeof input !== "object") return ""
-  if ("filePath" in input && typeof input.filePath === "string") return input.filePath
-  if ("path" in input && typeof input.path === "string") return input.path
-  if ("pattern" in input && typeof input.pattern === "string") return input.pattern
-  if ("command" in input && typeof input.command === "string") return input.command
-  if ("include" in input && typeof input.include === "string") return input.include
-  return ""
-}
-
-function strip(text: string) {
-  if (!text.startsWith("```") || !text.endsWith("```")) return text
-  return text
-    .replace(/^```[a-zA-Z]*\n?/, "")
-    .replace(/\n?```$/, "")
-    .trim()
-}
-
-function correctness(data: Pull, list: readonly PullFile[]) {
-  return [
-    `Review pull request #${data.number}: ${data.title}.`,
-    `Base ref: ${data.base.ref}. Head ref: ${data.head.ref}.`,
-    `Changed files: ${list.map((item) => item.filename).join(", ")}.`,
-    "Read `.opencode-review/REVIEW.md` before reviewing.",
-    "Start with the diff. Use the rest of the repo only for targeted confirmation.",
-    "Avoid broad exploration. Follow direct references only.",
-    "Find correctness bugs, regressions, missing edge-case handling, broken invariants, and unsafe assumptions.",
-    "Only report issues introduced or exposed by this pull request.",
-  ].join("\n")
-}
-
-function security(data: Pull, list: readonly PullFile[]) {
-  return [
-    `Review pull request #${data.number}: ${data.title}.`,
-    `Base ref: ${data.base.ref}. Head ref: ${data.head.ref}.`,
-    `Changed files: ${list.map((item) => item.filename).join(", ")}.`,
-    "Read `.opencode-review/REVIEW.md` before reviewing.",
-    "Start with the diff. Use the rest of the repo only for targeted confirmation.",
-    "Avoid broad exploration. Follow direct auth, validation, storage, or transport links only.",
-    "Find concrete security issues such as missing validation, unsafe auth checks, secrets exposure, or data leaks.",
-    "Only report issues introduced or exposed by this pull request.",
-  ].join("\n")
-}
-
-function maintainability(data: Pull, list: readonly PullFile[]) {
-  return [
-    `Review pull request #${data.number}: ${data.title}.`,
-    `Base ref: ${data.base.ref}. Head ref: ${data.head.ref}.`,
-    `Changed files: ${list.map((item) => item.filename).join(", ")}.`,
-    "Read `.opencode-review/REVIEW.md` before reviewing.",
-    "Start with the diff. Use the rest of the repo only for targeted confirmation.",
-    "Avoid broad exploration. Focus on maintainability issues made visible by the changed files.",
-    "Find high-signal maintainability issues that clearly violate repo conventions or make future bugs likely.",
-    "Do not nitpick harmless style differences.",
-  ].join("\n")
-}
-
-function verify(data: Pull, list: readonly Finding[]) {
-  return [
-    `Verify review findings for pull request #${data.number}: ${data.title}.`,
-    `Candidates: ${list.length}.`,
-    "Inspect the cited file first and expand only if needed to confirm or reject the finding.",
-    "Reject anything vague, duplicated, unsupported, or not attributable to the pull request.",
-  ].join("\n")
-}
-
-function dedupe(list: readonly Finding[]) {
-  const seen = new Set<string>()
-  return order(list).filter((item) => {
-    const key = [item.category, item.file, Math.trunc(item.line), item.summary.trim().toLowerCase()].join(":")
-    if (seen.has(key)) return false
-    seen.add(key)
-    return true
-  })
-}
-
-function order(list: readonly Finding[]) {
-  const rank = {
-    "must-fix": 0,
-    "should-fix": 1,
-    suggestion: 2,
-  }
-  return [...list].sort((a, b) => {
-    const left = rank[a.severity] - rank[b.severity]
-    if (left) return left
-    return a.file.localeCompare(b.file) || a.line - b.line
-  })
-}
-
-function hunks(patch?: string) {
-  if (!patch) return [] as [number, number][]
-  const out: [number, number][] = []
-  let line = 0
-  let start = -1
-  let end = -1
-
-  for (const row of patch.split("\n")) {
-    if (row.startsWith("@@")) {
-      push(out, start, end)
-      start = -1
-      end = -1
-      const hit = /\+([0-9]+)(?:,([0-9]+))?/.exec(row)
-      line = hit ? Number(hit[1]) : 0
-      continue
-    }
-
-    if (row.startsWith("+") && !row.startsWith("+++")) {
-      start = start === -1 ? line : start
-      end = line
-      line += 1
-      continue
-    }
-
-    if (row.startsWith("-") && !row.startsWith("---")) continue
-
-    push(out, start, end)
-    start = -1
-    end = -1
-    line += 1
-  }
-
-  push(out, start, end)
-  return out
-}
-
-function push(out: [number, number][], start: number, end: number) {
-  if (start === -1 || end === -1) return
-  const prev = out.at(-1)
-  if (prev && prev[1] + 1 >= start) {
-    prev[1] = Math.max(prev[1], end)
-    return
-  }
-  out.push([start, end])
-}
-
-function inDiff(list: [number, number][] | undefined, line: number) {
-  return !!list?.some((item) => line >= item[0] && line <= item[1])
-}
-
-function body(item: Finding) {
-  const out = [`[${item.severity}] ${item.summary}`, "", item.evidence]
-  if (item.suggestion.trim()) out.push("", `Suggestion: ${item.suggestion.trim()}`)
-  return out.join("\n")
-}
-
-function summary(list: readonly Finding[]) {
-  const head = "OpenCode review found additional PR-relevant issues that could not be placed on changed lines:"
-  const body = order(list).map(
-    (item) => `- [${item.severity}] \`${item.file}:${Math.trunc(item.line)}\` ${item.summary}`,
-  )
-  return [head, "", ...body].join("\n")
-}
-
-function print(all: readonly Finding[], notes: readonly Finding[], rest: readonly Finding[]) {
-  console.log("# OpenCode Review")
-  console.log()
-  console.log(`- total: ${all.length}`)
-  console.log(`- inline-ready: ${notes.length}`)
-  console.log(`- summary-only: ${rest.length}`)
-  console.log()
-
-  for (const item of order(all)) {
-    console.log(`- [${item.severity}] ${item.file}:${Math.trunc(item.line)} ${item.summary}`)
-    console.log(`  ${item.evidence}`)
-    if (item.suggestion.trim()) console.log(`  suggestion: ${item.suggestion.trim()}`)
-  }
-}
--- a/packages/opencode/specs/effect-migration.md
+++ b/packages/opencode/specs/effect-migration.md
@@ -186,5 +186,5 @@ Still open and likely worth migrating:
 - [ ] `SessionCompaction`
 - [ ] `Provider`
 - [x] `Project`
- [ ] `LSP`
+- [x] `LSP`
 - [x] `MCP`
--- a/packages/opencode/src/cli/cmd/tui/worker.ts
+++ b/packages/opencode/src/cli/cmd/tui/worker.ts
@@ -6,11 +6,13 @@ import { InstanceBootstrap } from "@/project/bootstrap"
 import { Rpc } from "@/util/rpc"
 import { upgrade } from "@/cli/upgrade"
 import { Config } from "@/config/config"
+import { Bus } from "@/bus"
 import { GlobalBus } from "@/bus/global"
-import { createOpencodeClient, type Event } from "@opencode-ai/sdk/v2"
+import type { Event } from "@opencode-ai/sdk/v2"
 import { Flag } from "@/flag/flag"
 import { setTimeout as sleep } from "node:timers/promises"
 import { writeHeapSnapshot } from "node:v8"
+import { WorkspaceID } from "@/control-plane/schema"

 await Log.init({
  print: process.argv.includes("--print-logs"),
@@ -50,39 +52,49 @@ const startEventStream = (input: { directory: string; workspaceID?: string }) =>
  eventStream.abort = abort
  const signal = abort.signal

-  const fetchFn = (async (input: RequestInfo | URL, init?: RequestInit) => {
-    const request = new Request(input, init)
-    const auth = getAuthorizationHeader()
-    if (auth) request.headers.set("Authorization", auth)
-    return Server.Default().fetch(request)
-  }) as typeof globalThis.fetch
-
-  const sdk = createOpencodeClient({
-    baseUrl: "http://opencode.internal",
-    directory: input.directory,
-    experimental_workspaceID: input.workspaceID,
-    fetch: fetchFn,
-    signal,
-  })
-
  ;(async () => {
    while (!signal.aborted) {
-      const events = await Promise.resolve(
-        sdk.event.subscribe(
-          {},
-          {
-            signal,
-          },
-        ),
-      ).catch(() => undefined)
+      const shouldReconnect = await Instance.provide({
+        directory: input.directory,
+        init: InstanceBootstrap,
+        fn: () =>
+          new Promise<boolean>((resolve) => {
+            Rpc.emit("event", {
+              type: "server.connected",
+              properties: {},
+            } satisfies Event)

-      if (!events) {
-        await sleep(250)
-        continue
-      }
+            let settled = false
+            const settle = (value: boolean) => {
+              if (settled) return
+              settled = true
+              signal.removeEventListener("abort", onAbort)
+              unsub()
+              resolve(value)
+            }

-      for await (const event of events.stream) {
-        Rpc.emit("event", event as Event)
+            const unsub = Bus.subscribeAll((event) => {
+              Rpc.emit("event", event as Event)
+              if (event.type === Bus.InstanceDisposed.type) {
+                settle(true)
+              }
+            })
+
+            const onAbort = () => {
+              settle(false)
+            }
+
+            signal.addEventListener("abort", onAbort, { once: true })
+          }),
+      }).catch((error) => {
+        Log.Default.error("event stream subscribe error", {
+          error: error instanceof Error ? error.message : error,
+        })
+        return false
+      })
+
+      if (!shouldReconnect || signal.aborted) {
+        break
      }

      if (!signal.aborted) {
--- a/packages/opencode/src/cli/cmd/workspace-serve.ts
+++ b/packages/opencode/src/cli/cmd/workspace-serve.ts
@@ -1,16 +0,0 @@
-import { cmd } from "./cmd"
-import { withNetworkOptions, resolveNetworkOptions } from "../network"
-import { WorkspaceServer } from "../../control-plane/workspace-server/server"
-
-export const WorkspaceServeCommand = cmd({
-  command: "workspace-serve",
-  builder: (yargs) => withNetworkOptions(yargs),
-  describe: "starts a remote workspace event server",
-  handler: async (args) => {
-    const opts = await resolveNetworkOptions(args)
-    const server = WorkspaceServer.Listen(opts)
-    console.log(`workspace event server listening on http://${server.hostname}:${server.port}/event`)
-    await new Promise(() => {})
-    await server.stop()
-  },
-})
--- a/packages/opencode/src/control-plane/adaptors/worktree.ts
+++ b/packages/opencode/src/control-plane/adaptors/worktree.ts
@@ -33,13 +33,14 @@ export const WorktreeAdaptor: Adaptor = {
    await Worktree.remove({ directory: config.directory })
  },
  async fetch(info, input: RequestInfo | URL, init?: RequestInit) {
+    const { Server } = await import("../../server/server")
+
    const config = Config.parse(info)
-    const { WorkspaceServer } = await import("../workspace-server/server")
    const url = input instanceof Request || input instanceof URL ? input : new URL(input, "http://opencode.internal")
    const headers = new Headers(init?.headers ?? (input instanceof Request ? input.headers : undefined))
    headers.set("x-opencode-directory", config.directory)

    const request = new Request(url, { ...init, headers })
-    return WorkspaceServer.App().fetch(request)
+    return Server.Default().fetch(request)
  },
 }
--- a/packages/opencode/src/control-plane/workspace-context.ts
+++ b/packages/opencode/src/control-plane/workspace-context.ts
@@ -1,24 +0,0 @@
-import { Context } from "../util/context"
-import type { WorkspaceID } from "./schema"
-
-interface Context {
-  workspaceID?: WorkspaceID
-}
-
-const context = Context.create<Context>("workspace")
-
-export const WorkspaceContext = {
-  async provide<R>(input: { workspaceID?: WorkspaceID; fn: () => R }): Promise<R> {
-    return context.provide({ workspaceID: input.workspaceID }, async () => {
-      return input.fn()
-    })
-  },
-
-  get workspaceID() {
-    try {
-      return context.use().workspaceID
-    } catch (e) {
-      return undefined
-    }
-  },
-}
--- a/packages/opencode/src/control-plane/workspace-router-middleware.ts
+++ b/packages/opencode/src/control-plane/workspace-router-middleware.ts
@@ -1,23 +1,38 @@
 import type { MiddlewareHandler } from "hono"
 import { Flag } from "../flag/flag"
 import { getAdaptor } from "./adaptors"
+import { WorkspaceID } from "./schema"
 import { Workspace } from "./workspace"
-import { WorkspaceContext } from "./workspace-context"

-// This middleware forwards all non-GET requests if the workspace is a
-// remote. The remote workspace needs to handle session mutations
+type Rule = { method?: string; path: string; exact?: boolean; action: "local" | "forward" }
+
+const RULES: Array<Rule> = [
+  { path: "/session/status", action: "forward" },
+  { method: "GET", path: "/session", action: "local" },
+]
+
+function local(method: string, path: string) {
+  for (const rule of RULES) {
+    if (rule.method && rule.method !== method) continue
+    const match = rule.exact ? path === rule.path : path === rule.path || path.startsWith(rule.path + "/")
+    if (match) return rule.action === "local"
+  }
+  return false
+}
+
 async function routeRequest(req: Request) {
-  // Right now, we need to forward all requests to the workspace
-  // because we don't have syncing. In the future all GET requests
-  // which don't mutate anything will be handled locally
-  //
-  // if (req.method === "GET") return
+  const url = new URL(req.url)
+  const raw = url.searchParams.get("workspace") || req.headers.get("x-opencode-workspace")

-  if (!WorkspaceContext.workspaceID) return
+  if (!raw) return

-  const workspace = await Workspace.get(WorkspaceContext.workspaceID)
+  if (local(req.method, url.pathname)) return
+
+  const workspaceID = WorkspaceID.make(raw)
+
+  const workspace = await Workspace.get(workspaceID)
  if (!workspace) {
-    return new Response(`Workspace not found: ${WorkspaceContext.workspaceID}`, {
+    return new Response(`Workspace not found: ${workspaceID}`, {
      status: 500,
      headers: {
        "content-type": "text/plain; charset=utf-8",
@@ -27,11 +42,14 @@ async function routeRequest(req: Request) {

  const adaptor = await getAdaptor(workspace.type)

-  return adaptor.fetch(workspace, `${new URL(req.url).pathname}${new URL(req.url).search}`, {
+  const headers = new Headers(req.headers)
+  headers.delete("x-opencode-workspace")
+
+  return adaptor.fetch(workspace, `${url.pathname}${url.search}`, {
    method: req.method,
    body: req.method === "GET" || req.method === "HEAD" ? undefined : await req.arrayBuffer(),
    signal: req.signal,
-    headers: req.headers,
+    headers,
  })
 }

--- a/packages/opencode/src/control-plane/workspace-server/routes.ts
+++ b/packages/opencode/src/control-plane/workspace-server/routes.ts
@@ -1,33 +0,0 @@
-import { GlobalBus } from "../../bus/global"
-import { Hono } from "hono"
-import { streamSSE } from "hono/streaming"
-
-export function WorkspaceServerRoutes() {
-  return new Hono().get("/event", async (c) => {
-    c.header("X-Accel-Buffering", "no")
-    c.header("X-Content-Type-Options", "nosniff")
-    return streamSSE(c, async (stream) => {
-      const send = async (event: unknown) => {
-        await stream.writeSSE({
-          data: JSON.stringify(event),
-        })
-      }
-      const handler = async (event: { directory?: string; payload: unknown }) => {
-        await send(event.payload)
-      }
-      GlobalBus.on("event", handler)
-      await send({ type: "server.connected", properties: {} })
-      const heartbeat = setInterval(() => {
-        void send({ type: "server.heartbeat", properties: {} })
-      }, 10_000)
-
-      await new Promise<void>((resolve) => {
-        stream.onAbort(() => {
-          clearInterval(heartbeat)
-          GlobalBus.off("event", handler)
-          resolve()
-        })
-      })
-    })
-  })
-}
--- a/packages/opencode/src/control-plane/workspace-server/server.ts
+++ b/packages/opencode/src/control-plane/workspace-server/server.ts
@@ -1,65 +0,0 @@
-import { Hono } from "hono"
-import { Instance } from "../../project/instance"
-import { InstanceBootstrap } from "../../project/bootstrap"
-import { SessionRoutes } from "../../server/routes/session"
-import { WorkspaceServerRoutes } from "./routes"
-import { WorkspaceContext } from "../workspace-context"
-import { WorkspaceID } from "../schema"
-
-export namespace WorkspaceServer {
-  export function App() {
-    const session = new Hono()
-      .use(async (c, next) => {
-        // Right now, we need handle all requests because we don't
-        // have syncing. In the future all GET requests will handled
-        // by the control plane
-        //
-        // if (c.req.method === "GET") return c.notFound()
-        await next()
-      })
-      .route("/", SessionRoutes())
-
-    return new Hono()
-      .use(async (c, next) => {
-        const rawWorkspaceID = c.req.query("workspace") || c.req.header("x-opencode-workspace")
-        const raw = c.req.query("directory") || c.req.header("x-opencode-directory")
-        if (rawWorkspaceID == null) {
-          throw new Error("workspaceID parameter is required")
-        }
-        if (raw == null) {
-          throw new Error("directory parameter is required")
-        }
-
-        const directory = (() => {
-          try {
-            return decodeURIComponent(raw)
-          } catch {
-            return raw
-          }
-        })()
-
-        return WorkspaceContext.provide({
-          workspaceID: WorkspaceID.make(rawWorkspaceID),
-          async fn() {
-            return Instance.provide({
-              directory,
-              init: InstanceBootstrap,
-              async fn() {
-                return next()
-              },
-            })
-          },
-        })
-      })
-      .route("/session", session)
-      .route("/", WorkspaceServerRoutes())
-  }
-
-  export function Listen(opts: { hostname: string; port: number }) {
-    return Bun.serve({
-      hostname: opts.hostname,
-      port: opts.port,
-      fetch: App().fetch,
-    })
-  }
-}
--- a/packages/opencode/src/effect/run-service.ts
+++ b/packages/opencode/src/effect/run-service.ts
@@ -3,15 +3,6 @@ import * as ServiceMap from "effect/ServiceMap"

 export const memoMap = Layer.makeMemoMapUnsafe()

-export function makeRunPromise<I, S, E>(service: ServiceMap.Service<I, S>, layer: Layer.Layer<I, E>) {
-  let rt: ManagedRuntime.ManagedRuntime<I, E> | undefined
-
-  return <A, Err>(fn: (svc: S) => Effect.Effect<A, Err, I>, options?: Effect.RunOptions) => {
-    rt ??= ManagedRuntime.make(layer, { memoMap })
-    return rt.runPromise(service.use(fn), options)
-  }
-}
-
 export function makeRuntime<I, S, E>(service: ServiceMap.Service<I, S>, layer: Layer.Layer<I, E>) {
  let rt: ManagedRuntime.ManagedRuntime<I, E> | undefined
  const getRuntime = () => (rt ??= ManagedRuntime.make(layer, { memoMap }))
--- a/packages/opencode/src/flag/flag.ts
+++ b/packages/opencode/src/flag/flag.ts
@@ -70,6 +70,7 @@ export namespace Flag {
  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"]
+  export const OPENCODE_DISABLE_EMBEDDED_WEB_UI = truthy("OPENCODE_DISABLE_EMBEDDED_WEB_UI")
  export const OPENCODE_DB = process.env["OPENCODE_DB"]
  export const OPENCODE_DISABLE_CHANNEL_DB = truthy("OPENCODE_DISABLE_CHANNEL_DB")
  export const OPENCODE_SKIP_MIGRATIONS = truthy("OPENCODE_SKIP_MIGRATIONS")
--- a/packages/opencode/src/index.ts
+++ b/packages/opencode/src/index.ts
@@ -14,7 +14,6 @@ import { Installation } from "./installation"
 import { NamedError } from "@opencode-ai/util/error"
 import { FormatError } from "./cli/error"
 import { ServeCommand } from "./cli/cmd/serve"
-import { WorkspaceServeCommand } from "./cli/cmd/workspace-serve"
 import { Filesystem } from "./util/filesystem"
 import { DebugCommand } from "./cli/cmd/debug"
 import { StatsCommand } from "./cli/cmd/stats"
@@ -47,7 +46,7 @@ process.on("uncaughtException", (e) => {
  })
 })

-let cli = yargs(hideBin(process.argv))
+const cli = yargs(hideBin(process.argv))
  .parserConfiguration({ "populate--": true })
  .scriptName("opencode")
  .wrap(100)
@@ -145,12 +144,6 @@ let cli = yargs(hideBin(process.argv))
  .command(PrCommand)
  .command(SessionCommand)
  .command(DbCommand)
-
-if (Installation.isLocal()) {
-  cli = cli.command(WorkspaceServeCommand)
-}
-
-cli = cli
  .fail((msg, err) => {
    if (
      msg?.startsWith("Unknown argument") ||
--- a/packages/opencode/src/lsp/index.ts
+++ b/packages/opencode/src/lsp/index.ts
@@ -11,6 +11,9 @@ import { Instance } from "../project/instance"
 import { Flag } from "@/flag/flag"
 import { Process } from "../util/process"
 import { spawn as lspspawn } from "./launch"
+import { Effect, Layer, ServiceMap } from "effect"
+import { InstanceState } from "@/effect/instance-state"
+import { makeRuntime } from "@/effect/run-service"

 export namespace LSP {
  const log = Log.create({ service: "lsp" })
@@ -62,92 +65,6 @@ export namespace LSP {
    })
  export type DocumentSymbol = z.infer<typeof DocumentSymbol>

-  const filterExperimentalServers = (servers: Record<string, LSPServer.Info>) => {
-    if (Flag.OPENCODE_EXPERIMENTAL_LSP_TY) {
-      // If experimental flag is enabled, disable pyright
-      if (servers["pyright"]) {
-        log.info("LSP server pyright is disabled because OPENCODE_EXPERIMENTAL_LSP_TY is enabled")
-        delete servers["pyright"]
-      }
-    } else {
-      // If experimental flag is disabled, disable ty
-      if (servers["ty"]) {
-        delete servers["ty"]
-      }
-    }
-  }
-
-  const state = Instance.state(
-    async () => {
-      const clients: LSPClient.Info[] = []
-      const servers: Record<string, LSPServer.Info> = {}
-      const cfg = await Config.get()
-
-      if (cfg.lsp === false) {
-        log.info("all LSPs are disabled")
-        return {
-          broken: new Set<string>(),
-          servers,
-          clients,
-          spawning: new Map<string, Promise<LSPClient.Info | undefined>>(),
-        }
-      }
-
-      for (const server of Object.values(LSPServer)) {
-        servers[server.id] = server
-      }
-
-      filterExperimentalServers(servers)
-
-      for (const [name, item] of Object.entries(cfg.lsp ?? {})) {
-        const existing = servers[name]
-        if (item.disabled) {
-          log.info(`LSP server ${name} is disabled`)
-          delete servers[name]
-          continue
-        }
-        servers[name] = {
-          ...existing,
-          id: name,
-          root: existing?.root ?? (async () => Instance.directory),
-          extensions: item.extensions ?? existing?.extensions ?? [],
-          spawn: async (root) => {
-            return {
-              process: lspspawn(item.command[0], item.command.slice(1), {
-                cwd: root,
-                env: {
-                  ...process.env,
-                  ...item.env,
-                },
-              }),
-              initialization: item.initialization,
-            }
-          },
-        }
-      }
-
-      log.info("enabled LSP servers", {
-        serverIds: Object.values(servers)
-          .map((server) => server.id)
-          .join(", "),
-      })
-
-      return {
-        broken: new Set<string>(),
-        servers,
-        clients,
-        spawning: new Map<string, Promise<LSPClient.Info | undefined>>(),
-      }
-    },
-    async (state) => {
-      await Promise.all(state.clients.map((client) => client.shutdown()))
-    },
-  )
-
-  export async function init() {
-    return state()
-  }
-
  export const Status = z
    .object({
      id: z.string(),
@@ -160,168 +77,6 @@ export namespace LSP {
    })
  export type Status = z.infer<typeof Status>

-  export async function status() {
-    return state().then((x) => {
-      const result: Status[] = []
-      for (const client of x.clients) {
-        result.push({
-          id: client.serverID,
-          name: x.servers[client.serverID].id,
-          root: path.relative(Instance.directory, client.root),
-          status: "connected",
-        })
-      }
-      return result
-    })
-  }
-
-  async function getClients(file: string) {
-    const s = await state()
-
-    // Only spawn LSP clients for files within the instance directory
-    if (!Instance.containsPath(file)) {
-      return []
-    }
-
-    const extension = path.parse(file).ext || file
-    const result: LSPClient.Info[] = []
-
-    async function schedule(server: LSPServer.Info, root: string, key: string) {
-      const handle = await server
-        .spawn(root)
-        .then((value) => {
-          if (!value) s.broken.add(key)
-          return value
-        })
-        .catch((err) => {
-          s.broken.add(key)
-          log.error(`Failed to spawn LSP server ${server.id}`, { error: err })
-          return undefined
-        })
-
-      if (!handle) return undefined
-      log.info("spawned lsp server", { serverID: server.id })
-
-      const client = await LSPClient.create({
-        serverID: server.id,
-        server: handle,
-        root,
-      }).catch(async (err) => {
-        s.broken.add(key)
-        await Process.stop(handle.process)
-        log.error(`Failed to initialize LSP client ${server.id}`, { error: err })
-        return undefined
-      })
-
-      if (!client) {
-        return undefined
-      }
-
-      const existing = s.clients.find((x) => x.root === root && x.serverID === server.id)
-      if (existing) {
-        await Process.stop(handle.process)
-        return existing
-      }
-
-      s.clients.push(client)
-      return client
-    }
-
-    for (const server of Object.values(s.servers)) {
-      if (server.extensions.length && !server.extensions.includes(extension)) continue
-
-      const root = await server.root(file)
-      if (!root) continue
-      if (s.broken.has(root + server.id)) continue
-
-      const match = s.clients.find((x) => x.root === root && x.serverID === server.id)
-      if (match) {
-        result.push(match)
-        continue
-      }
-
-      const inflight = s.spawning.get(root + server.id)
-      if (inflight) {
-        const client = await inflight
-        if (!client) continue
-        result.push(client)
-        continue
-      }
-
-      const task = schedule(server, root, root + server.id)
-      s.spawning.set(root + server.id, task)
-
-      task.finally(() => {
-        if (s.spawning.get(root + server.id) === task) {
-          s.spawning.delete(root + server.id)
-        }
-      })
-
-      const client = await task
-      if (!client) continue
-
-      result.push(client)
-      Bus.publish(Event.Updated, {})
-    }
-
-    return result
-  }
-
-  export async function hasClients(file: string) {
-    const s = await state()
-    const extension = path.parse(file).ext || file
-    for (const server of Object.values(s.servers)) {
-      if (server.extensions.length && !server.extensions.includes(extension)) continue
-      const root = await server.root(file)
-      if (!root) continue
-      if (s.broken.has(root + server.id)) continue
-      return true
-    }
-    return false
-  }
-
-  export async function touchFile(input: string, waitForDiagnostics?: boolean) {
-    log.info("touching file", { file: input })
-    const clients = await getClients(input)
-    await Promise.all(
-      clients.map(async (client) => {
-        const wait = waitForDiagnostics ? client.waitForDiagnostics({ path: input }) : Promise.resolve()
-        await client.notify.open({ path: input })
-        return wait
-      }),
-    ).catch((err) => {
-      log.error("failed to touch file", { err, file: input })
-    })
-  }
-
-  export async function diagnostics() {
-    const results: Record<string, LSPClient.Diagnostic[]> = {}
-    for (const result of await runAll(async (client) => client.diagnostics)) {
-      for (const [path, diagnostics] of result.entries()) {
-        const arr = results[path] || []
-        arr.push(...diagnostics)
-        results[path] = arr
-      }
-    }
-    return results
-  }
-
-  export async function hover(input: { file: string; line: number; character: number }) {
-    return run(input.file, (client) => {
-      return client.connection
-        .sendRequest("textDocument/hover", {
-          textDocument: {
-            uri: pathToFileURL(input.file).href,
-          },
-          position: {
-            line: input.line,
-            character: input.character,
-          },
-        })
-        .catch(() => null)
-    })
-  }
-
  enum SymbolKind {
    File = 1,
    Module = 2,
@@ -362,115 +117,423 @@ export namespace LSP {
    SymbolKind.Enum,
  ]

-  export async function workspaceSymbol(query: string) {
-    return runAll((client) =>
-      client.connection
-        .sendRequest("workspace/symbol", {
-          query,
+  const filterExperimentalServers = (servers: Record<string, LSPServer.Info>) => {
+    if (Flag.OPENCODE_EXPERIMENTAL_LSP_TY) {
+      if (servers["pyright"]) {
+        log.info("LSP server pyright is disabled because OPENCODE_EXPERIMENTAL_LSP_TY is enabled")
+        delete servers["pyright"]
+      }
+    } else {
+      if (servers["ty"]) {
+        delete servers["ty"]
+      }
+    }
+  }
+
+  type LocInput = { file: string; line: number; character: number }
+
+  interface State {
+    clients: LSPClient.Info[]
+    servers: Record<string, LSPServer.Info>
+    broken: Set<string>
+    spawning: Map<string, Promise<LSPClient.Info | undefined>>
+  }
+
+  export interface Interface {
+    readonly init: () => Effect.Effect<void>
+    readonly status: () => Effect.Effect<Status[]>
+    readonly hasClients: (file: string) => Effect.Effect<boolean>
+    readonly touchFile: (input: string, waitForDiagnostics?: boolean) => Effect.Effect<void>
+    readonly diagnostics: () => Effect.Effect<Record<string, LSPClient.Diagnostic[]>>
+    readonly hover: (input: LocInput) => Effect.Effect<any>
+    readonly definition: (input: LocInput) => Effect.Effect<any[]>
+    readonly references: (input: LocInput) => Effect.Effect<any[]>
+    readonly implementation: (input: LocInput) => Effect.Effect<any[]>
+    readonly documentSymbol: (uri: string) => Effect.Effect<(LSP.DocumentSymbol | LSP.Symbol)[]>
+    readonly workspaceSymbol: (query: string) => Effect.Effect<LSP.Symbol[]>
+    readonly prepareCallHierarchy: (input: LocInput) => Effect.Effect<any[]>
+    readonly incomingCalls: (input: LocInput) => Effect.Effect<any[]>
+    readonly outgoingCalls: (input: LocInput) => Effect.Effect<any[]>
+  }
+
+  export class Service extends ServiceMap.Service<Service, Interface>()("@opencode/LSP") {}
+
+  export const layer = Layer.effect(
+    Service,
+    Effect.gen(function* () {
+      const state = yield* InstanceState.make<State>(
+        Effect.fn("LSP.state")(function* () {
+          const cfg = yield* Effect.promise(() => Config.get())
+
+          const servers: Record<string, LSPServer.Info> = {}
+
+          if (cfg.lsp === false) {
+            log.info("all LSPs are disabled")
+          } else {
+            for (const server of Object.values(LSPServer)) {
+              servers[server.id] = server
+            }
+
+            filterExperimentalServers(servers)
+
+            for (const [name, item] of Object.entries(cfg.lsp ?? {})) {
+              const existing = servers[name]
+              if (item.disabled) {
+                log.info(`LSP server ${name} is disabled`)
+                delete servers[name]
+                continue
+              }
+              servers[name] = {
+                ...existing,
+                id: name,
+                root: existing?.root ?? (async () => Instance.directory),
+                extensions: item.extensions ?? existing?.extensions ?? [],
+                spawn: async (root) => ({
+                  process: lspspawn(item.command[0], item.command.slice(1), {
+                    cwd: root,
+                    env: { ...process.env, ...item.env },
+                  }),
+                  initialization: item.initialization,
+                }),
+              }
+            }
+
+            log.info("enabled LSP servers", {
+              serverIds: Object.values(servers)
+                .map((server) => server.id)
+                .join(", "),
+            })
+          }
+
+          const s: State = {
+            clients: [],
+            servers,
+            broken: new Set(),
+            spawning: new Map(),
+          }
+
+          yield* Effect.addFinalizer(() =>
+            Effect.promise(async () => {
+              await Promise.all(s.clients.map((client) => client.shutdown()))
+            }),
+          )
+
+          return s
+        }),
+      )
+
+      const getClients = Effect.fnUntraced(function* (file: string) {
+        if (!Instance.containsPath(file)) return [] as LSPClient.Info[]
+        const s = yield* InstanceState.get(state)
+        return yield* Effect.promise(async () => {
+          const extension = path.parse(file).ext || file
+          const result: LSPClient.Info[] = []
+
+          async function schedule(server: LSPServer.Info, root: string, key: string) {
+            const handle = await server
+              .spawn(root)
+              .then((value) => {
+                if (!value) s.broken.add(key)
+                return value
+              })
+              .catch((err) => {
+                s.broken.add(key)
+                log.error(`Failed to spawn LSP server ${server.id}`, { error: err })
+                return undefined
+              })
+
+            if (!handle) return undefined
+            log.info("spawned lsp server", { serverID: server.id })
+
+            const client = await LSPClient.create({
+              serverID: server.id,
+              server: handle,
+              root,
+            }).catch(async (err) => {
+              s.broken.add(key)
+              await Process.stop(handle.process)
+              log.error(`Failed to initialize LSP client ${server.id}`, { error: err })
+              return undefined
+            })
+
+            if (!client) return undefined
+
+            const existing = s.clients.find((x) => x.root === root && x.serverID === server.id)
+            if (existing) {
+              await Process.stop(handle.process)
+              return existing
+            }
+
+            s.clients.push(client)
+            return client
+          }
+
+          for (const server of Object.values(s.servers)) {
+            if (server.extensions.length && !server.extensions.includes(extension)) continue
+
+            const root = await server.root(file)
+            if (!root) continue
+            if (s.broken.has(root + server.id)) continue
+
+            const match = s.clients.find((x) => x.root === root && x.serverID === server.id)
+            if (match) {
+              result.push(match)
+              continue
+            }
+
+            const inflight = s.spawning.get(root + server.id)
+            if (inflight) {
+              const client = await inflight
+              if (!client) continue
+              result.push(client)
+              continue
+            }
+
+            const task = schedule(server, root, root + server.id)
+            s.spawning.set(root + server.id, task)
+
+            task.finally(() => {
+              if (s.spawning.get(root + server.id) === task) {
+                s.spawning.delete(root + server.id)
+              }
+            })
+
+            const client = await task
+            if (!client) continue
+
+            result.push(client)
+            Bus.publish(Event.Updated, {})
+          }
+
+          return result
        })
-        .then((result: any) => result.filter((x: LSP.Symbol) => kinds.includes(x.kind)))
-        .then((result: any) => result.slice(0, 10))
-        .catch(() => []),
-    ).then((result) => result.flat() as LSP.Symbol[])
-  }
+      })

-  export async function documentSymbol(uri: string) {
-    const file = fileURLToPath(uri)
-    return run(file, (client) =>
-      client.connection
-        .sendRequest("textDocument/documentSymbol", {
-          textDocument: {
-            uri,
-          },
+      const run = Effect.fnUntraced(function* <T>(file: string, fn: (client: LSPClient.Info) => Promise<T>) {
+        const clients = yield* getClients(file)
+        return yield* Effect.promise(() => Promise.all(clients.map((x) => fn(x))))
+      })
+
+      const runAll = Effect.fnUntraced(function* <T>(fn: (client: LSPClient.Info) => Promise<T>) {
+        const s = yield* InstanceState.get(state)
+        return yield* Effect.promise(() => Promise.all(s.clients.map((x) => fn(x))))
+      })
+
+      const init = Effect.fn("LSP.init")(function* () {
+        yield* InstanceState.get(state)
+      })
+
+      const status = Effect.fn("LSP.status")(function* () {
+        const s = yield* InstanceState.get(state)
+        const result: Status[] = []
+        for (const client of s.clients) {
+          result.push({
+            id: client.serverID,
+            name: s.servers[client.serverID].id,
+            root: path.relative(Instance.directory, client.root),
+            status: "connected",
+          })
+        }
+        return result
+      })
+
+      const hasClients = Effect.fn("LSP.hasClients")(function* (file: string) {
+        const s = yield* InstanceState.get(state)
+        return yield* Effect.promise(async () => {
+          const extension = path.parse(file).ext || file
+          for (const server of Object.values(s.servers)) {
+            if (server.extensions.length && !server.extensions.includes(extension)) continue
+            const root = await server.root(file)
+            if (!root) continue
+            if (s.broken.has(root + server.id)) continue
+            return true
+          }
+          return false
        })
-        .catch(() => []),
-    )
-      .then((result) => result.flat() as (LSP.DocumentSymbol | LSP.Symbol)[])
-      .then((result) => result.filter(Boolean))
-  }
+      })

-  export async function definition(input: { file: string; line: number; character: number }) {
-    return run(input.file, (client) =>
-      client.connection
-        .sendRequest("textDocument/definition", {
-          textDocument: { uri: pathToFileURL(input.file).href },
-          position: { line: input.line, character: input.character },
+      const touchFile = Effect.fn("LSP.touchFile")(function* (input: string, waitForDiagnostics?: boolean) {
+        log.info("touching file", { file: input })
+        const clients = yield* getClients(input)
+        yield* Effect.promise(() =>
+          Promise.all(
+            clients.map(async (client) => {
+              const wait = waitForDiagnostics ? client.waitForDiagnostics({ path: input }) : Promise.resolve()
+              await client.notify.open({ path: input })
+              return wait
+            }),
+          ).catch((err) => {
+            log.error("failed to touch file", { err, file: input })
+          }),
+        )
+      })
+
+      const diagnostics = Effect.fn("LSP.diagnostics")(function* () {
+        const results: Record<string, LSPClient.Diagnostic[]> = {}
+        const all = yield* runAll(async (client) => client.diagnostics)
+        for (const result of all) {
+          for (const [p, diags] of result.entries()) {
+            const arr = results[p] || []
+            arr.push(...diags)
+            results[p] = arr
+          }
+        }
+        return results
+      })
+
+      const hover = Effect.fn("LSP.hover")(function* (input: LocInput) {
+        return yield* run(input.file, (client) =>
+          client.connection
+            .sendRequest("textDocument/hover", {
+              textDocument: { uri: pathToFileURL(input.file).href },
+              position: { line: input.line, character: input.character },
+            })
+            .catch(() => null),
+        )
+      })
+
+      const definition = Effect.fn("LSP.definition")(function* (input: LocInput) {
+        const results = yield* run(input.file, (client) =>
+          client.connection
+            .sendRequest("textDocument/definition", {
+              textDocument: { uri: pathToFileURL(input.file).href },
+              position: { line: input.line, character: input.character },
+            })
+            .catch(() => null),
+        )
+        return results.flat().filter(Boolean)
+      })
+
+      const references = Effect.fn("LSP.references")(function* (input: LocInput) {
+        const results = yield* run(input.file, (client) =>
+          client.connection
+            .sendRequest("textDocument/references", {
+              textDocument: { uri: pathToFileURL(input.file).href },
+              position: { line: input.line, character: input.character },
+              context: { includeDeclaration: true },
+            })
+            .catch(() => []),
+        )
+        return results.flat().filter(Boolean)
+      })
+
+      const implementation = Effect.fn("LSP.implementation")(function* (input: LocInput) {
+        const results = yield* run(input.file, (client) =>
+          client.connection
+            .sendRequest("textDocument/implementation", {
+              textDocument: { uri: pathToFileURL(input.file).href },
+              position: { line: input.line, character: input.character },
+            })
+            .catch(() => null),
+        )
+        return results.flat().filter(Boolean)
+      })
+
+      const documentSymbol = Effect.fn("LSP.documentSymbol")(function* (uri: string) {
+        const file = fileURLToPath(uri)
+        const results = yield* run(file, (client) =>
+          client.connection.sendRequest("textDocument/documentSymbol", { textDocument: { uri } }).catch(() => []),
+        )
+        return (results.flat() as (LSP.DocumentSymbol | LSP.Symbol)[]).filter(Boolean)
+      })
+
+      const workspaceSymbol = Effect.fn("LSP.workspaceSymbol")(function* (query: string) {
+        const results = yield* runAll((client) =>
+          client.connection
+            .sendRequest("workspace/symbol", { query })
+            .then((result: any) => result.filter((x: LSP.Symbol) => kinds.includes(x.kind)))
+            .then((result: any) => result.slice(0, 10))
+            .catch(() => []),
+        )
+        return results.flat() as LSP.Symbol[]
+      })
+
+      const prepareCallHierarchy = Effect.fn("LSP.prepareCallHierarchy")(function* (input: LocInput) {
+        const results = yield* run(input.file, (client) =>
+          client.connection
+            .sendRequest("textDocument/prepareCallHierarchy", {
+              textDocument: { uri: pathToFileURL(input.file).href },
+              position: { line: input.line, character: input.character },
+            })
+            .catch(() => []),
+        )
+        return results.flat().filter(Boolean)
+      })
+
+      const callHierarchyRequest = Effect.fnUntraced(function* (
+        input: LocInput,
+        direction: "callHierarchy/incomingCalls" | "callHierarchy/outgoingCalls",
+      ) {
+        const results = yield* run(input.file, async (client) => {
+          const items = (await client.connection
+            .sendRequest("textDocument/prepareCallHierarchy", {
+              textDocument: { uri: pathToFileURL(input.file).href },
+              position: { line: input.line, character: input.character },
+            })
+            .catch(() => [])) as any[]
+          if (!items?.length) return []
+          return client.connection.sendRequest(direction, { item: items[0] }).catch(() => [])
        })
-        .catch(() => null),
-    ).then((result) => result.flat().filter(Boolean))
-  }
+        return results.flat().filter(Boolean)
+      })

-  export async function references(input: { file: string; line: number; character: number }) {
-    return run(input.file, (client) =>
-      client.connection
-        .sendRequest("textDocument/references", {
-          textDocument: { uri: pathToFileURL(input.file).href },
-          position: { line: input.line, character: input.character },
-          context: { includeDeclaration: true },
-        })
-        .catch(() => []),
-    ).then((result) => result.flat().filter(Boolean))
-  }
+      const incomingCalls = Effect.fn("LSP.incomingCalls")(function* (input: LocInput) {
+        return yield* callHierarchyRequest(input, "callHierarchy/incomingCalls")
+      })

-  export async function implementation(input: { file: string; line: number; character: number }) {
-    return run(input.file, (client) =>
-      client.connection
-        .sendRequest("textDocument/implementation", {
-          textDocument: { uri: pathToFileURL(input.file).href },
-          position: { line: input.line, character: input.character },
-        })
-        .catch(() => null),
-    ).then((result) => result.flat().filter(Boolean))
-  }
+      const outgoingCalls = Effect.fn("LSP.outgoingCalls")(function* (input: LocInput) {
+        return yield* callHierarchyRequest(input, "callHierarchy/outgoingCalls")
+      })

-  export async function prepareCallHierarchy(input: { file: string; line: number; character: number }) {
-    return run(input.file, (client) =>
-      client.connection
-        .sendRequest("textDocument/prepareCallHierarchy", {
-          textDocument: { uri: pathToFileURL(input.file).href },
-          position: { line: input.line, character: input.character },
-        })
-        .catch(() => []),
-    ).then((result) => result.flat().filter(Boolean))
-  }
+      return Service.of({
+        init,
+        status,
+        hasClients,
+        touchFile,
+        diagnostics,
+        hover,
+        definition,
+        references,
+        implementation,
+        documentSymbol,
+        workspaceSymbol,
+        prepareCallHierarchy,
+        incomingCalls,
+        outgoingCalls,
+      })
+    }),
+  )

-  export async function incomingCalls(input: { file: string; line: number; character: number }) {
-    return run(input.file, async (client) => {
-      const items = (await client.connection
-        .sendRequest("textDocument/prepareCallHierarchy", {
-          textDocument: { uri: pathToFileURL(input.file).href },
-          position: { line: input.line, character: input.character },
-        })
-        .catch(() => [])) as any[]
-      if (!items?.length) return []
-      return client.connection.sendRequest("callHierarchy/incomingCalls", { item: items[0] }).catch(() => [])
-    }).then((result) => result.flat().filter(Boolean))
-  }
+  const { runPromise } = makeRuntime(Service, layer)

-  export async function outgoingCalls(input: { file: string; line: number; character: number }) {
-    return run(input.file, async (client) => {
-      const items = (await client.connection
-        .sendRequest("textDocument/prepareCallHierarchy", {
-          textDocument: { uri: pathToFileURL(input.file).href },
-          position: { line: input.line, character: input.character },
-        })
-        .catch(() => [])) as any[]
-      if (!items?.length) return []
-      return client.connection.sendRequest("callHierarchy/outgoingCalls", { item: items[0] }).catch(() => [])
-    }).then((result) => result.flat().filter(Boolean))
-  }
+  export const init = async () => runPromise((svc) => svc.init())

-  async function runAll<T>(input: (client: LSPClient.Info) => Promise<T>): Promise<T[]> {
-    const clients = await state().then((x) => x.clients)
-    const tasks = clients.map((x) => input(x))
-    return Promise.all(tasks)
-  }
+  export const status = async () => runPromise((svc) => svc.status())

-  async function run<T>(file: string, input: (client: LSPClient.Info) => Promise<T>): Promise<T[]> {
-    const clients = await getClients(file)
-    const tasks = clients.map((x) => input(x))
-    return Promise.all(tasks)
-  }
+  export const hasClients = async (file: string) => runPromise((svc) => svc.hasClients(file))
+
+  export const touchFile = async (input: string, waitForDiagnostics?: boolean) =>
+    runPromise((svc) => svc.touchFile(input, waitForDiagnostics))
+
+  export const diagnostics = async () => runPromise((svc) => svc.diagnostics())
+
+  export const hover = async (input: LocInput) => runPromise((svc) => svc.hover(input))
+
+  export const definition = async (input: LocInput) => runPromise((svc) => svc.definition(input))
+
+  export const references = async (input: LocInput) => runPromise((svc) => svc.references(input))
+
+  export const implementation = async (input: LocInput) => runPromise((svc) => svc.implementation(input))
+
+  export const documentSymbol = async (uri: string) => runPromise((svc) => svc.documentSymbol(uri))
+
+  export const workspaceSymbol = async (query: string) => runPromise((svc) => svc.workspaceSymbol(query))
+
+  export const prepareCallHierarchy = async (input: LocInput) => runPromise((svc) => svc.prepareCallHierarchy(input))
+
+  export const incomingCalls = async (input: LocInput) => runPromise((svc) => svc.incomingCalls(input))
+
+  export const outgoingCalls = async (input: LocInput) => runPromise((svc) => svc.outgoingCalls(input))

  export namespace Diagnostic {
    export function pretty(diagnostic: LSPClient.Diagnostic) {
--- a/packages/opencode/src/mcp/index.ts
+++ b/packages/opencode/src/mcp/index.ts
@@ -24,7 +24,7 @@ import { BusEvent } from "../bus/bus-event"
 import { Bus } from "@/bus"
 import { TuiEvent } from "@/cli/cmd/tui/event"
 import open from "open"
-import { Effect, Exit, Layer, Option, ServiceMap, Stream } from "effect"
+import { Effect, Layer, Option, ServiceMap, Stream } from "effect"
 import { InstanceState } from "@/effect/instance-state"
 import { makeRuntime } from "@/effect/run-service"
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
@@ -129,8 +129,6 @@ export namespace MCP {
    return typeof entry === "object" && entry !== null && "type" in entry
  }

-  const sanitize = (s: string) => s.replace(/[^a-zA-Z0-9_-]/g, "_")
-
  // Convert MCP tool definition to AI SDK Tool type
  function convertMcpTool(mcpTool: MCPToolDef, client: MCPClient, timeout?: number): Tool {
    const inputSchema = mcpTool.inputSchema
@@ -162,157 +160,141 @@ export namespace MCP {
    })
  }

-  function defs(key: string, client: MCPClient, timeout?: number) {
-    return Effect.tryPromise({
-      try: () => withTimeout(client.listTools(), timeout ?? DEFAULT_TIMEOUT),
-      catch: (err) => err instanceof Error ? err : new Error(String(err)),
-    }).pipe(
-      Effect.map((result) => result.tools),
-      Effect.catch((err) => {
-        log.error("failed to get tools from client", { key, error: err })
-        return Effect.succeed(undefined)
-      }),
-    )
+  async function defs(key: string, client: MCPClient, timeout?: number) {
+    const result = await withTimeout(client.listTools(), timeout ?? DEFAULT_TIMEOUT).catch((err) => {
+      log.error("failed to get tools from client", { key, error: err })
+      return undefined
+    })
+    return result?.tools
  }

-  function fetchFromClient<T extends { name: string }>(
+  async function fetchFromClient<T extends { name: string }>(
    clientName: string,
    client: Client,
    listFn: (c: Client) => Promise<T[]>,
    label: string,
-  ) {
-    return Effect.tryPromise({
-      try: () => listFn(client),
-      catch: (e: any) => {
-        log.error(`failed to get ${label}`, { clientName, error: e.message })
-        return e
-      },
-    }).pipe(
-      Effect.map((items) => {
-        const out: Record<string, T & { client: string }> = {}
-        const sanitizedClient = sanitize(clientName)
-        for (const item of items) {
-          out[sanitizedClient + ":" + sanitize(item.name)] = { ...item, client: clientName }
-        }
-        return out
-      }),
-      Effect.orElseSucceed(() => undefined),
-    )
+  ): Promise<Record<string, T & { client: string }> | undefined> {
+    const items = await listFn(client).catch((e: any) => {
+      log.error(`failed to get ${label}`, { clientName, error: e.message })
+      return undefined
+    })
+    if (!items) return undefined
+
+    const out: Record<string, T & { client: string }> = {}
+    const sanitizedClient = clientName.replace(/[^a-zA-Z0-9_-]/g, "_")
+    for (const item of items) {
+      const sanitizedName = item.name.replace(/[^a-zA-Z0-9_-]/g, "_")
+      out[sanitizedClient + ":" + sanitizedName] = { ...item, client: clientName }
+    }
+    return out
  }

-  type Transport = StdioClientTransport | StreamableHTTPClientTransport | SSEClientTransport
-
-  /**
-   * Connect a client via the given transport with resource safety:
-   * on failure the transport is closed; on success the caller owns it.
-   */
-  const connectTransport = (transport: Transport, timeout: number) =>
-    Effect.acquireUseRelease(
-      Effect.succeed(transport),
-      (t) => {
-        const client = new Client({ name: "opencode", version: Installation.VERSION })
-        return Effect.tryPromise({
-          try: () => client.connect(t).then(() => client),
-          catch: (e) => (e instanceof Error ? e : new Error(String(e))),
-        }).pipe(
-          Effect.timeoutOrElse({
-            duration: `${timeout} millis`,
-            onTimeout: () => Effect.fail(new Error(`Operation timed out after ${timeout}ms`)),
-          }),
-        )
-      },
-      (t, exit) =>
-        Exit.isFailure(exit)
-          ? Effect.tryPromise(() => t.close()).pipe(Effect.ignore)
-          : Effect.void,
-    )
-
-  /** Fire-and-forget Bus.publish wrapped in Effect */
-  const busPublish = <D extends BusEvent.Definition>(def: D, properties: z.output<D["properties"]>) =>
-    Effect.tryPromise(() => Bus.publish(def, properties)).pipe(Effect.ignore)
-
-  interface CreateResult {
-    mcpClient?: MCPClient
-    status: Status
-    defs?: MCPToolDef[]
-  }
-
-  const DISABLED_RESULT: CreateResult = { status: { status: "disabled" } }
-
-  const connectRemote = Effect.fn("MCP.connectRemote")(function* (key: string, mcp: Config.Mcp & { type: "remote" }) {
-    const oauthDisabled = mcp.oauth === false
-    const oauthConfig = typeof mcp.oauth === "object" ? mcp.oauth : undefined
-    let authProvider: McpOAuthProvider | undefined
-
-    if (!oauthDisabled) {
-      authProvider = new McpOAuthProvider(
-        key,
-        mcp.url,
-        {
-          clientId: oauthConfig?.clientId,
-          clientSecret: oauthConfig?.clientSecret,
-          scope: oauthConfig?.scope,
-        },
-        {
-          onRedirect: async (url) => {
-            log.info("oauth redirect requested", { key, url: url.toString() })
-          },
-        },
-      )
+  async function create(key: string, mcp: Config.Mcp) {
+    if (mcp.enabled === false) {
+      log.info("mcp server disabled", { key })
+      return {
+        mcpClient: undefined,
+        status: { status: "disabled" as const },
+      }
    }

-    const transports: Array<{ name: string; transport: TransportWithAuth }> = [
-      {
-        name: "StreamableHTTP",
-        transport: new StreamableHTTPClientTransport(new URL(mcp.url), {
-          authProvider,
-          requestInit: mcp.headers ? { headers: mcp.headers } : undefined,
-        }),
-      },
-      {
-        name: "SSE",
-        transport: new SSEClientTransport(new URL(mcp.url), {
-          authProvider,
-          requestInit: mcp.headers ? { headers: mcp.headers } : undefined,
-        }),
-      },
-    ]
+    log.info("found", { key, type: mcp.type })
+    let mcpClient: MCPClient | undefined
+    let status: Status | undefined = undefined

-    const connectTimeout = mcp.timeout ?? DEFAULT_TIMEOUT
-    let lastStatus: Status | undefined
+    if (mcp.type === "remote") {
+      // OAuth is enabled by default for remote servers unless explicitly disabled with oauth: false
+      const oauthDisabled = mcp.oauth === false
+      const oauthConfig = typeof mcp.oauth === "object" ? mcp.oauth : undefined
+      let authProvider: McpOAuthProvider | undefined

-    for (const { name, transport } of transports) {
-      const result = yield* connectTransport(transport, connectTimeout).pipe(
-        Effect.map((client) => ({ client, transportName: name })),
-        Effect.catch((error) => {
-          const lastError = error instanceof Error ? error : new Error(String(error))
+      if (!oauthDisabled) {
+        authProvider = new McpOAuthProvider(
+          key,
+          mcp.url,
+          {
+            clientId: oauthConfig?.clientId,
+            clientSecret: oauthConfig?.clientSecret,
+            scope: oauthConfig?.scope,
+          },
+          {
+            onRedirect: async (url) => {
+              log.info("oauth redirect requested", { key, url: url.toString() })
+              // Store the URL - actual browser opening is handled by startAuth
+            },
+          },
+        )
+      }
+
+      const transports: Array<{ name: string; transport: TransportWithAuth }> = [
+        {
+          name: "StreamableHTTP",
+          transport: new StreamableHTTPClientTransport(new URL(mcp.url), {
+            authProvider,
+            requestInit: mcp.headers ? { headers: mcp.headers } : undefined,
+          }),
+        },
+        {
+          name: "SSE",
+          transport: new SSEClientTransport(new URL(mcp.url), {
+            authProvider,
+            requestInit: mcp.headers ? { headers: mcp.headers } : undefined,
+          }),
+        },
+      ]
+
+      let lastError: Error | undefined
+      const connectTimeout = mcp.timeout ?? DEFAULT_TIMEOUT
+      for (const { name, transport } of transports) {
+        try {
+          const client = new Client({
+            name: "opencode",
+            version: Installation.VERSION,
+          })
+          await withTimeout(client.connect(transport), connectTimeout)
+          mcpClient = client
+          log.info("connected", { key, transport: name })
+          status = { status: "connected" }
+          break
+        } 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) {
            log.info("mcp server requires authentication", { key, transport: name })

+            // Check if this is a "needs registration" error
            if (lastError.message.includes("registration") || lastError.message.includes("client_id")) {
-              lastStatus = {
+              status = {
                status: "needs_client_registration" as const,
                error: "Server does not support dynamic client registration. Please provide clientId in config.",
              }
-              return busPublish(TuiEvent.ToastShow, {
+              // Show toast for needs_client_registration
+              Bus.publish(TuiEvent.ToastShow, {
                title: "MCP Authentication Required",
                message: `Server "${key}" requires a pre-registered client ID. Add clientId to your config.`,
                variant: "warning",
                duration: 8000,
-              }).pipe(Effect.as(undefined))
+              }).catch((e) => log.debug("failed to show toast", { error: e }))
            } else {
+              // Store transport for later finishAuth call
              pendingOAuthTransports.set(key, transport)
-              lastStatus = { status: "needs_auth" as const }
-              return busPublish(TuiEvent.ToastShow, {
+              status = { status: "needs_auth" as const }
+              // Show toast for needs_auth
+              Bus.publish(TuiEvent.ToastShow, {
                title: "MCP Authentication Required",
                message: `Server "${key}" requires authentication. Run: opencode mcp auth ${key}`,
                variant: "warning",
                duration: 8000,
-              }).pipe(Effect.as(undefined))
+              }).catch((e) => log.debug("failed to show toast", { error: e }))
            }
+            break
          }

          log.debug("transport connection failed", {
@@ -321,75 +303,91 @@ export namespace MCP {
            url: mcp.url,
            error: lastError.message,
          })
-          lastStatus = { status: "failed" as const, error: lastError.message }
-          return Effect.succeed(undefined)
-        }),
-      )
-      if (result) {
-        log.info("connected", { key, transport: result.transportName })
-        return { client: result.client as MCPClient | undefined, status: { status: "connected" } as Status }
+          status = {
+            status: "failed" as const,
+            error: lastError.message,
+          }
+        }
      }
-      // If this was an auth error, stop trying other transports
-      if (lastStatus?.status === "needs_auth" || lastStatus?.status === "needs_client_registration") break
    }

-    return { client: undefined as MCPClient | undefined, status: (lastStatus ?? { status: "failed", error: "Unknown error" }) as Status }
-  })
+    if (mcp.type === "local") {
+      const [cmd, ...args] = mcp.command
+      const cwd = Instance.directory
+      const transport = new StdioClientTransport({
+        stderr: "pipe",
+        command: cmd,
+        args,
+        cwd,
+        env: {
+          ...process.env,
+          ...(cmd === "opencode" ? { BUN_BE_BUN: "1" } : {}),
+          ...mcp.environment,
+        },
+      })
+      transport.stderr?.on("data", (chunk: Buffer) => {
+        log.info(`mcp stderr: ${chunk.toString()}`, { key })
+      })

-  const connectLocal = Effect.fn("MCP.connectLocal")(function* (key: string, mcp: Config.Mcp & { type: "local" }) {
-    const [cmd, ...args] = mcp.command
-    const cwd = Instance.directory
-    const transport = new StdioClientTransport({
-      stderr: "pipe",
-      command: cmd,
-      args,
-      cwd,
-      env: {
-        ...process.env,
-        ...(cmd === "opencode" ? { BUN_BE_BUN: "1" } : {}),
-        ...mcp.environment,
-      },
-    })
-    transport.stderr?.on("data", (chunk: Buffer) => {
-      log.info(`mcp stderr: ${chunk.toString()}`, { key })
-    })
-
-    const connectTimeout = mcp.timeout ?? DEFAULT_TIMEOUT
-    return yield* connectTransport(transport, connectTimeout).pipe(
-      Effect.map((client): { client: MCPClient | undefined; status: Status } => ({ client, status: { status: "connected" } })),
-      Effect.catch((error): Effect.Effect<{ client: MCPClient | undefined; status: Status }> => {
-        const msg = error instanceof Error ? error.message : String(error)
-        log.error("local mcp startup failed", { key, command: mcp.command, cwd, error: msg })
-        return Effect.succeed({ client: undefined, status: { status: "failed", error: msg } })
-      }),
-    )
-  })
-
-  const create = Effect.fn("MCP.create")(function* (key: string, mcp: Config.Mcp) {
-    if (mcp.enabled === false) {
-      log.info("mcp server disabled", { key })
-      return DISABLED_RESULT
+      const connectTimeout = mcp.timeout ?? DEFAULT_TIMEOUT
+      try {
+        const client = new Client({
+          name: "opencode",
+          version: Installation.VERSION,
+        })
+        await withTimeout(client.connect(transport), connectTimeout)
+        mcpClient = client
+        status = {
+          status: "connected",
+        }
+      } catch (error) {
+        log.error("local mcp startup failed", {
+          key,
+          command: mcp.command,
+          cwd,
+          error: error instanceof Error ? error.message : String(error),
+        })
+        status = {
+          status: "failed" as const,
+          error: error instanceof Error ? error.message : String(error),
+        }
+      }
    }

-    log.info("found", { key, type: mcp.type })
-
-    const { client: mcpClient, status } = mcp.type === "remote"
-      ? yield* connectRemote(key, mcp as Config.Mcp & { type: "remote" })
-      : yield* connectLocal(key, mcp as Config.Mcp & { type: "local" })
+    if (!status) {
+      status = {
+        status: "failed" as const,
+        error: "Unknown error",
+      }
+    }

    if (!mcpClient) {
-      return { status } satisfies CreateResult
+      return {
+        mcpClient: undefined,
+        status,
+      }
    }

-    const listed = yield* defs(key, mcpClient, mcp.timeout)
+    const listed = await defs(key, mcpClient, mcp.timeout)
    if (!listed) {
-      yield* Effect.tryPromise(() => mcpClient.close()).pipe(Effect.ignore)
-      return { status: { status: "failed", error: "Failed to get tools" } } satisfies CreateResult
+      await mcpClient.close().catch((error) => {
+        log.error("Failed to close MCP client", {
+          error,
+        })
+      })
+      return {
+        mcpClient: undefined,
+        status: { status: "failed" as const, error: "Failed to get tools" },
+      }
    }

    log.info("create() successfully created client", { key, toolCount: listed.length })
-    return { mcpClient, status, defs: listed } satisfies CreateResult
-  })
+    return {
+      mcpClient,
+      status,
+      defs: listed,
+    }
+  }

  // --- Effect Service ---

@@ -465,20 +463,20 @@ export namespace MCP {
          log.info("tools list changed notification received", { server: name })
          if (s.clients[name] !== client || s.status[name]?.status !== "connected") return

-          const listed = await Effect.runPromise(defs(name, client, timeout))
+          const listed = await defs(name, client, timeout)
          if (!listed) return
          if (s.clients[name] !== client || s.status[name]?.status !== "connected") return

          s.defs[name] = listed
-          await Effect.runPromise(busPublish(ToolsChanged, { server: name }))
+          await Bus.publish(ToolsChanged, { server: name }).catch((error) =>
+            log.warn("failed to publish tools changed", { server: name, error }),
+          )
        })
      }

-      const getConfig = () => Effect.promise(() => Config.get())
-
      const cache = yield* InstanceState.make<State>(
        Effect.fn("MCP.state")(function* () {
-          const cfg = yield* getConfig()
+          const cfg = yield* Effect.promise(() => Config.get())
          const config = cfg.mcp ?? {}
          const s: State = {
            status: {},
@@ -500,15 +498,13 @@ export namespace MCP {
                  return
                }

-                const result = yield* create(key, mcp).pipe(
-                  Effect.catch(() => Effect.succeed(undefined)),
-                )
+                const result = yield* Effect.promise(() => create(key, mcp).catch(() => undefined))
                if (!result) return

                s.status[key] = result.status
                if (result.mcpClient) {
                  s.clients[key] = result.mcpClient
-                  s.defs[key] = result.defs!
+                  s.defs[key] = result.defs
                  watch(s, key, result.mcpClient, mcp.timeout)
                }
              }),
@@ -546,12 +542,14 @@ export namespace MCP {
        const client = s.clients[name]
        delete s.defs[name]
        if (!client) return Effect.void
-        return Effect.tryPromise(() => client.close()).pipe(Effect.ignore)
+        return Effect.promise(() =>
+          client.close().catch((error: any) => log.error("failed to close MCP client", { name, error })),
+        )
      }

      const status = Effect.fn("MCP.status")(function* () {
        const s = yield* InstanceState.get(cache)
-        const cfg = yield* getConfig()
+        const cfg = yield* Effect.promise(() => Config.get())
        const config = cfg.mcp ?? {}
        const result: Record<string, Status> = {}

@@ -570,7 +568,14 @@ export namespace MCP {

      const createAndStore = Effect.fn("MCP.createAndStore")(function* (name: string, mcp: Config.Mcp) {
        const s = yield* InstanceState.get(cache)
-        const result = yield* create(name, mcp)
+        const result = yield* Effect.promise(() => create(name, mcp))
+
+        if (!result) {
+          yield* closeClient(s, name)
+          delete s.clients[name]
+          s.status[name] = { status: "failed" as const, error: "unknown error" }
+          return s.status[name]
+        }

        s.status[name] = result.status
        if (!result.mcpClient) {
@@ -581,7 +586,7 @@ export namespace MCP {

        yield* closeClient(s, name)
        s.clients[name] = result.mcpClient
-        s.defs[name] = result.defs!
+        s.defs[name] = result.defs
        watch(s, name, result.mcpClient, mcp.timeout)
        return result.status
      })
@@ -611,7 +616,7 @@ export namespace MCP {
      const tools = Effect.fn("MCP.tools")(function* () {
        const result: Record<string, Tool> = {}
        const s = yield* InstanceState.get(cache)
-        const cfg = yield* getConfig()
+        const cfg = yield* Effect.promise(() => Config.get())
        const config = cfg.mcp ?? {}
        const defaultTimeout = cfg.experimental?.mcp_timeout

@@ -634,7 +639,9 @@ export namespace MCP {

              const timeout = entry?.timeout ?? defaultTimeout
              for (const mcpTool of listed) {
-                result[sanitize(clientName) + "_" + sanitize(mcpTool.name)] = convertMcpTool(mcpTool, client, timeout)
+                const sanitizedClientName = clientName.replace(/[^a-zA-Z0-9_-]/g, "_")
+                const sanitizedToolName = mcpTool.name.replace(/[^a-zA-Z0-9_-]/g, "_")
+                result[sanitizedClientName + "_" + sanitizedToolName] = convertMcpTool(mcpTool, client, timeout)
              }
            }),
          { concurrency: "unbounded" },
@@ -642,29 +649,30 @@ export namespace MCP {
        return result
      })

-      function collectFromConnected<T extends { name: string }>(
+      function collectFromConnected<T>(
        s: State,
-        listFn: (c: Client) => Promise<T[]>,
-        label: string,
+        fetchFn: (clientName: string, client: Client) => Promise<Record<string, T> | undefined>,
      ) {
        return Effect.forEach(
          Object.entries(s.clients).filter(([name]) => s.status[name]?.status === "connected"),
          ([clientName, client]) =>
-            fetchFromClient(clientName, client, listFn, label).pipe(
-              Effect.map((items) => Object.entries(items ?? {})),
-            ),
+            Effect.promise(async () => Object.entries((await fetchFn(clientName, client)) ?? {})),
          { concurrency: "unbounded" },
-        ).pipe(Effect.map((results) => Object.fromEntries<T & { client: string }>(results.flat())))
+        ).pipe(Effect.map((results) => Object.fromEntries<T>(results.flat())))
      }

      const prompts = Effect.fn("MCP.prompts")(function* () {
        const s = yield* InstanceState.get(cache)
-        return yield* collectFromConnected(s, (c) => c.listPrompts().then((r) => r.prompts), "prompts")
+        return yield* collectFromConnected(s, (name, client) =>
+          fetchFromClient(name, client, (c) => c.listPrompts().then((r) => r.prompts), "prompts"),
+        )
      })

      const resources = Effect.fn("MCP.resources")(function* () {
        const s = yield* InstanceState.get(cache)
-        return yield* collectFromConnected(s, (c) => c.listResources().then((r) => r.resources), "resources")
+        return yield* collectFromConnected(s, (name, client) =>
+          fetchFromClient(name, client, (c) => c.listResources().then((r) => r.resources), "resources"),
+        )
      })

      const withClient = Effect.fnUntraced(function* <A>(
@@ -705,7 +713,7 @@ export namespace MCP {
      })

      const getMcpConfig = Effect.fnUntraced(function* (mcpName: string) {
-        const cfg = yield* getConfig()
+        const cfg = yield* Effect.promise(() => Config.get())
        const mcpConfig = cfg.mcp?.[mcpName]
        if (!mcpConfig || !isMcpConfigured(mcpConfig)) return undefined
        return mcpConfig
@@ -742,21 +750,19 @@ export namespace MCP {

        const transport = new StreamableHTTPClientTransport(new URL(mcpConfig.url), { authProvider })

-        return yield* Effect.tryPromise({
-          try: () => {
+        return yield* Effect.promise(async () => {
+          try {
            const client = new Client({ name: "opencode", version: Installation.VERSION })
-            return client.connect(transport).then(() => ({ authorizationUrl: "", oauthState }))
-          },
-          catch: (error) => error,
-        }).pipe(
-          Effect.catch((error) => {
+            await client.connect(transport)
+            return { authorizationUrl: "", oauthState }
+          } catch (error) {
            if (error instanceof UnauthorizedError && capturedUrl) {
              pendingOAuthTransports.set(mcpName, transport)
-              return Effect.succeed({ authorizationUrl: capturedUrl.toString(), oauthState })
+              return { authorizationUrl: capturedUrl.toString(), oauthState }
            }
-            return Effect.die(error)
-          }),
-        )
+            throw error
+          }
+        })
      })

      const authenticate = Effect.fn("MCP.authenticate")(function* (mcpName: string) {
@@ -785,7 +791,7 @@ export namespace MCP {
          ),
          Effect.catch(() => {
            log.warn("failed to open browser, user must open URL manually", { mcpName })
-            return busPublish(BrowserOpenFailed, { mcpName, url: authorizationUrl })
+            return Effect.promise(() => Bus.publish(BrowserOpenFailed, { mcpName, url: authorizationUrl }))
          }),
        )

@@ -805,7 +811,10 @@ export namespace MCP {
        if (!transport) throw new Error(`No pending OAuth flow for MCP server: ${mcpName}`)

        const result = yield* Effect.tryPromise({
-          try: () => transport.finishAuth(authorizationCode).then(() => true as const),
+          try: async () => {
+            await transport.finishAuth(authorizationCode)
+            return true
+          },
          catch: (error) => {
            log.error("failed to finish oauth", { mcpName, error })
            return error
--- a/packages/opencode/src/server/server.ts
+++ b/packages/opencode/src/server/server.ts
@@ -19,7 +19,6 @@ import { Auth } from "../auth"
 import { Flag } from "../flag/flag"
 import { Command } from "../command"
 import { Global } from "../global"
-import { WorkspaceContext } from "../control-plane/workspace-context"
 import { WorkspaceID } from "../control-plane/schema"
 import { ProviderID } from "../provider/schema"
 import { WorkspaceRouterMiddleware } from "../control-plane/workspace-router-middleware"
@@ -56,6 +55,12 @@ initProjectors()

 export namespace Server {
  const log = Log.create({ service: "server" })
+  const DEFAULT_CSP =
+    "default-src 'self'; script-src 'self' 'wasm-unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src 'self' data: https:; font-src 'self' data:; media-src 'self' data:; connect-src 'self' data:"
+  const embeddedUIPromise = Flag.OPENCODE_DISABLE_EMBEDDED_WEB_UI
+    ? Promise.resolve(null)
+    : // @ts-expect-error - generated file at build time
+      import("opencode-web-ui.gen.ts").then((module) => module.default as Record<string, string>).catch(() => null)

  export const Default = lazy(() => createApp({}))

@@ -198,7 +203,6 @@ export namespace Server {
      )
      .use(async (c, next) => {
        if (c.req.path === "/log") return next()
-        const rawWorkspaceID = c.req.query("workspace") || c.req.header("x-opencode-workspace")
        const raw = c.req.query("directory") || c.req.header("x-opencode-directory") || process.cwd()
        const directory = Filesystem.resolve(
          (() => {
@@ -210,20 +214,14 @@ export namespace Server {
          })(),
        )

-        return WorkspaceContext.provide({
-          workspaceID: rawWorkspaceID ? WorkspaceID.make(rawWorkspaceID) : undefined,
+        return Instance.provide({
+          directory,
+          init: InstanceBootstrap,
          async fn() {
-            return Instance.provide({
-              directory,
-              init: InstanceBootstrap,
-              async fn() {
-                return next()
-              },
-            })
+            return next()
          },
        })
      })
-      .use(WorkspaceRouterMiddleware)
      .get(
        "/doc",
        openAPIRouteHandler(app, {
@@ -246,6 +244,7 @@ export namespace Server {
          }),
        ),
      )
+      .use(WorkspaceRouterMiddleware)
      .route("/project", ProjectRoutes())
      .route("/pty", PtyRoutes())
      .route("/config", ConfigRoutes())
@@ -504,24 +503,40 @@ export namespace Server {
        },
      )
      .all("/*", async (c) => {
+        const embeddedWebUI = await embeddedUIPromise
        const path = c.req.path

-        const response = await proxy(`https://app.opencode.ai${path}`, {
-          ...c.req,
-          headers: {
-            ...c.req.raw.headers,
-            host: "app.opencode.ai",
-          },
-        })
-        const match = response.headers.get("content-type")?.includes("text/html")
-          ? (await response.clone().text()).match(
-              /<script\b(?![^>]*\bsrc\s*=)[^>]*\bid=(['"])oc-theme-preload-script\1[^>]*>([\s\S]*?)<\/script>/i,
-            )
-          : undefined
-        const hash = match ? createHash("sha256").update(match[2]).digest("base64") : ""
-        response.headers.set("Content-Security-Policy", csp(hash))
-        return response
-      })
+        if (embeddedWebUI) {
+          const match = embeddedWebUI[path.replace(/^\//, "")] ?? embeddedWebUI["index.html"] ?? null
+          if (!match) return c.json({ error: "Not Found" }, 404)
+          const file = Bun.file(match)
+          if (await file.exists()) {
+            c.header("Content-Type", file.type)
+            if (file.type.startsWith("text/html")) {
+              c.header("Content-Security-Policy", DEFAULT_CSP)
+            }
+            return c.body(await file.arrayBuffer())
+          } else {
+            return c.json({ error: "Not Found" }, 404)
+          }
+        } else {
+          const response = await proxy(`https://app.opencode.ai${path}`, {
+            ...c.req,
+            headers: {
+              ...c.req.raw.headers,
+              host: "app.opencode.ai",
+            },
+          })
+          const match = response.headers.get("content-type")?.includes("text/html")
+            ? (await response.clone().text()).match(
+                /<script\b(?![^>]*\bsrc\s*=)[^>]*\bid=(['"])oc-theme-preload-script\1[^>]*>([\s\S]*?)<\/script>/i,
+              )
+            : undefined
+          const hash = match ? createHash("sha256").update(match[2]).digest("base64") : ""
+          response.headers.set("Content-Security-Policy", csp(hash))
+          return response
+        }
+      }) as unknown as Hono
  }

  export async function openapi() {
--- a/packages/opencode/src/session/index.ts
+++ b/packages/opencode/src/session/index.ts
@@ -23,7 +23,6 @@ import { SessionPrompt } from "./prompt"
 import { fn } from "@/util/fn"
 import { Command } from "../command"
 import { Snapshot } from "@/snapshot"
-import { WorkspaceContext } from "../control-plane/workspace-context"
 import { ProjectID } from "../project/schema"
 import { WorkspaceID } from "../control-plane/schema"
 import { SessionID, MessageID, PartID } from "./schema"
@@ -494,8 +493,8 @@ export namespace Session {
    const project = Instance.project
    const conditions = [eq(SessionTable.project_id, project.id)]

-    if (WorkspaceContext.workspaceID) {
-      conditions.push(eq(SessionTable.workspace_id, WorkspaceContext.workspaceID))
+    if (input?.workspaceID) {
+      conditions.push(eq(SessionTable.workspace_id, input.workspaceID))
    }
    if (input?.directory) {
      conditions.push(eq(SessionTable.directory, input.directory))
--- a/packages/opencode/src/session/prompt/gpt.txt
+++ b/packages/opencode/src/session/prompt/gpt.txt
@@ -0,0 +1,116 @@
+You are OpenCode, You and the user share the same workspace and collaborate to achieve the user's goals.
+
+You are a deeply pragmatic, effective software engineer. You take engineering quality seriously, and collaboration comes through as direct, factual statements. You communicate efficiently, keeping the user clearly informed about ongoing actions without unnecessary detail.
+
+## Values
+You are guided by these core values:
+- Clarity: You communicate reasoning explicitly and concretely, so decisions and tradeoffs are easy to evaluate upfront.
+- Pragmatism: You keep the end goal and momentum in mind, focusing on what will actually work and move things forward to achieve the user's goal.
+- Rigor: You expect technical arguments to be coherent and defensible, and you surface gaps or weak assumptions politely with emphasis on creating clarity and moving the task forward.
+
+## Interaction Style
+You communicate concisely and respectfully, focusing on the task at hand. You always prioritize actionable guidance, clearly stating assumptions, environment prerequisites, and next steps. Unless explicitly asked, you avoid excessively verbose explanations about your work.
+
+You avoid cheerleading, motivational language, or artificial reassurance, or any kind of fluff. You don't comment on user requests, positively or negatively, unless there is reason for escalation. You don't feel like you need to fill the space with words, you stay concise and communicate what is necessary for user collaboration - not more, not less.
+
+## Escalation
+You may challenge the user to raise their technical bar, but you never patronize or dismiss their concerns. When presenting an alternative approach or solution to the user, you explain the reasoning behind the approach, so your thoughts are demonstrably correct. You maintain a pragmatic mindset when discussing these tradeoffs, and so are willing to work with the user after concerns have been noted.
+
+
+# General
+As an expert coding agent, your primary focus is writing code, answering questions, and helping the user complete their task in the current environment. You build context by examining the codebase first without making assumptions or jumping to conclusions. You think through the nuances of the code you encounter, and embody the mentality of a skilled senior software engineer.
+
+- When searching for text or files, prefer using Glob and Grep tools (they are powered by `rg`)
+- Parallelize tool calls whenever possible - especially file reads. Use `multi_tool_use.parallel` to parallelize tool calls and only this. Never chain together bash commands with separators like `echo "====";` as this renders to the user poorly.
+
+## Editing constraints
+
+- Default to ASCII when editing or creating files. Only introduce non-ASCII or other Unicode characters when there is a clear justification and the file already uses them.
+- Add succinct code comments that explain what is going on if code is not self-explanatory. You should not add comments like "Assigns the value to the variable", but a brief comment might be useful ahead of a complex code block that the user would otherwise have to spend time parsing out. Usage of these comments should be rare.
+- Always use apply_patch for manual code edits. Do not use cat or any other commands when creating or editing files. Formatting commands or bulk edits don't need to be done with apply_patch.
+- Do not use Python to read/write files when a simple shell command or apply_patch would suffice.
+- You may be in a dirty git worktree.
+  * NEVER revert existing changes you did not make unless explicitly requested, since these changes were made by the user.
+  * If asked to make a commit or code edits and there are unrelated changes to your work or changes that you didn't make in those files, don't revert those changes.
+  * If the changes are in files you've touched recently, you should read carefully and understand how you can work with the changes rather than reverting them.
+  * If the changes are in unrelated files, just ignore them and don't revert them.
+- Do not amend a commit unless explicitly requested to do so.
+- While you are working, you might notice unexpected changes that you didn't make. It's likely the user made them, or were autogenerated. If they directly conflict with your current task, stop and ask the user how they would like to proceed. Otherwise, focus on the task at hand.
+- **NEVER** use destructive commands like `git reset --hard` or `git checkout --` unless specifically requested or approved by the user.
+- You struggle using the git interactive console. **ALWAYS** prefer using non-interactive git commands.
+
+## Special user requests
+
+- If the user makes a simple request (such as asking for the time) which you can fulfill by running a terminal command (such as `date`), you should do so.
+- If the user asks for a "review", default to a code review mindset: prioritise identifying bugs, risks, behavioural regressions, and missing tests. Findings must be the primary focus of the response - keep summaries or overviews brief and only after enumerating the issues. Present findings first (ordered by severity with file/line references), follow with open questions or assumptions, and offer a change-summary only as a secondary detail. If no findings are discovered, state that explicitly and mention any residual risks or testing gaps.
+
+## Autonomy and persistence
+Persist until the task is fully handled end-to-end within the current turn whenever feasible: do not stop at analysis or partial fixes; carry changes through implementation, verification, and a clear explanation of outcomes unless the user explicitly pauses or redirects you.
+
+Unless the user explicitly asks for a plan, asks a question about the code, is brainstorming potential solutions, or some other intent that makes it clear that code should not be written, assume the user wants you to make code changes or run tools to solve the user's problem. In these cases, it's bad to output your proposed solution in a message, you should go ahead and actually implement the change. If you encounter challenges or blockers, you should attempt to resolve them yourself.
+
+## Frontend tasks
+
+When doing frontend design tasks, avoid collapsing into "AI slop" or safe, average-looking layouts.
+- Ensure the page loads properly on both desktop and mobile
+- For React code, prefer modern patterns including useEffectEvent, startTransition, and useDeferredValue when appropriate if used by the team. Do not add useMemo/useCallback by default unless already used; follow the repo's React Compiler guidance.
+- Overall: Avoid boilerplate layouts and interchangeable UI patterns. Vary themes, type families, and visual languages across outputs.
+
+Exception: If working within an existing website or design system, preserve the established patterns, structure, and visual language.
+
+# Working with the user
+
+You interact with the user through a terminal. You have 2 ways of communicating with the users:
+- Share intermediary updates in `commentary` channel.
+- After you have completed all your work, send a message to the `final` channel.
+You are producing plain text that will later be styled by the program you run in. Formatting should make results easy to scan, but not feel mechanical. Use judgment to decide how much structure adds value. Follow the formatting rules exactly.
+
+## Formatting rules
+
+- You may format with GitHub-flavored Markdown.
+- Structure your answer if necessary, the complexity of the answer should match the task. If the task is simple, your answer should be a one-liner. Order sections from general to specific to supporting.
+- Never use nested bullets. Keep lists flat (single level). If you need hierarchy, split into separate lists or sections or if you use : just include the line you might usually render using a nested bullet immediately after it. For numbered lists, only use the `1. 2. 3.` style markers (with a period), never `1)`.
+- Headers are optional, only use them when you think they are necessary. If you do use them, use short Title Case (1-3 words) wrapped in **…**. Don't add a blank line.
+- Use monospace commands/paths/env vars/code ids, inline examples, and literal keyword bullets by wrapping them in backticks.
+- Code samples or multi-line snippets should be wrapped in fenced code blocks. Include an info string as often as possible.
+- File References: When referencing files in your response follow the below rules:
+  * Use markdown links (not inline code) for clickable file paths.
+  * Each reference should have a stand alone path. Even if it's the same file.
+  * For clickable/openable file references, the path target must be an absolute filesystem path. Labels may be short (for example, `[app.ts](/abs/path/app.ts)`).
+  * Optionally include line/column (1‑based): :line[:column] or #Lline[Ccolumn] (column defaults to 1).
+  * Do not use URIs like file://, vscode://, or https://.
+  * Do not provide range of lines
+- Don’t use emojis or em dashes unless explicitly instructed.
+
+## Final answer instructions
+
+Always favor conciseness in your final answer - you should usually avoid long-winded explanations and focus only on the most important details. For casual chit-chat, just chat. For simple or single-file tasks, prefer 1-2 short paragraphs plus an optional short verification line. Do not default to bullets. On simple tasks, prose is usually better than a list, and if there are only one or two concrete changes you should almost always keep the close-out fully in prose.
+
+On larger tasks, use at most 2-3 high-level sections when helpful. Each section can be a short paragraph or a few flat bullets. Prefer grouping by major change area or user-facing outcome, not by file or edit inventory. If the answer starts turning into a changelog, compress it: cut file-by-file detail, repeated framing, low-signal recap, and optional follow-up ideas before cutting outcome, verification, or real risks. Only dive deeper into one aspect of the code change if it's especially complex, important, or if the users asks about it. This also holds true for PR explanations, codebase walkthroughs, or architectural decisions: provide a high-level walkthrough unless specifically asked and cap answers at 2-3 sections.
+
+Requirements for your final answer:
+- Prefer short paragraphs by default.
+- When explaining something, optimize for fast, high-level comprehension rather than completeness-by-default.
+- Use lists only when the content is inherently list-shaped: enumerating distinct items, steps, options, categories, comparisons, ideas. Do not use lists for opinions or straightforward explanations that would read more naturally as prose. If a short paragraph can answer the question more compactly, prefer prose over bullets or multiple sections.
+- Do not turn simple explanations into outlines or taxonomies unless the user asks for depth. If a list is used, each bullet should be a complete standalone point.
+- Do not begin responses with conversational interjections or meta commentary. Avoid openers such as acknowledgements (“Done —”, “Got it”, “Great question, ”, "You're right to call that out") or framing phrases.
+- When asked to show the output of a command (e.g. `git show`), relay the important details in your answer or summarize the key lines so the user understands the result.
+- Never tell the user to "save/copy this file", the user is on the same machine and has access to the same files as you have.
+- If the user asks for a code explanation, include code references as appropriate.
+- If you weren't able to do something, for example run tests, tell the user.
+- Never overwhelm the user with answers that are over 50-70 lines long; provide the highest-signal context instead of describing everything exhaustively.
+
+## Intermediary updates
+
+- Intermediary updates go to the `commentary` channel.
+- User updates are short updates while you are working, they are NOT final answers.
+- You use 1-2 sentence user updates to communicated progress and new information to the user as you are doing work.
+- Do not begin responses with conversational interjections or meta commentary. Avoid openers such as acknowledgements (“Done —”, “Got it”, “Great question, ”) or framing phrases.
+- Before exploring or doing substantial work, you start with a user update acknowledging the request and explaining your first step. You should include your understanding of the user request and explain what you will do. Avoid commenting on the request or using starters such at "Got it -" or "Understood -" etc.
+- You provide user updates frequently, every 30s.
+- When exploring, e.g. searching, reading files you provide user updates as you go, explaining what context you are gathering and what you've learned. Vary your sentence structure when providing these updates to avoid sounding repetitive - in particular, don't start each sentence the same way.
+- When working for a while, keep updates informative and varied, but stay concise.
+- After you have sufficient context, and the work is substantial you provide a longer plan (this is the only user update that may be longer than 2 sentences and can contain formatting).
+- Before performing file edits of any kind, you provide updates explaining what edits you are making.
+- As you are thinking, you very frequently provide updates even if not taking any actions, informing the user of your progress. You interrupt your thinking and send multiple updates in a row if thinking for more than 100 words.
+- Tone of your updates MUST match your personality.
--- a/packages/opencode/src/session/system.ts
+++ b/packages/opencode/src/session/system.ts
@@ -6,6 +6,7 @@ import PROMPT_ANTHROPIC from "./prompt/anthropic.txt"
 import PROMPT_DEFAULT from "./prompt/default.txt"
 import PROMPT_BEAST from "./prompt/beast.txt"
 import PROMPT_GEMINI from "./prompt/gemini.txt"
+import PROMPT_GPT from "./prompt/gpt.txt"

 import PROMPT_CODEX from "./prompt/codex.txt"
 import PROMPT_TRINITY from "./prompt/trinity.txt"
@@ -18,7 +19,12 @@ export namespace SystemPrompt {
  export function provider(model: Provider.Model) {
    if (model.api.id.includes("gpt-4") || model.api.id.includes("o1") || model.api.id.includes("o3"))
      return [PROMPT_BEAST]
-    if (model.api.id.includes("gpt")) return [PROMPT_CODEX]
+    if (model.api.id.includes("gpt")) {
+      if (model.api.id.includes("codex")) {
+        return [PROMPT_CODEX]
+      }
+      return [PROMPT_GPT]
+    }
    if (model.api.id.includes("gemini-")) return [PROMPT_GEMINI]
    if (model.api.id.includes("claude")) return [PROMPT_ANTHROPIC]
    if (model.api.id.toLowerCase().includes("trinity")) return [PROMPT_TRINITY]
--- a/packages/opencode/test/control-plane/session-proxy-middleware.test.ts
+++ b/packages/opencode/test/control-plane/session-proxy-middleware.test.ts
@@ -1,159 +0,0 @@
-import { afterEach, describe, expect, mock, test } from "bun:test"
-import { WorkspaceID } from "../../src/control-plane/schema"
-import { Hono } from "hono"
-import { tmpdir } from "../fixture/fixture"
-import { Project } from "../../src/project/project"
-import { WorkspaceTable } from "../../src/control-plane/workspace.sql"
-import { Instance } from "../../src/project/instance"
-import { WorkspaceContext } from "../../src/control-plane/workspace-context"
-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 }>
-}
-
-const remote = { type: "testing", name: "remote-a" } as unknown as typeof WorkspaceTable.$inferInsert
-
-async function setup(state: State) {
-  const TestAdaptor: Adaptor = {
-    configure(config) {
-      return config
-    },
-    async create() {
-      throw new Error("not used")
-    },
-    async remove() {},
-
-    async fetch(_config: unknown, input: RequestInfo | URL, init?: RequestInit) {
-      const url =
-        input instanceof Request || input instanceof URL
-          ? input.toString()
-          : new URL(input, "http://workspace.test").toString()
-      const request = new Request(url, init)
-      const body = request.method === "GET" || request.method === "HEAD" ? undefined : await request.text()
-      state.calls.push({
-        method: request.method,
-        url: `${new URL(request.url).pathname}${new URL(request.url).search}`,
-        body,
-      })
-      return new Response("proxied", { status: 202 })
-    },
-  }
-
-  adaptors.installAdaptor("testing", TestAdaptor)
-
-  await using tmp = await tmpdir({ git: true })
-  const { project } = await Project.fromDirectory(tmp.path)
-
-  const id1 = WorkspaceID.ascending()
-  const id2 = WorkspaceID.ascending()
-
-  Database.use((db) =>
-    db
-      .insert(WorkspaceTable)
-      .values([
-        {
-          id: id1,
-          branch: "main",
-          project_id: project.id,
-          type: remote.type,
-          name: remote.name,
-        },
-        {
-          id: id2,
-          branch: "main",
-          project_id: project.id,
-          type: "worktree",
-          directory: tmp.path,
-          name: "local",
-        },
-      ])
-      .run(),
-  )
-
-  const { WorkspaceRouterMiddleware } = await import("../../src/control-plane/workspace-router-middleware")
-  const app = new Hono().use(WorkspaceRouterMiddleware)
-
-  return {
-    id1,
-    id2,
-    app,
-    async request(input: RequestInfo | URL, init?: RequestInit) {
-      return Instance.provide({
-        directory: tmp.path,
-        fn: async () =>
-          WorkspaceContext.provide({
-            workspaceID: state.workspace === "first" ? id1 : id2,
-            fn: () => app.request(input, init),
-          }),
-      })
-    },
-  }
-}
-
-describe("control-plane/session-proxy-middleware", () => {
-  test("forwards non-GET session requests for workspaces", async () => {
-    const state: State = {
-      workspace: "first",
-      calls: [],
-    }
-
-    const ctx = await setup(state)
-
-    ctx.app.post("/session/foo", (c) => c.text("local", 200))
-    const response = await ctx.request("http://workspace.test/session/foo?x=1", {
-      method: "POST",
-      body: JSON.stringify({ hello: "world" }),
-      headers: {
-        "content-type": "application/json",
-      },
-    })
-
-    expect(response.status).toBe(202)
-    expect(await response.text()).toBe("proxied")
-    expect(state.calls).toEqual([
-      {
-        method: "POST",
-        url: "/session/foo?x=1",
-        body: '{"hello":"world"}',
-      },
-    ])
-  })
-
-  // It will behave this way when we have syncing
-  //
-  // test("does not forward GET requests", async () => {
-  //   const state: State = {
-  //     workspace: "first",
-  //     calls: [],
-  //   }
-
-  //   const ctx = await setup(state)
-
-  //   ctx.app.get("/session/foo", (c) => c.text("local", 200))
-  //   const response = await ctx.request("http://workspace.test/session/foo?x=1")
-
-  //   expect(response.status).toBe(200)
-  //   expect(await response.text()).toBe("local")
-  //   expect(state.calls).toEqual([])
-  // })
-})
--- a/packages/opencode/test/control-plane/workspace-server-sse.test.ts
+++ b/packages/opencode/test/control-plane/workspace-server-sse.test.ts
@@ -1,70 +0,0 @@
-import { afterEach, describe, expect, test } from "bun:test"
-import { Log } from "../../src/util/log"
-import { WorkspaceServer } from "../../src/control-plane/workspace-server/server"
-import { parseSSE } from "../../src/control-plane/sse"
-import { GlobalBus } from "../../src/bus/global"
-import { resetDatabase } from "../fixture/db"
-import { tmpdir } from "../fixture/fixture"
-
-afterEach(async () => {
-  await resetDatabase()
-})
-
-Log.init({ print: false })
-
-describe("control-plane/workspace-server SSE", () => {
-  test("streams GlobalBus events and parseSSE reads them", async () => {
-    await using tmp = await tmpdir({ git: true })
-    const app = WorkspaceServer.App()
-    const stop = new AbortController()
-    const seen: unknown[] = []
-    try {
-      const response = await app.request("/event", {
-        signal: stop.signal,
-        headers: {
-          "x-opencode-workspace": "wrk_test_workspace",
-          "x-opencode-directory": tmp.path,
-        },
-      })
-
-      expect(response.status).toBe(200)
-      expect(response.body).toBeDefined()
-
-      const done = new Promise<void>((resolve, reject) => {
-        const timeout = setTimeout(() => {
-          reject(new Error("timed out waiting for workspace.test event"))
-        }, 3000)
-
-        void parseSSE(response.body!, stop.signal, (event) => {
-          seen.push(event)
-          const next = event as { type?: string }
-          if (next.type === "server.connected") {
-            GlobalBus.emit("event", {
-              payload: {
-                type: "workspace.test",
-                properties: { ok: true },
-              },
-            })
-            return
-          }
-          if (next.type !== "workspace.test") return
-          clearTimeout(timeout)
-          resolve()
-        }).catch((error) => {
-          clearTimeout(timeout)
-          reject(error)
-        })
-      })
-
-      await done
-
-      expect(seen.some((event) => (event as { type?: string }).type === "server.connected")).toBe(true)
-      expect(seen).toContainEqual({
-        type: "workspace.test",
-        properties: { ok: true },
-      })
-    } finally {
-      stop.abort()
-    }
-  })
-})
--- a/packages/opencode/test/control-plane/workspace-sync.test.ts
+++ b/packages/opencode/test/control-plane/workspace-sync.test.ts
@@ -1,99 +0,0 @@
-import { afterEach, describe, expect, mock, test } from "bun:test"
-import { WorkspaceID } from "../../src/control-plane/schema"
-import { Log } from "../../src/util/log"
-import { tmpdir } from "../fixture/fixture"
-import { Project } from "../../src/project/project"
-import { Database } from "../../src/storage/db"
-import { WorkspaceTable } from "../../src/control-plane/workspace.sql"
-import { GlobalBus } from "../../src/bus/global"
-import { resetDatabase } from "../fixture/db"
-import * as adaptors from "../../src/control-plane/adaptors"
-import type { Adaptor } from "../../src/control-plane/types"
-
-afterEach(async () => {
-  mock.restore()
-  await resetDatabase()
-})
-
-Log.init({ print: false })
-
-const remote = { type: "testing", name: "remote-a" } as unknown as typeof WorkspaceTable.$inferInsert
-
-const TestAdaptor: Adaptor = {
-  configure(config) {
-    return config
-  },
-  async create() {
-    throw new Error("not used")
-  },
-  async remove() {},
-  async fetch(_config: unknown, _input: RequestInfo | URL, _init?: RequestInit) {
-    const body = new ReadableStream<Uint8Array>({
-      start(controller) {
-        const encoder = new TextEncoder()
-        controller.enqueue(encoder.encode('data: {"type":"remote.ready","properties":{}}\n\n'))
-        controller.close()
-      },
-    })
-    return new Response(body, {
-      status: 200,
-      headers: {
-        "content-type": "text/event-stream",
-      },
-    })
-  },
-}
-
-adaptors.installAdaptor("testing", TestAdaptor)
-
-describe("control-plane/workspace.startSyncing", () => {
-  test("syncs only remote workspaces and emits remote SSE events", async () => {
-    const { Workspace } = await import("../../src/control-plane/workspace")
-    await using tmp = await tmpdir({ git: true })
-    const { project } = await Project.fromDirectory(tmp.path)
-
-    const id1 = WorkspaceID.ascending()
-    const id2 = WorkspaceID.ascending()
-
-    Database.use((db) =>
-      db
-        .insert(WorkspaceTable)
-        .values([
-          {
-            id: id1,
-            branch: "main",
-            project_id: project.id,
-            type: remote.type,
-            name: remote.name,
-          },
-          {
-            id: id2,
-            branch: "main",
-            project_id: project.id,
-            type: "worktree",
-            directory: tmp.path,
-            name: "local",
-          },
-        ])
-        .run(),
-    )
-
-    const done = new Promise<void>((resolve) => {
-      const listener = (event: { directory?: string; payload: { type: string } }) => {
-        if (event.directory !== id1) return
-        if (event.payload.type !== "remote.ready") return
-        GlobalBus.off("event", listener)
-        resolve()
-      }
-      GlobalBus.on("event", listener)
-    })
-
-    const sync = Workspace.startSyncing(project)
-    await Promise.race([
-      done,
-      new Promise((_, reject) => setTimeout(() => reject(new Error("timed out waiting for sync event")), 2000)),
-    ])
-
-    await sync.stop()
-  })
-})
--- a/packages/opencode/test/lsp/lifecycle.test.ts
+++ b/packages/opencode/test/lsp/lifecycle.test.ts
@@ -0,0 +1,147 @@
+import { describe, expect, test, spyOn, beforeEach, afterEach } from "bun:test"
+import path from "path"
+import * as Lsp from "../../src/lsp/index"
+import { LSPServer } from "../../src/lsp/server"
+import { Instance } from "../../src/project/instance"
+import { tmpdir } from "../fixture/fixture"
+
+function withInstance(fn: (dir: string) => Promise<void>) {
+  return async () => {
+    await using tmp = await tmpdir()
+    try {
+      await Instance.provide({
+        directory: tmp.path,
+        fn: () => fn(tmp.path),
+      })
+    } finally {
+      await Instance.disposeAll()
+    }
+  }
+}
+
+describe("LSP service lifecycle", () => {
+  let spawnSpy: ReturnType<typeof spyOn>
+
+  beforeEach(() => {
+    spawnSpy = spyOn(LSPServer.Typescript, "spawn").mockResolvedValue(undefined)
+  })
+
+  afterEach(() => {
+    spawnSpy.mockRestore()
+  })
+
+  test(
+    "init() completes without error",
+    withInstance(async () => {
+      await Lsp.LSP.init()
+    }),
+  )
+
+  test(
+    "status() returns empty array initially",
+    withInstance(async () => {
+      const result = await Lsp.LSP.status()
+      expect(Array.isArray(result)).toBe(true)
+      expect(result.length).toBe(0)
+    }),
+  )
+
+  test(
+    "diagnostics() returns empty object initially",
+    withInstance(async () => {
+      const result = await Lsp.LSP.diagnostics()
+      expect(typeof result).toBe("object")
+      expect(Object.keys(result).length).toBe(0)
+    }),
+  )
+
+  test(
+    "hasClients() returns true for .ts files in instance",
+    withInstance(async (dir) => {
+      const result = await Lsp.LSP.hasClients(path.join(dir, "test.ts"))
+      expect(result).toBe(true)
+    }),
+  )
+
+  test(
+    "hasClients() returns false for files outside instance",
+    withInstance(async (dir) => {
+      const result = await Lsp.LSP.hasClients(path.join(dir, "..", "outside.ts"))
+      // hasClients checks servers but doesn't check containsPath — getClients does
+      // So hasClients may return true even for outside files (it checks extension + root)
+      // The guard is in getClients, not hasClients
+      expect(typeof result).toBe("boolean")
+    }),
+  )
+
+  test(
+    "workspaceSymbol() returns empty array with no clients",
+    withInstance(async () => {
+      const result = await Lsp.LSP.workspaceSymbol("test")
+      expect(Array.isArray(result)).toBe(true)
+      expect(result.length).toBe(0)
+    }),
+  )
+
+  test(
+    "definition() returns empty array for unknown file",
+    withInstance(async (dir) => {
+      const result = await Lsp.LSP.definition({
+        file: path.join(dir, "nonexistent.ts"),
+        line: 0,
+        character: 0,
+      })
+      expect(Array.isArray(result)).toBe(true)
+    }),
+  )
+
+  test(
+    "references() returns empty array for unknown file",
+    withInstance(async (dir) => {
+      const result = await Lsp.LSP.references({
+        file: path.join(dir, "nonexistent.ts"),
+        line: 0,
+        character: 0,
+      })
+      expect(Array.isArray(result)).toBe(true)
+    }),
+  )
+
+  test(
+    "multiple init() calls are idempotent",
+    withInstance(async () => {
+      await Lsp.LSP.init()
+      await Lsp.LSP.init()
+      await Lsp.LSP.init()
+      // Should not throw or create duplicate state
+    }),
+  )
+})
+
+describe("LSP.Diagnostic", () => {
+  test("pretty() formats error diagnostic", () => {
+    const result = Lsp.LSP.Diagnostic.pretty({
+      range: { start: { line: 9, character: 4 }, end: { line: 9, character: 10 } },
+      message: "Type 'string' is not assignable to type 'number'",
+      severity: 1,
+    } as any)
+    expect(result).toBe("ERROR [10:5] Type 'string' is not assignable to type 'number'")
+  })
+
+  test("pretty() formats warning diagnostic", () => {
+    const result = Lsp.LSP.Diagnostic.pretty({
+      range: { start: { line: 0, character: 0 }, end: { line: 0, character: 5 } },
+      message: "Unused variable",
+      severity: 2,
+    } as any)
+    expect(result).toBe("WARN [1:1] Unused variable")
+  })
+
+  test("pretty() defaults to ERROR when no severity", () => {
+    const result = Lsp.LSP.Diagnostic.pretty({
+      range: { start: { line: 0, character: 0 }, end: { line: 0, character: 1 } },
+      message: "Something wrong",
+    } as any)
+    expect(result).toBe("ERROR [1:1] Something wrong")
+  })
+})
--- a/packages/opencode/test/mcp/lifecycle.test.ts
+++ b/packages/opencode/test/mcp/lifecycle.test.ts
@@ -19,12 +19,9 @@ interface MockClientState {
 const clientStates = new Map<string, MockClientState>()
 let lastCreatedClientName: string | undefined
 let connectShouldFail = false
-let connectShouldHang = false
 let connectError = "Mock transport cannot connect"
 // Tracks how many Client instances were created (detects leaks)
 let clientCreateCount = 0
-// Tracks how many times transport.close() is called across all mock transports
-let transportCloseCount = 0

 function getOrCreateClientState(name?: string): MockClientState {
  const key = name ?? "default"
@@ -47,42 +44,32 @@ function getOrCreateClientState(name?: string): MockClientState {
  return state
 }

-// Mock transport that succeeds or fails based on connectShouldFail / connectShouldHang
+// Mock transport that succeeds or fails based on connectShouldFail
 class MockStdioTransport {
  stderr: null = null
  pid = 12345
  constructor(_opts: any) {}
  async start() {
-    if (connectShouldHang) return new Promise<void>(() => {}) // never resolves
    if (connectShouldFail) throw new Error(connectError)
-    if (connectShouldHang) await new Promise(() => {}) // never resolves
-  }
-  async close() {
-    transportCloseCount++
  }
+  async close() {}
 }

 class MockStreamableHTTP {
  constructor(_url: URL, _opts?: any) {}
  async start() {
-    if (connectShouldHang) return new Promise<void>(() => {}) // never resolves
    if (connectShouldFail) throw new Error(connectError)
  }
-  async close() {
-    transportCloseCount++
-  }
+  async close() {}
  async finishAuth() {}
 }

 class MockSSE {
  constructor(_url: URL, _opts?: any) {}
  async start() {
-    if (connectShouldHang) return new Promise<void>(() => {}) // never resolves
-    if (connectShouldFail) throw new Error(connectError)
-  }
-  async close() {
-    transportCloseCount++
+    throw new Error("SSE fallback - not used in these tests")
  }
+  async close() {}
 }

 mock.module("@modelcontextprotocol/sdk/client/stdio.js", () => ({
@@ -158,10 +145,8 @@ beforeEach(() => {
  clientStates.clear()
  lastCreatedClientName = undefined
  connectShouldFail = false
-  connectShouldHang = false
  connectError = "Mock transport cannot connect"
  clientCreateCount = 0
-  transportCloseCount = 0
 })

 // Import after mocks
@@ -673,79 +658,3 @@ test(
    },
  ),
 )
-
-// ========================================================================
-// Test: transport leak — local stdio timeout (#19168)
-// ========================================================================
-
-test(
-  "local stdio transport is closed when connect times out (no process leak)",
-  withInstance({}, async () => {
-    lastCreatedClientName = "hanging-server"
-    getOrCreateClientState("hanging-server")
-    connectShouldHang = true
-
-    const addResult = await MCP.add("hanging-server", {
-      type: "local",
-      command: ["node", "fake.js"],
-      timeout: 100,
-    })
-
-    const serverStatus = (addResult.status as any)["hanging-server"] ?? addResult.status
-    expect(serverStatus.status).toBe("failed")
-    expect(serverStatus.error).toContain("timed out")
-    // Transport must be closed to avoid orphaned child process
-    expect(transportCloseCount).toBeGreaterThanOrEqual(1)
-  }),
-)
-
-// ========================================================================
-// Test: transport leak — remote timeout (#19168)
-// ========================================================================
-
-test(
-  "remote transport is closed when connect times out",
-  withInstance({}, async () => {
-    lastCreatedClientName = "hanging-remote"
-    getOrCreateClientState("hanging-remote")
-    connectShouldHang = true
-
-    const addResult = await MCP.add("hanging-remote", {
-      type: "remote",
-      url: "http://localhost:9999/mcp",
-      timeout: 100,
-      oauth: false,
-    })
-
-    const serverStatus = (addResult.status as any)["hanging-remote"] ?? addResult.status
-    expect(serverStatus.status).toBe("failed")
-    // Transport must be closed to avoid leaked HTTP connections
-    expect(transportCloseCount).toBeGreaterThanOrEqual(1)
-  }),
-)
-
-// ========================================================================
-// Test: transport leak — failed remote transports not closed (#19168)
-// ========================================================================
-
-test(
-  "failed remote transport is closed before trying next transport",
-  withInstance({}, async () => {
-    lastCreatedClientName = "fail-remote"
-    getOrCreateClientState("fail-remote")
-    connectShouldFail = true
-    connectError = "Connection refused"
-
-    const addResult = await MCP.add("fail-remote", {
-      type: "remote",
-      url: "http://localhost:9999/mcp",
-      timeout: 5000,
-      oauth: false,
-    })
-
-    const serverStatus = (addResult.status as any)["fail-remote"] ?? addResult.status
-    expect(serverStatus.status).toBe("failed")
-    // Both StreamableHTTP and SSE transports should be closed
-    expect(transportCloseCount).toBeGreaterThanOrEqual(2)
-  }),
-)
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/plugin",
-  "version": "1.3.2",
+  "version": "1.3.3",
  "type": "module",
  "license": "MIT",
  "scripts": {
--- a/packages/sdk/js/package.json
+++ b/packages/sdk/js/package.json
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/sdk",
-  "version": "1.3.2",
+  "version": "1.3.3",
  "type": "module",
  "license": "MIT",
  "scripts": {
--- a/packages/slack/package.json
+++ b/packages/slack/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/slack",
-  "version": "1.3.2",
+  "version": "1.3.3",
  "type": "module",
  "license": "MIT",
  "scripts": {
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/ui",
-  "version": "1.3.2",
+  "version": "1.3.3",
  "type": "module",
  "license": "MIT",
  "exports": {
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/util",
-  "version": "1.3.2",
+  "version": "1.3.3",
  "private": true,
  "type": "module",
  "license": "MIT",
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -2,7 +2,7 @@
  "name": "@opencode-ai/web",
  "type": "module",
  "license": "MIT",
-  "version": "1.3.2",
+  "version": "1.3.3",
  "scripts": {
    "dev": "astro dev",
    "dev:remote": "VITE_API_URL=https://api.opencode.ai astro dev",
--- a/sdks/vscode/package.json
+++ b/sdks/vscode/package.json
@@ -2,7 +2,7 @@
  "name": "opencode",
  "displayName": "opencode",
  "description": "opencode for VS Code",
-  "version": "1.3.2",
+  "version": "1.3.3",
  "publisher": "sst-dev",
  "repository": {
    "type": "git",
Author	SHA1	Message	Date
James Long	38450443b1	feat(core): remove workspace server, WorkspaceContext, start work towards better routing (#19316 )	2026-03-26 12:30:26 -04:00
Aiden Cline	da1d37274f	feat: add gpt prompt so non codex gpt models have their own system prompt modeled after codex cli (#19220 )	2026-03-26 15:57:38 +00:00
opencode-agent[bot]	17e8f577d6	chore: generate	2026-03-26 15:49:53 +00:00
Kit Langton	c7d23098d1	refactor(lsp): effectify LSP service with InstanceState (#19150 )	2026-03-26 11:48:36 -04:00
Dax Raad	bcf18edde4	changelog ci tweaks	2026-03-26 11:13:13 -04:00
opencode-agent[bot]	9a2482ac09	chore: generate	2026-03-26 15:05:29 +00:00
opencode	54443bfb7e	release: v1.3.3	2026-03-26 15:05:21 +00:00
Dax	ec20efc11a	feat: embed WebUI in binary with proxy flags (#19299 ) Co-authored-by: BlankParticle <blankparticle@gmail.com>	2026-03-26 14:43:56 +00:00
Dax	83ed1c4414	tui: bypass local SSE event streaming in worker (#19183 )	2026-03-26 14:41:36 +00:00