feat(tui): host plugin panels with shared pane focus

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

@@ -47,7 +47,6 @@ export default Runtime.handler(Commands, (input) =>
       ),
     )
     const updater = yield* Updater.Service
-    if (!server.service) yield* updater.check().pipe(Effect.forkScoped)
     preflight.loading()
     const config = yield* Config.Service
     const npm = yield* Npm.Service
@@ -83,11 +82,14 @@ export default Runtime.handler(Commands, (input) =>
         get: () => runPromise(config.get()),
         update: (update) => runPromise(config.update(update)),
       },
-      updater: service
-        ? {
-            apply: (version) => runPromise(updater.apply(version)),
-          }
-        : undefined,
+      updater: {
+        monitor: (notify, signal) =>
+          runPromise(
+            updater.monitor((version) => Effect.sync(() => notify(version))),
+            { signal },
+          ),
+        apply: (version) => runPromise(updater.apply(version)),
+      },
       packages: {
         prepare: (spec, install = true) => runPromise(install ? npm.add(spec) : npm.resolve(spec)),
       },

packages/cli/src/server-process.ts

@@ -7,14 +7,12 @@ import { Global } from "@opencode-ai/util/global"
 import { OPENCODE_ARTIFACT, OPENCODE_CHANNEL, OPENCODE_VERSION } from "./version"
 import { AppProcess } from "@opencode-ai/util/process"
 import { randomBytes, randomUUID } from "node:crypto"
-import { spawn } from "node:child_process"
-import { Deferred, Effect, Option, Redacted, Schedule, Schema } from "effect"
+import { Effect, Option, Redacted, Schedule, Schema } from "effect"
 import { PersistentPty } from "@opencode-ai/schema/persistent-pty"
 import { HttpServer } from "effect/unstable/http"
 import { Env } from "./env"
 import { ServiceConfig } from "./services/service-config"
 import { ServiceRegistration } from "./services/service-registration"
-import { Updater } from "./services/updater"
 import { WebUi } from "./services/web-ui"
 
 export type Mode = "default" | "service" | "stdio"
@@ -29,7 +27,6 @@ export type Options = {
 // The process effect lives until server shutdown; tracing it would parent every request to one process-lifetime trace.
 export const run = Effect.fnUntraced(function* (options: Options) {
   return yield* processEffect(options).pipe(
-    Effect.provide(Updater.layer),
     Effect.provide(
       LayerNode.compile(LayerNode.group([Global.node, AppProcess.node]), {
         replacements: [
@@ -54,8 +51,7 @@ const processEffect = Effect.fnUntraced(function* (options: Options) {
         )
   const global = yield* Global.Service
   if (options.mode === "service") yield* Effect.sync(() => process.chdir(global.home))
-  const replacement = yield* Deferred.make<PersistentPty.Handoff | null>()
-  const next = yield* Effect.scoped(
+  return yield* Effect.scoped(
     Effect.gen(function* () {
       const foreground = options.mode === "default"
       const serviceOptions = options.mode === "service" ? yield* ServiceConfig.options() : undefined
@@ -66,7 +62,7 @@ const processEffect = Effect.fnUntraced(function* (options: Options) {
         serviceOptions !== undefined && port !== undefined
           ? yield* Service.incumbent({ ...serviceOptions, url: serviceURL(hostname, port) })
           : undefined
-      if (incumbent !== undefined) return Option.none<PersistentPty.Handoff | null>()
+      if (incumbent !== undefined) return
       const { start } = yield* Effect.promise(() => import("@opencode-ai/server/process"))
       const environmentPassword = yield* Env.password
       // Keep the lease credential out of the environment inherited by tools.
@@ -163,62 +159,17 @@ const processEffect = Effect.fnUntraced(function* (options: Options) {
           )
         }),
       )
-      if (server === undefined) return Option.none<PersistentPty.Handoff | null>()
+      if (server === undefined) return
       const url = HttpServer.formatAddress(server.address)
       console.log(options.mode === "stdio" ? JSON.stringify({ url }) : `server listening on ${url}`)
       if (foreground && !environmentPassword) console.log(`server password ${password}`)
-      const updater = yield* Updater.Service
-      yield* updater
-        .monitor({
-          url,
-          password,
-          managed: options.mode === "service",
-          notify: server.updateAvailable,
-          restart: (handoff) => Deferred.succeed(replacement, handoff).pipe(Effect.asVoid),
-        })
-        .pipe(Effect.forkScoped)
       return yield* options.mode === "service"
-        ? Effect.raceFirst(
-            server.shutdown.pipe(Effect.as(Option.none<PersistentPty.Handoff | null>())),
-            Deferred.await(replacement).pipe(Effect.map(Option.some)),
-          )
+        ? server.shutdown
         : options.mode === "stdio"
-          ? waitForStdinClose().pipe(Effect.as(Option.none<PersistentPty.Handoff | null>()))
+          ? waitForStdinClose()
           : Effect.never
     }).pipe(Effect.annotateLogs({ role: "server" })),
   )
-  if (Option.isNone(next)) return
-  yield* spawnReplacement(next.value)
-})
-
-const spawnReplacement = Effect.fnUntraced(function* (handoff: PersistentPty.Handoff | null) {
-  const options = yield* ServiceConfig.options()
-  const [command, ...args] = options.command
-  if (!command) return yield* Effect.fail(new Error("Failed to resolve CLI command for restart"))
-  // We do not monitor the replacement after spawn. A managed TUI
-  // recovers with Service.ensure if startup fails; a future client
-  // restart signal could coordinate that recovery instead.
-  yield* Effect.tryPromise({
-    try: () =>
-      new Promise<void>((resolve, reject) => {
-        const child = spawn(command, args, {
-          detached: true,
-          stdio: "ignore",
-          windowsHide: true,
-          env: {
-            ...process.env,
-            ...options.env,
-            OPENCODE_PTY_HANDOFF: handoff ? JSON.stringify(handoff) : undefined,
-          },
-        })
-        child.once("spawn", () => {
-          child.unref()
-          resolve()
-        })
-        child.once("error", reject)
-      }),
-    catch: (cause) => new Error("Failed to start replacement server", { cause }),
-  })
 })
 
 const recognizeIncumbent = Effect.fnUntraced(function* (options: DiscoverOptions, hostname: string, port: number) {

packages/cli/src/services/updater-action.ts

@@ -1,5 +1,5 @@
-export type Policy = "disable" | "notify" | "auto"
-export type Action = "none" | "notify" | "upgrade"
+export type Policy = "disable" | "notify"
+export type Action = "none" | "notify"
 
 const maximumComponent = "9007199254740991"
 const versionPattern =
@@ -10,10 +10,7 @@ export function action(current: string, latest: string, policy: Policy): Action
   const currentVersion = parseReleaseVersion(current)
   const latestVersion = parseReleaseVersion(latest)
   if (!currentVersion || !latestVersion || sameRelease(currentVersion, latestVersion)) return "none"
-  if (policy === "notify") return "notify"
-  // Major upgrades are never installed automatically.
-  if (currentVersion.major !== latestVersion.major) return "notify"
-  return "upgrade"
+  return "notify"
 }
 
 export function parseReleaseVersion(input: string) {

packages/cli/src/services/updater.test.ts

@@ -6,22 +6,17 @@ describe("updater", () => {
   test("reads update policy from JSONC", () => {
     expect(decodePolicy('{ // preference\n "update": "notify",\n}')).toBe("notify")
     expect(decodePolicy('{ "update": "disable" }')).toBe("disable")
-    expect(decodePolicy('{ "update": "auto" }')).toBe("auto")
+    expect(decodePolicy('{ "update": "auto" }')).toBe("notify")
     expect(decodePolicy('{ "update": "invalid" }')).toBeUndefined()
   })
 
   test("maps the v1 update policy", () => {
     expect(decodePolicy('{ "autoupdate": false }')).toBe("disable")
     expect(decodePolicy('{ "autoupdate": "notify" }')).toBe("notify")
-    expect(decodePolicy('{ "autoupdate": true }')).toBe("auto")
+    expect(decodePolicy('{ "autoupdate": true }')).toBe("notify")
   })
 
-  test("automatically updates patches and minors", () => {
-    expect(action("1.2.3", "1.2.4", "auto")).toBe("upgrade")
-    expect(action("1.2.3", "1.3.0", "auto")).toBe("upgrade")
-  })
-
-  test("reports patches and minors without automatically installing them", () => {
+  test("reports every available release", () => {
     expect(action("1.2.3", "1.2.4", "notify")).toBe("notify")
     expect(action("1.2.3", "1.3.0", "notify")).toBe("notify")
     expect(action("1.2.3", "2.0.0", "notify")).toBe("notify")
@@ -32,25 +27,21 @@ describe("updater", () => {
     expect(action("1.2.3", "1.2.4", "disable")).toBe("none")
   })
 
-  test("reports majors instead of automatically installing them", () => {
-    expect(action("1.2.3", "2.0.0", "auto")).toBe("notify")
-  })
-
   test("reports up-to-date only when versions match", () => {
-    expect(action("1.2.3", "1.2.3", "auto")).toBe("none")
+    expect(action("1.2.3", "1.2.3", "notify")).toBe("none")
   })
 
-  test("upgrades when latest is lower (rollback)", () => {
-    expect(action("1.2.4", "1.2.3", "auto")).toBe("upgrade")
+  test("reports when latest is lower (rollback)", () => {
+    expect(action("1.2.4", "1.2.3", "notify")).toBe("notify")
   })
 
   test("accepts strict release version variants", () => {
-    expect(action("v1.2.3", " 1.2.4\n", "auto")).toBe("upgrade")
-    expect(action("1.2.3-alpha.1", "1.2.3-alpha.2", "auto")).toBe("upgrade")
-    expect(action("0.0.0-dev-17403", "0.0.0-dev-17403.2", "auto")).toBe("upgrade")
-    expect(action("0.0.0-next-17403", "0.0.0-beta-17404", "auto")).toBe("upgrade")
-    expect(action("1.2.3+old", "1.2.3+new", "auto")).toBe("none")
-    expect(action("v1.2.3+old", "1.2.3", "auto")).toBe("none")
+    expect(action("v1.2.3", " 1.2.4\n", "notify")).toBe("notify")
+    expect(action("1.2.3-alpha.1", "1.2.3-alpha.2", "notify")).toBe("notify")
+    expect(action("0.0.0-dev-17403", "0.0.0-dev-17403.2", "notify")).toBe("notify")
+    expect(action("0.0.0-next-17403", "0.0.0-beta-17404", "notify")).toBe("notify")
+    expect(action("1.2.3+old", "1.2.3+new", "notify")).toBe("none")
+    expect(action("v1.2.3+old", "1.2.3", "notify")).toBe("none")
   })
 
   test("preserves strict validity", () => {
@@ -71,21 +62,21 @@ describe("updater", () => {
       "0.9007199254740992.0",
       "0.0.9007199254740992",
     ]
-    invalid.forEach((version) => expect(action("1.2.3", version, "auto"), version).toBe("none"))
+    invalid.forEach((version) => expect(action("1.2.3", version, "notify"), version).toBe("none"))
   })
 
   test("handles numeric limits without losing precision", () => {
-    expect(action("9007199254740991.0.0", "9007199254740991.0.1", "auto")).toBe("upgrade")
-    expect(action("9007199254740990.0.0", "9007199254740991.0.0", "auto")).toBe("notify")
+    expect(action("9007199254740991.0.0", "9007199254740991.0.1", "notify")).toBe("notify")
+    expect(action("9007199254740990.0.0", "9007199254740991.0.0", "notify")).toBe("notify")
   })
 
   test("preserves equality for oversized numeric prerelease identifiers", () => {
-    expect(action("1.0.0-9007199254740992", "1.0.0-9007199254740993", "auto")).toBe("none")
-    expect(action("1.0.0-9007199254740991", "1.0.0-9007199254740992", "auto")).toBe("upgrade")
+    expect(action("1.0.0-9007199254740992", "1.0.0-9007199254740993", "notify")).toBe("none")
+    expect(action("1.0.0-9007199254740991", "1.0.0-9007199254740992", "notify")).toBe("notify")
   })
 
   test("rejects versions longer than semver's limit before trimming", () => {
-    expect(action("1.2.3", `${" ".repeat(251)}1.2.3`, "auto")).toBe("none")
-    expect(action("1.2.3", `1.2.4+${"a".repeat(250)}`, "auto")).toBe("upgrade")
+    expect(action("1.2.3", `${" ".repeat(251)}1.2.3`, "notify")).toBe("none")
+    expect(action("1.2.3", `1.2.4+${"a".repeat(250)}`, "notify")).toBe("notify")
   })
 })

packages/cli/src/services/updater.ts

@@ -1,154 +1,36 @@
 import { Global } from "@opencode-ai/util/global"
 import { AppProcess } from "@opencode-ai/util/process"
-import { OpenCode } from "@opencode-ai/client"
-import { PersistentPty } from "@opencode-ai/schema/persistent-pty"
 import { OPENCODE_ARTIFACT, OPENCODE_CHANNEL, OPENCODE_LOCAL, OPENCODE_VERSION } from "../version"
-import { Context, Duration, Effect, FileSystem, Layer, Ref, Schedule, Semaphore, Stream } from "effect"
+import { Context, Duration, Effect, FileSystem, Layer, Schedule } from "effect"
 import { ChildProcess } from "effect/unstable/process"
 import { parse, type ParseError } from "jsonc-parser"
 import path from "node:path"
-import { action, parseReleaseVersion, type Action, type Policy } from "./updater-action"
+import { action, parseReleaseVersion, type Policy } from "./updater-action"
 
 export const methods = ["curl", "npm", "pnpm", "bun", "yarn"] as const
 export type Method = (typeof methods)[number]
 
 export interface Interface {
-  readonly check: () => Effect.Effect<void>
-  readonly monitor: (input: {
-    readonly url: string
-    readonly password: string
-    readonly managed: boolean
-    readonly notify: (version: string) => Effect.Effect<void>
-    readonly restart: (handoff: PersistentPty.Handoff | null) => Effect.Effect<void>
-  }) => Effect.Effect<void>
+  readonly monitor: (notify: (version: string) => Effect.Effect<void>) => Effect.Effect<void>
   readonly apply: (version: string) => Effect.Effect<void, Error>
   readonly method: () => Effect.Effect<Method | undefined>
   readonly latest: () => Effect.Effect<string, Error>
   readonly upgrade: (method: Method, version: string) => Effect.Effect<void, Error>
 }
 
-export type Inspection =
-  | { readonly action: "none" }
-  | { readonly action: Exclude<Action, "none">; readonly version: string }
-
-type State =
-  | { readonly type: "current" }
-  | { readonly type: "available"; readonly version: string; readonly availableSince: number }
-  | { readonly type: "ready-to-restart"; readonly version: string }
-
-export interface MonitorInput {
-  readonly url: string
-  readonly password: string
-  readonly managed: boolean
-  readonly inspect: () => Effect.Effect<Inspection, Error>
-  readonly install: (version: string) => Effect.Effect<boolean, Error>
-  readonly restart: (handoff: PersistentPty.Handoff | null) => Effect.Effect<void>
-  readonly interval?: Duration.Input
-  readonly notificationThreshold?: Duration.Input
+export const monitorUpdates = Effect.fnUntraced(function* (input: {
+  readonly inspect: () => Effect.Effect<string | undefined, Error>
   readonly notify: (version: string) => Effect.Effect<void>
-}
-
-export const monitorServer = Effect.fnUntraced(function* (input: MonitorInput) {
-  const state = yield* Ref.make<State>({ type: "current" })
-  const applyLock = yield* Semaphore.make(1)
-  const client = OpenCode.make({
-    baseUrl: input.url,
-    headers: { authorization: `Basic ${btoa(`opencode:${input.password}`)}` },
-  })
-
-  const applyIfIdle = () =>
-    applyLock.withPermit(
-      Effect.gen(function* () {
-        const pending = yield* Ref.get(state)
-        if (pending.type !== "available") return
-        const active = yield* Effect.tryPromise({
-          try: () => client.session.active(),
-          catch: (cause) => new Error("Failed to read active sessions", { cause }),
-        })
-        if (Object.keys(active).length > 0) return
-        const latest = yield* input.inspect()
-        if (latest.action !== "upgrade") {
-          yield* Ref.set(state, { type: "current" })
-          return
-        }
-        const installed = yield* input
-          .install(latest.version)
-          .pipe(
-            Effect.catch((error) =>
-              Effect.logWarning("automatic update failed", { cause: error }).pipe(Effect.as(false)),
-            ),
-          )
-        if (!installed) return
-        const handoff = input.managed
-          ? yield* Effect.tryPromise({
-              try: () => client.experimental.persistentPty.handoff(),
-              catch: (cause) => new Error("Failed to prepare persistent terminals for restart", { cause }),
-            })
-          : undefined
-        yield* Ref.set(state, { type: "ready-to-restart", version: latest.version })
-        if (handoff) yield* input.restart(handoff.handoff)
-      }),
-    )
-
-  const checkServer = Effect.gen(function* () {
-    const result = yield* input.inspect()
-    if (result.action === "notify") {
-      yield* input.notify(result.version)
-      return
-    }
-    if (result.action !== "upgrade") {
-      yield* Ref.update(
-        state,
-        (current): State => (current.type === "ready-to-restart" ? current : { type: "current" }),
-      )
-      return
-    }
-    yield* Ref.update(state, (current): State => {
-      if (current.type === "ready-to-restart" && current.version === result.version) return current
-      return {
-        type: "available",
-        version: result.version,
-        availableSince: current.type === "available" ? current.availableSince : Date.now(),
-      }
-    })
-    yield* applyIfIdle()
-    const pending = yield* Ref.get(state)
-    if (
-      pending.type === "available" &&
-      Date.now() - pending.availableSince >= Duration.toMillis(input.notificationThreshold ?? "3 days")
-    )
-      yield* input.notify(pending.version)
-  }).pipe(Effect.catch((cause) => Effect.logWarning("automatic update check failed", { cause })))
-
-  const subscribe = Effect.suspend(() =>
-    Stream.fromAsyncIterable(
-      client.event.subscribe(),
-      (cause) => new Error("Update event stream failed", { cause }),
-    ).pipe(
-      Stream.runForEach((event) => {
-        if (event.type === "server.connected") return applyIfIdle()
-        if (
-          event.type !== "session.execution.succeeded" &&
-          event.type !== "session.execution.failed" &&
-          event.type !== "session.execution.interrupted"
-        )
-          return Effect.void
-        return Effect.tryPromise({
-          try: () => client.session.wait({ sessionID: event.data.sessionID }),
-          catch: (cause) => new Error(`Failed to wait for Session ${event.data.sessionID}`, { cause }),
-        }).pipe(Effect.andThen(applyIfIdle()))
-      }),
-      Effect.catch((cause) => Effect.logWarning("update event stream disconnected", { cause })),
-    ),
-  ).pipe(Effect.repeat(Schedule.spaced("1 second")))
-
-  return yield* Effect.all(
-    [checkServer.pipe(Effect.repeat(Schedule.spaced(input.interval ?? "10 minutes"))), subscribe],
-    {
-      concurrency: "unbounded",
-      discard: true,
-    },
-  )
+  readonly initialDelay?: Duration.Input
+  readonly interval?: Duration.Input
+}) {
+  const interval = input.interval ?? "10 minutes"
+  const initialDelay = input.initialDelay ?? "90 seconds"
+  const check = Effect.gen(function* () {
+    const version = yield* input.inspect()
+    if (version !== undefined) yield* input.notify(version)
+  }).pipe(Effect.catch((error) => Effect.logWarning("update check failed", { error })))
+  return yield* check.pipe(Effect.repeat(Schedule.spaced(interval)), Effect.delay(initialDelay))
 })
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/cli/Updater") {}
@@ -161,13 +43,14 @@ export function decodePolicy(text: string): Policy | undefined {
   if (errors.length || typeof input !== "object" || input === null) return
   if ("update" in input) {
     const value = input.update
-    if (value === "disable" || value === "notify" || value === "auto") return value
+    if (value === "disable" || value === "notify") return value
+    if (value === "auto") return "notify"
     return
   }
   if (!("autoupdate" in input)) return
   if (input.autoupdate === false) return "disable"
   if (input.autoupdate === "notify") return "notify"
-  if (input.autoupdate === true) return "auto"
+  if (input.autoupdate === true) return "notify"
 }
 
 const make = Effect.gen(function* () {
@@ -192,7 +75,7 @@ const make = Effect.gen(function* () {
         Effect.orElseSucceed(() => undefined),
       ),
     )
-    return values.findLast((value) => value !== undefined) ?? "auto"
+    return values.findLast((value) => value !== undefined) ?? "notify"
   })
 
   const run = Effect.fnUntraced(function* (command: string[], timeout: Duration.Input = "10 seconds") {
@@ -302,19 +185,19 @@ const make = Effect.gen(function* () {
     return yield* Effect.fail(new Error(result.stderr.trim() || `Failed to update with ${method}`))
   })
 
-  const inspect = Effect.fnUntraced(function* (): Effect.fn.Return<Inspection, Error> {
+  const inspect = Effect.fnUntraced(function* () {
     if (OPENCODE_LOCAL || ["1", "true"].includes(process.env.OPENCODE_DISABLE_AUTOUPDATE?.toLowerCase() ?? "")) {
       yield* Effect.logInfo("update check skipped", {
         reason: OPENCODE_LOCAL ? "local-install" : "disabled",
         version: OPENCODE_VERSION,
         channel: OPENCODE_CHANNEL,
       })
-      return { action: "none" }
+      return undefined
     }
     const policy = yield* readPolicy()
     if (policy === "disable") {
       yield* Effect.logInfo("update check skipped", { reason: "policy-disabled" })
-      return { action: "none" }
+      return undefined
     }
 
     const version = yield* latest()
@@ -325,19 +208,16 @@ const make = Effect.gen(function* () {
     const next = action(OPENCODE_VERSION, version, policy)
     if (next === "none") {
       yield* Effect.logInfo("update check done", { action: "up-to-date" })
-      return { action: "none" }
+      return undefined
     }
-    if (next === "notify") {
-      yield* Effect.logInfo("OpenCode update available", { current: OPENCODE_VERSION, latest: version })
-      return { action: next, version }
-    }
-    return { action: next, version }
+    yield* Effect.logInfo("OpenCode update available", { current: OPENCODE_VERSION, latest: version })
+    return version
   })
 
   const install = Effect.fnUntraced(function* (version: string) {
     const detected = yield* method()
     if (!detected) {
-      yield* Effect.logWarning("automatic update skipped: installation method not found")
+      yield* Effect.logWarning("update skipped: installation method not found")
       return false
     }
     yield* upgrade(detected, version)
@@ -349,26 +229,9 @@ const make = Effect.gen(function* () {
     if (!(yield* install(version))) return yield* Effect.fail(new Error("Installation method not found"))
   })
 
-  const check = Effect.fn("cli.updater.check")(
-    function* () {
-      const result = yield* inspect()
-      if (result.action !== "upgrade") return
-      yield* install(result.version)
-    },
-    Effect.catchCause((cause) => Effect.logWarning("automatic update failed", { cause })),
-  )
+  const monitor = (notify: (version: string) => Effect.Effect<void>) => monitorUpdates({ inspect, notify })
 
-  const monitor = Effect.fn("cli.updater.monitor")(function* (input: {
-    readonly url: string
-    readonly password: string
-    readonly managed: boolean
-    readonly notify: (version: string) => Effect.Effect<void>
-    readonly restart: (handoff: PersistentPty.Handoff | null) => Effect.Effect<void>
-  }) {
-    return yield* monitorServer({ ...input, inspect, install })
-  })
-
-  return Service.of({ check, monitor, apply, method, latest, upgrade })
+  return Service.of({ monitor, apply, method, latest, upgrade })
 })
 
 export const layer = Layer.effect(Service, make)

packages/cli/test/fixture/upgrade.ts

@@ -12,9 +12,8 @@ await Effect.runPromise(
     process.argv.slice(2),
   ).pipe(
     Effect.provideService(Updater.Service, {
-      check: () => Effect.die("Manual upgrades must not run the automatic update check"),
       monitor: () => Effect.die("Manual upgrades must not monitor automatic updates"),
-      apply: () => Effect.die("Manual upgrades must not apply automatic updates"),
+      apply: () => Effect.die("Manual upgrades must not apply TUI updates"),
       method: () =>
         Effect.sync(() => {
           record("method")

packages/cli/test/updater-monitor.test.ts

@@ -1,107 +1,40 @@
 import { expect } from "bun:test"
-import { Deferred, Effect, Layer, Option } from "effect"
+import { Effect, Layer, Queue } from "effect"
+import { TestClock } from "effect/testing"
 import { testEffect } from "../../core/test/lib/effect"
 import { Updater } from "../src/services/updater"
 
 const it = testEffect(Layer.empty)
 
-it.live("installs and restarts after the final Session settles", () =>
+it.effect("checks after 90 seconds and every 10 minutes after that", () =>
   Effect.gen(function* () {
-    const fixture = yield* Effect.acquireRelease(Effect.sync(makeServer), (server) => Effect.sync(() => server.stop()))
-    const installed = yield* Deferred.make<string>()
-    const restarted = yield* Deferred.make<void>()
-    yield* Updater.monitorServer({
-      url: fixture.url,
-      password: "test",
-      managed: true,
-      inspect: () => Effect.succeed({ action: "upgrade", version: "1.1.0" }),
-      install: (version) => Deferred.succeed(installed, version).pipe(Effect.as(true)),
-      restart: () => Deferred.succeed(restarted, undefined).pipe(Effect.asVoid),
-      notify: () => Effect.void,
+    const updates = yield* Queue.unbounded<string>()
+    yield* Updater.monitorUpdates({
+      inspect: () => Effect.succeed("2.0.0"),
+      notify: (version) => Queue.offer(updates, version).pipe(Effect.asVoid),
     }).pipe(Effect.forkScoped)
-    yield* wait(fixture.activeRead, () => "Updater did not check active Sessions")
-    yield* wait(fixture.eventOpened, () => "Updater did not open the server event stream")
-    expect(Option.isNone(yield* Deferred.poll(installed))).toBe(true)
 
-    fixture.settle()
-    yield* wait(fixture.waited, () => "Updater did not receive the settlement event")
-    expect(
-      yield* Effect.raceFirst(
-        Deferred.await(installed),
-        Effect.sleep("1 second").pipe(Effect.andThen(Effect.fail(new Error("Updater did not install the update")))),
-      ),
-    ).toBe("1.1.0")
-    yield* Effect.raceFirst(
-      Deferred.await(restarted),
-      Effect.sleep("1 second").pipe(Effect.andThen(Effect.fail(new Error("Updater did not restart the server")))),
-    )
+    yield* Effect.yieldNow
+    expect(yield* Queue.size(updates)).toBe(0)
+    yield* TestClock.adjust("89 seconds")
+    expect(yield* Queue.size(updates)).toBe(0)
+    yield* TestClock.adjust("1 second")
+    expect(yield* Queue.take(updates)).toBe("2.0.0")
+    yield* Effect.yieldNow
+    yield* TestClock.adjust("10 minutes")
+    expect(yield* Queue.take(updates)).toBe("2.0.0")
   }),
 )
 
-const wait = (promise: Promise<unknown>, message: () => string) =>
-  Effect.tryPromise(() => Promise.race([promise, Bun.sleep(1_000).then(() => Promise.reject(new Error(message())))]))
+it.effect("does not notify when no update is available", () =>
+  Effect.gen(function* () {
+    const updates = yield* Queue.unbounded<string>()
+    yield* Updater.monitorUpdates({
+      inspect: () => Effect.succeed(undefined),
+      notify: (version) => Queue.offer(updates, version).pipe(Effect.asVoid),
+    }).pipe(Effect.forkScoped)
 
-function makeServer() {
-  const encoder = new TextEncoder()
-  const activeRead = Promise.withResolvers<void>()
-  const eventOpened = Promise.withResolvers<void>()
-  const waited = Promise.withResolvers<void>()
-  let active = true
-  let events: ReadableStreamDefaultController<Uint8Array> | undefined
-  const server = Bun.serve({
-    hostname: "127.0.0.1",
-    port: 0,
-    fetch(request) {
-      const url = new URL(request.url)
-      if (url.pathname === "/api/session/active") {
-        activeRead.resolve()
-        return Response.json({ data: active ? { ses_test: { type: "running" } } : {} })
-      }
-      if (url.pathname === "/api/session/ses_test/wait" && request.method === "POST") {
-        waited.resolve()
-        return new Response(null, { status: 204 })
-      }
-      if (url.pathname === "/api/experimental/persistent-pty/handoff" && request.method === "POST") {
-        return Response.json({ handoff: null })
-      }
-      if (url.pathname === "/api/event") {
-        return new Response(
-          new ReadableStream<Uint8Array>({
-            start(controller) {
-              events = controller
-              eventOpened.resolve()
-            },
-          }),
-          { headers: { "content-type": "text/event-stream" } },
-        )
-      }
-      return new Response("Not found", { status: 404 })
-    },
-  })
-
-  return {
-    url: server.url.origin,
-    activeRead: activeRead.promise,
-    eventOpened: eventOpened.promise,
-    waited: waited.promise,
-    settle() {
-      active = false
-      events?.enqueue(
-        encoder.encode(
-          `data: ${JSON.stringify({
-            id: "evt_settled",
-            created: Date.now(),
-            type: "session.execution.succeeded",
-            durable: { aggregateID: "ses_test", seq: 0, version: 1 },
-            data: { sessionID: "ses_test" },
-          })}\n\n`,
-        ),
-      )
-      events?.close()
-      events = undefined
-    },
-    stop() {
-      server.stop(true)
-    },
-  }
-}
+    yield* Effect.yieldNow
+    expect(yield* Queue.size(updates)).toBe(0)
+  }),
+)

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

@@ -1892,7 +1892,7 @@ export type ConfigEntry =
         shell?: string
         model?: string | { providerID: string; model: string; variant?: string }
         default_agent?: string
-        update?: "disable" | "notify" | "auto"
+        update?: "disable" | "notify"
         share?: "manual" | "auto" | "disabled"
         enterprise?: { url?: string }
         username?: string

packages/core/src/codemode/instructions.ts

@@ -8,7 +8,7 @@ import { CodeModeCatalog } from "./catalog.js"
 // prettier-ignore
 const prompt = (hasMoreTools: boolean) => `The Code Mode tool catalog below is ${hasMoreTools ? "partial" : "complete"}.
 
-${hasMoreTools ? "The Code Mode catalog and `search` results are" : "This catalog is"} the complete set of tools available within Code Mode. Tools presented elsewhere are not available in this runtime.${hasMoreTools ? `
+${hasMoreTools ? "The Code Mode catalog and `search` results are" : "This catalog is"} the complete set of tools callable inside \`execute\`. It does not affect tools exposed directly outside Code Mode.${hasMoreTools ? `
 
 ## Search
 

packages/core/src/config/normalize.ts

@@ -73,6 +73,11 @@ export function normalize(input: unknown): Result {
   const legacyUpdate = own(input, "autoupdate")
     ? decodeValue(ConfigV1.Info.fields.autoupdate, input.autoupdate, ["autoupdate"], diagnostics)
     : undefined
+  const nativeUpdate = own(input, "update")
+    ? input.update === "auto"
+      ? "notify"
+      : decodeEncoded(Info.fields.update, input.update, ["update"], diagnostics)
+    : undefined
   const legacyShare = own(input, "autoshare")
     ? decodeValue(Schema.Boolean, input.autoshare, ["autoshare"], diagnostics) === true
       ? "auto"
@@ -86,7 +91,10 @@ export function normalize(input: unknown): Result {
     if (migrated !== undefined) encoded.media = canonical(ConfigMedia.Info, migrated)
   }
   if (legacySnapshots !== undefined) encoded.snapshots = legacySnapshots
-  if (legacyUpdate !== undefined) encoded.update = ConfigMigrateV1.migrate({ autoupdate: legacyUpdate }).update
+  const migratedUpdate =
+    legacyUpdate === undefined ? undefined : ConfigMigrateV1.migrate({ autoupdate: legacyUpdate }).update
+  const update = prefer(migratedUpdate, nativeUpdate, ["update"], diagnostics)
+  if (update !== undefined) encoded.update = update
   if (legacyShare !== undefined) encoded.share = legacyShare
 
   const legacyReferences = decodeMap(input.reference, ConfigReference.Entry, ["reference"], diagnostics, decodeEncoded)
@@ -196,7 +204,6 @@ export function normalize(input: unknown): Result {
     shell: Info.fields.shell,
     model: Info.fields.model,
     default_agent: Info.fields.default_agent,
-    update: Info.fields.update,
     share: Info.fields.share,
     enterprise: Info.fields.enterprise,
     username: Info.fields.username,

packages/core/src/github-copilot/models.ts

@@ -18,7 +18,9 @@ const RemoteModel = Schema.Struct({
         Schema.Struct({
           batch_size: Schema.Number,
           default: Schema.Struct({
-            cache_price: Schema.Number,
+            // API version 2026-08-01 renamed cache_price to cache_read_price.
+            cache_price: Schema.optional(Schema.Number),
+            cache_read_price: Schema.optional(Schema.Number),
             input_price: Schema.Number,
             output_price: Schema.Number,
           }),
@@ -166,7 +168,9 @@ function build(id: Model.ID, remote: UsableModel, baseURL: string, previous?: Mo
         input: Money.USDPerMillionTokens.make((prices?.default.input_price ?? 0) * usdPerMillion),
         output: Money.USDPerMillionTokens.make((prices?.default.output_price ?? 0) * usdPerMillion),
         cache: {
-          read: Money.USDPerMillionTokens.make((prices?.default.cache_price ?? 0) * usdPerMillion),
+          read: Money.USDPerMillionTokens.make(
+            (prices?.default.cache_read_price ?? prices?.default.cache_price ?? 0) * usdPerMillion,
+          ),
           write: Money.USDPerMillionTokens.zero,
         },
       },

packages/core/src/job.ts

@@ -55,7 +55,6 @@ type Active = {
   done: Deferred.Deferred<Info>
   backgrounded: Deferred.Deferred<Info>
   scope: Scope.Closeable
-  token: object
   blockingSessions: Map<SessionSchema.ID, number>
   isBackgrounded: boolean
   recovery?: Recovery
@@ -77,7 +76,7 @@ type BackgroundResult = {
   backgrounded?: Deferred.Deferred<Info>
 }
 
-type StartResult = { info: Info } | { info: Info; scope: Scope.Closeable; token: object }
+type StartResult = { info: Info } | { info: Info; scope: Scope.Closeable }
 
 type BlockWait = {
   done: Deferred.Deferred<Info>
@@ -184,14 +183,14 @@ export const make = Effect.gen(function* () {
     })
   })
 
-  const settle = Effect.fnUntraced(function* (id: string, token: object, exit: Exit.Exit<string, unknown>) {
+  const settle = Effect.fnUntraced(function* (id: string, scope: Scope.Closeable, exit: Exit.Exit<string, unknown>) {
     const completed_at = yield* Clock.currentTimeMillis
     const result = yield* SynchronizedRef.modifyEffect(
       state.jobs,
       Effect.fnUntraced(function* (jobs): Effect.fn.Return<readonly [FinishResult, Map<string, Active>]> {
         const job = jobs.get(id)
         if (!job) return [{}, jobs]
-        if (job.token !== token) return [{}, jobs]
+        if (job.scope !== scope) return [{}, jobs]
         if (job.info.status !== "running") return [{ info: snapshot(job) }, jobs]
         const status: Exclude<Status, "running"> = Exit.isSuccess(exit)
           ? "completed"
@@ -241,7 +240,6 @@ export const make = Effect.gen(function* () {
               return [{ info: snapshot(existing) }, jobs]
             }
             const scope = yield* Scope.fork(state.scope, "parallel")
-            const token = {}
             const job = {
               info: {
                 id,
@@ -255,18 +253,17 @@ export const make = Effect.gen(function* () {
               done,
               backgrounded,
               scope,
-              token,
               blockingSessions: new Map<SessionSchema.ID, number>(),
               isBackgrounded: false,
               recovery: input.recovery,
             }
-            return [{ info: snapshot(job), scope, token }, new Map(jobs).set(id, job)]
+            return [{ info: snapshot(job), scope }, new Map(jobs).set(id, job)]
           }),
         )
         if ("scope" in result)
           yield* restore(input.run).pipe(
             Effect.exit,
-            Effect.flatMap((exit) => settle(id, result.token, exit)),
+            Effect.flatMap((exit) => settle(id, result.scope, exit)),
             Effect.asVoid,
             Effect.forkIn(result.scope, { startImmediately: true }),
           )

packages/core/src/modal/models.ts

@@ -0,0 +1,141 @@
+export * as ModalModels from "./models.js"
+
+import { Money } from "@opencode-ai/schema/money"
+import { Option, Schema } from "effect"
+import { Model } from "../model.js"
+import { Provider } from "../provider.js"
+
+const providerID = Provider.ID.make("modal")
+
+const ReasoningOption = Schema.Struct({
+  type: Schema.Literal("effort"),
+  values: Schema.Array(Schema.NullOr(Schema.String)),
+})
+
+const RemoteModel = Schema.Struct({
+  id: Schema.String,
+  base_model_id: Schema.optional(Schema.String),
+  hugging_face_id: Schema.optional(Schema.String),
+  name: Schema.optional(Schema.String),
+  input_modalities: Schema.optional(Schema.Array(Schema.String)),
+  output_modalities: Schema.optional(Schema.Array(Schema.String)),
+  context_length: Schema.optional(Schema.Number),
+  max_output_length: Schema.optional(Schema.Number),
+  pricing: Schema.optional(
+    Schema.Struct({
+      prompt: Schema.optional(Schema.Union([Schema.String, Schema.Number])),
+      completion: Schema.optional(Schema.Union([Schema.String, Schema.Number])),
+      input_cache_read: Schema.optional(Schema.Union([Schema.String, Schema.Number])),
+    }),
+  ),
+  supported_sampling_parameters: Schema.optional(Schema.Array(Schema.String)),
+  supported_features: Schema.optional(Schema.Array(Schema.String)),
+  reasoning_options: Schema.optional(Schema.Array(ReasoningOption)),
+  interleaved: Schema.optional(
+    Schema.Union([
+      Schema.Boolean,
+      Schema.Struct({
+        field: Schema.Literals(["reasoning", "reasoning_content", "reasoning_details"]),
+      }),
+    ]),
+  ),
+})
+
+const Response = Schema.Struct({ data: Schema.Array(Schema.Unknown) })
+const decodeResponse = Schema.decodeUnknownSync(Response)
+const decodeModel = Schema.decodeUnknownOption(RemoteModel)
+
+type RemoteModel = typeof RemoteModel.Type
+
+export async function get(baseURL: string, apiKey: string, existing: readonly Model.Info[]) {
+  const response = await fetch(`${baseURL.replace(/\/+$/, "")}/models`, {
+    headers: {
+      Authorization: `Bearer ${apiKey}`,
+    },
+    signal: AbortSignal.timeout(3_000),
+  })
+  if (!response.ok) throw new Error(`Failed to fetch Modal models: ${response.status}`)
+
+  // Decode each item tolerantly so one malformed entry cannot discard the
+  // whole inventory. A malformed envelope still fails the fetch.
+  const remote = decodeResponse(await response.json()).data.flatMap((raw) => {
+    const model = Option.getOrUndefined(decodeModel(raw))
+    return model ? [model] : []
+  })
+  const templates = new Map(existing.map((model) => [model.id, model]))
+  const result = new Map<Model.ID, Model.Info>()
+  for (const item of remote) {
+    const template = templates.get(Model.ID.make(item.base_model_id ?? item.hugging_face_id ?? item.id))
+    const id = Model.ID.make(item.id)
+    result.set(id, build(id, item, baseURL, template))
+  }
+  return result
+}
+
+function price(value: string | number | undefined, fallback: Money.USDPerMillionTokens) {
+  if (value === undefined) return fallback
+  const parsed = Number(value) * 1_000_000
+  return Number.isFinite(parsed) ? Money.USDPerMillionTokens.make(parsed) : fallback
+}
+
+function limit(value: number | undefined, fallback: number) {
+  const parsed = value === undefined ? fallback : Math.trunc(value)
+  return Number.isInteger(parsed) && parsed >= 0 ? parsed : fallback
+}
+
+function build(id: Model.ID, remote: RemoteModel, baseURL: string, previous?: Model.Info) {
+  const cost = previous?.cost[0]
+  const input = previous?.limit.input
+  return Model.Info.make({
+    ...Model.Info.default(providerID, id),
+    id,
+    modelID: Model.ID.make(remote.id),
+    providerID,
+    name: remote.name ?? previous?.name ?? remote.id,
+    family: previous?.family,
+    compatibility:
+      remote.interleaved === undefined
+        ? previous?.compatibility
+        : (Model.compatibility(remote.interleaved) ?? previous?.compatibility),
+    package: Provider.aisdk("@ai-sdk/openai-compatible"),
+    settings: Provider.mergeOverlay(previous?.settings, { baseURL }),
+    headers: previous?.headers,
+    body: previous?.body,
+    capabilities: {
+      tools: remote.supported_features?.includes("tools") ?? previous?.capabilities.tools ?? true,
+      input: remote.input_modalities ?? previous?.capabilities.input ?? ["text"],
+      output: remote.output_modalities ?? previous?.capabilities.output ?? ["text"],
+    },
+    variants: remote.reasoning_options === undefined ? (previous?.variants ?? []) : variants(remote),
+    time: previous?.time ?? { released: 0 },
+    cost: [
+      {
+        input: price(remote.pricing?.prompt, cost?.input ?? Money.USDPerMillionTokens.zero),
+        output: price(remote.pricing?.completion, cost?.output ?? Money.USDPerMillionTokens.zero),
+        cache: {
+          read: price(remote.pricing?.input_cache_read, cost?.cache.read ?? Money.USDPerMillionTokens.zero),
+          write: cost?.cache.write ?? Money.USDPerMillionTokens.zero,
+        },
+      },
+    ],
+    status: previous?.status ?? "active",
+    enabled: previous?.enabled ?? true,
+    limit: {
+      context: limit(remote.context_length, previous?.limit.context ?? 0),
+      ...(input === undefined ? {} : { input }),
+      output: limit(remote.max_output_length, previous?.limit.output ?? 0),
+    },
+  })
+}
+
+function variants(remote: RemoteModel): Model.Info["variants"] {
+  const seen = new Map<string, Model.Info["variants"][number]>()
+  for (const option of remote.reasoning_options ?? []) {
+    for (const value of option.values) {
+      const effort = value ?? "none"
+      if (!seen.has(effort))
+        seen.set(effort, { id: Model.VariantID.make(effort), settings: { reasoningEffort: effort } })
+    }
+  }
+  return [...seen.values()]
+}

packages/core/src/plugin/provider.ts

@@ -15,6 +15,7 @@ import { KiloPlugin } from "./provider/kilo.js"
 import { LLMGatewayPlugin } from "./provider/llmgateway.js"
 import { LMStudioPlugin } from "./provider/lmstudio.js"
 import { MistralPlugin } from "./provider/mistral.js"
+import { ModalPlugin } from "./provider/modal.js"
 import { NvidiaPlugin } from "./provider/nvidia.js"
 import { OllamaPlugin } from "./provider/ollama.js"
 import { OpenAIPlugin } from "./provider/openai.js"
@@ -48,6 +49,7 @@ export const ProviderPlugins: PluginInternal.InternalPlugin[] = [
   LLMGatewayPlugin,
   LMStudioPlugin,
   MistralPlugin,
+  ModalPlugin,
   NvidiaPlugin,
   OllamaPlugin,
   OpencodePlugin,

packages/core/src/plugin/provider/github-copilot.ts

@@ -13,7 +13,7 @@ import { Provider } from "../../provider.js"
 import type { PluginInternal } from "../internal.js"
 
 const clientID = "Ov23li8tweQw6odWQebz"
-const apiVersion = "2026-06-01"
+const apiVersion = "2026-08-01"
 const userApiVersion = "2025-04-01"
 const pollingSafetyMargin = 3000
 const methodID = Integration.MethodID.make("device")

packages/core/src/plugin/provider/modal.ts

@@ -0,0 +1,67 @@
+import { Effect, Semaphore, Stream } from "effect"
+import { define } from "@opencode-ai/plugin/effect/plugin"
+import { Bus } from "../../bus.js"
+import { Catalog } from "../../catalog.js"
+import { Credential } from "../../credential.js"
+import { Integration } from "../../integration.js"
+import { ModalModels } from "../../modal/models.js"
+import { Model } from "../../model.js"
+import { Provider } from "../../provider.js"
+import type { PluginInternal } from "../internal.js"
+
+const providerID = Provider.ID.make("modal")
+
+export const ModalPlugin = define({
+  id: "opencode.provider.modal",
+  effect: Effect.fn(function* (ctx) {
+    const catalog = yield* Catalog.Service
+    const bus = yield* Bus.Service
+    const loading = Semaphore.makeUnsafe(1)
+    const loaded: {
+      baseURL?: string
+      models?: Map<Model.ID, Model.Info>
+    } = {}
+
+    const load = Effect.fn("ModalPlugin.load")(function* () {
+      const connection = yield* ctx.integration.connection.active("modal")
+      const credential = connection
+        ? yield* ctx.integration.connection.resolve(connection).pipe(Effect.orElseSucceed(() => undefined))
+        : undefined
+      const apiKey = credential?.type === "key" ? credential.key : process.env.MODAL_PROXY_TOKEN
+      const provider = yield* catalog.provider.get(providerID)
+      const baseURL = typeof provider?.settings?.baseURL === "string" ? provider.settings.baseURL : undefined
+      if (!apiKey || !baseURL) {
+        loaded.baseURL = undefined
+        loaded.models = undefined
+        return
+      }
+      loaded.baseURL = baseURL
+      const existing = (yield* catalog.model.all()).filter((model) => model.providerID === providerID)
+      loaded.models = yield* Effect.tryPromise({
+        try: () => ModalModels.get(baseURL, apiKey, existing),
+        catch: (cause) => cause,
+      }).pipe(
+        Effect.catch((cause) => Effect.logWarning("failed to sync Modal models", { cause }).pipe(Effect.as(undefined))),
+      )
+    })
+
+    yield* ctx.catalog.transform((evt) => {
+      const item = evt.provider.get(providerID)
+      if (!item) return
+      if (!loaded.models) return
+      for (const id of item.models.keys()) {
+        if (!loaded.models.has(Model.ID.make(id))) evt.model.remove(item.provider.id, id)
+      }
+      for (const [id, model] of loaded.models) {
+        evt.model.update(item.provider.id, id, (draft) => Object.assign(draft, structuredClone(model)))
+      }
+    })
+    const refresh = () => loading.withPermit(load().pipe(Effect.andThen(ctx.catalog.reload())))
+    yield* bus.subscribe(Credential.Event.Switched).pipe(
+      Stream.filter((event) => event.data.integrationID === Integration.ID.make("modal")),
+      Stream.runForEach(refresh),
+      Effect.forkScoped({ startImmediately: true }),
+    )
+    yield* refresh().pipe(Effect.forkScoped)
+  }),
+} satisfies PluginInternal.InternalPlugin)

packages/core/src/session/model-transport.ts

@@ -28,11 +28,9 @@ const events = Metric.counter("opencode_session_websocket_events_total", {
 const metric = (event: string, attributes: Record<string, string> = {}) =>
   Metric.update(events.pipe(Metric.withAttributes({ event, ...attributes })), 1)
 
-type Delivery = "queued" | "connecting" | "ready" | "send-attempted" | "provider-observed" | "terminal"
-
 interface Active {
   readonly queue: Queue.Queue<string, AIError>
-  readonly lifecycle: { delivery: Delivery }
+  delivery: "send-attempted" | "provider-observed" | "terminal"
 }
 
 interface Channel {
@@ -130,14 +128,9 @@ export const makeLayer = (connector: WebSocketConnector) =>
                 code: "close",
                 phase: "close",
                 delivery:
-                  channel.active.lifecycle.delivery === "queued" ||
-                  channel.active.lifecycle.delivery === "connecting" ||
-                  channel.active.lifecycle.delivery === "ready"
-                    ? "not-sent"
-                    : channel.active.lifecycle.delivery === "provider-observed" ||
-                        channel.active.lifecycle.delivery === "terminal"
-                      ? "accepted"
-                      : "ambiguous",
+                  channel.active.delivery === "provider-observed" || channel.active.delivery === "terminal"
+                    ? "accepted"
+                    : "ambiguous",
               }),
             ),
           )
@@ -198,7 +191,7 @@ export const makeLayer = (connector: WebSocketConnector) =>
                       code: "idle-data",
                       phase: "receive",
                     })
-                  active.lifecycle.delivery = "provider-observed"
+                  active.delivery = "provider-observed"
                   if (typeof message !== "string")
                     return yield* transportError("Unsupported binary WebSocket frame", {
                       url: exchange.connect.url,
@@ -226,8 +219,8 @@ export const makeLayer = (connector: WebSocketConnector) =>
                         phase:
                           error.reason._tag === "Transport" && error.reason.phase === "close" ? "close" : "receive",
                         delivery:
-                          channel.active?.lifecycle.delivery === "provider-observed" ||
-                          channel.active?.lifecycle.delivery === "terminal" ||
+                          channel.active?.delivery === "provider-observed" ||
+                          channel.active?.delivery === "terminal" ||
                           (error.reason._tag === "Transport" && error.reason.code === "queue-overflow")
                             ? "accepted"
                             : error.reason._tag === "Transport" && error.reason.code === "1009"
@@ -256,7 +249,6 @@ export const makeLayer = (connector: WebSocketConnector) =>
       const start = Effect.fn("SessionModelTransport.start")(function* (
         owner: State,
         exchange: WebSocketChannelExchange,
-        lifecycle: { delivery: Delivery },
       ) {
         if (owner.closed)
           return yield* transportError("Session WebSocket owner is closed", {
@@ -288,7 +280,6 @@ export const makeLayer = (connector: WebSocketConnector) =>
           yield* closeChannel(owner, current)
         }
 
-        lifecycle.delivery = owner.channel ? "ready" : "connecting"
         if (owner.channel)
           yield* Effect.logDebug("session websocket reused", {
             sessionTransport: "websocket",
@@ -314,7 +305,6 @@ export const makeLayer = (connector: WebSocketConnector) =>
               ),
             )
         if (!channel) return fallback(exchange)
-        lifecycle.delivery = "ready"
 
         if (channel.pending) {
           channel.pending = undefined
@@ -326,9 +316,11 @@ export const makeLayer = (connector: WebSocketConnector) =>
           Effect.onInterrupt(() => closeChannel(owner, channel)),
         )
         if (create.mode === "full") channel.checkpoint = undefined
-        const active: Active = { queue: yield* Queue.bounded<string, AIError>(INBOUND_CAPACITY), lifecycle }
+        const active: Active = {
+          queue: yield* Queue.bounded<string, AIError>(INBOUND_CAPACITY),
+          delivery: "send-attempted",
+        }
         channel.active = active
-        lifecycle.delivery = "send-attempted"
         const sent = yield* channel.connection.sendText(create.message).pipe(
           Effect.withSpan("SessionModelTransport.send"),
           Effect.onInterrupt(() => closeChannel(owner, channel)),
@@ -366,7 +358,7 @@ export const makeLayer = (connector: WebSocketConnector) =>
                   operation: "read",
                   code: "idle-timeout",
                   phase: "receive",
-                  delivery: lifecycle.delivery === "provider-observed" ? "accepted" : "ambiguous",
+                  delivery: active.delivery === "provider-observed" ? "accepted" : "ambiguous",
                 }),
               ),
           }),
@@ -375,7 +367,7 @@ export const makeLayer = (connector: WebSocketConnector) =>
             Effect.sync(() => {
               if (!observationTerminal(observation)) return
               terminal = observation
-              lifecycle.delivery = "terminal"
+              active.delivery = "terminal"
               const staged = observation.type === "completed" ? observation.checkpoint : undefined
               if (staged) channel.pending = { token, checkpoint: staged }
               if (observation.type !== "completed" || !staged) channel.checkpoint = undefined
@@ -411,7 +403,7 @@ export const makeLayer = (connector: WebSocketConnector) =>
                     operation: "read",
                     code: "incomplete",
                     phase: "receive",
-                    delivery: lifecycle.delivery === "provider-observed" ? "accepted" : "ambiguous",
+                    delivery: active.delivery === "provider-observed" ? "accepted" : "ambiguous",
                   })
               yield* poison(owner, channel, error)
             }),
@@ -448,7 +440,6 @@ export const makeLayer = (connector: WebSocketConnector) =>
       const bind = (sessionID: SessionSchema.ID): WebSocketChannelExecutor => ({
         execute: (exchange) => {
           const owner = state(sessionID)
-          const lifecycle = { delivery: "queued" as Delivery }
           let execution: WebSocketChannelExecution | undefined
           return Effect.succeed({
             get http() {
@@ -456,7 +447,7 @@ export const makeLayer = (connector: WebSocketConnector) =>
             },
             frames: Stream.unwrap(
               Effect.acquireRelease(owner.lock.take(1), () => owner.lock.release(1), { interruptible: true }).pipe(
-                Effect.andThen(start(owner, exchange, lifecycle)),
+                Effect.andThen(start(owner, exchange)),
                 Effect.tap((started) =>
                   Effect.sync(() => {
                     execution = started

packages/core/src/shell/scan.ts

@@ -149,6 +149,7 @@ function scanBash(input: string, depth: number, budget: { remaining: number }):
     const char = input[index]
     if (!wordStarted) wordStart = index
     if (!quote && !wordStarted) {
+      if (char === " " || char === "\t") continue
       const structure = structures.at(-1)
       const token = /^[A-Za-z_][A-Za-z0-9_]*(?=[ \t\n;()<>]|$)/.exec(input.slice(index))?.[0]
       if (structure?.kind === "case" && structure.phase === "header" && token === "in") {
@@ -166,13 +167,24 @@ function scanBash(input: string, depth: number, budget: { remaining: number }):
         segment = index + 1
         continue
       }
+      if (structure?.kind === "for" && structure.phase === "header" && char === "(" && input[index + 1] !== "(") {
+        const values = bashExpansion(input, index, depth, "array")
+        if (!values) return { kind: "opaque", reason: "compound-command" }
+        finishCommand()
+        const failure = addSubstitutions(values)
+        if (failure) return failure
+        commands.push(...nestedCommands.splice(0))
+        // Zsh permits a sublist or brace group directly after the value list, without do/done.
+        structure.phase = "do"
+        if (!/^(?:[ \t\n;]|\\\n|#[^\n]*(?:\n|$))*do(?=[ \t\n;]|$)/.test(input.slice(values.end + 1))) structures.pop()
+        index = values.end
+        segment = index + 1
+        continue
+      }
       if (!words.length && !hasRedirect && !compoundEnd) {
-        const definition =
-          /^(?:function[ \t]+[A-Za-z_][A-Za-z0-9_]*(?:[ \t]*\([ \t]*\))?|[A-Za-z_][A-Za-z0-9_]*[ \t]*\([ \t]*\))[ \t\n]*(?=[{(])/.exec(
-            input.slice(index),
-          )
+        const definition = bashFunctionHead(input, index)
         if (definition && !header()) {
-          index += definition[0].length - 1
+          index += definition.length - 1
           segment = index + 1
           continue
         }
@@ -536,6 +548,14 @@ function scanBash(input: string, depth: number, budget: { remaining: number }):
 
 type BashExpansion = { source: string; end: number; substitutions?: string[] }
 
+function bashFunctionHead(input: string, start: number) {
+  // Share recognition with delimiter scanning so case patterns in function bodies do not close the outer group.
+  // Names need not be variable identifiers. Zsh permits anonymous functions, including in an if condition.
+  return /^(?!if(?:[ \t]|\\\n)*\()(?:function[ \t]+(?:\\\n[ \t]*)*[A-Za-z_][A-Za-z0-9_.:-]*(?:(?:[ \t]|\\\n)*\([ \t]*\))?|(?:[A-Za-z_][A-Za-z0-9_.:-]*(?:[ \t]|\\\n)*)?\([ \t]*\))(?:[ \t\n]|\\\n|#[^\n]*(?:\n|$))*(?=[{(]|\[\[(?=[ \t\n])|(?:if|while|until|for|select|case)[ \t\n])/.exec(
+    input.slice(start),
+  )?.[0]
+}
+
 function bashDelimited(input: string, start: number, depth: number): BashExpansion | undefined {
   if (depth >= MAX_SUBSTITUTION_DEPTH) return
   const close = input[start] === "{" ? "}" : ")"
@@ -544,6 +564,7 @@ function bashDelimited(input: string, start: number, depth: number): BashExpansi
   let commandStart = true
   for (let index = start + 1; index < input.length; index++) {
     const char = input[index]
+    if (char === " " || char === "\t") continue
     if (char === "\\") {
       if (input[index + 1] !== "\n") commandStart = false
       index++
@@ -566,6 +587,11 @@ function bashDelimited(input: string, start: number, depth: number): BashExpansi
       continue
     }
     const boundary = index === start + 1 || /[ \t\n;|&(){}]/.test(input[index - 1])
+    const definition = commandStart && boundary ? bashFunctionHead(input, index) : undefined
+    if (definition) {
+      index += definition.length - 1
+      continue
+    }
     if (char === "#" && boundary) {
       const newline = input.indexOf("\n", index)
       if (newline < 0) return
@@ -725,7 +751,10 @@ function bashExpansion(
       index = nested.end
       continue
     }
-    if (kind === "array" && "<>=".includes(char) && input[index + 1] === "(") {
+    if (
+      ((kind === "array" && "<>=".includes(char)) || (kind === "test" && "<>".includes(char))) &&
+      input[index + 1] === "("
+    ) {
       const nested = bashDelimited(input, index + 1, depth + 1)
       if (!nested) return
       substitutions.push(nested.source)

packages/core/src/v1/config/migrate.ts

@@ -29,11 +29,9 @@ export function migrate(info: typeof ConfigV1.Info.Type) {
         update:
           info.autoupdate === false
             ? "disable"
-            : info.autoupdate === "notify"
+            : info.autoupdate === "notify" || info.autoupdate === true
               ? "notify"
-              : info.autoupdate === true
-                ? "auto"
-                : undefined,
+              : undefined,
         share: info.share ?? (info.autoshare ? "auto" : undefined),
         enterprise: info.enterprise,
         username: info.username,

packages/core/test/codemode/instructions.test.ts

@@ -47,7 +47,7 @@ describe("CodeModeInstructions", () => {
     Effect.gen(function* () {
       const initialized = yield* readInitial(CodeModeInstructions.make({ tools: [echo] }))
       expect(initialized.text).toContain(
-        "This catalog is the complete set of tools available within Code Mode. Tools presented elsewhere are not available in this runtime.",
+        "This catalog is the complete set of tools callable inside `execute`. It does not affect tools exposed directly outside Code Mode.",
       )
       expect(initialized.text).toContain("## Available tools")
       expect(initialized.text).not.toContain("## Search")

packages/core/test/config/config.test.ts

@@ -13,6 +13,7 @@ import { LayerNode } from "@opencode-ai/util/effect/layer-node"
 import { Credential } from "@opencode-ai/core/credential"
 import { ConfigMigrateV1 } from "@opencode-ai/core/v1/config/migrate"
 import { ConfigV1 } from "@opencode-ai/core/v1/config/config"
+import { ConfigNormalize } from "@opencode-ai/core/config/normalize"
 import { Watcher } from "@opencode-ai/core/filesystem/watcher"
 import { Bus } from "@opencode-ai/core/bus"
 import { Global } from "@opencode-ai/util/global"
@@ -665,10 +666,18 @@ describe("Config", () => {
   test("migrates the v1 update policy", () => {
     expect(ConfigMigrateV1.migrate({ autoupdate: false }).update).toBe("disable")
     expect(ConfigMigrateV1.migrate({ autoupdate: "notify" }).update).toBe("notify")
-    expect(ConfigMigrateV1.migrate({ autoupdate: true }).update).toBe("auto")
+    expect(ConfigMigrateV1.migrate({ autoupdate: true }).update).toBe("notify")
     expect(ConfigMigrateV1.migrate({}).update).toBeUndefined()
   })
 
+  test("normalizes the previous native auto update policy", () => {
+    expect(ConfigNormalize.normalize({ update: "auto" })).toEqual({
+      type: "normalized",
+      encoded: { update: "notify" },
+      diagnostics: [],
+    })
+  })
+
   test("migrates v1 provider lists to policies", () => {
     expect(
       ConfigMigrateV1.migrate({

packages/core/test/github-copilot/models.test.ts

@@ -118,3 +118,40 @@ test("defensively syncs advertised Copilot models", async () => {
     await server.stop(true)
   }
 })
+
+test("prices cache reads from either token price spelling", async () => {
+  // API version 2026-08-01 renamed cache_price to cache_read_price; older payloads still use cache_price.
+  const item = (id: string, prices: Record<string, number>) => ({
+    model_picker_enabled: true,
+    id,
+    name: id,
+    version: `${id}-2026-08-01`,
+    supported_endpoints: ["/chat/completions"],
+    billing: { token_prices: { batch_size: 1_000_000, default: { input_price: 250, output_price: 1500, ...prices } } },
+    capabilities: {
+      family: "gpt",
+      limits: { max_output_tokens: 1000, max_prompt_tokens: 8000 },
+      supports: { tool_calls: true },
+    },
+  })
+  const server = Bun.serve({
+    port: 0,
+    fetch: () =>
+      Response.json({
+        data: [
+          item("renamed", { cache_read_price: 25, cache_write_price: 0 }),
+          item("legacy", { cache_price: 25 }),
+          item("unpriced", {}),
+        ],
+      }),
+  })
+
+  try {
+    const models = await CopilotModels.get(server.url.origin, {}, [])
+    expect(models.get(Model.ID.make("renamed"))?.cost[0]).toMatchObject({ input: 2.5, output: 15, cache: { read: 0.25 } })
+    expect(models.get(Model.ID.make("legacy"))?.cost[0]).toMatchObject({ input: 2.5, output: 15, cache: { read: 0.25 } })
+    expect(models.get(Model.ID.make("unpriced"))?.cost[0]).toMatchObject({ cache: { read: 0 } })
+  } finally {
+    await server.stop(true)
+  }
+})

packages/core/test/job.test.ts

@@ -64,6 +64,71 @@ describe("Job", () => {
     }),
   )
 
+  it.live("reuses running work when started again with the same ID", () =>
+    Effect.gen(function* () {
+      const jobs = yield* Job.Service
+      const output = yield* Deferred.make<string>()
+      const job = yield* jobs.start({ id: "job_reused", type: "test", run: Deferred.await(output) })
+
+      expect(
+        yield* jobs.start({ id: job.id, type: "duplicate", run: Effect.die("Duplicate work must not run") }),
+      ).toEqual(job)
+
+      yield* Deferred.succeed(output, "original output")
+      expect((yield* jobs.wait({ id: job.id })).info).toMatchObject({
+        type: "test",
+        status: "completed",
+        output: "original output",
+      })
+    }),
+  )
+
+  it.live("ignores an obsolete callback after a cancellation waiter starts a same-ID replacement", () =>
+    Effect.gen(function* () {
+      const jobs = yield* Job.Service
+      const callback = yield* Deferred.make<() => void>()
+      const output = yield* Deferred.make<string>()
+      const finalized = yield* Deferred.make<void>()
+      const job = yield* jobs.start({
+        id: "job_replaced",
+        type: "test",
+        run: Effect.callback<string>((resume) => {
+          Deferred.doneUnsafe(
+            callback,
+            Effect.succeed(() => resume(Effect.succeed("obsolete output"))),
+          )
+        }),
+      })
+      const complete = yield* Deferred.await(callback)
+      // Cancellation wakes waiters before closing the old scope, allowing the old callback to race replacement.
+      const replacement = yield* jobs.wait({ id: job.id }).pipe(
+        Effect.tap((result) => Effect.sync(() => expect(result.info?.status).toBe("cancelled"))),
+        Effect.andThen(
+          jobs.start({
+            id: job.id,
+            type: "replacement",
+            run: Deferred.await(output).pipe(Effect.ensuring(Deferred.succeed(finalized, undefined))),
+          }),
+        ),
+        Effect.andThen(Effect.sync(complete)),
+        Effect.forkChild({ startImmediately: true }),
+      )
+
+      yield* jobs.cancel(job.id)
+      yield* Fiber.join(replacement)
+      expect(yield* jobs.get(job.id)).toMatchObject({ type: "replacement", status: "running" })
+      expect(yield* Deferred.isDone(finalized)).toBe(false)
+
+      yield* Deferred.succeed(output, "replacement output")
+      expect((yield* jobs.wait({ id: job.id })).info).toMatchObject({
+        type: "replacement",
+        status: "completed",
+        output: "replacement output",
+      })
+      expect(yield* Deferred.isDone(finalized)).toBe(true)
+    }),
+  )
+
   it.live("returns finished from a blocking wait when completion wins", () =>
     Effect.gen(function* () {
       const jobs = yield* Job.Service

packages/core/test/modal/models.test.ts

@@ -0,0 +1,137 @@
+import { expect, test } from "bun:test"
+import { ModalModels } from "@opencode-ai/core/modal/models"
+import { Model } from "@opencode-ai/core/model"
+import { Provider } from "@opencode-ai/core/provider"
+import { ProviderPlugins } from "@opencode-ai/core/plugin/provider"
+import { Money } from "@opencode-ai/schema/money"
+
+const providerID = Provider.ID.make("modal")
+
+test("modal plugin is registered", () => {
+  expect(ProviderPlugins.map((item) => item.id)).toContain("opencode.provider.modal")
+})
+
+function template(id: string, overrides: Partial<Model.Info> = {}) {
+  return Model.Info.make({
+    ...Model.Info.default(providerID, Model.ID.make(id)),
+    name: `${id} catalog`,
+    family: Model.Family.make("catalog-family"),
+    ...overrides,
+  })
+}
+
+test("maps live Modal models onto catalog templates", async () => {
+  const server = Bun.serve({
+    port: 0,
+    fetch: (request) => {
+      expect(request.headers.get("Authorization")).toBe("Bearer test-key")
+      expect(new URL(request.url).pathname).toBe("/v1/models")
+      return Response.json({
+        data: [
+          {
+            id: "live-model",
+            base_model_id: "base-model",
+            name: "Live Model",
+            input_modalities: ["text", "image"],
+            output_modalities: ["text"],
+            context_length: 128000,
+            max_output_length: 8192,
+            pricing: { prompt: "0.000001", completion: 0.000002, input_cache_read: "0.0000002" },
+            supported_sampling_parameters: ["temperature"],
+            supported_features: ["tools", "reasoning"],
+            reasoning_options: [{ type: "effort", values: ["low", "high", null] }],
+            interleaved: { field: "reasoning_content" },
+          },
+          {
+            id: "standalone",
+            context_length: 64000,
+          },
+          { id: "malformed", context_length: "huge" },
+        ],
+      })
+    },
+  })
+
+  try {
+    const base = template("base-model")
+    const stale = template("stale")
+    const models = await ModalModels.get(`${server.url.origin}/v1`, "test-key", [base, stale])
+
+    expect(models.has(Model.ID.make("stale"))).toBe(false)
+    expect(models.has(Model.ID.make("malformed"))).toBe(false)
+
+    const model = models.get(Model.ID.make("live-model"))
+    expect(model?.name).toBe("Live Model")
+    expect(model?.family).toBe(Model.Family.make("catalog-family"))
+    expect(model?.providerID).toBe(providerID)
+    expect(model?.modelID).toBe(Model.ID.make("live-model"))
+    expect(model?.package).toBe(Provider.aisdk("@ai-sdk/openai-compatible"))
+    expect(model?.settings).toMatchObject({ baseURL: `${server.url.origin}/v1` })
+    expect(model?.compatibility).toMatchObject({ reasoningField: "reasoning_content" })
+    expect(model?.capabilities).toMatchObject({ tools: true, input: ["text", "image"], output: ["text"] })
+    expect(model?.cost[0]?.input).toBe(Money.USDPerMillionTokens.make(1))
+    expect(model?.cost[0]?.output).toBe(Money.USDPerMillionTokens.make(2))
+    expect(Number(model?.cost[0]?.cache.read)).toBeCloseTo(0.2, 10)
+    expect(model?.cost[0]?.cache.write).toBe(Money.USDPerMillionTokens.zero)
+    expect(model?.limit).toMatchObject({ context: 128000, output: 8192 })
+    expect(model?.variants.map((variant) => variant.id)).toEqual([
+      Model.VariantID.make("low"),
+      Model.VariantID.make("high"),
+      Model.VariantID.make("none"),
+    ])
+    expect(model?.variants[0]?.settings).toMatchObject({ reasoningEffort: "low" })
+    expect(model?.status).toBe("active")
+
+    const fresh = models.get(Model.ID.make("standalone"))
+    expect(fresh?.name).toBe("standalone")
+    expect(fresh?.family).toBeUndefined()
+    expect(fresh?.capabilities).toMatchObject({ tools: true, input: ["text"], output: ["text"] })
+    expect(fresh?.variants).toEqual([])
+    expect(fresh?.limit).toMatchObject({ context: 64000, output: 0 })
+  } finally {
+    await server.stop(true)
+  }
+})
+
+test("keeps template cost and limits when the proxy omits them", async () => {
+  const server = Bun.serve({
+    port: 0,
+    fetch: () =>
+      Response.json({
+        data: [{ id: "sparse", hugging_face_id: "hf-base" }],
+      }),
+  })
+
+  try {
+    const base = template("hf-base", {
+      cost: [
+        {
+          input: Money.USDPerMillionTokens.make(5),
+          output: Money.USDPerMillionTokens.make(10),
+          cache: { read: Money.USDPerMillionTokens.make(1), write: Money.USDPerMillionTokens.make(2) },
+        },
+      ],
+      limit: { context: 1000, input: 500, output: 250 },
+    })
+    const models = await ModalModels.get(server.url.origin, "test-key", [base])
+    const model = models.get(Model.ID.make("sparse"))
+    expect(model?.name).toBe("hf-base catalog")
+    expect(model?.cost[0]).toMatchObject({ input: 5, output: 10, cache: { read: 1, write: 2 } })
+    expect(model?.limit).toMatchObject({ context: 1000, input: 500, output: 250 })
+  } finally {
+    await server.stop(true)
+  }
+})
+
+test("throws on proxy failure so the plugin can fail soft", async () => {
+  const server = Bun.serve({
+    port: 0,
+    fetch: () => new Response("nope", { status: 500 }),
+  })
+
+  try {
+    await expect(ModalModels.get(server.url.origin, "test-key", [])).rejects.toThrow()
+  } finally {
+    await server.stop(true)
+  }
+})

packages/core/test/plugin/provider-github-copilot.test.ts

@@ -122,7 +122,7 @@ describe("GithubCopilotPlugin", () => {
       expect(requests[0]?.has("x-api-key")).toBe(false)
       expect(requests[0]?.get("x-initiator")).toBe("user")
       expect(requests[0]?.get("copilot-vision-request")).toBe("true")
-      expect(requests[0]?.get("x-github-api-version")).toBe("2026-06-01")
+      expect(requests[0]?.get("x-github-api-version")).toBe("2026-08-01")
       expect(requests[0]?.get("user-agent")).toBe("opencode/beta/1.2.3/test")
     }),
   )
@@ -145,7 +145,7 @@ describe("GithubCopilotPlugin", () => {
       expect(event.request.headers.has("x-api-key")).toBe(false)
       expect(event.request.headers.get("x-initiator")).toBe("user")
       expect(event.request.headers.get("anthropic-beta")).toBe("interleaved-thinking-2025-05-14")
-      expect(event.request.headers.get("x-github-api-version")).toBe("2026-06-01")
+      expect(event.request.headers.get("x-github-api-version")).toBe("2026-08-01")
     }),
   )
 

packages/core/test/session-model-transport.test.ts

@@ -445,14 +445,17 @@ describe("SessionModelTransport", () => {
     )
   })
 
-  test("closes an active exchange without waiting for its Session permit", async () => {
+  test.each([false, true])("classifies active and queued close (observed: %s)", async (observed) => {
     const started = Deferred.makeUnsafe<void>()
     const messages = queue<string | Uint8Array, AIError>()
     let closed = 0
     const connector: WebSocketConnector = {
       open: () =>
         Effect.succeed({
-          sendText: () => Deferred.succeed(started, undefined),
+          sendText: () =>
+            observed
+              ? Queue.offer(messages, "frame").pipe(Effect.asVoid)
+              : Deferred.succeed(started, undefined).pipe(Effect.asVoid),
           messages: Stream.fromQueue(messages),
           close: Effect.sync(() => closed++).pipe(Effect.andThen(Queue.shutdown(messages)), Effect.asVoid),
         }),
@@ -462,17 +465,30 @@ describe("SessionModelTransport", () => {
       connector,
       Effect.gen(function* () {
         const transport = yield* SessionModelTransport.Service
-        const running = yield* collect(transport.bind(session), exchange("active")).pipe(
+        const executor = transport.bind(session)
+        const item = exchange("active")
+        const running = yield* collect(executor, {
+          ...item,
+          driver: {
+            ...item.driver,
+            observe: (_create, frame) => Deferred.succeed(started, undefined).pipe(Effect.as({ type: "frame", frame })),
+          },
+        }).pipe(Effect.result, Effect.forkChild({ startImmediately: true }))
+        yield* Deferred.await(started)
+        const queued = yield* collect(executor, exchange("queued")).pipe(
+          Effect.result,
           Effect.forkChild({ startImmediately: true }),
         )
-        yield* Deferred.await(started)
 
         yield* transport.close(session)
-        const result = yield* Effect.result(Fiber.join(running))
 
-        expect(result).toMatchObject({
+        expect(yield* Fiber.join(running)).toMatchObject({
           _tag: "Failure",
-          failure: { reason: { _tag: "Transport", code: "close", delivery: "ambiguous" } },
+          failure: { reason: { _tag: "Transport", code: "close", delivery: observed ? "accepted" : "ambiguous" } },
+        })
+        expect(yield* Fiber.join(queued)).toMatchObject({
+          _tag: "Failure",
+          failure: { reason: { _tag: "Transport", code: "owner-closed", phase: "queue", delivery: "not-sent" } },
         })
         expect(closed).toBe(1)
       }),
@@ -545,6 +561,43 @@ describe("SessionModelTransport", () => {
     )
   })
 
+  test("closes a connection returned after its owner closes during setup", async () => {
+    const connecting = Deferred.makeUnsafe<void>()
+    const release = Deferred.makeUnsafe<void>()
+    let closed = 0
+    const connector: WebSocketConnector = {
+      open: () =>
+        Deferred.succeed(connecting, undefined).pipe(
+          Effect.andThen(Deferred.await(release)),
+          Effect.as({
+            sendText: () => Effect.die("Unexpected send after owner close"),
+            messages: Stream.never,
+            close: Effect.sync(() => closed++).pipe(Effect.asVoid),
+          }),
+        ),
+    }
+
+    await run(
+      connector,
+      Effect.gen(function* () {
+        const transport = yield* SessionModelTransport.Service
+        const running = yield* collect(
+          transport.bind(session),
+          exchange("first", { fallback: () => Stream.die("Unexpected fallback after owner close") }),
+        ).pipe(Effect.result, Effect.forkChild({ startImmediately: true }))
+        yield* Deferred.await(connecting)
+        yield* transport.close(session)
+        yield* Deferred.succeed(release, undefined)
+
+        expect(yield* Fiber.join(running)).toMatchObject({
+          _tag: "Failure",
+          failure: { reason: { _tag: "Transport", code: "owner-closed", phase: "connect", delivery: "not-sent" } },
+        })
+        expect(closed).toBe(1)
+      }),
+    )
+  })
+
   test("falls back once when connection setup fails before send", async () => {
     let fallbacks = 0
     const connector: WebSocketConnector = { open: () => Effect.fail(error("upgrade rejected", "not-sent")) }

packages/core/test/shell-scan/compound-parity.test.ts

@@ -0,0 +1,132 @@
+import { describe, expect, test } from "bun:test"
+import { Effect } from "effect"
+import { ShellParse } from "../../src/shell/parse.js"
+import { ShellScan } from "../../src/shell/scan.js"
+
+const contexts = [
+  (source: string) => source,
+  (source: string) => `( ${source} )`,
+  (source: string) => `{ ${source}; }`,
+  (source: string) => `if true; then ${source}; fi`,
+  (source: string) => `outer() { ${source}; }; outer`,
+]
+
+const bodies = [
+  "for value in one two; do scan_probe; done",
+  "while true; do scan_probe; break; done",
+  "until false; do scan_probe; break; done",
+  "case value in value) scan_probe;; *) scan_other;; esac",
+]
+
+describe("compound function acceptance", () => {
+  for (const shell of ["bash", "zsh"]) {
+    for (const head of ["probe()", "function probe", "function probe()", "probe-name()"])
+      for (const body of bodies)
+        for (const context of contexts) {
+          const name = head.includes("probe-name") ? "probe-name" : "probe"
+          const source = context(`${head} ${body}; ${name}`)
+          test(`${shell}: ${source}`, async () => {
+            // Braces preserve the function's behavior, but avoid Tree-sitter's recovery artifacts.
+            const legacy = await Effect.runPromise(
+              ShellParse.scan(context(`${head} { ${body}; }; ${name}`), shell, "/workspace"),
+            )
+            expect(await Effect.runPromise(ShellParse.scanPortable(source, shell, "/workspace"))).toEqual(legacy)
+          })
+        }
+  }
+
+  test.each(bodies)("keeps compound function bodies inside command substitutions: %s", (body) => {
+    const source = `printf '%s' "$( probe() ${body}; probe )"`
+    const result = ShellScan.scan(source)
+    expect(result.kind).toBe("scanned")
+    if (result.kind !== "scanned") throw new Error(result.reason)
+    expect(result.commands[0]?.resource).toBe(source)
+    expect(result.commands.map((command) => command.words[0])).toContain("scan_probe")
+    expect(result.commands.at(-1)?.words).toEqual(["probe"])
+  })
+})
+
+const values = [
+  "one two",
+  "'two words' one",
+  "'cd' '/outside'",
+  "'do' 'done'",
+  "'(literal)' '$(scan_ignored)'",
+  "one\\\ntwo",
+  "$(printf one)",
+  '"$(printf one)"',
+  "<(printf one)",
+  "",
+]
+const loops = values.flatMap((value) =>
+  [
+    `for value (${value}) scan_probe "$value"`,
+    `for value (${value}) { scan_probe "$value"; }`,
+    ...(value
+      ? [
+          `for value (${value}) do scan_probe "$value"; done`,
+          `for value (${value}); do scan_probe "$value"; done`,
+          `for value (${value})\ndo scan_probe "$value"; done`,
+          `for value (${value}) # ignored\ndo scan_probe "$value"; done`,
+          `for value (${value}) \\\ndo scan_probe "$value"; done`,
+        ]
+      : []),
+  ].map((source) => ({ source, equivalent: `for value in ${value}; do scan_probe "$value"; done` })),
+)
+
+describe("Zsh parenthesized loop acceptance", () => {
+  for (const fixture of loops)
+    for (const context of contexts) {
+      const source = context(fixture.source)
+      test(source, async () => {
+        const legacy = await Effect.runPromise(ShellParse.scan(context(fixture.equivalent), "zsh", "/workspace"))
+        expect(await Effect.runPromise(ShellParse.scanPortable(source, "zsh", "/workspace"))).toEqual(legacy)
+      })
+    }
+
+  test.each([
+    "for x (one two) for y (a b) scan_probe",
+    "for x (one two) scan_probe && scan_other",
+    "for x (one two) scan_probe | scan_other",
+    "printf '%s' \"$(for x (one two) scan_probe)\"",
+    "for x (one two) { for y (a b); do scan_probe; done; }",
+    "for x (one two) [[ $(scan_probe) == ok ]]",
+    "for x (one two) (( 1 + $(scan_probe) ))",
+  ])("retains commands in nested shorthand loops: %s", (source) => {
+    const result = ShellScan.scan(source)
+    expect(result.kind).toBe("scanned")
+    if (result.kind !== "scanned") throw new Error(result.reason)
+    expect(result.commands.map((command) => command.words[0])).toContain("scan_probe")
+    if (source.includes("scan_other"))
+      expect(result.commands.map((command) => command.words[0])).toContain("scan_other")
+  })
+})
+
+describe("real-shell compound syntax", () => {
+  for (const shell of ["bash", "zsh"]) {
+    const executable = Bun.which(shell)
+    test
+      .skipIf(!executable)
+      .each([
+        ...bodies.map((body) => `probe() ${body}; probe`),
+        ...bodies.map((body) => `printf '%s' "$(probe() ${body}; probe)"`),
+        ...(shell === "zsh" ? loops.map((fixture) => fixture.source) : []),
+      ])(`${shell}: %s`, (source) => {
+      if (!executable) throw new Error(`${shell} is unavailable`)
+      const execution = Bun.spawnSync(
+        [
+          executable,
+          ...(shell === "bash" ? ["--noprofile", "--norc"] : ["-f"]),
+          "-c",
+          `scan_probe() { printf 'executed\\n' >&2; }; ${source}; wait`,
+        ],
+        { env: { PATH: "/usr/bin:/bin", LC_ALL: "C" }, timeout: 2_000 },
+      )
+      expect(execution.exitCode).toBe(0)
+      expect(execution.stderr.toString()).toEqual(
+        source.includes("value ()") ? "" : expect.stringContaining("executed\n"),
+      )
+      expect(ShellScan.scan(source).kind).toBe("scanned")
+    })
+  }
+})

packages/core/test/shell-scan/parity-regressions.test.ts

@@ -0,0 +1,158 @@
+import { describe, expect, test } from "bun:test"
+import { Effect } from "effect"
+import { ShellParse } from "../../src/shell/parse.js"
+import { ShellScan } from "../../src/shell/scan.js"
+
+const conditions = ["[[ -n <(scan_probe) ]]", "[[ -n >(scan_probe) ]]"]
+const contexts = [
+  (source: string) => source,
+  (source: string) => `( ${source} )`,
+  (source: string) => `{ ${source}; }`,
+  (source: string) => `if ${source}; then printf visible; fi`,
+  (source: string) => `check() { ${source}; }; check`,
+  (source: string) => `printf '%s' "$( ${source}; printf visible)"`,
+]
+
+const functions = ["probe", "probe-name", "probe.name", "probe:name"].flatMap((name) =>
+  [`${name}()`, `function ${name}`, `function ${name}()`].flatMap((head) =>
+    [
+      "{ scan_probe; }",
+      "(scan_probe)",
+      "if true; then scan_probe; fi",
+      "[[ $(scan_probe) == ok ]]",
+      "(( 1 + $(scan_probe) ))",
+    ].map((body) => `${head} ${body}; ${name}`),
+  ),
+)
+
+describe("legacy-accepted shell syntax regressions", () => {
+  test.each(["() { scan_probe; }", "probe() { scan_probe; }; probe"])(
+    "preserves deeply indented function definitions: %s",
+    async (source) => {
+      const command = `( ${" ".repeat(32_000)}${source} )`
+      const legacy = await Effect.runPromise(ShellParse.scan(command, "zsh", "/workspace"))
+      expect(await Effect.runPromise(ShellParse.scanPortable(command, "zsh", "/workspace"))).toEqual(legacy)
+    },
+  )
+
+  test.each(conditions.flatMap((source) => contexts.map((context) => context(source))))(
+    "retains conditional process substitutions and permission resources: %s",
+    async (source) => {
+      const legacy = await Effect.runPromise(ShellParse.scan(source, "bash", "/workspace"))
+      expect(legacy.commands.some((command) => command.resource === "scan_probe")).toBe(true)
+      expect(await Effect.runPromise(ShellParse.scanPortable(source, "bash", "/workspace"))).toEqual(legacy)
+    },
+  )
+
+  for (const shell of ["bash", "zsh"]) {
+    test.each(
+      ["probe()", "probe \\\n()", "function \\\nprobe()", "function probe \\\n()"].flatMap((head) =>
+        [" \\\n", " \\\n # ignored ) }\n", "# ignored \\\n"].flatMap((gap) =>
+          contexts.map((context) => context(`${head}${gap}{ scan_probe; }; probe`)),
+        ),
+      ),
+    )(`${shell} preserves line continuations at function boundaries: %s`, async (source) => {
+      const legacy = await Effect.runPromise(ShellParse.scan(source, shell, "/workspace"))
+      expect(legacy.commands.some((command) => command.resource === "scan_probe")).toBe(true)
+      expect(await Effect.runPromise(ShellParse.scanPortable(source, shell, "/workspace"))).toEqual(legacy)
+    })
+
+    test.each(
+      ["probe()", "function probe", "function probe()"].flatMap((head) =>
+        [" # ignored ) }\n", "\n# ignored ) }\n\n", " # first\n# second\n"].flatMap((gap) =>
+          contexts.map((context) => context(`${head}${gap}{ scan_probe; }; probe`)),
+        ),
+      ),
+    )(`${shell} preserves comments between a function head and its body: %s`, async (source) => {
+      const legacy = await Effect.runPromise(ShellParse.scan(source, shell, "/workspace"))
+      expect(legacy.commands.some((command) => command.resource === "scan_probe")).toBe(true)
+      expect(await Effect.runPromise(ShellParse.scanPortable(source, shell, "/workspace"))).toEqual(legacy)
+    })
+
+    test.each(functions)(
+      `${shell} preserves function resources, saved prefixes, and directories: %s`,
+      async (source) => {
+        const legacy = await Effect.runPromise(ShellParse.scan(source, shell, "/workspace"))
+        expect(legacy.commands.some((command) => command.resource === "scan_probe")).toBe(true)
+        expect(await Effect.runPromise(ShellParse.scanPortable(source, shell, "/workspace"))).toEqual(legacy)
+      },
+    )
+
+    const executable = Bun.which(shell)
+    test
+      .skipIf(!executable)
+      .each([
+        "probe-name() { scan_probe; }; probe-name",
+        "function probe.name { scan_probe; }; probe.name",
+        "probe:name() if true; then scan_probe; fi; probe:name",
+        "probe()# ignored ) }\n{ scan_probe; }; probe",
+        "probe \\\n() \\\n{ scan_probe; }; probe",
+        "function \\\nprobe() # ignored \\\n{ scan_probe; }; probe",
+        ...(shell === "bash" ? conditions : ["() { scan_probe; }"]),
+      ])(`${shell} really executes the extracted command: %s`, (source) => {
+      if (!executable) throw new Error(`${shell} is unavailable`)
+      const execution = Bun.spawnSync(
+        [
+          executable,
+          ...(shell === "bash" ? ["--noprofile", "--norc"] : ["-f"]),
+          "-c",
+          `scan_probe() { printf 'executed\\n' >&2; }; ${source}; wait`,
+        ],
+        { env: { PATH: "/usr/bin:/bin", LC_ALL: "C" } },
+      )
+      expect(execution.exitCode).toBe(0)
+      expect(execution.stderr.toString()).toBe("executed\n")
+      const result = ShellScan.scan(source)
+      expect(result.kind).toBe("scanned")
+      if (result.kind !== "scanned") throw new Error(result.reason)
+      expect(result.commands.map((command) => command.words[0])).toContain("scan_probe")
+    })
+  }
+
+  test.each([
+    "() { scan_probe; }",
+    "( () { scan_probe; } )",
+    "{ () { scan_probe; }; }",
+    "while() { scan_probe; break; }",
+    "until() { scan_probe; break; }",
+  ])("preserves Zsh anonymous functions and parenthesized loop permissions: %s", async (source) => {
+    const legacy = await Effect.runPromise(ShellParse.scan(source, "zsh", "/workspace"))
+    expect(legacy.commands.some((command) => command.resource === "scan_probe")).toBe(true)
+    expect(await Effect.runPromise(ShellParse.scanPortable(source, "zsh", "/workspace"))).toEqual(legacy)
+  })
+
+  // Tree-sitter recovers these valid Zsh forms with synthetic commands or truncated outer resources.
+  // Pin both results rather than treating recovery artifacts as executable shell syntax.
+  test.each([
+    {
+      source: "if () { scan_probe; }; then printf visible; fi",
+      legacy: ["scan_probe", "then printf visible", "fi"],
+      portable: ["scan_probe", "printf visible"],
+    },
+    {
+      source: "check() { () { scan_probe; }; }; check",
+      legacy: ["scan_probe", "}", "check"],
+      portable: ["scan_probe", "check"],
+    },
+    {
+      source: "printf '%s' \"$( () { scan_probe; }; printf visible)\"",
+      legacy: ["printf '%s'", "scan_probe", "printf visible"],
+      portable: ["printf '%s' \"$( () { scan_probe; }; printf visible)\"", "scan_probe", "printf visible"],
+    },
+  ])("accepts anonymous-function compositions despite legacy recovery artifacts: $source", async (fixture) => {
+    const legacy = await Effect.runPromise(ShellParse.scan(fixture.source, "zsh", "/workspace"))
+    const portable = await Effect.runPromise(ShellParse.scanPortable(fixture.source, "zsh", "/workspace"))
+    expect(legacy.commands.map((command) => command.resource)).toEqual([...fixture.legacy])
+    expect(portable.commands.map((command) => command.resource)).toEqual([...fixture.portable])
+  })
+
+  test.each([
+    "[[ -n '<(scan_ignored)' ]]",
+    '[[ -n "<(scan_ignored)" ]]',
+    "[[ -n '>(scan_ignored)' ]]",
+    '[[ -n ">(scan_ignored)" ]]',
+    "[[ -n $'<(scan_ignored)' ]]",
+  ])("does not turn quoted process-substitution text into commands: %s", (source) => {
+    expect(ShellScan.scan(source)).toEqual({ kind: "scanned", commands: [] })
+  })
+})

packages/core/test/shell-scan/powershell-runtime.test.ts

@@ -3,7 +3,30 @@ import { ShellScan } from "../../src/shell/scan.js"
 
 const pwsh = process.env.SHELL_SCAN_PWSH ?? Bun.which("pwsh")
 
+// These ordinary forms must stay accepted, not disappear behind the oracle's opaque-result filter.
+const supported = [
+  "Invoke-ProbeA; Invoke-ProbeB",
+  "$result = Invoke-ProbeA; Invoke-ProbeB",
+  "if (Invoke-ProbeA) { Invoke-ProbeB } else { Invoke-ProbeC }",
+  "foreach ($item in (Invoke-ProbeA)) { Invoke-ProbeB }",
+  "function Get-Probe { param($x); Invoke-ProbeB }; Invoke-ProbeA",
+  "$x = @{ first = Invoke-ProbeA; second = @(Invoke-ProbeB; Invoke-ProbeC) }",
+  'Invoke-ProbeA "$(Invoke-ProbeB "$(Invoke-ProbeC)")"',
+  "Invoke-ProbeA | ForEach-Object { Invoke-ProbeB }",
+  "Invoke-ProbeA @'\nliteral ; }\n'@; Invoke-ProbeB",
+  'Invoke-ProbeA @"\n$(Invoke-ProbeB)\n"@; Invoke-ProbeC',
+  "Invoke-ProbeA `\n  argument; Invoke-ProbeB",
+  "Invoke-ProbeA 2>&1; Invoke-ProbeB",
+  "& 'Invoke-ProbeA' argument; Invoke-ProbeB",
+  "Invoke-ProbeA --% literal; ignored\nInvoke-ProbeB",
+]
+
+test.each(supported)("accepts supported PowerShell syntax without an opaque escape hatch: %s", (source) => {
+  expect(ShellScan.scanPowerShell(source).kind).toBe("scanned")
+})
+
 const fixtures = [
+  ...supported,
   ...[
     "$result = Invoke-ProbeA; Invoke-ProbeB",
     "$result = (Invoke-ProbeA); Invoke-ProbeB",
@@ -343,6 +366,10 @@ test.skipIf(!pwsh)(
     let executed = 0
     for (const result of results) {
       const scan = ShellScan.scanPowerShell(result.source)
+      if (supported.includes(result.source)) {
+        expect(result.errors, result.source).toEqual([])
+        expect(scan.kind, result.source).toBe("scanned")
+      }
       if (scan.kind === "opaque" || result.errors.length > 0) continue
       scanned++
       executed += result.executed.length

packages/core/test/tool-shell.test.ts

@@ -526,6 +526,150 @@ describe("ShellTool scanner permissions", () => {
   }
 })
 
+describe("ShellTool conditional process substitution", () => {
+  const test = isWindows || !Bun.which("bash") ? permissionIt.live.skip : permissionIt.live
+  for (const portable of [false, true]) {
+    test(`${portable ? "native" : "legacy"}: a nested deny prevents the substitution from running`, () =>
+      withScanner(
+        portable,
+        (registry, directory) =>
+          Effect.gen(function* () {
+            const agents = yield* Agent.Service
+            yield* agents.transform((editor) =>
+              editor.update(toolIdentity.agent, (agent) => {
+                agent.permissions = [
+                  { action: "shell", resource: "*", effect: "allow" },
+                  { action: "shell", resource: "printf *", effect: "deny" },
+                ]
+              }),
+            )
+            const marker = path.join(directory.active, "marker")
+            const result = yield* runPermissionCommand(
+              registry,
+              '[[ -n <(printf reached > marker) ]]; wait "$!"',
+              marker,
+              [],
+            )
+            expect(result.exit).toMatchObject({
+              _tag: "Success",
+              value: { status: "error", error: { message: expect.stringContaining("Permission denied: shell") } },
+            })
+            expect(yield* Effect.promise(() => Bun.file(marker).exists())).toBe(false)
+          }),
+        "bash",
+      ))
+
+    for (const reply of ["reject", "once", "always"] as const) {
+      test(`${portable ? "native" : "legacy"}: conditional substitutions respect ${reply}`, () =>
+        withScanner(
+          portable,
+          (registry, directory) =>
+            Effect.gen(function* () {
+              const saved = yield* PermissionSaved.Service
+              const location = yield* Location.Service
+              yield* saved.add({ projectID: location.project.id, action: "shell", resources: ["wait *"] })
+              const marker = path.join(directory.active, "marker")
+              const command = '[[ -n <(printf reached > marker) ]]; wait "$!"'
+              const result = yield* runPermissionCommand(registry, command, marker, [reply])
+              expect(result.requests).toMatchObject([
+                { action: "shell", resources: ["printf reached > marker", 'wait "$!"'], save: ["printf *", "wait *"] },
+              ])
+              if (reply === "reject") {
+                expect(Exit.isFailure(result.exit)).toBe(true)
+                expect(yield* Effect.promise(() => Bun.file(marker).exists())).toBe(false)
+                return
+              }
+              expect(result.exit).toMatchObject({
+                _tag: "Success",
+                value: { status: "completed", metadata: { exit: 0 } },
+              })
+              expect(yield* Effect.promise(() => Bun.file(marker).text())).toBe("reached")
+              yield* Effect.promise(() => fs.unlink(marker))
+              const repeat = yield* runPermissionCommand(
+                registry,
+                command,
+                marker,
+                reply === "always" ? [] : ["reject"],
+              )
+              expect(repeat.requests).toHaveLength(reply === "always" ? 0 : 1)
+              expect(yield* Effect.promise(() => Bun.file(marker).exists())).toBe(reply === "always")
+            }),
+          "bash",
+        ))
+    }
+  }
+})
+
+describe("ShellTool compound syntax approval compatibility", () => {
+  for (const fixture of [
+    {
+      shell: "zsh",
+      command: 'for value (a b) printf %s "$value"',
+      equivalent: 'for value in a b; do printf %s "$value"; done',
+      output: "ab",
+      saved: ["printf *"],
+    },
+    {
+      shell: "zsh",
+      command: 'for value (a b) { printf %s "$value"; }',
+      equivalent: 'for value in a b; do printf %s "$value"; done',
+      output: "ab",
+      saved: ["printf *"],
+    },
+    {
+      shell: "zsh",
+      command: 'for value ($(printf a)) do printf %s "$value"; done',
+      equivalent: 'for value in $(printf a); do printf %s "$value"; done',
+      output: "a",
+      saved: ["printf *"],
+    },
+    {
+      shell: "bash",
+      command: 'probe() for value in a b; do printf %s "$value"; done; probe',
+      equivalent: 'probe() { for value in a b; do printf %s "$value"; done; }; probe',
+      output: "ab",
+      saved: ["printf *", "probe *"],
+    },
+    {
+      shell: "bash",
+      command: 'printf %s "$(probe() case value in value) printf hello;; esac; probe)"',
+      equivalent: 'printf %s "$(probe() { case value in value) printf hello;; esac; }; probe)"',
+      output: "hello",
+      saved: ["printf *", "probe *"],
+    },
+  ]) {
+    const test = isWindows || !Bun.which(fixture.shell) ? permissionIt.live.skip : permissionIt.live
+    for (const portable of [false, true]) {
+      test(`${fixture.shell} ${portable ? "native" : "legacy equivalent"}: ${fixture.command}`, () =>
+        withScanner(
+          portable,
+          (registry, directory) =>
+            Effect.gen(function* () {
+              const saved = yield* PermissionSaved.Service
+              const location = yield* Location.Service
+              yield* saved.add({ projectID: location.project.id, action: "shell", resources: fixture.saved })
+              const result = yield* runPermissionCommand(
+                registry,
+                portable ? fixture.command : fixture.equivalent,
+                path.join(directory.active, "marker"),
+                [],
+              )
+              expect(result.requests).toEqual([])
+              expect(result.exit).toMatchObject({
+                _tag: "Success",
+                value: {
+                  status: "completed",
+                  metadata: { exit: 0 },
+                  content: [{ type: "text", text: fixture.output }, { type: "text" }],
+                },
+              })
+            }),
+          fixture.shell,
+        ))
+    }
+  }
+})
+
 describe("ShellTool ordinary shell syntax", () => {
   for (const shell of ["bash", "zsh"]) {
     const test = isWindows || !Bun.which(shell) ? permissionIt.live.skip : permissionIt.live

packages/plugin/src/tui/context.ts

@@ -162,6 +162,20 @@ type PromptFooterInput = {
   readonly showDetails: boolean
 }
 
+export type PanelPresentation = "panel" | "fullscreen"
+
+/** Client-local state of the selected session panel. The host owns its layout and input scope. */
+export interface PanelInput {
+  readonly sessionID: string
+  readonly width: number
+  readonly presentation: PanelPresentation
+  readonly focused: boolean
+  readonly canSplit: boolean
+  readonly focus: () => void
+  readonly close: () => void
+  readonly toggleFullscreen: () => void
+}
+
 /**
  * The host UI's slot tree. Every path is one slot: a named boundary a plugin
  * may render around, inside, or take over. Paths are absolute and
@@ -180,6 +194,7 @@ export interface SlotMap {
   readonly "prompt.footer.status": PromptFooterInput
   readonly "prompt.footer.file": PromptFooterInput
   readonly "session.composer.top": { readonly sessionID: string }
+  readonly "session.panel": PanelInput
   readonly "sidebar.content": { readonly sessionID: string }
   readonly "sidebar.footer": { readonly sessionID: string }
 }
@@ -203,45 +218,58 @@ export type SlotPath = keyof SlotMap
  * `render` receives the target slot's input, reactively. The `?: never`
  * fields make the variants mutually exclusive: a claim with two placement
  * keys is a type error, not a silent priority pick.
+ *
+ * `session.panel` is an exclusive named replacement selected by ui.panel.open,
+ * not by plugin enable order. Its instance survives presentation changes.
  */
 export type SlotClaim<Path extends SlotPath = SlotPath> = Path extends SlotPath
-  ? { readonly render: (input: SlotMap[Path]) => JSX.Element } & (
-      | {
-          readonly prepend: Path
-          readonly append?: never
-          readonly before?: never
-          readonly after?: never
-          readonly replace?: never
-        }
-      | {
-          readonly append: Path
-          readonly prepend?: never
-          readonly before?: never
-          readonly after?: never
-          readonly replace?: never
-        }
-      | {
-          readonly before: Path
-          readonly prepend?: never
-          readonly append?: never
-          readonly after?: never
-          readonly replace?: never
-        }
-      | {
-          readonly after: Path
-          readonly prepend?: never
-          readonly append?: never
-          readonly before?: never
-          readonly replace?: never
-        }
-      | {
-          readonly replace: Path
-          readonly prepend?: never
-          readonly append?: never
-          readonly before?: never
-          readonly after?: never
-        }
-    )
+  ? { readonly render: (input: SlotMap[Path]) => JSX.Element } & (Path extends "session.panel"
+      ? { readonly name: string }
+      : { readonly name?: string }) &
+      (Path extends "session.panel"
+        ? {
+            readonly replace: Path
+            readonly prepend?: never
+            readonly append?: never
+            readonly before?: never
+            readonly after?: never
+          }
+        :
+            | {
+                readonly prepend: Path
+                readonly append?: never
+                readonly before?: never
+                readonly after?: never
+                readonly replace?: never
+              }
+            | {
+                readonly append: Path
+                readonly prepend?: never
+                readonly before?: never
+                readonly after?: never
+                readonly replace?: never
+              }
+            | {
+                readonly before: Path
+                readonly prepend?: never
+                readonly append?: never
+                readonly after?: never
+                readonly replace?: never
+              }
+            | {
+                readonly after: Path
+                readonly prepend?: never
+                readonly append?: never
+                readonly before?: never
+                readonly replace?: never
+              }
+            | {
+                readonly replace: Path
+                readonly prepend?: never
+                readonly append?: never
+                readonly before?: never
+                readonly after?: never
+              })
   : never
 
 export interface App {
@@ -450,6 +478,14 @@ export interface UI {
     navigate(destination: Destination): void
     current(): Route
   }
+  readonly panel: {
+    /** Opens a named session.panel contribution owned by this plugin in the current session. */
+    open(name: string, options?: { readonly presentation?: PanelPresentation }): boolean
+    /** Closes this plugin's active panel. Other plugins' panels are unaffected. */
+    close(): void
+    /** This plugin's active panel, if any. Reactive when read in a Solid computation. */
+    current(): { readonly name: string; readonly sessionID: string } | undefined
+  }
   readonly tabs: {
     /** Returns whether session tabs are enabled for this TUI. */
     enabled(): boolean

packages/protocol/openapi.json

@@ -13904,7 +13904,7 @@
           },
           "update": {
             "type": "string",
-            "enum": ["disable", "notify", "auto"]
+            "enum": ["disable", "notify"]
           },
           "share": {
             "type": "string",

packages/schema/src/config.ts

@@ -34,8 +34,8 @@ export class Info extends Schema.Class<Info>("Config.Info")({
   default_agent: Schema.String.pipe(optional).annotate({
     description: "Default primary agent to use when no session agent is selected",
   }),
-  update: Schema.Literals(["disable", "notify", "auto"]).pipe(optional).annotate({
-    description: "Disable updates, notify when one is available, or install automatically",
+  update: Schema.Literals(["disable", "notify"]).pipe(optional).annotate({
+    description: "Disable updates or notify when one is available",
   }),
   share: Schema.Literals(["manual", "auto", "disabled"]).pipe(optional).annotate({
     description: "Control whether sessions may be shared manually, automatically, or not at all",

packages/server/src/process.ts

@@ -1,11 +1,9 @@
 export * as ServerProcess from "./process"
 
 import { NodeHttpServer } from "@effect/platform-node"
-import { Bus } from "@opencode-ai/core/bus"
 import { SessionRestart } from "@opencode-ai/core/session/execution/restart"
 import { hasPtyConnectTicketURL } from "@opencode-ai/protocol/groups/pty"
 import { hasPersistentPtyConnectTicketURL } from "@opencode-ai/protocol/groups/persistent-pty"
-import { InstallationEvent } from "@opencode-ai/schema/installation-event"
 import { Cause, Context, Effect, Exit, Latch, Layer, Option, Ref, Scope } from "effect"
 import {
   HttpMiddleware,
@@ -116,12 +114,7 @@ export const start = Effect.fn("ServerProcess.start")(function* <E, R>(
       )
     yield* Ref.set(application, Option.some(transform ? transform(app) : app))
     yield* status.ready
-    return {
-      address: bound.http.address,
-      shutdown: shutdown.await,
-      updateAvailable: (version: string) =>
-        Context.get(context, Bus.Service).publish(InstallationEvent.UpdateAvailable, { version }).pipe(Effect.asVoid),
-    }
+    return { address: bound.http.address, shutdown: shutdown.await }
   }).pipe(
     Effect.catchCause((cause) => {
       if (!lifecycle || Cause.hasInterruptsOnly(cause)) return Effect.failCause(cause)

packages/server/test/process.test.ts

@@ -1,5 +1,4 @@
 import { expect } from "bun:test"
-import { InstallationEvent } from "@opencode-ai/schema/installation-event"
 import { Effect } from "effect"
 import { HttpServer, HttpServerError, HttpServerResponse } from "effect/unstable/http"
 import { it } from "../../core/test/lib/effect"
@@ -100,12 +99,9 @@ it.live("allows browser preflight requests without credentials", () =>
     )
     expect(event.status).toBe(200)
     expect(event.headers.get("content-encoding")).toBeNull()
-    if (!event.body) return yield* Effect.die(new Error("Event response has no body"))
-    const reader = event.body.getReader()
-    yield* Effect.promise(() => readUntil(reader, "server.connected"))
-    yield* server.updateAvailable("2.0.0")
-    yield* Effect.promise(() => readUntil(reader, "installation.update-available"))
-    yield* Effect.promise(() => reader.cancel())
+    const body = event.body
+    if (!body) return yield* Effect.die(new Error("Event response has no body"))
+    yield* Effect.promise(() => body.cancel())
 
     const missing = yield* Effect.promise(() =>
       fetch(new URL("/missing", HttpServer.formatAddress(server.address)), {
@@ -130,11 +126,3 @@ it.live("allows browser preflight requests without credentials", () =>
     )
   }),
 )
-
-async function readUntil(reader: ReadableStreamDefaultReader<Uint8Array>, expected: string) {
-  while (true) {
-    const next = await reader.read()
-    if (next.done) throw new Error(`Event stream ended before ${expected}`)
-    if (new TextDecoder().decode(next.value).includes(expected)) return
-  }
-}

packages/tui/src/app.tsx

@@ -100,6 +100,7 @@ import { cliErrorMessage, errorFormat } from "./util/error"
 import { AttentionProvider } from "./context/attention"
 import { StorageProvider, useStorage } from "./context/storage"
 import { SessionTerminalsProvider } from "./context/session-terminals"
+import { PanelProvider, usePanel } from "./context/panel"
 import { SessionFrame } from "./component/session-frame"
 import { createTuiClipboard } from "./clipboard"
 
@@ -186,6 +187,7 @@ export type TuiInput = {
   args: Args
   config: Config.Interface
   updater?: {
+    monitor: (notify: (version: string) => void, signal: AbortSignal) => Promise<void>
     apply: (version: string) => Promise<void>
   }
   packages: PackageSource
@@ -220,9 +222,6 @@ export const run = Effect.fn("Tui.run")(function* (input: TuiInput) {
   const service = managed
     ? {
         reconnect: async (signal: AbortSignal) => {
-          // Give the server a chance to respawn itself before starting client-side recovery.
-          await new Promise((resolve) => setTimeout(resolve, 50))
-          if (signal.aborted) throw signal.reason ?? new Error("Server reconnect cancelled")
           const endpoint = await managed.reconnect(signal)
           const next = { baseUrl: endpoint.url, headers: Service.headers(endpoint) }
           return { api: OpenCode.make(next), url: endpoint.url }
@@ -399,22 +398,24 @@ export const run = Effect.fn("Tui.run")(function* (input: TuiInput) {
                                                                     <PromptRefProvider>
                                                                       <EditorContextProvider>
                                                                         <AttentionProvider>
-                                                                          <PluginProvider
-                                                                            packages={input.packages}
-                                                                            directories={pluginDirectories}
-                                                                          >
-                                                                            <App
-                                                                              updater={input.updater}
-                                                                              pair={
-                                                                                input.server.endpoint.auth
-                                                                                  ? input.server.endpoint.auth
-                                                                                  : {
-                                                                                      username: "opencode",
-                                                                                      password: "",
-                                                                                    }
-                                                                              }
-                                                                            />
-                                                                          </PluginProvider>
+                                                                          <PanelProvider>
+                                                                            <PluginProvider
+                                                                              packages={input.packages}
+                                                                              directories={pluginDirectories}
+                                                                            >
+                                                                              <App
+                                                                                updater={input.updater}
+                                                                                pair={
+                                                                                  input.server.endpoint.auth
+                                                                                    ? input.server.endpoint.auth
+                                                                                    : {
+                                                                                        username: "opencode",
+                                                                                        password: "",
+                                                                                      }
+                                                                                }
+                                                                              />
+                                                                            </PluginProvider>
+                                                                          </PanelProvider>
                                                                         </AttentionProvider>
                                                                       </EditorContextProvider>
                                                                     </PromptRefProvider>
@@ -476,6 +477,7 @@ function App(props: { pair?: DialogPairCredentials; updater?: TuiInput["updater"
   const dialog = useDialog()
   const local = useLocal()
   const sessionTabs = useSessionTabs()
+  const panels = usePanel()
   const keymap = Keymap.use()
   const event = useEvent()
   const client = useClient()
@@ -507,6 +509,36 @@ function App(props: { pair?: DialogPairCredentials; updater?: TuiInput["updater"
     "update-notifications",
     { initial: { versions: [] } },
   )
+  const showUpdate = (version: string) => {
+    const updater = props.updater
+    if (!updater || updateNotifications.versions.includes(version)) return
+    void markUpdateNotification((draft) => {
+      draft.versions = [...draft.versions, version].slice(-100)
+    }).catch((error) => log.error("failed to persist update notification", { error }))
+    const key = `update:${version}`
+    dialog.replace(
+      () => (
+        <DialogUpdate
+          dialogKey={key}
+          version={version}
+          install={() => updater.apply(version)}
+          restart={client.restart}
+        />
+      ),
+      undefined,
+      { key },
+    )
+    dialog.setCentered(true)
+  }
+  onMount(() => {
+    const updater = props.updater
+    if (!updater) return
+    const controller = new AbortController()
+    onCleanup(() => controller.abort())
+    void updater.monitor(showUpdate, controller.signal).catch((error) => {
+      if (!controller.signal.aborted) log.error("update monitor failed", { error })
+    })
+  })
   const tabsResize = createPaneResize({
     value: () => layout.verticalTabsWidth ?? SESSION_SIDEBAR_WIDTH,
     defaultValue: () => SESSION_SIDEBAR_WIDTH,
@@ -580,9 +612,22 @@ function App(props: { pair?: DialogPairCredentials; updater?: TuiInput["updater"
   const pasteSummaryEnabled = () => config.data.prompt?.paste !== "full"
   const tabsVertical = () =>
     config.data.tabs.layout === "vertical" && sessionTabsFitVertically(dimensions().width, tabsResize.preferredSize())
-  const tabsVisible = () => sessionTabs.enabled() && sessionTabs.tabs().length > 0 && route.data.type !== "plugin"
+  const tabsAvailable = () => sessionTabs.enabled() && sessionTabs.tabs().length > 0 && route.data.type !== "plugin"
+  const fullscreenPanel = () =>
+    route.data.type === "session" &&
+    panels.current()?.sessionID === route.data.sessionID &&
+    panels.presentation() === "fullscreen"
+  const tabsVisible = () => tabsAvailable() && !fullscreenPanel()
   const verticalTabsVisible = () => tabsVisible() && tabsVertical()
 
+  // Measure the prospective split layout, even while full-screen hides the tabs.
+  createEffect(() => panels.setWidth(dimensions().width - (tabsAvailable() && tabsVertical() ? tabsResize.size() : 0)))
+  createEffect(() => {
+    const current = panels.current()
+    if (!current || (route.data.type === "session" && route.data.sessionID === current.sessionID)) return
+    panels.close()
+  })
+
   createEffect(() => {
     renderer.useMouse = config.data.mouse
   })
@@ -1215,19 +1260,6 @@ function App(props: { pair?: DialogPairCredentials; updater?: TuiInput["updater"
     })
   })
 
-  event.on("installation.update-available", (evt) => {
-    const updater = props.updater
-    const restart = client.restart
-    if (!updater || !restart) return
-    const version = evt.data.version
-    if (updateNotifications.versions.includes(version)) return
-    void markUpdateNotification((draft) => {
-      draft.versions = [...draft.versions, version].slice(-100)
-    }).catch((error) => log.error("failed to persist update notification", { error }))
-    dialog.replace(() => <DialogUpdate version={version} install={() => updater.apply(version)} restart={restart} />)
-    dialog.setCentered(true)
-  })
-
   event.on("tui.session.select", (evt, { workspace }) => {
     if (workspace !== (location.current?.workspaceID ?? data.location.default().workspaceID)) return
     route.navigate({

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

@@ -8,22 +8,32 @@ import { useDialog } from "../ui/dialog"
 import { Spinner } from "./spinner"
 
 type State =
-  | { type: "ready"; active: "update" | "ignore" }
+  | { type: "ready"; active: "update" | "skip" }
   | { type: "installing" }
   | { type: "restarting" }
   | { type: "failed"; message: string }
 
-export function DialogUpdate(props: { version: string; install: () => Promise<void>; restart: () => Promise<void> }) {
+export function DialogUpdate(props: {
+  dialogKey: string
+  version: string
+  install: () => Promise<void>
+  restart?: () => Promise<void>
+}) {
   const dialog = useDialog()
   const theme = useTheme("elevated")
   const [state, setState] = createSignal<State>({ type: "ready", active: "update" })
+  const close = () => {
+    if (dialog.key === props.dialogKey) dialog.clear()
+  }
 
   const install = async () => {
     setState({ type: "installing" })
     await props.install()
-    setState({ type: "restarting" })
-    await props.restart()
-    dialog.clear()
+    if (props.restart) {
+      setState({ type: "restarting" })
+      await props.restart()
+    }
+    close()
   }
 
   const beginInstall = () => {
@@ -34,16 +44,16 @@ export function DialogUpdate(props: { version: string; install: () => Promise<vo
   const run = () => {
     const current = state()
     if (current.type !== "ready") return
-    if (current.active === "ignore") return dialog.clear()
+    if (current.active === "skip") return close()
     beginInstall()
   }
 
   const toggle = () =>
     setState((current) =>
-      current.type === "ready" ? { ...current, active: current.active === "update" ? "ignore" : "update" } : current,
+      current.type === "ready" ? { ...current, active: current.active === "update" ? "skip" : "update" } : current,
     )
 
-  const selected = (action: "update" | "ignore") => {
+  const selected = (action: "update" | "skip") => {
     const current = state()
     return current.type === "ready" && current.active === action
   }
@@ -60,7 +70,7 @@ export function DialogUpdate(props: { version: string; install: () => Promise<vo
         bind: "return",
         title: "Confirm update action",
         group: "Dialog",
-        run: () => (state().type === "failed" ? dialog.clear() : run()),
+        run: () => (state().type === "failed" ? close() : run()),
       },
       {
         bind: "left",
@@ -81,9 +91,9 @@ export function DialogUpdate(props: { version: string; install: () => Promise<vo
     <box paddingLeft={2} paddingRight={2} gap={1}>
       <box flexDirection="row" justifyContent="space-between">
         <text attributes={TextAttributes.BOLD} fg={theme.text.default}>
-          Update
+          Update available
         </text>
-        <text fg={theme.text.subdued} onMouseUp={() => dialog.clear()}>
+        <text fg={theme.text.subdued} onMouseUp={close}>
           esc
         </text>
       </box>
@@ -91,14 +101,17 @@ export function DialogUpdate(props: { version: string; install: () => Promise<vo
         <Switch>
           <Match when={state().type === "ready"}>
             <text fg={theme.text.subdued}>
-              Update to v{props.version}? It will be applied in the background and active sessions will be restarted.
+              An update is available. Applying will
+              {props.restart
+                ? " restart the server and active sessions will be resumed."
+                : " install the update but you will need to manually restart."}
             </text>
           </Match>
           <Match when={state().type === "installing"}>
-            <Spinner>Installing OpenCode {props.version}…</Spinner>
+            <Spinner shimmer={theme.text.default}>Installing OpenCode {props.version}…</Spinner>
           </Match>
           <Match when={state().type === "restarting"}>
-            <Spinner>Restarting the background service…</Spinner>
+            <Spinner shimmer={theme.text.default}>Restarting the background service…</Spinner>
           </Match>
           <Match when={state().type === "failed"}>
             <text fg={theme.text.feedback.error.default}>{failure()}</text>
@@ -114,7 +127,7 @@ export function DialogUpdate(props: { version: string; install: () => Promise<vo
                 paddingLeft={3}
                 paddingRight={3}
                 backgroundColor={theme.background.action.primary.focused}
-                onMouseUp={() => dialog.clear()}
+                onMouseUp={close}
               >
                 <text fg={theme.text.action.primary.focused}>close</text>
               </box>
@@ -123,19 +136,19 @@ export function DialogUpdate(props: { version: string; install: () => Promise<vo
         }
       >
         <box flexDirection="row" justifyContent="flex-end" paddingBottom={1}>
-          <For each={["ignore", "update"] as const}>
+          <For each={["skip", "update"] as const}>
             {(action) => (
               <box
                 paddingLeft={1}
                 paddingRight={1}
                 backgroundColor={selected(action) ? theme.background.action.primary.focused : undefined}
                 onMouseUp={() => {
-                  if (action === "ignore") return dialog.clear()
+                  if (action === "skip") return close()
                   beginInstall()
                 }}
               >
                 <text fg={selected(action) ? theme.text.action.primary.focused : theme.text.subdued}>
-                  {action === "update" ? "Update" : "Ignore"}
+                  {action === "update" ? "Update" : "Skip"}
                 </text>
               </box>
             )}

packages/tui/src/component/panel-host.tsx

@@ -0,0 +1,66 @@
+import type { BoxRenderable } from "@opentui/core"
+import { onCleanup, onMount } from "solid-js"
+import { usePanel, type PanelTarget } from "../context/panel"
+import { Keymap } from "../context/keymap"
+import { ThemeContextProvider, useTheme } from "../context/theme"
+import { Slot } from "../plugin/render"
+
+export function PanelHost(props: {
+  panel: PanelTarget
+  width: number
+  focused: boolean
+  onFocus: () => void
+  onTarget: (node: BoxRenderable | undefined) => void
+}) {
+  const panels = usePanel()
+  let node: BoxRenderable
+  onMount(() => props.onTarget(node))
+  onCleanup(() => props.onTarget(undefined))
+
+  const Content = () => {
+    const theme = useTheme()
+    return (
+      <box
+        id="session-panel"
+        ref={(value: BoxRenderable) => (node = value)}
+        flexGrow={1}
+        minWidth={0}
+        minHeight={0}
+        focusable
+        backgroundColor={theme.background.default}
+        onMouseDown={props.onFocus}
+      >
+        <Slot
+          path="session.panel"
+          selection={props.panel}
+          input={{
+            sessionID: props.panel.sessionID,
+            get width() {
+              return props.width
+            },
+            get presentation() {
+              return panels.presentation()
+            },
+            get canSplit() {
+              return panels.canSplit()
+            },
+            get focused() {
+              return props.focused
+            },
+            focus: props.onFocus,
+            close: panels.close,
+            toggleFullscreen: panels.toggleFullscreen,
+          }}
+        />
+      </box>
+    )
+  }
+
+  return (
+    <Keymap.Scope enabled={props.focused}>
+      <ThemeContextProvider context={() => (panels.presentation() === "panel" ? "elevated" : undefined)}>
+        <Content />
+      </ThemeContextProvider>
+    </Keymap.Scope>
+  )
+}

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

@@ -187,6 +187,8 @@ export function Prompt(props: PromptProps) {
   let anchor: BoxRenderable
   const [inputTarget, setInputTarget] = createSignal<TextareaRenderable | undefined>()
 
+  const enabled = Keymap.useEnabled()
+  const disabled = () => props.disabled || !enabled()
   const leader = Keymap.useLeaderActive()
   const muted = () => leader() || props.muted
   const local = useLocal()
@@ -259,6 +261,7 @@ export function Prompt(props: PromptProps) {
   const [pendingDirectory, setPendingDirectory] = createSignal<string>()
   Keymap.createLayer(() => ({
     mode: "global",
+    enabled: !disabled(),
     commands: [
       {
         id: "session.cd",
@@ -348,8 +351,7 @@ export function Prompt(props: PromptProps) {
 
   createEffect(() => {
     if (!input || input.isDestroyed) return
-    if (props.disabled) input.cursorColor = theme.background.surface.offset
-    if (!props.disabled) input.cursorColor = theme.text.default
+    input.cursorColor = disabled() ? theme.background.surface.offset : theme.text.default
     if (config.cursor) input.cursorStyle = config.cursor
   })
 
@@ -372,12 +374,13 @@ export function Prompt(props: PromptProps) {
   function enqueuePaste(run: (changed: () => boolean) => Promise<void>) {
     pasteQueue = pasteQueue
       .then(async () => {
-        if (disposed || input.isDestroyed) return
+        if (disposed || input.isDestroyed || disabled()) return
         const before = { sessionID: props.sessionID, mode: store.mode, text: input.plainText }
         await run(
           () =>
             disposed ||
             input.isDestroyed ||
+            disabled() ||
             props.sessionID !== before.sessionID ||
             store.mode !== before.mode ||
             input.plainText !== before.text,
@@ -648,15 +651,18 @@ export function Prompt(props: PromptProps) {
 
   Keymap.createLayer(() => ({
     mode: "global",
+    enabled: !disabled(),
     commands: promptCommands(),
   }))
 
   Keymap.createLayer(() => ({
     priority: 1,
+    enabled: !disabled(),
     bindings: ["prompt.queue"],
   }))
 
   Keymap.createLayer(() => ({
+    enabled: !disabled(),
     bindings: [
       "prompt.submit",
       "prompt.editor",
@@ -674,12 +680,13 @@ export function Prompt(props: PromptProps) {
 
   const ref: PromptRef = {
     get focused() {
-      return input.focused
+      return !disabled() && input.focused
     },
     get current() {
       return store.prompt
     },
     focus() {
+      if (disabled()) return
       input.focus()
     },
     blur() {
@@ -733,11 +740,13 @@ export function Prompt(props: PromptProps) {
 
   createEffect(() => {
     if (!input || input.isDestroyed) return
-    if (props.visible === false || props.disabled || dialog.stack.length > 0) {
+    if (props.visible === false || disabled() || dialog.stack.length > 0) {
       if (input.focused) input.blur()
+      input.focusable = false
       return
     }
 
+    input.focusable = true
     // Slot/plugin updates can remount the background prompt while a dialog is open.
     // Keep focus with the dialog and let the prompt reclaim it after the dialog closes.
     if (!input.focused) input.focus()
@@ -933,13 +942,14 @@ export function Prompt(props: PromptProps) {
 
   Keymap.createLayer(() => ({
     mode: "global",
+    enabled: !disabled(),
     commands: stashCommands(),
   }))
 
   Keymap.createLayer(() => {
     return {
       target: inputTarget,
-      enabled: inputTarget() !== undefined && !props.disabled,
+      enabled: inputTarget() !== undefined && !disabled(),
       bindings: ["prompt.paste"],
     }
   })
@@ -947,7 +957,7 @@ export function Prompt(props: PromptProps) {
   Keymap.createLayer(() => {
     return {
       target: inputTarget,
-      enabled: inputTarget() !== undefined && !props.disabled && store.prompt.text !== "",
+      enabled: inputTarget() !== undefined && !disabled() && store.prompt.text !== "",
       bindings: ["prompt.clear"],
     }
   })
@@ -959,7 +969,7 @@ export function Prompt(props: PromptProps) {
         cursorVersion()
         return (
           inputTarget() !== undefined &&
-          !props.disabled &&
+          !disabled() &&
           store.mode === "normal" &&
           !auto()?.visible &&
           input?.visualCursor.offset === 0
@@ -983,7 +993,7 @@ export function Prompt(props: PromptProps) {
     return {
       priority: 1,
       target: inputTarget,
-      enabled: inputTarget() !== undefined && store.mode === "shell",
+      enabled: inputTarget() !== undefined && !disabled() && store.mode === "shell",
       commands: [
         { bind: "escape", title: "Exit shell mode", group: "Prompt", run: () => setStore("mode", "normal") },
         {
@@ -1002,7 +1012,7 @@ export function Prompt(props: PromptProps) {
       target: inputTarget,
       enabled: (() => {
         cursorVersion()
-        return inputTarget() !== undefined && store.mode === "shell" && input?.visualCursor.offset === 0
+        return inputTarget() !== undefined && !disabled() && store.mode === "shell" && input?.visualCursor.offset === 0
       })(),
       commands: [
         { bind: "backspace", title: "Exit shell mode", group: "Prompt", run: () => setStore("mode", "normal") },
@@ -1016,7 +1026,7 @@ export function Prompt(props: PromptProps) {
       target: inputTarget,
       enabled: (() => {
         cursorVersion()
-        return inputTarget() !== undefined && !props.disabled && !auto()?.visible && input !== undefined
+        return inputTarget() !== undefined && !disabled() && !auto()?.visible && input !== undefined
       })(),
       commands: [
         {
@@ -1052,7 +1062,7 @@ export function Prompt(props: PromptProps) {
       target: inputTarget,
       enabled: (() => {
         cursorVersion()
-        return inputTarget() !== undefined && !props.disabled && !auto()?.visible && input !== undefined
+        return inputTarget() !== undefined && !disabled() && !auto()?.visible && input !== undefined
       })(),
       commands: [
         {
@@ -1087,6 +1097,7 @@ export function Prompt(props: PromptProps) {
 
   let submitting = false
   async function submit(delivery: SessionInbox.Delivery = "steer") {
+    if (disabled()) return false
     // Prevent overlapping invocations (e.g. a double-pressed Enter, or the
     // input's native onSubmit racing another dispatch). Without this guard,
     // a second call slips past the empty-input check before the first call
@@ -1110,7 +1121,6 @@ export function Prompt(props: PromptProps) {
       setStore("prompt", "text", input.plainText)
       syncExtmarksWithPromptParts()
     }
-    if (props.disabled) return false
     if (move.creating()) return false
     if (auto()?.visible) return false
     const trimmed = store.prompt.text.trim()
@@ -1663,7 +1673,7 @@ export function Prompt(props: PromptProps) {
   const promptBg = createMemo(() => theme.raise(theme.background.surface.offset))
 
   return (
-    <>
+    <Keymap.Scope enabled={!disabled()}>
       <box ref={(r: BoxRenderable) => (anchor = r)} visible={props.visible !== false} width="100%">
         <box
           width="100%"
@@ -1769,18 +1779,19 @@ export function Prompt(props: PromptProps) {
               }}
               onCursorChange={() => setCursorVersion((value) => value + 1)}
               onKeyDown={(e: { preventDefault(): void }) => {
-                if (props.disabled) {
+                if (disabled()) {
                   e.preventDefault()
                   return
                 }
               }}
               onSubmit={() => {
+                if (disabled()) return
                 // IME: double-defer so the last composed character (e.g. Korean
                 // hangul) is flushed to plainText before we read it for submission.
                 setTimeout(() => setTimeout(() => submit(), 0), 0)
               }}
               onPaste={(event: PasteEvent) => {
-                if (props.disabled) {
+                if (disabled()) {
                   event.preventDefault()
                   return
                 }
@@ -1816,12 +1827,16 @@ export function Prompt(props: PromptProps) {
                 setTimeout(() => {
                   // setTimeout is a workaround and needs to be addressed properly
                   if (!input || input.isDestroyed) return
-                  input.cursorColor = theme.text.default
+                  input.cursorColor = disabled() ? theme.background.surface.offset : theme.text.default
                   if (config.cursor) input.cursorStyle = config.cursor
                 }, 0)
               }}
               onMouseDown={(r: MouseEvent) => {
-                if (props.disabled || r.button !== 0) return
+                if (disabled()) {
+                  r.preventDefault()
+                  return
+                }
+                if (r.button !== 0) return
                 r.target?.focus()
                 const extmark = input.extmarks
                   .getAtOffset(input.cursorOffset)
@@ -1831,7 +1846,7 @@ export function Prompt(props: PromptProps) {
                 r.stopPropagation()
               }}
               focusedBackgroundColor="transparent"
-              cursorColor={props.disabled ? theme.background.surface.offset : theme.text.default}
+              cursorColor={disabled() ? theme.background.surface.offset : theme.text.default}
               syntaxStyle={syntax()}
             />
             <box flexDirection="row" flexShrink={0} paddingTop={1} gap={1} justifyContent="space-between">
@@ -2016,6 +2031,6 @@ export function Prompt(props: PromptProps) {
         hasSkill={(id) => store.prompt.skills?.some((skill) => skill.id === id) ?? false}
         promptPartTypeId={() => promptPartTypeId}
       />
-    </>
+    </Keymap.Scope>
   )
 }

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

@@ -1,19 +1,29 @@
-import { RGBA, MouseEvent, type ScrollBoxRenderable } from "@opentui/core"
+import {
+  CliRenderEvents,
+  RGBA,
+  MouseEvent,
+  type BoxRenderable,
+  type Renderable,
+  type ScrollBoxRenderable,
+} from "@opentui/core"
 import { useRenderer, useTerminalDimensions } from "@opentui/solid"
-import { batch, createEffect, createMemo, createResource, createSignal, on, Show } from "solid-js"
+import { batch, createEffect, createMemo, createResource, createSignal, on, onCleanup, Show } from "solid-js"
 import { useConfig } from "../config"
 import { useData } from "../context/data"
 import { Keymap } from "../context/keymap"
 import { useSessionTerminals } from "../context/session-terminals"
 import { usePromptRef } from "../context/prompt"
+import { usePanel } from "../context/panel"
 import { useStorage } from "../context/storage"
+import { useDialog } from "../ui/dialog"
 import { Session } from "../routes/session"
 import { Sidebar } from "../routes/session/sidebar"
-import { clampTerminalPaneWidth, SESSION_SIDEBAR_WIDTH } from "../ui/layout"
+import { clampSessionPaneWidth, SESSION_SIDEBAR_WIDTH } from "../ui/layout"
 import { createPaneResize } from "../ui/pane-resize"
 import { PaneResizeHandle } from "../ui/pane-resize-handle"
 import { useToast } from "../ui/toast"
 import { TerminalPane } from "./terminal-pane"
+import { PanelHost } from "./panel-host"
 
 export function SessionFrame(props: { sessionID: string; verticalTabsWidth: number }) {
   const sessions = useSessionTerminals()
@@ -21,40 +31,49 @@ export function SessionFrame(props: { sessionID: string; verticalTabsWidth: numb
   const config = useConfig()
   const data = useData()
   const toast = useToast()
+  const terminalError = () => toast.show({ variant: "error", message: "Unable to load terminal" })
   const renderer = useRenderer()
   const dimensions = useTerminalDimensions()
+  const panels = usePanel()
+  const dialog = useDialog()
   const availableWidth = () => Math.max(0, dimensions().width - props.verticalTabsWidth)
-  const defaultTerminalWidth = () => Math.max(1, Math.floor(dimensions().width / 2))
-  const [layout, updateLayout] = useStorage().store<{ terminalWidth?: number }>("layout", { initial: {} })
-  const terminalResize = createPaneResize({
-    value: () => layout.terminalWidth ?? defaultTerminalWidth(),
-    defaultValue: defaultTerminalWidth,
-    clamp: (width) => clampTerminalPaneWidth(width, availableWidth()),
+  const defaultPaneWidth = () => Math.max(1, Math.floor(panels.width() / 2))
+  const [layout, updateLayout] = useStorage().store<{ paneWidth?: number; terminalWidth?: number }>("layout", {
+    initial: {},
+  })
+  const paneResize = createPaneResize({
+    value: () => layout.paneWidth ?? layout.terminalWidth ?? defaultPaneWidth(),
+    defaultValue: defaultPaneWidth,
+    clamp: (width) => clampSessionPaneWidth(width, panels.width()),
     fromMouse: (event) => dimensions().width - event.x - 1,
     contains: (event, width) => event.x >= dimensions().width - width - 1 && event.x <= dimensions().width - width,
     onCommit: (width) => {
       void updateLayout((draft) => {
-        draft.terminalWidth = width
+        draft.paneWidth = width
       }).catch((error) => console.error("Failed to persist TUI layout", error))
     },
   })
   let resizeRelease = false
-  const finishTerminalResize = (event: MouseEvent) => {
-    if (terminalResize.resizing()) {
+  const finishPaneResize = (event: MouseEvent) => {
+    if (paneResize.resizing()) {
       // A captured drag-end can be followed by mouse-up on the focus overlay.
       resizeRelease = true
       queueMicrotask(() => {
         resizeRelease = false
       })
     }
-    terminalResize.onMouseUp(event)
+    paneResize.onMouseUp(event)
   }
   const [sidebarOpen, setSidebarOpen] = createSignal(false)
   const [sessionWidth, setSessionWidth] = createSignal<number>()
-  const [terminalFocused, setTerminalFocused] = createSignal(false)
+  const [activePane, setActivePane] = createSignal<"session" | "right">("session")
   const [restoreTerminalFocus, setRestoreTerminalFocus] = createSignal(false)
   let focusTerminal: (() => void) | undefined
+  let showTerminals: (() => void) | undefined
   let sessionScroll: ScrollBoxRenderable | undefined
+  let sessionNode: BoxRenderable | undefined
+  let rightNode: BoxRenderable | undefined
+  let panelNode: BoxRenderable | undefined
   createResource(
     () => (config.data.session.terminal ? props.sessionID : undefined),
     (sessionID) => sessions.refresh(sessionID).catch(() => undefined),
@@ -65,14 +84,23 @@ export function SessionFrame(props: { sessionID: string; verticalTabsWidth: numb
     const value = session()
     return value.terminals.find((terminal) => terminal.id === value.selectedTerminalID)
   }
+  const activePanel = createMemo(() => {
+    const current = panels.current()
+    if (current?.sessionID === props.sessionID) return current
+  })
+  const fullscreen = () => activePanel() !== undefined && panels.presentation() === "fullscreen"
   createEffect(
-    on(
-      () => selectedTerminal()?.id,
-      (id) => {
-        if (id) setSidebarOpen(false)
-      },
-      { defer: true },
-    ),
+    on([activePanel, () => selectedTerminal()?.id], ([panel, terminal], previous) => {
+      if (panel && panel !== previous?.[0]) {
+        setSidebarOpen(false)
+        if (terminal) void sessions.selectTerminal(props.sessionID, null).catch(toast.error)
+        return
+      }
+      if (terminal && terminal !== previous?.[1]) {
+        setSidebarOpen(false)
+        if (panel) panels.close()
+      }
+    }),
   )
   const wide = createMemo(() => dimensions().width - props.verticalTabsWidth > 120)
   const sidebarVisible = createMemo(() => {
@@ -81,6 +109,7 @@ export function SessionFrame(props: { sessionID: string; verticalTabsWidth: numb
     return (config.data.session?.sidebar ?? "auto") === "auto" && wide()
   })
   const rightPane = createMemo(() => {
+    if (activePanel()) return "panel"
     if (sidebarOpen() && sidebarVisible()) return "sidebar"
     if (selectedTerminal()) return "terminal"
     if (sidebarVisible()) return "sidebar"
@@ -94,34 +123,137 @@ export function SessionFrame(props: { sessionID: string; verticalTabsWidth: numb
         })
         .catch(toast.error)
       setSidebarOpen(!visible)
+      if (!visible && activePanel()) panels.close()
       if (!visible && selectedTerminal()) void sessions.selectTerminal(props.sessionID, null).catch(toast.error)
     })
   }
   const focusSession = () => {
+    if (fullscreen()) return
     // Permission prompts replace the input, so returning focus must not depend on it.
-    if (terminalFocused()) renderer.currentFocusedRenderable?.blur()
+    if (activePane() === "right") renderer.currentFocusedRenderable?.blur()
+    setActivePane("session")
     prompt.current?.focus()
   }
+  const focusRightPane = () => {
+    setActivePane("right")
+    if (activePanel()) {
+      panelNode?.focus()
+      return
+    }
+    focusTerminal?.()
+  }
+  const onFocused = () => {
+    const current = renderer.currentFocusedRenderable
+    if (rightPane() !== "sidebar" && within(current, rightNode)) setActivePane("right")
+    if (!fullscreen() && within(current, sessionNode)) setActivePane("session")
+  }
+  renderer.on(CliRenderEvents.FOCUSED_RENDERABLE, onFocused)
+  onCleanup(() => renderer.off(CliRenderEvents.FOCUSED_RENDERABLE, onFocused))
+  createEffect(() => {
+    if (fullscreen()) focusRightPane()
+  })
+  createEffect(() => {
+    if (rightPane() !== "terminal" && rightPane() !== "panel") setActivePane("session")
+  })
   createEffect(() => {
     if (!restoreTerminalFocus() || selectedTerminal()) return
     setRestoreTerminalFocus(false)
     focusSession()
   })
   Keymap.createLayer(() => ({
-    enabled: () => config.data.session.terminal === true,
+    mode: "global",
+    enabled: () => (rightPane() === "terminal" || activePanel() !== undefined) && dialog.stack.length === 0,
     commands: [
       {
         id: "pane.focus.left",
         title: "Focus session pane",
+        enabled: () => !fullscreen(),
         run: focusSession,
       },
       {
         id: "pane.focus.right",
-        title: "Focus terminal pane",
+        title: "Focus right pane",
+        run: focusRightPane,
+      },
+    ],
+  }))
+
+  // Pane management stays reachable from either input scope.
+  Keymap.createLayer(() => ({
+    mode: "global",
+    commands: [
+      {
+        id: "session.sidebar.toggle",
+        title: rightPane() === "sidebar" ? "Hide sidebar" : "Show sidebar",
+        group: "Session",
+        palette: true,
         run: () => {
-          focusTerminal?.()
+          toggleSidebar()
+          dialog.clear()
         },
       },
+      ...(config.data.session.terminal
+        ? [
+            {
+              id: "terminal.toggle",
+              title: rightPane() === "terminal" ? "Hide terminal pane" : "Show terminal pane",
+              group: "Session",
+              palette: true as const,
+              run: () => {
+                dialog.clear()
+                if (rightPane() === "terminal") {
+                  focusSession()
+                  void sessions.selectTerminal(props.sessionID, null).catch(toast.error)
+                  return
+                }
+                void sessions
+                  .refresh(props.sessionID)
+                  .then(async () => {
+                    const terminal = sessions.get(props.sessionID).terminals.at(-1)
+                    if (terminal) return sessions.selectTerminal(props.sessionID, terminal.id)
+                    await sessions.newTerminal(props.sessionID)
+                  })
+                  .catch(terminalError)
+              },
+            },
+            {
+              id: "terminal.select",
+              title: "Select terminal",
+              group: "Session",
+              palette: true as const,
+              run: () => {
+                dialog.clear()
+                if (fullscreen()) panels.close()
+                focusSession()
+                showTerminals?.()
+                void sessions.refresh(props.sessionID).catch(terminalError)
+              },
+            },
+            {
+              id: "terminal.close",
+              title: "Close terminal pane",
+              group: "Session",
+              palette: true as const,
+              enabled: rightPane() === "terminal",
+              run: () => {
+                dialog.clear()
+                focusSession()
+                void sessions.selectTerminal(props.sessionID, null).catch(toast.error)
+              },
+            },
+            {
+              id: "session.terminal",
+              title: "New terminal",
+              group: "Session",
+              palette: true as const,
+              slash: { name: "terminal" },
+              run: async () => {
+                dialog.clear()
+                await sessions.newTerminal(props.sessionID).catch(terminalError)
+              },
+            },
+          ]
+        : []),
     ],
   }))
 
@@ -132,30 +264,38 @@ export function SessionFrame(props: { sessionID: string; verticalTabsWidth: numb
       minHeight={0}
       flexDirection="row"
       position="relative"
-      onMouseDrag={terminalResize.onMouseDrag}
-      onMouseDragEnd={finishTerminalResize}
-      onMouseUp={finishTerminalResize}
+      onMouseDrag={paneResize.onMouseDrag}
+      onMouseDragEnd={finishPaneResize}
+      onMouseUp={finishPaneResize}
     >
       <box
+        id="session-pane"
+        ref={(value: BoxRenderable) => (sessionNode = value)}
         flexGrow={1}
         flexBasis={0}
         minWidth={0}
         minHeight={0}
-        position="relative"
+        position={fullscreen() ? "absolute" : "relative"}
+        visible={!fullscreen()}
+        width={fullscreen() ? Math.max(0, panels.width() - paneResize.size()) : undefined}
+        height="100%"
         onSizeChange={function () {
           setSessionWidth(this.width)
         }}
       >
-        <Session
-          scrollRef={(value) => (sessionScroll = value)}
-          verticalTabsWidth={props.verticalTabsWidth}
-          promptMuted={terminalFocused()}
-          sidebarVisible={rightPane() === "sidebar"}
-          onToggleSidebar={toggleSidebar}
-          visibleTerminalID={rightPane() === "terminal" ? selectedTerminal()?.id : undefined}
-          width={sessionWidth()}
-        />
-        <Show when={terminalFocused()}>
+        <Keymap.Scope enabled={activePane() === "session" && !fullscreen()}>
+          <Session
+            scrollRef={(value) => (sessionScroll = value)}
+            verticalTabsWidth={props.verticalTabsWidth}
+            promptMuted={activePane() !== "session"}
+            sidebarVisible={rightPane() === "sidebar"}
+            onToggleSidebar={toggleSidebar}
+            visibleTerminalID={rightPane() === "terminal" ? selectedTerminal()?.id : undefined}
+            onTerminalPicker={(show) => (showTerminals = show)}
+            width={sessionWidth()}
+          />
+        </Keymap.Scope>
+        <Show when={activePane() === "right"}>
           <box
             position="absolute"
             left={0}
@@ -174,35 +314,60 @@ export function SessionFrame(props: { sessionID: string; verticalTabsWidth: numb
             }}
             // Consume the release before revealing permission buttons underneath.
             onMouseUp={() => {
-              if (terminalResize.resizing() || resizeRelease) return
+              if (paneResize.resizing() || resizeRelease) return
               focusSession()
             }}
           />
         </Show>
       </box>
-      <Show when={rightPane() === "terminal" || (rightPane() === "sidebar" && wide())}>
+      <Show when={rightPane() === "terminal" || rightPane() === "panel" || (rightPane() === "sidebar" && wide())}>
         <box
+          ref={(value: BoxRenderable) => (rightNode = value)}
           flexShrink={0}
-          width={rightPane() === "terminal" ? terminalResize.size() : SESSION_SIDEBAR_WIDTH}
+          width={
+            fullscreen() ? availableWidth() : rightPane() === "sidebar" ? SESSION_SIDEBAR_WIDTH : paneResize.size()
+          }
           minWidth={0}
           minHeight={0}
         >
           <Show
             when={rightPane() === "sidebar"}
             fallback={
-              <Show keyed when={selectedTerminal()?.id}>
-                {(ptyID) => (
-                  <TerminalPane
-                    ptyID={ptyID}
-                    resizing={terminalResize.resizing()}
-                    autoFocus={restoreTerminalFocus() || sessions.shouldFocus(ptyID)}
-                    onAutoFocus={() => {
-                      sessions.clearFocus(ptyID)
-                      setRestoreTerminalFocus(false)
+              <Show
+                keyed
+                when={activePanel()}
+                fallback={
+                  <Show keyed when={selectedTerminal()?.id}>
+                    {(ptyID) => (
+                      <TerminalPane
+                        ptyID={ptyID}
+                        resizing={paneResize.resizing()}
+                        autoFocus={restoreTerminalFocus() || sessions.shouldFocus(ptyID)}
+                        onAutoFocus={() => {
+                          sessions.clearFocus(ptyID)
+                          setRestoreTerminalFocus(false)
+                        }}
+                        onFocusRequest={(value) => (focusTerminal = value)}
+                        onDisconnect={() => setRestoreTerminalFocus(true)}
+                      />
+                    )}
+                  </Show>
+                }
+              >
+                {(item) => (
+                  <PanelHost
+                    panel={item}
+                    width={fullscreen() ? availableWidth() : paneResize.size()}
+                    focused={activePane() === "right"}
+                    onFocus={focusRightPane}
+                    onTarget={(node) => {
+                      panelNode = node
+                      if (node) {
+                        focusRightPane()
+                        return
+                      }
+                      setActivePane("session")
                     }}
-                    onFocusChange={setTerminalFocused}
-                    onFocusRequest={(value) => (focusTerminal = value)}
-                    onDisconnect={() => setRestoreTerminalFocus(true)}
                   />
                 )}
               </Show>
@@ -212,12 +377,8 @@ export function SessionFrame(props: { sessionID: string; verticalTabsWidth: numb
           </Show>
         </box>
       </Show>
-      <Show when={rightPane() === "terminal" && availableWidth() >= 3}>
-        <PaneResizeHandle
-          resize={terminalResize}
-          left={availableWidth() - terminalResize.size() - 1}
-          highlight="right"
-        />
+      <Show when={!fullscreen() && (rightPane() === "terminal" || rightPane() === "panel") && availableWidth() >= 3}>
+        <PaneResizeHandle resize={paneResize} left={availableWidth() - paneResize.size() - 1} highlight="right" />
       </Show>
       <Show when={rightPane() === "sidebar" && !wide()}>
         <box
@@ -235,3 +396,11 @@ export function SessionFrame(props: { sessionID: string; verticalTabsWidth: numb
     </box>
   )
 }
+
+function within(node: Renderable | null | undefined, root: Renderable | undefined) {
+  if (!root) return false
+  for (let current = node; current; current = current.parent) {
+    if (current === root) return true
+  }
+  return false
+}

packages/tui/src/component/shimmer-text.tsx

@@ -0,0 +1,104 @@
+import {
+  OptimizedBuffer,
+  RGBA,
+  TargetChannel,
+  TextRenderable,
+  type RenderContext,
+  type TextOptions,
+} from "@opentui/core"
+import { extend, type JSX } from "@opentui/solid"
+import { splitProps } from "solid-js"
+import { coast, intensityAt } from "./tab-pulse"
+
+type ShimmerTextOptions = TextOptions & {
+  shimmer: RGBA
+}
+
+const DURATION = 1200
+const TRANSPARENT = RGBA.fromValues(0, 0, 0, 0)
+const CONTINUATION = 0xc0000000 | 0
+
+class ShimmerTextRenderable extends TextRenderable {
+  private _shimmer = RGBA.defaultForeground()
+  private elapsed = 0
+  private scratch: OptimizedBuffer | undefined
+  private mask = new Float32Array(0)
+  private matrix = new Float32Array(16)
+
+  constructor(ctx: RenderContext, options: ShimmerTextOptions) {
+    super(ctx, options)
+    this.matrix[3] = this._shimmer.r
+    this.matrix[7] = this._shimmer.g
+    this.matrix[11] = this._shimmer.b
+    this.matrix[15] = 1
+    if (options.shimmer) this.shimmer = options.shimmer
+    this.live = true
+  }
+
+  set shimmer(value: RGBA) {
+    if (value.equals(this._shimmer)) return
+    this._shimmer = value
+    this.matrix[3] = value.r
+    this.matrix[7] = value.g
+    this.matrix[11] = value.b
+    this.requestRender()
+  }
+
+  override render(buffer: OptimizedBuffer, deltaTime: number) {
+    if (!this.visible || this.isDestroyed || !Number.isFinite(this.width) || this.width <= 0 || this.height <= 0) return
+    this.elapsed = (this.elapsed + deltaTime) % DURATION
+    if (!this.scratch)
+      this.scratch = OptimizedBuffer.create(this.width, this.height, this._ctx.widthMethod, { respectAlpha: true })
+    if (this.scratch.width !== this.width || this.scratch.height !== this.height)
+      this.scratch.resize(this.width, this.height)
+
+    this.scratch.clear(TRANSPARENT)
+    this.scratch.drawTextBuffer(this.textBufferView, 0, 0)
+    const characters = this.scratch.buffers.char
+    let end = 0
+    for (let row = 0; row < this.height; row++) {
+      let column = this.width
+      while (
+        column > 0 &&
+        (characters[row * this.width + column - 1] === 32 || characters[row * this.width + column - 1] === 0)
+      )
+        column--
+      end = Math.max(end, column)
+    }
+    const front = -4 + coast(this.elapsed / DURATION) * (end + 22)
+    if (this.mask.length !== this.width * this.height * 3) this.mask = new Float32Array(this.width * this.height * 3)
+    let strength = 0
+    for (let cell = 0; cell < characters.length; cell++) {
+      const column = cell % this.width
+      if ((characters[cell] & CONTINUATION) !== CONTINUATION) strength = intensityAt(column, front, 4, 18)
+      this.mask[cell * 3] = column
+      this.mask[cell * 3 + 1] = Math.floor(cell / this.width)
+      this.mask[cell * 3 + 2] = strength
+    }
+    this.scratch.colorMatrix(this.matrix, this.mask, 1, TargetChannel.FG)
+    buffer.drawFrameBuffer(this.screenX, this.screenY, this.scratch)
+    this.markClean()
+    this._ctx.addToHitGrid(this.screenX, this.screenY, this.width, this.height, this.num)
+  }
+
+  override destroy() {
+    this.scratch?.destroy()
+    this.scratch = undefined
+    super.destroy()
+  }
+}
+
+extend({ shimmer_text: ShimmerTextRenderable })
+
+declare module "@opentui/solid" {
+  interface OpenTUIComponents {
+    shimmer_text: typeof ShimmerTextRenderable
+  }
+}
+
+type Props = Omit<JSX.IntrinsicElements["text"], "ref"> & { shimmer: RGBA }
+
+export function ShimmerText(props: Props) {
+  const [local, text] = splitProps(props, ["shimmer"])
+  return <shimmer_text {...text} shimmer={local.shimmer} />
+}

packages/tui/src/component/spinner.tsx

@@ -1,30 +1,48 @@
-import { Show } from "solid-js"
+import { createEffect, createSignal, onCleanup, Show } from "solid-js"
 import { useTheme } from "../context/theme"
 import { useConfig } from "../config"
 import type { JSX } from "@opentui/solid"
 import type { RGBA } from "@opentui/core"
 import { registerOpencodeSpinner } from "./register-spinner"
 import { SPINNER_FRAMES } from "./spinner-frames"
+import { ShimmerText } from "./shimmer-text"
 
 export { SPINNER_FRAMES } from "./spinner-frames"
 
 registerOpencodeSpinner()
 
-export function Spinner(props: { children?: JSX.Element; color?: RGBA }) {
+export function Spinner(props: { children?: JSX.Element; color?: RGBA; shimmer?: RGBA }) {
   const theme = useTheme()
   const config = useConfig().data
   const color = () => props.color ?? theme.text.subdued
+  const [frame, setFrame] = createSignal(0)
+  createEffect(() => {
+    if (!(config.animations ?? true) || !props.shimmer) return
+    const timer = setInterval(() => setFrame((value) => (value + 1) % SPINNER_FRAMES.length), 80)
+    onCleanup(() => clearInterval(timer))
+  })
   return (
     <Show
       when={config.animations ?? true}
       fallback={<text fg={color()}>{props.children ? <>⋯ {props.children}</> : "⋯"}</text>}
     >
-      <box flexDirection="row" gap={1}>
-        <spinner frames={SPINNER_FRAMES} interval={80} color={color()} />
-        <Show when={props.children}>
-          <text fg={color()}>{props.children}</text>
-        </Show>
-      </box>
+      <Show
+        when={props.shimmer}
+        fallback={
+          <box flexDirection="row" gap={1}>
+            <spinner frames={SPINNER_FRAMES} interval={80} color={color()} />
+            <Show when={props.children}>
+              <text fg={color()}>{props.children}</text>
+            </Show>
+          </box>
+        }
+      >
+        {(shimmer) => (
+          <ShimmerText fg={color()} shimmer={shimmer()}>
+            {SPINNER_FRAMES[frame()]} {props.children}
+          </ShimmerText>
+        )}
+      </Show>
     </Show>
   )
 }

packages/tui/src/component/terminal-pane.tsx

@@ -1,4 +1,4 @@
-import { CliRenderEvents, EmbeddedTerminalRenderable, type RGBA } from "@opentui/core"
+import { EmbeddedTerminalRenderable, type RGBA } from "@opentui/core"
 import type { ResolvedThemeTokens } from "@opencode-ai/theme/tui"
 import { extend, useRenderer } from "@opentui/solid"
 import { createEffect, createSignal, onCleanup, onMount, Show } from "solid-js"
@@ -28,7 +28,6 @@ export function TerminalPane(props: {
   onAutoFocus?: () => void
   onFocusRequest?: (focus: (() => void) | undefined) => void
   onDisconnect?: () => void
-  onFocusChange?: (focused: boolean) => void
 }) {
   const client = useClient()
   const keymap = Keymap.use()
@@ -148,9 +147,6 @@ export function TerminalPane(props: {
     },
     { priority: 100 },
   )
-  // Blur emits this event before updating the terminal's own focused flag.
-  const onFocused = () => props.onFocusChange?.(renderer.currentFocusedRenderable === terminal)
-  renderer.on(CliRenderEvents.FOCUSED_RENDERABLE, onFocused)
   createEffect(() => {
     if (!props.autoFocus || !terminal) return
     terminal.focus()
@@ -172,8 +168,6 @@ export function TerminalPane(props: {
     waitingSize?.resolve()
     socket?.close()
     offKeys()
-    renderer.off(CliRenderEvents.FOCUSED_RENDERABLE, onFocused)
-    props.onFocusChange?.(false)
     props.onFocusRequest?.(undefined)
   })
 

packages/tui/src/config/keybind.ts

@@ -93,7 +93,7 @@ export const Definitions = {
   "theme.mode.lock": keybind("none", "Lock or unlock theme mode"),
   "session.sidebar.toggle": keybind("<leader>b", "Toggle sidebar"),
   "pane.focus.left": keybind("<leader>left", "Focus session pane"),
-  "pane.focus.right": keybind("<leader>right", "Focus terminal pane"),
+  "pane.focus.right": keybind("<leader>right", "Focus right pane"),
   "terminal.select": keybind("<leader>down", "Select terminal"),
   "terminal.toggle": keybind("<leader>t", "Toggle terminal pane"),
   "terminal.close": keybind("<leader>up", "Close terminal pane"),

packages/tui/src/context/keymap.tsx

@@ -13,7 +13,17 @@ import { formatCommandBindings, formatKeySequence } from "@opentui/keymap/extras
 import { createDefaultOpenTuiKeymap } from "@opentui/keymap/opentui"
 import { KeymapProvider, useBindings, useKeymapSelector } from "@opentui/keymap/solid"
 import { useRenderer } from "@opentui/solid"
-import { createContext, onCleanup, useContext, type Accessor, type ParentProps } from "solid-js"
+import {
+  createComputed,
+  createContext,
+  createMemo,
+  createSignal,
+  getOwner,
+  onCleanup,
+  useContext,
+  type Accessor,
+  type ParentProps,
+} from "solid-js"
 import { useConfig } from "../config"
 import { TuiKeybind } from "../config/keybind"
 
@@ -50,6 +60,20 @@ const Context = createContext<{
   readonly input: (id: string) => string | undefined
 }>()
 
+const EnabledContext = createContext<Accessor<boolean>>(() => true)
+
+/** Gates descendant layers and modes, including layers that opt out of mode matching. */
+function Scope(props: ParentProps<{ enabled: boolean }>) {
+  const parent = useEnabled()
+  const enabled = createMemo(() => parent() && props.enabled)
+  return <EnabledContext.Provider value={enabled}>{props.children}</EnabledContext.Provider>
+}
+
+/** Returns the combined activation of every enclosing scope. */
+function useEnabled() {
+  return useContext(EnabledContext)
+}
+
 function Provider(props: ParentProps<{ config?: KeymapConfig }>) {
   const renderer = useRenderer()
   const config: KeymapConfig = props.config ?? useConfig().data
@@ -175,13 +199,18 @@ export interface Keymap {
 
 function use(): Keymap {
   const value = useValue()
+  const enabled = useEnabled()
   const leader = value.config.keybinds.get("leader")?.[0]?.key
   const isLeader = leader ? value.keymap.createKeyMatcher(leader) : () => false
   return {
     dispatch(id, input) {
       value.dispatch(id, input)
     },
-    mode: value.mode,
+    mode: {
+      current: value.mode.current,
+      // Plugin APIs can forward a keymap captured above the calling component's scope.
+      push: (mode) => value.mode.push(mode, getOwner() ? useEnabled() : enabled),
+    },
     intercept: value.keymap.intercept.bind(value.keymap),
     isLeader,
   }
@@ -189,6 +218,7 @@ function use(): Keymap {
 
 function createLayer(input: () => KeymapLayer) {
   const value = useValue()
+  const enabled = useEnabled()
   useBindings(() => {
     const layer = input()
     const { commands, bindings, mode, ...options } = layer
@@ -215,6 +245,7 @@ function createLayer(input: () => KeymapLayer) {
     )
     return {
       ...options,
+      enabled: enabled() ? options.enabled : false,
       ...(mode === "global" ? {} : { mode: mode ?? MODE.base }),
       commands: grouped.named.map((command) => {
         const { id, description, group, palette, bind, run, ...definition } = command
@@ -385,7 +416,9 @@ function useValue() {
 
 export const Keymap = {
   Provider,
+  Scope,
   use,
+  useEnabled,
   createLayer,
   useShortcuts,
   useShortcut,
@@ -397,37 +430,34 @@ export const Keymap = {
 } as const
 
 function createMode(keymap: OpenTuiKeymap) {
-  keymap.setData(MODE.key, MODE.base)
+  const [stack, setStack] = createSignal<
+    { readonly id: symbol; readonly mode: string; readonly enabled: Accessor<boolean> }[]
+  >([])
+  const current = createMemo(() => stack().findLast((item) => item.enabled())?.mode ?? MODE.base)
+  // Publish mode changes before another command can be dispatched in the same callback.
+  createComputed(() => keymap.setData(MODE.key, current()))
   const unregister = keymap.registerLayerFields({
     mode(value, context) {
       context.require(MODE.key, value)
     },
   })
-  const stack: { readonly id: symbol; readonly mode: string }[] = []
   let disposed = false
 
-  const update = () => keymap.setData(MODE.key, stack.at(-1)?.mode ?? MODE.base)
-
   return {
-    current() {
-      return stack.at(-1)?.mode ?? MODE.base
-    },
-    push(mode: string) {
+    current,
+    push(mode: string, enabled: Accessor<boolean>) {
       if (disposed) return () => {}
       const id = Symbol(mode)
-      stack.push({ id, mode })
-      update()
+      // Inactive scopes retain their stack position beneath any newer modes.
+      setStack((items) => [...items, { id, mode, enabled }])
       return () => {
-        const index = stack.findIndex((item) => item.id === id)
-        if (index < 0) return
-        stack.splice(index, 1)
-        update()
+        setStack((items) => items.filter((item) => item.id !== id))
       }
     },
     dispose() {
       if (disposed) return
       disposed = true
-      stack.length = 0
+      setStack([])
       unregister()
       keymap.setData(MODE.key, undefined)
     },

packages/tui/src/context/panel.tsx

@@ -0,0 +1,58 @@
+import type { PanelPresentation } from "@opencode-ai/plugin/tui/context"
+import { batch, createContext, createMemo, createSignal, useContext, type ParentProps } from "solid-js"
+
+export type PanelTarget = {
+  readonly plugin: string
+  readonly name: string
+  readonly sessionID: string
+}
+
+export function createPanelState() {
+  const [current, setCurrent] = createSignal<PanelTarget>()
+  const [requested, setRequested] = createSignal<PanelPresentation>("panel")
+  const [width, setWidth] = createSignal(0)
+  const canSplit = () => width() > 80
+  const presentation = createMemo(() => (canSplit() ? requested() : "fullscreen"))
+  return {
+    current,
+    width,
+    canSplit,
+    presentation,
+    setWidth,
+    open(target: PanelTarget, presentation: PanelPresentation = "panel") {
+      batch(() => {
+        setRequested(presentation)
+        setCurrent((current) =>
+          current?.plugin === target.plugin && current.name === target.name && current.sessionID === target.sessionID
+            ? current
+            : target,
+        )
+      })
+    },
+    close: () => setCurrent(),
+    release(plugin: string, name?: string) {
+      if (current()?.plugin !== plugin || (name !== undefined && current()?.name !== name)) return
+      setCurrent()
+    },
+    toggleFullscreen() {
+      if (!canSplit()) return
+      setRequested((current) => (current === "panel" ? "fullscreen" : "panel"))
+    },
+  }
+}
+
+const Context = createContext<ReturnType<typeof createPanelState>>()
+
+export function PanelProvider(props: ParentProps) {
+  return <Context.Provider value={createPanelState()}>{props.children}</Context.Provider>
+}
+
+export function usePanel() {
+  const value = useContext(Context)
+  if (!value) throw new Error("usePanel must be used within a PanelProvider")
+  return value
+}
+
+export function useOptionalPanel() {
+  return useContext(Context)
+}

packages/tui/src/context/theme.tsx

@@ -23,7 +23,7 @@ import {
 } from "../theme"
 import { generateSystem, terminalMode } from "../theme/system"
 import { discoverThemes } from "../theme/discovery"
-import { createComponentTheme, type ComponentTheme } from "../theme/component"
+import { createComponentTheme, createComponentThemeView, type ComponentTheme } from "../theme/component"
 import { createEffect, createMemo, onCleanup, onMount, type Accessor, type ParentProps } from "solid-js"
 import { createStore, produce } from "solid-js/store"
 import { createSimpleContext } from "./helper"
@@ -379,12 +379,19 @@ export function useTheme(context?: ContextName) {
 }
 export const ThemeProvider = themeContext.provider
 
-export function ThemeContextProvider(props: ParentProps<{ context: ContextName }>) {
+/** An accessor switches context without remounting children; undefined inherits the enclosing view. */
+export function ThemeContextProvider(props: ParentProps<{ context: ContextName | Accessor<ContextName | undefined> }>) {
   const value = themeContext.use()
+  const context = props.context
+  const current =
+    typeof context === "function"
+      ? createComponentThemeView(() => {
+          const name = context()
+          return name ? value.themes.currentTokens().contextual[name] : value.current
+        }, value.themes.mode)
+      : value.themes.current.contextual[context]
   return (
-    <themeContext.context.Provider
-      value={{ current: value.themes.current.contextual[props.context], themes: value.themes, ready: value.ready }}
-    >
+    <themeContext.context.Provider value={{ current, themes: value.themes, ready: value.ready }}>
       {props.children}
     </themeContext.context.Provider>
   )

packages/tui/src/feature-plugins/system/diff-viewer-file-menu.tsx

@@ -0,0 +1,87 @@
+/** @jsxImportSource @opentui/solid */
+import type { Plugin } from "@opencode-ai/plugin/tui"
+import { BoxRenderable, MouseButton } from "@opentui/core"
+import { Portal, useTerminalDimensions } from "@opentui/solid"
+import { createSignal, onCleanup } from "solid-js"
+
+export function DiffFileMenu(props: {
+  context: Plugin.Context
+  state: { fileIndex: number; x: number; y: number }
+  reviewed: boolean
+  onToggle: () => void
+  onClose: () => void
+}) {
+  const dimensions = useTerminalDimensions()
+  const theme = props.context.theme.contextual.overlay
+  const [hovered, setHovered] = createSignal(false)
+  const label = () => (props.reviewed ? "Mark incomplete" : "Mark complete")
+  const width = () => Math.min(19, dimensions().width)
+  const run = () => {
+    props.onClose()
+    props.onToggle()
+  }
+  onCleanup(props.context.keymap.mode.push("menu"))
+  props.context.keymap.layer(() => ({
+    mode: "menu",
+    commands: [
+      { bind: "escape,ctrl+c", title: "Close file menu", group: "Diff", run: props.onClose },
+      { bind: "return", title: label(), group: "Diff", run },
+    ],
+  }))
+
+  return (
+    <Portal
+      ref={(container) => {
+        if (!(container instanceof BoxRenderable)) return
+        // Portal's wrapper must also escape root flow, not follow the full-height app.
+        container.position = "absolute"
+        container.left = 0
+        container.top = 0
+        container.zIndex = 2600
+      }}
+    >
+      <box
+        id="diff-file-menu-overlay"
+        position="absolute"
+        left={0}
+        top={0}
+        width={dimensions().width}
+        height={dimensions().height}
+        zIndex={2600}
+        onMouseDown={(event) => {
+          props.onClose()
+          event.preventDefault()
+          event.stopPropagation()
+        }}
+      >
+        <box
+          id="diff-file-menu"
+          position="absolute"
+          left={Math.max(0, Math.min(props.state.x, dimensions().width - width()))}
+          top={Math.max(0, Math.min(props.state.y + 1, dimensions().height - 1))}
+          width={width()}
+          height={1}
+          paddingLeft={1}
+          paddingRight={1}
+          backgroundColor={hovered() ? theme.background.action.primary.hovered : theme.background.default}
+          onMouseOver={() => setHovered(true)}
+          onMouseOut={() => setHovered(false)}
+          onMouseDown={(event) => {
+            if (event.button === MouseButton.RIGHT) props.onClose()
+            event.preventDefault()
+            event.stopPropagation()
+          }}
+          onMouseUp={(event) => {
+            event.preventDefault()
+            event.stopPropagation()
+            if (event.button === MouseButton.LEFT) run()
+          }}
+        >
+          <text fg={theme.text.default} selectable={false} wrapMode="none" truncate>
+            {label()}
+          </text>
+        </box>
+      </box>
+    </Portal>
+  )
+}

packages/tui/src/feature-plugins/system/diff-viewer.tsx

@@ -14,6 +14,7 @@ import { filetype } from "../../util/filetype"
 import { useRenderer, useTerminalDimensions } from "@opentui/solid"
 import { createEffect, createMemo, createResource, createSignal, For, Match, onCleanup, Show, Switch } from "solid-js"
 import { DiffViewerFileTree } from "./diff-viewer-file-tree"
+import { DiffFileMenu } from "./diff-viewer-file-menu"
 import { DiffViewerImage, isDiffImageFile } from "./diff-viewer-image"
 import { DialogSelect } from "../../ui/dialog-select"
 import { EmptyBorder } from "../../ui/border"
@@ -1076,76 +1077,6 @@ export function DiffViewerContent(props: {
   )
 }
 
-function DiffFileMenu(props: {
-  context: Plugin.Context
-  state: FileMenuState
-  reviewed: boolean
-  onToggle: () => void
-  onClose: () => void
-}) {
-  const dimensions = useTerminalDimensions()
-  const theme = props.context.theme.contextual.overlay
-  const [hovered, setHovered] = createSignal(false)
-  const label = () => (props.reviewed ? "Mark incomplete" : "Mark complete")
-  const run = () => {
-    props.onClose()
-    props.onToggle()
-  }
-  onCleanup(props.context.keymap.mode.push("menu"))
-  props.context.keymap.layer(() => ({
-    mode: "menu",
-    commands: [
-      { bind: "escape,ctrl+c", title: "Close file menu", group: "Diff", run: props.onClose },
-      { bind: "return", title: label(), group: "Diff", run },
-    ],
-  }))
-
-  return (
-    <box
-      id="diff-file-menu-overlay"
-      position="absolute"
-      left={0}
-      top={0}
-      width={dimensions().width}
-      height={dimensions().height}
-      zIndex={2600}
-      onMouseDown={(event) => {
-        props.onClose()
-        event.preventDefault()
-        event.stopPropagation()
-      }}
-    >
-      <box
-        id="diff-file-menu"
-        position="absolute"
-        left={Math.max(0, Math.min(props.state.x, dimensions().width - 19))}
-        top={Math.max(0, Math.min(props.state.y + 1, dimensions().height - 1))}
-        width={19}
-        height={1}
-        paddingLeft={1}
-        paddingRight={1}
-        backgroundColor={hovered() ? theme.background.action.primary.hovered : theme.background.default}
-        onMouseOver={() => setHovered(true)}
-        onMouseOut={() => setHovered(false)}
-        onMouseDown={(event) => {
-          if (event.button === MouseButton.RIGHT) props.onClose()
-          event.preventDefault()
-          event.stopPropagation()
-        }}
-        onMouseUp={(event) => {
-          event.preventDefault()
-          event.stopPropagation()
-          if (event.button === MouseButton.LEFT) run()
-        }}
-      >
-        <text fg={theme.text.default} selectable={false}>
-          {label()}
-        </text>
-      </box>
-    </box>
-  )
-}
-
 function DiffViewerHelpDialog(props: { context: Plugin.Context; single: boolean }) {
   const dimensions = useTerminalDimensions()
   const theme = props.context.theme.contextual.elevated

packages/tui/src/plugin/api.tsx

@@ -1,7 +1,7 @@
 import { PluginContextProvider } from "@opencode-ai/plugin/tui"
 import type { JSX } from "solid-js"
 import type { Context, Dialog, Page, SlotClaim, SlotMap, SlotPath, Toast } from "@opencode-ai/plugin/tui/context"
-import type { Placement, PlacementKind } from "./structure"
+import { namedSlotKey, type Placement, type PlacementKind } from "./structure"
 import { infoStringToFiletype, type MarkdownCodeBlockRenderer } from "@opentui/core"
 import { useRenderer } from "@opentui/solid"
 import { useClient } from "../context/client"
@@ -20,6 +20,7 @@ import { useToast } from "../ui/toast"
 import { useAttention } from "../context/attention"
 import { useStorage } from "../context/storage"
 import { useSessionTabs } from "../context/session-tabs"
+import { useOptionalPanel } from "../context/panel"
 import { abbreviateHome } from "../util/path-format"
 
 export type Dispose = () => Promise<void>
@@ -30,6 +31,7 @@ export type SlotRender = (input: SlotMap[SlotPath]) => JSX.Element
 
 // A registered claim as stored by the plugin provider's registry.
 export type RegisteredSlot = {
+  readonly name?: string
   readonly placement: Placement
   readonly render: SlotRender
 }
@@ -68,6 +70,7 @@ export function usePluginHost() {
     attention: useAttention(),
     storage: useStorage(),
     sessionTabs: useSessionTabs(),
+    panel: useOptionalPanel(),
   }
 }
 
@@ -97,11 +100,12 @@ export function createPluginContext(input: {
   }
   // Unregistering after deactivation is a no-op: deactivate already resets
   // the registration's routes and slots wholesale.
-  const registration = (kind: "routes" | "slots" | "markdown", name: string) => {
+  const registration = (kind: "routes" | "slots" | "markdown", name: string, onRemove?: () => void) => {
     let registered = true
     const unregister = () => {
       if (!registered) return
       registered = false
+      onRemove?.()
       if (!input.registry.active()) return
       input.registry.remove(kind, name)
     }
@@ -174,6 +178,22 @@ export function createPluginContext(input: {
           return host.route.data
         },
       },
+      panel: {
+        open(name, options) {
+          if (!host.panel || !input.registry.active()) return false
+          if (!input.registry.has("slots", namedSlotKey("session.panel", name))) return false
+          const route = host.route.data
+          if (route.type !== "session") return false
+          host.panel.open({ plugin: input.id, name, sessionID: route.sessionID }, options?.presentation)
+          return true
+        },
+        close: () => host.panel?.release(input.id),
+        current() {
+          const current = host.panel?.current()
+          if (current?.plugin !== input.id) return
+          return { name: current.name, sessionID: current.sessionID }
+        },
+      },
       tabs: {
         enabled: host.sessionTabs.enabled,
         list: () =>
@@ -206,19 +226,25 @@ export function createPluginContext(input: {
         },
       },
       slot(value: SlotClaim) {
-        // Keys are counter-suffixed so one plugin may claim several places;
-        // order within the plugin is registration order.
-        const key = `slot#${claims++}`
         // Exactly one placement kind, enforced at runtime for untyped plugins.
         const kinds = placements.filter((item) => value[item] !== undefined)
         if (kinds.length !== 1) throw new Error("Slot claim requires exactly one placement key")
         const kind = kinds[0]
+        const target = value[kind] as string
+        if (value.name !== undefined && !value.name) throw new Error("Slot names cannot be empty")
+        if (target === "session.panel" && !value.name) throw new Error("Session panels require a slot name")
+        if (target === "session.panel" && kind !== "replace") throw new Error("Session panels use replacement claims")
+        const key = value.name ? namedSlotKey(target, value.name) : `slot#${claims++}`
+        if (input.registry.has("slots", key)) throw new Error(`Slot already registered: ${value.name}`)
         input.registry.set("slots", key, {
-          placement: { kind, target: value[kind] as string },
+          name: value.name,
+          placement: { kind, target },
           // The registration map erases the path-specific input type.
           render: (slotInput) => provide(() => (value.render as SlotRender)(slotInput)),
         })
-        return registration("slots", key)
+        return registration("slots", key, () => {
+          if (target === "session.panel") host.panel?.release(input.id, value.name)
+        })
       },
     },
   }

packages/tui/src/plugin/context.tsx

@@ -19,7 +19,7 @@ import { fileURLToPath } from "url"
 import type { Page } from "@opencode-ai/plugin/tui/context"
 import { Hash } from "@opencode-ai/util/hash"
 import { Host } from "@opencode-ai/plugin/host"
-import { resolveSlots, type Claim } from "./structure"
+import { namedSlotKey, resolveSlots, type Claim } from "./structure"
 import { createStore, produce, reconcile as reconcileStore, unwrap } from "solid-js/store"
 import { isDeepEqual } from "remeda"
 import "#runtime-plugin-support"
@@ -60,6 +60,7 @@ type Value = {
     // A mounted <Slot> instance registers its path; the disposer unregisters.
     readonly register: (path: string) => () => void
     readonly resolved: () => ReturnType<typeof resolveSlots<SlotRender>>
+    readonly named: (path: string, plugin: string, name: string) => RegisteredSlot | undefined
   }
   readonly markdown: () => MarkdownOptions["renderNode"]
   readonly activate: (id: string) => Promise<boolean>
@@ -457,18 +458,20 @@ export function PluginProvider(props: ParentProps<{ packages: PackageSource; dir
   // order within one plugin. The resolver's last-wins rules depend on it.
   const claims = createMemo(() =>
     Object.entries(store.registrations).flatMap(([id, registration]) =>
-      Object.entries(registration.active ? registration.slots : {}).map(([key, slot]) => {
-        // Rows downstream diff by reference; a stable claim per render
-        // function keeps untouched plugins' slot rows (and their state)
-        // alive across other plugins' reloads.
-        const cached = slotItems.get(slot.render)
-        if (cached) return cached
-        // Placements are immutable once registered; unwrap the store proxy
-        // so resolver reads don't subscribe tracked scopes.
-        const item = { key: `${id}/${key}`, plugin: id, placement: unwrap(slot.placement), render: slot.render }
-        slotItems.set(slot.render, item)
-        return item
-      }),
+      Object.entries(registration.active ? registration.slots : {})
+        .filter(([, slot]) => slot.placement.target !== "session.panel")
+        .map(([key, slot]) => {
+          // Rows downstream diff by reference; a stable claim per render
+          // function keeps untouched plugins' slot rows (and their state)
+          // alive across other plugins' reloads.
+          const cached = slotItems.get(slot.render)
+          if (cached) return cached
+          // Placements are immutable once registered; unwrap the store proxy
+          // so resolver reads don't subscribe tracked scopes.
+          const item = { key: `${id}/${key}`, plugin: id, placement: unwrap(slot.placement), render: slot.render }
+          slotItems.set(slot.render, item)
+          return item
+        }),
     ),
   )
   // Object.keys tracks the store's keys node only: refcount changes on an
@@ -555,7 +558,15 @@ export function PluginProvider(props: ParentProps<{ packages: PackageSource; dir
             active: plugin.active,
           })),
         route: (id, name) => store.registrations[id]?.routes[name]?.render,
-        slots: { register: registerSlot, resolved },
+        slots: {
+          register: registerSlot,
+          resolved,
+          named(path, plugin, name) {
+            const registration = store.registrations[plugin]
+            if (!registration?.active) return
+            return registration.slots[namedSlotKey(path, name)]
+          },
+        },
         markdown,
         // Manual dialog toggles join the same chain as reconciles so a
         // toggle mid-reload cannot mix registrations across generations.

packages/tui/src/plugin/render.tsx

@@ -74,7 +74,11 @@ export function PluginRoute(props: { readonly fallback: (id: string, name: strin
 const SlotParent = createContext<string>()
 
 // `input` is required exactly when the path publishes a non-empty input.
-type SlotProps<Path extends SlotPath> = ParentProps<{ readonly path: Path }> &
+type SlotProps<Path extends SlotPath> = ParentProps<{
+  readonly path: Path
+  readonly selection?: { readonly plugin: string; readonly name: string }
+}> &
+  (Path extends "session.panel" ? { readonly selection: { readonly plugin: string; readonly name: string } } : {}) &
   ({} extends SlotMap[Path] ? { readonly input?: SlotMap[Path] } : { readonly input: SlotMap[Path] })
 
 // One named boundary of the host UI's slot tree. The host's own content are
@@ -97,6 +101,26 @@ export function Slot<Path extends SlotPath>(props: SlotProps<Path>) {
   }
   onCleanup(plugins.slots.register(path))
   const input = () => (props as { readonly input?: SlotMap[Path] }).input ?? ({} as SlotMap[Path])
+  // Selected panels use the same owned registrations and boundary as composed
+  // slots, but choose a named contribution instead of last-enabled replacement.
+  const selected = createMemo(() => {
+    const selection = props.selection
+    if (!selection) return
+    return plugins.slots.named(path, selection.plugin, selection.name)
+  })
+  if (path === "session.panel") {
+    return (
+      <SlotParent.Provider value={path}>
+        <Show keyed when={selected()}>
+          {(claim) => (
+            <PluginBoundary id={props.selection!.plugin} where={`slot ${path}`}>
+              {createComponent(claim.render, mergeProps(input))}
+            </PluginBoundary>
+          )}
+        </Show>
+      </SlotParent.Provider>
+    )
+  }
   const slotted = createMemo(
     () => plugins.slots.resolved().slotted.get(path) ?? emptySlotted<SlotRender>(),
     emptySlotted<SlotRender>(),

packages/tui/src/plugin/structure.ts

@@ -6,6 +6,10 @@
 
 export type PlacementKind = "prepend" | "append" | "before" | "after" | "replace"
 
+export function namedSlotKey(path: string, name: string) {
+  return `slot:${path}:${name}`
+}
+
 // Normalized from the public SlotClaim shape by the plugin API: exactly one
 // placement kind, the target path erased to a string so the resolver stays
 // independent of the slot map.

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

@@ -48,6 +48,8 @@ export function FormPrompt(props: { form: FormWithLocation }) {
   const renderer = useRenderer()
   const dimensions = useTerminalDimensions()
   const keymap = Keymap.use()
+  const enabled = Keymap.useEnabled()
+  const active = () => enabled() && keymap.mode.current() === FORM_MODE
   const config = useConfig().data
   const clipboard = useClipboard()
   const toast = useToast()
@@ -68,6 +70,7 @@ export function FormPrompt(props: { form: FormWithLocation }) {
   })
 
   let textarea: TextareaRenderable | undefined
+  const [inputTarget, setInputTarget] = createSignal<TextareaRenderable>()
   let review: ScrollBoxRenderable | undefined
   let measureReview: (() => void) | undefined
 
@@ -216,9 +219,22 @@ export function FormPrompt(props: { form: FormWithLocation }) {
     if (measureReview) renderer.off(CliRenderEvents.FRAME, measureReview)
   })
 
+  // Refs publish after initialization so burst typing stays with the interceptor until the editor is ready.
+  createEffect(() => {
+    const target = inputTarget()
+    if (!target || target.isDestroyed) return
+    if (!active()) {
+      target.blur()
+      target.focusable = false
+      return
+    }
+    target.focusable = true
+    target.focus()
+  })
+
   onCleanup(
     keymap.intercept("key", ({ event, consume }) => {
-      if (keymap.mode.current() !== FORM_MODE) return
+      if (!active()) return
       if (textual() || !other() || (store.editing && renderer.currentFocusedEditor === textarea)) return
       if (event.ctrl || event.meta || event.option || event.super || event.hyper) return
       if ((!store.editing && event.sequence === " ") || !/^[^\p{C}\p{Zl}\p{Zp}]$/u.test(event.sequence)) return
@@ -328,7 +344,7 @@ export function FormPrompt(props: { form: FormWithLocation }) {
   }
 
   usePaste((event) => {
-    if (keymap.mode.current() !== FORM_MODE) return
+    if (!active()) return
     const value = stripAnsiSequences(decodePasteBytes(event.bytes)).replace(/\r\n?/g, "\n")
     if (store.editing && renderer.currentFocusedEditor === textarea) {
       textarea.insertText(value)
@@ -343,7 +359,7 @@ export function FormPrompt(props: { form: FormWithLocation }) {
     return clipboard
       .read()
       .then((content) => {
-        if (content?.mime !== "text/plain") return
+        if (!active() || content?.mime !== "text/plain") return
         const value = stripAnsiSequences(content.data).replace(/\r\n?/g, "\n")
         if (store.editing || textual()) {
           textarea?.insertText(value)
@@ -878,8 +894,9 @@ export function FormPrompt(props: { form: FormWithLocation }) {
                     textarea = val
                     val.traits = { status: "ANSWER" }
                     queueMicrotask(() => {
-                      val.focus()
+                      if (val.isDestroyed) return
                       val.gotoLineEnd()
+                      setInputTarget(val)
                     })
                   }}
                   initialValue={
@@ -1017,9 +1034,10 @@ export function FormPrompt(props: { form: FormWithLocation }) {
                               textarea = val
                               val.traits = { status: "ANSWER" }
                               queueMicrotask(() => {
+                                if (val.isDestroyed) return
                                 val.setText(input())
-                                val.focus()
                                 val.gotoLineEnd()
+                                setInputTarget(val)
                               })
                             }}
                             initialValue={input()}

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

@@ -113,7 +113,6 @@ import { createDelayedPresence } from "../../util/delayed-presence"
 import { SessionLocationMissing } from "./location-missing"
 import { isRecord } from "../../util/record"
 import { createHistoryPrepend } from "./history"
-import { useSessionTerminals } from "../../context/session-terminals"
 
 addDefaultParsers(parsers.parsers)
 
@@ -161,6 +160,7 @@ export function Session(props: {
   sidebarVisible: boolean
   onToggleSidebar: () => void
   visibleTerminalID?: string
+  onTerminalPicker?: (show: (() => void) | undefined) => void
   width?: number
 }) {
   const setEpilogue = useEpilogue()
@@ -234,6 +234,8 @@ export function Session(props: {
     open: false,
     tab: undefined as string | undefined,
   })
+  props.onTerminalPicker?.(() => setComposer({ open: true, tab: "terminals" }))
+  onCleanup(() => props.onTerminalPicker?.(undefined))
   createEffect(() => {
     if (props.promptMuted && composer.open) setComposer("open", false)
   })
@@ -260,7 +262,6 @@ export function Session(props: {
 
   const scrollAcceleration = createMemo(() => getScrollAcceleration(config))
   const toast = useToast()
-  const terminalError = () => toast.show({ variant: "error", message: "Unable to load terminal" })
   const client = useClient()
   const autoApproved = new Set<string>()
   createEffect(() => {
@@ -295,7 +296,6 @@ export function Session(props: {
   const [firstJump, setFirstJump] = createSignal<() => void>()
   const [synced, setSynced] = createSignal(false)
   const sessionTabs = useSessionTabs()
-  const terminals = useSessionTerminals()
   const [awayFromBottom, setAwayFromBottom] = createSignal(false)
   const [latestHovered, setLatestHovered] = createSignal(false)
   let ensureAllRowsPending: (() => void)[] | undefined
@@ -976,73 +976,6 @@ export function Session(props: {
         })()
       },
     },
-    {
-      title: props.sidebarVisible ? "Hide sidebar" : "Show sidebar",
-      id: "session.sidebar.toggle",
-      group: "Session",
-      run: () => {
-        props.onToggleSidebar()
-        dialog.clear()
-      },
-    },
-    ...(config.session.terminal
-      ? [
-          {
-            title: props.visibleTerminalID ? "Hide terminal pane" : "Show terminal pane",
-            id: "terminal.toggle",
-            group: "Session",
-            run: () => {
-              const sessionID = route.sessionID
-              if (props.visibleTerminalID) {
-                promptRef.current?.focus()
-                void terminals.selectTerminal(sessionID, null).catch(toast.error)
-              } else {
-                void terminals
-                  .refresh(sessionID)
-                  .then(async () => {
-                    const terminal = terminals.get(sessionID).terminals.at(-1)
-                    if (terminal) return terminals.selectTerminal(sessionID, terminal.id)
-                    await terminals.newTerminal(sessionID)
-                  })
-                  .catch(terminalError)
-              }
-              dialog.clear()
-            },
-          },
-          {
-            title: "Select terminal",
-            id: "terminal.select",
-            group: "Session",
-            run: () => {
-              promptRef.current?.focus()
-              setComposer({ open: true, tab: "terminals" })
-              void terminals.refresh(route.sessionID).catch(terminalError)
-              dialog.clear()
-            },
-          },
-          {
-            title: "Close terminal pane",
-            id: "terminal.close",
-            group: "Session",
-            enabled: props.visibleTerminalID !== undefined,
-            run: () => {
-              promptRef.current?.focus()
-              void terminals.selectTerminal(route.sessionID, null).catch(toast.error)
-              dialog.clear()
-            },
-          },
-          {
-            title: "New terminal",
-            id: "session.terminal",
-            group: "Session",
-            slash: { name: "terminal" },
-            run: async () => {
-              dialog.clear()
-              await terminals.newTerminal(route.sessionID).catch(terminalError)
-            },
-          },
-        ]
-      : []),
     {
       title: (() => {
         const next = nextThinkingMode(thinkingMode())
@@ -1507,7 +1440,6 @@ export function Session(props: {
                   <Prompt
                     visible={true}
                     ref={bind}
-                    disabled={false}
                     muted={props.promptMuted}
                     onSubmit={() => {
                       toBottom()

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

@@ -288,6 +288,7 @@ function RejectPrompt(props: {
   onCancel: () => void
 }) {
   let input: TextareaRenderable
+  const enabled = Keymap.useEnabled()
   const theme = useTheme("elevated")
   const config = useConfig().data
   const dimensions = useTerminalDimensions()
@@ -364,7 +365,7 @@ function RejectPrompt(props: {
             }))(val)
             val.traits = { status: "REJECT" }
           }}
-          focused
+          focused={enabled()}
           textColor={theme.text.default}
           focusedTextColor={theme.text.default}
           cursorColor={theme.text.default}

packages/tui/src/theme/component.ts

@@ -3,7 +3,16 @@ import type { Accessor } from "solid-js"
 import type { Mode, ResolvedTheme, ResolvedThemeTokens } from "@opencode-ai/theme/tui"
 
 export function createComponentTheme(current: Accessor<ResolvedTheme>, mode: Accessor<Mode>) {
-  const create = (view: Accessor<ResolvedThemeTokens>) => ({
+  return Object.assign(createComponentThemeView(current, mode), {
+    contextual: {
+      elevated: createComponentThemeView(() => current().contextual.elevated, mode),
+      overlay: createComponentThemeView(() => current().contextual.overlay, mode),
+    },
+  })
+}
+
+export function createComponentThemeView(view: Accessor<ResolvedThemeTokens>, mode: Accessor<Mode>) {
+  return {
     get hue() {
       return view().hue
     },
@@ -35,14 +44,7 @@ export function createComponentTheme(current: Accessor<ResolvedTheme>, mode: Acc
     increase: (color: RGBA, amount = 1) => view().increase(color, amount),
     decrease: (color: RGBA, amount = 1) => view().decrease(color, amount),
     raise: (color: RGBA) => (mode() === "light" ? view().increase(color) : view().decrease(color)),
-  })
-
-  return Object.assign(create(current), {
-    contextual: {
-      elevated: create(() => current().contextual.elevated),
-      overlay: create(() => current().contextual.overlay),
-    },
-  })
+  }
 }
 
 export type ComponentTheme = ReturnType<typeof createComponentTheme>

packages/tui/src/ui/layout.ts

@@ -14,7 +14,7 @@ export function clampSessionTabsWidth(width: number, total: number) {
   )
 }
 
-export function clampTerminalPaneWidth(width: number, total: number) {
+export function clampSessionPaneWidth(width: number, total: number) {
   const half = Math.max(1, Math.floor(total / 2))
   // Preserve the equal split when there is not enough room for both pane minima.
   return Math.max(Math.min(24, half), Math.min(width, Math.max(half, total - SESSION_CONTENT_MIN_WIDTH)))

packages/tui/test/app-lifecycle.test.tsx

@@ -5,10 +5,9 @@ import { Effect, FileSystem } from "effect"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { Global } from "@opencode-ai/util/global"
 import path from "node:path"
-import { createEventStream, createFetch, directory, json, type FetchHandler } from "./fixture/tui-client"
+import { createEventStream, createFetch, directory, json } from "./fixture/tui-client"
+import { createAppFixture } from "./fixture/tui-app"
 import { tmpdir } from "./fixture/fixture"
-import type { TuiInput } from "../src/app"
-import type { Config } from "../src/config"
 import type { PluginInfo } from "@opencode-ai/client"
 
 test.each([100, 44])("Ctrl-O is immediate, dismissible, and prunes cached deletions at width %s", async (width) => {
@@ -1229,7 +1228,7 @@ test("ctrl+c dismisses autocomplete and shell mode before exiting", async () =>
 })
 
 test.each(["manual", "select"] as const)(
-  "selection copy and dismissal respect %s mode in the prompt and terminal pane",
+  "selection copy and pane management respect %s mode in the prompt and terminal pane",
   async (copy) => {
     const setup = await createTestRenderer({ width: 100, height: 30, useThread: false, kittyKeyboard: true })
     setup.renderer.start()
@@ -1360,6 +1359,19 @@ test.each(["manual", "select"] as const)(
       expect(setup.renderer.hasSelection).toBeFalse()
       expect(setup.renderer.isDestroyed).toBeFalse()
 
+      setup.mockInput.pressKey("x", { ctrl: true })
+      setup.mockInput.pressArrow("up")
+      await setup.waitFor(() => terminal.isDestroyed)
+      expect(setup.renderer.currentFocusedEditor?.plainText).toBe("")
+      setup.mockInput.pressKey("x", { ctrl: true })
+      setup.mockInput.pressKey("t")
+      await setup.waitForFrame((frame) => frame.includes("alpha beta gamma"))
+      expect(setup.renderer.currentFocusedRenderable).toBeInstanceOf(EmbeddedTerminalRenderable)
+      setup.mockInput.pressKey("x", { ctrl: true })
+      setup.mockInput.pressArrow("down")
+      await setup.waitForFrame((frame) => frame.includes("Subagents") && frame.includes("Terminals"))
+      expect(setup.renderer.currentFocusedRenderable).not.toBeInstanceOf(EmbeddedTerminalRenderable)
+
       setup.renderer.destroy()
       await task
     } finally {
@@ -1530,54 +1542,3 @@ test("server plugin failures share one notice and use source names before an ID
   expect(setup.captureCharFrame()).toContain("/fixture/broken.ts")
   expect(setup.captureCharFrame()).toContain("Open plugins")
 })
-
-async function createAppFixture(
-  input: {
-    width?: number
-    height?: number
-    state?: string
-    config?: Config.Info
-    args?: TuiInput["args"]
-    fetch?: FetchHandler
-  } = {},
-) {
-  const { run } = await import("../src/app")
-  const setup = await createTestRenderer({
-    width: input.width ?? 100,
-    height: input.height ?? 30,
-    useThread: false,
-    kittyKeyboard: true,
-  })
-  setup.renderer.start()
-  const ready = Promise.withResolvers<void>()
-  const events = createEventStream()
-  const calls = createFetch(input.fetch, events)
-  const server = Bun.serve({ port: 0, fetch: (request) => calls.fetch(request) })
-  const task = Effect.runPromise(
-    run({
-      app: { name: "test", version: "test", channel: "test" },
-      server: { endpoint: { url: server.url.toString() } },
-      config: { get: async () => input.config ?? { animations: false }, update: async () => ({}) },
-      packages: { prepare: async () => ({ directory: "" }) },
-      terminalHandoff: async () => ({ renderer: setup.renderer, mode: "dark", complete: ready.resolve }),
-      args: input.args ?? {},
-      log: () => {},
-    }).pipe(
-      Effect.provide(input.state ? Global.layerWith({ state: input.state }) : AppNodeBuilder.build(Global.node)),
-      Effect.provide(FileSystem.layerNoop({})),
-    ),
-  )
-  return {
-    ...setup,
-    events,
-    ready: ready.promise,
-    async [Symbol.asyncDispose]() {
-      try {
-        if (!setup.renderer.isDestroyed) setup.renderer.destroy()
-        await task
-      } finally {
-        await server.stop()
-      }
-    },
-  }
-}

packages/tui/test/cli/tui/diff-viewer-file-menu.test.tsx

@@ -0,0 +1,289 @@
+/** @jsxImportSource @opentui/solid */
+import type { Plugin } from "@opencode-ai/plugin/tui"
+import { MouseButton } from "@opentui/core"
+import { testRender } from "@opentui/solid"
+import { expect, test } from "bun:test"
+import { createSignal, Show } from "solid-js"
+import { Keymap } from "../../../src/context/keymap"
+import { DiffFileMenu } from "../../../src/feature-plugins/system/diff-viewer-file-menu"
+import { DEFAULT_THEMES, parseTheme, resolveThemeDocument } from "../../../src/theme"
+
+test.each(["dark", "light"] as const)(
+  "file menus escape an offset, narrower clipping pane in %s mode",
+  async (mode) => {
+    const menu = await renderFileMenu(mode)
+    try {
+      const pane = menu.app.renderer.root.findDescendantById("test-diff-pane")!
+      expect([pane.x, pane.y, pane.width]).toEqual([48, 4, 12])
+      expect(menu.app.renderer.currentFocusedRenderable).toBe(pane)
+      await menu.app.mockMouse.click(pane.x + 2, pane.y, MouseButton.RIGHT)
+      await menu.app.waitForFrame((frame) => frame.includes("Mark complete"))
+
+      const overlay = menu.app.renderer.root.findDescendantById("diff-file-menu-overlay")!
+      const popup = menu.app.renderer.root.findDescendantById("diff-file-menu")!
+      expect([overlay.x, overlay.y, overlay.width, overlay.height]).toEqual([0, 0, 80, 20])
+      expect(overlay.parent?.parent).toBe(menu.app.renderer.root)
+      expect([popup.x, popup.y, popup.width, popup.height]).toEqual([50, 5, 19, 1])
+      expect(popup.x + popup.width).toBeGreaterThan(pane.x + pane.width)
+      expect(menu.app.captureCharFrame().split("\n")[5].indexOf("Mark complete")).toBe(51)
+      expect(menu.mode()).toBe("menu")
+      expect(menu.app.renderer.currentFocusedRenderable).toBe(pane)
+
+      const idle = menu.app.captureSpans().lines[popup.y].spans.find((span) => span.text.includes("Mark complete"))!
+      expect(idle.fg).toEqual(menu.theme.contextual.overlay.text.default)
+      expect(idle.bg).toEqual(menu.theme.contextual.overlay.background.default)
+
+      // The action remains clickable outside the clipping pane's right edge.
+      await menu.app.mockMouse.moveTo(pane.x + pane.width + 1, popup.y)
+      await menu.app.flush()
+      const hovered = menu.app.captureSpans().lines[popup.y].spans.find((span) => span.text.includes("Mark complete"))!
+      expect(hovered.bg).toEqual(menu.theme.contextual.overlay.background.action.primary.hovered)
+      await menu.app.mockMouse.moveTo(1, 1)
+      await menu.app.flush()
+      expect(
+        menu.app.captureSpans().lines[popup.y].spans.find((span) => span.text.includes("Mark complete"))!.bg,
+      ).toEqual(idle.bg)
+      await menu.app.mockMouse.click(pane.x + pane.width + 1, popup.y)
+      await menu.app.flush()
+      expect(menu.calls).toEqual(["close", "toggle"])
+      expect(menu.reviewed()).toBe(true)
+      expect(menu.mode()).toBe("base")
+      expect(menu.app.renderer.currentFocusedRenderable).toBe(pane)
+      expect(menu.app.renderer.root.findDescendantById("diff-file-menu-overlay")).toBeUndefined()
+    } finally {
+      menu.app.renderer.destroy()
+    }
+  },
+)
+
+test("file menus clamp to screen edges and follow terminal resizes rather than pane bounds", async () => {
+  const menu = await renderFileMenu()
+  try {
+    menu.open(79, 19)
+    await menu.app.flush()
+    const popup = menu.app.renderer.root.findDescendantById("diff-file-menu")!
+    const overlay = menu.app.renderer.root.findDescendantById("diff-file-menu-overlay")!
+    expect([popup.x, popup.y, popup.width, popup.height]).toEqual([61, 19, 19, 1])
+    expect(menu.app.captureCharFrame().split("\n")[19]).toContain("Mark complete")
+
+    menu.app.resize(64, 14)
+    await menu.app.flush()
+    expect([overlay.x, overlay.y, overlay.width, overlay.height]).toEqual([0, 0, 64, 14])
+    expect([popup.x, popup.y, popup.width, popup.height]).toEqual([45, 13, 19, 1])
+    expect(menu.app.captureCharFrame().split("\n")[13]).toContain("Mark complete")
+
+    menu.app.resize(12, 8)
+    await menu.app.flush()
+    expect([overlay.width, overlay.height]).toEqual([12, 8])
+    expect([popup.x, popup.y, popup.width, popup.height]).toEqual([0, 7, 12, 1])
+    expect(menu.app.captureCharFrame().split("\n")[7]).toContain("...")
+
+    menu.open(-3, -2)
+    await menu.app.flush()
+    const clamped = menu.app.renderer.root.findDescendantById("diff-file-menu")!
+    expect([clamped.x, clamped.y]).toEqual([0, 0])
+  } finally {
+    menu.app.renderer.destroy()
+  }
+})
+
+test("clicking outside the pane dismisses its menu without activating the underlying control", async () => {
+  const menu = await renderFileMenu()
+  try {
+    menu.open(50, 4)
+    await menu.app.flush()
+    await menu.app.mockMouse.click(1, 1)
+    await menu.app.flush()
+    expect(menu.calls).toEqual(["close"])
+    expect(menu.mode()).toBe("base")
+    expect(menu.app.renderer.currentFocusedRenderable?.id).toBe("test-diff-pane")
+    expect(menu.app.renderer.root.findDescendantById("diff-file-menu-overlay")).toBeUndefined()
+
+    await menu.app.mockMouse.click(1, 1)
+    expect(menu.calls).toEqual(["close", "outside"])
+  } finally {
+    menu.app.renderer.destroy()
+  }
+})
+
+test.each(["escape", "ctrl+c"] as const)("%s dismisses only the file menu and restores pane commands", async (key) => {
+  const menu = await renderFileMenu()
+  try {
+    menu.open(50, 4)
+    await menu.app.flush()
+    menu.app.mockInput.pressKey("j")
+    await menu.app.flush()
+    expect(menu.calls).toEqual([])
+    if (key === "escape") menu.app.mockInput.pressEscape()
+    if (key === "ctrl+c") menu.app.mockInput.pressKey("c", { ctrl: true })
+    await menu.app.flush()
+    expect(menu.calls).toEqual(["close"])
+    expect(menu.mode()).toBe("base")
+    expect(menu.app.renderer.currentFocusedRenderable?.id).toBe("test-diff-pane")
+    expect(menu.app.renderer.root.findDescendantById("diff-file-menu-overlay")).toBeUndefined()
+
+    menu.app.mockInput.pressKey("j")
+    expect(menu.calls).toEqual(["close", "pane"])
+  } finally {
+    menu.app.renderer.destroy()
+  }
+})
+
+test("Enter toggles either review state after closing the menu and leaves no stale menu bindings", async () => {
+  const menu = await renderFileMenu()
+  try {
+    menu.open(50, 4)
+    await menu.app.waitForFrame((frame) => frame.includes("Mark complete"))
+    menu.app.mockInput.pressEnter()
+    await menu.app.flush()
+    expect(menu.reviewed()).toBe(true)
+    expect(menu.calls).toEqual(["close", "toggle"])
+    expect(menu.mode()).toBe("base")
+
+    menu.open(50, 4)
+    await menu.app.waitForFrame((frame) => frame.includes("Mark incomplete"))
+    menu.app.mockInput.pressEnter()
+    await menu.app.flush()
+    expect(menu.reviewed()).toBe(false)
+    expect(menu.calls).toEqual(["close", "toggle", "close", "toggle"])
+    expect(menu.mode()).toBe("base")
+    expect(menu.app.renderer.currentFocusedRenderable?.id).toBe("test-diff-pane")
+    expect(menu.app.renderer.root.findDescendantById("diff-file-menu-overlay")).toBeUndefined()
+
+    menu.app.mockInput.pressEnter()
+    expect(menu.calls).toEqual(["close", "toggle", "close", "toggle", "pane"])
+  } finally {
+    menu.app.renderer.destroy()
+  }
+})
+
+test("right-clicking the menu dismisses without toggling", async () => {
+  const menu = await renderFileMenu()
+  try {
+    menu.open(50, 4)
+    await menu.app.flush()
+    await menu.app.mockMouse.click(51, 5, MouseButton.RIGHT)
+    await menu.app.flush()
+    expect(menu.calls).toEqual(["close"])
+    expect(menu.mode()).toBe("base")
+    expect(menu.reviewed()).toBe(false)
+    expect(menu.app.renderer.currentFocusedRenderable?.id).toBe("test-diff-pane")
+  } finally {
+    menu.app.renderer.destroy()
+  }
+})
+
+test("portaling the menu leaves its mode and commands owned by the pane's keymap scope", async () => {
+  const menu = await renderFileMenu()
+  try {
+    menu.open(50, 4)
+    await menu.app.flush()
+    expect(menu.mode()).toBe("menu")
+
+    menu.setEnabled(false)
+    await menu.app.flush()
+    expect(menu.mode()).toBe("base")
+    menu.app.mockInput.pressEnter()
+    menu.app.mockInput.pressEscape()
+    await menu.app.flush()
+    expect(menu.calls).toEqual([])
+    expect(menu.app.renderer.root.findDescendantById("diff-file-menu")).toBeDefined()
+
+    menu.setEnabled(true)
+    await menu.app.flush()
+    expect(menu.mode()).toBe("menu")
+    menu.app.mockInput.pressEnter()
+    await menu.app.flush()
+    expect(menu.calls).toEqual(["close", "toggle"])
+    expect(menu.mode()).toBe("base")
+  } finally {
+    menu.app.renderer.destroy()
+  }
+})
+
+async function renderFileMenu(mode: "dark" | "light" = "dark") {
+  const theme = resolveThemeDocument(parseTheme(DEFAULT_THEMES.opencode), mode)
+  const calls: string[] = []
+  const [state, setState] = createSignal<{ fileIndex: number; x: number; y: number }>()
+  const [reviewed, setReviewed] = createSignal(false)
+  const [enabled, setEnabled] = createSignal(true)
+  const open = (x: number, y: number) => setState({ fileIndex: 0, x, y })
+  let currentMode = () => "base"
+
+  function Harness() {
+    const keymap = Keymap.use()
+    currentMode = keymap.mode.current
+    const context: Pick<Plugin.Context, "theme" | "keymap"> = {
+      theme,
+      keymap: {
+        layer: Keymap.createLayer,
+        dispatch: keymap.dispatch,
+        shortcuts: Keymap.useShortcuts().list,
+        ...Keymap.useState(),
+        mode: keymap.mode,
+      },
+    }
+    Keymap.createLayer(() => ({
+      commands: [{ bind: "escape,ctrl+c,return,j", title: "Pane command", run: () => void calls.push("pane") }],
+    }))
+    return (
+      <box width="100%" height="100%" backgroundColor={theme.background.default}>
+        <box position="absolute" left={0} top={0} width={20} height={3} onMouseDown={() => calls.push("outside")}>
+          <text>Other pane</text>
+        </box>
+        <box
+          id="test-diff-pane"
+          position="absolute"
+          left={48}
+          top={4}
+          width={12}
+          height={6}
+          overflow="hidden"
+          focusable
+          focused
+        >
+          <text
+            onMouseDown={(event) => {
+              if (event.button !== MouseButton.RIGHT) return
+              open(event.x, event.y)
+              event.preventDefault()
+              event.stopPropagation()
+            }}
+          >
+            file.txt
+          </text>
+          <Show when={state()} keyed>
+            {(state) => (
+              <DiffFileMenu
+                context={context as Plugin.Context}
+                state={state}
+                reviewed={reviewed()}
+                onClose={() => {
+                  calls.push("close")
+                  setState(undefined)
+                }}
+                onToggle={() => {
+                  calls.push("toggle")
+                  setReviewed((value) => !value)
+                }}
+              />
+            )}
+          </Show>
+        </box>
+      </box>
+    )
+  }
+
+  const app = await testRender(
+    () => (
+      <Keymap.Provider config={{ keybinds: { get: () => [] } }}>
+        <Keymap.Scope enabled={enabled()}>
+          <Harness />
+        </Keymap.Scope>
+      </Keymap.Provider>
+    ),
+    { width: 80, height: 20, kittyKeyboard: true },
+  )
+  await app.flush()
+  return { app, calls, theme, open, reviewed, setEnabled, mode: () => currentMode() }
+}

packages/tui/test/cli/tui/input-scope.test.tsx

@@ -0,0 +1,278 @@
+/** @jsxImportSource @opentui/solid */
+import type { PermissionRequest } from "@opencode-ai/client"
+import type { TextareaRenderable } from "@opentui/core"
+import { testRender, type JSX } from "@opentui/solid"
+import { expect, test } from "bun:test"
+import { createSignal, onMount } from "solid-js"
+import { ConfigProvider } from "../../../src/config"
+import { ClientProvider } from "../../../src/context/client"
+import { DataProvider, useData, type FormWithLocation } from "../../../src/context/data"
+import { Keymap } from "../../../src/context/keymap"
+import { LocationProvider } from "../../../src/context/location"
+import { ThemeProvider } from "../../../src/context/theme"
+import { FormPrompt, FORM_MODE } from "../../../src/routes/session/form"
+import { PermissionPrompt } from "../../../src/routes/session/permission"
+import { ToastProvider } from "../../../src/ui/toast"
+import { emptyThemeSource, tmpdir } from "../../fixture/fixture"
+import { createApi, createEventStream, createFetch, json } from "../../fixture/tui-client"
+import { TestTuiContexts } from "../../fixture/tui-environment"
+import { createTuiResolvedConfig } from "../../fixture/tui-runtime"
+
+async function mountPanes(root: string, render: () => JSX.Element, parentID?: string) {
+  const [active, setActive] = createSignal(false)
+  const replies: unknown[] = []
+  const cancellations: string[] = []
+  const submissions: string[] = []
+  const ready = Promise.withResolvers<void>()
+  let peer!: TextareaRenderable
+  let keymap!: Keymap
+  const transport = createFetch((url, request) => {
+    if (url.pathname === "/api/session/ses_scoped")
+      return json({
+        data: {
+          id: "ses_scoped",
+          parentID,
+          title: "Scoped session",
+          projectID: "proj_test",
+          location: { directory: root },
+          cost: 0,
+          tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+          time: { created: 0, updated: 0 },
+        },
+      })
+    if (url.pathname.endsWith("/reply"))
+      return request.json().then((body) => {
+        replies.push(body)
+        return new Response(null, { status: 204 })
+      })
+    if (url.pathname.endsWith("/cancel")) {
+      cancellations.push(url.pathname)
+      return new Response(null, { status: 204 })
+    }
+  }, createEventStream())
+
+  function Panes() {
+    const data = useData()
+    keymap = Keymap.use()
+    onMount(() => void data.session.sync("ses_scoped").then(ready.resolve, ready.reject))
+    return (
+      <box>
+        <Keymap.Scope enabled={!active()}>
+          <textarea
+            ref={(value) => (peer = value)}
+            focused={!active()}
+            initialValue="peer"
+            onSubmit={() => submissions.push(peer.plainText)}
+          />
+        </Keymap.Scope>
+        <Keymap.Scope enabled={active()}>{render()}</Keymap.Scope>
+      </box>
+    )
+  }
+
+  const app = await testRender(
+    () => (
+      <TestTuiContexts directory={root} paths={{ home: root, state: root, worktree: root }}>
+        <ConfigProvider config={createTuiResolvedConfig({ animations: false })}>
+          <Keymap.Provider>
+            <ClientProvider api={createApi(transport.fetch)}>
+              <DataProvider directory={root}>
+                <LocationProvider>
+                  <ThemeProvider mode="dark" source={emptyThemeSource}>
+                    <ToastProvider>
+                      <Panes />
+                    </ToastProvider>
+                  </ThemeProvider>
+                </LocationProvider>
+              </DataProvider>
+            </ClientProvider>
+          </Keymap.Provider>
+        </ConfigProvider>
+      </TestTuiContexts>
+    ),
+    { width: 90, height: 24, kittyKeyboard: true },
+  )
+  app.renderer.start()
+  await ready.promise
+  await app.renderOnce()
+  return { app, setActive, replies, cancellations, submissions, peer, keymap }
+}
+
+function form(fields: FormWithLocation["fields"]): FormWithLocation {
+  return { id: "frm_scoped", sessionID: "ses_scoped", title: "Scoped form", fields }
+}
+
+const request = {
+  id: "per_scoped",
+  sessionID: "ses_scoped",
+  action: "shell",
+  resources: ["echo scoped"],
+} satisfies PermissionRequest
+
+test("an inactive form leaves Enter, navigation, and paste with the focused peer", async () => {
+  await using tmp = await tmpdir()
+  const panes = await mountPanes(tmp.path, () => (
+    <FormPrompt
+      form={form([
+        {
+          key: "target",
+          type: "string",
+          options: [
+            { value: "staging", label: "Staging" },
+            { value: "production", label: "Production" },
+          ],
+        },
+      ])}
+    />
+  ))
+  try {
+    expect(panes.keymap.mode.current()).toBe("base")
+    expect(panes.app.renderer.currentFocusedEditor?.id).toBe(panes.peer.id)
+    panes.app.mockInput.pressEnter()
+    panes.app.mockInput.pressArrow("down")
+    panes.app.mockInput.pressKey("2")
+    panes.app.mockInput.pressEscape()
+    await panes.app.mockInput.pasteBracketedText(" pasted")
+    expect(panes.submissions).toEqual(["peer"])
+    expect(panes.peer.plainText).toContain("pasted")
+    expect(panes.replies).toEqual([])
+    expect(panes.cancellations).toEqual([])
+
+    panes.setActive(true)
+    expect(panes.keymap.mode.current()).toBe(FORM_MODE)
+    panes.app.mockInput.pressEnter()
+    await panes.app.waitFor(() => panes.replies.length === 1)
+    expect(panes.replies).toEqual([{ answer: { target: "staging" } }])
+  } finally {
+    panes.app.renderer.destroy()
+  }
+})
+
+test("a form textarea mounts inactive and restores its draft focus after scope and modal changes", async () => {
+  await using tmp = await tmpdir()
+  const panes = await mountPanes(tmp.path, () => <FormPrompt form={form([{ key: "notes", type: "string" }])} />)
+  try {
+    expect(panes.app.renderer.currentFocusedEditor?.id).toBe(panes.peer.id)
+    panes.setActive(true)
+    const input = panes.app.renderer.currentFocusedEditor
+    expect(input).not.toBeNull()
+    expect(input?.id).not.toBe(panes.peer.id)
+    await panes.app.mockInput.typeText("draft answer")
+
+    const pop = panes.keymap.mode.push("modal")
+    expect(panes.app.renderer.currentFocusedEditor).toBeNull()
+    panes.setActive(false)
+    panes.setActive(true)
+    expect(panes.keymap.mode.current()).toBe("modal")
+    expect(panes.app.renderer.currentFocusedEditor).toBeNull()
+    pop()
+    expect(panes.app.renderer.currentFocusedEditor?.id).toBe(input?.id)
+
+    panes.setActive(false)
+    input?.focus()
+    expect(panes.app.renderer.currentFocusedEditor?.id).toBe(panes.peer.id)
+    await panes.app.mockInput.typeText(" other")
+    await panes.app.mockInput.pasteBracketedText(" pane")
+    panes.app.mockInput.pressEnter()
+    expect(panes.submissions).toHaveLength(1)
+    expect(input?.plainText).toBe("draft answer")
+    expect(panes.replies).toEqual([])
+
+    panes.setActive(true)
+    expect(panes.app.renderer.currentFocusedEditor?.id).toBe(input?.id)
+    panes.app.mockInput.pressEnter()
+    panes.app.mockInput.pressEnter()
+    await panes.app.waitFor(() => panes.replies.length === 1)
+    expect(panes.replies).toEqual([{ answer: { notes: "draft answer" } }])
+  } finally {
+    panes.app.renderer.destroy()
+  }
+})
+
+test("inactive custom forms cannot intercept a peer using the same form mode", async () => {
+  await using tmp = await tmpdir()
+  const panes = await mountPanes(tmp.path, () => (
+    <FormPrompt
+      form={form([{ key: "target", type: "string", options: [{ value: "staging", label: "Staging" }], custom: true }])}
+    />
+  ))
+  try {
+    panes.setActive(true)
+    panes.app.mockInput.pressArrow("down")
+    panes.setActive(false)
+    const pop = panes.keymap.mode.push(FORM_MODE)
+    await panes.app.mockInput.typeText(" typed")
+    await panes.app.mockInput.pasteBracketedText(" pasted")
+    panes.app.mockInput.pressEnter()
+    await panes.app.renderOnce()
+    expect(panes.app.renderer.currentFocusedEditor?.id).toBe(panes.peer.id)
+    expect(panes.submissions).toHaveLength(1)
+    expect(panes.peer.plainText).toContain("typed")
+    expect(panes.peer.plainText).toContain("pasted")
+    expect(panes.app.captureCharFrame()).toContain("Type your own answer")
+    expect(panes.replies).toEqual([])
+    pop()
+
+    panes.setActive(true)
+    await panes.app.mockInput.typeText("production target")
+    await panes.app.waitFor(() => panes.app.renderer.currentFocusedEditor?.plainText === "production target")
+    panes.setActive(false)
+    expect(panes.app.renderer.currentFocusedEditor?.id).toBe(panes.peer.id)
+    panes.setActive(true)
+    expect(panes.app.renderer.currentFocusedEditor?.plainText).toBe("production target")
+    panes.app.mockInput.pressEnter()
+    await panes.app.waitFor(() => panes.replies.length === 1)
+    expect(panes.replies).toEqual([{ answer: { target: "production target" } }])
+  } finally {
+    panes.app.renderer.destroy()
+  }
+})
+
+test("permission layers leave the focused peer's Enter and navigation alone until activated", async () => {
+  await using tmp = await tmpdir()
+  const panes = await mountPanes(tmp.path, () => <PermissionPrompt request={request} />)
+  try {
+    panes.app.mockInput.pressEnter()
+    panes.app.mockInput.pressArrow("right")
+    panes.app.mockInput.pressEscape()
+    expect(panes.submissions).toEqual(["peer"])
+    expect(panes.replies).toEqual([])
+    expect(panes.app.renderer.currentFocusedEditor?.id).toBe(panes.peer.id)
+
+    panes.setActive(true)
+    panes.app.mockInput.pressEnter()
+    await panes.app.waitFor(() => panes.replies.length === 1)
+    expect(panes.replies).toEqual([{ reply: "once" }])
+    expect(panes.submissions).toHaveLength(1)
+  } finally {
+    panes.app.renderer.destroy()
+  }
+})
+
+test("permission rejection text keeps its draft and regains focus when its scope resumes", async () => {
+  await using tmp = await tmpdir()
+  const panes = await mountPanes(tmp.path, () => <PermissionPrompt request={request} />, "ses_parent")
+  try {
+    panes.setActive(true)
+    panes.app.mockInput.pressEscape()
+    await panes.app.waitForFrame((frame) => frame.includes("Reject permission"))
+    const input = panes.app.renderer.currentFocusedEditor
+    expect(input).not.toBeNull()
+    await panes.app.mockInput.typeText("choose another command")
+
+    panes.setActive(false)
+    panes.app.mockInput.pressEnter()
+    expect(panes.app.renderer.currentFocusedEditor?.id).toBe(panes.peer.id)
+    expect(panes.submissions).toEqual(["peer"])
+    expect(panes.replies).toEqual([])
+    expect(input?.plainText).toBe("choose another command")
+
+    panes.setActive(true)
+    expect(panes.app.renderer.currentFocusedEditor?.id).toBe(input?.id)
+    panes.app.mockInput.pressEnter()
+    await panes.app.waitFor(() => panes.replies.length === 1)
+    expect(panes.replies).toEqual([{ reply: "reject", message: "choose another command" }])
+  } finally {
+    panes.app.renderer.destroy()
+  }
+})

packages/tui/test/cli/tui/theme-mode.test.tsx

@@ -2,6 +2,7 @@
 import { testRender } from "@opentui/solid"
 import { expect, test } from "bun:test"
 import { RGBA } from "@opentui/core"
+import { createSignal } from "solid-js"
 import { DEFAULT_THEME, selectTheme } from "@opencode-ai/theme/tui"
 import { createTuiResolvedConfig } from "../../fixture/tui-runtime"
 import { DEFAULT_THEMES } from "../../../src/theme"
@@ -173,3 +174,45 @@ test("contextual hooks resolve overrides and fall back to a standalone theme's b
     app.renderer.destroy()
   }
 })
+
+test.each(["dark", "light"] as const)(
+  "reactive %s theme contexts change without remounting their contents",
+  async (mode) => {
+    const [context, setContext] = createSignal<"elevated" | undefined>("elevated")
+    let theme: ReturnType<typeof useTheme> | undefined
+    let themes: ReturnType<typeof useThemes> | undefined
+    let mounts = 0
+    function Probe() {
+      mounts++
+      theme = useTheme()
+      themes = useThemes()
+      return <text fg={theme.text.default}>probe</text>
+    }
+    const app = await testRender(() => (
+      <ConfigProvider config={createTuiResolvedConfig({ theme: { name: "opencode", mode } })}>
+        <ThemeProvider mode={mode} source={{ discover: async () => ({}) }}>
+          <ThemeContextProvider context={context}>
+            <Probe />
+          </ThemeContextProvider>
+        </ThemeProvider>
+      </ConfigProvider>
+    ))
+    app.renderer.start()
+    try {
+      await wait(() => themes?.ready === true)
+      if (!theme || !themes) throw new Error("Theme provider is not mounted")
+      const view = theme
+      expect(view.background.default).toBe(themes.current.contextual.elevated.background.default)
+      setContext(undefined)
+      await app.flush()
+      expect(view.background.default).toBe(themes.current.background.default)
+      setContext("elevated")
+      await app.flush()
+      expect(view.text.default).toBe(themes.current.contextual.elevated.text.default)
+      expect(theme).toBe(view)
+      expect(mounts).toBe(1)
+    } finally {
+      app.renderer.destroy()
+    }
+  },
+)

packages/tui/test/fixture/tui-app.ts

@@ -0,0 +1,58 @@
+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 type { TuiInput } from "../../src/app"
+import type { Config } from "../../src/config"
+import { createEventStream, createFetch, type FetchHandler } from "./tui-client"
+
+export async function createAppFixture(
+  input: {
+    width?: number
+    height?: number
+    state?: string
+    config?: Config.Info
+    args?: TuiInput["args"]
+    fetch?: FetchHandler
+  } = {},
+) {
+  const { run } = await import("../../src/app")
+  const setup = await createTestRenderer({
+    width: input.width ?? 100,
+    height: input.height ?? 30,
+    useThread: false,
+    kittyKeyboard: true,
+  })
+  setup.renderer.start()
+  const ready = Promise.withResolvers<void>()
+  const events = createEventStream()
+  const calls = createFetch(input.fetch, events)
+  const server = Bun.serve({ port: 0, fetch: (request) => calls.fetch(request) })
+  const task = Effect.runPromise(
+    run({
+      app: { name: "test", version: "test", channel: "test" },
+      server: { endpoint: { url: server.url.toString() } },
+      config: { get: async () => input.config ?? { animations: false }, update: async () => ({}) },
+      packages: { prepare: async () => ({ directory: "" }) },
+      terminalHandoff: async () => ({ renderer: setup.renderer, mode: "dark", complete: ready.resolve }),
+      args: input.args ?? {},
+      log: () => {},
+    }).pipe(
+      Effect.provide(input.state ? Global.layerWith({ state: input.state }) : AppNodeBuilder.build(Global.node)),
+      Effect.provide(FileSystem.layerNoop({})),
+    ),
+  )
+  return {
+    ...setup,
+    events,
+    ready: ready.promise,
+    async [Symbol.asyncDispose]() {
+      try {
+        if (!setup.renderer.isDestroyed) setup.renderer.destroy()
+        await task
+      } finally {
+        await server.stop()
+      }
+    },
+  }
+}

packages/tui/test/keymap-scope.test.tsx

@@ -0,0 +1,270 @@
+/** @jsxImportSource @opentui/solid */
+import { testRender } from "@opentui/solid"
+import { expect, test } from "bun:test"
+import { createSignal, onCleanup, onMount, Show } from "solid-js"
+import { Keymap } from "../src/context/keymap"
+
+const config = { keybinds: { get: () => [] } }
+
+test("disabled scopes isolate named, inline, and global layers without disabling application commands", async () => {
+  const calls: string[] = []
+  const [enabled, setEnabled] = createSignal(false)
+  let keymap!: Keymap
+
+  function Scoped() {
+    Keymap.createLayer(() => ({
+      commands: [
+        { id: "scoped.submit", bind: "return", run: () => void calls.push("submit") },
+        { bind: "j", run: () => void calls.push("inline") },
+      ],
+    }))
+    Keymap.createLayer(() => ({
+      mode: "global",
+      commands: [{ id: "scoped.global", bind: "g", run: () => void calls.push("scoped global") }],
+    }))
+    return null
+  }
+
+  function Harness() {
+    keymap = Keymap.use()
+    Keymap.createLayer(() => ({
+      mode: "global",
+      commands: [{ id: "app.global", bind: "x", run: () => void calls.push("app global") }],
+    }))
+    return (
+      <Keymap.Scope enabled={enabled()}>
+        <Scoped />
+      </Keymap.Scope>
+    )
+  }
+
+  const app = await testRender(() => (
+    <Keymap.Provider config={config}>
+      <Harness />
+    </Keymap.Provider>
+  ))
+  try {
+    app.mockInput.pressEnter()
+    app.mockInput.pressKey("j")
+    app.mockInput.pressKey("g")
+    keymap.dispatch("scoped.submit")
+    keymap.dispatch("scoped.global")
+    app.mockInput.pressKey("x")
+    expect(calls).toEqual(["app global"])
+
+    setEnabled(true)
+    app.mockInput.pressEnter()
+    app.mockInput.pressKey("j")
+    app.mockInput.pressKey("g")
+    expect(calls).toEqual(["app global", "submit", "inline", "scoped global"])
+
+    const pop = keymap.mode.push("modal")
+    app.mockInput.pressEnter()
+    app.mockInput.pressKey("g")
+    app.mockInput.pressKey("x")
+    expect(calls.slice(4)).toEqual(["scoped global", "app global"])
+
+    setEnabled(false)
+    app.mockInput.pressEnter()
+    app.mockInput.pressKey("g")
+    app.mockInput.pressKey("x")
+    expect(calls.slice(6)).toEqual(["app global"])
+    pop()
+  } finally {
+    app.renderer.destroy()
+  }
+})
+
+test("nested scopes conjoin ancestors and retain dispatch-time layer predicates", async () => {
+  const calls: string[] = []
+  const [parent, setParent] = createSignal(false)
+  const [child, setChild] = createSignal(true)
+  const [layer, setLayer] = createSignal(true)
+  let allowed = true
+  let read!: () => boolean
+  let unscoped!: () => boolean
+
+  function Scoped() {
+    read = Keymap.useEnabled()
+    Keymap.createLayer(() => ({
+      enabled: layer(),
+      commands: [{ bind: "return", run: () => void calls.push("boolean") }],
+    }))
+    Keymap.createLayer(() => ({
+      mode: "global",
+      enabled: () => allowed,
+      commands: [{ bind: "g", run: () => void calls.push("predicate") }],
+    }))
+    return null
+  }
+
+  function Harness() {
+    unscoped = Keymap.useEnabled()
+    return (
+      <Keymap.Scope enabled={parent()}>
+        <Keymap.Scope enabled={child()}>
+          <Scoped />
+        </Keymap.Scope>
+      </Keymap.Scope>
+    )
+  }
+
+  const app = await testRender(() => (
+    <Keymap.Provider config={config}>
+      <Harness />
+    </Keymap.Provider>
+  ))
+  try {
+    expect(unscoped()).toBe(true)
+    expect(read()).toBe(false)
+    app.mockInput.pressEnter()
+    setParent(true)
+    expect(read()).toBe(true)
+    app.mockInput.pressEnter()
+    app.mockInput.pressKey("g")
+
+    allowed = false
+    app.mockInput.pressKey("g")
+    setLayer(false)
+    app.mockInput.pressEnter()
+    expect(calls).toEqual(["boolean", "predicate"])
+
+    setChild(false)
+    setLayer(true)
+    allowed = true
+    app.mockInput.pressEnter()
+    app.mockInput.pressKey("g")
+    expect(read()).toBe(false)
+    setParent(false)
+    setChild(true)
+    expect(read()).toBe(false)
+    app.mockInput.pressEnter()
+    app.mockInput.pressKey("g")
+    expect(calls).toEqual(["boolean", "predicate"])
+
+    setParent(true)
+    expect(read()).toBe(true)
+    app.mockInput.pressEnter()
+    app.mockInput.pressKey("g")
+    expect(calls).toEqual(["boolean", "predicate", "boolean", "predicate"])
+  } finally {
+    app.renderer.destroy()
+  }
+})
+
+test("ownerless mode pushes suspend and resume in their captured scope without changing stack order", async () => {
+  const [enabled, setEnabled] = createSignal(false)
+  const calls: string[] = []
+  let scoped!: Keymap
+  let global!: Keymap
+
+  function Scoped() {
+    scoped = Keymap.use()
+    Keymap.createLayer(() => ({
+      mode: "form",
+      commands: [{ bind: "return", run: () => void calls.push("form") }],
+    }))
+    Keymap.createLayer(() => ({
+      mode: "menu",
+      commands: [{ bind: "return", run: () => void calls.push("menu") }],
+    }))
+    return null
+  }
+
+  function Harness() {
+    global = Keymap.use()
+    return (
+      <Keymap.Scope enabled={enabled()}>
+        <Scoped />
+      </Keymap.Scope>
+    )
+  }
+
+  const app = await testRender(() => (
+    <Keymap.Provider config={config}>
+      <Harness />
+    </Keymap.Provider>
+  ))
+  try {
+    const form = scoped.mode.push("form")
+    expect(global.mode.current()).toBe("base")
+    app.mockInput.pressEnter()
+    const modal = global.mode.push("modal")
+    setEnabled(true)
+    expect(global.mode.current()).toBe("modal")
+    app.mockInput.pressEnter()
+    modal()
+    expect(global.mode.current()).toBe("form")
+    app.mockInput.pressEnter()
+    expect(calls).toEqual(["form"])
+
+    setEnabled(false)
+    expect(global.mode.current()).toBe("base")
+    const menu = scoped.mode.push("menu")
+    form()
+    expect(global.mode.current()).toBe("base")
+    setEnabled(true)
+    expect(global.mode.current()).toBe("menu")
+    app.mockInput.pressEnter()
+    expect(calls).toEqual(["form", "menu"])
+    menu()
+    expect(global.mode.current()).toBe("base")
+    setEnabled(false)
+    setEnabled(true)
+    expect(global.mode.current()).toBe("base")
+    app.mockInput.pressEnter()
+    expect(calls).toEqual(["form", "menu"])
+  } finally {
+    app.renderer.destroy()
+  }
+})
+
+test("forwarded keymaps push modes in the calling component's nested scope and clean up while inactive", async () => {
+  const [enabled, setEnabled] = createSignal(false)
+  const [nested, setNested] = createSignal(true)
+  const [mounted, setMounted] = createSignal(true)
+  let global!: Keymap
+
+  function Scoped(props: { keymap: Keymap }) {
+    onMount(() => onCleanup(props.keymap.mode.push("menu")))
+    return null
+  }
+
+  function Harness() {
+    global = Keymap.use()
+    return (
+      <Keymap.Scope enabled={enabled()}>
+        <Keymap.Scope enabled={nested()}>
+          <Show when={mounted()}>
+            <Scoped keymap={global} />
+          </Show>
+        </Keymap.Scope>
+      </Keymap.Scope>
+    )
+  }
+
+  const app = await testRender(() => (
+    <Keymap.Provider config={config}>
+      <Harness />
+    </Keymap.Provider>
+  ))
+  try {
+    expect(global.mode.current()).toBe("base")
+    setEnabled(true)
+    expect(global.mode.current()).toBe("menu")
+    setNested(false)
+    expect(global.mode.current()).toBe("base")
+    setNested(true)
+    expect(global.mode.current()).toBe("menu")
+    setEnabled(false)
+    setMounted(false)
+    setEnabled(true)
+    expect(global.mode.current()).toBe("base")
+    setMounted(true)
+    expect(global.mode.current()).toBe("menu")
+    setMounted(false)
+    expect(global.mode.current()).toBe("base")
+  } finally {
+    app.renderer.destroy()
+  }
+})

packages/tui/test/panel.test.ts

@@ -0,0 +1,55 @@
+import { expect, test } from "bun:test"
+import { createRoot } from "solid-js"
+import { createPanelState } from "../src/context/panel"
+
+test("presentation changes preserve the selected panel identity", () => {
+  createRoot((dispose) => {
+    const panels = createPanelState()
+    panels.setWidth(160)
+    panels.open({ plugin: "review", name: "diff", sessionID: "session" })
+    const current = panels.current()
+    expect(panels.presentation()).toBe("panel")
+    panels.toggleFullscreen()
+    expect(panels.presentation()).toBe("fullscreen")
+    expect(panels.current()).toBe(current)
+    panels.toggleFullscreen()
+    expect(panels.presentation()).toBe("panel")
+    expect(panels.current()).toBe(current)
+    panels.open({ plugin: "review", name: "diff", sessionID: "session" })
+    expect(panels.current()).toBe(current)
+    dispose()
+  })
+})
+
+test("narrow geometry overrides presentation without discarding the user's choice", () => {
+  createRoot((dispose) => {
+    const panels = createPanelState()
+    panels.open({ plugin: "review", name: "diff", sessionID: "session" })
+    panels.setWidth(80)
+    expect(panels.canSplit()).toBe(false)
+    expect(panels.presentation()).toBe("fullscreen")
+    panels.toggleFullscreen()
+    panels.setWidth(81)
+    expect(panels.canSplit()).toBe(true)
+    expect(panels.presentation()).toBe("panel")
+    panels.toggleFullscreen()
+    panels.setWidth(60)
+    panels.setWidth(160)
+    expect(panels.presentation()).toBe("fullscreen")
+    dispose()
+  })
+})
+
+test("releasing a plugin contribution only closes its own selected panel", () => {
+  createRoot((dispose) => {
+    const panels = createPanelState()
+    panels.open({ plugin: "review", name: "diff", sessionID: "session" })
+    const current = panels.current()
+    panels.release("other")
+    panels.release("review", "another-panel")
+    expect(panels.current()).toBe(current)
+    panels.release("review", "diff")
+    expect(panels.current()).toBeUndefined()
+    dispose()
+  })
+})

packages/tui/test/theme/v2/component.test.ts

@@ -2,7 +2,7 @@ import { expect, test } from "bun:test"
 import { createSignal } from "solid-js"
 import { RGBA } from "@opentui/core"
 import { DEFAULT_THEME, resolveTheme, selectTheme, type ContextName } from "@opencode-ai/theme/tui"
-import { createComponentTheme } from "../../../src/theme/component"
+import { createComponentTheme, createComponentThemeView } from "../../../src/theme/component"
 
 test("provides reactive properties, states, contexts, and color operations", () => {
   const [resolved, setResolved] = createSignal(resolveTheme(selectTheme(DEFAULT_THEME, "light")))
@@ -67,3 +67,19 @@ test("provides reactive properties, states, contexts, and color operations", ()
   expect(current().decrease(current().background.surface.offset, 1)).toBe(resolved().hue.neutral[600])
   expect(current().raise(current().background.surface.offset)).toBe(resolved().hue.neutral[600])
 })
+
+test("a stable component theme view follows presentation context changes", () => {
+  const [resolved, setResolved] = createSignal(resolveTheme(selectTheme(DEFAULT_THEME, "dark")))
+  const [context, setContext] = createSignal<ContextName>()
+  const theme = createComponentThemeView(
+    () => (context() ? resolved().contextual[context()!] : resolved()),
+    () => "dark",
+  )
+  expect(theme.background.default).toBe(resolved().background.default)
+  setContext("elevated")
+  expect(theme.background.default).toBe(resolved().contextual.elevated.background.default)
+  setContext(undefined)
+  expect(theme.background.default).toBe(resolved().background.default)
+  setResolved(resolveTheme(selectTheme(DEFAULT_THEME, "light")))
+  expect(theme.text.default).toBe(resolved().text.default)
+})

packages/www/openapi.json

@@ -13904,7 +13904,7 @@
           },
           "update": {
             "type": "string",
-            "enum": ["disable", "notify", "auto"]
+            "enum": ["disable", "notify"]
           },
           "share": {
             "type": "string",

packages/www/public/openapi.json

@@ -13904,7 +13904,7 @@
           },
           "update": {
             "type": "string",
-            "enum": ["disable", "notify", "auto"]
+            "enum": ["disable", "notify"]
           },
           "share": {
             "type": "string",

packages/www/src/docs/content/build/plugins/cli.mdx

@@ -236,10 +236,7 @@ function Status() {
 Register a fenced-code renderer by language; the returned function unregisters it.
 
 ```ts
-const unregister = context.markdown.registerCodeBlockRenderer(
-  "acme",
-  (_token, render) => render.defaultRender(),
-)
+const unregister = context.markdown.registerCodeBlockRenderer("acme", (_token, render) => render.defaultRender())
 return unregister
 ```
 
@@ -340,7 +337,14 @@ Custom JSX dialogs can set their size and close themselves.
 
 ```tsx
 context.ui.dialog.set({ size: "large", centered: true })
-context.ui.dialog.show(() => <box><text>Acme</text></box>, () => console.log("closed"))
+context.ui.dialog.show(
+  () => (
+    <box>
+      <text>Acme</text>
+    </box>
+  ),
+  () => console.log("closed"),
+)
 context.ui.dialog.clear()
 ```
 
@@ -405,6 +409,77 @@ context.ui.slot({ after: "home.footer", render: () => <text>After footer slot</t
 context.ui.slot({ replace: "home.footer", render: () => <text>New footer</text> })
 ```
 
+### Session panels
+
+Register a named replacement for `session.panel`, then open it from a command. The host owns sizing, focus, and
+full-screen presentation; the plugin owns its contents.
+
+```tsx
+context.ui.slot({
+  name: "review",
+  replace: "session.panel",
+  render: (panel) => <ReviewPanel panel={panel} />,
+})
+
+context.ui.slot({
+  append: "app",
+  render: () => {
+    context.keymap.layer(() => ({
+      mode: "global",
+      commands: [
+        {
+          id: "acme.review",
+          title: "Open review",
+          slash: { name: "review" },
+          run: () => {
+            context.ui.panel.open("review")
+          },
+        },
+      ],
+    }))
+    return null
+  },
+})
+```
+
+- Names are scoped to the plugin. Opening an unknown name or opening outside a session returns `false`.
+- Unlike composed slots, this slot renders only the explicitly selected named contribution.
+- Changing presentation preserves the mounted contribution. Closing it or unregistering its plugin disposes it.
+- Its keyboard layers and input modes are active only while the panel owns input.
+
+The slot receives reactive `sessionID`, `width`, `presentation`, `focused`, and `canSplit` properties, plus `focus`,
+`close`, and `toggleFullscreen` actions. Use `canSplit` to gate the presentation shortcut rather than checking terminal
+width inside the plugin.
+
+```tsx
+import type { PanelInput } from "@opencode-ai/plugin/tui/context"
+import { usePlugin } from "@opencode-ai/plugin/tui"
+
+function ReviewPanel(props: { panel: PanelInput }) {
+  const context = usePlugin()
+  context.keymap.layer(() => ({
+    commands: [
+      {
+        id: "acme.review.fullscreen",
+        bind: "f",
+        enabled: () => props.panel.canSplit,
+        run: props.panel.toggleFullscreen,
+      },
+    ],
+  }))
+  return <text>Reviewing {props.panel.sessionID}</text>
+}
+```
+
+You can request full-screen presentation initially, inspect your active panel, or close it without affecting another
+plugin's panel.
+
+```ts
+context.ui.panel.open("review", { presentation: "fullscreen" })
+const current = context.ui.panel.current()
+context.ui.panel.close()
+```
+
 ## Formatting
 
 Format filesystem paths for display, including home-directory abbreviation.

packages/www/src/docs/content/config.mdx

@@ -129,15 +129,13 @@ agents.
 
 ### Updates
 
-Control updates from the global config. Set `update` to `"disable"` to skip
-updates, `"notify"` to report available updates without installing them, or
-`"auto"` to automatically install compatible non-major updates.
-Major updates are reported but never installed automatically.
+Control update checks from the global config. Set `update` to `"disable"` to
+skip them or `"notify"` to show available updates before installing them.
 Project-level values are ignored.
 
 ```jsonc
 {
-  "update": "auto",
+  "update": "notify",
 }
 ```
 

packages/www/src/docs/content/migrate-v1.mdx

@@ -409,7 +409,8 @@ The V1 provider filters do not have one-to-one native V2 config fields, but thei
 
 - `enabled_providers` becomes an internal deny-by-default provider policy followed by allows for the listed providers.
 - `disabled_providers` becomes internal deny policies for the listed providers.
-- `autoupdate` becomes `update`: `false` maps to `"disable"`, `"notify"` remains `"notify"`, and `true` maps to `"auto"`.
+- `autoupdate` becomes `update`: `false` maps to `"disable"`, while `"notify"` and `true` map to `"notify"`.
+- The previous V2 value `update: "auto"` is treated as `update: "notify"`.
 - `small_model` becomes the `model` selection for the built-in `title` agent. Native V2 configuration should use
   `agents.title.model` instead.