fix: real model thingy

ignore: prettify
test: update model test fixture
2026-03-31 00:19:50 -05:00 · 2026-03-30 23:46:04 -05:00 · 2026-03-30 23:35:52 -05:00
81 changed files with 1253 additions and 2093 deletions
@@ -21,9 +21,8 @@ jayair
 kitlangton
 kommander
 -opencode2026
-opencodeengineer bot that spams issues
 r44vc0rp
 rekram1-node
-robinmordasiewicz
 -spider-yamet clawdbot/llm psychosis, spam pinging the team
 thdxr
+-OpenCodeEngineer bot that spams issues
@@ -100,9 +100,6 @@ jobs:
        run: bun --cwd packages/app test:e2e:local
        env:
          CI: true
-          OPENCODE_API_KEY: ${{ secrets.OPENCODE_API_KEY }}
-          OPENCODE_E2E_MODEL: opencode/claude-haiku-4-5
-          OPENCODE_E2E_REQUIRE_PAID: "true"
        timeout-minutes: 30

      - name: Upload Playwright artifacts
@@ -26,7 +26,7 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "1.3.11",
+      "version": "1.3.9",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -79,7 +79,7 @@
    },
    "packages/console/app": {
      "name": "@opencode-ai/console-app",
-      "version": "1.3.11",
+      "version": "1.3.9",
      "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.11",
+      "version": "1.3.9",
      "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.11",
+      "version": "1.3.9",
      "dependencies": {
        "@ai-sdk/anthropic": "3.0.64",
        "@ai-sdk/openai": "3.0.48",
@@ -164,7 +164,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode-ai/console-mail",
-      "version": "1.3.11",
+      "version": "1.3.9",
      "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.11",
+      "version": "1.3.9",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -221,7 +221,7 @@
    },
    "packages/desktop-electron": {
      "name": "@opencode-ai/desktop-electron",
-      "version": "1.3.11",
+      "version": "1.3.9",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -252,7 +252,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode-ai/enterprise",
-      "version": "1.3.11",
+      "version": "1.3.9",
      "dependencies": {
        "@opencode-ai/ui": "workspace:*",
        "@opencode-ai/util": "workspace:*",
@@ -281,7 +281,7 @@
    },
    "packages/function": {
      "name": "@opencode-ai/function",
-      "version": "1.3.11",
+      "version": "1.3.9",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -297,7 +297,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "1.3.11",
+      "version": "1.3.9",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -338,8 +338,8 @@
        "@opencode-ai/sdk": "workspace:*",
        "@opencode-ai/util": "workspace:*",
        "@openrouter/ai-sdk-provider": "2.3.3",
-        "@opentui/core": "0.1.93",
-        "@opentui/solid": "0.1.93",
+        "@opentui/core": "0.1.92",
+        "@opentui/solid": "0.1.92",
        "@parcel/watcher": "2.5.1",
        "@pierre/diffs": "catalog:",
        "@solid-primitives/event-bus": "1.1.2",
@@ -423,22 +423,22 @@
    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
-      "version": "1.3.11",
+      "version": "1.3.9",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "zod": "catalog:",
      },
      "devDependencies": {
-        "@opentui/core": "0.1.93",
-        "@opentui/solid": "0.1.93",
+        "@opentui/core": "0.1.92",
+        "@opentui/solid": "0.1.92",
        "@tsconfig/node22": "catalog:",
        "@types/node": "catalog:",
        "@typescript/native-preview": "catalog:",
        "typescript": "catalog:",
      },
      "peerDependencies": {
-        "@opentui/core": ">=0.1.93",
-        "@opentui/solid": ">=0.1.93",
+        "@opentui/core": ">=0.1.92",
+        "@opentui/solid": ">=0.1.92",
      },
      "optionalPeers": [
        "@opentui/core",
@@ -457,7 +457,7 @@
    },
    "packages/sdk/js": {
      "name": "@opencode-ai/sdk",
-      "version": "1.3.11",
+      "version": "1.3.9",
      "devDependencies": {
        "@hey-api/openapi-ts": "0.90.10",
        "@tsconfig/node22": "catalog:",
@@ -468,7 +468,7 @@
    },
    "packages/slack": {
      "name": "@opencode-ai/slack",
-      "version": "1.3.11",
+      "version": "1.3.9",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "@slack/bolt": "^3.17.1",
@@ -503,7 +503,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "1.3.11",
+      "version": "1.3.9",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -550,7 +550,7 @@
    },
    "packages/util": {
      "name": "@opencode-ai/util",
-      "version": "1.3.11",
+      "version": "1.3.9",
      "dependencies": {
        "zod": "catalog:",
      },
@@ -561,7 +561,7 @@
    },
    "packages/web": {
      "name": "@opencode-ai/web",
-      "version": "1.3.11",
+      "version": "1.3.9",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -1461,21 +1461,21 @@

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

-    "@opentui/core": ["@opentui/core@0.1.93", "", { "dependencies": { "bun-ffi-structs": "0.1.2", "diff": "8.0.2", "jimp": "1.6.0", "marked": "17.0.1", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.1.93", "@opentui/core-darwin-x64": "0.1.93", "@opentui/core-linux-arm64": "0.1.93", "@opentui/core-linux-x64": "0.1.93", "@opentui/core-win32-arm64": "0.1.93", "@opentui/core-win32-x64": "0.1.93", "bun-webgpu": "0.1.5", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-HlTM16ZiBKN0mPBNMHSILkSrbzNku6Pg/ovIpVVkEPqLeWeSC2bfZS4Uhc0Ej1sckVVVoU9HKBJanfHvpP+pMg=="],
+    "@opentui/core": ["@opentui/core@0.1.92", "", { "dependencies": { "bun-ffi-structs": "0.1.2", "diff": "8.0.2", "jimp": "1.6.0", "marked": "17.0.1", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.1.92", "@opentui/core-darwin-x64": "0.1.92", "@opentui/core-linux-arm64": "0.1.92", "@opentui/core-linux-x64": "0.1.92", "@opentui/core-win32-arm64": "0.1.92", "@opentui/core-win32-x64": "0.1.92", "bun-webgpu": "0.1.5", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-c+KdYAIH3M8n24RYaor+t7AQtKZ3l84L7xdP7DEaN4xtuYH8W08E6Gi+wUal4g+HSai3HS9irox68yFf0VPAxw=="],

-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.1.93", "", { "os": "darwin", "cpu": "arm64" }, "sha512-4I2mwhXLqRNUv7tu88hA6cBGaGpLZXkAa8W0VqBiGDV+Tx337x4T+vbQ7G57OwKXT787oTrEOF9rOOrGLov6qw=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.1.92", "", { "os": "darwin", "cpu": "arm64" }, "sha512-NX/qFRuc7My0pazyOrw9fdTXmU7omXcZzQuHcsaVnwssljaT52UYMrJ7mCKhSo69RhHw0lnGCymTorvz3XBdsA=="],

-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.1.93", "", { "os": "darwin", "cpu": "x64" }, "sha512-jvYMgcg47a5qLhSv1DnQiafEWBQ1UukGutmsYV1TvNuhWtuDXYLVy2AhKIHPzbB9JNrV0IpjbxUC8QnJaP3n8g=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.1.92", "", { "os": "darwin", "cpu": "x64" }, "sha512-Zb4jn33hOf167llINKLniOabQIycs14LPOBZnQ6l4khbeeTPVJdG8gy9PhlAyIQygDKmRTFncVlP0RP+L6C7og=="],

-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.1.93", "", { "os": "linux", "cpu": "arm64" }, "sha512-bvFqRcPftmg14iYmMc3d63XC9rhe4yF7pJRApH6klLBKp27WX/LU0iSO4mvyX7qhy65gcmyy4Sj9dl5jNJ+vlA=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.1.92", "", { "os": "linux", "cpu": "arm64" }, "sha512-4VA1A91OTMPJ3LkAyaxKEZVJsk5jIc3Kz0gV2vip8p2aGLPpYHHpkFZpXP/FyzsnJzoSGftBeA6ya1GKa5bkXg=="],

-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.1.93", "", { "os": "linux", "cpu": "x64" }, "sha512-/wJXhwtNxdcpshrRl1KouyGE54ODAHxRQgBHtnlM/F4bB8cjzOlq2Yc+5cv5DxRz4Q0nQZFCPefwpg2U6ZwNdA=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.1.92", "", { "os": "linux", "cpu": "x64" }, "sha512-tr7va8hfKS1uY+TBmulQBoBlwijzJk56K/U/L9/tbHfW7oJctqxPVwEFHIh1HDcOQ3/UhMMWGvMfeG6cFiK8/A=="],

-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.1.93", "", { "os": "win32", "cpu": "arm64" }, "sha512-g3PQobfM2yFPSzkBKRKFp8FgTG4ulWyJcU+GYXjyYmxQIT+ZbOU7UfR//ImRq3/FxUAfUC/MhC6WwjqccjEqBw=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.1.92", "", { "os": "win32", "cpu": "arm64" }, "sha512-34YM3uPtDjzUVeSnJWIK2J8mxyduzV7f3mYc4Hub0glNpUdM1jjzF2HvvvnrKK5ElzTsIcno3c3lOYT8yvG1Zg=="],

-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.1.93", "", { "os": "win32", "cpu": "x64" }, "sha512-Spllte2W7q+WfB1zVHgHilVJNp+jpp77PkkxTWyMQNvT7vJNt9LABMNjGTGiJBBMkAuKvO0GgFNKxrda7tFKrQ=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.1.92", "", { "os": "win32", "cpu": "x64" }, "sha512-uk442kA2Vn0mmJHHqk5sPM+Zai/AN9sgl7egekhoEOUx2VK3gxftKsVlx2YVpCHTvTE/S+vnD2WpQaJk2SNjww=="],

-    "@opentui/solid": ["@opentui/solid@0.1.93", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.1.93", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.10", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.11" } }, "sha512-Qx+4qoLSjnRGoo/YY4sZJMyXj09Y5kaAMpVO+65Ax58MMj4TjABN4bOOiRT2KV7sKOMTjxiAgXAIaBuqBBJ0Qg=="],
+    "@opentui/solid": ["@opentui/solid@0.1.92", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.1.92", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.10", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.11" } }, "sha512-0Sx1+6zRpmMJ5oDEY0JS9b9+eGd/Q0fPndNllrQNnp7w2FCjpXmvHdBdq+pFI6kFp01MHq2ZOkUU5zX5/9YMSQ=="],

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

@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-UuVbB5lTRB4bIcaKMc8CLSbQW7m9EjXgxYvxp/uO7Co=",
-    "aarch64-linux": "sha256-8D7ReLRVb7NDd5PQTVxFhRLmlLbfjK007XgIhhpNKoE=",
-    "aarch64-darwin": "sha256-M+z7C/eXfVqwDiGiiwKo/LT/m4dvCjL1Pblsr1kxoyI=",
-    "x86_64-darwin": "sha256-RzZS6GMwYVDPK0W+K/mlebixNMs2+JRkMG9n8OFhd0c="
+    "x86_64-linux": "sha256-5w+DwEvUrCly9LHZuTa1yTSD45X56cGJG8sds/N29mU=",
+    "aarch64-linux": "sha256-pLhyzajYinBlFyGWwPypyC8gHEU8S7fVXIs6aqgBmhg=",
+    "aarch64-darwin": "sha256-vN0sXYs7pLtpq7U9SorR2z6st/wMfHA3dybOnwIh1pU=",
+    "x86_64-darwin": "sha256-P8fgyBcZJmY5VbNxNer/EL4r/F28dNxaqheaqNZH488="
  }
 }
@@ -15,16 +15,6 @@ import { createSdk, dirSlug, getWorktree, sessionPath } from "./utils"

 export const settingsKey = "settings.v3"

-const seedModel = (() => {
-  const [providerID = "opencode", modelID = "big-pickle"] = (
-    process.env.OPENCODE_E2E_MODEL ?? "opencode/big-pickle"
-  ).split("/")
-  return {
-    providerID: providerID || "opencode",
-    modelID: modelID || "big-pickle",
-  }
-})()
-
 type TestFixtures = {
  sdk: ReturnType<typeof createSdk>
  gotoSession: (sessionID?: string) => Promise<void>
@@ -135,7 +125,7 @@ export const test = base.extend<TestFixtures, WorkerFixtures>({

 async function seedStorage(page: Page, input: { directory: string; extra?: string[] }) {
  await seedProjects(page, input)
-  await page.addInitScript((model: { providerID: string; modelID: string }) => {
+  await page.addInitScript(() => {
    const win = window as E2EWindow
    win.__opencode_e2e = {
      ...win.__opencode_e2e,
@@ -153,12 +143,12 @@ async function seedStorage(page: Page, input: { directory: string; extra?: strin
    localStorage.setItem(
      "opencode.global.dat:model",
      JSON.stringify({
-        recent: [model],
+        recent: [{ providerID: "opencode", modelID: "big-pickle" }],
        user: [],
        variant: {},
      }),
    )
-  }, seedModel)
+  })
 }

 export { expect }
@@ -234,7 +234,6 @@ async function fileOverflow(page: Parameters<typeof test>[0]["page"]) {
 }

 test("review applies inline comment clicks without horizontal overflow", async ({ page, withProject }) => {
-  test.skip(true, "Flaky in CI for now.")
  test.setTimeout(180_000)

  const tag = `review-comment-${Date.now()}`
@@ -284,7 +283,6 @@ test("review applies inline comment clicks without horizontal overflow", async (
 })

 test("review file comments submit on click without clipping actions", async ({ page, withProject }) => {
-  test.skip(true, "Flaky in CI for now.")
  test.setTimeout(180_000)

  const tag = `review-file-comment-${Date.now()}`
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.3.11",
+  "version": "1.3.9",
  "description": "",
  "type": "module",
  "exports": {
@@ -71,7 +71,7 @@ const serverEnv = {
  OPENCODE_E2E_PROJECT_DIR: repoDir,
  OPENCODE_E2E_SESSION_TITLE: "E2E Session",
  OPENCODE_E2E_MESSAGE: "Seeded for UI e2e",
-  OPENCODE_E2E_MODEL: process.env.OPENCODE_E2E_MODEL ?? "opencode/gpt-5-nano",
+  OPENCODE_E2E_MODEL: "opencode/gpt-5-nano",
  OPENCODE_CLIENT: "app",
  OPENCODE_STRICT_CONFIG_DEPS: "true",
 } satisfies Record<string, string>
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-app",
-  "version": "1.3.11",
+  "version": "1.3.9",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/console-core",
-  "version": "1.3.11",
+  "version": "1.3.9",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -10,7 +10,7 @@ if (!stage) throw new Error("Stage is required")
 const root = path.resolve(process.cwd(), "..", "..", "..")

 // read the secret
-const ret = await $`bun sst secret list --stage frank`.cwd(root).text()
+const ret = await $`bun sst secret list`.cwd(root).text()
 const lines = ret.split("\n")
 const value = lines.find((line) => line.startsWith("ZEN_LIMITS"))?.split("=")[1]
 if (!value) throw new Error("ZEN_LIMITS not found")
@@ -12,7 +12,7 @@ const root = path.resolve(process.cwd(), "..", "..", "..")
 const PARTS = 30

 // read the secret
-const ret = await $`bun sst secret list --stage frank`.cwd(root).text()
+const ret = await $`bun sst secret list`.cwd(root).text()
 const lines = ret.split("\n")
 const values = Array.from({ length: PARTS }, (_, i) => {
  const value = lines
@@ -6,7 +6,7 @@ import os from "os"
 import { Subscription } from "../src/subscription"

 const root = path.resolve(process.cwd(), "..", "..", "..")
-const secrets = await $`bun sst secret list --stage frank`.cwd(root).text()
+const secrets = await $`bun sst secret list`.cwd(root).text()

 // read value
 const lines = secrets.split("\n")
@@ -25,4 +25,4 @@ const newValue = JSON.stringify(JSON.parse(await tempFile.text()))
 Subscription.validate(JSON.parse(newValue))

 // update the secret
-await $`bun sst secret set ZEN_LIMITS ${newValue} --stage frank`.cwd(root)
+await $`bun sst secret set ZEN_LIMITS ${newValue}`
@@ -6,7 +6,7 @@ import os from "os"
 import { ZenData } from "../src/model"

 const root = path.resolve(process.cwd(), "..", "..", "..")
-const models = await $`bun sst secret list --stage frank`.cwd(root).text()
+const models = await $`bun sst secret list`.cwd(root).text()
 const PARTS = 30

 // read the line starting with "ZEN_MODELS"
@@ -40,4 +40,4 @@ const newValues = Array.from({ length: PARTS }, (_, i) =>

 const envFile = Bun.file(path.join(os.tmpdir(), `models-${Date.now()}.env`))
 await envFile.write(newValues.map((v, i) => `ZEN_MODELS${i + 1}="${v.replace(/"/g, '\\"')}"`).join("\n"))
-await $`bun sst secret load ${envFile.name} --stage frank`.cwd(root)
+await $`bun sst secret load ${envFile.name}`.cwd(root)
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-function",
-  "version": "1.3.11",
+  "version": "1.3.9",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-mail",
-  "version": "1.3.11",
+  "version": "1.3.9",
  "dependencies": {
    "@jsx-email/all": "2.2.3",
    "@jsx-email/cli": "1.4.3",
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop-electron",
  "private": true,
-  "version": "1.3.11",
+  "version": "1.3.9",
  "type": "module",
  "license": "MIT",
  "homepage": "https://opencode.ai",
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop",
  "private": true,
-  "version": "1.3.11",
+  "version": "1.3.9",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/enterprise",
-  "version": "1.3.11",
+  "version": "1.3.9",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,7 +1,7 @@
 id = "opencode"
 name = "OpenCode"
 description = "The open source coding agent."
-version = "1.3.11"
+version = "1.3.9"
 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.11/opencode-darwin-arm64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.9/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.11/opencode-darwin-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.9/opencode-darwin-x64.zip"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.linux-aarch64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.11/opencode-linux-arm64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.9/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.11/opencode-linux-x64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.9/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.11/opencode-windows-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.9/opencode-windows-x64.zip"
 cmd = "./opencode.exe"
 args = ["acp"]
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/function",
-  "version": "1.3.11",
+  "version": "1.3.9",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.3.11",
+  "version": "1.3.9",
  "name": "opencode",
  "type": "module",
  "license": "MIT",
@@ -102,8 +102,8 @@
    "@opencode-ai/sdk": "workspace:*",
    "@opencode-ai/util": "workspace:*",
    "@openrouter/ai-sdk-provider": "2.3.3",
-    "@opentui/core": "0.1.93",
-    "@opentui/solid": "0.1.93",
+    "@opentui/core": "0.1.92",
+    "@opentui/solid": "0.1.92",
    "@parcel/watcher": "2.5.1",
    "@pierre/diffs": "catalog:",
    "@solid-primitives/event-bus": "1.1.2",
@@ -2,7 +2,6 @@ const dir = process.env.OPENCODE_E2E_PROJECT_DIR ?? process.cwd()
 const title = process.env.OPENCODE_E2E_SESSION_TITLE ?? "E2E Session"
 const text = process.env.OPENCODE_E2E_MESSAGE ?? "Seeded for UI e2e"
 const model = process.env.OPENCODE_E2E_MODEL ?? "opencode/gpt-5-nano"
-const requirePaid = process.env.OPENCODE_E2E_REQUIRE_PAID === "true"
 const parts = model.split("/")
 const providerID = parts[0] ?? "opencode"
 const modelID = parts[1] ?? "gpt-5-nano"
@@ -12,7 +11,6 @@ const seed = async () => {
  const { Instance } = await import("../src/project/instance")
  const { InstanceBootstrap } = await import("../src/project/bootstrap")
  const { Config } = await import("../src/config/config")
-  const { Provider } = await import("../src/provider/provider")
  const { Session } = await import("../src/session")
  const { MessageID, PartID } = await import("../src/session/schema")
  const { Project } = await import("../src/project/project")
@@ -27,19 +25,6 @@ const seed = async () => {
        await Config.waitForDependencies()
        await ToolRegistry.ids()

-        if (requirePaid && providerID === "opencode" && !process.env.OPENCODE_API_KEY) {
-          throw new Error("OPENCODE_API_KEY is required when OPENCODE_E2E_REQUIRE_PAID=true")
-        }
-
-        const info = await Provider.getModel(ProviderID.make(providerID), ModelID.make(modelID))
-        if (requirePaid) {
-          const paid =
-            info.cost.input > 0 || info.cost.output > 0 || info.cost.cache.read > 0 || info.cost.cache.write > 0
-          if (!paid) {
-            throw new Error(`OPENCODE_E2E_MODEL must resolve to a paid model: ${providerID}/${modelID}`)
-          }
-        }
-
        const session = await Session.create({ title })
        const messageID = MessageID.ascending()
        const partID = PartID.ascending()
@@ -88,7 +88,6 @@ export default plugin
 - If package `exports` exists, loader only resolves `./tui` or `./server`; it never falls back to `exports["."]`.
 - For npm package specs, TUI does not use `package.json` `main` as a fallback entry.
 - `package.json` `main` is only used for server plugin entrypoint resolution.
- If a configured plugin has no target-specific entrypoint, it is skipped with a warning (not a load failure).
 - If a package supports both server and TUI, use separate files and package `exports` (`./server` and `./tui`) so each target resolves to a target-only module.
 - File/path plugins must export a non-empty `id`.
 - npm plugins may omit `id`; package `name` is used.
@@ -101,10 +100,7 @@ export default plugin

 ## Package manifest and install

-Install target detection is inferred from `package.json` entrypoints:
-
- `server` target when `exports["./server"]` exists or `main` is set.
- `tui` target when `exports["./tui"]` exists.
+Package manifest is read from `package.json` field `oc-plugin`.

 Example:

@@ -112,20 +108,14 @@ Example:
 {
  "name": "@acme/opencode-plugin",
  "type": "module",
-  "main": "./dist/server.js",
-  "exports": {
-    "./server": {
-      "import": "./dist/server.js",
-      "config": { "custom": true }
-    },
-    "./tui": {
-      "import": "./dist/tui.js",
-      "config": { "compact": true }
-    }
-  },
+  "main": "./dist/index.js",
  "engines": {
    "opencode": "^1.0.0"
-  }
+  },
+  "oc-plugin": [
+    ["server", { "custom": true }],
+    ["tui", { "compact": true }]
+  ]
 }
 ```

@@ -154,16 +144,12 @@ npm plugins can declare a version compatibility range in `package.json` using th
 - Local installs resolve target dir inside `patchPluginConfig`.
 - For local scope, path is `<worktree>/.opencode` only when VCS is git and `worktree !== "/"`; otherwise `<directory>/.opencode`.
 - Root-worktree fallback (`worktree === "/"` uses `<directory>/.opencode`) is covered by regression tests.
- `patchPluginConfig` applies all detected targets (`server` and/or `tui`) in one call.
+- `patchPluginConfig` applies all declared manifest targets (`server` and/or `tui`) in one call.
 - `patchPluginConfig` returns structured result unions (`ok`, `code`, fields by error kind) instead of custom thrown errors.
 - `patchPluginConfig` serializes per-target config writes with `Flock.acquire(...)`.
 - `patchPluginConfig` uses targeted `jsonc-parser` edits, so existing JSONC comments are preserved when plugin entries are added or replaced.
- npm plugin package installs are executed with `--ignore-scripts`, so package `install` / `postinstall` lifecycle scripts are not run.
- `exports["./server"].config` and `exports["./tui"].config` can provide default plugin options written on first install.
 - Without `--force`, an already-configured npm package name is a no-op.
 - With `--force`, replacement matches by package name. If the existing row is `[spec, options]`, those tuple options are kept.
- Explicit npm specs with a version suffix (for example `pkg@1.2.3`) are pinned. Runtime install requests that exact version and does not run stale/latest checks for newer registry versions.
- Bare npm specs (`pkg`) are treated as `latest` and can refresh when the cached version is stale.
 - Tuple targets in `oc-plugin` provide default options written into config.
 - A package can target `server`, `tui`, or both.
 - If a package targets both, each target must still resolve to a separate target-only module. Do not export `{ server, tui }` from one module.
@@ -331,6 +317,7 @@ Slot notes:
 - `api.plugins.install(spec, { global? })` runs install -> manifest read -> config patch using the same helper flow as CLI install.
 - `api.plugins.install(...)` returns either `{ ok: false, message, missing? }` or `{ ok: true, dir, tui }`.
 - `api.plugins.install(...)` does not load plugins into the current session. Call `api.plugins.add(spec)` to load after install.
+- For packages that declare a tuple `tui` target in `oc-plugin`, `api.plugins.install(...)` stages those tuple options so a following `api.plugins.add(spec)` uses them.
 - If activation fails, the plugin can remain `enabled=true` and `active=false`.
 - `api.lifecycle.signal` is aborted before cleanup runs.
 - `api.lifecycle.onDispose(fn)` registers cleanup and returns an unregister function.
@@ -50,7 +50,7 @@ export namespace BunProc {
    }),
  )

-  export async function install(pkg: string, version = "latest", opts?: { ignoreScripts?: boolean }) {
+  export async function install(pkg: string, version = "latest") {
    // Use lock to ensure only one install at a time
    using _ = await Lock.write("bun-install")

@@ -82,7 +82,6 @@ export namespace BunProc {
      "add",
      "--force",
      "--exact",
-      ...(opts?.ignoreScripts ? ["--ignore-scripts"] : []),
      // TODO: get rid of this case (see: https://github.com/oven-sh/bun/issues/19936)
      ...(proxied() || process.env.CI ? ["--no-cache"] : []),
      "--cwd",
@@ -90,9 +90,8 @@ export namespace Bus {
          if (ps) yield* PubSub.publish(ps, payload)
          yield* PubSub.publish(state.wildcard, payload)

-          const dir = yield* InstanceState.directory
          GlobalBus.emit("event", {
-            directory: dir,
+            directory: Instance.directory,
            payload,
          })
        })
@@ -114,8 +114,8 @@ export function createPlugTask(input: PlugInput, dep: PlugDeps = defaultPlugDeps

      if (manifest.code === "manifest_no_targets") {
        inspect.stop("No plugin targets found", 1)
-        dep.log.error(`"${mod}" does not expose plugin entrypoints in package.json`)
-        dep.log.info('Expected one of: exports["./tui"], exports["./server"], or package.json main for server.')
+        dep.log.error(`"${mod}" does not declare supported targets in package.json`)
+        dep.log.info('Expected: "oc-plugin": ["server", "tui"] or tuples like [["tui", { ... }]].')
        return false
      }

@@ -125,7 +125,6 @@ import { DialogVariant } from "./component/dialog-variant"

 function rendererConfig(_config: TuiConfig.Info): CliRendererConfig {
  return {
-    externalOutputMode: "passthrough",
    targetFps: 60,
    gatherStats: false,
    exitOnCtrlC: false,
@@ -251,6 +250,7 @@ function App(props: { onSnapshot?: () => Promise<string[]> }) {
  const route = useRoute()
  const dimensions = useTerminalDimensions()
  const renderer = useRenderer()
+  renderer.disableStdoutInterception()
  const dialog = useDialog()
  const local = useLocal()
  const kv = useKV()
@@ -87,11 +87,6 @@ function fail(message: string, data: Record<string, unknown>) {
  console.error(`[tui.plugin] ${text}`, next)
 }

-function warn(message: string, data: Record<string, unknown>) {
-  log.warn(message, data)
-  console.warn(`[tui.plugin] ${message}`, data)
-}
-
 type CleanupResult = { type: "ok" } | { type: "error"; error: unknown } | { type: "timeout" }

 function runCleanup(fn: () => unknown, ms: number): Promise<CleanupResult> {
@@ -234,15 +229,6 @@ async function loadExternalPlugin(cfg: TuiConfig.PluginRecord, retry = false): P
  log.info("loading tui plugin", { path: plan.spec, retry })
  const resolved = await PluginLoader.resolve(plan, "tui")
  if (!resolved.ok) {
-    if (resolved.stage === "missing") {
-      warn("tui plugin has no entrypoint", {
-        path: plan.spec,
-        retry,
-        message: resolved.message,
-      })
-      return
-    }
-
    if (resolved.stage === "install") {
      fail("failed to resolve tui plugin", { path: plan.spec, retry, error: resolved.error })
      return
@@ -767,6 +753,7 @@ async function addPluginBySpec(state: RuntimeState | undefined, raw: string) {
    return [] as PluginLoad[]
  })
  if (!ready.length) {
+    fail("failed to add tui plugin", { path: next })
    return false
  }

@@ -837,7 +824,7 @@ async function installPluginBySpec(
    if (manifest.code === "manifest_no_targets") {
      return {
        ok: false,
-        message: `"${spec}" does not expose plugin entrypoints in package.json`,
+        message: `"${spec}" does not declare supported targets in package.json`,
      }
    }

@@ -121,10 +121,7 @@ export namespace Config {
    const gitignore = path.join(dir, ".gitignore")
    const ignore = await Filesystem.exists(gitignore)
    if (!ignore) {
-      await Filesystem.write(
-        gitignore,
-        ["node_modules", "package.json", "package-lock.json", "bun.lock", ".gitignore"].join("\n"),
-      )
+      await Filesystem.write(gitignore, ["node_modules", "package.json", "bun.lock", ".gitignore"].join("\n"))
    }

    // Bun can race cache writes on Windows when installs run in parallel across dirs.
@@ -1486,8 +1483,7 @@ export namespace Config {
        })

        const update = Effect.fn("Config.update")(function* (config: Info) {
-          const dir = yield* InstanceState.directory
-          const file = path.join(dir, "config.json")
+          const file = path.join(Instance.directory, "config.json")
          const existing = yield* loadFile(file)
          yield* fs.writeFileString(file, JSON.stringify(mergeDeep(existing, config), null, 2)).pipe(Effect.orDie)
          yield* Effect.promise(() => Instance.dispose())
@@ -1,6 +0,0 @@
-import { ServiceMap } from "effect"
-import type { InstanceContext } from "@/project/instance"
-
-export const InstanceRef = ServiceMap.Reference<InstanceContext | undefined>("~opencode/InstanceRef", {
-  defaultValue: () => undefined,
-})
@@ -1,7 +1,5 @@
-import { Effect, Fiber, ScopedCache, Scope, ServiceMap } from "effect"
+import { Effect, ScopedCache, Scope } from "effect"
 import { Instance, type InstanceContext } from "@/project/instance"
-import { Context } from "@/util/context"
-import { InstanceRef } from "./instance-ref"
 import { registerDisposer } from "./instance-registry"

 const TypeId = "~opencode/InstanceState"
@@ -12,34 +10,13 @@ export interface InstanceState<A, E = never, R = never> {
 }

 export namespace InstanceState {
-  export const bind = <F extends (...args: any[]) => any>(fn: F): F => {
-    try {
-      return Instance.bind(fn)
-    } catch (err) {
-      if (!(err instanceof Context.NotFound)) throw err
-    }
-    const fiber = Fiber.getCurrent()
-    const ctx = fiber ? ServiceMap.getReferenceUnsafe(fiber.services, InstanceRef) : undefined
-    if (!ctx) return fn
-    return ((...args: any[]) => Instance.restore(ctx, () => fn(...args))) as F
-  }
-
-  export const context = Effect.fnUntraced(function* () {
-    return (yield* InstanceRef) ?? Instance.current
-  })()
-
-  export const directory = Effect.map(context, (ctx) => ctx.directory)
-
  export const make = <A, E = never, R = never>(
    init: (ctx: InstanceContext) => Effect.Effect<A, E, R | Scope.Scope>,
  ): Effect.Effect<InstanceState<A, E, Exclude<R, Scope.Scope>>, never, R | Scope.Scope> =>
    Effect.gen(function* () {
      const cache = yield* ScopedCache.make<string, A, E, R>({
        capacity: Number.POSITIVE_INFINITY,
-        lookup: () =>
-          Effect.fnUntraced(function* () {
-            return yield* init(yield* context)
-          })(),
+        lookup: () => init(Instance.current),
      })

      const off = registerDisposer((directory) => Effect.runPromise(ScopedCache.invalidate(cache, directory)))
@@ -52,9 +29,7 @@ export namespace InstanceState {
    })

  export const get = <A, E, R>(self: InstanceState<A, E, R>) =>
-    Effect.gen(function* () {
-      return yield* ScopedCache.get(self.cache, yield* directory)
-    })
+    Effect.suspend(() => ScopedCache.get(self.cache, Instance.directory))

  export const use = <A, E, R, B>(self: InstanceState<A, E, R>, select: (value: A) => B) =>
    Effect.map(get(self), select)
@@ -65,18 +40,8 @@ export namespace InstanceState {
  ) => Effect.flatMap(get(self), select)

  export const has = <A, E, R>(self: InstanceState<A, E, R>) =>
-    Effect.gen(function* () {
-      return yield* ScopedCache.has(self.cache, yield* directory)
-    })
+    Effect.suspend(() => ScopedCache.has(self.cache, Instance.directory))

  export const invalidate = <A, E, R>(self: InstanceState<A, E, R>) =>
-    Effect.gen(function* () {
-      return yield* ScopedCache.invalidate(self.cache, yield* directory)
-    })
-
-  /**
-   * Effect finalizers run on the fiber scheduler after the original async
-   * boundary, so ALS reads like Instance.directory can be gone by then.
-   */
-  export const withALS = <T>(fn: () => T) => Effect.map(context, (ctx) => Instance.restore(ctx, fn))
+    Effect.suspend(() => ScopedCache.invalidate(self.cache, Instance.directory))
 }
@@ -1,33 +1,19 @@
 import { Effect, Layer, ManagedRuntime } from "effect"
 import * as ServiceMap from "effect/ServiceMap"
-import { Instance } from "@/project/instance"
-import { Context } from "@/util/context"
-import { InstanceRef } from "./instance-ref"

 export const memoMap = Layer.makeMemoMapUnsafe()

-function attach<A, E, R>(effect: Effect.Effect<A, E, R>): Effect.Effect<A, E, R> {
-  try {
-    const ctx = Instance.current
-    return Effect.provideService(effect, InstanceRef, ctx)
-  } catch (err) {
-    if (!(err instanceof Context.NotFound)) throw err
-  }
-  return effect
-}
-
 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 }))

  return {
-    runSync: <A, Err>(fn: (svc: S) => Effect.Effect<A, Err, I>) => getRuntime().runSync(attach(service.use(fn))),
+    runSync: <A, Err>(fn: (svc: S) => Effect.Effect<A, Err, I>) => getRuntime().runSync(service.use(fn)),
    runPromiseExit: <A, Err>(fn: (svc: S) => Effect.Effect<A, Err, I>, options?: Effect.RunOptions) =>
-      getRuntime().runPromiseExit(attach(service.use(fn)), options),
+      getRuntime().runPromiseExit(service.use(fn), options),
    runPromise: <A, Err>(fn: (svc: S) => Effect.Effect<A, Err, I>, options?: Effect.RunOptions) =>
-      getRuntime().runPromise(attach(service.use(fn)), options),
-    runFork: <A, Err>(fn: (svc: S) => Effect.Effect<A, Err, I>) => getRuntime().runFork(attach(service.use(fn))),
-    runCallback: <A, Err>(fn: (svc: S) => Effect.Effect<A, Err, I>) =>
-      getRuntime().runCallback(attach(service.use(fn))),
+      getRuntime().runPromise(service.use(fn), options),
+    runFork: <A, Err>(fn: (svc: S) => Effect.Effect<A, Err, I>) => getRuntime().runFork(service.use(fn)),
+    runCallback: <A, Err>(fn: (svc: S) => Effect.Effect<A, Err, I>) => getRuntime().runCallback(service.use(fn)),
  }
 }
@@ -108,11 +108,10 @@ export namespace Format {
              for (const item of yield* Effect.promise(() => getFormatter(ext))) {
                log.info("running", { command: item.command })
                const cmd = item.command.map((x) => x.replace("$FILE", filepath))
-                const dir = yield* InstanceState.directory
                const code = yield* spawner
                  .spawn(
                    ChildProcess.make(cmd[0]!, cmd.slice(1), {
-                      cwd: dir,
+                      cwd: Instance.directory,
                      env: item.environment,
                      extendEnv: true,
                    }),
@@ -9,7 +9,11 @@ import z from "zod"
 import { BusEvent } from "@/bus/bus-event"
 import { Flag } from "../flag/flag"
 import { Log } from "../util/log"
-import { CHANNEL as channel, VERSION as version } from "./meta"
+
+declare global {
+  const OPENCODE_VERSION: string
+  const OPENCODE_CHANNEL: string
+}

 import semver from "semver"

@@ -56,8 +60,8 @@ export namespace Installation {
    })
  export type Info = z.infer<typeof Info>

-  export const VERSION = version
-  export const CHANNEL = channel
+  export const VERSION = typeof OPENCODE_VERSION === "string" ? OPENCODE_VERSION : "local"
+  export const CHANNEL = typeof OPENCODE_CHANNEL === "string" ? OPENCODE_CHANNEL : "local"
  export const USER_AGENT = `opencode/${CHANNEL}/${VERSION}/${Flag.OPENCODE_CLIENT}`

  export function isPreview() {
@@ -1,7 +0,0 @@
-declare global {
-  const OPENCODE_VERSION: string
-  const OPENCODE_CHANNEL: string
-}
-
-export const VERSION = typeof OPENCODE_VERSION === "string" ? OPENCODE_VERSION : "local"
-export const CHANNEL = typeof OPENCODE_CHANNEL === "string" ? OPENCODE_CHANNEL : "local"
@@ -375,6 +375,38 @@ export async function CodexAuthPlugin(input: PluginInput): Promise<Hooks> {
          delete provider.models[modelId]
        }

+        if (!provider.models["gpt-5.3-codex"]) {
+          const model = {
+            id: ModelID.make("gpt-5.3-codex"),
+            providerID: ProviderID.openai,
+            api: {
+              id: "gpt-5.3-codex",
+              url: "https://chatgpt.com/backend-api/codex",
+              npm: "@ai-sdk/openai",
+            },
+            name: "GPT-5.3 Codex",
+            capabilities: {
+              temperature: false,
+              reasoning: true,
+              attachment: true,
+              toolcall: true,
+              input: { text: true, audio: false, image: true, video: false, pdf: false },
+              output: { text: true, audio: false, image: false, video: false, pdf: false },
+              interleaved: false,
+            },
+            cost: { input: 0, output: 0, cache: { read: 0, write: 0 } },
+            limit: { context: 400_000, input: 272_000, output: 128_000 },
+            status: "active" as const,
+            options: {},
+            headers: {},
+            release_date: "2026-02-05",
+            variants: {} as Record<string, Record<string, any>>,
+            family: "gpt-codex",
+          }
+          model.variants = ProviderTransform.variants(model)
+          provider.models["gpt-5.3-codex"] = model
+        }
+
        // Zero out costs for Codex (included with ChatGPT subscription)
        for (const model of Object.values(provider.models)) {
          model.cost = {
@@ -157,14 +157,6 @@ export namespace Plugin {

                const resolved = await PluginLoader.resolve(plan, "server")
                if (!resolved.ok) {
-                  if (resolved.stage === "missing") {
-                    log.warn("plugin has no server entrypoint", {
-                      path: plan.spec,
-                      message: resolved.message,
-                    })
-                    return
-                  }
-
                  const cause =
                    resolved.error instanceof Error ? (resolved.error.cause ?? resolved.error) : resolved.error
                  const message = errorMessage(cause)
@@ -11,7 +11,6 @@ import { ConfigPaths } from "@/config/paths"
 import { Global } from "@/global"
 import { Filesystem } from "@/util/filesystem"
 import { Flock } from "@/util/flock"
-import { isRecord } from "@/util/record"

 import { parsePluginSpecifier, readPluginPackage, resolvePluginTarget } from "./shared"

@@ -102,60 +101,28 @@ function pluginList(data: unknown) {
  return item.plugin
 }

-function exportValue(value: unknown): string | undefined {
-  if (typeof value === "string") {
-    const next = value.trim()
-    if (next) return next
-    return
-  }
-  if (!isRecord(value)) return
-  for (const key of ["import", "default"]) {
-    const next = value[key]
-    if (typeof next !== "string") continue
-    const hit = next.trim()
-    if (!hit) continue
-    return hit
-  }
-}
-
-function exportOptions(value: unknown): Record<string, unknown> | undefined {
-  if (!isRecord(value)) return
-  const config = value.config
-  if (!isRecord(config)) return
-  return config
-}
-
-function exportTarget(pkg: Record<string, unknown>, kind: Kind) {
-  const exports = pkg.exports
-  if (!isRecord(exports)) return
-  const value = exports[`./${kind}`]
-  const entry = exportValue(value)
-  if (!entry) return
+function parseTarget(item: unknown): Target | undefined {
+  if (item === "server" || item === "tui") return { kind: item }
+  if (!Array.isArray(item)) return
+  if (item[0] !== "server" && item[0] !== "tui") return
+  if (item.length < 2) return { kind: item[0] }
+  const opt = item[1]
+  if (!opt || typeof opt !== "object" || Array.isArray(opt)) return { kind: item[0] }
  return {
-    opts: exportOptions(value),
+    kind: item[0],
+    opts: opt,
  }
 }

-function hasMainTarget(pkg: Record<string, unknown>) {
-  const main = pkg.main
-  if (typeof main !== "string") return false
-  return Boolean(main.trim())
-}
-
-function packageTargets(pkg: Record<string, unknown>) {
-  const targets: Target[] = []
-  const server = exportTarget(pkg, "server")
-  if (server) {
-    targets.push({ kind: "server", opts: server.opts })
-  } else if (hasMainTarget(pkg)) {
-    targets.push({ kind: "server" })
+function parseTargets(raw: unknown) {
+  if (!Array.isArray(raw)) return []
+  const map = new Map<Kind, Target>()
+  for (const item of raw) {
+    const hit = parseTarget(item)
+    if (!hit) continue
+    map.set(hit.kind, hit)
  }
-
-  const tui = exportTarget(pkg, "tui")
-  if (tui) {
-    targets.push({ kind: "tui", opts: tui.opts })
-  }
-  return targets
+  return [...map.values()]
 }

 function patch(text: string, path: Array<string | number>, value: unknown, insert = false) {
@@ -293,7 +260,7 @@ export async function readPluginManifest(target: string): Promise<ManifestResult
    }
  }

-  const targets = packageTargets(pkg.item.json)
+  const targets = parseTargets(pkg.item.json["oc-plugin"])
  if (!targets.length) {
    return {
      ok: false,
@@ -363,7 +330,7 @@ async function patchOne(dir: string, target: Target, spec: string, force: boolea
  }

  const list = pluginList(data)
-  const item = target.opts ? ([spec, target.opts] as const) : spec
+  const item = target.opts ? [spec, target.opts] : spec
  const out = patchPluginList(text, list, spec, item, force)
  if (out.mode === "noop") {
    return {
@@ -43,9 +43,7 @@ export namespace PluginLoader {
    plan: Plan,
    kind: PluginKind,
  ): Promise<
-    | { ok: true; value: Resolved }
-    | { ok: false; stage: "missing"; message: string }
-    | { ok: false; stage: "install" | "entry" | "compatibility"; error: unknown }
+    { ok: true; value: Resolved } | { ok: false; stage: "install" | "entry" | "compatibility"; error: unknown }
  > {
    let target = ""
    try {
@@ -79,8 +77,8 @@ export namespace PluginLoader {
    if (!base.entry) {
      return {
        ok: false,
-        stage: "missing",
-        message: `Plugin ${plan.spec} does not expose a ${kind} entrypoint`,
+        stage: "entry",
+        error: new Error(`Plugin ${plan.spec} entry is empty`),
      }
    }

@@ -34,7 +34,7 @@ export type PluginEntry = {
  source: PluginSource
  target: string
  pkg?: PluginPackage
-  entry?: string
+  entry: string
 }

 const INDEX_FILES = ["index.ts", "index.tsx", "index.js", "index.mjs", "index.cjs"]
@@ -128,8 +128,13 @@ async function resolvePluginEntrypoint(spec: string, target: string, kind: Plugi
      if (index) return pathToFileURL(index).href
    }

-    if (source === "npm") return
-    if (dir) return
+    if (source === "npm") {
+      throw new TypeError(`Plugin ${spec} must define package.json exports["./tui"]`)
+    }
+
+    if (dir) {
+      throw new TypeError(`Plugin ${spec} must define package.json exports["./tui"] or include index file`)
+    }

    return target
  }
@@ -140,7 +145,7 @@ async function resolvePluginEntrypoint(spec: string, target: string, kind: Plugi
      if (index) return pathToFileURL(index).href
    }

-    return
+    throw new TypeError(`Plugin ${spec} must define package.json exports["./server"] or package.json main`)
  }

  return target
@@ -184,7 +189,7 @@ export async function checkPluginCompatibility(target: string, opencodeVersion:

 export async function resolvePluginTarget(spec: string, parsed = parsePluginSpecifier(spec)) {
  if (isPathPluginSpec(spec)) return resolvePathPluginTarget(spec)
-  return BunProc.install(parsed.pkg, parsed.version, { ignoreScripts: true })
+  return BunProc.install(parsed.pkg, parsed.version)
 }

 export async function readPluginPackage(target: string): Promise<PluginPackage> {
@@ -114,14 +114,6 @@ export const Instance = {
    const ctx = context.use()
    return ((...args: any[]) => context.provide(ctx, () => fn(...args))) as F
  },
-  /**
-   * Run a synchronous function within the given instance context ALS.
-   * Use this to bridge from Effect (where InstanceRef carries context)
-   * back to sync code that reads Instance.directory from ALS.
-   */
-  restore<R>(ctx: InstanceContext, fn: () => R): R {
-    return context.provide(ctx, fn)
-  },
  state<S>(init: () => S, dispose?: (state: Awaited<S>) => Promise<void>): () => S {
    return State.create(() => Instance.directory, init, dispose)
  },
@@ -1541,9 +1541,10 @@ export namespace Provider {
    }),
  )

-  export const defaultLayer = layer.pipe(Layer.provide(Config.defaultLayer), Layer.provide(Auth.defaultLayer))
-
-  const { runPromise } = makeRuntime(Service, defaultLayer)
+  const { runPromise } = makeRuntime(
+    Service,
+    layer.pipe(Layer.provide(Config.defaultLayer), Layer.provide(Auth.defaultLayer)),
+  )

  export async function list() {
    return runPromise((svc) => svc.list())
@@ -280,7 +280,6 @@ export namespace ProviderTransform {
    msgs = normalizeMessages(msgs, model, options)
    if (
      (model.providerID === "anthropic" ||
-        model.providerID === "google-vertex-anthropic" ||
        model.api.id.includes("anthropic") ||
        model.api.id.includes("claude") ||
        model.id.includes("anthropic") ||
@@ -293,7 +292,7 @@ export namespace ProviderTransform {

    // Remap providerOptions keys from stored providerID to expected SDK key
    const key = sdkKey(model.api.npm)
-    if (key && key !== model.providerID) {
+    if (key && key !== model.providerID && model.api.npm !== "@ai-sdk/azure") {
      const remap = (opts: Record<string, any> | undefined) => {
        if (!opts) return opts
        if (!(model.providerID in opts)) return opts
@@ -17,7 +17,6 @@ import { NotFoundError } from "@/storage/db"
 import { ModelID, ProviderID } from "@/provider/schema"
 import { Effect, Layer, ServiceMap } from "effect"
 import { makeRuntime } from "@/effect/run-service"
-import { InstanceState } from "@/effect/instance-state"
 import { isOverflow as overflow } from "./overflow"

 export namespace SessionCompaction {
@@ -214,7 +213,6 @@ When constructing the summary, try to stick to this template:
        const msgs = structuredClone(messages)
        yield* plugin.trigger("experimental.chat.messages.transform", {}, { messages: msgs })
        const modelMessages = yield* Effect.promise(() => MessageV2.toModelMessages(msgs, model, { stripMedia: true }))
-        const ctx = yield* InstanceState.context
        const msg: MessageV2.Assistant = {
          id: MessageID.ascending(),
          role: "assistant",
@@ -225,8 +223,8 @@ When constructing the summary, try to stick to this template:
          variant: userMessage.variant,
          summary: true,
          path: {
-            cwd: ctx.directory,
-            root: ctx.worktree,
+            cwd: Instance.directory,
+            root: Instance.worktree,
          },
          cost: 0,
          tokens: {
@@ -19,7 +19,6 @@ import { Log } from "../util/log"
 import { updateSchema } from "../util/update-schema"
 import { MessageV2 } from "./message-v2"
 import { Instance } from "../project/instance"
-import { InstanceState } from "@/effect/instance-state"
 import { SessionPrompt } from "./prompt"
 import { fn } from "@/util/fn"
 import { Command } from "../command"
@@ -258,9 +257,6 @@ export namespace Session {
    const cacheReadInputTokens = safe(input.usage.cachedInputTokens ?? 0)
    const cacheWriteInputTokens = safe(
      (input.metadata?.["anthropic"]?.["cacheCreationInputTokens"] ??
-        // google-vertex-anthropic returns metadata under "vertex" key
-        // (AnthropicMessagesLanguageModel custom provider key from 'vertex.anthropic.messages')
-        input.metadata?.["vertex"]?.["cacheCreationInputTokens"] ??
        // @ts-expect-error
        input.metadata?.["bedrock"]?.["usage"]?.["cacheWriteInputTokens"] ??
        // @ts-expect-error
@@ -383,12 +379,11 @@ export namespace Session {
        directory: string
        permission?: Permission.Ruleset
      }) {
-        const ctx = yield* InstanceState.context
        const result: Info = {
          id: SessionID.descending(input.id),
          slug: Slug.create(),
          version: Installation.VERSION,
-          projectID: ctx.project.id,
+          projectID: Instance.project.id,
          directory: input.directory,
          workspaceID: input.workspaceID,
          parentID: input.parentID,
@@ -446,12 +441,12 @@ export namespace Session {
      })

      const children = Effect.fn("Session.children")(function* (parentID: SessionID) {
-        const ctx = yield* InstanceState.context
+        const project = Instance.project
        const rows = yield* db((d) =>
          d
            .select()
            .from(SessionTable)
-            .where(and(eq(SessionTable.project_id, ctx.project.id), eq(SessionTable.parent_id, parentID)))
+            .where(and(eq(SessionTable.project_id, project.id), eq(SessionTable.parent_id, parentID)))
            .all(),
        )
        return rows.map(fromRow)
@@ -498,10 +493,9 @@ export namespace Session {
        permission?: Permission.Ruleset
        workspaceID?: WorkspaceID
      }) {
-        const directory = yield* InstanceState.directory
        return yield* createNext({
          parentID: input?.parentID,
-          directory,
+          directory: Instance.directory,
          title: input?.title,
          permission: input?.permission,
          workspaceID: input?.workspaceID,
@@ -509,11 +503,10 @@ export namespace Session {
      })

      const fork = Effect.fn("Session.fork")(function* (input: { sessionID: SessionID; messageID?: MessageID }) {
-        const directory = yield* InstanceState.directory
        const original = yield* get(input.sessionID)
        const title = getForkedTitle(original.title)
        const session = yield* createNext({
-          directory,
+          directory: Instance.directory,
          workspaceID: original.workspaceID,
          title,
        })
@@ -53,22 +53,32 @@ export namespace LLM {
    Effect.gen(function* () {
      return Service.of({
        stream(input) {
-          return Stream.scoped(
+          const stream: Stream.Stream<Event, unknown> = Stream.scoped(
            Stream.unwrap(
              Effect.gen(function* () {
                const ctrl = yield* Effect.acquireRelease(
                  Effect.sync(() => new AbortController()),
                  (ctrl) => Effect.sync(() => ctrl.abort()),
                )
+                const queue = yield* Queue.unbounded<Event, unknown | Cause.Done>()

-                const result = yield* Effect.promise(() => LLM.stream({ ...input, abort: ctrl.signal }))
-
-                return Stream.fromAsyncIterable(result.fullStream, (e) =>
-                  e instanceof Error ? e : new Error(String(e)),
+                yield* Effect.promise(async () => {
+                  const result = await LLM.stream({ ...input, abort: ctrl.signal })
+                  for await (const event of result.fullStream) {
+                    if (!Queue.offerUnsafe(queue, event)) break
+                  }
+                  Queue.endUnsafe(queue)
+                }).pipe(
+                  Effect.catchCause((cause) => Effect.sync(() => void Queue.failCauseUnsafe(queue, cause))),
+                  Effect.onInterrupt(() => Effect.sync(() => ctrl.abort())),
+                  Effect.forkScoped,
                )
+
+                return Stream.fromQueue(queue)
              }),
            ),
          )
+          return stream
        },
      })
    }),
@@ -148,7 +148,6 @@ export namespace SessionPrompt {
      })

      const resolvePromptParts = Effect.fn("SessionPrompt.resolvePromptParts")(function* (template: string) {
-        const ctx = yield* InstanceState.context
        const parts: PromptInput["parts"] = [{ type: "text", text: template }]
        const files = ConfigMarkdown.files(template)
        const seen = new Set<string>()
@@ -160,7 +159,7 @@ export namespace SessionPrompt {
            seen.add(name)
            const filepath = name.startsWith("~/")
              ? path.join(os.homedir(), name.slice(2))
-              : path.resolve(ctx.worktree, name)
+              : path.resolve(Instance.worktree, name)

            const info = yield* fsys.stat(filepath).pipe(Effect.option)
            if (Option.isNone(info)) {
@@ -404,7 +403,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
            Effect.runPromise(
              Effect.gen(function* () {
                const match = input.processor.partFromToolCall(options.toolCallId)
-                if (!match || !["running", "pending"].includes(match.state.status)) return
+                if (!match || match.state.status !== "running") return
                yield* sessions.updatePart({
                  ...match,
                  state: {
@@ -554,7 +553,6 @@ NOTE: At any point in time through this workflow you should feel free to ask the
        msgs: MessageV2.WithParts[]
      }) {
        const { task, model, lastUser, sessionID, session, msgs } = input
-        const ctx = yield* InstanceState.context
        const taskTool = yield* Effect.promise(() => TaskTool.init())
        const taskModel = task.model ? yield* getModel(task.model.providerID, task.model.modelID, sessionID) : model
        const assistantMessage: MessageV2.Assistant = yield* sessions.updateMessage({
@@ -565,7 +563,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
          mode: task.agent,
          agent: task.agent,
          variant: lastUser.variant,
-          path: { cwd: ctx.directory, root: ctx.worktree },
+          path: { cwd: Instance.directory, root: Instance.worktree },
          cost: 0,
          tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
          modelID: taskModel.id,
@@ -736,7 +734,6 @@ NOTE: At any point in time through this workflow you should feel free to ask the
      })

      const shellImpl = Effect.fn("SessionPrompt.shellImpl")(function* (input: ShellInput, signal: AbortSignal) {
-        const ctx = yield* InstanceState.context
        const session = yield* sessions.get(input.sessionID)
        if (session.revert) {
          yield* Effect.promise(() => SessionRevert.cleanup(session))
@@ -776,7 +773,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
          mode: input.agent,
          agent: input.agent,
          cost: 0,
-          path: { cwd: ctx.directory, root: ctx.worktree },
+          path: { cwd: Instance.directory, root: Instance.worktree },
          time: { created: Date.now() },
          role: "assistant",
          tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
@@ -835,7 +832,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
        }

        const args = (invocations[shellName] ?? invocations[""]).args
-        const cwd = ctx.directory
+        const cwd = Instance.directory
        const shellEnv = yield* plugin.trigger(
          "shell.env",
          { cwd, sessionID: input.sessionID, callID: part.callID },
@@ -979,7 +976,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
          variant,
        }

-        yield* Effect.addFinalizer(() => InstanceState.withALS(() => InstructionPrompt.clear(info.id)))
+        yield* Effect.addFinalizer(() => Effect.sync(() => InstructionPrompt.clear(info.id)))

        type Draft<T> = T extends MessageV2.Part ? Omit<T, "id"> & { id?: string } : never
        const assign = (part: Draft<MessageV2.Part>): MessageV2.Part => ({
@@ -1333,7 +1330,6 @@ NOTE: At any point in time through this workflow you should feel free to ask the

      const runLoop: (sessionID: SessionID) => Effect.Effect<MessageV2.WithParts> = Effect.fn("SessionPrompt.run")(
        function* (sessionID: SessionID) {
-          const ctx = yield* InstanceState.context
          let structured: unknown | undefined
          let step = 0
          const session = yield* sessions.get(sessionID)
@@ -1425,7 +1421,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
              mode: agent.name,
              agent: agent.name,
              variant: lastUser.variant,
-              path: { cwd: ctx.directory, root: ctx.worktree },
+              path: { cwd: Instance.directory, root: Instance.worktree },
              cost: 0,
              tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
              modelID: model.id,
@@ -1542,7 +1538,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
              }),
              Effect.fnUntraced(function* (exit) {
                if (Exit.isFailure(exit) && Cause.hasInterruptsOnly(exit.cause)) yield* handle.abort()
-                yield* InstanceState.withALS(() => InstructionPrompt.clear(handle.message.id))
+                InstructionPrompt.clear(handle.message.id)
              }),
            )
            if (outcome === "break") break
@@ -1,114 +0,0 @@
-You are OpenCode, an interactive general AI agent running on a user's computer.
-
-Your primary goal is to help users with software engineering tasks by taking action — use the tools available to you to make real changes on the user's system. You should also answer questions when asked. Always adhere strictly to the following system instructions and the user's requirements.
-
-# Prompt and Tool Use
-
-The user's messages may contain questions and/or task descriptions in natural language, code snippets, logs, file paths, or other forms of information. Read them, understand them and do what the user requested. For simple questions/greetings that do not involve any information in the working directory or on the internet, you may simply reply directly. For anything else, default to taking action with tools. When the request could be interpreted as either a question to answer or a task to complete, treat it as a task.
-
-When handling the user's request, if it involves creating, modifying, or running code or files, you MUST use the appropriate tools to make actual changes — do not just describe the solution in text. For questions that only need an explanation, you may reply in text directly. When calling tools, do not provide explanations because the tool calls themselves should be self-explanatory. You MUST follow the description of each tool and its parameters when calling tools.
-
-If the `task` tool is available, you can use it to delegate a focused subtask to a subagent instance. When delegating, provide a complete prompt with all necessary context because a newly created subagent does not automatically see your current context.
-
-You have the capability to output any number of tool calls in a single response. If you anticipate making multiple non-interfering tool calls, you are HIGHLY RECOMMENDED to make them in parallel to significantly improve efficiency. This is very important to your performance.
-
-The results of the tool calls will be returned to you in a tool message. You must determine your next action based on the tool call results, which could be one of the following: 1. Continue working on the task, 2. Inform the user that the task is completed or has failed, or 3. Ask the user for more information.
-
-Tool results and user messages may include `<system-reminder>` tags. These are authoritative system directives that you MUST follow. They bear no direct relation to the specific tool results or user messages in which they appear. Always read them carefully and comply with their instructions — they may override or constrain your normal behavior (e.g., restricting you to read-only actions during plan mode).
-
-When responding to the user, you MUST use the SAME language as the user, unless explicitly instructed to do otherwise.
-
-# General Guidelines for Coding
-
-When building something from scratch, you should:
-
- Understand the user's requirements.
- Ask the user for clarification if there is anything unclear.
- Design the architecture and make a plan for the implementation.
- Write the code in a modular and maintainable way.
-
-Always use tools to implement your code changes:
-
- Use `write`/`edit` to create or modify source files. Code that only appears in your text response is NOT saved to the file system and will not take effect.
- Use `bash` to run and test your code after writing it.
- Iterate: if tests fail, read the error, fix the code with `write`/`edit`, and re-test with `bash`.
-
-When working on an existing codebase, you should:
-
- Understand the codebase by reading it with tools (`read`, `glob`, `grep`) before making changes. Identify the ultimate goal and the most important criteria to achieve the goal.
- For a bug fix, you typically need to check error logs or failed tests, scan over the codebase to find the root cause, and figure out a fix. If user mentioned any failed tests, you should make sure they pass after the changes.
- For a feature, you typically need to design the architecture, and write the code in a modular and maintainable way, with minimal intrusions to existing code. Add new tests if the project already has tests.
- For a code refactoring, you typically need to update all the places that call the code you are refactoring if the interface changes. DO NOT change any existing logic especially in tests, focus only on fixing any errors caused by the interface changes.
- Make MINIMAL changes to achieve the goal. This is very important to your performance.
- Follow the coding style of existing code in the project.
-
-DO NOT run `git commit`, `git push`, `git reset`, `git rebase` and/or do any other git mutations unless explicitly asked to do so. Ask for confirmation each time when you need to do git mutations, even if the user has confirmed in earlier conversations.
-
-# General Guidelines for Research and Data Processing
-
-The user may ask you to research on certain topics, process or generate certain multimedia files. When doing such tasks, you must:
-
- Understand the user's requirements thoroughly, ask for clarification before you start if needed.
- Make plans before doing deep or wide research, to ensure you are always on track.
- Search on the Internet if possible, with carefully-designed search queries to improve efficiency and accuracy.
- Use proper tools or shell commands or Python packages to process or generate images, videos, PDFs, docs, spreadsheets, presentations, or other multimedia files. Detect if there are already such tools in the environment. If you have to install third-party tools/packages, you MUST ensure that they are installed in a virtual/isolated environment.
- Once you generate or edit any images, videos or other media files, try to read it again before proceed, to ensure that the content is as expected.
- Avoid installing or deleting anything to/from outside of the current working directory. If you have to do so, ask the user for confirmation.
-
-# Working Environment
-
-## Operating System
-
-The operating environment is not in a sandbox. Any actions you do will immediately affect the user's system. So you MUST be extremely cautious. Unless being explicitly instructed to do so, you should never access (read/write/execute) files outside of the working directory.
-
-## Working Directory
-
-The working directory should be considered as the project root if you are instructed to perform tasks on the project. Every file system operation will be relative to the working directory if you do not explicitly specify the absolute path. Tools may require absolute paths for some parameters, IF SO, YOU MUST use absolute paths for these parameters.
-
-# Project Information
-
-Markdown files named `AGENTS.md` usually contain the background, structure, coding styles, user preferences and other relevant information about the project. You should use this information to understand the project and the user's preferences. `AGENTS.md` files may exist at different locations in the project, but typically there is one in the project root.
-
-> Why `AGENTS.md`?
->
-> `README.md` files are for humans: quick starts, project descriptions, and contribution guidelines. `AGENTS.md` complements this by containing the extra, sometimes detailed context coding agents need: build steps, tests, and conventions that might clutter a README or aren’t relevant to human contributors.
->
-> We intentionally kept it separate to:
->
-> - Give agents a clear, predictable place for instructions.
-> - Keep `README`s concise and focused on human contributors.
-> - Provide precise, agent-focused guidance that complements existing `README` and docs.
-If the `AGENTS.md` is empty or insufficient, you may check `README`/`README.md` files or `AGENTS.md` files in subdirectories for more information about specific parts of the project.
-
-If you modified any files/styles/structures/configurations/workflows/... mentioned in `AGENTS.md` files, you MUST update the corresponding `AGENTS.md` files to keep them up-to-date.
-
-# Skills
-
-Skills are reusable, composable capabilities that enhance your abilities. Each skill is a self-contained directory with a `SKILL.md` file that contains instructions, examples, and/or reference material.
-
-## What are skills?
-
-Skills are modular extensions that provide:
-
- Specialized knowledge: Domain-specific expertise (e.g., PDF processing, data analysis)
- Workflow patterns: Best practices for common tasks
- Tool integrations: Pre-configured tool chains for specific operations
- Reference material: Documentation, templates, and examples
-
-## How to use skills
-
-Identify the skills that are likely to be useful for the tasks you are currently working on, use the `skill` tool to load a skill for detailed instructions, guidelines, scripts and more.
-
-Only load skill details when needed to conserve the context window.
-
-# Ultimate Reminders
-
-At any time, you should be HELPFUL, CONCISE, and ACCURATE. Be thorough in your actions — test what you build, verify what you change — not in your explanations.
-
- Never diverge from the requirements and the goals of the task you work on. Stay on track.
- Never give the user more than what they want.
- Try your best to avoid any hallucination. Do fact checking before providing any factual information.
- Think about the best approach, then take action decisively.
- Do not give up too early.
- ALWAYS, keep it stupidly simple. Do not overcomplicate things.
- When the task requires creating or modifying files, always use tools to do so. Never treat displaying code in your response as a substitute for actually writing it to the file system.
@@ -7,7 +7,6 @@ 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_KIMI from "./prompt/kimi.txt"

 import PROMPT_CODEX from "./prompt/codex.txt"
 import PROMPT_TRINITY from "./prompt/trinity.txt"
@@ -29,7 +28,6 @@ export namespace SystemPrompt {
    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]
-    if (model.api.id.toLowerCase().includes("kimi")) return [PROMPT_KIMI]
    return [PROMPT_DEFAULT]
  }

@@ -10,9 +10,8 @@ import { NamedError } from "@opencode-ai/util/error"
 import z from "zod"
 import path from "path"
 import { readFileSync, readdirSync, existsSync } from "fs"
+import { Installation } from "../installation"
 import { Flag } from "../flag/flag"
-import { CHANNEL } from "../installation/meta"
-import { InstanceState } from "@/effect/instance-state"
 import { iife } from "@/util/iife"
 import { init } from "#db"

@@ -29,9 +28,10 @@ const log = Log.create({ service: "db" })

 export namespace Database {
  export function getChannelPath() {
-    if (["latest", "beta"].includes(CHANNEL) || Flag.OPENCODE_DISABLE_CHANNEL_DB)
+    const channel = Installation.CHANNEL
+    if (["latest", "beta"].includes(channel) || Flag.OPENCODE_DISABLE_CHANNEL_DB)
      return path.join(Global.Path.data, "opencode.db")
-    const safe = CHANNEL.replace(/[^a-zA-Z0-9._-]/g, "-")
+    const safe = channel.replace(/[^a-zA-Z0-9._-]/g, "-")
    return path.join(Global.Path.data, `opencode-${safe}.db`)
  }

@@ -142,11 +142,10 @@ export namespace Database {
  }

  export function effect(fn: () => any | Promise<any>) {
-    const bound = InstanceState.bind(fn)
    try {
-      ctx.use().effects.push(bound)
+      ctx.use().effects.push(fn)
    } catch {
-      bound()
+      fn()
    }
  }

@@ -163,8 +162,12 @@ export namespace Database {
    } catch (err) {
      if (err instanceof Context.NotFound) {
        const effects: (() => void | Promise<void>)[] = []
-        const txCallback = InstanceState.bind((tx: TxOrDb) => ctx.provide({ tx, effects }, () => callback(tx)))
-        const result = Client().transaction(txCallback, { behavior: options?.behavior })
+        const result = Client().transaction(
+          (tx: TxOrDb) => {
+            return ctx.provide({ tx, effects }, () => callback(tx))
+          },
+          { behavior: options?.behavior },
+        )
        for (const effect of effects) effect()
        return result as NotPromise<T>
      }
@@ -18,7 +18,6 @@ import { NodePath } from "@effect/platform-node"
 import { AppFileSystem } from "@/filesystem"
 import { makeRuntime } from "@/effect/run-service"
 import * as CrossSpawnSpawner from "@/effect/cross-spawn-spawner"
-import { InstanceState } from "@/effect/instance-state"

 export namespace Worktree {
  const log = Log.create({ service: "worktree" })
@@ -200,7 +199,6 @@ export namespace Worktree {

      const MAX_NAME_ATTEMPTS = 26
      const candidate = Effect.fn("Worktree.candidate")(function* (root: string, base?: string) {
-        const ctx = yield* InstanceState.context
        for (const attempt of Array.from({ length: MAX_NAME_ATTEMPTS }, (_, i) => i)) {
          const name = base ? (attempt === 0 ? base : `${base}-${Slug.create()}`) : Slug.create()
          const branch = `opencode/${name}`
@@ -209,7 +207,7 @@ export namespace Worktree {
          if (yield* fs.exists(directory).pipe(Effect.orDie)) continue

          const ref = `refs/heads/${branch}`
-          const branchCheck = yield* git(["show-ref", "--verify", "--quiet", ref], { cwd: ctx.worktree })
+          const branchCheck = yield* git(["show-ref", "--verify", "--quiet", ref], { cwd: Instance.worktree })
          if (branchCheck.code === 0) continue

          return Info.parse({ name, branch, directory })
@@ -218,12 +216,11 @@ export namespace Worktree {
      })

      const makeWorktreeInfo = Effect.fn("Worktree.makeWorktreeInfo")(function* (name?: string) {
-        const ctx = yield* InstanceState.context
-        if (ctx.project.vcs !== "git") {
+        if (Instance.project.vcs !== "git") {
          throw new NotGitError({ message: "Worktrees are only supported for git projects" })
        }

-        const root = pathSvc.join(Global.Path.data, "worktree", ctx.project.id)
+        const root = pathSvc.join(Global.Path.data, "worktree", Instance.project.id)
        yield* fs.makeDirectory(root, { recursive: true }).pipe(Effect.orDie)

        const base = name ? slugify(name) : ""
@@ -231,20 +228,18 @@ export namespace Worktree {
      })

      const setup = Effect.fnUntraced(function* (info: Info) {
-        const ctx = yield* InstanceState.context
        const created = yield* git(["worktree", "add", "--no-checkout", "-b", info.branch, info.directory], {
-          cwd: ctx.worktree,
+          cwd: Instance.worktree,
        })
        if (created.code !== 0) {
          throw new CreateFailedError({ message: created.stderr || created.text || "Failed to create git worktree" })
        }

-        yield* project.addSandbox(ctx.project.id, info.directory).pipe(Effect.catch(() => Effect.void))
+        yield* project.addSandbox(Instance.project.id, info.directory).pipe(Effect.catch(() => Effect.void))
      })

      const boot = Effect.fnUntraced(function* (info: Info, startCommand?: string) {
-        const ctx = yield* InstanceState.context
-        const projectID = ctx.project.id
+        const projectID = Instance.project.id
        const extra = startCommand?.trim()

        const populated = yield* git(["reset", "--hard"], { cwd: info.directory })
@@ -16,21 +16,21 @@ const truncate = Layer.effectDiscard(

 const it = testEffect(Layer.merge(AccountRepo.layer, truncate))

-it.live("list returns empty when no accounts exist", () =>
+it.effect("list returns empty when no accounts exist", () =>
  Effect.gen(function* () {
    const accounts = yield* AccountRepo.use((r) => r.list())
    expect(accounts).toEqual([])
  }),
 )

-it.live("active returns none when no accounts exist", () =>
+it.effect("active returns none when no accounts exist", () =>
  Effect.gen(function* () {
    const active = yield* AccountRepo.use((r) => r.active())
    expect(Option.isNone(active)).toBe(true)
  }),
 )

-it.live("persistAccount inserts and getRow retrieves", () =>
+it.effect("persistAccount inserts and getRow retrieves", () =>
  Effect.gen(function* () {
    const id = AccountID.make("user-1")
    yield* AccountRepo.use((r) =>
@@ -56,7 +56,7 @@ it.live("persistAccount inserts and getRow retrieves", () =>
  }),
 )

-it.live("persistAccount sets the active account and org", () =>
+it.effect("persistAccount sets the active account and org", () =>
  Effect.gen(function* () {
    const id1 = AccountID.make("user-1")
    const id2 = AccountID.make("user-2")
@@ -93,7 +93,7 @@ it.live("persistAccount sets the active account and org", () =>
  }),
 )

-it.live("list returns all accounts", () =>
+it.effect("list returns all accounts", () =>
  Effect.gen(function* () {
    const id1 = AccountID.make("user-1")
    const id2 = AccountID.make("user-2")
@@ -128,7 +128,7 @@ it.live("list returns all accounts", () =>
  }),
 )

-it.live("remove deletes an account", () =>
+it.effect("remove deletes an account", () =>
  Effect.gen(function* () {
    const id = AccountID.make("user-1")

@@ -151,7 +151,7 @@ it.live("remove deletes an account", () =>
  }),
 )

-it.live("use stores the selected org and marks the account active", () =>
+it.effect("use stores the selected org and marks the account active", () =>
  Effect.gen(function* () {
    const id1 = AccountID.make("user-1")
    const id2 = AccountID.make("user-2")
@@ -191,7 +191,7 @@ it.live("use stores the selected org and marks the account active", () =>
  }),
 )

-it.live("persistToken updates token fields", () =>
+it.effect("persistToken updates token fields", () =>
  Effect.gen(function* () {
    const id = AccountID.make("user-1")

@@ -225,7 +225,7 @@ it.live("persistToken updates token fields", () =>
  }),
 )

-it.live("persistToken with no expiry sets token_expiry to null", () =>
+it.effect("persistToken with no expiry sets token_expiry to null", () =>
  Effect.gen(function* () {
    const id = AccountID.make("user-1")

@@ -255,7 +255,7 @@ it.live("persistToken with no expiry sets token_expiry to null", () =>
  }),
 )

-it.live("persistAccount upserts on conflict", () =>
+it.effect("persistAccount upserts on conflict", () =>
  Effect.gen(function* () {
    const id = AccountID.make("user-1")

@@ -295,7 +295,7 @@ it.live("persistAccount upserts on conflict", () =>
  }),
 )

-it.live("remove clears active state when deleting the active account", () =>
+it.effect("remove clears active state when deleting the active account", () =>
  Effect.gen(function* () {
    const id = AccountID.make("user-1")

@@ -318,7 +318,7 @@ it.live("remove clears active state when deleting the active account", () =>
  }),
 )

-it.live("getRow returns none for nonexistent account", () =>
+it.effect("getRow returns none for nonexistent account", () =>
  Effect.gen(function* () {
    const row = yield* AccountRepo.use((r) => r.getRow(AccountID.make("nope")))
    expect(Option.isNone(row)).toBe(true)
@@ -54,7 +54,7 @@ const deviceTokenClient = (body: unknown, status = 400) =>
 const poll = (body: unknown, status = 400) =>
  Account.Service.use((s) => s.poll(login())).pipe(Effect.provide(live(deviceTokenClient(body, status))))

-it.live("orgsByAccount groups orgs per account", () =>
+it.effect("orgsByAccount groups orgs per account", () =>
  Effect.gen(function* () {
    yield* AccountRepo.use((r) =>
      r.persistAccount({
@@ -107,7 +107,7 @@ it.live("orgsByAccount groups orgs per account", () =>
  }),
 )

-it.live("token refresh persists the new token", () =>
+it.effect("token refresh persists the new token", () =>
  Effect.gen(function* () {
    const id = AccountID.make("user-1")

@@ -148,7 +148,7 @@ it.live("token refresh persists the new token", () =>
  }),
 )

-it.live("config sends the selected org header", () =>
+it.effect("config sends the selected org header", () =>
  Effect.gen(function* () {
    const id = AccountID.make("user-1")

@@ -188,7 +188,7 @@ it.live("config sends the selected org header", () =>
  }),
 )

-it.live("poll stores the account and first org on success", () =>
+it.effect("poll stores the account and first org on success", () =>
  Effect.gen(function* () {
    const client = HttpClient.make((req) =>
      Effect.succeed(
@@ -259,7 +259,7 @@ for (const [name, body, expectedTag] of [
    "PollExpired",
  ],
 ] as const) {
-  it.live(`poll returns ${name} for ${body.error}`, () =>
+  it.effect(`poll returns ${name} for ${body.error}`, () =>
    Effect.gen(function* () {
      const result = yield* poll(body)
      expect(result._tag).toBe(expectedTag)
@@ -267,7 +267,7 @@ for (const [name, body, expectedTag] of [
  )
 }

-it.live("poll returns poll error for other OAuth errors", () =>
+it.effect("poll returns poll error for other OAuth errors", () =>
  Effect.gen(function* () {
    const result = yield* poll({
      error: "server_error",
@@ -1,10 +1,6 @@
-import { describe, expect, spyOn, test } from "bun:test"
+import { describe, expect, test } from "bun:test"
 import fs from "fs/promises"
 import path from "path"
-import { BunProc } from "../src/bun"
-import { PackageRegistry } from "../src/bun/registry"
-import { Global } from "../src/global"
-import { Process } from "../src/util/process"

 describe("BunProc registry configuration", () => {
  test("should not contain hardcoded registry parameters", async () => {
@@ -55,83 +51,3 @@ describe("BunProc registry configuration", () => {
    }
  })
 })
-
-describe("BunProc install pinning", () => {
-  test("uses pinned cache without touching registry", async () => {
-    const pkg = `pin-test-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`
-    const ver = "1.2.3"
-    const mod = path.join(Global.Path.cache, "node_modules", pkg)
-    const data = path.join(Global.Path.cache, "package.json")
-
-    await fs.mkdir(mod, { recursive: true })
-    await Bun.write(path.join(mod, "package.json"), JSON.stringify({ name: pkg, version: ver }, null, 2))
-
-    const src = await fs.readFile(data, "utf8").catch(() => "")
-    const json = src ? ((JSON.parse(src) as { dependencies?: Record<string, string> }) ?? {}) : {}
-    const deps = json.dependencies ?? {}
-    deps[pkg] = ver
-    await Bun.write(data, JSON.stringify({ ...json, dependencies: deps }, null, 2))
-
-    const stale = spyOn(PackageRegistry, "isOutdated").mockImplementation(async () => {
-      throw new Error("unexpected registry check")
-    })
-    const run = spyOn(Process, "run").mockImplementation(async () => {
-      throw new Error("unexpected process.run")
-    })
-
-    try {
-      const out = await BunProc.install(pkg, ver)
-      expect(out).toBe(mod)
-      expect(stale).not.toHaveBeenCalled()
-      expect(run).not.toHaveBeenCalled()
-    } finally {
-      stale.mockRestore()
-      run.mockRestore()
-
-      await fs.rm(mod, { recursive: true, force: true })
-      const end = await fs
-        .readFile(data, "utf8")
-        .then((item) => JSON.parse(item) as { dependencies?: Record<string, string> })
-        .catch(() => undefined)
-      if (end?.dependencies) {
-        delete end.dependencies[pkg]
-        await Bun.write(data, JSON.stringify(end, null, 2))
-      }
-    }
-  })
-
-  test("passes --ignore-scripts when requested", async () => {
-    const pkg = `ignore-test-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`
-    const ver = "4.5.6"
-    const mod = path.join(Global.Path.cache, "node_modules", pkg)
-    const data = path.join(Global.Path.cache, "package.json")
-
-    const run = spyOn(Process, "run").mockImplementation(async () => ({
-      code: 0,
-      stdout: Buffer.alloc(0),
-      stderr: Buffer.alloc(0),
-    }))
-
-    try {
-      await fs.rm(mod, { recursive: true, force: true })
-      await BunProc.install(pkg, ver, { ignoreScripts: true })
-
-      expect(run).toHaveBeenCalled()
-      const call = run.mock.calls[0]?.[0]
-      expect(call).toContain("--ignore-scripts")
-      expect(call).toContain(`${pkg}@${ver}`)
-    } finally {
-      run.mockRestore()
-      await fs.rm(mod, { recursive: true, force: true })
-
-      const end = await fs
-        .readFile(data, "utf8")
-        .then((item) => JSON.parse(item) as { dependencies?: Record<string, string> })
-        .catch(() => undefined)
-      if (end?.dependencies) {
-        delete end.dependencies[pkg]
-        await Bun.write(data, JSON.stringify(end, null, 2))
-      }
-    }
-  })
-})
@@ -22,7 +22,7 @@ const live = Layer.mergeAll(Bus.layer, node)
 const it = testEffect(live)

 describe("Bus (Effect-native)", () => {
-  it.live("publish + subscribe stream delivers events", () =>
+  it.effect("publish + subscribe stream delivers events", () =>
    provideTmpdirInstance(() =>
      Effect.gen(function* () {
        const bus = yield* Bus.Service
@@ -46,7 +46,7 @@ describe("Bus (Effect-native)", () => {
    ),
  )

-  it.live("subscribe filters by event type", () =>
+  it.effect("subscribe filters by event type", () =>
    provideTmpdirInstance(() =>
      Effect.gen(function* () {
        const bus = yield* Bus.Service
@@ -70,7 +70,7 @@ describe("Bus (Effect-native)", () => {
    ),
  )

-  it.live("subscribeAll receives all types", () =>
+  it.effect("subscribeAll receives all types", () =>
    provideTmpdirInstance(() =>
      Effect.gen(function* () {
        const bus = yield* Bus.Service
@@ -95,7 +95,7 @@ describe("Bus (Effect-native)", () => {
    ),
  )

-  it.live("multiple subscribers each receive the event", () =>
+  it.effect("multiple subscribers each receive the event", () =>
    provideTmpdirInstance(() =>
      Effect.gen(function* () {
        const bus = yield* Bus.Service
@@ -129,7 +129,7 @@ describe("Bus (Effect-native)", () => {
    ),
  )

-  it.live("subscribeAll stream sees InstanceDisposed on disposal", () =>
+  it.effect("subscribeAll stream sees InstanceDisposed on disposal", () =>
    Effect.gen(function* () {
      const dir = yield* tmpdirScoped()
      const types: string[] = []
@@ -21,12 +21,8 @@ test("installs plugin without loading it", async () => {
          {
            name: "demo-install-plugin",
            type: "module",
-            exports: {
-              "./tui": {
-                import: "./install-plugin.ts",
-                config: { marker },
-              },
-            },
+            main: "./install-plugin.ts",
+            "oc-plugin": [["tui", { marker }]],
          },
          null,
          2,
@@ -50,7 +46,7 @@ test("installs plugin without loading it", async () => {
  })

  process.env.OPENCODE_PLUGIN_META_FILE = path.join(tmp.path, "plugin-meta.json")
-  const cfg: Awaited<ReturnType<typeof TuiConfig.get>> = {
+  let cfg: Awaited<ReturnType<typeof TuiConfig.get>> = {
    plugin: [],
    plugin_records: undefined,
  }
@@ -70,6 +66,17 @@ test("installs plugin without loading it", async () => {

  try {
    await TuiPluginRuntime.init(api)
+    cfg = {
+      plugin: [[tmp.extra.spec, { marker: tmp.extra.marker }]],
+      plugin_records: [
+        {
+          item: [tmp.extra.spec, { marker: tmp.extra.marker }],
+          scope: "local",
+          source: path.join(tmp.path, "tui.json"),
+        },
+      ],
+    }
+
    const out = await TuiPluginRuntime.installPlugin(tmp.extra.spec)
    expect(out).toMatchObject({
      ok: true,
@@ -304,23 +304,17 @@ test("does not use npm package main for tui entry", async () => {
  const wait = spyOn(TuiConfig, "waitForDependencies").mockResolvedValue()
  const cwd = spyOn(process, "cwd").mockImplementation(() => tmp.path)
  const install = spyOn(BunProc, "install").mockResolvedValue(tmp.extra.mod)
-  const warn = spyOn(console, "warn").mockImplementation(() => {})
-  const error = spyOn(console, "error").mockImplementation(() => {})

  try {
    await TuiPluginRuntime.init(createTuiPluginApi())
    await expect(fs.readFile(tmp.extra.marker, "utf8")).rejects.toThrow()
    expect(TuiPluginRuntime.list().some((item) => item.spec === tmp.extra.spec)).toBe(false)
-    expect(error).not.toHaveBeenCalled()
-    expect(warn.mock.calls.some((call) => String(call[0]).includes("tui plugin has no entrypoint"))).toBe(true)
  } finally {
    await TuiPluginRuntime.dispose()
    install.mockRestore()
    cwd.mockRestore()
    get.mockRestore()
    wait.mockRestore()
-    warn.mockRestore()
-    error.mockRestore()
    delete process.env.OPENCODE_PLUGIN_META_FILE
  }
 })
@@ -792,7 +792,6 @@ test("installs dependencies in writable OPENCODE_CONFIG_DIR", async () => {

    expect(await Filesystem.exists(path.join(tmp.extra, "package.json"))).toBe(true)
    expect(await Filesystem.exists(path.join(tmp.extra, ".gitignore"))).toBe(true)
-    expect(await Filesystem.readText(path.join(tmp.extra, ".gitignore"))).toContain("package-lock.json")
  } finally {
    online.mockRestore()
    run.mockRestore()
@@ -1,7 +1,6 @@
 import { afterEach, expect, test } from "bun:test"
-import { Cause, Deferred, Duration, Effect, Exit, Fiber, Layer, ManagedRuntime, ServiceMap } from "effect"
+import { Duration, Effect, Layer, ManagedRuntime, ServiceMap } from "effect"
 import { InstanceState } from "../../src/effect/instance-state"
-import { InstanceRef } from "../../src/effect/instance-ref"
 import { Instance } from "../../src/project/instance"
 import { tmpdir } from "../fixture/fixture"

@@ -383,100 +382,3 @@ test("InstanceState dedupes concurrent lookups", async () => {
    ),
  )
 })
-
-test("InstanceState survives deferred resume from the same instance context", async () => {
-  await using tmp = await tmpdir({ git: true })
-
-  interface Api {
-    readonly get: (gate: Deferred.Deferred<void>) => Effect.Effect<string>
-  }
-
-  class Test extends ServiceMap.Service<Test, Api>()("@test/DeferredResume") {
-    static readonly layer = Layer.effect(
-      Test,
-      Effect.gen(function* () {
-        const state = yield* InstanceState.make((ctx) => Effect.sync(() => ctx.directory))
-
-        return Test.of({
-          get: Effect.fn("Test.get")(function* (gate: Deferred.Deferred<void>) {
-            yield* Deferred.await(gate)
-            return yield* InstanceState.get(state)
-          }),
-        })
-      }),
-    )
-  }
-
-  const rt = ManagedRuntime.make(Test.layer)
-
-  try {
-    const gate = await Effect.runPromise(Deferred.make<void>())
-    const fiber = await Instance.provide({
-      directory: tmp.path,
-      fn: () => Promise.resolve(rt.runFork(Test.use((svc) => svc.get(gate)))),
-    })
-
-    await Instance.provide({
-      directory: tmp.path,
-      fn: () => Effect.runPromise(Deferred.succeed(gate, void 0)),
-    })
-    const exit = await Effect.runPromise(Fiber.await(fiber))
-
-    expect(Exit.isSuccess(exit)).toBe(true)
-    if (Exit.isSuccess(exit)) {
-      expect(exit.value).toBe(tmp.path)
-    }
-  } finally {
-    await rt.dispose()
-  }
-})
-
-test("InstanceState survives deferred resume outside ALS when InstanceRef is set", async () => {
-  await using tmp = await tmpdir({ git: true })
-
-  interface Api {
-    readonly get: (gate: Deferred.Deferred<void>) => Effect.Effect<string>
-  }
-
-  class Test extends ServiceMap.Service<Test, Api>()("@test/DeferredResumeOutside") {
-    static readonly layer = Layer.effect(
-      Test,
-      Effect.gen(function* () {
-        const state = yield* InstanceState.make((ctx) => Effect.sync(() => ctx.directory))
-
-        return Test.of({
-          get: Effect.fn("Test.get")(function* (gate: Deferred.Deferred<void>) {
-            yield* Deferred.await(gate)
-            return yield* InstanceState.get(state)
-          }),
-        })
-      }),
-    )
-  }
-
-  const rt = ManagedRuntime.make(Test.layer)
-
-  try {
-    const gate = await Effect.runPromise(Deferred.make<void>())
-    // Provide InstanceRef so the fiber carries the context even when
-    // the deferred is resolved from outside Instance.provide ALS.
-    const fiber = await Instance.provide({
-      directory: tmp.path,
-      fn: () =>
-        Promise.resolve(
-          rt.runFork(Test.use((svc) => svc.get(gate)).pipe(Effect.provideService(InstanceRef, Instance.current))),
-        ),
-    })
-
-    // Resume from outside any Instance.provide — ALS is NOT set here
-    await Effect.runPromise(Deferred.succeed(gate, void 0))
-    const exit = await Effect.runPromise(Fiber.await(fiber))
-
-    expect(Exit.isSuccess(exit)).toBe(true)
-    if (Exit.isSuccess(exit)) {
-      expect(exit.value).toBe(tmp.path)
-    }
-  } finally {
-    await rt.dispose()
-  }
-})
@@ -6,7 +6,7 @@ import { it } from "../lib/effect"
 describe("Runner", () => {
  // --- ensureRunning semantics ---

-  it.live(
+  it.effect(
    "ensureRunning starts work and returns result",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -18,7 +18,7 @@ describe("Runner", () => {
    }),
  )

-  it.live(
+  it.effect(
    "ensureRunning propagates work failures",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -29,7 +29,7 @@ describe("Runner", () => {
    }),
  )

-  it.live(
+  it.effect(
    "concurrent callers share the same run",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -51,7 +51,7 @@ describe("Runner", () => {
    }),
  )

-  it.live(
+  it.effect(
    "concurrent callers all receive same error",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -71,7 +71,7 @@ describe("Runner", () => {
    }),
  )

-  it.live(
+  it.effect(
    "ensureRunning can be called again after previous run completes",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -81,7 +81,7 @@ describe("Runner", () => {
    }),
  )

-  it.live(
+  it.effect(
    "second ensureRunning ignores new work if already running",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -110,7 +110,7 @@ describe("Runner", () => {

  // --- cancel semantics ---

-  it.live(
+  it.effect(
    "cancel interrupts running work",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -128,7 +128,7 @@ describe("Runner", () => {
    }),
  )

-  it.live(
+  it.effect(
    "cancel on idle is a no-op",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -138,7 +138,7 @@ describe("Runner", () => {
    }),
  )

-  it.live(
+  it.effect(
    "cancel with onInterrupt resolves callers gracefully",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -154,7 +154,7 @@ describe("Runner", () => {
    }),
  )

-  it.live(
+  it.effect(
    "cancel with queued callers resolves all",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -175,7 +175,7 @@ describe("Runner", () => {
    }),
  )

-  it.live(
+  it.effect(
    "work can be started after cancel",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -245,7 +245,7 @@ describe("Runner", () => {

  // --- shell semantics ---

-  it.live(
+  it.effect(
    "shell runs exclusively",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -256,7 +256,7 @@ describe("Runner", () => {
    }),
  )

-  it.live(
+  it.effect(
    "shell rejects when run is active",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -272,7 +272,7 @@ describe("Runner", () => {
    }),
  )

-  it.live(
+  it.effect(
    "shell rejects when another shell is running",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -292,7 +292,7 @@ describe("Runner", () => {
    }),
  )

-  it.live(
+  it.effect(
    "shell rejects via busy callback and cancel still stops the first shell",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -323,7 +323,7 @@ describe("Runner", () => {
    }),
  )

-  it.live(
+  it.effect(
    "cancel interrupts shell that ignores abort signal",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -349,7 +349,7 @@ describe("Runner", () => {

  // --- shell→run handoff ---

-  it.live(
+  it.effect(
    "ensureRunning queues behind shell then runs after",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -376,7 +376,7 @@ describe("Runner", () => {
    }),
  )

-  it.live(
+  it.effect(
    "multiple ensureRunning callers share the queued run behind shell",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -407,7 +407,7 @@ describe("Runner", () => {
    }),
  )

-  it.live(
+  it.effect(
    "cancel during shell_then_run cancels both",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -441,7 +441,7 @@ describe("Runner", () => {

  // --- lifecycle callbacks ---

-  it.live(
+  it.effect(
    "onIdle fires when returning to idle from running",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -454,7 +454,7 @@ describe("Runner", () => {
    }),
  )

-  it.live(
+  it.effect(
    "onIdle fires on cancel",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -470,7 +470,7 @@ describe("Runner", () => {
    }),
  )

-  it.live(
+  it.effect(
    "onBusy fires when shell starts",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -485,7 +485,7 @@ describe("Runner", () => {

  // --- busy flag ---

-  it.live(
+  it.effect(
    "busy is true during run",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -502,7 +502,7 @@ describe("Runner", () => {
    }),
  )

-  it.live(
+  it.effect(
    "busy is true during shell",
    Effect.gen(function* () {
      const s = yield* Scope.Scope
@@ -2,14 +2,10 @@ import { $ } from "bun"
 import * as fs from "fs/promises"
 import os from "os"
 import path from "path"
-import { Effect, ServiceMap } from "effect"
-import type * as PlatformError from "effect/PlatformError"
-import type * as Scope from "effect/Scope"
+import { Effect, FileSystem, ServiceMap } from "effect"
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
 import type { Config } from "../../src/config/config"
-import { InstanceRef } from "../../src/effect/instance-ref"
 import { Instance } from "../../src/project/instance"
-import { TestLLMServer } from "../lib/llm-server"

 // Strip null bytes from paths (defensive fix for CI environment issues)
 function sanitizePath(p: string): string {
@@ -82,17 +78,9 @@ export async function tmpdir<T>(options?: TmpDirOptions<T>) {
 /** Effectful scoped tmpdir. Cleaned up when the scope closes. Make sure these stay in sync */
 export function tmpdirScoped(options?: { git?: boolean; config?: Partial<Config.Info> }) {
  return Effect.gen(function* () {
+    const fs = yield* FileSystem.FileSystem
    const spawner = yield* ChildProcessSpawner.ChildProcessSpawner
-    const dirpath = sanitizePath(path.join(os.tmpdir(), "opencode-test-" + Math.random().toString(36).slice(2)))
-    yield* Effect.promise(() => fs.mkdir(dirpath, { recursive: true }))
-    const dir = sanitizePath(yield* Effect.promise(() => fs.realpath(dirpath)))
-
-    yield* Effect.addFinalizer(() =>
-      Effect.promise(async () => {
-        if (options?.git) await stop(dir).catch(() => undefined)
-        await clean(dir).catch(() => undefined)
-      }),
-    )
+    const dir = yield* fs.makeTempDirectoryScoped({ prefix: "opencode-test-" })

    const git = (...args: string[]) =>
      spawner.spawn(ChildProcess.make("git", args, { cwd: dir })).pipe(Effect.flatMap((handle) => handle.exitCode))
@@ -106,11 +94,9 @@ export function tmpdirScoped(options?: { git?: boolean; config?: Partial<Config.
    }

    if (options?.config) {
-      yield* Effect.promise(() =>
-        fs.writeFile(
-          path.join(dir, "opencode.json"),
-          JSON.stringify({ $schema: "https://opencode.ai/config.json", ...options.config }),
-        ),
+      yield* fs.writeFileString(
+        path.join(dir, "opencode.json"),
+        JSON.stringify({ $schema: "https://opencode.ai/config.json", ...options.config }),
      )
    }

@@ -125,7 +111,7 @@ export const provideInstance =
      Effect.promise<A>(async () =>
        Instance.provide({
          directory,
-          fn: () => Effect.runPromiseWith(services)(self.pipe(Effect.provideService(InstanceRef, Instance.current))),
+          fn: () => Effect.runPromiseWith(services)(self),
        }),
      ),
    )
@@ -153,20 +139,3 @@ export function provideTmpdirInstance<A, E, R>(
    return yield* self(path).pipe(provideInstance(path))
  })
 }
-
-export function provideTmpdirServer<A, E, R>(
-  self: (input: { dir: string; llm: TestLLMServer["Service"] }) => Effect.Effect<A, E, R>,
-  options?: { git?: boolean; config?: (url: string) => Partial<Config.Info> },
-): Effect.Effect<
-  A,
-  E | PlatformError.PlatformError,
-  R | TestLLMServer | ChildProcessSpawner.ChildProcessSpawner | Scope.Scope
-> {
-  return Effect.gen(function* () {
-    const llm = yield* TestLLMServer
-    return yield* provideTmpdirInstance((dir) => self({ dir, llm }), {
-      git: options?.git,
-      config: options?.config?.(llm.url),
-    })
-  })
-}
@@ -10,7 +10,7 @@ import * as Formatter from "../../src/format/formatter"
 const it = testEffect(Layer.mergeAll(Format.defaultLayer, CrossSpawnSpawner.defaultLayer, NodeFileSystem.layer))

 describe("Format", () => {
-  it.live("status() returns built-in formatters when no config overrides", () =>
+  it.effect("status() returns built-in formatters when no config overrides", () =>
    provideTmpdirInstance(() =>
      Format.Service.use((fmt) =>
        Effect.gen(function* () {
@@ -32,7 +32,7 @@ describe("Format", () => {
    ),
  )

-  it.live("status() returns empty list when formatter is disabled", () =>
+  it.effect("status() returns empty list when formatter is disabled", () =>
    provideTmpdirInstance(
      () =>
        Format.Service.use((fmt) =>
@@ -44,7 +44,7 @@ describe("Format", () => {
    ),
  )

-  it.live("status() excludes formatters marked as disabled in config", () =>
+  it.effect("status() excludes formatters marked as disabled in config", () =>
    provideTmpdirInstance(
      () =>
        Format.Service.use((fmt) =>
@@ -64,11 +64,11 @@ describe("Format", () => {
    ),
  )

-  it.live("service initializes without error", () =>
+  it.effect("service initializes without error", () =>
    provideTmpdirInstance(() => Format.Service.use(() => Effect.void)),
  )

-  it.live("status() initializes formatter state per directory", () =>
+  it.effect("status() initializes formatter state per directory", () =>
    Effect.gen(function* () {
      const a = yield* provideTmpdirInstance(() => Format.Service.use((fmt) => fmt.status()), {
        config: { formatter: false },
@@ -80,7 +80,7 @@ describe("Format", () => {
    }),
  )

-  it.live("runs enabled checks for matching formatters in parallel", () =>
+  it.effect("runs enabled checks for matching formatters in parallel", () =>
    provideTmpdirInstance((path) =>
      Effect.gen(function* () {
        const file = `${path}/test.parallel`
@@ -144,7 +144,7 @@ describe("Format", () => {
    ),
  )

-  it.live("runs matching formatters sequentially for the same file", () =>
+  it.effect("runs matching formatters sequentially for the same file", () =>
    provideTmpdirInstance(
      (path) =>
        Effect.gen(function* () {
@@ -1,14 +1,14 @@
 import { test, type TestOptions } from "bun:test"
 import { Cause, Effect, Exit, Layer } from "effect"
 import type * as Scope from "effect/Scope"
-import * as TestClock from "effect/testing/TestClock"
 import * as TestConsole from "effect/testing/TestConsole"

 type Body<A, E, R> = Effect.Effect<A, E, R> | (() => Effect.Effect<A, E, R>)
+const env = TestConsole.layer

 const body = <A, E, R>(value: Body<A, E, R>) => Effect.suspend(() => (typeof value === "function" ? value() : value))

-const run = <A, E, R, E2>(value: Body<A, E, R | Scope.Scope>, layer: Layer.Layer<R, E2>) =>
+const run = <A, E, R, E2>(value: Body<A, E, R | Scope.Scope>, layer: Layer.Layer<R, E2, never>) =>
  Effect.gen(function* () {
    const exit = yield* body(value).pipe(Effect.scoped, Effect.provide(layer), Effect.exit)
    if (Exit.isFailure(exit)) {
@@ -19,35 +19,19 @@ const run = <A, E, R, E2>(value: Body<A, E, R | Scope.Scope>, layer: Layer.Layer
    return yield* exit
  }).pipe(Effect.runPromise)

-const make = <R, E>(testLayer: Layer.Layer<R, E>, liveLayer: Layer.Layer<R, E>) => {
+const make = <R, E>(layer: Layer.Layer<R, E, never>) => {
  const effect = <A, E2>(name: string, value: Body<A, E2, R | Scope.Scope>, opts?: number | TestOptions) =>
-    test(name, () => run(value, testLayer), opts)
+    test(name, () => run(value, layer), opts)

  effect.only = <A, E2>(name: string, value: Body<A, E2, R | Scope.Scope>, opts?: number | TestOptions) =>
-    test.only(name, () => run(value, testLayer), opts)
+    test.only(name, () => run(value, layer), opts)

  effect.skip = <A, E2>(name: string, value: Body<A, E2, R | Scope.Scope>, opts?: number | TestOptions) =>
-    test.skip(name, () => run(value, testLayer), opts)
+    test.skip(name, () => run(value, layer), opts)

-  const live = <A, E2>(name: string, value: Body<A, E2, R | Scope.Scope>, opts?: number | TestOptions) =>
-    test(name, () => run(value, liveLayer), opts)
-
-  live.only = <A, E2>(name: string, value: Body<A, E2, R | Scope.Scope>, opts?: number | TestOptions) =>
-    test.only(name, () => run(value, liveLayer), opts)
-
-  live.skip = <A, E2>(name: string, value: Body<A, E2, R | Scope.Scope>, opts?: number | TestOptions) =>
-    test.skip(name, () => run(value, liveLayer), opts)
-
-  return { effect, live }
+  return { effect }
 }

-// Test environment with TestClock and TestConsole
-const testEnv = Layer.mergeAll(TestConsole.layer, TestClock.layer())
+export const it = make(env)

-// Live environment - uses real clock, but keeps TestConsole for output capture
-const liveEnv = TestConsole.layer
-
-export const it = make(testEnv, liveEnv)
-
-export const testEffect = <R, E>(layer: Layer.Layer<R, E>) =>
-  make(Layer.provideMerge(layer, testEnv), Layer.provideMerge(layer, liveEnv))
+export const testEffect = <R, E>(layer: Layer.Layer<R, E, never>) => make(Layer.provideMerge(layer, env))
@@ -1,422 +0,0 @@
-import { NodeHttpServer, NodeHttpServerRequest } from "@effect/platform-node"
-import * as Http from "node:http"
-import { Deferred, Effect, Layer, ServiceMap, Stream } from "effect"
-import * as HttpServer from "effect/unstable/http/HttpServer"
-import { HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/unstable/http"
-
-export type Usage = { input: number; output: number }
-
-type Line = Record<string, unknown>
-
-type Hit = {
-  url: URL
-  body: Record<string, unknown>
-}
-
-type Wait = {
-  count: number
-  ready: Deferred.Deferred<void>
-}
-
-type Sse = {
-  type: "sse"
-  head: unknown[]
-  tail: unknown[]
-  wait?: PromiseLike<unknown>
-  hang?: boolean
-  error?: unknown
-  reset?: boolean
-}
-
-type HttpError = {
-  type: "http-error"
-  status: number
-  body: unknown
-}
-
-export type Item = Sse | HttpError
-
-const done = Symbol("done")
-
-function line(input: unknown) {
-  if (input === done) return "data: [DONE]\n\n"
-  return `data: ${JSON.stringify(input)}\n\n`
-}
-
-function tokens(input?: Usage) {
-  if (!input) return
-  return {
-    prompt_tokens: input.input,
-    completion_tokens: input.output,
-    total_tokens: input.input + input.output,
-  }
-}
-
-function chunk(input: { delta?: Record<string, unknown>; finish?: string; usage?: Usage }) {
-  return {
-    id: "chatcmpl-test",
-    object: "chat.completion.chunk",
-    choices: [
-      {
-        delta: input.delta ?? {},
-        ...(input.finish ? { finish_reason: input.finish } : {}),
-      },
-    ],
-    ...(input.usage ? { usage: tokens(input.usage) } : {}),
-  } satisfies Line
-}
-
-function role() {
-  return chunk({ delta: { role: "assistant" } })
-}
-
-function textLine(value: string) {
-  return chunk({ delta: { content: value } })
-}
-
-function reasonLine(value: string) {
-  return chunk({ delta: { reasoning_content: value } })
-}
-
-function finishLine(reason: string, usage?: Usage) {
-  return chunk({ finish: reason, usage })
-}
-
-function toolStartLine(id: string, name: string) {
-  return chunk({
-    delta: {
-      tool_calls: [
-        {
-          index: 0,
-          id,
-          type: "function",
-          function: {
-            name,
-            arguments: "",
-          },
-        },
-      ],
-    },
-  })
-}
-
-function toolArgsLine(value: string) {
-  return chunk({
-    delta: {
-      tool_calls: [
-        {
-          index: 0,
-          function: {
-            arguments: value,
-          },
-        },
-      ],
-    },
-  })
-}
-
-function bytes(input: Iterable<unknown>) {
-  return Stream.fromIterable([...input].map(line)).pipe(Stream.encodeText)
-}
-
-function send(item: Sse) {
-  const head = bytes(item.head)
-  const tail = bytes([...item.tail, ...(item.hang || item.error ? [] : [done])])
-  const empty = Stream.fromIterable<Uint8Array>([])
-  const wait = item.wait
-  const body: Stream.Stream<Uint8Array, unknown> = wait
-    ? Stream.concat(head, Stream.fromEffect(Effect.promise(() => wait)).pipe(Stream.flatMap(() => tail)))
-    : Stream.concat(head, tail)
-  let end: Stream.Stream<Uint8Array, unknown> = empty
-  if (item.error) end = Stream.concat(empty, Stream.fail(item.error))
-  else if (item.hang) end = Stream.concat(empty, Stream.never)
-
-  return HttpServerResponse.stream(Stream.concat(body, end), { contentType: "text/event-stream" })
-}
-
-const reset = Effect.fn("TestLLMServer.reset")(function* (item: Sse) {
-  const req = yield* HttpServerRequest.HttpServerRequest
-  const res = NodeHttpServerRequest.toServerResponse(req)
-  yield* Effect.sync(() => {
-    res.writeHead(200, { "content-type": "text/event-stream" })
-    for (const part of item.head) res.write(line(part))
-    for (const part of item.tail) res.write(line(part))
-    res.destroy(new Error("connection reset"))
-  })
-  yield* Effect.never
-})
-
-function fail(item: HttpError) {
-  return HttpServerResponse.text(JSON.stringify(item.body), {
-    status: item.status,
-    contentType: "application/json",
-  })
-}
-
-export class Reply {
-  #head: unknown[] = [role()]
-  #tail: unknown[] = []
-  #usage: Usage | undefined
-  #finish: string | undefined
-  #wait: PromiseLike<unknown> | undefined
-  #hang = false
-  #error: unknown
-  #reset = false
-  #seq = 0
-
-  #id() {
-    this.#seq += 1
-    return `call_${this.#seq}`
-  }
-
-  text(value: string) {
-    this.#tail = [...this.#tail, textLine(value)]
-    return this
-  }
-
-  reason(value: string) {
-    this.#tail = [...this.#tail, reasonLine(value)]
-    return this
-  }
-
-  usage(value: Usage) {
-    this.#usage = value
-    return this
-  }
-
-  wait(value: PromiseLike<unknown>) {
-    this.#wait = value
-    return this
-  }
-
-  stop() {
-    this.#finish = "stop"
-    this.#hang = false
-    this.#error = undefined
-    this.#reset = false
-    return this
-  }
-
-  toolCalls() {
-    this.#finish = "tool_calls"
-    this.#hang = false
-    this.#error = undefined
-    this.#reset = false
-    return this
-  }
-
-  tool(name: string, input: unknown) {
-    const id = this.#id()
-    const args = JSON.stringify(input)
-    this.#tail = [...this.#tail, toolStartLine(id, name), toolArgsLine(args)]
-    return this.toolCalls()
-  }
-
-  pendingTool(name: string, input: unknown) {
-    const id = this.#id()
-    const args = JSON.stringify(input)
-    const size = Math.max(1, Math.floor(args.length / 2))
-    this.#tail = [...this.#tail, toolStartLine(id, name), toolArgsLine(args.slice(0, size))]
-    return this
-  }
-
-  hang() {
-    this.#finish = undefined
-    this.#hang = true
-    this.#error = undefined
-    this.#reset = false
-    return this
-  }
-
-  streamError(error: unknown = "boom") {
-    this.#finish = undefined
-    this.#hang = false
-    this.#error = error
-    this.#reset = false
-    return this
-  }
-
-  reset() {
-    this.#finish = undefined
-    this.#hang = false
-    this.#error = undefined
-    this.#reset = true
-    return this
-  }
-
-  item(): Item {
-    return {
-      type: "sse",
-      head: this.#head,
-      tail: this.#finish ? [...this.#tail, finishLine(this.#finish, this.#usage)] : this.#tail,
-      wait: this.#wait,
-      hang: this.#hang,
-      error: this.#error,
-      reset: this.#reset,
-    }
-  }
-}
-
-export function reply() {
-  return new Reply()
-}
-
-export function httpError(status: number, body: unknown): Item {
-  return {
-    type: "http-error",
-    status,
-    body,
-  }
-}
-
-export function raw(input: {
-  chunks?: unknown[]
-  head?: unknown[]
-  tail?: unknown[]
-  wait?: PromiseLike<unknown>
-  hang?: boolean
-  error?: unknown
-  reset?: boolean
-}): Item {
-  return {
-    type: "sse",
-    head: input.head ?? input.chunks ?? [],
-    tail: input.tail ?? [],
-    wait: input.wait,
-    hang: input.hang,
-    error: input.error,
-    reset: input.reset,
-  }
-}
-
-function item(input: Item | Reply) {
-  return input instanceof Reply ? input.item() : input
-}
-
-namespace TestLLMServer {
-  export interface Service {
-    readonly url: string
-    readonly push: (...input: (Item | Reply)[]) => Effect.Effect<void>
-    readonly text: (value: string, opts?: { usage?: Usage }) => Effect.Effect<void>
-    readonly tool: (name: string, input: unknown) => Effect.Effect<void>
-    readonly toolHang: (name: string, input: unknown) => Effect.Effect<void>
-    readonly reason: (value: string, opts?: { text?: string; usage?: Usage }) => Effect.Effect<void>
-    readonly fail: (message?: unknown) => Effect.Effect<void>
-    readonly error: (status: number, body: unknown) => Effect.Effect<void>
-    readonly hang: Effect.Effect<void>
-    readonly hold: (value: string, wait: PromiseLike<unknown>) => Effect.Effect<void>
-    readonly hits: Effect.Effect<Hit[]>
-    readonly calls: Effect.Effect<number>
-    readonly wait: (count: number) => Effect.Effect<void>
-    readonly inputs: Effect.Effect<Record<string, unknown>[]>
-    readonly pending: Effect.Effect<number>
-  }
-}
-
-export class TestLLMServer extends ServiceMap.Service<TestLLMServer, TestLLMServer.Service>()("@test/LLMServer") {
-  static readonly layer = Layer.effect(
-    TestLLMServer,
-    Effect.gen(function* () {
-      const server = yield* HttpServer.HttpServer
-      const router = yield* HttpRouter.HttpRouter
-
-      let hits: Hit[] = []
-      let list: Item[] = []
-      let waits: Wait[] = []
-
-      const queue = (...input: (Item | Reply)[]) => {
-        list = [...list, ...input.map(item)]
-      }
-
-      const notify = Effect.fnUntraced(function* () {
-        const ready = waits.filter((item) => hits.length >= item.count)
-        if (!ready.length) return
-        waits = waits.filter((item) => hits.length < item.count)
-        yield* Effect.forEach(ready, (item) => Deferred.succeed(item.ready, void 0))
-      })
-
-      const pull = () => {
-        const first = list[0]
-        if (!first) return
-        list = list.slice(1)
-        return first
-      }
-
-      yield* router.add(
-        "POST",
-        "/v1/chat/completions",
-        Effect.gen(function* () {
-          const req = yield* HttpServerRequest.HttpServerRequest
-          const next = pull()
-          if (!next) return HttpServerResponse.text("unexpected request", { status: 500 })
-          const body = yield* req.json.pipe(Effect.orElseSucceed(() => ({})))
-          hits = [
-            ...hits,
-            {
-              url: new URL(req.originalUrl, "http://localhost"),
-              body: body && typeof body === "object" ? (body as Record<string, unknown>) : {},
-            },
-          ]
-          yield* notify()
-          if (next.type === "sse" && next.reset) {
-            yield* reset(next)
-            return HttpServerResponse.empty()
-          }
-          if (next.type === "sse") return send(next)
-          return fail(next)
-        }),
-      )
-
-      yield* server.serve(router.asHttpEffect())
-
-      return TestLLMServer.of({
-        url:
-          server.address._tag === "TcpAddress"
-            ? `http://127.0.0.1:${server.address.port}/v1`
-            : `unix://${server.address.path}/v1`,
-        push: Effect.fn("TestLLMServer.push")(function* (...input: (Item | Reply)[]) {
-          queue(...input)
-        }),
-        text: Effect.fn("TestLLMServer.text")(function* (value: string, opts?: { usage?: Usage }) {
-          const out = reply().text(value)
-          if (opts?.usage) out.usage(opts.usage)
-          queue(out.stop().item())
-        }),
-        tool: Effect.fn("TestLLMServer.tool")(function* (name: string, input: unknown) {
-          queue(reply().tool(name, input).item())
-        }),
-        toolHang: Effect.fn("TestLLMServer.toolHang")(function* (name: string, input: unknown) {
-          queue(reply().pendingTool(name, input).hang().item())
-        }),
-        reason: Effect.fn("TestLLMServer.reason")(function* (value: string, opts?: { text?: string; usage?: Usage }) {
-          const out = reply().reason(value)
-          if (opts?.text) out.text(opts.text)
-          if (opts?.usage) out.usage(opts.usage)
-          queue(out.stop().item())
-        }),
-        fail: Effect.fn("TestLLMServer.fail")(function* (message: unknown = "boom") {
-          queue(reply().streamError(message).item())
-        }),
-        error: Effect.fn("TestLLMServer.error")(function* (status: number, body: unknown) {
-          queue(httpError(status, body))
-        }),
-        hang: Effect.gen(function* () {
-          queue(reply().hang().item())
-        }).pipe(Effect.withSpan("TestLLMServer.hang")),
-        hold: Effect.fn("TestLLMServer.hold")(function* (value: string, wait: PromiseLike<unknown>) {
-          queue(reply().wait(wait).text(value).stop().item())
-        }),
-        hits: Effect.sync(() => [...hits]),
-        calls: Effect.sync(() => hits.length),
-        wait: Effect.fn("TestLLMServer.wait")(function* (count: number) {
-          if (hits.length >= count) return
-          const ready = yield* Deferred.make<void>()
-          waits = [...waits, { count, ready }]
-          yield* Deferred.await(ready)
-        }),
-        inputs: Effect.sync(() => hits.map((hit) => hit.body)),
-        pending: Effect.sync(() => list.length),
-      })
-    }),
-  ).pipe(Layer.provide(HttpRouter.layer), Layer.provide(NodeHttpServer.layer(() => Http.createServer(), { port: 0 })))
-}
@@ -25,11 +25,6 @@ function run(msg: Msg) {

 async function plugin(dir: string, kinds: Array<"server" | "tui">) {
  const p = path.join(dir, "plugin")
-  const server = kinds.includes("server")
-  const tui = kinds.includes("tui")
-  const exports: Record<string, string> = {}
-  if (server) exports["./server"] = "./server.js"
-  if (tui) exports["./tui"] = "./tui.js"
  await fs.mkdir(p, { recursive: true })
  await Bun.write(
    path.join(p, "package.json"),
@@ -37,8 +32,7 @@ async function plugin(dir: string, kinds: Array<"server" | "tui">) {
      {
        name: "acme",
        version: "1.0.0",
-        ...(server ? { main: "./server.js" } : {}),
-        ...(Object.keys(exports).length ? { exports } : {}),
+        "oc-plugin": kinds,
      },
      null,
      2,
@@ -55,34 +55,8 @@ function ctxRoot(dir: string): PlugCtx {
  }
 }

-async function plugin(
-  dir: string,
-  kinds?: Array<"server" | "tui">,
-  opts?: {
-    server?: Record<string, unknown>
-    tui?: Record<string, unknown>
-  },
-) {
+async function plugin(dir: string, kinds?: unknown) {
  const p = path.join(dir, "plugin")
-  const server = kinds?.includes("server") ?? false
-  const tui = kinds?.includes("tui") ?? false
-  const exports: Record<string, unknown> = {}
-  if (server) {
-    exports["./server"] = opts?.server
-      ? {
-          import: "./server.js",
-          config: opts.server,
-        }
-      : "./server.js"
-  }
-  if (tui) {
-    exports["./tui"] = opts?.tui
-      ? {
-          import: "./tui.js",
-          config: opts.tui,
-        }
-      : "./tui.js"
-  }
  await fs.mkdir(p, { recursive: true })
  await Bun.write(
    path.join(p, "package.json"),
@@ -90,8 +64,7 @@ async function plugin(
      {
        name: "acme",
        version: "1.0.0",
-        ...(server ? { main: "./server.js" } : {}),
-        ...(Object.keys(exports).length ? { exports } : {}),
+        ...(kinds === undefined ? {} : { "oc-plugin": kinds }),
      },
      null,
      2,
@@ -126,12 +99,12 @@ describe("plugin.install.task", () => {
    expect(tui.plugin).toEqual(["acme@1.2.3"])
  })

-  test("writes default options from exports config metadata", async () => {
+  test("writes default options from tuple manifest targets", async () => {
    await using tmp = await tmpdir()
-    const target = await plugin(tmp.path, ["server", "tui"], {
-      server: { custom: true, other: false },
-      tui: { compact: true },
-    })
+    const target = await plugin(tmp.path, [
+      ["server", { custom: true, other: false }],
+      ["tui", { compact: true }],
+    ])
    const run = createPlugTask(
      {
        mod: "acme@1.2.3",
@@ -266,8 +266,8 @@ describe("plugin.loader.shared", () => {
    try {
      await load(tmp.path)

-      expect(install.mock.calls).toContainEqual(["acme-plugin", "latest", { ignoreScripts: true }])
-      expect(install.mock.calls).toContainEqual(["scope-plugin", "2.3.4", { ignoreScripts: true }])
+      expect(install.mock.calls).toContainEqual(["acme-plugin", "latest"])
+      expect(install.mock.calls).toContainEqual(["scope-plugin", "2.3.4"])
    } finally {
      install.mockRestore()
    }
@@ -487,7 +487,7 @@ describe("plugin.loader.shared", () => {
        .catch(() => false)

      expect(called).toBe(false)
-      expect(errors).toHaveLength(0)
+      expect(errors.some((x) => x.includes('exports["./server"]') && x.includes("package.json main"))).toBe(true)
    } finally {
      install.mockRestore()
    }
@@ -1557,35 +1557,6 @@ describe("ProviderTransform.message - providerOptions key remapping", () => {
    expect(result[0].providerOptions?.openai).toBeUndefined()
  })

-  test("azure cognitive services remaps providerID to 'azure' key", () => {
-    const model = createModel("azure-cognitive-services", "@ai-sdk/azure")
-    const msgs = [
-      {
-        role: "user",
-        content: [
-          {
-            type: "text",
-            text: "Hello",
-            providerOptions: {
-              "azure-cognitive-services": { part: true },
-            },
-          },
-        ],
-        providerOptions: {
-          "azure-cognitive-services": { someOption: "value" },
-        },
-      },
-    ] as any[]
-
-    const result = ProviderTransform.message(msgs, model, {}) as any[]
-    const part = result[0].content[0] as any
-
-    expect(result[0].providerOptions?.azure).toEqual({ someOption: "value" })
-    expect(result[0].providerOptions?.["azure-cognitive-services"]).toBeUndefined()
-    expect(part.providerOptions?.azure).toEqual({ part: true })
-    expect(part.providerOptions?.["azure-cognitive-services"]).toBeUndefined()
-  })
-
  test("copilot remaps providerID to 'copilot' key", () => {
    const model = createModel("github-copilot", "@ai-sdk/github-copilot")
    const msgs = [
@@ -1792,58 +1763,6 @@ describe("ProviderTransform.message - cache control on gateway", () => {
      },
    })
  })
-
-  test("google-vertex-anthropic applies cache control", () => {
-    const model = createModel({
-      providerID: "google-vertex-anthropic",
-      api: {
-        id: "google-vertex-anthropic",
-        url: "https://us-central1-aiplatform.googleapis.com",
-        npm: "@ai-sdk/google-vertex/anthropic",
-      },
-      id: "claude-sonnet-4@20250514",
-    })
-    const msgs = [
-      {
-        role: "system",
-        content: "You are a helpful assistant",
-      },
-      {
-        role: "user",
-        content: "Hello",
-      },
-    ] as any[]
-
-    const result = ProviderTransform.message(msgs, model, {}) as any[]
-
-    expect(result[0].providerOptions).toEqual({
-      anthropic: {
-        cacheControl: {
-          type: "ephemeral",
-        },
-      },
-      openrouter: {
-        cacheControl: {
-          type: "ephemeral",
-        },
-      },
-      bedrock: {
-        cachePoint: {
-          type: "default",
-        },
-      },
-      openaiCompatible: {
-        cache_control: {
-          type: "ephemeral",
-        },
-      },
-      copilot: {
-        copilot_cache_control: {
-          type: "ephemeral",
-        },
-      },
-    })
-  })
 })

 describe("ProviderTransform.variants", () => {
@@ -1199,26 +1199,4 @@ describe("session.getUsage", () => {
      expect(result.tokens.total).toBe(1500)
    },
  )
-
-  test("extracts cache write tokens from vertex metadata key", () => {
-    const model = createModel({ context: 100_000, output: 32_000, npm: "@ai-sdk/google-vertex/anthropic" })
-    const result = Session.getUsage({
-      model,
-      usage: {
-        inputTokens: 1000,
-        outputTokens: 500,
-        totalTokens: 1500,
-        cachedInputTokens: 200,
-      },
-      metadata: {
-        vertex: {
-          cacheCreationInputTokens: 300,
-        },
-      },
-    })
-
-    expect(result.tokens.input).toBe(500)
-    expect(result.tokens.cache.read).toBe(200)
-    expect(result.tokens.cache.write).toBe(300)
-  })
 })
@@ -1,6 +1,8 @@
 import { NodeFileSystem } from "@effect/platform-node"
 import { expect } from "bun:test"
-import { Cause, Effect, Exit, Fiber, Layer } from "effect"
+import { APICallError } from "ai"
+import { Cause, Effect, Exit, Fiber, Layer, ServiceMap } from "effect"
+import * as Stream from "effect/Stream"
 import path from "path"
 import type { Agent } from "../../src/agent/agent"
 import { Agent as AgentSvc } from "../../src/agent/agent"
@@ -8,7 +10,7 @@ import { Bus } from "../../src/bus"
 import { Config } from "../../src/config/config"
 import { Permission } from "../../src/permission"
 import { Plugin } from "../../src/plugin"
-import { Provider } from "../../src/provider/provider"
+import type { Provider } from "../../src/provider/provider"
 import { ModelID, ProviderID } from "../../src/provider/schema"
 import { Session } from "../../src/session"
 import { LLM } from "../../src/session/llm"
@@ -19,9 +21,8 @@ import { SessionStatus } from "../../src/session/status"
 import { Snapshot } from "../../src/snapshot"
 import { Log } from "../../src/util/log"
 import * as CrossSpawnSpawner from "../../src/effect/cross-spawn-spawner"
-import { provideTmpdirServer } from "../fixture/fixture"
+import { provideTmpdirInstance } from "../fixture/fixture"
 import { testEffect } from "../lib/effect"
-import { reply, TestLLMServer } from "../lib/llm-server"

 Log.init({ print: false })

@@ -30,51 +31,118 @@ const ref = {
  modelID: ModelID.make("test-model"),
 }

-const cfg = {
-  provider: {
-    test: {
-      name: "Test",
-      id: "test",
-      env: [],
-      npm: "@ai-sdk/openai-compatible",
-      models: {
-        "test-model": {
-          id: "test-model",
-          name: "Test Model",
-          attachment: false,
-          reasoning: false,
-          temperature: false,
-          tool_call: true,
-          release_date: "2025-01-01",
-          limit: { context: 100000, output: 10000 },
-          cost: { input: 0, output: 0 },
-          options: {},
-        },
-      },
-      options: {
-        apiKey: "test-key",
-        baseURL: "http://localhost:1/v1",
-      },
-    },
-  },
+type Script = Stream.Stream<LLM.Event, unknown> | ((input: LLM.StreamInput) => Stream.Stream<LLM.Event, unknown>)
+
+class TestLLM extends ServiceMap.Service<
+  TestLLM,
+  {
+    readonly push: (stream: Script) => Effect.Effect<void>
+    readonly reply: (...items: LLM.Event[]) => Effect.Effect<void>
+    readonly calls: Effect.Effect<number>
+    readonly inputs: Effect.Effect<LLM.StreamInput[]>
+  }
+>()("@test/SessionProcessorLLM") {}
+
+function stream(...items: LLM.Event[]) {
+  return Stream.make(...items)
 }

-function providerCfg(url: string) {
+function usage(input = 1, output = 1, total = input + output) {
  return {
-    ...cfg,
-    provider: {
-      ...cfg.provider,
-      test: {
-        ...cfg.provider.test,
-        options: {
-          ...cfg.provider.test.options,
-          baseURL: url,
-        },
-      },
+    inputTokens: input,
+    outputTokens: output,
+    totalTokens: total,
+    inputTokenDetails: {
+      noCacheTokens: undefined,
+      cacheReadTokens: undefined,
+      cacheWriteTokens: undefined,
+    },
+    outputTokenDetails: {
+      textTokens: undefined,
+      reasoningTokens: undefined,
    },
  }
 }

+function start(): LLM.Event {
+  return { type: "start" }
+}
+
+function textStart(id = "t"): LLM.Event {
+  return { type: "text-start", id }
+}
+
+function textDelta(id: string, text: string): LLM.Event {
+  return { type: "text-delta", id, text }
+}
+
+function textEnd(id = "t"): LLM.Event {
+  return { type: "text-end", id }
+}
+
+function reasoningStart(id: string): LLM.Event {
+  return { type: "reasoning-start", id }
+}
+
+function reasoningDelta(id: string, text: string): LLM.Event {
+  return { type: "reasoning-delta", id, text }
+}
+
+function reasoningEnd(id: string): LLM.Event {
+  return { type: "reasoning-end", id }
+}
+
+function finishStep(): LLM.Event {
+  return {
+    type: "finish-step",
+    finishReason: "stop",
+    rawFinishReason: "stop",
+    response: { id: "res", modelId: "test-model", timestamp: new Date() },
+    providerMetadata: undefined,
+    usage: usage(),
+  }
+}
+
+function finish(): LLM.Event {
+  return { type: "finish", finishReason: "stop", rawFinishReason: "stop", totalUsage: usage() }
+}
+
+function toolInputStart(id: string, toolName: string): LLM.Event {
+  return { type: "tool-input-start", id, toolName }
+}
+
+function toolCall(toolCallId: string, toolName: string, input: unknown): LLM.Event {
+  return { type: "tool-call", toolCallId, toolName, input }
+}
+
+function fail<E>(err: E, ...items: LLM.Event[]) {
+  return stream(...items).pipe(Stream.concat(Stream.fail(err)))
+}
+
+function hang(_input: LLM.StreamInput, ...items: LLM.Event[]) {
+  return stream(...items).pipe(Stream.concat(Stream.fromEffect(Effect.never)))
+}
+
+function model(context: number): Provider.Model {
+  return {
+    id: "test-model",
+    providerID: "test",
+    name: "Test",
+    limit: { context, output: 10 },
+    cost: { input: 0, output: 0, cache: { read: 0, write: 0 } },
+    capabilities: {
+      toolcall: true,
+      attachment: false,
+      reasoning: false,
+      temperature: true,
+      input: { text: true, image: false, audio: false, video: false },
+      output: { text: true, image: false, audio: false, video: false },
+    },
+    api: { npm: "@ai-sdk/anthropic" },
+    options: {},
+  } as Provider.Model
+}
+
 function agent(): Agent.Info {
  return {
    name: "build",
@@ -143,6 +211,43 @@ const assistant = Effect.fn("TestSession.assistant")(function* (
  return msg
 })

+const llm = Layer.unwrap(
+  Effect.gen(function* () {
+    const queue: Script[] = []
+    const inputs: LLM.StreamInput[] = []
+    let calls = 0
+
+    const push = Effect.fn("TestLLM.push")((item: Script) => {
+      queue.push(item)
+      return Effect.void
+    })
+
+    const reply = Effect.fn("TestLLM.reply")((...items: LLM.Event[]) => push(stream(...items)))
+    return Layer.mergeAll(
+      Layer.succeed(
+        LLM.Service,
+        LLM.Service.of({
+          stream: (input) => {
+            calls += 1
+            inputs.push(input)
+            const item = queue.shift() ?? Stream.empty
+            return typeof item === "function" ? item(input) : item
+          },
+        }),
+      ),
+      Layer.succeed(
+        TestLLM,
+        TestLLM.of({
+          push,
+          reply,
+          calls: Effect.sync(() => calls),
+          inputs: Effect.sync(() => [...inputs]),
+        }),
+      ),
+    )
+  }),
+)
+
 const status = SessionStatus.layer.pipe(Layer.provideMerge(Bus.layer))
 const infra = Layer.mergeAll(NodeFileSystem.layer, CrossSpawnSpawner.defaultLayer)
 const deps = Layer.mergeAll(
@@ -152,37 +257,27 @@ const deps = Layer.mergeAll(
  Permission.layer,
  Plugin.defaultLayer,
  Config.defaultLayer,
-  LLM.defaultLayer,
-  Provider.defaultLayer,
  status,
+  llm,
 ).pipe(Layer.provideMerge(infra))
-const env = Layer.mergeAll(TestLLMServer.layer, SessionProcessor.layer.pipe(Layer.provideMerge(deps)))
+const env = SessionProcessor.layer.pipe(Layer.provideMerge(deps))

 const it = testEffect(env)

-const boot = Effect.fn("test.boot")(function* () {
-  const processors = yield* SessionProcessor.Service
-  const session = yield* Session.Service
-  const provider = yield* Provider.Service
-  return { processors, session, provider }
-})
-
-// ---------------------------------------------------------------------------
-// Tests
-// ---------------------------------------------------------------------------
-
-it.live("session.processor effect tests capture llm input cleanly", () =>
-  provideTmpdirServer(
-    ({ dir, llm }) =>
+it.effect("session.processor effect tests capture llm input cleanly", () => {
+  return provideTmpdirInstance(
+    (dir) =>
      Effect.gen(function* () {
-        const { processors, session, provider } = yield* boot()
+        const test = yield* TestLLM
+        const processors = yield* SessionProcessor.Service
+        const session = yield* Session.Service

-        yield* llm.text("hello")
+        yield* test.reply(start(), textStart(), textDelta("t", "hello"), textEnd(), finishStep(), finish())

        const chat = yield* session.create({})
        const parent = yield* user(chat.id, "hi")
        const msg = yield* assistant(chat.id, parent.id, path.resolve(dir))
-        const mdl = yield* provider.getModel(ref.providerID, ref.modelID)
+        const mdl = model(100)
        const handle = yield* processors.create({
          assistantMessage: msg,
          sessionID: chat.id,
@@ -208,29 +303,46 @@ it.live("session.processor effect tests capture llm input cleanly", () =>

        const value = yield* handle.process(input)
        const parts = yield* Effect.promise(() => MessageV2.parts(msg.id))
-        const calls = yield* llm.calls
+        const calls = yield* test.calls
+        const inputs = yield* test.inputs

        expect(value).toBe("continue")
        expect(calls).toBe(1)
+        expect(inputs).toHaveLength(1)
+        expect(inputs[0].messages).toStrictEqual([{ role: "user", content: "hi" }])
        expect(parts.some((part) => part.type === "text" && part.text === "hello")).toBe(true)
      }),
-    { git: true, config: (url) => providerCfg(url) },
-  ),
-)
+    { git: true },
+  )
+})

-it.live("session.processor effect tests stop after token overflow requests compaction", () =>
-  provideTmpdirServer(
-    ({ dir, llm }) =>
+it.effect("session.processor effect tests stop after token overflow requests compaction", () => {
+  return provideTmpdirInstance(
+    (dir) =>
      Effect.gen(function* () {
-        const { processors, session, provider } = yield* boot()
+        const test = yield* TestLLM
+        const processors = yield* SessionProcessor.Service
+        const session = yield* Session.Service

-        yield* llm.text("after", { usage: { input: 100, output: 0 } })
+        yield* test.reply(
+          start(),
+          {
+            type: "finish-step",
+            finishReason: "stop",
+            rawFinishReason: "stop",
+            response: { id: "res", modelId: "test-model", timestamp: new Date() },
+            providerMetadata: undefined,
+            usage: usage(100, 0, 100),
+          },
+          textStart(),
+          textDelta("t", "after"),
+          textEnd(),
+        )

        const chat = yield* session.create({})
        const parent = yield* user(chat.id, "compact")
        const msg = yield* assistant(chat.id, parent.id, path.resolve(dir))
-        const base = yield* provider.getModel(ref.providerID, ref.modelID)
-        const mdl = { ...base, limit: { context: 20, output: 10 } }
+        const mdl = model(20)
        const handle = yield* processors.create({
          assistantMessage: msg,
          sessionID: chat.id,
@@ -257,73 +369,51 @@ it.live("session.processor effect tests stop after token overflow requests compa
        const parts = yield* Effect.promise(() => MessageV2.parts(msg.id))

        expect(value).toBe("compact")
-        expect(parts.some((part) => part.type === "text" && part.text === "after")).toBe(true)
+        expect(parts.some((part) => part.type === "text")).toBe(false)
        expect(parts.some((part) => part.type === "step-finish")).toBe(true)
      }),
-    { git: true, config: (url) => providerCfg(url) },
-  ),
-)
+    { git: true },
+  )
+})

-it.live("session.processor effect tests capture reasoning from http mock", () =>
-  provideTmpdirServer(
-    ({ dir, llm }) =>
+it.effect("session.processor effect tests reset reasoning state across retries", () => {
+  return provideTmpdirInstance(
+    (dir) =>
      Effect.gen(function* () {
-        const { processors, session, provider } = yield* boot()
+        const test = yield* TestLLM
+        const processors = yield* SessionProcessor.Service
+        const session = yield* Session.Service

-        yield* llm.push(reply().reason("think").text("done").stop())
+        yield* test.push(
+          fail(
+            new APICallError({
+              message: "boom",
+              url: "https://example.com/v1/chat/completions",
+              requestBodyValues: {},
+              statusCode: 503,
+              responseHeaders: { "retry-after-ms": "0" },
+              responseBody: '{"error":"boom"}',
+              isRetryable: true,
+            }),
+            start(),
+            reasoningStart("r"),
+            reasoningDelta("r", "one"),
+          ),
+        )
+
+        yield* test.reply(
+          start(),
+          reasoningStart("r"),
+          reasoningDelta("r", "two"),
+          reasoningEnd("r"),
+          finishStep(),
+          finish(),
+        )

        const chat = yield* session.create({})
        const parent = yield* user(chat.id, "reason")
        const msg = yield* assistant(chat.id, parent.id, path.resolve(dir))
-        const mdl = yield* provider.getModel(ref.providerID, ref.modelID)
-        const handle = yield* processors.create({
-          assistantMessage: msg,
-          sessionID: chat.id,
-          model: mdl,
-        })
-
-        const value = yield* handle.process({
-          user: {
-            id: parent.id,
-            sessionID: chat.id,
-            role: "user",
-            time: parent.time,
-            agent: parent.agent,
-            model: { providerID: ref.providerID, modelID: ref.modelID },
-          } satisfies MessageV2.User,
-          sessionID: chat.id,
-          model: mdl,
-          agent: agent(),
-          system: [],
-          messages: [{ role: "user", content: "reason" }],
-          tools: {},
-        })
-
-        const parts = yield* Effect.promise(() => MessageV2.parts(msg.id))
-        const reasoning = parts.find((part): part is MessageV2.ReasoningPart => part.type === "reasoning")
-        const text = parts.find((part): part is MessageV2.TextPart => part.type === "text")
-
-        expect(value).toBe("continue")
-        expect(yield* llm.calls).toBe(1)
-        expect(reasoning?.text).toBe("think")
-        expect(text?.text).toBe("done")
-      }),
-    { git: true, config: (url) => providerCfg(url) },
-  ),
-)
-
-it.live("session.processor effect tests reset reasoning state across retries", () =>
-  provideTmpdirServer(
-    ({ dir, llm }) =>
-      Effect.gen(function* () {
-        const { processors, session, provider } = yield* boot()
-
-        yield* llm.push(reply().reason("one").reset(), reply().reason("two").stop())
-
-        const chat = yield* session.create({})
-        const parent = yield* user(chat.id, "reason")
-        const msg = yield* assistant(chat.id, parent.id, path.resolve(dir))
-        const mdl = yield* provider.getModel(ref.providerID, ref.modelID)
+        const mdl = model(100)
        const handle = yield* processors.create({
          assistantMessage: msg,
          sessionID: chat.id,
@@ -351,26 +441,28 @@ it.live("session.processor effect tests reset reasoning state across retries", (
        const reasoning = parts.filter((part): part is MessageV2.ReasoningPart => part.type === "reasoning")

        expect(value).toBe("continue")
-        expect(yield* llm.calls).toBe(2)
+        expect(yield* test.calls).toBe(2)
        expect(reasoning.some((part) => part.text === "two")).toBe(true)
        expect(reasoning.some((part) => part.text === "onetwo")).toBe(false)
      }),
-    { git: true, config: (url) => providerCfg(url) },
-  ),
-)
+    { git: true },
+  )
+})

-it.live("session.processor effect tests do not retry unknown json errors", () =>
-  provideTmpdirServer(
-    ({ dir, llm }) =>
+it.effect("session.processor effect tests do not retry unknown json errors", () => {
+  return provideTmpdirInstance(
+    (dir) =>
      Effect.gen(function* () {
-        const { processors, session, provider } = yield* boot()
+        const test = yield* TestLLM
+        const processors = yield* SessionProcessor.Service
+        const session = yield* Session.Service

-        yield* llm.error(400, { error: { message: "no_kv_space" } })
+        yield* test.push(fail({ error: { message: "no_kv_space" } }, start()))

        const chat = yield* session.create({})
        const parent = yield* user(chat.id, "json")
        const msg = yield* assistant(chat.id, parent.id, path.resolve(dir))
-        const mdl = yield* provider.getModel(ref.providerID, ref.modelID)
+        const mdl = model(100)
        const handle = yield* processors.create({
          assistantMessage: msg,
          sessionID: chat.id,
@@ -395,26 +487,29 @@ it.live("session.processor effect tests do not retry unknown json errors", () =>
        })

        expect(value).toBe("stop")
-        expect(yield* llm.calls).toBe(1)
-        expect(handle.message.error?.name).toBe("APIError")
+        expect(yield* test.calls).toBe(1)
+        expect(yield* test.inputs).toHaveLength(1)
+        expect(handle.message.error?.name).toBe("UnknownError")
      }),
-    { git: true, config: (url) => providerCfg(url) },
-  ),
-)
+    { git: true },
+  )
+})

-it.live("session.processor effect tests retry recognized structured json errors", () =>
-  provideTmpdirServer(
-    ({ dir, llm }) =>
+it.effect("session.processor effect tests retry recognized structured json errors", () => {
+  return provideTmpdirInstance(
+    (dir) =>
      Effect.gen(function* () {
-        const { processors, session, provider } = yield* boot()
+        const test = yield* TestLLM
+        const processors = yield* SessionProcessor.Service
+        const session = yield* Session.Service

-        yield* llm.error(429, { type: "error", error: { type: "too_many_requests" } })
-        yield* llm.text("after")
+        yield* test.push(fail({ type: "error", error: { type: "too_many_requests" } }, start()))
+        yield* test.reply(start(), textStart(), textDelta("t", "after"), textEnd(), finishStep(), finish())

        const chat = yield* session.create({})
        const parent = yield* user(chat.id, "retry json")
        const msg = yield* assistant(chat.id, parent.id, path.resolve(dir))
-        const mdl = yield* provider.getModel(ref.providerID, ref.modelID)
+        const mdl = model(100)
        const handle = yield* processors.create({
          assistantMessage: msg,
          sessionID: chat.id,
@@ -441,28 +536,43 @@ it.live("session.processor effect tests retry recognized structured json errors"
        const parts = yield* Effect.promise(() => MessageV2.parts(msg.id))

        expect(value).toBe("continue")
-        expect(yield* llm.calls).toBe(2)
+        expect(yield* test.calls).toBe(2)
        expect(parts.some((part) => part.type === "text" && part.text === "after")).toBe(true)
        expect(handle.message.error).toBeUndefined()
      }),
-    { git: true, config: (url) => providerCfg(url) },
-  ),
-)
+    { git: true },
+  )
+})

-it.live("session.processor effect tests publish retry status updates", () =>
-  provideTmpdirServer(
-    ({ dir, llm }) =>
+it.effect("session.processor effect tests publish retry status updates", () => {
+  return provideTmpdirInstance(
+    (dir) =>
      Effect.gen(function* () {
-        const { processors, session, provider } = yield* boot()
+        const test = yield* TestLLM
+        const processors = yield* SessionProcessor.Service
+        const session = yield* Session.Service
        const bus = yield* Bus.Service

-        yield* llm.error(503, { error: "boom" })
-        yield* llm.text("")
+        yield* test.push(
+          fail(
+            new APICallError({
+              message: "boom",
+              url: "https://example.com/v1/chat/completions",
+              requestBodyValues: {},
+              statusCode: 503,
+              responseHeaders: { "retry-after-ms": "0" },
+              responseBody: '{"error":"boom"}',
+              isRetryable: true,
+            }),
+            start(),
+          ),
+        )
+        yield* test.reply(start(), finishStep(), finish())

        const chat = yield* session.create({})
        const parent = yield* user(chat.id, "retry")
        const msg = yield* assistant(chat.id, parent.id, path.resolve(dir))
-        const mdl = yield* provider.getModel(ref.providerID, ref.modelID)
+        const mdl = model(100)
        const states: number[] = []
        const off = yield* bus.subscribeCallback(SessionStatus.Event.Status, (evt) => {
          if (evt.properties.sessionID !== chat.id) return
@@ -494,25 +604,27 @@ it.live("session.processor effect tests publish retry status updates", () =>
        off()

        expect(value).toBe("continue")
-        expect(yield* llm.calls).toBe(2)
+        expect(yield* test.calls).toBe(2)
        expect(states).toStrictEqual([1])
      }),
-    { git: true, config: (url) => providerCfg(url) },
-  ),
-)
+    { git: true },
+  )
+})

-it.live("session.processor effect tests compact on structured context overflow", () =>
-  provideTmpdirServer(
-    ({ dir, llm }) =>
+it.effect("session.processor effect tests compact on structured context overflow", () => {
+  return provideTmpdirInstance(
+    (dir) =>
      Effect.gen(function* () {
-        const { processors, session, provider } = yield* boot()
+        const test = yield* TestLLM
+        const processors = yield* SessionProcessor.Service
+        const session = yield* Session.Service

-        yield* llm.error(400, { type: "error", error: { code: "context_length_exceeded" } })
+        yield* test.push(fail({ type: "error", error: { code: "context_length_exceeded" } }, start()))

        const chat = yield* session.create({})
        const parent = yield* user(chat.id, "compact json")
        const msg = yield* assistant(chat.id, parent.id, path.resolve(dir))
-        const mdl = yield* provider.getModel(ref.providerID, ref.modelID)
+        const mdl = model(100)
        const handle = yield* processors.create({
          assistantMessage: msg,
          sessionID: chat.id,
@@ -537,25 +649,32 @@ it.live("session.processor effect tests compact on structured context overflow",
        })

        expect(value).toBe("compact")
-        expect(yield* llm.calls).toBe(1)
+        expect(yield* test.calls).toBe(1)
        expect(handle.message.error).toBeUndefined()
      }),
-    { git: true, config: (url) => providerCfg(url) },
-  ),
-)
+    { git: true },
+  )
+})

-it.live("session.processor effect tests mark pending tools as aborted on cleanup", () =>
-  provideTmpdirServer(
-    ({ dir, llm }) =>
+it.effect("session.processor effect tests mark pending tools as aborted on cleanup", () => {
+  return provideTmpdirInstance(
+    (dir) =>
      Effect.gen(function* () {
-        const { processors, session, provider } = yield* boot()
+        const ready = defer<void>()
+        const test = yield* TestLLM
+        const processors = yield* SessionProcessor.Service
+        const session = yield* Session.Service

-        yield* llm.toolHang("bash", { cmd: "pwd" })
+        yield* test.push((input) =>
+          hang(input, start(), toolInputStart("tool-1", "bash"), toolCall("tool-1", "bash", { cmd: "pwd" })).pipe(
+            Stream.tap((event) => (event.type === "tool-call" ? Effect.sync(() => ready.resolve()) : Effect.void)),
+          ),
+        )

        const chat = yield* session.create({})
        const parent = yield* user(chat.id, "tool abort")
        const msg = yield* assistant(chat.id, parent.id, path.resolve(dir))
-        const mdl = yield* provider.getModel(ref.providerID, ref.modelID)
+        const mdl = model(100)
        const handle = yield* processors.create({
          assistantMessage: msg,
          sessionID: chat.id,
@@ -581,15 +700,7 @@ it.live("session.processor effect tests mark pending tools as aborted on cleanup
          })
          .pipe(Effect.forkChild)

-        yield* llm.wait(1)
-        yield* Effect.promise(async () => {
-          const end = Date.now() + 500
-          while (Date.now() < end) {
-            const parts = await MessageV2.parts(msg.id)
-            if (parts.some((part) => part.type === "tool")) return
-            await Bun.sleep(10)
-          }
-        })
+        yield* Effect.promise(() => ready.promise)
        yield* Fiber.interrupt(run)

        const exit = yield* Fiber.await(run)
@@ -597,38 +708,45 @@ it.live("session.processor effect tests mark pending tools as aborted on cleanup
          yield* handle.abort()
        }
        const parts = yield* Effect.promise(() => MessageV2.parts(msg.id))
-        const call = parts.find((part): part is MessageV2.ToolPart => part.type === "tool")
+        const tool = parts.find((part): part is MessageV2.ToolPart => part.type === "tool")

        expect(Exit.isFailure(exit)).toBe(true)
        if (Exit.isFailure(exit)) {
          expect(Cause.hasInterruptsOnly(exit.cause)).toBe(true)
        }
-        expect(yield* llm.calls).toBe(1)
-        expect(call?.state.status).toBe("error")
-        if (call?.state.status === "error") {
-          expect(call.state.error).toBe("Tool execution aborted")
-          expect(call.state.time.end).toBeDefined()
+        expect(yield* test.calls).toBe(1)
+        expect(tool?.state.status).toBe("error")
+        if (tool?.state.status === "error") {
+          expect(tool.state.error).toBe("Tool execution aborted")
+          expect(tool.state.time.end).toBeDefined()
        }
      }),
-    { git: true, config: (url) => providerCfg(url) },
-  ),
-)
+    { git: true },
+  )
+})

-it.live("session.processor effect tests record aborted errors and idle state", () =>
-  provideTmpdirServer(
-    ({ dir, llm }) =>
+it.effect("session.processor effect tests record aborted errors and idle state", () => {
+  return provideTmpdirInstance(
+    (dir) =>
      Effect.gen(function* () {
+        const ready = defer<void>()
        const seen = defer<void>()
-        const { processors, session, provider } = yield* boot()
+        const test = yield* TestLLM
+        const processors = yield* SessionProcessor.Service
+        const session = yield* Session.Service
        const bus = yield* Bus.Service
-        const sts = yield* SessionStatus.Service
+        const status = yield* SessionStatus.Service

-        yield* llm.hang
+        yield* test.push((input) =>
+          hang(input, start()).pipe(
+            Stream.tap((event) => (event.type === "start" ? Effect.sync(() => ready.resolve()) : Effect.void)),
+          ),
+        )

        const chat = yield* session.create({})
        const parent = yield* user(chat.id, "abort")
        const msg = yield* assistant(chat.id, parent.id, path.resolve(dir))
-        const mdl = yield* provider.getModel(ref.providerID, ref.modelID)
+        const mdl = model(100)
        const errs: string[] = []
        const off = yield* bus.subscribeCallback(Session.Event.Error, (evt) => {
          if (evt.properties.sessionID !== chat.id) return
@@ -661,7 +779,7 @@ it.live("session.processor effect tests record aborted errors and idle state", (
          })
          .pipe(Effect.forkChild)

-        yield* llm.wait(1)
+        yield* Effect.promise(() => ready.promise)
        yield* Fiber.interrupt(run)

        const exit = yield* Fiber.await(run)
@@ -670,7 +788,7 @@ it.live("session.processor effect tests record aborted errors and idle state", (
        }
        yield* Effect.promise(() => seen.promise)
        const stored = yield* Effect.promise(() => MessageV2.get({ sessionID: chat.id, messageID: msg.id }))
-        const state = yield* sts.get(chat.id)
+        const state = yield* status.get(chat.id)
        off()

        expect(Exit.isFailure(exit)).toBe(true)
@@ -685,23 +803,30 @@ it.live("session.processor effect tests record aborted errors and idle state", (
        expect(state).toMatchObject({ type: "idle" })
        expect(errs).toContain("MessageAbortedError")
      }),
-    { git: true, config: (url) => providerCfg(url) },
-  ),
-)
+    { git: true },
+  )
+})

-it.live("session.processor effect tests mark interruptions aborted without manual abort", () =>
-  provideTmpdirServer(
-    ({ dir, llm }) =>
+it.effect("session.processor effect tests mark interruptions aborted without manual abort", () => {
+  return provideTmpdirInstance(
+    (dir) =>
      Effect.gen(function* () {
-        const { processors, session, provider } = yield* boot()
-        const sts = yield* SessionStatus.Service
+        const ready = defer<void>()
+        const processors = yield* SessionProcessor.Service
+        const session = yield* Session.Service
+        const status = yield* SessionStatus.Service
+        const test = yield* TestLLM

-        yield* llm.hang
+        yield* test.push((input) =>
+          hang(input, start()).pipe(
+            Stream.tap((event) => (event.type === "start" ? Effect.sync(() => ready.resolve()) : Effect.void)),
+          ),
+        )

        const chat = yield* session.create({})
        const parent = yield* user(chat.id, "interrupt")
        const msg = yield* assistant(chat.id, parent.id, path.resolve(dir))
-        const mdl = yield* provider.getModel(ref.providerID, ref.modelID)
+        const mdl = model(100)
        const handle = yield* processors.create({
          assistantMessage: msg,
          sessionID: chat.id,
@@ -727,12 +852,12 @@ it.live("session.processor effect tests mark interruptions aborted without manua
          })
          .pipe(Effect.forkChild)

-        yield* llm.wait(1)
+        yield* Effect.promise(() => ready.promise)
        yield* Fiber.interrupt(run)

        const exit = yield* Fiber.await(run)
        const stored = yield* Effect.promise(() => MessageV2.get({ sessionID: chat.id, messageID: msg.id }))
-        const state = yield* sts.get(chat.id)
+        const state = yield* status.get(chat.id)

        expect(Exit.isFailure(exit)).toBe(true)
        expect(handle.message.error?.name).toBe("MessageAbortedError")
@@ -742,6 +867,6 @@ it.live("session.processor effect tests mark interruptions aborted without manua
        }
        expect(state).toMatchObject({ type: "idle" })
      }),
-    { git: true, config: (url) => providerCfg(url) },
-  ),
-)
+    { git: true },
+  )
+})
@@ -1,6 +1,7 @@
 import { NodeFileSystem } from "@effect/platform-node"
 import { expect, spyOn } from "bun:test"
-import { Cause, Effect, Exit, Fiber, Layer } from "effect"
+import { Cause, Effect, Exit, Fiber, Layer, ServiceMap } from "effect"
+import * as Stream from "effect/Stream"
 import z from "zod"
 import type { Agent } from "../../src/agent/agent"
 import { Agent as AgentSvc } from "../../src/agent/agent"
@@ -30,9 +31,8 @@ import { ToolRegistry } from "../../src/tool/registry"
 import { Truncate } from "../../src/tool/truncate"
 import { Log } from "../../src/util/log"
 import * as CrossSpawnSpawner from "../../src/effect/cross-spawn-spawner"
-import { provideTmpdirInstance, provideTmpdirServer } from "../fixture/fixture"
+import { provideTmpdirInstance } from "../fixture/fixture"
 import { testEffect } from "../lib/effect"
-import { TestLLMServer } from "../lib/llm-server"

 Log.init({ print: false })

@@ -41,6 +41,105 @@ const ref = {
  modelID: ModelID.make("test-model"),
 }

+type Script = Stream.Stream<LLM.Event, unknown> | ((input: LLM.StreamInput) => Stream.Stream<LLM.Event, unknown>)
+
+class TestLLM extends ServiceMap.Service<
+  TestLLM,
+  {
+    readonly push: (stream: Script) => Effect.Effect<void>
+    readonly reply: (...items: LLM.Event[]) => Effect.Effect<void>
+    readonly calls: Effect.Effect<number>
+    readonly inputs: Effect.Effect<LLM.StreamInput[]>
+  }
+>()("@test/PromptLLM") {}
+
+function stream(...items: LLM.Event[]) {
+  return Stream.make(...items)
+}
+
+function usage(input = 1, output = 1, total = input + output) {
+  return {
+    inputTokens: input,
+    outputTokens: output,
+    totalTokens: total,
+    inputTokenDetails: {
+      noCacheTokens: undefined,
+      cacheReadTokens: undefined,
+      cacheWriteTokens: undefined,
+    },
+    outputTokenDetails: {
+      textTokens: undefined,
+      reasoningTokens: undefined,
+    },
+  }
+}
+
+function start(): LLM.Event {
+  return { type: "start" }
+}
+
+function textStart(id = "t"): LLM.Event {
+  return { type: "text-start", id }
+}
+
+function textDelta(id: string, text: string): LLM.Event {
+  return { type: "text-delta", id, text }
+}
+
+function textEnd(id = "t"): LLM.Event {
+  return { type: "text-end", id }
+}
+
+function finishStep(): LLM.Event {
+  return {
+    type: "finish-step",
+    finishReason: "stop",
+    rawFinishReason: "stop",
+    response: { id: "res", modelId: "test-model", timestamp: new Date() },
+    providerMetadata: undefined,
+    usage: usage(),
+  }
+}
+
+function finish(): LLM.Event {
+  return { type: "finish", finishReason: "stop", rawFinishReason: "stop", totalUsage: usage() }
+}
+
+function finishToolCallsStep(): LLM.Event {
+  return {
+    type: "finish-step",
+    finishReason: "tool-calls",
+    rawFinishReason: "tool_calls",
+    response: { id: "res", modelId: "test-model", timestamp: new Date() },
+    providerMetadata: undefined,
+    usage: usage(),
+  }
+}
+
+function finishToolCalls(): LLM.Event {
+  return { type: "finish", finishReason: "tool-calls", rawFinishReason: "tool_calls", totalUsage: usage() }
+}
+
+function replyStop(text: string, id = "t") {
+  return [start(), textStart(id), textDelta(id, text), textEnd(id), finishStep(), finish()] as const
+}
+
+function replyToolCalls(text: string, id = "t") {
+  return [start(), textStart(id), textDelta(id, text), textEnd(id), finishToolCallsStep(), finishToolCalls()] as const
+}
+
+function toolInputStart(id: string, toolName: string): LLM.Event {
+  return { type: "tool-input-start", id, toolName }
+}
+
+function toolCall(toolCallId: string, toolName: string, input: unknown): LLM.Event {
+  return { type: "tool-call", toolCallId, toolName, input }
+}
+
+function hang(_input: LLM.StreamInput, ...items: LLM.Event[]) {
+  return stream(...items).pipe(Stream.concat(Stream.fromEffect(Effect.never)))
+}
+
 function defer<T>() {
  let resolve!: (value: T | PromiseLike<T>) => void
  const promise = new Promise<T>((done) => {
@@ -49,6 +148,10 @@ function defer<T>() {
  return { promise, resolve }
 }

+function waitMs(ms: number) {
+  return Effect.promise(() => new Promise<void>((done) => setTimeout(done, ms)))
+}
+
 function withSh<A, E, R>(fx: () => Effect.Effect<A, E, R>) {
  return Effect.acquireUseRelease(
    Effect.sync(() => {
@@ -86,6 +189,43 @@ function errorTool(parts: MessageV2.Part[]) {
  return part?.state.status === "error" ? (part as ErrorToolPart) : undefined
 }

+const llm = Layer.unwrap(
+  Effect.gen(function* () {
+    const queue: Script[] = []
+    const inputs: LLM.StreamInput[] = []
+    let calls = 0
+
+    const push = Effect.fn("TestLLM.push")((item: Script) => {
+      queue.push(item)
+      return Effect.void
+    })
+
+    const reply = Effect.fn("TestLLM.reply")((...items: LLM.Event[]) => push(stream(...items)))
+    return Layer.mergeAll(
+      Layer.succeed(
+        LLM.Service,
+        LLM.Service.of({
+          stream: (input) => {
+            calls += 1
+            inputs.push(input)
+            const item = queue.shift() ?? Stream.empty
+            return typeof item === "function" ? item(input) : item
+          },
+        }),
+      ),
+      Layer.succeed(
+        TestLLM,
+        TestLLM.of({
+          push,
+          reply,
+          calls: Effect.sync(() => calls),
+          inputs: Effect.sync(() => [...inputs]),
+        }),
+      ),
+    )
+  }),
+)
+
 const mcp = Layer.succeed(
  MCP.Service,
  MCP.Service.of({
@@ -141,40 +281,35 @@ const filetime = Layer.succeed(

 const status = SessionStatus.layer.pipe(Layer.provideMerge(Bus.layer))
 const infra = Layer.mergeAll(NodeFileSystem.layer, CrossSpawnSpawner.defaultLayer)
-function makeHttp() {
-  const deps = Layer.mergeAll(
-    Session.defaultLayer,
-    Snapshot.defaultLayer,
-    LLM.defaultLayer,
-    AgentSvc.defaultLayer,
-    Command.defaultLayer,
-    Permission.layer,
-    Plugin.defaultLayer,
-    Config.defaultLayer,
-    filetime,
-    lsp,
-    mcp,
-    AppFileSystem.defaultLayer,
-    status,
-  ).pipe(Layer.provideMerge(infra))
-  const registry = ToolRegistry.layer.pipe(Layer.provideMerge(deps))
-  const trunc = Truncate.layer.pipe(Layer.provideMerge(deps))
-  const proc = SessionProcessor.layer.pipe(Layer.provideMerge(deps))
-  const compact = SessionCompaction.layer.pipe(Layer.provideMerge(proc), Layer.provideMerge(deps))
-  return Layer.mergeAll(
-    TestLLMServer.layer,
-    SessionPrompt.layer.pipe(
-      Layer.provideMerge(compact),
-      Layer.provideMerge(proc),
-      Layer.provideMerge(registry),
-      Layer.provideMerge(trunc),
-      Layer.provideMerge(deps),
-    ),
-  )
-}
+const deps = Layer.mergeAll(
+  Session.defaultLayer,
+  Snapshot.defaultLayer,
+  AgentSvc.defaultLayer,
+  Command.defaultLayer,
+  Permission.layer,
+  Plugin.defaultLayer,
+  Config.defaultLayer,
+  filetime,
+  lsp,
+  mcp,
+  AppFileSystem.defaultLayer,
+  status,
+  llm,
+).pipe(Layer.provideMerge(infra))
+const registry = ToolRegistry.layer.pipe(Layer.provideMerge(deps))
+const trunc = Truncate.layer.pipe(Layer.provideMerge(deps))
+const proc = SessionProcessor.layer.pipe(Layer.provideMerge(deps))
+const compact = SessionCompaction.layer.pipe(Layer.provideMerge(proc), Layer.provideMerge(deps))
+const env = SessionPrompt.layer.pipe(
+  Layer.provideMerge(compact),
+  Layer.provideMerge(proc),
+  Layer.provideMerge(registry),
+  Layer.provideMerge(trunc),
+  Layer.provideMerge(deps),
+)

-const it = testEffect(makeHttp())
-const unix = process.platform !== "win32" ? it.live : it.live.skip
+const it = testEffect(env)
+const unix = process.platform !== "win32" ? it.effect : it.effect.skip

 // Config that registers a custom "test" provider with a "test-model" model
 // so Provider.getModel("test", "test-model") succeeds inside the loop.
@@ -207,22 +342,6 @@ const cfg = {
  },
 }

-function providerCfg(url: string) {
-  return {
-    ...cfg,
-    provider: {
-      ...cfg.provider,
-      test: {
-        ...cfg.provider.test,
-        options: {
-          ...cfg.provider.test.options,
-          baseURL: url,
-        },
-      },
-    },
-  }
-}
-
 const user = Effect.fn("test.user")(function* (sessionID: SessionID, text: string) {
  const session = yield* Session.Service
  const msg = yield* session.updateMessage({
@@ -288,300 +407,232 @@ const addSubtask = (sessionID: SessionID, messageID: MessageID, model = ref) =>
  })

 const boot = Effect.fn("test.boot")(function* (input?: { title?: string }) {
+  const test = yield* TestLLM
  const prompt = yield* SessionPrompt.Service
  const sessions = yield* Session.Service
  const chat = yield* sessions.create(input ?? { title: "Pinned" })
-  return { prompt, sessions, chat }
+  return { test, prompt, sessions, chat }
 })

 // Loop semantics

-it.live("loop exits immediately when last assistant has stop finish", () =>
-  provideTmpdirServer(
-    Effect.fnUntraced(function* ({ llm }) {
-      const prompt = yield* SessionPrompt.Service
-      const sessions = yield* Session.Service
-      const chat = yield* sessions.create({ title: "Pinned" })
-      yield* seed(chat.id, { finish: "stop" })
+it.effect("loop exits immediately when last assistant has stop finish", () =>
+  provideTmpdirInstance(
+    (dir) =>
+      Effect.gen(function* () {
+        const { test, prompt, chat } = yield* boot()
+        yield* seed(chat.id, { finish: "stop" })

-      const result = yield* prompt.loop({ sessionID: chat.id })
-      expect(result.info.role).toBe("assistant")
-      if (result.info.role === "assistant") expect(result.info.finish).toBe("stop")
-      expect(yield* llm.calls).toBe(0)
-    }),
-    { git: true, config: providerCfg },
+        const result = yield* prompt.loop({ sessionID: chat.id })
+        expect(result.info.role).toBe("assistant")
+        if (result.info.role === "assistant") expect(result.info.finish).toBe("stop")
+        expect(yield* test.calls).toBe(0)
+      }),
+    { git: true },
  ),
 )

-it.live("loop calls LLM and returns assistant message", () =>
-  provideTmpdirServer(
-    Effect.fnUntraced(function* ({ llm }) {
-      const prompt = yield* SessionPrompt.Service
-      const sessions = yield* Session.Service
-      const chat = yield* sessions.create({
-        title: "Pinned",
-        permission: [{ permission: "*", pattern: "*", action: "allow" }],
-      })
-      yield* prompt.prompt({
-        sessionID: chat.id,
-        agent: "build",
-        noReply: true,
-        parts: [{ type: "text", text: "hello" }],
-      })
-      yield* llm.text("world")
+it.effect("loop calls LLM and returns assistant message", () =>
+  provideTmpdirInstance(
+    (dir) =>
+      Effect.gen(function* () {
+        const { test, prompt, chat } = yield* boot()
+        yield* test.reply(...replyStop("world"))
+        yield* user(chat.id, "hello")

-      const result = yield* prompt.loop({ sessionID: chat.id })
-      expect(result.info.role).toBe("assistant")
-      const parts = result.parts.filter((p) => p.type === "text")
-      expect(parts.some((p) => p.type === "text" && p.text === "world")).toBe(true)
-      expect(yield* llm.hits).toHaveLength(1)
-    }),
-    { git: true, config: providerCfg },
+        const result = yield* prompt.loop({ sessionID: chat.id })
+        expect(result.info.role).toBe("assistant")
+        const parts = result.parts.filter((p) => p.type === "text")
+        expect(parts.some((p) => p.type === "text" && p.text === "world")).toBe(true)
+        expect(yield* test.calls).toBe(1)
+      }),
+    { git: true, config: cfg },
  ),
 )

-it.live("static loop returns assistant text through local provider", () =>
-  provideTmpdirServer(
-    Effect.fnUntraced(function* ({ llm }) {
-      const session = yield* Effect.promise(() =>
-        Session.create({
-          title: "Prompt provider",
-          permission: [{ permission: "*", pattern: "*", action: "allow" }],
-        }),
-      )
+it.effect("loop continues when finish is tool-calls", () =>
+  provideTmpdirInstance(
+    (dir) =>
+      Effect.gen(function* () {
+        const { test, prompt, chat } = yield* boot()
+        yield* test.reply(...replyToolCalls("first"))
+        yield* test.reply(...replyStop("second"))
+        yield* user(chat.id, "hello")

-      yield* Effect.promise(() =>
-        SessionPrompt.prompt({
-          sessionID: session.id,
-          agent: "build",
-          noReply: true,
-          parts: [{ type: "text", text: "hello" }],
-        }),
-      )
-
-      yield* llm.text("world")
-
-      const result = yield* Effect.promise(() => SessionPrompt.loop({ sessionID: session.id }))
-      expect(result.info.role).toBe("assistant")
-      expect(result.parts.some((part) => part.type === "text" && part.text === "world")).toBe(true)
-      expect(yield* llm.hits).toHaveLength(1)
-      expect(yield* llm.pending).toBe(0)
-    }),
-    { git: true, config: providerCfg },
+        const result = yield* prompt.loop({ sessionID: chat.id })
+        expect(yield* test.calls).toBe(2)
+        expect(result.info.role).toBe("assistant")
+        if (result.info.role === "assistant") {
+          expect(result.parts.some((part) => part.type === "text" && part.text === "second")).toBe(true)
+          expect(result.info.finish).toBe("stop")
+        }
+      }),
+    { git: true, config: cfg },
  ),
 )

-it.live("static loop consumes queued replies across turns", () =>
-  provideTmpdirServer(
-    Effect.fnUntraced(function* ({ llm }) {
-      const session = yield* Effect.promise(() =>
-        Session.create({
-          title: "Prompt provider turns",
-          permission: [{ permission: "*", pattern: "*", action: "allow" }],
-        }),
-      )
+it.effect("failed subtask preserves metadata on error tool state", () =>
+  provideTmpdirInstance(
+    (dir) =>
+      Effect.gen(function* () {
+        const { test, prompt, chat } = yield* boot({ title: "Pinned" })
+        yield* test.reply(
+          start(),
+          toolInputStart("task-1", "task"),
+          toolCall("task-1", "task", {
+            description: "inspect bug",
+            prompt: "look into the cache key path",
+            subagent_type: "general",
+          }),
+          {
+            type: "finish-step",
+            finishReason: "tool-calls",
+            rawFinishReason: "tool_calls",
+            response: { id: "res", modelId: "test-model", timestamp: new Date() },
+            providerMetadata: undefined,
+            usage: usage(),
+          },
+          { type: "finish", finishReason: "tool-calls", rawFinishReason: "tool_calls", totalUsage: usage() },
+        )
+        yield* test.reply(...replyStop("done"))
+        const msg = yield* user(chat.id, "hello")
+        yield* addSubtask(chat.id, msg.id)

-      yield* Effect.promise(() =>
-        SessionPrompt.prompt({
-          sessionID: session.id,
-          agent: "build",
-          noReply: true,
-          parts: [{ type: "text", text: "hello one" }],
-        }),
-      )
+        const result = yield* prompt.loop({ sessionID: chat.id })
+        expect(result.info.role).toBe("assistant")
+        expect(yield* test.calls).toBe(2)

-      yield* llm.text("world one")
+        const msgs = yield* Effect.promise(() => MessageV2.filterCompacted(MessageV2.stream(chat.id)))
+        const taskMsg = msgs.find((item) => item.info.role === "assistant" && item.info.agent === "general")
+        expect(taskMsg?.info.role).toBe("assistant")
+        if (!taskMsg || taskMsg.info.role !== "assistant") return

-      const first = yield* Effect.promise(() => SessionPrompt.loop({ sessionID: session.id }))
-      expect(first.info.role).toBe("assistant")
-      expect(first.parts.some((part) => part.type === "text" && part.text === "world one")).toBe(true)
+        const tool = errorTool(taskMsg.parts)
+        if (!tool) return

-      yield* Effect.promise(() =>
-        SessionPrompt.prompt({
-          sessionID: session.id,
-          agent: "build",
-          noReply: true,
-          parts: [{ type: "text", text: "hello two" }],
-        }),
-      )
-
-      yield* llm.text("world two")
-
-      const second = yield* Effect.promise(() => SessionPrompt.loop({ sessionID: session.id }))
-      expect(second.info.role).toBe("assistant")
-      expect(second.parts.some((part) => part.type === "text" && part.text === "world two")).toBe(true)
-
-      expect(yield* llm.hits).toHaveLength(2)
-      expect(yield* llm.pending).toBe(0)
-    }),
-    { git: true, config: providerCfg },
-  ),
-)
-
-it.live("loop continues when finish is tool-calls", () =>
-  provideTmpdirServer(
-    Effect.fnUntraced(function* ({ llm }) {
-      const prompt = yield* SessionPrompt.Service
-      const sessions = yield* Session.Service
-      const session = yield* sessions.create({
-        title: "Pinned",
-        permission: [{ permission: "*", pattern: "*", action: "allow" }],
-      })
-      yield* prompt.prompt({
-        sessionID: session.id,
-        agent: "build",
-        noReply: true,
-        parts: [{ type: "text", text: "hello" }],
-      })
-      yield* llm.tool("first", { value: "first" })
-      yield* llm.text("second")
-
-      const result = yield* prompt.loop({ sessionID: session.id })
-      expect(yield* llm.calls).toBe(2)
-      expect(result.info.role).toBe("assistant")
-      if (result.info.role === "assistant") {
-        expect(result.parts.some((part) => part.type === "text" && part.text === "second")).toBe(true)
-        expect(result.info.finish).toBe("stop")
-      }
-    }),
-    { git: true, config: providerCfg },
-  ),
-)
-
-it.live("failed subtask preserves metadata on error tool state", () =>
-  provideTmpdirServer(
-    Effect.fnUntraced(function* ({ llm }) {
-      const prompt = yield* SessionPrompt.Service
-      const sessions = yield* Session.Service
-      const chat = yield* sessions.create({ title: "Pinned" })
-      yield* llm.tool("task", {
-        description: "inspect bug",
-        prompt: "look into the cache key path",
-        subagent_type: "general",
-      })
-      yield* llm.text("done")
-      const msg = yield* user(chat.id, "hello")
-      yield* addSubtask(chat.id, msg.id)
-
-      const result = yield* prompt.loop({ sessionID: chat.id })
-      expect(result.info.role).toBe("assistant")
-      expect(yield* llm.calls).toBe(2)
-
-      const msgs = yield* Effect.promise(() => MessageV2.filterCompacted(MessageV2.stream(chat.id)))
-      const taskMsg = msgs.find((item) => item.info.role === "assistant" && item.info.agent === "general")
-      expect(taskMsg?.info.role).toBe("assistant")
-      if (!taskMsg || taskMsg.info.role !== "assistant") return
-
-      const tool = errorTool(taskMsg.parts)
-      if (!tool) return
-
-      expect(tool.state.error).toContain("Tool execution failed")
-      expect(tool.state.metadata).toBeDefined()
-      expect(tool.state.metadata?.sessionId).toBeDefined()
-      expect(tool.state.metadata?.model).toEqual({
-        providerID: ProviderID.make("test"),
-        modelID: ModelID.make("missing-model"),
-      })
-    }),
+        expect(tool.state.error).toContain("Tool execution failed")
+        expect(tool.state.metadata).toBeDefined()
+        expect(tool.state.metadata?.sessionId).toBeDefined()
+        expect(tool.state.metadata?.model).toEqual({
+          providerID: ProviderID.make("test"),
+          modelID: ModelID.make("missing-model"),
+        })
+      }),
    {
      git: true,
-      config: (url) => ({
-        ...providerCfg(url),
+      config: {
+        ...cfg,
        agent: {
          general: {
            model: "test/missing-model",
          },
        },
-      }),
+      },
    },
  ),
 )

-it.live(
-  "loop sets status to busy then idle",
-  () =>
-    provideTmpdirServer(
-      Effect.fnUntraced(function* ({ llm }) {
+it.effect("loop sets status to busy then idle", () =>
+  provideTmpdirInstance(
+    (dir) =>
+      Effect.gen(function* () {
+        const test = yield* TestLLM
        const prompt = yield* SessionPrompt.Service
        const sessions = yield* Session.Service
-        const status = yield* SessionStatus.Service
+        const bus = yield* Bus.Service

-        yield* llm.hang
+        yield* test.reply(start(), textStart(), textDelta("t", "ok"), textEnd(), finishStep(), finish())

        const chat = yield* sessions.create({})
        yield* user(chat.id, "hi")

-        const fiber = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
-        yield* llm.wait(1)
-        expect((yield* status.get(chat.id)).type).toBe("busy")
-        yield* prompt.cancel(chat.id)
-        yield* Fiber.await(fiber)
-        expect((yield* status.get(chat.id)).type).toBe("idle")
+        const types: string[] = []
+        const idle = defer<void>()
+        const off = yield* bus.subscribeCallback(SessionStatus.Event.Status, (evt) => {
+          if (evt.properties.sessionID !== chat.id) return
+          types.push(evt.properties.status.type)
+          if (evt.properties.status.type === "idle") idle.resolve()
+        })
+
+        yield* prompt.loop({ sessionID: chat.id })
+        yield* Effect.promise(() => idle.promise)
+        off()
+
+        expect(types).toContain("busy")
+        expect(types[types.length - 1]).toBe("idle")
      }),
-      { git: true, config: providerCfg },
-    ),
-  3_000,
+    { git: true, config: cfg },
+  ),
 )

 // Cancel semantics

-it.live(
+it.effect(
  "cancel interrupts loop and resolves with an assistant message",
  () =>
-    provideTmpdirServer(
-      Effect.fnUntraced(function* ({ llm }) {
-        const prompt = yield* SessionPrompt.Service
-        const sessions = yield* Session.Service
-        const chat = yield* sessions.create({ title: "Pinned" })
-        yield* seed(chat.id)
+    provideTmpdirInstance(
+      (dir) =>
+        Effect.gen(function* () {
+          const { test, prompt, chat } = yield* boot()
+          yield* seed(chat.id)

-        yield* llm.hang
+          // Make LLM hang so the loop blocks
+          yield* test.push((input) => hang(input, start()))

-        yield* user(chat.id, "more")
+          // Seed a new user message so the loop enters the LLM path
+          yield* user(chat.id, "more")

-        const fiber = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
-        yield* llm.wait(1)
-        yield* prompt.cancel(chat.id)
-        const exit = yield* Fiber.await(fiber)
-        expect(Exit.isSuccess(exit)).toBe(true)
-        if (Exit.isSuccess(exit)) {
-          expect(exit.value.info.role).toBe("assistant")
-        }
-      }),
-      { git: true, config: providerCfg },
+          const fiber = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
+          // Give the loop time to start
+          yield* waitMs(200)
+          yield* prompt.cancel(chat.id)
+
+          const exit = yield* Fiber.await(fiber)
+          expect(Exit.isSuccess(exit)).toBe(true)
+          if (Exit.isSuccess(exit)) {
+            expect(exit.value.info.role).toBe("assistant")
+          }
+        }),
+      { git: true, config: cfg },
    ),
-  3_000,
+  30_000,
 )

-it.live(
+it.effect(
  "cancel records MessageAbortedError on interrupted process",
  () =>
-    provideTmpdirServer(
-      Effect.fnUntraced(function* ({ llm }) {
-        const prompt = yield* SessionPrompt.Service
-        const sessions = yield* Session.Service
-        const chat = yield* sessions.create({ title: "Pinned" })
-        yield* llm.hang
-        yield* user(chat.id, "hello")
+    provideTmpdirInstance(
+      (dir) =>
+        Effect.gen(function* () {
+          const ready = defer<void>()
+          const { test, prompt, chat } = yield* boot()

-        const fiber = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
-        yield* llm.wait(1)
-        yield* prompt.cancel(chat.id)
-        const exit = yield* Fiber.await(fiber)
-        expect(Exit.isSuccess(exit)).toBe(true)
-        if (Exit.isSuccess(exit)) {
-          const info = exit.value.info
-          if (info.role === "assistant") {
-            expect(info.error?.name).toBe("MessageAbortedError")
+          yield* test.push((input) =>
+            hang(input, start()).pipe(
+              Stream.tap((event) => (event.type === "start" ? Effect.sync(() => ready.resolve()) : Effect.void)),
+            ),
+          )
+          yield* user(chat.id, "hello")
+
+          const fiber = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
+          yield* Effect.promise(() => ready.promise)
+          yield* prompt.cancel(chat.id)
+
+          const exit = yield* Fiber.await(fiber)
+          expect(Exit.isSuccess(exit)).toBe(true)
+          if (Exit.isSuccess(exit)) {
+            const info = exit.value.info
+            if (info.role === "assistant") {
+              expect(info.error?.name).toBe("MessageAbortedError")
+            }
          }
-        }
-      }),
-      { git: true, config: providerCfg },
+        }),
+      { git: true, config: cfg },
    ),
-  3_000,
+  30_000,
 )

-it.live(
+it.effect(
  "cancel finalizes subtask tool state",
  () =>
    provideTmpdirInstance(
@@ -644,38 +695,45 @@ it.live(
  30_000,
 )

-it.live(
+it.effect(
  "cancel with queued callers resolves all cleanly",
  () =>
-    provideTmpdirServer(
-      Effect.fnUntraced(function* ({ llm }) {
-        const prompt = yield* SessionPrompt.Service
-        const sessions = yield* Session.Service
-        const chat = yield* sessions.create({ title: "Pinned" })
-        yield* llm.hang
-        yield* user(chat.id, "hello")
+    provideTmpdirInstance(
+      (dir) =>
+        Effect.gen(function* () {
+          const ready = defer<void>()
+          const { test, prompt, chat } = yield* boot()

-        const a = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
-        yield* llm.wait(1)
-        const b = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
-        yield* Effect.sleep(50)
+          yield* test.push((input) =>
+            hang(input, start()).pipe(
+              Stream.tap((event) => (event.type === "start" ? Effect.sync(() => ready.resolve()) : Effect.void)),
+            ),
+          )
+          yield* user(chat.id, "hello")

-        yield* prompt.cancel(chat.id)
-        const [exitA, exitB] = yield* Effect.all([Fiber.await(a), Fiber.await(b)])
-        expect(Exit.isSuccess(exitA)).toBe(true)
-        expect(Exit.isSuccess(exitB)).toBe(true)
-        if (Exit.isSuccess(exitA) && Exit.isSuccess(exitB)) {
-          expect(exitA.value.info.id).toBe(exitB.value.info.id)
-        }
-      }),
-      { git: true, config: providerCfg },
+          const a = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
+          yield* Effect.promise(() => ready.promise)
+          // Queue a second caller
+          const b = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
+          yield* waitMs(50)
+
+          yield* prompt.cancel(chat.id)
+
+          const [exitA, exitB] = yield* Effect.all([Fiber.await(a), Fiber.await(b)])
+          expect(Exit.isSuccess(exitA)).toBe(true)
+          expect(Exit.isSuccess(exitB)).toBe(true)
+          if (Exit.isSuccess(exitA) && Exit.isSuccess(exitB)) {
+            expect(exitA.value.info.id).toBe(exitB.value.info.id)
+          }
+        }),
+      { git: true, config: cfg },
    ),
-  3_000,
+  30_000,
 )

 // Queue semantics

-it.live("concurrent loop callers get same result", () =>
+it.effect("concurrent loop callers get same result", () =>
  provideTmpdirInstance(
    (dir) =>
      Effect.gen(function* () {
@@ -694,128 +752,152 @@ it.live("concurrent loop callers get same result", () =>
  ),
 )

-it.live(
-  "concurrent loop callers all receive same error result",
-  () =>
-    provideTmpdirServer(
-      Effect.fnUntraced(function* ({ llm }) {
-        const prompt = yield* SessionPrompt.Service
-        const sessions = yield* Session.Service
-        const chat = yield* sessions.create({ title: "Pinned" })
+it.effect("concurrent loop callers all receive same error result", () =>
+  provideTmpdirInstance(
+    (dir) =>
+      Effect.gen(function* () {
+        const { test, prompt, chat } = yield* boot()

-        yield* llm.fail("boom")
+        // Push a stream that fails — the loop records the error on the assistant message
+        yield* test.push(Stream.fail(new Error("boom")))
        yield* user(chat.id, "hello")

        const [a, b] = yield* Effect.all([prompt.loop({ sessionID: chat.id }), prompt.loop({ sessionID: chat.id })], {
          concurrency: "unbounded",
        })
+
+        // Both callers get the same assistant with an error recorded
        expect(a.info.id).toBe(b.info.id)
        expect(a.info.role).toBe("assistant")
+        if (a.info.role === "assistant") {
+          expect(a.info.error).toBeDefined()
+        }
+        if (b.info.role === "assistant") {
+          expect(b.info.error).toBeDefined()
+        }
      }),
-      { git: true, config: providerCfg },
-    ),
-  3_000,
+    { git: true, config: cfg },
+  ),
 )

-it.live(
+it.effect(
  "prompt submitted during an active run is included in the next LLM input",
  () =>
-    provideTmpdirServer(
-      Effect.fnUntraced(function* ({ llm }) {
-        const gate = defer<void>()
-        const prompt = yield* SessionPrompt.Service
-        const sessions = yield* Session.Service
-        const chat = yield* sessions.create({ title: "Pinned" })
+    provideTmpdirInstance(
+      (dir) =>
+        Effect.gen(function* () {
+          const ready = defer<void>()
+          const gate = defer<void>()
+          const { test, prompt, sessions, chat } = yield* boot()

-        yield* llm.hold("first", gate.promise)
-        yield* llm.text("second")
+          yield* test.push((_input) =>
+            stream(start()).pipe(
+              Stream.tap((event) => (event.type === "start" ? Effect.sync(() => ready.resolve()) : Effect.void)),
+              Stream.concat(
+                Stream.fromEffect(Effect.promise(() => gate.promise)).pipe(
+                  Stream.flatMap(() =>
+                    stream(textStart("a"), textDelta("a", "first"), textEnd("a"), finishStep(), finish()),
+                  ),
+                ),
+              ),
+            ),
+          )

-        const a = yield* prompt
-          .prompt({
-            sessionID: chat.id,
-            agent: "build",
-            model: ref,
-            parts: [{ type: "text", text: "first" }],
+          const a = yield* prompt
+            .prompt({
+              sessionID: chat.id,
+              agent: "build",
+              model: ref,
+              parts: [{ type: "text", text: "first" }],
+            })
+            .pipe(Effect.forkChild)
+
+          yield* Effect.promise(() => ready.promise)
+
+          const id = MessageID.ascending()
+          const b = yield* prompt
+            .prompt({
+              sessionID: chat.id,
+              messageID: id,
+              agent: "build",
+              model: ref,
+              parts: [{ type: "text", text: "second" }],
+            })
+            .pipe(Effect.forkChild)
+
+          yield* Effect.promise(async () => {
+            const end = Date.now() + 5000
+            while (Date.now() < end) {
+              const msgs = await Effect.runPromise(sessions.messages({ sessionID: chat.id }))
+              if (msgs.some((msg) => msg.info.role === "user" && msg.info.id === id)) return
+              await new Promise((done) => setTimeout(done, 20))
+            }
+            throw new Error("timed out waiting for second prompt to save")
          })
-          .pipe(Effect.forkChild)

-        yield* llm.wait(1)
+          yield* test.reply(...replyStop("second"))
+          gate.resolve()

-        const id = MessageID.ascending()
-        const b = yield* prompt
-          .prompt({
-            sessionID: chat.id,
-            messageID: id,
-            agent: "build",
-            model: ref,
-            parts: [{ type: "text", text: "second" }],
-          })
-          .pipe(Effect.forkChild)
+          const [ea, eb] = yield* Effect.all([Fiber.await(a), Fiber.await(b)])
+          expect(Exit.isSuccess(ea)).toBe(true)
+          expect(Exit.isSuccess(eb)).toBe(true)
+          expect(yield* test.calls).toBe(2)

-        yield* Effect.promise(async () => {
-          const end = Date.now() + 5000
-          while (Date.now() < end) {
-            const msgs = await Effect.runPromise(sessions.messages({ sessionID: chat.id }))
-            if (msgs.some((msg) => msg.info.role === "user" && msg.info.id === id)) return
-            await new Promise((done) => setTimeout(done, 20))
-          }
-          throw new Error("timed out waiting for second prompt to save")
-        })
+          const msgs = yield* sessions.messages({ sessionID: chat.id })
+          const assistants = msgs.filter((msg) => msg.info.role === "assistant")
+          expect(assistants).toHaveLength(2)
+          const last = assistants.at(-1)
+          if (!last || last.info.role !== "assistant") throw new Error("expected second assistant")
+          expect(last.info.parentID).toBe(id)
+          expect(last.parts.some((part) => part.type === "text" && part.text === "second")).toBe(true)

-        gate.resolve()
-
-        const [ea, eb] = yield* Effect.all([Fiber.await(a), Fiber.await(b)])
-        expect(Exit.isSuccess(ea)).toBe(true)
-        expect(Exit.isSuccess(eb)).toBe(true)
-        expect(yield* llm.calls).toBe(2)
-
-        const msgs = yield* sessions.messages({ sessionID: chat.id })
-        const assistants = msgs.filter((msg) => msg.info.role === "assistant")
-        expect(assistants).toHaveLength(2)
-        const last = assistants.at(-1)
-        if (!last || last.info.role !== "assistant") throw new Error("expected second assistant")
-        expect(last.info.parentID).toBe(id)
-        expect(last.parts.some((part) => part.type === "text" && part.text === "second")).toBe(true)
-
-        const inputs = yield* llm.inputs
-        expect(inputs).toHaveLength(2)
-        expect(JSON.stringify(inputs.at(-1)?.messages)).toContain("second")
-      }),
-      { git: true, config: providerCfg },
+          const inputs = yield* test.inputs
+          expect(inputs).toHaveLength(2)
+          expect(JSON.stringify(inputs.at(-1)?.messages)).toContain("second")
+        }),
+      { git: true, config: cfg },
    ),
-  3_000,
+  30_000,
 )

-it.live(
+it.effect(
  "assertNotBusy throws BusyError when loop running",
  () =>
-    provideTmpdirServer(
-      Effect.fnUntraced(function* ({ llm }) {
-        const prompt = yield* SessionPrompt.Service
-        const sessions = yield* Session.Service
-        yield* llm.hang
+    provideTmpdirInstance(
+      (dir) =>
+        Effect.gen(function* () {
+          const ready = defer<void>()
+          const test = yield* TestLLM
+          const prompt = yield* SessionPrompt.Service
+          const sessions = yield* Session.Service

-        const chat = yield* sessions.create({})
-        yield* user(chat.id, "hi")
+          yield* test.push((input) =>
+            hang(input, start()).pipe(
+              Stream.tap((event) => (event.type === "start" ? Effect.sync(() => ready.resolve()) : Effect.void)),
+            ),
+          )

-        const fiber = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
-        yield* llm.wait(1)
+          const chat = yield* sessions.create({})
+          yield* user(chat.id, "hi")

-        const exit = yield* prompt.assertNotBusy(chat.id).pipe(Effect.exit)
-        expect(Exit.isFailure(exit)).toBe(true)
-        if (Exit.isFailure(exit)) {
-          expect(Cause.squash(exit.cause)).toBeInstanceOf(Session.BusyError)
-        }
+          const fiber = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
+          yield* Effect.promise(() => ready.promise)

-        yield* prompt.cancel(chat.id)
-        yield* Fiber.await(fiber)
-      }),
-      { git: true, config: providerCfg },
+          const exit = yield* prompt.assertNotBusy(chat.id).pipe(Effect.exit)
+          expect(Exit.isFailure(exit)).toBe(true)
+          if (Exit.isFailure(exit)) {
+            expect(Cause.squash(exit.cause)).toBeInstanceOf(Session.BusyError)
+          }
+
+          yield* prompt.cancel(chat.id)
+          yield* Fiber.await(fiber)
+        }),
+      { git: true, config: cfg },
    ),
-  3_000,
+  30_000,
 )

-it.live("assertNotBusy succeeds when idle", () =>
+it.effect("assertNotBusy succeeds when idle", () =>
  provideTmpdirInstance(
    (dir) =>
      Effect.gen(function* () {
@@ -832,32 +914,37 @@ it.live("assertNotBusy succeeds when idle", () =>

 // Shell semantics

-it.live(
+it.effect(
  "shell rejects with BusyError when loop running",
  () =>
-    provideTmpdirServer(
-      Effect.fnUntraced(function* ({ llm }) {
-        const prompt = yield* SessionPrompt.Service
-        const sessions = yield* Session.Service
-        const chat = yield* sessions.create({ title: "Pinned" })
-        yield* llm.hang
-        yield* user(chat.id, "hi")
+    provideTmpdirInstance(
+      (dir) =>
+        Effect.gen(function* () {
+          const ready = defer<void>()
+          const { test, prompt, chat } = yield* boot()

-        const fiber = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
-        yield* llm.wait(1)
+          yield* test.push((input) =>
+            hang(input, start()).pipe(
+              Stream.tap((event) => (event.type === "start" ? Effect.sync(() => ready.resolve()) : Effect.void)),
+            ),
+          )
+          yield* user(chat.id, "hi")

-        const exit = yield* prompt.shell({ sessionID: chat.id, agent: "build", command: "echo hi" }).pipe(Effect.exit)
-        expect(Exit.isFailure(exit)).toBe(true)
-        if (Exit.isFailure(exit)) {
-          expect(Cause.squash(exit.cause)).toBeInstanceOf(Session.BusyError)
-        }
+          const fiber = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
+          yield* Effect.promise(() => ready.promise)

-        yield* prompt.cancel(chat.id)
-        yield* Fiber.await(fiber)
-      }),
-      { git: true, config: providerCfg },
+          const exit = yield* prompt.shell({ sessionID: chat.id, agent: "build", command: "echo hi" }).pipe(Effect.exit)
+          expect(Exit.isFailure(exit)).toBe(true)
+          if (Exit.isFailure(exit)) {
+            expect(Cause.squash(exit.cause)).toBeInstanceOf(Session.BusyError)
+          }
+
+          yield* prompt.cancel(chat.id)
+          yield* Fiber.await(fiber)
+        }),
+      { git: true, config: cfg },
    ),
-  3_000,
+  30_000,
 )

 unix("shell captures stdout and stderr in completed tool output", () =>
@@ -919,82 +1006,74 @@ unix(
  30_000,
 )

-it.live(
+unix(
  "loop waits while shell runs and starts after shell exits",
  () =>
-    provideTmpdirServer(
-      Effect.fnUntraced(function* ({ llm }) {
-        const prompt = yield* SessionPrompt.Service
-        const sessions = yield* Session.Service
-        const chat = yield* sessions.create({
-          title: "Pinned",
-          permission: [{ permission: "*", pattern: "*", action: "allow" }],
-        })
-        yield* llm.text("after-shell")
+    provideTmpdirInstance(
+      (dir) =>
+        Effect.gen(function* () {
+          const { test, prompt, chat } = yield* boot()
+          yield* test.reply(...replyStop("after-shell"))

-        const sh = yield* prompt
-          .shell({ sessionID: chat.id, agent: "build", command: "sleep 0.2" })
-          .pipe(Effect.forkChild)
-        yield* Effect.sleep(50)
+          const sh = yield* prompt
+            .shell({ sessionID: chat.id, agent: "build", command: "sleep 0.2" })
+            .pipe(Effect.forkChild)
+          yield* waitMs(50)

-        const loop = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
-        yield* Effect.sleep(50)
+          const run = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
+          yield* waitMs(50)

-        expect(yield* llm.calls).toBe(0)
+          expect(yield* test.calls).toBe(0)

-        yield* Fiber.await(sh)
-        const exit = yield* Fiber.await(loop)
+          yield* Fiber.await(sh)
+          const exit = yield* Fiber.await(run)

-        expect(Exit.isSuccess(exit)).toBe(true)
-        if (Exit.isSuccess(exit)) {
-          expect(exit.value.info.role).toBe("assistant")
-          expect(exit.value.parts.some((part) => part.type === "text" && part.text === "after-shell")).toBe(true)
-        }
-        expect(yield* llm.calls).toBe(1)
-      }),
-      { git: true, config: providerCfg },
+          expect(Exit.isSuccess(exit)).toBe(true)
+          if (Exit.isSuccess(exit)) {
+            expect(exit.value.info.role).toBe("assistant")
+            expect(exit.value.parts.some((part) => part.type === "text" && part.text === "after-shell")).toBe(true)
+          }
+          expect(yield* test.calls).toBe(1)
+        }),
+      { git: true, config: cfg },
    ),
-  3_000,
+  30_000,
 )

-it.live(
+unix(
  "shell completion resumes queued loop callers",
  () =>
-    provideTmpdirServer(
-      Effect.fnUntraced(function* ({ llm }) {
-        const prompt = yield* SessionPrompt.Service
-        const sessions = yield* Session.Service
-        const chat = yield* sessions.create({
-          title: "Pinned",
-          permission: [{ permission: "*", pattern: "*", action: "allow" }],
-        })
-        yield* llm.text("done")
+    provideTmpdirInstance(
+      (dir) =>
+        Effect.gen(function* () {
+          const { test, prompt, chat } = yield* boot()
+          yield* test.reply(...replyStop("done"))

-        const sh = yield* prompt
-          .shell({ sessionID: chat.id, agent: "build", command: "sleep 0.2" })
-          .pipe(Effect.forkChild)
-        yield* Effect.sleep(50)
+          const sh = yield* prompt
+            .shell({ sessionID: chat.id, agent: "build", command: "sleep 0.2" })
+            .pipe(Effect.forkChild)
+          yield* waitMs(50)

-        const a = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
-        const b = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
-        yield* Effect.sleep(50)
+          const a = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
+          const b = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
+          yield* waitMs(50)

-        expect(yield* llm.calls).toBe(0)
+          expect(yield* test.calls).toBe(0)

-        yield* Fiber.await(sh)
-        const [ea, eb] = yield* Effect.all([Fiber.await(a), Fiber.await(b)])
+          yield* Fiber.await(sh)
+          const [ea, eb] = yield* Effect.all([Fiber.await(a), Fiber.await(b)])

-        expect(Exit.isSuccess(ea)).toBe(true)
-        expect(Exit.isSuccess(eb)).toBe(true)
-        if (Exit.isSuccess(ea) && Exit.isSuccess(eb)) {
-          expect(ea.value.info.id).toBe(eb.value.info.id)
-          expect(ea.value.info.role).toBe("assistant")
-        }
-        expect(yield* llm.calls).toBe(1)
-      }),
-      { git: true, config: providerCfg },
+          expect(Exit.isSuccess(ea)).toBe(true)
+          expect(Exit.isSuccess(eb)).toBe(true)
+          if (Exit.isSuccess(ea) && Exit.isSuccess(eb)) {
+            expect(ea.value.info.id).toBe(eb.value.info.id)
+            expect(ea.value.info.role).toBe("assistant")
+          }
+          expect(yield* test.calls).toBe(1)
+        }),
+      { git: true, config: cfg },
    ),
-  3_000,
+  30_000,
 )

 unix(
@@ -1009,7 +1088,7 @@ unix(
            const sh = yield* prompt
              .shell({ sessionID: chat.id, agent: "build", command: "sleep 30" })
              .pipe(Effect.forkChild)
-            yield* Effect.sleep(50)
+            yield* waitMs(50)

            yield* prompt.cancel(chat.id)

@@ -1046,7 +1125,7 @@ unix(
            const sh = yield* prompt
              .shell({ sessionID: chat.id, agent: "build", command: "trap '' TERM; sleep 30" })
              .pipe(Effect.forkChild)
-            yield* Effect.sleep(50)
+            yield* waitMs(50)

            yield* prompt.cancel(chat.id)

@@ -1077,14 +1156,14 @@ unix(
          const sh = yield* prompt
            .shell({ sessionID: chat.id, agent: "build", command: "sleep 30" })
            .pipe(Effect.forkChild)
-          yield* Effect.sleep(50)
+          yield* waitMs(50)

-          const loop = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
-          yield* Effect.sleep(50)
+          const run = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkChild)
+          yield* waitMs(50)

          yield* prompt.cancel(chat.id)

-          const exit = yield* Fiber.await(loop)
+          const exit = yield* Fiber.await(run)
          expect(Exit.isSuccess(exit)).toBe(true)

          yield* Fiber.await(sh)
@@ -1106,7 +1185,7 @@ unix(
            const a = yield* prompt
              .shell({ sessionID: chat.id, agent: "build", command: "sleep 30" })
              .pipe(Effect.forkChild)
-            yield* Effect.sleep(50)
+            yield* waitMs(50)

            const exit = yield* prompt
              .shell({ sessionID: chat.id, agent: "build", command: "echo hi" })
@@ -140,7 +140,7 @@ describe("Truncate", () => {
    const DAY_MS = 24 * 60 * 60 * 1000
    const it = testEffect(Layer.mergeAll(TruncateSvc.defaultLayer, NodeFileSystem.layer))

-    it.live("deletes files older than 7 days and preserves recent files", () =>
+    it.effect("deletes files older than 7 days and preserves recent files", () =>
      Effect.gen(function* () {
        const fs = yield* FileSystem.FileSystem

@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/plugin",
-  "version": "1.3.11",
+  "version": "1.3.9",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -21,8 +21,8 @@
    "zod": "catalog:"
  },
  "peerDependencies": {
-    "@opentui/core": ">=0.1.93",
-    "@opentui/solid": ">=0.1.93"
+    "@opentui/core": ">=0.1.92",
+    "@opentui/solid": ">=0.1.92"
  },
  "peerDependenciesMeta": {
    "@opentui/core": {
@@ -33,8 +33,8 @@
    }
  },
  "devDependencies": {
-    "@opentui/core": "0.1.93",
-    "@opentui/solid": "0.1.93",
+    "@opentui/core": "0.1.92",
+    "@opentui/solid": "0.1.92",
    "@tsconfig/node22": "catalog:",
    "@types/node": "catalog:",
    "typescript": "catalog:",
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/sdk",
-  "version": "1.3.11",
+  "version": "1.3.9",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -4,6 +4,20 @@ export type ClientOptions = {
  baseUrl: `${string}://${string}` | (string & {})
 }

+export type EventInstallationUpdated = {
+  type: "installation.updated"
+  properties: {
+    version: string
+  }
+}
+
+export type EventInstallationUpdateAvailable = {
+  type: "installation.update-available"
+  properties: {
+    version: string
+  }
+}
+
 export type Project = {
  id: string
  worktree: string
@@ -33,20 +47,6 @@ export type EventProjectUpdated = {
  properties: Project
 }

-export type EventInstallationUpdated = {
-  type: "installation.updated"
-  properties: {
-    version: string
-  }
-}
-
-export type EventInstallationUpdateAvailable = {
-  type: "installation.update-available"
-  properties: {
-    version: string
-  }
-}
-
 export type EventServerInstanceDisposed = {
  type: "server.instance.disposed"
  properties: {
@@ -964,9 +964,9 @@ export type EventSessionDeleted = {
 }

 export type Event =
-  | EventProjectUpdated
  | EventInstallationUpdated
  | EventInstallationUpdateAvailable
+  | EventProjectUpdated
  | EventServerInstanceDisposed
  | EventServerConnected
  | EventGlobalDisposed
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/slack",
-  "version": "1.3.11",
+  "version": "1.3.9",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/ui",
-  "version": "1.3.11",
+  "version": "1.3.9",
  "type": "module",
  "license": "MIT",
  "exports": {
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/util",
-  "version": "1.3.11",
+  "version": "1.3.9",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -2,7 +2,7 @@
  "name": "@opencode-ai/web",
  "type": "module",
  "license": "MIT",
-  "version": "1.3.11",
+  "version": "1.3.9",
  "scripts": {
    "dev": "astro dev",
    "dev:remote": "VITE_API_URL=https://api.opencode.ai astro dev",
@@ -2,7 +2,7 @@
  "name": "opencode",
  "displayName": "opencode",
  "description": "opencode for VS Code",
-  "version": "1.3.11",
+  "version": "1.3.9",
  "publisher": "sst-dev",
  "repository": {
    "type": "git",
Author	SHA1	Message	Date
Aiden Cline	2e5adfa436	fix: real model thingy	2026-03-31 00:19:50 -05:00
Aiden Cline	95dde82d97	ignore: prettify	2026-03-30 23:46:04 -05:00
Aiden Cline	ffb016ac0e	test: update model test fixture	2026-03-30 23:35:52 -05:00