fix(tui): watch newly created plugin directory

AGENTS.md

@@ -4,13 +4,6 @@
 - The default branch in this repo is `dev`.
 - Local `main` ref may not exist; use `dev` or `origin/dev` for diffs.
 
-## Live V2 TUI Testing
-
-- Run `bun run dev:live` from a development worktree to test its TUI against the currently elected `opencode2` background server and live sessions.
-- Pass a directory after the script when needed, for example `bun run dev:live /path/to/project`.
-- The script discovers the server with `opencode2 service status`, injects its private local credential from `opencode2 service get password`, and uses the `next` TUI storage channel so tabs and other client-local state match the installed client.
-- Prefer `dev:live` over plain `bun run dev` for this workflow. An implicit managed-service connection may replace the live server when the worktree client version differs; explicit `--server` warns and continues without replacing it.
-
 ## Branch Names
 
 Use a short branch name of at most three words, separated by hyphens. Do not use slashes or type prefixes such as `feat/` or `fix/`.

package.json

@@ -8,7 +8,6 @@
   "packageManager": "bun@1.3.14",
   "scripts": {
     "dev": "bun run --cwd packages/cli --conditions=browser src/index.ts",
-    "dev:live": "OPENCODE_TUI_CHANNEL=next OPENCODE_PASSWORD=\"$(opencode2 service get password)\" bun run dev --server \"$(opencode2 service status)\"",
     "dev:desktop": "bun --cwd packages/desktop dev",
     "dev:web": "bun --cwd packages/app dev",
     "dev:console": "ulimit -n 10240 2>/dev/null; bun run --cwd packages/console/app dev",

packages/ai/STATUS.md

@@ -60,7 +60,7 @@ Other `aisdk:` packages, including Google Vertex, Azure, and Bedrock, currently
 | `@ai-sdk/google-vertex/xai`       | Vertex Chat / Responses                                        | Partial / usable | Decide Chat/Responses selection for catalog models, add runner mapping and recorded coverage, and review xAI-specific request options.                                                                              |
 | `@ai-sdk/azure`                   | Azure OpenAI Chat/Responses facade                             | Partial          | Map runner/catalog metadata to native Azure, handle resourceName/baseURL/apiVersion variants, add AAD/token auth story, and verify Chat vs Responses deployment selection.                                          |
 | `@ai-sdk/amazon-bedrock`          | Bedrock Converse                                               | Partial          | Add default AWS credential chain/profile support, region/inference-profile model ID handling, provider option parity via `additionalModelRequestFields`, guardrails/performance config, and runner/catalog mapping. |
-| `@ai-sdk/amazon-bedrock/mantle`   | Bedrock Mantle OpenAI-compatible Chat/Responses namespace      | Partial / usable | Add default AWS credential chain/profile support; native catalog mapping currently requires bearer auth or explicit static credentials.                                                                             |
+| `@ai-sdk/amazon-bedrock/mantle`   | Bedrock Mantle OpenAI-compatible Chat/Responses namespace      | Missing          | Decide native Mantle shape, likely separate from Converse because it uses OpenAI-compatible Chat/Responses semantics over Bedrock. Add package mapping and tests.                                                   |
 
 ## Highest-Risk Gaps
 
@@ -71,31 +71,30 @@ Other `aisdk:` packages, including Google Vertex, Azure, and Bedrock, currently
 5. Azure is only a provider facade, not a full runtime replacement. Native Azure exists, but the catalog runner does not select it, and token auth/resource variants need review.
 6. Provider option typing is uneven. OpenAI, Anthropic, Gemini, Bedrock, and OpenRouter each expose a small typed subset plus raw HTTP overlays; this is useful but not equivalent to AI SDK provider option coverage.
 7. Structured output is not provider-native yet. `LLM.generateObject` still uses a synthetic tool strategy, while the future design expects native structured output where reliable and tool fallback where needed.
-8. Package/namespace boundaries for the current native loading set are explicit in docs and exports. Other exported provider facades are not catalog package entrypoints until they implement the contract. Vertex xAI still needs catalog API selection.
-9. Recorded coverage is uneven. OpenAI, Anthropic, Gemini, Bedrock Converse, Bedrock Mantle, Cloudflare, OpenRouter, and several OpenAI-compatible Chat providers have cassettes. Azure and Vertex still need first-class recorded scenarios before switching defaults.
+8. Package/namespace boundaries for the current native loading set are explicit in docs and exports. Other exported provider facades are not catalog package entrypoints until they implement the contract. Vertex xAI still needs catalog API selection; the missing native boundary is Bedrock Mantle.
+9. Recorded coverage is uneven. OpenAI, Anthropic, Gemini, Bedrock Converse, Cloudflare, OpenRouter, and several OpenAI-compatible Chat providers have cassettes. Azure, Vertex, and Mantle need first-class recorded scenarios before switching defaults.
 
 ## Native Namespace Shape
 
 These are implementation/API slices, not separate npm packages.
 
-| API slice                     | Package-like entrypoint                                     | Purpose                                                                      |
-| ----------------------------- | ----------------------------------------------------------- | ---------------------------------------------------------------------------- |
-| OpenAI Chat                   | `@opencode-ai/ai/providers/openai/chat`                     | OpenAI `/chat/completions` semantics.                                        |
-| OpenAI Responses              | `@opencode-ai/ai/providers/openai/responses`                | OpenAI `/responses` semantics with HTTP/WebSocket selected through settings. |
-| OpenAI-compatible Chat        | `@opencode-ai/ai/providers/openai-compatible`               | Generic OpenAI-compatible `/chat/completions`.                               |
-| Open Responses-compatible     | `@opencode-ai/ai/providers/openai-compatible/responses`     | Generic provider-neutral `/responses`.                                       |
-| Anthropic-compatible Messages | `@opencode-ai/ai/providers/anthropic-compatible`            | Generic Anthropic-compatible `/messages`.                                    |
-| Anthropic Messages            | `@opencode-ai/ai/providers/anthropic`                       | Anthropic Messages API.                                                      |
-| Gemini Developer API          | `@opencode-ai/ai/providers/google`                          | Google AI Studio Gemini API.                                                 |
-| Vertex Gemini                 | `@opencode-ai/ai/providers/google-vertex/gemini`            | Vertex Gemini API; `providers/google-vertex` is the default alias.           |
-| Vertex Chat                   | `@opencode-ai/ai/providers/google-vertex/chat`              | Vertex OpenAI-compatible Chat Completions for MaaS models.                   |
-| Vertex Responses              | `@opencode-ai/ai/providers/google-vertex/responses`         | Vertex Open Responses for Grok models.                                       |
-| Vertex Messages               | `@opencode-ai/ai/providers/google-vertex/messages`          | Vertex-hosted Anthropic Messages API.                                        |
-| Bedrock Converse              | `@opencode-ai/ai/providers/amazon-bedrock`                  | AWS Bedrock Converse API.                                                    |
-| Bedrock Mantle Chat           | `@opencode-ai/ai/providers/amazon-bedrock/mantle/chat`      | AWS Bedrock Mantle OpenAI-compatible Chat API.                               |
-| Bedrock Mantle Responses      | `@opencode-ai/ai/providers/amazon-bedrock/mantle/responses` | AWS Bedrock Mantle OpenAI-compatible Responses API.                          |
-| Azure OpenAI Chat             | `@opencode-ai/ai/providers/azure/chat`                      | Azure specialization of OpenAI Chat.                                         |
-| Azure OpenAI Responses        | `@opencode-ai/ai/providers/azure/responses`                 | Azure specialization of OpenAI Responses.                                    |
+| API slice                     | Package-like entrypoint                                 | Purpose                                                                      |
+| ----------------------------- | ------------------------------------------------------- | ---------------------------------------------------------------------------- |
+| OpenAI Chat                   | `@opencode-ai/ai/providers/openai/chat`                 | OpenAI `/chat/completions` semantics.                                        |
+| OpenAI Responses              | `@opencode-ai/ai/providers/openai/responses`            | OpenAI `/responses` semantics with HTTP/WebSocket selected through settings. |
+| OpenAI-compatible Chat        | `@opencode-ai/ai/providers/openai-compatible`           | Generic OpenAI-compatible `/chat/completions`.                               |
+| Open Responses-compatible     | `@opencode-ai/ai/providers/openai-compatible/responses` | Generic provider-neutral `/responses`.                                       |
+| Anthropic-compatible Messages | `@opencode-ai/ai/providers/anthropic-compatible`        | Generic Anthropic-compatible `/messages`.                                    |
+| Anthropic Messages            | `@opencode-ai/ai/providers/anthropic`                   | Anthropic Messages API.                                                      |
+| Gemini Developer API          | `@opencode-ai/ai/providers/google`                      | Google AI Studio Gemini API.                                                 |
+| Vertex Gemini                 | `@opencode-ai/ai/providers/google-vertex/gemini`        | Vertex Gemini API; `providers/google-vertex` is the default alias.           |
+| Vertex Chat                   | `@opencode-ai/ai/providers/google-vertex/chat`          | Vertex OpenAI-compatible Chat Completions for MaaS models.                   |
+| Vertex Responses              | `@opencode-ai/ai/providers/google-vertex/responses`     | Vertex Open Responses for Grok models.                                       |
+| Vertex Messages               | `@opencode-ai/ai/providers/google-vertex/messages`      | Vertex-hosted Anthropic Messages API.                                        |
+| Bedrock Converse              | `@opencode-ai/ai/providers/amazon-bedrock`              | AWS Bedrock Converse API.                                                    |
+| Bedrock Mantle                | Missing                                                 | AWS Bedrock Mantle OpenAI-compatible APIs.                                   |
+| Azure OpenAI Chat             | `@opencode-ai/ai/providers/azure/chat`                  | Azure specialization of OpenAI Chat.                                         |
+| Azure OpenAI Responses        | `@opencode-ai/ai/providers/azure/responses`             | Azure specialization of OpenAI Responses.                                    |
 
 ## Suggested Next Work Slices
 
@@ -104,5 +103,6 @@ These are implementation/API slices, not separate npm packages.
 3. Bring Bedrock native auth/config to AI SDK parity: region, profile, default AWS credential chain, bearer token env, endpoint override, and cross-region inference profile handling.
 4. Add runner/catalog mappings and recorded scenarios for the native Vertex Gemini, Chat, Responses, and Messages entrypoints.
 5. Decide Chat/Responses selection for `@ai-sdk/google-vertex/xai` catalog models.
-6. Expand typed provider options from the existing V1 lowerer knowledge in `packages/core/src/v1/config/provider-options.ts` before adding more raw overlay examples.
-7. Add recorded provider tests for Azure, Vertex Gemini, Vertex Chat, Vertex Responses, Vertex Messages, and Bedrock credential-chain behavior before making native runtime the default for those packages.
+6. Add Bedrock Mantle as a separate OpenAI-compatible Bedrock namespace after deciding whether it uses Chat, Responses, or both by model.
+7. Expand typed provider options from the existing V1 lowerer knowledge in `packages/core/src/v1/config/provider-options.ts` before adding more raw overlay examples.
+8. Add recorded provider tests for Azure, Vertex Gemini, Vertex Chat, Vertex Responses, Vertex Messages, Bedrock credential-chain behavior, and Mantle before making native runtime the default for those packages.

packages/ai/src/protocols/utils/bedrock-auth.ts

@@ -22,8 +22,6 @@ const signRequest = (input: {
   readonly body: string
   readonly headers: Headers.Headers
   readonly credentials: Credentials
-  readonly service: string
-  readonly name: string
 }) =>
   Effect.tryPromise({
     try: async () => {
@@ -36,26 +34,23 @@ const signRequest = (input: {
         accessKeyId: input.credentials.accessKeyId,
         secretAccessKey: input.credentials.secretAccessKey,
         sessionToken: input.credentials.sessionToken,
-        service: input.service,
+        service: "bedrock",
       }).sign()
       return Object.fromEntries(signed.headers.entries())
     },
     catch: (error) =>
       ProviderShared.invalidRequest(
-        `${input.name} SigV4 signing failed: ${error instanceof Error ? error.message : String(error)}`,
+        `Bedrock Converse SigV4 signing failed: ${error instanceof Error ? error.message : String(error)}`,
       ),
   })
 
 /** Sign the exact JSON bytes with SigV4 using credentials configured on the route. */
-export const sigV4 = (
-  credentials: Credentials | undefined,
-  options: { readonly service?: string; readonly name?: string } = {},
-) =>
+export const sigV4 = (credentials: Credentials | undefined) =>
   Auth.custom((input: AuthInput) => {
     return Effect.gen(function* () {
       if (!credentials) {
         return yield* ProviderShared.invalidRequest(
-          `${options.name ?? "Bedrock Converse"} requires either route bearer auth or AWS credentials configured on the route`,
+          "Bedrock Converse requires either route bearer auth or AWS credentials configured on the route",
         )
       }
       const headersForSigning = Headers.set(input.headers, "content-type", "application/json")
@@ -64,8 +59,6 @@ export const sigV4 = (
         body: input.body,
         headers: headersForSigning,
         credentials,
-        service: options.service ?? "bedrock",
-        name: options.name ?? "Bedrock Converse",
       })
       return Headers.setAll(headersForSigning, signed)
     })

packages/ai/src/provider-error.ts

@@ -16,6 +16,7 @@ import {
 
 const patterns = [
   /prompt is too long/i,
+  /request_too_large/i,
   /input is too long for requested model/i,
   /exceeds the context window/i,
   /exceeds (?:the )?(?:model'?s )?maximum context length(?: of [\d,]+ tokens?|\s*\([\d,]+\))/i,
@@ -32,6 +33,7 @@ const patterns = [
   /context window exceeds limit/i,
   /exceeded model token limit/i,
   /context[_ ]length[_ ]exceeded/i,
+  /request entity too large/i,
   /context length is only \d+ tokens/i,
   /input length.*exceeds.*context length/i,
   /prompt too long; exceeded (?:max )?context length/i,
@@ -42,15 +44,11 @@ const patterns = [
   /token limit exceeded/i,
 ]
 
-const payloadPatterns = [/request_too_large/i, /request entity too large/i, /payload too large/i, /request too large/i]
-
 const exclusions = [/^(throttling error|service unavailable):/i, /rate limit/i, /too many requests/i]
 
 export const isContextOverflow = (message: string) =>
   !exclusions.some((pattern) => pattern.test(message)) &&
-  (patterns.some((pattern) => pattern.test(message)) || /^400\s*(status code)?\s*\(no body\)/i.test(message))
-
-export const isPayloadTooLarge = (message: string) => payloadPatterns.some((pattern) => pattern.test(message))
+  (patterns.some((pattern) => pattern.test(message)) || /^4(00|13)\s*(status code)?\s*\(no body\)/i.test(message))
 
 export const isContextOverflowFailure = (failure: unknown) =>
   failure instanceof LLMError
@@ -102,8 +100,6 @@ export function classifyProviderFailure(input: ProviderFailure): LLMError["reaso
       isContextOverflow(text))
   )
     return new InvalidRequestReason({ ...common, classification: "context-overflow" })
-  if (input.status === 413 || isPayloadTooLarge(text))
-    return new InvalidRequestReason({ ...common, classification: "payload-too-large" })
   if (CONTENT_POLICY_TEXT.test(text)) return new ContentPolicyReason(common)
   if (codes.some((code) => QUOTA_CODES.has(code)) || (input.status === 429 && QUOTA_TEXT.test(text)))
     return new QuotaExceededReason(common)
@@ -146,7 +142,12 @@ export function classifyProviderFailure(input: ProviderFailure): LLMError["reaso
       retryAfterMs: input.retryAfterMs,
     })
   if (codes.some((code) => INVALID_REQUEST_CODES.has(code))) return new InvalidRequestReason(common)
-  if (input.status === 400 || input.status === 404 || input.status === 413 || input.status === 422)
+  if (
+    input.status === 400 ||
+    input.status === 404 ||
+    input.status === 413 ||
+    input.status === 422
+  )
     return new InvalidRequestReason(common)
   return new UnknownProviderReason({ ...common, status: input.status })
 }

packages/ai/src/providers/amazon-bedrock-mantle.ts

@@ -1,107 +0,0 @@
-import { Auth } from "../route/auth"
-import type { Route as RouteDef, RouteDefaultsInput } from "../route/client"
-import type { ProviderPackage } from "../provider-package"
-import { OpenAIChat } from "../protocols/openai-chat"
-import { OpenAIResponses } from "../protocols/openai-responses"
-import { BedrockAuth, type Credentials } from "../protocols/utils/bedrock-auth"
-import { ProviderID, type ModelID } from "../schema"
-import { withOpenAIOptions, type OpenAIProviderOptionsInput } from "./openai-options"
-
-export const id = ProviderID.make("amazon-bedrock")
-
-export type Config = RouteDefaultsInput & {
-  readonly apiKey?: string
-  readonly baseURL?: string
-  readonly credentials?: Credentials
-  readonly region?: string
-  readonly providerOptions?: OpenAIProviderOptionsInput
-}
-
-export interface Settings extends ProviderPackage.Settings {
-  readonly apiKey?: string
-  readonly auth?: "bearer" | "sigv4"
-  readonly baseURL?: string
-  readonly credentials?: Credentials
-  readonly region?: string
-  readonly providerOptions?: OpenAIProviderOptionsInput
-}
-
-const responsesRoute = OpenAIResponses.route.with({
-  id: "bedrock-mantle-responses",
-  provider: id,
-})
-
-const chatRoute = OpenAIChat.route.with({
-  id: "bedrock-mantle-chat",
-  provider: id,
-})
-
-export const routes = [responsesRoute, chatRoute]
-
-const configuredRoute = <Body, Prepared>(route: RouteDef<Body, Prepared>, input: Config) => {
-  const region = input.region ?? input.credentials?.region ?? "us-east-1"
-  const credentials = input.credentials === undefined ? undefined : { ...input.credentials, region }
-  return route.with({
-    endpoint: { baseURL: input.baseURL ?? `https://bedrock-mantle.${region}.api.aws/v1` },
-    auth:
-      input.apiKey === undefined
-        ? BedrockAuth.sigV4(credentials, { service: "bedrock-mantle", name: "Bedrock Mantle" })
-        : Auth.bearer(input.apiKey),
-  })
-}
-
-const defaults = (input: Config) => {
-  const { apiKey: _, baseURL: _baseURL, credentials: _credentials, region: _region, ...rest } = input
-  return rest
-}
-
-export const configure = (input: Config = {}) => {
-  const configuredResponsesRoute = configuredRoute(responsesRoute, input)
-  const configuredChatRoute = configuredRoute(chatRoute, input)
-  const modelDefaults = defaults(input)
-  const responses = (modelID: string | ModelID) =>
-    configuredResponsesRoute
-      .with(withOpenAIOptions(modelID, modelDefaults))
-      .model<OpenAIProviderOptionsInput>({ id: modelID })
-  const chat = (modelID: string | ModelID) =>
-    configuredChatRoute
-      .with(withOpenAIOptions(modelID, modelDefaults))
-      .model<OpenAIProviderOptionsInput>({ id: modelID })
-
-  return {
-    id,
-    model: chat,
-    chat,
-    responses,
-    configure,
-  }
-}
-
-export const provider = configure()
-
-const config = (settings: Settings): Config => {
-  if (settings.auth === "bearer" && settings.apiKey === undefined)
-    throw new Error("Amazon Bedrock Mantle bearer auth requires apiKey")
-  if (settings.auth === "sigv4" && settings.apiKey !== undefined)
-    throw new Error("Amazon Bedrock Mantle SigV4 auth does not accept apiKey")
-  return {
-    apiKey: settings.auth === "sigv4" ? undefined : settings.apiKey,
-    baseURL: settings.baseURL,
-    credentials: settings.credentials,
-    headers: settings.headers === undefined ? undefined : { ...settings.headers },
-    http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    limits: settings.limits,
-    providerOptions: settings.providerOptions,
-    region: settings.region,
-  }
-}
-
-export const chatModel: ProviderPackage.Definition<Settings, OpenAIProviderOptionsInput>["model"] = (
-  modelID,
-  settings,
-) => configure(config(settings)).chat(modelID)
-export const responsesModel: ProviderPackage.Definition<Settings, OpenAIProviderOptionsInput>["model"] = (
-  modelID,
-  settings,
-) => configure(config(settings)).responses(modelID)
-export const model = chatModel

packages/ai/src/providers/amazon-bedrock/mantle.ts

@@ -1,2 +0,0 @@
-export { chatModel as model } from "../amazon-bedrock-mantle"
-export type { Settings } from "../amazon-bedrock-mantle"

packages/ai/src/providers/amazon-bedrock/mantle/chat.ts

@@ -1,2 +0,0 @@
-export { chatModel as model } from "../../amazon-bedrock-mantle"
-export type { Settings } from "../../amazon-bedrock-mantle"

packages/ai/src/providers/amazon-bedrock/mantle/responses.ts

@@ -1,2 +0,0 @@
-export { responsesModel as model } from "../../amazon-bedrock-mantle"
-export type { Settings } from "../../amazon-bedrock-mantle"

packages/ai/src/providers/index.ts

@@ -1,7 +1,6 @@
 export * as Anthropic from "./anthropic"
 export * as AnthropicCompatible from "./anthropic-compatible"
 export * as AmazonBedrock from "./amazon-bedrock"
-export * as AmazonBedrockMantle from "./amazon-bedrock-mantle"
 export * as Azure from "./azure"
 export * as Cloudflare from "./cloudflare"
 export { CloudflareAIGateway, CloudflareWorkersAI } from "./cloudflare"

packages/ai/src/schema/errors.ts

@@ -2,7 +2,7 @@ import { Schema } from "effect"
 import { Tool } from "@opencode-ai/schema/tool"
 import { ModelID, ProviderID, ProviderMetadata, RouteID } from "./ids"
 
-export const ProviderFailureClassification = Schema.Literals(["context-overflow", "payload-too-large"])
+export const ProviderFailureClassification = Schema.Literal("context-overflow")
 export type ProviderFailureClassification = typeof ProviderFailureClassification.Type
 
 export class HttpRequestDetails extends Schema.Class<HttpRequestDetails>("LLM.HttpRequestDetails")({

packages/ai/test/executor.test.ts

@@ -85,17 +85,14 @@ describe("RequestExecutor", () => {
     ),
   )
 
-  it.effect("classifies generic HTTP 413 payload errors", () =>
+  it.effect("does not classify generic HTTP 413 payload errors as context overflow", () =>
     Effect.gen(function* () {
       const executor = yield* RequestExecutor.Service
       const error = yield* executor.execute(request).pipe(Effect.flip)
 
       expectLLMError(error)
-      expect(error.reason).toMatchObject({
-        _tag: "InvalidRequest",
-        classification: "payload-too-large",
-        http: { response: { status: 413 } },
-      })
+      expect(error.reason).toMatchObject({ _tag: "InvalidRequest" })
+      expect("classification" in error.reason ? error.reason.classification : undefined).toBeUndefined()
     }).pipe(Effect.provide(responsesLayer([new Response("request too large", { status: 413 })]))),
   )
 

packages/ai/test/provider-error.test.ts

@@ -6,6 +6,7 @@ describe("provider error classification", () => {
   test("classifies provider token limit messages as context overflow", () => {
     const messages = [
       "tokens in request more than max tokens allowed",
+      '{"error":{"type":"request_too_large","message":"Request exceeds the maximum size"}}',
       "Requested token count exceeds the model's maximum context length of 131072 tokens.",
       "Input length (265330) exceeds model's maximum context length (262144).",
       "Input length 131393 exceeds the maximum allowed input length of 131040 tokens.",
@@ -18,24 +19,6 @@ describe("provider error classification", () => {
     expect(messages.every(isContextOverflow)).toBe(true)
   })
 
-  test("classifies request size failures separately from context overflow", () => {
-    const failures = [
-      classifyProviderFailure({ message: "request too large", status: 413 }),
-      classifyProviderFailure({
-        message: '{"error":{"type":"request_too_large","message":"Request exceeds the maximum size"}}',
-        status: 400,
-      }),
-      classifyProviderFailure({ message: "upstream request entity too large", status: 502 }),
-    ]
-
-    expect(failures).toEqual(
-      failures.map((failure) =>
-        expect.objectContaining({ _tag: "InvalidRequest", classification: "payload-too-large" }),
-      ),
-    )
-    expect(isContextOverflow("413 status code (no body)")).toBe(false)
-  })
-
   test("does not classify rate limits as context overflow", () => {
     const messages = [
       "Throttling error: Too many tokens, please wait before trying again.",
@@ -76,10 +59,9 @@ describe("provider error classification", () => {
   })
 
   test("classifies transient client statuses as provider internal", () => {
-    expect([408, 409].map((status) => classifyProviderFailure({ message: `HTTP ${status}`, status })._tag)).toEqual([
-      "ProviderInternal",
-      "ProviderInternal",
-    ])
+    expect(
+      [408, 409].map((status) => classifyProviderFailure({ message: `HTTP ${status}`, status })._tag),
+    ).toEqual(["ProviderInternal", "ProviderInternal"])
   })
 
   test("classifies nested provider codes when a top-level code is also present", () => {

packages/ai/test/provider-package.test.ts

@@ -23,16 +23,12 @@ describe("provider package entrypoints", () => {
       import("@opencode-ai/ai/providers/google-vertex/messages"),
       import("@opencode-ai/ai/providers/openrouter"),
       import("@opencode-ai/ai/providers/xai"),
-      import("@opencode-ai/ai/providers/amazon-bedrock/mantle"),
-      import("@opencode-ai/ai/providers/amazon-bedrock/mantle/chat"),
-      import("@opencode-ai/ai/providers/amazon-bedrock/mantle/responses"),
     ])
 
     for (const module of modules) expect(module.model).toBeFunction()
     expect(modules[0].model).toBe(modules[1].model)
     expect(modules[8].model).toBe(modules[9].model)
     expect(modules[12].model).toBe(modules[13].model)
-    expect(modules[19].model).toBe(modules[20].model)
   })
 
   test("maps OpenRouter and xAI package settings onto executable models", async () => {

packages/ai/test/provider/bedrock-mantle.test.ts

@@ -1,111 +0,0 @@
-import { describe, expect } from "bun:test"
-import { Effect } from "effect"
-import { HttpClientRequest } from "effect/unstable/http"
-import { LLM } from "../../src"
-import { AmazonBedrockMantle } from "../../src/providers"
-import { compileRequest, LLMClient } from "../../src/route/client"
-import { it } from "../lib/effect"
-import { dynamicResponse } from "../lib/http"
-import { recordedTests } from "../recorded-test"
-
-const credentials = {
-  region: "us-east-2",
-  accessKeyId: "AKIAIOSFODNN7EXAMPLE",
-  secretAccessKey: "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
-}
-
-describe("Amazon Bedrock Mantle provider", () => {
-  it.effect("uses Chat by default and exposes Responses", () =>
-    Effect.gen(function* () {
-      const provider = AmazonBedrockMantle.configure({ credentials })
-      const chat = yield* compileRequest(LLM.request({ model: provider.model("openai.gpt-oss-120b"), prompt: "Hi" }))
-      const responses = yield* compileRequest(
-        LLM.request({ model: provider.responses("openai.gpt-oss-120b"), prompt: "Hi" }),
-      )
-
-      expect(chat).toMatchObject({
-        route: "bedrock-mantle-chat",
-        protocol: "openai-chat",
-        body: { model: "openai.gpt-oss-120b" },
-      })
-      expect(responses).toMatchObject({
-        route: "bedrock-mantle-responses",
-        protocol: "openai-responses",
-        body: { model: "openai.gpt-oss-120b", store: false },
-      })
-    }),
-  )
-
-  it.effect("uses the Mantle endpoint and signing service", () =>
-    Effect.gen(function* () {
-      const seen: Array<{ readonly url: string; readonly authorization: string | undefined }> = []
-      const model = AmazonBedrockMantle.configure({ credentials, region: "us-west-1" }).responses("openai.gpt-oss-120b")
-      yield* LLMClient.generate(LLM.request({ model, prompt: "Hi" })).pipe(
-        Effect.provide(
-          dynamicResponse((input) =>
-            Effect.gen(function* () {
-              const request = yield* HttpClientRequest.toWeb(input.request)
-              seen.push({ url: request.url, authorization: request.headers.get("authorization") ?? undefined })
-              return input.respond("", { headers: { "content-type": "text/event-stream" } })
-            }),
-          ),
-        ),
-        Effect.flip,
-      )
-
-      expect(seen[0]?.url).toBe("https://bedrock-mantle.us-west-1.api.aws/v1/responses")
-      expect(seen[0]?.authorization).toContain("/us-west-1/bedrock-mantle/aws4_request")
-    }),
-  )
-
-  it.effect("supports bearer authentication and custom base URLs", () =>
-    Effect.gen(function* () {
-      const seen: Array<{ readonly url: string; readonly authorization: string | undefined }> = []
-      const model = AmazonBedrockMantle.configure({
-        apiKey: "test-key",
-        baseURL: "https://mantle.test/v1",
-      }).chat("openai.gpt-oss-safeguard-20b")
-      yield* LLMClient.generate(LLM.request({ model, prompt: "Hi" })).pipe(
-        Effect.provide(
-          dynamicResponse((input) =>
-            Effect.gen(function* () {
-              const request = yield* HttpClientRequest.toWeb(input.request)
-              seen.push({ url: request.url, authorization: request.headers.get("authorization") ?? undefined })
-              return input.respond("", { headers: { "content-type": "text/event-stream" } })
-            }),
-          ),
-        ),
-        Effect.flip,
-      )
-
-      expect(seen).toEqual([{ url: "https://mantle.test/v1/chat/completions", authorization: "Bearer test-key" }])
-    }),
-  )
-})
-
-const recorded = recordedTests({
-  prefix: "bedrock-mantle",
-  provider: "amazon-bedrock",
-  protocol: "openai-responses",
-  requires: ["AWS_BEARER_TOKEN_BEDROCK"],
-  metadata: { model: "openai.gpt-oss-120b" },
-})
-
-describe("Amazon Bedrock Mantle recorded", () => {
-  recorded.effect("streams text", () =>
-    Effect.gen(function* () {
-      const response = yield* LLMClient.generate(
-        LLM.request({
-          model: AmazonBedrockMantle.configure({
-            apiKey: process.env.AWS_BEARER_TOKEN_BEDROCK ?? "fixture",
-            region: "us-east-1",
-          }).responses("openai.gpt-oss-120b"),
-          prompt: "Reply with exactly: hello",
-          generation: { maxTokens: 256, temperature: 0 },
-        }),
-      )
-
-      expect(response.text.trim().toLowerCase()).toBe("hello")
-    }),
-  )
-})

packages/cli/src/commands/handlers/default.ts

@@ -45,11 +45,7 @@ export default Runtime.handler(Commands, (input) =>
     const runPromise = Effect.runPromiseWith(context)
     const service = server.service
     yield* run({
-      app: {
-        name: process.env.OPENCODE_CLIENT ?? "cli",
-        version: OPENCODE_VERSION,
-        channel: process.env.OPENCODE_TUI_CHANNEL ?? OPENCODE_CHANNEL,
-      },
+      app: { name: process.env.OPENCODE_CLIENT ?? "cli", version: OPENCODE_VERSION, channel: OPENCODE_CHANNEL },
       server: {
         endpoint: server.endpoint,
         service: service

packages/client/src/effect/api/api.ts

@@ -398,7 +398,7 @@ export type Endpoint5_26Output =
           readonly location?: Location.Ref | undefined
           readonly data: {
             readonly sessionID: Session.ID
-            readonly error: { readonly type: string; readonly message: string; readonly status?: number | undefined }
+            readonly error: { readonly type: string; readonly message: string }
           }
         }
       | {
@@ -524,7 +524,7 @@ export type Endpoint5_26Output =
           readonly data: {
             readonly sessionID: Session.ID
             readonly assistantMessageID: SessionMessage.ID
-            readonly error: { readonly type: string; readonly message: string; readonly status?: number | undefined }
+            readonly error: { readonly type: string; readonly message: string }
             readonly cost?: (number & Brand.Brand<"Money.USD">) | undefined
             readonly tokens?:
               | {
@@ -686,7 +686,7 @@ export type Endpoint5_26Output =
             readonly sessionID: Session.ID
             readonly assistantMessageID: SessionMessage.ID
             readonly callID: string
-            readonly error: { readonly type: string; readonly message: string; readonly status?: number | undefined }
+            readonly error: { readonly type: string; readonly message: string }
             readonly content?:
               | readonly [
                   (
@@ -726,7 +726,7 @@ export type Endpoint5_26Output =
             readonly assistantMessageID: SessionMessage.ID
             readonly attempt: number
             readonly at: number
-            readonly error: { readonly type: string; readonly message: string; readonly status?: number | undefined }
+            readonly error: { readonly type: string; readonly message: string }
           }
         }
       | {
@@ -776,7 +776,7 @@ export type Endpoint5_26Output =
           readonly data: {
             readonly sessionID: Session.ID
             readonly reason: "auto" | "manual"
-            readonly error: { readonly type: string; readonly message: string; readonly status?: number | undefined }
+            readonly error: { readonly type: string; readonly message: string }
             readonly inputID?: SessionMessage.ID | undefined
           }
         }

packages/client/src/promise/generated/types.ts

@@ -108,7 +108,7 @@ export type ToolTextContent = { type: "text"; text: string }
 
 export type ToolFileContent = { type: "file"; uri: string; mime: string; name?: string | null }
 
-export type SessionStructuredError = { type: string; message: string; status?: number }
+export type SessionStructuredError = { type: string; message: string }
 
 export type SessionMessageCompactionRunning = {
   type: "compaction"

packages/core/src/aisdk-native.ts

@@ -10,15 +10,9 @@ export interface Mapping {
   readonly body?: Readonly<Record<string, unknown>>
 }
 
-export function map(
-  packageName: string | undefined,
-  settings: Readonly<Record<string, unknown>>,
-  modelID?: string,
-): Mapping | undefined {
+export function map(packageName: string | undefined, settings: Readonly<Record<string, unknown>>): Mapping | undefined {
   const baseSettings = mapBaseSettings(settings)
   switch (packageName) {
-    case "@ai-sdk/amazon-bedrock/mantle":
-      return mapBedrockMantle(settings, baseSettings, modelID)
     case "@ai-sdk/google":
       return {
         package: "@opencode-ai/ai/providers/google",
@@ -42,79 +36,6 @@ export function map(
   }
 }
 
-function mapBedrockMantle(
-  settings: Readonly<Record<string, unknown>>,
-  baseSettings: Readonly<Record<string, unknown>>,
-  modelID: string | undefined,
-): Mapping | undefined {
-  const apiKey =
-    typeof settings.apiKey === "string"
-      ? settings.apiKey
-      : typeof settings.bearerToken === "string"
-        ? settings.bearerToken
-        : undefined
-  const credentials = mapBedrockCredentials(settings)
-  if (apiKey === undefined && credentials === undefined) return undefined
-  const safeguard = modelID === "openai.gpt-oss-safeguard-20b" || modelID === "openai.gpt-oss-safeguard-120b"
-  return {
-    package: `@opencode-ai/ai/providers/amazon-bedrock/mantle/${safeguard ? "chat" : "responses"}`,
-    settings: {
-      ...baseSettings,
-      ...(typeof settings.baseURL !== "string" && typeof settings.endpoint === "string"
-        ? { baseURL: settings.endpoint }
-        : {}),
-      ...(apiKey === undefined ? {} : { apiKey }),
-      ...(credentials === undefined ? {} : { credentials }),
-      ...(typeof settings.region === "string" ? { region: settings.region } : {}),
-      ...mapOpenAIOptions(settings),
-    },
-  }
-}
-
-function mapBedrockCredentials(settings: Readonly<Record<string, unknown>>) {
-  if (
-    isRecord(settings.credentials) &&
-    typeof settings.credentials.region === "string" &&
-    typeof settings.credentials.accessKeyId === "string" &&
-    typeof settings.credentials.secretAccessKey === "string"
-  ) {
-    return {
-      region: settings.credentials.region,
-      accessKeyId: settings.credentials.accessKeyId,
-      secretAccessKey: settings.credentials.secretAccessKey,
-      ...(typeof settings.credentials.sessionToken === "string"
-        ? { sessionToken: settings.credentials.sessionToken }
-        : {}),
-    }
-  }
-  if (
-    typeof settings.region !== "string" ||
-    typeof settings.accessKeyId !== "string" ||
-    typeof settings.secretAccessKey !== "string"
-  )
-    return undefined
-  return {
-    region: settings.region,
-    accessKeyId: settings.accessKeyId,
-    secretAccessKey: settings.secretAccessKey,
-    ...(typeof settings.sessionToken === "string" ? { sessionToken: settings.sessionToken } : {}),
-  }
-}
-
-function mapOpenAIOptions(settings: Readonly<Record<string, unknown>>) {
-  const options = {
-    ...(typeof settings.reasoningEffort === "string" ? { reasoningEffort: settings.reasoningEffort } : {}),
-    ...(typeof settings.reasoningSummary === "string" ? { reasoningSummary: settings.reasoningSummary } : {}),
-    ...(Array.isArray(settings.include) ? { include: settings.include } : {}),
-    ...(typeof settings.store === "boolean" ? { store: settings.store } : {}),
-    ...(typeof settings.promptCacheKey === "string" ? { promptCacheKey: settings.promptCacheKey } : {}),
-    ...(typeof settings.textVerbosity === "string" ? { textVerbosity: settings.textVerbosity } : {}),
-    ...(typeof settings.serviceTier === "string" ? { serviceTier: settings.serviceTier } : {}),
-  }
-  if (Object.keys(options).length === 0) return {}
-  return { providerOptions: { openai: options } }
-}
-
 function mapBaseSettings(settings: Readonly<Record<string, unknown>>) {
   return {
     ...(typeof settings.baseURL === "string" ? { baseURL: settings.baseURL } : {}),

packages/core/src/model-resolver.ts

@@ -175,22 +175,15 @@ export const fromCatalogModel = (
         .model({ id: resolved.modelID ?? resolved.id, compatibility: resolved.compatibility }),
     )
   }
-  const configured = {
-    ...resolved.settings,
-    ...credential?.metadata,
-    ...(packageName === "@ai-sdk/amazon-bedrock/mantle"
-      ? nativeCredentialSettings("@opencode-ai/ai/providers/amazon-bedrock/mantle", credential)
-      : {}),
-  }
-  const mapping = Provider.isAISDK(resolved.package)
-    ? AISDKNative.map(packageName, configured, resolved.modelID ?? resolved.id)
-    : undefined
+  const configured = { ...resolved.settings, ...credential?.metadata }
+  const mapping = Provider.isAISDK(resolved.package) ? AISDKNative.map(packageName, configured) : undefined
   const native = mapping?.package ?? resolved.package
   if (Provider.isAISDK(resolved.package) && !mapping) {
     if (!dependencies?.loadAISDK) return Effect.fail(unsupported(resolved))
     const runtime = produce(resolved, (draft) => {
       draft.settings = Provider.mergeOverlay(draft.settings, {
-        ...nativeCredentialSettings(resolved.package ?? "", credential),
+        ...(credential?.type === "key" ? { apiKey: credential.key } : {}),
+        ...(credential?.type === "oauth" ? { apiKey: credential.access } : {}),
         ...credential?.metadata,
       })
     })

packages/core/src/provider.ts

@@ -34,15 +34,6 @@ export type ProviderPackage = ProviderPackageDefinition
 const packages = new Map<string, Promise<unknown>>()
 const builtins = new Map<string, () => Promise<unknown>>([
   ["@opencode-ai/ai/providers/amazon-bedrock", () => import("@opencode-ai/ai/providers/amazon-bedrock")],
-  ["@opencode-ai/ai/providers/amazon-bedrock/mantle", () => import("@opencode-ai/ai/providers/amazon-bedrock/mantle")],
-  [
-    "@opencode-ai/ai/providers/amazon-bedrock/mantle/chat",
-    () => import("@opencode-ai/ai/providers/amazon-bedrock/mantle/chat"),
-  ],
-  [
-    "@opencode-ai/ai/providers/amazon-bedrock/mantle/responses",
-    () => import("@opencode-ai/ai/providers/amazon-bedrock/mantle/responses"),
-  ],
   ["@opencode-ai/ai/providers/anthropic", () => import("@opencode-ai/ai/providers/anthropic")],
   ["@opencode-ai/ai/providers/azure", () => import("@opencode-ai/ai/providers/azure")],
   ["@opencode-ai/ai/providers/azure/chat", () => import("@opencode-ai/ai/providers/azure/chat")],

packages/core/src/session/to-session-error.ts

@@ -11,25 +11,25 @@ export function toSessionError(cause: unknown): SessionError.Error {
   if (cause instanceof LLMError) {
     switch (cause.reason._tag) {
       case "RateLimit":
-        return providerError("provider.rate-limit", cause.reason)
+        return { type: "provider.rate-limit", message: cause.reason.message }
       case "Authentication":
-        return providerError("provider.auth", cause.reason)
+        return { type: "provider.auth", message: cause.reason.message }
       case "QuotaExceeded":
-        return providerError("provider.quota", cause.reason)
+        return { type: "provider.quota", message: cause.reason.message }
       case "ContentPolicy":
-        return providerError("provider.content-filter", cause.reason)
+        return { type: "provider.content-filter", message: cause.reason.message }
       case "Transport":
-        return providerError("provider.transport", cause.reason)
+        return { type: "provider.transport", message: cause.reason.message }
       case "ProviderInternal":
-        return providerError("provider.internal", cause.reason)
+        return { type: "provider.internal", message: cause.reason.message }
       case "InvalidProviderOutput":
-        return providerError("provider.invalid-output", cause.reason)
+        return { type: "provider.invalid-output", message: cause.reason.message }
       case "InvalidRequest":
-        return providerError("provider.invalid-request", cause.reason)
+        return { type: "provider.invalid-request", message: cause.reason.message }
       case "NoRoute":
-        return providerError("provider.no-route", cause.reason)
+        return { type: "provider.no-route", message: cause.reason.message }
       case "UnknownProvider":
-        return providerError("provider.unknown", cause.reason)
+        return { type: "provider.unknown", message: cause.reason.message }
       default: {
         const exhaustive: never = cause.reason
         return exhaustive
@@ -58,9 +58,3 @@ export function toSessionError(cause: unknown): SessionError.Error {
   if (cause instanceof Integration.AuthorizationError) return { type: "provider.auth", message: cause.message }
   return { type: "unknown", message: cause instanceof Error ? cause.message : String(cause) }
 }
-
-function providerError(type: string, reason: LLMError["reason"]): SessionError.Error {
-  const status =
-    ("http" in reason ? reason.http?.response?.status : undefined) ?? ("status" in reason ? reason.status : undefined)
-  return { type, message: reason.message, ...(status === undefined ? {} : { status }) }
-}

packages/core/test/aisdk-native.test.ts

@@ -2,87 +2,6 @@ import { describe, expect, test } from "bun:test"
 import { AISDKNative } from "@opencode-ai/core/aisdk-native"
 
 describe("AISDKNative", () => {
-  test("maps Bedrock Mantle models to their supported native APIs", () => {
-    const settings = {
-      bearerToken: "token",
-      region: "us-west-2",
-      baseURL: "https://mantle.test/v1",
-      reasoningEffort: "high",
-      reasoningSummary: "auto",
-      include: ["reasoning.encrypted_content"],
-    }
-
-    expect(AISDKNative.map("@ai-sdk/amazon-bedrock/mantle", settings, "openai.gpt-oss-120b")).toEqual({
-      package: "@opencode-ai/ai/providers/amazon-bedrock/mantle/responses",
-      settings: {
-        apiKey: "token",
-        baseURL: "https://mantle.test/v1",
-        region: "us-west-2",
-        providerOptions: {
-          openai: {
-            reasoningEffort: "high",
-            reasoningSummary: "auto",
-            include: ["reasoning.encrypted_content"],
-          },
-        },
-      },
-    })
-    expect(AISDKNative.map("@ai-sdk/amazon-bedrock/mantle", settings, "openai.gpt-oss-safeguard-20b")?.package).toBe(
-      "@opencode-ai/ai/providers/amazon-bedrock/mantle/chat",
-    )
-  })
-
-  test("maps static Bedrock Mantle credentials without leaking connection options", () => {
-    expect(
-      AISDKNative.map(
-        "@ai-sdk/amazon-bedrock/mantle",
-        {
-          accessKeyId: "key",
-          secretAccessKey: "secret",
-          sessionToken: "session",
-          region: "eu-west-1",
-          profile: "ignored",
-          credentialProvider: "ignored",
-          fetch: "ignored",
-          store: false,
-        },
-        "openai.gpt-oss-120b",
-      ),
-    ).toEqual({
-      package: "@opencode-ai/ai/providers/amazon-bedrock/mantle/responses",
-      settings: {
-        credentials: {
-          accessKeyId: "key",
-          secretAccessKey: "secret",
-          sessionToken: "session",
-          region: "eu-west-1",
-        },
-        region: "eu-west-1",
-        providerOptions: { openai: { store: false } },
-      },
-    })
-  })
-
-  test("keeps Bedrock Mantle on the AI SDK when native static auth is unavailable", () => {
-    expect(
-      AISDKNative.map(
-        "@ai-sdk/amazon-bedrock/mantle",
-        { region: "us-east-1", profile: "production" },
-        "openai.gpt-oss-120b",
-      ),
-    ).toBeUndefined()
-  })
-
-  test("maps the legacy Bedrock endpoint override", () => {
-    expect(
-      AISDKNative.map(
-        "@ai-sdk/amazon-bedrock/mantle",
-        { bearerToken: "token", endpoint: "https://mantle.private/v1", region: "us-east-1" },
-        "openai.gpt-oss-120b",
-      ),
-    ).toMatchObject({ settings: { baseURL: "https://mantle.private/v1" } })
-  })
-
   test("maps OpenRouter settings to native destinations", () => {
     expect(
       AISDKNative.map("@openrouter/ai-sdk-provider", {

packages/core/test/model-resolver.test.ts

@@ -42,35 +42,6 @@ const model = (packageName: string | undefined, options: ModelOptions = {}) =>
   })
 
 describe("ModelResolver", () => {
-  it.effect("maps Bedrock Mantle models to native Responses and safeguards to Chat", () =>
-    Effect.gen(function* () {
-      const credential = Credential.Key.make({ type: "key", key: "secret" })
-      const responses = yield* ModelResolver.fromCatalogModel(
-        model(Provider.aisdk("@ai-sdk/amazon-bedrock/mantle"), {
-          modelID: "openai.gpt-oss-120b",
-          settings: { region: "us-east-2" },
-        }),
-        credential,
-      )
-      const chat = yield* ModelResolver.fromCatalogModel(
-        model(Provider.aisdk("@ai-sdk/amazon-bedrock/mantle"), {
-          modelID: "openai.gpt-oss-safeguard-20b",
-          settings: { region: "us-east-2" },
-        }),
-        credential,
-      )
-
-      expect(responses.route).toMatchObject({
-        id: "bedrock-mantle-responses",
-        endpoint: { baseURL: "https://bedrock-mantle.us-east-2.api.aws/v1" },
-      })
-      expect(chat.route).toMatchObject({
-        id: "bedrock-mantle-chat",
-        endpoint: { baseURL: "https://bedrock-mantle.us-east-2.api.aws/v1" },
-      })
-    }),
-  )
-
   it.effect("uses the API modelID instead of the catalog ID for native OpenAI routes", () =>
     Effect.gen(function* () {
       const catalog = model(Provider.aisdk("@ai-sdk/openai"), {

packages/core/test/session-error.test.ts

@@ -14,9 +14,6 @@ import {
   TransportReason,
   UnknownProviderReason,
   ToolFailure,
-  HttpContext,
-  HttpRequestDetails,
-  HttpResponseDetails,
 } from "@opencode-ai/ai"
 import { Permission } from "@opencode-ai/core/permission"
 import { Tool } from "@opencode-ai/schema/tool"
@@ -74,23 +71,6 @@ describe("toSessionError", () => {
     })
   })
 
-  test("preserves provider HTTP status", () => {
-    const http = new HttpContext({
-      request: new HttpRequestDetails({ method: "POST", url: "https://example.com", headers: {} }),
-      response: new HttpResponseDetails({ status: 413, headers: {} }),
-    })
-    expect(toSessionError(llm(new InvalidRequestReason({ message: "too large", http })))).toEqual({
-      type: "provider.invalid-request",
-      message: "too large",
-      status: 413,
-    })
-    expect(toSessionError(llm(new ProviderInternalReason({ message: "bad gateway", status: 502 })))).toEqual({
-      type: "provider.internal",
-      message: "bad gateway",
-      status: 502,
-    })
-  })
-
   test("retries only rate limits, provider-internal failures, and transport failures", () => {
     const eligible = [
       llm(new RateLimitReason({ message: "rate" })),

packages/schema/src/session-error.ts

@@ -1,11 +1,9 @@
 export * as SessionError from "./session-error.js"
 
 import { Schema } from "effect"
-import { optional } from "./schema.js"
 
 export interface Error extends Schema.Schema.Type<typeof Error> {}
 export const Error = Schema.Struct({
   type: Schema.String,
   message: Schema.String,
-  status: Schema.Int.check(Schema.isBetween({ minimum: 100, maximum: 599 })).pipe(optional),
 }).annotate({ identifier: "Session.StructuredError" })

packages/tui/src/app.tsx

@@ -68,7 +68,6 @@ import { DialogAgent } from "./component/dialog-agent"
 import { DialogSessionList } from "./component/dialog-session-list"
 import { DialogOpen } from "./component/dialog-open"
 import { SessionTabs } from "./component/session-tabs"
-import { sessionTabsFitVertically } from "./ui/layout"
 import { ThemeErrorToast } from "./component/theme-error-toast"
 import { ThemeProvider, useTheme, useThemes } from "./context/theme"
 import { Home } from "./routes/home"
@@ -84,7 +83,6 @@ import open from "open"
 import { PromptRefProvider, usePromptRef } from "./context/prompt"
 import { Config, ConfigProvider, useConfig } from "./config"
 import { PluginProvider, usePlugin, type PackageResolver } from "./plugin/context"
-import { tuiPluginDirectories } from "./plugin/discovery"
 import { PluginRoute, PluginSlot } from "./plugin/render"
 import { CommandPaletteDialog } from "./component/command-palette"
 import { COMMAND_PALETTE_COMMAND, Keymap, type KeymapCommand } from "./context/keymap"
@@ -210,13 +208,9 @@ export const run = Effect.fn("Tui.run")(function* (input: TuiInput) {
   })
   const options = { baseUrl: input.server.endpoint.url, headers: Service.headers(input.server.endpoint) }
   const api = OpenCode.make(options)
-  const location = yield* Effect.tryPromise(() => api.file.list({ location: { directory: process.cwd() } })).pipe(
-    Effect.map((response) => response.location),
-    Effect.catch(() => Effect.tryPromise(() => api.location.get())),
-  )
-  const directory = location.directory
-  const pluginDirectories = yield* Effect.promise(() =>
-    tuiPluginDirectories(process.cwd(), global.config),
+  const directory = yield* Effect.tryPromise(() => api.file.list({ location: { directory: process.cwd() } })).pipe(
+    Effect.map((response) => response.location.directory),
+    Effect.catch(() => Effect.tryPromise(() => api.location.get()).pipe(Effect.map((response) => response.directory))),
   )
   const handoff = input.terminalHandoff ? yield* Effect.promise(input.terminalHandoff) : undefined
   const managed = input.server.service
@@ -384,10 +378,7 @@ export const run = Effect.fn("Tui.run")(function* (input: TuiInput) {
                                                                   <PromptRefProvider>
                                                                     <EditorContextProvider>
                                                                       <AttentionProvider>
-                                                                        <PluginProvider
-                                                                          packages={input.packages}
-                                                                          directories={pluginDirectories}
-                                                                        >
+                                                                        <PluginProvider packages={input.packages}>
                                                                           <App
                                                                             pair={
                                                                               input.server.endpoint.auth
@@ -528,9 +519,6 @@ function App(props: { pair?: DialogPairCredentials }) {
   const terminalTitleEnabled = () => config.data.terminal?.title ?? true
   const copyOnSelectEnabled = () => config.data.terminal?.copy_on_select ?? process.platform !== "win32"
   const pasteSummaryEnabled = () => config.data.prompt?.paste !== "full"
-  const tabsVertical = () => (config.data.tabs?.vertical ?? false) && sessionTabsFitVertically(dimensions().width)
-  const tabsVisible = () =>
-    sessionTabs.enabled() && (sessionTabs.tabs().length > 0 || sessionTabs.newTab()) && route.data.type !== "plugin"
 
   createEffect(() => {
     renderer.useMouse = config.data.mouse
@@ -1226,13 +1214,16 @@ function App(props: { pair?: DialogPairCredentials }) {
       onMouseUp={copyOnSelectEnabled() ? () => Selection.copy(renderer, toast, clipboard) : undefined}
     >
       <box flexGrow={1} minHeight={0} flexDirection="row">
-        <Show when={tabsVisible() && tabsVertical()}>
-          <SessionTabs orientation="vertical" />
-        </Show>
         <box flexGrow={1} minWidth={0} flexDirection="column">
           <Show when={plugins.ready()}>
             <box flexGrow={1} minHeight={0} flexDirection="column">
-              <Show when={tabsVisible() && !tabsVertical()}>
+              <Show
+                when={
+                  sessionTabs.enabled() &&
+                  (sessionTabs.tabs().length > 0 || sessionTabs.newTab()) &&
+                  route.data.type !== "plugin"
+                }
+              >
                 <SessionTabs />
               </Show>
               <Switch>

packages/tui/src/component/dialog-config.tsx

@@ -100,15 +100,6 @@ export const settings: Setting[] = [
     values: ["cwd", "global"],
     labels: ["current directory", "global"],
   },
-  {
-    title: "Vertical",
-    category: "Tabs",
-    path: ["tabs", "vertical"],
-    default: false,
-    values: [false, true],
-    labels: ["off", "on"],
-    keywords: ["sidebar", "orientation", "left"],
-  },
   {
     title: "Layout",
     category: "Diffs",

packages/tui/src/component/dialog-model.tsx

@@ -63,15 +63,15 @@ export function DialogModel(props: { providerID?: string }) {
         .filter((model) => (props.providerID ? model.providerID === props.providerID : true))
         .map((model) => {
           const provider = providers().get(model.providerID)
-          const favorite = favorites.some((item) => item.providerID === model.providerID && item.modelID === model.id)
           return {
             value: { providerID: model.providerID, modelID: model.id },
             providerID: model.providerID,
             providerName: provider?.name ?? model.providerID,
             title: model.name,
             releaseDate: model.time.released,
-            favorite,
-            description: favorite ? "(Favorite)" : undefined,
+            description: favorites.some((item) => item.providerID === model.providerID && item.modelID === model.id)
+              ? "(Favorite)"
+              : undefined,
             category: connected() ? (provider?.name ?? model.providerID) : undefined,
             footer: free(model) ? "Free" : undefined,
             onSelect() {
@@ -96,9 +96,7 @@ export function DialogModel(props: { providerID?: string }) {
     )
 
     if (needle) {
-      return prioritizeFavorites(
-        fuzzysort.go(needle, modelOptions, { keys: ["title", "category"] }).map((item) => item.obj),
-      )
+      return fuzzysort.go(needle, modelOptions, { keys: ["title", "category"] }).map((item) => item.obj)
     }
 
     return [...favoriteOptions, ...recentOptions, ...modelOptions]
@@ -162,10 +160,6 @@ export function DialogModel(props: { providerID?: string }) {
   )
 }
 
-export function prioritizeFavorites<T extends { favorite: boolean }>(options: T[]) {
-  return options.toSorted((a, b) => Number(b.favorite) - Number(a.favorite))
-}
-
 export function sortModelOptions<
   T extends { providerID?: string; providerName?: string; releaseDate: string | number; title: string },
 >(options: T[]) {

packages/tui/src/component/dialog-open.tsx

@@ -1,3 +1,4 @@
+import path from "path"
 import { createMemo, createResource, createSignal, onMount } from "solid-js"
 import type { SessionInfo } from "@opencode-ai/client"
 import { useTerminalDimensions } from "@opentui/solid"
@@ -17,7 +18,6 @@ import { truncateFilePath } from "../ui/file-path"
 import { stringWidth } from "../util/string-width"
 import { withTimestampedFallback } from "@opencode-ai/util/session-title-fallback"
 import { Spinner } from "./spinner"
-import { projectName } from "../util/project"
 
 const RECENT_LIMIT = 8
 
@@ -81,7 +81,7 @@ export function DialogOpen() {
           .slice(0, RECENT_LIMIT)
     const sessionOptions = recent.map((session) => {
       const project = data.project.get(session.projectID)
-      const name = projectName(project)
+      const name = project?.canonical === "/" ? undefined : project?.name || path.basename(project?.canonical ?? "")
       const running =
         data.session.status(session.id) === "running" ||
         data.session.family(session.id).some((id) => data.session.status(id) === "running")
@@ -109,7 +109,7 @@ export function DialogOpen() {
         return true
       })
       .map((project) => {
-        const title = projectName(project) ?? project.canonical
+        const title = project.name ?? path.basename(project.canonical)
         const footer = abbreviateHome(project.canonical, paths.home)
         const width =
           dialogSelectContentWidth(Math.min(dialogWidth("large"), dimensions().width - 2)) - stringWidth(title)

packages/tui/src/component/dialog-session-list.tsx

@@ -20,7 +20,6 @@ import { useSessionTabs } from "../context/session-tabs"
 import { useStorage } from "../context/storage"
 import { useConfig } from "../config"
 import { withTimestampedFallback } from "@opencode-ai/util/session-title-fallback"
-import { projectName } from "../util/project"
 
 export function DialogSessionList() {
   const dialog = useDialog()
@@ -124,7 +123,8 @@ export function DialogSessionList() {
     const current = data.location.info()
     if (!current) return ""
     const project = data.project.get(current.project.id)
-    return projectName(project) ?? ""
+    if (!project) return ""
+    return project.name || path.basename(project.canonical)
   })
 
   const options = createMemo(() => {
@@ -141,7 +141,9 @@ export function DialogSessionList() {
     const option = (session: SessionInfo, category: string) => {
       const directory = session.location.directory
       const project = data.project.get(session.projectID)
-      const footer = allProjects() ? Locale.truncate(projectName(project, directory) ?? "", 20) : undefined
+      const footer = allProjects()
+        ? Locale.truncate(project?.name || path.basename(project?.canonical ?? directory), 20)
+        : undefined
       const slot = sessionTabs.enabled() ? undefined : slotByID.get(session.id)
       const deleting = toDelete() === session.id
       return {

packages/tui/src/component/dialog-status.tsx

@@ -4,6 +4,8 @@ import { useDialog } from "../ui/dialog"
 import { useData } from "../context/data"
 import { For, Match, Switch, Show, createMemo } from "solid-js"
 
+export type DialogStatusProps = {}
+
 export function DialogStatus() {
   const data = useData()
   const theme = useTheme("elevated")

packages/tui/src/component/prompt/autocomplete.tsx

@@ -23,7 +23,6 @@ import { displayCharAt, mentionTriggerIndex } from "../../prompt/display"
 import type { FileSystemEntry } from "@opencode-ai/client"
 import { stringWidth } from "../../util/string-width"
 import { parseFileLineRange, stripFileLineRange } from "../../prompt/parse"
-import { moveSelection, revealSelectionOffset } from "../../ui/select-controller"
 
 export type AutocompleteRef = {
   onInput: (value: string) => void
@@ -502,19 +501,22 @@ export function Autocomplete(props: {
   function move(direction: -1 | 1) {
     if (!store.visible) return
     if (!options().length) return
-    moveTo(moveSelection(store.selected, { count: options().length, delta: direction, policy: "wrap" }))
+    let next = store.selected + direction
+    if (next < 0) next = options().length - 1
+    if (next >= options().length) next = 0
+    moveTo(next)
   }
 
   function moveTo(next: number) {
     setStore("selected", next)
     if (!scroll) return
-    const offset = revealSelectionOffset(scroll.scrollTop, {
-      count: options().length,
-      limit: Math.min(height(), options().length),
-      selected: next,
-    })
-    if (offset === scroll.scrollTop) return
-    scroll.scrollBy(offset - scroll.scrollTop)
+    const viewportHeight = Math.min(height(), options().length)
+    const scrollBottom = scroll.scrollTop + viewportHeight
+    if (next < scroll.scrollTop) {
+      scroll.scrollBy(next - scroll.scrollTop)
+    } else if (next + 1 > scrollBottom) {
+      scroll.scrollBy(next + 1 - scrollBottom)
+    }
   }
 
   function select() {

packages/tui/src/component/prompt/index.tsx

@@ -8,6 +8,7 @@ import {
   type KeyEvent,
 } from "@opentui/core"
 import { createEffect, createMemo, onMount, createSignal, onCleanup, on, Show, Switch, Match } from "solid-js"
+import { registerOpencodeSpinner } from "../register-spinner"
 import path from "path"
 import { fileURLToPath } from "url"
 import { useLocal } from "../../context/local"
@@ -54,6 +55,8 @@ import { Keymap, type KeymapCommand } from "../../context/keymap"
 import { abbreviateHome } from "../../runtime"
 import { PluginSlot } from "../../plugin/render"
 
+registerOpencodeSpinner()
+
 export type PromptProps = {
   sessionID?: string
   visible?: boolean

packages/tui/src/component/session-tabs.tsx

@@ -1,9 +1,8 @@
-import { RGBA, ScrollBoxRenderable, TextAttributes } from "@opentui/core"
+import { RGBA, TextAttributes } from "@opentui/core"
 import { For, Show, createComputed, createEffect, createMemo, createSignal, untrack } from "solid-js"
 import { useTerminalDimensions } from "@opentui/solid"
 import { useConfig } from "../config"
 import { useSessionTabs } from "../context/session-tabs"
-import { useData } from "../context/data"
 import { useTheme, useThemes } from "../context/theme"
 import {
   adaptiveSessionTabLayout,
@@ -20,8 +19,6 @@ import { Locale } from "../util/locale"
 import { stringWidth } from "../util/string-width"
 import { TabPulse, unreadGlowIntensity } from "./tab-pulse"
 import { tint } from "../theme/color"
-import { SESSION_SIDEBAR_WIDTH } from "../ui/layout"
-import { projectName } from "../util/project"
 
 // A long title fades out over its last cells instead of cutting hard.
 const FADE_WIDTH = 4
@@ -42,338 +39,8 @@ export type SessionTabsController = Pick<ContextController, "tabs" | "current" |
 }
 
 const NEW_SESSION_TAB: SessionTab = { sessionID: "new", title: NEW_SESSION_TAB_TITLE }
-const glowTextColor = (base: RGBA, glow: RGBA, index: number, width: number) =>
-  tint(base, glow, 0.12 * unreadGlowIntensity(index, width))
 
-export function SessionTabs(
-  props: { controller?: SessionTabsController; animations?: boolean; orientation?: "horizontal" | "vertical" } = {},
-) {
-  if (props.orientation === "vertical")
-    return <VerticalSessionTabs controller={props.controller} animations={props.animations} />
-  return <HorizontalSessionTabs controller={props.controller} animations={props.animations} />
-}
-
-function VerticalSessionTabs(props: { controller?: SessionTabsController; animations?: boolean }) {
-  const tabs = props.controller ?? useSessionTabs()
-  const data = useData()
-  const theme = useTheme("elevated")
-  const { mode } = useThemes()
-  const config = useConfig().data
-  const animations = () => props.animations ?? config.animations ?? true
-  const width = () => SESSION_SIDEBAR_WIDTH
-  const hueStep = () => (mode() === "light" ? 800 : 200)
-  const accent = () => theme.hue.accent[hueStep()]
-  const activeNumber = () => theme.hue.interactive[hueStep()]
-  const idleNumber = () => tint(theme.text.subdued, theme.background.default, 0.35)
-  const separatorUpperPulseColor = createMemo(() => tint(theme.background.default, theme.text.default, 0.04))
-  const separatorLowerPulseColor = createMemo(() => tint(theme.background.default, theme.text.default, 0.05))
-  const [hovered, setHovered] = createSignal<string>()
-  const [dragging, setDragging] = createSignal<string>()
-  const [preview, setPreview] = createSignal<{ sessionID: string; index: number }>()
-  const newTab = () => tabs.newTab?.() ?? false
-  const activeID = createMemo(() => (newTab() ? NEW_SESSION_TAB.sessionID : tabs.current()))
-  const ordered = createMemo(() => {
-    const pending = preview()
-    if (!pending) return tabs.tabs()
-    return moveSessionTab(tabs.tabs(), pending.sessionID, pending.index)
-  })
-  const items = createMemo(() => (newTab() ? [...ordered(), NEW_SESSION_TAB] : ordered()))
-  const statuses = createMemo(
-    () =>
-      new Map(
-        items().map((tab) => {
-          const status = tab === NEW_SESSION_TAB ? EMPTY_SESSION_TAB_STATUS : tabs.status(tab.sessionID)
-          return [
-            tab.sessionID,
-            {
-              ...status,
-              complete: sessionTabComplete(status.unread, status.busy),
-              runs: status.busy && !status.attention,
-              glows:
-                tab.sessionID !== activeID() && (status.attention || (!status.busy && status.unread !== undefined)),
-            },
-          ] as const
-        }),
-      ),
-  )
-  const itemStatus = (tab: SessionTab) => statuses().get(tab.sessionID)!
-  let rail: { screenY: number } | undefined
-  let scroll: ScrollBoxRenderable | undefined
-
-  createEffect(() => {
-    const pending = preview()
-    if (!pending || dragging()) return
-    const index = tabs.tabs().findIndex((tab) => tab.sessionID === pending.sessionID)
-    if (index === -1 || index === Math.min(pending.index, tabs.tabs().length - 1)) setPreview(undefined)
-  })
-
-  createEffect(() => {
-    if (!scroll) return
-    const index = items().findIndex((tab) => tab.sessionID === activeID())
-    if (index === -1) return
-    const top = index * 3
-    if (top < scroll.scrollTop) return scroll.scrollTo(top)
-    if (top + 2 > scroll.scrollTop + scroll.viewport.height) {
-      scroll.scrollTo(top + 2 - scroll.viewport.height)
-    }
-  })
-
-  return (
-    <box
-      ref={(element) => (rail = element)}
-      width={width()}
-      height="100%"
-      flexShrink={0}
-      flexDirection="column"
-      paddingTop={1}
-      backgroundColor={theme.background.default}
-    >
-      <scrollbox ref={(element) => (scroll = element)} flexGrow={1} scrollbarOptions={{ visible: false }}>
-        <box flexShrink={0} flexDirection="column" gap={1}>
-          <For each={items()}>
-            {(tab, index) => {
-              const selected = () => activeID() === tab.sessionID
-              const status = createMemo(() => itemStatus(tab))
-              const [sweepLevel, setSweepLevel] = createSignal(0)
-              const session = createMemo(() => (tab === NEW_SESSION_TAB ? undefined : data.session.get(tab.sessionID)))
-              const project = createMemo(() => {
-                const value = session()
-                return value ? data.project.get(value.projectID) : undefined
-              })
-              const numberWidth = () => String(index() + 1).length + 1
-              const titleWidth = () => Math.max(1, width() - numberWidth() - 2 - (hovered() === tab.sessionID ? 1 : 0))
-              const title = () => tab.title ?? "Untitled session"
-              const visibleTitle = createMemo(() => Locale.takeWidth(title(), titleWidth()))
-              const visibleTitleParts = createMemo(() => Locale.graphemes(visibleTitle()))
-              const titleFades = createMemo(() => stringWidth(title()) >= titleWidth() && titleWidth() > FADE_WIDTH)
-              const detail = createMemo(() => {
-                if (tab === NEW_SESSION_TAB) return Locale.takeWidth("Start a new session", titleWidth())
-                const value = session()
-                return Locale.takeWidth(projectName(project(), value?.location.directory) ?? "", titleWidth())
-              })
-              const background = createMemo(() => {
-                if (selected()) return theme.background.action.primary.selected
-                if (hovered() === tab.sessionID || dragging() === tab.sessionID)
-                  return theme.background.action.primary.hovered
-                return theme.background.default
-              })
-              const pulseBackground = createMemo(() => tint(theme.background.default, background(), background().a))
-              const numberColor = () => {
-                if (status().attention) return theme.text.feedback.warning.default
-                if (status().unread === "error") return theme.text.feedback.error.default
-                const base =
-                  hovered() === tab.sessionID && !selected()
-                    ? foreground()
-                    : tint(idleNumber(), activeNumber(), Number(selected()))
-                const color = tint(base, accent(), Number(complete()))
-                return sweepLevel() === 0 ? color : tint(color, theme.text.default, 0.15 * sweepLevel())
-              }
-              const foreground = () => {
-                if (hovered() === tab.sessionID) return theme.text.default
-                return selected() ? theme.text.default : theme.text.subdued
-              }
-              const complete = () => status().complete
-              const glowHue = () => {
-                if (status().attention) return theme.text.feedback.warning.default
-                if (status().unread === "error") return theme.text.feedback.error.default
-                return accent()
-              }
-              const pulseColor = createMemo(() => tint(pulseBackground(), theme.text.default, 0.25))
-              const glowColor = createMemo(() => tint(pulseBackground(), glowHue(), 0.45))
-              const detailPulseColor = createMemo(() => tint(pulseBackground(), theme.text.default, 0.13))
-              const detailGlowColor = createMemo(() => tint(pulseBackground(), glowHue(), 0.25))
-              const detailColor = createMemo(() => tint(theme.text.subdued, pulseBackground(), 0.35))
-              const glows = () => status().glows
-              const previous = createMemo(() => items()[index() - 1])
-              const previousStatus = createMemo(() => {
-                const tab = previous()
-                return tab
-                  ? itemStatus(tab)
-                  : { ...EMPTY_SESSION_TAB_STATUS, complete: false, runs: false, glows: false }
-              })
-              const previousGlows = () => previousStatus().glows
-              const runs = () => status().runs
-              const previousRuns = () => previousStatus().runs
-              const previousGlowHue = () => {
-                if (previousStatus().attention) return theme.text.feedback.warning.default
-                if (previousStatus().unread === "error") return theme.text.feedback.error.default
-                return accent()
-              }
-              const separatorUpperColor = createMemo(() => tint(theme.background.default, previousGlowHue(), 0.1))
-              const separatorLowerColor = createMemo(() => tint(theme.background.default, glowHue(), 0.12))
-              const titleColor = (index: number) => {
-                const color = glows()
-                  ? glowTextColor(foreground(), glowColor(), 1 + numberWidth() + index, width())
-                  : foreground()
-                if (!titleFades() || index < visibleTitleParts().length - FADE_WIDTH) return color
-                const position = index - (visibleTitleParts().length - FADE_WIDTH)
-                return tint(color, pulseBackground(), 0.2 + 0.72 * (position / Math.max(1, FADE_WIDTH - 1)))
-              }
-              const release = () => {
-                setDragging(undefined)
-                const pending = preview()
-                if (pending?.sessionID === tab.sessionID) tabs.move(pending.sessionID, pending.index)
-                if (tab !== NEW_SESSION_TAB) tabs.select(tab.sessionID)
-              }
-              return (
-                <box
-                  height={2}
-                  width="100%"
-                  position="relative"
-                  flexDirection="column"
-                  backgroundColor={background()}
-                  onMouseOver={() => setHovered(tab.sessionID)}
-                  onMouseOut={() => setHovered(undefined)}
-                  onMouseDown={() => setDragging(tab.sessionID)}
-                  onMouseUp={release}
-                  onMouseDrag={(event) => {
-                    if (!rail || tab === NEW_SESSION_TAB) return
-                    const target = Math.max(
-                      0,
-                      Math.min(
-                        tabs.tabs().length - 1,
-                        Math.floor((event.y - rail.screenY - 1 + (scroll?.scrollTop ?? 0)) / 3),
-                      ),
-                    )
-                    if (target !== index() && preview()?.index !== target)
-                      setPreview({ sessionID: tab.sessionID, index: target })
-                  }}
-                  onMouseDragEnd={release}
-                >
-                  <TabPulse
-                    top={-1}
-                    edge="above"
-                    enabled={animations()}
-                    active={runs()}
-                    outerActive={previousRuns()}
-                    promptPulse={status().promptPulse}
-                    outerPromptPulse={previousStatus().promptPulse}
-                    complete={complete() && !status().attention}
-                    outerComplete={previousStatus().complete && !previousStatus().attention}
-                    glow={glows()}
-                    outerGlow={previousGlows()}
-                    breathe={status().attention}
-                    outerBreathe={previousStatus().attention}
-                    color={separatorLowerPulseColor()}
-                    outerColor={separatorUpperPulseColor()}
-                    glowColor={separatorLowerColor()}
-                    outerGlowColor={separatorUpperColor()}
-                    glowTail={8}
-                    outerGlowTail={5}
-                    completionColor={separatorLowerColor()}
-                    outerCompletionColor={separatorUpperColor()}
-                    backgroundColor={theme.background.default}
-                  />
-                  <Show when={index() === items().length - 1}>
-                    <TabPulse
-                      top={2}
-                      edge="below"
-                      enabled={animations()}
-                      active={runs()}
-                      outerActive={false}
-                      promptPulse={status().promptPulse}
-                      outerPromptPulse={0}
-                      complete={complete() && !status().attention}
-                      outerComplete={false}
-                      glow={glows()}
-                      outerGlow={false}
-                      breathe={status().attention}
-                      outerBreathe={false}
-                      color={tint(theme.background.default, theme.text.default, 0.04)}
-                      outerColor={tint(theme.background.default, theme.text.default, 0.006)}
-                      glowColor={tint(theme.background.default, glowHue(), 0.1)}
-                      outerGlowColor={theme.background.default}
-                      glowTail={8}
-                      outerGlowTail={5}
-                      completionColor={tint(theme.background.default, glowHue(), 0.1)}
-                      outerCompletionColor={theme.background.default}
-                      backgroundColor={theme.background.default}
-                    />
-                  </Show>
-                  <box height={1} width="100%" flexDirection="row" position="relative">
-                    <TabPulse
-                      enabled={animations()}
-                      active={runs()}
-                      promptPulse={status().promptPulse}
-                      complete={complete() && !status().attention}
-                      glow={glows()}
-                      breathe={status().attention}
-                      color={pulseColor()}
-                      glowColor={glowColor()}
-                      completionColor={glowColor()}
-                      backgroundColor={pulseBackground()}
-                      onLevel={setSweepLevel}
-                    />
-                    <box zIndex={1} width="100%" flexDirection="row" paddingLeft={1} paddingRight={1}>
-                      <text
-                        width={numberWidth()}
-                        fg={numberColor()}
-                        selectable={false}
-                        attributes={selected() ? TextAttributes.BOLD : undefined}
-                      >
-                        {index() + 1}
-                      </text>
-                      <text
-                        width={titleWidth()}
-                        fg={foreground()}
-                        wrapMode="none"
-                        selectable={false}
-                        attributes={selected() ? TextAttributes.BOLD : undefined}
-                      >
-                        <Show when={glows() || titleFades()} fallback={visibleTitle()}>
-                          <For each={visibleTitleParts()}>
-                            {(character, index) => <span style={{ fg: titleColor(index()) }}>{character}</span>}
-                          </For>
-                        </Show>
-                      </text>
-                      <text
-                        position="absolute"
-                        right={1}
-                        zIndex={2}
-                        width={1}
-                        fg={theme.text.subdued}
-                        selectable={false}
-                        onMouseUp={(event) => {
-                          if (hovered() !== tab.sessionID) return
-                          event.stopPropagation()
-                          tabs.close(tab === NEW_SESSION_TAB ? undefined : tab.sessionID)
-                        }}
-                      >
-                        {hovered() === tab.sessionID ? "×" : ""}
-                      </text>
-                    </box>
-                  </box>
-                  <box height={1} width="100%" position="relative" flexDirection="row">
-                    <TabPulse
-                      enabled={animations()}
-                      active={runs()}
-                      promptPulse={status().promptPulse}
-                      complete={complete() && !status().attention}
-                      glow={glows()}
-                      breathe={status().attention}
-                      color={detailPulseColor()}
-                      glowColor={detailGlowColor()}
-                      glowTail={10}
-                      completionColor={detailGlowColor()}
-                      backgroundColor={pulseBackground()}
-                    />
-                    <box zIndex={1} width="100%" flexDirection="row" paddingLeft={numberWidth() + 1} paddingRight={2}>
-                      <text fg={detailColor()} wrapMode="none" selectable={false}>
-                        {detail()}
-                      </text>
-                    </box>
-                  </box>
-                </box>
-              )
-            }}
-          </For>
-        </box>
-      </scrollbox>
-    </box>
-  )
-}
-
-function HorizontalSessionTabs(props: { controller?: SessionTabsController; animations?: boolean } = {}) {
+export function SessionTabs(props: { controller?: SessionTabsController; animations?: boolean } = {}) {
   const tabs = props.controller ?? useSessionTabs()
   const dimensions = useTerminalDimensions()
   const theme = useTheme()
@@ -602,7 +269,9 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
           // spatial falloff as the glow itself; characters beyond the tail stay neutral.
           const characterColor = (index: number) => {
             const base = foreground()
-            const color = glows() ? glowTextColor(base, glowColor(), 1 + numberWidth() + index, width()) : base
+            const color = glows()
+              ? tint(base, glowColor(), 0.12 * unreadGlowIntensity(1 + numberWidth() + index, width()))
+              : base
             if (!titleFades() || index < displayedParts().length - FADE_WIDTH) return color
             const position = index - (displayedParts().length - FADE_WIDTH)
             return tint(color, background(), 0.2 + 0.72 * (position / Math.max(1, FADE_WIDTH - 1)))

packages/tui/src/component/tab-pulse.tsx

@@ -2,28 +2,16 @@ import { OptimizedBuffer, Renderable, RGBA, type RenderableOptions, type RenderC
 import { extend } from "@opentui/solid"
 
 type TabPulseOptions = RenderableOptions<TabPulseRenderable> & {
-  edge?: "above" | "below"
   enabled?: boolean
   active?: boolean
-  outerActive?: boolean
   promptPulse?: number
-  outerPromptPulse?: number
   complete?: boolean
-  outerComplete?: boolean
   glow?: boolean
-  outerGlow?: boolean
   breathe?: boolean
-  outerBreathe?: boolean
   color?: RGBA
-  outerColor?: RGBA
   glowColor?: RGBA
-  outerGlowColor?: RGBA
-  glowTail?: number
-  outerGlowTail?: number
   flashColor?: RGBA
-  outerFlashColor?: RGBA
   completionColor?: RGBA
-  outerCompletionColor?: RGBA
   backgroundColor?: RGBA
   /** Reports the running sweep's intensity at the tab number's cell, quantized; 0 when idle. */
   onLevel?: (level: number) => void
@@ -32,7 +20,6 @@ type TabPulseOptions = RenderableOptions<TabPulseRenderable> & {
 const clamp = (value: number) => Math.max(0, Math.min(1, value))
 const smootherstep = (value: number) => value * value * value * (value * (value * 6 - 15) + 10)
 const RUN_DURATION = 2_800
-const RUN_ATTACK = 450
 const RUN_HEAD = 4
 const RUN_TAIL = 18
 const RUN_FADE_OUT = 500
@@ -71,10 +58,9 @@ const attackDecay = (progress: number, attack: number, peak: number, rest: numbe
 export const completionPulseOpacity = (progress: number) => attackDecay(progress, COMPLETION_ATTACK, 1, 0)
 export const glowIgnitionLevel = (progress: number) =>
   attackDecay(progress, GLOW_IGNITION_ATTACK, GLOW_IGNITION_PEAK, 1)
-const glowIntensityAt = (index: number, tail: number) => smootherstep(clamp(1 - Math.max(0, index - 1) / tail))
-export const unreadGlowIntensity = (index: number, width: number, maximumTail = GLOW_TAIL) => {
-  const tail = Math.min(maximumTail, Math.max(1, width - 2))
-  return glowIntensityAt(index, tail)
+export const unreadGlowIntensity = (index: number, width: number) => {
+  const tail = Math.min(GLOW_TAIL, Math.max(1, width - 2))
+  return smootherstep(clamp(1 - Math.max(0, index - 1) / tail))
 }
 export function blendTabPulseColor(
   output: RGBA,
@@ -145,236 +131,45 @@ class Envelope {
 // Hoisted so the per-frame liveness check allocates no closure.
 const envelopeActive = (envelope: Envelope) => envelope.active
 
-type PulseStateOptions = {
-  enabled: boolean
-  active: boolean
-  promptPulse: number
-  complete: boolean
-  glow: boolean
-  breathe: boolean
-}
-
-class PulseState {
-  private enabled: boolean
-  private active: boolean
-  private promptPulse: number
-  private complete: boolean
-  private glow: boolean
-  private breathe: boolean
+class TabPulseRenderable extends Renderable {
+  private _enabled: boolean
+  private _active: boolean
+  private _promptPulse: number
+  private _complete: boolean
+  private _glow: boolean
+  private _breathe: boolean
+  private _color: RGBA
+  private _glowColor: RGBA
+  private _flashColor: RGBA
+  private _completionColor: RGBA
+  private _backgroundColor: RGBA
   private clock = 0
   private breatheClock = 0
   private completionPending = false
-  private runAttack = new Envelope(RUN_ATTACK, smootherstep)
   private runFade = new Envelope(RUN_FADE_OUT, fadeOut)
   private completionPulse = new Envelope(COMPLETION_DURATION, completionPulseOpacity)
   private edgeFlash = new Envelope(EDGE_FLASH_DURATION, (progress) => attackDecay(progress, EDGE_FLASH_ATTACK, 1, 0))
   private ignition = new Envelope(GLOW_IGNITION_DURATION, glowIgnitionLevel)
   private glowOff = new Envelope(GLOW_FADE_OUT, fadeOut)
-  private envelopes = [this.runAttack, this.runFade, this.completionPulse, this.edgeFlash, this.ignition, this.glowOff]
-
-  constructor(options: PulseStateOptions) {
-    this.enabled = options.enabled
-    this.active = options.active
-    this.promptPulse = options.promptPulse
-    this.complete = options.complete
-    this.glow = options.glow
-    this.breathe = options.breathe
-    if (this.enabled && this.active) this.runAttack.start()
-  }
-
-  private get breathing() {
-    return this.enabled && this.glow && this.breathe
-  }
-
-  get live() {
-    return this.active || this.breathing || this.envelopes.some(envelopeActive)
-  }
-
-  get running() {
-    if (!this.enabled) return 0
-    return this.active ? (this.runAttack.active ? this.runAttack.level() : 1) : this.runFade.level()
-  }
-
-  get completion() {
-    return this.completionPulse.level() * COMPLETION_OPACITY
-  }
-
-  get flash() {
-    return this.edgeFlash.level() * EDGE_FLASH_OPACITY
-  }
-
-  get glowLevel() {
-    if (!this.glow) return this.glowOff.level()
-    const base = this.ignition.active ? this.ignition.level() : 1
-    if (!this.breathing) return base
-    return (
-      base * (1 + GLOW_BREATHE_RISE * 0.5 * (1 - Math.cos((2 * Math.PI * this.breatheClock) / GLOW_BREATHE_PERIOD)))
-    )
-  }
-
-  setEnabled(value: boolean) {
-    if (value === this.enabled) return false
-    this.enabled = value
-    if (!value) {
-      for (const envelope of this.envelopes) envelope.stop()
-      this.completionPending = false
-      this.breatheClock = 0
-    } else if (this.active) {
-      this.runAttack.restart()
-    }
-    return true
-  }
-
-  setActive(value: boolean) {
-    if (value === this.active) return false
-    this.active = value
-    if (!this.enabled) return true
-    if (value) {
-      this.clock = 0
-      this.runAttack.restart()
-      this.runFade.stop()
-      this.completionPulse.stop()
-      this.completionPending = false
-    } else {
-      const level = this.runAttack.active ? this.runAttack.level() : 1
-      this.runAttack.stop()
-      this.runFade.start(level)
-      this.completionPending = true
-    }
-    this.edgeFlash.start()
-    return true
-  }
-
-  setPromptPulse(value: number) {
-    if (value === this.promptPulse) return false
-    this.promptPulse = value
-    if (this.enabled) this.edgeFlash.restart(PROMPT_FLASH_SCALE)
-    return true
-  }
-
-  setComplete(value: boolean) {
-    if (value === this.complete) return false
-    this.complete = value
-    if (!value) {
-      this.completionPulse.stop()
-      this.completionPending = false
-    }
-    if (value && this.completionPending) {
-      this.completionPending = false
-      if (this.enabled) this.completionPulse.start()
-    }
-    return true
-  }
-
-  setGlow(value: boolean) {
-    if (value === this.glow) return false
-    if (this.enabled && !value) this.glowOff.start(this.glowLevel)
-    this.glow = value
-    this.ignition.stop()
-    this.breatheClock = 0
-    if (this.enabled && value) {
-      this.glowOff.stop()
-      this.ignition.start()
-    }
-    return true
-  }
-
-  setBreathe(value: boolean) {
-    if (value === this.breathe) return false
-    this.breathe = value
-    this.breatheClock = 0
-    return true
-  }
-
-  advance(deltaTime: number) {
-    if (!this.enabled) return
-    if (this.active || this.runFade.active) this.clock += deltaTime
-    if (this.breathing) this.breatheClock += deltaTime
-    for (const envelope of this.envelopes) envelope.advance(deltaTime)
-    if (!this.completionPending) return
-    if (this.complete) {
-      this.completionPending = false
-      this.completionPulse.start()
-      return
-    }
-    if (!this.runFade.active) this.completionPending = false
-  }
-
-  fronts(width: number) {
-    const cycles = this.clock / RUN_DURATION
-    const progress = cycles % 1
-    const start = -RUN_HEAD
-    const end = width - 1 + RUN_TAIL
-    const secondProgress = cycles < 0.5 ? 0 : (cycles + 0.5) % 1
-    return [start + coast(progress) * (end - start), start + coast(secondProgress) * (end - start)] as const
-  }
-}
-
-class TabPulseRenderable extends Renderable {
-  private _enabled: boolean
-  private inner: PulseState
-  private outer: PulseState
-  private _color: RGBA
-  private _outerColor: RGBA
-  private _glowColor: RGBA
-  private _outerGlowColor: RGBA
-  private _glowTail: number
-  private _outerGlowTail: number
-  private _edge: "above" | "below" | undefined
-  private _flashColor: RGBA
-  private _outerFlashColor: RGBA
-  private _completionColor: RGBA
-  private _outerCompletionColor: RGBA
-  private _backgroundColor: RGBA
+  private envelopes = [this.runFade, this.completionPulse, this.edgeFlash, this.ignition, this.glowOff]
   private renderColor = RGBA.fromInts(0, 0, 0)
-  private outerRenderColor = RGBA.fromInts(0, 0, 0)
   private _onLevel: ((level: number) => void) | undefined
   private lastLevel = 0
 
   constructor(ctx: RenderContext, options: TabPulseOptions = {}) {
     const enabled = options.enabled ?? true
     const active = options.active ?? false
-    const glow = options.glow ?? false
-    const breathe = options.breathe ?? false
-    const edge = options.edge
-    const outerActive = options.outerActive ?? active
-    const outerGlow = options.outerGlow ?? glow
-    const outerBreathe = options.outerBreathe ?? breathe
-    super(ctx, {
-      ...options,
-      height: 1,
-      live:
-        enabled &&
-        (active || (glow && breathe) || (edge !== undefined && (outerActive || (outerGlow && outerBreathe)))),
-    })
+    super(ctx, { ...options, height: 1, live: enabled && active })
     this._enabled = enabled
-    this.inner = new PulseState({
-      enabled,
-      active,
-      promptPulse: options.promptPulse ?? 0,
-      complete: options.complete ?? false,
-      glow,
-      breathe,
-    })
-    this.outer = new PulseState({
-      enabled: enabled && edge !== undefined,
-      active: outerActive,
-      promptPulse: options.outerPromptPulse ?? options.promptPulse ?? 0,
-      complete: options.outerComplete ?? options.complete ?? false,
-      glow: outerGlow,
-      breathe: outerBreathe,
-    })
+    this._active = active
+    this._promptPulse = options.promptPulse ?? 0
+    this._complete = options.complete ?? false
+    this._glow = options.glow ?? false
+    this._breathe = options.breathe ?? false
     this._color = options.color ?? RGBA.defaultForeground()
-    this._outerColor = options.outerColor ?? this._color
     this._glowColor = options.glowColor ?? this._color
-    this._outerGlowColor = options.outerGlowColor ?? this._glowColor
-    this._glowTail = options.glowTail ?? GLOW_TAIL
-    this._outerGlowTail = options.outerGlowTail ?? this._glowTail
-    this._edge = edge
     this._flashColor = options.flashColor ?? this._color
-    this._outerFlashColor = options.outerFlashColor ?? options.flashColor ?? this._outerColor
     this._completionColor = options.completionColor ?? this._color
-    this._outerCompletionColor = options.outerCompletionColor ?? options.completionColor ?? this._outerColor
     this._backgroundColor = options.backgroundColor ?? RGBA.defaultBackground()
     this._onLevel = options.onLevel
   }
@@ -384,64 +179,103 @@ class TabPulseRenderable extends Renderable {
   }
 
   private emitLevel(value: number) {
-    if (!this._onLevel) return
     const quantized = Math.round(value * 32) / 32
     if (quantized === this.lastLevel) return
     this.lastLevel = quantized
     this._onLevel?.(quantized)
   }
 
+  private get breathing() {
+    return this._enabled && this._glow && this._breathe
+  }
+
+  /** Resting glow is 1; ignition overshoots on arrival, breathing swells while pending, glowOff decays after. */
+  private glowLevel() {
+    if (!this._glow) return this.glowOff.level()
+    const base = this.ignition.active ? this.ignition.level() : 1
+    if (!this.breathing) return base
+    return (
+      base * (1 + GLOW_BREATHE_RISE * 0.5 * (1 - Math.cos((2 * Math.PI * this.breatheClock) / GLOW_BREATHE_PERIOD)))
+    )
+  }
+
   set enabled(value: boolean) {
     if (value === this._enabled) return
     this._enabled = value
-    this.inner.setEnabled(value)
-    this.outer.setEnabled(value && this._edge !== undefined)
-    this.live = this.inner.live || this.outer.live
+    if (!value) {
+      for (const envelope of this.envelopes) envelope.stop()
+      this.completionPending = false
+      this.breatheClock = 0
+      this.live = false
+    } else if (this._active || this.breathing) {
+      this.live = true
+    }
     this.requestRender()
   }
 
   set active(value: boolean) {
-    if (this.inner.setActive(value)) this.changed()
-  }
-
-  set outerActive(value: boolean) {
-    if (this.outer.setActive(value)) this.changed()
+    if (value === this._active) return
+    this._active = value
+    if (!this._enabled) return
+    if (value) {
+      this.runFade.stop()
+      this.completionPulse.stop()
+      this.completionPending = false
+    } else {
+      this.runFade.start()
+      this.completionPending = true
+    }
+    // The same neutral edge flash marks both the start and the finish of a run.
+    this.edgeFlash.start()
+    this.live = true
+    this.requestRender()
   }
 
   set promptPulse(value: number) {
-    if (this.inner.setPromptPulse(value)) this.changed()
-  }
-
-  set outerPromptPulse(value: number) {
-    if (this.outer.setPromptPulse(value)) this.changed()
+    if (value === this._promptPulse) return
+    this._promptPulse = value
+    if (!this._enabled) return
+    this.edgeFlash.restart(PROMPT_FLASH_SCALE)
+    this.live = true
+    this.requestRender()
   }
 
   set complete(value: boolean) {
-    if (this.inner.setComplete(value)) this.changed()
-  }
-
-  set outerComplete(value: boolean) {
-    if (this.outer.setComplete(value)) this.changed()
+    if (value === this._complete) return
+    this._complete = value
+    if (!value) {
+      this.completionPulse.stop()
+      this.completionPending = false
+    }
+    if (value && this.completionPending) {
+      this.completionPending = false
+      if (this._enabled) {
+        this.completionPulse.start()
+        this.live = true
+      }
+    }
+    this.requestRender()
   }
 
   set glow(value: boolean) {
-    if (this.inner.setGlow(value)) this.changed()
-  }
-
-  set outerGlow(value: boolean) {
-    if (this.outer.setGlow(value)) this.changed()
+    if (value === this._glow) return
+    if (this._enabled && !value) this.glowOff.start(this.glowLevel())
+    this._glow = value
+    this.ignition.stop()
+    this.breatheClock = 0
+    if (this._enabled && value) {
+      this.glowOff.stop()
+      this.ignition.start()
+      this.live = true
+    }
+    this.requestRender()
   }
 
   set breathe(value: boolean) {
-    if (this.inner.setBreathe(value)) this.changed()
-  }
-
-  set outerBreathe(value: boolean) {
-    if (this.outer.setBreathe(value)) this.changed()
-  }
-
-  private changed() {
-    this.live = this.inner.live || this.outer.live
+    if (value === this._breathe) return
+    this._breathe = value
+    this.breatheClock = 0
+    if (this.breathing) this.live = true
     this.requestRender()
   }
 
@@ -457,62 +291,18 @@ class TabPulseRenderable extends Renderable {
     this.requestRender()
   }
 
-  set outerColor(value: RGBA) {
-    if (value.equals(this._outerColor)) return
-    this._outerColor = value
-    this.requestRender()
-  }
-
-  set outerGlowColor(value: RGBA) {
-    if (value.equals(this._outerGlowColor)) return
-    this._outerGlowColor = value
-    this.requestRender()
-  }
-
-  set glowTail(value: number) {
-    if (value === this._glowTail) return
-    this._glowTail = value
-    this.requestRender()
-  }
-
-  set outerGlowTail(value: number) {
-    if (value === this._outerGlowTail) return
-    this._outerGlowTail = value
-    this.requestRender()
-  }
-
-  set edge(value: "above" | "below" | undefined) {
-    if (value === this._edge) return
-    this._edge = value
-    this.outer.setEnabled(this._enabled && value !== undefined)
-    this.live = this.inner.live || this.outer.live
-    this.requestRender()
-  }
-
   set flashColor(value: RGBA) {
     if (value.equals(this._flashColor)) return
     this._flashColor = value
     this.requestRender()
   }
 
-  set outerFlashColor(value: RGBA) {
-    if (value.equals(this._outerFlashColor)) return
-    this._outerFlashColor = value
-    this.requestRender()
-  }
-
   set completionColor(value: RGBA) {
     if (value.equals(this._completionColor)) return
     this._completionColor = value
     this.requestRender()
   }
 
-  set outerCompletionColor(value: RGBA) {
-    if (value.equals(this._outerCompletionColor)) return
-    this._outerCompletionColor = value
-    this.requestRender()
-  }
-
   set backgroundColor(value: RGBA) {
     if (value.equals(this._backgroundColor)) return
     this._backgroundColor = value
@@ -521,45 +311,42 @@ class TabPulseRenderable extends Renderable {
 
   protected override onUpdate(deltaTime: number): void {
     if (!this._enabled) return
-    this.inner.advance(deltaTime)
-    this.outer.advance(deltaTime)
-    this.live = this.inner.live || this.outer.live
+    if (this._active || this.runFade.active) this.clock += deltaTime
+    if (this.breathing) this.breatheClock += deltaTime
+    for (const envelope of this.envelopes) envelope.advance(deltaTime)
+    if (this.completionPending) {
+      if (this._complete) {
+        this.completionPending = false
+        this.completionPulse.start()
+      } else if (!this.runFade.active) {
+        this.completionPending = false
+      }
+    }
+    this.live = this._active || this.breathing || this.envelopes.some(envelopeActive)
   }
 
   protected override renderSelf(buffer: OptimizedBuffer): void {
     if (!this.visible || this.isDestroyed || this.width <= 0) return
-    const running = this.inner.running
-    const completion = this.inner.completion
-    const flash = this.inner.flash
-    const glowLevel = this.inner.glowLevel
-    const outerRunning = this.outer.running
-    const outerCompletion = this.outer.completion
-    const outerFlash = this.outer.flash
-    const outerGlowLevel = this.outer.glowLevel
-    if (
-      glowLevel === 0 &&
-      running === 0 &&
-      completion === 0 &&
-      flash === 0 &&
-      outerGlowLevel === 0 &&
-      outerRunning === 0 &&
-      outerCompletion === 0 &&
-      outerFlash === 0
-    ) {
+    const running = !this._enabled ? 0 : this._active ? 1 : this.runFade.level()
+    const completion = this.completionPulse.level() * COMPLETION_OPACITY
+    // The edge flash is a neutral wash on the running stage; the accent completion stage stays reserved for results.
+    const flash = this.edgeFlash.level() * EDGE_FLASH_OPACITY
+    const glowLevel = this.glowLevel()
+    if (glowLevel === 0 && running === 0 && completion === 0 && flash === 0) {
       this.emitLevel(0)
       return
     }
-    const [front, secondFront] = this.inner.fronts(this.width)
-    const [outerFront, outerSecondFront] = this.outer.fronts(this.width)
-    if (this._onLevel)
-      this.emitLevel(
-        running === 0
-          ? 0
-          : Math.max(intensityAt(1, front, RUN_HEAD, RUN_TAIL), intensityAt(1, secondFront, RUN_HEAD, RUN_TAIL)) *
-              running,
-      )
-    const glowTail = Math.min(this._glowTail, Math.max(1, this.width - 2))
-    const outerGlowTail = Math.min(this._outerGlowTail, Math.max(1, this.width - 2))
+    const progress = (this.clock % RUN_DURATION) / RUN_DURATION
+    const start = -RUN_HEAD
+    const end = this.width - 1 + RUN_TAIL
+    const front = start + coast(progress) * (end - start)
+    const secondFront = start + coast((progress + 0.5) % 1) * (end - start)
+    this.emitLevel(
+      running === 0
+        ? 0
+        : Math.max(intensityAt(1, front, RUN_HEAD, RUN_TAIL), intensityAt(1, secondFront, RUN_HEAD, RUN_TAIL)) *
+            running,
+    )
     for (let index = 0; index < this.width; index++) {
       // Skip per-cell sweep and glow math when that stage is idle, e.g. a steady breathing glow.
       const sweep =
@@ -571,15 +358,6 @@ class TabPulseRenderable extends Renderable {
             ) *
             0.14 *
             running
-      const outerSweep =
-        outerRunning === 0
-          ? 0
-          : Math.max(
-              intensityAt(index, outerFront, RUN_HEAD, RUN_TAIL),
-              intensityAt(index, outerSecondFront, RUN_HEAD, RUN_TAIL),
-            ) *
-            0.14 *
-            outerRunning
       blendTabPulseColor(
         this.renderColor,
         this._backgroundColor,
@@ -587,34 +365,12 @@ class TabPulseRenderable extends Renderable {
         this._color,
         this._flashColor,
         this._completionColor,
-        glowLevel === 0 ? 0 : glowIntensityAt(index, glowTail) * GLOW_OPACITY * glowLevel,
+        glowLevel === 0 ? 0 : unreadGlowIntensity(index, this.width) * GLOW_OPACITY * glowLevel,
         sweep,
         flash,
         completion,
       )
-      if (!this._edge) {
-        buffer.setCell(this.screenX + index, this.screenY, " ", DEFAULT_FOREGROUND, this.renderColor)
-        continue
-      }
-      blendTabPulseColor(
-        this.outerRenderColor,
-        this._backgroundColor,
-        this._outerGlowColor,
-        this._outerColor,
-        this._outerFlashColor,
-        this._outerCompletionColor,
-        outerGlowLevel === 0 ? 0 : glowIntensityAt(index, outerGlowTail) * GLOW_OPACITY * outerGlowLevel,
-        outerSweep,
-        outerFlash,
-        outerCompletion,
-      )
-      buffer.setCell(
-        this.screenX + index,
-        this.screenY,
-        this._edge === "above" ? "▄" : "▀",
-        this.renderColor,
-        this.outerRenderColor,
-      )
+      buffer.setCell(this.screenX + index, this.screenY, " ", DEFAULT_FOREGROUND, this.renderColor)
     }
   }
 }
@@ -628,61 +384,34 @@ declare module "@opentui/solid" {
 extend({ tab_pulse: TabPulseRenderable })
 
 export function TabPulse(props: {
-  top?: number
-  width?: number
-  edge?: "above" | "below"
   enabled?: boolean
   active: boolean
-  outerActive?: boolean
   promptPulse?: number
-  outerPromptPulse?: number
   complete?: boolean
-  outerComplete?: boolean
   glow?: boolean
-  outerGlow?: boolean
   breathe?: boolean
-  outerBreathe?: boolean
   color: RGBA
-  outerColor?: RGBA
   glowColor?: RGBA
-  outerGlowColor?: RGBA
-  glowTail?: number
-  outerGlowTail?: number
   flashColor?: RGBA
-  outerFlashColor?: RGBA
   completionColor?: RGBA
-  outerCompletionColor?: RGBA
   backgroundColor: RGBA
   onLevel?: (level: number) => void
 }) {
   return (
     <tab_pulse
       position="absolute"
-      top={props.top}
-      edge={props.edge}
       zIndex={0}
-      width={props.width ?? "100%"}
+      width="100%"
       enabled={props.enabled ?? true}
       active={props.active}
-      outerActive={props.outerActive ?? props.active}
       promptPulse={props.promptPulse ?? 0}
-      outerPromptPulse={props.outerPromptPulse ?? props.promptPulse ?? 0}
       complete={props.complete ?? false}
-      outerComplete={props.outerComplete ?? props.complete ?? false}
       glow={props.glow ?? false}
-      outerGlow={props.outerGlow ?? props.glow ?? false}
       breathe={props.breathe ?? false}
-      outerBreathe={props.outerBreathe ?? props.breathe ?? false}
       color={props.color}
-      outerColor={props.outerColor ?? props.color}
       glowColor={props.glowColor ?? props.color}
-      outerGlowColor={props.outerGlowColor ?? props.glowColor ?? props.color}
-      glowTail={props.glowTail ?? GLOW_TAIL}
-      outerGlowTail={props.outerGlowTail ?? props.glowTail ?? GLOW_TAIL}
       flashColor={props.flashColor ?? props.color}
-      outerFlashColor={props.outerFlashColor ?? props.flashColor ?? props.outerColor ?? props.color}
       completionColor={props.completionColor ?? props.color}
-      outerCompletionColor={props.outerCompletionColor ?? props.completionColor ?? props.outerColor ?? props.color}
       backgroundColor={props.backgroundColor}
       onLevel={props.onLevel}
     />

packages/tui/src/config/index.tsx

@@ -132,9 +132,6 @@ export const Info = Schema.Struct({
       scope: Schema.optional(Schema.Literals(["global", "cwd"])).annotate({
         description: "Share tabs globally or keep a separate set for each working directory",
       }),
-      vertical: Schema.optional(Schema.Boolean).annotate({
-        description: "Show tabs in a left sidebar instead of a horizontal strip",
-      }),
     }),
   ).annotate({ description: "Tab strip settings" }),
   mini: Schema.optional(

packages/tui/src/context/route.tsx

@@ -67,6 +67,8 @@ function initialRoute(value: unknown): Route | undefined {
   }
 }
 
+export type RouteContext = ReturnType<typeof useRoute>
+
 export function useRouteData<T extends Route["type"]>(type: T) {
   const route = useRoute()
   return route.data as Extract<Route, { type: typeof type }>

packages/tui/src/context/theme.tsx

@@ -22,7 +22,7 @@ import {
   type ThemeDocumentSource,
 } from "../theme"
 import { generateSystem, terminalMode } from "../theme/system"
-import { discoverThemes } from "../theme/discovery"
+import { discoverThemes, themeDirectories } from "../theme/discovery"
 import { createComponentTheme, type ComponentTheme } from "../theme/component"
 import { createEffect, createMemo, onCleanup, onMount, type Accessor, type ParentProps } from "solid-js"
 import { createStore, produce } from "solid-js/store"
@@ -30,7 +30,6 @@ import { createSimpleContext } from "./helper"
 import { useConfig } from "../config"
 import { Global } from "@opencode-ai/util/global"
 import { DevTools } from "../devtools"
-import { configDirectories } from "../util/config-directories"
 
 const themePerformance = DevTools.register({ id: "theme-performance", title: "Theme performance" })
 export type ThemeError = { name: string; error: Error }
@@ -71,7 +70,7 @@ export type ThemeSource = Readonly<{
 
 const themeSource: ThemeSource = {
   async discover() {
-    return discoverThemes(configDirectories(Global.Path.config, process.cwd()))
+    return discoverThemes(themeDirectories(Global.Path.config, process.cwd()))
   },
   subscribeRefresh(refresh) {
     process.on("SIGUSR2", refresh)

packages/tui/src/feature-plugins/prompt/footer.tsx

@@ -10,18 +10,24 @@ const money = new Intl.NumberFormat("en-US", {
 
 export function PromptFooter(props: { context: Plugin.Context; sessionID?: string; mode: "normal" | "shell" }) {
   const dimensions = useTerminalDimensions()
-  const subagents = createMemo(() => {
+  const activeSubagents = createMemo(() => {
     if (!props.sessionID) return 0
-    const count = props.context.data.session
+    return props.context.data.session
       .family(props.sessionID)
       .filter((id) => id !== props.sessionID && props.context.data.session.status(id) === "running").length
+  })
+  const runningShells = createMemo(() => {
+    if (!props.sessionID) return 0
+    return props.context.data.shell
+      .list(props.context.location)
+      .filter((shell) => shell.metadata.sessionID === props.sessionID).length
+  })
+  const subagents = createMemo(() => {
+    const count = activeSubagents()
     return count ? `${count} subagent${count === 1 ? "" : "s"}` : undefined
   })
   const shells = createMemo(() => {
-    if (!props.sessionID) return 0
-    const count = props.context.data.shell
-      .list(props.context.location)
-      .filter((shell) => shell.metadata.sessionID === props.sessionID).length
+    const count = runningShells()
     return count ? `${count} shell${count === 1 ? "" : "s"}` : undefined
   })
   const status = createMemo(() => {
@@ -34,10 +40,8 @@ export function PromptFooter(props: { context: Plugin.Context; sessionID?: strin
       session.revert?.messageID,
     )
     const cost = props.context.data.session.cost(props.sessionID)
-    return [
-      usage ? formatContextUsage(usage.tokens, usage.percent) : undefined,
-      cost > 0 ? money.format(cost) : undefined,
-    ].filter((item): item is string => Boolean(item))
+    return [usage ? formatContextUsage(usage.tokens, usage.percent) : undefined, cost > 0 ? money.format(cost) : undefined]
+      .filter((item): item is string => Boolean(item))
   })
   const live = createMemo(() => Boolean(subagents() || shells()))
   const shortcut = (id: string) => props.context.keymap.shortcuts(id)[0]

packages/tui/src/feature-plugins/sidebar/context.tsx

@@ -7,7 +7,7 @@ const money = new Intl.NumberFormat("en-US", {
   currency: "USD",
 })
 
-export function SidebarContext(props: { context: Plugin.Context; sessionID: string }) {
+function View(props: { context: Plugin.Context; sessionID: string }) {
   const theme = props.context.theme
   const msg = createMemo(() => props.context.data.session.message.list(props.sessionID))
   const session = createMemo(() => props.context.data.session.get(props.sessionID))
@@ -18,32 +18,28 @@ export function SidebarContext(props: { context: Plugin.Context; sessionID: stri
   )
 
   return (
-    <Show when={state() || cost() > 0}>
-      <box>
-        <text fg={theme.text.default}>
-          <b>Context</b>
-        </text>
-        <Show when={state()}>
-          {(value) => (
-            <>
-              <text fg={theme.text.subdued}>{value().tokens.toLocaleString()} tokens</text>
-              <Show when={value().percent !== undefined}>
-                <text fg={theme.text.subdued}>{value().percent}% used</text>
-              </Show>
-            </>
-          )}
-        </Show>
-        <Show when={cost() > 0}>
-          <text fg={theme.text.subdued}>{money.format(cost())} spent</text>
-        </Show>
-      </box>
-    </Show>
+    <box>
+      <text fg={theme.text.default}>
+        <b>Context</b>
+      </text>
+      <Show when={state()} fallback={<text fg={theme.text.subdued}>Not measured</text>}>
+        {(value) => (
+          <>
+            <text fg={theme.text.subdued}>{value().tokens.toLocaleString()} tokens</text>
+            <Show when={value().percent !== undefined}>
+              <text fg={theme.text.subdued}>{value().percent}% used</text>
+            </Show>
+          </>
+        )}
+      </Show>
+      <text fg={theme.text.subdued}>{money.format(cost())} spent</text>
+    </box>
   )
 }
 
 export default Plugin.define({
   id: "internal:sidebar-context",
   setup(context) {
-    context.ui.slot("sidebar.content", (props) => <SidebarContext context={context} sessionID={props.sessionID} />)
+    context.ui.slot("sidebar.content", (props) => <View context={context} sessionID={props.sessionID} />)
   },
 })

packages/tui/src/mini/runtime.queue.ts

@@ -90,7 +90,10 @@ export async function runPromptQueue(input: QueueInput): Promise<void> {
     draining = (async () => {
       try {
         while (!state.closed && state.queue.length > 0) {
-          const prompt = state.queue.shift()!
+          const prompt = state.queue.shift()
+          if (!prompt) {
+            continue
+          }
 
           if (prompt.mode !== "shell" && isNewCommand(prompt.text)) {
             if (!input.onNewSession) {

packages/tui/src/plugin/context.tsx

@@ -13,7 +13,7 @@ import { errorMessage } from "../util/error"
 import { builtins } from "./builtins"
 import { createPluginContext, usePluginHost, type Dispose } from "./api"
 import { createSourceWatcher } from "./watch"
-import { discoverTuiPlugins, freshSpecifier, localSource } from "./discovery"
+import { discoverTuiPlugins, freshSpecifier, localSource, tuiPluginDirectory } from "./discovery"
 
 export interface PackageResolver {
   readonly resolve: (spec: string) => Promise<string | undefined>
@@ -57,7 +57,7 @@ type Desired = Pick<Registration, "plugin" | "source" | "target" | "version" | "
 
 const PluginContext = createContext<Value>()
 
-export function PluginProvider(props: ParentProps<{ packages: PackageResolver; directories: string[] }>) {
+export function PluginProvider(props: ParentProps<{ packages: PackageResolver }>) {
   const host = usePluginHost()
   const config = useConfig()
   const lifecycle = useTuiLifecycle()
@@ -171,11 +171,10 @@ export function PluginProvider(props: ParentProps<{ packages: PackageResolver; d
       void enqueue(reconcile).catch(() => undefined)
     }, 100)
   })
-  const stopWatching = () => {
+  onCleanup(() => {
     clearTimeout(pending)
     watcher.dispose()
-  }
-  onCleanup(stopWatching)
+  })
 
   // Rebuild the plugin generation as resolve → compare → swap, mirroring the
   // core plugin registry: fold the ordered entries into a desired end state
@@ -187,8 +186,8 @@ export function PluginProvider(props: ParentProps<{ packages: PackageResolver; d
   // every watch event; remember them until the configuration changes.
   const npmFailures = new Map<string, string>()
   const reconcile = async () => {
-    await Promise.all(props.directories.map(watcher.wait))
-    const entries = [...(await discoverTuiPlugins(props.directories)), ...(config.data.plugins ?? [])]
+    const entries = [...(await discoverTuiPlugins(host.paths.cwd)), ...(config.data.plugins ?? [])]
+    watcher.add(tuiPluginDirectory(host.paths.cwd))
 
     // Resolve: fold entries into one desired generation. A source that fails
     // to import keeps its running previous version and only reports failure.
@@ -211,7 +210,7 @@ export function PluginProvider(props: ParentProps<{ packages: PackageResolver; d
       const options = typeof entry === "string" ? undefined : entry.options
       // Watch even when the resolve below fails so fixing a broken plugin reloads it.
       const local = localSource(target, directory)
-      if (local) await watcher.add(fileURLToPath(local))
+      if (local) watcher.add(fileURLToPath(local))
       const previous = Object.values(store.registrations).find((registration) => registration.target === target)
       const memo = local ? undefined : npmFailures.get(target)
       const resolved = memo
@@ -364,7 +363,6 @@ export function PluginProvider(props: ParentProps<{ packages: PackageResolver; d
     let disposing: Promise<void> | undefined
     const dispose = () => {
       if (disposing) return disposing
-      stopWatching()
       disposing = loading
         .catch(() => undefined)
         .then(() =>

packages/tui/src/plugin/discovery.ts

@@ -1,47 +1,23 @@
-import { readdir, stat } from "node:fs/promises"
+import { readdir } from "node:fs/promises"
 import path from "node:path"
 import { fileURLToPath, pathToFileURL } from "node:url"
-import {
-  isMissingPath,
-  localProjectDirectory,
-  projectConfigDirectories,
-} from "../util/config-directories"
 
 const extensions = new Set([".cjs", ".cts", ".js", ".jsx", ".mjs", ".mts", ".ts", ".tsx"])
 
-export async function tuiPluginDirectories(cwd: string, configDirectory: string) {
-  const projectDirectory = await localProjectDirectory(cwd)
-  const projectConfig = path.join(projectDirectory, ".opencode")
-  const directories = [configDirectory, ...projectConfigDirectories(projectDirectory, cwd)]
-  const exists = await Promise.all(
-    directories.map((directory) => {
-      if (directory === configDirectory || directory === projectConfig) return true
-      return stat(directory).then(
-        (info) => info.isDirectory(),
-        (error) => (isMissingPath(error) ? false : Promise.reject(error)),
-      )
-    }),
-  )
-  return directories
-    .filter((_, index) => exists[index])
-    .map((directory) => path.join(directory, "plugins", "tui"))
+export function tuiPluginDirectory(cwd: string) {
+  return path.join(cwd, ".opencode", "plugins", "tui")
 }
 
-export async function discoverTuiPlugins(directories: string[]) {
-  return (
-    await Promise.all(
-      directories.map(async (directory) => {
-        const entries = await readdir(directory, { withFileTypes: true }).catch((error: unknown) => {
-          if (isMissingPath(error)) return []
-          return Promise.reject(error)
-        })
-        return entries
-          .filter((entry) => (entry.isFile() || entry.isSymbolicLink()) && extensions.has(path.extname(entry.name)))
-          .map((entry) => path.join(directory, entry.name))
-          .sort()
-      }),
-    )
-  ).flat()
+export async function discoverTuiPlugins(cwd: string) {
+  const directory = tuiPluginDirectory(cwd)
+  const entries = await readdir(directory, { withFileTypes: true }).catch((error: unknown) => {
+    if (error && typeof error === "object" && Reflect.get(error, "code") === "ENOENT") return []
+    return Promise.reject(error)
+  })
+  return entries
+    .filter((entry) => (entry.isFile() || entry.isSymbolicLink()) && extensions.has(path.extname(entry.name)))
+    .map((entry) => path.join(directory, entry.name))
+    .sort()
 }
 
 export function localSource(spec: string, directory: string) {

packages/tui/src/plugin/watch.ts

@@ -8,32 +8,46 @@ import { lstat, realpath, stat } from "fs/promises"
 // directories stay quiet. Symlinked files are additionally watched at their
 // resolved target, since edits there emit nothing at the link's location.
 // Directory targets are watched at their root only: edits to nested helper
-// files do not change the entrypoint mtime and are not detected. Watches are
-// never torn down individually (a stale watch costs one fs handle and a
-// spurious onChange); all die with dispose(). Missing retryable targets are
-// polled until they can be armed without relying on a racy chain of ancestor
-// watches.
+// files do not change the entrypoint mtime and are not detected. A missing
+// target temporarily watches its nearest existing parent, filtered to the
+// first missing path segment, until the normal source watch can take over.
+// Established source watches die with dispose(). Failed or vanished watches
+// are forgotten so a later add() can re-arm once the path exists.
 export function createSourceWatcher(onChange: () => void) {
   const watchers = new Map<string, ReturnType<typeof watch>>()
   const watched = new Map<string, Set<string> | null>()
-  const missing = new Set<string>()
-  const arming = new Map<string, Promise<void>>()
+  const missing = new Map<string, { dir: string; watcher: ReturnType<typeof watch> }>()
   let disposed = false
-  const notify = () => {
-    if (!disposed) onChange()
-  }
   const forget = (dir: string) => {
     watchers.get(dir)?.close()
     watchers.delete(dir)
     watched.delete(dir)
   }
-  const arm = (target: string, retry: boolean) => {
-    const active = arming.get(target)
-    if (active) return active
-    const result = stat(target)
+  const forgetMissing = (target: string) => {
+    missing.get(target)?.watcher.close()
+    missing.delete(target)
+  }
+  const armMissing = (target: string) => {
+    if (disposed) return
+    const dir = nearestExistingParent(target)
+    if (!dir) return
+    if (missing.get(target)?.dir === dir) return
+    forgetMissing(target)
+    const name = path.relative(dir, target).split(path.sep)[0]!
+    const watcher = watch(dir, (_event, filename) => {
+      if (filename && filename.toString().split(path.sep)[0] !== name) return
+      forgetMissing(target)
+      arm(target)
+      onChange()
+    })
+    watcher.on("error", () => forgetMissing(target))
+    missing.set(target, { dir, watcher })
+  }
+  const arm = (target: string) => {
+    stat(target)
       .then((info) => {
         if (disposed) return
-        const appeared = missing.delete(target)
+        forgetMissing(target)
         const dir = info.isDirectory() ? target : path.dirname(target)
         // Directories accept every filename (null); files accept their basename.
         const name = info.isDirectory() ? null : path.basename(target)
@@ -41,69 +55,52 @@ export function createSourceWatcher(onChange: () => void) {
         if (existing !== undefined) {
           if (name === null) watched.set(dir, null)
           else existing?.add(name)
-          if (appeared) notify()
           return
         }
+        watched.set(dir, name === null ? null : new Set([name]))
         const watcher = watch(dir, (_event, filename) => {
           // A replaced directory keeps this watcher on the dead inode (Linux
           // emits rename, not error); forget it so a later add() re-arms on
           // the recreated path, and still schedule so reconcile runs now.
           if (!existsSync(dir)) {
             forget(dir)
-            notify()
+            onChange()
             return
           }
           // A null filename (platform-dependent) always schedules.
           const accept = watched.get(dir)
           if (filename && accept && !accept.has(filename.toString())) return
-          notify()
-        })
-        watched.set(dir, name === null ? null : new Set([name]))
-        // Reconcile after watcher errors so every source is re-added and any
-        // temporarily unavailable target moves into the polling set.
-        watcher.on("error", () => {
-          forget(dir)
-          notify()
+          onChange()
         })
+        // A watched directory can disappear out from under us; without a
+        // listener the error event would crash the process. Forget the path
+        // so a later add can re-arm once it exists again.
+        watcher.on("error", () => forget(dir))
         watchers.set(dir, watcher)
-        if (appeared) notify()
       })
-      .catch((error: unknown) => {
-        if (!disposed && retry && isMissing(error)) missing.add(target)
-      })
-      .finally(() => arming.delete(target))
-    arming.set(target, result)
-    return result
+      .catch(() => armMissing(target))
   }
-  const add = async (target: string, retry: boolean) => {
-    await arm(target, retry)
+  const add = (target: string) => {
+    arm(target)
     // A symlinked source receives edits at its resolved target.
-    await lstat(target)
+    lstat(target)
       .then((info) => {
         if (!info.isSymbolicLink()) return
-        return realpath(target).then((target) => arm(target, retry))
+        return realpath(target).then(arm)
       })
       .catch(() => undefined)
   }
   const dispose = () => {
     disposed = true
-    clearInterval(poll)
     for (const watcher of watchers.values()) watcher.close()
-    watchers.clear()
-    watched.clear()
-    missing.clear()
-  }
-  const poll = setInterval(() => missing.forEach((target) => arm(target, true)), 500)
-  poll.unref()
-  return {
-    add: (target: string) => add(target, false),
-    wait: (target: string) => add(target, true),
-    dispose,
+    for (const item of missing.values()) item.watcher.close()
   }
+  return { add, dispose }
 }
 
-function isMissing(error: unknown) {
-  if (!error || typeof error !== "object") return false
-  const code = Reflect.get(error, "code")
-  return code === "ENOENT" || code === "ENOTDIR"
+function nearestExistingParent(target: string) {
+  const dir = path.dirname(target)
+  if (existsSync(dir)) return dir
+  if (dir === path.dirname(dir)) return
+  return nearestExistingParent(dir)
 }

packages/tui/src/routes/session/index.tsx

@@ -64,7 +64,6 @@ import { errorMessage } from "../../util/error"
 import { useToast } from "../../ui/toast"
 import stripAnsi from "strip-ansi"
 import { usePromptRef } from "../../context/prompt"
-import { sessionTabsFitVertically, SESSION_SIDEBAR_WIDTH } from "../../ui/layout"
 import { projectedPromptInput } from "../../prompt/codec"
 import { useEpilogue } from "../../context/epilogue"
 import { normalizePath } from "../../util/path"
@@ -200,21 +199,14 @@ export function Session() {
   const diffWrapMode = createMemo(() => config.diffs?.wrap ?? "word")
   const groupExploration = createMemo(() => config.session?.grouping !== "none")
 
-  const availableWidth = createMemo(
-    () =>
-      dimensions().width -
-      (config.tabs?.enabled && config.tabs.vertical && sessionTabsFitVertically(dimensions().width)
-        ? SESSION_SIDEBAR_WIDTH
-        : 0),
-  )
-  const wide = createMemo(() => availableWidth() > 120)
+  const wide = createMemo(() => dimensions().width > 120)
   const sidebarVisible = createMemo(() => {
     if (session()?.parentID) return false
     if (sidebarOpen()) return true
     if (sidebar() === "auto" && wide()) return true
     return false
   })
-  const contentWidth = createMemo(() => availableWidth() - (sidebarVisible() ? 42 : 0) - 4)
+  const contentWidth = createMemo(() => dimensions().width - (sidebarVisible() ? 42 : 0) - 4)
   const models = createMemo(() => data.location.model.list(location()) ?? [])
 
   const scrollAcceleration = createMemo(() => getScrollAcceleration(config))

packages/tui/src/routes/session/sidebar.tsx

@@ -6,7 +6,6 @@ import { PluginSlot } from "../../plugin/render"
 import { withTimestampedFallback } from "@opencode-ai/util/session-title-fallback"
 
 import { getScrollAcceleration } from "../../util/scroll"
-import { SESSION_SIDEBAR_WIDTH } from "../../ui/layout"
 
 export function Sidebar(props: { sessionID: string; overlay?: boolean }) {
   const data = useData()
@@ -19,7 +18,7 @@ export function Sidebar(props: { sessionID: string; overlay?: boolean }) {
     <Show when={session()}>
       <box
         backgroundColor={theme.background.default}
-        width={SESSION_SIDEBAR_WIDTH}
+        width={42}
         height="100%"
         paddingTop={1}
         paddingBottom={1}
@@ -28,15 +27,9 @@ export function Sidebar(props: { sessionID: string; overlay?: boolean }) {
         position={props.overlay ? "absolute" : "relative"}
       >
         <scrollbox
-          ref={(scroll) =>
-            queueMicrotask(() => {
-              if (!scroll.isDestroyed) scroll.verticalScrollBar.resetVisibilityControl()
-            })
-          }
           flexGrow={1}
           scrollAcceleration={scrollAcceleration()}
           verticalScrollbarOptions={{
-            visible: false,
             trackOptions: {
               backgroundColor: theme.background.default,
               foregroundColor: theme.scrollbar.default,

packages/tui/src/theme/discovery.ts

@@ -1,6 +1,15 @@
 import { readdir, readFile } from "node:fs/promises"
 import path from "node:path"
 
+export function themeDirectories(config: string, cwd: string) {
+  const directories: string[] = []
+  for (let current = cwd; ; current = path.dirname(current)) {
+    directories.push(path.join(current, ".opencode"))
+    if (path.dirname(current) === current) break
+  }
+  return [config, ...directories.reverse()]
+}
+
 export async function discoverThemes(directories: string[]) {
   const result: Record<string, unknown> = {}
   for (const directory of directories) {

packages/tui/src/ui/dialog-prompt.tsx

@@ -1,7 +1,7 @@
 import { TextareaRenderable, TextAttributes } from "@opentui/core"
 import { Keymap } from "../context/keymap"
 import { useTheme } from "../context/theme"
-import { useDialog } from "./dialog"
+import { useDialog, type DialogContext } from "./dialog"
 import { Show, createEffect, createSignal, onMount, type JSX } from "solid-js"
 import { Spinner } from "../component/spinner"
 
@@ -112,3 +112,14 @@ export function DialogPrompt(props: DialogPromptProps) {
     </box>
   )
 }
+
+DialogPrompt.show = (dialog: DialogContext, title: string, options?: Omit<DialogPromptProps, "title">) => {
+  return new Promise<string | null>((resolve) => {
+    dialog.replace(
+      () => (
+        <DialogPrompt title={title} {...options} onConfirm={(value) => resolve(value)} onCancel={() => resolve(null)} />
+      ),
+      () => resolve(null),
+    )
+  })
+}

packages/tui/src/ui/layout.ts

@@ -1,6 +0,0 @@
-export const SESSION_SIDEBAR_WIDTH = 42
-const SESSION_CONTENT_MIN_WIDTH = 44
-
-export function sessionTabsFitVertically(total: number) {
-  return total >= SESSION_SIDEBAR_WIDTH + SESSION_CONTENT_MIN_WIDTH
-}

packages/tui/src/util/config-directories.ts

@@ -1,45 +0,0 @@
-import path from "node:path"
-import { stat } from "node:fs/promises"
-
-export function configDirectories(config: string, cwd: string) {
-  return [...new Set([config, ...ancestors(cwd).map((directory) => path.join(directory, ".opencode"))])]
-}
-
-export function projectConfigDirectories(project: string, cwd: string) {
-  const directories = ancestors(cwd)
-  return directories
-    .slice(directories.indexOf(path.resolve(project)))
-    .map((directory) => path.join(directory, ".opencode"))
-}
-
-export async function localProjectDirectory(cwd: string) {
-  const directories = ancestors(cwd)
-  const repositories = await Promise.all(
-    directories.map((directory) =>
-      Promise.all(
-        [".git", ".hg"].map((name) =>
-          stat(path.join(directory, name)).then(
-            () => true,
-            (error) => (isMissingPath(error) ? false : Promise.reject(error)),
-          ),
-        ),
-      ).then((matches) => matches.some(Boolean)),
-    ),
-  )
-  return directories.findLast((_, index) => repositories[index]) ?? path.resolve(cwd)
-}
-
-export function isMissingPath(error: unknown) {
-  if (!error || typeof error !== "object") return false
-  const code = Reflect.get(error, "code")
-  return code === "ENOENT" || code === "ENOTDIR"
-}
-
-function ancestors(cwd: string) {
-  const directories: string[] = []
-  for (let current = path.resolve(cwd); ; current = path.dirname(current)) {
-    directories.push(current)
-    if (path.dirname(current) === current) break
-  }
-  return directories.reverse()
-}

packages/tui/src/util/project.ts

@@ -1,7 +0,0 @@
-import path from "path"
-
-export function projectName(project?: { canonical: string; name?: string }, fallback = "") {
-  const canonical = project?.canonical ?? fallback
-  if (canonical === "/") return fallback ? path.basename(fallback) : undefined
-  return project?.name || path.basename(canonical)
-}

packages/tui/test/cli/cmd/tui/model-options.test.ts

@@ -1,23 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { prioritizeFavorites, sortModelOptions } from "../../../../src/component/dialog-model"
-
-describe("prioritizeFavorites", () => {
-  test("moves favorites first while preserving fuzzy result order", () => {
-    const prioritized = prioritizeFavorites([
-      { title: "Best match", favorite: false },
-      { title: "Favorite match", favorite: true },
-      { title: "Second best match", favorite: false },
-      { title: "Second favorite match", favorite: true },
-    ])
-
-    expect(prioritized.map((model) => model.title)).toEqual([
-      "Favorite match",
-      "Second favorite match",
-      "Best match",
-      "Second best match",
-    ])
-  })
-})
+import { sortModelOptions } from "../../../../src/component/dialog-model"
 
 describe("sortModelOptions", () => {
   test("orders opencode models before other providers", () => {

packages/tui/test/config-v2.test.tsx

@@ -17,7 +17,7 @@ test("validates mini replay settings", () => {
 test("validates the session tabs setting", () => {
   const decode = Schema.decodeUnknownSync(Info)
 
-  expect(decode({ tabs: { enabled: true, vertical: true } })).toEqual({ tabs: { enabled: true, vertical: true } })
+  expect(decode({ tabs: { enabled: true } })).toEqual({ tabs: { enabled: true } })
   expect(() => decode({ tabs: { enabled: "on" } })).toThrow()
 })
 

packages/tui/test/feature-plugins/sidebar-context.test.tsx

@@ -1,70 +0,0 @@
-/** @jsxImportSource @opentui/solid */
-import { expect, test } from "bun:test"
-import { RGBA } from "@opentui/core"
-import { testRender } from "@opentui/solid"
-import type { Context } from "@opencode-ai/plugin/tui/context"
-import { SidebarContext } from "../../src/feature-plugins/sidebar/context"
-
-function context(options?: { cost?: number; tokens?: number }) {
-  const color = RGBA.fromInts(200, 200, 200)
-  return {
-    theme: { text: { default: color, subdued: color } },
-    data: {
-      session: {
-        get: () => ({ location: { directory: "/workspace" } }),
-        cost: () => options?.cost ?? 0,
-        message: {
-          list: () =>
-            options?.tokens
-              ? [
-                  {
-                    id: "message",
-                    type: "assistant",
-                    model: { providerID: "provider", id: "model" },
-                    tokens: {
-                      input: options.tokens,
-                      output: 0,
-                      reasoning: 0,
-                      cache: { read: 0, write: 0 },
-                    },
-                  },
-                ]
-              : [],
-        },
-      },
-      location: {
-        model: { list: () => [] },
-      },
-    },
-  } as unknown as Context
-}
-
-test("sidebar omits context before usage is available", async () => {
-  const app = await testRender(() => <SidebarContext context={context()} sessionID="session" />, {
-    width: 42,
-    height: 8,
-  })
-
-  try {
-    await app.renderOnce()
-    expect(app.captureCharFrame()).not.toContain("Context")
-    expect(app.captureCharFrame()).not.toContain("Not measured")
-  } finally {
-    app.renderer.destroy()
-  }
-})
-
-test("sidebar shows available context usage", async () => {
-  const app = await testRender(() => <SidebarContext context={context({ tokens: 1234 })} sessionID="session" />, {
-    width: 42,
-    height: 8,
-  })
-
-  try {
-    await app.renderOnce()
-    expect(app.captureCharFrame()).toContain("Context")
-    expect(app.captureCharFrame()).toContain("1,234 tokens")
-  } finally {
-    app.renderer.destroy()
-  }
-})

packages/tui/test/mini/fixture/footer-api.ts

@@ -3,10 +3,6 @@ import type { FooterApi, FooterEvent, RunPrompt, StreamCommit } from "../../../s
 export function createFooterApiFixture(input: { events?: FooterEvent[]; commits?: StreamCommit[] } = {}) {
   const prompts = new Set<(input: RunPrompt) => void>()
   const closes = new Set<() => void>()
-  let ready!: () => void
-  const promptReady = new Promise<void>((resolve) => {
-    ready = resolve
-  })
   const events = input.events ?? []
   const commits = input.commits ?? []
   const calls: Array<{ type: "event"; value: FooterEvent } | { type: "commit"; value: StreamCommit }> = []
@@ -18,7 +14,6 @@ export function createFooterApiFixture(input: { events?: FooterEvent[]; commits?
     },
     onPrompt(fn) {
       prompts.add(fn)
-      ready()
       return () => prompts.delete(fn)
     },
     onClose(fn) {
@@ -55,12 +50,9 @@ export function createFooterApiFixture(input: { events?: FooterEvent[]; commits?
     events,
     commits,
     calls,
-    promptReady,
     submit(text: string, mode?: RunPrompt["mode"]) {
-      if (prompts.size === 0) return false
       const prompt: RunPrompt = mode ? { text, parts: [], mode } : { text, parts: [] }
       for (const fn of [...prompts]) fn(prompt)
-      return true
     },
   }
 }

packages/tui/test/mini/runtime.test.ts

@@ -55,9 +55,6 @@ describe("run interactive runtime", () => {
     const api = ui.api
     const selected = defer<Awaited<ReturnType<typeof sdk.model.default>>>()
     const catalogLoaded = defer<void>()
-    const defaultModelReloaded = defer<void>()
-    const modelShown = defer<void>()
-    const turnStarted = defer<void>()
     const model = catalogModel({
       id: "resolved",
       providerID: "test",
@@ -72,17 +69,7 @@ describe("run interactive runtime", () => {
       providers: [catalogProvider("test", "Test Provider")],
       models: [model],
     })
-    let defaultModelCalls = 0
-    const defaultModel = spyOn(sdk.model, "default").mockImplementation(() => {
-      defaultModelCalls++
-      if (defaultModelCalls === 2) defaultModelReloaded.resolve()
-      return selected.promise
-    })
-    const emit = api.event.bind(api)
-    api.event = (event) => {
-      emit(event)
-      if (event.type === "model") modelShown.resolve()
-    }
+    const defaultModel = spyOn(sdk.model, "default").mockImplementation(() => selected.promise)
 
     const task = runInteractiveDeferredMode(
       {
@@ -123,7 +110,6 @@ describe("run interactive runtime", () => {
               runPromptTurn: async (input) => {
                 turnAgent = input.agent
                 turnModel = input.model
-                turnStarted.resolve()
                 api.close()
               },
               queuePromptTurn: async () => {},
@@ -147,8 +133,8 @@ describe("run interactive runtime", () => {
       location: { directory: "/tmp", project: { id: "pro-1", directory: "/tmp", canonical: "/tmp" } },
       data: model,
     })
-    await defaultModelReloaded.promise
-    await modelShown.promise
+    while (defaultModel.mock.calls.length < 2) await Bun.sleep(0)
+    while (!events.some((event) => event.type === "model")) await Bun.sleep(0)
     expect(events).toContainEqual({
       type: "model",
       model: "Resolved Model · Test Provider",
@@ -156,9 +142,8 @@ describe("run interactive runtime", () => {
     })
     expect(lifecycle.onCycleVariant?.()).toMatchObject({ status: "variant low", variant: "low" })
     lifecycle.onAgentSelect?.("review")
-    await ui.promptReady
-    expect(ui.submit("hello")).toBe(true)
-    await turnStarted.promise
+    ui.submit("hello")
+    while (!turnModel) await Bun.sleep(0)
     expect(turnAgent).toBe("review")
     expect(turnModel).toEqual({ providerID: "test", modelID: "resolved" })
     await task

packages/tui/test/plugin-discovery.test.ts

@@ -1,8 +1,7 @@
 import { mkdir, writeFile } from "node:fs/promises"
 import path from "node:path"
 import { expect, test } from "bun:test"
-import { discoverTuiPlugins, tuiPluginDirectories } from "../src/plugin/discovery"
-import { localProjectDirectory } from "../src/util/config-directories"
+import { discoverTuiPlugins } from "../src/plugin/discovery"
 import { tmpdir } from "./fixture/fixture"
 
 test("discovers project TUI plugin files in stable order", async () => {
@@ -16,57 +15,13 @@ test("discovers project TUI plugin files in stable order", async () => {
     writeFile(path.join(directory, "nested", "ignored.ts"), "export default {}"),
   ])
 
-  expect(
-    await discoverTuiPlugins(await tuiPluginDirectories(tmp.path, path.join(tmp.path, "config"))),
-  ).toEqual([path.join(directory, "first.js"), path.join(directory, "second.tsx")])
+  expect(await discoverTuiPlugins(tmp.path)).toEqual([
+    path.join(directory, "first.js"),
+    path.join(directory, "second.tsx"),
+  ])
 })
 
 test("returns no project TUI plugins when the directory is absent", async () => {
   await using tmp = await tmpdir()
-  const roots = await tuiPluginDirectories(tmp.path, path.join(tmp.path, "config"))
-  expect(await discoverTuiPlugins(roots)).toEqual([])
-  expect(roots).toContain(path.join(tmp.path, ".opencode", "plugins", "tui"))
-})
-
-test("discovers global and ancestor plugin roots in precedence order", async () => {
-  await using tmp = await tmpdir()
-  const cwd = path.join(tmp.path, "repo", "packages", "app")
-  const project = path.join(tmp.path, "repo")
-  const config = path.join(tmp.path, "config")
-  const directories = [
-    path.join(config, "plugins", "tui"),
-    path.join(tmp.path, "repo", ".opencode", "plugins", "tui"),
-    path.join(tmp.path, "repo", "packages", ".opencode", "plugins", "tui"),
-  ]
-  const outside = path.join(tmp.path, ".opencode", "plugins", "tui")
-  await mkdir(path.join(project, ".git"), { recursive: true })
-  await Promise.all([...directories, outside].map((directory) => mkdir(directory, { recursive: true })))
-  await Promise.all(
-    directories.map((directory, index) => writeFile(path.join(directory, `${index}.ts`), "export default {}")),
-  )
-  await writeFile(path.join(outside, "outside.ts"), "export default {}")
-
-  const roots = await tuiPluginDirectories(cwd, config)
-  expect(await discoverTuiPlugins(roots)).toEqual(
-    directories.map((directory, index) => path.join(directory, `${index}.ts`)),
-  )
-  expect(roots).not.toContain(path.join(cwd, ".opencode", "plugins", "tui"))
-  expect(roots).not.toContain(outside)
-})
-
-test("uses an Hg root for a missing project plugin directory", async () => {
-  await using tmp = await tmpdir()
-  const project = path.join(tmp.path, "repo")
-  const cwd = path.join(project, "package")
-  await mkdir(path.join(project, ".hg"), { recursive: true })
-  await mkdir(cwd, { recursive: true })
-
-  expect(await tuiPluginDirectories(cwd, path.join(tmp.path, "config"))).toContain(
-    path.join(project, ".opencode", "plugins", "tui"),
-  )
-})
-
-test("propagates non-missing filesystem errors", async () => {
-  await expect(localProjectDirectory("\0")).rejects.toBeInstanceOf(Error)
-  await expect(discoverTuiPlugins(["\0"])).rejects.toBeInstanceOf(Error)
+  expect(await discoverTuiPlugins(tmp.path)).toEqual([])
 })

packages/tui/test/plugin-hot-reload.test.tsx

@@ -1,10 +1,11 @@
 import { expect, mock, test } from "bun:test"
 import { createTestRenderer } from "@opentui/core/testing"
 import { Effect, FileSystem } from "effect"
+import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { Global } from "@opencode-ai/util/global"
 import { mkdir, readFile, symlink, writeFile } from "node:fs/promises"
 import path from "node:path"
-import { createEventStream, createFetch, json } from "./fixture/tui-client"
+import { createEventStream, createFetch } from "./fixture/tui-client"
 import { tmpdir } from "./fixture/fixture"
 
 function lifecycleSource(marker: string, id: string, version: string) {
@@ -35,16 +36,7 @@ async function bootApp(directory: string) {
   const core = await import("@opentui/core")
   mock.module("@opentui/core", () => ({ ...core, createCliRenderer: async () => setup.renderer }))
   const events = createEventStream()
-  const calls = createFetch((url) => {
-    if (url.pathname !== "/api/fs/list") return
-    return json({
-      location: {
-        directory,
-        project: { id: "proj_test", directory, canonical: directory },
-      },
-      data: [],
-    })
-  }, events)
+  const calls = createFetch(undefined, events)
   const server = Bun.serve({ port: 0, fetch: (request) => calls.fetch(request) })
   const cwd = process.cwd()
   process.chdir(directory)
@@ -57,13 +49,11 @@ async function bootApp(directory: string) {
       packages: { resolve: async () => undefined },
       args: {},
       log: () => {},
-    }).pipe(
-      Effect.provide(Global.layerWith({ config: path.join(directory, ".global") })),
-      Effect.provide(FileSystem.layerNoop({})),
-    ),
+    }).pipe(Effect.provide(AppNodeBuilder.build(Global.node)), Effect.provide(FileSystem.layerNoop({}))),
   )
   return {
     task,
+    renderer: setup,
     async [Symbol.asyncDispose]() {
       process.chdir(cwd)
       if (!setup.renderer.isDestroyed) setup.renderer.destroy()
@@ -73,34 +63,6 @@ async function bootApp(directory: string) {
   }
 }
 
-test("discovers an ancestor TUI plugin directory created after startup", async () => {
-  await using tmp = await tmpdir()
-  const cwd = path.join(tmp.path, "repo", "packages", "app")
-  await mkdir(cwd, { recursive: true })
-  await mkdir(path.join(tmp.path, "repo", ".git"))
-  const ready = path.join(tmp.path, "ready.txt")
-  const marker = path.join(tmp.path, "marker.txt")
-  const initial = path.join(cwd, ".opencode", "plugins", "tui")
-  await mkdir(initial, { recursive: true })
-  await writeFile(path.join(initial, "ready.ts"), lifecycleSource(ready, "test.ready", "ready"))
-
-  await using app = await bootApp(cwd)
-  expect(await until(() => readFile(ready, "utf8"), (value) => value === "ready:setup\n")).toBe("ready:setup\n")
-  const directory = path.join(tmp.path, "repo", ".opencode", "plugins", "tui")
-  await mkdir(directory, { recursive: true })
-  await writeFile(path.join(directory, "hot.ts"), lifecycleSource(marker, "test.hot", "v1"))
-
-  expect(
-    await until(
-      () => readFile(marker, "utf8"),
-      (value) => value === "v1:setup\n",
-    ),
-  ).toBe("v1:setup\n")
-
-  process.emit("SIGHUP")
-  await app.task
-})
-
 test("editing a discovered TUI plugin hot-reloads its fresh module", async () => {
   await using tmp = await tmpdir()
   const directory = path.join(tmp.path, ".opencode", "plugins", "tui")
@@ -120,6 +82,32 @@ test("editing a discovered TUI plugin hot-reloads its fresh module", async () =>
   await app.task
 })
 
+test("creating the TUI plugin directory after startup discovers its first plugin", async () => {
+  await using tmp = await tmpdir()
+  const directory = path.join(tmp.path, ".opencode", "plugins", "tui")
+  await mkdir(path.dirname(directory), { recursive: true })
+  const marker = path.join(tmp.path, "marker.txt")
+  const placeholders = ["Fix a TODO in the codebase", "What is the tech stack of this project?", "Fix broken tests"]
+
+  await using app = await bootApp(tmp.path)
+  const frame = await until(
+    async () => {
+      await app.renderer.renderOnce()
+      return app.renderer.captureCharFrame()
+    },
+    (value) => placeholders.some((text) => value?.includes(text)),
+  )
+  expect(placeholders.some((text) => frame?.includes(text))).toBe(true)
+  await mkdir(directory)
+  await writeFile(path.join(directory, "hot.ts"), lifecycleSource(marker, "test.hot", "v1"))
+
+  const read = () => readFile(marker, "utf8")
+  expect(await until(read, (value) => value === "v1:setup\n")).toBe("v1:setup\n")
+
+  process.emit("SIGHUP")
+  await app.task
+})
+
 test("a plugin whose slot render throws does not take down the TUI", async () => {
   await using tmp = await tmpdir()
   const directory = path.join(tmp.path, ".opencode", "plugins", "tui")

packages/tui/test/theme.test.ts

@@ -12,8 +12,7 @@ import {
   setCustomThemes,
   upsertTheme,
 } from "../src/theme"
-import { discoverThemes } from "../src/theme/discovery"
-import { configDirectories } from "../src/util/config-directories"
+import { discoverThemes, themeDirectories } from "../src/theme/discovery"
 import { terminalMode } from "../src/theme/system"
 import { tmpdir } from "./fixture/fixture"
 
@@ -188,7 +187,7 @@ test("theme directories include global config before project directories", async
   await writeFile(path.join(global, "themes", "global.json"), JSON.stringify({ source: "global" }))
   await writeFile(path.join(project, ".opencode", "themes", "project.json"), JSON.stringify({ source: "project" }))
 
-  await expect(discoverThemes(configDirectories(global, project))).resolves.toEqual({
+  await expect(discoverThemes(themeDirectories(global, project))).resolves.toEqual({
     global: { source: "global" },
     project: { source: "project" },
   })

packages/tui/test/ui/layout.test.ts

@@ -1,8 +0,0 @@
-import { expect, test } from "bun:test"
-import { sessionTabsFitVertically, SESSION_SIDEBAR_WIDTH } from "../../src/ui/layout"
-
-test("vertical tabs match the session sidebar and preserve compact content width", () => {
-  expect(SESSION_SIDEBAR_WIDTH).toBe(42)
-  expect(sessionTabsFitVertically(86)).toBe(true)
-  expect(sessionTabsFitVertically(85)).toBe(false)
-})