fix(tui): improve subagent picker states

Co-authored-by: Dax Raad <d@ironbay.co>

packages/cli/bunfig.toml

@@ -1 +1,4 @@
 preload = ["@opentui/solid/preload"]
+
+[test]
+preload = ["@opentui/solid/preload"]

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

@@ -2,12 +2,13 @@ import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { Global } from "@opencode-ai/core/global"
 import { run } from "@opencode-ai/tui"
 import { loadBuiltinPlugins } from "@opencode-ai/tui/builtins"
-import { TuiConfig } from "@opencode-ai/tui/config"
 import { Commands } from "../commands"
 import { Runtime } from "../../framework/runtime"
+import { TuiConfig } from "../../tui-config"
 import { Effect, Option } from "effect"
 import { Server } from "../../services/server"
 import { Updater } from "../../services/updater"
+import { UpdatePreflight } from "../../services/update-preflight"
 
 export default Runtime.handler(Commands, (input) =>
   Effect.gen(function* () {
@@ -15,17 +16,25 @@ export default Runtime.handler(Commands, (input) =>
     if (requestedDirectory !== undefined) process.chdir(requestedDirectory)
     const updater = yield* Updater.Service
     yield* updater.check().pipe(Effect.forkScoped)
+    const preflight = UpdatePreflight.make()
     const server = yield* Server.resolve({
       server: Option.getOrUndefined(input.server),
       standalone: input.standalone,
-      onStart: (reason) =>
+      onStart: (reason, existing) => {
+        if (reason === "version-mismatch" && preflight.begin(existing?.version)) return
         process.stderr.write(
           reason === "version-mismatch"
             ? "Restarting background server (version mismatch)...\n"
             : "Starting background server...\n",
-        ),
-    })
-    const config = TuiConfig.resolve({}, { terminalSuspend: false })
+        )
+      },
+    }).pipe(
+      Effect.tapError(() =>
+        Effect.promise(() => preflight.fail("OpenCode update could not start the new background service")),
+      ),
+    )
+    yield* Effect.promise(() => preflight.finish())
+    const config = yield* TuiConfig.load()
     let disposeSlots: (() => void) | undefined
     const runFork = Effect.runForkWith(yield* Effect.context())
     yield* run({

packages/cli/src/mini/footer.prompt.tsx

@@ -778,19 +778,26 @@ export function createPromptState(input: PromptInput): PromptState {
     if (!area || area.isDestroyed) return false
 
     const endOffset = Bun.stringWidth(area.plainText)
-    if (dir === -1 && area.visualCursor.visualRow === 0) {
-      area.cursorOffset = 0
+    if (dir === -1) {
+      if (area.cursorOffset === 0) return false
+      if (area.visualCursor.visualRow === 0) {
+        area.cursorOffset = 0
+        return
+      }
+      area.moveCursorUp()
+      return
     }
 
     const end =
       typeof area.height === "number" && Number.isFinite(area.height) && area.height > 0
         ? area.height - 1
         : Math.max(0, (area.virtualLineCount ?? 1) - 1)
-    if (dir === 1 && area.visualCursor.visualRow === end) {
+    if (area.cursorOffset === endOffset) return false
+    if (area.visualCursor.visualRow === end) {
       area.cursorOffset = endOffset
+      return
     }
-
-    return false
+    area.moveCursorDown()
   }
 
   const requestExit = () => {
@@ -1037,6 +1044,7 @@ export function createPromptState(input: PromptInput): PromptState {
   }))
 
   useBindings(() => ({
+    priority: 1,
     mode: OPENCODE_BASE_MODE,
     enabled: input.prompt() && !visible(),
     commands: [

packages/cli/src/mini/runtime.boot.ts

@@ -6,7 +6,7 @@
 // history ring. All are async because they read config or hit the SDK, but
 // none block each other.
 import { Context, Effect, Layer } from "effect"
-import { resolve } from "@opencode-ai/tui/config"
+import { resolve } from "@opencode-ai/tui/config/v1"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { makeGlobalNode } from "@opencode-ai/core/effect/app-node"
 import { makeRuntime } from "@opencode-ai/core/effect/runtime"

packages/cli/src/mini/types.ts

@@ -13,7 +13,7 @@
 //         → OpenTUI split-footer renderer writes to terminal
 import type { OpenCodeClient, ReferenceListOutput } from "@opencode-ai/client/promise"
 import type { FilePart, PermissionRequest, QuestionRequest, ToolPart } from "@opencode-ai/sdk/v2"
-import type { TuiConfig } from "@opencode-ai/tui/config"
+import type { TuiConfig } from "@opencode-ai/tui/config/v1"
 
 export type RunFilePart = {
   type: "file"

packages/cli/src/services/update-preflight.tsx

@@ -0,0 +1,440 @@
+/** @jsxImportSource @opentui/solid */
+// Split-footer status shown while a freshly launched CLI replaces a
+// version-mismatched background service before the TUI attaches.
+import { createCliRenderer, RGBA, TextAttributes, type CliRenderer } from "@opentui/core"
+import { render, useTerminalDimensions } from "@opentui/solid"
+import { InstallationVersion } from "@opencode-ai/core/installation/version"
+import { registerOpencodeSpinner } from "@opencode-ai/tui/component/register-spinner"
+import { SPINNER_FRAMES } from "@opencode-ai/tui/component/spinner"
+import { go } from "@opencode-ai/tui/logo"
+import {
+  batch,
+  createEffect,
+  createMemo,
+  createSignal,
+  For,
+  Index,
+  on,
+  onCleanup,
+  onMount,
+  Show,
+  untrack,
+} from "solid-js"
+
+const stages = ["Keeping your session safe", "Starting the new background service", "Connecting to OpenCode"] as const
+const stageFloor = 480
+const transitionDuration = 420
+const completionHold = 650
+
+export type Handle = {
+  readonly begin: (from?: string) => boolean
+  readonly finish: () => Promise<void>
+  readonly fail: (message: string) => Promise<void>
+}
+
+export const make = (): Handle => {
+  let session: Promise<Session | undefined> | undefined
+  return {
+    begin: (from) => {
+      if (!process.stdout.isTTY || !process.stdin.isTTY) return false
+      session ??= open(from).catch(() => {
+        process.stderr.write("Restarting background server (version mismatch)...\n")
+        return undefined
+      })
+      return true
+    },
+    finish: async () => {
+      const active = await session
+      await active?.finish()
+    },
+    fail: async (message) => {
+      const active = await session
+      await active?.fail(message)
+    },
+  }
+}
+
+type Session = {
+  readonly finish: () => Promise<void>
+  readonly fail: (message: string) => Promise<void>
+}
+
+async function open(from?: string): Promise<Session> {
+  registerOpencodeSpinner()
+  const [active, setActive] = createSignal(0)
+  const [outcome, setOutcome] = createSignal<"running" | "success" | "failure">("running")
+  const [failure, setFailure] = createSignal("")
+  const [animating, setAnimating] = createSignal(true)
+  let resolveOutcome: (() => void) | undefined
+  const renderer = await createCliRenderer({
+    stdin: process.stdin,
+    useMouse: false,
+    autoFocus: false,
+    openConsoleOnError: false,
+    exitOnCtrlC: false,
+    exitSignals: [],
+    screenMode: "split-footer",
+    footerHeight: 4,
+    targetFps: 60,
+    externalOutputMode: "capture-stdout",
+    consoleMode: "disabled",
+    clearOnShutdown: false,
+  })
+  await render(
+    () => (
+      <UpdateFooter
+        from={from}
+        active={active}
+        outcome={outcome}
+        failure={failure}
+        animating={animating}
+        renderer={renderer}
+        onOutcomeSettled={() => resolveOutcome?.()}
+      />
+    ),
+    renderer,
+  ).catch((error) => {
+    if (!renderer.isDestroyed) renderer.destroy()
+    throw error
+  })
+  let shownAt = performance.now()
+  const advance = async (stage: number) => {
+    const remaining = stageFloor - (performance.now() - shownAt)
+    if (remaining > 0) await Bun.sleep(remaining)
+    if (outcome() !== "running") return
+    setActive(stage)
+    shownAt = performance.now()
+  }
+  // Service.start currently exposes only its start boundary, so this first
+  // transition is time-based. Finer lifecycle callbacks remain follow-up work.
+  const auto = advance(1)
+  const transitionTo = async (next: "success" | "failure", hold: number) => {
+    const settled = Promise.withResolvers<void>()
+    resolveOutcome = settled.resolve
+    setOutcome(next)
+    const completed = await Promise.race([
+      settled.promise.then(() => true),
+      Bun.sleep(transitionDuration + 500).then(() => false),
+    ])
+    resolveOutcome = undefined
+    setAnimating(false)
+    if (completed) await Bun.sleep(hold)
+  }
+  const close = async () => {
+    setAnimating(false)
+    if (renderer.isDestroyed) return
+    renderer.pause()
+    await Promise.race([renderer.idle(), Bun.sleep(500)])
+    renderer.destroy()
+  }
+  let settled: Promise<void> | undefined
+  const settle = (task: () => Promise<void>) => (settled ??= task())
+  return {
+    finish: () =>
+      settle(async () => {
+        await auto
+        await advance(2)
+        await Bun.sleep(stageFloor)
+        await transitionTo("success", completionHold)
+        await close()
+      }),
+    fail: (message) =>
+      settle(async () => {
+        setFailure(message)
+        await transitionTo("failure", 250)
+        await close()
+      }),
+  }
+}
+
+const colors = {
+  accent: RGBA.fromHex("#a6b8ff"),
+  accentBright: RGBA.fromHex("#eef1ff"),
+  accentDim: RGBA.fromHex("#596998"),
+  error: RGBA.fromHex("#ff8192"),
+  muted: RGBA.fromHex("#808080"),
+  success: RGBA.fromHex("#8bd5a5"),
+  text: RGBA.fromHex("#eeeeee"),
+}
+
+const monogram = go.right.slice(1)
+const sweepBlend = 8
+const textDim = RGBA.fromHex("#4c4c4c")
+const rampSteps = 32
+
+const ramp = (from: RGBA, to: RGBA) =>
+  Array.from({ length: rampSteps + 1 }, (_, step) => {
+    const amount = step / rampSteps
+    return RGBA.fromValues(
+      from.r + (to.r - from.r) * amount,
+      from.g + (to.g - from.g) * amount,
+      from.b + (to.b - from.b) * amount,
+    )
+  })
+const railRamp = ramp(colors.accentDim, colors.accentBright)
+const monogramRamp = ramp(colors.muted, colors.accent)
+const rampCache = new Map<RGBA, ReadonlyArray<RGBA>>()
+const rampFor = (color: RGBA) => {
+  const cached = rampCache.get(color)
+  if (cached) return cached
+  const result = ramp(textDim, color)
+  rampCache.set(color, result)
+  return result
+}
+const shade = (palette: ReadonlyArray<RGBA>, brightness: number) =>
+  palette[Math.round(Math.max(0, Math.min(1, brightness)) * rampSteps)]
+
+type Cell = { readonly char: string; readonly color: RGBA; readonly bold?: boolean }
+const styled = (text: string, color: RGBA, bold?: boolean): Cell[] =>
+  Array.from(text).map((char) => ({ char, color, bold }))
+const phrase = (...segments: ReadonlyArray<readonly [string, RGBA, boolean?]>): Cell[] =>
+  segments.flatMap((segment, index) => [
+    ...(index > 0 ? styled(" ", colors.muted) : []),
+    ...styled(segment[0], segment[1], segment[2]),
+  ])
+
+function Monogram(props: { ink: () => RGBA }) {
+  const shadow = createMemo(() => {
+    const ink = props.ink()
+    return RGBA.fromValues(ink.r * 0.25, ink.g * 0.25, ink.b * 0.25)
+  })
+  return (
+    <box flexDirection="column">
+      <For each={monogram}>
+        {(line) => (
+          <box flexDirection="row">
+            <For each={Array.from(line)}>
+              {(char) =>
+                char === "_" ? (
+                  <text bg={shadow()} selectable={false}>
+                    {" "}
+                  </text>
+                ) : (
+                  <text fg={props.ink()} selectable={false}>
+                    {char}
+                  </text>
+                )
+              }
+            </For>
+          </box>
+        )}
+      </For>
+    </box>
+  )
+}
+
+type CellTransition = { from: Cell[]; to: Cell[]; done?: () => void }
+
+function createTransition(render: (transition: CellTransition, progress: number) => Cell[]) {
+  const [state, setState] = createSignal<{ from: Cell[]; to: Cell[]; done?: () => void } | undefined>()
+  const [progress, setProgress] = createSignal(0)
+  let elapsed = 0
+  const cells = createMemo(() => {
+    const transition = state()
+    if (!transition) return undefined
+    return render(transition, progress())
+  })
+  return {
+    start(from: Cell[], to: Cell[], done?: () => void) {
+      elapsed = 0
+      setProgress(0)
+      setState({ from, to, done })
+    },
+    tick(deltaTime: number) {
+      const transition = state()
+      if (!transition) return
+      elapsed = Math.min(transitionDuration, elapsed + deltaTime)
+      setProgress(elapsed / transitionDuration)
+      if (elapsed < transitionDuration) return
+      setState(undefined)
+      transition.done?.()
+    },
+    cells,
+    progress,
+  }
+}
+
+const createSweep = () =>
+  createTransition((transition, progress) => {
+    const length = Math.max(transition.from.length, transition.to.length)
+    const front = smoothstep(progress) * (length + 2 * sweepBlend) - sweepBlend
+    return Array.from({ length }, (_, index) => {
+      const passed = Math.max(0, Math.min(1, (front - index) / sweepBlend))
+      const brightness = smoothstep(Math.abs(passed * 2 - 1))
+      const cell = (passed >= 0.5 ? transition.to[index] : transition.from[index]) ?? {
+        char: " ",
+        color: colors.text,
+      }
+      return { ...cell, color: shade(rampFor(cell.color), brightness) }
+    })
+  })
+
+const createFade = () =>
+  createTransition((transition, progress) => {
+    const entering = progress >= 0.5
+    const brightness = smoothstep(entering ? progress * 2 - 1 : 1 - progress * 2)
+    return (entering ? transition.to : transition.from).map((cell) => ({
+      ...cell,
+      color: shade(rampFor(cell.color), brightness),
+    }))
+  })
+
+const smoothstep = (value: number) => value * value * (3 - 2 * value)
+const frameDone = Promise.resolve()
+
+function UpdateFooter(props: {
+  from?: string
+  active: () => number
+  outcome: () => "running" | "success" | "failure"
+  failure: () => string
+  animating: () => boolean
+  renderer: CliRenderer
+  onOutcomeSettled: () => void
+}) {
+  const term = useTerminalDimensions()
+  const [position, setPosition] = createSignal(0)
+  const [pulse, setPulse] = createSignal(0)
+  const headerFade = createFade()
+  const statusSweep = createSweep()
+  const runningHeader = () =>
+    phrase(
+      ["OpenCode", colors.muted, true],
+      ["is updating", colors.muted],
+      ...(props.from
+        ? ([
+            ["from", colors.muted],
+            [props.from, colors.accentDim],
+          ] as const)
+        : []),
+      ["to", colors.muted],
+      [InstallationVersion, colors.accent],
+    )
+  const completedHeader = phrase(
+    ["OpenCode", colors.muted, true],
+    ["updated to", colors.muted],
+    [InstallationVersion, colors.accent],
+  )
+  const pausedHeader = phrase(["OpenCode", colors.muted, true], ["update paused", colors.muted])
+  const outcomeStatus = () =>
+    props.outcome() === "success"
+      ? [...styled("✓", colors.success), ...styled(" Ready", colors.text)]
+      : [...styled("!", colors.error), ...styled(" " + props.failure(), colors.text)]
+  let previousStage: string = stages[0]
+  createEffect(
+    on(props.active, (index) => {
+      if (props.outcome() !== "running") return
+      const next = stages[index]
+      if (next === previousStage) return
+      statusSweep.start(styled(previousStage, colors.text), styled(next, colors.text))
+      previousStage = next
+    }),
+  )
+  createEffect(
+    on(
+      props.outcome,
+      (outcome) => {
+        if (outcome === "running") return
+        const visibleStatus = untrack(statusSweep.cells) ?? styled(previousStage, colors.text)
+        headerFade.start(runningHeader(), outcome === "success" ? completedHeader : pausedHeader)
+        statusSweep.start([...styled("  ", colors.text), ...visibleStatus], outcomeStatus(), props.onOutcomeSettled)
+      },
+      { defer: true },
+    ),
+  )
+  const header = createMemo(
+    () =>
+      headerFade.cells() ??
+      (props.outcome() === "success"
+        ? completedHeader
+        : props.outcome() === "failure"
+          ? pausedHeader
+          : runningHeader()),
+  )
+  const monogramInk = createMemo(() =>
+    props.outcome() === "success" ? shade(monogramRamp, smoothstep(headerFade.progress())) : colors.muted,
+  )
+  const rail = createMemo(() => {
+    const width = Math.max(0, Math.min(30, term().width - 39))
+    if (width === 0) return []
+    if (props.outcome() === "success") return Array.from({ length: width }, () => ({ char: "━", color: colors.accent }))
+    const filled = Math.round(position() * width)
+    const glowRadius = 6
+    const span = Math.max(1, filled + glowRadius * 2)
+    const center = pulse() * span - glowRadius
+    return Array.from({ length: width }, (_, index) => {
+      if (index >= filled) return { char: "·", color: colors.muted }
+      const glow = Math.max(0, 1 - Math.abs(index - center) / glowRadius) ** 2
+      return { char: "━", color: shade(railRamp, glow) }
+    })
+  })
+
+  onMount(() => {
+    let value = 0
+    let velocity = 0
+    let phase = 0
+    const frame = (deltaTime: number) => {
+      if (!props.animating()) return frameDone
+      const elapsed = Math.min(0.032, deltaTime / 1_000)
+      const stiffness = 110
+      const damping = 2 * Math.sqrt(stiffness)
+      const target = props.outcome() === "success" ? 1 : (props.active() + 1) / stages.length
+      velocity += (stiffness * (target - value) - damping * velocity) * elapsed
+      value += velocity * elapsed
+      phase = (phase + deltaTime / 900) % 1
+      batch(() => {
+        setPosition(Math.max(0, Math.min(1, value)))
+        setPulse(phase)
+      })
+      headerFade.tick(deltaTime)
+      statusSweep.tick(deltaTime)
+      return frameDone
+    }
+    props.renderer.setFrameCallback(frame)
+    onCleanup(() => props.renderer.removeFrameCallback(frame))
+  })
+
+  return (
+    <box width="100%" height={4} flexDirection="row" gap={1} live={props.animating()}>
+      <Monogram ink={monogramInk} />
+      <box flexDirection="column" flexGrow={1} overflow="hidden">
+        <CellLine cells={header()} />
+        <Show
+          when={props.outcome() === "running"}
+          fallback={<CellLine cells={statusSweep.cells() ?? outcomeStatus()} />}
+        >
+          <box flexDirection="row" gap={1}>
+            <spinner frames={SPINNER_FRAMES} interval={80} color={colors.accent} />
+            <CellLine cells={statusSweep.cells() ?? styled(stages[props.active()], colors.text)} />
+          </box>
+        </Show>
+        <box flexDirection="row" gap={1}>
+          <CellLine cells={rail()} />
+          <text fg={colors.muted}>
+            {props.outcome() === "success" ? stages.length : props.active() + 1}/{stages.length}
+          </text>
+        </box>
+      </box>
+    </box>
+  )
+}
+
+function CellLine(props: { cells: ReadonlyArray<Cell> }) {
+  return (
+    <text truncate>
+      <Index each={props.cells}>
+        {(cell) => (
+          <span
+            style={{
+              fg: cell().color,
+              attributes: cell().bold ? TextAttributes.BOLD : TextAttributes.NONE,
+            }}
+          >
+            {cell().char}
+          </span>
+        )}
+      </Index>
+    </text>
+  )
+}
+
+export * as UpdatePreflight from "./update-preflight"

packages/cli/src/tui-config.ts

@@ -0,0 +1,24 @@
+export * as TuiConfig from "./tui-config"
+
+import { Global } from "@opencode-ai/core/global"
+import { TuiConfig } from "@opencode-ai/tui/config/v1"
+import { Effect, FileSystem, Option, Schema } from "effect"
+import { parse, type ParseError } from "jsonc-parser"
+import path from "path"
+
+export const load = Effect.fn("TuiConfig.load")(function* () {
+  const fs = yield* FileSystem.FileSystem
+  const global = yield* Global.Service
+  const filepath = path.join(global.config, "tui.json")
+  const text = yield* fs.readFileString(filepath).pipe(Effect.catch(() => Effect.succeed(undefined)))
+  if (!text) return TuiConfig.resolve({}, { terminalSuspend: process.platform !== "win32" })
+
+  const errors: ParseError[] = []
+  const input: unknown = parse(text, errors, { allowTrailingComma: true })
+  if (errors.length) return TuiConfig.resolve({}, { terminalSuspend: process.platform !== "win32" })
+
+  return TuiConfig.resolve(
+    Option.getOrElse(Schema.decodeUnknownOption(TuiConfig.Info)(input), () => ({})),
+    { terminalSuspend: process.platform !== "win32" },
+  )
+})

packages/cli/test/footer-keymap.test.tsx

@@ -0,0 +1,106 @@
+/** @jsxImportSource @opentui/solid */
+import { createDefaultOpenTuiKeymap } from "@opentui/keymap/opentui"
+import { testRender, useRenderer } from "@opentui/solid"
+import { OpencodeKeymapProvider, registerOpencodeKeymap } from "@opencode-ai/tui/keymap"
+import { resolve } from "@opencode-ai/tui/config/v1"
+import { expect, test } from "bun:test"
+import { createComponent, createSignal } from "solid-js"
+import { RunFooterView } from "../src/mini/footer.view"
+import { RUN_THEME_FALLBACK } from "../src/mini/theme"
+import type { FooterState, FooterSubagentState, FooterView } from "../src/mini/types"
+
+test("down opens subagents from an empty prompt", async () => {
+  const [state] = createSignal<FooterState>({
+    phase: "idle",
+    status: "",
+    queue: 0,
+    model: "gpt-5",
+    duration: "",
+    usage: "",
+    first: false,
+    interrupt: 0,
+    exit: 0,
+  })
+  const [view] = createSignal<FooterView>({ type: "prompt" })
+  const [subagents] = createSignal<FooterSubagentState>({
+    tabs: [
+      {
+        sessionID: "subagent-1",
+        partID: "part-1",
+        callID: "call-1",
+        label: "Explore",
+        description: "Inspect the keymap",
+        status: "running",
+        lastUpdatedAt: 1,
+      },
+    ],
+    details: {},
+    permissions: [],
+    questions: [],
+  })
+  const config = resolve(
+    { keybinds: { editor_open: "none", session_queued_prompts: "none" } },
+    { terminalSuspend: true },
+  )
+  let offKeymap: (() => void) | undefined
+
+  function Harness() {
+    const renderer = useRenderer()
+    const keymap = createDefaultOpenTuiKeymap(renderer)
+    offKeymap = registerOpencodeKeymap(keymap, renderer, config)
+
+    return createComponent(OpencodeKeymapProvider, {
+      keymap,
+      get children() {
+        return (
+          <RunFooterView
+            directory="/tmp"
+            findFiles={async () => []}
+            agents={() => []}
+            references={() => []}
+            commands={() => []}
+            providers={() => undefined}
+            currentModel={() => undefined}
+            variants={() => []}
+            currentVariant={() => undefined}
+            state={state}
+            view={view}
+            subagent={subagents}
+            theme={() => RUN_THEME_FALLBACK}
+            tuiConfig={config}
+            agent="opencode"
+            onSubmit={() => true}
+            onPermissionReply={() => {}}
+            onQuestionReply={() => {}}
+            onQuestionReject={() => {}}
+            onCycle={() => {}}
+            onInterrupt={() => false}
+            onEditorOpen={async () => undefined}
+            onInputClear={() => {}}
+            onExit={() => {}}
+            onModelSelect={() => {}}
+            onVariantSelect={() => {}}
+            onRows={() => {}}
+            onLayout={() => {}}
+            onStatus={() => {}}
+            onQueuedRemove={async () => true}
+          />
+        )
+      },
+    })
+  }
+
+  const app = await testRender(() => <Harness />, { width: 100, height: 8, kittyKeyboard: true })
+  try {
+    await app.renderOnce()
+    expect(app.renderer.currentFocusedEditor?.plainText).toBe("")
+    app.mockInput.pressArrow("down")
+    await app.renderOnce()
+    expect(app.captureCharFrame()).toContain("Select subagent")
+  } finally {
+    app.renderer.currentFocusedRenderable?.blur()
+    app.renderer.currentFocusedEditor?.blur()
+    offKeymap?.()
+    app.renderer.destroy()
+  }
+})

packages/cli/test/tui-config.test.ts

@@ -0,0 +1,25 @@
+import { NodeFileSystem } from "@effect/platform-node"
+import { Global } from "@opencode-ai/core/global"
+import { Effect } from "effect"
+import { expect, test } from "bun:test"
+import path from "path"
+import { TuiConfig } from "../src/tui-config"
+
+test("loads the global tui config", async () => {
+  const directory = await Bun.$`mktemp -d`.text().then((value) => value.trim())
+  await Bun.write(path.join(directory, "tui.json"), JSON.stringify({ keybinds: { leader: "ctrl+o" } }))
+
+  try {
+    const config = await Effect.runPromise(
+      TuiConfig.load().pipe(
+        Effect.provide(Global.layerWith({ config: directory })),
+        Effect.provide(NodeFileSystem.layer),
+      ),
+    )
+
+    expect(config.keybinds.get("leader")?.[0]?.key).toBe("ctrl+o")
+    expect(config.keybinds.get("session.new")?.[0]?.key).toBe("<leader>n")
+  } finally {
+    await Bun.$`rm -rf ${directory}`
+  }
+})

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

@@ -476,18 +476,16 @@ export interface IntegrationApi<E = never> {
 type Endpoint11_0Request = Parameters<RawClient["server.mcp"]["mcp.list"]>[0]
 export type Endpoint11_0Input = { readonly location?: Endpoint11_0Request["query"]["location"] }
 export type Endpoint11_0Output = EffectValue<ReturnType<RawClient["server.mcp"]["mcp.list"]>>
-export type ServerMcpListOperation<E = never> = (input?: Endpoint11_0Input) => Effect.Effect<Endpoint11_0Output, E>
+export type McpListOperation<E = never> = (input?: Endpoint11_0Input) => Effect.Effect<Endpoint11_0Output, E>
 
 type Endpoint11_1Request = Parameters<RawClient["server.mcp"]["mcp.resource.catalog"]>[0]
 export type Endpoint11_1Input = { readonly location?: Endpoint11_1Request["query"]["location"] }
 export type Endpoint11_1Output = EffectValue<ReturnType<RawClient["server.mcp"]["mcp.resource.catalog"]>>
-export type ServerMcpResourceCatalogOperation<E = never> = (
-  input?: Endpoint11_1Input,
-) => Effect.Effect<Endpoint11_1Output, E>
+export type McpResourceCatalogOperation<E = never> = (input?: Endpoint11_1Input) => Effect.Effect<Endpoint11_1Output, E>
 
-export interface ServerMcpApi<E = never> {
-  readonly list: ServerMcpListOperation<E>
-  readonly resource: { readonly catalog: ServerMcpResourceCatalogOperation<E> }
+export interface McpApi<E = never> {
+  readonly list: McpListOperation<E>
+  readonly resource: { readonly catalog: McpResourceCatalogOperation<E> }
 }
 
 type Endpoint12_0Request = Parameters<RawClient["server.credential"]["credential.update"]>[0]
@@ -955,7 +953,7 @@ export interface AppApi<E = never> {
   readonly generate: GenerateApi<E>
   readonly provider: ProviderApi<E>
   readonly integration: IntegrationApi<E>
-  readonly "server.mcp": ServerMcpApi<E>
+  readonly mcp: McpApi<E>
   readonly credential: CredentialApi<E>
   readonly project: ProjectApi<E>
   readonly form: FormApi<E>

packages/client/src/effect/generated/client.ts

@@ -1134,7 +1134,7 @@ const adaptClient = (raw: RawClient) => ({
   generate: adaptGroup8(raw["server.generate"]),
   provider: adaptGroup9(raw["server.provider"]),
   integration: adaptGroup10(raw["server.integration"]),
-  "server.mcp": adaptGroup11(raw["server.mcp"]),
+  mcp: adaptGroup11(raw["server.mcp"]),
   credential: adaptGroup12(raw["server.credential"]),
   project: adaptGroup13(raw["server.project"]),
   form: adaptGroup14(raw["server.form"]),

packages/client/src/effect/service.ts

@@ -35,7 +35,10 @@ export type Options = {
 export type StartReason = "missing" | "version-mismatch"
 
 export type StartOptions = Options & {
-  readonly onStart?: (reason: StartReason) => void
+  // Called once when start() decides it must spawn: either no service was
+  // found, or a healthy service with a different version is being replaced.
+  // `existing` carries the registration of the service being replaced.
+  readonly onStart?: (reason: StartReason, existing?: Info) => void
 }
 
 // Read-only lookup: registration file plus health check and version gate.
@@ -57,7 +60,9 @@ export const start = Effect.fn("service.start")(function* (options: StartOptions
   const compatible = yield* discover(options)
   if (compatible !== undefined) return compatible
   const mismatched = yield* find(options)
-  yield* Effect.sync(() => options.onStart?.(mismatched === undefined ? "missing" : "version-mismatch"))
+  yield* Effect.sync(() =>
+    options.onStart?.(mismatched === undefined ? "missing" : "version-mismatch", mismatched?.info),
+  )
   if (mismatched !== undefined) yield* kill(mismatched.info, options).pipe(Effect.ignore)
 
   const [command, ...args] = options.command ?? ["opencode", "serve", "--service"]

packages/client/src/promise/generated/client-error.ts

@@ -1,4 +1,9 @@
-export type ClientErrorReason = "Transport" | "UnexpectedStatus" | "UnsupportedContentType" | "MalformedResponse"
+export type ClientErrorReason =
+  | "Transport"
+  | "UnexpectedStatus"
+  | "UnsupportedContentType"
+  | "MalformedResponse"
+  | "SseEventTooLarge"
 
 export class ClientError extends Error {
   override readonly name = "ClientError"

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

@@ -90,10 +90,10 @@ import type {
   IntegrationAttemptCompleteOutput,
   IntegrationAttemptCancelInput,
   IntegrationAttemptCancelOutput,
-  ServerMcpListInput,
-  ServerMcpListOutput,
-  ServerMcpResourceCatalogInput,
-  ServerMcpResourceCatalogOutput,
+  McpListInput,
+  McpListOutput,
+  McpResourceCatalogInput,
+  McpResourceCatalogOutput,
   CredentialUpdateInput,
   CredentialUpdateOutput,
   CredentialRemoveInput,
@@ -213,6 +213,8 @@ interface RequestDescriptor {
   readonly binary?: true
 }
 
+const maxSseEventBytes = 16 * 1024 * 1024
+
 export function make(options: ClientOptions) {
   const fetch = options.fetch ?? globalThis.fetch
 
@@ -289,7 +291,7 @@ export function make(options: ClientOptions) {
             throw new ClientError("Transport", { cause })
           }
           buffer += decoder.decode(next.value, { stream: !next.done })
-          if (buffer.length > 1_048_576) throw new ClientError("MalformedResponse")
+          if (buffer.length > maxSseEventBytes) throw new ClientError("SseEventTooLarge")
           const trailingCarriageReturn = !next.done && buffer.endsWith("\r")
           if (trailingCarriageReturn) buffer = buffer.slice(0, -1)
           buffer = buffer.replaceAll("\r\n", "\n").replaceAll("\r", "\n")
@@ -939,9 +941,9 @@ export function make(options: ClientOptions) {
           ),
       },
     },
-    "server.mcp": {
-      list: (input?: ServerMcpListInput, requestOptions?: RequestOptions) =>
-        request<ServerMcpListOutput>(
+    mcp: {
+      list: (input?: McpListInput, requestOptions?: RequestOptions) =>
+        request<McpListOutput>(
           {
             method: "GET",
             path: `/api/mcp`,
@@ -953,8 +955,8 @@ export function make(options: ClientOptions) {
           requestOptions,
         ),
       resource: {
-        catalog: (input?: ServerMcpResourceCatalogInput, requestOptions?: RequestOptions) =>
-          request<ServerMcpResourceCatalogOutput>(
+        catalog: (input?: McpResourceCatalogInput, requestOptions?: RequestOptions) =>
+          request<McpResourceCatalogOutput>(
             {
               method: "GET",
               path: `/api/mcp/resource`,

packages/client/test/promise.test.ts

@@ -284,6 +284,43 @@ test("event.subscribe terminates on malformed Promise SSE data", async () => {
   })
 })
 
+test("event.subscribe accepts a fragmented SSE event below the size limit", async () => {
+  const event = { id: "evt_large", type: "test.large", data: { output: "x".repeat(12 * 1024 * 1024) } }
+  const encoded = new TextEncoder().encode(`data: ${JSON.stringify(event)}\n\n`)
+  const client = OpenCode.make({
+    baseUrl: "http://localhost:3000",
+    fetch: async () =>
+      new Response(
+        new ReadableStream({
+          start(controller) {
+            for (let offset = 0; offset < encoded.length; offset += 64 * 1024) {
+              controller.enqueue(encoded.slice(offset, offset + 64 * 1024))
+            }
+            controller.close()
+          },
+        }),
+        { headers: { "content-type": "text/event-stream" } },
+      ),
+  })
+
+  await expect(client.event.subscribe()[Symbol.asyncIterator]().next()).resolves.toEqual({ done: false, value: event })
+})
+
+test("event.subscribe rejects an SSE event above the size limit", async () => {
+  const client = OpenCode.make({
+    baseUrl: "http://localhost:3000",
+    fetch: async () =>
+      new Response(`data: ${JSON.stringify({ output: "x".repeat(16 * 1024 * 1024) })}`, {
+        headers: { "content-type": "text/event-stream" },
+      }),
+  })
+
+  await expect(client.event.subscribe()[Symbol.asyncIterator]().next()).rejects.toMatchObject({
+    name: "ClientError",
+    reason: "SseEventTooLarge",
+  })
+})
+
 test("session methods use the public HTTP contract", async () => {
   const requests: Array<{ url: string; init?: RequestInit }> = []
   const client = OpenCode.make({

packages/codemode/README.md

@@ -1,37 +1,40 @@
 # @opencode-ai/codemode
 
-Effect-native confined code execution over explicit, schema-described tools.
+This is our take on code mode. Programs are written in a lightweight, JavaScript-like DSL and run in the package's
+own interpreter. They never execute as actual JavaScript, so there is no runtime to escape into. The interpreter
+itself can reach nothing; every effect a program has goes through a tool you explicitly supplied. The tradeoff is a
+bounded language rather than full JavaScript: the [interpreter support checklist](./interpreter-support.md) documents
+exactly what is supported.
 
-CodeMode lets a model write a small JavaScript program that can call only the tools supplied by the host. The program can sequence calls, transform plain data, branch, loop, and run independent calls in parallel without receiving ambient filesystem, process, network, module, or application authority.
+[Cloudflare's post](https://blog.cloudflare.com/code-mode/) introduced the idea. Their implementation executes
+generated code in isolate sandboxes. We took a lighter route: a pure interpreter that runs wherever your application
+runs, no sandbox required.
 
-The package is currently private to this workspace. Its API is designed around one-shot and reusable execution:
+## How it differs from JavaScript
 
-```ts
-// One execution
-yield * CodeMode.execute({ tools, code })
+The deliberate differences:
 
-// A reusable runtime
-const runtime = CodeMode.make({ tools, limits })
-yield * runtime.execute(code)
-```
+- **No ambient authority.** No `fetch`, `process`, filesystem, timers, or host globals - only the allowlisted standard
+  library and the `tools` tree.
+- **No dynamic code.** No `eval`, `Function`, or module loading.
+- **Plain-data boundaries.** Tool arguments and program results are JSON-like data. Dates become ISO strings, RegExp,
+  Map, and Set serialize as `{}`, and promises, functions, and runtime references cannot cross the boundary.
+- **Eager, supervised promises.** Tool calls and async functions start immediately when called. Whatever is still
+  running when the program returns is interrupted - race losers and fire-and-forget calls alike - so a program must
+  await every call whose completion matters. Rejections that settle un-awaited become `warnings` on the result instead
+  of crashing the run.
+- **REPL-style results.** An omitted `return` yields the final top-level expression; `undefined` normalizes to `null`.
 
-## Install
-
-Within this workspace:
-
-```json
-{
-  "dependencies": {
-    "@opencode-ai/codemode": "workspace:*"
-  }
-}
-```
-
-Hosts interact with CodeMode through `effect` (tool `run` implementations, `Effect`-typed results), so they should depend on `effect` themselves.
+Beyond these, the language is a growing subset rather than a divergent one: unsupported syntax returns an
+`UnsupportedSyntax` diagnostic with a source location, and current gaps (for example thenable assimilation, classes,
+generators, and full sparse-array parity) are tracked as unchecked items in the
+[interpreter support checklist](./interpreter-support.md).
 
 ## Quick Start
 
-Define tools with Effect Schema, then place them in the object tree exposed to programs as `tools`:
+The package is workspace-private (`"@opencode-ai/codemode": "workspace:*"`). Hosts interact with it through `effect`
+and should depend on `effect` themselves. Define tools with Effect Schema, then place them in the object tree exposed
+to programs as `tools`:
 
 ```ts
 import { CodeMode, Tool } from "@opencode-ai/codemode"
@@ -60,69 +63,53 @@ const result =
 `)
 ```
 
-`result` is always a `CodeMode.Result`. Program, validation, limit, and tool failures are returned as diagnostics rather than failing the Effect. Host interruption remains interruption.
-
-Successful result values are JSON-safe data. An explicit `return` produces the program result; when it is omitted, the final executable top-level expression is returned as a model-friendly REPL convenience. Otherwise reaching the end produces `null`. Returned `undefined` and nested `undefined` values are normalized to `null` as well.
+`result` is always a `CodeMode.Result`. Program, validation, limit, and tool failures are returned as diagnostics
+rather than failing the Effect; host interruption remains interruption.
 
 ## API
 
 ### `Tool.make`
 
-```ts
-const tool = Tool.make({
-  description,
-  input, // Effect Schema (validating) or JSON Schema (render-only)
-  output, // optional; same choice
-  run,
-})
-```
+`input` and `output` each accept a validating Effect Schema or a render-only JSON Schema document. Effect Schema input
+is decoded before `run` is invoked; an Effect Schema `output` is decoded and copied before the program sees it. JSON
+Schemas only shape the model-visible signature. Without `output` the signature advertises `Promise<unknown>`.
+Descriptions and schemas are model-visible contract; keep authorization in `run`.
 
-`input` and `output` each accept a validating Effect Schema or a render-only JSON Schema document (the natural shape for adapter-provided tools whose schemas arrive as JSON Schema, e.g. MCP definitions). Effect Schema input is decoded before `run` is invoked, and `run` returns the encoded representation of an Effect Schema `output`, which CodeMode decodes and copies before exposing it to the program. JSON Schemas only shape the model-visible signature; values pass through unvalidated (they still cross the plain-data boundary).
+### `CodeMode.execute` and `CodeMode.make`
 
-`output` is optional. Without it the tool's signature advertises `Promise<unknown>` and the host result is exposed as-is.
-
-The description and schemas are part of the model-visible tool contract. Keep descriptions concrete and put authorization in `run` or in the service it calls.
-
-Public tool types are grouped under the same namespace: `Tool.Definition`, `Tool.Options`, `Tool.SchemaType`, and `Tool.JsonSchema`.
-
-### `CodeMode.execute`
-
-Use `CodeMode.execute` for a single execution:
+`CodeMode.execute({ ...options, code })` runs once and is equivalent to `CodeMode.make(options).execute(code)`. A
+runtime from `make` reuses the tool set and policy:
 
 ```ts
-const result =
-  yield *
-  CodeMode.execute({
-    tools: { orders: { lookup: lookupOrder } },
-    code: `return await tools.orders.lookup({ id: "order_42" })`,
-    limits: { maxToolCalls: 10 },
-    onToolCallStart: (call) => Effect.logDebug("CodeMode tool started", call),
-    onToolCallEnd: (call) => Effect.logDebug("CodeMode tool settled", call),
-  })
-```
-
-The Effect environment is inferred from the supplied tools. CodeMode does not erase service requirements introduced by tool implementations.
-
-### `CodeMode.make`
-
-Use `CodeMode.make` when the tool set and execution policy are reused:
-
-```ts
-const runtime = CodeMode.make({
-  tools: { orders: { lookup: lookupOrder } },
-  limits: { timeoutMs: 30_000 },
-})
+const runtime = CodeMode.make({ tools, limits: { timeoutMs: 30_000 } })
 
 runtime.catalog() // structured tool descriptions
 runtime.instructions() // model-facing syntax and tool guide
 runtime.execute(source) // CodeMode.Result
 ```
 
-`CodeMode.Input`, `CodeMode.Result`, `CodeMode.Success`, `CodeMode.Failure`, `CodeMode.Diagnostic`, and `CodeMode.DiagnosticKind` are both Effect schemas and their inferred TypeScript types. Hosts can combine `CodeMode.Input` and `CodeMode.Result` with `runtime.instructions()` and `runtime.execute()` when constructing a framework-specific agent tool.
+The Effect environment is inferred from the supplied tools; service requirements are not erased. Optional
+`onToolCallStart` / `onToolCallEnd` hooks observe admitted calls with decoded input, outcome, and duration; both are
+Effect-returning and must not fail.
 
-All other CodeMode types use the same namespace: `CodeMode.Options`, `CodeMode.ExecuteOptions`, `CodeMode.Runtime`, `CodeMode.ExecutionLimits`, `CodeMode.DiscoveryOptions`, `CodeMode.DataValue`, `CodeMode.ToolDescription`, and the `CodeMode.ToolCall*` observation types.
+### OpenAPI tools
 
-### Results
+`OpenAPI.fromSpec` turns an OpenAPI 3.x document into a tool subtree - one tool per operation, namespaced by dotted
+`operationId`:
+
+```ts
+const api = OpenAPI.fromSpec({ spec, auth: { resolve } })
+const runtime = CodeMode.make({ tools: { opencode: api.tools } })
+```
+
+It is synchronous and returns `{ tools, skipped }`: operations with unsupported encodings, non-JSON bodies, binary
+responses, or streaming land in `skipped` instead of producing broken tools. Auth is resolved host-side and never
+model-visible; generated tools require `HttpClient.HttpClient` in the environment. See the option docstrings in
+`src/openapi/types.ts` for full semantics.
+
+## Outputs
+
+Every execution returns a `CodeMode.Result`:
 
 ```ts
 type Result = Success | Failure
@@ -145,152 +132,11 @@ interface Failure {
 }
 ```
 
-`toolCalls` contains the names of calls admitted by the runtime in call order. It is retained on failure so hosts can audit partial execution without exposing inputs or host failures. A successful execution may also contain `warnings`: runtime-authored, non-fatal diagnostics alongside a valid value - unhandled rejections from promises that failed, un-awaited, before the program returned, or background work interrupted by the timeout after the program returned. Anything still running when the program returns is interrupted - race losers and fire-and-forget calls alike - so a program must await every call whose completion matters. Failure has an `error`; success may have `warnings`; program-authored console output stays in `logs`. Keeping the value on an unhandled rejection is a deliberate divergence from Node's crash-on-unhandled-rejection default: the computed value and the background failure are independently useful to the model, so the result carries both. When warnings are cut by `maxOutputBytes`, a final `Truncated` diagnostic marks the omission in-band, and `truncated` marks any result, warning, or log truncation (see Execution Limits).
+`value` is JSON-safe data. `warnings` are non-fatal diagnostics alongside a valid value (un-awaited rejections,
+timeout cleanup after the return). `logs` holds program console output, `truncated` marks any output-budget cut, and
+`toolCalls` lists admitted calls in order - retained on failure for auditing.
 
-### Tool-call hooks
-
-`onToolCallStart` receives `{ index, name, input }` after input decoding and before tool execution. The input is decoded host-side data and may include values produced by schema transformations; applications should avoid logging sensitive tool arguments indiscriminately.
-
-`onToolCallEnd` receives `{ index, name, input, durationMs, outcome, message? }` when an admitted call settles. `outcome` is `"success"` or `"failure"`; `message` is the model-safe failure message and is present only on failure. Interrupted calls (for example when the execution timeout fires) do not produce an end event. Both hooks are Effect-returning and must not fail.
-
-### OpenAPI tools
-
-`OpenAPI.fromSpec` turns an OpenAPI 3.x document into a tool subtree - one tool per operation. Dotted `operationId` values form namespaces such as `v2.session.get`. Missing IDs receive a flat method/path fallback such as `getUsersById`; names are sanitized and deduplicated. The host places the subtree under a key in its `tools` tree; that key is the model-visible namespace.
-
-```ts
-import { CodeMode, OpenAPI } from "@opencode-ai/codemode"
-import { Effect } from "effect"
-import { FetchHttpClient } from "effect/unstable/http"
-
-const api = OpenAPI.fromSpec({
-  spec: await Bun.file("openapi.json").json(), // parsed document (no YAML)
-  auth: {
-    resolve: ({ name, scopes, operation }) =>
-      name === "BearerAuth" ? Effect.succeed({ type: "bearer", token }) : Effect.succeed(undefined),
-  },
-})
-
-const runtime = CodeMode.make({ tools: { opencode: api.tools } })
-const result = await Effect.runPromise(runtime.execute(code).pipe(Effect.provide(FetchHttpClient.layer)))
-```
-
-`fromSpec` is synchronous and returns `{ tools, skipped }`. The initial adapter supports query `form`/`deepObject`, path/header `simple`, JSON request bodies, JSON responses, and text responses; unsupported parameter encodings, non-JSON request bodies, binary responses, and streaming operations land in `skipped` instead of producing broken tools. Operation and path servers take precedence over document servers unless `baseUrl` explicitly overrides all of them. Tool inputs flatten path, query, header, and closed object-body fields into one model-facing object while retaining their HTTP locations internally. Cross-location name collisions receive a location prefix such as `path_id` and `query_id`; composed, nullable, dictionary, conditionally-required, and non-object JSON bodies remain under `body`. Auth is never model-visible. Responses are limited to 50 MiB, and non-2xx responses become safe tool failures carrying the status and a size-capped body summary. Deferred capabilities are tracked in `src/openapi/TODO.md`.
-
-Supported bearer, basic, header, and query authentication follows OpenAPI `security` semantics and is resolved host-side via `auth.resolve` - credential storage, OAuth flows, and token refresh never enter the compiler. Cookie authentication alternatives are discarded; an operation is skipped when it has no supported alternative. See the option docstrings in `src/openapi/types.ts` for the full semantics. Generated tools require `HttpClient.HttpClient` (from `effect/unstable/http`) in the Effect environment - provide `FetchHttpClient.layer` or a custom/test client layer at execution. The supplied client owns redirect policy; credentialed hosts should reject redirects or strip credentials when the origin changes.
-
-## Discovery
-
-The agent-tool instructions use a budgeted catalog. Every tool namespace is always listed with its tool count regardless of budget, and as many complete, JSDoc-annotated tool signatures (each with a one-line description) as fit an estimated-token budget are inlined. Schema field descriptions and tags are part of each signature's measured cost. Selection is round-robin across namespaces for fairness: in each round (namespaces alphabetical), every namespace still holding un-inlined tools attempts to place its next-cheapest signature against the shared budget, and a namespace whose next signature does not fit drops out while the others keep going - so every namespace gets some representation before any namespace gets everything. The instructions state exactly how comprehensive the list is, both overall (`COMPLETE list` vs `PARTIAL - N of M shown`) and per namespace (`(3 tools)`, `(3 tools, 1 shown)`, `(3 tools, none shown)`).
-
-The catalog-entry budget defaults to 2,000 estimated tokens (characters / 4, the same heuristic OpenCode uses). It applies only to full tool entries shown in the catalog; fixed instructions and namespace summaries are not counted. Override it when constructing a runtime:
-
-```ts
-const runtime = CodeMode.make({
-  tools,
-  discovery: { catalogBudget: 6_000 },
-})
-```
-
-The budget must be a non-negative safe integer.
-
-The runtime search tool is always registered - including when the catalog is fully inlined - so a speculative `tools.$codemode.search` call never fails as an unknown tool. It is only advertised in the instructions when the inlined list is partial:
-
-```ts
-const matches = await tools.$codemode.search({
-  query: "order status",
-  namespace: "orders", // optional: scope to one top-level namespace
-  limit: 10,
-  offset: 0,
-})
-```
-
-`search` performs deterministic, additive field-weighted matching. The query is tokenized (camelCase boundaries split; every non-alphanumeric character is a separator; empties and `*` are dropped), and each term scores every tool: exact path or path-segment match (20), path substring (8), description substring (4), and searchable-text substring (2). Each term also carries naive singular variants (trailing `s`/`es` stripped), and a field check passes when the term or any variant matches - so a plural query term (`issues`) still finds a tool whose text only says `issue`, without changing the weights. The searchable text also includes the input schema's property names and their description strings, so a query naming a parameter finds its tool, and substring matching means partial words match. Scores sum across terms; matches are sorted by score (ties broken alphabetically by path), then sliced from the zero-based `offset` (default 0) to the configured `limit` (default 10). `remaining` counts matches after the current page. `next` is `{ offset }` when another page exists and `null` on the final page; spread it into the original request to preserve its query, namespace, and limit.
-
-```ts
-const request = { query: "order status", namespace: "orders", limit: 10 }
-const page = await tools.$codemode.search(request)
-const nextPage = page.next ? await tools.$codemode.search({ ...request, ...page.next }) : undefined
-```
-
-Each result contains the path, description, and the same generated TypeScript signature used by the inline catalog, so no second lookup is needed. Signatures use the JSDoc-annotated multiline form: each described input/output field carries its schema `description` as a `/** ... */` comment, and constraints TypeScript cannot express ride along as tags (`@deprecated`, `@default`, `@format`, `@minItems`, `@maxItems`).
-
-```ts
-tools.github.list_issues(input: {
-  /** Repository owner */
-  owner: string,
-  /** Cursor from the previous response's pageInfo */
-  after?: string,
-  /**
-   * Results per page
-   * @default 30
-   */
-  perPage?: number,
-}): Promise<unknown>
-```
-
-Result paths are rendered as JavaScript expressions rooted at `tools` (`tools.orders.lookup`, or `tools.context7["resolve-library-id"]` for non-identifier segments), so each `path` is directly usable as the call site. An empty query browses the catalog alphabetically by path; combined with `namespace` (`{ query: "", namespace: "orders" }`) it lists everything in that namespace. A query that names one tool path exactly (canonical path, `tools.`-prefixed path, or rendered JavaScript expression) is treated as a lookup and returns that tool alone.
-
-The instructions are structured markdown, ordered so the workflow sits at the top and the catalog at the bottom: a `## Workflow` section with numbered steps (find a tool via search when the catalog is partial, or pick from the inlined list when it is complete; call the exact path as-is; return only the needed fields), a `## Rules` section holding only guidance the workflow does not already cover (only listed/search-result Code Mode tools and internal runtime tools exist inside `tools`; filter and aggregate collections in code; narrow `Promise<unknown>` results at runtime; run independent calls through `Promise.all`; enumerate `tools` with `Object.keys`/`for...in`; browse a namespace and paginate search results when search is advertised), a short `## Language` section that identifies the runtime as a restricted JavaScript orchestration language and names its major unavailable capabilities, and the budgeted `## Available tools` catalog. Example call forms use explicit `<namespace>.<tool>`/`<field>` placeholders - never a real or fabricated tool name.
-
-A host cannot define its own `$codemode` top-level namespace.
-
-## Supported Programs
-
-CodeMode executes a deliberately bounded JavaScript subset. See the
-[interpreter support checklist](./interpreter-support.md) for the complete, checkable language and standard-library
-matrix, known semantic gaps, and intentional exclusions.
-
-At a high level, it supports:
-
-- Plain data, property access and assignment, destructuring, functions, conditionals, loops, spread, optional chaining,
-  and structured error handling.
-- Allowlisted Array, String, Number, Object, Math, JSON, console, Date, RegExp, Map, Set, URL, and URLSearchParams APIs.
-- Eager supervised tool promises, direct `await`, and the supported `Promise` combinators for concurrent work.
-- Live standard-library values inside the sandbox and predictable JSON-like serialization at tool/result boundaries.
-- Actionable diagnostics for unsupported syntax, invalid data, tool failures, limits, and execution failures.
-
-It does not expose ambient host authority or arbitrary JavaScript execution. Unsupported syntax returns an
-`UnsupportedSyntax` diagnostic with a source location when available.
-
-CodeMode is an orchestration language, not a general JavaScript runtime.
-
-## Execution Limits
-
-The limits are exactly three knobs:
-
-| Limit            |              Default | Bounds                                               |
-| ---------------- | -------------------: | ---------------------------------------------------- |
-| `timeoutMs`      |    none - no timeout | Wall-clock execution time.                           |
-| `maxToolCalls`   |     none - unlimited | Tool calls admitted during the execution.            |
-| `maxOutputBytes` | none - no truncation | Retained result value and logs; warnings separately. |
-
-No limit has a default, on purpose: execution budgets are host policy, not library policy - a host that wants a bound sets one; a host that can interrupt the execution fiber (as OpenCode does on user cancel) may set no timeout, and a host with its own tool-output truncation (as OpenCode has) may leave `maxOutputBytes` unset. A host with neither should set `maxOutputBytes`, or oversized results silently flood model context.
-
-Pass only the overrides you need:
-
-```ts
-const runtime = CodeMode.make({
-  tools,
-  limits: {
-    maxToolCalls: 20,
-    timeoutMs: 60_000,
-  },
-})
-```
-
-Limits are safe integers. `timeoutMs` must be at least `1`; the others may be `0`. Invalid configuration throws a `RangeError` when `CodeMode.make` or `CodeMode.execute` is called. An explicitly `undefined` value is the same as leaving the limit unset.
-
-`maxOutputBytes` is a payload budget, not a strict byte cap on the final rendered tool message. It counts the serialized result value and retained log lines; warning diagnostics are bounded by a separate budget of the same size, so a large value never silences runtime diagnostics. Fixed truncation notices and framing added by a host when it renders the structured result are additional and may make the final message exceed the configured number.
-
-Exceeding a configured `maxOutputBytes` never fails the execution. An oversized result value is replaced by its truncated serialized text plus an explanatory marker, logs are kept within the remaining budget, warnings are kept within their own budget, omitted entries receive a summary marker, and the result carries `truncated: true`.
-
-When configured, the timeout interrupts in-flight tool Effects, including eagerly started calls the program has not awaited (their fibers are supervised by the execution). The interpreter yields cooperatively between steps, so the timeout also interrupts pure busy loops (`while (true) {}`) - no separate work budget exists. Tool implementations remain responsible for making their external operations interruptible or independently bounded: the timeout bounds when interruption begins, not when the result is delivered, which waits for tool interruption cleanup to finish. If the timeout fires after the program has already returned a valid value - while the runtime is interrupting leftover work and waiting for its cleanup - the result stays successful: the computed value is returned with a `TimeoutExceeded` warning instead of being discarded.
-
-Two interpreter internals are fixed constants rather than knobs: at most 8 tool calls run concurrently, and values crossing a data boundary may nest at most 32 levels deep (deeper values fail as `InvalidDataValue`, which reads better than a native stack-overflow error). Neither is part of the public contract.
-
-## Diagnostics
-
-Failures are data:
+Failure `error` and success `warnings` share one diagnostic vocabulary:
 
 | Kind                    | Meaning                                                                                                   |
 | ----------------------- | --------------------------------------------------------------------------------------------------------- |
@@ -306,58 +152,45 @@ Failures are data:
 | `ExecutionFailure`      | The program threw or another execution error occurred.                                                    |
 | `Truncated`             | Warning-only marker: additional warnings were omitted by `maxOutputBytes`.                                |
 
-Unknown host failures, defects, invalid outputs, and copying failures are sanitized. To return a safe operational refusal, fail with `toolError`:
+Unknown host failures, defects, and invalid outputs are sanitized. `toolError("safe message")` is the explicit channel
+for a model-visible refusal; its optional cause never crosses the boundary.
 
-```ts
-import { toolError } from "@opencode-ai/codemode"
+## Discovery
 
-run: ({ id }) => (authorized(id) ? loadOrder(id) : Effect.fail(toolError("Order is unavailable")))
-```
+The generated instructions inline a budgeted catalog (default 2,000 estimated tokens, override with
+`discovery: { catalogBudget }`): every namespace is always listed with its tool count, signatures are selected
+round-robin so every namespace gets representation, and the instructions state whether the list is complete or
+partial. Programs also get a global `search(...)` built-in - always available, advertised when the list is partial:
+synchronous, deterministic field-weighted substring matching that returns directly callable paths with full
+signatures, supports namespace scoping and pagination, and treats an empty query as browsing and an exact path as
+lookup. Search counts as an admitted tool call.
 
-Only the supplied message is model-visible. The optional cause is never returned in `CodeMode.Result`; hosts should perform any required internal logging before crossing this boundary.
+## Execution Limits
 
-## Authority Boundary
+| Limit            |              Default | Bounds                                               |
+| ---------------- | -------------------: | ---------------------------------------------------- |
+| `timeoutMs`      |    none - no timeout | Wall-clock execution time.                           |
+| `maxToolCalls`   |     none - unlimited | Tool calls admitted during the execution.            |
+| `maxOutputBytes` | none - no truncation | Retained result value and logs; warnings separately. |
 
-CodeMode confines programs to the supplied tool tree, but it does not decide what those tools may do.
+No limit has a default, on purpose: execution budgets are host policy. A host without its own truncation or
+interruption should set `maxOutputBytes` and `timeoutMs`. Limits are safe integers; invalid configuration throws a
+`RangeError` at construction. Exceeding `maxOutputBytes` never fails the execution - oversized output is truncated
+with an in-band marker. The timeout interrupts in-flight tool fibers and pure busy loops alike; a value the program
+already returned survives a cleanup timeout as a success with a `TimeoutExceeded` warning. Two internals are fixed
+constants, not knobs: at most 8 concurrent tool calls, and 32 levels of data nesting at boundaries.
 
-The host owns:
+## Boundaries and Non-Goals
 
-- Authentication and authorization.
-- Tool selection and immutable scope.
-- Credentials and network clients.
-- Persistence, idempotency, approval, and durable side effects.
-- Logging and redaction policy.
+The host owns authentication, authorization, tool selection, credentials, persistence, approval, and logging policy.
+CodeMode owns interpretation, schema and plain-data boundaries, resource limits, diagnostics, and discovery. A program
+can only exercise authority already present in the supplied tools - do not expose a broad tool and expect the prompt
+to restrict it.
 
-CodeMode owns:
-
-- Parsing and interpreting the supported subset without `eval`.
-- Schema boundaries around tool calls.
-- Plain-data copying and blocked prototype members.
-- Resource limits, call accounting, and normalized diagnostics.
-- Model-facing tool discovery and instructions.
-
-A program cannot gain authority through prose or generated code. It can only exercise authority already present in the supplied tools. Do not expose a broad tool and expect the prompt to restrict it.
-
-## Laws
-
-The public contract is guided by these equivalences:
-
-- `CodeMode.execute({ ...options, code })` is equivalent to `CodeMode.make(options).execute(code)`.
-- A tool implementation is not invoked unless its input has decoded successfully.
-- A tool result is not visible to the program unless its output has decoded and crossed the plain-data boundary successfully.
-- Unknown host failures do not become model-visible diagnostics; `ToolError` is the explicit safe-message channel.
-- Host interruption remains interruption rather than a `CodeMode.Failure`.
-
-## Non-Goals
-
-- Generic permission prompts or approval workflows.
-- Durable pause/resume, replay, or storage adapters.
-- Exactly-once external side effects.
-- Application authorization or product policy.
-- A filesystem or process sandbox for arbitrary JavaScript.
-- Compatibility with the full JavaScript language or npm ecosystem.
-
-Applications that need approval or durable consequences should model those above CodeMode and expose only the currently authorized tools.
+Non-goals: permission prompts and approval workflows, durable pause/resume or replay, exactly-once side effects,
+application authorization policy, sandboxing arbitrary JavaScript, and compatibility with the full language or npm
+ecosystem. Applications that need approval or durable consequences should model those above CodeMode and expose only
+the currently authorized tools.
 
 ## Testing
 
@@ -367,5 +200,3 @@ From the package directory:
 bun test
 bun run typecheck
 ```
-
-The direct suite covers public projections, discovery, schema boundaries, diagnostic sanitization, resource limits, tool-call observation, and interruption.

packages/codemode/codemode.md

@@ -32,7 +32,7 @@ CodeMode is an orchestration language, not a general JavaScript runtime or an ap
 The generic runtime lives in `packages/codemode` and is host-neutral:
 
 1. The host builds a tree of `Tool.make(...)` definitions and calls `CodeMode.make(...)` or `CodeMode.execute(...)`.
-2. CodeMode generates model instructions, a budgeted inline catalog, and the internal `$codemode.search` tool.
+2. CodeMode generates model instructions, a budgeted inline catalog, and the global `search(...)` built-in.
 3. TypeScript syntax is transpiled away, Acorn parses the resulting JavaScript, and an owned tree-walking interpreter
    executes it without `eval`.
 4. Tool inputs and outputs cross schema and plain-data boundaries before they become visible on either side.
@@ -46,13 +46,14 @@ advertised as `Promise<unknown>`.
 ### Discovery and model workflow
 
 The model sees a token-budgeted catalog. Every namespace remains visible, and complete signatures are selected
-round-robin across namespaces so one large namespace cannot starve the others. `$codemode.search` is always callable
-and is advertised when the inline catalog is partial.
+round-robin across namespaces so one large namespace cannot starve the others. The global `search(...)` built-in is
+always callable - synchronously, counted as an admitted tool call - and is advertised when the inline catalog is
+partial.
 
 The intended workflow is:
 
-1. Pick an exact signature from the inline catalog, or return `$codemode.search(...)` results and use a selected path
-   in the next execution.
+1. Pick an exact signature from the inline catalog, or return `search(...)` results and use a selected path in the
+   next execution.
 2. Call the exact returned path without guessing or normalizing segments.
 3. Narrow `Promise<unknown>` results before reading fields.
 4. Start independent calls together and await them with `Promise.all`.
@@ -64,10 +65,16 @@ path lookup, namespace browsing, deterministic ranking, and pagination.
 ### Tool execution
 
 Every sandbox promise starts eagerly on a run-once fiber owned by the whole CodeMode execution, including tool calls,
-async functions, `Promise.all`, `Promise.allSettled`, `Promise.race`, `Promise.resolve`, and `Promise.reject`. Nested
-functions therefore cannot end the lifetime of work they started. Independent aggregate batches overlap, and rejection
-is observed at the eventual `await`. `Promise.race` uses native non-cancelling settlement semantics: its first result
-wins while losers continue running. At normal completion CodeMode interrupts everything still running - race losers,
+async functions, chained `.then`/`.catch`/`.finally` reactions, `new Promise(executor)` constructions, and the
+`Promise.all`/`allSettled`/`race`/`any`/`resolve`/`reject` statics. Nested functions therefore cannot end the lifetime
+of work they started.
+Independent aggregate batches overlap, and rejection is observed at the eventual `await` or chained rejection handler.
+`Promise.race` and `Promise.any` use native non-cancelling settlement semantics: the deciding member wins while losers
+continue running, and an all-rejected `Promise.any` rejects with an `AggregateError`. `new Promise(...)` hands the
+executor first-class resolve/reject callables that may escape and settle the promise later, exactly once.
+Reaction ordering matches what V8 makes observable - handlers and await continuations are deferred and run in attach
+order, and a combinator settles one reaction turn after its deciding member - without promising exact microtask-count
+parity beyond that. At normal completion CodeMode interrupts everything still running - race losers,
 fail-fast `Promise.all` stragglers, and fire-and-forget calls alike: the program has returned, so no future await can
 exist, and work whose completion matters must be awaited by the program. Waiting for any class of leftover instead
 would let it hold the execution open, or deadlock it when queued work needs tool-call permits the leftovers occupy.

packages/codemode/interpreter-support.md

@@ -22,6 +22,8 @@ ultimate source of truth.
 - [x] JSON-like host boundaries with `undefined` and non-finite numbers normalized to `null`.
 - [x] Live Date, RegExp, Map, Set, URL, and URLSearchParams values inside the sandbox.
 - [x] Tool calls through the host-provided `tools` tree only.
+- [x] The global `search(...)` built-in: synchronous tool discovery that counts as an admitted tool call and is
+      shadowable by program declarations like other globals.
 - [x] Cooperative timeout, tool-call accounting, output bounding, and a maximum of eight concurrent tool calls.
 - [ ] Full JavaScript or TypeScript compatibility. CodeMode is a bounded orchestration language.
 
@@ -92,8 +94,9 @@ ultimate source of truth.
 - [x] Optional property access and optional calls.
 - [x] Function/tool calls and spread arguments.
 - [x] Sequence expressions (the comma operator).
-- [x] `await` for sandbox promises; awaiting a plain value is a no-op.
-- [x] `new` for Error types, Date, RegExp, Map, Set, URL, and URLSearchParams.
+- [x] `await` for sandbox promises; a plain value passes through unchanged, though every `await` still defers its
+      continuation one reaction turn.
+- [x] `new` for Error types, Date, RegExp, Map, Set, URL, URLSearchParams, and Promise.
 - [x] Arithmetic operators: `+`, `-`, `*`, `/`, `%`, and `**`.
 - [x] Equality and ordering: `==`, `!=`, `===`, `!==`, `<`, `<=`, `>`, and `>=`.
 - [x] Bitwise operators: `&`, `|`, `^`, `~`, `<<`, `>>`, and `>>>`.
@@ -102,27 +105,41 @@ ultimate source of truth.
 - [x] Prefix and postfix `++` and `--`.
 - [x] Plain, arithmetic, bitwise, and logical assignment operators.
 - [ ] Unary `void` and `delete`.
-- [ ] Arbitrary constructors and `new Promise(...)`.
+- [ ] Arbitrary constructors.
 
 ## Promises and tools
 
 - [x] Tool calls start eagerly and return supervised, run-once sandbox promises.
 - [x] Direct `await`, repeated awaits, and implicit resolution when a promise is returned from a function/program.
 - [x] `Promise.resolve` and `Promise.reject`.
-- [x] `Promise.all`, `Promise.allSettled`, and `Promise.race` over supported collections containing promises and plain
-      values.
+- [x] `Promise.all`, `Promise.allSettled`, `Promise.race`, and `Promise.any` over supported collections containing
+      promises and plain values.
 - [x] `Promise.all` preserves result order and rejects on the first observed failure without cancelling siblings.
 - [x] `Promise.allSettled` returns plain fulfilled/rejected outcome records.
 - [x] `Promise.race` settles from the first result without cancelling losers at settlement time.
 - [x] Real promise values from `Promise.all`, `Promise.allSettled`, and `Promise.race`; separately constructed
       combinator batches overlap as in normal JavaScript.
+- [x] Promise chaining with `.then`, `.catch`, and `.finally`: handlers run deferred in attach order, returned
+      promises are adopted, handler throws reject the derived promise, `.finally` preserves the original settlement
+      unless its cleanup fails, and direct self-resolution rejects with a `TypeError`.
+- [x] Every `await` (including of plain values and already-settled promises) defers its continuation one reaction
+      turn, so concurrent async functions interleave at await points as in JavaScript.
+- [x] Combinators settle one reaction turn after their deciding member (V8-observable ordering): reactions already
+      attached to members run first, and an aggregate cannot beat a plain value settling in the same turn into a
+      `Promise.race`. Exact microtask-count parity beyond this observable ordering is not a documented guarantee.
 - [x] All still-pending work (race losers, fail-fast `Promise.all` stragglers, and un-awaited calls alike) is
       interrupted when the program returns; rejections that settled un-awaited become `Success.warnings`
-      diagnostics.
+      diagnostics. A combinator abandoned inside its final settlement turn counts as pending and is interrupted
+      without a warning.
 - [x] `try`/`catch` can handle awaited tool and promise failures.
-- [ ] `Promise.any`.
-- [ ] Promise chaining with `.then`, `.catch`, and `.finally`.
-- [ ] Custom promise construction with `new Promise(...)`.
+- [x] `Promise.any`: first fulfillment wins; all-rejected rejects with an `AggregateError` whose `errors` array holds
+      the catch-normalized reasons in input order, and empty input rejects with an empty `AggregateError`.
+- [x] `new Promise((resolve, reject) => ...)`: the executor runs synchronously and receives first-class resolve/reject
+      callables that settle the promise exactly once (they may escape the executor and settle later); an executor
+      throw rejects unless the promise already settled, resolving with a promise adopts it, and resolving with the
+      promise itself rejects with a `TypeError`. Resolver callables work as `.then`/`.catch` handlers and collection
+      callbacks but remain opaque references that cannot cross the data boundary.
+- [ ] Thenable assimilation (objects with a `then` method are plain data, not promises).
 - [ ] Async iterables, host streams, and stream consumption.
 
 ## Objects and properties
@@ -153,7 +170,7 @@ ultimate source of truth.
 - [ ] The mapper and `thisArg` forms of `Array.from`.
 - [ ] `Array.prototype.toSpliced`.
 - [ ] Canonical index handling: a key such as `"01"` must not alias index `1`.
-- [ ] Complete sparse-array parity.
+- [ ] Complete sparse-array parity. Promise combinators do consume holes as `undefined` members, as in JS.
 - [ ] Correct `findLast` return behavior when its predicate mutates the examined element.
 
 ## Strings
@@ -258,6 +275,8 @@ ultimate source of truth.
 
 - [x] `Error`, `TypeError`, `RangeError`, `SyntaxError`, `ReferenceError`, `EvalError`, and `URIError`, callable with
       or without `new`.
+- [x] `AggregateError` with the `(errors, message?)` signature and an own `errors` array, constructed directly or by
+      an all-rejected `Promise.any`.
 - [x] Error `name`/`message`, error inheritance through `instanceof`, and plain-data serialization.
 - [x] `instanceof` for Date, RegExp, Map, Set, URL, URLSearchParams, Array, Object, Promise, and Error types.
 - [x] Catchable interpreter failures and awaited tool failures.

packages/codemode/src/codemode.ts

@@ -1,11 +1,6 @@
 import { Effect, Schema } from "effect"
 import { executeWithLimits } from "./interpreter/runtime.js"
-import {
-  type HostTools,
-  type Services,
-  type ToolDescription,
-  ToolRuntime,
-} from "./tool-runtime.js"
+import { type HostTools, type Services, type ToolDescription, ToolRuntime } from "./tool-runtime.js"
 import type { Definition } from "./tool.js"
 
 /** A tool call admitted during an execution. */
@@ -130,11 +125,7 @@ export type Runtime<R = never> = {
   readonly execute: (code: string) => Effect.Effect<Result, never, R>
 }
 
-const validateLimit = <Value extends number | undefined>(
-  name: keyof ExecutionLimits,
-  value: Value,
-  minimum: number,
-): Value => {
+const validateLimit = (name: keyof ExecutionLimits, value: number | undefined, minimum: number): number | undefined => {
   if (value !== undefined && (!Number.isSafeInteger(value) || value < minimum)) {
     throw new RangeError(`${name} must be a safe integer greater than or equal to ${minimum}.`)
   }
@@ -152,7 +143,6 @@ export const execute = <const Tools extends Record<string, unknown>>(
   options: ExecuteOptions<Tools>,
 ): Effect.Effect<Result, never, Services<Tools>> => {
   const tools = (options.tools ?? {}) as HostTools<Services<Tools>>
-  ToolRuntime.assertValidTools(tools)
   return executeWithLimits(options, resolveExecutionLimits(options.limits), ToolRuntime.searchIndex(tools))
 }
 
@@ -161,7 +151,6 @@ export const make = <const Tools extends Record<string, unknown> = {}>(
   options: Options<Tools> = {} as Options<Tools>,
 ): Runtime<Services<Tools>> => {
   const tools = (options.tools ?? {}) as HostTools<Services<Tools>>
-  ToolRuntime.assertValidTools(tools)
   const limits = resolveExecutionLimits(options.limits)
   const prepared = ToolRuntime.prepare(tools, options.discovery?.catalogBudget)
 

packages/codemode/src/interpreter/model.ts

@@ -1,5 +1,5 @@
 import type { SafeObject } from "../tool-runtime.js"
-import type { SandboxURL } from "../values.js"
+import type { SandboxPromise, SandboxURL } from "../values.js"
 
 export type SourcePosition = {
   line: number
@@ -61,12 +61,27 @@ export class ComputedValue {
 
 export class PromiseNamespace {}
 
-export type PromiseMethodName = "all" | "allSettled" | "race" | "resolve" | "reject"
+export type PromiseMethodName = "all" | "allSettled" | "race" | "any" | "resolve" | "reject"
 
 export class PromiseMethodReference {
   constructor(readonly name: PromiseMethodName) {}
 }
 
+export type PromiseInstanceMethodName = "then" | "catch" | "finally"
+
+export class PromiseInstanceMethodReference {
+  constructor(
+    readonly promise: SandboxPromise,
+    readonly name: PromiseInstanceMethodName,
+  ) {}
+}
+
+// The resolve/reject callables handed to a `new Promise(executor)` executor. `settle` closes
+// over the promise's deferred and is first-settlement-wins; later calls are no-ops, as in JS.
+export class PromiseCapabilityFunction {
+  constructor(readonly settle: (value: unknown) => void) {}
+}
+
 export type GlobalNamespaceName =
   | "Object"
   | "Math"
@@ -99,6 +114,10 @@ export class UriFunction {
   constructor(readonly name: "encodeURI" | "encodeURIComponent" | "decodeURI" | "decodeURIComponent") {}
 }
 
+// The global `search` built-in: synchronous tool discovery that shares the tool admission
+// pipeline (budget, audit, hooks) without living in the `tools` tree.
+export class SearchFunction {}
+
 export class ProgramThrow {
   constructor(readonly value: unknown) {}
 }
@@ -122,11 +141,11 @@ export type DiagnosticKind =
 export const OptionalShortCircuit: unique symbol = Symbol("codemode.optional-short-circuit")
 
 export const supportedSyntaxMessage =
-  "Supported orchestration syntax: tools.* calls (they return promises - resolve them with await), data literals, destructuring, optional chaining, template literals, conditionals, switch, loops (incl. for...of and for...in over object/array/tools keys), arrow functions, spread, try/catch, array methods (map/filter/find/findIndex/some/every/reduce/flatMap/forEach/sort/slice/concat/indexOf/lastIndexOf/at/flat/reverse/includes/join), string methods (incl. match/matchAll/replace/split with regular expressions), Date/RegExp/Map/Set/URL/URLSearchParams, URI encoding helpers, Object/Math/JSON helpers, captured console.log/warn/error/dir/table, and Promise.all/allSettled/race/resolve/reject over arrays mixing promises and plain values for parallel tool calls (promise chaining with .then/.catch is not supported - use await with try/catch)."
+  "Supported orchestration syntax: tools.* calls (they return promises - resolve them with await), data literals, destructuring, optional chaining, template literals, conditionals, switch, loops (incl. for...of and for...in over object/array/tools keys), arrow functions, spread, try/catch, array methods (map/filter/find/findIndex/some/every/reduce/flatMap/forEach/sort/slice/concat/indexOf/lastIndexOf/at/flat/reverse/includes/join), string methods (incl. match/matchAll/replace/split with regular expressions), Date/RegExp/Map/Set/URL/URLSearchParams, URI encoding helpers, Object/Math/JSON helpers, captured console.log/warn/error/dir/table, Promise.all/allSettled/race/any/resolve/reject over arrays mixing promises and plain values for parallel tool calls, promise chaining with .then/.catch/.finally, and new Promise((resolve, reject) => ...) construction."
 
 export class InterpreterRuntimeError extends Error {
   readonly node?: AstNode
-  errorName: string = "Error"
+  errorName = "Error"
 
   constructor(
     message: string,

packages/codemode/src/interpreter/runtime.ts

@@ -1,5 +1,5 @@
 import { parse } from "acorn"
-import { Cause, Effect, Exit, Fiber, Scope, Semaphore } from "effect"
+import { Cause, Deferred, Effect, Exit, Fiber, Scope, Semaphore } from "effect"
 import { DiagnosticCategory, ModuleKind, ScriptTarget, flattenDiagnosticMessageText, transpileModule } from "typescript"
 import {
   copyIn,
@@ -31,7 +31,6 @@ import {
   ErrorConstructorReference,
   GlobalMethodReference,
   GlobalNamespace,
-  type GlobalNamespaceName,
   formatLocation,
   getArray,
   getBoolean,
@@ -43,11 +42,14 @@ import {
   isRecord,
   type MemberReference,
   OptionalShortCircuit,
+  PromiseCapabilityFunction,
+  PromiseInstanceMethodReference,
   PromiseMethodReference,
   type PromiseMethodName,
   PromiseNamespace,
   ProgramThrow,
   type ProgramNode,
+  SearchFunction,
   type StatementResult,
   sourceLocation,
   supportedSyntaxMessage,
@@ -56,7 +58,7 @@ import {
 } from "./model.js"
 import { arrayMethods, mapMethods, setMethods, spreadItems } from "../stdlib/collections.js"
 import { consoleMethods, MAX_CONSOLE_DEPTH } from "../stdlib/console.js"
-import { dateMethods, dateStatics, invokeDateMethod, invokeDateStatic } from "../stdlib/date.js"
+import { dateMethods, invokeDateMethod, invokeDateStatic } from "../stdlib/date.js"
 import { invokeJsonMethod } from "../stdlib/json.js"
 import { invokeMathMethod, mathConstants } from "../stdlib/math.js"
 import {
@@ -82,7 +84,6 @@ import {
   urlMethods,
   urlProperties,
   urlSearchParamsMethods,
-  urlStatics,
   urlWritableProperties,
   invokeUriFunction,
   invokeURLMethod,
@@ -95,6 +96,7 @@ import {
   coerceToNumber,
   coerceToString,
   compoundOperators,
+  createAggregateErrorValue,
   createErrorValue,
   errorBrandName,
   errorConstructors,
@@ -219,6 +221,41 @@ const normalizeError = (error: unknown): Diagnostic => {
   }
 }
 
+// V8 parity: a combinator settles one reaction turn after the deciding member, never
+// before reactions already attached to it.
+const settleAfterTurn = <A, E, R>(body: Effect.Effect<A, E, R>): Effect.Effect<A, E, R> =>
+  Effect.flatMap(Effect.exit(body), (exit) => Effect.andThen(Effect.yieldNow, exit))
+
+const selfResolutionError = (node?: AstNode): InterpreterRuntimeError =>
+  new InterpreterRuntimeError("Chaining cycle detected: a promise cannot resolve with itself.", node).as("TypeError")
+
+// Short-circuit marker for Promise.any: the first fulfillment travels the error channel of
+// the flipped members so fail-fast Effect.all stops observing on it.
+class PromiseAnyFulfilled {
+  constructor(readonly value: unknown) {}
+}
+
+type ReactionHandler = CodeModeFunction | CoercionFunction | UriFunction | PromiseCapabilityFunction
+
+// Non-callables are ignored as in JS: `.then(undefined, f)` relies on the passthrough.
+const reactionHandler = (value: unknown, method: string, node: AstNode): ReactionHandler | undefined => {
+  if (
+    value instanceof CodeModeFunction ||
+    value instanceof CoercionFunction ||
+    value instanceof UriFunction ||
+    value instanceof PromiseCapabilityFunction
+  ) {
+    return value
+  }
+  if (typeofValue(value) === "function") {
+    throw new InterpreterRuntimeError(
+      `${method} handlers must be plain functions; wrap other callables in an arrow function, e.g. (value) => tools.ns.tool(value).`,
+      node,
+    )
+  }
+  return undefined
+}
+
 // Shared by catch bindings and Promise.allSettled rejection reasons.
 const caughtErrorValue = (thrown: unknown): unknown => {
   if (thrown instanceof ProgramThrow) return thrown.value
@@ -227,6 +264,21 @@ const caughtErrorValue = (thrown: unknown): unknown => {
   return createErrorValue(name, normalizeError(thrown).message)
 }
 
+// `new Error("msg")` and the no-new call form share this; AggregateError alone takes
+// (errors, message?) with a required errors collection, as in JS.
+const constructErrorValue = (name: string, args: Array<unknown>, node: AstNode): SafeObject => {
+  if (name !== "AggregateError") return createErrorValue(name, args[0] === undefined ? "" : coerceToString(args[0]))
+  const errors = spreadItems(args[0])
+  if (errors === undefined) {
+    throw new InterpreterRuntimeError(
+      "new AggregateError(...) expects an array of errors (e.g. new AggregateError(errors, message?)).",
+      node,
+    ).as("TypeError")
+  }
+  // Copy: spreadItems returns array input itself, and the error value must not alias caller data.
+  return createAggregateErrorValue([...errors], args[1] === undefined ? "" : coerceToString(args[1]))
+}
+
 const isRuntimeReference = (value: unknown): boolean =>
   value instanceof CodeModeFunction ||
   value instanceof ToolReference ||
@@ -235,9 +287,12 @@ const isRuntimeReference = (value: unknown): boolean =>
   value instanceof GlobalMethodReference ||
   value instanceof PromiseNamespace ||
   value instanceof PromiseMethodReference ||
+  value instanceof PromiseInstanceMethodReference ||
   value instanceof SandboxPromise ||
   value instanceof CoercionFunction ||
   value instanceof UriFunction ||
+  value instanceof SearchFunction ||
+  value instanceof PromiseCapabilityFunction ||
   value instanceof ErrorConstructorReference ||
   isSandboxValue(value)
 
@@ -279,11 +334,13 @@ const typeofValue = (value: unknown): string => {
     value instanceof IntrinsicReference ||
     value instanceof GlobalMethodReference ||
     value instanceof PromiseMethodReference ||
+    value instanceof PromiseInstanceMethodReference ||
     value instanceof PromiseNamespace ||
+    value instanceof PromiseCapabilityFunction ||
     value instanceof ErrorConstructorReference
   )
     return "function"
-  if (value instanceof UriFunction) return "function"
+  if (value instanceof UriFunction || value instanceof SearchFunction) return "function"
   if (value instanceof ToolReference) return value.path.length > 0 ? "function" : "object"
   if (value instanceof GlobalNamespace) {
     return value.name === "Math" || value.name === "JSON" || value.name === "console" ? "object" : "function"
@@ -391,7 +448,7 @@ const invokeStringMethod = (value: string, name: string, args: Array<unknown>, n
         break
       }
       if (args[0] instanceof SandboxRegExp) {
-        result = value.split((args[0] as SandboxRegExp).regex, optNum(1))
+        result = value.split(args[0].regex, optNum(1))
         break
       }
       const requestedLimit = optNum(1)
@@ -419,7 +476,7 @@ const invokeStringMethod = (value: string, name: string, args: Array<unknown>, n
     case "replace":
     case "replaceAll": {
       if (args[0] instanceof SandboxRegExp) {
-        const pattern = (args[0] as SandboxRegExp).regex
+        const pattern = args[0].regex
         const replacement = str(1)
         if (name === "replaceAll" && !pattern.global) {
           throw new InterpreterRuntimeError(
@@ -524,9 +581,8 @@ const invokeArrayStatic = (name: string, args: Array<unknown>, node: AstNode): u
         )
       }
       // Map/Set materialize directly (the data checkpoint would serialize them to {}).
-      if (args[0] instanceof SandboxMap)
-        return Array.from((args[0] as SandboxMap).map.entries(), ([key, item]) => [key, item])
-      if (args[0] instanceof SandboxSet) return Array.from((args[0] as SandboxSet).set.values())
+      if (args[0] instanceof SandboxMap) return Array.from(args[0].map.entries(), ([key, item]) => [key, item])
+      if (args[0] instanceof SandboxSet) return Array.from(args[0].set.values())
       if (args[0] instanceof SandboxURLSearchParams) {
         return Array.from(args[0].params.entries(), ([key, value]) => [key, value])
       }
@@ -568,11 +624,7 @@ const invokeGlobalMethod = (ref: GlobalMethodReference, args: Array<unknown>, no
   if (ref.namespace === "Number") return invokeNumberStatic(ref.name, args, node)
   if (ref.namespace === "String") return invokeStringStatic(ref.name, args, node)
   if (ref.namespace === "URL") return invokeURLStatic(ref.name, args, node)
-  if (ref.namespace === "Date") {
-    if (!dateStatics.has(ref.name))
-      throw new InterpreterRuntimeError(`Date.${ref.name} is not available in CodeMode.`, node)
-    return invokeDateStatic(ref.name, args, node)
-  }
+  if (ref.namespace === "Date") return invokeDateStatic(ref.name, args, node)
   if (
     ref.namespace === "RegExp" ||
     ref.namespace === "Map" ||
@@ -688,6 +740,8 @@ class PromiseRuntime<R> {
 class Interpreter<R> {
   private scopes: Array<Map<string, Binding>>
   private readonly invokeTool: (path: ReadonlyArray<string>, args: Array<unknown>) => Effect.Effect<unknown, unknown, R>
+  // The built-in `search` global, threaded from ToolRuntime.make like invokeTool.
+  private readonly invokeSearch: (args: Array<unknown>) => Effect.Effect<unknown, unknown, R>
   // Enumerable namespace/tool names at a node of the host tool tree, threaded from
   // ToolRuntime.make like invokeTool: the interpreter never holds the tree itself.
   private readonly toolKeys: (path: ReadonlyArray<string>) => ReadonlyArray<string>
@@ -698,6 +752,7 @@ class Interpreter<R> {
 
   constructor(
     invokeTool: (path: ReadonlyArray<string>, args: Array<unknown>) => Effect.Effect<unknown, unknown, R>,
+    invokeSearch: (args: Array<unknown>) => Effect.Effect<unknown, unknown, R>,
     toolKeys: (path: ReadonlyArray<string>) => ReadonlyArray<string>,
     promises: PromiseRuntime<R>,
     logs: Array<string> = [],
@@ -706,11 +761,13 @@ class Interpreter<R> {
     const globalScope = new Map<string, Binding>()
     this.scopes = [globalScope]
     this.invokeTool = invokeTool
+    this.invokeSearch = invokeSearch
     this.toolKeys = toolKeys
     this.logs = logs
     this.callPermits = callPermits
     this.promises = promises
     globalScope.set("tools", { mutable: false, value: new ToolReference([]) })
+    globalScope.set("search", { mutable: false, value: new SearchFunction() })
     globalScope.set("Promise", { mutable: false, value: new PromiseNamespace() })
     globalScope.set("undefined", { mutable: false, value: undefined })
     globalScope.set("Object", { mutable: false, value: new GlobalNamespace("Object") })
@@ -768,7 +825,6 @@ class Interpreter<R> {
         if (result.kind === "break" || result.kind === "continue") {
           throw new InterpreterRuntimeError(`Unexpected '${result.kind}' outside of a loop.`, statement)
         }
-
       }
 
       // The program body runs inside an implicit async function, so a returned promise
@@ -794,16 +850,14 @@ class Interpreter<R> {
     return this.promises.create(effect)
   }
 
-  // `await promise`: succeed with the fulfilled value or re-raise the failure so try/catch
-  // observes it exactly like a synchronous throw at the await site. Settlement is idempotent
-  // (fiber exits replay), so awaiting the same promise repeatedly never re-runs the call.
+  // Settlement is idempotent (fiber exits replay), so awaiting the same promise repeatedly
+  // never re-runs the call. The post-settlement yield defers the continuation one reaction
+  // turn, as in JS: awaiters never resume inline, so they interleave in attach order.
   private settlePromise(promise: SandboxPromise): Effect.Effect<unknown, unknown, never> {
     const promises = this.promises
     return Effect.suspend(() => {
       promises.markObserved(promise)
-      return Effect.flatMap(promises.await(promise), (exit) =>
-        Exit.isSuccess(exit) ? Effect.succeed(exit.value) : Effect.failCause(exit.cause),
-      )
+      return Effect.flatMap(promises.await(promise), (exit) => Effect.andThen(Effect.yieldNow, exit))
     })
   }
 
@@ -980,7 +1034,6 @@ class Interpreter<R> {
         if (result.kind === "return") {
           return result
         }
-
       }
 
       return { kind: "none" } satisfies StatementResult
@@ -1007,7 +1060,6 @@ class Interpreter<R> {
         if (result.kind === "return") {
           return result
         }
-
       } while (yield* self.evaluateExpression(testNode))
 
       return { kind: "none" } satisfies StatementResult
@@ -1037,16 +1089,13 @@ class Interpreter<R> {
           : []
 
       while (testNode ? yield* self.evaluateExpression(testNode) : true) {
-        let iterationScope: Map<string, Binding> | undefined
-        if (perIterationBindings.length > 0) {
-          iterationScope = new Map(
-            perIterationBindings.map((name) => {
-              const binding = self.currentScope().get(name)!
-              return [name, { ...binding }]
-            }),
-          )
-          self.scopes.push(iterationScope)
-        }
+        const iterationScope =
+          perIterationBindings.length > 0
+            ? new Map(
+                perIterationBindings.map((name): [string, Binding] => [name, { ...self.currentScope().get(name)! }]),
+              )
+            : undefined
+        if (iterationScope) self.scopes.push(iterationScope)
         const result = yield* self.evaluateStatement(bodyNode).pipe(
           Effect.ensuring(
             Effect.sync(() => {
@@ -1096,7 +1145,7 @@ class Interpreter<R> {
 
       // Arrays iterate in place; strings iterate code points; Maps iterate [key, value]
       // pairs and Sets iterate values over a snapshot (mutation during iteration is safe).
-      const iterable = Array.isArray(right) ? right : spreadItems(right)
+      const iterable = spreadItems(right)
       if (iterable === undefined) {
         throw new InterpreterRuntimeError("for...of requires an array, string, Map, or Set value in CodeMode.", node)
       }
@@ -1550,11 +1599,10 @@ class Interpreter<R> {
       case "UpdateExpression":
         return this.evaluateUpdateExpression(node)
       case "AwaitExpression": {
-        // `await` resolves a promise value; awaiting anything else is a passthrough no-op,
-        // matching real JS semantics for non-thenables.
+        // In JS every await suspends, even on a non-promise.
         const self = this
         return Effect.flatMap(this.evaluateExpression(getNode(node, "argument")), (value) =>
-          value instanceof SandboxPromise ? self.settlePromise(value) : Effect.succeed(value),
+          value instanceof SandboxPromise ? self.settlePromise(value) : Effect.as(Effect.yieldNow, value),
         )
       }
       case "NewExpression":
@@ -1573,19 +1621,10 @@ class Interpreter<R> {
     const argNodes = getArray(node, "arguments")
     const self = this
     if (name === "Promise") {
-      throw new InterpreterRuntimeError(
-        "new Promise(...) is not supported in CodeMode; tool calls already return promises - call the tool and await the result.",
-        node,
-        "UnsupportedSyntax",
-        [supportedSyntaxMessage],
-      )
+      return Effect.flatMap(this.evaluateCallArguments(argNodes), (args) => self.constructPromise(args[0], node))
     }
     if (errorConstructors.has(name)) {
-      return Effect.gen(function* () {
-        const arg =
-          argNodes.length > 0 ? yield* self.evaluateExpression(asNode(argNodes[0], "arguments[0]")) : undefined
-        return createErrorValue(name, arg === undefined ? "" : coerceToString(arg))
-      })
+      return Effect.map(this.evaluateCallArguments(argNodes), (args) => constructErrorValue(name, args, node))
     }
     if (valueConstructors.has(name)) {
       return Effect.gen(function* () {
@@ -1923,7 +1962,7 @@ class Interpreter<R> {
           return self.setIdentifierValue(name, next, left)
         }
         const rightValue = yield* self.evaluateExpression(getNode(node, "right"))
-        if (operator === "=") return self.setIdentifierValue(name, rightValue, left)
+        return self.setIdentifierValue(name, rightValue, left)
       }
       if (left.type === "MemberExpression") {
         return yield* self.modifyMember(left, (current) =>
@@ -2025,6 +2064,9 @@ class Interpreter<R> {
       if (callable instanceof PromiseMethodReference) {
         return yield* self.invokePromiseMethod(callable, args, node)
       }
+      if (callable instanceof PromiseInstanceMethodReference) {
+        return yield* self.invokePromiseInstanceMethod(callable, args, node)
+      }
       if (callable instanceof CodeModeFunction) {
         return yield* self.invokeFunction(callable, args)
       }
@@ -2050,9 +2092,18 @@ class Interpreter<R> {
       if (callable instanceof UriFunction) {
         return invokeUriFunction(callable, args, node)
       }
+      if (callable instanceof SearchFunction) {
+        // The built-in search is synchronous in-memory matching: the call returns its
+        // result directly (await still works, as with any plain value).
+        return yield* self.invokeSearch(args)
+      }
       // `Error("msg")` without `new` constructs an error exactly like `new Error("msg")`, as in JS.
       if (callable instanceof ErrorConstructorReference) {
-        return createErrorValue(callable.name, args[0] === undefined ? "" : coerceToString(args[0]))
+        return constructErrorValue(callable.name, args, node)
+      }
+      if (callable instanceof PromiseCapabilityFunction) {
+        callable.settle(args[0])
+        return undefined
       }
       throw new InterpreterRuntimeError("Only tools are callable in CodeMode.", callee)
     })
@@ -2067,7 +2118,7 @@ class Interpreter<R> {
       return boundedData(this.enumerableKeys(ref)!, "Object.keys result")
     }
     throw new InterpreterRuntimeError(
-      `Object.${name}(...) cannot read tool references: they are not plain data. Use Object.keys(tools) for names, or tools.$codemode.search({ query }) for signatures.`,
+      `Object.${name}(...) cannot read tool references: they are not plain data. Use Object.keys(tools) for names, or search({ query }) for signatures.`,
       node,
       "InvalidDataValue",
     )
@@ -2241,17 +2292,19 @@ class Interpreter<R> {
       return this.createPromise(Effect.fail(new ProgramThrow(args[0])))
     }
 
-    const items = Array.isArray(args[0]) ? args[0] : spreadItems(args[0])
-    if (items === undefined) {
+    const spread = spreadItems(args[0])
+    if (spread === undefined) {
       return this.createPromise(
         Effect.fail(
           new InterpreterRuntimeError(
             `Promise.${ref.name} expects an array of promises or plain values (e.g. Promise.${ref.name}(items.map((item) => tools.ns.tool(item)))).`,
             node,
-          ),
+          ).as("TypeError"),
         ),
       )
     }
+    // Densify: JS combinator iteration reads sparse holes as undefined members; .map would skip them.
+    const items = Array.from(spread)
 
     // JS makes combinator members "handled" synchronously at the call - their rejections
     // belong to the aggregate from this moment, even ones settling before it runs.
@@ -2261,47 +2314,42 @@ class Interpreter<R> {
 
     switch (ref.name) {
       case "all": {
-        // Each observation re-raises its member's failure, so Effect.all rejects on the first
-        // failure without waiting for the rest and preserves input order when all fulfill.
-        // Its failure-time interruption only unsubscribes the sibling waiters: the underlying
-        // fibers stay execution-owned and keep running, as in JS.
+        // Rejects on the first failure; sibling fibers stay execution-owned and keep running, as in JS.
         const observations = items.map((item) =>
-          item instanceof SandboxPromise
-            ? Effect.flatMap(this.promises.await(item), (exit) =>
-                Exit.isSuccess(exit) ? Effect.succeed(exit.value) : Effect.failCause(exit.cause),
-              )
-            : Effect.succeed(item),
+          item instanceof SandboxPromise ? Effect.flatten(this.promises.await(item)) : Effect.succeed(item),
         )
-        return this.createPromise(Effect.all(observations, { concurrency: "unbounded" }))
+        return this.createPromise(settleAfterTurn(Effect.all(observations, { concurrency: "unbounded" })))
       }
       case "allSettled": {
         const observations = items.map((item) =>
-          item instanceof SandboxPromise ? this.promises.await(item) : Effect.succeed(Exit.succeed(item as unknown)),
+          item instanceof SandboxPromise ? this.promises.await(item) : Effect.succeed(Exit.succeed(item)),
         )
         return this.createPromise(
-          Effect.gen(function* () {
-            const outcomes: Array<unknown> = []
-            for (const observation of observations) {
-              const exit = yield* observation
-              if (Exit.isSuccess(exit)) {
+          settleAfterTurn(
+            Effect.gen(function* () {
+              const outcomes: Array<unknown> = []
+              for (const observation of observations) {
+                const exit = yield* observation
+                if (Exit.isSuccess(exit)) {
+                  outcomes.push(
+                    Object.assign(Object.create(null) as SafeObject, { status: "fulfilled", value: exit.value }),
+                  )
+                  continue
+                }
+                if (Cause.hasInterruptsOnly(exit.cause)) {
+                  // Execution teardown (timeout/host interruption), not a program-level rejection.
+                  return yield* Effect.failCause(exit.cause)
+                }
                 outcomes.push(
-                  Object.assign(Object.create(null) as SafeObject, { status: "fulfilled", value: exit.value }),
+                  Object.assign(Object.create(null) as SafeObject, {
+                    status: "rejected",
+                    reason: caughtErrorValue(Cause.squash(exit.cause)),
+                  }),
                 )
-                continue
               }
-              if (Cause.hasInterruptsOnly(exit.cause)) {
-                // Execution teardown (timeout/host interruption), not a program-level rejection.
-                return yield* Effect.failCause(exit.cause)
-              }
-              outcomes.push(
-                Object.assign(Object.create(null) as SafeObject, {
-                  status: "rejected",
-                  reason: caughtErrorValue(Cause.squash(exit.cause)),
-                }),
-              )
-            }
-            return outcomes
-          }),
+              return outcomes
+            }),
+          ),
         )
       }
       case "race": {
@@ -2316,21 +2364,155 @@ class Interpreter<R> {
           )
         }
         const observations = items.map((item) =>
-          item instanceof SandboxPromise ? this.promises.await(item) : Effect.succeed(Exit.succeed(item as unknown)),
+          item instanceof SandboxPromise ? this.promises.await(item) : Effect.succeed(Exit.succeed(item)),
         )
         // First settlement (fulfilled OR rejected) wins; losing work stays execution-owned
         // and is interrupted at normal completion (already observed) or by teardown.
-        return this.createPromise(
-          Effect.flatMap(Effect.raceAll(observations), (exit) =>
-            Exit.isSuccess(exit) ? Effect.succeed(exit.value) : Effect.failCause(exit.cause),
+        return this.createPromise(settleAfterTurn(Effect.flatten(Effect.raceAll(observations))))
+      }
+      case "any": {
+        // De Morgan dual of Promise.all: members are flipped so the first fulfillment
+        // short-circuits fail-fast Effect.all, and all-rejected completes with the reasons
+        // in input order for the AggregateError.
+        const flipped = items.map((item) =>
+          item instanceof SandboxPromise
+            ? Effect.flatMap(this.promises.await(item), (exit) => {
+                if (Exit.isSuccess(exit)) return Effect.fail(new PromiseAnyFulfilled(exit.value))
+                if (Cause.hasInterruptsOnly(exit.cause)) return Effect.failCause(exit.cause)
+                return Effect.succeed(caughtErrorValue(Cause.squash(exit.cause)))
+              })
+            : Effect.fail(new PromiseAnyFulfilled(item)),
+        )
+        const body = Effect.all(flipped, { concurrency: "unbounded" }).pipe(
+          Effect.flatMap((reasons) =>
+            Effect.fail(new ProgramThrow(createAggregateErrorValue(reasons, "All promises were rejected"))),
+          ),
+          Effect.catch((error) =>
+            error instanceof PromiseAnyFulfilled ? Effect.succeed(error.value) : Effect.fail(error),
           ),
         )
+        return this.createPromise(settleAfterTurn(body))
       }
     }
   }
 
+  // Teardown interruption propagates without running handlers; a real settlement defers
+  // one reaction turn so handlers never run inline.
+  private reactionExit(source: SandboxPromise): Effect.Effect<Exit.Exit<unknown, unknown>, unknown, R> {
+    const promises = this.promises
+    return Effect.gen(function* () {
+      const exit = yield* promises.await(source)
+      if (!Exit.isSuccess(exit) && Cause.hasInterruptsOnly(exit.cause)) return yield* Effect.failCause(exit.cause)
+      yield* Effect.yieldNow
+      return exit
+    })
+  }
+
+  private invokePromiseInstanceMethod(
+    ref: PromiseInstanceMethodReference,
+    args: Array<unknown>,
+    node: AstNode,
+  ): Effect.Effect<SandboxPromise, never, R> {
+    const method = `Promise.prototype.${ref.name}`
+    this.promises.markObserved(ref.promise)
+    if (ref.name === "finally") {
+      return this.chainFinally(ref.promise, reactionHandler(args[0], method, node), method, node)
+    }
+    const onFulfilled = ref.name === "then" ? reactionHandler(args[0], method, node) : undefined
+    const onRejected = reactionHandler(ref.name === "then" ? args[1] : args[0], method, node)
+    return this.chainReaction(ref.promise, onFulfilled, onRejected, method, node)
+  }
+
+  private chainReaction(
+    source: SandboxPromise,
+    onFulfilled: ReactionHandler | undefined,
+    onRejected: ReactionHandler | undefined,
+    method: string,
+    node: AstNode,
+  ): Effect.Effect<SandboxPromise, never, R> {
+    const self = this
+    const box: { derived?: SandboxPromise } = {}
+    const body = Effect.gen(function* () {
+      const exit = yield* self.reactionExit(source)
+      const handler = Exit.isSuccess(exit) ? onFulfilled : onRejected
+      if (handler === undefined) return yield* exit
+      const input = Exit.isSuccess(exit) ? exit.value : caughtErrorValue(Cause.squash(exit.cause))
+      const result = yield* self.applyCollectionCallback(handler, method, node)([input])
+      if (result === box.derived) return yield* Effect.fail(selfResolutionError(node))
+      if (result instanceof SandboxPromise) return yield* self.settlePromise(result)
+      return result
+    })
+    return Effect.map(this.createPromise(body), (derived) => {
+      box.derived = derived
+      return derived
+    })
+  }
+
+  private chainFinally(
+    source: SandboxPromise,
+    cleanup: ReactionHandler | undefined,
+    method: string,
+    node: AstNode,
+  ): Effect.Effect<SandboxPromise, never, R> {
+    const self = this
+    return this.createPromise(
+      Effect.gen(function* () {
+        const exit = yield* self.reactionExit(source)
+        if (cleanup !== undefined) {
+          const result = yield* self.applyCollectionCallback(cleanup, method, node)([])
+          if (result instanceof SandboxPromise) yield* self.settlePromise(result)
+        }
+        return yield* exit
+      }),
+    )
+  }
+
+  // new Promise(executor): the promise's fiber awaits a Deferred that resolve/reject settle
+  // exactly once. The executor runs synchronously; its throw rejects the promise unless it
+  // already settled (JS swallows post-settlement executor throws).
+  private constructPromise(executor: unknown, node: AstNode): Effect.Effect<SandboxPromise, unknown, R> {
+    if (!(executor instanceof CodeModeFunction)) {
+      throw new InterpreterRuntimeError(
+        "new Promise(...) expects an executor function (e.g. new Promise((resolve, reject) => { ... })).",
+        node,
+      ).as("TypeError")
+    }
+    const self = this
+    return Effect.gen(function* () {
+      const deferred = Deferred.makeUnsafe<unknown, unknown>()
+      const box: { own?: SandboxPromise } = {}
+      const promise = yield* self.createPromise(
+        Effect.flatMap(Deferred.await(deferred), (value) => {
+          if (!(value instanceof SandboxPromise)) return Effect.succeed(value)
+          if (value === box.own) return Effect.fail(selfResolutionError(node))
+          return self.settlePromise(value)
+        }),
+      )
+      box.own = promise
+      const resolve = new PromiseCapabilityFunction((value) => {
+        Deferred.doneUnsafe(deferred, Exit.succeed(value))
+      })
+      const reject = new PromiseCapabilityFunction((value) => {
+        Deferred.doneUnsafe(deferred, Exit.fail(new ProgramThrow(value)))
+      })
+      const executed = yield* Effect.exit(self.invokeFunction(executor, [resolve, reject]))
+      if (!Exit.isSuccess(executed)) {
+        if (Cause.hasInterruptsOnly(executed.cause)) return yield* Effect.failCause(executed.cause)
+        Deferred.doneUnsafe(deferred, Exit.fail(Cause.squash(executed.cause)))
+      }
+      return promise
+    })
+  }
+
   private invokeFunction(fn: CodeModeFunction, args: Array<unknown>): Effect.Effect<unknown, unknown, R> {
-    const invocation = new Interpreter(this.invokeTool, this.toolKeys, this.promises, this.logs, this.callPermits)
+    const invocation = new Interpreter(
+      this.invokeTool,
+      this.invokeSearch,
+      this.toolKeys,
+      this.promises,
+      this.logs,
+      this.callPermits,
+    )
     invocation.scopes = [...fn.capturedScopes, new Map<string, Binding>()]
     const run = Effect.gen(function* () {
       // Seed every parameter name into the scope as a TDZ slot first, so a default that
@@ -2358,10 +2540,20 @@ class Interpreter<R> {
       return yield* invocation.evaluateExpression(fn.body)
     })
     if (!fn.async) return run
-    return this.createPromise(
-      Effect.flatMap(run, (value) =>
-        value instanceof SandboxPromise ? invocation.settlePromise(value) : Effect.succeed(value),
+    // Every await yields, so `box.own` is assigned before the body can return a reference to it.
+    const box: { own?: SandboxPromise } = {}
+    return Effect.map(
+      this.createPromise(
+        Effect.flatMap(run, (value) => {
+          if (!(value instanceof SandboxPromise)) return Effect.succeed(value)
+          if (value === box.own) return Effect.fail(selfResolutionError())
+          return invocation.settlePromise(value)
+        }),
       ),
+      (promise) => {
+        box.own = promise
+        return promise
+      },
     )
   }
 
@@ -2472,8 +2664,8 @@ class Interpreter<R> {
     })
   }
 
-  // Runs a collection callback accepting a user function or supported builtin callable,
-  // mirroring the array-method callback contract.
+  // Accepts a user function or supported builtin callable, so idioms such as
+  // `filter(Boolean)`, `map(String)`, and `map(encodeURIComponent)` work as in JS.
   private applyCollectionCallback(
     callback: unknown,
     name: string,
@@ -2482,7 +2674,8 @@ class Interpreter<R> {
     if (
       !(callback instanceof CodeModeFunction) &&
       !(callback instanceof CoercionFunction) &&
-      !(callback instanceof UriFunction)
+      !(callback instanceof UriFunction) &&
+      !(callback instanceof PromiseCapabilityFunction)
     ) {
       throw new InterpreterRuntimeError(`${name} expects a function callback.`, node)
     }
@@ -2491,7 +2684,9 @@ class Interpreter<R> {
         ? Effect.succeed(invokeCoercion(callback, callbackArgs, node))
         : callback instanceof UriFunction
           ? Effect.succeed(invokeUriFunction(callback, callbackArgs, node))
-          : this.invokeFunction(callback, callbackArgs)
+          : callback instanceof PromiseCapabilityFunction
+            ? Effect.sync(() => callback.settle(callbackArgs[0]))
+            : this.invokeFunction(callback, callbackArgs)
   }
 
   private invokeMapMethod(
@@ -2761,24 +2956,7 @@ class Interpreter<R> {
         return Effect.succeed(Array.from(target.entries(), ([index, item]): Array<unknown> => [index, item]))
     }
 
-    const callback = args[0]
-    if (
-      !(callback instanceof CodeModeFunction) &&
-      !(callback instanceof CoercionFunction) &&
-      !(callback instanceof UriFunction)
-    ) {
-      throw new InterpreterRuntimeError(`Array.${name} expects a function callback.`, node)
-    }
-    const self = this
-    // Accept a user function or supported builtin callable, so idioms such as
-    // `filter(Boolean)`, `map(String)`, and `map(encodeURIComponent)` work as in JS. Builtins
-    // are synchronous; only CodeModeFunctions can await tool calls.
-    const apply = (callbackArgs: Array<unknown>): Effect.Effect<unknown, unknown, R> =>
-      callback instanceof CoercionFunction
-        ? Effect.succeed(invokeCoercion(callback, callbackArgs, node))
-        : callback instanceof UriFunction
-          ? Effect.succeed(invokeUriFunction(callback, callbackArgs, node))
-          : self.invokeFunction(callback, callbackArgs)
+    const apply = this.applyCollectionCallback(args[0], `Array.${name}`, node)
     return Effect.gen(function* () {
       // Capture the initial length, but read the receiver live so callbacks observe mutations
       // without visiting elements appended after iteration begins.
@@ -3079,6 +3257,7 @@ class Interpreter<R> {
     | MemberReference
     | ToolReference
     | PromiseMethodReference
+    | PromiseInstanceMethodReference
     | IntrinsicReference
     | GlobalMethodReference
     | ComputedValue
@@ -3115,7 +3294,7 @@ class Interpreter<R> {
           return new PromiseMethodReference(key as PromiseMethodName)
         }
         throw new InterpreterRuntimeError(
-          `Promise.${String(key)} is not available in CodeMode. Available: Promise.all, Promise.allSettled, Promise.race, Promise.resolve, and Promise.reject; consume promises with await.`,
+          `Promise.${String(key)} is not available in CodeMode. Available: Promise.all, Promise.allSettled, Promise.race, Promise.any, Promise.resolve, and Promise.reject; consume promises with await.`,
           propertyNode,
         )
       }
@@ -3199,20 +3378,13 @@ class Interpreter<R> {
         return new ComputedValue(undefined)
       }
 
-      // Any property access on a promise is a confused program (`p.then(...)`, `p.value`);
-      // reading `undefined` here would hide the missing await, so both paths get an explicit,
-      // await-hinting error instead of the forgiving unknown-property fallthrough.
+      // Error instead of `undefined` so a missing await never hides.
       if (objectValue instanceof SandboxPromise) {
         if (key === "then" || key === "catch" || key === "finally") {
-          throw new InterpreterRuntimeError(
-            `Promise.prototype.${String(key)} is not supported in CodeMode; use await instead (with try/catch to handle failures) - e.g. \`const result = await tools.ns.tool(...)\`.`,
-            propertyNode,
-            "UnsupportedSyntax",
-            [supportedSyntaxMessage],
-          )
+          return new PromiseInstanceMethodReference(objectValue, key)
         }
         throw new InterpreterRuntimeError(
-          "This value is an un-awaited Promise and has no readable properties; await it first - e.g. `const result = await tools.ns.tool(...)`.",
+          "This value is an un-awaited Promise; await it first - e.g. `const result = await tools.ns.tool(...)`.",
           objectNode,
           "InvalidDataValue",
         )
@@ -3265,6 +3437,7 @@ class Interpreter<R> {
         reference === undefined ||
         reference instanceof ToolReference ||
         reference instanceof PromiseMethodReference ||
+        reference instanceof PromiseInstanceMethodReference ||
         reference instanceof IntrinsicReference ||
         reference instanceof GlobalMethodReference
       )
@@ -3302,6 +3475,7 @@ class Interpreter<R> {
         reference === undefined ||
         reference instanceof ToolReference ||
         reference instanceof PromiseMethodReference ||
+        reference instanceof PromiseInstanceMethodReference ||
         reference instanceof IntrinsicReference ||
         reference instanceof GlobalMethodReference
       ) {
@@ -3489,15 +3663,14 @@ export const executeWithLimits = <const Tools extends Record<string, unknown>>(
   // and the timeout path's completed value - binds at run time: a reused Effect must start
   // from a clean slate instead of observing a previous run's state.
   return Effect.suspend(() => {
-    const hooks = {
-      ...(options.onToolCallStart === undefined ? {} : { onToolCallStart: options.onToolCallStart }),
-      ...(options.onToolCallEnd === undefined ? {} : { onToolCallEnd: options.onToolCallEnd }),
-    }
     const tools = ToolRuntime.make(
       (options.tools ?? {}) as HostTools<Services<Tools>>,
       limits.maxToolCalls,
       searchIndex,
-      hooks,
+      {
+        onToolCallStart: options.onToolCallStart,
+        onToolCallEnd: options.onToolCallEnd,
+      },
     )
     const logs: Array<string> = []
     const logged = () => (logs.length > 0 ? { logs: [...logs] } : {})
@@ -3512,7 +3685,7 @@ export const executeWithLimits = <const Tools extends Record<string, unknown>>(
         Effect.gen(function* () {
           const program = parseProgram(options.code)
           const promises = new PromiseRuntime<Services<Tools>>(scope)
-          const interpreter = new Interpreter<Services<Tools>>(tools.invoke, tools.keys, promises, logs)
+          const interpreter = new Interpreter<Services<Tools>>(tools.invoke, tools.search, tools.keys, promises, logs)
           const value = yield* interpreter.run(program)
           // Validate the result first so an invalid value is a fatal completion that closes
           // the promise scope directly instead of taking the normal-completion path.

packages/codemode/src/openapi/runtime.ts

@@ -46,9 +46,7 @@ export const invoke = (plan: Plan, input: unknown): Effect.Effect<unknown, unkno
       )
     }
     if (json && Option.isNone(decoded)) {
-      return yield* Effect.fail(
-        toolError(`${plan.operation.method} ${plan.operation.path} returned malformed JSON.`),
-      )
+      return yield* Effect.fail(toolError(`${plan.operation.method} ${plan.operation.path} returned malformed JSON.`))
     }
     return parsed
   })
@@ -208,8 +206,9 @@ const buildUrl = (plan: Plan, input: Readonly<Record<string, unknown>>): string
       return toolError(`Missing required path parameter '${field.inputName}'.`)
     }
     const fieldValue = serializeSimple(field, item, (value) =>
-      encodeURIComponent(value).replace(/[!'()*]/g, (character) =>
-        `%${character.charCodeAt(0).toString(16).toUpperCase()}`,
+      encodeURIComponent(value).replace(
+        /[!'()*]/g,
+        (character) => `%${character.charCodeAt(0).toString(16).toUpperCase()}`,
       ),
     )
     if (fieldValue instanceof ToolError) return fieldValue
@@ -271,10 +270,7 @@ const serializeQuery = (
     if (value.some((item) => item === undefined || (item !== null && typeof item === "object"))) {
       return toolError(`Query parameter '${field.inputName}' contains an unsupported nested value.`)
     }
-    return value.reduce(
-      (current, item) => HttpClientRequest.appendUrlParam(current, field.name, String(item)),
-      request,
-    )
+    return value.reduce((current, item) => HttpClientRequest.appendUrlParam(current, field.name, String(item)), request)
   }
   if (isRecord(value) && field.explode) {
     return Object.entries(value).reduce<HttpClientRequest.HttpClientRequest | ToolError>((current, [name, item]) => {
@@ -289,11 +285,15 @@ const serializeQuery = (
   return rendered instanceof ToolError ? rendered : HttpClientRequest.appendUrlParam(request, field.name, rendered)
 }
 
-const readResponseBody = (response: HttpClientResponse.HttpClientResponse, plan: Plan): Effect.Effect<string, ToolError> =>
+const readResponseBody = (
+  response: HttpClientResponse.HttpClientResponse,
+  plan: Plan,
+): Effect.Effect<string, ToolError> =>
   Effect.gen(function* () {
     const contentLength = response.headers["content-length"]
     const parsedSize = contentLength === undefined ? undefined : Number.parseInt(contentLength, 10)
-    const declaredSize = parsedSize !== undefined && Number.isSafeInteger(parsedSize) && parsedSize >= 0 ? parsedSize : undefined
+    const declaredSize =
+      parsedSize !== undefined && Number.isSafeInteger(parsedSize) && parsedSize >= 0 ? parsedSize : undefined
     if (declaredSize !== undefined && declaredSize > maxResponseBodyBytes) {
       return yield* Effect.fail(toolError(`${plan.operation.method} ${plan.operation.path} response exceeds 50 MiB.`))
     }
@@ -304,7 +304,9 @@ const readResponseBody = (response: HttpClientResponse.HttpClientResponse, plan:
         return Effect.fail(toolError(`${plan.operation.method} ${plan.operation.path} response exceeds 50 MiB.`))
       }
       if (size + chunk.byteLength > body.byteLength) {
-        const grown = Buffer.allocUnsafe(Math.min(maxResponseBodyBytes, Math.max(size + chunk.byteLength, body.byteLength * 2)))
+        const grown = Buffer.allocUnsafe(
+          Math.min(maxResponseBodyBytes, Math.max(size + chunk.byteLength, body.byteLength * 2)),
+        )
         body.copy(grown, 0, 0, size)
         body = grown
       }

packages/codemode/src/openapi/spec.ts

@@ -78,7 +78,9 @@ const isBinaryMediaType = (document: Document, mediaType: string, value: unknown
   return isRecord(schema) && schema.format === "binary"
 }
 
-const jsonContent = (content: Record<string, unknown>): { readonly mediaType: string; readonly schema: unknown } | undefined => {
+const jsonContent = (
+  content: Record<string, unknown>,
+): { readonly mediaType: string; readonly schema: unknown } | undefined => {
   const entry = Object.entries(content).find(([mediaType]) => isJsonMediaType(mediaType))
   return entry !== undefined && isRecord(entry[1]) ? { mediaType: entry[0], schema: entry[1].schema } : undefined
 }
@@ -344,7 +346,7 @@ export const operationOutput = (
   if (outcomes.length === 0) return { ok: true, value: undefined }
   return {
     ok: true,
-    value: withDefinitions(outcomes.length === 1 ? outcomes[0] ?? {} : { anyOf: outcomes }, definitions),
+    value: withDefinitions(outcomes.length === 1 ? (outcomes[0] ?? {}) : { anyOf: outcomes }, definitions),
   }
 }
 
@@ -380,7 +382,9 @@ export const operationPath = (
   namespaces: ReadonlySet<string>,
 ): ReadonlyArray<string> => {
   const raw = nonEmptyString(operation.operationId)
-  const segments = (raw === undefined ? [fallbackOperationId(method, path)] : raw.split(".")).map(sanitizeOperationSegment)
+  const segments = (raw === undefined ? [fallbackOperationId(method, path)] : raw.split(".")).map(
+    sanitizeOperationSegment,
+  )
   if (isOperationPathAvailable(segments, used, namespaces)) return segments
   const conflict = segments.slice(0, -1).findIndex((_, index) => used.has(segments.slice(0, index + 1).join(".")))
   if (conflict >= 0 && conflict + 1 < segments.length) {

packages/codemode/src/stdlib/date.ts

@@ -23,8 +23,6 @@ export const dateMethods = new Set([
   "getTimezoneOffset",
 ])
 
-export const dateStatics = new Set(["now", "parse", "UTC"])
-
 export const invokeDateStatic = (name: string, args: Array<unknown>, node: AstNode): number => {
   switch (name) {
     case "now":

packages/codemode/src/stdlib/json.ts

@@ -6,10 +6,7 @@ import {
 } from "../interpreter/model.js"
 import { copyIn, copyOut } from "../tool-runtime.js"
 
-export const jsonStatics = new Set(["stringify", "parse"])
-
 export const invokeJsonMethod = (name: string, args: Array<unknown>, node: AstNode): unknown => {
-  if (!jsonStatics.has(name)) throw new InterpreterRuntimeError(`JSON.${name} is not available in CodeMode.`, node)
   switch (name) {
     case "stringify": {
       const replacer = args[1]

packages/codemode/src/stdlib/object.ts

@@ -3,11 +3,9 @@ import { isBlockedMember } from "../tool-runtime.js"
 import { isSandboxValue, SandboxMap, SandboxPromise, SandboxSet, SandboxURLSearchParams } from "../values.js"
 import { boundedData, coerceToString } from "./value.js"
 
-export const objectStatics = new Set(["keys", "values", "entries", "hasOwn", "assign", "fromEntries"])
 export const objectMethodsPreservingIdentity = new Set(["assign", "values", "entries", "fromEntries"])
 
 export const invokeObjectMethod = (name: string, args: Array<unknown>, node: AstNode): unknown => {
-  if (!objectStatics.has(name)) throw new InterpreterRuntimeError(`Object.${name} is not available in CodeMode.`, node)
   const requireObject = (): Record<string, unknown> => {
     const input = args[0]
     if (Array.isArray(input)) return input as unknown as Record<string, unknown>
@@ -53,13 +51,11 @@ export const invokeObjectMethod = (name: string, args: Array<unknown>, node: Ast
       }
       const out = target as Record<string, unknown>
       for (const source of args.slice(1)) {
-        if (source === null || source === undefined) continue
-        const value = source
-        if (isSandboxValue(value)) continue
-        if (value === null || typeof value !== "object" || Array.isArray(value)) {
+        if (source === null || source === undefined || isSandboxValue(source)) continue
+        if (typeof source !== "object" || Array.isArray(source)) {
           throw new InterpreterRuntimeError("Object.assign expects data objects.", node)
         }
-        for (const [key, item] of Object.entries(value)) guardedSet(out, key, item)
+        for (const [key, item] of Object.entries(source)) guardedSet(out, key, item)
       }
       return out
     }

packages/codemode/src/stdlib/promise.ts

@@ -1,6 +1,6 @@
 import type { PromiseMethodName } from "../interpreter/model.js"
 
-export const promiseStatics = new Set<PromiseMethodName>(["all", "allSettled", "race", "resolve", "reject"])
+export const promiseStatics = new Set<PromiseMethodName>(["all", "allSettled", "race", "any", "resolve", "reject"])
 
 /** Maximum number of eagerly forked tool calls that may run concurrently. */
 export const TOOL_CALL_CONCURRENCY = 8

packages/codemode/src/stdlib/value.ts

@@ -6,6 +6,7 @@ export const errorConstructors = new Set([
   "ReferenceError",
   "EvalError",
   "URIError",
+  "AggregateError",
 ])
 
 export const valueConstructors = new Set(["Date", "RegExp", "Map", "Set", "URL", "URLSearchParams"])
@@ -20,6 +21,9 @@ export const createErrorValue = (name: string, message: string): SafeObject => {
   return value
 }
 
+export const createAggregateErrorValue = (errors: Array<unknown>, message: string): SafeObject =>
+  Object.assign(createErrorValue("AggregateError", message), { errors })
+
 export const errorBrandName = (value: unknown): string | undefined =>
   value !== null && typeof value === "object"
     ? ((value as Record<PropertyKey, unknown>)[ErrorBrand] as string | undefined)
@@ -60,7 +64,7 @@ export const invokeCoercion = (ref: CoercionFunction, args: Array<unknown>, node
     if (ref.name === "parseInt") return parseInt(coerceToString(raw))
     return parseFloat(coerceToString(raw))
   }
-  const value = boundedData(args[0], `${ref.name} input`)
+  const value = boundedData(raw, `${ref.name} input`)
   if (ref.name === "Number") return coerceToNumber(value)
   if (ref.name === "Boolean") return Boolean(value)
   if (ref.name === "parseInt") {
@@ -73,11 +77,7 @@ export const invokeCoercion = (ref: CoercionFunction, args: Array<unknown>, node
   if (ref.name === "parseFloat") return parseFloat(coerceToString(value))
   return coerceToString(value)
 }
-import {
-  type AstNode,
-  CoercionFunction,
-  InterpreterRuntimeError,
-} from "../interpreter/model.js"
+import { type AstNode, CoercionFunction, InterpreterRuntimeError } from "../interpreter/model.js"
 import { copyIn, type SafeObject } from "../tool-runtime.js"
 import {
   isSandboxValue,

packages/codemode/src/tool-runtime.ts

@@ -82,7 +82,6 @@ export type ToolDescription = {
 
 export type SafeObject = Record<string, unknown>
 
-const reservedNamespace = "$codemode"
 const defaultCatalogBudget = 2_000
 const defaultSearchLimit = 10
 const PositiveInt = Schema.Int.check(Schema.isGreaterThan(0))
@@ -326,15 +325,12 @@ export const copyOut = (value: unknown, undefinedAsNull = false): unknown => {
 const definitions = <R>(
   tools: HostTools<R>,
   path: ReadonlyArray<string> = [],
-): Array<{ path: string; definition: Definition<R> }> => {
-  const entries: Array<{ path: string; definition: Definition<R> }> = []
-  for (const [name, value] of Object.entries(tools)) {
+): Array<{ path: string; definition: Definition<R> }> =>
+  Object.entries(tools).flatMap(([name, value]) => {
     const next = [...path, name]
-    if (isDefinition(value)) entries.push({ path: next.join("."), definition: value })
-    else if (typeof value !== "function") entries.push(...definitions(value, next))
-  }
-  return entries
-}
+    if (isDefinition(value)) return [{ path: next.join("."), definition: value }]
+    return typeof value === "function" ? [] : definitions(value, next)
+  })
 
 const describeDefinition = <R>(path: string, definition: Definition<R>): ToolDescription => ({
   path,
@@ -349,9 +345,6 @@ const visibleDefinitions = <R>(tools: HostTools<R>) =>
     description: describeDefinition(path, definition),
   }))
 
-export const catalog = <R>(tools: HostTools<R>): ReadonlyArray<ToolDescription> =>
-  visibleDefinitions(tools).map(({ description }) => description)
-
 export type DiscoveryPlan = {
   readonly catalog: ReadonlyArray<ToolDescription>
   readonly instructions: string
@@ -458,7 +451,12 @@ const makeSearchTool = (searchIndex: ReadonlyArray<SearchEntry>): Definition =>
     }),
 })
 
-const searchDescription = describeDefinition(`${reservedNamespace}.search`, makeSearchTool([]))
+// The built-in `search` is a synchronous global function, not a tool-tree entry, so its
+// advertised signature is rendered by hand instead of through `describeDefinition`.
+const searchSignature = (() => {
+  const definition = makeSearchTool([])
+  return `search(input: ${inputTypeScript(definition, true)}): ${outputTypeScript(definition, true)}`
+})()
 
 const catalogLine = (tool: ToolDescription) => {
   // Keep the tool description concise; the full schema documentation remains in the signature.
@@ -485,12 +483,6 @@ const toSearchEntry = <R>(path: string, definition: Definition<R>, description:
 export const searchIndex = <R>(tools: HostTools<R>): ReadonlyArray<SearchEntry> =>
   visibleDefinitions(tools).map(({ path, definition, description }) => toSearchEntry(path, definition, description))
 
-export const assertValidTools = <R>(tools: HostTools<R>): void => {
-  if (Object.hasOwn(tools, reservedNamespace)) {
-    throw new Error(`Tool namespace '${reservedNamespace}' is reserved for CodeMode discovery tools.`)
-  }
-}
-
 /**
  * Budgeted catalog: every namespace is always listed with its tool count; full call
  * signatures are inlined against the `catalogBudget` (estimated tokens,
@@ -563,8 +555,8 @@ export const prepare = <R>(tools: HostTools<R>, catalogBudget = defaultCatalogBu
     empty
       ? "This is a restricted JavaScript language for calling tools, not a general-purpose runtime."
       : complete
-        ? "This is a restricted JavaScript language for calling tools, not a general-purpose runtime. Inside the confined interpreter, `tools` contains the Code Mode tools listed below and internal runtime tools; surrounding agent tools are not available."
-        : "This is a restricted JavaScript language for calling tools, not a general-purpose runtime. Inside the confined interpreter, `tools` contains the Code Mode tools listed or searchable below and internal runtime tools; surrounding agent tools are not available.",
+        ? "This is a restricted JavaScript language for calling tools, not a general-purpose runtime. Inside the confined interpreter, `tools` contains the Code Mode tools listed below; surrounding agent tools are not available."
+        : "This is a restricted JavaScript language for calling tools, not a general-purpose runtime. Inside the confined interpreter, `tools` contains the Code Mode tools listed or searchable below; surrounding agent tools are not available.",
     ...(empty
       ? []
       : ["Do not infer or normalize tool names; use only exact signatures shown below or returned by search."]),
@@ -585,7 +577,7 @@ export const prepare = <R>(tools: HostTools<R>, catalogBudget = defaultCatalogBu
               "3. Return only the fields you need from structured results; narrow unknown results before reading fields, and avoid returning large raw payloads.",
             ]
           : [
-              '1. If needed, discover tools: `return await tools.$codemode.search({ query: "<intent + key nouns>" })`.',
+              '1. If needed, discover tools with the built-in search function: `return search({ query: "<intent + key nouns>" })`.',
               "2. In the next execution, copy a returned path exactly, call it, and return only the needed fields.",
             ]),
       ]
@@ -597,8 +589,8 @@ export const prepare = <R>(tools: HostTools<R>, catalogBudget = defaultCatalogBu
         "## Rules",
         "",
         complete
-          ? "- Only Code Mode tools listed here and internal runtime tools are available; surrounding agent tools are not implicitly exposed."
-          : "- Only Code Mode tools listed here or returned by `tools.$codemode.search` and internal runtime tools are available; surrounding agent tools are not implicitly exposed.",
+          ? "- Only Code Mode tools listed here are available; surrounding agent tools are not implicitly exposed."
+          : "- Only Code Mode tools listed here or returned by the built-in `search` function are available; surrounding agent tools are not implicitly exposed.",
         "- Filter, aggregate, and transform collections in code - never return them raw or call a tool per item across messages.",
         "- A result typed `Promise<unknown>` may be structured data or text. Before reading fields, check that it is a non-null object and not an array; otherwise handle the returned text or primitive directly.",
         '- Run independent calls in parallel: `await Promise.all(items.map((item) => tools.<namespace>.<tool>(item)))`, or use `tools.<namespace>["tool-name"](item)` when the listed signature uses bracket notation.',
@@ -607,7 +599,7 @@ export const prepare = <R>(tools: HostTools<R>, catalogBudget = defaultCatalogBu
         ...(complete
           ? []
           : [
-              '- Browse one namespace: `await tools.$codemode.search({ query: "", namespace: "<name>" })`.',
+              '- Browse one namespace: `search({ query: "", namespace: "<name>" })`.',
               "- If search returns `next`, repeat the same search with `offset: next.offset`.",
             ]),
       ]
@@ -617,7 +609,7 @@ export const prepare = <R>(tools: HostTools<R>, catalogBudget = defaultCatalogBu
     "## Language",
     "",
     "Use common JavaScript data operations, functions, control flow, selected standard-library methods, and awaited tool calls. Built-ins include Date, RegExp, Map, Set, URL, URLSearchParams, and URI encoding helpers.",
-    "Modules/imports, classes, generators, timers, fetch, eval, prototype access, unlisted methods, and promise chaining are unavailable. Use Code Mode tools for external operations. Use await with try/catch.",
+    "Modules/imports, classes, generators, timers, fetch, eval, prototype access, and unlisted methods are unavailable. Use Code Mode tools for external operations. Use await with try/catch.",
     "Prefer explicit `return`; otherwise only the final top-level expression becomes the result.",
     "Dates and URLs serialize to strings at data boundaries; Map/Set/RegExp/URLSearchParams serialize to `{}`.",
   ]
@@ -629,7 +621,7 @@ export const prepare = <R>(tools: HostTools<R>, catalogBudget = defaultCatalogBu
     toolSection.push(
       complete
         ? "## Available tools (COMPLETE list - every tool is shown below with its full call signature)"
-        : `## Available tools (PARTIAL - ${totalShown} of ${described.length} shown; find the rest with tools.$codemode.search)`,
+        : `## Available tools (PARTIAL - ${totalShown} of ${described.length} shown; find the rest with search(...))`,
       "",
     )
     for (const [namespace, group] of ordered) {
@@ -647,7 +639,7 @@ export const prepare = <R>(tools: HostTools<R>, catalogBudget = defaultCatalogBu
       for (const tool of group) if (picked.has(tool)) toolSection.push(catalogLine(tool))
     }
     if (!complete) {
-      toolSection.push("", "Search returns complete callable signatures:", `- ${searchDescription.signature}`)
+      toolSection.push("", "Search returns complete callable signatures:", `- ${searchSignature}`)
     }
   }
 
@@ -676,7 +668,7 @@ const namespaceKeys = <R>(tools: HostTools<R>, path: ReadonlyArray<string>): Rea
       !Object.hasOwn(value, segment)
     ) {
       throw new ToolRuntimeError("UnknownTool", `Unknown tool namespace '${path.join(".")}'.`, [
-        "Object.keys(tools) lists the available namespaces; tools.$codemode.search({ query }) finds described tools.",
+        "Object.keys(tools) lists the available namespaces; search({ query }) finds described tools.",
       ])
     }
     value = value[segment] as HostTool<R> | Definition<R> | HostTools<R>
@@ -696,7 +688,7 @@ const resolve = <R>(tools: HostTools<R>, path: ReadonlyArray<string>): HostTool<
       !Object.hasOwn(value, segment)
     ) {
       throw new ToolRuntimeError("UnknownTool", `Unknown tool '${path.join(".")}'.`, [
-        "Use tools.$codemode.search({ query }) to find available described tools.",
+        "Use search({ query }) to find available described tools.",
       ])
     }
     value = value[segment] as HostTool<R> | Definition<R> | HostTools<R>
@@ -713,6 +705,11 @@ export type ToolRuntime<R = never> = {
   readonly root: ToolReference
   readonly calls: Array<ToolCall>
   readonly invoke: (path: ReadonlyArray<string>, args: Array<unknown>) => Effect.Effect<unknown, unknown, R>
+  /**
+   * The built-in `search` global: a synchronous discovery call that shares the tool
+   * admission pipeline (budget, audit, hooks) without living in the `tools` tree.
+   */
+  readonly search: (args: Array<unknown>) => Effect.Effect<unknown, unknown, R>
   /** Enumerable namespace/tool names at one node of the callable tool tree; see `namespaceKeys`. */
   readonly keys: (path: ReadonlyArray<string>) => ReadonlyArray<string>
 }
@@ -725,10 +722,7 @@ export const make = <R>(
   hooks?: ToolCallHooks<R>,
 ): ToolRuntime<R> => {
   const calls: Array<ToolCall> = []
-  const callableTools = {
-    ...tools,
-    [reservedNamespace]: { search: makeSearchTool(searchIndex) },
-  }
+  const searchTool = makeSearchTool(searchIndex)
 
   // Wraps the settling portion of a tool call so onToolCallEnd observes success and failure
   // symmetrically. Interruption (e.g. the execution timeout) fires neither outcome.
@@ -764,52 +758,59 @@ export const make = <R>(
     calls.push(call)
   }
 
+  const recordAndObserve = (name: string, input: unknown) =>
+    Effect.sync(() => {
+      recordCall({ name })
+      return calls.length - 1
+    }).pipe(Effect.tap((index) => hooks?.onToolCallStart?.({ index, name, input }) ?? Effect.void))
+
+  const invokeDefinition = (name: string, tool: Definition<R>, externalArgs: Array<unknown>) =>
+    Effect.gen(function* () {
+      if (externalArgs.length !== 1)
+        throw new ToolRuntimeError("InvalidToolInput", `Tool '${name}' expects exactly one input object.`)
+      const input = yield* Effect.try({
+        try: () => decodeToolInput(tool, externalArgs[0]),
+        catch: (cause) =>
+          new ToolRuntimeError("InvalidToolInput", `Invalid input for tool '${name}': ${String(cause)}`),
+      })
+      const index = yield* recordAndObserve(name, input)
+      return yield* observeEnd(
+        Effect.gen(function* () {
+          const raw = yield* runHost(Effect.suspend(() => tool.run(input)))
+          const result = yield* Effect.try({
+            try: () => decodeToolOutput(tool, raw),
+            catch: () => new ToolRuntimeError("InvalidToolOutput", `Invalid output from tool '${name}'.`),
+          })
+          return yield* decodeOutput(result, name)
+        }),
+        { index, name, input },
+      )
+    })
+
   return {
     root: new ToolReference([]),
     calls,
-    keys: (path) => namespaceKeys(callableTools, path),
+    keys: (path) => namespaceKeys(tools, path),
+    search: (args) =>
+      Effect.suspend(() =>
+        invokeDefinition(
+          "search",
+          searchTool,
+          args.map((arg) => copyOut(copyIn(arg, "Arguments for tool 'search'"))),
+        ),
+      ),
     invoke: (path, args) =>
       Effect.gen(function* () {
         const name = path.join(".")
         const externalArgs = args.map((arg) => copyOut(copyIn(arg, `Arguments for tool '${name}'`)))
-        const call = { name }
-        const recordAndObserve = (input: unknown) =>
-          Effect.sync(() => {
-            recordCall(call)
-            return calls.length - 1
-          }).pipe(Effect.tap((index) => hooks?.onToolCallStart?.({ index, name, input }) ?? Effect.void))
-        const tool = resolve(callableTools, path)
-        let describedInput: unknown
-        if (isDefinition(tool)) {
-          if (externalArgs.length !== 1)
-            throw new ToolRuntimeError("InvalidToolInput", `Tool '${name}' expects exactly one input object.`)
-          describedInput = yield* Effect.try({
-            try: () => decodeToolInput(tool, externalArgs[0]),
-            catch: (cause) =>
-              new ToolRuntimeError("InvalidToolInput", `Invalid input for tool '${name}': ${String(cause)}`),
-          })
-        }
-        const input = isDefinition(tool) ? describedInput : externalArgs
-        const index = yield* recordAndObserve(input)
-        const currentCall = { index, name, input }
-        if (isDefinition(tool)) {
-          return yield* observeEnd(
-            Effect.gen(function* () {
-              const raw = yield* runHost(Effect.suspend(() => tool.run(describedInput)))
-              const result = yield* Effect.try({
-                try: () => decodeToolOutput(tool, raw),
-                catch: () => new ToolRuntimeError("InvalidToolOutput", `Invalid output from tool '${name}'.`),
-              })
-              return yield* decodeOutput(result, name)
-            }),
-            currentCall,
-          )
-        }
+        const tool = resolve(tools, path)
+        if (isDefinition(tool)) return yield* invokeDefinition(name, tool, externalArgs)
+        const index = yield* recordAndObserve(name, externalArgs)
         return yield* observeEnd(
           Effect.gen(function* () {
             return yield* decodeOutput(yield* runHost(Effect.suspend(() => tool(...externalArgs))), name)
           }),
-          currentCall,
+          { index, name, input: externalArgs },
         )
       }),
   }

packages/codemode/src/tool-schema.ts

@@ -23,7 +23,7 @@ const effectNumberSentinel = (schema: JsonSchema) =>
 const intersection = (members: ReadonlyArray<string>): string => {
   const concrete = members.filter((member) => member !== "unknown")
   if (concrete.length === 0) return "unknown"
-  if (concrete.length === 1) return concrete[0] ?? "unknown"
+  if (concrete.length === 1) return concrete[0]
   return concrete.map((member) => (member.includes(" | ") ? `(${member})` : member)).join(" & ")
 }
 

packages/codemode/test/codemode.test.ts

@@ -541,11 +541,11 @@ describe("CodeMode public contract", () => {
       "  - tools.orders.lookup(input: {\n  id: string,\n}): Promise<{\n  id: string,\n  status: string,\n}> // Look up an order by ID",
     )
     // A fully inlined catalog does not advertise search in the instructions...
-    expect(runtime.instructions()).not.toMatch(/\$codemode/)
+    expect(runtime.instructions()).not.toContain("search(")
 
-    // ...but the search tool stays registered, so a speculative call still works with the
+    // ...but the search built-in stays available, so a speculative call still works with the
     // same signature as the inline catalog.
-    const result = await Effect.runPromise(runtime.execute(`return await tools.$codemode.search({ query: "order" })`))
+    const result = await Effect.runPromise(runtime.execute(`return search({ query: "order" })`))
     expect(result.ok).toBe(true)
     if (result.ok) {
       expect(result.value).toStrictEqual({
@@ -583,9 +583,7 @@ describe("CodeMode public contract", () => {
       'tools.context7["resolve-library-id"](input: {\n  libraryName: string,\n}): Promise<string>',
     )
 
-    const search = await Effect.runPromise(
-      runtime.execute(`return await tools.$codemode.search({ query: "resolve library id" })`),
-    )
+    const search = await Effect.runPromise(runtime.execute(`return search({ query: "resolve library id" })`))
     expect(search.ok).toBe(true)
     if (search.ok) {
       expect(search.value).toStrictEqual({
@@ -608,7 +606,7 @@ describe("CodeMode public contract", () => {
     if (call.ok) expect(call.value).toBe("/resolved/TypeScript")
 
     const exact = await Effect.runPromise(
-      runtime.execute(`return await tools.$codemode.search({ query: 'tools.context7["resolve-library-id"]' })`),
+      runtime.execute(`return search({ query: 'tools.context7["resolve-library-id"]' })`),
     )
     expect(exact.ok).toBe(true)
     if (exact.ok) expect(exact.value).toMatchObject({ remaining: 0, next: null })
@@ -632,7 +630,7 @@ describe("CodeMode public contract", () => {
     expect(instructions).toContain("Do not infer or normalize tool names")
     expect(instructions).toContain("bracket notation and quotes are part of the path")
     expect(instructions).toContain("surrounding agent tools are not available")
-    expect(instructions).toContain("Only Code Mode tools listed here and internal runtime tools")
+    expect(instructions).toContain("Only Code Mode tools listed here are available")
     // Placeholders use generic namespace/tool/field names only - no fabricated real tools
     // and no real catalog tools cherry-picked into example lines.
     expect(instructions).toContain("`const result = await tools.<namespace>.<tool>(input)`")
@@ -651,15 +649,11 @@ describe("CodeMode public contract", () => {
     // PARTIAL: the workflow starts with search (with query-style guidance that is clearly
     // a query string, never a tool name) and the browse-namespace rule appears.
     expect(partial).toContain(
-      '1. If needed, discover tools: `return await tools.$codemode.search({ query: "<intent + key nouns>" })`.',
+      '1. If needed, discover tools with the built-in search function: `return search({ query: "<intent + key nouns>" })`.',
     )
     expect(partial).toContain("In the next execution, copy a returned path exactly")
-    expect(partial).toContain(
-      "Only Code Mode tools listed here or returned by `tools.$codemode.search` and internal runtime tools",
-    )
-    expect(partial).toContain(
-      '- Browse one namespace: `await tools.$codemode.search({ query: "", namespace: "<name>" })`.',
-    )
+    expect(partial).toContain("Only Code Mode tools listed here or returned by the built-in `search` function")
+    expect(partial).toContain('- Browse one namespace: `search({ query: "", namespace: "<name>" })`.')
     expect(partial).toContain("repeat the same search with `offset: next.offset`")
     expect(partial).toContain("  limit?: number,\n  offset?: number,")
     expect(partial).not.toContain("total_count")
@@ -672,9 +666,11 @@ describe("CodeMode public contract", () => {
     expect(instructions).toContain("not a general-purpose runtime")
     expect(instructions).not.toContain("Standard modern JavaScript works")
     expect(instructions).not.toContain("TypeScript type annotations")
-    for (const missing of ["Modules/imports", "classes", "generators", "fetch", "promise chaining"]) {
+    for (const missing of ["Modules/imports", "classes", "generators", "fetch"]) {
       expect(instructions).toContain(missing)
     }
+    expect(instructions).not.toContain("new Promise(...) are unavailable")
+    expect(instructions).not.toContain("promise chaining")
     expect(instructions).toContain("URL, URLSearchParams, and URI encoding helpers")
     expect(instructions).not.toContain("host globals")
     expect(instructions).toContain("Use Code Mode tools for external operations")
@@ -694,7 +690,7 @@ describe("CodeMode public contract", () => {
     expect(instructions).toContain("## Available tools")
     expect(instructions).not.toContain("## Workflow")
     expect(instructions).not.toContain("## Rules")
-    expect(instructions).not.toMatch(/\$codemode/)
+    expect(instructions).not.toContain("search(")
   })
 
   test("uses one ranked search returning complete definitions for large catalogs", async () => {
@@ -714,17 +710,15 @@ describe("CodeMode public contract", () => {
       tools: { thread: { uploadFile: upload, generateImage: generate }, orders: { lookup } },
       discovery: { catalogBudget: 0 },
     })
-    expect(runtime.instructions()).toContain(
-      "Available tools (PARTIAL - 0 of 3 shown; find the rest with tools.$codemode.search)",
-    )
+    expect(runtime.instructions()).toContain("Available tools (PARTIAL - 0 of 3 shown; find the rest with search(...))")
     expect(runtime.instructions()).toContain("- thread (2 tools, none shown)")
     expect(runtime.instructions()).toContain("- orders (1 tool, none shown)")
-    expect(runtime.instructions()).toMatch(/\$codemode\.search/)
+    expect(runtime.instructions()).toContain("Search returns complete callable signatures:\n- search(input: {")
     expect(runtime.instructions()).not.toMatch(/tools\.thread\.uploadFile\(input/)
 
     const result = await Effect.runPromise(
       runtime.execute(`
-      return await tools.$codemode.search({
+      return search({
         query: "send message attachment upload file to current Discord thread",
         limit: 2
       })
@@ -748,14 +742,14 @@ describe("CodeMode public contract", () => {
       remaining: 0,
       next: null,
     })
-    expect(result.toolCalls).toStrictEqual([{ name: "$codemode.search" }])
+    expect(result.toolCalls).toStrictEqual([{ name: "search" }])
 
     const variants = await Effect.runPromise(
       runtime.execute(`
-      return await Promise.all([
-        tools.$codemode.search({ query: "file" }),
-        tools.$codemode.search({ query: "image" })
-      ])
+      return [
+        search({ query: "file" }),
+        search({ query: "image" })
+      ]
     `),
     )
     expect(variants.ok).toBe(true)
@@ -767,12 +761,35 @@ describe("CodeMode public contract", () => {
         "tools.thread.generateImage",
       )
     }
+  })
 
-    const removed = await Effect.runPromise(
-      runtime.execute(`return await tools.$codemode.describe({ path: "thread.uploadFile" })`),
-    )
-    expect(removed.ok).toBe(false)
-    if (!removed.ok) expect(removed.error.kind).toBe("UnknownTool")
+  test("search is a counted tool call: it burns maxToolCalls and fires the hooks", async () => {
+    const started: Array<string> = []
+    const ended: Array<string> = []
+    const limited = CodeMode.make({
+      tools,
+      limits: { maxToolCalls: 1 },
+      onToolCallStart: (call) => Effect.sync(() => void started.push(call.name)),
+      onToolCallEnd: (call) => Effect.sync(() => void ended.push(`${call.name}:${call.outcome}`)),
+    })
+    const result = await Effect.runPromise(limited.execute(`search({}); return search({})`))
+    expect(result.ok).toBe(false)
+    if (!result.ok) expect(result.error.kind).toBe("ToolCallLimitExceeded")
+    expect(started).toEqual(["search"])
+    expect(ended).toEqual(["search:success"])
+  })
+
+  test("search is an opaque, shadowable global like other built-ins", async () => {
+    const runtime = CodeMode.make({ tools })
+    expect(await Effect.runPromise(runtime.execute(`return typeof search`))).toMatchObject({ value: "function" })
+    // A program-level declaration shadows the global, as JS module scope does.
+    const shadowed = await Effect.runPromise(runtime.execute(`const search = () => "local"; return search()`))
+    expect(shadowed.ok).toBe(true)
+    if (shadowed.ok) expect(shadowed.value).toBe("local")
+    // The reference itself cannot cross the data boundary.
+    const escaped = await Effect.runPromise(runtime.execute(`return { search }`))
+    expect(escaped.ok).toBe(false)
+    if (!escaped.ok) expect(escaped.error.kind).toBe("InvalidDataValue")
   })
 
   test("search defaults to 10 results and resolves exact tool paths", async () => {
@@ -789,7 +806,7 @@ describe("CodeMode public contract", () => {
       },
     })
 
-    const browse = await Effect.runPromise(runtime.execute(`return await tools.$codemode.search({})`))
+    const browse = await Effect.runPromise(runtime.execute(`return search({})`))
     expect(browse.ok).toBe(true)
     if (browse.ok) {
       const value = browse.value as {
@@ -803,9 +820,7 @@ describe("CodeMode public contract", () => {
     }
 
     for (const query of ["many.tool13", "tools.many.tool13"]) {
-      const exact = await Effect.runPromise(
-        runtime.execute(`return await tools.$codemode.search({ query: ${JSON.stringify(query)} })`),
-      )
+      const exact = await Effect.runPromise(runtime.execute(`return search({ query: ${JSON.stringify(query)} })`))
       expect(exact.ok).toBe(true)
       if (exact.ok) {
         expect(exact.value).toStrictEqual({
@@ -839,9 +854,7 @@ describe("CodeMode public contract", () => {
     })
 
     // Empty query + namespace browses just that namespace, alphabetical by path.
-    const browse = await Effect.runPromise(
-      runtime.execute(`return await tools.$codemode.search({ query: "", namespace: "github" })`),
-    )
+    const browse = await Effect.runPromise(runtime.execute(`return search({ query: "", namespace: "github" })`))
     expect(browse.ok).toBe(true)
     if (browse.ok) {
       const value = browse.value as { items: Array<{ path: string }>; remaining: number }
@@ -853,9 +866,7 @@ describe("CodeMode public contract", () => {
     }
 
     // A query + namespace ranks within that namespace only.
-    const scoped = await Effect.runPromise(
-      runtime.execute(`return await tools.$codemode.search({ query: "issues", namespace: "linear" })`),
-    )
+    const scoped = await Effect.runPromise(runtime.execute(`return search({ query: "issues", namespace: "linear" })`))
     expect(scoped.ok).toBe(true)
     if (scoped.ok) {
       const value = scoped.value as { items: Array<{ path: string }>; remaining: number }
@@ -863,9 +874,7 @@ describe("CodeMode public contract", () => {
       expect(value.items[0]?.path).toBe("tools.linear.list_issues")
     }
 
-    const invalid = await Effect.runPromise(
-      runtime.execute(`return await tools.$codemode.search({ query: "issues", namespace: 7 })`),
-    )
+    const invalid = await Effect.runPromise(runtime.execute(`return search({ query: "issues", namespace: 7 })`))
     expect(invalid.ok).toBe(false)
     if (!invalid.ok) expect(invalid.error.kind).toBe("InvalidToolInput")
   })
@@ -890,9 +899,7 @@ describe("CodeMode public contract", () => {
 
     // "attachment" appears in neither path nor description - only in the input schema's
     // property names, which the searchable text includes.
-    const byParameter = await Effect.runPromise(
-      runtime.execute(`return await tools.$codemode.search({ query: "attachment" })`),
-    )
+    const byParameter = await Effect.runPromise(runtime.execute(`return search({ query: "attachment" })`))
     expect(byParameter.ok).toBe(true)
     if (byParameter.ok) {
       const value = byParameter.value as { items: Array<{ path: string }>; remaining: number }
@@ -901,9 +908,7 @@ describe("CodeMode public contract", () => {
     }
 
     // Substring matching: a partial word ("docum") still hits the description.
-    const bySubstring = await Effect.runPromise(
-      runtime.execute(`return await tools.$codemode.search({ query: "docum" })`),
-    )
+    const bySubstring = await Effect.runPromise(runtime.execute(`return search({ query: "docum" })`))
     expect(bySubstring.ok).toBe(true)
     if (bySubstring.ok) {
       const value = bySubstring.value as { items: Array<{ path: string }>; remaining: number }
@@ -930,9 +935,7 @@ describe("CodeMode public contract", () => {
     })
 
     // "issues" still finds the singular-only tool (term OR singular(term) per field)...
-    const plural = await Effect.runPromise(
-      runtime.execute(`return await tools.$codemode.search({ query: "issues", namespace: "tracker" })`),
-    )
+    const plural = await Effect.runPromise(runtime.execute(`return search({ query: "issues", namespace: "tracker" })`))
     expect(plural.ok).toBe(true)
     if (plural.ok) {
       const value = plural.value as { items: Array<{ path: string }>; remaining: number }
@@ -941,7 +944,7 @@ describe("CodeMode public contract", () => {
     }
 
     // ...while a true "issues" path match still outranks the singular-only description match.
-    const ranked = await Effect.runPromise(runtime.execute(`return await tools.$codemode.search({ query: "issues" })`))
+    const ranked = await Effect.runPromise(runtime.execute(`return search({ query: "issues" })`))
     expect(ranked.ok).toBe(true)
     if (ranked.ok) {
       const value = ranked.value as { items: Array<{ path: string }>; remaining: number }
@@ -968,7 +971,7 @@ describe("CodeMode public contract", () => {
         alpha: { beta: simple("Middle"), aardvark: simple("First") },
       },
     })
-    const browse = await Effect.runPromise(runtime.execute(`return await tools.$codemode.search({})`))
+    const browse = await Effect.runPromise(runtime.execute(`return search({})`))
     expect(browse.ok).toBe(true)
     if (browse.ok) {
       const value = browse.value as { items: Array<{ path: string }>; remaining: number; next: unknown }
@@ -981,9 +984,7 @@ describe("CodeMode public contract", () => {
       expect(value.next).toBeNull()
     }
 
-    const middle = await Effect.runPromise(
-      runtime.execute(`return await tools.$codemode.search({ limit: 1, offset: 1 })`),
-    )
+    const middle = await Effect.runPromise(runtime.execute(`return search({ limit: 1, offset: 1 })`))
     expect(middle.ok).toBe(true)
     if (middle.ok) {
       expect(middle.value).toMatchObject({
@@ -993,9 +994,7 @@ describe("CodeMode public contract", () => {
       })
     }
 
-    const exhausted = await Effect.runPromise(
-      runtime.execute(`return await tools.$codemode.search({ limit: 1, offset: 3 })`),
-    )
+    const exhausted = await Effect.runPromise(runtime.execute(`return search({ limit: 1, offset: 3 })`))
     expect(exhausted.ok).toBe(true)
     if (exhausted.ok) expect(exhausted.value).toStrictEqual({ items: [], remaining: 0, next: null })
   })
@@ -1026,16 +1025,14 @@ describe("CodeMode public contract", () => {
     })
 
     const instructions = runtime.instructions()
-    expect(instructions).toContain(
-      "Available tools (PARTIAL - 2 of 3 shown; find the rest with tools.$codemode.search)",
-    )
+    expect(instructions).toContain("Available tools (PARTIAL - 2 of 3 shown; find the rest with search(...))")
     expect(instructions).toContain("- alpha (2 tools, 1 shown)")
     expect(instructions).toContain("  - tools.alpha.cheap(input: {\n  q: string,\n}): Promise<string> // Cheap")
     expect(instructions).not.toContain("tools.alpha.expensive(")
     // Fully shown namespaces read cleanly (no "shown" annotation).
     expect(instructions).toContain("- beta (1 tool)")
     expect(instructions).toContain("  - tools.beta.cheap(input: {\n  q: string,\n}): Promise<string> // Cheap")
-    expect(instructions).toMatch(/\$codemode\.search/)
+    expect(instructions).toContain("Search returns complete callable signatures:\n- search(input: {")
   })
 
   test("charges inline JSDoc against the catalog token budget", () => {
@@ -1056,9 +1053,7 @@ describe("CodeMode public contract", () => {
     })
 
     expect(runtime.catalog()[0]?.signature).toContain("/** A detailed identifier description.")
-    expect(runtime.instructions()).toContain(
-      "Available tools (PARTIAL - 0 of 1 shown; find the rest with tools.$codemode.search)",
-    )
+    expect(runtime.instructions()).toContain("Available tools (PARTIAL - 0 of 1 shown; find the rest with search(...))")
     expect(runtime.instructions()).not.toContain("tools.records.lookup(input:")
   })
 
@@ -1136,7 +1131,7 @@ describe("CodeMode public contract", () => {
       CodeMode.make({
         tools,
         discovery: { catalogBudget: 0 },
-      }).execute(`return await tools.$codemode.search({ query: "order", limit: 0.5 })`),
+      }).execute(`return search({ query: "order", limit: 0.5 })`),
     )
     expect(result.ok).toBe(false)
     if (result.ok) return
@@ -1144,9 +1139,7 @@ describe("CodeMode public contract", () => {
 
     for (const offset of [-1, 0.5, Number.MAX_SAFE_INTEGER + 1, "1"]) {
       const invalidOffset = await Effect.runPromise(
-        CodeMode.make({ tools }).execute(
-          `return await tools.$codemode.search({ query: "order", offset: ${JSON.stringify(offset)} })`,
-        ),
+        CodeMode.make({ tools }).execute(`return search({ query: "order", offset: ${JSON.stringify(offset)} })`),
       )
       expect(invalidOffset.ok).toBe(false)
       if (!invalidOffset.ok) expect(invalidOffset.error.kind).toBe("InvalidToolInput")
@@ -1197,8 +1190,4 @@ describe("CodeMode public contract", () => {
     }
     expect(elapsedMs).toBeLessThan(3_000)
   })
-
-  test("reserves the discovery namespace", () => {
-    expect(() => CodeMode.make({ tools: { $codemode: { lookup } } })).toThrow(/reserved for CodeMode discovery tools/)
-  })
 })

packages/codemode/test/enumeration.test.ts

@@ -41,7 +41,7 @@ describe("Object.keys over tool references", () => {
       const namespaces = Object.keys(tools)
       return { namespaces, count: namespaces.length }
     `),
-    ).toEqual({ namespaces: ["github", "memory", "playwright", "$codemode"], count: 4 })
+    ).toEqual({ namespaces: ["github", "memory", "playwright"], count: 3 })
   })
 
   test("enumerates tool names at a nested namespace", async () => {
@@ -52,8 +52,8 @@ describe("Object.keys over tool references", () => {
     expect(await value(`return Object.keys(tools.github.list_issues)`)).toEqual([])
   })
 
-  test("the internal discovery namespace enumerates its callable surface", async () => {
-    expect(await value(`return Object.keys(tools.$codemode)`)).toEqual(["search"])
+  test("search is a global built-in function", async () => {
+    expect(await value(`return typeof search`)).toBe("function")
   })
 
   test("an unknown namespace is an UnknownTool error pointing at the discovery idioms", async () => {
@@ -68,7 +68,7 @@ describe("Object.keys over tool references", () => {
       const failure = await error(`return Object.${method}(tools)`)
       expect(failure.kind).toBe("InvalidDataValue")
       expect(failure.message).toContain(
-        `Object.${method}(...) cannot read tool references: they are not plain data. Use Object.keys(tools) for names, or tools.$codemode.search({ query }) for signatures.`,
+        `Object.${method}(...) cannot read tool references: they are not plain data. Use Object.keys(tools) for names, or search({ query }) for signatures.`,
       )
     }
     const nested = await error(`return Object.entries(tools.github)`)
@@ -146,7 +146,7 @@ describe("for...in", () => {
       }
       return names
     `),
-    ).toEqual(["github.list_issues", "github.get_issue", "memory.search", "playwright.navigate", "$codemode.search"])
+    ).toEqual(["github.list_issues", "github.get_issue", "memory.search", "playwright.navigate"])
   })
 
   test("unsupported values fail with a hint at for...of and Object.keys", async () => {

packages/codemode/test/openapi.test.ts

@@ -377,7 +377,7 @@ describe("OpenAPI.fromSpec", () => {
       runtime
         .execute(
           `
-        return await tools.$codemode.search({ query: "global health", namespace: "opencode", limit: 1 })
+        return search({ query: "global health", namespace: "opencode", limit: 1 })
       `,
         )
         .pipe(Effect.provide(layer)),

packages/codemode/test/promise-test262.test.ts

@@ -16,8 +16,7 @@ import { describe, expect, test } from "bun:test"
 import { Effect } from "effect"
 import { CodeMode } from "../src/index.js"
 
-const execute = (code: string) =>
-  Effect.runPromise(CodeMode.execute({ code, tools: {}, limits: { timeoutMs: 1_000 } }))
+const execute = (code: string) => Effect.runPromise(CodeMode.execute({ code, tools: {}, limits: { timeoutMs: 1_000 } }))
 
 const value = async (code: string) => {
   const result = await execute(code)
@@ -450,7 +449,10 @@ describe("Test262 async functions and await", () => {
         const promises = [declaration(), expression(), arrow()]
         return [promises.map((item) => item instanceof Promise), await Promise.all(promises)]
       `),
-    ).toEqual([[true, true, true], [1, 2, 3]])
+    ).toEqual([
+      [true, true, true],
+      [1, 2, 3],
+    ])
   })
 
   test("async bodies adopt returns and reject throws before and after await", async () => {
@@ -479,13 +481,7 @@ describe("Test262 async functions and await", () => {
           await observe(throwsAfter()),
         ]
       `),
-    ).toEqual([
-      ["body"],
-      ["fulfilled", 42],
-      ["fulfilled", 43],
-      ["rejected", 1],
-      ["rejected", 2],
-    ])
+    ).toEqual([["body"], ["fulfilled", 42], ["fulfilled", 43], ["rejected", 1], ["rejected", 2]])
   })
 
   test("default-parameter throws reject instead of escaping the call", async () => {
@@ -577,13 +573,14 @@ describe("Test262 async functions and await", () => {
 })
 
 describe("Test262 expected Promise conformance", () => {
-  for (const name of ["all", "allSettled", "race"] as const) {
-    test.failing(`Promise.${name} rejects invalid input with TypeError`, async () => {
+  for (const name of ["all", "allSettled", "race", "any"] as const) {
+    test(`Promise.${name} rejects invalid input with TypeError`, async () => {
       // Sources:
       // test/built-ins/Promise/all/S25.4.4.1_A3.1_T1.js
       // test/built-ins/Promise/all/S25.4.4.1_A3.1_T2.js
       // test/built-ins/Promise/allSettled/iter-arg-is-number-reject.js
       // test/built-ins/Promise/race/iter-arg-is-number-reject.js
+      // test/built-ins/Promise/any/iter-arg-is-number-reject.js
       expect(
         await value(`
           try {
@@ -599,7 +596,7 @@ describe("Test262 expected Promise conformance", () => {
     })
   }
 
-  test.failing("Promise.all consumes sparse positions as undefined", async () => {
+  test("Promise.all consumes sparse positions as undefined", async () => {
     // Source: test/built-ins/Array/from/from-array.js (array iterator hole behavior)
     expect(
       await value(`
@@ -611,7 +608,7 @@ describe("Test262 expected Promise conformance", () => {
     ).toEqual([2, true, 1])
   })
 
-  test.failing("Promise.allSettled consumes sparse positions as undefined", async () => {
+  test("Promise.allSettled consumes sparse positions as undefined", async () => {
     // Source: test/built-ins/Array/from/from-array.js (array iterator hole behavior)
     expect(
       await value(`
@@ -623,7 +620,7 @@ describe("Test262 expected Promise conformance", () => {
     ).toEqual([2, "fulfilled", true, { status: "fulfilled", value: 1 }])
   })
 
-  test.failing("Promise.race consumes a sparse first position as undefined", async () => {
+  test("Promise.race consumes a sparse first position as undefined", async () => {
     // Source: test/built-ins/Array/from/from-array.js (array iterator hole behavior)
     expect(
       await value(`
@@ -634,7 +631,18 @@ describe("Test262 expected Promise conformance", () => {
     ).toBe(true)
   })
 
-  test.failing("Promise.all settles after reactions attached to its inputs", async () => {
+  test("Promise.any consumes a sparse first position as an undefined fulfillment", async () => {
+    // Source: test/built-ins/Array/from/from-array.js (array iterator hole behavior)
+    expect(
+      await value(`
+        const input = []
+        input[1] = Promise.reject("loses")
+        return (await Promise.any(input)) === undefined
+      `),
+    ).toBe(true)
+  })
+
+  test("Promise.all settles after reactions attached to its inputs", async () => {
     // Sources:
     // test/built-ins/Promise/all/S25.4.4.1_A7.2_T1.js
     // test/built-ins/Promise/all/S25.4.4.1_A8.1_T1.js
@@ -653,7 +661,7 @@ describe("Test262 expected Promise conformance", () => {
     ).toEqual([1, 2, 3, 4, 5])
   })
 
-  test.failing("Promise.allSettled settles after reactions attached to its inputs", async () => {
+  test("Promise.allSettled settles after reactions attached to its inputs", async () => {
     // Sources:
     // test/built-ins/Promise/allSettled/resolved-sequence.js
     // test/built-ins/Promise/allSettled/resolved-sequence-extra-ticks.js
@@ -674,7 +682,7 @@ describe("Test262 expected Promise conformance", () => {
     ).toEqual([1, 2, 3, 4, 5])
   })
 
-  test.failing("Promise.race settles in a reaction after its winning input", async () => {
+  test("Promise.race settles in a reaction after its winning input", async () => {
     // Sources:
     // test/built-ins/Promise/race/S25.4.4.3_A6.1_T1.js
     // test/built-ins/Promise/race/resolved-sequence-extra-ticks.js
@@ -692,7 +700,7 @@ describe("Test262 expected Promise conformance", () => {
     ).toEqual([1, 2, 3, 4, 5])
   })
 
-  test.failing("then reactions route and propagate fulfillment and rejection", async () => {
+  test("then reactions route and propagate fulfillment and rejection", async () => {
     // Sources:
     // test/built-ins/Promise/prototype/then/prfm-fulfilled.js
     // test/built-ins/Promise/prototype/then/prfm-rejected.js
@@ -726,7 +734,7 @@ describe("Test262 expected Promise conformance", () => {
     ])
   })
 
-  test.failing("then reactions preserve breadth-first queue order", async () => {
+  test("then reactions preserve breadth-first queue order", async () => {
     // Source: test/built-ins/Promise/prototype/then/S25.4.4_A1.1_T1.js
     expect(
       await value(`
@@ -741,7 +749,7 @@ describe("Test262 expected Promise conformance", () => {
     ).toEqual([1, 2, 3, 4, 5, 6, 7, 8])
   })
 
-  test.failing("then rejects direct self-resolution for fulfilled and rejected sources", async () => {
+  test("then rejects direct self-resolution for fulfilled and rejected sources", async () => {
     // Sources:
     // test/built-ins/Promise/prototype/then/resolve-settled-fulfilled-self.js
     // test/built-ins/Promise/prototype/then/resolve-settled-rejected-self.js
@@ -761,7 +769,7 @@ describe("Test262 expected Promise conformance", () => {
     ).toEqual(["TypeError", "TypeError"])
   })
 
-  test.failing("catch delegates rejection handling and preserves fulfillment", async () => {
+  test("catch delegates rejection handling and preserves fulfillment", async () => {
     // Sources:
     // test/built-ins/Promise/prototype/catch/S25.4.5.1_A2.1_T1.js
     // test/built-ins/Promise/prototype/catch/S25.4.5.1_A3.1_T1.js
@@ -776,7 +784,7 @@ describe("Test262 expected Promise conformance", () => {
     ).toEqual([1, 4])
   })
 
-  test.failing("finally preserves or replaces the original settlement", async () => {
+  test("finally preserves or replaces the original settlement", async () => {
     // Sources:
     // test/built-ins/Promise/prototype/finally/resolution-value-no-override.js
     // test/built-ins/Promise/prototype/finally/rejection-reason-no-fulfill.js
@@ -799,7 +807,109 @@ describe("Test262 expected Promise conformance", () => {
     ])
   })
 
-  test.failing("await always resumes in a later reaction and interleaves async functions", async () => {
+  test("then ignores non-callable handlers", async () => {
+    // Sources:
+    // test/built-ins/Promise/prototype/then/S25.4.5.3_A4.1_T1.js
+    // test/built-ins/Promise/prototype/then/S25.4.5.3_A4.1_T2.js
+    // test/built-ins/Promise/prototype/then/S25.4.5.3_A5.1_T1.js
+    // test/built-ins/Promise/prototype/then/S25.4.5.3_A5.2_T1.js
+    // (adapted: only non-callable handlers are probed; callables that are not plain
+    //  functions, such as tool references, intentionally throw in CodeMode)
+    expect(
+      await value(`
+        const observe = async (promise) => {
+          try { return ["fulfilled", await promise] } catch (reason) { return ["rejected", reason] }
+        }
+        return await Promise.all([
+          observe(Promise.resolve(1).then(2)),
+          observe(Promise.resolve(4).then(null, null)),
+          observe(Promise.resolve(5).then({}, "x")),
+          observe(Promise.reject(3).then(null, "x")),
+          observe(Promise.reject(6).then(7, {})),
+        ])
+      `),
+    ).toEqual([
+      ["fulfilled", 1],
+      ["fulfilled", 4],
+      ["fulfilled", 5],
+      ["rejected", 3],
+      ["rejected", 6],
+    ])
+  })
+
+  test("finally waits for a returned promise and preserves or replaces settlement", async () => {
+    // Sources:
+    // test/built-ins/Promise/prototype/finally/resolved-observable-then-calls.js
+    // test/built-ins/Promise/prototype/finally/rejected-observable-then-calls.js
+    // test/built-ins/Promise/prototype/finally/resolution-value-no-override.js
+    expect(
+      await value(`
+        const observe = async (promise) => {
+          try { return ["fulfilled", await promise] } catch (reason) { return ["rejected", reason] }
+        }
+        const order = []
+        const cleanup = async () => {
+          await Promise.resolve()
+          order.push("cleanup")
+        }
+        const settled = await Promise.resolve("kept").finally(() => cleanup())
+        order.push("settled:" + settled)
+        return [
+          await observe(Promise.resolve(1).finally(() => Promise.resolve(99))),
+          order,
+          await observe(Promise.resolve(2).finally(() => Promise.reject(3))),
+          await observe(Promise.reject(4).finally(() => Promise.resolve(99))),
+        ]
+      `),
+    ).toEqual([
+      ["fulfilled", 1],
+      ["cleanup", "settled:kept"],
+      ["rejected", 3],
+      ["rejected", 4],
+    ])
+  })
+
+  test("then adopts a returned rejected promise", async () => {
+    // Sources:
+    // test/built-ins/Promise/prototype/then/rxn-handler-fulfilled-return-abrupt.js
+    // test/built-ins/Promise/resolve/resolve-promise.js
+    // (adapted: the fulfillment handler returns an already-rejected promise instead of
+    //  throwing, and the rejection handler recovers with a fulfilled promise)
+    expect(
+      await value(`
+        const observe = async (promise) => {
+          try { return ["fulfilled", await promise] } catch (reason) { return ["rejected", reason] }
+        }
+        return await Promise.all([
+          observe(Promise.resolve(1).then(() => Promise.reject("bad"))),
+          observe(Promise.reject(2).then(undefined, () => Promise.resolve("ok"))),
+        ])
+      `),
+    ).toEqual([
+      ["rejected", "bad"],
+      ["fulfilled", "ok"],
+    ])
+  })
+
+  test("independent reactions on one source each observe the same settlement", async () => {
+    // Source: test/built-ins/Promise/prototype/then/S25.4.4_A2.1_T1.js
+    // (adapted: the multiple-reactions family is asserted through the values every
+    //  reaction returns instead of a shared completion counter)
+    expect(
+      await value(`
+        const fulfilled = Promise.resolve(7)
+        const rejected = Promise.reject(8)
+        return await Promise.all([
+          fulfilled.then((value) => "first:" + value),
+          fulfilled.then((value) => "second:" + value),
+          rejected.catch((reason) => "first:" + reason),
+          rejected.catch((reason) => "second:" + reason),
+        ])
+      `),
+    ).toEqual(["first:7", "second:7", "first:8", "second:8"])
+  })
+
+  test("await always resumes in a later reaction and interleaves async functions", async () => {
     // Sources:
     // test/language/expressions/await/async-await-interleaved.js
     // test/language/expressions/await/await-non-promise.js
@@ -814,7 +924,7 @@ describe("Test262 expected Promise conformance", () => {
     ).toEqual(["first:1", "second:1", "first:2", "second:2"])
   })
 
-  test.failing("an async function rejects when it resolves with its own promise", async () => {
+  test("an async function rejects when it resolves with its own promise", async () => {
     // Adapted from the self-resolution requirement represented by:
     // test/built-ins/Promise/resolve-self.js
     // test/built-ins/Promise/resolve/S25.4.4.5_A4.1_T1.js
@@ -904,3 +1014,410 @@ describe("Test262 expected Promise conformance", () => {
     ).toBe(true)
   })
 })
+
+describe("Test262 Promise.any", () => {
+  test("is a callable static that returns a promise", async () => {
+    // Sources:
+    // test/built-ins/Promise/any/is-function.js
+    // test/built-ins/Promise/any/returns-promise.js
+    expect(
+      await value(`
+        const promise = Promise.any([1])
+        return [typeof Promise.any, promise instanceof Promise, await promise]
+      `),
+    ).toEqual(["function", true, 1])
+  })
+
+  test("fulfills with the first fulfilled member, ignoring rejections", async () => {
+    // Sources:
+    // test/built-ins/Promise/any/resolved-sequence-mixed.js
+    // test/built-ins/Promise/any/resolved-sequence-with-rejections.js
+    // test/built-ins/Promise/any/reject-ignored-immed.js
+    expect(
+      await value(`
+        return [
+          await Promise.any([Promise.reject("a"), Promise.resolve(1), Promise.resolve(2)]),
+          await Promise.any([Promise.reject("a"), "plain", Promise.reject("b")]),
+        ]
+      `),
+    ).toEqual([1, "plain"])
+  })
+
+  test("a fulfillment wins over a later rejection of another member", async () => {
+    // Sources:
+    // test/built-ins/Promise/any/resolve-ignores-late-rejection.js
+    // test/built-ins/Promise/any/resolve-ignores-late-rejection-deferred.js
+    expect(
+      await value(`
+        let rejectLate
+        const late = new Promise((_, reject) => { rejectLate = reject })
+        const result = await Promise.any([late, Promise.resolve("won")])
+        rejectLate("too late")
+        return result
+      `),
+    ).toBe("won")
+  })
+
+  test("rejects with an AggregateError carrying the reasons in input order", async () => {
+    // Sources:
+    // test/built-ins/Promise/any/reject-all-mixed.js
+    // test/built-ins/Promise/any/reject-immed.js
+    // test/built-ins/Promise/any/reject-deferred.js
+    expect(
+      await value(`
+        let rejectLate
+        const late = new Promise((_, reject) => { rejectLate = reject })
+        const aggregate = Promise.any([Promise.reject("first"), late, Promise.reject("third")])
+        rejectLate("second")
+        try {
+          await aggregate
+          return "fulfilled"
+        } catch (error) {
+          return {
+            isAggregate: error instanceof AggregateError,
+            isError: error instanceof Error,
+            name: error.name,
+            message: error.message,
+            errors: error.errors,
+          }
+        }
+      `),
+    ).toEqual({
+      isAggregate: true,
+      isError: true,
+      name: "AggregateError",
+      message: "All promises were rejected",
+      errors: ["first", "second", "third"],
+    })
+  })
+
+  test("rejects an empty input with an empty AggregateError", async () => {
+    // Source: test/built-ins/Promise/any/iter-arg-is-empty-iterable-reject.js
+    expect(
+      await value(`
+        try {
+          await Promise.any([])
+          return "fulfilled"
+        } catch (error) {
+          return [error instanceof AggregateError, error.errors.length]
+        }
+      `),
+    ).toEqual([true, 0])
+  })
+
+  test("consumes a string input as its characters", async () => {
+    // Source: test/built-ins/Promise/any/iter-arg-is-string-resolve.js
+    expect(await value(`return await Promise.any("abc")`)).toBe("a")
+  })
+
+  test("rejects an empty string input with an empty AggregateError", async () => {
+    // Source: test/built-ins/Promise/any/iter-arg-is-empty-string-reject.js
+    expect(
+      await value(`
+        try {
+          await Promise.any("")
+          return "fulfilled"
+        } catch (error) {
+          return [error instanceof AggregateError, error.errors.length]
+        }
+      `),
+    ).toEqual([true, 0])
+  })
+
+  test("fulfills with the first member that does not reject", async () => {
+    // Sources:
+    // test/built-ins/Promise/any/resolve-from-reject-catch.js
+    // test/built-ins/Promise/any/resolve-from-resolve-reject-catch.js
+    expect(
+      await value(`
+        return await Promise.any([
+          Promise.reject("a"),
+          new Promise((resolve, reject) => reject("b")),
+          Promise.all([Promise.reject("c")]),
+          Promise.resolve(Promise.reject("d").catch((reason) => reason)),
+        ])
+      `),
+    ).toBe("d")
+  })
+
+  test("settles after reactions attached to its inputs", async () => {
+    // Source: test/built-ins/Promise/any/resolved-sequence.js
+    expect(
+      await value(`
+        const sequence = [1]
+        const input = Promise.resolve(1)
+        const aggregate = Promise.any([input])
+        aggregate.then(() => sequence.push(4))
+        input.then(() => sequence.push(3)).then(() => sequence.push(5))
+        sequence.push(2)
+        await aggregate
+        await Promise.resolve()
+        return sequence
+      `),
+    ).toEqual([1, 2, 3, 4, 5])
+  })
+})
+
+describe("Test262 AggregateError", () => {
+  test("constructs from an errors collection and an optional message", async () => {
+    // Sources:
+    // test/built-ins/AggregateError/errors-iterabletolist.js
+    // test/built-ins/AggregateError/message-undefined-no-prop.js
+    expect(
+      await value(`
+        const input = ["x", "y"]
+        const withMessage = new AggregateError(input, "msg")
+        const bare = new AggregateError([])
+        return [
+          withMessage.name,
+          withMessage.message,
+          withMessage.errors,
+          withMessage.errors !== input,
+          withMessage instanceof AggregateError,
+          withMessage instanceof Error,
+          bare.message,
+          bare.errors,
+        ]
+      `),
+    ).toEqual(["AggregateError", "msg", ["x", "y"], true, true, true, "", []])
+  })
+
+  test("rejects a non-collection errors argument with TypeError", async () => {
+    // Source: test/built-ins/AggregateError/errors-iterabletolist-failures.js
+    expect(
+      await value(`
+        try {
+          new AggregateError(42)
+          return "constructed"
+        } catch (error) {
+          return error.name
+        }
+      `),
+    ).toBe("TypeError")
+  })
+
+  test("is callable without new", async () => {
+    // Source: test/built-ins/AggregateError/newtarget-is-undefined.js
+    expect(
+      await value(`
+        const error = AggregateError(["x"], "m")
+        return [error instanceof AggregateError, error instanceof Error, error.name, error.message, error.errors]
+      `),
+    ).toEqual([true, true, "AggregateError", "m", ["x"]])
+  })
+
+  test("coerces a non-string message to a string", async () => {
+    // Source: test/built-ins/AggregateError/message-method-prop-cast.js (value coercion only; the
+    // upstream object-with-toString case is omitted because the sandbox has no user toString dispatch)
+    expect(
+      await value(`
+        return [
+          new AggregateError([], 42).message,
+          new AggregateError([], false).message,
+          new AggregateError([], true).message,
+          new AggregateError([], null).message,
+        ]
+      `),
+    ).toEqual(["42", "false", "true", "null"])
+  })
+})
+
+describe("Test262 Promise constructor", () => {
+  test("constructs a promise, handing the executor callable resolve/reject", async () => {
+    // Sources:
+    // test/built-ins/Promise/constructor.js
+    // test/built-ins/Promise/exec-args.js
+    expect(
+      await value(`
+        let observed
+        const promise = new Promise((resolve, reject) => {
+          observed = [typeof resolve, typeof reject]
+          resolve("done")
+        })
+        return [promise instanceof Promise, observed, await promise]
+      `),
+    ).toEqual([true, ["function", "function"], "done"])
+  })
+
+  test("a missing or non-callable executor is a TypeError", async () => {
+    // Source: test/built-ins/Promise/executor-not-callable.js
+    expect(
+      await value(`
+        const outcomes = []
+        for (const make of [() => new Promise(), () => new Promise(1), () => new Promise({})]) {
+          try {
+            make()
+            outcomes.push("constructed")
+          } catch (error) {
+            outcomes.push(error.name)
+          }
+        }
+        return outcomes
+      `),
+    ).toEqual(["TypeError", "TypeError", "TypeError"])
+  })
+
+  test("resolves immediately or later through an escaping resolver", async () => {
+    // Sources:
+    // test/built-ins/Promise/resolve-non-thenable-immed.js
+    // test/built-ins/Promise/resolve-non-thenable-deferred.js
+    // test/built-ins/Promise/create-resolving-functions-resolve.js
+    expect(
+      await value(`
+        let settle
+        const deferred = new Promise((resolve) => { settle = resolve })
+        const immediate = new Promise((resolve) => resolve("now"))
+        settle("later")
+        return [await immediate, await deferred]
+      `),
+    ).toEqual(["now", "later"])
+  })
+
+  test("rejects through reject and through an abrupt executor completion", async () => {
+    // Sources:
+    // test/built-ins/Promise/reject-via-fn-immed.js
+    // test/built-ins/Promise/reject-via-abrupt.js
+    expect(
+      await value(`
+        const observe = async (promise) => {
+          try { return ["fulfilled", await promise] } catch (reason) { return ["rejected", reason.message ?? reason] }
+        }
+        return [
+          await observe(new Promise((_, reject) => reject("nope"))),
+          await observe(new Promise(() => { throw new Error("boom") })),
+        ]
+      `),
+    ).toEqual([
+      ["rejected", "nope"],
+      ["rejected", "boom"],
+    ])
+  })
+
+  test("only the first settlement counts", async () => {
+    // Sources:
+    // test/built-ins/Promise/reject-ignored-via-fn-immed.js
+    // test/built-ins/Promise/resolve-ignored-via-fn-immed.js
+    expect(
+      await value(`
+        return [
+          await new Promise((resolve, reject) => { resolve("first"); reject("second"); resolve("third") }),
+          await new Promise((resolve) => { resolve(resolve("inner") === undefined ? "unreached" : "also unreached") }),
+        ]
+      `),
+    ).toEqual(["first", "inner"])
+  })
+
+  test("escaped resolvers keep first-settle-wins in both directions", async () => {
+    // Sources:
+    // test/built-ins/Promise/reject-ignored-via-fn-deferred.js
+    // test/built-ins/Promise/resolve-ignored-via-fn-deferred.js
+    expect(
+      await value(`
+        let resolveRejected, rejectRejected
+        const rejected = new Promise((resolve, reject) => { resolveRejected = resolve; rejectRejected = reject })
+        rejectRejected("first")
+        const lateResolve = resolveRejected("late")
+        let resolveFulfilled, rejectFulfilled
+        const fulfilled = new Promise((resolve, reject) => { resolveFulfilled = resolve; rejectFulfilled = reject })
+        resolveFulfilled()
+        const lateReject = rejectFulfilled(new Promise(() => {}))
+        try {
+          await rejected
+          return "fulfilled"
+        } catch (reason) {
+          return [reason, lateResolve === undefined, (await fulfilled) === undefined, lateReject === undefined]
+        }
+      `),
+    ).toEqual(["first", true, true, true])
+  })
+
+  test("a queued reaction chain observes a later rejection through a handler-less then", async () => {
+    // Sources:
+    // test/built-ins/Promise/reject-via-fn-immed-queue.js
+    // test/built-ins/Promise/reject-via-fn-deferred-queue.js
+    // test/built-ins/Promise/reject-via-abrupt-queue.js
+    expect(
+      await value(`
+        const observe = (promise) => promise.then(() => "wrong").then(() => "also wrong", (reason) => "caught:" + reason)
+        let reject
+        const deferred = new Promise((_, r) => { reject = r })
+        const chained = observe(deferred)
+        reject("boom")
+        return [
+          await observe(new Promise((_, r) => r("immed"))),
+          await chained,
+          await observe(new Promise(() => { throw "abrupt" })),
+        ]
+      `),
+    ).toEqual(["caught:immed", "caught:boom", "caught:abrupt"])
+  })
+
+  test("an exception after resolve is ignored", async () => {
+    // Source: test/built-ins/Promise/exception-after-resolve-in-executor.js
+    expect(await value(`return await new Promise((resolve) => { resolve("kept"); throw new Error("dropped") })`)).toBe(
+      "kept",
+    )
+  })
+
+  test("resolving with a promise adopts its settlement", async () => {
+    // Sources:
+    // test/built-ins/Promise/resolve-thenable-immed.js (promise-adoption portion)
+    // test/built-ins/Promise/all/S25.4.4.1_A2.3_T1.js (resolution adoption semantics)
+    expect(
+      await value(`
+        const adoptedValue = await new Promise((resolve) => resolve(Promise.resolve("adopted")))
+        try {
+          await new Promise((resolve) => resolve(Promise.reject("bad")))
+          return [adoptedValue, "fulfilled"]
+        } catch (reason) {
+          return [adoptedValue, reason]
+        }
+      `),
+    ).toEqual(["adopted", "bad"])
+  })
+
+  test("resolving with the promise itself rejects with TypeError", async () => {
+    // Source: test/built-ins/Promise/resolve-self.js
+    expect(
+      await value(`
+        let settle
+        const promise = new Promise((resolve) => { settle = resolve })
+        settle(promise)
+        try {
+          await promise
+          return "fulfilled"
+        } catch (error) {
+          return error.name
+        }
+      `),
+    ).toBe("TypeError")
+  })
+
+  test("executor runs synchronously before the constructor returns", async () => {
+    // Source: test/built-ins/Promise/executor-call-context-strict.js (synchronous Call(executor) step)
+    expect(
+      await value(`
+        const sequence = []
+        sequence.push("before")
+        new Promise((resolve) => { sequence.push("executor"); resolve() })
+        sequence.push("after")
+        return sequence
+      `),
+    ).toEqual(["before", "executor", "after"])
+  })
+
+  test.failing("calling Promise without new throws TypeError", async () => {
+    // Source: test/built-ins/Promise/undefined-newtarget.js
+    // The sandbox currently reports a generic Error ("Only tools are callable in CodeMode.").
+    expect(
+      await value(`
+        try {
+          Promise(() => {})
+          return "called"
+        } catch (error) {
+          return error.name
+        }
+      `),
+    ).toBe("TypeError")
+  })
+})

packages/codemode/test/promise.test.ts

@@ -3,8 +3,9 @@ import { Effect, Schema } from "effect"
 import { CodeMode, Tool, toolError } from "../src/index.js"
 
 // Wave 5 acceptance suite: first-class promise values. Un-awaited tool calls start eagerly on
-// supervised fibers, `await` settles them, and Promise.all/allSettled/race/resolve/reject are
-// ordinary functions over arbitrary arrays mixing promises and plain values.
+// supervised fibers, `await` settles them, Promise.all/allSettled/race/resolve/reject are
+// ordinary functions over arbitrary arrays mixing promises and plain values, and
+// .then/.catch/.finally chain reactions onto any promise.
 
 type Trace = {
   starts: Array<number>
@@ -184,7 +185,7 @@ describe("first-class promise values", () => {
     expect(result.toolCalls).toStrictEqual([{ name: "host.sleepy" }])
   })
 
-  test("await of a non-promise value is a passthrough no-op", async () => {
+  test("await of a non-promise value passes it through unchanged", async () => {
     expect(await value(`return await 42`)).toBe(42)
     expect(await value(`const x = await "s"; return x`)).toBe("s")
     expect(await value(`return await null`)).toBeNull()
@@ -935,16 +936,124 @@ describe("timeout interruption of forked calls", () => {
   })
 })
 
-describe("unsupported promise surface", () => {
-  test(".then/.catch/.finally give a clear await-instead error", async () => {
-    for (const method of ["then", "catch", "finally"]) {
-      const diagnostic = await error(`return tools.host.sleepy({ id: 1 }).${method}((x) => x)`)
-      expect(diagnostic.kind).toBe("UnsupportedSyntax")
-      expect(diagnostic.message).toContain(`Promise.prototype.${method} is not supported`)
-      expect(diagnostic.message).toContain("await")
-    }
+describe("promise chaining", () => {
+  test("then transforms tool results and adopts returned promises across a chain", async () => {
+    expect(
+      await value(`
+        return await tools.host
+          .sleepy({ id: 2 })
+          .then((id) => tools.host.sleepy({ id: id + 1 }))
+          .then((id) => id * 10)
+      `),
+    ).toBe(30)
   })
 
+  test("handlers are deferred and run in attach order", async () => {
+    expect(
+      await value(`
+        const order = []
+        const promise = Promise.resolve(1)
+        promise.then(() => order.push("h1"))
+        promise.then(() => order.push("h2"))
+        order.push("sync")
+        await promise
+        return order
+      `),
+    ).toEqual(["sync", "h1", "h2"])
+  })
+
+  test("catch recovers a tool failure and preserves fulfillment", async () => {
+    expect(
+      await value(`
+        return [
+          await tools.host.fail({}).catch((error) => error.message),
+          await tools.host.sleepy({ id: 4 }).catch(() => "unused"),
+        ]
+      `),
+    ).toEqual(["Lookup refused", 4])
+  })
+
+  test("finally observes settlement without changing the value", async () => {
+    expect(
+      await value(`
+        const events = []
+        const result = await tools.host.sleepy({ id: 5 }).finally(() => events.push("cleanup"))
+        return [result, events]
+      `),
+    ).toEqual([5, ["cleanup"]])
+  })
+
+  test("a settled, un-awaited rejected chain tail warns exactly once", async () => {
+    const result = await run(`
+      Promise.reject(new Error("boom")).then((value) => value)
+      await Promise.resolve()
+      return "done"
+    `)
+    expect(result.ok).toBe(true)
+    if (!result.ok) return
+    expect(result.value).toBe("done")
+    // The source rejection belongs to the chain (no warning); only the derived tail warns.
+    expect(result.warnings).toStrictEqual([
+      { kind: "ExecutionFailure", message: "Unhandled rejection from an un-awaited promise: Uncaught: boom" },
+    ])
+  })
+
+  test("a catch handler silences the chain's rejection warning", async () => {
+    const result = await run(`
+      Promise.reject(new Error("boom")).catch(() => "handled")
+      await Promise.resolve()
+      return "done"
+    `)
+    expect(result.ok).toBe(true)
+    if (!result.ok) return
+    expect(result.warnings).toBeUndefined()
+  })
+
+  test("non-plain-function handlers fail loudly instead of being ignored", async () => {
+    const diagnostic = await error(`return await tools.host.sleepy({ id: 1 }).then(tools.host.completed)`)
+    expect(diagnostic.message).toContain("Promise.prototype.then handlers must be plain functions")
+  })
+
+  test("chaining methods are opaque references until called", async () => {
+    expect(await value(`return typeof tools.host.sleepy({ id: 1 }).then`)).toBe("function")
+  })
+})
+
+describe("combinator settlement timing", () => {
+  test("a combinator settling one reaction turn after the program returns is interrupted silently", async () => {
+    // The aggregate's one-turn settlement delay (V8 parity) means an immediately-returning
+    // program abandons it while still pending: interrupted like any pending work, so no
+    // rejection warning survives - the member itself was observed by the combinator.
+    const result = await run(`
+      Promise.all([Promise.reject(new Error("boom"))])
+      return "done"
+    `)
+    expect(result.ok).toBe(true)
+    if (!result.ok) return
+    expect(result.value).toBe("done")
+    expect(result.warnings).toBeUndefined()
+  })
+
+  test("a combinator settles one reaction turn after its members, as in V8", async () => {
+    // Regression for the race winner flip: Promise.all's settlement burns a reaction turn,
+    // so a plain resolved value entered in the same race wins, and a fail-fast aggregate
+    // cannot beat it into rejection.
+    expect(
+      await value(`
+        const pending = tools.host.sleepy({ id: 9, ms: 60000 })
+        const winner = await Promise.race([Promise.all([Promise.resolve(1)]), Promise.resolve(2)])
+        try {
+          const raced = await Promise.race([Promise.all([Promise.reject("x"), pending]), Promise.resolve("ok")])
+          return [winner, "fulfilled", raced]
+        } catch (reason) {
+          return [winner, "rejected", reason]
+        }
+      `),
+    ).toEqual([2, "fulfilled", "ok"])
+  })
+})
+
+describe("unsupported promise surface", () => {
   test("other property reads on a promise hint at the missing await", async () => {
     const diagnostic = await error(`return tools.host.sleepy({ id: 1 }).value`)
     expect(diagnostic.kind).toBe("InvalidDataValue")
@@ -953,15 +1062,179 @@ describe("unsupported promise surface", () => {
   })
 
   test("unknown Promise statics list what is available", async () => {
-    const diagnostic = await error(`return await Promise.any([tools.host.sleepy({ id: 1 })])`)
-    expect(diagnostic.message).toContain("Promise.any is not available")
-    expect(diagnostic.message).toContain("Promise.allSettled")
-  })
-
-  test("new Promise(...) points at tool calls instead", async () => {
-    const diagnostic = await error(`return new Promise((resolve) => resolve(1))`)
-    expect(diagnostic.kind).toBe("UnsupportedSyntax")
-    expect(diagnostic.message).toContain("new Promise(...) is not supported")
-    expect(diagnostic.message).toContain("already return promises")
+    const diagnostic = await error(`return await Promise.withResolvers()`)
+    expect(diagnostic.message).toContain("Promise.withResolvers is not available")
+    expect(diagnostic.message).toContain("Promise.any")
+  })
+})
+
+describe("Promise.any", () => {
+  test("first tool success wins; failing and losing calls are handled silently", async () => {
+    const trace = makeTrace()
+    const result = await run(
+      `
+        const winner = await Promise.any([
+          tools.host.fail({}),
+          tools.host.sleepy({ id: 1, ms: 5 }),
+          tools.host.sleepy({ id: 2, ms: 60000 }),
+        ])
+        return winner
+      `,
+      { trace },
+    )
+    expect(result.ok).toBe(true)
+    if (!result.ok) return
+    expect(result.value).toBe(1)
+    // The slow loser stays execution-owned and is interrupted at completion; the tool
+    // failure was observed by the aggregate, so no rejection warning survives.
+    expect(result.warnings).toBeUndefined()
+    expect(trace.interrupted).toBe(1)
+  })
+
+  test("all members failing rejects with catch-normalized reasons in input order", async () => {
+    expect(
+      await value(`
+        try {
+          await Promise.any([tools.host.fail({}), Promise.reject("plain")])
+          return "fulfilled"
+        } catch (error) {
+          return [error.name, error.errors.map((reason) => reason.message ?? reason)]
+        }
+      `),
+    ).toEqual(["AggregateError", ["Lookup refused", "plain"]])
+  })
+
+  test("settles one reaction turn after its deciding member, as in V8", async () => {
+    expect(await value(`return await Promise.race([Promise.any([Promise.resolve(1)]), Promise.resolve(2)])`)).toBe(2)
+  })
+
+  test("a tie is decided by settlement order, not input order", async () => {
+    // Handlers run in attach order, so `first` settles before `second` and wins
+    // despite its later input position - as in real JS.
+    expect(
+      await value(`
+        const first = Promise.resolve().then(() => "one")
+        const second = Promise.resolve().then(() => "two")
+        return await Promise.any([second, first])
+      `),
+    ).toBe("one")
+  })
+
+  test("an abandoned rejecting aggregate is interrupted silently at the return", async () => {
+    const result = await run(`
+      Promise.any([Promise.reject(new Error("boom"))])
+      return "done"
+    `)
+    expect(result.ok).toBe(true)
+    if (!result.ok) return
+    expect(result.value).toBe("done")
+    expect(result.warnings).toBeUndefined()
+  })
+})
+
+describe("promise construction", () => {
+  test("a deferred gate coordinates tool results across async functions", async () => {
+    expect(
+      await value(`
+        let openGate
+        const gate = new Promise((resolve) => { openGate = resolve })
+        const worker = (async () => {
+          const id = await gate
+          return id * 2
+        })()
+        openGate(await tools.host.sleepy({ id: 21, ms: 5 }))
+        return await worker
+      `),
+    ).toBe(42)
+  })
+
+  test("the .then(resolve) bridge settles a constructed promise", async () => {
+    expect(
+      await value(`
+        const bridged = new Promise((resolve, reject) => {
+          tools.host.sleepy({ id: 7, ms: 5 }).then(resolve, reject)
+        })
+        return await bridged
+      `),
+    ).toBe(7)
+  })
+
+  test("constructed promises participate in combinators", async () => {
+    expect(
+      await value(`
+        let settle
+        const manual = new Promise((resolve) => { settle = resolve })
+        const race = Promise.race([manual, tools.host.sleepy({ id: 3, ms: 60000 })])
+        const all = Promise.all([manual, "plain"])
+        const any = Promise.any([manual, new Promise(() => {})])
+        settle("manual")
+        return [await race, await all, await any]
+      `),
+    ).toEqual(["manual", ["manual", "plain"], "manual"])
+  })
+
+  test("resolving with a pending promise adopts its later settlement", async () => {
+    expect(
+      await value(`
+        let innerResolve, innerReject
+        const adopted = new Promise((resolve) => resolve(new Promise((resolve) => { innerResolve = resolve })))
+        const adoptedRejection = new Promise((resolve) => resolve(new Promise((_, reject) => { innerReject = reject })))
+        innerResolve("later")
+        innerReject("bad")
+        try {
+          return [await adopted, await adoptedRejection]
+        } catch (reason) {
+          return [await adopted, reason]
+        }
+      `),
+    ).toEqual(["later", "bad"])
+  })
+
+  test("an async executor's post-await resolve settles the promise", async () => {
+    expect(
+      await value(`
+        const result = new Promise(async (resolve) => {
+          const id = await tools.host.sleepy({ id: 5, ms: 5 })
+          resolve(id * 2)
+        })
+        return await result
+      `),
+    ).toBe(10)
+  })
+
+  test("a never-settled promise is abandoned silently at the return", async () => {
+    const result = await run(`
+      const forever = new Promise(() => {})
+      forever.then(() => {})
+      return "done"
+    `)
+    expect(result.ok).toBe(true)
+    if (!result.ok) return
+    expect(result.value).toBe("done")
+    expect(result.warnings).toBeUndefined()
+  })
+
+  test("an un-awaited constructed rejection is reported like any unhandled rejection", async () => {
+    const result = await run(`
+      new Promise((_, reject) => reject(new Error("dropped")))
+      await Promise.resolve()
+      await Promise.resolve()
+      return "done"
+    `)
+    expect(result.ok).toBe(true)
+    if (!result.ok) return
+    expect(result.value).toBe("done")
+    expect(result.warnings).toHaveLength(1)
+    expect(result.warnings?.[0].message).toContain("Unhandled rejection")
+    expect(result.warnings?.[0].message).toContain("dropped")
+  })
+
+  test("resolver functions cannot cross the data boundary", async () => {
+    const diagnostic = await error(`
+      let escaped
+      new Promise((resolve) => { escaped = resolve })
+      return { escaped }
+    `)
+    expect(diagnostic.kind).toBe("InvalidDataValue")
   })
 })

packages/codemode/test/signature.test.ts

@@ -342,9 +342,7 @@ describe("JSDoc signatures in catalogs and search results", () => {
   const runtime = CodeMode.make({ tools: { github: { list_issues: listIssues }, orders: { lookup: lookupOrder } } })
 
   const search = async (query: string) => {
-    const result = await Effect.runPromise(
-      runtime.execute(`return await tools.$codemode.search({ query: ${JSON.stringify(query)} })`),
-    )
+    const result = await Effect.runPromise(runtime.execute(`return search({ query: ${JSON.stringify(query)} })`))
     expect(result.ok).toBe(true)
     if (!result.ok) throw new Error("search failed")
     return result.value as { items: Array<{ path: string; signature: string }>; remaining: number }
@@ -436,9 +434,7 @@ describe("non-identifier tool paths", () => {
   })
 
   test("search results return callable bracket-notation paths and signatures", async () => {
-    const result = await Effect.runPromise(
-      runtime.execute(`return await tools.$codemode.search({ query: "resolve library" })`),
-    )
+    const result = await Effect.runPromise(runtime.execute(`return search({ query: "resolve library" })`))
     expect(result.ok).toBe(true)
     if (!result.ok) throw new Error("search failed")
 

packages/core/src/filesystem/search.ts

@@ -128,6 +128,8 @@ export const fffLayer = Layer.effect(
         Fff.create({
           basePath: location.directory,
           aiMode: true,
+          disableMmapCache: true,
+          disableContentIndexing: true,
         }),
       catch: (cause) => cause,
     }).pipe(
@@ -230,6 +232,13 @@ export const fffLayer = Layer.effect(
   }),
 )
 
-const layer = Layer.unwrap(Effect.sync(() => (Flag.OPENCODE_DISABLE_FFF || !Fff.available() ? ripgrepLayer : fffLayer)))
+const layer = Layer.unwrap(
+  Effect.gen(function* () {
+    if (Flag.OPENCODE_DISABLE_FFF || !Fff.available()) return ripgrepLayer
+    const location = yield* Location.Service
+    // Non-VCS locations can contain many repositories, so avoid eagerly content-indexing the entire aggregate tree.
+    return location.vcs ? fffLayer : ripgrepLayer
+  }),
+)
 
 export const node = makeLocationNode({ service: Service, layer, deps: [FSUtil.node, Location.node, Ripgrep.node] })

packages/core/src/git.ts

@@ -189,16 +189,14 @@ const layer = Layer.effect(
       if (!dotgit) return undefined
 
       const cwd = path.dirname(dotgit)
-      const git = run(cwd, proc)
-      const topLevel = yield* git(["rev-parse", "--show-toplevel"])
-      const gitDir = yield* git(["rev-parse", "--git-dir"])
-      const commonDir = yield* git(["rev-parse", "--git-common-dir"])
-      if (gitDir.exitCode !== 0 || commonDir.exitCode !== 0) return undefined
+      const result = yield* run(cwd, proc)(["rev-parse", "--git-dir", "--git-common-dir", "--show-toplevel"])
+      const [gitDir, commonDir, topLevel] = result.text.split(/\r?\n/)
+      if (!gitDir || !commonDir) return undefined
 
       return new Repository({
-        worktree: AbsolutePath.make(topLevel.exitCode === 0 ? resolvePath(cwd, topLevel.text) : cwd),
-        gitDirectory: AbsolutePath.make(resolvePath(cwd, gitDir.text)),
-        commonDirectory: AbsolutePath.make(resolvePath(cwd, commonDir.text)),
+        worktree: AbsolutePath.make(topLevel ? resolvePath(cwd, topLevel) : cwd),
+        gitDirectory: AbsolutePath.make(resolvePath(cwd, gitDir)),
+        commonDirectory: AbsolutePath.make(resolvePath(cwd, commonDir)),
       })
     })
 

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

@@ -0,0 +1,214 @@
+export * as CopilotModels from "./models"
+
+import { Money } from "@opencode-ai/schema/money"
+import { Option, Schema } from "effect"
+import { ModelV2 } from "../model"
+import { ProviderV2 } from "../provider"
+
+const RemoteModel = Schema.Struct({
+  model_picker_enabled: Schema.Boolean,
+  id: Schema.String,
+  name: Schema.String,
+  version: Schema.String,
+  supported_endpoints: Schema.optional(Schema.Array(Schema.String)),
+  policy: Schema.optional(Schema.Struct({ state: Schema.optional(Schema.String) })),
+  billing: Schema.optional(
+    Schema.Struct({
+      token_prices: Schema.optional(
+        Schema.Struct({
+          batch_size: Schema.Number,
+          default: Schema.Struct({
+            cache_price: Schema.Number,
+            input_price: Schema.Number,
+            output_price: Schema.Number,
+          }),
+        }),
+      ),
+    }),
+  ),
+  capabilities: Schema.Struct({
+    family: Schema.String,
+    limits: Schema.optional(
+      Schema.Struct({
+        max_context_window_tokens: Schema.optional(Schema.Number),
+        max_output_tokens: Schema.optional(Schema.Number),
+        max_prompt_tokens: Schema.optional(Schema.Number),
+        vision: Schema.optional(
+          Schema.Struct({
+            max_prompt_image_size: Schema.Number,
+            max_prompt_images: Schema.Number,
+            supported_media_types: Schema.Array(Schema.String),
+          }),
+        ),
+      }),
+    ),
+    supports: Schema.Struct({
+      adaptive_thinking: Schema.optional(Schema.Boolean),
+      max_thinking_budget: Schema.optional(Schema.Number),
+      min_thinking_budget: Schema.optional(Schema.Number),
+      reasoning_effort: Schema.optional(Schema.Array(Schema.String)),
+      streaming: Schema.optional(Schema.Boolean),
+      structured_outputs: Schema.optional(Schema.Boolean),
+      tool_calls: Schema.optional(Schema.Boolean),
+      vision: Schema.optional(Schema.Boolean),
+    }),
+  }),
+})
+
+const Response = Schema.Struct({ data: Schema.Array(Schema.Unknown) })
+const decodeResponse = Schema.decodeUnknownSync(Response)
+const decodeModel = Schema.decodeUnknownOption(RemoteModel)
+
+type RemoteModel = typeof RemoteModel.Type
+type UsableModel = RemoteModel & {
+  capabilities: RemoteModel["capabilities"] & {
+    limits: NonNullable<RemoteModel["capabilities"]["limits"]> & {
+      max_output_tokens: number
+      max_prompt_tokens: number
+    }
+    supports: RemoteModel["capabilities"]["supports"] & { tool_calls: boolean }
+  }
+}
+
+export async function get(baseURL: string, headers: RequestInit["headers"], existing: readonly ModelV2.Info[]) {
+  const response = await fetch(`${baseURL}/models`, {
+    headers,
+    signal: AbortSignal.timeout(5_000),
+  })
+  if (!response.ok) throw new Error(`Failed to fetch Copilot models: ${response.status}`)
+
+  const remote = new Map(
+    decodeResponse(await response.json()).data.flatMap((raw) => {
+      const model = Option.getOrUndefined(decodeModel(raw))
+      return model && usable(model) ? ([[model.id, model]] as const) : []
+    }),
+  )
+  const result = new Map(existing.map((model) => [model.id, model]))
+
+  // Keep aliases and local metadata, but only when their advertised API model
+  // still exists. A partial or malformed item cannot create a broken model.
+  for (const [id, model] of result) {
+    const current = remote.get(model.modelID)
+    if (!current) {
+      result.delete(id)
+      continue
+    }
+    result.set(id, build(id, current, baseURL, model))
+  }
+
+  for (const [id, model] of remote) {
+    const key = ModelV2.ID.make(id)
+    if (result.has(key)) continue
+    result.set(key, build(key, model, baseURL))
+  }
+
+  return result
+}
+
+function usable(model: RemoteModel): model is UsableModel {
+  return (
+    model.policy?.state !== "disabled" &&
+    model.capabilities.limits?.max_output_tokens !== undefined &&
+    model.capabilities.limits.max_prompt_tokens !== undefined &&
+    model.capabilities.supports.tool_calls !== undefined
+  )
+}
+
+function build(id: ModelV2.ID, remote: UsableModel, baseURL: string, previous?: ModelV2.Info) {
+  const messages = remote.supported_endpoints?.includes("/v1/messages") ?? false
+  const endpoint = messages
+    ? "messages"
+    : remote.supported_endpoints?.includes("/responses")
+      ? "responses"
+      : remote.supported_endpoints?.includes("/chat/completions")
+        ? "chat"
+        : undefined
+  const image =
+    (remote.capabilities.supports.vision ?? false) ||
+    (remote.capabilities.limits.vision?.supported_media_types ?? []).some((item) => item.startsWith("image/"))
+  const prices = remote.billing?.token_prices
+  // Copilot reports AIC per billing batch; OpenCode stores USD per million tokens.
+  const usdPerMillion = prices && prices.batch_size > 0 ? 10_000 / prices.batch_size : 0
+  const version = remote.version.startsWith(`${remote.id}-`)
+    ? remote.version.slice(remote.id.length + 1)
+    : remote.version
+  const released = previous?.time.released || Date.parse(version)
+
+  return ModelV2.Info.make({
+    ...ModelV2.Info.empty(ProviderV2.ID.githubCopilot, id),
+    id,
+    modelID: ModelV2.ID.make(remote.id),
+    providerID: ProviderV2.ID.githubCopilot,
+    family: previous?.family ?? ModelV2.Family.make(remote.capabilities.family),
+    name: previous?.name ?? remote.name,
+    package: ProviderV2.aisdk(messages ? "@ai-sdk/anthropic" : "@ai-sdk/github-copilot"),
+    settings: ProviderV2.mergeOverlay(previous?.settings, {
+      baseURL: messages ? `${baseURL}/v1` : baseURL,
+      ...(endpoint ? { endpoint } : {}),
+    }),
+    headers: previous?.headers,
+    body: previous?.body,
+    capabilities: {
+      tools: remote.capabilities.supports.tool_calls,
+      input: image ? ["text", "image"] : ["text"],
+      output: ["text"],
+    },
+    variants: variants(remote, messages),
+    time: { released: Number.isFinite(released) ? released : 0 },
+    cost: [
+      {
+        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),
+          write: Money.USDPerMillionTokens.zero,
+        },
+      },
+    ],
+    status: "active",
+    enabled: remote.model_picker_enabled,
+    limit: {
+      context: remote.capabilities.limits.max_context_window_tokens ?? remote.capabilities.limits.max_prompt_tokens,
+      input: remote.capabilities.limits.max_prompt_tokens,
+      output: remote.capabilities.limits.max_output_tokens,
+    },
+  })
+}
+
+function variants(remote: UsableModel, messages: boolean): ModelV2.Info["variants"] {
+  const efforts = remote.capabilities.supports.reasoning_effort ?? []
+  if (!messages && efforts.length) {
+    return efforts.map((effort) => ({
+      id: ModelV2.VariantID.make(effort),
+      settings: {
+        reasoningEffort: effort,
+        reasoningSummary: "auto",
+        include: ["reasoning.encrypted_content"],
+      },
+    }))
+  }
+  if (efforts.length && remote.capabilities.supports.adaptive_thinking) {
+    return efforts.map((effort) => ({
+      id: ModelV2.VariantID.make(effort),
+      settings: {
+        thinking: {
+          type: "adaptive",
+          ...(remote.id.includes("opus-4.7") ? { display: "summarized" } : {}),
+        },
+        effort,
+      },
+    }))
+  }
+  const max = remote.capabilities.supports.max_thinking_budget
+  if (max === undefined) return []
+  return [
+    {
+      id: ModelV2.VariantID.make("max"),
+      settings: { thinking: { type: "enabled", budgetTokens: max - 1 } },
+    },
+    {
+      id: ModelV2.VariantID.make("high"),
+      settings: { thinking: { type: "enabled", budgetTokens: Math.floor(max / 2) } },
+    },
+  ]
+}

packages/core/src/integration.ts

@@ -303,7 +303,7 @@ const layer = Layer.effect(
     }
 
     const project = (entry: Entry, connections: IntegrationConnection.Info[]) =>
-      new Info({
+      Info.make({
         id: entry.ref.id,
         name: entry.ref.name,
         methods: entry.methods,

packages/core/src/plugin.ts

@@ -21,10 +21,14 @@ import { ToolHooks } from "./tool/hooks"
 import { PluginHooks } from "./plugin/hooks"
 
 export interface Interface {
-  readonly activate: (plugins: readonly Plugin[]) => Effect.Effect<void>
+  readonly activate: (plugins: readonly Versioned[]) => Effect.Effect<void>
   readonly list: () => Effect.Effect<Info[]>
 }
 
+export interface Versioned extends Plugin {
+  readonly version: string
+}
+
 export class Service extends Context.Service<Service, Interface>()("@opencode/v2/Plugin") {}
 
 const layer = Layer.effect(
@@ -32,11 +36,11 @@ const layer = Layer.effect(
   Effect.gen(function* () {
     const events = yield* EventV2.Service
     const scope = yield* Scope.make()
-    const active = new Map<typeof ID.Type, { readonly plugin: Plugin; readonly scope: Scope.Closeable }>()
+    const active = new Map<typeof ID.Type, { readonly plugin: Versioned; readonly scope: Scope.Closeable }>()
     const lock = Semaphore.makeUnsafe(1)
     let host: Parameters<Plugin["effect"]>[0]
 
-    const load = Effect.fnUntraced(function* (plugin: Plugin) {
+    const load = Effect.fnUntraced(function* (plugin: Versioned) {
       const child = yield* Scope.fork(scope)
       const inherit = yield* State.inherit()
       const loaded = yield* Effect.suspend(() => plugin.effect(host)).pipe(
@@ -55,7 +59,7 @@ const layer = Layer.effect(
       return undefined
     })
 
-    const activate = Effect.fn("Plugin.activate")(function* (plugins: readonly Plugin[]) {
+    const activate = Effect.fn("Plugin.activate")(function* (plugins: readonly Versioned[]) {
       const definitions = plugins.map((plugin) => ({ ...plugin, id: ID.make(plugin.id) }))
       const ids = new Set<typeof ID.Type>()
       for (const definition of definitions) {
@@ -65,6 +69,20 @@ const layer = Layer.effect(
 
       yield* lock.withPermit(
         Effect.gen(function* () {
+          const next = definitions.map((definition) => ({ id: definition.id, version: definition.version }))
+          const current = Array.from(active.values(), (entry) => ({
+            id: entry.plugin.id,
+            version: entry.plugin.version,
+          }))
+          if (
+            current.length === next.length &&
+            current.every((definition, index) => {
+              const candidate = next[index]
+              return definition.id === candidate?.id && definition.version === candidate.version
+            })
+          )
+            return
+
           yield* State.batch(
             Effect.gen(function* () {
               for (const definition of definitions) {

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

@@ -1,7 +1,115 @@
-import { Effect } from "effect"
+import type { IntegrationOAuthMethodRegistration } from "@opencode-ai/plugin/v2/effect/integration"
+import { Effect, Option, Schema, Semaphore, Stream } from "effect"
+import { Catalog } from "../../catalog"
+import { Credential } from "../../credential"
+import { EventV2 } from "../../event"
+import { CopilotModels } from "../../github-copilot/models"
+import { InstallationVersion } from "../../installation/version"
+import { Integration } from "../../integration"
 import { ModelV2 } from "../../model"
 import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { ProviderV2 } from "../../provider"
+import type { PluginInternal } from "../internal"
+
+const clientID = "Ov23li8tweQw6odWQebz"
+const apiVersion = "2026-06-01"
+const pollingSafetyMargin = 3000
+const methodID = Integration.MethodID.make("device")
+
+const Device = Schema.Struct({
+  verification_uri: Schema.String,
+  user_code: Schema.String,
+  device_code: Schema.String,
+  interval: Schema.Number,
+})
+const Token = Schema.Struct({
+  access_token: Schema.optional(Schema.String),
+  error: Schema.optional(Schema.String),
+  interval: Schema.optional(Schema.Number),
+})
+const JsonBody = Schema.UnknownFromJsonString
+const decodeBody = Schema.decodeUnknownOption(JsonBody)
+
+const oauth = {
+  integrationID: Integration.ID.make("github-copilot"),
+  method: {
+    id: methodID,
+    type: "oauth",
+    label: "Login with GitHub Copilot",
+    prompts: [
+      {
+        type: "select",
+        key: "deploymentType",
+        message: "Select GitHub deployment type",
+        options: [
+          { label: "GitHub.com", value: "github.com", hint: "Public" },
+          { label: "GitHub Enterprise", value: "enterprise", hint: "Data residency or self-hosted" },
+        ],
+      },
+      {
+        type: "text",
+        key: "enterpriseUrl",
+        message: "Enter your GitHub Enterprise URL or domain",
+        placeholder: "company.ghe.com or https://company.ghe.com",
+        when: { key: "deploymentType", op: "eq", value: "enterprise" },
+      },
+    ],
+  },
+  authorize: (inputs) =>
+    Effect.gen(function* () {
+      const enterprise = inputs.deploymentType === "enterprise"
+      if (enterprise && !inputs.enterpriseUrl) return yield* Effect.fail(new Error("Enterprise URL is required"))
+      const domain = enterprise ? normalizeDomain(inputs.enterpriseUrl ?? "") : "github.com"
+      const urls = oauthURLs(domain)
+      const device = yield* request(urls.device, {
+        method: "POST",
+        headers: headers(),
+        body: JSON.stringify({ client_id: clientID, scope: "read:user" }),
+      }).pipe(Effect.map(Schema.decodeUnknownSync(Device)))
+      const interval = Math.max(device.interval, 1) * 1000
+
+      const poll = (wait: number): Effect.Effect<Credential.OAuth, unknown> =>
+        request(urls.token, {
+          method: "POST",
+          headers: headers(),
+          body: JSON.stringify({
+            client_id: clientID,
+            device_code: device.device_code,
+            grant_type: "urn:ietf:params:oauth:grant-type:device_code",
+          }),
+        }).pipe(
+          Effect.map(Schema.decodeUnknownSync(Token)),
+          Effect.flatMap((token) => {
+            if (token.access_token) {
+              return Effect.succeed(
+                Credential.OAuth.make({
+                  type: "oauth",
+                  methodID,
+                  refresh: token.access_token,
+                  access: token.access_token,
+                  expires: 0,
+                  ...(enterprise ? { metadata: { enterpriseUrl: domain } } : {}),
+                }),
+              )
+            }
+            if (token.error === "authorization_pending")
+              return Effect.sleep(wait + pollingSafetyMargin).pipe(Effect.andThen(poll(wait)))
+            if (token.error === "slow_down") {
+              const next = token.interval && token.interval > 0 ? token.interval * 1000 : wait + 5000
+              return Effect.sleep(next + pollingSafetyMargin).pipe(Effect.andThen(poll(next)))
+            }
+            return Effect.fail(new Error(`Device authorization failed${token.error ? `: ${token.error}` : ""}`))
+          }),
+        )
+
+      return {
+        mode: "auto" as const,
+        url: device.verification_uri,
+        instructions: `Enter code: ${device.user_code}`,
+        callback: poll(interval),
+      }
+    }),
+} satisfies IntegrationOAuthMethodRegistration
 
 function shouldUseResponses(modelID: string) {
   // Copilot supports Responses for GPT-5 class models, except mini variants
@@ -14,19 +122,103 @@ function shouldUseResponses(modelID: string) {
 export const GithubCopilotPlugin = define({
   id: "opencode.provider.github-copilot",
   effect: Effect.fn(function* (ctx) {
+    const catalog = yield* Catalog.Service
+    const events = yield* EventV2.Service
+    const loading = Semaphore.makeUnsafe(1)
+    const loaded: {
+      baseURL?: string
+      models?: Map<ModelV2.ID, ModelV2.Info>
+    } = {}
+
+    const load = Effect.fn("GithubCopilotPlugin.load")(function* () {
+      const connection = yield* ctx.integration.connection.active("github-copilot")
+      const credential = connection
+        ? yield* ctx.integration.connection.resolve(connection).pipe(Effect.catch(() => Effect.succeed(undefined)))
+        : undefined
+      if (credential?.type !== "oauth") {
+        loaded.baseURL = undefined
+        loaded.models = undefined
+        return
+      }
+
+      const enterprise = credential.metadata?.enterpriseUrl
+      loaded.baseURL = baseURL(typeof enterprise === "string" ? enterprise : undefined)
+      const provider = yield* catalog.provider.get(ProviderV2.ID.githubCopilot)
+      const existing = (yield* catalog.model.all()).filter((model) => model.providerID === ProviderV2.ID.githubCopilot)
+      loaded.models = yield* Effect.tryPromise({
+        try: () =>
+          CopilotModels.get(
+            loaded.baseURL ?? baseURL(),
+            {
+              ...provider?.headers,
+              Authorization: `Bearer ${credential.refresh}`,
+              "User-Agent": `opencode/${InstallationVersion}`,
+              "X-GitHub-Api-Version": apiVersion,
+            },
+            existing,
+          ),
+        catch: (cause) => cause,
+      }).pipe(
+        Effect.catch((cause) =>
+          Effect.logWarning("failed to sync GitHub Copilot models", { cause }).pipe(Effect.as(undefined)),
+        ),
+      )
+    })
+
+    yield* ctx.integration.transform((draft) => {
+      draft.method.update(oauth)
+    })
     yield* ctx.catalog.transform((evt) => {
       const item = evt.provider.get(ProviderV2.ID.githubCopilot)
-      if (!item || !item.models.has(ModelV2.ID.make("gpt-5-chat-latest"))) return
-      evt.model.update(item.provider.id, ModelV2.ID.make("gpt-5-chat-latest"), (model) => {
-        // This chat-only alias conflicts with the Copilot GPT-5 Responses route,
-        // so hide it only for Copilot rather than for every provider catalog.
-        model.enabled = false
-      })
+      if (!item) return
+      if (loaded.models) {
+        for (const id of item.models.keys()) {
+          if (!loaded.models.has(ModelV2.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)))
+        }
+      } else if (loaded.baseURL) {
+        for (const id of item.models.keys()) {
+          evt.model.update(item.provider.id, id, (model) => {
+            model.settings = ProviderV2.mergeOverlay(model.settings, { baseURL: loaded.baseURL })
+          })
+        }
+      }
+      if (item.models.has(ModelV2.ID.make("gpt-5-chat-latest"))) {
+        evt.model.update(item.provider.id, ModelV2.ID.make("gpt-5-chat-latest"), (model) => {
+          // This chat-only alias conflicts with the Copilot GPT-5 Responses route,
+          // so hide it only for Copilot rather than for every provider catalog.
+          model.enabled = false
+        })
+      }
     })
+    const refresh = () => loading.withPermit(load().pipe(Effect.andThen(ctx.catalog.reload())))
+    yield* events.subscribe(Integration.Event.ConnectionUpdated).pipe(
+      Stream.filter((event) => event.data.integrationID === Integration.ID.make("github-copilot")),
+      Stream.runForEach(refresh),
+      Effect.forkScoped({ startImmediately: true }),
+    )
+    yield* refresh().pipe(Effect.forkScoped)
     yield* ctx.aisdk.hook(
       "sdk",
       Effect.fn(function* (evt) {
-        if (evt.package !== "@ai-sdk/github-copilot") return
+        if (evt.model.providerID !== ProviderV2.ID.githubCopilot) return
+        if (evt.package !== "@ai-sdk/github-copilot" && evt.package !== "@ai-sdk/anthropic") return
+        evt.options.fetch = copilotFetch(
+          typeof evt.options.apiKey === "string" ? evt.options.apiKey : undefined,
+          evt.options.fetch,
+          evt.package === "@ai-sdk/anthropic",
+        )
+        if (evt.package === "@ai-sdk/anthropic") {
+          evt.options.headers = {
+            ...evt.options.headers,
+            "anthropic-beta": "interleaved-thinking-2025-05-14",
+          }
+          const mod = yield* Effect.promise(() => import("@ai-sdk/anthropic"))
+          evt.sdk = mod.createAnthropic(evt.options)
+          return
+        }
         const mod = yield* Effect.promise(() => import("../../github-copilot/copilot-provider"))
         evt.sdk = mod.createOpenaiCompatible(evt.options)
       }),
@@ -52,4 +244,114 @@ export const GithubCopilotPlugin = define({
       }),
     )
   }),
-})
+} satisfies PluginInternal.InternalPlugin)
+
+function normalizeDomain(input: string) {
+  return input.replace(/^https?:\/\//, "").replace(/\/$/, "")
+}
+
+function oauthURLs(domain: string) {
+  return {
+    device: `https://${domain}/login/device/code`,
+    token: `https://${domain}/login/oauth/access_token`,
+  }
+}
+
+function baseURL(enterprise?: string) {
+  return enterprise ? `https://copilot-api.${normalizeDomain(enterprise)}` : "https://api.githubcopilot.com"
+}
+
+function headers() {
+  return {
+    Accept: "application/json",
+    "Content-Type": "application/json",
+    "User-Agent": `opencode/${InstallationVersion}`,
+  }
+}
+
+function request(url: string, init: RequestInit) {
+  return Effect.tryPromise({
+    try: async (signal) => {
+      const response = await fetch(url, { ...init, signal })
+      if (!response.ok) throw new Error(`Request failed: ${response.status}`)
+      return response.json()
+    },
+    catch: (cause) => cause,
+  })
+}
+
+type Fetch = (input: Parameters<typeof fetch>[0], init?: RequestInit) => Promise<Response>
+
+export function copilotFetch(token: string | undefined, upstream: Fetch | undefined, anthropic: boolean): Fetch {
+  const send = upstream ?? fetch
+  return async (input, init) => {
+    const requestHeaders = new Headers(init?.headers)
+    if (token) {
+      requestHeaders.delete("authorization")
+      requestHeaders.delete("x-api-key")
+      requestHeaders.set("Authorization", `Bearer ${token}`)
+    }
+    requestHeaders.set("User-Agent", `opencode/${InstallationVersion}`)
+    requestHeaders.set("Openai-Intent", "conversation-edits")
+    requestHeaders.set("X-GitHub-Api-Version", apiVersion)
+    if (anthropic) requestHeaders.set("anthropic-beta", "interleaved-thinking-2025-05-14")
+
+    const url = input instanceof URL ? input.href : typeof input === "string" ? input : input.url
+    const body = typeof init?.body === "string" ? Option.getOrUndefined(decodeBody(init.body)) : undefined
+    const metadata = requestMetadata(url, body)
+    requestHeaders.set("x-initiator", metadata.agent ? "agent" : "user")
+    if (metadata.vision) requestHeaders.set("Copilot-Vision-Request", "true")
+    return send(input, { ...init, headers: requestHeaders })
+  }
+}
+
+function requestMetadata(url: string, body: unknown) {
+  if (!record(body)) return { agent: false, vision: false }
+  if (Array.isArray(body.input)) {
+    const last = body.input.at(-1)
+    return {
+      agent: !record(last) || last.role !== "user",
+      vision: body.input.some(
+        (item) =>
+          record(item) &&
+          Array.isArray(item.content) &&
+          item.content.some((part) => record(part) && part.type === "input_image"),
+      ),
+    }
+  }
+  if (!Array.isArray(body.messages)) return { agent: false, vision: false }
+  const last = body.messages.at(-1)
+  if (url.includes("completions")) {
+    return {
+      agent: !record(last) || last.role !== "user",
+      vision: body.messages.some(
+        (message) =>
+          record(message) &&
+          Array.isArray(message.content) &&
+          message.content.some((part) => record(part) && part.type === "image_url"),
+      ),
+    }
+  }
+  const content = record(last) && Array.isArray(last.content) ? last.content : []
+  return {
+    agent:
+      !record(last) || last.role !== "user" || !content.some((part) => record(part) && part.type !== "tool_result"),
+    vision: body.messages.some(
+      (message) =>
+        record(message) &&
+        Array.isArray(message.content) &&
+        message.content.some(
+          (part) =>
+            record(part) &&
+            (part.type === "image" ||
+              (part.type === "tool_result" &&
+                Array.isArray(part.content) &&
+                part.content.some((nested) => record(nested) && nested.type === "image"))),
+        ),
+    ),
+  }
+}
+
+function record(input: unknown): input is Record<string, unknown> {
+  return typeof input === "object" && input !== null && !Array.isArray(input)
+}

packages/core/src/plugin/sdk.ts

@@ -4,6 +4,7 @@ import type { Plugin } from "@opencode-ai/plugin/v2/effect/plugin"
 import { Context, Effect, Layer } from "effect"
 import { makeGlobalNode } from "../effect/app-node"
 import { EventV2 } from "../event"
+import type { PluginV2 } from "../plugin"
 
 export const Updated = EventV2.ephemeral({ type: "sdk.plugin.updated", schema: {} })
 
@@ -20,7 +21,7 @@ export const Updated = EventV2.ephemeral({ type: "sdk.plugin.updated", schema: {
  */
 export interface Interface {
   readonly register: (plugin: Plugin) => Effect.Effect<void>
-  readonly all: () => readonly Plugin[]
+  readonly all: () => readonly PluginV2.Versioned[]
 }
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/SdkPlugins") {}
@@ -29,11 +30,12 @@ export const layer = Layer.effect(
   Service,
   Effect.gen(function* () {
     const events = yield* EventV2.Service
-    const plugins = new Map<string, Plugin>()
+    const plugins = new Map<string, PluginV2.Versioned>()
+    let revision = 0
     return Service.of({
       register: (plugin) =>
         Effect.sync(() => {
-          plugins.set(plugin.id, plugin)
+          plugins.set(plugin.id, { ...plugin, version: String(++revision) })
         }).pipe(Effect.andThen(events.publish(Updated, {})), Effect.asVoid),
       all: () => [...plugins.values()],
     })

packages/core/src/plugin/supervisor.ts

@@ -116,15 +116,15 @@ const scan = Effect.fn("PluginSupervisor.scan")(function* (entries: readonly Con
 })
 
 const resolve = Effect.fn("PluginSupervisor.resolve")(function* (
-  pre: readonly Plugin[],
-  post: readonly Plugin[],
+  pre: readonly PluginV2.Versioned[],
+  post: readonly PluginV2.Versioned[],
   operations: readonly Operation[],
 ) {
   const matches = (selector: string, target: string) =>
     selector === "*" || (selector.endsWith(".*") ? target.startsWith(selector.slice(0, -1)) : selector === target)
   const definitions = [...pre, ...post]
   const enabled = new Set(definitions.map((plugin) => plugin.id))
-  const packages = new Map<string, Plugin>()
+  const packages = new Map<string, PluginV2.Versioned>()
   const plugins = () => [...definitions, ...packages.values()]
 
   for (const operation of operations) {
@@ -178,8 +178,9 @@ const load = Effect.fn("PluginSupervisor.load")(function* (operation: Extract<Op
   const plugin = "effect" in value ? value : PluginPromise.fromPromise(value)
   return {
     id: plugin.id,
+    version: JSON.stringify(operation),
     effect: (host) => plugin.effect({ ...host, options: operation.options }),
-  } satisfies Plugin
+  } satisfies PluginV2.Versioned
 })
 
 function discoverDirectory(fs: FSUtil.Interface, directory: string) {
@@ -253,10 +254,11 @@ const layer = Layer.effect(
           // Resolve OpenCode's internal plugins with their privileged Location services.
           const internal = yield* PluginInternal.list()
           // Combine internal plugins with host-contributed SDK plugins in boot order.
-          const pre = [...internal.pre, ...sdk.all()]
+          const pre = [...internal.pre.map((plugin) => ({ ...plugin, version: "internal" })), ...sdk.all()]
+          const post = internal.post.map((plugin) => ({ ...plugin, version: "internal" }))
           const operations = yield* scan(yield* config.entries())
           // Apply config operations and load enabled package plugins into one ordered generation.
-          const plugins = yield* resolve(pre, internal.post, operations)
+          const plugins = yield* resolve(pre, post, operations)
           // Replace the active generation in one scoped, batched activation.
           yield* registry.activate(plugins)
           applied = target

packages/core/src/reference.ts

@@ -64,7 +64,7 @@ const layer = Layer.effect(
             if (source.type === "local") {
               materialized.set(
                 name,
-                new Info({
+                Info.make({
                   name,
                   path: source.path,
                   ...(source.description === undefined ? {} : { description: source.description }),
@@ -88,7 +88,7 @@ const layer = Layer.effect(
             seen.set(target, source.branch)
             materialized.set(
               name,
-              new Info({
+              Info.make({
                 name,
                 path: AbsolutePath.make(target),
                 ...(source.description === undefined ? {} : { description: source.description }),

packages/core/src/skill.ts

@@ -92,6 +92,7 @@ const layer = Layer.effect(
         },
         list: () => draft.sources as Source[],
       }),
+      finalize: () => events.publish(Event.Updated, {}).pipe(Effect.asVoid),
     })
 
     const load = Effect.fn("SkillV2.load")(function* (source: Source) {

packages/core/src/tool/subagent.ts

@@ -12,8 +12,8 @@ import { Tool } from "./tool"
 export const name = "subagent"
 
 const NO_TEXT = "Subagent completed without a text response."
-const BACKGROUND_STARTED =
-  "The subagent is working in the background. You will be notified automatically when it finishes. DO NOT sleep, poll, or proactively check on its progress."
+const backgroundStarted = (sessionID: SessionSchema.ID) =>
+  `The subagent is working in the background (id: ${sessionID}). You will be notified automatically when it finishes. DO NOT sleep, poll, or proactively check on its progress.`
 
 export const Input = Schema.Struct({
   agent: Schema.String.annotate({ description: "The configured agent to run as the subagent" }),
@@ -168,7 +168,11 @@ export const Plugin = {
                 if (background) {
                   yield* runtime.job.background(info.id)
                   yield* notifyWhenDone(context.sessionID, child.id, input.description)
-                  return { sessionID: child.id, status: "running" as const, output: BACKGROUND_STARTED }
+                  return {
+                    sessionID: child.id,
+                    status: "running" as const,
+                    output: backgroundStarted(child.id),
+                  }
                 }
 
                 const result = yield* runtime.job.block({ id: child.id, sessionID: context.sessionID }).pipe(
@@ -180,7 +184,11 @@ export const Plugin = {
                 )
                 if (result?.type === "backgrounded") {
                   yield* notifyWhenDone(context.sessionID, child.id, input.description)
-                  return { sessionID: child.id, status: "running" as const, output: BACKGROUND_STARTED }
+                  return {
+                    sessionID: child.id,
+                    status: "running" as const,
+                    output: backgroundStarted(child.id),
+                  }
                 }
                 if (result?.info.status === "error")
                   return yield* new ToolFailure({ message: result.info.error ?? "Subagent failed" })

packages/core/test/git.test.ts

@@ -13,6 +13,26 @@ import { testEffect } from "./lib/effect"
 const it = testEffect(LayerNode.compile(Git.node))
 
 describe("Git", () => {
+  it.live("discovers repository metadata without a work tree", () =>
+    Effect.gen(function* () {
+      const root = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (dir) => Effect.promise(() => dir[Symbol.asyncDispose]()),
+      )
+      yield* Effect.promise(async () => {
+        await initRepo(root.path)
+        await $`git config core.bare true`.cwd(root.path).quiet()
+      })
+      const directory = AbsolutePath.make(yield* Effect.promise(() => fs.realpath(root.path)))
+      const git = yield* Git.Service
+      const repository = yield* git.repo.discover(directory)
+
+      expect(repository?.worktree).toBe(directory)
+      expect(repository?.gitDirectory).toBe(AbsolutePath.make(path.join(directory, ".git")))
+      expect(repository?.commonDirectory).toBe(repository?.gitDirectory)
+    }),
+  )
+
   it.live("clones a remote and reads checkout metadata", () =>
     withRemote((fixture) =>
       Effect.gen(function* () {

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

@@ -0,0 +1,76 @@
+import { expect, test } from "bun:test"
+import { CopilotModels } from "@opencode-ai/core/github-copilot/models"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+
+test("defensively syncs advertised Copilot models", async () => {
+  const server = Bun.serve({
+    port: 0,
+    fetch: () =>
+      Response.json({
+        data: [
+          {
+            model_picker_enabled: true,
+            id: "gpt-5",
+            name: "GPT-5 remote",
+            version: "gpt-5-2026-06-01",
+            supported_endpoints: ["/responses"],
+            billing: {
+              token_prices: {
+                batch_size: 0,
+                default: { input_price: 10, output_price: 20, cache_price: 5 },
+              },
+            },
+            capabilities: {
+              family: "gpt",
+              limits: {
+                max_context_window_tokens: 200000,
+                max_output_tokens: 16384,
+                max_prompt_tokens: 180000,
+              },
+              supports: { tool_calls: true, reasoning_effort: ["low", "high"] },
+            },
+          },
+          {
+            model_picker_enabled: false,
+            id: "utility",
+            name: "Utility",
+            version: "utility-2026-06-01",
+            capabilities: {
+              family: "utility",
+              limits: { max_output_tokens: 1000, max_prompt_tokens: 8000 },
+              supports: { tool_calls: false },
+            },
+          },
+          { model_picker_enabled: true, id: "incomplete" },
+        ],
+      }),
+  })
+
+  try {
+    const existing = ModelV2.Info.make({
+      ...ModelV2.Info.empty(ProviderV2.ID.githubCopilot, ModelV2.ID.make("gpt-5")),
+      modelID: ModelV2.ID.make("gpt-5"),
+      name: "GPT-5 local",
+    })
+    const stale = ModelV2.Info.make({
+      ...ModelV2.Info.empty(ProviderV2.ID.githubCopilot, ModelV2.ID.make("stale")),
+      modelID: ModelV2.ID.make("stale"),
+    })
+    const models = await CopilotModels.get(server.url.origin, {}, [existing, stale])
+    const model = models.get(ModelV2.ID.make("gpt-5"))
+
+    expect(model?.name).toBe("GPT-5 local")
+    expect(model?.settings).toMatchObject({ baseURL: server.url.origin, endpoint: "responses" })
+    expect(model?.cost[0]).toMatchObject({ input: 0, output: 0, cache: { read: 0, write: 0 } })
+    expect(model?.variants.map((variant) => variant.id)).toEqual([
+      ModelV2.VariantID.make("low"),
+      ModelV2.VariantID.make("high"),
+    ])
+    expect(models.get(ModelV2.ID.make("utility"))?.enabled).toBe(false)
+    expect(models.has(ModelV2.ID.make("stale"))).toBe(false)
+    expect(models.has(ModelV2.ID.make("incomplete"))).toBe(false)
+  } finally {
+    await server.stop(true)
+  }
+})

packages/core/test/integration.test.ts

@@ -40,7 +40,7 @@ describe("Integration", () => {
         .transform((editor) => editor.update(openai, (integration) => (integration.name = "OpenAI")))
         .pipe(Scope.provide(scope))
       expect(yield* integrations.get(openai)).toEqual(
-        new Integration.Info({ id: openai, name: "OpenAI", methods: [], connections: [] }),
+        Integration.Info.make({ id: openai, name: "OpenAI", methods: [], connections: [] }),
       )
 
       yield* Scope.close(scope, Exit.void)

packages/core/test/location-layer.test.ts

@@ -249,6 +249,36 @@ describe("LocationServiceMap", () => {
     ),
   )
 
+  itWithSdk.live("does not reload plugins when config updates leave plugin operations unchanged", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (dir) => Effect.promise(() => dir[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((dir) =>
+        Effect.gen(function* () {
+          const activations = { count: 0 }
+          const sdk = yield* SdkPlugins.Service
+          yield* sdk.register(
+            EffectPlugin.define({
+              id: "unchanged-config-plugin",
+              effect: () => Effect.sync(() => ++activations.count).pipe(Effect.asVoid),
+            }),
+          )
+
+          const locations = yield* LocationServiceMap.Service
+          const context = yield* locations.contextEffect(Location.Ref.make({ directory: AbsolutePath.make(dir.path) }))
+          yield* PluginSupervisor.Service.use((supervisor) => supervisor.flush).pipe(Effect.provide(context))
+          expect(activations.count).toBe(1)
+
+          yield* EventV2.Service.use((events) => events.publish(Config.Event.Updated, {})).pipe(Effect.provide(context))
+          yield* Effect.sleep("200 millis")
+
+          expect(activations.count).toBe(1)
+        }),
+      ),
+    ),
+  )
+
   itWithSdk.live("keeps flush open while later hot reload runs", () =>
     Effect.acquireRelease(
       Effect.promise(() => tmpdir()),
@@ -706,7 +736,7 @@ describe("LocationServiceMap", () => {
                 })
                 .pipe(Effect.asVoid),
           })
-          yield* plugins.activate([reviewer])
+          yield* plugins.activate([{ ...reviewer, version: "1" }])
 
           expect(yield* (yield* AgentV2.Service).get(AgentV2.ID.make("reviewer"))).toMatchObject({
             description: "Reviews code",

packages/core/test/plugin.test.ts

@@ -18,6 +18,8 @@ const it = testEffect(PluginTestLayer)
 
 class Secret extends Context.Service<Secret, string>()("@opencode/test/PluginSecret") {}
 
+const versioned = <R>(plugin: EffectPlugin.Plugin<R>, version = "1") => ({ ...plugin, version })
+
 describe("PluginV2", () => {
   it.live("exposes public events through the plugin context", () =>
     Effect.gen(function* () {
@@ -37,15 +39,18 @@ describe("PluginV2", () => {
     }),
   )
 
-  it.effect("replaces plugins by ID", () =>
+  it.effect("replaces plugins by ID and version", () =>
     Effect.gen(function* () {
       const plugins = yield* PluginV2.Service
       const agents = yield* AgentV2.Service
       const events = yield* EventV2.Service
       let description = "first"
-      const updated = yield* events
-        .subscribe(Plugin.Event.Updated)
-        .pipe(Stream.take(2), Stream.runCollect, Effect.forkScoped({ startImmediately: true }))
+      let updates = 0
+      const unsubscribe = yield* events.listen((event) =>
+        Effect.sync(() => {
+          if (event.type === Plugin.Event.Updated.type) updates++
+        }),
+      )
 
       const managed = () =>
         EffectPlugin.define({
@@ -60,17 +65,23 @@ describe("PluginV2", () => {
               .pipe(Effect.asVoid),
         })
 
-      yield* plugins.activate([managed()])
+      yield* plugins.activate([versioned(managed(), "1")])
 
       expect((yield* agents.get(AgentV2.ID.make("configured")))?.description).toBe("first")
 
       description = "second"
-      yield* plugins.activate([managed()])
+      yield* plugins.activate([versioned(managed(), "2")])
+      expect((yield* agents.get(AgentV2.ID.make("configured")))?.description).toBe("second")
+
+      description = "third"
+      yield* plugins.activate([versioned(managed(), "2")])
+      expect(updates).toBe(2)
       expect((yield* agents.get(AgentV2.ID.make("configured")))?.description).toBe("second")
-      expect(yield* Fiber.join(updated)).toHaveLength(2)
 
       yield* plugins.activate([])
       expect(yield* agents.get(AgentV2.ID.make("configured"))).toBeUndefined()
+      expect(updates).toBe(3)
+      yield* unsubscribe
     }),
   )
 
@@ -79,12 +90,12 @@ describe("PluginV2", () => {
       const plugins = yield* PluginV2.Service
       const active = Plugin.ID.make("active")
       const duplicate = "duplicate"
-      yield* plugins.activate([{ id: active, effect: () => Effect.void }])
+      yield* plugins.activate([{ id: active, version: "1", effect: () => Effect.void }])
 
       const result = yield* plugins
         .activate([
-          { id: duplicate, effect: () => Effect.void },
-          { id: duplicate, effect: () => Effect.void },
+          { id: duplicate, version: "1", effect: () => Effect.void },
+          { id: duplicate, version: "1", effect: () => Effect.void },
         ])
         .pipe(Effect.exit)
 
@@ -117,12 +128,12 @@ describe("PluginV2", () => {
         },
       })
 
-      yield* plugins.activate([good, bad])
+      yield* plugins.activate([versioned(good), versioned(bad)])
       expect(yield* plugins.list()).toEqual([{ id: Plugin.ID.make("good") }])
       expect((yield* agents.get(AgentV2.ID.make("configured")))?.description).toBe("loaded")
 
       fail = false
-      yield* plugins.activate([good, bad])
+      yield* plugins.activate([versioned(good), versioned(bad, "2")])
       expect(yield* plugins.list()).toEqual([{ id: Plugin.ID.make("good") }, { id: Plugin.ID.make("bad") }])
     }),
   )
@@ -155,8 +166,8 @@ describe("PluginV2", () => {
           }),
       })
 
-      yield* plugins.activate([previous])
-      yield* plugins.activate([replacement])
+      yield* plugins.activate([versioned(previous)])
+      yield* plugins.activate([versioned(replacement, "2")])
 
       expect(yield* plugins.list()).toEqual([{ id: Plugin.ID.make("managed") }])
       expect((yield* agents.get(AgentV2.ID.make("configured")))?.description).toBe("previous")
@@ -187,8 +198,8 @@ describe("PluginV2", () => {
         effect: () => Effect.die(new Error("replacement failed")),
       })
 
-      yield* plugins.activate([previous])
-      yield* plugins.activate([replacement])
+      yield* plugins.activate([versioned(previous)])
+      yield* plugins.activate([versioned(replacement, "2")])
 
       expect(yield* plugins.list()).toEqual([])
       expect(yield* agents.get(AgentV2.ID.make("configured"))).toBeUndefined()
@@ -202,6 +213,7 @@ describe("PluginV2", () => {
       yield* plugins.activate(
         ["first", "second"].map((id) => ({
           id,
+          version: "1",
           effect: () => Effect.addFinalizer(() => Effect.sync(() => closed.push(id))),
         })),
       )
@@ -225,7 +237,7 @@ describe("PluginV2", () => {
           ),
       })
 
-      yield* plugins.activate([plugin]).pipe(Effect.provideService(Secret, "secret"))
+      yield* plugins.activate([versioned(plugin)]).pipe(Effect.provideService(Secret, "secret"))
 
       expect(visible).toBe(false)
     }),
@@ -253,7 +265,7 @@ describe("PluginV2", () => {
             .pipe(Effect.orDie),
       })
 
-      yield* plugins.activate([plugin])
+      yield* plugins.activate([versioned(plugin)])
       expect((yield* registry.materialize()).definitions.map((tool) => tool.name)).toContain("plugin_tool")
 
       yield* plugins.activate([])
@@ -284,7 +296,7 @@ describe("PluginV2", () => {
             .pipe(Effect.orDie),
       })
 
-      yield* plugins.activate([plugin])
+      yield* plugins.activate([versioned(plugin)])
 
       expect((yield* registry.materialize()).definitions.map((tool) => tool.name)).toEqual([
         "plain",
@@ -343,7 +355,7 @@ describe("PluginV2", () => {
           }),
       })
 
-      yield* plugins.activate([plugin])
+      yield* plugins.activate([versioned(plugin)])
 
       const materialized = yield* registry.materialize()
       const settlement = yield* materialized.settle({

packages/core/test/plugin/models-dev.test.ts

@@ -214,7 +214,7 @@ describe("ModelsDevPlugin", () => {
             }),
           )
           expect(yield* integrations.list()).toEqual([
-            new Integration.Info({
+            Integration.Info.make({
               id: Integration.ID.make("acme"),
               name: "Acme",
               methods: [

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

@@ -5,8 +5,9 @@ import { Catalog } from "@opencode-ai/core/catalog"
 import { ModelV2 } from "@opencode-ai/core/model"
 import { PluginV2 } from "@opencode-ai/core/plugin"
 import { PluginHost } from "@opencode-ai/core/plugin/host"
-import { GithubCopilotPlugin } from "@opencode-ai/core/plugin/provider/github-copilot"
+import { copilotFetch, GithubCopilotPlugin } from "@opencode-ai/core/plugin/provider/github-copilot"
 import { ProviderV2 } from "@opencode-ai/core/provider"
+import { Integration } from "@opencode-ai/core/integration"
 import type { LanguageModelV3 } from "@ai-sdk/provider"
 import { testEffect } from "../lib/effect"
 import { PluginTestLayer } from "./fixture"
@@ -39,6 +40,46 @@ function fakeSelectorSdk(calls: string[]) {
 }
 
 describe("GithubCopilotPlugin", () => {
+  it.effect("registers GitHub Copilot device OAuth", () =>
+    Effect.gen(function* () {
+      yield* addPlugin()
+      expect((yield* (yield* Integration.Service).get(Integration.ID.make("github-copilot")))?.methods).toContainEqual({
+        id: Integration.MethodID.make("device"),
+        type: "oauth",
+        label: "Login with GitHub Copilot",
+        prompts: expect.any(Array),
+      })
+    }),
+  )
+
+  it.live("adds Copilot authentication and request metadata headers", () =>
+    Effect.gen(function* () {
+      const requests: Headers[] = []
+      const send = copilotFetch(
+        "token",
+        async (_input: Parameters<typeof fetch>[0], init?: RequestInit) => {
+          requests.push(new Headers(init?.headers))
+          return Response.json({ ok: true })
+        },
+        false,
+      )
+      yield* Effect.promise(() =>
+        send("https://api.githubcopilot.com/chat/completions", {
+          method: "POST",
+          headers: { "x-api-key": "old" },
+          body: JSON.stringify({
+            messages: [{ role: "user", content: [{ type: "image_url", image_url: { url: "data:image/png" } }] }],
+          }),
+        }),
+      )
+      expect(requests[0]?.get("authorization")).toBe("Bearer token")
+      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")
+    }),
+  )
+
   it.effect("creates the bundled Copilot SDK for the GitHub Copilot package", () =>
     Effect.gen(function* () {
       const plugin = yield* PluginV2.Service

packages/core/test/reference-guidance.test.ts

@@ -26,7 +26,7 @@ describe("ReferenceGuidance", () => {
           Layer.mock(Reference.Service, {
             list: () =>
               Effect.succeed([
-                new Reference.Info({
+                Reference.Info.make({
                   name: "docs",
                   path: AbsolutePath.make("/docs"),
                   description: "Use for product documentation",
@@ -62,7 +62,7 @@ describe("ReferenceGuidance", () => {
           Layer.mock(Reference.Service, {
             list: () =>
               Effect.succeed([
-                new Reference.Info({
+                Reference.Info.make({
                   name: "docs",
                   path: AbsolutePath.make("/docs"),
                   source: Reference.LocalSource.make({ type: "local", path: AbsolutePath.make("/docs") }),
@@ -76,7 +76,7 @@ describe("ReferenceGuidance", () => {
 
   it.effect("announces added and removed references as deltas", () => {
     const reference = (name: string, description: string) =>
-      new Reference.Info({
+      Reference.Info.make({
         name,
         path: AbsolutePath.make(`/${name}`),
         description,

packages/core/test/reference.test.ts

@@ -29,7 +29,7 @@ describe("Reference", () => {
       yield* references.transform((editor) => editor.add("docs", source)).pipe(Scope.provide(scope))
 
       expect(yield* references.list()).toEqual([
-        new Reference.Info({ name: "docs", path, description: "Use for API documentation", hidden: true, source }),
+        Reference.Info.make({ name: "docs", path, description: "Use for API documentation", hidden: true, source }),
       ])
 
       yield* Scope.close(scope, Exit.void)
@@ -45,7 +45,7 @@ describe("Reference", () => {
       yield* references.transform((editor) => editor.add("sdk", source))
 
       expect(yield* references.list()).toEqual([
-        new Reference.Info({
+        Reference.Info.make({
           name: "sdk",
           path: AbsolutePath.make(Repository.cachePath(Global.Path.repos, repository)),
           source,
@@ -66,7 +66,7 @@ describe("Reference", () => {
       yield* references.transform((editor) => editor.add("sdk", source))
 
       expect(yield* references.list()).toEqual([
-        new Reference.Info({
+        Reference.Info.make({
           name: "sdk",
           path: AbsolutePath.make(Repository.cachePath(Global.Path.repos, repository)),
           description: "Use for SDK implementation details",

packages/core/test/skill.test.ts

@@ -54,6 +54,23 @@ function waitForSkillUpdate() {
 }
 
 describe("SkillV2", () => {
+  it.live("publishes updates when skill sources change", () =>
+    Effect.gen(function* () {
+      const skill = yield* SkillV2.Service
+
+      yield* Effect.acquireUseRelease(
+        waitForSkillUpdate(),
+        ({ deferred }) =>
+          skill
+            .transform((editor) =>
+              editor.source({ type: "directory", path: AbsolutePath.make("/tmp/opencode-skills") }),
+            )
+            .pipe(Effect.andThen(Deferred.await(deferred)), Effect.timeout("1 second")),
+        ({ fiber }) => Fiber.interrupt(fiber),
+      )
+    }),
+  )
+
   it.live("registers sources and resolves later source precedence", () =>
     Effect.acquireRelease(
       Effect.promise(() => tmpdir()),

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

@@ -281,7 +281,10 @@ describe("SubagentTool", () => {
             },
           })
           const childID = outputSessionID(settled.output?.structured)
-          expect(settled.output?.structured).toMatchObject({ status: "running" })
+          expect(settled.output?.structured).toMatchObject({
+            status: "running",
+            output: expect.stringContaining(`id: ${childID}`),
+          })
 
           const admission = Array.from(yield* Fiber.join(admitted))[0]
           expect(admission?.data.input.data.text).toContain(`<subagent id="${childID}" state="completed"`)

packages/httpapi-codegen/test/generate.test.ts

@@ -1097,6 +1097,27 @@ describe("HttpApiCodegen.generate", () => {
     expect(output.operations[0]?.success).toBe("stream")
   })
 
+  test("emits opaque Promise SSE fields as any", () => {
+    const output = emitPromise(
+      compileContract(
+        api(
+          HttpApiEndpoint.get("subscribe", "/event", {
+            success: HttpApiSchema.StreamSse({
+              data: Schema.Struct({
+                metadata: Schema.Record(Schema.String, Schema.Unknown),
+                label: Schema.Literal("unknown"),
+              }),
+            }),
+          }),
+        ),
+      ),
+    )
+    const types = output.files.find((file) => file.path === "types.ts")?.content
+
+    expect(types).toContain('readonly "metadata": { readonly [x: string]: any }')
+    expect(types).toContain('readonly "label": "unknown"')
+  })
+
   test("preserves annotated stream response statuses", () => {
     const output = compile(
       api(

packages/opencode/script/schema.ts

@@ -2,7 +2,7 @@
 
 import { Config } from "@/config/config"
 import { ConfigV1 } from "@opencode-ai/core/v1/config/config"
-import { TuiConfig } from "@opencode-ai/tui/config"
+import { TuiConfig } from "@opencode-ai/tui/config/v1"
 import { Schema } from "effect"
 
 type JsonSchema = Record<string, unknown>

packages/opencode/src/config/tui-host-attention.ts

@@ -1,4 +1,4 @@
-import { TuiConfig } from "@opencode-ai/tui/config"
+import { TuiConfig } from "@opencode-ai/tui/config/v1"
 import { isRecord } from "@opencode-ai/tui/util/record"
 import { Filesystem } from "@/util/filesystem"
 import { Schema } from "effect"

packages/opencode/src/config/tui-migrate.ts

@@ -2,7 +2,7 @@ import path from "path"
 import { type ParseError as JsoncParseError, applyEdits, modify, parse as parseJsonc } from "jsonc-parser"
 import { unique } from "remeda"
 import { Option, Schema } from "effect"
-import { TuiConfig } from "@opencode-ai/tui/config"
+import { TuiConfig } from "@opencode-ai/tui/config/v1"
 import { Flag } from "@opencode-ai/core/flag/flag"
 import { Global } from "@opencode-ai/core/global"
 import { Filesystem } from "@/util/filesystem"

packages/opencode/src/config/tui.ts

@@ -15,14 +15,14 @@ import { Global } from "@opencode-ai/core/global"
 import { FSUtil } from "@opencode-ai/core/fs-util"
 import { CurrentWorkingDirectory } from "./tui-cwd"
 import { ConfigPlugin } from "@/config/plugin"
-import { TuiKeybind } from "@opencode-ai/tui/config/keybind"
+import { TuiKeybind } from "@opencode-ai/tui/config/v1/keybind"
 import { InstallationLocal, InstallationVersion } from "@opencode-ai/core/installation/version"
 import { makeRuntime } from "@opencode-ai/core/effect/runtime"
 import { Filesystem } from "@/util/filesystem"
 import { ConfigVariable } from "@/config/variable"
 import { Npm } from "@opencode-ai/core/npm"
 import { FormatError, FormatUnknownError } from "@/cli/error"
-import { TuiConfig } from "@opencode-ai/tui/config"
+import { TuiConfig } from "@opencode-ai/tui/config/v1"
 
 export const Info = TuiConfig.Info
 export type Info = TuiConfig.Info

packages/opencode/test/cli/cmd/tui/attention.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test"
 import type { AudioPlayOptions, AudioSound } from "@opentui/core"
 import { createTuiAttention } from "@opencode-ai/tui/attention"
-import type { TuiConfig } from "@opencode-ai/tui/config"
+import type { TuiConfig } from "@opencode-ai/tui/config/v1"
 
 type FocusEvent = "focus" | "blur"
 

packages/opencode/test/cli/run/runtime.boot.test.ts

@@ -1,6 +1,6 @@
 import { afterEach, describe, expect, mock, spyOn, test } from "bun:test"
 import { OpenCode } from "@opencode-ai/client/promise"
-import type { Resolved } from "@opencode-ai/tui/config"
+import type { Resolved } from "@opencode-ai/tui/config/v1"
 import { resolveDiffStyle, resolveModelInfo, resolveRunTuiConfig } from "@opencode-ai/cli/mini/runtime.boot"
 import { createTuiResolvedConfig } from "../../fixture/tui-runtime"
 

packages/opencode/test/fixture/tui-runtime.ts

@@ -1,8 +1,8 @@
 import { spyOn } from "bun:test"
 import path from "path"
-import { resolve, type Info, type Resolved } from "@opencode-ai/tui/config"
+import { resolve, type Info, type Resolved } from "@opencode-ai/tui/config/v1"
 import { TuiConfig } from "../../src/config/tui"
-import { TuiKeybind } from "@opencode-ai/tui/config/keybind"
+import { TuiKeybind } from "@opencode-ai/tui/config/v1/keybind"
 
 type PluginSpec = string | [string, Record<string, unknown>]
 type PluginOrigin = {

packages/plugin/package.json

@@ -15,6 +15,7 @@
     "./tui": "./src/tui.ts",
     "./v2/effect": "./src/v2/effect/index.ts",
     "./v2/effect/*": "./src/v2/effect/*.ts",
+    "./v2/tui/*": "./src/v2/tui/*.ts",
     "./v2": "./src/v2/promise/index.ts",
     "./v2/*": "./src/v2/promise/*.ts"
   },

packages/plugin/src/v2/tui/context.ts

@@ -0,0 +1,112 @@
+import type {
+  AgentInfo,
+  CommandInfo,
+  FormInfo,
+  IntegrationInfo,
+  LocationRef,
+  McpResource,
+  McpServer,
+  ModelInfo,
+  OpenCodeClient,
+  OpenCodeEvent,
+  PermissionSavedInfo,
+  PermissionV2Request,
+  ProviderV2Info,
+  ReferenceInfo,
+  SessionInfo,
+  SessionMessageInfo,
+  SessionPendingInfo,
+  ShellInfo,
+  SkillInfo,
+} from "@opencode-ai/client"
+import type { JSX } from "@opentui/solid"
+
+interface LocationCollection<Value> {
+  list(location?: LocationRef): Value[] | undefined
+  refresh(location?: LocationRef): Promise<void>
+}
+
+export interface Data {
+  readonly on: <Type extends OpenCodeEvent["type"]>(
+    type: Type,
+    handler: (event: Extract<OpenCodeEvent, { type: Type }>) => void,
+  ) => () => void
+  readonly listen: (handler: (event: { details: OpenCodeEvent }) => void) => () => void
+  readonly session: {
+    list(): SessionInfo[]
+    get(sessionID: string): SessionInfo | undefined
+    root(sessionID: string): string
+    family(sessionID: string): string[]
+    cost(sessionID: string): number
+    status(sessionID: string): "idle" | "running"
+    readonly pending: {
+      list(sessionID: string): SessionPendingInfo[]
+      refresh(sessionID: string): Promise<void>
+    }
+    refresh(sessionID: string): Promise<void>
+    readonly message: {
+      list(sessionID: string): SessionMessageInfo[]
+      get(sessionID: string, messageID: string): SessionMessageInfo | undefined
+      refresh(sessionID: string): Promise<void>
+    }
+    readonly permission: {
+      list(sessionID: string): PermissionV2Request[] | undefined
+      refresh(sessionID: string): Promise<void>
+    }
+    readonly form: {
+      list(sessionID: string, location?: LocationRef): Array<FormInfo & { readonly location?: LocationRef }> | undefined
+      refresh(sessionID: string, location?: LocationRef): Promise<void>
+    }
+  }
+  readonly project: {
+    readonly permission: {
+      list(projectID: string): PermissionSavedInfo[] | undefined
+      refresh(projectID: string): Promise<void>
+    }
+  }
+  readonly shell: {
+    list(location?: LocationRef): ShellInfo[]
+    get(id: string): ShellInfo | undefined
+    refresh(location?: LocationRef): Promise<void>
+  }
+  readonly location: {
+    default(): LocationRef
+    refresh(location?: LocationRef): Promise<void>
+    readonly agent: LocationCollection<AgentInfo>
+    readonly command: LocationCollection<CommandInfo>
+    readonly integration: LocationCollection<IntegrationInfo>
+    readonly mcp: {
+      readonly server: LocationCollection<McpServer>
+      readonly resource: LocationCollection<McpResource>
+    }
+    readonly model: LocationCollection<ModelInfo>
+    readonly provider: LocationCollection<ProviderV2Info>
+    readonly reference: LocationCollection<ReferenceInfo>
+    readonly skill: LocationCollection<SkillInfo>
+  }
+}
+
+export interface RouteDefinition {
+  readonly name: string
+  readonly render: (input: { readonly params: any }) => JSX.Element
+}
+
+export interface Route {
+  register(definition: RouteDefinition): () => void
+  navigate(input: { readonly name: string; readonly params?: any }): void
+  current(): {
+    readonly name: string
+    readonly params: any
+  }
+}
+
+export interface UI {
+  readonly route: Route
+}
+
+export interface Context {
+  readonly options: Record<string, any>
+  readonly client: OpenCodeClient
+  readonly data: Data
+  readonly ui: UI
+}

packages/protocol/src/client.ts

@@ -54,6 +54,7 @@ export const groupNames = {
   "server.event": "event",
   "server.pty": "pty",
   "server.shell": "shell",
+  "server.mcp": "mcp",
   "server.question": "question",
   "server.reference": "reference",
   "server.project": "project",

packages/schema/src/integration.ts

@@ -92,12 +92,13 @@ export const Ref = Schema.Struct({
   name: Schema.String,
 }).annotate({ identifier: "Integration.Ref" })
 
-export class Info extends Schema.Class<Info>("Integration.Info")({
+export const Info = Schema.Struct({
   id: ID,
   name: Schema.String,
   methods: Schema.Array(Method),
   connections: Schema.Array(Connection.Info),
-}) {}
+}).annotate({ identifier: "Integration.Info" })
+export interface Info extends Schema.Schema.Type<typeof Info> {}
 
 export const AttemptID = Schema.String.pipe(
   Schema.brand("Integration.AttemptID"),

packages/schema/src/reference.ts

@@ -30,10 +30,11 @@ export const Source = Schema.Union([LocalSource, GitSource])
   .annotate({ identifier: "Reference.Source" })
 export type Source = typeof Source.Type
 
-export class Info extends Schema.Class<Info>("Reference.Info")({
+export const Info = Schema.Struct({
   name: Schema.String,
   path: AbsolutePath,
   description: Schema.String.pipe(optional),
   hidden: Schema.Boolean.pipe(optional),
   source: Source,
-}) {}
+}).annotate({ identifier: "Reference.Info" })
+export interface Info extends Schema.Schema.Type<typeof Info> {}

packages/schema/src/shell.ts

@@ -23,8 +23,8 @@ export const Status = Schema.Literals(["running", "exited", "timeout", "killed"]
 export type Status = typeof Status.Type
 
 export const Time = Schema.Struct({
-  started: Schema.Number,
-  completed: optional(Schema.Number),
+  started: Schema.Finite,
+  completed: optional(Schema.Finite),
 })
 export interface Time extends Schema.Schema.Type<typeof Time> {}
 
@@ -42,15 +42,15 @@ export const Info = Schema.Struct({
   // Absolute path of the file capturing combined stdout/stderr. Page through it via `output`.
   file: Schema.String,
   pid: optional(NonNegativeInt),
-  exit: optional(Schema.Number),
+  exit: optional(Schema.Finite),
   // Always present; defaults to an empty object when the creator supplies no metadata.
   metadata: Metadata,
   time: Time,
-}).annotate({ identifier: "Shell" })
+}).annotate({ identifier: "Shell.Info" })
 export interface Info extends Schema.Schema.Type<typeof Info> {}
 
 const Created = ephemeral({ type: "shell.created", schema: { info: Info } })
-const Exited = ephemeral({ type: "shell.exited", schema: { id: ID, exit: optional(Schema.Number), status: Status } })
+const Exited = ephemeral({ type: "shell.exited", schema: { id: ID, exit: optional(Schema.Finite), status: Status } })
 const Deleted = ephemeral({ type: "shell.deleted", schema: { id: ID } })
 export const Event = { Created, Exited, Deleted, Definitions: inventory(Created, Exited, Deleted) }
 

packages/tui/package.json

@@ -12,7 +12,10 @@
   "exports": {
     ".": "./src/index.tsx",
     "./builtins": "./src/feature-plugins/builtins.ts",
-    "./config": "./src/config/index.tsx",
+    "./config/v1": "./src/config/v1/index.tsx",
+    "./config/v1/keybind": "./src/config/v1/keybind.ts",
+    "./config/v2": "./src/config/v2/index.ts",
+    "./config/v2/keybind": "./src/config/v2/keybind.ts",
     "./context/args": "./src/context/args.tsx",
     "./context/epilogue": "./src/context/epilogue.tsx",
     "./context/exit": "./src/context/exit.tsx",
@@ -30,7 +33,6 @@
     "./editor-zed": "./src/editor-zed.ts",
     "./runtime": "./src/runtime.tsx",
     "./terminal-win32": "./src/terminal-win32.ts",
-    "./config/keybind": "./src/config/keybind.ts",
     "./keymap": "./src/keymap.tsx",
     "./prompt/content": "./src/prompt/content.ts",
     "./prompt/display": "./src/prompt/display.ts",

packages/tui/src/app.tsx

@@ -3,7 +3,7 @@ import { registerOpencodeSpinner } from "./component/register-spinner"
 import { createDefaultOpenTuiKeymap } from "@opentui/keymap/opentui"
 import { Deferred, Effect } from "effect"
 import { Service } from "@opencode-ai/client/effect"
-import { OpenCode } from "@opencode-ai/client/promise"
+import { OpenCode } from "@opencode-ai/client"
 import { Global } from "@opencode-ai/core/global"
 import { Flag } from "@opencode-ai/core/flag/flag"
 import { InstallationVersion } from "@opencode-ai/core/installation/version"
@@ -53,8 +53,6 @@ import { DialogThemeList } from "./component/dialog-theme-list"
 import { DialogHelp } from "./ui/dialog-help"
 import { DialogAgent } from "./component/dialog-agent"
 import { DialogSessionList } from "./component/dialog-session-list"
-import { DialogWorkspaceList } from "./component/dialog-workspace-list"
-import { DialogConsoleOrg } from "./component/dialog-console-org"
 import { ThemeProvider, useTheme } from "./context/theme"
 import { Home } from "./routes/home"
 import { Session } from "./routes/session"
@@ -70,7 +68,7 @@ import * as Model from "./util/model"
 import { ArgsProvider, useArgs, type Args } from "./context/args"
 import open from "open"
 import { PromptRefProvider, usePromptRef } from "./context/prompt"
-import { TuiConfigProvider, useTuiConfig, type TuiConfig } from "./config"
+import { TuiConfigProvider, useTuiConfig, type TuiConfig } from "./config/v1"
 import { createTuiApiAdapters } from "./plugin/adapters"
 import { createTuiApi } from "./plugin/api"
 import { createPluginRuntime, PluginRuntimeProvider, usePluginRuntime, type TuiPluginHost } from "./plugin/runtime"
@@ -121,7 +119,6 @@ const appBindingCommands = [
   "variant.cycle",
   "variant.list",
   "provider.connect",
-  "console.org.switch",
   "opencode.status",
   "server.pair",
   "opencode.debug",
@@ -131,7 +128,6 @@ const appBindingCommands = [
   "help.show",
   "docs.open",
   "diff.open",
-  "workspace.list",
   "app.debug",
   "app.console",
   "app.heap_snapshot",
@@ -422,10 +418,10 @@ function App(props: { onSnapshot?: () => Promise<string[]>; pluginHost: TuiPlugi
   const keymap = useOpencodeKeymap()
   const event = useEvent()
   const sdk = useSDK()
+  const sync = useSync()
   const toast = useToast()
   const themeState = useTheme()
   const { theme, mode, setMode, locked, lock, unlock } = themeState
-  const sync = useSync()
   const data = useData()
   const project = useProject()
   const exit = useExit()
@@ -439,7 +435,7 @@ function App(props: { onSnapshot?: () => Promise<string[]>; pluginHost: TuiPlugi
   // the same problem on every refresh while still re-alerting if the state changes.
   const mcpAlerted: Record<string, string> = {}
   createEffect(() => {
-    for (const server of data.location.mcp.list() ?? []) {
+    for (const server of data.location.mcp.server.list() ?? []) {
       const status = server.status
       if (status.status !== "failed" && status.status !== "needs_auth") {
         delete mcpAlerted[server.name]
@@ -524,7 +520,7 @@ function App(props: { onSnapshot?: () => Promise<string[]>; pluginHost: TuiPlugi
   }
   const [terminalTitleEnabled, setTerminalTitleEnabled] = createSignal(kv.get("terminal_title_enabled", true))
   const [pasteSummaryEnabled, setPasteSummaryEnabled] = createSignal(
-    kv.get("paste_summary_enabled", !sync.data.config.experimental?.disable_paste_summary),
+    kv.get("paste_summary_enabled", true),
   )
 
   // Update terminal window title based on current route and session
@@ -578,7 +574,7 @@ function App(props: { onSnapshot?: () => Promise<string[]>; pluginHost: TuiPlugi
 
   let continued = false
   createEffect(() => {
-    if (continued || sync.status === "loading" || !args.continue) return
+    if (continued || !args.continue) return
     continued = true
     const location = data.location.default()
     void sdk.api.session
@@ -604,12 +600,10 @@ function App(props: { onSnapshot?: () => Promise<string[]>; pluginHost: TuiPlugi
       .catch(toast.error)
   })
 
-  // Handle --session with --fork: wait for sync to be fully complete before forking
-  // (session list loads in non-blocking phase for --session, so we must wait for "complete"
-  // to avoid a race where reconcile overwrites the newly forked session)
+  // Handle --session with --fork once.
   let forked = false
   createEffect(() => {
-    if (forked || sync.status !== "complete" || !args.sessionID || !args.fork) return
+    if (forked || !args.sessionID || !args.fork) return
     forked = true
     void sdk.api.session
       .fork({ sessionID: args.sessionID })
@@ -618,13 +612,6 @@ function App(props: { onSnapshot?: () => Promise<string[]>; pluginHost: TuiPlugi
   })
 
   const connected = useConnected()
-  const currentWorktreeWorkspace = createMemo(() => {
-    const workspaceID = project.workspace.current()
-    if (!workspaceID) return
-    const workspace = project.workspace.get(workspaceID)
-    if (workspace?.type !== "worktree" || !workspace.directory) return
-    return workspace
-  })
   const appCommands = createMemo(() =>
     [
       {
@@ -661,31 +648,6 @@ function App(props: { onSnapshot?: () => Promise<string[]>; pluginHost: TuiPlugi
           dialog.clear()
         },
       },
-      {
-        name: "workspace.copy_path",
-        title: "Copy worktree path",
-        category: "Workspace",
-        enabled: () => currentWorktreeWorkspace() !== undefined,
-        run: async () => {
-          const workspace = currentWorktreeWorkspace()
-          if (!workspace?.directory) return
-          await clipboard
-            .write?.(workspace.directory)
-            .then(() => toast.show({ message: "Copied worktree path", variant: "info" }))
-            .catch(toast.error)
-          dialog.clear()
-        },
-      },
-      {
-        name: "workspace.list",
-        title: "Manage workspaces",
-        category: "Workspace",
-        hidden: !Flag.OPENCODE_EXPERIMENTAL_WORKSPACES,
-        slashName: "workspaces",
-        run: () => {
-          dialog.replace(() => <DialogWorkspaceList />)
-        },
-      },
       ...Array.from({ length: 9 }, (_, i) => ({
         name: `session.quick_switch.${i + 1}`,
         title: `Switch to session in quick slot ${i + 1}`,
@@ -818,21 +780,6 @@ function App(props: { onSnapshot?: () => Promise<string[]>; pluginHost: TuiPlugi
         },
         category: "Integration",
       },
-      ...(sync.data.console_state.switchableOrgCount > 1
-        ? [
-            {
-              name: "console.org.switch",
-              title: "Switch org",
-              suggested: Boolean(sync.data.console_state.activeOrgName),
-              slashName: "org",
-              slashAliases: ["orgs", "switch-org"],
-              run: () => {
-                dialog.replace(() => <DialogConsoleOrg />)
-              },
-              category: "Provider",
-            },
-          ]
-        : []),
       {
         name: "opencode.status",
         title: "View status",
@@ -1040,7 +987,6 @@ function App(props: { onSnapshot?: () => Promise<string[]>; pluginHost: TuiPlugi
         category: "System",
         run: async () => {
           kv.set("session_directory_filter_enabled", !kv.get("session_directory_filter_enabled", true))
-          await sync.session.refresh()
           dialog.clear()
         },
       },

packages/tui/src/attention.ts

@@ -10,7 +10,7 @@ import type {
   TuiAttentionSoundPack,
   TuiAttentionSoundPackInfo,
 } from "@opencode-ai/plugin/tui"
-import { AttentionSoundName, type TuiConfig } from "./config"
+import { AttentionSoundName, type TuiConfig } from "./config/v1"
 import { Schema } from "effect"
 import stripAnsi from "strip-ansi"
 import * as TuiAudio from "./audio"

packages/tui/src/component/command-palette.tsx

@@ -8,7 +8,7 @@ import {
   useKeymapSelector,
   useOpencodeKeymap,
 } from "../keymap"
-import { useTuiConfig } from "../config"
+import { useTuiConfig } from "../config/v1"
 
 type PaletteCommandEntry = ReturnType<OpenTuiKeymap["getCommandEntries"]>[number]
 

packages/tui/src/component/dialog-console-org.tsx

@@ -1,135 +0,0 @@
-import { createResource, createMemo, createSignal } from "solid-js"
-import { TextAttributes } from "@opentui/core"
-import { DialogSelect } from "../ui/dialog-select"
-import { useSDK } from "../context/sdk"
-import { useDialog } from "../ui/dialog"
-import { useToast } from "../ui/toast"
-import { useTheme } from "../context/theme"
-import { errorMessage } from "../util/error"
-import type { ExperimentalConsoleListOrgsResponse } from "@opencode-ai/sdk/v2"
-
-type OrgOption = ExperimentalConsoleListOrgsResponse["orgs"][number]
-
-const accountHost = (url: string) => {
-  try {
-    return new URL(url).host
-  } catch {
-    return url
-  }
-}
-
-const accountLabel = (item: Pick<OrgOption, "accountEmail" | "accountUrl">) =>
-  `${item.accountEmail}  ${accountHost(item.accountUrl)}`
-
-export function DialogConsoleOrg() {
-  const sdk = useSDK()
-  const dialog = useDialog()
-  const toast = useToast()
-  const { theme } = useTheme()
-
-  const [loadError, setLoadError] = createSignal<unknown>()
-
-  const [orgs] = createResource(() =>
-    sdk.client.experimental.console
-      .listOrgs({}, { throwOnError: true })
-      .then((result) => result.data?.orgs ?? [])
-      // Catch so the rejected resource never reaches the memos below: reading
-      // orgs() in an errored state re-throws and tears down the dialog.
-      .catch((error) => {
-        setLoadError(error)
-        return undefined
-      }),
-  )
-
-  const showError = createMemo(() => Boolean(loadError()))
-
-  const current = createMemo(() => orgs()?.find((item) => item.active))
-
-  const options = createMemo(() => {
-    if (showError()) return []
-    const listed = orgs()
-    if (listed === undefined) {
-      return [
-        {
-          title: "Loading orgs...",
-          value: "loading",
-          onSelect: () => {},
-        },
-      ]
-    }
-
-    if (listed.length === 0) {
-      return [
-        {
-          title: "No orgs found",
-          value: "empty",
-          onSelect: () => {},
-        },
-      ]
-    }
-
-    return listed
-      .toSorted((a, b) => {
-        const activeAccountA = a.active ? 0 : 1
-        const activeAccountB = b.active ? 0 : 1
-        if (activeAccountA !== activeAccountB) return activeAccountA - activeAccountB
-
-        const accountCompare = accountLabel(a).localeCompare(accountLabel(b))
-        if (accountCompare !== 0) return accountCompare
-
-        return a.orgName.localeCompare(b.orgName)
-      })
-      .map((item) => ({
-        title: item.orgName,
-        value: item,
-        category: accountLabel(item),
-        categoryView: (
-          <box flexDirection="row" gap={2}>
-            <text fg={theme.accent}>{item.accountEmail}</text>
-            <text fg={theme.textMuted}>{accountHost(item.accountUrl)}</text>
-          </box>
-        ),
-        onSelect: async () => {
-          if (item.active) {
-            dialog.clear()
-            return
-          }
-
-          await sdk.client.experimental.console.switchOrg(
-            {
-              accountID: item.accountID,
-              orgID: item.orgID,
-            },
-            { throwOnError: true },
-          )
-
-          await sdk.client.instance.dispose()
-          toast.show({
-            message: `Switched to ${item.orgName}`,
-            variant: "info",
-          })
-          dialog.clear()
-        },
-      }))
-  })
-
-  return (
-    <DialogSelect<string | OrgOption>
-      title="Switch org"
-      options={options()}
-      current={current()}
-      renderFilter={!showError()}
-      locked={showError()}
-      emptyView={
-        showError() ? (
-          <box paddingLeft={4} paddingRight={4}>
-            <text fg={theme.error} attributes={TextAttributes.BOLD}>
-              Could not load orgs
-            </text>
-            <text fg={theme.textMuted}>{errorMessage(loadError())}</text>
-          </box>
-        ) : undefined
-      }
-    />
-  )
-}

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

@@ -1,6 +1,10 @@
 import { TextAttributes } from "@opentui/core"
-import type { IntegrationConnectOauthOutput } from "@opencode-ai/client/promise"
-import type { ConnectionInfo, IntegrationInfo, IntegrationOAuthMethod } from "@opencode-ai/sdk/v2"
+import type {
+  ConnectionInfo,
+  IntegrationConnectOauthOutput,
+  IntegrationInfo,
+  IntegrationOAuthMethod,
+} from "@opencode-ai/client"
 import { createMemo, createSignal, onCleanup, onMount, Show } from "solid-js"
 import { useClipboard } from "../context/clipboard"
 import { useData } from "../context/data"

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

@@ -5,11 +5,11 @@ import { DialogSelect } from "../ui/dialog-select"
 import { useDialog } from "../ui/dialog"
 import { useTheme, type Theme } from "../context/theme"
 import { TextAttributes, type ScrollBoxRenderable } from "@opentui/core"
-import type { McpServer } from "@opencode-ai/sdk/v2"
+import type { McpServer } from "@opencode-ai/client"
 import { useClipboard } from "../context/clipboard"
 import { useToast } from "../ui/toast"
 import { useKeyboard, useTerminalDimensions } from "@opentui/solid"
-import { useTuiConfig } from "../config"
+import { useTuiConfig } from "../config/v1"
 import { getScrollAcceleration } from "../util/scroll"
 import { useBindings } from "../keymap"
 
@@ -45,7 +45,7 @@ export function DialogMcp() {
 
   const servers = createMemo(() =>
     pipe(
-      data.location.mcp.list() ?? [],
+      data.location.mcp.server.list() ?? [],
       sortBy(
         (server) => statusMeta(server.status, theme).rank,
         (server) => server.name,

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

@@ -6,7 +6,7 @@ import { DialogSelect, type DialogSelectOption } from "../ui/dialog-select"
 import { useDialog } from "../ui/dialog"
 import { useSDK } from "../context/sdk"
 import { useTheme } from "../context/theme"
-import { useSync } from "../context/sync"
+import { useData } from "../context/data"
 import { abbreviateHome } from "../runtime"
 import { useTuiPaths } from "../context/runtime"
 import { Locale } from "../util/locale"
@@ -17,7 +17,7 @@ import { useCommandShortcut } from "../keymap"
 import { useProject } from "../context/project"
 import { Spinner } from "./spinner"
 import { DialogWorkspaceFileChanges } from "./dialog-workspace-file-changes"
-import type { ProjectDirectoriesOutput } from "@opencode-ai/client/promise"
+import type { ProjectDirectoriesOutput } from "@opencode-ai/client"
 import { useRoute } from "../context/route"
 import { DialogProjectCopyName } from "./dialog-project-copy-name"
 
@@ -38,7 +38,7 @@ export function DialogMoveSession(props: DialogMoveSessionProps) {
   const sdk = useSDK()
   const dimensions = useTerminalDimensions()
   const { theme } = useTheme()
-  const sync = useSync()
+  const sessionData = useData()
   const projectContext = useProject()
   const route = useRoute()
   const toast = useToast()
@@ -132,9 +132,13 @@ export function DialogMoveSession(props: DialogMoveSessionProps) {
     })
     if (roots.length === 0) return [{ title: "No project directories found", value: undefined }]
 
-    const subdirectories = sync.data.session
-      .filter((session) => session.projectID === props.projectID && session.path && ![".", "/"].includes(session.path))
-      .map((session) => session.directory)
+    const subdirectories = sessionData.session
+      .list()
+      .filter(
+        (session) =>
+          session.projectID === props.projectID && session.subpath && ![".", "/"].includes(session.subpath),
+      )
+      .map((session) => session.location.directory)
       .filter((directory) => !roots.some((root) => root.directory === directory))
       .filter((directory, index, directories) => directories.indexOf(directory) === index)
       .map((location) => ({

packages/tui/src/component/dialog-project-copy-name.tsx

@@ -1,7 +1,7 @@
 import { InputRenderable, TextAttributes } from "@opentui/core"
 import { Slug } from "@opencode-ai/core/util/slug"
 import { createSignal, onMount } from "solid-js"
-import { useTuiConfig } from "../config"
+import { useTuiConfig } from "../config/v1"
 import { useTheme } from "../context/theme"
 import { useBindings, useCommandShortcut } from "../keymap"
 import { useDialog, type DialogContext } from "../ui/dialog"

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

@@ -1,469 +0,0 @@
-import { createMemo, createSignal, onMount, Show } from "solid-js"
-import { useSync } from "../context/sync"
-import { map, pipe, sortBy } from "remeda"
-import { DialogSelect } from "../ui/dialog-select"
-import { useDialog } from "../ui/dialog"
-import { useSDK } from "../context/sdk"
-import { DialogPrompt } from "../ui/dialog-prompt"
-import { Link } from "../ui/link"
-import { useTheme } from "../context/theme"
-import { TextAttributes } from "@opentui/core"
-import type { ProviderAuthAuthorization, ProviderAuthMethod } from "@opencode-ai/sdk/v2"
-import { DialogModel } from "./dialog-model"
-import { useToast } from "../ui/toast"
-import { isConsoleManagedProvider } from "../util/provider-origin"
-import { useConnected } from "./use-connected"
-import { useBindings } from "../keymap"
-import { useClipboard } from "../context/clipboard"
-
-const PROVIDER_PRIORITY: Record<string, number> = {
-  opencode: 0,
-  "opencode-go": 1,
-  openai: 2,
-  "github-copilot": 3,
-  anthropic: 4,
-  google: 5,
-}
-
-const CUSTOM_PROVIDER_OPTION_VALUE = "__opencode_custom_provider__"
-const CUSTOM_PROVIDER_ID = /^[a-z0-9][a-z0-9-_]*$/
-
-type ProviderOptionBase = {
-  title: string
-  value: string
-  description?: string
-  category: string
-}
-
-type ProviderOption =
-  | (ProviderOptionBase & {
-      type: "provider"
-      providerID: string
-    })
-  | (ProviderOptionBase & {
-      type: "custom"
-    })
-
-export function providerOptions(list: { id: string; name: string }[]): ProviderOption[] {
-  return [
-    ...pipe(
-      list,
-      sortBy(
-        (x) => PROVIDER_PRIORITY[x.id] ?? 99,
-        (x) => x.name.toLowerCase(),
-        (x) => x.id,
-      ),
-      map((provider) => ({
-        type: "provider" as const,
-        title: provider.name,
-        value: provider.id,
-        providerID: provider.id,
-        description: {
-          opencode: "(Recommended)",
-          anthropic: "(API key)",
-          openai: "(ChatGPT Plus/Pro or API key)",
-          "opencode-go": "Low cost subscription for everyone",
-        }[provider.id],
-        category: provider.id in PROVIDER_PRIORITY ? "Popular" : "Providers",
-      })),
-    ),
-    {
-      type: "custom",
-      title: "Other",
-      value: CUSTOM_PROVIDER_OPTION_VALUE,
-      description: "Custom provider",
-      category: "Providers",
-    },
-  ]
-}
-
-export function normalizeCustomProviderID(value: string) {
-  const providerID = value.trim().replace(/^@ai-sdk\//, "")
-  if (!CUSTOM_PROVIDER_ID.test(providerID)) return
-  return providerID
-}
-
-export function createDialogProviderOptions() {
-  const sync = useSync()
-  const dialog = useDialog()
-  const sdk = useSDK()
-  const toast = useToast()
-  const { theme } = useTheme()
-  const onboarded = useConnected()
-
-  async function promptCustomProviderID(): Promise<string | undefined> {
-    const value = await DialogPrompt.show(dialog, "Other", {
-      placeholder: "Provider id",
-      description: () => (
-        <text fg={theme.textMuted}>
-          This only stores a credential. Configure the provider in opencode.json to use it.
-        </text>
-      ),
-    })
-    if (value === null) return
-
-    const providerID = normalizeCustomProviderID(value)
-    if (providerID) return providerID
-
-    toast.show({
-      variant: "error",
-      message:
-        "Provider ids must start with a lowercase letter or number and only use lowercase letters, numbers, hyphens, and underscores",
-    })
-    return promptCustomProviderID()
-  }
-
-  const options = createMemo(() => {
-    return pipe(
-      providerOptions(sync.data.provider_next.all),
-      map((provider) => {
-        if (provider.type === "custom") {
-          return {
-            title: provider.title,
-            value: provider.value,
-            description: provider.description,
-            category: provider.category,
-            async onSelect() {
-              const providerID = await promptCustomProviderID()
-              if (!providerID) return
-              return dialog.replace(() => <ApiMethod providerID={providerID} title="API key" custom />)
-            },
-          }
-        }
-
-        const providerID = provider.providerID
-        const consoleManaged = isConsoleManagedProvider(sync.data.console_state.consoleManagedProviders, providerID)
-        const connected = sync.data.provider_next.connected.includes(providerID)
-
-        return {
-          title: provider.title,
-          value: provider.value,
-          description: provider.description,
-          footer: consoleManaged ? sync.data.console_state.activeOrgName : undefined,
-          category: provider.category,
-          gutter: connected && onboarded() ? () => <text fg={theme.success}>✓</text> : undefined,
-          async onSelect() {
-            if (consoleManaged) return
-
-            const methods = sync.data.provider_auth[providerID] ?? [
-              {
-                type: "api",
-                label: "API key",
-              },
-            ]
-            let index: number | null = 0
-            if (methods.length > 1) {
-              index = await new Promise<number | null>((resolve) => {
-                dialog.replace(
-                  () => (
-                    <DialogSelect
-                      title="Select auth method"
-                      options={methods.map((x, index) => ({
-                        title: x.label,
-                        value: index,
-                      }))}
-                      onSelect={(option) => resolve(option.value)}
-                    />
-                  ),
-                  () => resolve(null),
-                )
-              })
-            }
-            if (index == null) return
-            const method = methods[index]
-            if (method.type === "oauth") {
-              let inputs: Record<string, string> | undefined
-              if (method.prompts?.length) {
-                const value = await PromptsMethod({
-                  dialog,
-                  prompts: method.prompts,
-                })
-                if (!value) return
-                inputs = value
-              }
-
-              const result = await sdk.client.provider.oauth.authorize({
-                providerID,
-                method: index,
-                inputs,
-              })
-              if (result.error) {
-                toast.show({
-                  variant: "error",
-                  message: JSON.stringify(result.error),
-                })
-                dialog.clear()
-                return
-              }
-              if (result.data?.method === "code") {
-                dialog.replace(() => (
-                  <CodeMethod providerID={providerID} title={method.label} index={index} authorization={result.data!} />
-                ))
-              }
-              if (result.data?.method === "auto") {
-                dialog.replace(() => (
-                  <AutoMethod providerID={providerID} title={method.label} index={index} authorization={result.data!} />
-                ))
-              }
-            }
-            if (method.type === "api") {
-              let metadata: Record<string, string> | undefined
-              if (method.prompts?.length) {
-                const value = await PromptsMethod({ dialog, prompts: method.prompts })
-                if (!value) return
-                metadata = value
-              }
-              return dialog.replace(() => (
-                <ApiMethod providerID={providerID} title={method.label} metadata={metadata} />
-              ))
-            }
-          },
-        }
-      }),
-    )
-  })
-  return options
-}
-
-export function DialogProvider() {
-  const options = createDialogProviderOptions()
-  return <DialogSelect title="Connect a provider" options={options()} />
-}
-
-interface AutoMethodProps {
-  index: number
-  providerID: string
-  title: string
-  authorization: ProviderAuthAuthorization
-}
-function AutoMethod(props: AutoMethodProps) {
-  const { theme } = useTheme()
-  const sdk = useSDK()
-  const dialog = useDialog()
-  const sync = useSync()
-  const toast = useToast()
-  const clipboard = useClipboard()
-
-  useBindings(() => ({
-    bindings: [
-      {
-        key: "c",
-        desc: "Copy provider code",
-        group: "Dialog",
-        cmd: () => {
-          const code =
-            props.authorization.instructions.match(/[A-Z0-9]{4}-[A-Z0-9]{4,5}/)?.[0] ?? props.authorization.url
-          clipboard
-            .write?.(code)
-            .then(() => toast.show({ message: "Copied to clipboard", variant: "info" }))
-            .catch(toast.error)
-        },
-      },
-    ],
-  }))
-
-  onMount(async () => {
-    const result = await sdk.client.provider.oauth.callback({
-      providerID: props.providerID,
-      method: props.index,
-    })
-    if (result.error) {
-      toast.show({
-        variant: "error",
-        message:
-          "name" in result.error && result.error.name === "ProviderAuthOauthCallbackFailed"
-            ? "OAuth authorization failed. Try /connect again."
-            : JSON.stringify(result.error),
-      })
-      dialog.clear()
-      return
-    }
-    await sdk.client.instance.dispose()
-    await sync.bootstrap()
-    dialog.replace(() => <DialogModel providerID={props.providerID} />)
-  })
-
-  return (
-    <box paddingLeft={2} paddingRight={2} gap={1} paddingBottom={1}>
-      <box flexDirection="row" justifyContent="space-between">
-        <text attributes={TextAttributes.BOLD} fg={theme.text}>
-          {props.title}
-        </text>
-        <text fg={theme.textMuted} onMouseUp={() => dialog.clear()}>
-          esc
-        </text>
-      </box>
-      <box gap={1}>
-        <Link href={props.authorization.url} fg={theme.primary} />
-        <text fg={theme.textMuted}>{props.authorization.instructions}</text>
-      </box>
-      <text fg={theme.textMuted}>Waiting for authorization...</text>
-      <text fg={theme.text}>
-        c <span style={{ fg: theme.textMuted }}>copy</span>
-      </text>
-    </box>
-  )
-}
-
-interface CodeMethodProps {
-  index: number
-  title: string
-  providerID: string
-  authorization: ProviderAuthAuthorization
-}
-function CodeMethod(props: CodeMethodProps) {
-  const { theme } = useTheme()
-  const sdk = useSDK()
-  const sync = useSync()
-  const dialog = useDialog()
-  const [error, setError] = createSignal(false)
-
-  return (
-    <DialogPrompt
-      title={props.title}
-      placeholder="Authorization code"
-      onConfirm={async (value) => {
-        const { error } = await sdk.client.provider.oauth.callback({
-          providerID: props.providerID,
-          method: props.index,
-          code: value,
-        })
-        if (!error) {
-          await sdk.client.instance.dispose()
-          await sync.bootstrap()
-          dialog.replace(() => <DialogModel providerID={props.providerID} />)
-          return
-        }
-        setError(true)
-      }}
-      description={() => (
-        <box gap={1}>
-          <text fg={theme.textMuted}>{props.authorization.instructions}</text>
-          <Link href={props.authorization.url} fg={theme.primary} />
-          <Show when={error()}>
-            <text fg={theme.error}>Invalid code</text>
-          </Show>
-        </box>
-      )}
-    />
-  )
-}
-
-interface ApiMethodProps {
-  providerID: string
-  title: string
-  metadata?: Record<string, string>
-  custom?: boolean
-}
-function ApiMethod(props: ApiMethodProps) {
-  const dialog = useDialog()
-  const sdk = useSDK()
-  const sync = useSync()
-  const toast = useToast()
-  const { theme } = useTheme()
-
-  return (
-    <DialogPrompt
-      title={props.title}
-      placeholder="API key"
-      description={() =>
-        ({
-          opencode: (
-            <box gap={1}>
-              <text fg={theme.textMuted}>
-                OpenCode Zen gives you access to all the best coding models at the cheapest prices with a single API
-                key.
-              </text>
-              <text fg={theme.text}>
-                Go to <span style={{ fg: theme.primary }}>https://opencode.ai/zen</span> to get a key
-              </text>
-            </box>
-          ),
-          "opencode-go": (
-            <box gap={1}>
-              <text fg={theme.textMuted}>
-                OpenCode Go is a $10 per month subscription that provides reliable access to popular open coding models
-                with generous usage limits.
-              </text>
-              <text fg={theme.text}>
-                Go to <span style={{ fg: theme.primary }}>https://opencode.ai/go</span> and enable OpenCode Go
-              </text>
-            </box>
-          ),
-        })[props.providerID] ?? undefined
-      }
-      onConfirm={async (value) => {
-        if (!value) return
-        await sdk.client.auth.set({
-          providerID: props.providerID,
-          auth: {
-            type: "api",
-            key: value,
-            ...(props.metadata ? { metadata: props.metadata } : {}),
-          },
-        })
-        await sdk.client.instance.dispose()
-        await sync.bootstrap()
-        if (props.custom && !sync.data.provider_next.all.some((provider) => provider.id === props.providerID)) {
-          toast.show({
-            variant: "info",
-            message: `Saved credential for ${props.providerID}. Configure it in opencode.json to use it.`,
-          })
-          dialog.clear()
-          return
-        }
-        dialog.replace(() => <DialogModel providerID={props.providerID} />)
-      }}
-    />
-  )
-}
-
-interface PromptsMethodProps {
-  dialog: ReturnType<typeof useDialog>
-  prompts: NonNullable<ProviderAuthMethod["prompts"]>[number][]
-}
-async function PromptsMethod(props: PromptsMethodProps) {
-  const inputs: Record<string, string> = {}
-  for (const prompt of props.prompts) {
-    if (prompt.when) {
-      const value = inputs[prompt.when.key]
-      if (value === undefined) continue
-      const matches = prompt.when.op === "eq" ? value === prompt.when.value : value !== prompt.when.value
-      if (!matches) continue
-    }
-
-    if (prompt.type === "select") {
-      const value = await new Promise<string | null>((resolve) => {
-        props.dialog.replace(
-          () => (
-            <DialogSelect
-              title={prompt.message}
-              options={prompt.options.map((x) => ({
-                title: x.label,
-                value: x.value,
-                description: x.hint,
-              }))}
-              onSelect={(option) => resolve(option.value)}
-            />
-          ),
-          () => resolve(null),
-        )
-      })
-      if (value === null) return null
-      inputs[prompt.key] = value
-      continue
-    }
-
-    const value = await new Promise<string | null>((resolve) => {
-      props.dialog.replace(
-        () => (
-          <DialogPrompt title={prompt.message} placeholder={prompt.placeholder} onConfirm={(value) => resolve(value)} />
-        ),
-        () => resolve(null),
-      )
-    })
-    if (value === null) return null
-    inputs[prompt.key] = value
-  }
-  return inputs
-}

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

@@ -1,6 +1,6 @@
 import { createMemo, createResource, createSignal, onMount } from "solid-js"
 import path from "path"
-import type { SessionInfo } from "@opencode-ai/sdk/v2"
+import type { SessionInfo } from "@opencode-ai/client"
 import { useDialog } from "../ui/dialog"
 import { DialogSelect } from "../ui/dialog-select"
 import { useRoute } from "../context/route"

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

@@ -5,7 +5,7 @@ import { useDialog } from "../ui/dialog"
 import { useTheme } from "../context/theme"
 import { errorMessage } from "../util/error"
 import { useData } from "../context/data"
-import type { LocationRef } from "@opencode-ai/sdk/v2"
+import type { LocationRef } from "@opencode-ai/client"
 
 export type DialogSkillProps = {
   location?: LocationRef

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

@@ -1,48 +1,17 @@
 import { TextAttributes } from "@opentui/core"
-import { fileURLToPath } from "bun"
 import { useTheme } from "../context/theme"
 import { useDialog } from "../ui/dialog"
-import { useSync } from "../context/sync"
 import { useData } from "../context/data"
 import { For, Match, Switch, Show, createMemo } from "solid-js"
 
 export type DialogStatusProps = {}
 
 export function DialogStatus() {
-  const sync = useSync()
   const data = useData()
   const { theme } = useTheme()
   const dialog = useDialog()
 
-  const mcp = createMemo(() => data.location.mcp.list() ?? [])
-  const enabledFormatters = createMemo(() => sync.data.formatter.filter((f) => f.enabled))
-
-  const plugins = createMemo(() => {
-    const list = sync.data.config.plugin ?? []
-    const result = list.map((item) => {
-      const value = typeof item === "string" ? item : item[0]
-      if (value.startsWith("file://")) {
-        const path = fileURLToPath(value)
-        const parts = path.split("/")
-        const filename = parts.pop() || path
-        if (!filename.includes(".")) return { name: filename }
-        const basename = filename.split(".")[0]
-        if (basename === "index") {
-          const dirname = parts.pop()
-          const name = dirname || basename
-          return { name }
-        }
-        return { name: basename }
-      }
-      const index = value.lastIndexOf("@")
-      if (index <= 0) return { name: value, version: "latest" }
-      const name = value.substring(0, index)
-      const version = value.substring(index + 1)
-      return { name, version }
-    })
-    return result.toSorted((a, b) => a.name.localeCompare(b.name))
-  })
-
+  const mcp = createMemo(() => data.location.mcp.server.list() ?? [])
   return (
     <box paddingLeft={2} paddingRight={2} gap={1} paddingBottom={1}>
       <box flexDirection="row" justifyContent="space-between">
@@ -94,76 +63,6 @@ export function DialogStatus() {
           </For>
         </box>
       </Show>
-      {sync.data.lsp.length > 0 && (
-        <box>
-          <text fg={theme.text}>{sync.data.lsp.length} LSP Servers</text>
-          <For each={sync.data.lsp}>
-            {(item) => (
-              <box flexDirection="row" gap={1}>
-                <text
-                  flexShrink={0}
-                  style={{
-                    fg: {
-                      connected: theme.success,
-                      error: theme.error,
-                    }[item.status],
-                  }}
-                >
-                  •
-                </text>
-                <text fg={theme.text} wrapMode="word">
-                  <b>{item.id}</b> <span style={{ fg: theme.textMuted }}>{item.root}</span>
-                </text>
-              </box>
-            )}
-          </For>
-        </box>
-      )}
-      <Show when={enabledFormatters().length > 0} fallback={<text fg={theme.text}>No Formatters</text>}>
-        <box>
-          <text fg={theme.text}>{enabledFormatters().length} Formatters</text>
-          <For each={enabledFormatters()}>
-            {(item) => (
-              <box flexDirection="row" gap={1}>
-                <text
-                  flexShrink={0}
-                  style={{
-                    fg: theme.success,
-                  }}
-                >
-                  •
-                </text>
-                <text wrapMode="word" fg={theme.text}>
-                  <b>{item.name}</b>
-                </text>
-              </box>
-            )}
-          </For>
-        </box>
-      </Show>
-      <Show when={plugins().length > 0} fallback={<text fg={theme.text}>No Plugins</text>}>
-        <box>
-          <text fg={theme.text}>{plugins().length} Plugins</text>
-          <For each={plugins()}>
-            {(item) => (
-              <box flexDirection="row" gap={1}>
-                <text
-                  flexShrink={0}
-                  style={{
-                    fg: theme.success,
-                  }}
-                >
-                  •
-                </text>
-                <text wrapMode="word" fg={theme.text}>
-                  <b>{item.name}</b>
-                  {item.version && <span style={{ fg: theme.textMuted }}> @{item.version}</span>}
-                </text>
-              </box>
-            )}
-          </For>
-        </box>
-      </Show>
     </box>
   )
 }

packages/tui/src/component/dialog-workspace-create.tsx

@@ -1,308 +0,0 @@
-import type { ExperimentalWorkspaceAdapterListResponse, Workspace } from "@opencode-ai/sdk/v2"
-import { useDialog } from "../ui/dialog"
-import { DialogSelect, type DialogSelectOption } from "../ui/dialog-select"
-import { useSync } from "../context/sync"
-import { useProject } from "../context/project"
-import { useRoute } from "../context/route"
-import { createMemo, createSignal, onMount } from "solid-js"
-import { errorMessage } from "../util/error"
-import { useSDK } from "../context/sdk"
-import { useToast } from "../ui/toast"
-import { DialogAlert } from "../ui/dialog-alert"
-import { DialogWorkspaceFileChanges } from "./dialog-workspace-file-changes"
-
-type Adapter = ExperimentalWorkspaceAdapterListResponse[number]
-
-export type WorkspaceSelection =
-  | {
-      type: "none"
-    }
-  | {
-      type: "new"
-      workspaceType: string
-      workspaceName: string
-    }
-  | {
-      type: "existing"
-      workspaceID: string
-      workspaceType: string
-      workspaceName: string
-    }
-
-type WorkspaceSelectValue = WorkspaceSelection | { type: "existing-list" }
-type ExistingWorkspaceSelectValue = { workspace: Workspace }
-
-export function recentConnectedWorkspaces<WorkspaceInfo extends { id: string; timeUsed: number | string }>(input: {
-  workspaces: readonly WorkspaceInfo[]
-  status: (workspaceID: string) => string | undefined
-  limit?: number
-  omitWorkspaceID?: string
-}) {
-  const allWorkspaces = input.workspaces.filter((workspace) => input.status(workspace.id) === "connected")
-  const workspaces = allWorkspaces.toSorted((a, b) => Number(b.timeUsed) - Number(a.timeUsed))
-  const recent = workspaces.slice(0, input.limit ?? 3)
-
-  return { recent, hasMore: recent.length < workspaces.length }
-}
-
-export function warpReminderText(dir: string) {
-  return `<system-reminder>The user has changed the current working directory to "${dir}". This is still the same project but at a possibly new location; take this into account when working with any files from now on.</system-reminder>`
-}
-
-async function loadWorkspaceAdapters(input: {
-  sdk: ReturnType<typeof useSDK>
-  sync: ReturnType<typeof useSync>
-  toast: ReturnType<typeof useToast>
-}) {
-  const dir = input.sync.path.directory || process.cwd()
-  try {
-    const response = await input.sdk.client.experimental.workspace.adapter.list({ directory: dir })
-    if (response.error) throw response.error
-    return response.data
-  } catch (err) {
-    input.toast.show({
-      title: "Failed to load workspace adapters",
-      message: errorMessage(err),
-      variant: "error",
-    })
-    return undefined
-  }
-}
-
-export async function openWorkspaceSelect(input: {
-  dialog: ReturnType<typeof useDialog>
-  sdk: ReturnType<typeof useSDK>
-  sync: ReturnType<typeof useSync>
-  project: ReturnType<typeof useProject>
-  toast: ReturnType<typeof useToast>
-  onSelect: (selection: WorkspaceSelection) => Promise<void> | void
-}) {
-  input.dialog.clear()
-  await input.sdk.client.experimental.workspace.syncList().catch(() => undefined)
-  await input.project.workspace.sync().catch(() => undefined)
-  const adapters = await loadWorkspaceAdapters(input)
-  if (!adapters) return
-  input.dialog.replace(() => <DialogWorkspaceSelect adapters={adapters} onSelect={input.onSelect} />)
-}
-
-export async function warpWorkspaceSession(input: {
-  dialog: ReturnType<typeof useDialog>
-  sdk: ReturnType<typeof useSDK>
-  sync: ReturnType<typeof useSync>
-  project: ReturnType<typeof useProject>
-  toast: ReturnType<typeof useToast>
-  sourceWorkspaceID?: string
-  workspaceID: string | null
-  sessionID: string
-  copyChanges: boolean
-  done?: () => void
-}): Promise<boolean> {
-  let result
-  try {
-    result = await input.sdk.client.experimental.workspace.warp({
-      id: input.workspaceID,
-      sessionID: input.sessionID,
-      copyChanges: input.copyChanges,
-    })
-  } catch (err) {
-    input.toast.show({
-      title: "Failed to warp session",
-      message: errorMessage(err),
-      variant: "error",
-    })
-    return false
-  }
-  if (!result?.data) {
-    if (result?.error && "name" in result.error && result.error.name === "VcsApplyError") {
-      await DialogAlert.show(
-        input.dialog,
-        "Unable to Warp Session",
-        "Unable to apply file changes to this workspace. It has existing changes that conflict or is based off a different branch. Session has not been warped.",
-      )
-      return false
-    }
-
-    input.toast.show({
-      title: "Failed to warp session",
-      message: errorMessage(result?.error ?? "no response"),
-      variant: "error",
-    })
-    return false
-  }
-
-  input.project.workspace.set(input.workspaceID)
-
-  await input.sync.bootstrap({ fatal: false }).catch(() => undefined)
-
-  const dir = input.project.instance.directory() || input.sync.path.directory
-  if (dir) {
-    await input.sdk.client.session
-      .promptAsync({
-        sessionID: input.sessionID,
-        workspace: input.workspaceID ?? undefined,
-        noReply: true,
-        parts: [
-          {
-            type: "text",
-            text: warpReminderText(dir),
-            synthetic: true,
-          },
-        ],
-      })
-      .catch(() => undefined)
-  }
-
-  await Promise.all([input.project.workspace.sync(), input.sync.session.refresh()])
-
-  if (input.done) {
-    input.done()
-    return true
-  }
-  input.dialog.clear()
-  return true
-}
-
-export async function confirmWorkspaceFileChanges(input: {
-  dialog: ReturnType<typeof useDialog>
-  sdk: ReturnType<typeof useSDK>
-  sourceWorkspaceID?: string
-}) {
-  const status = await input.sdk.client.vcs.status({ workspace: input.sourceWorkspaceID }).catch(() => undefined)
-  const fileChangeChoice = status?.data?.length
-    ? await DialogWorkspaceFileChanges.show(input.dialog, status.data)
-    : "no"
-  if (!fileChangeChoice) return
-  return fileChangeChoice === "yes"
-}
-
-export function DialogWorkspaceSelect(props: {
-  adapters?: Adapter[]
-  onSelect: (selection: WorkspaceSelection) => Promise<void> | void
-}) {
-  const dialog = useDialog()
-  const project = useProject()
-  const route = useRoute()
-  const sync = useSync()
-  const sdk = useSDK()
-  const toast = useToast()
-  const [adapters, setAdapters] = createSignal<Adapter[] | undefined>(props.adapters)
-  const omittedWorkspaceID = createMemo(() => (route.data.type === "session" ? project.workspace.current() : undefined))
-
-  onMount(() => {
-    dialog.setSize("medium")
-    void (async () => {
-      if (adapters()) return
-      const res = await loadWorkspaceAdapters({ sdk, sync, toast })
-      if (!res) return
-      setAdapters(res)
-    })()
-  })
-
-  const options = createMemo<DialogSelectOption<WorkspaceSelectValue>[]>(() => {
-    const list = adapters()
-    if (!list) return []
-    const { recent, hasMore } = recentConnectedWorkspaces({
-      workspaces: project.workspace.list(),
-      status: project.workspace.status,
-      omitWorkspaceID: omittedWorkspaceID(),
-    })
-    return [
-      ...list.map((adapter) => ({
-        title: adapter.name,
-        value: { type: "new" as const, workspaceType: adapter.type, workspaceName: adapter.name },
-        description: adapter.description,
-        category: "New workspace",
-      })),
-      {
-        title: "None",
-        value: { type: "none" as const },
-        description: "Use the local project",
-        category: "Choose workspace",
-      },
-      ...recent.map((workspace: Workspace) => ({
-        title: workspace.name,
-        description: `(${workspace.type})`,
-        value: {
-          type: "existing" as const,
-          workspaceID: workspace.id,
-          workspaceType: workspace.type,
-          workspaceName: workspace.name,
-        },
-        category: "Choose workspace",
-      })),
-      ...(hasMore
-        ? [
-            {
-              title: "View all workspaces",
-              value: { type: "existing-list" as const },
-              description: "Choose from all workspaces",
-              category: "Choose workspace",
-            },
-          ]
-        : []),
-    ]
-  })
-
-  if (!adapters()) return null
-  return (
-    <DialogSelect<WorkspaceSelectValue>
-      title="Warp"
-      skipFilter={true}
-      renderFilter={false}
-      options={options()}
-      onSelect={(option) => {
-        if (!option.value) return
-        if (option.value.type === "none") {
-          void props.onSelect(option.value)
-          return
-        }
-        if (option.value.type === "new") {
-          void props.onSelect(option.value)
-          return
-        }
-        if (option.value.type === "existing") {
-          void props.onSelect(option.value)
-          return
-        }
-
-        dialog.replace(() => (
-          <DialogExistingWorkspaceSelect omitWorkspaceID={omittedWorkspaceID()} onSelect={props.onSelect} />
-        ))
-      }}
-    />
-  )
-}
-
-function DialogExistingWorkspaceSelect(props: {
-  omitWorkspaceID?: string
-  onSelect: (selection: WorkspaceSelection) => Promise<void> | void
-}) {
-  const project = useProject()
-
-  const options = createMemo<DialogSelectOption<ExistingWorkspaceSelectValue>[]>(() =>
-    project.workspace
-      .list()
-      .filter((workspace) => project.workspace.status(workspace.id) === "connected")
-      .filter((workspace) => workspace.id !== props.omitWorkspaceID)
-      .map((workspace: Workspace) => ({
-        title: workspace.name,
-        description: `(${workspace.type})`,
-        value: { workspace },
-      })),
-  )
-
-  return (
-    <DialogSelect<ExistingWorkspaceSelectValue>
-      title="Existing Workspace"
-      options={options()}
-      onSelect={(option) => {
-        void props.onSelect({
-          type: "existing",
-          workspaceID: option.value.workspace.id,
-          workspaceType: option.value.workspace.type,
-          workspaceName: option.value.workspace.name,
-        })
-      }}
-    />
-  )
-}

packages/tui/src/component/dialog-workspace-file-changes.tsx

@@ -1,11 +1,11 @@
 import { TextAttributes } from "@opentui/core"
-import { useKeyboard } from "@opentui/solid"
-import type { VcsFileStatus } from "@opencode-ai/sdk/v2"
+import { useKeyboard, useTerminalDimensions } from "@opentui/solid"
+import type { VcsFileStatus } from "@opencode-ai/client"
 import { createMemo, For } from "solid-js"
 import { createStore } from "solid-js/store"
-import { Locale } from "../util/locale"
+import { FilePath } from "../ui/file-path"
 import { useTheme } from "../context/theme"
-import { useTuiConfig } from "../config"
+import { useTuiConfig } from "../config/v1"
 import { useDialog, type DialogContext } from "../ui/dialog"
 import { getScrollAcceleration } from "../util/scroll"
 
@@ -33,10 +33,13 @@ export function DialogWorkspaceFileChanges(props: {
   const dialog = useDialog()
   const { theme } = useTheme()
   const tuiConfig = useTuiConfig()
+  const dimensions = useTerminalDimensions()
   const scrollAcceleration = createMemo(() => getScrollAcceleration(tuiConfig))
   const [store, setStore] = createStore({ active: "yes" as WorkspaceFileChangesChoice })
   const height = createMemo(() => Math.min(props.files.length, 8))
-  const fileNameWidth = createMemo(() => 48 - Math.max(Math.max(7, ...props.files.map(changeCountWidth)) - 7, 0))
+  const fileNameWidth = createMemo(
+    () => Math.max(2, Math.min(60, dimensions().width - 2) - 6 - Math.max(7, ...props.files.map(changeCountWidth))),
+  )
 
   function confirm() {
     props.onSelect(store.active)
@@ -93,9 +96,7 @@ export function DialogWorkspaceFileChanges(props: {
                 <box width={2} flexShrink={0}>
                   <text fg={theme.textMuted}>{statusLabel(item.status)}</text>
                 </box>
-                <text fg={theme.textMuted} wrapMode="none">
-                  {Locale.truncateLeft(item.file, fileNameWidth())}
-                </text>
+                <FilePath value={item.file} maxWidth={fileNameWidth()} fg={theme.textMuted} />
               </box>
               <box flexDirection="row" gap={1} minWidth={7} flexShrink={0} justifyContent="flex-end">
                 <text>

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

@@ -1,112 +0,0 @@
-import type { Workspace } from "@opencode-ai/sdk/v2"
-import { useDialog } from "../ui/dialog"
-import { DialogSelect, type DialogSelectOption } from "../ui/dialog-select"
-import { useProject } from "../context/project"
-import { useRoute } from "../context/route"
-import { useSync } from "../context/sync"
-import { useTheme } from "../context/theme"
-import { createMemo, createSignal, onMount } from "solid-js"
-import { createStore } from "solid-js/store"
-import { errorMessage } from "../util/error"
-import { useSDK } from "../context/sdk"
-import { useToast } from "../ui/toast"
-
-type WorkspaceOption = { workspace: Workspace }
-
-export function DialogWorkspaceList() {
-  const dialog = useDialog()
-  const route = useRoute()
-  const sync = useSync()
-  const sdk = useSDK()
-  const toast = useToast()
-  const project = useProject()
-  const { theme } = useTheme()
-  const [deleting, setDeleting] = createSignal<string>()
-  const [removing, setRemoving] = createSignal<string>()
-  const [expanded, setExpanded] = createStore<Record<string, boolean>>({})
-
-  const current = createMemo(() => {
-    if (route.data.type === "session") return sync.session.get(route.data.sessionID)?.workspaceID
-    return project.workspace.current()
-  })
-
-  const options = createMemo<DialogSelectOption<WorkspaceOption>[]>(() =>
-    project.workspace
-      .list()
-      .toSorted((a, b) => a.name.localeCompare(b.name))
-      .map((workspace) => {
-        const status = project.workspace.status(workspace.id)
-        return {
-          title:
-            removing() === workspace.id
-              ? "Deleting..."
-              : deleting() === workspace.id
-                ? `Delete ${workspace.name}? Press delete again`
-                : workspace.name,
-          value: { workspace },
-          footer: workspace.type,
-          details: expanded[workspace.id] && workspace.directory ? [workspace.directory] : undefined,
-          gutter: () => <text fg={status === "connected" ? theme.success : theme.error}>●</text>,
-        }
-      }),
-  )
-
-  function showDetails(workspace: Workspace) {
-    setExpanded(workspace.id, (open) => !open)
-  }
-
-  async function remove(workspace: Workspace) {
-    if (removing()) return
-    if (deleting() !== workspace.id) {
-      setDeleting(workspace.id)
-      return
-    }
-
-    setDeleting(undefined)
-    setRemoving(workspace.id)
-    const result = await sdk.client.experimental.workspace.remove({ id: workspace.id }).catch((err) => ({
-      error: err,
-    }))
-    if (result?.error) {
-      setRemoving(undefined)
-      toast.show({
-        variant: "error",
-        title: "Failed to delete workspace",
-        message: errorMessage(result.error),
-      })
-      return
-    }
-
-    if (current() === workspace.id) {
-      project.workspace.set(undefined)
-      route.navigate({ type: "home" })
-    }
-    await project.workspace.sync()
-    await sync.bootstrap({ fatal: false }).catch(() => undefined)
-    setRemoving(undefined)
-  }
-
-  onMount(() => {
-    dialog.setSize("large")
-    void sdk.client.experimental.workspace.syncList().catch(() => undefined)
-    void project.workspace.sync()
-  })
-
-  return (
-    <DialogSelect
-      title="Workspaces"
-      options={options()}
-      onMove={(option) => {
-        setDeleting(undefined)
-      }}
-      onSelect={(option) => showDetails(option.value.workspace)}
-      actions={[
-        {
-          command: "session.delete",
-          title: "delete",
-          onTrigger: (option) => void remove(option.value.workspace),
-        },
-      ]}
-    />
-  )
-}

packages/tui/src/component/dialog-workspace-unavailable.tsx

@@ -1,69 +0,0 @@
-import { TextAttributes } from "@opentui/core"
-import { createStore } from "solid-js/store"
-import { For } from "solid-js"
-import { useTheme } from "../context/theme"
-import { useDialog } from "../ui/dialog"
-import { useBindings } from "../keymap"
-
-export function DialogWorkspaceUnavailable(props: { onRestore?: () => boolean | void | Promise<boolean | void> }) {
-  const dialog = useDialog()
-  const { theme } = useTheme()
-  const [store, setStore] = createStore({
-    active: "restore" as "cancel" | "restore",
-  })
-
-  const options = ["cancel", "restore"] as const
-
-  async function confirm() {
-    if (store.active === "cancel") {
-      dialog.clear()
-      return
-    }
-    const result = await props.onRestore?.()
-    if (result === false) return
-  }
-
-  useBindings(() => ({
-    bindings: [
-      { key: "return", desc: "Confirm workspace option", group: "Dialog", cmd: () => void confirm() },
-      { key: "left", desc: "Cancel workspace restore", group: "Dialog", cmd: () => setStore("active", "cancel") },
-      { key: "right", desc: "Restore workspace", group: "Dialog", cmd: () => setStore("active", "restore") },
-    ],
-  }))
-
-  return (
-    <box paddingLeft={2} paddingRight={2} gap={1}>
-      <box flexDirection="row" justifyContent="space-between">
-        <text attributes={TextAttributes.BOLD} fg={theme.text}>
-          Workspace Unavailable
-        </text>
-        <text fg={theme.textMuted} onMouseUp={() => dialog.clear()}>
-          esc
-        </text>
-      </box>
-      <text fg={theme.textMuted} wrapMode="word">
-        This session is attached to a workspace that is no longer available.
-      </text>
-      <text fg={theme.textMuted} wrapMode="word">
-        Would you like to restore this session into a new workspace?
-      </text>
-      <box flexDirection="row" justifyContent="flex-end" paddingBottom={1} gap={1}>
-        <For each={options}>
-          {(item) => (
-            <box
-              paddingLeft={2}
-              paddingRight={2}
-              backgroundColor={item === store.active ? theme.primary : undefined}
-              onMouseUp={() => {
-                setStore("active", item)
-                void confirm()
-              }}
-            >
-              <text fg={item === store.active ? theme.selectedListItemText : theme.textMuted}>{item}</text>
-            </box>
-          )}
-        </For>
-      </box>
-    </box>
-  )
-}

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

@@ -8,11 +8,10 @@ import { createStore } from "solid-js/store"
 import { useEditorContext } from "../../context/editor"
 import { useProject } from "../../context/project"
 import { useSDK } from "../../context/sdk"
-import { useSync } from "../../context/sync"
 import { useData } from "../../context/data"
 import { getScrollAcceleration } from "../../util/scroll"
 import { useTuiPaths } from "../../context/runtime"
-import { useTuiConfig } from "../../config"
+import { useTuiConfig } from "../../config/v1"
 import { useLocation } from "../../context/location"
 import { useTheme, selectedForeground } from "../../context/theme"
 import { SplitBorder } from "../../ui/border"
@@ -22,7 +21,7 @@ import type { PromptInfo, PromptPartRef } from "../../prompt/history"
 import { useFrecency } from "../../prompt/frecency"
 import { useBindings, useCommandSlashes, useOpencodeModeStack } from "../../keymap"
 import { displayCharAt, mentionTriggerIndex } from "../../prompt/display"
-import type { FileSystemEntry } from "@opencode-ai/sdk/v2"
+import type { FileSystemEntry } from "@opencode-ai/client"
 
 function removeLineRange(input: string) {
   const hashIndex = input.lastIndexOf("#")
@@ -86,7 +85,6 @@ export function Autocomplete(props: {
 }) {
   const editor = useEditorContext()
   const sdk = useSDK()
-  const sync = useSync()
   const data = useData()
   const project = useProject()
   const slashes = useCommandSlashes()
@@ -285,7 +283,7 @@ export function Autocomplete(props: {
   })
 
   function normalizeMentionPath(filePath: string) {
-    const baseDir = location()?.directory || sync.path.directory || paths.cwd
+    const baseDir = location()?.directory || project.instance.directory() || paths.cwd
     const absolute = path.resolve(filePath)
     const relative = path.relative(baseDir, absolute)
 
@@ -363,7 +361,7 @@ export function Autocomplete(props: {
     const options: AutocompleteOption[] = []
     const width = props.anchor().width - 4
 
-    for (const res of Object.values(sync.data.mcp_resource)) {
+    for (const res of data.location.mcp.resource.list(location()) ?? []) {
       options.push({
         display: Locale.truncateMiddle(res.name, width),
         // Match the name only; matching the URI caused unrelated fuzzy hits.

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

@@ -23,7 +23,6 @@ import { Spinner } from "../spinner"
 import { useSDK } from "../../context/sdk"
 import { useRoute } from "../../context/route"
 import { useProject } from "../../context/project"
-import { useSync } from "../../context/sync"
 import { useEvent } from "../../context/event"
 import { editorSelectionKey, useEditorContext, type EditorSelection } from "../../context/editor"
 import { normalizePromptContent, openEditor } from "../../editor"
@@ -37,7 +36,6 @@ import { usePromptStash } from "../../prompt/stash"
 import { DialogStash } from "../dialog-stash"
 import { type AutocompleteRef, Autocomplete } from "./autocomplete"
 import { useRenderer, useTerminalDimensions, type JSX } from "@opentui/solid"
-import type { UserMessage } from "@opencode-ai/sdk/v2"
 import { Locale } from "../../util/locale"
 import { errorMessage } from "../../util/error"
 import { createColors, createFrames } from "../../ui/spinner"
@@ -48,16 +46,14 @@ import { useToast } from "../../ui/toast"
 import { useKV } from "../../context/kv"
 import { createFadeIn } from "../../util/signal"
 import { DialogSkill } from "../dialog-skill"
-import { DialogWorkspaceUnavailable } from "../dialog-workspace-unavailable"
 import { useArgs } from "../../context/args"
 import { OPENCODE_BASE_MODE, useBindings, useCommandShortcut, useLeaderActive, useOpencodeKeymap } from "../../keymap"
-import { useTuiConfig } from "../../config"
-import { usePromptWorkspace } from "./workspace"
+import { useTuiConfig } from "../../config/v1"
 import { usePromptMove } from "./move"
 import { readLocalAttachment } from "./local-attachment"
 import { useData } from "../../context/data"
 import { useLocation } from "../../context/location"
-import { lastAssistantWithUsage } from "../../util/session"
+import { contextUsage } from "../../util/session"
 
 registerOpencodeSpinner()
 
@@ -156,7 +152,6 @@ export function Prompt(props: PromptProps) {
   const editor = useEditorContext()
   const route = useRoute()
   const project = useProject()
-  const sync = useSync()
   const data = useData()
   const currentLocation = useLocation()
   const tuiConfig = useTuiConfig()
@@ -177,6 +172,7 @@ export function Prompt(props: PromptProps) {
   const keymap = useOpencodeKeymap()
   const agentShortcut = useCommandShortcut("agent.cycle")
   const paletteShortcut = useCommandShortcut("command.palette.show")
+  const liveWorkShortcut = useCommandShortcut("session.child.first")
   const renderer = useRenderer()
   const exit = useExit()
   const dimensions = useTerminalDimensions()
@@ -218,7 +214,6 @@ export function Prompt(props: PromptProps) {
   })
   const editorContextLabelState = createMemo(() => editor.labelState())
   const [auto, setAuto] = createSignal<AutocompleteRef>()
-  const workspace = usePromptWorkspace(props.sessionID)
   const move = usePromptMove({
     projectID: () => (props.sessionID ? data.session.get(props.sessionID)?.projectID : undefined) ?? project.project(),
     sessionID: () => props.sessionID,
@@ -268,32 +263,24 @@ export function Prompt(props: PromptProps) {
     if (!props.disabled) input.cursorColor = theme.text
   })
 
-  const lastUserMessage = createMemo(() => {
-    if (!props.sessionID) return undefined
-    const messages = sync.data.message[props.sessionID]
-    if (!messages) return undefined
-    return messages.findLast((m): m is UserMessage => m.role === "user")
-  })
-
   const usage = createMemo(() => {
     if (!props.sessionID) return
     const session = data.session.get(props.sessionID)
     if (!session) return
-    const last = lastAssistantWithUsage(data.session.message.list(props.sessionID), session.revert?.messageID)
-    if (!last) return
-
-    const tokens =
-      last.tokens.input + last.tokens.output + last.tokens.reasoning + last.tokens.cache.read + last.tokens.cache.write
-    if (tokens <= 0) return
-
-    const model = data.location.model
-      .list(session.location)
-      ?.find((model) => model.providerID === last.model.providerID && model.id === last.model.id)
-    const pct = model?.limit.context ? `${Math.round((tokens / model.limit.context) * 100)}%` : undefined
-    const cost = session.cost
+    const cost = data.session.cost(props.sessionID)
+    const formattedCost = cost > 0 ? money.format(cost) : undefined
+    const context = contextUsage(
+      data.session.message.list(props.sessionID),
+      data.location.model.list(session.location),
+      session.revert?.messageID,
+    )
     return {
-      context: pct ? `${Locale.number(tokens)} (${pct})` : Locale.number(tokens),
-      cost: cost > 0 ? money.format(cost) : undefined,
+      context: context
+        ? context.percent === undefined
+          ? Locale.number(context.tokens)
+          : `${Locale.number(context.tokens)} (${context.percent}%)`
+        : undefined,
+      cost: formattedCost,
     }
   })
 
@@ -529,17 +516,6 @@ export function Prompt(props: PromptProps) {
           ))
         },
       },
-      {
-        title: "Warp",
-        desc: "Change the workspace for the session",
-        name: "workspace.set",
-        category: "Session",
-        enabled: Flag.OPENCODE_EXPERIMENTAL_WORKSPACES,
-        slashName: "warp",
-        run: () => {
-          workspace.open()
-        },
-      },
       {
         title: "Move session",
         desc: "Move to another project dir",
@@ -572,7 +548,6 @@ export function Prompt(props: PromptProps) {
       "prompt.skills",
       "session.interrupt",
       "session.background",
-      "workspace.set",
       "session.move",
     ]),
   }))
@@ -864,6 +839,7 @@ export function Prompt(props: PromptProps) {
 
   useBindings(() => {
     return {
+      priority: 1,
       target: inputTarget,
       enabled: (() => {
         cursorVersion()
@@ -876,8 +852,12 @@ export function Prompt(props: PromptProps) {
           category: "Prompt",
           run() {
             if (input.cursorOffset !== 0) {
-              if (input.scrollY + input.visualCursor.visualRow === 0) input.cursorOffset = 0
-              return false
+              if (input.scrollY + input.visualCursor.visualRow === 0) {
+                input.cursorOffset = 0
+                return
+              }
+              input.moveCursorUp()
+              return
             }
 
             const item = history.move(-1, input.plainText)
@@ -896,6 +876,7 @@ export function Prompt(props: PromptProps) {
 
   useBindings(() => {
     return {
+      priority: 1,
       target: inputTarget,
       enabled: (() => {
         cursorVersion()
@@ -911,9 +892,12 @@ export function Prompt(props: PromptProps) {
               if (
                 input.scrollY + input.visualCursor.visualRow ===
                 Math.max(0, input.editorView.getTotalVirtualLineCount() - 1)
-              )
+              ) {
                 input.cursorOffset = input.plainText.length
-              return false
+                return
+              }
+              input.moveCursorDown()
+              return
             }
 
             const item = history.move(1, input.plainText)
@@ -948,8 +932,6 @@ export function Prompt(props: PromptProps) {
   }
 
   async function submitInner() {
-    workspace.clearNotice()
-
     // IME: double-defer may fire before onContentChange flushes the last
     // composed character (e.g. Korean hangul) to the store, so read
     // plainText directly and sync before any downstream reads.
@@ -958,7 +940,7 @@ export function Prompt(props: PromptProps) {
       syncExtmarksWithPromptParts()
     }
     if (props.disabled) return false
-    if (workspace.creating() || move.creating()) return false
+    if (move.creating()) return false
     if (auto()?.visible) return false
     if (!store.prompt.text) return false
     const trimmed = store.prompt.text.trim()
@@ -974,29 +956,11 @@ export function Prompt(props: PromptProps) {
       return false
     }
 
-    const workspaceSession = props.sessionID ? sync.session.get(props.sessionID) : undefined
-    const workspaceID = workspaceSession?.workspaceID
-    const workspaceStatus = workspaceID ? (project.workspace.status(workspaceID) ?? "error") : undefined
-    if (props.sessionID && workspaceID && workspaceStatus !== "connected") {
-      dialog.replace(() => (
-        <DialogWorkspaceUnavailable
-          onRestore={() => {
-            workspace.open()
-            return false
-          }}
-        />
-      ))
-      return false
-    }
-
     const variant = local.model.variant.current()
     let sessionID = props.sessionID
     let session = sessionID ? data.session.get(sessionID) : undefined
     let finishMoveProgress = false
     if (sessionID == null) {
-      const selectedWorkspace = workspace.selection()
-      const workspaceID = selectedWorkspace?.type === "existing" ? selectedWorkspace.workspaceID : undefined
-
       const directory = await move.getDirectory()
       if (move.pending() && !directory) return false
       finishMoveProgress = Boolean(move.progress())
@@ -1004,9 +968,7 @@ export function Prompt(props: PromptProps) {
 
       const created = await sdk.api.session
         .create({
-          location: directory
-            ? { directory, workspaceID }
-            : { directory: location.directory, workspaceID: workspaceID ?? location.workspaceID },
+          location: directory ? { directory } : location,
           agent: agent.id,
           model: {
             providerID: selectedModel.providerID,
@@ -1229,7 +1191,7 @@ export function Prompt(props: PromptProps) {
     const lineCount = (pastedContent.match(/\n/g)?.length ?? 0) + 1
     if (
       (lineCount >= 3 || pastedContent.length > 150) &&
-      kv.get("paste_summary_enabled", !sync.data.config.experimental?.disable_paste_summary)
+      kv.get("paste_summary_enabled", true)
     ) {
       pasteText(pastedContent, `[Pasted ~${lineCount} lines]`)
       return
@@ -1339,7 +1301,7 @@ export function Prompt(props: PromptProps) {
   const spinnerDef = createMemo(() => {
     const agent =
       status() === "running"
-        ? (local.agent.list().find((agent) => agent.id === lastUserMessage()?.agent) ?? local.agent.current())
+        ? local.agent.current()
         : local.agent.current()
     const color = agent ? local.agent.color(agent.id) : theme.border
     return {
@@ -1545,41 +1507,6 @@ export function Prompt(props: PromptProps) {
                 </text>
               </box>
             </Match>
-            <Match when={workspace.notice()}>
-              {(notice) => (
-                <box paddingLeft={3}>
-                  <text fg={theme.accent}>{notice()}</text>
-                </box>
-              )}
-            </Match>
-            <Match when={workspace.label()}>
-              {(label) => (
-                <box paddingLeft={3} flexDirection="row" gap={1}>
-                  <Show when={workspace.creating()}>
-                    <Spinner color={theme.accent} />
-                  </Show>
-                  <text fg={workspace.creating() ? theme.accent : theme.text}>
-                    {(() => {
-                      const item = label()
-                      if (item.type === "new") {
-                        if (workspace.creating())
-                          return `Creating ${item.workspaceType}${".".repeat(workspace.creatingDots())}`
-                        return (
-                          <>
-                            Workspace <span style={{ fg: theme.textMuted }}>(new {item.workspaceType})</span>
-                          </>
-                        )
-                      }
-                      return (
-                        <>
-                          Workspace <span style={{ fg: theme.textMuted }}>{item.workspaceName}</span>
-                        </>
-                      )
-                    })()}
-                  </text>
-                </box>
-              )}
-            </Match>
             <Match when={move.progress()}>
               {(progress) => (
                 <box paddingLeft={3}>
@@ -1608,6 +1535,9 @@ export function Prompt(props: PromptProps) {
                 <Switch>
                   <Match when={liveWorkStatusVisible() || statusItems().length > 0}>
                     <text fg={theme.textMuted} wrapMode="none">
+                      <Show when={liveWorkStatusVisible() && liveWorkShortcut()}>
+                        {(shortcut) => <span style={{ fg: theme.text }}>{shortcut()} </span>}
+                      </Show>
                       <Show when={subagentStatusLabel()}>
                         {(label) => <span style={{ fg: theme.textMuted }}>{label()}</span>}
                       </Show>

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

@@ -1,137 +0,0 @@
-import { createEffect, createMemo, createSignal, onCleanup } from "solid-js"
-import { useDialog } from "../../ui/dialog"
-import { useSDK } from "../../context/sdk"
-import { useProject } from "../../context/project"
-import { useSync } from "../../context/sync"
-import { useToast } from "../../ui/toast"
-import { errorMessage } from "../../util/error"
-import {
-  confirmWorkspaceFileChanges,
-  openWorkspaceSelect,
-  warpWorkspaceSession,
-  type WorkspaceSelection,
-} from "../dialog-workspace-create"
-import type { WorkspaceStatus } from "../workspace-label"
-
-export function usePromptWorkspace(sessionID?: string) {
-  const dialog = useDialog()
-  const sdk = useSDK()
-  const project = useProject()
-  const sync = useSync()
-  const toast = useToast()
-  const [selection, setSelection] = createSignal<WorkspaceSelection>()
-  const [creating, setCreating] = createSignal(false)
-  const [creatingDots, setCreatingDots] = createSignal(3)
-  const [notice, setNotice] = createSignal<string>()
-
-  async function create(selection: Extract<WorkspaceSelection, { type: "new" }>) {
-    setCreating(true)
-    let result
-    try {
-      result = await sdk.client.experimental.workspace.create({ type: selection.workspaceType, branch: null })
-    } catch (err) {
-      setSelection(undefined)
-      setCreating(false)
-      toast.show({ title: "Creating workspace failed", message: errorMessage(err), variant: "error" })
-      return
-    }
-    if (result.error || !result.data) {
-      setSelection(undefined)
-      setCreating(false)
-      toast.show({
-        title: "Creating workspace failed",
-        message: errorMessage(result.error ?? "no response"),
-        variant: "error",
-      })
-      return
-    }
-
-    await project.workspace.sync()
-    const workspace = result.data
-    setSelection({
-      type: "existing",
-      workspaceID: workspace.id,
-      workspaceType: workspace.type,
-      workspaceName: workspace.name,
-    })
-    setCreating(false)
-    return workspace
-  }
-
-  async function warp(selection: WorkspaceSelection) {
-    if (!sessionID) {
-      setSelection(selection)
-      dialog.clear()
-      if (selection.type === "new") void create(selection)
-      return
-    }
-    const sourceWorkspaceID = project.workspace.current()
-    const copyChanges = await confirmWorkspaceFileChanges({ dialog, sdk, sourceWorkspaceID })
-    if (copyChanges === undefined) return
-    setSelection(selection)
-    dialog.clear()
-
-    const workspace =
-      selection.type === "none"
-        ? { id: null, name: "local project" }
-        : selection.type === "existing"
-          ? { id: selection.workspaceID, name: selection.workspaceName }
-          : await create(selection)
-    if (!workspace) return
-
-    const warped = await warpWorkspaceSession({
-      dialog,
-      sdk,
-      sync,
-      project,
-      toast,
-      sourceWorkspaceID,
-      workspaceID: workspace.id,
-      sessionID,
-      copyChanges,
-    })
-    if (warped) showNotice(workspace.name)
-  }
-
-  function showNotice(name: string) {
-    setNotice(`Warped to ${name}`)
-    setTimeout(() => setNotice(undefined), 4000)
-  }
-
-  function clearNotice() {
-    setNotice(undefined)
-  }
-
-  function open() {
-    void openWorkspaceSelect({ dialog, sdk, sync, project, toast, onSelect: warp })
-  }
-
-  createEffect(() => {
-    if (!creating()) {
-      setCreatingDots(3)
-      return
-    }
-    const timer = setInterval(() => setCreatingDots((dots) => (dots % 3) + 1), 1000)
-    onCleanup(() => clearInterval(timer))
-  })
-
-  const label = createMemo<
-    | { type: "new"; workspaceType: string }
-    | { type: "existing"; workspaceType: string; workspaceName: string; status?: WorkspaceStatus }
-    | undefined
-  >(() => {
-    const selected = selection()
-    if (!selected) return
-    if (selected.type === "none") return
-    if (sessionID && !creating()) return
-    if (selected.type === "new") return { type: "new", workspaceType: selected.workspaceType }
-    return {
-      type: "existing",
-      workspaceType: selected.workspaceType,
-      workspaceName: selected.workspaceName,
-      status: selected.type === "existing" ? "connected" : undefined,
-    }
-  })
-
-  return { selection, creating, creatingDots, notice, label, open, warp, clearNotice }
-}

packages/tui/src/component/workspace-label.tsx

@@ -1,19 +0,0 @@
-import { useTheme } from "../context/theme"
-
-export type WorkspaceStatus = "connected" | "connecting" | "disconnected" | "error"
-
-export function WorkspaceLabel(props: { type: string; name: string; status?: WorkspaceStatus; icon?: boolean }) {
-  const { theme } = useTheme()
-  const color = () => {
-    if (props.status === "connected") return theme.success
-    if (props.status === "error") return theme.error
-    return theme.textMuted
-  }
-
-  return (
-    <>
-      {props.icon ? <span style={{ fg: color() }}>● </span> : undefined}
-      <span style={{ fg: theme.text }}>{props.name}</span> <span style={{ fg: theme.textMuted }}>({props.type})</span>
-    </>
-  )
-}

packages/tui/src/config/v1/keybind.ts

@@ -97,10 +97,8 @@ export const Definitions = {
   session_interrupt: keybind("escape", "Interrupt current session"),
   session_background: keybind("ctrl+b", "Background blocking session tools"),
   session_compact: keybind("<leader>c", "Compact the session"),
-  session_toggle_timestamps: keybind("none", "Toggle message timestamps"),
-  session_toggle_generic_tool_output: keybind("none", "Toggle generic tool output"),
   session_queued_prompts: keybind("<leader>q", "Manage queued prompts"),
-  session_child_first: keybind("<leader>down", "Toggle subagent picker"),
+  session_child_first: keybind("down,<leader>down", "Toggle subagent picker"),
   session_child_cycle: keybind("right", "Go to next child session"),
   session_child_cycle_reverse: keybind("left", "Go to previous child session"),
   session_parent: keybind("up", "Go to parent session"),
@@ -125,7 +123,6 @@ export const Definitions = {
   model_cycle_favorite_reverse: keybind("none", "Previous favorite model"),
   mcp_list: keybind("none", "List MCP servers"),
   provider_connect: keybind("none", "Connect integration"),
-  console_org_switch: keybind("none", "Switch console organization"),
   agent_list: keybind("<leader>a", "List agents"),
   agent_cycle: keybind("tab", "Next agent"),
   agent_cycle_reverse: keybind("shift+tab", "Previous agent"),
@@ -147,7 +144,6 @@ export const Definitions = {
   messages_undo: keybind("<leader>u", "Undo message"),
   messages_redo: keybind("<leader>r", "Redo message"),
   messages_toggle_conceal: keybind("<leader>h", "Toggle code block concealment in messages"),
-  tool_details: keybind("none", "Toggle tool details visibility"),
   display_thinking: keybind("none", "Toggle thinking blocks visibility"),
 
   prompt_submit: keybind("none", "Submit prompt"),
@@ -156,7 +152,6 @@ export const Definitions = {
   prompt_stash: keybind("none", "Stash prompt"),
   prompt_stash_pop: keybind("none", "Pop stashed prompt"),
   prompt_stash_list: keybind("none", "List stashed prompts"),
-  workspace_set: keybind("none", "Set workspace"),
 
   input_clear: keybind("ctrl+c", "Clear input field"),
   input_paste: keybind({ key: "ctrl+v", preventDefault: false }, "Paste from clipboard"),
@@ -305,8 +300,6 @@ export const CommandMap = {
   session_interrupt: "session.interrupt",
   session_background: "session.background",
   session_compact: "session.compact",
-  session_toggle_timestamps: "session.toggle.timestamps",
-  session_toggle_generic_tool_output: "session.toggle.generic_tool_output",
   session_queued_prompts: "session.queued_prompts",
   session_child_first: "session.child.first",
   session_child_cycle: "session.child.next",
@@ -332,7 +325,6 @@ export const CommandMap = {
   model_cycle_favorite_reverse: "model.cycle_favorite_reverse",
   mcp_list: "mcp.list",
   provider_connect: "provider.connect",
-  console_org_switch: "console.org.switch",
   agent_list: "agent.list",
   agent_cycle: "agent.cycle",
   agent_cycle_reverse: "agent.cycle.reverse",
@@ -353,7 +345,6 @@ export const CommandMap = {
   messages_undo: "session.undo",
   messages_redo: "session.redo",
   messages_toggle_conceal: "session.toggle.conceal",
-  tool_details: "session.toggle.actions",
   display_thinking: "session.toggle.thinking",
   prompt_submit: "prompt.submit",
   prompt_editor_context_clear: "prompt.editor_context.clear",
@@ -361,7 +352,6 @@ export const CommandMap = {
   prompt_stash: "prompt.stash",
   prompt_stash_pop: "prompt.stash.pop",
   prompt_stash_list: "prompt.stash.list",
-  workspace_set: "workspace.set",
   input_clear: "prompt.clear",
   input_paste: "prompt.paste",
   input_submit: "input.submit",

packages/tui/src/config/v2/index.ts

@@ -0,0 +1,97 @@
+export * as TuiConfigV2 from "."
+
+import { Schema } from "effect"
+import { TuiKeybind } from "./keybind"
+
+export const Plugin = Schema.Union([
+  Schema.String,
+  Schema.Struct({
+    package: Schema.String,
+    options: Schema.optional(Schema.Record(Schema.String, Schema.Any)),
+  }),
+])
+
+export const Info = Schema.Struct({
+  theme: Schema.optional(
+    Schema.Struct({
+      name: Schema.optional(Schema.String),
+      mode: Schema.optional(Schema.Literals(["system", "dark", "light"])),
+    }),
+  ),
+  keybinds: Schema.optional(TuiKeybind.KeybindOverrides),
+  plugins: Schema.optional(Schema.Array(Plugin)),
+  leader: Schema.optional(
+    Schema.Struct({
+      timeout: Schema.optional(Schema.Int.check(Schema.isGreaterThan(0))),
+    }),
+  ),
+  scroll: Schema.optional(
+    Schema.Struct({
+      speed: Schema.optional(Schema.Number.check(Schema.isGreaterThanOrEqualTo(0.001))),
+      acceleration: Schema.optional(Schema.Boolean),
+    }),
+  ),
+  attention: Schema.optional(
+    Schema.Struct({
+      enabled: Schema.optional(Schema.Boolean),
+      notifications: Schema.optional(Schema.Boolean),
+      sound: Schema.optional(Schema.Boolean),
+      volume: Schema.optional(Schema.Number.check(Schema.isGreaterThanOrEqualTo(0), Schema.isLessThanOrEqualTo(1))),
+      sound_pack: Schema.optional(Schema.String),
+      sounds: Schema.optional(
+        Schema.Record(
+          Schema.Literals(["default", "question", "permission", "error", "done", "subagent_done"]),
+          Schema.optionalKey(Schema.String),
+        ),
+      ),
+    }),
+  ),
+  diffs: Schema.optional(
+    Schema.Struct({
+      wrap: Schema.optional(Schema.Literals(["word", "none"])),
+      tree: Schema.optional(Schema.Boolean),
+      single: Schema.optional(Schema.Boolean),
+      view: Schema.optional(Schema.Literals(["auto", "split", "unified"])),
+    }),
+  ),
+  terminal: Schema.optional(
+    Schema.Struct({
+      title: Schema.optional(Schema.Boolean),
+    }),
+  ),
+  composer: Schema.optional(
+    Schema.Struct({
+      file_context: Schema.optional(Schema.Boolean),
+      paste_summary: Schema.optional(Schema.Boolean),
+    }),
+  ),
+  session: Schema.optional(
+    Schema.Struct({
+      sidebar: Schema.optional(Schema.Literals(["auto", "hide"])),
+      scrollbar: Schema.optional(Schema.Boolean),
+      thinking: Schema.optional(Schema.Literals(["show", "hide"])),
+      group_exploration: Schema.optional(Schema.Boolean),
+      directory_filter: Schema.optional(Schema.Boolean),
+    }),
+  ),
+  which_key: Schema.optional(
+    Schema.Struct({
+      layout: Schema.optional(Schema.Literals(["dock", "overlay"])),
+      pending_preview: Schema.optional(Schema.Boolean),
+    }),
+  ),
+  hints: Schema.optional(
+    Schema.Struct({
+      tips: Schema.optional(Schema.Boolean),
+      getting_started: Schema.optional(Schema.Boolean),
+    }),
+  ),
+  updates: Schema.optional(
+    Schema.Struct({
+      skipped: Schema.optional(Schema.String),
+    }),
+  ),
+  animations: Schema.optional(Schema.Boolean),
+  mouse: Schema.optional(Schema.Boolean),
+})
+export type Info = Schema.Schema.Type<typeof Info>

packages/tui/src/config/v2/keybind.ts

@@ -0,0 +1,6 @@
+export * as TuiKeybind from "./keybind"
+
+import { Schema } from "effect"
+
+export const KeybindOverrides = Schema.Struct({})
+export type KeybindOverrides = Schema.Schema.Type<typeof KeybindOverrides>

packages/tui/src/context/data.tsx

@@ -9,6 +9,7 @@ import type {
   FormInfo,
   IntegrationInfo,
   LocationRef,
+  McpResource,
   McpServer,
   ModelInfo,
   PermissionSavedInfo,
@@ -21,10 +22,12 @@ import type {
   SessionMessageAssistantText,
   SessionMessageAssistantTool,
   SessionInfo,
-  Shell,
+  SessionPendingInfo,
+  ShellInfo,
   SkillInfo,
-} from "@opencode-ai/sdk/v2"
-import type { OpenCodeEvent } from "@opencode-ai/client/promise"
+  OpenCodeEvent,
+} from "@opencode-ai/client"
+import type { Data } from "@opencode-ai/plugin/v2/tui/context"
 import { createStore, produce, reconcile } from "solid-js/store"
 import { createSimpleContext } from "./helper"
 import { useSDK } from "./sdk"
@@ -43,17 +46,20 @@ type LocationData = {
   agent?: AgentInfo[]
   command?: CommandInfo[]
   integration?: IntegrationInfo[]
-  mcp?: McpServer[]
+  mcp?: {
+    server?: McpServer[]
+    resource?: McpResource[]
+  }
   model?: ModelInfo[]
   provider?: ProviderV2Info[]
   reference?: ReferenceInfo[]
   // Currently running shell commands for this location, keyed by shell id. Entries are removed
   // once the command exits or is deleted, so this only ever holds in-flight shells.
-  shell?: Record<string, Shell>
+  shell?: Record<string, ShellInfo>
   skill?: SkillInfo[]
 }
 
-type Data = {
+type Store = {
   session: {
     info: Record<string, SessionInfo>
     // Family index keyed by a family's root (or furthest-known-ancestor when the
@@ -62,7 +68,9 @@ type Data = {
     family: Record<string, string[]>
     status: Record<string, DataSessionStatus>
     message: Record<string, SessionMessageInfo[]>
+    pending: Record<string, SessionPendingInfo[]>
     input: Record<string, string[]>
+    compaction: Record<string, string[]>
     permission: Record<string, PermissionV2Request[]>
     // Pending forms keyed by owner: a session ID or the temporary "global" elicitation sentinel.
     form: Record<string, FormWithLocation[]>
@@ -84,13 +92,15 @@ function locationQuery(ref?: LocationRef) {
 export const { use: useData, provider: DataProvider } = createSimpleContext({
   name: "Data",
   init: () => {
-    const [store, setStore] = createStore<Data>({
+    const [store, setStore] = createStore<Store>({
       session: {
         info: {},
         family: {},
         status: {},
         message: {},
+        pending: {},
         input: {},
+        compaction: {},
         permission: {},
         form: {},
       },
@@ -112,6 +122,36 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
       setStore("session", "status", sessionID, status)
     }
 
+    function addCompaction(sessionID: string, inputID: string) {
+      if (store.session.compaction[sessionID]?.includes(inputID)) return
+      setStore("session", "compaction", sessionID, [...(store.session.compaction[sessionID] ?? []), inputID])
+    }
+
+    function addPending(item: SessionPendingInfo) {
+      if (store.session.pending[item.sessionID]?.some((pending) => pending.id === item.id)) return
+      setStore("session", "pending", item.sessionID, [...(store.session.pending[item.sessionID] ?? []), item])
+    }
+
+    function removePending(sessionID: string, inputID?: string) {
+      if (!inputID) return
+      setStore(
+        "session",
+        "pending",
+        sessionID,
+        (store.session.pending[sessionID] ?? []).filter((item) => item.id !== inputID),
+      )
+    }
+
+    function removeCompaction(sessionID: string, inputID?: string) {
+      if (!inputID || !store.session.compaction[sessionID]?.includes(inputID)) return
+      setStore(
+        "session",
+        "compaction",
+        sessionID,
+        store.session.compaction[sessionID].filter((id) => id !== inputID),
+      )
+    }
+
     const message = {
       update(sessionID: string, fn: (messages: SessionMessageInfo[], index: Map<string, number>) => void) {
         setStore(
@@ -220,7 +260,9 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
           delete draft.info[sessionID]
           delete draft.status[sessionID]
           delete draft.message[sessionID]
+          delete draft.pending[sessionID]
           delete draft.input[sessionID]
+          delete draft.compaction[sessionID]
           delete draft.permission[sessionID]
           delete draft.form[sessionID]
           for (const [rootID, family] of Object.entries(draft.family)) {
@@ -308,6 +350,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
           }
           break
         case "session.input.promoted": {
+          removePending(event.data.sessionID, event.data.inputID)
           message.update(event.data.sessionID, (draft, index) => {
             const position = index.get(event.data.inputID)
             if (position === undefined) return
@@ -328,6 +371,13 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
           break
         }
         case "session.input.admitted":
+          addPending({
+            id: event.data.inputID,
+            sessionID: event.data.sessionID,
+            admittedSeq: event.durable.seq,
+            timeCreated: event.created,
+            ...event.data.input,
+          })
           if (!store.session.input[event.data.sessionID]?.includes(event.data.inputID))
             setStore("session", "input", event.data.sessionID, [
               ...(store.session.input[event.data.sessionID] ?? []),
@@ -611,8 +661,18 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
           setSessionStatus(event.data.sessionID, "running")
           break
         case "session.compaction.admitted":
+          addPending({
+            id: event.data.inputID,
+            sessionID: event.data.sessionID,
+            admittedSeq: event.durable.seq,
+            timeCreated: event.created,
+            type: "compaction",
+          })
+          addCompaction(event.data.sessionID, event.data.inputID)
           break
         case "session.compaction.started":
+          removePending(event.data.sessionID, event.data.inputID)
+          removeCompaction(event.data.sessionID, event.data.inputID)
           message.update(event.data.sessionID, (draft, index) => {
             message.append(draft, index, {
               id: event.data.inputID ?? messageIDFromEvent(event.id),
@@ -669,16 +729,12 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             const position = draft.findLastIndex((item) => item.type === "compaction" && item.status === "running")
             const current = draft[position]
             if (current?.type === "compaction") {
-              draft[position] = {
-                id: current.id,
-                type: "compaction",
+              Object.assign(current, {
                 status: "completed",
                 reason: event.data.reason,
                 summary: event.data.text,
                 recent: event.data.recent,
-                metadata: current.metadata,
-                time: current.time,
-              }
+              })
               return
             }
             message.append(draft, index, {
@@ -693,6 +749,8 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
           })
           break
         case "session.compaction.failed":
+          removePending(event.data.sessionID, event.data.inputID)
+          removeCompaction(event.data.sessionID, event.data.inputID)
           message.update(event.data.sessionID, (draft, index) => {
             const position = draft.findLastIndex((item) => item.type === "compaction" && item.status === "running")
             const current = draft[position]
@@ -784,7 +842,10 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
         // so the mcp list refreshes here rather than off integration.updated.
         case "mcp.status.changed":
           if (bootstrapping) break
-          void result.location.mcp.refresh(event.location)
+          void result.location.mcp.server.refresh(event.location)
+          break
+        case "mcp.resources.changed":
+          void result.location.mcp.resource.refresh(event.location)
           break
       }
     }
@@ -805,6 +866,15 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
         family(sessionID: string) {
           return store.session.family[resolveRoot(sessionID)] ?? []
         },
+        cost(sessionID: string) {
+          const session = store.session.info[sessionID]
+          if (!session) return 0
+          if (session.parentID) return session.cost
+          return (store.session.family[sessionID] ?? [sessionID]).reduce(
+            (total, id) => total + (store.session.info[id]?.cost ?? 0),
+            0,
+          )
+        },
         status(sessionID: string) {
           return store.session.status[sessionID] ?? "idle"
         },
@@ -816,14 +886,40 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             return store.session.input[sessionID]?.includes(inputID) ?? false
           },
         },
+        compaction: {
+          list(sessionID: string) {
+            return store.session.compaction[sessionID] ?? []
+          },
+          async refresh(sessionID: string) {
+            await result.session.pending.refresh(sessionID)
+          },
+        },
+        pending: {
+          list(sessionID: string) {
+            return store.session.pending[sessionID] ?? []
+          },
+          async refresh(sessionID: string) {
+            const pending = await sdk.api.session.pending.list({ sessionID })
+            setStore("session", "pending", sessionID, reconcile(pending))
+            setStore(
+              "session",
+              "input",
+              sessionID,
+              reconcile(pending.filter((item) => item.type !== "compaction").map((item) => item.id)),
+            )
+            setStore(
+              "session",
+              "compaction",
+              sessionID,
+              reconcile(pending.filter((item) => item.type === "compaction").map((item) => item.id)),
+            )
+          },
+        },
         async refresh(sessionID: string) {
           setStore("session", "info", sessionID, await sdk.api.session.get({ sessionID }))
           registerSession(sessionID)
         },
         message: {
-          ids(sessionID: string) {
-            return (store.session.message[sessionID] ?? []).map((message) => message.id)
-          },
           list(sessionID: string) {
             return store.session.message[sessionID] ?? []
           },
@@ -943,13 +1039,31 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
           },
         },
         mcp: {
-          list(location?: LocationRef) {
-            return store.location[locationKey(location ?? defaultLocation())]?.mcp
+          server: {
+            list(location?: LocationRef) {
+              return store.location[locationKey(location ?? defaultLocation())]?.mcp?.server
+            },
+            async refresh(ref?: LocationRef) {
+              const result = await sdk.api.mcp.list({ location: locationQuery(ref) })
+              const key = locationKey(result.location)
+              setStore("location", key, {
+                ...store.location[key],
+                mcp: { ...store.location[key]?.mcp, server: result.data },
+              })
+            },
           },
-          async refresh(ref?: LocationRef) {
-            const result = await sdk.api["server.mcp"].list({ location: locationQuery(ref) })
-            const key = locationKey(result.location)
-            setStore("location", key, { ...store.location[key], mcp: result.data })
+          resource: {
+            list(location?: LocationRef) {
+              return store.location[locationKey(location ?? defaultLocation())]?.mcp?.resource
+            },
+            async refresh(ref?: LocationRef) {
+              const result = await sdk.api.mcp.resource.catalog({ location: locationQuery(ref) })
+              const key = locationKey(result.location)
+              setStore("location", key, {
+                ...store.location[key],
+                mcp: { ...store.location[key]?.mcp, resource: result.data.resources },
+              })
+            },
           },
         },
         model: {
@@ -994,6 +1108,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
         },
       },
     }
+    result satisfies Data
 
     async function bootstrap() {
       if (bootstrapping) return bootstrapping
@@ -1045,7 +1160,8 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
         result.location.refresh(),
         result.location.agent.refresh(),
         result.location.integration.refresh(),
-        result.location.mcp.refresh(),
+        result.location.mcp.server.refresh(),
+        result.location.mcp.resource.refresh(),
         result.location.model.refresh(),
         result.location.provider.refresh(),
         result.location.reference.refresh(),
@@ -1093,9 +1209,14 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
       sdk.event.listen(({ details }) => {
         if (details.type === "server.connected") {
           const messages = connected ? Object.keys(store.session.message) : []
+          const compactions = connected ? Object.keys(store.session.compaction) : []
           connected = true
           refreshActive()
-          void Promise.allSettled([bootstrap(), ...messages.map(result.session.message.refresh)])
+          void Promise.allSettled([
+            bootstrap(),
+            ...messages.map(result.session.message.refresh),
+            ...compactions.map(result.session.compaction.refresh),
+          ])
           return
         }
         handleEvent(details)