fix(server): share router with fallback routes

.changeset/calm-services-start.md

@@ -1,7 +1,5 @@
 ---
 "@opencode-ai/client": patch
-"@opencode-ai/protocol": patch
-"@opencode-ai/cli": patch
 ---
 
-Expose background-service lifecycle status, preserve one process-held owner through startup and failure, reconnect TUIs without activating replacement, and stop exact service instances gracefully.
+Reuse a same-version background service when a repeated health probe succeeds instead of replacing an endpoint another client may already be using.

.github/TEAM_MEMBERS

@@ -18,4 +18,4 @@ simonklee
 Slickstef11
 usrnk1
 vimtor
-StarpTech
+starptech

.github/workflows/test.yml

@@ -70,14 +70,6 @@ jobs:
         env:
           OPENCODE_EXPERIMENTAL_DISABLE_FILEWATCHER: ${{ runner.os == 'Windows' && 'true' || 'false' }}
 
-      - name: Verify compiled service lifecycle
-        if: always()
-        timeout-minutes: 10
-        working-directory: packages/cli
-        run: |
-          bun run script/build.ts --single --skip-install
-          bun run script/service-smoke.ts
-
       - name: Check generated client
         if: runner.os == 'Linux'
         working-directory: packages/client

.opencode/tool/github-triage.ts

@@ -4,7 +4,7 @@ import { tool } from "@opencode-ai/plugin"
 const TEAM = {
   tui: ["kommander", "simonklee"],
   desktop_web: ["Hona", "Brendonovich"],
-  core: ["jlongster", "rekram1-node", "nexxeln", "kitlangton"],
+  core: ["jlongster", "rekram1-node", "nexxeln", "kitlangton", "starptech"],
   inference: ["fwang", "MrMushrooooom", "starptech"],
   windows: ["Hona"],
 } as const

CONTEXT.md

@@ -0,0 +1,245 @@
+# OpenCode Session Runtime
+
+OpenCode sessions preserve durable conversational history while assembling the runtime context an agent needs to act correctly in its current environment.
+
+## Language
+
+**Model Context**:
+The complete model-visible input assembled for one **Step**, including system instructions, **Session History**, tool definitions, and step-local additions. **Instructions** are one component of Model Context, not a synonym for it.
+_Avoid_: System Context
+
+**Instructions**:
+The opaque algebra of independently refreshable typed instruction sources that render the durable instruction baseline and chronological updates shown to the model.
+_Avoid_: Model Context, System Context
+
+**Session History**:
+The projected chronological conversation selected for a **Step** after applying the active compaction boundary and interleaving derived **Instruction Updates** from the current **Instruction Epoch**.
+_Avoid_: Session Context
+
+**Instruction Source**:
+One independently read typed value within **Instructions**, represented by a stable namespaced key, canonical JSON codec, pure first/changed renderers, and an optional removal renderer.
+_Avoid_: Prompt fragment
+
+**InstructionEntry**:
+One API-managed, durable, per-Session instruction value. Its slash-free client key maps to the `api/<key>` **Instruction Source** key. Entries deliberately render to the model as mechanism-neutral `<context>` blocks: the model sees session context, not how it was attached.
+
+**InstructionDiscovery**:
+The Location-scoped service that observes ambient global and upward-project `AGENTS.md` files as one ordered aggregate **Instruction Source**.
+
+**Instruction State**:
+The Session-owned projection cache of one instruction log fold: epoch start, values at that start, current values, and the last folded sequence. It is rebuilt from durable events and never authors model-visible facts.
+
+**Instruction Update**:
+A durable `session.instructions.updated` value delta admitted at a **Safe Step Boundary**. Its model-visible System text is rendered from stored values at request assembly and is never persisted verbatim.
+_Avoid_: Correction, stored prose, raw text diff
+
+**Initial Instructions**:
+The deterministic instruction text rendered from values at the current **Instruction Epoch** start and sent as provider-cache prefix state until completed compaction moves the epoch or Session movement or committed revert resets it.
+_Avoid_: Live system prompt
+
+**Instruction Epoch**:
+The span between completed compactions. Its start is the last `session.compaction.ended` sequence, or the initial complete instruction delta when no prior epoch exists.
+
+**Instruction Values**:
+The key-to-hash map produced by folding instruction deltas in durable sequence order. Hash bodies live once in the content-addressed instruction blob store.
+
+**Unavailable Instruction Source**:
+An expected temporary inability to read an **Instruction Source** value; the runtime retains its prior effective value and emits no update, while an unavailable source blocks the initial complete delta.
+
+**Safe Step Boundary**:
+The point during Step preparation, after prior tool settlement and before durable input promotion, where instruction changes may be admitted chronologically.
+
+**Admitted Prompt**:
+A durable user input accepted into the Session inbox but not yet included in **Session History**.
+
+**Prompt Promotion**:
+The durable transition that removes an **Admitted Prompt** from pending input and appends its user message to **Session History**.
+
+**Step**:
+One logical LLM call spanning pre-flight instruction synchronization, input promotion, request build, and compaction check; the provider stream; and tool settlement.
+_Avoid_: provider turn, turn (unqualified)
+
+**Physical Attempt**:
+One actual provider request on the wire in service of a **Step**; most Steps have one Physical Attempt, while overflow-triggered compaction recovery may give one Step two.
+
+**Assistant Turn**:
+A reserved name for the not-yet-modeled unit containing all **Steps** from prompt promotion until the assistant yields the floor; do not reify it until something durable needs it.
+
+**Settlement**:
+The terminal transition for a unit of work: Step and tool settlement are durable, while drain and execution settlement are coordinator-observed.
+
+**Execution**:
+One session-scoped coordinator busy period from first wake until idle. An Execution is process-local coordination rather than a durable domain entity.
+
+**Session Drain**:
+One process-local execution span that promotes eligible input and runs required **Steps** until no immediate continuation remains. A Session Drain has no durable identity or transcript boundary.
+
+**Model Tool Output**:
+The bounded projection of a Core-executed tool result persisted in Session history and replayed to the model. A tool may shape this projection semantically, but the Tool Registry enforces the final size limit.
+
+**Managed Tool Output File**:
+A temporary file created under OpenCode's shared tool-output directory to retain complete output that was too large for Session history.
+
+**Model Request Options**:
+Provider-semantic model settings selected from the Catalog and active Session variant before the LLM protocol adapter encodes them for a provider request.
+_Avoid_: Request body, wire options
+
+**Generation Controls**:
+Provider-neutral sampling and output controls, partitioned from provider semantics and compatibility wire fields when model metadata enters the Catalog.
+
+**Native Continuation Metadata**:
+Opaque protocol-shaped data attached to assistant content and required to continue that content natively with a compatible model, such as a reasoning signature or provider-hosted item identifier.
+
+**PTY Environment**:
+The host-supplied environment overlay applied by the server when creating a PTY, observed for the request Location and resolved PTY working directory.
+
+**OpenCode Client**:
+The generated Promise and Effect APIs derived from the public `HttpApi`; **Embedded OpenCode** shares the Effect API through an in-memory `HttpClient` against the same router and handlers.
+_Avoid_: Remote client
+
+**SDK Contract IR**:
+The runtime-neutral compiled representation of the authoritative `HttpApi`, preserving encoded and decoded type projections plus transport metadata so independent SDK emitters can choose their public value model and runtime interpreter.
+
+**Embedded OpenCode**:
+A scoped in-process host that structurally extends the **OpenCode Client**, supplies an in-memory HTTP transport, and exposes additional same-process capabilities directly.
+_Avoid_: Local implementation
+
+**Page**:
+A bounded ordered result containing `items` and opaque `previous` and `next` cursor links for navigating the same query in either direction.
+_Avoid_: Response envelope
+
+## Relationships
+
+- **Instructions** is an opaque carrier composed from zero or more **Instruction Sources**.
+- **Model Context** is broader than **Instructions**. For each **Step**, the runner assembles the selected agent or provider system text, **Initial Instructions**, **Session History**, available tools, and step-local additions into one model request.
+- **Session History** persists conversational messages. The runner derives model-facing **Instruction Update** messages from value deltas and interleaves them by durable sequence; **Initial Instructions** remain separate provider-request state.
+- The runner explicitly loads and combines instruction built-ins, **InstructionDiscovery**, selected-agent skill guidance, reference guidance, MCP guidance, and **InstructionEntry** values. There is no instruction registry.
+- `Instructions.combine(...)` preserves caller order and rejects duplicate stable namespaced source keys. The runner loads its producers concurrently, then combines them in its fixed declared order.
+- Each **Instruction Source** read returns one coherent typed value, explicit removal, or temporary unavailability. `Instructions.make(...)` hides the value type so differently typed sources compose uniformly; its canonical codec defines storage and hash equivalence, while pure renderers produce first, changed, and optional removal text.
+- `Instructions.read(...)` reads every composed source concurrently and exactly once at the boundary. `Instructions.diff(...)` compares encoded-value hashes with current **Instruction Values** and returns one delta plus new blob bodies.
+- `Instructions.renderInitial(...)` renders values at the **Instruction Epoch** start. `Instructions.renderUpdate(...)` renders one hydrated delta against the values immediately before it.
+- A changed **Instruction Source** contributes its hash to one **Instruction Update**; explicit removal contributes the `"removed"` sentinel.
+- An **Instruction Update** persists only its value delta. Rendered text is derived during request assembly and excluded from compaction summaries.
+- The instruction blob insert, durable delta, and **Instruction State** advance commit atomically.
+- Changes from multiple **Instruction Sources** admitted at one safe boundary combine into one **Instruction Update**.
+- Instruction changes are sampled and admitted lazily at a **Safe Step Boundary**, never pushed asynchronously when their source changes.
+- At a **Safe Step Boundary**, prior tool results are already settled; instruction preparation completes before newly admitted user input promotes.
+- An **Admitted Prompt** is replayable pending input, not yet model-visible **Session History**.
+- **Prompt Promotion** atomically consumes the pending inbox entry and appends its model-visible user message.
+- Steering prompts promote at the next **Safe Step Boundary** while the current **Session Drain** still requires continuation. Promoting any newly admitted user input resets the selected agent's step allowance; multiple prompts promoted at one boundary reset it once.
+- A queued prompt does not promote while the current **Session Drain** requires continuation. The runner promotes one queued prompt when the Session would otherwise become idle, then reevaluates continuation before promoting another.
+- A **Session Drain** is process-local coordination rather than a durable domain entity. Durable recovery must reason from prompts, projected history, physical attempts, and tool state rather than inventing an enclosing execution identity.
+- An **Execution** contains one or more **Session Drains**; a **Session Drain** contains one reserved assistant-turn span at a time; that span contains **Steps**; and each **Step** contains one or more **Physical Attempts** plus any tool calls it requires.
+- A **Step** record covers only the model-visible span from first assistant output through tool settlement; pre-flight leaves no record, and one Step settles at most one record.
+- The first **Step** admits one complete delta and renders **Initial Instructions** without narrating that delta in history; an unavailable initial source blocks the Step instead of persisting incomplete values.
+- Instruction preparation precedes durable input promotion on every Step so an unavailable first baseline leaves pending input untouched and later updates enter history before newly promoted input.
+- Completed compaction moves the **Instruction Epoch** to the exact `session.compaction.ended` sequence and copies current hashes to the epoch's initial values. Earlier updates leave active model history while durable deltas remain.
+- A newly composed **Instruction Source** absent from current **Instruction Values** emits its first rendering once at the next **Safe Step Boundary**.
+- **Unavailable Instruction Source** uses stale-while-revalidate semantics and is distinct from a successfully loaded absence, which may emit removal text.
+- **InstructionDiscovery** observes ambient instructions as one ordered aggregate **Instruction Source**.
+- Ambient discovery reads global and upward-project `AGENTS.md` files and honors `OPENCODE_DISABLE_PROJECT_CONFIG` for project files.
+- After a successful internal file or directory read, nearby `AGENTS.md` files toward the Location root are injected once per Session as durable synthetic instruction messages.
+- **InstructionEntry** stores API-managed per-Session JSON values. Each entry contributes one `api/<key>` **Instruction Source**, so adding, replacing, or removing an entry is reconciled at the next **Safe Step Boundary**.
+- Location-scoped instruction producers naturally re-resolve when a moved Session next runs in its destination Location.
+- Moving a Session clears its **Instruction State**, so the destination must admit a complete delta before another prompt can promote. Committed revert does the same; replay derives both resets from their durable events.
+- Selected-agent available-skill guidance is an **Instruction Source** composed explicitly by the runner. It lists only names and descriptions permitted for that agent; skill bodies and locations are exposed only through the permission-checked `skill` tool.
+- The selected agent and model are sampled when a **Step** starts. Changes admitted after that boundary apply to the next Step and do not restart the current Step.
+- An agent switch that changes selected-agent guidance produces an **Instruction Update** while preserving the current baseline.
+- Local tool authorization and pending permission requests retain the effective agent of the **Step** that issued the call; a later agent switch cannot change that call's policy.
+- Instruction source changes never wake idle Sessions; the next naturally scheduled **Safe Step Boundary** loads and compares current values lazily.
+- Once admitted, an **Instruction Update** remains durable even if the following **Physical Attempt** fails and is replayed unchanged on retry.
+- **Instruction Updates** remain durable value history but are not `session_message` rows. Clients display changed keys rather than model-facing prose.
+- The date **Instruction Source** initially preserves host-local calendar-date behavior; a configured user timezone may replace that default later.
+- **Initial Instructions** are recomputed deterministically from durable values for every request; rendered bytes are not stored.
+- A model/provider switch preserves current **Instruction Values**, the **Instruction Epoch**, and chronological conversation history; the new selection applies to the next **Step**.
+- **Native Continuation Metadata** remains in durable history. Step projection includes it only for a successful exact originating provider/model match; failed Steps and incompatible models omit opaque metadata, while non-empty visible reasoning lowers to ordinary assistant text after a model switch. This conservative relation may widen only when recorded provider tests establish compatibility.
+- **Model Request Options** remain provider-semantic through Catalog resolution. The Session runner maps them into the LLM package's provider-option namespace; the selected protocol adapter alone owns provider wire encoding.
+- **Generation Controls**, protocol-semantic **Model Request Options**, and compatibility request body fields are separate Catalog domains. A shared ingestion adapter partitions legacy and models.dev AI-SDK-shaped options before routing.
+- The **PTY Environment** is a server concern rather than a Core PTY concern. PTY creation merges caller values, then the host overlay, then Core-forced terminal invariants such as `TERM` and `OPENCODE_TERMINAL`.
+- Networked and **Embedded OpenCode** use the same **OpenCode Client** and preserve the full HTTP encoding, routing, middleware, and decoding boundary; only the `HttpClient` transport differs.
+- The Effect-native network constructor obtains `HttpClient.HttpClient` from its environment so callers own transport selection, recording, tracing, retries, and tests. Convenience runtimes may provide a fetch transport separately.
+- Creating **Embedded OpenCode** is scoped. Closing its owning Scope releases the in-process server resources, database resources, registrations, and fibers.
+- **Embedded OpenCode** exposes shared client capabilities and embedded-only capabilities on one object; consumers do not navigate through a nested `.client` property.
+- The beta **OpenCode Client** currently uses plural consumer-facing capability groups such as `sessions`; whether the stable Session namespace should instead be singular `session` must be settled before stabilization. Internal server identifiers do not implicitly define public client names.
+- Server's concrete `HttpApi` is authoritative for shared **OpenCode Client** capabilities. Codegen compiles its Session group directly; the Effect runtime uses an equivalent Protocol-only projection so generated artifacts remain independent of Core and Server.
+- SDK generation reflects the public `HttpApi` once into an **SDK Contract IR**. Promise and Effect emitters share endpoint structure and transport metadata without being required to expose identical public values: an emitter may select encoded wire types, decoded domain types, compile-time brands, runtime validation, and its own execution abstraction independently.
+- The first Effect emitter is the rich projection: it exposes decoded Effect-native values, preserves brands and schema transformations, performs runtime schema decoding, and delegates transport interpretation to `HttpApiClient`. Lighter wire-shaped Effect output remains possible through another emitter policy rather than constraining the shared IR.
+- The rich Effect emitter regenerates private executable schemas when the **SDK Contract IR** proves that their transport semantics can be reproduced exactly. Contracts with authoritative custom transformations use the import-based Effect emitter against a Protocol-only client projection whose generated transport output is tested against Server's concrete API; the Promise emitter still derives zero-Effect structural wire types from the same IR.
+- `@opencode-ai/protocol` owns Session endpoint construction and middleware placement. Server supplies concrete middleware keys to produce the authoritative build-time API; the client projection supplies transport-only keys without importing Core or Server at runtime.
+- The first Promise emitter targets the same clean domain-oriented method organization rather than Hey API source compatibility. It returns unwrapped values directly, rejects declared and infrastructure failures, and begins with minimal client-level transport configuration; result wrappers, interceptors, and legacy generated signatures are outside the initial surface.
+- The first Promise emitter parses response syntax and trusts its generated structural types; it does not perform runtime structural validation. Malformed payload syntax fails, while a syntactically valid shape mismatch is not detected at the SDK boundary. Standalone validator generation remains an optional future emitter policy.
+- Declared Promise-client failures retain their tagged structural wire values and have generated type guards. Consumers do not depend on generated `Error` subclass identity, preserving discrimination across package copies and realms while remaining structurally aligned with Effect domain errors.
+- Promise-client infrastructure failures use one generated `ClientError` class with a structured reason such as transport failure, unexpected status, unsupported content type, or malformed response. Promise methods reject with either a tagged declared domain failure or `ClientError`, matching the Effect client's conceptual domain/infrastructure error division.
+- Promise methods accept a separate optional per-call transport-options argument containing `AbortSignal` and header overrides. Cancellation and transport metadata do not enter the domain input object; broader interceptor and response-mode APIs remain deferred.
+- Promise streaming methods return a lazy `AsyncIterable` directly rather than a Promise-wrapped stream object. Iteration opens the connection, `AbortSignal` cancels it, and ending iteration closes the underlying request; the Effect emitter analogously returns `Stream` directly.
+- Promise SSE connection establishment, declared HTTP failures, and infrastructure failures occur during `AsyncIterable` iteration, beginning with its first `next()` call, rather than during synchronous method construction.
+- Neither generated streaming runtime automatically reconnects after disconnection. Promise `AsyncIterable` and Effect `Stream` fail explicitly; live consumers refresh and resubscribe, while durable sequence-based resume remains explicit composition above the generated client.
+- Promise client construction is synchronous and network-free. It requires `baseUrl`, defaults to `globalThis.fetch`, accepts client-level headers, and merges them with per-call header overrides.
+- Effect client construction accepts an explicit `baseUrl` and obtains `HttpClient.HttpClient` from the Effect environment. It does not install fetch or duplicate per-call transport policy; callers transform/provide the client for headers, tracing, retries, recording, and tests, while fiber interruption owns cancellation.
+- Promise and Effect emitters each own their generated public type modules. The **SDK Contract IR**, not a physically shared generated type package, is the common source; this permits zero-Effect wire types and rich decoded Effect types to evolve independently.
+- Promise and Effect network clients ship from `@opencode-ai/client` behind isolated root and `/effect` exports. The root has no runtime path to Effect; `/effect` imports only Effect, Schema, and Protocol.
+- The Effect-native scoped host belongs to `@opencode-ai/sdk-next`, which will assume the existing `@opencode-ai/sdk` name after legacy consumers migrate. Client remains network-only and SDK depends one-way on Client.
+- SDK executes Server's assembled `HttpRouter` in memory. It opens no listener and performs no network I/O, while preserving Server routing, middleware, codecs, handlers, and errors.
+- The Effect Client and SDK re-export their decoded datatype facade from Schema so callers do not depend on internal package locations or Core's versioned names.
+- A capability intended for both networked and **Embedded OpenCode** belongs in the authoritative public `HttpApi`; embedded-only same-process capabilities extend **Embedded OpenCode** separately.
+- `sessions.log({ sessionID, after, follow })` is the public durable Session event stream. It verifies the Session, replays durable events after the optional aggregate sequence, optionally continues with newly committed durable events, excludes live-only fragments, and is transported as SSE in both networked and embedded modes.
+- `events.subscribe()` is a distinct public instance-wide live stream for Session and non-Session activity. It has no replay guarantee and includes connection, heartbeat, and instance-disposal lifecycle events; consumers recover from disconnection by refreshing authoritative state.
+- A Session ID is not an optional filter on `events.subscribe()`: instance-wide live events and durable Session events have different schemas, replay guarantees, cursors, lifecycle events, and failure behavior.
+- The initial common OpenCode Client does not expose server-global event aggregation. `events.subscribe()` is bounded to the connected OpenCode instance or workspace; any future cross-instance administrative stream requires a separately designed API.
+- `events.subscribe()` does not automatically reconnect after transport loss. The live-only stream fails with `ClientError`; consumers refresh authoritative state before explicitly opening a new subscription because events missed during disconnection cannot be replayed.
+- `sessions.log({ sessionID, after, follow })` returns the generated HTTP client's cold durable event stream and does not build reconnection policy into the endpoint or client constructor. Transport loss fails the stream with `ClientError`. Callers may compose an explicit resuming stream above it by retaining the last observed durable sequence and opening a new subscription with `after`; any reusable resume helper remains a separate API design question.
+- The stable `sessions.list(...)` design returns a **Page** in both networked and **Embedded OpenCode**; embedded execution does not define a separate unbounded array-returning list operation. The beta client currently preserves the existing HTTP `{ data, cursor }` envelope until emitter-level Page projection is implemented.
+- Session list cursors are opaque branded values carrying continuation query and ordering state. Consumers pass them back unchanged and do not inspect storage anchors or encoded filter fields.
+- A Session list continuation accepts only its opaque cursor. Scope, filters, ordering, and page size are fixed by the initial query and carried by that cursor.
+- `sessions.messages(...)` returns a **Page** and uses the same cursor discipline as `sessions.list(...)`: the initial request supplies `sessionID`, ordering, and page size; continuation supplies `sessionID` plus only an opaque branded message cursor carrying ordering, page size, direction, and message anchor. Using a cursor with another Session is invalid.
+- `sessions.message({ sessionID, messageID })` is a required resource lookup. An unknown Session fails with `SessionNotFoundError`; a known Session with an absent or differently owned message fails with `MessageNotFoundError` without disclosing cross-Session ownership. Absence is not represented as `undefined` across the public HTTP boundary.
+- `sessions.interrupt({ sessionID })` first verifies that the durable Session exists, failing with `SessionNotFoundError` otherwise. For a known Session, interruption is idempotent: idle, already-settled, or locally unowned execution is a no-op.
+- `sessions.active()` snapshots the current process's foreground Session drain registry as a record of Session IDs to `{ type: "running" }`. Missing IDs are inactive; background subagents and tasks do not make their parent Session active, and process restart clears the registry.
+- `sessions.context({ sessionID })` preserves the existing message-only operation. It returns projected **Session History**; it does not include or represent the complete **Model Context**, whose agent system text, **Initial Instructions**, tools, and step-local additions remain separate.
+- **Open question**: Should a future, separately named operation expose complete **Model Context**, including the instruction baseline, applied instruction metadata, tools, and step-local additions?
+- `sessions.prompt(...)` exposes `resume?: boolean`. Omitting it preserves durable admission followed by an advisory execution wake; `resume: false` requests durable admit-only behavior.
+- The public operation remains `sessions.prompt(...)`; `SessionPending.admit` is the internal primitive, while the public `Admission` result and `resume` option express its durable admission semantics.
+- `sessions.create(...)` accepts an optional `location`. Omission resolves through the connected OpenCode instance's default or current location; an explicit value selects a known location. Networked and embedded transports use the same handler semantics.
+- `sessions.switchAgent({ sessionID, agent })` is part of the common client alongside `sessions.switchModel(...)`. It affects subsequent Session activity and fails with `SessionNotFoundError` for an unknown Session.
+- The **Embedded OpenCode** Layer delegates to the same scoped creation path; it does not define a second implementation.
+- A **PTY Environment** adapter observes plugins in the request Location while passing the resolved PTY working directory to the hook; standalone servers use an empty adapter.
+- An **Instruction Update** lowers to the provider's native chronological instruction role when supported and to a wrapped chronological fallback otherwise.
+- When the aggregate discovered instruction set changes, its **Instruction Update** includes the complete current ordered set and supersedes the prior aggregate value; when no discovered instructions remain, the message states that previously loaded instructions no longer apply.
+- Ambient project instruction discovery honors `OPENCODE_DISABLE_PROJECT_CONFIG`; global instructions remain eligible.
+- Oversized textual **Model Tool Output** retains a bounded preview in Session history while its complete text moves to managed tool-output storage. Arbitrary structured-result size is a separate concern.
+- One tool settlement receives one aggregate textual limit, using the configured maximum lines or UTF-8 bytes, whichever is reached first. The limit is provider-independent; token pressure belongs to context assembly and compaction.
+- Generic truncation preserves the beginning and end of textual output. Tools may apply a more meaningful strategy before the Tool Registry enforces the final limit.
+- A truncated **Model Tool Output** identifies its complete text in the bounded model-visible preview. The Tool Registry also supplies managed paths as internal metadata to tool hooks; Session events do not expose a typed `outputPaths` field.
+- A **Managed Tool Output File** is temporary and may expire after its retention period. The bounded **Model Tool Output**, not the file, is the durable replayable record.
+- Failure to retain a **Managed Tool Output File** fails settlement operationally. The Session never publishes a successful result whose complete output was lost during generic bounding.
+- Once a tool operation succeeds, bounding its **Model Tool Output** and publishing its one durable settlement form an interruption-safe completion region. Raw oversized success is never published before a later correction.
+- When a structured-only result would exceed the **Model Tool Output** limit, its validated structured value remains unchanged for Session consumers while model replay uses a bounded textual JSON preview and optional managed output path.
+- Existing tool-managed output paths survive generic bounding. A fallback file retains exactly the complete projected text received by the Tool Registry and never claims to reconstruct output already discarded by tool-specific shaping.
+- **Managed Tool Output Files** use globally unique names in one shared flat directory. They receive no special filesystem authority; each tool applies its ordinary external-path policy.
+- Provider-executed tool results remain provider-native transcript facts outside generic Tool Registry bounding. Their context control requires provider-aware pruning or compaction because some providers require exact structured round-trip payloads.
+
+## Client contract architecture
+
+Semantic values that mean the same thing internally and publicly live in the lightweight Schema leaf. Core consumes Schema for domain behavior; Protocol composes Schema values into paths, payloads, envelopes, errors, cursors, and streams; Server imports both, hosts Protocol's exact groups, and owns protocol/domain adaptation. The root Promise client remains zero-Effect, `/effect` depends on Effect plus Schema and Protocol, and `@opencode-ai/sdk-next` composes the scoped in-process host above Client, Core, and Server.
+
+Shared public records are plain objects declared with `Schema.Struct`. A same-name inferred interface gives object records readable TypeScript signatures without constructors, prototypes, or nominal identity; unions retain explicit type aliases.
+
+Before stabilizing the client API:
+
+- Keep additional public schemas in Schema and additional network groups in Protocol; neither package may transitively load databases, Drizzle, Session execution, providers, watchers, native modules, or WASM.
+- Keep concrete Location middleware keys in Server while Protocol owns their placement. Client projections may supply transport-only keys, but must prove generated equivalence with Server's concrete API.
+- Project the existing list response envelope to the stable client **Page** shape and enforce separate initial-query and cursor-continuation inputs without changing the hosted V2 wire contract.
+- Settle the stable consumer namespace (`session` versus the current beta `sessions`) and use an explicit codegen annotation if the consumer name should differ from the server group identifier.
+- Preserve V2 route paths, operation IDs, codecs, errors, middleware behavior, and OpenAPI output while making this change.
+- Preserve browser-safe `@opencode-ai/client` and `@opencode-ai/client/effect` bundles through import-boundary tests.
+- Define embedded-host placement before supporting multiple hosts over one database. Hosts that share durable Session storage must also share process-local Session execution coordination, or each host must receive isolated storage explicitly.
+- Keep an embedded request scope alive until any streamed response body finishes. The initial non-streaming Session surface does not exercise this lifetime boundary; Session and instance event streams must do so before joining the embedded client.
+
+## Example dialogue
+
+> **Dev:** "The date changed while the session was active. Should the **Instruction Update** say what the old date was?"
+> **Domain expert:** "No. Emit the newly effective date so the agent can act on the current instructions."
+
+## Flagged ambiguities
+
+- Legacy `experimental.chat.system.transform` can mutate assembled system text arbitrarily, but V2 plugins do not yet expose an equivalent hook. Decide separately whether to port it, model dynamic uses as explicit **Instruction Sources**, or narrow its semantics.

bun.lock

@@ -32,7 +32,7 @@
     },
     "packages/app": {
       "name": "@opencode-ai/app",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@corvu/drawer": "catalog:",
         "@dnd-kit/abstract": "0.5.0",
@@ -40,9 +40,11 @@
         "@dnd-kit/helpers": "0.5.0",
         "@dnd-kit/solid": "0.5.0",
         "@kobalte/core": "catalog:",
+        "@opencode-ai/client": "workspace:*",
         "@opencode-ai/core": "workspace:*",
         "@opencode-ai/schema": "workspace:*",
         "@opencode-ai/sdk": "workspace:*",
+        "@opencode-ai/sdk-v1": "https://registry.npmjs.org/@opencode-ai/sdk/-/sdk-1.17.18.tgz",
         "@opencode-ai/session-ui": "workspace:*",
         "@opencode-ai/ui": "workspace:*",
         "@pierre/trees": "1.0.0-beta.4",
@@ -108,6 +110,7 @@
         "@opencode-ai/core": "workspace:*",
         "@opencode-ai/plugin": "workspace:*",
         "@opencode-ai/schema": "workspace:*",
+        "@opencode-ai/sdk": "workspace:*",
         "@opencode-ai/server": "workspace:*",
         "@opencode-ai/tui": "workspace:*",
         "@opentui/core": "catalog:",
@@ -126,7 +129,6 @@
         "uqr": "0.1.3",
       },
       "devDependencies": {
-        "@opencode-ai/protocol": "workspace:*",
         "@opencode-ai/script": "workspace:*",
         "@tsconfig/bun": "catalog:",
         "@types/bun": "catalog:",
@@ -158,7 +160,7 @@
     },
     "packages/codemode": {
       "name": "@opencode-ai/codemode",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "acorn": "8.15.0",
         "effect": "catalog:",
@@ -172,7 +174,7 @@
     },
     "packages/console/app": {
       "name": "@opencode-ai/console-app",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@cloudflare/vite-plugin": "1.15.2",
         "@ibm/plex": "6.4.1",
@@ -208,7 +210,7 @@
     },
     "packages/console/core": {
       "name": "@opencode-ai/console-core",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@aws-sdk/client-sts": "3.782.0",
         "@jsx-email/render": "1.1.1",
@@ -235,7 +237,7 @@
     },
     "packages/console/function": {
       "name": "@opencode-ai/console-function",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@ai-sdk/anthropic": "3.0.82",
         "@ai-sdk/openai": "3.0.48",
@@ -257,7 +259,7 @@
     },
     "packages/console/mail": {
       "name": "@opencode-ai/console-mail",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@jsx-email/all": "2.2.3",
         "@jsx-email/cli": "1.4.3",
@@ -281,7 +283,7 @@
     },
     "packages/console/support": {
       "name": "@opencode-ai/console-support",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@cloudflare/vite-plugin": "1.15.2",
         "@opencode-ai/console-core": "workspace:*",
@@ -301,7 +303,7 @@
     },
     "packages/core": {
       "name": "@opencode-ai/core",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "bin": {
         "opencode": "./bin/opencode",
       },
@@ -309,7 +311,7 @@
         "@ai-sdk/alibaba": "1.0.17",
         "@ai-sdk/amazon-bedrock": "4.0.112",
         "@ai-sdk/anthropic": "3.0.82",
-        "@ai-sdk/azure": "3.0.88",
+        "@ai-sdk/azure": "3.0.49",
         "@ai-sdk/cerebras": "2.0.41",
         "@ai-sdk/cohere": "3.0.27",
         "@ai-sdk/deepinfra": "2.0.41",
@@ -318,7 +320,7 @@
         "@ai-sdk/google-vertex": "4.0.128",
         "@ai-sdk/groq": "3.0.31",
         "@ai-sdk/mistral": "3.0.27",
-        "@ai-sdk/openai": "3.0.84",
+        "@ai-sdk/openai": "3.0.53",
         "@ai-sdk/openai-compatible": "2.0.41",
         "@ai-sdk/perplexity": "3.0.26",
         "@ai-sdk/provider": "3.0.8",
@@ -355,7 +357,7 @@
         "drizzle-orm": "catalog:",
         "effect": "catalog:",
         "fuzzysort": "3.1.0",
-        "gitlab-ai-provider": "6.11.1",
+        "gitlab-ai-provider": "6.10.0",
         "glob": "13.0.5",
         "google-auth-library": "10.5.0",
         "gray-matter": "4.0.3",
@@ -397,7 +399,7 @@
     },
     "packages/desktop": {
       "name": "@opencode-ai/desktop",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@zip.js/zip.js": "2.7.62",
         "effect": "catalog:",
@@ -457,7 +459,7 @@
     },
     "packages/effect-drizzle-sqlite": {
       "name": "@opencode-ai/effect-drizzle-sqlite",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "drizzle-orm": "catalog:",
         "effect": "catalog:",
@@ -471,7 +473,7 @@
     },
     "packages/effect-sqlite-node": {
       "name": "@opencode-ai/effect-sqlite-node",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "effect": "catalog:",
       },
@@ -483,7 +485,7 @@
     },
     "packages/enterprise": {
       "name": "@opencode-ai/enterprise",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@hono/standard-validator": "catalog:",
         "@opencode-ai/core": "workspace:*",
@@ -515,7 +517,7 @@
     },
     "packages/function": {
       "name": "@opencode-ai/function",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@octokit/auth-app": "8.0.1",
         "@octokit/rest": "catalog:",
@@ -531,7 +533,7 @@
     },
     "packages/http-recorder": {
       "name": "@opencode-ai/http-recorder",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@effect/platform-node-shared": "4.0.0-beta.83",
       },
@@ -563,7 +565,7 @@
     },
     "packages/llm": {
       "name": "@opencode-ai/llm",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@opencode-ai/schema": "workspace:*",
         "@smithy/eventstream-codec": "4.2.14",
@@ -582,7 +584,7 @@
     },
     "packages/opencode": {
       "name": "opencode",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "bin": {
         "opencode": "./bin/opencode",
       },
@@ -593,7 +595,7 @@
         "@ai-sdk/alibaba": "1.0.17",
         "@ai-sdk/amazon-bedrock": "4.0.112",
         "@ai-sdk/anthropic": "3.0.82",
-        "@ai-sdk/azure": "3.0.88",
+        "@ai-sdk/azure": "3.0.49",
         "@ai-sdk/cerebras": "2.0.60",
         "@ai-sdk/cohere": "3.0.27",
         "@ai-sdk/deepinfra": "2.0.41",
@@ -602,7 +604,7 @@
         "@ai-sdk/google-vertex": "4.0.128",
         "@ai-sdk/groq": "3.0.31",
         "@ai-sdk/mistral": "3.0.27",
-        "@ai-sdk/openai": "3.0.84",
+        "@ai-sdk/openai": "3.0.53",
         "@ai-sdk/openai-compatible": "2.0.41",
         "@ai-sdk/perplexity": "3.0.26",
         "@ai-sdk/provider": "3.0.8",
@@ -657,7 +659,7 @@
         "drizzle-orm": "catalog:",
         "effect": "catalog:",
         "fuzzysort": "3.1.0",
-        "gitlab-ai-provider": "6.11.1",
+        "gitlab-ai-provider": "6.10.0",
         "glob": "13.0.5",
         "google-auth-library": "10.5.0",
         "gray-matter": "4.0.3",
@@ -715,7 +717,7 @@
     },
     "packages/plugin": {
       "name": "@opencode-ai/plugin",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@ai-sdk/provider": "3.0.8",
         "@opencode-ai/client": "workspace:*",
@@ -802,7 +804,7 @@
     },
     "packages/sdk/js": {
       "name": "@opencode-ai/sdk",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "cross-spawn": "catalog:",
       },
@@ -817,7 +819,7 @@
     },
     "packages/server": {
       "name": "@opencode-ai/server",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@effect/platform-node": "catalog:",
         "@opencode-ai/core": "workspace:*",
@@ -834,11 +836,10 @@
     },
     "packages/session-ui": {
       "name": "@opencode-ai/session-ui",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@kobalte/core": "catalog:",
         "@opencode-ai/core": "workspace:*",
-        "@opencode-ai/sdk": "workspace:*",
         "@opencode-ai/ui": "workspace:*",
         "@pierre/diffs": "catalog:",
         "@shikijs/stream": "catalog:",
@@ -880,7 +881,7 @@
       "name": "@opencode-ai/simulation",
       "version": "1.17.13",
       "dependencies": {
-        "@fontsource/commit-mono": "5.2.5",
+        "@fontsource/adwaita-mono": "5.2.1",
         "@napi-rs/canvas": "1.0.2",
         "@opencode-ai/core": "workspace:*",
         "@opencode-ai/llm": "workspace:*",
@@ -895,7 +896,7 @@
     },
     "packages/slack": {
       "name": "@opencode-ai/slack",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@opencode-ai/sdk": "workspace:*",
         "@slack/bolt": "^3.17.1",
@@ -908,10 +909,9 @@
     },
     "packages/stats/app": {
       "name": "@opencode-ai/stats-app",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@ibm/plex": "6.4.1",
-        "@kobalte/core": "catalog:",
         "@opencode-ai/stats-core": "workspace:*",
         "@opencode-ai/ui": "workspace:*",
         "@solidjs/meta": "catalog:",
@@ -942,7 +942,7 @@
     },
     "packages/stats/core": {
       "name": "@opencode-ai/stats-core",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@aws-sdk/client-athena": "3.933.0",
         "@planetscale/database": "1.19.0",
@@ -961,7 +961,7 @@
     },
     "packages/stats/server": {
       "name": "@opencode-ai/stats-server",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@aws-sdk/client-firehose": "3.933.0",
         "@effect/platform-node": "catalog:",
@@ -1002,11 +1002,12 @@
     },
     "packages/tui": {
       "name": "@opencode-ai/tui",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@opencode-ai/client": "workspace:*",
         "@opencode-ai/core": "workspace:*",
         "@opencode-ai/plugin": "workspace:*",
+        "@opencode-ai/sdk": "workspace:*",
         "@opencode-ai/simulation": "workspace:*",
         "@opencode-ai/ui": "workspace:*",
         "@opentui/core": "catalog:",
@@ -1032,7 +1033,7 @@
     },
     "packages/ui": {
       "name": "@opencode-ai/ui",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@kobalte/core": "catalog:",
         "@pierre/diffs": "catalog:",
@@ -1083,7 +1084,7 @@
     },
     "packages/web": {
       "name": "@opencode-ai/web",
-      "version": "1.17.20",
+      "version": "1.17.18",
       "dependencies": {
         "@astrojs/cloudflare": "12.6.3",
         "@astrojs/markdown-remark": "6.3.1",
@@ -1154,7 +1155,6 @@
   ],
   "patchedDependencies": {
     "@pierre/trees@1.0.0-beta.4": "patches/@pierre%2Ftrees@1.0.0-beta.4.patch",
-    "@tanstack/virtual-core@3.17.3": "patches/@tanstack%2Fvirtual-core@3.17.3.patch",
     "@ai-sdk/xai@3.0.102": "patches/@ai-sdk%2Fxai@3.0.102.patch",
     "@modelcontextprotocol/sdk@1.29.0": "patches/@modelcontextprotocol%2Fsdk@1.29.0.patch",
     "gcp-metadata@8.1.2": "patches/gcp-metadata@8.1.2.patch",
@@ -1162,8 +1162,10 @@
     "effect@4.0.0-beta.83": "patches/effect@4.0.0-beta.83.patch",
     "@npmcli/agent@4.0.2": "patches/@npmcli%2Fagent@4.0.2.patch",
     "@silvia-odwyer/photon-node@0.3.4": "patches/@silvia-odwyer%2Fphoton-node@0.3.4.patch",
+    "@tanstack/solid-virtual@3.13.28": "patches/@tanstack%2Fsolid-virtual@3.13.28.patch",
     "solid-js@1.9.10": "patches/solid-js@1.9.10.patch",
     "@ai-sdk/google@3.0.73": "patches/@ai-sdk%2Fgoogle@3.0.73.patch",
+    "@tanstack/virtual-core@3.17.0": "patches/@tanstack%2Fvirtual-core@3.17.0.patch",
     "pacote@21.5.0": "patches/pacote@21.5.0.patch",
   },
   "overrides": {
@@ -1199,7 +1201,7 @@
     "@solidjs/router": "0.15.4",
     "@solidjs/start": "https://pkg.pr.new/@solidjs/start@dfb2020",
     "@tailwindcss/vite": "4.1.11",
-    "@tanstack/solid-virtual": "3.13.32",
+    "@tanstack/solid-virtual": "3.13.28",
     "@tsconfig/bun": "1.0.9",
     "@tsconfig/node22": "22.0.2",
     "@types/bun": "1.3.13",
@@ -1219,7 +1221,7 @@
     "hono": "4.10.7",
     "hono-openapi": "1.1.2",
     "luxon": "3.6.1",
-    "marked": "17.0.6",
+    "marked": "17.0.1",
     "marked-shiki": "1.2.1",
     "opentui-spinner": "0.0.7",
     "remeda": "2.26.0",
@@ -1261,7 +1263,7 @@
 
     "@ai-sdk/anthropic": ["@ai-sdk/anthropic@3.0.82", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-WKKou2wbhGGYV8PSALAPyV2YY4nfCqCPkyBzYtJtDA9yCcIFwsbtkTNgg7bqtLCVzeEsY7wwxRoCWy+EMfrw/A=="],
 
-    "@ai-sdk/azure": ["@ai-sdk/azure@3.0.88", "", { "dependencies": { "@ai-sdk/deepseek": "2.0.47", "@ai-sdk/openai": "3.0.84", "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.38" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-RRjZkB1lYplh8dpBarnvkl1j7sYLHsyXua7erL3oNcMK7fHcl4bPO5C7iQhD1O/DqD/zCceDifnege1s+8yEvw=="],
+    "@ai-sdk/azure": ["@ai-sdk/azure@3.0.49", "", { "dependencies": { "@ai-sdk/openai": "3.0.48", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-wskgAL+OmrHG7by/iWIxEBQCEdc1mDudha/UZav46i0auzdFfsDB/k2rXZaC4/3nWSgMZkxr0W3ncyouEGX/eg=="],
 
     "@ai-sdk/cerebras": ["@ai-sdk/cerebras@2.0.41", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.37", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-kDMEpjaRdRXIUi1EH8WHwLRahyDTYv9SAJnP6VCCeq8X+tVqZbMLCqqxSG5dRknrI65ucjvzQt+FiDKTAa7AHg=="],
 
@@ -1271,7 +1273,7 @@
 
     "@ai-sdk/deepinfra": ["@ai-sdk/deepinfra@2.0.41", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.37", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-y6RoOP7DGWmDSiSxrUSt5p18sbz+Ixe5lMVPmdE7x+Tr5rlrzvftyHhjWHfqlAtoYERZTGFbP6tPW1OfQcrb4A=="],
 
-    "@ai-sdk/deepseek": ["@ai-sdk/deepseek@2.0.47", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.38" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MzcQ321JO8OY+TVLFI81A7cIIuoeLLxrLCDD+8C1E3Ro6UFyfMtRXo9bw9OhTMRSDMo6hgSDOo4Fekz8aJtQYQ=="],
+    "@ai-sdk/deepseek": ["@ai-sdk/deepseek@2.0.35", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-9DhYurbAvcurOEGN6u2myYDybrrzGfcrkG8hwmFjwTrePW6KCMggm0YxP7e8RkLYcQKqCEMgFlyEB4BM6EmiKg=="],
 
     "@ai-sdk/elevenlabs": ["@ai-sdk/elevenlabs@2.0.33", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-EtvsWfGrqx3OhzJdoi82qH+4yzEPPKZr2utyQ+w8cHKoFeg0+8Lou9Z3uixy73WEwz8Z1+AR8QT9fZ64AWGYPA=="],
 
@@ -1765,7 +1767,7 @@
 
     "@floating-ui/utils": ["@floating-ui/utils@0.2.11", "", {}, "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg=="],
 
-    "@fontsource/commit-mono": ["@fontsource/commit-mono@5.2.5", "", {}, "sha512-htX8yQWtiPt5L1Hzh4sirvfUJT2+KYiquDB/Q2sY2tWQYplpBUOD5zHnIM3k36Hnm4V+JIIqA/wmwupSQ68WjA=="],
+    "@fontsource/adwaita-mono": ["@fontsource/adwaita-mono@5.2.1", "", {}, "sha512-6+Q1UIvklJ9REijs6kv7YlRNt6yktRj0iW8H69YIugdD9P2h3eIX1AB8/9ICMfpVyVeywlsrCXg82y/LfRrjyg=="],
 
     "@fontsource/ibm-plex-mono": ["@fontsource/ibm-plex-mono@5.2.5", "", {}, "sha512-G09N3GfuT9qj3Ax2FDZvKqZttzM3v+cco2l8uXamhKyXLdmlaUDH5o88/C3vtTHj2oT7yRKsvxz9F+BXbWKMYA=="],
 
@@ -2217,6 +2219,8 @@
 
     "@opencode-ai/sdk-next": ["@opencode-ai/sdk-next@workspace:packages/sdk-next"],
 
+    "@opencode-ai/sdk-v1": ["@opencode-ai/sdk@https://registry.npmjs.org/@opencode-ai/sdk/-/sdk-1.17.18.tgz", { "dependencies": { "cross-spawn": "7.0.6" } }, "sha512-c/C9PhY8PrbcxDY+JIYtOZsrmMD0KzoVvxq+RGUrZ6LQp57SuVBbT4lfwA2G8Se5RNC1N5JtYjiuaXeECnF2SQ=="],
+
     "@opencode-ai/server": ["@opencode-ai/server@workspace:packages/server"],
 
     "@opencode-ai/session-ui": ["@opencode-ai/session-ui@workspace:packages/session-ui"],
@@ -3123,7 +3127,7 @@
 
     "@tanstack/solid-query": ["@tanstack/solid-query@5.91.4", "", { "dependencies": { "@tanstack/query-core": "5.91.2" }, "peerDependencies": { "solid-js": "^1.6.0" } }, "sha512-oCEgn8iT7WnF/7ISd7usBpUK1C9EdvQfg8ZUpKNKZ4edVClICZrCX6f3/Bp8ZlwQnL21KLc2rp+CejEuehlRxg=="],
 
-    "@tanstack/solid-virtual": ["@tanstack/solid-virtual@3.13.32", "", { "dependencies": { "@tanstack/virtual-core": "3.17.3" }, "peerDependencies": { "solid-js": "^1.3.0" } }, "sha512-yhX4A4Kgn+wyTg6Mmu8+zwoMTwjz4K1ucvLfRJ8f0rPGDDAIqSaf0v6oU0yT9+SvrjmUaZQ0VX7g4byexbhNng=="],
+    "@tanstack/solid-virtual": ["@tanstack/solid-virtual@3.13.28", "", { "dependencies": { "@tanstack/virtual-core": "3.17.0" }, "peerDependencies": { "solid-js": "^1.3.0" } }, "sha512-kRuOEL5orH/rzGgxNgfgOttsgV6cgrUeupVtrHMITb5p0rZ3hnxhbu/lhKcR9+7x+EJdfUtJIb2CVC85mlw15g=="],
 
     "@tanstack/start-client-core": ["@tanstack/start-client-core@1.170.13", "", { "dependencies": { "@tanstack/router-core": "1.171.14", "@tanstack/start-fn-stubs": "1.162.0", "@tanstack/start-storage-context": "1.167.16", "seroval": "^1.5.4" } }, "sha512-o37M3msIK5ec87kPrIYJWXb1XPnjIe5/jrkGLXiXpFuVL99z7mhoBCzftKtVPtzqI8EElnRE/VGFYT9BHNnWcw=="],
 
@@ -3137,7 +3141,7 @@
 
     "@tanstack/store": ["@tanstack/store@0.9.3", "", {}, "sha512-8reSzl/qGWGGVKhBoxXPMWzATSbZLZFWhwBAFO9NAyp0TxzfBP0mIrGb8CP8KrQTmvzXlR/vFPPUrHTLBGyFyw=="],
 
-    "@tanstack/virtual-core": ["@tanstack/virtual-core@3.17.3", "", {}, "sha512-8Np/TFELpI0ySuJoVmjvOrQYXH/8sTX0Biv9szhFhY39xOdAAY+smrMxjxOum/ux3eM8MUJQsEJ0/R0UpvC8dw=="],
+    "@tanstack/virtual-core": ["@tanstack/virtual-core@3.17.0", "", {}, "sha512-gOxY/hFkPh/XQYhnThBHzkbkX3Ed+z/iushyz+R+JAr213aXxUDgQoTgTdrDpBSRsjFM73P/KfUyWmaF9WHMkQ=="],
 
     "@tanstack/virtual-file-routes": ["@tanstack/virtual-file-routes@1.162.0", "", {}, "sha512-uhOeFyxLcU41HzvrxsGpiWdcMbScY1EDgbZ5K7DVRMYInbLYWAC0EA/kx9wXAoSM8q82bUG2hRl8+EAjE6XAbA=="],
 
@@ -4345,7 +4349,7 @@
 
     "github-slugger": ["github-slugger@2.0.0", "", {}, "sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw=="],
 
-    "gitlab-ai-provider": ["gitlab-ai-provider@6.11.1", "", { "dependencies": { "@anthropic-ai/sdk": "^0.71.0", "@anycable/core": "^0.9.2", "graphql-request": "^6.1.0", "isomorphic-ws": "^5.0.0", "openai": "^6.16.0", "socket.io-client": "^4.8.1", "vscode-jsonrpc": "^8.2.1", "zod": "^3.25.76" }, "peerDependencies": { "@ai-sdk/provider": ">=3.0.0", "@ai-sdk/provider-utils": ">=4.0.0" } }, "sha512-SJ6f5qa7P8md6lPrserryER3zerLkrezlnqqYQ2AbvDPpHLbwtbyk0FYJ5kNRcmbI80i/VMcsMBP0YIRdc3ucQ=="],
+    "gitlab-ai-provider": ["gitlab-ai-provider@6.10.0", "", { "dependencies": { "@anthropic-ai/sdk": "^0.71.0", "@anycable/core": "^0.9.2", "graphql-request": "^6.1.0", "isomorphic-ws": "^5.0.0", "openai": "^6.16.0", "socket.io-client": "^4.8.1", "vscode-jsonrpc": "^8.2.1", "zod": "^3.25.76" }, "peerDependencies": { "@ai-sdk/provider": ">=3.0.0", "@ai-sdk/provider-utils": ">=4.0.0" } }, "sha512-oWEZ06rDO6JjB7INHO882wyBAQqCZVHiDHwCs5M+VPmdDj8TzhGXcYesA2CcV5RoI5lfHLKwGp5uKFB62VWpqw=="],
 
     "glob": ["glob@13.0.5", "", { "dependencies": { "minimatch": "^10.2.1", "minipass": "^7.1.2", "path-scurry": "^2.0.0" } }, "sha512-BzXxZg24Ibra1pbQ/zE7Kys4Ua1ks7Bn6pKLkVPZ9FZe4JQS6/Q7ef3LG1H+k7lUf5l4T3PLSyYyYJVYUvfgTw=="],
 
@@ -4855,7 +4859,7 @@
 
     "markdown-table": ["markdown-table@3.0.4", "", {}, "sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw=="],
 
-    "marked": ["marked@17.0.6", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-gB0gkNafnonOw0obSTEGZTT86IuhILt2Wfx0mWH/1Au83kybTayroZ/V6nS25mN7u8ASy+5fMhgB3XPNrOZdmA=="],
+    "marked": ["marked@17.0.1", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-boeBdiS0ghpWcSwoNm/jJBwdpFaMnZWRzjA6SkUMYb40SVaN1x7mmfGKp0jvexGcx+7y2La5zRZsYFZI6Qpypg=="],
 
     "marked-katex-extension": ["marked-katex-extension@5.1.6", "", { "peerDependencies": { "katex": ">=0.16 <0.17", "marked": ">=4 <18" } }, "sha512-vYpLXwmlIDKILIhJtiRTgdyZRn5sEYdFBuTmbpjD7lbCIzg0/DWyK3HXIntN3Tp8zV6hvOUgpZNLWRCgWVc24A=="],
 
@@ -6341,11 +6345,7 @@
 
     "@ai-sdk/anthropic/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="],
 
-    "@ai-sdk/azure/@ai-sdk/openai": ["@ai-sdk/openai@3.0.84", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.38" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-cmgbeJL0bbY0yTJH4/AdmP5E7MjWRL9G8UdhIi0JlV/So03o82ORJofW8OzwCZPTORVQblFbpZXYGDcUd9NdUQ=="],
-
-    "@ai-sdk/azure/@ai-sdk/provider": ["@ai-sdk/provider@3.0.14", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-5X1k57JBJ4H7H1QjX7CnJYAB1I19r/trVZTMcSms7/kLNZ8RaU4Nt2agcwZzv82Hfx6Q7/TOLU7agAKeFfc8cA=="],
-
-    "@ai-sdk/azure/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.38", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-/HHGmtKllqjg1OLc023v9w9kK3laW7Z6TzfZukYQWCsGBbzB9p60zTvvpXFVcs44NZBVXL3viOa1HRKUbeee8g=="],
+    "@ai-sdk/azure/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.21", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw=="],
 
     "@ai-sdk/cerebras/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.21", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw=="],
 
@@ -6357,9 +6357,9 @@
 
     "@ai-sdk/deepinfra/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.21", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw=="],
 
-    "@ai-sdk/deepseek/@ai-sdk/provider": ["@ai-sdk/provider@3.0.14", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-5X1k57JBJ4H7H1QjX7CnJYAB1I19r/trVZTMcSms7/kLNZ8RaU4Nt2agcwZzv82Hfx6Q7/TOLU7agAKeFfc8cA=="],
+    "@ai-sdk/deepseek/@ai-sdk/provider": ["@ai-sdk/provider@3.0.10", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-Q3BZ27qfpYqnCYGvE3vt+Qi6LGOF9R5Nmzn+9JoM1lCRsD9mYaIhfJLkSunN48nfGXJ6n+XNV0J/XVpqGQl7Dw=="],
 
-    "@ai-sdk/deepseek/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.38", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-/HHGmtKllqjg1OLc023v9w9kK3laW7Z6TzfZukYQWCsGBbzB9p60zTvvpXFVcs44NZBVXL3viOa1HRKUbeee8g=="],
+    "@ai-sdk/deepseek/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="],
 
     "@ai-sdk/elevenlabs/@ai-sdk/provider": ["@ai-sdk/provider@3.0.10", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-Q3BZ27qfpYqnCYGvE3vt+Qi6LGOF9R5Nmzn+9JoM1lCRsD9mYaIhfJLkSunN48nfGXJ6n+XNV0J/XVpqGQl7Dw=="],
 
@@ -6849,7 +6849,7 @@
 
     "@opencode-ai/console-mail/@types/react": ["@types/react@18.0.25", "", { "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", "csstype": "^3.0.2" } }, "sha512-xD6c0KDT4m7n9uD4ZHi02lzskaiqcBxf4zi+tXZY98a04wvc0hi/TcCPC2FOESZi51Nd7tlUeOJY8RofL799/g=="],
 
-    "@opencode-ai/core/@ai-sdk/openai": ["@ai-sdk/openai@3.0.84", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.38" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-cmgbeJL0bbY0yTJH4/AdmP5E7MjWRL9G8UdhIi0JlV/So03o82ORJofW8OzwCZPTORVQblFbpZXYGDcUd9NdUQ=="],
+    "@opencode-ai/core/@ai-sdk/openai": ["@ai-sdk/openai@3.0.53", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-Wld+Rbc05KaUn08uBt06eEuwcgalcIFtIl32Yp+GxuZXUQwOb6YeAuq+C6da4ch6BurFoqEaLemJVwjBb7x+PQ=="],
 
     "@opencode-ai/core/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.41", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-kNAGINk71AlOXx10Dq/PXw4t/9XjdK8uxfpVElRwtSFMdeSiLVt58p9TPx4/FJD+hxZuVhvxYj9r42osxWq79g=="],
 
@@ -6889,8 +6889,6 @@
 
     "@opentui/core/diff": ["diff@9.0.0", "", {}, "sha512-svtcdpS8CgJyqAjEQIXdb3OjhFVVYjzGAPO8WGCmRbrml64SPw/jJD4GoE98aR7r25A0XcgrK3F02yw9R/vhQw=="],
 
-    "@opentui/core/marked": ["marked@17.0.1", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-boeBdiS0ghpWcSwoNm/jJBwdpFaMnZWRzjA6SkUMYb40SVaN1x7mmfGKp0jvexGcx+7y2La5zRZsYFZI6Qpypg=="],
-
     "@opentui/solid/@babel/core": ["@babel/core@7.28.0", "", { "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.0", "@babel/helper-compilation-targets": "^7.27.2", "@babel/helper-module-transforms": "^7.27.3", "@babel/helpers": "^7.27.6", "@babel/parser": "^7.28.0", "@babel/template": "^7.27.2", "@babel/traverse": "^7.28.0", "@babel/types": "^7.28.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.3", "semver": "^6.3.1" } }, "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ=="],
 
     "@oslojs/jwt/@oslojs/encoding": ["@oslojs/encoding@0.4.1", "", {}, "sha512-hkjo6MuIK/kQR5CrGNdAPZhS01ZCXuWDRJ187zh6qqF2+yMHZpD9fAYpX8q2bOO6Ryhl3XpCT6kUX76N8hhm4Q=="],
@@ -7237,10 +7235,6 @@
 
     "ai-gateway-provider/@ai-sdk/anthropic": ["@ai-sdk/anthropic@3.0.78", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-0OY12G20cUt6iU6htpEA1491Oz++NVxZxlmWGX4B7rSbeZ5pnDmOu6YtW9BKzdZlNx5Gn23i6WMxyZFoMKNcgA=="],
 
-    "ai-gateway-provider/@ai-sdk/azure": ["@ai-sdk/azure@3.0.49", "", { "dependencies": { "@ai-sdk/openai": "3.0.48", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-wskgAL+OmrHG7by/iWIxEBQCEdc1mDudha/UZav46i0auzdFfsDB/k2rXZaC4/3nWSgMZkxr0W3ncyouEGX/eg=="],
-
-    "ai-gateway-provider/@ai-sdk/deepseek": ["@ai-sdk/deepseek@2.0.35", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-9DhYurbAvcurOEGN6u2myYDybrrzGfcrkG8hwmFjwTrePW6KCMggm0YxP7e8RkLYcQKqCEMgFlyEB4BM6EmiKg=="],
-
     "ai-gateway-provider/@ai-sdk/openai": ["@ai-sdk/openai@3.0.53", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-Wld+Rbc05KaUn08uBt06eEuwcgalcIFtIl32Yp+GxuZXUQwOb6YeAuq+C6da4ch6BurFoqEaLemJVwjBb7x+PQ=="],
 
     "ai-gateway-provider/@ai-sdk/xai": ["@ai-sdk/xai@3.0.82", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.41", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-A0VFMufnVf4wODcT3SPQUUzvYXiIO1VhFuXj9r6z/vP4rlo+QRDPw3WSTchcz93ROQWSfBE3I6Szqz342OHi5w=="],
@@ -7545,7 +7539,7 @@
 
     "opencode/@ai-sdk/cerebras": ["@ai-sdk/cerebras@2.0.60", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.54", "@ai-sdk/provider": "3.0.12", "@ai-sdk/provider-utils": "4.0.33" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-Rnok3cThg6awBwaDSyiZpgRpbV7pqxGYrA89LODCo5cuEHeP2h0AM0lLHP7zIkclAdXfOm4wldKi/S2T/DGCOw=="],
 
-    "opencode/@ai-sdk/openai": ["@ai-sdk/openai@3.0.84", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.38" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-cmgbeJL0bbY0yTJH4/AdmP5E7MjWRL9G8UdhIi0JlV/So03o82ORJofW8OzwCZPTORVQblFbpZXYGDcUd9NdUQ=="],
+    "opencode/@ai-sdk/openai": ["@ai-sdk/openai@3.0.53", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-Wld+Rbc05KaUn08uBt06eEuwcgalcIFtIl32Yp+GxuZXUQwOb6YeAuq+C6da4ch6BurFoqEaLemJVwjBb7x+PQ=="],
 
     "opencode/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.41", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-kNAGINk71AlOXx10Dq/PXw4t/9XjdK8uxfpVElRwtSFMdeSiLVt58p9TPx4/FJD+hxZuVhvxYj9r42osxWq79g=="],
 
@@ -8237,10 +8231,6 @@
 
     "@octokit/rest/@octokit/core/before-after-hook": ["before-after-hook@4.0.0", "", {}, "sha512-q6tR3RPqIB1pMiTRMFcZwuG5T8vwp+vUvEG0vuI6B+Rikh5BfPp2fQ82c925FOs+b0lcFQ8CFrL+KbilfZFhOQ=="],
 
-    "@opencode-ai/core/@ai-sdk/openai/@ai-sdk/provider": ["@ai-sdk/provider@3.0.14", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-5X1k57JBJ4H7H1QjX7CnJYAB1I19r/trVZTMcSms7/kLNZ8RaU4Nt2agcwZzv82Hfx6Q7/TOLU7agAKeFfc8cA=="],
-
-    "@opencode-ai/core/@ai-sdk/openai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.38", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-/HHGmtKllqjg1OLc023v9w9kK3laW7Z6TzfZukYQWCsGBbzB9p60zTvvpXFVcs44NZBVXL3viOa1HRKUbeee8g=="],
-
     "@opencode-ai/desktop/@actions/artifact/@actions/http-client": ["@actions/http-client@2.2.3", "", { "dependencies": { "tunnel": "^0.0.6", "undici": "^5.25.4" } }, "sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA=="],
 
     "@opencode-ai/web/@shikijs/transformers/@shikijs/core": ["@shikijs/core@3.20.0", "", { "dependencies": { "@shikijs/types": "3.20.0", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4", "hast-util-to-html": "^9.0.5" } }, "sha512-f2ED7HYV4JEk827mtMDwe/yQ25pRiXZmtHjWF8uzZKuKiEsJR7Ce1nuQ+HhV9FzDcbIo4ObBCD9GPTzNuy9S1g=="],
@@ -8485,14 +8475,6 @@
 
     "ai-gateway-provider/@ai-sdk/anthropic/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="],
 
-    "ai-gateway-provider/@ai-sdk/azure/@ai-sdk/openai": ["@ai-sdk/openai@3.0.48", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ALmj/53EXpcRqMbGpPJPP4UOSWw0q4VGpnDo7YctvsynjkrKDmoneDG/1a7VQnSPYHnJp6tTRMf5ZdxZ5whulg=="],
-
-    "ai-gateway-provider/@ai-sdk/azure/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.21", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw=="],
-
-    "ai-gateway-provider/@ai-sdk/deepseek/@ai-sdk/provider": ["@ai-sdk/provider@3.0.10", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-Q3BZ27qfpYqnCYGvE3vt+Qi6LGOF9R5Nmzn+9JoM1lCRsD9mYaIhfJLkSunN48nfGXJ6n+XNV0J/XVpqGQl7Dw=="],
-
-    "ai-gateway-provider/@ai-sdk/deepseek/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="],
-
     "ai-gateway-provider/@ai-sdk/xai/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.41", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-kNAGINk71AlOXx10Dq/PXw4t/9XjdK8uxfpVElRwtSFMdeSiLVt58p9TPx4/FJD+hxZuVhvxYj9r42osxWq79g=="],
 
     "ajv-keywords/ajv/json-schema-traverse": ["json-schema-traverse@0.4.1", "", {}, "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="],
@@ -8805,10 +8787,6 @@
 
     "opencode/@ai-sdk/cerebras/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.33", "", { "dependencies": { "@ai-sdk/provider": "3.0.12", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-nJ0bAfegMAIJtrzMJtbzer1cS3nb7c7DsyU1S4nrPm7ZU0Mn6SBBZv5IGZZGTbpWTJwqKTSPeZJTXalbAxt1BA=="],
 
-    "opencode/@ai-sdk/openai/@ai-sdk/provider": ["@ai-sdk/provider@3.0.14", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-5X1k57JBJ4H7H1QjX7CnJYAB1I19r/trVZTMcSms7/kLNZ8RaU4Nt2agcwZzv82Hfx6Q7/TOLU7agAKeFfc8cA=="],
-
-    "opencode/@ai-sdk/openai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.38", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-/HHGmtKllqjg1OLc023v9w9kK3laW7Z6TzfZukYQWCsGBbzB9p60zTvvpXFVcs44NZBVXL3viOa1HRKUbeee8g=="],
-
     "p-locate/p-limit/yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="],
 
     "pkg-dir/find-up/locate-path": ["locate-path@5.0.0", "", { "dependencies": { "p-locate": "^4.1.0" } }, "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="],
@@ -9143,8 +9121,6 @@
 
     "@octokit/rest/@octokit/core/@octokit/types/@octokit/openapi-types": ["@octokit/openapi-types@27.0.0", "", {}, "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA=="],
 
-    "@opencode-ai/core/@ai-sdk/openai/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
-
     "@opencode-ai/desktop/@actions/artifact/@actions/http-client/undici": ["undici@5.29.0", "", { "dependencies": { "@fastify/busboy": "^2.0.0" } }, "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg=="],
 
     "@opencode-ai/www/@cloudflare/vite-plugin/@cloudflare/unenv-preset/workerd": ["workerd@1.20260708.1", "", { "optionalDependencies": { "@cloudflare/workerd-darwin-64": "1.20260708.1", "@cloudflare/workerd-darwin-arm64": "1.20260708.1", "@cloudflare/workerd-linux-64": "1.20260708.1", "@cloudflare/workerd-linux-arm64": "1.20260708.1", "@cloudflare/workerd-windows-64": "1.20260708.1" }, "bin": { "workerd": "bin/workerd" } }, "sha512-WAK+Kt/VVCSldH2qSr8lx46XCJ4Q+bdlHNaFqUtOHthBEIB8C1N8HVW+VOLrxDoTCk0NGNv0zajnBeQK4JOB9w=="],
@@ -9331,10 +9307,6 @@
 
     "ai-gateway-provider/@ai-sdk/anthropic/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
 
-    "ai-gateway-provider/@ai-sdk/azure/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
-
-    "ai-gateway-provider/@ai-sdk/deepseek/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
-
     "ansi-align/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
 
     "app-builder-lib/@electron/get/fs-extra/universalify": ["universalify@0.1.2", "", {}, "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="],
@@ -9435,8 +9407,6 @@
 
     "opencode/@ai-sdk/cerebras/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
 
-    "opencode/@ai-sdk/openai/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
-
     "pkg-dir/find-up/locate-path/p-locate": ["p-locate@4.1.0", "", { "dependencies": { "p-limit": "^2.2.0" } }, "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="],
 
     "pkg-up/find-up/locate-path/p-locate": ["p-locate@3.0.0", "", { "dependencies": { "p-limit": "^2.0.0" } }, "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="],

docs/design/service-lifecycle.md

@@ -1,623 +0,0 @@
-# Service Lifecycle: Election, Restart, and Reconnect
-
-Status: in progress
-
-Incident: [#36688](https://github.com/anomalyco/opencode/issues/36688)
-
-## Summary
-
-The managed V2 service keeps its current update policy: the background updater
-may install a new package, but only a freshly launched TUI activates that update
-after finding an older running service. Existing TUIs never replace a service;
-they only reconnect.
-
-The restart path changes in three places:
-
-1. A process-held OS lock, not the HTTP port or registration file, elects
-   exactly one server owner for its lifetime.
-2. The elected process binds and registers a minimal lifecycle surface before
-   it initializes the application, so clients can distinguish a slow winner
-   from an absent server.
-3. TUIs rediscover and reconnect indefinitely. Transport loss is never a
-   terminal error by itself.
-
-Several clients may spawn small contenders during a restart. This is safe and
-intentional: one contender acquires the lock and initializes, while every loser
-exits before expensive server boot. The design does not require clients to
-agree on a single initiator.
-
-This proposal does not introduce a supervisor process, warm candidate server,
-protocol negotiation, idle background restart, or general execution-recovery
-framework.
-
-## Implementation Status
-
-| Area                      | State                                                                 |
-| ------------------------- | --------------------------------------------------------------------- |
-| Lifetime ownership        | Implemented on this branch with a scoped OS lock                      |
-| Contender behavior        | Implemented; losers exit before the server module is imported         |
-| Registration repair       | Implemented; the owner reasserts deleted or corrupt discovery         |
-| Channel isolation         | Implemented with no-clobber migration for legacy preview discovery    |
-| Client startup waiting    | Implemented; slow winners are not killed and waiting is indefinite    |
-| Lifecycle shell           | Implemented; the owner binds and registers before application boot    |
-| Failed-state latching     | Implemented; deterministic boot failure stays bound and actionable    |
-| Recovery diagnostics      | Implemented; the TUI shows status instead of transport internals      |
-| Cross-platform validation | macOS runtime verified; Linux and Windows run in the unit-test matrix |
-
-## Context
-
-The V2 CLI runs a shared managed service that owns Sessions, location graphs,
-plugins, permissions, and tool execution. The service updater can replace the
-installed package while the current process continues running the old image.
-A later TUI launch then detects the version mismatch and replaces the service.
-
-Incident #36688 showed four failures in that replacement path:
-
-- Multiple TUIs spawned heavyweight server contenders.
-- A winner remained unobservable while it cold-booted, so another wave treated
-  it as absent and displaced it.
-- A fresh TUI exhausted its reconnect budget and crashed with an unhandled
-  transport defect.
-- A losing contender remained alive and consumed about 1 GB of RSS.
-
-The `origin/v2` baseline serializes service startup with `EffectFlock`. A
-contender acquires a three-second heartbeat lease, checks whether another
-service became discoverable, and only the winner crosses the application-boot
-boundary. This already prevents simultaneous heavy boots and makes startup
-losers exit.
-
-The lease is released immediately after registration, however, so it is not
-lifetime ownership. Registration then reverts to last-writer-wins authority: a
-deleted or corrupt registration can admit a second boot, a displaced server
-terminates itself through its 10-second registration self-check, and a stalled
-lease holder can be displaced after the three-second service staleness timeout.
-
-`Flock` and `EffectFlock` live in `packages/core/src/util` and are also used for
-config writes, MCP auth, npm installs, and repository caching. Despite the
-name, the primitive is an atomic-mkdir lease with heartbeat and staleness
-takeover, not an OS-held lock. It remains appropriate for bounded critical
-sections, including today's startup fence, but is not lifetime service
-ownership.
-
-The current implementation also mixes three different concepts:
-
-- **Ownership:** which process is allowed to be the managed server.
-- **Discovery:** where clients can reach that process.
-- **Lifecycle:** whether that process is starting, ready, stopping, or failed.
-
-This design gives each concept one authority.
-
-```definitions
-[
-  {
-    "term": "Owner",
-    "definition": "The one process holding the process-held OS service lock."
-  },
-  {
-    "term": "Contender",
-    "definition": "A small serve process attempting to acquire the service lock. It must not initialize the application before winning."
-  },
-  {
-    "term": "Registration",
-    "definition": "An atomic discovery record containing the elected owner's identity and endpoint. Registration never grants ownership."
-  },
-  {
-    "term": "Lifecycle shell",
-    "definition": "The minimal HTTP surface bound by the elected process before application initialization. It serves health and retryable startup responses."
-  },
-  {
-    "term": "Application",
-    "definition": "The full server routes and global or location-scoped modules used for normal OpenCode work."
-  }
-]
-```
-
-## Goals
-
-- At most one process initializes and serves the managed application.
-- Losing contenders exit before database, route, plugin, MCP, or location boot.
-- A slow winner becomes observable before expensive initialization.
-- Existing and freshly launched TUIs survive retryable service unavailability.
-- Reconnect follows service state instead of displaying retry counts or raw
-  transport failures.
-- Version-mismatch replacement remains triggered by a fresh TUI launch.
-- A stale or malformed registration cannot create a second owner.
-- An unresponsive owner is never killed automatically by an arbitrary TUI.
-- Every spawned contender has a bounded path to ownership or exit.
-
-## Non-goals
-
-- Restarting automatically when a background update finds an idle window.
-- Running old and candidate application servers concurrently.
-- Adding a permanent steward, proxy, or supervisor process.
-- Zero-downtime worker handoff or automatic rollback.
-- Application protocol negotiation or automatic TUI self-restart.
-- General hard-crash recovery for active Sessions.
-- Defining recovery semantics for provider attempts, tools, shells, sub-agents,
-  permissions, questions, or background jobs.
-- Automatically killing a frozen owner.
-- Bounding concurrent location cold boots after clients reconnect.
-- Multi-machine or clustered service placement.
-
-## Invariants
-
-1. **The service lock is ownership.** Exactly one process may hold the OS lock
-   for one installation channel and service profile.
-2. **Ownership precedes boot.** A contender performs no expensive application
-   initialization before it acquires the lock.
-3. **Ownership lasts for the process lifetime.** The owner holds an open lock
-   handle until the managed server exits. The OS releases it on process death
-   without a cleanup callback.
-4. **The port is transport, not election.** The owner may select a dynamic port
-   after acquiring the lock.
-5. **Registration is discovery, not election.** Deleting, corrupting, or
-   replacing registration does not invalidate a live owner's lock.
-6. **Only a fresh launch enforces package version.** Existing TUIs reconnect to
-   the current owner without initiating version replacement.
-7. **Transport loss is retryable.** It never terminates a TUI without a separate
-   diagnosed, non-retryable cause.
-8. **Clients do not kill an unresponsive owner automatically.** Destructive
-   recovery requires the explicit `service restart` command.
-9. **Lifecycle does not promise execution semantics.** Graceful replacement
-   invokes Session suspension and resumption hooks, but tool-level continuity
-   belongs to a separate design.
-
-## System Model
-
-```mermaid
-flowchart LR
-  TUI[Fresh or existing TUI]
-  REG[Registration file]
-  LOCK[Process-held OS service lock]
-  SHELL[Lifecycle shell]
-  APP[OpenCode application]
-
-  TUI -->|discover| REG
-  TUI -->|observe| SHELL
-  TUI -->|normal requests| APP
-  SHELL --> APP
-  LOCK -->|authorizes one owner| SHELL
-```
-
-The lifecycle shell and application run in the same process. The distinction is
-initialization order and responsibility, not process topology.
-
-## Service Status
-
-The server reports one small status value:
-
-```typescript
-type ServiceStatus =
-  | {
-      type: "starting"
-    }
-  | {
-      type: "ready"
-    }
-  | {
-      type: "stopping"
-      targetVersion?: string
-    }
-  | {
-      type: "failed"
-      message: string
-      action: string
-    }
-```
-
-The client adds only the discovery states needed by callers:
-
-```typescript
-type Status = { type: "missing" } | { type: "unreachable" } | { type: "unresponsive" } | ServiceStatus
-```
-
-The health response retains the existing fields for old clients and adds the
-status discriminant:
-
-```typescript
-type ServiceHealth = {
-  healthy: true
-  version: string
-  pid: number
-  instanceID: string
-  status: ServiceStatus
-}
-```
-
-`healthy: true` means the registered lifecycle shell is responding and its
-identity matches registration. New clients use `status.type === "ready"` as
-the application-readiness signal.
-
-During `starting` or `stopping`, application requests are not held in memory.
-They receive an immediate retryable response:
-
-```http
-HTTP/1.1 503 Service Unavailable
-Retry-After: 1
-Content-Type: application/json
-
-```
-
-`stopping` uses `service_stopping`. A failed application boot uses
-`service_failed` and includes a safe diagnostic message.
-
-A failed owner remains bound and keeps holding the service lock. Exiting on
-failure would let every waiting client's `ensureRunning` loop elect a new
-contender that repeats the same heavy failing boot, so staying bound turns a
-deterministic boot failure into one observable `failed` state instead of a
-client-driven respawn loop. Recovery still works: a fresh launch observes the
-failed instance through the stop path, and explicit `service restart` replaces
-it.
-
-## Registration Contract
-
-Registration contains only discovery identity:
-
-```typescript
-type ServiceRegistration = {
-  schema: 1
-  instanceID: string
-  version: string
-  url: string
-  pid: number
-}
-```
-
-Authentication continues to use the existing private service credential
-storage. The registration schema does not change that policy.
-
-The owner writes registration only after the lifecycle shell has bound:
-
-1. Bind the lifecycle shell.
-2. Write a temporary registration file with mode `0600`.
-3. Atomically rename it over the old registration.
-4. Serve lifecycle health as `starting`.
-
-On shutdown, the owner removes registration only if the current file still has
-its `instanceID`. An old finalizer can never remove a successor's registration.
-
-While running, the owner periodically asserts its registration. Because the
-lock guarantees exactly one live owner, any registration that does not name the
-owner is stale or corrupt, and the owner rewrites it. A deleted or clobbered
-registration therefore heals within one assertion interval instead of leaving
-clients waiting on absent discovery. This inverts today's self-check loop,
-which terminates the displaced process instead of repairing discovery.
-
-Legacy registration shapes are decoded by a compatibility adapter. The new
-domain type does not make fields optional to represent old formats.
-
-## Election
-
-This design promotes today's startup fence into lifetime ownership.
-Last-writer-wins registration is replaced by a process-held OS lock that is
-acquired before any expensive boot work and held for the entire service
-lifetime.
-
-A heartbeat-and-staleness lease, including the existing `Flock` utility, is not
-sufficient for service ownership: the service configures a three-second stale
-timeout, after which its lock can be broken and recreated. An event-loop stall,
-a suspended machine, or a debugger pause can therefore make a live owner appear
-stale and allow a contender to displace it. Service ownership requires a
-process-held OS lock: `flock` on Unix and an exclusively bound named pipe on
-Windows. It cannot be broken because a heartbeat exceeded a timeout. Process
-death releases the lock through the OS.
-
-Neither Bun nor Node exposes `flock` directly, the existing `Flock` utility is
-an mkdir-plus-heartbeat lease rather than an OS-held lock, and the common
-lockfile packages are staleness-based leases as well. The platform layer uses
-`bun:ffi` to call `flock` on POSIX and Node's named-pipe server support on
-Windows, where Bun FFI is not available on every shipped architecture. It lives
-alongside the existing utility in `packages/core/src/util`. This primitive is
-the foundation of the design, so the delivery sequence spikes it first.
-
-```mermaid
-flowchart TD
-  A[Contender process starts]
-  B{Acquire service lock?}
-  C[Exit successfully]
-  D[Bind lifecycle shell]
-  E[Write registration]
-  F[Report starting]
-  G[Initialize application]
-  H[Report ready]
-  I[Serve until shutdown]
-
-  A --> B
-  B -->|No| C
-  B -->|Yes| D
-  D --> E --> F --> G
-  G -->|Success| H --> I
-  G -->|Failure| J[Report failed and stay bound]
-```
-
-Lock acquisition by a contender is nonblocking or tightly bounded. A loser
-must exit before constructing application routes or importing startup-heavy
-modules.
-
-Several clients may spawn contenders concurrently. The design guarantees one
-heavy winner, not one process spawn. If the winner crashes during startup, the
-OS releases the lock and a later client retry starts another election.
-
-The lock is scoped by installation channel and service profile. Local, preview,
-and stable installations cannot displace one another.
-
-## Update Activation
-
-Background update behavior remains unchanged:
-
-1. The running service checks for an update.
-2. The updater installs the package in the background.
-3. The running process continues using its existing process image.
-4. No idle check or automatic restart occurs.
-
-A fresh TUI launch activates the installed update:
-
-1. Read registration and authenticate the responding service.
-2. If its package version matches the fresh client, attach normally.
-3. If the version differs, request graceful stop of that exact registered
-   instance using the existing authenticated stop path.
-4. Re-check instance identity before every signal or escalation in that path.
-5. Wait for the old process to exit and release the service lock.
-6. Call `ensureRunning` until a compatible service becomes ready.
-
-Concurrent fresh launchers may all observe the same old instance. Stopping that
-exact instance must be idempotent. Once registration names a different instance,
-a stale launcher stops signaling and returns to discovery.
-
-No durable restart-transition record is introduced. The initiating fresh TUI
-already knows the source and target versions and can display its update
-preflight. Existing TUIs may display `Updating...` if they observed `stopping`;
-otherwise `Waiting for background service...` is the honest fallback.
-
-## Fresh Launch Versus Reconnect
-
-Fresh launch and reconnect deliberately have different version policies:
-
-```typescript
-type ManagedConnection =
-  | {
-      type: "launch"
-      requiredVersion: string
-    }
-  | {
-      type: "reconnect"
-    }
-```
-
-- `launch` requires the installed package version and may activate replacement.
-- `reconnect` accepts the current owner and never activates replacement.
-
-This preserves today's permissive reconnect behavior. Explicit application
-protocol negotiation and automatic TUI re-exec remain follow-ups.
-
-## Client Reconnect
-
-Fresh and existing TUIs use the same status loop after startup:
-
-1. Read registration on every attempt. Do not retry a stale URL indefinitely.
-2. If registration is absent, call `ensureRunning` and continue waiting.
-3. If registration is unreachable, call `ensureRunning`. A live owner prevents
-   contenders from acquiring the lock; a dead owner does not.
-4. If status is `starting` or `stopping`, wait.
-5. If status is `failed`, show its actionable message.
-6. If status is `ready`, rebuild HTTP and event-stream clients for the new
-   endpoint and perform authoritative state reconciliation.
-
-Retry cadence is internal policy. Retry counts are telemetry, not user-facing
-state. The TUI waits until the service is ready or the user exits.
-
-Transport failures are handled at the TUI run boundary. A raw client transport
-error or Effect defect must not escape to the terminal. Hard exit is reserved
-for diagnosed causes such as invalid local configuration, failed authentication,
-or a foreign process occupying an explicitly configured port.
-
-The UI derives text from status:
-
-| Status                   | User-facing state                   |
-| ------------------------ | ----------------------------------- |
-| No registration          | `Starting background service...`    |
-| Registration unreachable | `Waiting for background service...` |
-| `starting`               | `Starting OpenCode vX...`           |
-| `stopping`               | `Updating to vX...`                 |
-| `failed`                 | Actionable failure message          |
-| `ready`                  | Normal TUI                          |
-
-## Graceful Session Continuity
-
-Version-mismatch replacement uses the existing graceful Session suspension and
-resumption hooks:
-
-1. The old server snapshots active Session IDs during graceful teardown.
-2. The successor schedules those Sessions for continuation.
-3. The runner reloads durable Session history before continuing.
-
-This lifecycle design does not define what an interrupted physical provider
-attempt or tool invocation means. It does not promise that external side effects
-did not occur, replay the exact interrupted tool, preserve an in-memory form, or
-recover process-local background work.
-
-Those concerns require a separate execution-continuity design covering tools,
-shells, sub-agents, permissions, questions, provider attempts, and hard-crash
-recovery.
-
-## Unresponsive Owner
-
-An unreachable registration does not prove that the owner is dead. A contender
-attempts the service lock:
-
-- If the lock is free, the contender starts a replacement.
-- If the lock is held, the contender exits and the client keeps waiting.
-
-After a bounded diagnostic threshold, the client may show:
-
-```text
-The background service owns the service lock but is not responding.
-Run `opencode service restart` to recover it.
-```
-
-Only explicit `service restart` may perform destructive recovery. It verifies
-the complete registration and process instance before signaling, waits for
-graceful exit, re-checks identity before escalation, and refuses to kill a
-process it cannot positively identify.
-
-Automatic frozen-owner recovery is deferred.
-
-## Failure Walkthroughs
-
-### Update with open TUIs
-
-1. The old service installs vNext but keeps running.
-2. A fresh vNext TUI finds the healthy vOld service and requests graceful stop.
-3. The old service reports `stopping`, suspends active Sessions, and exits.
-4. Open TUIs enter their indefinite status loops.
-5. One or more clients spawn contenders.
-6. One contender acquires the service lock. Losers exit before heavy boot.
-7. The winner binds and registers the lifecycle shell as `starting`.
-8. Clients stop spawning and wait on the observable winner.
-9. The winner initializes the application and reports `ready`.
-10. TUIs rebuild clients, reconcile state, and resume.
-
-### Server crashes while ready
-
-1. The endpoint becomes unreachable and registration may remain stale.
-2. Clients call `ensureRunning`.
-3. Process death has released the service lock.
-4. One contender wins, replaces registration, and starts normally.
-5. Detailed active-execution recovery is outside this design.
-
-### Winner crashes during startup
-
-1. Clients observed `starting` and remain alive.
-2. Process death releases the service lock.
-3. A later reconnect attempt starts another election.
-4. One new contender wins; all other contenders exit.
-
-### Registration is deleted while the owner is healthy
-
-1. Clients may call `ensureRunning` because discovery is absent.
-2. Every contender fails to acquire the owner's lock and exits.
-3. No second application initializes.
-4. The owner's next registration assertion republishes discovery.
-
-### Owner is alive but unresponsive
-
-1. Health fails, but the process still holds the service lock.
-2. Contenders fail lock acquisition and exit.
-3. Clients wait and eventually show explicit recovery guidance.
-4. No TUI kills the owner automatically.
-
-## TDD Verification
-
-Implementation should proceed test-first with real subprocesses and real locks.
-Mocks cannot establish process death, lock release, loser cleanup, or port
-behavior.
-
-### Election tests
-
-| Scenario                                              | Required result                                         |
-| ----------------------------------------------------- | ------------------------------------------------------- |
-| Ten contenders start simultaneously                   | Exactly one crosses the application-boot boundary       |
-| Winner pauses after lock acquisition                  | No loser initializes or remains alive                   |
-| Winner event loop pauses beyond the old stale timeout | Ownership is not displaced                              |
-| Winner crashes before bind                            | Lock releases; a later attempt wins                     |
-| Winner crashes after bind but before registration     | Lock releases; a later attempt replaces stale discovery |
-| Registration is deleted while owner runs              | No second owner initializes                             |
-| Registration is malformed                             | Lock still prevents a second owner                      |
-| Registration names a dead PID                         | New contender can acquire the released lock             |
-| Two installation channels start                       | Each elects an independent owner                        |
-| Explicit configured port is foreign-owned             | Fail diagnostically; do not kill the foreign process    |
-
-The fixture records a marker immediately before application initialization. The
-tests assert that only one process writes that marker and that every loser exits
-within a bounded interval. The harness should also assert that a loser's peak
-RSS stays an order of magnitude below an application boot, since import weight
-was the observed incident cost.
-
-### Lifecycle tests
-
-| Scenario                                        | Required result                                                  |
-| ----------------------------------------------- | ---------------------------------------------------------------- |
-| Winner owns lock but application boot is paused | Health reports `starting`                                        |
-| Application request arrives during startup      | Immediate retryable `503`                                        |
-| Application becomes ready                       | Status changes once from `starting` to `ready`                   |
-| Graceful replacement begins                     | Status reports `stopping` before disconnect                      |
-| Application initialization fails                | Actionable `failed` status; owner stays bound and holds the lock |
-| Registration is deleted while owner runs        | Owner republishes it within one assertion interval               |
-| Owner exits                                     | Registration is removed only if it still names that owner        |
-
-### Update tests
-
-| Scenario                               | Required result                                          |
-| -------------------------------------- | -------------------------------------------------------- |
-| Background update installs vNext       | Running vOld service does not restart                    |
-| Fresh vNext launch finds vOld          | Exact old instance stops; vNext eventually becomes ready |
-| Two fresh vNext launches race          | One heavy successor; both clients attach                 |
-| Existing vOld TUI reconnects to vNext  | It never requests replacement                            |
-| Stale launcher observes a new instance | It does not signal the new instance                      |
-
-### Reconnect tests
-
-| Scenario                                            | Required result                                    |
-| --------------------------------------------------- | -------------------------------------------------- |
-| Endpoint disappears and changes port                | TUI rediscovers and rebuilds clients               |
-| Service remains unavailable beyond old retry budget | TUI remains alive                                  |
-| Event stream reconnects                             | Client performs authoritative state reconciliation |
-| Transport returns an unexpected defect              | TUI formats it; no raw stack escapes               |
-| Owner remains unresponsive                          | TUI waits and shows explicit restart guidance      |
-
-## Delivery Sequence
-
-1. **Spike the lock primitive.** Prove a nonblocking, process-held OS lock
-   under Bun on macOS, Linux, and Windows (`bun:ffi` to `flock` on POSIX and a
-   named pipe on Windows), including release on hard kill and behavior across
-   containers and network filesystems used in CI.
-2. **Expand the subprocess test harness.** Begin from the baseline
-   two-contender test and cover ten contenders, lock release on crash, a paused
-   winner, deleted or corrupt registration, and bounded loser exit before
-   changing ownership.
-3. **Contain client failure.** Make transport loss nonterminal, rediscover on
-   every cycle, and format unexpected failures at the TUI boundary.
-4. **Promote the startup fence to process-held ownership.** Preserve the
-   existing pre-boot acquisition seam, replace its lease with the OS lock, hold
-   it until process exit, and invert the registration self-check from
-   self-termination to reassertion.
-5. **Bind the lifecycle shell first.** Publish registration and `starting`,
-   return retryable `503` for application requests, then initialize the app.
-   The health contract change is public API: regenerate clients from
-   `packages/client` with `bun run generate`.
-6. **Codify launch versus reconnect.** Fresh launch enforces installed version;
-   reconnect never activates replacement.
-7. **Integrate graceful replacement.** Preserve current background-install and
-   fresh-launch activation behavior while invoking Session continuity hooks.
-8. **Harden explicit recovery.** Verify exact process identity during explicit
-   `service restart`; never automatically kill an unresponsive owner.
-9. **Run the full multi-process suite.** Include repeated restart cycles and
-   assert that no contender or child process remains afterward.
-
-## Acceptance Criteria
-
-- Ten concurrent restart observers produce one application initialization.
-- No losing contender survives or builds a location graph.
-- A 30-second application boot remains continuously observable as `starting`.
-- A TUI remains alive through a service outage longer than the previous retry
-  budget.
-- A service endpoint change does not require restarting an existing TUI.
-- Background installation alone does not restart the service.
-- A fresh mismatched TUI eventually attaches to the installed service version.
-- Existing reconnecting TUIs never replace the current owner.
-- Registration corruption cannot produce two owners.
-- A deleted registration heals without restarting the owner or any client.
-- An unresponsive owner is not killed without an explicit recovery command.
-- Raw transport defects never escape to the terminal.
-
-## Follow-ups
-
-- Idle background update activation with an admission fence.
-- Application protocol compatibility and automatic local TUI re-exec.
-- Durable execution recovery for provider attempts and tools.
-- Shell, sub-agent, permission, question, and background-job continuity.
-- Automatic recovery for a positively identified frozen owner.
-- Cold-boot concurrency limits and interaction-prioritized location loading.
-- A steward or socket-handoff architecture if zero-downtime replacement becomes
-  a real requirement.
-  a real requirement.

nix/hashes.json

@@ -1,8 +1,8 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-F1luclnqCPQk9yxfmeSYGaM/nScf28yBu9K3Fv+Xd24=",
-    "aarch64-linux": "sha256-XW0XZnsCRkU3MFJH9TjMRYZHffzVy3cQyiNCkec2gl4=",
-    "aarch64-darwin": "sha256-bf8kvORs3Fs2UYLp3PekF+AJR7NKOcHb+fIQA79RtMk=",
-    "x86_64-darwin": "sha256-sBdQPkzd7JXNW6Lbi9JHiAsfHwdLwTKWY+uPeXAv2Nw="
+    "x86_64-linux": "sha256-JTtn+wXTXg+yklvIMDLcGFaYhTU6ZrCgKT9JTNEQ3gA=",
+    "aarch64-linux": "sha256-gXU6zyhvAZrZirkL/PlHdkHtEof/7PVSPCaE34Jnd4U=",
+    "aarch64-darwin": "sha256-Q0oTG3uzOlD/X2kJingLle529lKFoTpyCW2rHXOZ6iE=",
+    "x86_64-darwin": "sha256-LINvKHxPibTlJeNzfACQx0x+Yj5oROT6Du3I5AtqqXk="
   }
 }

package.json

@@ -49,7 +49,7 @@
       "@opentui/core": "0.4.3",
       "@opentui/keymap": "0.4.3",
       "@opentui/solid": "0.4.3",
-      "@tanstack/solid-virtual": "3.13.32",
+      "@tanstack/solid-virtual": "3.13.28",
       "@shikijs/stream": "4.2.0",
       "ulid": "3.0.1",
       "@kobalte/core": "0.13.11",
@@ -76,7 +76,7 @@
       "hono-openapi": "1.1.2",
       "fuzzysort": "3.1.0",
       "luxon": "3.6.1",
-      "marked": "17.0.6",
+      "marked": "17.0.1",
       "marked-shiki": "1.2.1",
       "remend": "1.3.0",
       "@playwright/test": "1.59.1",
@@ -161,9 +161,10 @@
     "gcp-metadata@8.1.2": "patches/gcp-metadata@8.1.2.patch",
     "pacote@21.5.0": "patches/pacote@21.5.0.patch",
     "@ai-sdk/google@3.0.73": "patches/@ai-sdk%2Fgoogle@3.0.73.patch",
+    "@tanstack/solid-virtual@3.13.28": "patches/@tanstack%2Fsolid-virtual@3.13.28.patch",
     "@pierre/trees@1.0.0-beta.4": "patches/@pierre%2Ftrees@1.0.0-beta.4.patch",
     "@modelcontextprotocol/sdk@1.29.0": "patches/@modelcontextprotocol%2Fsdk@1.29.0.patch",
-    "effect@4.0.0-beta.83": "patches/effect@4.0.0-beta.83.patch",
-    "@tanstack/virtual-core@3.17.3": "patches/@tanstack%2Fvirtual-core@3.17.3.patch"
+    "@tanstack/virtual-core@3.17.0": "patches/@tanstack%2Fvirtual-core@3.17.0.patch",
+    "effect@4.0.0-beta.83": "patches/effect@4.0.0-beta.83.patch"
   }
 }

packages/app/e2e/performance/timeline-stability/fixture.ts

@@ -136,9 +136,6 @@ export async function setupTimeline(
         },
       }),
     )
-    if (settings.newLayoutDesigns === false) {
-      localStorage.setItem("app-version.v1", JSON.stringify({ version: "1.17.20" }))
-    }
   }, input.settings ?? {})
   if (input.locale) {
     await page.addInitScript((locale) => {

packages/app/e2e/regression/file-browser-sidebar-tab-switch.spec.ts

@@ -1,150 +0,0 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
-import { expect, test, type Page } from "@playwright/test"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { expectSessionTitle } from "../utils/waits"
-
-const directory = "C:/OpenCode/FileBrowserSidebar"
-const projectID = "proj_file_browser_sidebar"
-const sessionID = "ses_file_browser_sidebar"
-const title = "File browser sidebar"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-const files = Array.from({ length: 80 }, (_, index) => `file-${String(index).padStart(2, "0")}.ts`)
-// Marks the file-browser sidebar DOM node so a remount (fresh node) is detectable.
-const PROBE = "original"
-
-test.use({ viewport: { width: 1440, height: 900 } })
-
-// The file-browser sidebar must stay mounted across preview/pinned file-tab
-// switches. Remounting resets scroll and filter state.
-test("keeps the file-browser sidebar mounted when switching file tabs", async ({ page }) => {
-  await setup(page)
-
-  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
-  await expectSessionTitle(page, title)
-
-  const panel = page.locator("#review-panel")
-  await panel.getByRole("button", { name: "Open file" }).click()
-  await expect(panel.getByRole("tab", { name: "Open file" })).toHaveAttribute("data-selected", "")
-
-  const sidebar = panel.locator('[data-component="session-review-v2-sidebar-root"]')
-  await expect(sidebar).toBeVisible()
-  await expect(panel.getByRole("button", { name: "file-00.ts" })).toBeVisible()
-
-  await panel.getByRole("button", { name: "file-00.ts" }).click()
-  await expect(panel.getByRole("tab", { name: "file-00.ts" })).toHaveAttribute("data-selected", "")
-  await expect(panel.getByText("contents:file-00.ts", { exact: true })).toBeVisible()
-
-  const viewport = panel.locator('[data-slot="session-review-v2-sidebar-tree"] .scroll-view__viewport')
-  await viewport.hover()
-  await page.mouse.wheel(0, 100_000)
-  await expect
-    .poll(() => viewport.evaluate((element) => element.scrollHeight - element.clientHeight - element.scrollTop))
-    .toBeLessThanOrEqual(1)
-  const scrolled = await viewport.evaluate((element) => element.scrollTop)
-  expect(scrolled).toBeGreaterThan(0)
-  await writeProbe(page)
-
-  await panel.getByRole("button", { name: "file-79.ts" }).click()
-  await expect(panel.getByRole("tab", { name: "file-79.ts" })).toHaveAttribute("data-selected", "")
-  await expect(panel.getByText("contents:file-79.ts", { exact: true })).toBeVisible()
-  expect(await readProbe(page)).toBe(PROBE)
-  await expect.poll(() => viewport.evaluate((element) => element.scrollTop)).toBe(scrolled)
-
-  await panel.getByRole("button", { name: "file-78.ts" }).dblclick()
-  await expect(panel.getByRole("tab", { name: "file-78.ts" })).toHaveAttribute("data-selected", "")
-  await panel.getByRole("button", { name: "file-79.ts" }).click()
-  await expect(panel.getByRole("tab", { name: "file-79.ts" })).toHaveAttribute("data-selected", "")
-  await panel.getByRole("tab", { name: "file-78.ts" }).click()
-  await expect(panel.getByRole("tab", { name: "file-78.ts" })).toHaveAttribute("data-selected", "")
-  expect(await readProbe(page)).toBe(PROBE)
-  await expect.poll(() => viewport.evaluate((element) => element.scrollTop)).toBe(scrolled)
-})
-
-type Probed = HTMLElement & { __e2eProbe?: string }
-
-async function writeProbe(page: Page) {
-  await page.locator('#review-panel [data-component="session-review-v2-sidebar-root"]').evaluate((el, probe) => {
-    ;(el as Probed).__e2eProbe = probe
-  }, PROBE)
-}
-
-async function readProbe(page: Page) {
-  return page
-    .locator('#review-panel [data-component="session-review-v2-sidebar-root"]')
-    .evaluate((el) => (el as Probed).__e2eProbe)
-}
-
-async function setup(page: Page) {
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: projectID,
-      worktree: directory,
-      vcs: "git",
-      name: "file-browser-sidebar",
-      time: { created: 1700000000000, updated: 1700000000000 },
-      sandboxes: [],
-    },
-    provider: {
-      all: [
-        {
-          id: "opencode",
-          name: "OpenCode",
-          models: { test: { id: "test", name: "Test", limit: { context: 200_000 } } },
-        },
-      ],
-      connected: ["opencode"],
-      default: { providerID: "opencode", modelID: "test" },
-    },
-    sessions: [
-      {
-        id: sessionID,
-        slug: sessionID,
-        projectID,
-        directory,
-        title,
-        version: "dev",
-        time: { created: 1700000000000, updated: 1700000000000 },
-      },
-    ],
-    vcsDiff: [],
-    fileList: (path) => {
-      if (path) return []
-      return files.map((name) => ({
-        name,
-        path: name,
-        absolute: `${directory}/${name}`,
-        type: "file" as const,
-        ignored: false,
-      }))
-    },
-    fileContent: (path) => ({ type: "text", content: `contents:${path}` }),
-    pageMessages: () => ({ items: [] }),
-  })
-
-  await page.addInitScript(
-    ({ directory, server, sessionID }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
-      localStorage.setItem(
-        "opencode.global.dat:server",
-        JSON.stringify({
-          projects: { local: [{ worktree: directory, expanded: true }] },
-          lastProject: { local: directory },
-        }),
-      )
-      localStorage.setItem(
-        "opencode.global.dat:layout",
-        JSON.stringify({ review: { diffStyle: "split", panelOpened: true } }),
-      )
-      localStorage.setItem(
-        "opencode.global.dat:review-panel-v2",
-        JSON.stringify({ sidebarOpened: true, sidebarWidth: 240, expandMode: "collapse" }),
-      )
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify([{ type: "session", server, sessionId: sessionID }]),
-      )
-    },
-    { directory, server, sessionID },
-  )
-}

packages/app/e2e/regression/legacy-new-session.spec.ts

@@ -24,7 +24,6 @@ test("redirects a draft to the legacy new-session route", async ({ page }) => {
   await page.addInitScript(
     ({ directory, draftID, server }) => {
       localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: false } }))
-      localStorage.setItem("app-version.v1", JSON.stringify({ version: "1.17.20" }))
       localStorage.setItem(
         "opencode.window.browser.dat:tabs",
         JSON.stringify([{ type: "draft", draftID, server, directory }]),

packages/app/e2e/regression/remote-session-settings.spec.ts

@@ -1,270 +0,0 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
-import { expect, test, type Page, type Route } from "@playwright/test"
-import { installSseTransport } from "../utils/sse-transport"
-
-const serverA = "http://127.0.0.1:4096"
-const serverB = "http://127.0.0.1:4097"
-const directoryA = "C:/server-a"
-const directoryB = "/home/server-b"
-const sessionA = session("ses_server_a", directoryA, "Server A session")
-const childSessionA = { ...session("ses_server_a_child", directoryA, "Server A child session"), parentID: sessionA.id }
-const sessionB = session("ses_server_b", directoryB, "Server B session")
-
-test("session settings use the remote server context", async ({ page }) => {
-  const permissionRequests: string[] = []
-  await mockServers(page, permissionRequests)
-  await configureServers(page)
-
-  await page.goto(`/server/${base64Encode(serverB)}/session/${sessionB.id}`)
-  await expect(page.getByText(sessionB.title).first()).toBeVisible()
-  await page.keyboard.press(process.platform === "darwin" ? "Meta+," : "Control+,")
-
-  const dialog = page.locator(".settings-v2-dialog")
-  const autoAccept = dialog.locator('[data-action="settings-auto-accept-permissions"]')
-  const input = autoAccept.getByRole("switch")
-  await expect(autoAccept).toBeVisible()
-  await expect(input).toBeEnabled()
-  permissionRequests.length = 0
-  await autoAccept.locator('[data-slot="switch-control"]').click()
-  await expect(input).toBeChecked()
-  await expect
-    .poll(() =>
-      permissionRequests.some((request) => {
-        const url = new URL(request)
-        return url.origin === serverB && url.searchParams.get("directory") === directoryB
-      }),
-    )
-    .toBe(true)
-  expect(permissionRequests.every((request) => new URL(request).origin === serverB)).toBe(true)
-
-  await dialog.getByRole("tab", { name: "Models" }).click()
-  await expect(dialog.getByRole("switch", { name: "Server B Model" })).toBeEnabled()
-  await expect(dialog.getByRole("switch", { name: "Server A Model" })).toHaveCount(0)
-})
-
-test("auto-accept responds for an unfocused server session", async ({ page }) => {
-  const permissionRequests: string[] = []
-  const permissionResponses: PermissionResponse[] = []
-  const transport = await installSseTransport<{ directory: string; payload: Record<string, unknown> }>(page, {
-    server: serverA,
-    retry: 20,
-  })
-  await mockServers(page, permissionRequests, permissionResponses)
-  await configureServers(page, [
-    { type: "session", server: serverA, sessionId: sessionA.id },
-    { type: "session", server: serverB, sessionId: sessionB.id },
-  ])
-
-  const hrefB = `/server/${base64Encode(serverB)}/session/${sessionB.id}`
-  await page.goto(`/server/${base64Encode(serverA)}/session/${sessionA.id}`)
-  await expect(page.getByText(sessionA.title).first()).toBeVisible()
-  await page.keyboard.press(process.platform === "darwin" ? "Meta+," : "Control+,")
-  const autoAccept = page.locator(".settings-v2-dialog").locator('[data-action="settings-auto-accept-permissions"]')
-  await autoAccept.locator('[data-slot="switch-control"]').click()
-  await expect(autoAccept.getByRole("switch")).toBeChecked()
-  await expect
-    .poll(() =>
-      permissionRequests.some((request) => {
-        const url = new URL(request)
-        return url.origin === serverA && url.searchParams.get("directory") === directoryA
-      }),
-    )
-    .toBe(true)
-  await page.keyboard.press("Escape")
-
-  await page.locator(`[data-titlebar-tab-slot]:has(a[href="${hrefB}"])`).click()
-  await expect(page).toHaveURL(new RegExp(`${hrefB.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}$`))
-  await expect(page.getByText(sessionB.title).first()).toBeVisible()
-  await transport.waitForConnection()
-
-  await transport.send({
-    directory: directoryA,
-    payload: {
-      id: "event-permission-background-a",
-      type: "permission.asked",
-      properties: {
-        id: "permission-background-a",
-        sessionID: sessionA.id,
-        permission: "bash",
-        patterns: ["git status"],
-        metadata: {},
-        always: [],
-      },
-    },
-  })
-
-  await expect
-    .poll(() => permissionResponses)
-    .toEqual([
-      {
-        origin: serverA,
-        directory: directoryA,
-        sessionID: sessionA.id,
-        permissionID: "permission-background-a",
-        body: { response: "once" },
-      },
-    ])
-
-  await transport.send({
-    directory: directoryA,
-    payload: {
-      id: "event-permission-background-a-child",
-      type: "permission.asked",
-      properties: {
-        id: "permission-background-a-child",
-        sessionID: childSessionA.id,
-        permission: "bash",
-        patterns: ["git diff"],
-        metadata: {},
-        always: [],
-      },
-    },
-  })
-
-  await expect
-    .poll(() => permissionResponses)
-    .toEqual([
-      {
-        origin: serverA,
-        directory: directoryA,
-        sessionID: sessionA.id,
-        permissionID: "permission-background-a",
-        body: { response: "once" },
-      },
-      {
-        origin: serverA,
-        directory: directoryA,
-        sessionID: childSessionA.id,
-        permissionID: "permission-background-a-child",
-        body: { response: "once" },
-      },
-    ])
-})
-
-type PermissionResponse = {
-  origin: string
-  directory?: string
-  sessionID: string
-  permissionID: string
-  body: unknown
-}
-
-async function configureServers(page: Page, tabs: { type: "session"; server: string; sessionId: string }[] = []) {
-  await page.addInitScript(
-    ({ serverB, tabs }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
-      localStorage.setItem("opencode.global.dat:server", JSON.stringify({ list: [serverB] }))
-      localStorage.setItem("opencode.window.browser.dat:tabs", JSON.stringify(tabs))
-    },
-    { serverB, tabs },
-  )
-}
-
-async function mockServers(page: Page, permissionRequests: string[], permissionResponses: PermissionResponse[] = []) {
-  await page.route("**/*", async (route) => {
-    const url = new URL(route.request().url())
-    if (url.origin !== serverA && url.origin !== serverB) return route.fallback()
-    const remote = url.origin === serverB
-    const directory = remote ? directoryB : directoryA
-    const sessions = remote ? [sessionB] : [sessionA, childSessionA]
-    const requestDirectory = url.searchParams.get("directory")
-    const response = url.pathname.match(/^\/session\/([^/]+)\/permissions\/([^/]+)$/)
-    if (route.request().method() === "POST" && response) {
-      permissionResponses.push({
-        origin: url.origin,
-        directory: requestDirectory ?? undefined,
-        sessionID: response[1]!,
-        permissionID: response[2]!,
-        body: route.request().postDataJSON(),
-      })
-      return json(route, true)
-    }
-    if (requestDirectory && requestDirectory !== directory) return json(route, { name: "InvalidDirectory" }, 500)
-    if (url.pathname === "/global/event" || url.pathname === "/event") return sse(route)
-    if (url.pathname === "/global/health") return json(route, { healthy: true })
-    if (url.pathname === "/session/status") return json(route, {})
-    if (url.pathname === "/session") return json(route, sessions)
-    const current = sessions.find((session) => url.pathname === `/session/${session.id}`)
-    if (current) return json(route, current)
-    if (/^\/session\/[^/]+$/.test(url.pathname)) return json(route, { name: "NotFoundError" }, 404)
-    if (/^\/session\/[^/]+\/message$/.test(url.pathname)) return json(route, [])
-    if (/^\/session\/[^/]+\/(children|todo|diff)$/.test(url.pathname)) return json(route, [])
-    if (url.pathname === "/permission") {
-      permissionRequests.push(url.toString())
-      return json(route, [])
-    }
-    if (["/skill", "/command", "/lsp", "/formatter", "/question", "/vcs/diff", "/pty/shells"].includes(url.pathname))
-      return json(route, [])
-    if (["/global/config", "/config", "/provider/auth", "/mcp"].includes(url.pathname)) return json(route, {})
-    if (url.pathname === "/provider") return json(route, provider(remote ? "server-b" : "server-a"))
-    if (url.pathname === "/agent") return json(route, [{ name: "build", mode: "primary" }])
-    if (url.pathname === "/project" || url.pathname === "/project/current") {
-      const project = {
-        id: remote ? sessionB.projectID : "project-server-a",
-        worktree: directory,
-        vcs: "git",
-        time: { created: 1, updated: 1 },
-        sandboxes: [],
-      }
-      return json(route, url.pathname === "/project" ? [project] : project)
-    }
-    if (url.pathname === "/path")
-      return json(route, {
-        state: directory,
-        config: directory,
-        worktree: directory,
-        directory,
-        home: directory,
-      })
-    if (url.pathname === "/vcs") return json(route, { branch: "main", default_branch: "main" })
-    return json(route, {})
-  })
-}
-
-function session(id: string, directory: string, title: string) {
-  return {
-    id,
-    slug: id,
-    projectID: `project-${id}`,
-    directory,
-    title,
-    version: "dev",
-    time: { created: 1, updated: 1 },
-  }
-}
-
-function provider(id: string) {
-  const name = id === "server-b" ? "Server B" : "Server A"
-  return {
-    all: [
-      {
-        id,
-        name: `${name} Provider`,
-        models: {
-          [id]: {
-            id,
-            name: `${name} Model`,
-            family: id,
-            release_date: "2026-01-01",
-            limit: { context: 200_000 },
-          },
-        },
-      },
-    ],
-    connected: [id],
-    default: { providerID: id, modelID: id },
-  }
-}
-
-function json(route: Route, body: unknown, status = 200) {
-  return route.fulfill({
-    status,
-    contentType: "application/json",
-    headers: { "access-control-allow-origin": "*" },
-    body: JSON.stringify(body),
-  })
-}
-
-function sse(route: Route) {
-  return route.fulfill({ status: 200, contentType: "text/event-stream", body: ": ok\n\n" })
-}

packages/app/e2e/regression/review-open-file.spec.ts

@@ -91,17 +91,15 @@ test("opens and searches project files inline", async ({ page }) => {
 
   const panel = page.locator("#review-panel")
   const sidebar = panel.locator('[data-slot="session-review-v2-sidebar"]')
-  const sidebarToggle = panel.getByRole("button", { name: "Toggle file tree" })
   const contextButton = page.getByRole("button", { name: "View context usage" })
   await contextButton.click()
   await expect(panel.getByRole("tab", { name: "Context" })).toHaveAttribute("data-selected", "")
   await panel.getByRole("button", { name: "Open file" }).click()
   await expect(panel.getByRole("tab", { name: "Open file" })).toHaveAttribute("data-selected", "")
-  await expect(sidebarToggle).toBeDisabled()
   await expect(sidebar).toBeVisible()
   await contextButton.click()
   await expect(panel.getByRole("tab", { name: "Context" })).toHaveAttribute("data-selected", "")
-  await expect(sidebar).toBeHidden()
+  await expect(sidebar).toHaveCount(0)
   await panel.getByRole("button", { name: "Open file" }).click()
   const filter = panel.getByRole("combobox", { name: "Filter files" })
   await expect(filter).toBeFocused()
@@ -110,7 +108,6 @@ test("opens and searches project files inline", async ({ page }) => {
 
   await panel.getByRole("button", { name: "README.md" }).click()
   await expect(panel.getByRole("tab", { name: "README.md" })).toHaveAttribute("data-selected", "")
-  await expect(sidebarToggle).toBeEnabled()
   await expect(panel.getByText("contents:README.md", { exact: true })).toBeVisible()
   await expect(sidebar).toHaveCount(0)
 
@@ -125,17 +122,12 @@ test("opens and searches project files inline", async ({ page }) => {
   await expect(filter).toHaveAttribute("aria-activedescendant", resultID!)
   await filter.press("Enter")
   await expect(panel.getByRole("tab", { name: "nested.ts" })).toHaveAttribute("data-selected", "")
-  await expect(sidebarToggle).toBeEnabled()
   await expect(panel.getByText("contents:src/nested.ts", { exact: true })).toBeVisible()
   expect(searches).toContainEqual({ query: "nested", dirs: "false", limit: 200 })
 
   await panel.getByRole("button", { name: "Open file" }).click()
   await expect(panel.getByRole("tab", { name: "nested.ts" })).toHaveCount(1)
   await expect(panel.getByRole("tab", { name: "Open file" })).toHaveAttribute("data-selected", "")
-  await expect(sidebarToggle).toBeDisabled()
-  await panel.getByRole("tab", { name: /Review/ }).click()
-  await expect(sidebarToggle).toBeEnabled()
-  await panel.getByRole("tab", { name: "Open file" }).click()
   await page.keyboard.press("Control+w")
   await expect(panel.getByRole("tab", { name: "Open file" })).toHaveCount(0)
   await expect(panel.getByRole("tab", { name: "nested.ts" })).toHaveAttribute("data-selected", "")

packages/app/e2e/regression/review-tab-switch.spec.ts

@@ -28,8 +28,8 @@ test("keeps the v2 review pane mounted when switching session tabs in a workspac
   await expectSessionTitle(page, titleA)
 
   await page.getByRole("button", { name: "Toggle review" }).click()
-  const reviewTab = page.locator("#session-side-panel-review-tab")
-  const reviewTabPanel = page.locator("#session-side-panel-review-tabpanel")
+  const reviewTab = page.getByRole("tab", { name: /Review/ })
+  const reviewTabPanel = page.getByRole("tabpanel", { name: /Review/ })
   await expect(reviewTab).toHaveAttribute("aria-controls", "session-side-panel-review-tabpanel")
   await expect(reviewTabPanel).toHaveAttribute("id", "session-side-panel-review-tabpanel")
   const review = page.locator('#review-panel [data-component="session-review-v2"]')

packages/app/e2e/regression/review-terminal-stacked.spec.ts

@@ -111,7 +111,7 @@ test("keeps the review tree and terminal sized when both panels are open", async
   await expectTree(page, 8, "git-0.ts")
 
   await selectMode(page, "Git changes", "Branch changes")
-  await expect(page.locator("#session-side-panel-review-tab")).toHaveText("Files Changed 2740")
+  await expect(page.getByRole("tab", { name: "Review 2740" })).toBeVisible()
   await page.keyboard.press("Control+Backquote")
   await expect(page.locator("#terminal-panel")).toBeVisible()
   await expectTree(page, 2_773, "action.yml")

packages/app/e2e/regression/session-request-docks.spec.ts

@@ -1,7 +1,6 @@
 import { base64Encode } from "@opencode-ai/core/util/encode"
 import { expect, test, type Page } from "@playwright/test"
 import { mockOpenCodeServer } from "../utils/mock-server"
-import { installSseTransport } from "../utils/sse-transport"
 import { expectSessionTitle } from "../utils/waits"
 
 const directory = "C:/OpenCode/RequestDocks"
@@ -101,67 +100,6 @@ test("shows a pending permission dock", async ({ page }) => {
   expect(request.postDataJSON()).toEqual({ response: "once" })
 })
 
-test("restores the draft caret before typing after a request dock closes", async ({ page }) => {
-  const transport = await installSseTransport(page, {
-    server: `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`,
-    retry: 20,
-  })
-  await mockServer(page, { questions: [] })
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
-  await transport.waitForConnection()
-  await expectSessionTitle(page, title)
-
-  const editor = page.locator('[data-component="prompt-input"][contenteditable="true"]')
-  const draft = "keep the caret at the end"
-  await editor.fill(draft)
-  await page.evaluate(() => new Promise<void>((resolve) => requestAnimationFrame(() => resolve())))
-  for (let index = 0; index < 4; index++) await page.keyboard.press("ArrowLeft")
-  const cursor = draft.length - 4
-  await expect
-    .poll(() =>
-      editor.evaluate((element) => {
-        const selection = window.getSelection()
-        if (!selection?.rangeCount || !element.contains(selection.anchorNode)) return -1
-        const range = selection.getRangeAt(0).cloneRange()
-        range.selectNodeContents(element)
-        range.setEnd(selection.anchorNode!, selection.anchorOffset)
-        return range.toString().length
-      }),
-    )
-    .toBe(cursor)
-  await transport.send({
-    directory,
-    payload: {
-      type: "question.asked",
-      properties: {
-        id: "question-caret",
-        sessionID,
-        questions: [
-          {
-            header: "Continue",
-            question: "Continue?",
-            options: [{ label: "Yes", description: "Continue the session" }],
-          },
-        ],
-        tool: { messageID: "message-caret", callID: "call-caret" },
-      },
-    },
-  })
-  const question = page.locator('[data-component="dock-prompt"][data-kind="question"]')
-  await expect(question).toBeVisible()
-  await expect(editor).toHaveCount(0)
-
-  await transport.send({
-    directory,
-    payload: { type: "question.rejected", properties: { sessionID, requestID: "question-caret" } },
-  })
-  await expect(question).toHaveCount(0)
-  await expect(editor).toBeVisible()
-  await page.keyboard.press("x")
-
-  await expect(editor).toHaveText(`${draft.slice(0, cursor)}x${draft.slice(cursor)}`)
-})
-
 async function mockServer(
   page: Page,
   requests: {

packages/app/e2e/regression/session-timeline-history-root.spec.ts

@@ -17,14 +17,12 @@ import { mockOpenCodeServer } from "../utils/mock-server"
 import { installSseTransport } from "../utils/sse-transport"
 import { expectSessionTitle } from "../utils/waits"
 
-const initialPageSize = 20
-const historyPageSize = 200
-const assistants = Array.from({ length: initialPageSize + 1 }, (_, index) =>
+const assistants = Array.from({ length: 14 }, (_, index) =>
   assistantMessage([textPart(`prt_history_root_${index}`, `Assistant response ${index}`)], {
     id: `msg_${String(index + 1001).padStart(4, "0")}_history_root_assistant`,
     parentID: userID,
     created: 1700000001000 + index * 1_000,
-    completed: index < initialPageSize,
+    completed: index < 13,
   }),
 )
 const messages = [userMessage(), ...assistants]
@@ -48,7 +46,7 @@ const scenarios = [
 test.use({ viewport: { width: 646, height: 1385 } })
 
 for (const scenario of scenarios) {
-  test(`keeps visible timeline content visible through ${scenario.name}`, async ({ page }) => {
+  test(`keeps the latest user turn visible through ${scenario.name}`, async ({ page }) => {
     const requests: { before?: string; phase: "start" | "end" }[] = []
     const pages: { before?: string; limit: number }[] = []
     const roots: { sessionID: string; messageID: string }[] = []
@@ -103,51 +101,36 @@ for (const scenario of scenarios) {
         }
       },
     })
-    await page.addInitScript(() => {
-      const visibleParts = () => {
-        const virtual = document.querySelector<HTMLElement>("[data-timeline-virtual-content]")
-        const viewport = virtual?.closest<HTMLElement>(".scroll-view__viewport")
-        const view = viewport?.getBoundingClientRect()
-        if (!viewport || !view) return []
-        return [...viewport.querySelectorAll<HTMLElement>("[data-timeline-part-id]")]
-          .filter((part) => {
-            const rect = part.getBoundingClientRect()
-            return rect.width > 0 && rect.height > 0 && rect.bottom > view.top && rect.top < view.bottom
-          })
-          .flatMap((part) => (part.dataset.timelinePartId ? [part.dataset.timelinePartId] : []))
-      }
-      const state = {
-        armed: false,
-        hidden: false,
-        visibleParts: [] as string[],
-        samples: 0,
-        stop: false,
-        arm() {
-          state.visibleParts = visibleParts()
-          state.armed = true
-        },
-      }
-      ;(window as Window & { __historyRootProbe?: typeof state }).__historyRootProbe = state
-      const sample = () => {
-        if (state.armed) {
-          const virtual = document.querySelector<HTMLElement>("[data-timeline-virtual-content]")
-          const viewport = virtual?.closest<HTMLElement>(".scroll-view__viewport")
-          const view = viewport?.getBoundingClientRect()
-          const visible = (partID: string) => {
-            const part = viewport?.querySelector<HTMLElement>(`[data-timeline-part-id="${CSS.escape(partID)}"]`)
-            const rect = part?.getBoundingClientRect()
-            return (
-              !!rect && !!view && rect.width > 0 && rect.height > 0 && rect.bottom > view.top && rect.top < view.bottom
-            )
+    await page.addInitScript(
+      ({ userPartID, lastPartID }) => {
+        const state = { armed: false, hidden: false, samples: 0, stop: false }
+        ;(window as Window & { __historyRootProbe?: typeof state }).__historyRootProbe = state
+        const sample = () => {
+          if (state.armed) {
+            const virtual = document.querySelector<HTMLElement>("[data-timeline-virtual-content]")
+            const viewport = virtual?.closest<HTMLElement>(".scroll-view__viewport")
+            const view = viewport?.getBoundingClientRect()
+            const visible = (partID: string) => {
+              const part = viewport?.querySelector<HTMLElement>(`[data-timeline-part-id="${partID}"]`)
+              const rect = part?.getBoundingClientRect()
+              return (
+                !!rect &&
+                !!view &&
+                rect.width > 0 &&
+                rect.height > 0 &&
+                rect.bottom > view.top &&
+                rect.top < view.bottom
+              )
+            }
+            if (!virtual || !visible(userPartID) || !visible(lastPartID)) state.hidden = true
+            state.samples++
           }
-          if (!virtual || state.visibleParts.length === 0 || state.visibleParts.some((partID) => !visible(partID)))
-            state.hidden = true
-          state.samples++
+          if (!state.stop) requestAnimationFrame(() => setTimeout(sample, 0))
         }
-        if (!state.stop) requestAnimationFrame(() => setTimeout(sample, 0))
-      }
-      requestAnimationFrame(() => setTimeout(sample, 0))
-    })
+        requestAnimationFrame(() => setTimeout(sample, 0))
+      },
+      { userPartID, lastPartID },
+    )
 
     await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
     await transport.waitForConnection()
@@ -160,28 +143,23 @@ for (const scenario of scenarios) {
       "messages:start:latest",
       "messages:end:latest",
       `message:${userID}`,
-      `messages:start:${messages.at(-initialPageSize)!.info.id}`,
+      `messages:start:${messages.at(-2)!.info.id}`,
     ])
-    await expect(page.locator('[data-timeline-part-id^="prt_history_root_"]')).toHaveCount(initialPageSize)
     await page.evaluate(() => {
       ;(
         window as Window & {
-          __historyRootProbe?: { arm(): void }
+          __historyRootProbe?: { armed: boolean }
         }
-      ).__historyRootProbe!.arm()
+      ).__historyRootProbe!.armed = true
     })
     await waitForProbeSamples(page, 0)
-    expect(await visibleContentHidden(page)).toBe(false)
+    expect(await historyRootHidden(page)).toBe(false)
     const beforeHistory = await probeSamples(page)
     history.resolve()
-    await expect(page.locator('[data-timeline-part-id^="prt_history_root_"]')).toHaveCount(assistants.length)
-    await expect.poll(() => requests.filter((request) => request.phase === "end").length).toBe(2)
+    await expect(page.locator('[data-timeline-part-id^="prt_history_root_"]')).toHaveCount(14)
     await expect(page.getByRole("button", { name: "Stop" })).toBeVisible()
     await waitForProbeSamples(page, beforeHistory)
-    expect(pages).toEqual([
-      { before: undefined, limit: initialPageSize },
-      { before: messages.at(-initialPageSize)!.info.id, limit: historyPageSize },
-    ])
+    expect(pages[0]).toEqual({ before: undefined, limit: 2 })
     expect(roots).toEqual([{ sessionID, messageID: userID }])
 
     const message = messageUpdated(scenario.info)
@@ -235,7 +213,7 @@ async function waitForProbeSamples(page: Page, after: number) {
   )
 }
 
-function visibleContentHidden(page: Page) {
+function historyRootHidden(page: Page) {
   return page.evaluate(
     () => (window as Window & { __historyRootProbe?: { hidden: boolean } }).__historyRootProbe!.hidden,
   )

packages/app/e2e/regression/session-timeline-projection.spec.ts

@@ -150,10 +150,7 @@ test.describe("session timeline projection", () => {
       parentID: "msg_2000_diff_next_user",
       created: 1700000011000,
     })
-    await setupTimeline(page, {
-      messages: [user, assistantMessage(), nextUser, nextAssistant],
-      settings: { newLayoutDesigns: false },
-    })
+    await setupTimeline(page, { messages: [user, assistantMessage(), nextUser, nextAssistant] })
     const scroller = page.locator(".scroll-view__viewport", { has: page.locator("[data-timeline-row]") })
     await scroller.evaluate((element) => (element.scrollTop = 0))
 

packages/app/e2e/regression/terminal-composer-focus.spec.ts

@@ -1,5 +1,5 @@
 import { base64Encode } from "@opencode-ai/core/util/encode"
-import { expect, test, type Page } from "@playwright/test"
+import { expect, test } from "@playwright/test"
 import { mockOpenCodeServer } from "../utils/mock-server"
 import { expectSessionTitle } from "../utils/waits"
 
@@ -7,11 +7,10 @@ const directory = "C:/OpenCode/TerminalComposerFocus"
 const projectID = "proj_terminal_composer_focus"
 const sessionID = "ses_terminal_composer_focus"
 const ptyID = "pty_terminal_composer_focus"
-const newPtyID = "pty_terminal_composer_focus_new"
 
 test.use({ viewport: { width: 1440, height: 900 } })
 
-test.beforeEach(async ({ page }) => {
+test("routes typing to the composer unless the open terminal is focused", async ({ page }) => {
   await mockOpenCodeServer(page, {
     directory,
     project: {
@@ -68,9 +67,7 @@ test.beforeEach(async ({ page }) => {
   await page.addInitScript(() => {
     localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
   })
-})
 
-test("routes typing to the composer unless the open terminal is focused", async ({ page }) => {
   await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
   await expectSessionTitle(page, "Terminal composer focus")
 
@@ -90,120 +87,3 @@ test("routes typing to the composer unless the open terminal is focused", async
   await expect(composer).toBeFocused()
   await expect(composer).toHaveText("a")
 })
-
-test("keeps composer focus when a cached terminal finishes mounting", async ({ page }) => {
-  const ghostty = Promise.withResolvers<void>()
-  const release = Promise.withResolvers<void>()
-  const created = { count: 0 }
-  await page.route("**/pty", (route) => {
-    created.count += 1
-    return route.fulfill({
-      status: 200,
-      contentType: "application/json",
-      body: JSON.stringify({ id: ptyID, title: "Terminal 1" }),
-    })
-  })
-  await page.route(/ghostty-web/, async (route) => {
-    ghostty.resolve()
-    await release.promise
-    await route.continue()
-  })
-  await seedCachedTerminal(page)
-
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`, { waitUntil: "commit" })
-  await expectSessionTitle(page, "Terminal composer focus")
-
-  const composer = page.locator('[data-component="prompt-input"]')
-  const terminal = page.locator('[data-component="terminal"]')
-  await expect(terminal).toBeVisible()
-  expect(created.count).toBe(0)
-  await ghostty.promise
-  await composer.click()
-  await expect(composer).toBeFocused()
-
-  release.resolve()
-  await expect(terminal.locator("textarea")).toHaveCount(1)
-  await page.waitForTimeout(300)
-  await expect(composer).toBeFocused()
-})
-
-test("keeps newer composer focus while an explicit terminal open finishes", async ({ page }) => {
-  const ghostty = Promise.withResolvers<void>()
-  const release = Promise.withResolvers<void>()
-  await page.route(/ghostty-web/, async (route) => {
-    ghostty.resolve()
-    await release.promise
-    await route.continue()
-  })
-
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
-  await expectSessionTitle(page, "Terminal composer focus")
-
-  const composer = page.locator('[data-component="prompt-input"]')
-  const terminal = page.locator('[data-component="terminal"]')
-  await page.keyboard.press("Control+Backquote")
-  await expect(terminal).toBeVisible()
-  await ghostty.promise
-  await composer.click()
-  await expect(composer).toBeFocused()
-
-  release.resolve()
-  await expect(terminal.locator("textarea")).toHaveCount(1)
-  await page.waitForTimeout(50)
-  await expect(composer).toBeFocused()
-})
-
-test("focuses a terminal created from the new-terminal button", async ({ page }) => {
-  const created = { count: 0 }
-  await page.route("**/pty", (route) => {
-    created.count += 1
-    const next = created.count === 1 ? { id: ptyID, title: "Terminal 1" } : { id: newPtyID, title: "Terminal 2" }
-    return route.fulfill({
-      status: 200,
-      contentType: "application/json",
-      body: JSON.stringify(next),
-    })
-  })
-  await page.route(`**/pty/${newPtyID}`, (route) =>
-    route.fulfill({ status: 200, contentType: "application/json", body: "{}" }),
-  )
-  await page.route(`**/pty/${newPtyID}/connect-token*`, (route) =>
-    route.fulfill({
-      status: 200,
-      contentType: "application/json",
-      headers: { "access-control-allow-origin": "*" },
-      body: JSON.stringify({ ticket: "e2e-ticket" }),
-    }),
-  )
-  await page.routeWebSocket(new RegExp(`/pty/${newPtyID}/connect`), () => undefined)
-
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
-  await expectSessionTitle(page, "Terminal composer focus")
-
-  const composer = page.locator('[data-component="prompt-input"]')
-  const terminal = page.locator('[data-component="terminal"]')
-  await page.keyboard.press("Control+Backquote")
-  await expect(terminal.locator("textarea")).toHaveCount(1)
-  await composer.click()
-  await expect(composer).toBeFocused()
-
-  await page.getByRole("button", { name: "New terminal" }).click()
-  await expect(page.getByRole("tab", { name: "Terminal 2" })).toHaveAttribute("aria-selected", "true")
-  await expect.poll(() => terminal.evaluate((element) => element.contains(document.activeElement))).toBe(true)
-})
-
-function seedCachedTerminal(page: Page) {
-  return page.addInitScript(
-    ({ terminalKey, ptyID }) => {
-      localStorage.setItem("opencode.global.dat:layout", JSON.stringify({ terminal: { height: 320, opened: true } }))
-      localStorage.setItem(
-        terminalKey,
-        JSON.stringify({
-          active: ptyID,
-          all: [{ id: ptyID, title: "Terminal 1", titleNumber: 1 }],
-        }),
-      )
-    },
-    { terminalKey: `${base64Encode(directory)}/terminal.v1`, ptyID },
-  )
-}

packages/app/e2e/reproduction/timeline-suspense/index.html

@@ -1,34 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Timeline Suspense Reproduction</title>
-    <style>
-      * {
-        box-sizing: border-box;
-      }
-
-      html,
-      body,
-      #root {
-        margin: 0;
-        min-height: 100%;
-      }
-
-      body {
-        background: #171717;
-        color: #f5f5f5;
-        font-family: ui-monospace, SFMono-Regular, Consolas, monospace;
-      }
-
-      #root {
-        padding: 24px;
-      }
-    </style>
-  </head>
-  <body>
-    <main id="root"></main>
-    <script type="module" src="/main.tsx"></script>
-  </body>
-</html>

packages/app/e2e/reproduction/timeline-suspense/main.tsx

@@ -1,315 +0,0 @@
-import { createResource, createSignal, For, onMount, Suspense } from "solid-js"
-import { render } from "solid-js/web"
-import { createVirtualizer, observeElementOffset, observeElementRect } from "@tanstack/solid-virtual"
-import { observeElementOffsetReconnectAware } from "../../../src/pages/session/timeline/observe-element-offset"
-
-const rowCount = 2_000
-const rowHeight = 40
-const parameters = new URLSearchParams(location.search)
-const resourceMode = parameters.get("resource") === "guard" ? "guard" : "baseline"
-const reconnectMode = parameters.get("reconnect") === "candidate" ? "candidate" : "baseline"
-
-type MutationEvent = {
-  kind: "removed" | "added"
-  callbackTime: number
-  callbackFrame: number
-  routeConnectedInCallback: boolean
-  nativeOffsetInCallback: number
-}
-
-type Snapshot = {
-  mode: {
-    resource: "baseline" | "guard"
-    reconnect: "baseline" | "candidate"
-  }
-  operation: {
-    sequence: number
-    phase: string
-    time: number
-    frame: number
-  }
-  resourceState: string
-  routeConnected: boolean
-  viewportConnected: boolean
-  viewportOwnedByRoute: boolean
-  sameRoute: boolean
-  sameViewport: boolean
-  sameSurface: boolean
-  sameMountedRows: boolean
-  nativeOffset: number
-  coreOffset: number
-  rangeStart: number
-  rangeEnd: number
-  indexes: number[]
-  domIndexes: number[]
-  logicalSurfaceHeight: number
-  renderedSurfaceHeight: number
-  viewportClientHeight: number
-  viewportScrollHeight: number
-  visibleRows: number
-  minimumRowTop: number
-  domScrollEvents: number
-  lastScrollTrusted: boolean
-  coreOffsetCallbackCalls: number
-  offsetCallbackSources: "observer"[]
-  rectObserverCallbacks: number
-  ignoredDetachedZeroRects: number
-  syntheticScrollDispatches: number
-  mutationEvents: MutationEvent[]
-}
-
-declare global {
-  interface Window {
-    timelineSuspense: {
-      prepare: () => Promise<Snapshot>
-      trigger: () => void
-      resolve: () => void
-      frames: (count?: number) => Promise<void>
-      snapshot: () => Snapshot
-    }
-  }
-}
-
-function App() {
-  const [refresh, setRefresh] = createSignal(false)
-  let resolveResource: (() => void) | undefined
-  const [resource] = createResource(
-    refresh,
-    (version) =>
-      new Promise<string>((resolve) => {
-        resolveResource = () => resolve(`settled-${version}`)
-      }),
-    { initialValue: "settled" },
-  )
-
-  function Route() {
-    let route: HTMLElement | undefined
-    let viewport: HTMLDivElement | undefined
-    let surface: HTMLDivElement | undefined
-    let initialRoute: HTMLElement | undefined
-    let initialViewport: HTMLDivElement | undefined
-    let initialSurface: HTMLDivElement | undefined
-    let initialRows: HTMLElement[] = []
-    let phase = "mounting"
-    let browserFrame = 0
-    let snapshotSequence = 0
-    let domScrollEvents = 0
-    let lastScrollTrusted = false
-    let coreOffsetCallbackCalls = 0
-    let rectObserverCallbacks = 0
-    let ignoredDetachedZeroRects = 0
-    const offsetCallbackSources: "observer"[] = []
-    const mutationEvents: MutationEvent[] = []
-    const virtualizer = createVirtualizer<HTMLDivElement, HTMLDivElement>({
-      count: rowCount,
-      getScrollElement: () => viewport ?? null,
-      estimateSize: () => rowHeight,
-      initialRect: { width: 900, height: 600 },
-      overscan: 2,
-      observeElementRect: (instance, callback) =>
-        observeElementRect(instance, (rect) => {
-          rectObserverCallbacks++
-          // A fixed 600px viewport has no usable geometry while detached. Keep the last connected rect.
-          if (!instance.scrollElement?.isConnected && rect.height === 0) {
-            ignoredDetachedZeroRects++
-            return
-          }
-          callback(rect)
-        }),
-      observeElementOffset: (instance, callback) => {
-        const deliver = (offset: number, isScrolling: boolean) => {
-          coreOffsetCallbackCalls++
-          offsetCallbackSources.push("observer")
-          callback(offset, isScrolling)
-        }
-        if (reconnectMode === "candidate") return observeElementOffsetReconnectAware(instance, deliver)
-        return observeElementOffset(instance, deliver)
-      },
-    })
-
-    const frames = async (count = 2) => {
-      for (let index = 0; index < count; index++) {
-        await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()))
-      }
-    }
-    const mountedRows = () => [...(surface?.querySelectorAll<HTMLElement>("[data-row-index]") ?? [])]
-    const snapshot = (): Snapshot => {
-      const rows = mountedRows()
-      const view = viewport?.getBoundingClientRect()
-      const visibleRows =
-        viewport?.isConnected && view
-          ? rows.filter((row) => {
-              const rect = row.getBoundingClientRect()
-              return rect.bottom > view.top && rect.top < view.bottom
-            }).length
-          : 0
-      return {
-        mode: { resource: resourceMode, reconnect: reconnectMode },
-        operation: {
-          sequence: ++snapshotSequence,
-          phase,
-          time: performance.now(),
-          frame: browserFrame,
-        },
-        resourceState: resource.state,
-        routeConnected: route?.isConnected ?? false,
-        viewportConnected: viewport?.isConnected ?? false,
-        viewportOwnedByRoute: !!route && !!viewport && route.contains(viewport),
-        sameRoute: route === initialRoute,
-        sameViewport: viewport === initialViewport,
-        sameSurface: surface === initialSurface,
-        sameMountedRows:
-          initialRows.length > 0 &&
-          initialRows.length === rows.length &&
-          initialRows.every((row, index) => row === rows[index]),
-        nativeOffset: viewport?.scrollTop ?? -1,
-        coreOffset: virtualizer.scrollOffset ?? -1,
-        rangeStart: virtualizer.range?.startIndex ?? -1,
-        rangeEnd: virtualizer.range?.endIndex ?? -1,
-        indexes: virtualizer.getVirtualItems().map((item) => item.index),
-        domIndexes: rows.map((row) => Number(row.dataset.rowIndex)),
-        logicalSurfaceHeight: Number.parseFloat(surface?.style.height ?? "-1"),
-        renderedSurfaceHeight: surface?.getBoundingClientRect().height ?? -1,
-        viewportClientHeight: viewport?.clientHeight ?? -1,
-        viewportScrollHeight: viewport?.scrollHeight ?? -1,
-        visibleRows,
-        minimumRowTop:
-          rows.length && view ? Math.min(...rows.map((row) => row.getBoundingClientRect().top - view.top)) : -1,
-        domScrollEvents,
-        lastScrollTrusted,
-        coreOffsetCallbackCalls,
-        offsetCallbackSources: [...offsetCallbackSources],
-        rectObserverCallbacks,
-        ignoredDetachedZeroRects,
-        syntheticScrollDispatches: 0,
-        mutationEvents: mutationEvents.map((event) => ({ ...event })),
-      }
-    }
-
-    onMount(() => {
-      if (!route || !viewport || !surface) throw new Error("Timeline fixture did not mount")
-      const routeRoot = route.parentElement
-      if (!routeRoot) throw new Error("Timeline route root did not mount")
-      initialRoute = route
-      initialViewport = viewport
-      initialSurface = surface
-      viewport.addEventListener("scroll", (event) => {
-        domScrollEvents++
-        lastScrollTrusted = event.isTrusted
-      })
-      const countFrames = () => {
-        browserFrame++
-        requestAnimationFrame(countFrames)
-      }
-      requestAnimationFrame(countFrames)
-      new MutationObserver((records) => {
-        const callbackTime = performance.now()
-        records.forEach((record) => {
-          ;([...(record.removedNodes ?? [])] as Node[]).forEach((node) => {
-            if (node !== route) return
-            phase = "detached"
-            mutationEvents.push({
-              kind: "removed",
-              callbackTime,
-              callbackFrame: browserFrame,
-              routeConnectedInCallback: route.isConnected,
-              nativeOffsetInCallback: viewport.scrollTop,
-            })
-          })
-          ;([...(record.addedNodes ?? [])] as Node[]).forEach((node) => {
-            if (node !== route) return
-            phase = "reinserted"
-            mutationEvents.push({
-              kind: "added",
-              callbackTime,
-              callbackFrame: browserFrame,
-              routeConnectedInCallback: route.isConnected,
-              nativeOffsetInCallback: viewport.scrollTop,
-            })
-          })
-        })
-      }).observe(routeRoot, { childList: true })
-      window.timelineSuspense = {
-        prepare: async () => {
-          phase = "preparing"
-          await frames(2)
-          viewport.scrollTop = viewport.scrollHeight
-          await frames(3)
-          await new Promise((resolve) => setTimeout(resolve, 200))
-          await frames(2)
-          initialRows = mountedRows()
-          phase = "prepared"
-          return snapshot()
-        },
-        trigger: () => {
-          phase = "triggering"
-          setRefresh(true)
-        },
-        resolve: () => {
-          if (!resolveResource) throw new Error("Resource is not pending")
-          phase = "resolving"
-          resolveResource()
-        },
-        frames,
-        snapshot,
-      }
-    })
-
-    return (
-      <section ref={route} data-route style={{ width: "900px", margin: "0 auto" }}>
-        <span aria-hidden="true" style={{ display: "none" }}>
-          {resourceMode === "guard" && resource.state === "refreshing" ? resource.latest : resource()}
-        </span>
-        <div
-          ref={viewport}
-          data-viewport
-          style={{
-            height: "600px",
-            overflow: "auto",
-            "overflow-anchor": "none",
-            position: "relative",
-            background: "#202020",
-            outline: "1px solid #3f3f46",
-          }}
-        >
-          <div
-            ref={surface}
-            data-surface
-            style={{ height: `${virtualizer.getTotalSize()}px`, position: "relative", "overflow-anchor": "none" }}
-          >
-            <For each={virtualizer.getVirtualItems()}>
-              {(item) => (
-                <div
-                  data-row-index={item.index}
-                  style={{
-                    position: "absolute",
-                    top: "0",
-                    left: "0",
-                    width: "100%",
-                    height: `${item.size}px`,
-                    transform: `translateY(${item.start}px)`,
-                    padding: "10px 14px",
-                    border: "0 solid #333",
-                    "border-bottom-width": "1px",
-                  }}
-                >
-                  logical row {item.index}
-                </div>
-              )}
-            </For>
-          </div>
-        </div>
-      </section>
-    )
-  }
-
-  return (
-    <main>
-      <Suspense>
-        <Route />
-      </Suspense>
-    </main>
-  )
-}
-
-render(() => <App />, document.getElementById("root")!)

packages/app/e2e/reproduction/timeline-suspense/playwright.config.ts

@@ -1,34 +0,0 @@
-import { defineConfig, devices } from "@playwright/test"
-
-const port = Number(process.env.PLAYWRIGHT_TIMELINE_SUSPENSE_PORT ?? 4317)
-
-export default defineConfig({
-  testDir: ".",
-  testMatch: "timeline-suspense.repro.ts",
-  outputDir: "../../test-results/timeline-suspense",
-  fullyParallel: false,
-  workers: 1,
-  retries: 0,
-  reporter: "line",
-  timeout: 30_000,
-  expect: {
-    timeout: 10_000,
-  },
-  webServer: {
-    command: `bunx vite --config vite.config.ts --host 127.0.0.1 --port ${port} --strictPort`,
-    cwd: import.meta.dirname,
-    url: `http://127.0.0.1:${port}`,
-    reuseExistingServer: false,
-  },
-  use: {
-    baseURL: `http://127.0.0.1:${port}`,
-    trace: "retain-on-failure",
-    screenshot: "only-on-failure",
-  },
-  projects: [
-    {
-      name: "chromium",
-      use: { ...devices["Desktop Chrome"] },
-    },
-  ],
-})

packages/app/e2e/reproduction/timeline-suspense/timeline-suspense.repro.ts

@@ -1,179 +0,0 @@
-import { expect, test, type Page } from "@playwright/test"
-
-test.beforeEach(async ({ page }) => {
-  page.on("pageerror", (error) => console.error(error))
-  await page.goto("/")
-  await expect.poll(() => page.evaluate(() => !!window.timelineSuspense)).toBe(true)
-})
-
-test("desired: preserves visible timeline continuity across descendant resource suspension", async ({ page }) => {
-  await page.goto("/?reconnect=candidate")
-  await expect.poll(() => page.evaluate(() => window.timelineSuspense.snapshot().mode.reconnect)).toBe("candidate")
-  const before = await prepare(page)
-  await triggerBaselineSuspension(page)
-  const pending = await page.evaluate(() => window.timelineSuspense.snapshot())
-  expect(pending.nativeOffset).toBe(0)
-  expect(pending.coreOffset).toBe(before.coreOffset)
-  expect(pending.indexes).toEqual(before.indexes)
-  expect(pending.sameRoute).toBe(true)
-  expect(pending.sameViewport).toBe(true)
-  expect(pending.sameSurface).toBe(true)
-  expect(pending.sameMountedRows).toBe(true)
-
-  await resolveSuspension(page)
-  await expect.poll(() => page.evaluate(() => window.timelineSuspense.snapshot().coreOffset)).toBe(0)
-  await page.waitForTimeout(250)
-  await page.evaluate(() => window.timelineSuspense.frames(2))
-  const after = await page.evaluate(() => window.timelineSuspense.snapshot())
-  expect(after.sameRoute).toBe(true)
-  expect(after.sameViewport).toBe(true)
-  expect(after.sameSurface).toBe(true)
-  expect(after.nativeOffset).toBe(0)
-  expect(after.coreOffset).toBe(0)
-  expect(after.rangeStart).toBeLessThan(10)
-  expect(after.visibleRows, diagnostic({ before, pending, after })).toBeGreaterThan(0)
-  expect(after.domScrollEvents).toBe(before.domScrollEvents)
-  expect(after.coreOffsetCallbackCalls).toBe(before.coreOffsetCallbackCalls + 1)
-  expect(after.offsetCallbackSources.at(-1)).toBe("observer")
-  expect(after.syntheticScrollDispatches).toBe(0)
-})
-
-test("forensic: proves detached same-node viewport leaves TanStack's bottom range blank until a real scroll", async ({
-  page,
-}) => {
-  const before = await prepare(page)
-  const beforeRows = before.domIndexes
-  expect(before.mode).toEqual({ resource: "baseline", reconnect: "baseline" })
-  expect(before.logicalSurfaceHeight).toBe(80_000)
-  expect(before.renderedSurfaceHeight).toBe(80_000)
-  expect(before.viewportClientHeight).toBe(600)
-  expect(before.viewportScrollHeight).toBe(80_000)
-  expect(before.rangeStart).toBeGreaterThan(1_900)
-  expect(before.nativeOffset).toBe(before.coreOffset)
-  expect(before.visibleRows).toBeGreaterThan(0)
-
-  await triggerBaselineSuspension(page)
-  const pending = await page.evaluate(() => window.timelineSuspense.snapshot())
-  expect(pending.resourceState).toBe("refreshing")
-  expect(pending.routeConnected).toBe(false)
-  expect(pending.viewportConnected).toBe(false)
-  expect(pending.viewportOwnedByRoute).toBe(true)
-  expect(pending.nativeOffset).toBe(0)
-  expect(pending.coreOffset).toBe(before.coreOffset)
-  expect(pending.rangeStart).toBe(before.rangeStart)
-  expect(pending.rangeEnd).toBe(before.rangeEnd)
-  expect(pending.indexes).toEqual(before.indexes)
-  expect(pending.domIndexes).toEqual(beforeRows)
-  expect(pending.sameMountedRows).toBe(true)
-  expect(pending.domScrollEvents).toBe(before.domScrollEvents)
-  expect(pending.coreOffsetCallbackCalls).toBe(before.coreOffsetCallbackCalls)
-  expect(pending.ignoredDetachedZeroRects).toBeGreaterThan(before.ignoredDetachedZeroRects)
-  expect(pending.mutationEvents).toHaveLength(1)
-  expect(pending.mutationEvents[0]).toMatchObject({
-    kind: "removed",
-    routeConnectedInCallback: false,
-    nativeOffsetInCallback: 0,
-  })
-  expect(pending.mutationEvents[0]!.callbackTime).toBeLessThanOrEqual(pending.operation.time)
-  expect(pending.mutationEvents[0]!.callbackFrame).toBeLessThanOrEqual(pending.operation.frame)
-
-  const after = await resolveSuspension(page)
-  expect(after.resourceState).toBe("ready")
-  expect(after.routeConnected).toBe(true)
-  expect(after.viewportConnected).toBe(true)
-  expect(after.viewportOwnedByRoute).toBe(true)
-  expect(after.sameRoute).toBe(true)
-  expect(after.sameViewport).toBe(true)
-  expect(after.sameSurface).toBe(true)
-  expect(after.sameMountedRows).toBe(true)
-  expect(after.nativeOffset).toBe(0)
-  expect(after.coreOffset).toBe(before.coreOffset)
-  expect(after.rangeStart).toBe(before.rangeStart)
-  expect(after.rangeEnd).toBe(before.rangeEnd)
-  expect(after.indexes).toEqual(before.indexes)
-  expect(after.domIndexes).toEqual(beforeRows)
-  expect(after.domScrollEvents).toBe(before.domScrollEvents)
-  expect(after.coreOffsetCallbackCalls).toBe(before.coreOffsetCallbackCalls)
-  expect(after.mutationEvents).toHaveLength(2)
-  expect(after.mutationEvents[1]).toMatchObject({
-    kind: "added",
-    routeConnectedInCallback: true,
-    nativeOffsetInCallback: 0,
-  })
-  expect(after.mutationEvents[1]!.callbackTime).toBeLessThanOrEqual(after.operation.time)
-  expect(after.mutationEvents[1]!.callbackFrame).toBeLessThanOrEqual(after.operation.frame)
-  expect(after.visibleRows).toBe(0)
-  expect(after.minimumRowTop).toBeGreaterThan(50_000)
-  expect(after.syntheticScrollDispatches).toBe(0)
-
-  await page.locator("[data-viewport]").hover()
-  await page.mouse.wheel(0, 80)
-  await expect
-    .poll(() =>
-      page.evaluate(() => {
-        const value = window.timelineSuspense.snapshot()
-        return value.nativeOffset > 0 && value.coreOffset === value.nativeOffset
-      }),
-    )
-    .toBe(true)
-  await page.evaluate(() => window.timelineSuspense.frames(2))
-  const recovered = await page.evaluate(() => window.timelineSuspense.snapshot())
-  expect(recovered.domScrollEvents).toBeGreaterThan(after.domScrollEvents)
-  expect(recovered.coreOffsetCallbackCalls).toBeGreaterThan(after.coreOffsetCallbackCalls)
-  expect(recovered.offsetCallbackSources.at(-1)).toBe("observer")
-  expect(recovered.lastScrollTrusted).toBe(true)
-  expect(recovered.rangeStart).toBeLessThan(10)
-  expect(recovered.visibleRows).toBeGreaterThan(0)
-})
-
-test("matrix: fixture-only settled-resource guard keeps the route connected", async ({ page }) => {
-  await page.goto("/?resource=guard")
-  await expect.poll(() => page.evaluate(() => window.timelineSuspense.snapshot().mode.resource)).toBe("guard")
-  const before = await prepare(page)
-
-  await page.evaluate(() => window.timelineSuspense.trigger())
-  await expect.poll(() => page.evaluate(() => window.timelineSuspense.snapshot().resourceState)).toBe("refreshing")
-  await page.evaluate(() => window.timelineSuspense.frames(3))
-  const pending = await page.evaluate(() => window.timelineSuspense.snapshot())
-  expect(pending.routeConnected).toBe(true)
-  expect(pending.mutationEvents).toEqual([])
-  expect(pending.nativeOffset).toBe(before.nativeOffset)
-  expect(pending.coreOffset).toBe(before.coreOffset)
-  expect(pending.visibleRows).toBeGreaterThan(0)
-
-  const after = await resolveSuspension(page)
-  expect(after.routeConnected).toBe(true)
-  expect(after.nativeOffset).toBe(before.nativeOffset)
-  expect(after.coreOffset).toBe(before.coreOffset)
-  expect(after.visibleRows).toBeGreaterThan(0)
-})
-
-async function prepare(page: Page) {
-  const before = await page.evaluate(() => window.timelineSuspense.prepare())
-  expect(before.routeConnected).toBe(true)
-  expect(before.viewportConnected).toBe(true)
-  expect(before.viewportOwnedByRoute).toBe(true)
-  expect(before.sameMountedRows).toBe(true)
-  expect(before.rangeStart).toBeGreaterThan(1_900)
-  expect(before.nativeOffset).toBe(before.coreOffset)
-  return before
-}
-
-async function triggerBaselineSuspension(page: Page) {
-  await page.evaluate(() => window.timelineSuspense.trigger())
-  await expect.poll(() => page.evaluate(() => window.timelineSuspense.snapshot().resourceState)).toBe("refreshing")
-  await expect.poll(() => page.evaluate(() => window.timelineSuspense.snapshot().routeConnected)).toBe(false)
-  await page.evaluate(() => window.timelineSuspense.frames(3))
-}
-
-async function resolveSuspension(page: Page) {
-  await page.evaluate(() => window.timelineSuspense.resolve())
-  await expect.poll(() => page.evaluate(() => window.timelineSuspense.snapshot().resourceState)).toBe("ready")
-  await expect.poll(() => page.evaluate(() => window.timelineSuspense.snapshot().routeConnected)).toBe(true)
-  await page.evaluate(() => window.timelineSuspense.frames(3))
-  return page.evaluate(() => window.timelineSuspense.snapshot())
-}
-
-function diagnostic(value: unknown) {
-  return JSON.stringify(value, null, 2)
-}

packages/app/e2e/reproduction/timeline-suspense/vite.config.ts

@@ -1,7 +0,0 @@
-import { defineConfig } from "vite"
-import solid from "vite-plugin-solid"
-
-export default defineConfig({
-  root: import.meta.dirname,
-  plugins: [solid()],
-})

packages/app/e2e/tsconfig.json

@@ -10,9 +10,6 @@
     "./performance/timeline-stability/fixture.test.ts",
     "./performance/timeline-stability/fixture.ts",
     "./performance/unit/visual-stability.test.ts",
-    "./reproduction/timeline-suspense/**/*.ts",
-    "./reproduction/timeline-suspense/**/*.tsx",
-    "../src/pages/session/timeline/observe-element-offset.ts",
     "./regression/new-session-panel-corner.spec.ts",
     "./regression/session-timeline-context-resize.spec.ts",
     "./utils/**/*.ts"

packages/app/e2e/utils/sse-transport.ts

@@ -162,7 +162,7 @@ export async function installSseTransport<T>(
         const request = new Request(input, init)
         const url = new URL(request.url)
         if (url.origin !== server || (url.pathname !== "/global/event" && url.pathname !== "/event"))
-          return originalFetch(request)
+          return originalFetch(input, init)
 
         const id = ++nextConnectionID
         const record = {

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/app",
-  "version": "1.17.20",
+  "version": "1.17.18",
   "description": "",
   "type": "module",
   "exports": {
@@ -53,9 +53,11 @@
     "@dnd-kit/helpers": "0.5.0",
     "@dnd-kit/solid": "0.5.0",
     "@kobalte/core": "catalog:",
+    "@opencode-ai/client": "workspace:*",
     "@opencode-ai/core": "workspace:*",
     "@opencode-ai/schema": "workspace:*",
     "@opencode-ai/sdk": "workspace:*",
+    "@opencode-ai/sdk-v1": "https://registry.npmjs.org/@opencode-ai/sdk/-/sdk-1.17.18.tgz",
     "@opencode-ai/session-ui": "workspace:*",
     "@opencode-ai/ui": "workspace:*",
     "@pierre/trees": "1.0.0-beta.4",

packages/app/src/app.tsx

@@ -153,7 +153,8 @@ function LegacyTargetSessionRedirect() {
 }
 
 // Wraps the non-draft routes. They are gated on (and keyed to) the globally selected
-// server via ServerKey, then provide the server-scoped shell for that server.
+// server via ServerKey, then provide the server-scoped shell (Permission/Layout/
+// Notification/Models + the visual Layout) for that server.
 function SelectedServerProviders(props: ParentProps) {
   return (
     <ServerKey>
@@ -206,7 +207,7 @@ function ResolvedDraftRoute(props: { draft: DraftTab }) {
     <Show when={`${props.draft.server}\0${props.draft.directory}`} keyed>
       <ServerSDKProvider server={conn}>
         <ServerSyncProvider server={conn}>
-          <ModelsProvider directory={directory}>
+          <DraftServerScopedProviders directory={directory}>
             <SDKProvider directory={directory}>
               <DirectoryDataProvider directory={directory} server={serverKey}>
                 <DraftProviders>
@@ -214,7 +215,7 @@ function ResolvedDraftRoute(props: { draft: DraftTab }) {
                 </DraftProviders>
               </DirectoryDataProvider>
             </SDKProvider>
-          </ModelsProvider>
+          </DraftServerScopedProviders>
         </ServerSyncProvider>
       </ServerSDKProvider>
     </Show>
@@ -308,21 +309,24 @@ function DesktopCommands() {
 // Server-scoped providers shared by the legacy shell and the top-level new shell.
 type ServerScopedShellProps = ParentProps<{
   directory?: () => string | undefined
+  sessionID?: () => string | undefined
   serverScoped?: JSX.Element
 }>
 
 function ServerScopedProviders(props: ServerScopedShellProps) {
   return (
-    <LayoutProvider>
-      {props.serverScoped}
-      <ModelsProvider directory={props.directory}>{props.children}</ModelsProvider>
-    </LayoutProvider>
+    <PermissionProvider directory={props.directory}>
+      <LayoutProvider>
+        {props.serverScoped}
+        <ModelsProvider directory={props.directory}>{props.children}</ModelsProvider>
+      </LayoutProvider>
+    </PermissionProvider>
   )
 }
 
 function LegacyServerScopedShell(props: ServerScopedShellProps) {
   return (
-    <ServerScopedProviders directory={props.directory} serverScoped={props.serverScoped}>
+    <ServerScopedProviders directory={props.directory} sessionID={props.sessionID} serverScoped={props.serverScoped}>
       <LegacyLayout>{props.children}</LegacyLayout>
     </ServerScopedProviders>
   )
@@ -338,6 +342,14 @@ function NewAppLayout(props: ParentProps<{ serverScoped?: JSX.Element }>) {
   )
 }
 
+function DraftServerScopedProviders(props: ParentProps<{ directory?: () => string | undefined }>) {
+  return (
+    <PermissionProvider directory={props.directory}>
+      <ModelsProvider directory={props.directory}>{props.children}</ModelsProvider>
+    </PermissionProvider>
+  )
+}
+
 // The draft page only renders the prompt composer, so it drops TerminalProvider.
 // FileProvider and CommentsProvider stay because PromptInput uses file search and comment context.
 function DraftProviders(props: ParentProps) {
@@ -547,15 +559,13 @@ export function AppInterface(props: {
                 component={props.router ?? Router}
                 root={(routerProps) => (
                   <TabsProvider>
-                    <PermissionProvider>
-                      <NotificationProvider>
-                        <ServerShell>
-                          <Show when={useSettings().general.newLayoutDesigns()} fallback={routerProps.children}>
-                            <NewAppLayout serverScoped={props.serverScoped}>{routerProps.children}</NewAppLayout>
-                          </Show>
-                        </ServerShell>
-                      </NotificationProvider>
-                    </PermissionProvider>
+                    <NotificationProvider>
+                      <ServerShell>
+                        <Show when={useSettings().general.newLayoutDesigns()} fallback={routerProps.children}>
+                          <NewAppLayout serverScoped={props.serverScoped}>{routerProps.children}</NewAppLayout>
+                        </Show>
+                      </ServerShell>
+                    </NotificationProvider>
                   </TabsProvider>
                 )}
               >

packages/app/src/components/command-palette.ts

@@ -169,7 +169,7 @@ export function createCommandPaletteModel(props: { filesOnly?: () => boolean; on
       const name = store.vcs?.branch ?? getFilename(directory)
       return `${kind} : ${name || path}`
     },
-    load: (directory) => serverSDK.client.session.list({ directory, roots: true }),
+    load: async (directory) => (await serverSDK.backend).common.sessions.list({ location: { directory }, roots: true }),
     untitled: () => language.t("command.session.new"),
     category: () => language.t("command.category.session"),
   })
@@ -233,7 +233,7 @@ function createCommandEntry(option: CommandOption, category: string): CommandPal
 function createSessionEntries(props: {
   workspaces: () => string[]
   label: (directory: string) => string
-  load: (directory: string) => ReturnType<ServerSDK["client"]["session"]["list"]>
+  load: (directory: string) => ReturnType<Awaited<ServerSDK["backend"]>["common"]["sessions"]["list"]>
   untitled: () => string
   category: () => string
 }) {
@@ -263,7 +263,7 @@ function createSessionEntries(props: {
         return props
           .load(directory)
           .then((result) =>
-            (result.data ?? [])
+            result.items
               .filter((session) => !!session?.id)
               .map((session) => ({
                 id: session.id,

packages/app/src/components/dialog-connect-provider.tsx

@@ -1,4 +1,4 @@
-import type { ProviderAuthAuthorization, ProviderAuthMethod } from "@opencode-ai/sdk/v2/client"
+import type { ProviderAuthorization, ProviderAuthMethod } from "@/context/backend"
 import { Button } from "@opencode-ai/ui/button"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Dialog } from "@opencode-ai/ui/dialog"
@@ -31,6 +31,7 @@ import { popularProviders, useProviders } from "@/hooks/use-providers"
 import { CustomProviderForm } from "./dialog-custom-provider"
 
 const CUSTOM_ID = "_custom"
+type AuthMethod = ProviderAuthMethod & { readonly id?: string }
 
 export function useProviderConnectController(options: { onBack?: () => void } = {}) {
   const [store, setStore] = createStore({ selected: undefined as string | undefined })
@@ -176,6 +177,7 @@ function ProviderConnection(props: {
   const providers = useProviders(props.directory)
 
   const alive = { value: true }
+  const connected = { value: false }
   const timer = { current: undefined as ReturnType<typeof setTimeout> | undefined }
 
   onCleanup(() => {
@@ -188,7 +190,16 @@ function ProviderConnection(props: {
   const provider = createMemo(
     () => providers.all().get(props.provider) ?? serverSync().data.provider.all.get(props.provider)!,
   )
-  const fallback = createMemo<ProviderAuthMethod[]>(() => [
+  const integrationID = () => {
+    const value = provider()
+    if (!("integrationID" in value) || typeof value.integrationID !== "string") return props.provider
+    return value.integrationID
+  }
+  const location = () => {
+    const directory = props.directory?.()
+    return directory ? { location: { directory } } : {}
+  }
+  const fallback = createMemo<AuthMethod[]>(() => [
     {
       type: "api" as const,
       label: language.t("provider.connect.method.apiKey"),
@@ -197,19 +208,52 @@ function ProviderConnection(props: {
   const [auth] = createResource(
     () => props.provider,
     async () => {
+      const backend = await serverSDK().backend
+      if (backend.version === "v2") {
+        const capability = backend.capabilities.integrationsV2
+        if (!capability) throw new Error("Server does not support provider integrations")
+        const integration = await capability.get({ ...location(), integrationID: integrationID() })
+        if (!alive.value) return fallback()
+        return (
+          integration?.methods.flatMap((method): AuthMethod[] => {
+            if (method.type === "environment") return []
+            if (method.type === "key") return [{ type: "api", label: method.label }]
+            return [{ type: "oauth", id: method.id, label: method.label, prompts: method.prompts }]
+          }) ?? fallback()
+        )
+      }
+
       const cached = serverSync().data.provider_auth[props.provider]
       if (cached) return cached
-      const res = await serverSDK().client.provider.auth()
+      const capability = backend.capabilities.providerAuthV1
+      if (!capability) throw new Error("Server does not support provider authentication")
+      const result = await capability.methods(location())
       if (!alive.value) return fallback()
-      serverSync().set("provider_auth", res.data ?? {})
-      return res.data?.[props.provider] ?? fallback()
+      const normalized = Object.fromEntries(
+        Object.entries(result).map(([id, methods]) => [
+          id,
+          methods.map((method) => ({
+            ...method,
+            prompts: method.prompts?.map((prompt) =>
+              prompt.type === "select"
+                ? { ...prompt, options: prompt.options.map((option) => ({ ...option })) }
+                : { ...prompt },
+            ),
+          })),
+        ]),
+      )
+      serverSync().set("provider_auth", normalized)
+      return normalized[props.provider] ?? fallback()
     },
   )
   const loading = createMemo(() => auth.loading && !serverSync().data.provider_auth[props.provider])
-  const methods = createMemo(() => auth.latest ?? serverSync().data.provider_auth[props.provider] ?? fallback())
+  const methods = createMemo<AuthMethod[]>(() => [
+    ...(auth.latest ?? serverSync().data.provider_auth[props.provider] ?? fallback()),
+  ])
   const [store, setStore] = createStore({
     methodIndex: undefined as undefined | number,
-    authorization: undefined as undefined | ProviderAuthAuthorization,
+    authorization: undefined as undefined | ProviderAuthorization,
+    attemptID: undefined as string | undefined,
     promptInputs: undefined as undefined | Record<string, string>,
     state: "pending" as undefined | "pending" | "complete" | "error" | "prompt",
     error: undefined as string | undefined,
@@ -221,7 +265,7 @@ function ProviderConnection(props: {
     | { type: "auth.prompt" }
     | { type: "auth.inputs"; inputs: Record<string, string> }
     | { type: "auth.pending" }
-    | { type: "auth.complete"; authorization: ProviderAuthAuthorization }
+    | { type: "auth.complete"; authorization: ProviderAuthorization; attemptID?: string }
     | { type: "auth.error"; error: string }
 
   function dispatch(action: Action) {
@@ -230,6 +274,7 @@ function ProviderConnection(props: {
         if (action.type === "method.select") {
           draft.methodIndex = action.index
           draft.authorization = undefined
+          draft.attemptID = undefined
           draft.promptInputs = undefined
           draft.state = undefined
           draft.error = undefined
@@ -238,6 +283,7 @@ function ProviderConnection(props: {
         if (action.type === "method.reset") {
           draft.methodIndex = undefined
           draft.authorization = undefined
+          draft.attemptID = undefined
           draft.promptInputs = undefined
           draft.state = undefined
           draft.error = undefined
@@ -262,6 +308,7 @@ function ProviderConnection(props: {
         if (action.type === "auth.complete") {
           draft.state = "complete"
           draft.authorization = action.authorization
+          draft.attemptID = action.attemptID
           draft.error = undefined
           return
         }
@@ -273,6 +320,16 @@ function ProviderConnection(props: {
 
   const method = createMemo(() => (store.methodIndex !== undefined ? methods().at(store.methodIndex!) : undefined))
 
+  onCleanup(() => {
+    if (!store.attemptID || connected.value) return
+    void (async () => {
+      const backend = await serverSDK().backend
+      await backend.capabilities.integrationsV2
+        ?.cancelAttempt({ ...location(), attemptID: store.attemptID! })
+        .catch(() => undefined)
+    })()
+  })
+
   const methodLabel = (value?: { type?: string; label?: string }) => {
     if (!value) return ""
     if (value.type === "api") return language.t("provider.connect.method.apiKey")
@@ -322,15 +379,33 @@ function ProviderConnection(props: {
       }
       dispatch({ type: "auth.pending" })
       const start = Date.now()
-      await serverSDK()
-        .client.provider.oauth.authorize(
-          {
-            providerID: props.provider,
-            method: index,
-            inputs,
-          },
-          { throwOnError: true },
-        )
+      const backend = await serverSDK().backend
+      const request =
+        backend.version === "v1"
+          ? (() => {
+              const capability = backend.capabilities.providerAuthV1
+              if (!capability) throw new Error("Server does not support provider authentication")
+              return capability.authorize({ ...location(), providerID: props.provider, method: index, values: inputs })
+            })()
+          : (() => {
+              const capability = backend.capabilities.integrationsV2
+              if (!capability) throw new Error("Server does not support provider integrations")
+              if (!method.id) throw new Error("Provider OAuth method is missing an ID")
+              return capability
+                .connectOauth({
+                  ...location(),
+                  integrationID: integrationID(),
+                  methodID: method.id,
+                  values: inputs ?? {},
+                })
+                .then((attempt) => ({
+                  url: attempt.url,
+                  method: attempt.mode,
+                  instructions: attempt.instructions,
+                  attemptID: attempt.attemptID,
+                }))
+            })()
+      await request
         .then((x) => {
           if (!alive.value) return
           const elapsed = Date.now() - start
@@ -341,11 +416,19 @@ function ProviderConnection(props: {
             timer.current = setTimeout(() => {
               timer.current = undefined
               if (!alive.value) return
-              dispatch({ type: "auth.complete", authorization: x.data! })
+              dispatch({
+                type: "auth.complete",
+                authorization: x,
+                attemptID: "attemptID" in x && typeof x.attemptID === "string" ? x.attemptID : undefined,
+              })
             }, delay)
             return
           }
-          dispatch({ type: "auth.complete", authorization: x.data! })
+          dispatch({
+            type: "auth.complete",
+            authorization: x,
+            attemptID: "attemptID" in x && typeof x.attemptID === "string" ? x.attemptID : undefined,
+          })
         })
         .catch((e) => {
           if (!alive.value) return
@@ -445,7 +528,7 @@ function ProviderConnection(props: {
               <div>
                 <List
                   class="px-3"
-                  items={select()?.options ?? []}
+                  items={[...(select()?.options ?? [])]}
                   key={(x) => x.value}
                   current={select()?.options.find((x) => x.value === formStore.value[select()!.key])}
                   onSelect={(value) => {
@@ -498,7 +581,10 @@ function ProviderConnection(props: {
   })
 
   async function complete() {
-    await serverSDK().client.global.dispose()
+    const backend = await serverSDK().backend
+    if (backend.version === "v1") await backend.capabilities.runtimeV1?.disposeAll()
+    if (backend.version === "v2") await serverSync().refreshProviders()
+    connected.value = true
     dialog.close()
     showToast({
       variant: "success",
@@ -570,14 +656,20 @@ function ProviderConnection(props: {
       }
 
       setFormStore("error", undefined)
-      await serverSDK().client.auth.set({
-        providerID: props.provider,
-        auth: {
-          type: "api",
+      const backend = await serverSDK().backend
+      if (backend.version === "v1") {
+        const capability = backend.capabilities.providerAuthV1
+        if (!capability) throw new Error("Server does not support provider authentication")
+        await capability.setApiKey({ providerID: props.provider, key: apiKey, metadata: store.promptInputs })
+      } else {
+        const capability = backend.capabilities.integrationsV2
+        if (!capability) throw new Error("Server does not support provider integrations")
+        await capability.connectKey({
+          ...location(),
+          integrationID: integrationID(),
           key: apiKey,
-          ...(store.promptInputs ? { metadata: store.promptInputs } : {}),
-        },
-      })
+        })
+      }
       await complete()
     }
 
@@ -642,13 +734,20 @@ function ProviderConnection(props: {
       }
 
       setFormStore("error", undefined)
-      const result = await serverSDK()
-        .client.provider.oauth.callback({
-          providerID: props.provider,
-          method: store.methodIndex,
-          code,
-        })
-        .then((value) => (value.error ? { ok: false as const, error: value.error } : { ok: true as const }))
+      const result = await (async () => {
+        const backend = await serverSDK().backend
+        if (backend.version === "v1") {
+          const capability = backend.capabilities.providerAuthV1
+          if (!capability) throw new Error("Server does not support provider authentication")
+          await capability.callback({ providerID: props.provider, method: store.methodIndex!, code })
+          return
+        }
+        const capability = backend.capabilities.integrationsV2
+        if (!capability) throw new Error("Server does not support provider integrations")
+        if (!store.attemptID) throw new Error("Provider OAuth attempt is missing")
+        await capability.completeAttempt({ ...location(), attemptID: store.attemptID, code })
+      })()
+        .then(() => ({ ok: true as const }))
         .catch((error) => ({ ok: false as const, error }))
       if (result.ok) {
         await complete()
@@ -695,12 +794,26 @@ function ProviderConnection(props: {
 
     onMount(() => {
       void (async () => {
-        const result = await serverSDK()
-          .client.provider.oauth.callback({
-            providerID: props.provider,
-            method: store.methodIndex,
-          })
-          .then((value) => (value.error ? { ok: false as const, error: value.error } : { ok: true as const }))
+        const result = await (async () => {
+          const backend = await serverSDK().backend
+          if (backend.version === "v1") {
+            const capability = backend.capabilities.providerAuthV1
+            if (!capability) throw new Error("Server does not support provider authentication")
+            await capability.callback({ providerID: props.provider, method: store.methodIndex! })
+            return
+          }
+          const capability = backend.capabilities.integrationsV2
+          if (!capability) throw new Error("Server does not support provider integrations")
+          if (!store.attemptID) throw new Error("Provider OAuth attempt is missing")
+          while (alive.value) {
+            const status = await capability.attemptStatus({ ...location(), attemptID: store.attemptID })
+            if (status.status === "complete") return
+            if (status.status === "failed") throw new Error(status.error ?? "Authorization failed")
+            if (status.status === "expired") throw new Error("Authorization expired")
+            await new Promise((resolve) => setTimeout(resolve, 500))
+          }
+        })()
+          .then(() => ({ ok: true as const }))
           .catch((error) => ({ ok: false as const, error }))
 
         if (!alive.value) return

packages/app/src/components/dialog-custom-provider.tsx

@@ -118,7 +118,7 @@ export function CustomProviderForm() {
     const output = validateCustomProvider({
       form,
       t: language.t,
-      disabledProviders: serverSync().data.config.disabled_providers ?? [],
+      disabledProviders: [...(serverSync().data.config.disabledProviders ?? [])],
       existingProviderIDs: new Set(serverSync().data.provider.all.keys()),
     })
     batch(() => {
@@ -131,23 +131,26 @@ export function CustomProviderForm() {
 
   const saveMutation = useMutation(() => ({
     mutationFn: async (result: NonNullable<ReturnType<typeof validate>>) => {
-      const disabledProviders = serverSync().data.config.disabled_providers ?? []
+      const disabledProviders = serverSync().data.config.disabledProviders ?? []
       const nextDisabled = disabledProviders.filter((id) => id !== result.providerID)
+      const backend = await serverSDK().backend
 
-      if (result.key) {
-        await serverSDK().client.auth.set({
-          providerID: result.providerID,
-          auth: {
-            type: "api",
-            key: result.key,
-          },
-        })
+      if (result.key && backend.version === "v1") {
+        const capability = backend.capabilities.providerAuthV1
+        if (!capability) throw new Error("Server does not support provider authentication")
+        await capability.setApiKey({ providerID: result.providerID, key: result.key })
       }
 
       await serverSync().updateConfig({
         provider: { [result.providerID]: result.config },
-        disabled_providers: nextDisabled,
+        disabledProviders: nextDisabled,
       })
+      if (result.key && backend.version === "v2") {
+        const capability = backend.capabilities.integrationsV2
+        if (!capability) throw new Error("Server does not support provider integrations")
+        await capability.connectKey({ integrationID: result.providerID, key: result.key })
+        await serverSync().refreshProviders()
+      }
       return result
     },
     onSuccess: (result) => {

packages/app/src/components/dialog-edit-project-v2.tsx

@@ -1,156 +0,0 @@
-import { ButtonV2 } from "@opencode-ai/ui/v2/button-v2"
-import { Dialog, DialogBody, DialogFooter, DialogHeader, DialogTitle } from "@opencode-ai/ui/v2/dialog-v2"
-import { DividerV2 } from "@opencode-ai/ui/v2/divider-v2"
-import { Field } from "@opencode-ai/ui/v2/field-v2"
-import { Icon } from "@opencode-ai/ui/v2/icon"
-import { ProjectAvatar, PROJECT_AVATAR_VARIANTS } from "@opencode-ai/ui/v2/project-avatar-v2"
-import { TextareaV2 } from "@opencode-ai/ui/v2/textarea-v2"
-import { TextInputV2 } from "@opencode-ai/ui/v2/text-input-v2"
-import { For, Show } from "solid-js"
-import { useLanguage } from "@/context/language"
-import { getProjectAvatarVariant, type LocalProject } from "@/context/layout"
-import { ServerConnection } from "@/context/server"
-import { getProjectAvatarSource } from "@/pages/layout/helpers"
-import { createEditProjectModel } from "./edit-project"
-
-export function DialogEditProjectV2(props: { project: LocalProject; server: ServerConnection.Any }) {
-  const language = useLanguage()
-  const model = createEditProjectModel(props)
-
-  return (
-    <Dialog fit>
-      <form onSubmit={model.submit} class="contents">
-        <DialogHeader>
-          <DialogTitle>{language.t("dialog.project.edit.title")}</DialogTitle>
-        </DialogHeader>
-        <DividerV2 />
-        <DialogBody class="flex max-h-[min(560px,calc(100vh-160px))] w-full flex-col gap-6 overflow-y-auto px-4 pt-4 pb-1">
-          <Field>
-            <Field.Label>{language.t("dialog.project.edit.name")}</Field.Label>
-            <TextInputV2
-              autofocus
-              appearance="large"
-              class="!w-full"
-              value={model.store.name}
-              placeholder={model.folderName()}
-              onInput={(event) => model.setStore("name", event.currentTarget.value)}
-            />
-          </Field>
-
-          <div class="flex w-full flex-col gap-2">
-            <div class="select-none text-[13px] font-[530] leading-none tracking-[-0.04px] text-v2-text-text-base">
-              {language.t("dialog.project.edit.icon")}
-            </div>
-            <div class="flex items-center gap-3">
-              <button
-                type="button"
-                aria-label={language.t("dialog.project.edit.icon.alt")}
-                class="relative size-16 shrink-0 cursor-pointer overflow-hidden rounded-[6px] outline outline-1 outline-transparent transition-[background-color,outline-color] focus-visible:outline-v2-border-border-focus"
-                classList={{
-                  "bg-v2-overlay-simple-overlay-hover outline-v2-border-border-focus": model.store.dragOver,
-                }}
-                onMouseEnter={() => model.setStore("iconHover", true)}
-                onMouseLeave={() => model.setStore("iconHover", false)}
-                onDrop={model.drop}
-                onDragOver={model.dragOver}
-                onDragLeave={model.dragLeave}
-                onClick={model.iconClick}
-              >
-                <ProjectAvatar
-                  fallback={model.store.name || model.defaultName()}
-                  src={getProjectAvatarSource(props.project.id, {
-                    color: model.store.color,
-                    url: props.project.icon?.url,
-                    override: model.store.iconOverride,
-                  })}
-                  variant={getProjectAvatarVariant(model.store.color)}
-                  class="!size-16 [&_[data-slot=project-avatar-surface]]:!rounded-[6px] [&_[data-slot=project-avatar-surface]]:!text-[32px]"
-                />
-                <span
-                  class="pointer-events-none absolute inset-0 flex items-center justify-center rounded-[6px] bg-v2-background-bg-contrast/80 text-v2-icon-icon-contrast backdrop-blur-[2px] transition-opacity"
-                  classList={{
-                    "opacity-100": model.store.iconHover,
-                    "opacity-0": !model.store.iconHover,
-                  }}
-                >
-                  <Icon name={model.store.iconOverride ? "close" : "outline-share"} />
-                </span>
-              </button>
-              <input
-                ref={(element) => {
-                  model.setIconInput(element)
-                }}
-                type="file"
-                accept="image/*"
-                class="hidden"
-                onChange={model.inputChange}
-              />
-              <div class="flex select-none flex-col gap-[6px] text-[11px] font-[440] leading-none tracking-[0.05px] text-v2-text-text-muted">
-                <span>{language.t("dialog.project.edit.icon.hint")}</span>
-                <span>{language.t("dialog.project.edit.icon.recommended")}</span>
-              </div>
-            </div>
-          </div>
-
-          <Show when={!model.store.iconOverride}>
-            <div class="flex w-full flex-col gap-2">
-              <div class="select-none text-[13px] font-[530] leading-none tracking-[-0.04px] text-v2-text-text-base">
-                {language.t("dialog.project.edit.color")}
-              </div>
-              <div class="-ml-1 flex gap-1.5">
-                <For each={PROJECT_AVATAR_VARIANTS}>
-                  {(color) => (
-                    <button
-                      type="button"
-                      aria-label={language.t("dialog.project.edit.color.select", { color })}
-                      aria-pressed={getProjectAvatarVariant(model.store.color) === color}
-                      class="flex size-8 items-center justify-center rounded-[10px] p-1 outline outline-1 outline-transparent transition-[background-color,outline-color] hover:bg-v2-overlay-simple-overlay-hover focus-visible:outline-v2-border-border-focus"
-                      classList={{
-                        "bg-v2-overlay-simple-overlay-hover [box-shadow:inset_0_0_0_2px_var(--v2-border-border-focus)]":
-                          getProjectAvatarVariant(model.store.color) === color,
-                      }}
-                      onClick={() => {
-                        if (getProjectAvatarVariant(model.store.color) === color && !props.project.icon?.url) return
-                        model.setStore(
-                          "color",
-                          getProjectAvatarVariant(model.store.color) === color ? undefined : color,
-                        )
-                      }}
-                    >
-                      <ProjectAvatar
-                        fallback={model.store.name || model.defaultName()}
-                        variant={getProjectAvatarVariant(color)}
-                        class="!size-6 [&_[data-slot=project-avatar-surface]]:!rounded-[6px]"
-                      />
-                    </button>
-                  )}
-                </For>
-              </div>
-            </div>
-          </Show>
-
-          <Field>
-            <Field.Label>{language.t("dialog.project.edit.worktree.startup")}</Field.Label>
-            <Field.Prefix>{language.t("dialog.project.edit.worktree.startup.description")}</Field.Prefix>
-            <TextareaV2
-              class="!w-full [&_[data-slot=textarea-v2-textarea]]:font-mono"
-              rows={3}
-              value={model.store.startup}
-              placeholder={language.t("dialog.project.edit.worktree.startup.placeholder")}
-              spellcheck={false}
-              onInput={(event) => model.setStore("startup", event.currentTarget.value)}
-            />
-          </Field>
-        </DialogBody>
-        <DialogFooter>
-          <ButtonV2 type="button" variant="neutral" disabled={model.save.isPending} onClick={model.close}>
-            {language.t("common.cancel")}
-          </ButtonV2>
-          <ButtonV2 type="submit" variant="contrast" disabled={model.save.isPending}>
-            {model.save.isPending ? language.t("common.saving") : language.t("common.save")}
-          </ButtonV2>
-        </DialogFooter>
-      </form>
-    </Dialog>
-  )
-}

packages/app/src/components/dialog-edit-project.tsx

@@ -1,32 +1,125 @@
 import { Button } from "@opencode-ai/ui/button"
+import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { TextField } from "@opencode-ai/ui/text-field"
+import { useMutation } from "@tanstack/solid-query"
 import { Icon } from "@opencode-ai/ui/icon"
-import { For, Show } from "solid-js"
+import { createMemo, For, Show } from "solid-js"
+import { createStore } from "solid-js/store"
 import { type LocalProject, getAvatarColors } from "@/context/layout"
+import { getFilename } from "@opencode-ai/core/util/path"
 import { Avatar } from "@opencode-ai/ui/avatar"
 import { useLanguage } from "@/context/language"
 import { getProjectAvatarSource } from "@/pages/layout/helpers"
 import { ServerConnection } from "@/context/server"
-import { createEditProjectModel } from "./edit-project"
+import { useGlobal } from "@/context/global"
 
 const AVATAR_COLOR_KEYS = ["pink", "mint", "orange", "purple", "cyan", "lime"] as const
 
 export function DialogEditProject(props: { project: LocalProject; server: ServerConnection.Any }) {
+  const dialog = useDialog()
+  const global = useGlobal()
   const language = useLanguage()
-  const model = createEditProjectModel(props)
+  const serverCtx = createMemo(() => global.ensureServerCtx(props.server))
+  const serverSDK = () => serverCtx().sdk
+  const serverSync = () => serverCtx().sync
+
+  const folderName = createMemo(() => getFilename(props.project.worktree))
+  const defaultName = createMemo(() => props.project.name || folderName())
+
+  const [store, setStore] = createStore({
+    name: defaultName(),
+    color: props.project.icon?.color,
+    iconOverride: props.project.icon?.override,
+    startup: props.project.commands?.start ?? "",
+    dragOver: false,
+    iconHover: false,
+  })
+
+  let iconInput: HTMLInputElement | undefined
+
+  function handleFileSelect(file: File) {
+    if (!file.type.startsWith("image/")) return
+    const reader = new FileReader()
+    reader.onload = (e) => {
+      setStore("iconOverride", e.target?.result as string)
+      setStore("iconHover", false)
+    }
+    reader.readAsDataURL(file)
+  }
+
+  function handleDrop(e: DragEvent) {
+    e.preventDefault()
+    setStore("dragOver", false)
+    const file = e.dataTransfer?.files[0]
+    if (file) handleFileSelect(file)
+  }
+
+  function handleDragOver(e: DragEvent) {
+    e.preventDefault()
+    setStore("dragOver", true)
+  }
+
+  function handleDragLeave() {
+    setStore("dragOver", false)
+  }
+
+  function handleInputChange(e: Event) {
+    const input = e.target as HTMLInputElement
+    const file = input.files?.[0]
+    if (file) handleFileSelect(file)
+  }
+
+  function clearIcon() {
+    setStore("iconOverride", "")
+  }
+
+  const saveMutation = useMutation(() => ({
+    mutationFn: async () => {
+      const name = store.name.trim() === folderName() ? "" : store.name.trim()
+      const start = store.startup.trim()
+
+      if (props.project.id && props.project.id !== "global") {
+        const editing = (await serverSDK().backend).capabilities.projectEditing
+        if (!editing) throw new Error("Project editing is not supported by this server")
+        await editing.update({
+          projectID: props.project.id,
+          location: { directory: props.project.worktree },
+          name,
+          icon: { color: store.color || "", override: store.iconOverride || "" },
+          commands: { start },
+        })
+        serverSync().project.icon(props.project.worktree, store.iconOverride || undefined)
+        dialog.close()
+        return
+      }
+
+      serverSync().project.meta(props.project.worktree, {
+        name,
+        icon: { color: store.color || undefined, override: store.iconOverride || undefined },
+        commands: { start: start || undefined },
+      })
+      dialog.close()
+    },
+  }))
+
+  function handleSubmit(e: SubmitEvent) {
+    e.preventDefault()
+    if (saveMutation.isPending) return
+    saveMutation.mutate()
+  }
 
   return (
     <Dialog title={language.t("dialog.project.edit.title")} class="w-full max-w-[480px] mx-auto">
-      <form onSubmit={model.submit} class="flex flex-col gap-6 p-6 pt-0">
+      <form onSubmit={handleSubmit} class="flex flex-col gap-6 p-6 pt-0">
         <div class="flex flex-col gap-4">
           <TextField
             autofocus
             type="text"
             label={language.t("dialog.project.edit.name")}
-            placeholder={model.folderName()}
-            value={model.store.name}
-            onChange={(v) => model.setStore("name", v)}
+            placeholder={folderName()}
+            value={store.name}
+            onChange={(v) => setStore("name", v)}
           />
 
           <div class="flex flex-col gap-2">
@@ -34,32 +127,38 @@ export function DialogEditProject(props: { project: LocalProject; server: Server
             <div class="flex gap-3 items-start">
               <div
                 class="relative"
-                onMouseEnter={() => model.setStore("iconHover", true)}
-                onMouseLeave={() => model.setStore("iconHover", false)}
+                onMouseEnter={() => setStore("iconHover", true)}
+                onMouseLeave={() => setStore("iconHover", false)}
               >
                 <div
                   class="relative size-16 rounded-md transition-colors cursor-pointer"
                   classList={{
-                    "border-text-interactive-base bg-surface-info-base/20": model.store.dragOver,
-                    "border-border-base hover:border-border-strong": !model.store.dragOver,
-                    "overflow-hidden": !!model.store.iconOverride,
+                    "border-text-interactive-base bg-surface-info-base/20": store.dragOver,
+                    "border-border-base hover:border-border-strong": !store.dragOver,
+                    "overflow-hidden": !!store.iconOverride,
+                  }}
+                  onDrop={handleDrop}
+                  onDragOver={handleDragOver}
+                  onDragLeave={handleDragLeave}
+                  onClick={() => {
+                    if (store.iconOverride && store.iconHover) {
+                      clearIcon()
+                    } else {
+                      iconInput?.click()
+                    }
                   }}
-                  onDrop={model.drop}
-                  onDragOver={model.dragOver}
-                  onDragLeave={model.dragLeave}
-                  onClick={model.iconClick}
                 >
                   <Show
                     when={getProjectAvatarSource(props.project.id, {
-                      color: model.store.color,
+                      color: store.color,
                       url: props.project.icon?.url,
-                      override: model.store.iconOverride,
+                      override: store.iconOverride,
                     })}
                     fallback={
                       <div class="size-full flex items-center justify-center">
                         <Avatar
-                          fallback={model.store.name || model.defaultName()}
-                          {...getAvatarColors(model.store.color)}
+                          fallback={store.name || defaultName()}
+                          {...getAvatarColors(store.color)}
                           class="size-full text-[32px]"
                         />
                       </div>
@@ -77,8 +176,8 @@ export function DialogEditProject(props: { project: LocalProject; server: Server
                 <div
                   class="absolute inset-0 size-16 bg-surface-raised-stronger-non-alpha/90 rounded-[6px] z-10 pointer-events-none flex items-center justify-center transition-opacity"
                   classList={{
-                    "opacity-100": model.store.iconHover && !model.store.iconOverride,
-                    "opacity-0": !(model.store.iconHover && !model.store.iconOverride),
+                    "opacity-100": store.iconHover && !store.iconOverride,
+                    "opacity-0": !(store.iconHover && !store.iconOverride),
                   }}
                 >
                   <Icon name="cloud-upload" size="large" class="text-icon-on-interactive-base drop-shadow-sm" />
@@ -86,8 +185,8 @@ export function DialogEditProject(props: { project: LocalProject; server: Server
                 <div
                   class="absolute inset-0 size-16 bg-surface-raised-stronger-non-alpha/90 rounded-[6px] z-10 pointer-events-none flex items-center justify-center transition-opacity"
                   classList={{
-                    "opacity-100": model.store.iconHover && !!model.store.iconOverride,
-                    "opacity-0": !(model.store.iconHover && !!model.store.iconOverride),
+                    "opacity-100": store.iconHover && !!store.iconOverride,
+                    "opacity-0": !(store.iconHover && !!store.iconOverride),
                   }}
                 >
                   <Icon name="trash" size="large" class="text-icon-on-interactive-base drop-shadow-sm" />
@@ -96,12 +195,12 @@ export function DialogEditProject(props: { project: LocalProject; server: Server
               <input
                 id="icon-upload"
                 ref={(el) => {
-                  model.setIconInput(el)
+                  iconInput = el
                 }}
                 type="file"
                 accept="image/*"
                 class="hidden"
-                onChange={model.inputChange}
+                onChange={handleInputChange}
               />
               <div class="flex flex-col gap-1.5 text-12-regular text-text-weak self-center">
                 <span>{language.t("dialog.project.edit.icon.hint")}</span>
@@ -110,7 +209,7 @@ export function DialogEditProject(props: { project: LocalProject; server: Server
             </div>
           </div>
 
-          <Show when={!model.store.iconOverride}>
+          <Show when={!store.iconOverride}>
             <div class="flex flex-col gap-2">
               <label class="text-12-medium text-text-weak">{language.t("dialog.project.edit.color")}</label>
               <div class="flex gap-1.5">
@@ -119,21 +218,21 @@ export function DialogEditProject(props: { project: LocalProject; server: Server
                     <button
                       type="button"
                       aria-label={language.t("dialog.project.edit.color.select", { color })}
-                      aria-pressed={model.store.color === color}
+                      aria-pressed={store.color === color}
                       classList={{
                         "flex items-center justify-center size-10 p-0.5 rounded-lg overflow-hidden transition-colors cursor-default": true,
                         "bg-transparent border-2 border-icon-strong-base hover:bg-surface-base-hover":
-                          model.store.color === color,
+                          store.color === color,
                         "bg-transparent border border-transparent hover:bg-surface-base-hover hover:border-border-weak-base":
-                          model.store.color !== color,
+                          store.color !== color,
                       }}
                       onClick={() => {
-                        if (model.store.color === color && !props.project.icon?.url) return
-                        model.setStore("color", model.store.color === color ? undefined : color)
+                        if (store.color === color && !props.project.icon?.url) return
+                        setStore("color", store.color === color ? undefined : color)
                       }}
                     >
                       <Avatar
-                        fallback={model.store.name || model.defaultName()}
+                        fallback={store.name || defaultName()}
                         {...getAvatarColors(color)}
                         class="size-full rounded"
                       />
@@ -149,19 +248,19 @@ export function DialogEditProject(props: { project: LocalProject; server: Server
             label={language.t("dialog.project.edit.worktree.startup")}
             description={language.t("dialog.project.edit.worktree.startup.description")}
             placeholder={language.t("dialog.project.edit.worktree.startup.placeholder")}
-            value={model.store.startup}
-            onChange={(v) => model.setStore("startup", v)}
+            value={store.startup}
+            onChange={(v) => setStore("startup", v)}
             spellcheck={false}
             class="max-h-14 w-full overflow-y-auto font-mono text-xs"
           />
         </div>
 
         <div class="flex justify-end gap-2">
-          <Button type="button" variant="ghost" size="large" onClick={model.close}>
+          <Button type="button" variant="ghost" size="large" onClick={() => dialog.close()}>
             {language.t("common.cancel")}
           </Button>
-          <Button type="submit" variant="primary" size="large" disabled={model.save.isPending}>
-            {model.save.isPending ? language.t("common.saving") : language.t("common.save")}
+          <Button type="submit" variant="primary" size="large" disabled={saveMutation.isPending}>
+            {saveMutation.isPending ? language.t("common.saving") : language.t("common.save")}
           </Button>
         </div>
       </form>

packages/app/src/components/dialog-fork.tsx

@@ -8,7 +8,7 @@ import { Dialog } from "@opencode-ai/ui/dialog"
 import { List } from "@opencode-ai/ui/list"
 import { showToast } from "@/utils/toast"
 import { extractPromptFromParts } from "@/utils/prompt"
-import type { TextPart as SDKTextPart } from "@opencode-ai/sdk/v2/client"
+import type { AppPart } from "@/context/backend"
 import { base64Encode } from "@opencode-ai/core/util/encode"
 import { useLanguage } from "@/context/language"
 
@@ -42,7 +42,9 @@ export const DialogFork: Component = () => {
       if (message.role !== "user") continue
 
       const parts = sync().data.part[message.id] ?? []
-      const textPart = parts.find((x): x is SDKTextPart => x.type === "text" && !x.synthetic && !x.ignored)
+      const textPart = parts.find(
+        (x): x is Extract<AppPart, { type: "text" }> => x.type === "text" && !x.synthetic && !x.ignored,
+      )
       if (!textPart) continue
 
       result.push({
@@ -69,15 +71,15 @@ export const DialogFork: Component = () => {
     const dir = base64Encode(sdk().directory)
 
     sdk()
-      .client.session.fork({ sessionID, messageID: item.id })
+      .backend.then((client) => {
+        const capability = client.capabilities.sessionActionsV1
+        if (!capability) throw new Error("Session forking is not supported by this server")
+        return capability.fork({ location: { directory: sdk().directory }, sessionID, messageID: item.id })
+      })
       .then((forked) => {
-        if (!forked.data) {
-          showToast({ title: language.t("common.requestFailed") })
-          return
-        }
         dialog.close()
-        prompt.set(restored, undefined, { dir, id: forked.data.id })
-        navigate(`/${dir}/session/${forked.data.id}`)
+        prompt.set(restored, undefined, { dir, id: forked.id })
+        navigate(`/${dir}/session/${forked.id}`)
       })
       .catch((err: unknown) => {
         const message = err instanceof Error ? err.message : String(err)

packages/app/src/components/dialog-select-directory-v2.tsx

@@ -68,9 +68,8 @@ export function DialogSelectDirectoryV2(props: DialogSelectDirectoryV2Props) {
   const [fallbackPath] = createResource(
     () => (missingBase() ? true : undefined),
     () =>
-      sdk.client.path
-        .get()
-        .then((result) => result.data)
+      sdk.backend
+        .then((client) => client.capabilities.pathInfo?.get())
         .catch(() => undefined),
     { initialValue: undefined },
   )
@@ -83,20 +82,26 @@ export function DialogSelectDirectoryV2(props: DialogSelectDirectoryV2Props) {
       fallbackPath()?.home ||
       fallbackPath()?.directory,
   )
-  const search = createDirectorySearch({ sdk, home, base: () => root() || start() })
+  const search = createDirectorySearch({ backend: sdk.backend, home, base: () => root() || start() })
   const [suggestions] = createResource(input, async (value) => {
     const typed = cleanPickerInput(value).replace(/\/+$/, "")
     const current = displayPickerPath(root(), value, home()).replace(/\/+$/, "")
     if (!typed || typed === current) return { query: value, items: [] }
     const directories = (await search(value)).map((absolute) => ({ absolute, type: "directory" as const }))
     if (!policy.includeFiles) return { query: value, items: directories.slice(0, 5) }
-    const files = await sdk.client.find
-      .files({ directory: root(), query: pickerFileSearchQuery(root(), value, home()), type: "file", limit: 20 })
-      .then((result) => result.data ?? [])
+    const files = await sdk.backend
+      .then((client) =>
+        client.common.files.find({
+          location: { directory: root() },
+          query: pickerFileSearchQuery(root(), value, home()),
+          type: "file",
+          limit: 20,
+        }),
+      )
       .catch(() => [])
     const results = [
       ...directories,
-      ...files.map((path) => ({ absolute: absoluteTreePath(root(), path), type: "file" as const })),
+      ...files.map((file) => ({ absolute: file.absolute ?? absoluteTreePath(root(), file.path), type: "file" as const })),
     ]
     return {
       query: value,
@@ -115,9 +120,9 @@ export function DialogSelectDirectoryV2(props: DialogSelectDirectoryV2Props) {
       existing ??
       loads.schedule(`${generation}:${key}`, eager ? "background" : "user", () => {
         if (!activeTreeNavigation(generation, navigation)) return Promise.resolve(undefined)
-        return sdk.client.file
-          .list({ directory: absolute, path: "" })
-          .then((result) => result.data ?? [])
+        return sdk.backend
+          .then((client) => client.common.files.list({ location: { directory: absolute }, path: "" }))
+          .then((nodes) => nodes.map((node) => ({ name: node.name ?? node.path, type: node.type })))
           .catch(() => undefined)
       })
     listings.set(key, request)

packages/app/src/components/dialog-select-directory.tsx

@@ -60,9 +60,8 @@ export function DialogSelectDirectory(props: DialogSelectDirectoryProps) {
   const [fallbackPath] = createResource(
     () => (missingBase() ? true : undefined),
     async () => {
-      return sdk.client.path
-        .get()
-        .then((x) => x.data)
+      return sdk.backend
+        .then((client) => client.capabilities.pathInfo?.get())
         .catch(() => undefined)
     },
     { initialValue: undefined },
@@ -74,7 +73,7 @@ export function DialogSelectDirectory(props: DialogSelectDirectoryProps) {
   )
 
   const directories = createDirectorySearch({
-    sdk,
+    backend: sdk.backend,
     home,
     base: start,
   })

packages/app/src/components/directory-picker-domain.test.ts

@@ -21,6 +21,7 @@ import {
   pickerRoot,
   pickerAbsoluteInput,
 } from "./directory-picker-domain"
+import { createAppClient } from "@/context/backend.test-fixture"
 
 test("maps server directory entries into Pierre paths", () => {
   expect(
@@ -132,18 +133,20 @@ test("scopes file autocomplete to the current browser root", () => {
 
 test("resolves directory autocomplete from the current browser root", async () => {
   const directories: string[] = []
-  const sdk = {
-    client: {
-      find: {
-        files: (input: { directory: string }) => {
-          directories.push(input.directory)
-          return Promise.resolve({ data: [] })
+  const backend = Promise.resolve(
+    createAppClient({
+      common: {
+        files: {
+          find: (input) => {
+            directories.push(input.location?.directory ?? "")
+            return Promise.resolve([])
+          },
         },
       },
-    },
-  } as unknown as Parameters<typeof createDirectorySearch>[0]["sdk"]
+    }),
+  )
   let base = "/repo"
-  const search = createDirectorySearch({ sdk, home: () => "/home/luke", base: () => base })
+  const search = createDirectorySearch({ backend, home: () => "/home/luke", base: () => base })
 
   await search("components")
   base = "/repo/src"

packages/app/src/components/directory-picker-domain.ts

@@ -247,7 +247,7 @@ export function nativePickerPath(path: string) {
 }
 import { getFilename } from "@opencode-ai/core/util/path"
 import fuzzysort from "fuzzysort"
-import { ServerSDK } from "@/context/server-sdk"
+import type { AppClient } from "@/context/backend"
 
 export function cleanPickerInput(value: string) {
   const first = (value ?? "").split(/\r?\n/)[0] ?? ""
@@ -321,7 +321,11 @@ export function displayPickerPath(path: string, input: string, home: string) {
   return pickerTilde(value, home) || value
 }
 
-export function createDirectorySearch(args: { sdk: ServerSDK; base: () => string | undefined; home: () => string }) {
+export function createDirectorySearch(args: {
+  backend: Promise<AppClient>
+  base: () => string | undefined
+  home: () => string
+}) {
   const cache = new Map<string, Promise<Array<{ name: string; absolute: string }>>>()
   let current = 0
 
@@ -342,14 +346,16 @@ export function createDirectorySearch(args: { sdk: ServerSDK; base: () => string
     const key = trimPickerPath(directory)
     const existing = cache.get(key)
     if (existing) return existing
-    const request = args.sdk.client.file
-      .list({ directory: key, path: "" })
-      .then((result) => result.data ?? [])
+    const request = args.backend
+      .then((client) => client.common.files.list({ location: { directory: key }, path: "" }))
       .catch(() => [])
       .then((nodes) =>
         nodes
           .filter((node) => node.type === "directory")
-          .map((node) => ({ name: node.name, absolute: trimPickerPath(normalizePickerDrive(node.absolute)) })),
+          .map((node) => ({
+            name: node.name ?? getFilename(node.path),
+            absolute: trimPickerPath(normalizePickerDrive(node.absolute ?? joinPickerPath(key, node.path))),
+          })),
       )
     cache.set(key, request)
     return request
@@ -371,12 +377,18 @@ export function createDirectorySearch(args: { sdk: ServerSDK; base: () => string
     const pathInput = raw.startsWith("~") || !!pickerRoot(raw) || raw.includes("/")
     const query = normalizePickerDrive(input.path)
     if (!pathInput) {
-      const results = await args.sdk.client.find
-        .files({ directory: input.directory, query, type: "directory", limit: 50 })
-        .then((result) => result.data ?? [])
+      const results = await args.backend
+        .then((client) =>
+          client.common.files.find({
+            location: { directory: input.directory },
+            query,
+            type: "directory",
+            limit: 50,
+          }),
+        )
         .catch(() => [])
       if (!active()) return []
-      return results.map((path) => joinPickerPath(input.directory, path)).slice(0, 50)
+      return results.map((item) => item.absolute ?? joinPickerPath(input.directory, item.path)).slice(0, 50)
     }
     const segments = query.replace(/^\/+/, "").split("/")
     const head = segments.slice(0, -1).filter((part) => part && part !== ".")

packages/app/src/components/edit-project.ts

@@ -1,119 +0,0 @@
-import { getFilename } from "@opencode-ai/core/util/path"
-import { useDialog } from "@opencode-ai/ui/context/dialog"
-import { useMutation } from "@tanstack/solid-query"
-import { createMemo } from "solid-js"
-import { createStore } from "solid-js/store"
-import { useGlobal } from "@/context/global"
-import { type LocalProject } from "@/context/layout"
-import { ServerConnection } from "@/context/server"
-
-export function createEditProjectModel(props: { project: LocalProject; server: ServerConnection.Any }) {
-  const dialog = useDialog()
-  const global = useGlobal()
-  const serverCtx = createMemo(() => global.ensureServerCtx(props.server))
-  const folderName = createMemo(() => getFilename(props.project.worktree))
-  const defaultName = createMemo(() => props.project.name || folderName())
-  const [store, setStore] = createStore({
-    name: defaultName(),
-    color: props.project.icon?.color,
-    iconOverride: props.project.icon?.override,
-    startup: props.project.commands?.start ?? "",
-    dragOver: false,
-    iconHover: false,
-  })
-  let iconInput: HTMLInputElement | undefined
-
-  function selectFile(file: File) {
-    if (!file.type.startsWith("image/")) return
-    const reader = new FileReader()
-    reader.onload = (event) => {
-      const result = event.target?.result
-      if (typeof result !== "string") return
-      setStore("iconOverride", result)
-      setStore("iconHover", false)
-    }
-    reader.readAsDataURL(file)
-  }
-
-  function drop(event: DragEvent) {
-    event.preventDefault()
-    setStore("dragOver", false)
-    const file = event.dataTransfer?.files[0]
-    if (file) selectFile(file)
-  }
-
-  function dragOver(event: DragEvent) {
-    event.preventDefault()
-    setStore("dragOver", true)
-  }
-
-  function dragLeave() {
-    setStore("dragOver", false)
-  }
-
-  function inputChange(event: Event) {
-    const file = (event.currentTarget as HTMLInputElement).files?.[0]
-    if (file) selectFile(file)
-  }
-
-  function iconClick() {
-    if (store.iconOverride && store.iconHover) {
-      setStore("iconOverride", "")
-      return
-    }
-    iconInput?.click()
-  }
-
-  const save = useMutation(() => ({
-    mutationFn: async () => {
-      const name = store.name.trim() === folderName() ? "" : store.name.trim()
-      const start = store.startup.trim()
-
-      if (props.project.id && props.project.id !== "global") {
-        await serverCtx().sdk.client.project.update({
-          projectID: props.project.id,
-          directory: props.project.worktree,
-          name,
-          icon: { color: store.color || "", override: store.iconOverride || "" },
-          commands: { start },
-        })
-        serverCtx().sync.project.icon(props.project.worktree, store.iconOverride || undefined)
-        dialog.close()
-        return
-      }
-
-      serverCtx().sync.project.meta(props.project.worktree, {
-        name,
-        icon: { color: store.color || undefined, override: store.iconOverride || undefined },
-        commands: { start: start || undefined },
-      })
-      dialog.close()
-    },
-  }))
-
-  function submit(event: SubmitEvent) {
-    event.preventDefault()
-    if (save.isPending) return
-    save.mutate()
-  }
-
-  return {
-    store,
-    setStore,
-    folderName,
-    defaultName,
-    save,
-    submit,
-    drop,
-    dragOver,
-    dragLeave,
-    inputChange,
-    iconClick,
-    close() {
-      dialog.close()
-    },
-    setIconInput(input: HTMLInputElement) {
-      iconInput = input
-    },
-  }
-}

packages/app/src/components/file-tree-v2-model.test.ts

@@ -1,9 +1,8 @@
 import { describe, expect, test } from "bun:test"
-import { buildFileTreeV2Model, flattenFileTreeV2, flattenLiveFileTreeV2 } from "./file-tree-v2-model"
-import type { FileNode } from "@opencode-ai/sdk/v2"
+import { buildFileTreeV2Model, flattenFileTreeV2 } from "./file-tree-v2-model"
 
-describe("buildFileTreeV2Model", () => {
-  test("builds a sorted tree and flattens expanded directories", () => {
+describe("file tree v2 model", () => {
+  test("builds sorted depth-first rows", () => {
     const model = buildFileTreeV2Model(["src/z.ts", "src/lib/b.ts", "src/lib/a.ts", "README.md", "docs/guide.md"])
 
     expect(model.total).toBe(8)
@@ -19,7 +18,7 @@ describe("buildFileTreeV2Model", () => {
     ])
   })
 
-  test("skips children of collapsed directories", () => {
+  test("omits descendants of collapsed directories", () => {
     const model = buildFileTreeV2Model(["src/lib/a.ts", "src/z.ts"])
 
     expect(flattenFileTreeV2(model, (path) => path !== "src/lib").map((row) => row.node.path)).toEqual([
@@ -29,46 +28,19 @@ describe("buildFileTreeV2Model", () => {
     ])
   })
 
-  test("normalizes duplicate and messy paths", () => {
+  test("normalizes separators and duplicate paths", () => {
     const model = buildFileTreeV2Model(["src\\lib\\a.ts", "src/lib/a.ts", "/src//lib/b.ts/"])
     const rows = flattenFileTreeV2(model, () => true)
 
+    expect(model.total).toBe(4)
     expect(rows.map((row) => row.node.path)).toEqual(["src", "src/lib", "src/lib/a.ts", "src/lib/b.ts"])
     expect(rows.find((row) => row.node.path === "src/lib/a.ts")?.node.originalPath).toBe("src\\lib\\a.ts")
   })
 
-  test("handles deeply nested paths", () => {
-    const file = Array.from({ length: 130 }, (_, index) => `d${index}`).join("/") + "/leaf.ts"
+  test("supports paths deeper than the legacy recursion limit", () => {
+    const file = `${Array.from({ length: 130 }, (_, index) => `dir-${index}`).join("/")}/file.ts`
     const model = buildFileTreeV2Model([file])
 
     expect(flattenFileTreeV2(model, () => true)).toHaveLength(131)
   })
 })
-
-describe("flattenLiveFileTreeV2", () => {
-  test("flattens live children using original paths for nested lookups", () => {
-    const nodes: Record<string, FileNode[]> = {
-      "": [
-        { name: "src", path: "src", absolute: "/repo/src", type: "directory", ignored: false },
-        { name: "README.md", path: "README.md", absolute: "/repo/README.md", type: "file", ignored: false },
-      ],
-      src: [
-        { name: "a.ts", path: "src/a.ts", absolute: "/repo/src/a.ts", type: "file", ignored: false },
-        { name: "lib", path: "src/lib", absolute: "/repo/src/lib", type: "directory", ignored: false },
-      ],
-      "src/lib": [{ name: "b.ts", path: "src/lib/b.ts", absolute: "/repo/src/lib/b.ts", type: "file", ignored: false }],
-    }
-
-    expect(
-      flattenLiveFileTreeV2(
-        (path) => nodes[path] ?? [],
-        (path) => path === "src",
-      ).map((row) => [row.node.path, row.node.originalPath, row.level]),
-    ).toEqual([
-      ["src", "src", 0],
-      ["src/a.ts", "src/a.ts", 1],
-      ["src/lib", "src/lib", 1],
-      ["README.md", "README.md", 0],
-    ])
-  })
-})

packages/app/src/components/file-tree-v2-model.ts

@@ -1,4 +1,4 @@
-import type { FileNode } from "@opencode-ai/sdk/v2"
+import type { AppFileNode as FileNode } from "@/context/backend"
 
 export type FileTreeV2Model = {
   children: ReadonlyMap<string, readonly FileTreeV2Node[]>
@@ -75,33 +75,3 @@ export function flattenFileTreeV2(model: FileTreeV2Model, expanded: (path: strin
 
   return rows
 }
-
-export function flattenLiveFileTreeV2(
-  children: (path: string) => readonly FileNode[],
-  expanded: (path: string) => boolean,
-) {
-  const rows: FileTreeV2Row[] = []
-  const stack = children("")
-    .toReversed()
-    .map((node) => ({ node: toLiveNode(node), level: 0 }))
-
-  while (stack.length > 0) {
-    const row = stack.pop()!
-    rows.push(row)
-    if (row.node.type !== "directory" || !expanded(row.node.path)) continue
-    const nested = children(row.node.originalPath)
-    for (let index = nested.length - 1; index >= 0; index--) {
-      stack.push({ node: toLiveNode(nested[index]!), level: row.level + 1 })
-    }
-  }
-
-  return rows
-}
-
-function toLiveNode(node: FileNode): FileTreeV2Node {
-  return {
-    ...node,
-    path: normalizeFileTreeV2Path(node.path),
-    originalPath: node.path,
-  }
-}

packages/app/src/components/file-tree-v2.tsx

@@ -12,17 +12,11 @@ import {
   type ParentProps,
 } from "solid-js"
 import { Dynamic } from "solid-js/web"
-import type { FileNode } from "@opencode-ai/sdk/v2"
+import type { AppFileNode as FileNode } from "@/context/backend"
 import { Icon } from "@opencode-ai/ui/v2/icon"
 import { pathToFileUrl, withFileDragImage, type Kind } from "@/components/file-tree"
 import { createVirtualizer, defaultRangeExtractor } from "@tanstack/solid-virtual"
-import {
-  buildFileTreeV2Model,
-  flattenFileTreeV2,
-  flattenLiveFileTreeV2,
-  normalizeFileTreeV2Path,
-  type FileTreeV2Node,
-} from "@/components/file-tree-v2-model"
+import { buildFileTreeV2Model, flattenFileTreeV2, normalizeFileTreeV2Path } from "@/components/file-tree-v2-model"
 import { virtualScrollElement } from "@/components/virtual-scroll-element"
 
 export type { Kind } from "@/components/file-tree"
@@ -42,7 +36,7 @@ function guideLineLeft(level: number) {
 export const kindLabel = (kind: Kind) => {
   if (kind === "add") return "A"
   if (kind === "del") return "D"
-  return "M"
+  return ""
 }
 
 export const kindChange = (kind: Kind) => {
@@ -74,7 +68,7 @@ const FileTreeNodeV2 = (
     "class",
     "classList",
   ])
-  const kind = () => local.kinds?.get(normalizeFileTreeV2Path(local.node.path))
+  const kind = () => local.kinds?.get(local.node.path)
 
   return (
     <Dynamic
@@ -116,7 +110,12 @@ const FileTreeNodeV2 = (
 function GuideLines(props: { level: number }) {
   return (
     <For each={Array.from({ length: props.level })}>
-      {(_, index) => <div data-slot="file-tree-v2-guide" style={`left: ${guideLineLeft(index())}px`} />}
+      {(_, index) => (
+        <div
+          class="absolute top-0 bottom-0 w-px pointer-events-none bg-border-weak-base opacity-0 group-hover/file-tree-v2:opacity-50"
+          style={`left: ${guideLineLeft(index())}px`}
+        />
+      )}
     </For>
   )
 }
@@ -127,18 +126,12 @@ export default function FileTreeV2(props: {
   kinds?: ReadonlyMap<string, Kind>
   draggable?: boolean
   onFileClick?: (file: FileNode) => void
-  onFileDoubleClick?: (file: FileNode) => void
 }) {
   const file = useFile()
-  const live = () => props.allowed === undefined
   const draggable = () => props.draggable ?? true
   const active = () => normalizeFileTreeV2Path(props.active ?? "")
-  const model = createMemo(() => (live() ? undefined : buildFileTreeV2Model(props.allowed ?? [])))
-  const expanded = (path: string) => file.tree.state(path)?.expanded ?? !live()
-  const rows = createMemo(() => {
-    if (live()) return flattenLiveFileTreeV2((path) => file.tree.children(path), expanded)
-    return flattenFileTreeV2(model()!, expanded)
-  })
+  const model = createMemo(() => buildFileTreeV2Model(props.allowed ?? []))
+  const rows = createMemo(() => flattenFileTreeV2(model(), (path) => file.tree.state(path)?.expanded ?? true))
   const [root, setRoot] = createSignal<HTMLDivElement>()
   const [focused, setFocused] = createSignal<string>()
   const virtualizer = createVirtualizer<HTMLDivElement, HTMLDivElement>({
@@ -162,49 +155,16 @@ export default function FileTreeV2(props: {
       return [...indexes, index].sort((a, b) => a - b)
     },
   })
-
-  createEffect(() => {
-    if (!live()) return
-    void file.tree.list("")
-  })
-
-  // Only scroll when the active path changes (or first appears in the tree).
-  // Do not re-scroll when expand/collapse reshuffles `rows()`.
-  let scrolledActive: string | undefined
   createEffect(() => {
     const path = active()
-    if (!path) {
-      scrolledActive = undefined
-      return
-    }
+    if (!path) return
     const index = rows().findIndex((row) => row.node.path === path)
     if (index < 0) return
-    if (scrolledActive === path) return
-    scrolledActive = path
     queueMicrotask(() => {
-      const next = rows().findIndex((row) => row.node.path === path)
-      if (next < 0) return
-      if (virtualizer.range && next >= virtualizer.range.startIndex && next <= virtualizer.range.endIndex) return
-      virtualizer.scrollToIndex(next, { align: "auto" })
+      if (virtualizer.range && index >= virtualizer.range.startIndex && index <= virtualizer.range.endIndex) return
+      virtualizer.scrollToIndex(index, { align: "auto" })
     })
   })
-
-  const selectFile = (node: FileTreeV2Node, action?: (file: FileNode) => void) => {
-    action?.({
-      ...node,
-      path: node.originalPath,
-      absolute: node.originalPath,
-    })
-  }
-
-  const toggleDirectory = (path: string, originalPath: string) => {
-    if (expanded(path)) {
-      file.tree.collapse(originalPath)
-      return
-    }
-    file.tree.expand(originalPath, live() ? undefined : { list: false })
-  }
-
   const rowByKey = createMemo(() => new Map(rows().map((row) => [row.node.path, row] as const)))
   const virtualItemByKey = createMemo(
     () => new Map(virtualizer.getVirtualItems().map((item) => [item.key, item] as const)),
@@ -215,7 +175,7 @@ export default function FileTreeV2(props: {
     <div
       ref={setRoot}
       data-component="file-tree-v2"
-      data-total-rows={live() ? rows().length : model()!.total}
+      data-total-rows={model().total}
       class="group/file-tree-v2"
       style={{ position: "relative", height: `${virtualizer.getTotalSize()}px` }}
     >
@@ -249,8 +209,13 @@ export default function FileTreeV2(props: {
                           class="relative"
                           onFocus={() => setFocused(row().node.path)}
                           onBlur={() => setFocused(undefined)}
-                          onClick={() => selectFile(row().node, props.onFileClick)}
-                          onDblClick={() => selectFile(row().node, props.onFileDoubleClick)}
+                          onClick={() =>
+                            props.onFileClick?.({
+                              ...row().node,
+                              path: row().node.originalPath,
+                              absolute: row().node.originalPath,
+                            })
+                          }
                         >
                           <GuideLines level={row().level} />
                           <Show when={row().level > 0}>
@@ -274,13 +239,17 @@ export default function FileTreeV2(props: {
                         class="relative"
                         onFocus={() => setFocused(row().node.path)}
                         onBlur={() => setFocused(undefined)}
-                        aria-expanded={expanded(row().node.path)}
-                        onClick={() => toggleDirectory(row().node.path, row().node.originalPath)}
+                        aria-expanded={file.tree.state(row().node.path)?.expanded ?? true}
+                        onClick={() =>
+                          file.tree.state(row().node.path)?.expanded === false
+                            ? file.tree.expand(row().node.path, { list: false })
+                            : file.tree.collapse(row().node.path)
+                        }
                       >
                         <GuideLines level={row().level} />
                         <div
                           data-slot="file-tree-v2-chevron"
-                          data-expanded={expanded(row().node.path) ? "" : undefined}
+                          data-expanded={file.tree.state(row().node.path)?.expanded === false ? undefined : ""}
                           class="size-4 flex items-center justify-center"
                         >
                           <Icon name="chevron-down" />

packages/app/src/components/file-tree.tsx

@@ -17,7 +17,7 @@ import {
   type ParentProps,
 } from "solid-js"
 import { Dynamic } from "solid-js/web"
-import type { FileNode } from "@opencode-ai/sdk/v2"
+import type { AppFileNode as FileNode } from "@/context/backend"
 
 const MAX_DEPTH = 128
 

packages/app/src/components/help-button.tsx

@@ -1,12 +1,11 @@
 import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
 import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
 import { createSignal, Show } from "solid-js"
+import { createStore } from "solid-js/store"
 import { Drawer, DrawerClose, DrawerContent } from "@/components/ui/drawer"
 import { usePlatform } from "@/context/platform"
-import { useSettings } from "@/context/settings"
 import introducingTabsVideo from "@/assets/help/introducing-tabs.mp4"
-import homeImage from "@/assets/help/home.png"
-import tabsImage from "@/assets/help/tabs.png"
+import { Persist, persisted } from "@/utils/persist"
 
 const helpIcon = (
   <svg
@@ -55,21 +54,24 @@ export function HelpButton() {
 
 // can remove this after the tabs rollout has been out for a while
 export function TabsInfoPopup() {
-  const settings = useSettings()
+  if (import.meta.env.VITE_OPENCODE_CHANNEL !== "dev") return null
+
+  const [state, setState] = persisted(Persist.global("tabsInfoPopup"), createStore({ dismissed: false }))
+  // setState({ dismissed: false }) // for testing
   const [drawerOpen, setDrawerOpen] = createSignal(false)
 
   return (
     <Drawer open={drawerOpen()} onOpenChange={setDrawerOpen} side="right">
-      <Show when={settings.general.shouldDisplayTabsToast()}>
+      <Show when={!state.dismissed}>
         <div
           class="fixed bottom-14 right-5 z-50 h-[240px] w-[192px] rounded-[8px] bg-v2-background-bg-base p-1 shadow-[var(--v2-elevation-floating)]"
-          aria-label="Introducing Tabs. Organize your work and active sessions with tabs"
+          aria-label="Introducing Tabs. A faster, more intuitive way to work."
         >
           <button
             type="button"
             aria-label="Dismiss Tabs information"
             class="absolute top-3 right-3 z-10 size-5 flex items-center justify-center rounded-[4px] bg-[rgba(0,0,0,0.4)]"
-            onClick={settings.general.dismissTabsToast}
+            onClick={() => setState("dismissed", true)}
           >
             <svg
               width="16"
@@ -86,7 +88,7 @@ export function TabsInfoPopup() {
             type="button"
             class="relative block h-[232px] w-[184px] cursor-pointer overflow-hidden rounded-[4px] text-left"
             onClick={() => {
-              settings.general.dismissTabsToast()
+              setState("dismissed", true)
               setDrawerOpen(true)
             }}
           >
@@ -105,7 +107,7 @@ export function TabsInfoPopup() {
                 Introducing Tabs
               </p>
               <p class="w-full select-none text-[13px] font-[440] leading-[140%] tracking-[-0.04px] text-[#808080]">
-                Organize your work and active sessions with tabs
+                A faster, more intuitive way to work.
               </p>
             </div>
           </button>
@@ -125,32 +127,16 @@ export function TabsInfoPopup() {
             icon={<IconV2 name="xmark-small" />}
           />
         </div>
-        <div class="relative flex min-h-0 w-full flex-1 flex-col items-start gap-6 overflow-y-auto p-8">
+        <div class="relative flex w-full flex-col items-start gap-6 p-8">
           <p class="w-full shrink-0 self-stretch text-[21px] font-[610] leading-6 tracking-[-0.37px] tabular-nums text-v2-text-text-base">
-            Introducing Tabs
+            Introducing Tabs Navigation.
+          </p>
+          <p class="w-full flex-1 text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-base">
+            We've introduced tabs as the primary navigation in OpenCode. Your most important session are now pinned at
+            the top of your screen at all times. No more hunting through menus or losing your place mid-session. Switch
+            contexts instantly, pick up exactly where you left off, and keep your focus where it belongs: on the
+            sessions.
           </p>
-          <div class="flex w-full flex-1 flex-col gap-4 text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-base">
-            <p>OpenCode Desktop is now built around tabs.</p>
-            <img src={tabsImage} alt="" class="aspect-video w-full rounded-[6px] object-cover" />
-            <p>
-              Start a new session in a tab, or open an existing session from any of your projects. Open a new tab when
-              you're starting something new, and close it when you're done.
-            </p>
-            <p>
-              Keeping a few tabs open makes it easier to organize your active sessions. Rename tabs to something
-              memorable if you plan to keep them around.
-            </p>
-            <p>
-              You'll find all your sessions and projects on the new Home screen. Selecting a session opens it in a tab.
-            </p>
-            <img src={homeImage} alt="" class="aspect-video w-full rounded-[6px] object-cover" />
-            <p>When you reopen the app, your tabs are still open.</p>
-            <p>
-              The new design does not support Git Worktrees yet, it's coming soon. So if you'd prefer to continue using
-              the previous layout , you can switch between layouts in Settings. Just keep in mind that the new layout
-              will become permanent in a few weeks.
-            </p>
-          </div>
         </div>
       </DrawerContent>
     </Drawer>

packages/app/src/components/prompt-input.tsx

@@ -19,7 +19,6 @@ import { selectionFromLines, type SelectedLineRange, useFile } from "@/context/f
 import {
   ContentPart,
   DEFAULT_PROMPT,
-  isCommentItem,
   isPromptEqual,
   Prompt,
   usePrompt,
@@ -75,7 +74,7 @@ import { promptPlaceholder } from "./prompt-input/placeholder"
 import { createPromptInputTransientState } from "./prompt-input/transient-state"
 import { showToast } from "@/utils/toast"
 import { ImagePreview } from "@opencode-ai/ui/image-preview"
-import type { ReferenceInfo } from "@opencode-ai/sdk/v2/client"
+import type { AppReference as ReferenceInfo } from "@/context/backend"
 
 export type PromptInputState = ReturnType<typeof usePrompt>
 
@@ -633,9 +632,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
   const isImeComposing = (event: KeyboardEvent) => event.isComposing || composing() || event.keyCode === 229
 
   const handleBlur = () => {
-    const cursor = currentCursor()
-    savedCursor = cursor
-    if (cursor !== null && cursor !== prompt.cursor()) prompt.set(prompt.current(), cursor)
+    savedCursor = currentCursor()
     closePopover()
     setComposing(false)
   }
@@ -681,7 +678,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
         type: "resource",
         name: resource.name,
         uri: resource.uri,
-        client: resource.client,
+        client: resource.server,
         display: resource.name,
         description: resource.description,
         mime: resource.mimeType,
@@ -1629,7 +1626,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                 )}
               />
               <PromptContextItems
-                items={contextItems().filter((item) => !isCommentItem(item))}
+                items={contextItems()}
                 active={(item) => {
                   const active = comments.active()
                   return !!item.commentID && item.commentID === active?.id && item.path === active?.file
@@ -1639,7 +1636,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                   if (item.commentID) comments.remove(item.path, item.commentID)
                   prompt.context.remove(item.key)
                 }}
-                newLayoutDesigns={props.controls.newLayoutDesigns}
                 t={(key) => language.t(key as Parameters<typeof language.t>[0])}
               />
               <PromptImageAttachments
@@ -1649,17 +1645,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                 }
                 onRemove={removeAttachment}
                 removeLabel={language.t("prompt.attachment.remove")}
-                newLayoutDesigns={props.controls.newLayoutDesigns}
-                comments={contextItems().filter(isCommentItem)}
-                commentActive={(item) => {
-                  const active = comments.active()
-                  return !!item.commentID && item.commentID === active?.id && item.path === active?.file
-                }}
-                onOpenComment={openComment}
-                onRemoveComment={(item) => {
-                  if (item.commentID) comments.remove(item.path, item.commentID)
-                  prompt.context.remove(item.key)
-                }}
               />
               <div
                 class="relative min-h-[52px]"
@@ -1867,7 +1852,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                 if (item.commentID) comments.remove(item.path, item.commentID)
                 prompt.context.remove(item.key)
               }}
-              newLayoutDesigns={props.controls.newLayoutDesigns}
               t={(key) => language.t(key as Parameters<typeof language.t>[0])}
             />
             <PromptImageAttachments
@@ -1877,7 +1861,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
               }
               onRemove={removeAttachment}
               removeLabel={language.t("prompt.attachment.remove")}
-              newLayoutDesigns={props.controls.newLayoutDesigns}
             />
             <div
               class="relative"
@@ -2203,7 +2186,10 @@ type ComposerModelControlState = {
 
 function ComposerAgentControl(props: { state: ComposerAgentControlState }) {
   return (
-    <div>
+    <div class="relative">
+      <div class="pointer-events-none absolute left-2 top-1/2 z-10 flex size-4 -translate-y-1/2 items-center justify-center text-v2-icon-icon-muted">
+        <Icon name="sliders" size="small" />
+      </div>
       <TooltipV2
         placement="top"
         gutter={4}
@@ -2214,32 +2200,17 @@ function ComposerAgentControl(props: { state: ComposerAgentControlState }) {
           </>
         }
       >
-        <MenuV2 gutter={6} modal={false} placement="top-start">
-          <MenuV2.Trigger
-            as={ButtonV2}
-            data-action="prompt-agent"
-            variant="ghost-muted"
-            size="normal"
-            class="max-w-[175px] justify-start ![font-weight:440]"
-            style={props.state.style}
-          >
-            <span class="truncate capitalize leading-5">{props.state.current}</span>
-            <span class="-ml-0.5 -mr-1 flex shrink-0">
-              <Icon name="chevron-down" size="small" />
-            </span>
-          </MenuV2.Trigger>
-          <MenuV2.Portal>
-            <MenuV2.Content>
-              <MenuV2.RadioGroup value={props.state.current} onChange={props.state.onSelect}>
-                {props.state.options.map((value) => (
-                  <MenuV2.RadioItem value={value} class="capitalize">
-                    {value}
-                  </MenuV2.RadioItem>
-                ))}
-              </MenuV2.RadioGroup>
-            </MenuV2.Content>
-          </MenuV2.Portal>
-        </MenuV2>
+        <Select
+          size="normal"
+          options={props.state.options}
+          current={props.state.current}
+          onSelect={props.state.onSelect}
+          class="max-w-[175px] justify-start text-v2-text-text-faint [&_[data-component=icon]]:text-v2-icon-icon-muted"
+          valueClass="truncate pl-5 text-[13px] font-[440] leading-5 text-v2-text-text-faint"
+          triggerStyle={props.state.style}
+          triggerProps={{ "data-action": "prompt-agent" }}
+          variant="ghost"
+        />
       </TooltipV2>
     </div>
   )
@@ -2370,7 +2341,7 @@ function ModelControlContent(props: { state: ComposerModelControlState; v2?: boo
           />
         )}
       </Show>
-      <span class="truncate leading-4">{props.state.modelName}</span>
+      <span class="truncate">{props.state.modelName}</span>
       <span class={props.v2 ? "-ml-0.5 -mr-1 flex shrink-0" : "-ml-1 shrink-0 flex size-fit"}>
         <Icon name="chevron-down" size="small" class="text-v2-icon-icon-muted" />
       </span>

packages/app/src/components/prompt-input/build-request-parts.test.ts

@@ -46,6 +46,8 @@ describe("buildRequestParts", () => {
     ).toBe(true)
 
     expect(result.optimisticParts).toHaveLength(result.requestParts.length)
+    expect(result.optimisticParts.map((part) => part.id)).toEqual(result.requestParts.map((part) => part.id))
+    expect(result.optimisticParts.map((part) => part.type)).toEqual(result.requestParts.map((part) => part.type))
     expect(result.optimisticParts.every((part) => part.sessionID === "ses_1" && part.messageID === "msg_1")).toBe(true)
   })
 

packages/app/src/components/prompt-input/build-request-parts.ts

@@ -1,12 +1,12 @@
 import { getFilename } from "@opencode-ai/core/util/path"
-import { type AgentPartInput, type FilePartInput, type Part, type TextPartInput } from "@opencode-ai/sdk/v2/client"
+import type { AppPart as Part, PromptPart } from "@/context/backend"
 import type { FileSelection } from "@/context/file"
 import { encodeFilePath } from "@/context/file/path"
 import type { AgentPart, FileAttachmentPart, ImageAttachmentPart, Prompt } from "@/context/prompt"
 import { Identifier } from "@/utils/id"
 import { createCommentMetadata, formatCommentNote } from "@/utils/comment-note"
 
-type PromptRequestPart = (TextPartInput | FilePartInput | AgentPartInput) & { id: string }
+type PromptRequestPart = PromptPart
 
 type ContextFile = {
   key: string

packages/app/src/components/prompt-input/context-items.tsx

@@ -1,8 +1,6 @@
 import { Component, For, Show } from "solid-js"
-import { Dynamic } from "solid-js/web"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
 import { IconButton } from "@opencode-ai/ui/icon-button"
-import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
 import { getDirectory, getFilename, getFilenameTruncated } from "@opencode-ai/core/util/path"
 import type { ContextItem } from "@/context/prompt"
@@ -14,7 +12,6 @@ type ContextItemsProps = {
   active: (item: PromptContextItem) => boolean
   openComment: (item: PromptContextItem) => void
   remove: (item: PromptContextItem) => void
-  newLayoutDesigns: boolean
   t: (key: string) => string
 }
 
@@ -30,17 +27,10 @@ export const PromptContextItems: Component<ContextItemsProps> = (props) => {
             const selected = props.active(item)
 
             return (
-              <Dynamic
-                component={props.newLayoutDesigns ? TooltipV2 : Tooltip}
+              <TooltipV2
                 value={
                   <span class="flex max-w-[300px]">
-                    <span
-                      classList={{
-                        "truncate-start [unicode-bidi:plaintext] min-w-0": true,
-                        "text-v2-text-text-muted": props.newLayoutDesigns,
-                        "text-text-invert-base": !props.newLayoutDesigns,
-                      }}
-                    >
+                    <span class="text-text-invert-base truncate-start [unicode-bidi:plaintext] min-w-0">
                       {directory}
                     </span>
                     <span class="shrink-0">{filename}</span>
@@ -88,7 +78,7 @@ export const PromptContextItems: Component<ContextItemsProps> = (props) => {
                     {(comment) => <div class="text-12-regular text-text-strong ml-5 pr-1 truncate">{comment()}</div>}
                   </Show>
                 </div>
-              </Dynamic>
+              </TooltipV2>
             )
           }}
         </For>

packages/app/src/components/prompt-input/image-attachments.css

@@ -1,43 +0,0 @@
-@keyframes prompt-attachments-fade-left {
-  from {
-    visibility: hidden;
-  }
-  to {
-    visibility: visible;
-  }
-}
-
-@keyframes prompt-attachments-fade-right {
-  from {
-    visibility: visible;
-  }
-  to {
-    visibility: hidden;
-  }
-}
-
-[data-slot="prompt-attachments"] {
-  timeline-scope: --prompt-attachments-scroll;
-
-  [data-slot^="prompt-attachments-fade-"] {
-    visibility: hidden;
-  }
-}
-
-@supports (animation-timeline: --prompt-attachments-scroll) and (timeline-scope: --prompt-attachments-scroll) {
-  [data-slot="prompt-attachments-scroll"] {
-    scroll-timeline: --prompt-attachments-scroll x;
-  }
-
-  [data-slot="prompt-attachments-fade-left"] {
-    animation: prompt-attachments-fade-left linear both;
-    animation-timeline: --prompt-attachments-scroll;
-    animation-range: 0 0.1px;
-  }
-
-  [data-slot="prompt-attachments-fade-right"] {
-    animation: prompt-attachments-fade-right linear both;
-    animation-timeline: --prompt-attachments-scroll;
-    animation-range: calc(100% - 1.1px) calc(100% - 1px);
-  }
-}

packages/app/src/components/prompt-input/image-attachments.tsx

@@ -1,167 +1,60 @@
 import { Component, For, Show } from "solid-js"
 import { Icon } from "@opencode-ai/ui/icon"
-import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
-import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
-import { AttachmentCardV2 } from "@opencode-ai/session-ui/v2/attachment-card-v2"
-import { CommentCardV2 } from "@opencode-ai/session-ui/v2/comment-card-v2"
-import { typeLabel } from "@opencode-ai/session-ui/message-file"
-import type { ContextItem, ImageAttachmentPart } from "@/context/prompt"
-import "./image-attachments.css"
-
-type PromptCommentItem = ContextItem & { key: string }
+import type { ImageAttachmentPart } from "@/context/prompt"
 
 type PromptImageAttachmentsProps = {
   attachments: ImageAttachmentPart[]
   onOpen: (attachment: ImageAttachmentPart) => void
   onRemove: (id: string) => void
   removeLabel: string
-  newLayoutDesigns: boolean
-  comments?: PromptCommentItem[]
-  commentActive?: (item: PromptCommentItem) => boolean
-  onOpenComment?: (item: PromptCommentItem) => void
-  onRemoveComment?: (item: PromptCommentItem) => void
 }
 
 const fallbackClass = "size-16 rounded-md bg-surface-base flex items-center justify-center border border-border-base"
 const imageClass =
   "size-16 rounded-md object-cover border border-border-base hover:border-border-strong-base transition-colors"
-const imageClassV2 = "w-[58px] h-[46px] rounded-[6px] object-cover"
-// inset box-shadows do not paint over <img> content, so the hairline is a separate overlay
-const imageHairlineClassV2 =
-  "absolute inset-0 rounded-[6px] shadow-[inset_0_0_0_0.5px_var(--v2-border-border-base)] pointer-events-none"
 const removeClass =
   "absolute -top-1.5 -right-1.5 size-5 rounded-full bg-surface-raised-stronger-non-alpha border border-border-base flex items-center justify-center opacity-0 group-hover:opacity-100 transition-opacity hover:bg-surface-raised-base-hover"
-const removeClassV2 =
-  "absolute -top-1 -right-1 size-4 rounded-full bg-v2-icon-icon-muted outline-solid outline-1 outline-v2-icon-icon-contrast flex items-center justify-center opacity-0 group-hover:opacity-100 transition-opacity"
 const nameClass = "absolute bottom-0 left-0 right-0 px-1 py-0.5 bg-black/50 rounded-b-md"
 
 export const PromptImageAttachments: Component<PromptImageAttachmentsProps> = (props) => {
   return (
-    <Show when={props.attachments.length > 0 || (props.newLayoutDesigns && (props.comments?.length ?? 0) > 0)}>
-      <div data-slot="prompt-attachments" classList={{ relative: props.newLayoutDesigns }}>
-        <div
-          data-slot="prompt-attachments-scroll"
-          classList={{
-            "flex gap-2": true,
-            "flex-nowrap overflow-x-auto no-scrollbar px-2 pt-2 pb-1": props.newLayoutDesigns,
-            "flex-wrap px-3 pt-3": !props.newLayoutDesigns,
-          }}
-        >
-          <Show when={props.newLayoutDesigns}>
-            <For each={props.comments ?? []}>
-              {(item) => (
-                <div class="relative group shrink-0">
-                  <TooltipV2
-                    value={item.comment}
-                    placement="top"
-                    openDelay={800}
-                    contentClass="max-w-[300px] break-words"
-                  >
-                    <CommentCardV2
-                      comment={item.comment ?? ""}
-                      path={item.path}
-                      selection={item.selection}
-                      active={props.commentActive?.(item)}
-                      onClick={() => props.onOpenComment?.(item)}
-                    />
-                  </TooltipV2>
-                  <button
-                    type="button"
-                    onClick={() => props.onRemoveComment?.(item)}
-                    class={removeClassV2}
-                    aria-label={props.removeLabel}
-                  >
-                    <IconV2 name="outline-xmark" class="text-v2-icon-icon-contrast" />
-                  </button>
-                </div>
-              )}
-            </For>
-          </Show>
-          <For each={props.attachments}>
-            {(attachment) => {
-              const image = attachment.mime.startsWith("image/")
-              const media = () => (
+    <Show when={props.attachments.length > 0}>
+      <div class="flex flex-wrap gap-2 px-3 pt-3">
+        <For each={props.attachments}>
+          {(attachment) => (
+            <Tooltip value={attachment.filename} placement="top" contentClass="break-all">
+              <div class="relative group">
                 <Show
-                  when={image}
+                  when={attachment.mime.startsWith("image/")}
                   fallback={
-                    <Show
-                      when={props.newLayoutDesigns}
-                      fallback={
-                        <div class={fallbackClass}>
-                          <Icon name="folder" class="size-6 text-text-weak" />
-                        </div>
-                      }
-                    >
-                      <AttachmentCardV2 title={attachment.filename}>
-                        {typeLabel(attachment.filename, attachment.mime)}
-                      </AttachmentCardV2>
-                    </Show>
+                    <div class={fallbackClass}>
+                      <Icon name="folder" class="size-6 text-text-weak" />
+                    </div>
                   }
                 >
                   <img
                     src={attachment.dataUrl}
                     alt={attachment.filename}
-                    class={props.newLayoutDesigns ? imageClassV2 : imageClass}
+                    class={imageClass}
                     onClick={() => props.onOpen(attachment)}
                   />
                 </Show>
-              )
-              const name = () => (
-                <div class={nameClass}>
-                  <span class="text-10-regular text-white truncate block">{attachment.filename}</span>
-                </div>
-              )
-              const remove = () => (
                 <button
                   type="button"
                   onClick={() => props.onRemove(attachment.id)}
-                  class={props.newLayoutDesigns ? removeClassV2 : removeClass}
+                  class={removeClass}
                   aria-label={props.removeLabel}
                 >
-                  <Show when={props.newLayoutDesigns} fallback={<Icon name="close" class="size-3 text-text-weak" />}>
-                    <IconV2 name="outline-xmark" class="text-v2-icon-icon-contrast" />
-                  </Show>
+                  <Icon name="close" class="size-3 text-text-weak" />
                 </button>
-              )
-              // v2 keeps the remove button outside the tooltip trigger so hovering it dismisses the tooltip
-              return (
-                <Show
-                  when={props.newLayoutDesigns}
-                  fallback={
-                    <Tooltip value={attachment.filename} placement="top" contentClass="break-all">
-                      <div class="relative group">
-                        {media()}
-                        {name()}
-                        {remove()}
-                      </div>
-                    </Tooltip>
-                  }
-                >
-                  <div class="relative group shrink-0">
-                    <TooltipV2 value={attachment.filename} placement="top" contentClass="break-all">
-                      {media()}
-                      <Show when={image}>
-                        <div class={imageHairlineClassV2} />
-                      </Show>
-                    </TooltipV2>
-                    {remove()}
-                  </div>
-                </Show>
-              )
-            }}
-          </For>
-        </div>
-        <Show when={props.newLayoutDesigns}>
-          <div
-            data-slot="prompt-attachments-fade-left"
-            class="pointer-events-none absolute inset-y-0 left-0 z-10 w-6 bg-[linear-gradient(to_right,var(--v2-background-bg-base),transparent)]"
-          />
-          <div
-            data-slot="prompt-attachments-fade-right"
-            class="pointer-events-none absolute inset-y-0 right-0 z-10 w-6 bg-[linear-gradient(to_left,var(--v2-background-bg-base),transparent)]"
-          />
-        </Show>
+                <div class={nameClass}>
+                  <span class="text-10-regular text-white truncate block">{attachment.filename}</span>
+                </div>
+              </div>
+            </Tooltip>
+          )}
+        </For>
       </div>
     </Show>
   )

packages/app/src/components/prompt-input/submit.test.ts

@@ -6,7 +6,7 @@ let createPromptSubmit: typeof import("./submit").createPromptSubmit
 
 const createdClients: string[] = []
 const createdSessions: string[] = []
-const enabledAutoAccept: Array<{ server: string; sessionID: string; directory: string }> = []
+const enabledAutoAccept: Array<{ sessionID: string; directory: string }> = []
 const optimistic: Array<{
   directory?: string
   sessionID?: string
@@ -27,8 +27,6 @@ let params: { id?: string } = {}
 let search: { draftId?: string } = {}
 let selected = "/repo/worktree-a"
 let variant: string | undefined
-let permissionServer = "server-a"
-let createSessionGate: Promise<void> | undefined
 
 const promptValue: Prompt = [{ type: "text", content: "ls", start: 0, end: 2 }]
 const prompt = {
@@ -58,7 +56,6 @@ const clientFor = (directory: string) => {
   return {
     session: {
       create: async () => {
-        await createSessionGate
         createdSessions.push(directory)
         return {
           data: {
@@ -84,6 +81,34 @@ const clientFor = (directory: string) => {
 
 beforeAll(async () => {
   const rootClient = clientFor("/repo/main")
+  const backend = Promise.resolve({
+    common: {
+      sessions: {
+        create: async (input: { location?: { directory?: string } }) => {
+          const directory = input.location?.directory ?? "/repo/main"
+          createdSessions.push(directory)
+          return {
+            id: `session-${createdSessions.length}`,
+            projectID: "project",
+            location: { directory },
+            title: `New session ${createdSessions.length}`,
+            cost: 0,
+            time: { created: Date.now() },
+          }
+        },
+        prompt: async () => undefined,
+        command: async () => undefined,
+        interrupt: async () => undefined,
+      },
+    },
+    capabilities: {
+      sessionExtrasV1: {
+        shell: async (input: { location?: { directory?: string } }) => {
+          sentShell.push(input.location?.directory ?? "/repo/main")
+        },
+      },
+    },
+  })
 
   mock.module("@solidjs/router", () => ({
     useNavigate: () => () => undefined,
@@ -92,13 +117,6 @@ beforeAll(async () => {
     useSearchParams: () => [search, () => undefined],
   }))
 
-  mock.module("@opencode-ai/sdk/v2/client", () => ({
-    createOpencodeClient: (input: { directory: string }) => {
-      createdClients.push(input.directory)
-      return clientFor(input.directory)
-    },
-  }))
-
   mock.module("@opencode-ai/ui/toast", () => ({
     Toast: { Region: () => null },
     showToast: () => 0,
@@ -125,14 +143,13 @@ beforeAll(async () => {
     }),
   }))
 
-  mock.module("@/context/permission", () => {
-    const state = (server: string) => ({
+  mock.module("@/context/permission", () => ({
+    usePermission: () => ({
       enableAutoAccept(sessionID: string, directory: string) {
-        enabledAutoAccept.push({ server, sessionID, directory })
+        enabledAutoAccept.push({ sessionID, directory })
       },
-    })
-    return { usePermission: () => ({ currentServerState: () => state(permissionServer) }) }
-  })
+    }),
+  }))
 
   mock.module("@/context/server", () => ({
     useServer: () => ({ key: "server-key" }),
@@ -165,6 +182,7 @@ beforeAll(async () => {
         scope: "local",
         directory: "/repo/main",
         client: rootClient,
+        backend,
         url: "http://localhost:4096",
         createClient(opts: any) {
           return clientFor(opts.directory)
@@ -255,8 +273,6 @@ beforeEach(() => {
   syncedDirectories.length = 0
   selected = "/repo/worktree-a"
   variant = undefined
-  permissionServer = "server-a"
-  createSessionGate = undefined
   for (const key of Object.keys(storedSessions)) delete storedSessions[key]
 })
 
@@ -288,7 +304,7 @@ describe("prompt submit worktree selection", () => {
     selected = "/repo/worktree-b"
     await submit.handleSubmit(event)
 
-    expect(createdClients).toEqual(["/repo/worktree-a", "/repo/worktree-b"])
+    expect(createdClients).toEqual([])
     expect(createdSessions).toEqual(["/repo/worktree-a", "/repo/worktree-b"])
     expect(sentShell).toEqual(["/repo/worktree-a", "/repo/worktree-b"])
     expect(syncedDirectories).toEqual(["/repo/worktree-a", "/repo/worktree-a", "/repo/worktree-b", "/repo/worktree-b"])
@@ -324,40 +340,7 @@ describe("prompt submit worktree selection", () => {
 
     await submit.handleSubmit(event)
 
-    expect(enabledAutoAccept).toEqual([{ server: "server-a", sessionID: "session-1", directory: "/repo/worktree-a" }])
-  })
-
-  test("keeps auto-accept bound to the submission server", async () => {
-    let release = () => {}
-    createSessionGate = new Promise<void>((resolve) => {
-      release = resolve
-    })
-    const submit = createPromptSubmit({
-      prompt,
-      info: () => undefined,
-      imageAttachments: () => [],
-      commentCount: () => 0,
-      autoAccept: () => true,
-      mode: () => "shell",
-      working: () => false,
-      editor: () => undefined,
-      queueScroll: () => undefined,
-      promptLength: (value) => value.reduce((sum, part) => sum + ("content" in part ? part.content.length : 0), 0),
-      addToHistory: () => undefined,
-      resetHistoryNavigation: () => undefined,
-      setMode: () => undefined,
-      setPopover: () => undefined,
-      newSessionWorktree: () => selected,
-      onNewSessionWorktreeReset: () => undefined,
-      onSubmit: () => undefined,
-    })
-
-    const result = submit.handleSubmit({ preventDefault: () => undefined } as unknown as Event)
-    permissionServer = "server-b"
-    release()
-    await result
-
-    expect(enabledAutoAccept).toEqual([{ server: "server-a", sessionID: "session-1", directory: "/repo/worktree-a" }])
+    expect(enabledAutoAccept).toEqual([{ sessionID: "session-1", directory: "/repo/worktree-a" }])
   })
 
   test("promotes drafts using the selected project's server", async () => {
@@ -480,7 +463,13 @@ describe("prompt submit worktree selection", () => {
 
     await submit.handleSubmit(event)
 
-    expect(storedSessions["/repo/worktree-a"]).toEqual([{ id: "session-1", title: "New session 1" }])
+    expect(storedSessions["/repo/worktree-a"]).toEqual([
+      expect.objectContaining({
+        id: "session-1",
+        title: "New session 1",
+        location: { directory: "/repo/worktree-a" },
+      }),
+    ])
     expect(optimisticSeeded).toEqual([true])
   })
 })

packages/app/src/components/prompt-input/submit.ts

@@ -1,4 +1,3 @@
-import type { Message, Session } from "@opencode-ai/sdk/v2/client"
 import { showToast } from "@/utils/toast"
 import { base64Encode } from "@opencode-ai/core/util/encode"
 import { Binary } from "@opencode-ai/core/util/binary"
@@ -11,7 +10,7 @@ import { useLayout } from "@/context/layout"
 import { useLocal, type ModelSelection } from "@/context/local"
 import { usePermission } from "@/context/permission"
 import { type ContextItem, type ImageAttachmentPart, type Prompt, type usePrompt } from "@/context/prompt"
-import { useSDK, type DirectorySDK } from "@/context/sdk"
+import { useSDK } from "@/context/sdk"
 import { useSync, type DirectorySync } from "@/context/sync"
 import { Identifier } from "@/utils/id"
 import { Worktree as WorktreeState } from "@/utils/worktree"
@@ -20,6 +19,7 @@ import { setCursorPosition } from "./editor-dom"
 import { formatServerError } from "@/utils/server-errors"
 import { ScopedKey } from "@/utils/server-scope"
 import { createPromptSubmissionState } from "./submission-state"
+import type { AppClient, AppMessage, AppSession } from "@/context/backend"
 
 type PendingPrompt = {
   abort: AbortController
@@ -39,13 +39,14 @@ export type FollowupDraft = {
 }
 
 type FollowupSendInput = {
-  client: DirectorySDK["client"]
+  backend: Promise<AppClient>
   serverSync: ServerSync
   sync: DirectorySync
   draft: FollowupDraft
   messageID?: string
   optimisticBusy?: boolean
   before?: () => Promise<boolean> | boolean
+  commitRevert?: boolean
 }
 
 const draftText = (prompt: Prompt) => prompt.map((part) => ("content" in part ? part.content : "")).join("")
@@ -53,6 +54,8 @@ const draftText = (prompt: Prompt) => prompt.map((part) => ("content" in part ?
 const draftImages = (prompt: Prompt) => prompt.filter((part): part is ImageAttachmentPart => part.type === "image")
 
 export async function sendFollowupDraft(input: FollowupSendInput) {
+  const backend = await input.backend
+  const location = { directory: input.draft.sessionDirectory }
   const text = draftText(input.draft.prompt)
   const images = draftImages(input.draft.prompt)
   const setBusy = () => {
@@ -81,19 +84,26 @@ export async function sendFollowupDraft(input: FollowupSendInput) {
         return false
       }
 
-      await input.client.session.command({
+      if (input.commitRevert)
+        await backend.capabilities.sessionExtrasV2?.commitRevert({ location, sessionID: input.draft.sessionID })
+      const capability = backend.capabilities.sessionActionsV1
+      if (!capability) throw new Error("Commands are not supported by this server")
+      await capability.command({
+        location,
         sessionID: input.draft.sessionID,
+        id: input.messageID,
         command: cmd,
         arguments: tail.join(" "),
         agent: input.draft.agent,
-        model: `${input.draft.model.providerID}/${input.draft.model.modelID}`,
-        variant: input.draft.variant,
-        parts: images.map((attachment) => ({
-          id: Identifier.ascending("part"),
-          type: "file" as const,
+        model: {
+          providerID: input.draft.model.providerID,
+          id: input.draft.model.modelID,
+          variant: input.draft.variant,
+        },
+        files: images.map((attachment) => ({
+          uri: attachment.dataUrl,
           mime: attachment.mime,
-          url: attachment.dataUrl,
-          filename: attachment.filename,
+          name: attachment.filename,
         })),
       })
       return true
@@ -114,7 +124,7 @@ export async function sendFollowupDraft(input: FollowupSendInput) {
     sessionDirectory: input.draft.sessionDirectory,
   })
 
-  const message: Message = {
+  const message: AppMessage = {
     id: messageID,
     sessionID: input.draft.sessionID,
     role: "user",
@@ -152,13 +162,22 @@ export async function sendFollowupDraft(input: FollowupSendInput) {
       return false
     }
 
-    await input.client.session.promptAsync({
+    if (input.commitRevert)
+      await backend.capabilities.sessionExtrasV2?.commitRevert({ location, sessionID: input.draft.sessionID })
+    await backend.common.sessions.prompt({
+      location,
       sessionID: input.draft.sessionID,
-      agent: input.draft.agent,
-      model: input.draft.model,
-      messageID,
+      id: messageID,
+      text,
       parts: requestParts,
-      variant: input.draft.variant,
+      selection: {
+        agent: input.draft.agent,
+        model: {
+          providerID: input.draft.model.providerID,
+          id: input.draft.model.modelID,
+          variant: input.draft.variant,
+        },
+      },
     })
     return true
   } catch (err) {
@@ -172,7 +191,7 @@ export async function sendFollowupDraft(input: FollowupSendInput) {
 
 type PromptSubmitInput = {
   prompt: ReturnType<typeof usePrompt>
-  info: Accessor<{ id: string } | undefined>
+  info: Accessor<{ id: string; revert?: { messageID: string } } | undefined>
   imageAttachments: Accessor<ImageAttachmentPart[]>
   commentCount: Accessor<number>
   autoAccept: Accessor<boolean>
@@ -233,9 +252,9 @@ export function createPromptSubmit(input: PromptSubmitInput) {
       return Promise.resolve()
     }
     return sdk()
-      .client.session.abort({
-        sessionID,
-      })
+      .backend.then((client) =>
+        client.common.sessions.interrupt({ location: { directory: sdk().directory }, sessionID }),
+      )
       .catch(() => {})
   }
 
@@ -262,10 +281,10 @@ export function createPromptSubmit(input: PromptSubmitInput) {
     }
   }
 
-  const seed = (dir: string, info: Session) => {
+  const seed = (dir: string, info: AppSession) => {
     serverSync().session.remember(info)
     const [, setStore] = serverSync().child(dir)
-    setStore("session", (list: Session[]) => {
+    setStore("session", (list: AppSession[]) => {
       const result = Binary.search(list, info.id, (item) => item.id)
       const next = [...list]
       if (result.found) {
@@ -313,20 +332,18 @@ export function createPromptSubmit(input: PromptSubmitInput) {
     input.resetHistoryNavigation()
 
     const projectDirectory = sdk().directory
-    const permissionState = permission.currentServerState()
+    const backend = await sdk().backend
     const isNewSession = !params.id
     const shouldAutoAccept = isNewSession && input.autoAccept()
     const worktreeSelection = input.newSessionWorktree?.() || "main"
 
     let sessionDirectory = projectDirectory
-    let client = sdk().client
 
     if (isNewSession) {
       if (worktreeSelection === "create") {
-        const createdWorktree = await client.worktree
-          .create({ directory: projectDirectory })
-          .then((x) => x.data)
-          .catch((err) => {
+        const createdWorktree = await backend.capabilities.worktreesV1
+          ?.create({ location: { directory: projectDirectory } })
+          .catch((err: unknown) => {
             showToast({
               title: language.t("prompt.toast.worktreeCreateFailed.title"),
               description: errorMessage(err),
@@ -350,10 +367,6 @@ export function createPromptSubmit(input: PromptSubmitInput) {
       }
 
       if (sessionDirectory !== projectDirectory) {
-        client = sdk().createClient({
-          directory: sessionDirectory,
-          throwOnError: true,
-        })
         serverSync().child(sessionDirectory)
       }
 
@@ -362,9 +375,10 @@ export function createPromptSubmit(input: PromptSubmitInput) {
 
     let session = input.info()
     if (!session && isNewSession) {
-      const created = await client.session
-        .create()
-        .then((x) => x.data ?? undefined)
+      const created = await sdk()
+        .backend.then((backend) =>
+          backend.common.sessions.create({ location: { directory: sessionDirectory } }),
+        )
         .catch((err) => {
           showToast({
             title: language.t("prompt.toast.sessionCreateFailed.title"),
@@ -377,7 +391,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
         session = created
         await startTransition(() => {
           if (!session) return
-          if (shouldAutoAccept) permissionState.enableAutoAccept(session.id, sessionDirectory)
+          if (shouldAutoAccept) permission.enableAutoAccept(session.id, sessionDirectory)
           local.session.promote(sessionDirectory, session.id, {
             agent: currentAgent.name,
             model: { providerID: currentModel.provider.id, modelID: currentModel.id },
@@ -448,12 +462,22 @@ export function createPromptSubmit(input: PromptSubmitInput) {
 
     if (mode === "shell") {
       clearInput()
-      client.session
-        .shell({
-          sessionID: session.id,
-          agent,
-          model,
-          command: text,
+      sdk()
+        .backend.then(async (backend) => {
+          const location = { directory: sessionDirectory }
+          if (session.revert)
+            await backend.capabilities.sessionExtrasV2?.commitRevert({ location, sessionID: session.id })
+          if (backend.capabilities.sessionExtrasV1)
+            return backend.capabilities.sessionExtrasV1.shell({
+              location,
+              sessionID: session.id,
+              agent,
+              model: { id: model.modelID, providerID: model.providerID },
+              command: text,
+            })
+          if (backend.capabilities.sessionExtrasV2?.shell)
+            return backend.capabilities.sessionExtrasV2.shell({ location, sessionID: session.id, command: text })
+          throw new Error("Shell prompts are not supported by this server")
         })
         .catch((err) => {
           showToast({
@@ -471,21 +495,27 @@ export function createPromptSubmit(input: PromptSubmitInput) {
       const customCommand = sync().data.command.find((c) => c.name === commandName)
       if (customCommand) {
         clearInput()
-        client.session
-          .command({
-            sessionID: session.id,
-            command: commandName,
-            arguments: args.join(" "),
-            agent,
-            model: `${model.providerID}/${model.modelID}`,
-            variant,
-            parts: images.map((attachment) => ({
-              id: Identifier.ascending("part"),
-              type: "file" as const,
-              mime: attachment.mime,
-              url: attachment.dataUrl,
-              filename: attachment.filename,
-            })),
+        sdk()
+          .backend.then(async (backend) => {
+            const location = { directory: sessionDirectory }
+            if (session.revert)
+              await backend.capabilities.sessionExtrasV2?.commitRevert({ location, sessionID: session.id })
+            const capability = backend.capabilities.sessionActionsV1
+            if (!capability) throw new Error("Commands are not supported by this server")
+            return capability.command({
+              location,
+              sessionID: session.id,
+              id: Identifier.ascending("message"),
+              command: commandName,
+              arguments: args.join(" "),
+              agent,
+              model: { id: model.modelID, providerID: model.providerID, variant },
+              files: images.map((attachment) => ({
+                uri: attachment.dataUrl,
+                mime: attachment.mime,
+                name: attachment.filename,
+              })),
+            })
           })
           .catch((err) => {
             showToast({
@@ -571,12 +601,13 @@ export function createPromptSubmit(input: PromptSubmitInput) {
     }
 
     void sendFollowupDraft({
-      client,
+      backend: sdk().backend,
       sync: sync(),
       serverSync: serverSync(),
       draft,
       messageID,
       optimisticBusy: sessionDirectory === projectDirectory,
+      commitRevert: !!session.revert,
       before: waitForWorktree,
     }).catch((err) => {
       pending.delete(pendingKey(session.id))

packages/app/src/components/prompt-project-selector.tsx

@@ -1,13 +1,4 @@
-import {
-  createEffect,
-  createSignal,
-  For,
-  onCleanup,
-  Show,
-  splitProps,
-  type Accessor,
-  type ComponentProps,
-} from "solid-js"
+import { createEffect, For, onCleanup, Show, splitProps, type Accessor, type ComponentProps } from "solid-js"
 import { createStore } from "solid-js/store"
 import { DropdownMenu } from "@opencode-ai/ui/dropdown-menu"
 import { Icon } from "@opencode-ai/ui/icon"
@@ -193,28 +184,9 @@ export function PromptProjectSelector(props: {
   controller: PromptProjectController
   placement?: "bottom" | "bottom-start"
 }) {
-  const [triggerReady, setTriggerReady] = createSignal(false)
   let contentRef: HTMLDivElement | undefined
-  let triggerFrame: number | undefined
   let restoreTrigger = true
 
-  // Floating UI requires a connected anchor; route transitions can construct this trigger before adoption.
-  const setTriggerRef = (element: HTMLButtonElement) => {
-    const ready = () => {
-      if (!element.isConnected) {
-        triggerFrame = requestAnimationFrame(ready)
-        return
-      }
-      triggerFrame = undefined
-      setTriggerReady(true)
-    }
-    ready()
-  }
-
-  onCleanup(() => {
-    if (triggerFrame !== undefined) cancelAnimationFrame(triggerFrame)
-  })
-
   const activeItem = () =>
     props.controller.active()
       ? contentRef?.querySelector<HTMLElement>(`[data-option-key="${CSS.escape(props.controller.active())}"]`)
@@ -285,13 +257,13 @@ export function PromptProjectSelector(props: {
 
   return (
     <DropdownMenu
-      open={triggerReady() && props.controller.open()}
+      open={props.controller.open()}
       placement={props.placement ?? "bottom"}
       gutter={4}
       modal={false}
       onOpenChange={(open) => props.controller.setOpen(open)}
     >
-      <DropdownMenu.Trigger as={ProjectTrigger} ref={setTriggerRef} controller={props.controller} />
+      <DropdownMenu.Trigger as={ProjectTrigger} controller={props.controller} />
       <DropdownMenu.Portal>
         <DropdownMenu.Content
           ref={contentRef}

packages/app/src/components/prompt-workspace-selector.tsx

@@ -1,6 +1,5 @@
 import { For, Show } from "solid-js"
 import { MenuV2 } from "@opencode-ai/ui/v2/menu-v2"
-import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
 import { Icon } from "@opencode-ai/ui/icon"
 import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
 import { getFilename } from "@opencode-ai/core/util/path"
@@ -97,17 +96,10 @@ export function PromptWorkspaceSelector(props: {
         {(branch) => (
           <>
             <span class="hidden select-none opacity-50 sm:inline mx-1">/</span>
-            <TooltipV2
-              placement="top"
-              value={branch()}
-              class="min-w-0 max-w-[220px]"
-              contentClass="max-w-[calc(100vw-32px)] break-all"
-            >
-              <div class="flex h-7 min-w-0 max-w-[220px] items-center gap-1.5 px-2 text-[13px] font-[440] leading-5 tracking-[-0.04px]">
-                <Icon name="branch" size="small" class="shrink-0 text-v2-icon-icon-muted" />
-                <span class="min-w-0 truncate">{branch()}</span>
-              </div>
-            </TooltipV2>
+            <div class="flex h-7 min-w-0 max-w-[220px] items-center gap-1.5 px-2 text-[13px] font-[440] leading-5 tracking-[-0.04px]">
+              <Icon name="branch" size="small" class="shrink-0 text-v2-icon-icon-muted" />
+              <span class="min-w-0 truncate">{branch()}</span>
+            </div>
           </>
         )}
       </Show>

packages/app/src/components/session/index.ts

@@ -1,7 +1,6 @@
 export { SessionHeader } from "./session-header"
 export { SessionContextTab } from "./session-context-tab"
 export { SortableTab, FileVisual } from "./session-sortable-tab"
-export { SortableTabV2 } from "./session-sortable-tab-v2"
 export { SortableTerminalTab } from "./session-sortable-terminal-tab"
 export { NewSessionView } from "./session-new-view"
 export { NewSessionDesignView } from "./session-new-design-view"

packages/app/src/components/session/open-in-app-v2.tsx

@@ -1,98 +0,0 @@
-import { For, Show } from "solid-js"
-import { AppIcon } from "@opencode-ai/ui/app-icon"
-import { Icon } from "@opencode-ai/ui/icon"
-import { Spinner } from "@opencode-ai/ui/spinner"
-import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
-import { MenuV2 } from "@opencode-ai/ui/v2/menu-v2"
-import { SplitButtonV2, SplitButtonV2Action, SplitButtonV2MenuTrigger } from "@opencode-ai/ui/v2/split-button-v2"
-import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
-import { useLanguage } from "@/context/language"
-import { type OpenApp, useOpenInApp } from "@/components/session/open-in-app"
-
-export function OpenInAppV2(props: { directory: () => string }) {
-  const language = useLanguage()
-  const state = useOpenInApp(props)
-
-  return (
-    <Show when={props.directory() && state.canOpen()}>
-      <SplitButtonV2 class="session-review-v2-open-in-app" onPointerDown={(event) => event.stopPropagation()}>
-        <TooltipV2
-          placement="bottom"
-          value={language.t("session.header.open.ariaLabel", { app: state.current().label })}
-          class="flex items-center"
-        >
-          <SplitButtonV2Action
-            onPointerDown={(event) => event.stopPropagation()}
-            onClick={(event) => {
-              event.stopPropagation()
-              if (state.opening()) return
-              state.openDir(state.current().id)
-            }}
-            disabled={state.opening()}
-            aria-label={language.t("session.header.open.ariaLabel", { app: state.current().label })}
-          >
-            <Show when={state.opening()} fallback={<AppIcon id={state.current().icon} class="size-[18px]" />}>
-              <Spinner class="size-3.5" />
-            </Show>
-          </SplitButtonV2Action>
-        </TooltipV2>
-        <MenuV2
-          gutter={4}
-          modal={false}
-          placement="bottom-end"
-          open={state.menu.open}
-          onOpenChange={(open) => state.setMenu("open", open)}
-        >
-          <MenuV2.Trigger
-            as={SplitButtonV2MenuTrigger}
-            disabled={state.opening()}
-            aria-label={language.t("session.header.open.menu")}
-            onPointerDown={(event) => event.stopPropagation()}
-          >
-            <IconV2 name="chevron-down" size="small" />
-          </MenuV2.Trigger>
-          <MenuV2.Portal>
-            <MenuV2.Content class="open-in-app-v2-menu">
-              <MenuV2.Group>
-                <MenuV2.GroupLabel>{language.t("session.header.openIn")}</MenuV2.GroupLabel>
-                <MenuV2.RadioGroup
-                  value={state.current().id}
-                  onChange={(value) => {
-                    state.selectApp(value as OpenApp)
-                  }}
-                >
-                  <For each={state.options()}>
-                    {(option) => (
-                      <MenuV2.RadioItem
-                        value={option.id}
-                        disabled={state.opening()}
-                        onSelect={() => {
-                          state.selectApp(option.id)
-                          state.setMenu("open", false)
-                          state.openDir(option.id)
-                        }}
-                      >
-                        <AppIcon id={option.icon} />
-                        {option.label}
-                      </MenuV2.RadioItem>
-                    )}
-                  </For>
-                </MenuV2.RadioGroup>
-              </MenuV2.Group>
-              <MenuV2.Separator />
-              <MenuV2.Item
-                onSelect={() => {
-                  state.setMenu("open", false)
-                  state.copyPath()
-                }}
-              >
-                <Icon name="copy" size="small" class="text-icon-weak" />
-                {language.t("session.header.open.copyPath")}
-              </MenuV2.Item>
-            </MenuV2.Content>
-          </MenuV2.Portal>
-        </MenuV2>
-      </SplitButtonV2>
-    </Show>
-  )
-}

packages/app/src/components/session/open-in-app.tsx

@@ -1,229 +0,0 @@
-import { createEffect, createMemo } from "solid-js"
-import { createStore } from "solid-js/store"
-import { useLanguage } from "@/context/language"
-import { usePlatform } from "@/context/platform"
-import { useServer } from "@/context/server"
-import { Persist, persisted } from "@/utils/persist"
-import { showToast } from "@/utils/toast"
-
-export const OPEN_APPS = [
-  "vscode",
-  "cursor",
-  "zed",
-  "textmate",
-  "antigravity",
-  "finder",
-  "terminal",
-  "iterm2",
-  "ghostty",
-  "warp",
-  "xcode",
-  "android-studio",
-  "powershell",
-  "sublime-text",
-] as const
-
-export type OpenApp = (typeof OPEN_APPS)[number]
-export type OpenAppOS = "macos" | "windows" | "linux" | "unknown"
-
-export const MAC_OPEN_APPS = [
-  {
-    id: "vscode",
-    label: "session.header.open.app.vscode",
-    icon: "vscode",
-    openWith: "Visual Studio Code",
-  },
-  { id: "cursor", label: "session.header.open.app.cursor", icon: "cursor", openWith: "Cursor" },
-  { id: "zed", label: "session.header.open.app.zed", icon: "zed", openWith: "Zed" },
-  { id: "textmate", label: "session.header.open.app.textmate", icon: "textmate", openWith: "TextMate" },
-  {
-    id: "antigravity",
-    label: "session.header.open.app.antigravity",
-    icon: "antigravity",
-    openWith: "Antigravity",
-  },
-  { id: "terminal", label: "session.header.open.app.terminal", icon: "terminal", openWith: "Terminal" },
-  { id: "iterm2", label: "session.header.open.app.iterm2", icon: "iterm2", openWith: "iTerm" },
-  { id: "ghostty", label: "session.header.open.app.ghostty", icon: "ghostty", openWith: "Ghostty" },
-  { id: "warp", label: "session.header.open.app.warp", icon: "warp", openWith: "Warp" },
-  { id: "xcode", label: "session.header.open.app.xcode", icon: "xcode", openWith: "Xcode" },
-  {
-    id: "android-studio",
-    label: "session.header.open.app.androidStudio",
-    icon: "android-studio",
-    openWith: "Android Studio",
-  },
-  {
-    id: "sublime-text",
-    label: "session.header.open.app.sublimeText",
-    icon: "sublime-text",
-    openWith: "Sublime Text",
-  },
-] as const
-
-export const WINDOWS_OPEN_APPS = [
-  { id: "vscode", label: "session.header.open.app.vscode", icon: "vscode", openWith: "code" },
-  { id: "cursor", label: "session.header.open.app.cursor", icon: "cursor", openWith: "cursor" },
-  { id: "zed", label: "session.header.open.app.zed", icon: "zed", openWith: "zed" },
-  {
-    id: "powershell",
-    label: "session.header.open.app.powershell",
-    icon: "powershell",
-    openWith: "powershell",
-  },
-  {
-    id: "sublime-text",
-    label: "session.header.open.app.sublimeText",
-    icon: "sublime-text",
-    openWith: "Sublime Text",
-  },
-] as const
-
-export const LINUX_OPEN_APPS = [
-  { id: "vscode", label: "session.header.open.app.vscode", icon: "vscode", openWith: "code" },
-  { id: "cursor", label: "session.header.open.app.cursor", icon: "cursor", openWith: "cursor" },
-  { id: "zed", label: "session.header.open.app.zed", icon: "zed", openWith: "zed" },
-  {
-    id: "sublime-text",
-    label: "session.header.open.app.sublimeText",
-    icon: "sublime-text",
-    openWith: "Sublime Text",
-  },
-] as const
-
-export function detectOpenAppOS(platform: ReturnType<typeof usePlatform>): OpenAppOS {
-  if (platform.platform === "desktop" && platform.os) return platform.os
-  if (typeof navigator !== "object") return "unknown"
-  const value = navigator.platform || navigator.userAgent
-  if (/Mac/i.test(value)) return "macos"
-  if (/Win/i.test(value)) return "windows"
-  if (/Linux/i.test(value)) return "linux"
-  return "unknown"
-}
-
-export function openAppFileManager(os: OpenAppOS) {
-  if (os === "macos") return { label: "session.header.open.finder", icon: "finder" as const }
-  if (os === "windows") return { label: "session.header.open.fileExplorer", icon: "file-explorer" as const }
-  return { label: "session.header.open.fileManager", icon: "finder" as const }
-}
-
-export function openAppsForOS(os: OpenAppOS) {
-  if (os === "macos") return MAC_OPEN_APPS
-  if (os === "windows") return WINDOWS_OPEN_APPS
-  return LINUX_OPEN_APPS
-}
-
-const showRequestError = (language: ReturnType<typeof useLanguage>, err: unknown) => {
-  showToast({
-    variant: "error",
-    title: language.t("common.requestFailed"),
-    description: err instanceof Error ? err.message : String(err),
-  })
-}
-
-export function useOpenInApp(input: { directory: () => string }) {
-  const platform = usePlatform()
-  const server = useServer()
-  const language = useLanguage()
-
-  const os = createMemo(() => detectOpenAppOS(platform))
-  const apps = createMemo(() => openAppsForOS(os()))
-  const fileManager = createMemo(() => openAppFileManager(os()))
-
-  const [exists, setExists] = createStore<Partial<Record<OpenApp, boolean>>>({
-    finder: true,
-  })
-
-  createEffect(() => {
-    if (platform.platform !== "desktop") return
-    if (!platform.checkAppExists) return
-
-    const list = apps()
-
-    setExists(Object.fromEntries(list.map((app) => [app.id, undefined])) as Partial<Record<OpenApp, boolean>>)
-
-    void Promise.all(
-      list.map((app) =>
-        Promise.resolve(platform.checkAppExists?.(app.openWith))
-          .then((value) => Boolean(value))
-          .catch(() => false)
-          .then((ok) => [app.id, ok] as const),
-      ),
-    ).then((entries) => {
-      setExists(Object.fromEntries(entries) as Partial<Record<OpenApp, boolean>>)
-    })
-  })
-
-  const options = createMemo(() => {
-    return [
-      { id: "finder", label: language.t(fileManager().label), icon: fileManager().icon },
-      ...apps()
-        .filter((app) => exists[app.id])
-        .map((app) => ({ ...app, label: language.t(app.label) })),
-    ] as const
-  })
-
-  const [prefs, setPrefs] = persisted(Persist.global("open.app"), createStore({ app: "finder" as OpenApp | "finder" }))
-  const [menu, setMenu] = createStore({ open: false })
-  const [openRequest, setOpenRequest] = createStore({
-    app: undefined as OpenApp | undefined,
-  })
-
-  const canOpen = createMemo(() => platform.platform === "desktop" && !!platform.openPath && server.isLocal())
-  const current = createMemo(
-    () =>
-      options().find((o) => o.id === prefs.app) ??
-      options()[0] ??
-      ({ id: "finder", label: fileManager().label, icon: fileManager().icon } as const),
-  )
-  const opening = createMemo(() => openRequest.app !== undefined)
-
-  const selectApp = (app: OpenApp | "finder") => {
-    if (!options().some((item) => item.id === app)) return
-    setPrefs("app", app)
-  }
-
-  const openDir = (app: OpenApp | "finder") => {
-    if (opening() || !canOpen() || !platform.openPath) return
-    const directory = input.directory()
-    if (!directory) return
-
-    const item = options().find((o) => o.id === app)
-    const openWith = item && "openWith" in item ? item.openWith : undefined
-    setOpenRequest("app", app)
-    platform
-      .openPath(directory, openWith)
-      .catch((err: unknown) => showRequestError(language, err))
-      .finally(() => {
-        setOpenRequest("app", undefined)
-      })
-  }
-
-  const copyPath = () => {
-    const directory = input.directory()
-    if (!directory) return
-    navigator.clipboard
-      .writeText(directory)
-      .then(() => {
-        showToast({
-          variant: "success",
-          icon: "circle-check",
-          title: language.t("session.share.copy.copied"),
-          description: directory,
-        })
-      })
-      .catch((err: unknown) => showRequestError(language, err))
-  }
-
-  return {
-    canOpen,
-    opening,
-    current,
-    options,
-    menu,
-    setMenu,
-    openDir,
-    selectApp,
-    copyPath,
-  }
-}

packages/app/src/components/session/session-context-breakdown.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import type { Message, Part } from "@opencode-ai/sdk/v2/client"
+import type { AppMessage as Message, AppPart as Part } from "@/context/backend"
 import { estimateSessionContextBreakdown } from "./session-context-breakdown"
 
 const user = (id: string) => {

packages/app/src/components/session/session-context-breakdown.ts

@@ -1,4 +1,4 @@
-import type { Message, Part } from "@opencode-ai/sdk/v2/client"
+import type { AppMessage, AppPart } from "@/context/backend"
 
 export type SessionContextBreakdownKey = "system" | "user" | "assistant" | "tool" | "other"
 
@@ -13,14 +13,14 @@ const estimateTokens = (chars: number) => Math.ceil(chars / 4)
 const toPercent = (tokens: number, input: number) => (tokens / input) * 100
 const toPercentLabel = (tokens: number, input: number) => Math.round(toPercent(tokens, input) * 10) / 10
 
-const charsFromUserPart = (part: Part) => {
+const charsFromUserPart = (part: AppPart) => {
   if (part.type === "text") return part.text.length
   if (part.type === "file") return part.source?.text.value.length ?? 0
   if (part.type === "agent") return part.source?.value.length ?? 0
   return 0
 }
 
-const charsFromAssistantPart = (part: Part) => {
+const charsFromAssistantPart = (part: AppPart) => {
   if (part.type === "text") return { assistant: part.text.length, tool: 0 }
   if (part.type === "reasoning") return { assistant: part.text.length, tool: 0 }
   if (part.type !== "tool") return { assistant: 0, tool: 0 }
@@ -68,8 +68,8 @@ const build = (
 }
 
 export function estimateSessionContextBreakdown(args: {
-  messages: Message[]
-  parts: Record<string, Part[] | undefined>
+  messages: AppMessage[]
+  parts: Record<string, AppPart[] | undefined>
   input: number
   systemPrompt?: string
 }) {

packages/app/src/components/session/session-context-metrics.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import type { Message } from "@opencode-ai/sdk/v2/client"
+import type { AppMessage as Message } from "@/context/backend"
 import { getSessionContext } from "./session-context-metrics"
 
 const assistant = (

packages/app/src/components/session/session-context-metrics.ts

@@ -1,4 +1,4 @@
-import type { AssistantMessage, Message } from "@opencode-ai/sdk/v2/client"
+import type { AppAssistantMessage, AppMessage } from "@/context/backend"
 
 type Provider = {
   id: string
@@ -14,7 +14,7 @@ type Model = {
 }
 
 type Context = {
-  message: AssistantMessage
+  message: AppAssistantMessage
   provider?: Provider
   model?: Model
   providerLabel: string
@@ -25,11 +25,11 @@ type Context = {
   usage: number | null
 }
 
-const tokenTotal = (msg: AssistantMessage) => {
+const tokenTotal = (msg: AppAssistantMessage) => {
   return msg.tokens.input + msg.tokens.output + msg.tokens.reasoning + msg.tokens.cache.read + msg.tokens.cache.write
 }
 
-const lastAssistantWithTokens = (messages: Message[]) => {
+const lastAssistantWithTokens = (messages: AppMessage[]) => {
   for (let i = messages.length - 1; i >= 0; i--) {
     const msg = messages[i]
     if (msg.role !== "assistant") continue
@@ -38,7 +38,7 @@ const lastAssistantWithTokens = (messages: Message[]) => {
   }
 }
 
-const build = (messages: Message[] = [], providers: Provider[] = []): Context | undefined => {
+const build = (messages: AppMessage[] = [], providers: Provider[] = []): Context | undefined => {
   const message = lastAssistantWithTokens(messages)
   if (!message) return undefined
 
@@ -60,6 +60,6 @@ const build = (messages: Message[] = [], providers: Provider[] = []): Context |
   }
 }
 
-export function getSessionContext(messages: Message[] = [], providers: Provider[] = []) {
+export function getSessionContext(messages: AppMessage[] = [], providers: Provider[] = []) {
   return build(messages, providers)
 }

packages/app/src/components/session/session-context-tab.tsx

@@ -10,7 +10,7 @@ import { StickyAccordionHeader } from "@opencode-ai/ui/sticky-accordion-header"
 import { File } from "@opencode-ai/session-ui/file"
 import { Markdown } from "@opencode-ai/session-ui/markdown"
 import { ScrollView } from "@opencode-ai/ui/scroll-view"
-import type { Message, Part, UserMessage } from "@opencode-ai/sdk/v2/client"
+import type { AppMessage as Message, AppPart as Part, AppUserMessage as UserMessage } from "@/context/backend"
 import { useLanguage } from "@/context/language"
 import { useProviders } from "@/hooks/use-providers"
 import { useSDK } from "@/context/sdk"

packages/app/src/components/session/session-new-design-view.tsx

@@ -7,7 +7,7 @@ export function NewSessionDesignView(props: { children: JSX.Element }) {
     <div data-component="session-new-design" class="relative size-full overflow-hidden bg-v2-background-bg-deep ">
       <div class="absolute inset-x-0 top-[25.375%] flex justify-center px-6">
         <div class={NEW_SESSION_CONTENT_WIDTH}>
-          <WordmarkV2 class="h-auto w-full text-v2-background-bg-inverse" />
+          <WordmarkV2 class="h-auto w-full text-v2-icon-icon-base" />
           <div class="mt-8">{props.children}</div>
         </div>
       </div>

packages/app/src/components/session/session-sortable-tab-v2.tsx

@@ -1,66 +0,0 @@
-import { createMemo, Show } from "solid-js"
-import type { JSX } from "solid-js"
-import { useSortable } from "@dnd-kit/solid/sortable"
-import { IconButton } from "@opencode-ai/ui/icon-button"
-import { TooltipKeybind } from "@opencode-ai/ui/tooltip"
-import { Tabs } from "@opencode-ai/ui/tabs"
-import { useFile } from "@/context/file"
-import { useLanguage } from "@/context/language"
-import { useCommand } from "@/context/command"
-import { FileVisual } from "./session-sortable-tab"
-
-export function SortableTabV2(props: {
-  tab: string
-  index: () => number
-  temporary?: boolean
-  onTabClose: (tab: string) => void
-  onTabDoubleClick?: (tab: string) => void
-}): JSX.Element {
-  const file = useFile()
-  const language = useLanguage()
-  const command = useCommand()
-  const sortable = useSortable({
-    get id() {
-      return props.tab
-    },
-    get index() {
-      return props.index()
-    },
-  })
-  const path = createMemo(() => file.pathFromTab(props.tab))
-  const content = createMemo(() => {
-    const value = path()
-    if (!value) return
-    return <FileVisual path={value} temporary={props.temporary} />
-  })
-  return (
-    <div ref={sortable.ref} class="h-full flex items-center">
-      <div class="relative">
-        <Tabs.Trigger
-          value={props.tab}
-          closeButton={
-            <TooltipKeybind
-              title={language.t("common.closeTab")}
-              keybind={command.keybind("tab.close")}
-              placement="bottom"
-              gutter={10}
-            >
-              <IconButton
-                icon="close-small"
-                variant="ghost"
-                class="h-5 w-5"
-                onClick={() => props.onTabClose(props.tab)}
-                aria-label={language.t("common.closeTab")}
-              />
-            </TooltipKeybind>
-          }
-          hideCloseButton
-          onMiddleClick={() => props.onTabClose(props.tab)}
-          onDblClick={() => props.onTabDoubleClick?.(props.tab)}
-        >
-          <Show when={content()}>{(value) => value()}</Show>
-        </Tabs.Trigger>
-      </div>
-    </div>
-  )
-}

packages/app/src/components/session/session-sortable-terminal-tab-v2.tsx

@@ -65,12 +65,9 @@ export function SortableTerminalTabV2(props: {
 
   const focus = () => {
     if (store.editing) return
-    terminal.requestFocus(props.terminal.id)
     terminal.open(props.terminal.id)
     if (document.activeElement instanceof HTMLElement) document.activeElement.blur()
     focusTerminalById(props.terminal.id)
-    const input = document.getElementById(`terminal-wrapper-${props.terminal.id}`)?.querySelector("textarea")
-    if (input === document.activeElement) terminal.consumeFocus(props.terminal.id)
   }
 
   const edit = (e?: Event) => {

packages/app/src/components/settings-general.tsx

@@ -5,7 +5,6 @@ import { Select } from "@opencode-ai/ui/select"
 import { Switch } from "@opencode-ai/ui/switch"
 import { TextField } from "@opencode-ai/ui/text-field"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
-import { Tag } from "@opencode-ai/ui/v2/badge-v2"
 import { useTheme, type ColorScheme } from "@opencode-ai/ui/theme/context"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { useParams } from "@solidjs/router"
@@ -127,11 +126,11 @@ export const SettingsGeneral: Component = () => {
   const serverSdk = useServerSDK()
 
   const [shells] = createResource(
-    () =>
-      serverSdk()
-        .client.pty.shells()
-        .then((res) => res.data ?? [])
-        .catch(() => [] as ShellOption[]),
+    async () => {
+      const capability = (await serverSdk().backend).capabilities.shellDiscovery
+      if (!capability) return []
+      return capability.list().catch(() => [] as ShellOption[])
+    },
     { initialValue: [] as ShellOption[] },
   )
 
@@ -249,50 +248,6 @@ export const SettingsGeneral: Component = () => {
     triggerVariant: "settings" as const,
   })
 
-  const InterfaceSection = () => (
-    <div class="flex flex-col gap-1">
-      <SettingsList>
-        <SettingsRow
-          title={
-            <span class="flex items-center gap-2">
-              {language.t("settings.general.row.newInterface.title")}
-              <Tag variant="accent">{language.t("settings.general.row.newInterface.badge")}</Tag>
-            </span>
-          }
-          description={language.t("settings.general.row.newInterface.description")}
-        >
-          <div data-action="settings-new-layout-designs">
-            <Switch
-              checked={settings.general.newLayoutDesigns()}
-              onChange={(checked) => {
-                settings.general.setNewLayoutDesigns(checked)
-                if (!checked) return
-                void import("@/components/settings-v2").then((module) => {
-                  void dialog.show(() => <module.DialogSettings />)
-                })
-              }}
-            />
-          </div>
-        </SettingsRow>
-      </SettingsList>
-    </div>
-  )
-
-  const InterfaceNoticeSection = () => (
-    <div class="flex flex-col gap-1">
-      <SettingsList>
-        <SettingsRow
-          title={language.t("settings.general.row.newInterfaceNotice.title")}
-          description={language.t("settings.general.row.newInterfaceNotice.description")}
-        >
-          <Button size="small" variant="ghost" onClick={settings.general.dismissNewInterfaceNotice}>
-            {language.t("settings.general.row.newInterfaceNotice.dismiss")}
-          </Button>
-        </SettingsRow>
-      </SettingsList>
-    </div>
-  )
-
   const GeneralSection = () => (
     <div class="flex flex-col gap-1">
       <SettingsList>
@@ -379,6 +334,24 @@ export const SettingsGeneral: Component = () => {
             />
           </div>
         </SettingsRow>
+
+        <SettingsRow
+          title={language.t("settings.general.row.newLayoutDesigns.title")}
+          description={language.t("settings.general.row.newLayoutDesigns.description")}
+        >
+          <div data-action="settings-new-layout-designs">
+            <Switch
+              checked={settings.general.newLayoutDesigns()}
+              onChange={(checked) => {
+                settings.general.setNewLayoutDesigns(checked)
+                if (!checked) return
+                void import("@/components/settings-v2").then((module) => {
+                  dialog.show(() => <module.DialogSettings />)
+                })
+              }}
+            />
+          </div>
+        </SettingsRow>
       </SettingsList>
     </div>
   )
@@ -745,14 +718,6 @@ export const SettingsGeneral: Component = () => {
       </div>
 
       <div class="flex flex-col gap-8 w-full">
-        <Show when={settings.general.layoutTransitionAvailable()}>
-          <InterfaceSection />
-        </Show>
-
-        <Show when={settings.general.newInterfaceNoticeVisible()}>
-          <InterfaceNoticeSection />
-        </Show>
-
         <GeneralSection />
 
         <AppearanceSection />

packages/app/src/components/settings-providers.tsx

@@ -12,6 +12,7 @@ import { DialogConnectProvider, useProviderConnectController } from "./dialog-co
 import { DialogCustomProvider } from "./dialog-custom-provider"
 import { SettingsList } from "./settings-list"
 import { SettingsServerPicker, SettingsServerScope } from "./settings-server-picker"
+import { credentialConnectionIDs } from "@/context/backend"
 
 type ProviderSource = "env" | "api" | "config" | "custom"
 type ProviderItem = ReturnType<ReturnType<typeof useProviders>["connected"]>[number]
@@ -96,12 +97,12 @@ const SettingsProvidersContent: Component<{ onBack?: () => void }> = (props) =>
   }
 
   const disableProvider = async (providerID: string, name: string) => {
-    const before = serverSync().data.config.disabled_providers ?? []
+    const before = serverSync().data.config.disabledProviders ?? []
     const next = before.includes(providerID) ? before : [...before, providerID]
-    serverSync().set("config", "disabled_providers", next)
+    serverSync().set("config", "disabledProviders", next)
 
     await serverSync()
-      .updateConfig({ disabled_providers: next })
+      .updateConfig({ disabledProviders: next })
       .then(() => {
         showToast({
           variant: "success",
@@ -111,29 +112,47 @@ const SettingsProvidersContent: Component<{ onBack?: () => void }> = (props) =>
         })
       })
       .catch((err: unknown) => {
-        serverSync().set("config", "disabled_providers", before)
+        serverSync().set("config", "disabledProviders", before)
         const message = err instanceof Error ? err.message : String(err)
         showToast({ title: language.t("common.requestFailed"), description: message })
       })
   }
 
-  const disconnect = async (providerID: string, name: string) => {
-    if (isConfigCustom(providerID)) {
-      await serverSDK()
-        .client.auth.remove({ providerID })
-        .catch(() => undefined)
-      await disableProvider(providerID, name)
+  const disconnect = async (item: ProviderItem) => {
+    const backend = await serverSDK().backend
+    const remove = async () => {
+      if (backend.version === "v1") {
+        const capability = backend.capabilities.providerAuthV1
+        if (!capability) throw new Error("Server does not support provider authentication")
+        await capability.remove({ providerID: item.id })
+        return
+      }
+      const capability = backend.capabilities.integrationsV2
+      if (!capability) throw new Error("Server does not support provider integrations")
+      const integrationID =
+        "integrationID" in item && typeof item.integrationID === "string" ? item.integrationID : item.id
+      const integration = await capability.get({ integrationID })
+      await Promise.all(
+        credentialConnectionIDs(integration?.connections ?? []).map((credentialID) =>
+          capability.removeCredential({ credentialID }),
+        ),
+      )
+    }
+
+    if (isConfigCustom(item.id)) {
+      await remove().catch(() => undefined)
+      await disableProvider(item.id, item.name)
       return
     }
-    await serverSDK()
-      .client.auth.remove({ providerID })
+    await remove()
       .then(async () => {
-        await serverSDK().client.global.dispose()
+        if (backend.version === "v1") await backend.capabilities.runtimeV1?.disposeAll()
+        if (backend.version === "v2") await serverSync().refreshProviders()
         showToast({
           variant: "success",
           icon: "circle-check",
-          title: language.t("provider.disconnect.toast.disconnected.title", { provider: name }),
-          description: language.t("provider.disconnect.toast.disconnected.description", { provider: name }),
+          title: language.t("provider.disconnect.toast.disconnected.title", { provider: item.name }),
+          description: language.t("provider.disconnect.toast.disconnected.description", { provider: item.name }),
         })
       })
       .catch((err: unknown) => {
@@ -179,7 +198,7 @@ const SettingsProvidersContent: Component<{ onBack?: () => void }> = (props) =>
                         </span>
                       }
                     >
-                      <Button size="large" variant="ghost" onClick={() => void disconnect(item.id, item.name)}>
+                      <Button size="large" variant="ghost" onClick={() => void disconnect(item)}>
                         {language.t("common.disconnect")}
                       </Button>
                     </Show>

packages/app/src/components/settings-v2/general.tsx

@@ -28,7 +28,6 @@ import { playSoundById, SOUND_OPTIONS } from "@/utils/sound"
 import { Link } from "../link"
 import { SettingsListV2 } from "./parts/list"
 import { SettingsRowV2 } from "./parts/row"
-import { LayoutRetirementNotice, LayoutTransitionToggle } from "./interface-transition"
 import "./settings-v2.css"
 
 let demoSoundState = {
@@ -122,11 +121,11 @@ export const SettingsGeneralV2: Component<{
   const themeOptions = createMemo<ThemeOption[]>(() => theme.ids().map((id) => ({ id, name: theme.name(id) })))
 
   const [shells] = createResource(
-    () =>
-      serverSdk()
-        .client.pty.shells()
-        .then((res) => res.data ?? [])
-        .catch(() => [] as ShellOption[]),
+    async () => {
+      const capability = (await serverSdk().backend).capabilities.shellDiscovery
+      if (!capability) return []
+      return capability.list().catch(() => [] as ShellOption[])
+    },
     { initialValue: [] as ShellOption[] },
   )
 
@@ -227,31 +226,6 @@ export const SettingsGeneralV2: Component<{
     },
   })
 
-  const InterfaceSection = () => (
-    <LayoutTransitionToggle
-      title={language.t("settings.general.row.newInterface.title")}
-      badge={language.t("settings.general.row.newInterface.badge")}
-      description={language.t("settings.general.row.newInterface.description")}
-      checked={settings.general.newLayoutDesigns()}
-      onChange={(checked) => {
-        settings.general.setNewLayoutDesigns(checked)
-        if (checked) return
-        void import("@/components/dialog-settings").then((module) => {
-          void dialog.show(() => <module.DialogSettings />)
-        })
-      }}
-    />
-  )
-
-  const InterfaceNoticeSection = () => (
-    <LayoutRetirementNotice
-      title={language.t("settings.general.row.newInterfaceNotice.title")}
-      description={language.t("settings.general.row.newInterfaceNotice.description")}
-      dismiss={language.t("settings.general.row.newInterfaceNotice.dismiss")}
-      onDismiss={settings.general.dismissNewInterfaceNotice}
-    />
-  )
-
   const GeneralSection = () => (
     <div class="settings-v2-section">
       <SettingsListV2>
@@ -338,6 +312,24 @@ export const SettingsGeneralV2: Component<{
           </div>
         </SettingsRowV2>
 
+        <SettingsRowV2
+          title={language.t("settings.general.row.newLayoutDesigns.title")}
+          description={language.t("settings.general.row.newLayoutDesigns.description")}
+        >
+          <div data-action="settings-new-layout-designs">
+            <Switch
+              checked={settings.general.newLayoutDesigns()}
+              onChange={(checked) => {
+                settings.general.setNewLayoutDesigns(checked)
+                if (checked) return
+                void import("@/components/dialog-settings").then((module) => {
+                  dialog.show(() => <module.DialogSettings />)
+                })
+              }}
+            />
+          </div>
+        </SettingsRowV2>
+
         <Show when={mobile() && import.meta.env.VITE_OPENCODE_CHANNEL !== "prod"}>
           <SettingsRowV2
             title={language.t("settings.general.row.mobileTitlebarBottom.title")}
@@ -691,14 +683,6 @@ export const SettingsGeneralV2: Component<{
       </div>
 
       <div class="settings-v2-tab-body">
-        <Show when={settings.general.layoutTransitionAvailable()}>
-          <InterfaceSection />
-        </Show>
-
-        <Show when={settings.general.newInterfaceNoticeVisible()}>
-          <InterfaceNoticeSection />
-        </Show>
-
         <GeneralSection />
 
         <AppearanceSection />

packages/app/src/components/settings-v2/interface-transition.stories.tsx

@@ -1,76 +0,0 @@
-// @ts-nocheck
-import { Show } from "solid-js"
-import { createStore } from "solid-js/store"
-import { LayoutRetirementNotice, LayoutTransitionToggle } from "./interface-transition"
-
-const copy = {
-  title: "New layout",
-  badge: "New",
-  description: "Use the new tabs and home layout. Switch between layouts for a limited time.",
-  noticeTitle: "You're now using new layout",
-  noticeDescription: "The previous layout is no longer available",
-  dismiss: "Dismiss",
-}
-
-function Frame(props) {
-  return <div class="w-[640px] max-w-full">{props.children}</div>
-}
-
-function ToggleExample(props) {
-  const [state, setState] = createStore({ checked: props.checked })
-  return (
-    <Frame>
-      <LayoutTransitionToggle
-        title={copy.title}
-        badge={copy.badge}
-        description={copy.description}
-        checked={state.checked}
-        onChange={(checked) => setState("checked", checked)}
-      />
-    </Frame>
-  )
-}
-
-function NoticeExample() {
-  const [state, setState] = createStore({ dismissed: false })
-  return (
-    <Frame>
-      <Show when={!state.dismissed} fallback={<span class="text-v2-text-text-muted">Notice dismissed</span>}>
-        <LayoutRetirementNotice
-          title={copy.noticeTitle}
-          description={copy.noticeDescription}
-          dismiss={copy.dismiss}
-          onDismiss={() => setState("dismissed", true)}
-        />
-      </Show>
-    </Frame>
-  )
-}
-
-export default {
-  title: "App/Settings/Layout transition",
-  id: "app-settings-layout-transition",
-  component: LayoutTransitionToggle,
-}
-
-export const NewLayoutEnabled = {
-  render: () => <ToggleExample checked />,
-}
-
-export const PreviousLayoutEnabled = {
-  render: () => <ToggleExample checked={false} />,
-}
-
-export const PreviousLayoutRetired = {
-  render: () => <NoticeExample />,
-}
-
-export const AllStates = {
-  render: () => (
-    <div class="flex flex-col gap-8">
-      <ToggleExample checked />
-      <ToggleExample checked={false} />
-      <NoticeExample />
-    </div>
-  ),
-}

packages/app/src/components/settings-v2/interface-transition.tsx

@@ -1,54 +0,0 @@
-import { Tag } from "@opencode-ai/ui/v2/badge-v2"
-import { ButtonV2 } from "@opencode-ai/ui/v2/button-v2"
-import { Switch } from "@opencode-ai/ui/v2/switch-v2"
-import { SettingsListV2 } from "./parts/list"
-import { SettingsRowV2 } from "./parts/row"
-
-export function LayoutTransitionToggle(props: {
-  title: string
-  badge: string
-  description: string
-  checked: boolean
-  onChange: (checked: boolean) => void
-}) {
-  return (
-    <div class="settings-v2-section">
-      <div class="settings-v2-interface-feature">
-        <SettingsListV2>
-          <SettingsRowV2
-            title={
-              <span class="flex items-center gap-2">
-                {props.title}
-                <Tag variant="accent">{props.badge}</Tag>
-              </span>
-            }
-            description={props.description}
-          >
-            <div data-action="settings-new-layout-designs">
-              <Switch checked={props.checked} onChange={props.onChange} />
-            </div>
-          </SettingsRowV2>
-        </SettingsListV2>
-      </div>
-    </div>
-  )
-}
-
-export function LayoutRetirementNotice(props: {
-  title: string
-  description: string
-  dismiss: string
-  onDismiss: () => void
-}) {
-  return (
-    <div class="settings-v2-section">
-      <SettingsListV2>
-        <SettingsRowV2 title={props.title} description={props.description}>
-          <ButtonV2 size="small" variant="ghost-muted" onClick={props.onDismiss}>
-            {props.dismiss}
-          </ButtonV2>
-        </SettingsRowV2>
-      </SettingsListV2>
-    </div>
-  )
-}

packages/app/src/components/settings-v2/providers.tsx

@@ -12,6 +12,7 @@ import { DialogConnectProvider, useProviderConnectController } from "../dialog-c
 import { DialogCustomProvider } from "../dialog-custom-provider"
 import { SettingsListV2 } from "./parts/list"
 import "./settings-v2.css"
+import { credentialConnectionIDs } from "@/context/backend"
 
 type ProviderSource = "env" | "api" | "config" | "custom"
 type ProviderItem = ReturnType<ReturnType<typeof useProviders>["connected"]>[number]
@@ -90,12 +91,12 @@ export const SettingsProvidersV2: Component<{ onBack?: () => void }> = (props) =
   }
 
   const disableProvider = async (providerID: string, name: string) => {
-    const before = serverSync().data.config.disabled_providers ?? []
+    const before = serverSync().data.config.disabledProviders ?? []
     const next = before.includes(providerID) ? before : [...before, providerID]
-    serverSync().set("config", "disabled_providers", next)
+    serverSync().set("config", "disabledProviders", next)
 
     await serverSync()
-      .updateConfig({ disabled_providers: next })
+      .updateConfig({ disabledProviders: next })
       .then(() => {
         showToast({
           variant: "success",
@@ -105,29 +106,47 @@ export const SettingsProvidersV2: Component<{ onBack?: () => void }> = (props) =
         })
       })
       .catch((err: unknown) => {
-        serverSync().set("config", "disabled_providers", before)
+        serverSync().set("config", "disabledProviders", before)
         const message = err instanceof Error ? err.message : String(err)
         showToast({ title: language.t("common.requestFailed"), description: message })
       })
   }
 
-  const disconnect = async (providerID: string, name: string) => {
-    if (isConfigCustom(providerID)) {
-      await serverSdk()
-        .client.auth.remove({ providerID })
-        .catch(() => undefined)
-      await disableProvider(providerID, name)
+  const disconnect = async (item: ProviderItem) => {
+    const backend = await serverSdk().backend
+    const remove = async () => {
+      if (backend.version === "v1") {
+        const capability = backend.capabilities.providerAuthV1
+        if (!capability) throw new Error("Server does not support provider authentication")
+        await capability.remove({ providerID: item.id })
+        return
+      }
+      const capability = backend.capabilities.integrationsV2
+      if (!capability) throw new Error("Server does not support provider integrations")
+      const integrationID =
+        "integrationID" in item && typeof item.integrationID === "string" ? item.integrationID : item.id
+      const integration = await capability.get({ integrationID })
+      await Promise.all(
+        credentialConnectionIDs(integration?.connections ?? []).map((credentialID) =>
+          capability.removeCredential({ credentialID }),
+        ),
+      )
+    }
+
+    if (isConfigCustom(item.id)) {
+      await remove().catch(() => undefined)
+      await disableProvider(item.id, item.name)
       return
     }
-    await serverSdk()
-      .client.auth.remove({ providerID })
+    await remove()
       .then(async () => {
-        await serverSdk().client.global.dispose()
+        if (backend.version === "v1") await backend.capabilities.runtimeV1?.disposeAll()
+        if (backend.version === "v2") await serverSync().refreshProviders()
         showToast({
           variant: "success",
           icon: "circle-check",
-          title: language.t("provider.disconnect.toast.disconnected.title", { provider: name }),
-          description: language.t("provider.disconnect.toast.disconnected.description", { provider: name }),
+          title: language.t("provider.disconnect.toast.disconnected.title", { provider: item.name }),
+          description: language.t("provider.disconnect.toast.disconnected.description", { provider: item.name }),
         })
       })
       .catch((err: unknown) => {
@@ -175,7 +194,7 @@ export const SettingsProvidersV2: Component<{ onBack?: () => void }> = (props) =
                         </span>
                       }
                     >
-                      <ButtonV2 size="normal" variant="ghost-muted" onClick={() => void disconnect(item.id, item.name)}>
+                      <ButtonV2 size="normal" variant="ghost-muted" onClick={() => void disconnect(item)}>
                         {language.t("common.disconnect")}
                       </ButtonV2>
                     </Show>

packages/app/src/components/settings-v2/servers.tsx

@@ -110,8 +110,8 @@ export const SettingsServersV2: Component = () => {
                       <div class="settings-v2-servers-copy">
                         <span class="settings-v2-servers-name">{serverName(item)}</span>
                         <span class="settings-v2-servers-meta">
-                          <Show when={health()?.version}>v{health()?.version}</Show>
-                          <Show when={health()?.version && item.type === "http"}> • </Show>
+                          <Show when={health()?.installationVersion}>v{health()?.installationVersion}</Show>
+                          <Show when={health()?.installationVersion && item.type === "http"}> • </Show>
                           <Show
                             when={item.type === "http" && item.http.username}
                             fallback={<Show when={item.type === "http"}>{language.t("server.row.noUsername")}</Show>}

packages/app/src/components/settings-v2/settings-v2.css

@@ -90,11 +90,6 @@
   box-shadow: inset 0 0 0 0.5px var(--v2-border-border-muted);
 }
 
-.settings-v2-interface-feature [data-component="settings-v2-list"] {
-  background-color: var(--v2-background-bg-base);
-  box-shadow: var(--v2-elevation-raised);
-}
-
 [data-component="settings-v2-row"] {
   display: flex;
   flex-wrap: wrap;
@@ -133,7 +128,7 @@
 }
 
 [data-slot="settings-v2-row-description"] {
-  font-size: 13px;
+  font-size: 11px;
   font-weight: 440;
   line-height: 1;
   color: var(--v2-text-text-muted);

packages/app/src/components/status-popover-indicator.test.ts

@@ -1,36 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { hasNonBlockingServiceIssue, serverStatusDotClass } from "./status-popover-indicator"
-
-describe("serverStatusDotClass", () => {
-  test("uses the success token while the server and services are healthy", () => {
-    expect(serverStatusDotClass({ ready: true, serverHealth: true, issue: false })).toBe("bg-icon-success-base")
-  })
-
-  test("uses the warning token for non-blocking issues while the server is online", () => {
-    expect(serverStatusDotClass({ ready: true, serverHealth: true, issue: true })).toBe("bg-icon-warning-base")
-  })
-
-  test("uses the critical token only after the server connection drops", () => {
-    expect(serverStatusDotClass({ ready: true, serverHealth: false, issue: false })).toBe("bg-icon-critical-base")
-    expect(serverStatusDotClass({ ready: true, serverHealth: false, issue: true })).toBe("bg-icon-critical-base")
-  })
-
-  test("stays neutral before status is ready", () => {
-    expect(serverStatusDotClass({ ready: false, serverHealth: true, issue: false })).toBe("bg-border-weak-base")
-    expect(serverStatusDotClass({ ready: false, serverHealth: undefined, issue: false })).toBe("bg-border-weak-base")
-  })
-})
-
-describe("hasNonBlockingServiceIssue", () => {
-  test("detects MCP failures that do not block chatting", () => {
-    expect(hasNonBlockingServiceIssue({ mcp: ["failed"], lsp: [] })).toBe(true)
-    expect(hasNonBlockingServiceIssue({ mcp: ["needs_auth"], lsp: [] })).toBe(true)
-    expect(hasNonBlockingServiceIssue({ mcp: ["needs_client_registration"], lsp: [] })).toBe(true)
-    expect(hasNonBlockingServiceIssue({ mcp: ["connected", "disabled"], lsp: [] })).toBe(false)
-  })
-
-  test("detects LSP failures that do not block chatting", () => {
-    expect(hasNonBlockingServiceIssue({ mcp: [], lsp: ["error"] })).toBe(true)
-    expect(hasNonBlockingServiceIssue({ mcp: [], lsp: ["connected"] })).toBe(false)
-  })
-})

packages/app/src/components/status-popover-indicator.ts

@@ -1,19 +0,0 @@
-import type { LspStatus, McpStatus } from "@opencode-ai/sdk/v2/client"
-
-export function hasNonBlockingServiceIssue(input: {
-  mcp: Array<McpStatus["status"]>
-  lsp: Array<LspStatus["status"]>
-}) {
-  return (
-    input.mcp.some((status) => status !== "connected" && status !== "disabled") ||
-    input.lsp.some((status) => status === "error")
-  )
-}
-
-export function serverStatusDotClass(input: { ready: boolean; serverHealth: boolean | undefined; issue: boolean }) {
-  if (input.serverHealth === false) return "bg-icon-critical-base"
-  if (!input.ready || input.serverHealth === undefined) return "bg-border-weak-base"
-  if (input.issue) return "bg-icon-warning-base"
-  if (input.serverHealth === true) return "bg-icon-success-base"
-  return "bg-border-weak-base"
-}

packages/app/src/components/status-popover.tsx

@@ -9,7 +9,6 @@ import { ServerConnection, useServer } from "@/context/server"
 import { useServerSDK } from "@/context/server-sdk"
 import { useSync } from "@/context/sync"
 import { useGlobal } from "@/context/global"
-import { hasNonBlockingServiceIssue, serverStatusDotClass } from "./status-popover-indicator"
 
 const Body = lazy(() => import("./status-popover-body").then((x) => ({ default: x.StatusPopoverBody })))
 const ServerBody = lazy(() => import("./status-popover-body").then((x) => ({ default: x.StatusPopoverServerBody })))
@@ -20,14 +19,16 @@ export function StatusPopover() {
   const global = useGlobal()
   const sync = useSync()
   const [shown, setShown] = createSignal(false)
-  const serverHealth = () => global.servers.health[server.key]?.healthy
-  const ready = createMemo(() => serverHealth() === false || (sync().data.mcp_ready && sync().data.lsp_ready))
-  const issue = createMemo(() =>
-    hasNonBlockingServiceIssue({
-      mcp: Object.values(sync().data.mcp ?? {}).map((item) => item.status),
-      lsp: (sync().data.lsp ?? []).map((item) => item.status),
-    }),
-  )
+  const ready = createMemo(() => global.servers.health[server.key]?.healthy === false || sync().data.mcp_ready)
+  const mcpIssue = createMemo(() => {
+    const mcp = Object.values(sync().data.mcp ?? {})
+    const failed = mcp.some((item) => item.status === "failed" || item.status === "needs_client_registration")
+    const warn = mcp.some((item) => item.status === "needs_auth")
+    if (failed) return "critical" as const
+    if (warn) return "warning" as const
+  })
+  const serverHealthy = () => global.servers.health[server.key]?.healthy === true
+  const healthy = createMemo(() => global.servers.health[server.key]?.healthy === true && !mcpIssue())
 
   return (
     <Popover
@@ -46,11 +47,13 @@ export function StatusPopover() {
             <Icon name={shown() ? "status-active" : "status"} size="small" />
           </div>
           <div
-            class={`absolute -top-px -right-px size-1.5 rounded-full ${serverStatusDotClass({
-              ready: ready(),
-              serverHealth: serverHealth(),
-              issue: issue(),
-            })}`}
+            classList={{
+              "absolute -top-px -right-px size-1.5 rounded-full": true,
+              "bg-icon-success-base": ready() && healthy(),
+              "bg-icon-warning-base": ready() && serverHealthy() && mcpIssue() === "warning",
+              "bg-icon-critical-base": serverHealthy() || (ready() && serverHealthy() && mcpIssue() === "critical"),
+              "bg-border-weak-base": serverHealthy() || !ready(),
+            }}
           />
         </div>
       }
@@ -84,18 +87,21 @@ function DirectoryStatusPopover() {
   const sync = useSync()
   const [shown, setShown] = createSignal(false)
   const serverHealth = () => global.servers.health[ServerConnection.key(server().server)]?.healthy
-  const ready = createMemo(() => serverHealth() === false || (sync().data.mcp_ready && sync().data.lsp_ready))
-  const issue = createMemo(() =>
-    hasNonBlockingServiceIssue({
-      mcp: Object.values(sync().data.mcp ?? {}).map((item) => item.status),
-      lsp: (sync().data.lsp ?? []).map((item) => item.status),
-    }),
-  )
+  const ready = createMemo(() => serverHealth() === false || sync().data.mcp_ready)
+  const mcpIssue = createMemo(() => {
+    const mcp = Object.values(sync().data.mcp ?? {})
+    const failed = mcp.some((item) => item.status === "failed" || item.status === "needs_client_registration")
+    const warn = mcp.some((item) => item.status === "needs_auth")
+    if (failed) return "critical" as const
+    if (warn) return "warning" as const
+  })
+  const healthy = createMemo(() => serverHealth() === true && !mcpIssue())
   const state = createMemo<StatusPopoverState>(() => ({
     shown: shown(),
     ready: ready(),
+    healthy: healthy(),
     serverHealth: serverHealth(),
-    issue: issue(),
+    issue: mcpIssue(),
     label: language.t("status.popover.trigger"),
     onOpenChange: setShown,
     body: () => (
@@ -117,8 +123,8 @@ function ServerStatusPopover() {
   const state = createMemo<StatusPopoverState>(() => ({
     shown: shown(),
     ready: serverHealth() !== undefined,
+    healthy: serverHealth() === true,
     serverHealth: serverHealth(),
-    issue: false,
     label: language.t("status.popover.trigger"),
     onOpenChange: setShown,
     body: () => (
@@ -134,8 +140,9 @@ function ServerStatusPopover() {
 type StatusPopoverState = {
   shown: boolean
   ready: boolean
+  healthy: boolean
   serverHealth: boolean | undefined
-  issue: boolean
+  issue?: "critical" | "warning"
   label: string
   onOpenChange: (value: boolean) => void
   body: () => JSX.Element
@@ -154,6 +161,16 @@ function StatusPopoverBody(props: { shown: boolean; children: JSX.Element }) {
 }
 
 function StatusPopoverView(props: { state: StatusPopoverState }) {
+  const statusDotClass = () => ({
+    "absolute rounded-full": true,
+    "bg-icon-success-base": props.state.ready && props.state.healthy,
+    "bg-icon-warning-base": props.state.ready && props.state.serverHealth === true && props.state.issue === "warning",
+    "bg-icon-critical-base":
+      props.state.serverHealth === false ||
+      (props.state.ready && props.state.serverHealth === true && props.state.issue === "critical"),
+    "bg-border-weak-base": props.state.serverHealth === undefined || !props.state.ready,
+  })
+
   const popoverProps = {
     class:
       "[&_[data-slot=popover-body]]:p-0 w-[360px] max-w-[calc(100vw-40px)] bg-transparent border-0 shadow-none rounded-xl",
@@ -178,7 +195,8 @@ function StatusPopoverView(props: { state: StatusPopoverState }) {
         <div class="relative size-4">
           <IconV2 name={props.state.shown ? "status-active" : "status"} />
           <div
-            class={`absolute -top-1 -right-1 size-2 rounded-full border border-[var(--v2-background-bg-deep)] ${serverStatusDotClass(props.state)}`}
+            classList={statusDotClass()}
+            class="-top-1 -right-1 size-2 border border-[var(--v2-background-bg-deep)]"
           />
         </div>
       }

packages/app/src/components/terminal.tsx

@@ -11,19 +11,16 @@ import { matchKeybind, parseKeybind } from "@/context/command"
 import { useLanguage } from "@/context/language"
 import { usePlatform } from "@/context/platform"
 import { useSDK } from "@/context/sdk"
-import { useServerSDK } from "@/context/server-sdk"
 import { terminalFontFamily, useSettings } from "@/context/settings"
 import type { LocalPTY } from "@/context/terminal"
 import { disposeIfDisposable, getHoveredLinkText, setOptionIfSupported } from "@/utils/runtime-adapters"
 import { terminalWriter } from "@/utils/terminal-writer"
-import { terminalWebSocketURL } from "@/utils/terminal-websocket-url"
 
 const TOGGLE_TERMINAL_ID = "terminal.toggle"
 const DEFAULT_TOGGLE_TERMINAL_KEYBIND = "ctrl+`"
 export interface TerminalProps extends ComponentProps<"div"> {
   pty: LocalPTY
   autoFocus?: boolean
-  onAutoFocus?: () => void
   onSubmit?: () => void
   onCleanup?: (pty: Partial<LocalPTY> & { id: string }) => void
   onConnect?: () => void
@@ -175,26 +172,10 @@ export const Terminal = (props: TerminalProps) => {
   const settings = useSettings()
   const theme = useTheme()
   const language = useLanguage()
-  // Terminal captures its connection for the PTY lifetime, so callers must key it per server/session.
-  const connection = useServerSDK()().server
   const directory = sdk().directory
-  const client = sdk().client
-  const url = sdk().url
-  const auth = connection.http
-  const username = auth?.username ?? "opencode"
-  const password = auth?.password ?? ""
-  const authToken = connection.type === "http" ? connection.authToken : false
-  const sameOrigin = new URL(url, location.href).origin === location.origin
+  const backend = sdk().backend
   let container!: HTMLDivElement
-  const [local, others] = splitProps(props, [
-    "pty",
-    "class",
-    "classList",
-    "autoFocus",
-    "onAutoFocus",
-    "onConnect",
-    "onConnectError",
-  ])
+  const [local, others] = splitProps(props, ["pty", "class", "classList", "autoFocus", "onConnect", "onConnectError"])
   const id = local.pty.id
   const restore = typeof local.pty.buffer === "string" ? local.pty.buffer : ""
   const restoreSize =
@@ -242,11 +223,14 @@ export const Terminal = (props: TerminalProps) => {
   }
 
   const pushSize = (cols: number, rows: number) => {
-    return client.pty
-      .update({
-        ptyID: id,
-        size: { cols, rows },
-      })
+    return backend
+      .then((client) =>
+        client.common.pty.update({
+          ptyID: id,
+          size: { cols, rows },
+          location: { directory },
+        }),
+      )
       .catch((err) => {
         debugTerminal("failed to sync terminal size", err)
       })
@@ -425,7 +409,6 @@ export const Terminal = (props: TerminalProps) => {
       fitAddon = fit
       serializeAddon = serializer
 
-      const active = document.activeElement
       t.open(container)
       useTerminalUiBindings({
         container,
@@ -435,22 +418,7 @@ export const Terminal = (props: TerminalProps) => {
         handleLinkClick,
       })
 
-      if (local.autoFocus === true) {
-        focusTerminal()
-        local.onAutoFocus?.()
-      }
-      if (local.autoFocus !== true) {
-        const restoreFocus = () => {
-          const current = document.activeElement
-          if (current !== container && !container.contains(current)) return
-          t.blur()
-          t.textarea?.blur()
-          if (active instanceof HTMLElement && active.isConnected) active.focus()
-        }
-        restoreFocus()
-        const timer = setTimeout(restoreFocus, 0)
-        cleanups.push(() => clearTimeout(timer))
-      }
+      if (local.autoFocus !== false) focusTerminal()
 
       if (typeof document !== "undefined" && document.fonts) {
         void document.fonts.ready.then(scheduleFit)
@@ -515,33 +483,32 @@ export const Terminal = (props: TerminalProps) => {
       }
 
       const gone = () =>
-        client.pty
-          .get({ ptyID: id }, { throwOnError: false })
-          .then((result) => result.response.status === 404)
+        backend
+          .then((client) => {
+            const transport = client.capabilities.ptyTransport
+            if (transport) return transport.exists({ ptyID: id, location: { directory } }).then((exists) => !exists)
+            return client.common.pty.get({ ptyID: id, location: { directory } }).then(() => false)
+          })
           .catch((err) => {
             debugTerminal("failed to inspect terminal session", err)
             return false
           })
 
       const connectToken = async () => {
-        const result = await client.pty
-          .connectToken(
-            { ptyID: id, directory },
-            {
-              throwOnError: false,
-              headers: { "x-opencode-ticket": "1" },
-            },
-          )
+        const transport = (await backend).capabilities.ptyTransport
+        if (!transport) return
+        const result = await transport
+          .connectToken({ ptyID: id, location: { directory } })
           .catch((err: unknown) => {
             if (err instanceof Error && err.message.includes("Request is not supported")) return
             throw err
           })
         if (!result) return
-        if (result.response.status === 200 && result.data?.ticket) return result.data.ticket
-        if (result.response.status === 404 || result.response.status === 405) return
-        if (result.response.status === 403)
+        if (result.status === 200 && result.ticket) return result.ticket
+        if (result.status === 404 || result.status === 405) return
+        if (result.status === 403)
           throw new Error("PTY connect ticket rejected by origin or CSRF checks. Check the server CORS config.")
-        throw new Error(`PTY connect ticket failed with ${result.response.status}`)
+        throw new Error(`PTY connect ticket failed with ${result.status}`)
       }
 
       const retry = (err: unknown) => {
@@ -574,18 +541,13 @@ export const Terminal = (props: TerminalProps) => {
         if (once.value) return
         if (disposed) return
 
+        const transport = (await backend).capabilities.ptyTransport
+        if (!transport) {
+          fail(new Error("PTY transport is not supported by this server"))
+          return
+        }
         const socket = new WebSocket(
-          terminalWebSocketURL({
-            url,
-            id,
-            directory,
-            cursor: seek,
-            ticket,
-            sameOrigin,
-            username,
-            password,
-            authToken,
-          }),
+          transport.connectURL({ ptyID: id, location: { directory }, cursor: seek, ticket }),
         )
         socket.binaryType = "arraybuffer"
         ws = socket

packages/app/src/components/titlebar-tab-nav.tsx

@@ -9,7 +9,7 @@ import { ServerConnection, serverName } from "@/context/server"
 import { displayName, projectForSession } from "@/pages/layout/helpers"
 import { SessionTabAvatar } from "@/pages/layout/session-tab-avatar"
 import { showToast } from "@/utils/toast"
-import type { Session } from "@opencode-ai/sdk/v2"
+import type { AppSession } from "@/context/backend"
 import { canOpenTabRename, forwardTabRef } from "./titlebar-tab-gesture"
 import { TabPreviewPopover } from "./titlebar-tab-popover"
 import "./titlebar-tab-nav.css"
@@ -21,7 +21,7 @@ export function TabNavItem(props: {
   ref?: Ref<HTMLDivElement>
   href: string
   server: ServerConnection.Key
-  session: () => Session | undefined
+  session: () => AppSession | undefined
   fallbackTitle?: string
   onTitleChange?: (title: string) => void
   onTitleChangeFailed?: (title: string) => void
@@ -120,8 +120,10 @@ export function TabNavItem(props: {
     const ctx = serverCtx()
     const session = props.session()
     if (!ctx || !session) return
-    const client = ctx.sdk.createClient({ directory: session.directory, throwOnError: true })
-    await client.session.update({ sessionID: session.id, title })
+    const client = await ctx.sdk.backend
+    const capability = client.capabilities.sessionActionsV1
+    if (!capability) throw new Error("Session renaming is not supported by this server")
+    await capability.rename({ location: { directory: session.directory }, sessionID: session.id, title })
   }
 
   const closeRename = async (save: boolean) => {

packages/app/src/components/titlebar.tsx

@@ -267,9 +267,8 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
                 return conn ? { route, sdk: global.ensureServerCtx(conn).sdk } : undefined
               },
               ({ route, sdk }) =>
-                sdk.client.session
-                  .get({ sessionID: route.sessionId })
-                  .then((x) => x.data)
+                sdk.backend
+                  .then((client) => client.common.sessions.get({ sessionID: route.sessionId }))
                   .catch(() => {}),
             )
 

packages/app/src/context/backend-client.test.ts

@@ -0,0 +1,70 @@
+import { describe, expect, test } from "bun:test"
+import type { ServerHealth } from "@/utils/server-health"
+import { backendIdentity, createBackendForServer } from "./backend-client"
+
+const server = {
+  type: "http" as const,
+  http: {
+    url: "http://localhost:4096",
+    username: "user",
+    password: "secret",
+  },
+  authToken: false,
+}
+
+function setup(health: ServerHealth) {
+  const requests: Request[] = []
+  const fetch = (async (input: RequestInfo | URL, init?: RequestInit) => {
+    const request = input instanceof Request ? input : new Request(input, init)
+    requests.push(request)
+    if (new URL(request.url).pathname === "/project")
+      return new Response("[]", { headers: { "content-type": "application/json" } })
+    return new Response(JSON.stringify({ healthy: true, version: "1.2.3" }), {
+      headers: { "content-type": "application/json" },
+    })
+  }) as typeof globalThis.fetch
+  return {
+    requests,
+    fetch,
+    backend: createBackendForServer({ server, browserUrl: "https://app.example.test", fetch, health: Promise.resolve(health) }),
+  }
+}
+
+describe("createBackendForServer", () => {
+  test("changes backend identity when credentials for the same URL change", () => {
+    expect(backendIdentity(server)).not.toBe(
+      backendIdentity({ ...server, http: { ...server.http, password: "replacement" } }),
+    )
+  })
+
+  test("selects v2 and configures fetch and authentication", async () => {
+    const result = setup({ healthy: true, version: "v2" })
+    const backend = await result.backend
+
+    expect(backend.version).toBe("v2")
+    expect(result.requests).toHaveLength(0)
+    await backend.common.health.get()
+    expect(new URL(result.requests[0].url).pathname).toBe("/api/health")
+    expect(result.requests[0].headers.get("authorization")).toBe(`Basic ${btoa("user:secret")}`)
+
+    expect(backend.capabilities.projectList).toBeUndefined()
+    expect(backend.capabilities.vcs).toBeUndefined()
+    expect(backend.capabilities.mcp).toBeUndefined()
+    expect(result.requests).toHaveLength(1)
+    expect(backend.version).toBe("v2")
+  })
+
+  test("selects v1 after fallback detection", async () => {
+    const result = setup({ healthy: true, version: "v1", installationVersion: "1.2.3" })
+    const backend = await result.backend
+
+    expect(backend.version).toBe("v1")
+    expect(result.requests).toHaveLength(0)
+    await backend.common.health.get()
+    expect(new URL(result.requests[0].url).pathname).toBe("/global/health")
+    expect(result.requests[0].headers.get("authorization")).toBe(`Basic ${btoa("user:secret")}`)
+    expect(backend.capabilities.projectList).toBeDefined()
+    expect(backend.capabilities.vcs).toBeDefined()
+    expect(backend.capabilities.mcp).toBeDefined()
+  })
+})

packages/app/src/context/backend-client.ts

@@ -0,0 +1,64 @@
+import { OpenCode } from "@opencode-ai/client"
+import { createOpencodeClient } from "@opencode-ai/sdk-v1/v2/client"
+import type { ServerHealth } from "@/utils/server-health"
+import { authTokenFromCredentials } from "@/utils/server"
+import type { ServerConnection } from "./server"
+import type { LocationRef } from "./backend"
+import { createV1Backend } from "./backend-v1"
+import { createV2Backend } from "./backend-v2"
+
+function options(server: ServerConnection.HttpBase, fetch: typeof globalThis.fetch) {
+  return {
+    baseUrl: server.url,
+    fetch,
+    headers: server.password
+      ? {
+          Authorization: `Basic ${authTokenFromCredentials({ username: server.username, password: server.password })}`,
+        }
+      : undefined,
+  }
+}
+
+export function createV1RawClient(server: ServerConnection.HttpBase, fetch: typeof globalThis.fetch) {
+  return createOpencodeClient(options(server, fetch))
+}
+
+export function createV2RawClient(server: ServerConnection.HttpBase, fetch: typeof globalThis.fetch) {
+  return OpenCode.make(options(server, fetch))
+}
+
+export function backendIdentity(server: ServerConnection.Any) {
+  return `${server.type}\n${server.http.url}\n${server.http.username ?? ""}\n${server.http.password ?? ""}\n${
+    server.type === "http" && server.authToken === true ? "token" : ""
+  }`
+}
+
+export async function createBackendForServer(input: {
+  server: ServerConnection.Any
+  browserUrl: string
+  fetch: typeof globalThis.fetch
+  eventFetch?: typeof globalThis.fetch
+  health: Promise<ServerHealth>
+  defaultLocation?: LocationRef
+}) {
+  const health = await input.health
+  const eventFetch = input.eventFetch ?? input.fetch
+  const transport = {
+    baseUrl: input.server.http.url,
+    fetch: input.fetch,
+    username: input.server.http.username,
+    password: input.server.http.password,
+    sameOrigin: new URL(input.server.http.url, input.browserUrl).origin === new URL(input.browserUrl).origin,
+    authToken: input.server.type === "http" && input.server.authToken === true,
+  }
+  if (health.version === "v2")
+    return createV2Backend(
+      createV2RawClient(input.server.http, input.fetch),
+      transport,
+      input.defaultLocation,
+      createV2RawClient(input.server.http, eventFetch),
+    )
+  const legacy = createV1RawClient(input.server.http, input.fetch)
+  const eventLegacy = eventFetch === input.fetch ? legacy : createV1RawClient(input.server.http, eventFetch)
+  return createV1Backend(legacy, input.defaultLocation, eventLegacy, transport)
+}

packages/app/src/context/backend-v1.test.ts

@@ -0,0 +1,407 @@
+import { describe, expect, test } from "bun:test"
+import { createOpencodeClient } from "@opencode-ai/sdk-v1/v2/client"
+import type { PtyTransportConfig } from "./backend"
+import { createV1Backend } from "./backend-v1"
+
+function setup(
+  respond: (request: Request) => Response | Promise<Response>,
+  withDefault = false,
+  transport?: Partial<Pick<PtyTransportConfig, "sameOrigin" | "authToken">>,
+) {
+  const requests: Request[] = []
+  const fetch = Object.assign(
+    async (input: RequestInfo | URL, init?: RequestInit) => {
+      const request = input instanceof Request ? input : new Request(input, init)
+      requests.push(request)
+      return respond(request)
+    },
+    { preconnect: globalThis.fetch.preconnect },
+  ) satisfies typeof globalThis.fetch
+  const client = createOpencodeClient({ baseUrl: "http://localhost", fetch })
+  return {
+    requests,
+    backend: createV1Backend(
+      client,
+      withDefault ? { directory: "/default", workspaceID: "default-workspace" } : undefined,
+      client,
+      {
+        baseUrl: "http://localhost",
+        fetch,
+        username: "user",
+        password: "secret",
+        sameOrigin: transport?.sameOrigin ?? false,
+        authToken: transport?.authToken ?? false,
+      },
+    ),
+  }
+}
+
+function json(data: unknown, headers?: HeadersInit) {
+  return new Response(JSON.stringify(data), {
+    headers: { "content-type": "application/json", ...Object.fromEntries(new Headers(headers)) },
+  })
+}
+
+const session = {
+  id: "ses_1",
+  slug: "one",
+  projectID: "project",
+  directory: "/repo",
+  title: "Session",
+  version: "1",
+  time: { created: 1, updated: 2 },
+}
+
+describe("createV1Backend", () => {
+  test("preserves location in OAuth callbacks", async () => {
+    const setupResult = setup(() => json({}))
+
+    await setupResult.backend.capabilities.providerAuthV1?.callback({
+      providerID: "provider",
+      method: 1,
+      code: "code",
+      location: { directory: "/repo", workspaceID: "workspace" },
+    })
+
+    const url = new URL(setupResult.requests[0].url)
+    expect(url.searchParams.get("directory")).toBe("/repo")
+    expect(url.searchParams.get("workspace")).toBe("workspace")
+  })
+
+  test("normalizes session pagination and location", async () => {
+    const setupResult = setup(() => json([session], { "x-next-cursor": "456" }))
+
+    const result = await setupResult.backend.common.sessions.list({
+      location: { directory: "/repo", workspaceID: "workspace" },
+      roots: true,
+      limit: 10,
+      cursor: "123",
+    })
+
+    expect(result).toEqual({
+      items: [
+        {
+          id: "ses_1",
+          slug: "one",
+          version: "1",
+          parentID: undefined,
+          projectID: "project",
+          location: { directory: "/repo", workspaceID: undefined },
+          directory: "/repo",
+          workspaceID: undefined,
+          title: "Session",
+          cost: 0,
+          tokens: undefined,
+          time: { created: 1, updated: 2 },
+          share: undefined,
+          revert: undefined,
+        },
+      ],
+      older: "456",
+    })
+    const url = new URL(setupResult.requests[0].url)
+    expect(url.pathname).toBe("/experimental/session")
+    expect(url.searchParams.get("directory")).toBe("/repo")
+    expect(url.searchParams.get("workspace")).toBe("workspace")
+    expect(url.searchParams.get("roots")).toBe("true")
+    expect(url.searchParams.get("cursor")).toBe("123")
+  })
+
+  test("converts normalized prompts to legacy parts", async () => {
+    const setupResult = setup(() => new Response(null, { status: 204 }))
+
+    await setupResult.backend.common.sessions.prompt({
+      sessionID: "ses_1",
+      location: { directory: "/explicit", workspaceID: "explicit-workspace" },
+      id: "msg_1",
+      text: "hello",
+      selection: {
+        agent: "build",
+        model: { id: "model", providerID: "provider", variant: "high" },
+      },
+      files: [{ uri: "data:text/plain;base64,aGk=", name: "hi.txt", mime: "text/plain" }],
+      agents: [{ name: "explore", text: "@explore", start: 6, end: 14 }],
+    })
+
+    const request = setupResult.requests[0]
+    expect(new URL(request.url).pathname).toBe("/session/ses_1/prompt_async")
+    expect(new URL(request.url).searchParams.get("directory")).toBe("/explicit")
+    expect(new URL(request.url).searchParams.get("workspace")).toBe("explicit-workspace")
+    expect(await request.json()).toEqual({
+      messageID: "msg_1",
+      model: { providerID: "provider", modelID: "model" },
+      agent: "build",
+      variant: "high",
+      parts: [
+        { type: "text", text: "hello" },
+        { type: "file", mime: "text/plain", filename: "hi.txt", url: "data:text/plain;base64,aGk=" },
+        { type: "agent", name: "explore", source: { value: "@explore", start: 6, end: 14 } },
+      ],
+    })
+  })
+
+  test("preserves ordered prompt part IDs and metadata", async () => {
+    const setupResult = setup(() => new Response(null, { status: 204 }))
+
+    await setupResult.backend.common.sessions.prompt({
+      sessionID: "ses_1",
+      id: "msg_1",
+      text: "visible",
+      parts: [
+        { id: "part_text", type: "text", text: "visible" },
+        { id: "part_note", type: "text", text: "note", synthetic: true, metadata: { source: "review" } },
+        { id: "part_file", type: "file", mime: "text/plain", url: "file:///repo/a.ts", filename: "a.ts" },
+        { id: "part_agent", type: "agent", name: "build", source: { value: "@build", start: 7, end: 13 } },
+      ],
+    })
+
+    expect((await setupResult.requests[0].json()).parts).toEqual([
+      { id: "part_text", type: "text", text: "visible" },
+      { id: "part_note", type: "text", text: "note", synthetic: true, metadata: { source: "review" } },
+      { id: "part_file", type: "file", mime: "text/plain", url: "file:///repo/a.ts", filename: "a.ts" },
+      { id: "part_agent", type: "agent", name: "build", source: { value: "@build", start: 7, end: 13 } },
+    ])
+  })
+
+  test("combines mixed file search and decodes binary content", async () => {
+    const setupResult = setup((request) => {
+      const url = new URL(request.url)
+      if (url.pathname === "/find/file") {
+        return json(url.searchParams.get("type") === "file" ? ["a.txt", "shared"] : ["dir", "shared"])
+      }
+      return json({ type: "binary", content: "AAEC", encoding: "base64", mimeType: "application/octet-stream" })
+    })
+
+    const found = await setupResult.backend.common.files.find({ query: "a" })
+    const content = await setupResult.backend.common.files.read({ path: "a.bin" })
+
+    expect(found).toEqual([
+      { path: "a.txt", type: "file" },
+      { path: "shared", type: "directory" },
+      { path: "dir", type: "directory" },
+    ])
+    expect([...content.bytes]).toEqual([0, 1, 2])
+    expect(content.kind).toBe("binary")
+    expect(content.mimeType).toBe("application/octet-stream")
+  })
+
+  test("preserves project, provider, and file metadata", async () => {
+    const setupResult = setup((request) => {
+      const path = new URL(request.url).pathname
+      if (path === "/project")
+        return json([
+          { id: "project", worktree: "/repo", vcs: "git", time: { created: 1, initialized: 2 }, sandboxes: [] },
+        ])
+      if (path === "/provider")
+        return json({
+          all: [{ id: "provider", name: "Provider", source: "config", env: [], options: {}, models: {} }],
+          connected: [],
+          default: {},
+        })
+      return json([{ name: "a.txt", path: "a.txt", absolute: "/repo/a.txt", type: "file", ignored: false }])
+    })
+
+    const projectList = setupResult.backend.capabilities.projectList
+    if (!projectList) throw new Error("Missing project list capability")
+    const projects = await projectList.list()
+    const providers = await setupResult.backend.common.catalog.providers()
+    const files = await setupResult.backend.common.files.list({})
+
+    expect(projects[0]).toMatchObject({ vcs: "git", time: { created: 1, initialized: 2 } })
+    expect(providers.providers.get("provider")?.source).toBe("config")
+    expect(files).toEqual([{ name: "a.txt", path: "a.txt", absolute: "/repo/a.txt", type: "file", ignored: false }])
+  })
+
+  test("uses explicit session locations and preserves mutation confirmations", async () => {
+    const setupResult = setup((request) => {
+      const path = new URL(request.url).pathname
+      if (request.method === "DELETE" || path.startsWith("/experimental/worktree")) return json(true)
+      if (request.method === "GET" && path === "/session/ses_1/message") return json([], { "x-next-cursor": "older" })
+      return json(session)
+    }, true)
+
+    const history = await setupResult.backend.common.sessions.history({
+      sessionID: "ses_1",
+      location: { directory: "/explicit", workspaceID: "explicit-workspace" },
+    })
+    const removed = await setupResult.backend.capabilities.sessionActionsV1?.remove({ sessionID: "ses_1" })
+    const reverted = await setupResult.backend.capabilities.sessionExtrasV1?.revert({
+      sessionID: "ses_1",
+      messageID: "msg_1",
+    })
+    const cleared = await setupResult.backend.capabilities.sessionExtrasV1?.clearRevert({ sessionID: "ses_1" })
+    const worktreeRemoved = await setupResult.backend.capabilities.worktreesV1?.remove({ directory: "/copy" })
+    const worktreeReset = await setupResult.backend.capabilities.worktreesV1?.reset({ directory: "/copy" })
+
+    expect(history.older).toBe("older")
+    expect(removed).toBe(true)
+    expect(reverted?.id).toBe("ses_1")
+    expect(cleared?.id).toBe("ses_1")
+    expect(worktreeRemoved).toBe(true)
+    expect(worktreeReset).toBe(true)
+    const urls = setupResult.requests.map((request) => new URL(request.url))
+    expect(urls[0].searchParams.get("directory")).toBe("/explicit")
+    expect(urls[1].searchParams.get("directory")).toBe("/default")
+  })
+
+  test("normalizes idle and compatibility events", async () => {
+    const events = [
+      { type: "session.status", properties: { sessionID: "ses_1", status: { type: "idle" } } },
+      {
+        type: "todo.updated",
+        properties: { sessionID: "ses_1", todos: [{ content: "Ship", status: "pending", priority: "high" }] },
+      },
+      {
+        type: "message.part.delta",
+        properties: { sessionID: "ses_1", messageID: "msg_1", partID: "part_1", field: "text", delta: "hi" },
+      },
+      { type: "message.part.removed", properties: { sessionID: "ses_1", messageID: "msg_1", partID: "part_1" } },
+      { type: "worktree.ready", properties: { name: "copy", branch: "copy" } },
+      { type: "lsp.updated", properties: {} },
+      { type: "reference.updated", properties: {} },
+      { type: "mcp.tools.changed", properties: { server: "docs" } },
+      { type: "server.instance.disposed", properties: { directory: "/repo" } },
+    ]
+    const setupResult = setup(
+      () =>
+        new Response(events.map((payload) => `data: ${JSON.stringify({ directory: "/repo", payload })}\n\n`).join(""), {
+          headers: { "content-type": "text/event-stream" },
+        }),
+    )
+    const iterator = setupResult.backend.common.events.subscribe()[Symbol.asyncIterator]()
+    const result = await Promise.all(events.map(() => iterator.next()))
+
+    expect(result.map((item) => item.value?.event.type)).toEqual([
+      "session.activity",
+      "todo.updated",
+      "timeline.delta",
+      "timeline.part.removed",
+      "worktree.ready",
+      "lsp.updated",
+      "reference.updated",
+      "mcp.updated",
+      "instance.disposed",
+    ])
+    expect(result[0].value?.event).toEqual({ type: "session.activity", sessionID: "ses_1", activity: { type: "idle" } })
+    expect(result[1].value?.event).toMatchObject({ todos: [{ priority: "high" }] })
+  })
+
+  test("updates the V1 projection cache for deltas and removals", async () => {
+    const info = {
+      id: "msg_1",
+      sessionID: "ses_1",
+      role: "user",
+      time: { created: 1 },
+      agent: "build",
+      model: { providerID: "p", modelID: "m" },
+    }
+    const part = { id: "part_1", sessionID: "ses_1", messageID: "msg_1", type: "text", text: "a" }
+    const events = [
+      { type: "message.updated", properties: { info } },
+      { type: "message.part.updated", properties: { sessionID: "ses_1", part } },
+      { type: "message.part.delta", properties: { sessionID: "ses_1", messageID: "msg_1", partID: "part_1", field: "text", delta: "b" } },
+      { type: "message.updated", properties: { info } },
+      { type: "message.part.removed", properties: { sessionID: "ses_1", messageID: "msg_1", partID: "part_1" } },
+      { type: "message.updated", properties: { info } },
+    ]
+    const setupResult = setup(() => new Response(events.map((payload) => `data: ${JSON.stringify({ directory: "/repo", payload })}\n\n`).join(""), { headers: { "content-type": "text/event-stream" } }))
+    const iterator = setupResult.backend.common.events.subscribe()[Symbol.asyncIterator]()
+    await iterator.next()
+    await iterator.next()
+    await iterator.next()
+    const afterDelta = await iterator.next()
+    await iterator.next()
+    const afterRemoval = await iterator.next()
+
+    expect(afterDelta.value?.event).toMatchObject({ item: { content: [{ id: "part_1", text: "ab" }] } })
+    expect(afterRemoval.value?.event).toMatchObject({ item: { content: [] } })
+    expect(setupResult.requests).toHaveLength(1)
+  })
+
+  test("merges global config updates with untouched fields", async () => {
+    const bodies: unknown[] = []
+    const setupResult = setup(async (request) => {
+      if (request.method === "GET") return json({ autoupdate: true, model: "old", disabled_providers: ["one"] })
+      bodies.push(await request.json())
+      return json({})
+    })
+
+    await setupResult.backend.capabilities.configuration?.updateGlobal({
+      model: "new",
+      disabledProviders: ["two"],
+    })
+
+    expect(bodies).toEqual([{ autoupdate: true, model: "new", disabled_providers: ["two"] }])
+  })
+
+  test("uses legacy PTY endpoints, location queries, status, tickets, and auth fallback", async () => {
+    const setupResult = setup((request) => {
+      const path = new URL(request.url).pathname
+      if (path.endsWith("/connect-token")) return new Response(null, { status: 405 })
+      if (request.method === "GET") return new Response(null, { status: 404 })
+      return new Response(null, { status: 204 })
+    })
+
+    await setupResult.backend.common.permissions.reply({
+      sessionID: "ses_1",
+      requestID: "per_1",
+      reply: "once",
+      location: { directory: "/explicit", workspaceID: "workspace" },
+    })
+    await setupResult.backend.common.questions.reject({
+      sessionID: "ses_1",
+      requestID: "que_1",
+      location: { directory: "/explicit", workspaceID: "workspace" },
+    })
+    const transport = setupResult.backend.capabilities.ptyTransport
+    const ticket = await transport?.connectToken({
+      ptyID: "pty_1",
+      location: { directory: "/explicit", workspaceID: "workspace" },
+    })
+    const exists = await transport?.exists({
+      ptyID: "pty_1",
+      location: { directory: "/explicit", workspaceID: "workspace" },
+    })
+
+    expect(ticket).toEqual({ status: 405, ticket: undefined })
+    expect(exists).toBe(false)
+    expect(setupResult.requests.map((request) => new URL(request.url).searchParams.get("directory"))).toEqual([
+      "/explicit",
+      "/explicit",
+      "/explicit",
+      "/explicit",
+    ])
+    expect(setupResult.requests[2].headers.get("x-opencode-ticket")).toBe("1")
+
+    const fallback = transport?.connectURL({
+      ptyID: "pty/1",
+      location: { directory: "/explicit", workspaceID: "workspace" },
+      cursor: 12,
+    })
+    expect(fallback?.pathname).toBe("/pty/pty%2F1/connect")
+    expect(fallback?.protocol).toBe("ws:")
+    expect(fallback?.searchParams.get("directory")).toBe("/explicit")
+    expect(fallback?.searchParams.get("workspace")).toBe("workspace")
+    expect(fallback?.searchParams.get("cursor")).toBe("12")
+    expect(fallback?.searchParams.get("auth_token")).toBe(btoa("user:secret"))
+
+    const ticketURL = transport?.connectURL({
+      ptyID: "pty_1",
+      location: { directory: "/explicit" },
+      cursor: -1,
+      ticket: "ticket value",
+    })
+    expect(ticketURL?.searchParams.get("ticket")).toBe("ticket value")
+    expect(ticketURL?.searchParams.has("auth_token")).toBe(false)
+  })
+
+  test("preserves same-origin auth-token policy for PTY URLs", () => {
+    const saved = setup(() => new Response(), false, { sameOrigin: true }).backend.capabilities.ptyTransport
+    const token = setup(() => new Response(), false, { sameOrigin: true, authToken: true }).backend.capabilities
+      .ptyTransport
+    const input = { ptyID: "pty_1", location: { directory: "/repo" }, cursor: 0 }
+
+    expect(saved?.connectURL(input).searchParams.has("auth_token")).toBe(false)
+    expect(token?.connectURL(input).searchParams.get("auth_token")).toBe(btoa("user:secret"))
+  })
+})

packages/app/src/context/backend-v2.test.ts

@@ -0,0 +1,745 @@
+import { describe, expect, test } from "bun:test"
+import { OpenCode } from "@opencode-ai/client"
+import { credentialConnectionIDs, type PtyTransportConfig } from "./backend"
+import { createV2Backend } from "./backend-v2"
+
+function setup(
+  respond: (request: Request) => Response | Promise<Response>,
+  transport?: Partial<Pick<PtyTransportConfig, "sameOrigin" | "authToken" | "password">>,
+) {
+  const requests: Request[] = []
+  const fetch = Object.assign(
+    async (input: RequestInfo | URL, init?: RequestInit) => {
+      const request = input instanceof Request ? input : new Request(input, init)
+      requests.push(request)
+      return respond(request)
+    },
+    { preconnect: globalThis.fetch.preconnect },
+  ) satisfies typeof globalThis.fetch
+  const client = OpenCode.make({ baseUrl: "http://localhost", fetch })
+  return {
+    requests,
+    backend: createV2Backend(
+      client,
+      {
+        baseUrl: "http://localhost",
+        fetch,
+        username: "user",
+        password: transport && "password" in transport ? transport.password : "secret",
+        sameOrigin: transport?.sameOrigin ?? false,
+        authToken: transport?.authToken ?? false,
+      },
+      { directory: "/default", workspaceID: "default-workspace" },
+      client,
+    ),
+  }
+}
+
+function json(data: unknown) {
+  return new Response(JSON.stringify(data), { headers: { "content-type": "application/json" } })
+}
+
+const session = {
+  id: "ses_1",
+  projectID: "project",
+  cost: 1.5,
+  tokens: { input: 1, output: 2, reasoning: 3, cache: { read: 4, write: 5 } },
+  time: { created: 10, updated: 20 },
+  title: "Session",
+  location: { directory: "/repo", workspaceID: "workspace" },
+}
+
+describe("createV2Backend", () => {
+  test("uses no legacy endpoints for bootstrap and common reads", async () => {
+    const setupResult = setup((request) => {
+      const path = new URL(request.url).pathname
+      if (path === "/api/health") return json({ healthy: true, version: "v2" })
+      if (path === "/api/location")
+        return json({
+          directory: "/default",
+          workspaceID: "default-workspace",
+          project: { id: "project", directory: "/default" },
+        })
+      return json({ location: { directory: "/default" }, data: [] })
+    })
+
+    await Promise.all([
+      setupResult.backend.common.health.get(),
+      setupResult.backend.common.projects.current(),
+      setupResult.backend.common.catalog.providers(),
+      setupResult.backend.common.catalog.agents(),
+      setupResult.backend.common.commands.list(),
+      setupResult.backend.common.references.list(),
+      setupResult.backend.common.files.list({}),
+      setupResult.backend.common.files.find({ query: "src" }),
+      setupResult.backend.common.permissions.pending(),
+      setupResult.backend.common.questions.pending(),
+      setupResult.backend.common.pty.list(),
+    ])
+
+    const paths = setupResult.requests.map((request) => new URL(request.url).pathname)
+    expect(paths.every((path) => path.startsWith("/api/"))).toBe(true)
+    expect(paths.some((path) => path === "/project" || path.startsWith("/vcs") || path.startsWith("/mcp"))).toBe(
+      false,
+    )
+  })
+
+  test("normalizes session pages and preserves location precedence", async () => {
+    const setupResult = setup(() => json({ data: [session], cursor: { previous: "before", next: "after" } }))
+
+    const result = await setupResult.backend.common.sessions.list({
+      location: { directory: "/explicit", workspaceID: "explicit-workspace" },
+      limit: 10,
+      cursor: "cursor",
+    })
+
+    expect(result).toEqual({
+      items: [
+        {
+          id: "ses_1",
+          slug: "ses_1",
+          version: "",
+          parentID: undefined,
+          projectID: "project",
+          location: { directory: "/repo", workspaceID: "workspace" },
+          directory: "/repo",
+          workspaceID: "workspace",
+          title: "Session",
+          cost: 1.5,
+          tokens: { input: 1, output: 2, reasoning: 3, cache: { read: 4, write: 5 } },
+          time: { created: 10, updated: 20 },
+          revert: undefined,
+        },
+      ],
+      newer: "before",
+      older: "after",
+    })
+    const url = new URL(setupResult.requests[0].url)
+    expect(url.pathname).toBe("/api/session")
+    expect(url.searchParams.get("directory")).toBe("/explicit")
+    expect(url.searchParams.get("workspace")).toBe("explicit-workspace")
+    expect(url.searchParams.has("parentID")).toBe(false)
+    expect(url.searchParams.get("cursor")).toBe("cursor")
+  })
+
+  test("paginates native sessions until roots:true contains only the requested roots", async () => {
+    const child = { ...session, id: "child", parentID: "root_1" }
+    const root1 = { ...session, id: "root_1" }
+    const root2 = { ...session, id: "root_2" }
+    const setupResult = setup((request) => {
+      const cursor = new URL(request.url).searchParams.get("cursor")
+      if (!cursor) return json({ data: [child], cursor: { next: "one" } })
+      if (cursor === "one") return json({ data: [root1], cursor: { next: "two" } })
+      return json({ data: [root2], cursor: { next: "three" } })
+    })
+
+    const result = await setupResult.backend.common.sessions.list({ roots: true, limit: 2 })
+
+    expect(result.items.map((item) => item.id)).toEqual(["root_1", "root_2"])
+    expect(result.older).toBe("three")
+    expect(setupResult.requests.map((request) => new URL(request.url).searchParams.get("limit"))).toEqual(["1", "1", "1"])
+  })
+
+  test("uses only native endpoints for bootstrap operations and binary file reads", async () => {
+    const setupResult = setup((request) => {
+      if (new URL(request.url).pathname === "/api/fs/read/dir%2Fa.txt")
+        return new Response(Uint8Array.from([0, 1, 255]), { headers: { "content-type": "application/octet-stream" } })
+      return json({ location: { directory: "/default" }, data: [] })
+    })
+
+    await setupResult.backend.common.files.list({ path: "dir" })
+    const content = await setupResult.backend.common.files.read({ path: "dir/a.txt" })
+
+    const url = new URL(setupResult.requests[0].url)
+    expect(url.pathname).toBe("/api/fs/list")
+    expect(url.searchParams.get("location[directory]")).toBe("/default")
+    expect(url.searchParams.get("location[workspace]")).toBe("default-workspace")
+    expect(content).toEqual({
+      bytes: Uint8Array.from([0, 1, 255]),
+      kind: "binary",
+      mimeType: "application/octet-stream",
+    })
+    const readURL = new URL(setupResult.requests[1].url)
+    expect(readURL.pathname).toBe("/api/fs/read/dir%2Fa.txt")
+    expect(readURL.searchParams.get("location[directory]")).toBe("/default")
+    expect(readURL.searchParams.get("location[workspace]")).toBe("default-workspace")
+    expect(setupResult.requests[1].headers.get("authorization")).toBe(`Basic ${btoa("user:secret")}`)
+    expect(setupResult.requests.every((request) => new URL(request.url).pathname.startsWith("/api/"))).toBe(true)
+    expect(setupResult.backend.version).toBe("v2")
+    expect(Object.keys(setupResult.backend.capabilities).sort()).toEqual([
+      "integrationsV2",
+      "projectCopiesV2",
+      "ptyTransport",
+      "savedPermissionsV2",
+      "sessionExtrasV2",
+    ])
+    expect(setupResult.backend.capabilities.providerAuthV1).toBeUndefined()
+    expect(setupResult.backend.capabilities.worktreesV1).toBeUndefined()
+    expect(setupResult.backend.capabilities.sessionExtrasV1).toBeUndefined()
+    expect(setupResult.backend.capabilities.runtimeV1).toBeUndefined()
+    expect(setupResult.backend.capabilities.projectList).toBeUndefined()
+    expect(setupResult.backend.capabilities.vcs).toBeUndefined()
+    expect(setupResult.backend.capabilities.mcp).toBeUndefined()
+    expect(setupResult.backend.capabilities.sessionExtrasV2?.move).toBeUndefined()
+    expect(setupResult.backend.capabilities.projectCopiesV2?.directories).toBeUndefined()
+  })
+
+  test("uses native PTY endpoints and preserves status through the v2 adapter", async () => {
+    const setupResult = setup((request) =>
+      request.method === "GET" ? new Response(null, { status: 404 }) : new Response(null, { status: 403 }),
+    )
+    const transport = setupResult.backend.capabilities.ptyTransport
+
+    const ticket = await transport?.connectToken({
+      ptyID: "pty_1",
+      location: { directory: "/explicit", workspaceID: "workspace" },
+    })
+    const exists = await transport?.exists({
+      ptyID: "pty_1",
+      location: { directory: "/explicit", workspaceID: "workspace" },
+    })
+
+    expect(ticket).toEqual({ status: 403, ticket: undefined })
+    expect(exists).toBe(false)
+    expect(setupResult.requests[0].headers.get("x-opencode-ticket")).toBe("1")
+    const tokenURL = new URL(setupResult.requests[0].url)
+    const existsURL = new URL(setupResult.requests[1].url)
+    expect(tokenURL.pathname).toBe("/api/pty/pty_1/connect-token")
+    expect(existsURL.pathname).toBe("/api/pty/pty_1")
+    expect(tokenURL.searchParams.get("location[directory]")).toBe("/explicit")
+    expect(tokenURL.searchParams.get("location[workspace]")).toBe("workspace")
+    expect(setupResult.requests[0].headers.get("authorization")).toBe(`Basic ${btoa("user:secret")}`)
+
+    expect(() =>
+      transport?.connectURL({
+        ptyID: "pty/1",
+        location: { directory: "/explicit", workspaceID: "workspace" },
+        cursor: 8,
+      }),
+    ).toThrow("require a ticket")
+
+    const ticketURL = transport?.connectURL({
+      ptyID: "pty_1",
+      location: { directory: "/explicit" },
+      cursor: 0,
+      ticket: "ticket value",
+    })
+    expect(ticketURL?.searchParams.get("ticket")).toBe("ticket value")
+    expect(ticketURL?.searchParams.has("auth_token")).toBe(false)
+  })
+
+  test("allows ticketless same-origin native PTY URLs without credential queries", () => {
+    const transport = setup(() => new Response(), { sameOrigin: true, password: undefined }).backend.capabilities
+      .ptyTransport
+    const url = transport?.connectURL({ ptyID: "pty_1", location: { directory: "/repo" }, cursor: 0 })
+
+    expect(url?.searchParams.has("auth_token")).toBe(false)
+    expect(url?.pathname).toBe("/api/pty/pty_1/connect")
+  })
+
+  test("preserves native provider integration IDs", async () => {
+    const setupResult = setup((request) => {
+      const path = new URL(request.url).pathname
+      if (path === "/api/provider")
+        return json({
+          location: { directory: "/default" },
+          data: [
+            {
+              id: "provider",
+              integrationID: "integration",
+              name: "Provider",
+              api: { type: "native", settings: {} },
+              request: { headers: {}, body: {} },
+            },
+          ],
+        })
+      return json({ location: { directory: "/default" }, data: [] })
+    })
+
+    const result = await setupResult.backend.common.catalog.providers()
+
+    expect(result.providers.get("provider")?.integrationID).toBe("integration")
+  })
+
+  test("preserves integration connection kinds", async () => {
+    const setupResult = setup(() =>
+      json({
+        location: { directory: "/default" },
+        data: [
+          {
+            id: "integration",
+            name: "Integration",
+            methods: [],
+            connections: [
+              { type: "credential", id: "credential", label: "Saved" },
+              { type: "environment", name: "TOKEN" },
+            ],
+          },
+        ],
+      }),
+    )
+
+    const integrations = await setupResult.backend.capabilities.integrationsV2?.list()
+    expect(integrations).toEqual([
+      {
+        id: "integration",
+        name: "Integration",
+        methods: [],
+        connections: [
+          { id: "credential", label: "Saved", kind: "credential" },
+          { id: "TOKEN", label: "TOKEN", kind: "environment" },
+        ],
+      },
+    ])
+    expect(credentialConnectionIDs(integrations?.[0]?.connections ?? [])).toEqual(["credential"])
+  })
+
+  test("switches prompt selection before admission", async () => {
+    const setupResult = setup((request) =>
+      request.url.endsWith("/prompt")
+        ? json({
+            data: {
+              admittedSeq: 1,
+              id: "msg_1",
+              sessionID: "ses_1",
+              timeCreated: 1,
+              type: "user",
+              data: { text: "hello" },
+              delivery: "steer",
+            },
+          })
+        : new Response(null, { status: 204 }),
+    )
+
+    await setupResult.backend.common.sessions.prompt({
+      sessionID: "ses_1",
+      id: "msg_1",
+      text: "hello",
+      selection: { agent: "build", model: { id: "model", providerID: "provider", variant: "high" } },
+      files: [{ uri: "data:text/plain;base64,aGk=", name: "hi.txt", source: { text: "hi", start: 0, end: 2 } }],
+    })
+
+    expect(setupResult.requests.map((item) => new URL(item.url).pathname)).toEqual([
+      "/api/session/ses_1/agent",
+      "/api/session/ses_1/model",
+      "/api/session/ses_1/prompt",
+    ])
+    expect(await setupResult.requests[2].json()).toEqual({
+      id: "msg_1",
+      prompt: {
+        text: "hello",
+        files: [
+          {
+            uri: "data:text/plain;base64,aGk=",
+            mime: "application/octet-stream",
+            name: "hi.txt",
+            source: { start: 0, end: 2, text: "hi" },
+          },
+        ],
+      },
+    })
+  })
+
+  test("serializes selection and prompt admission per session", async () => {
+    const firstPrompt = Promise.withResolvers<void>()
+    const firstPromptStarted = Promise.withResolvers<void>()
+    const setupResult = setup(async (request) => {
+      const path = new URL(request.url).pathname
+      if (path.endsWith("/prompt") && setupResult.requests.filter((item) => item.url.endsWith("/prompt")).length === 1) {
+        firstPromptStarted.resolve()
+        await firstPrompt.promise
+      }
+      return path.endsWith("/prompt")
+        ? json({ data: { id: "msg", sessionID: "ses_1", timeCreated: 1, type: "user", data: { text: "" } } })
+        : new Response(null, { status: 204 })
+    })
+
+    const first = setupResult.backend.common.sessions.prompt({
+      sessionID: "ses_1",
+      id: "msg_1",
+      text: "first",
+      selection: { agent: "build" },
+    })
+    await firstPromptStarted.promise
+    const second = setupResult.backend.common.sessions.prompt({
+      sessionID: "ses_1",
+      id: "msg_2",
+      text: "second",
+      selection: { agent: "plan" },
+    })
+
+    expect(setupResult.requests.map((item) => new URL(item.url).pathname)).toEqual([
+      "/api/session/ses_1/agent",
+      "/api/session/ses_1/prompt",
+    ])
+    firstPrompt.resolve()
+    await Promise.all([first, second])
+    expect(setupResult.requests.map((item) => new URL(item.url).pathname)).toEqual([
+      "/api/session/ses_1/agent",
+      "/api/session/ses_1/prompt",
+      "/api/session/ses_1/agent",
+      "/api/session/ses_1/prompt",
+    ])
+  })
+
+  test("does not switch a selection already present in session state", async () => {
+    const setupResult = setup((request) =>
+      request.url.endsWith("/prompt")
+        ? json({ data: { id: "msg", sessionID: "ses_1", timeCreated: 1, type: "user", data: { text: "" } } })
+        : json({ data: { ...session, agent: "build", model: { id: "model", providerID: "provider" } } }),
+    )
+    await setupResult.backend.common.sessions.get({ sessionID: "ses_1" })
+    await setupResult.backend.common.sessions.prompt({
+      sessionID: "ses_1",
+      id: "msg_1",
+      text: "hello",
+      selection: { agent: "build", model: { id: "model", providerID: "provider" } },
+    })
+
+    expect(setupResult.requests.map((item) => new URL(item.url).pathname)).toEqual([
+      "/api/session/ses_1",
+      "/api/session/ses_1/prompt",
+    ])
+  })
+
+  test("requests file staging when selected revert files are present", async () => {
+    const setupResult = setup(() => json({ data: { messageID: "msg_1", files: [] } }))
+
+    await setupResult.backend.capabilities.sessionExtrasV2?.stageRevert({
+      sessionID: "ses_1",
+      messageID: "msg_1",
+      files: ["a.txt"],
+    })
+
+    expect(await setupResult.requests[0].json()).toEqual({ messageID: "msg_1", files: true })
+  })
+
+  test("maps ordered app prompt parts to the native prompt shape", async () => {
+    const setupResult = setup(() =>
+      json({ data: { admittedSeq: 1, id: "msg_1", sessionID: "ses_1", timeCreated: 1, type: "user", data: {} } }),
+    )
+
+    await setupResult.backend.common.sessions.prompt({
+      sessionID: "ses_1",
+      id: "msg_1",
+      text: "visible",
+      parts: [
+        { id: "part_text", type: "text", text: "visible" },
+        { id: "part_note", type: "text", text: "note", synthetic: true, metadata: { source: "review" } },
+        { id: "part_file", type: "file", mime: "text/plain", url: "file:///repo/a.ts", filename: "a.ts" },
+        { id: "part_agent", type: "agent", name: "build", source: { value: "@build", start: 7, end: 13 } },
+      ],
+    })
+
+    expect(await setupResult.requests[0].json()).toEqual({
+      id: "msg_1",
+      prompt: {
+        text: "visiblenote",
+        files: [{ uri: "file:///repo/a.ts", mime: "text/plain", name: "a.ts" }],
+        agents: [{ name: "build", source: { text: "@build", start: 7, end: 13 } }],
+      },
+    })
+  })
+
+  test("commits a staged revert through the V2 capability", async () => {
+    const setupResult = setup(() => new Response(null, { status: 204 }))
+
+    await setupResult.backend.capabilities.sessionExtrasV2?.commitRevert({ sessionID: "ses_1" })
+
+    expect(new URL(setupResult.requests[0].url).pathname).toBe("/api/session/ses_1/revert/commit")
+  })
+
+  test("normalizes current session activity events without projection refresh", async () => {
+    const setupResult = setup(
+      () =>
+        new Response(
+          `data: ${JSON.stringify({
+            id: "evt_started",
+            type: "session.next.step.started",
+            durable: { aggregateID: "ses_1", seq: 3, version: 1 },
+            location: { directory: "/repo" },
+            data: {
+              timestamp: 1,
+              sessionID: "ses_1",
+              assistantMessageID: "msg_1",
+              agent: "build",
+              model: { id: "model", providerID: "provider" },
+            },
+          })}\n\n`,
+          { headers: { "content-type": "text/event-stream" } },
+        ),
+    )
+
+    const result = await setupResult.backend.common.events.subscribe()[Symbol.asyncIterator]().next()
+
+    expect(result.value).toMatchObject({
+      location: { directory: "/repo" },
+      event: {
+        type: "session.activity",
+        sessionID: "ses_1",
+        activity: { type: "running" },
+      },
+    })
+    expect(setupResult.requests).toHaveLength(1)
+  })
+
+  test("maps completed native steps to idle activity", async () => {
+    const setupResult = setup(
+      () =>
+        new Response(
+          `data: ${JSON.stringify({
+            id: "evt_ended",
+            type: "session.next.step.ended",
+            data: {
+              timestamp: 2,
+              sessionID: "ses_1",
+              assistantMessageID: "msg_1",
+              finish: "stop",
+              cost: 1,
+              tokens: { input: 1, output: 1, reasoning: 0, cache: { read: 0, write: 0 } },
+            },
+          })}\n\n`,
+          { headers: { "content-type": "text/event-stream" } },
+        ),
+    )
+
+    const result = await setupResult.backend.common.events.subscribe()[Symbol.asyncIterator]().next()
+
+    expect(result.value?.event).toEqual({
+      type: "session.activity",
+      sessionID: "ses_1",
+      activity: { type: "idle" },
+    })
+  })
+
+  test("projects failed steps as completed assistant errors and clears running", async () => {
+    const events = [
+      {
+        id: "start",
+        type: "session.next.step.started",
+        data: { timestamp: 1, sessionID: "ses_1", assistantMessageID: "msg_1", agent: "build", model: { id: "m", providerID: "p" } },
+      },
+      { id: "text", type: "session.next.text.started", data: { timestamp: 2, sessionID: "ses_1", assistantMessageID: "msg_1", textID: "text_1" } },
+      { id: "delta", type: "session.next.text.delta", data: { timestamp: 3, sessionID: "ses_1", assistantMessageID: "msg_1", textID: "text_1", delta: "partial" } },
+      { id: "failed", type: "session.next.step.failed", data: { timestamp: 4, sessionID: "ses_1", assistantMessageID: "msg_1", error: { type: "unknown", message: "boom" } } },
+    ]
+    const setupResult = setup(() => new Response(events.map((event) => `data: ${JSON.stringify(event)}\n\n`).join(""), { headers: { "content-type": "text/event-stream" } }))
+    const iterator = setupResult.backend.common.events.subscribe()[Symbol.asyncIterator]()
+    await iterator.next()
+    await iterator.next()
+    await iterator.next()
+
+    expect((await iterator.next()).value?.event).toMatchObject({
+      type: "session.activity",
+      activity: { type: "idle" },
+      item: { completed: 4, error: { data: { message: "boom" } }, content: [{ id: "text_1", text: "partial" }] },
+    })
+  })
+
+  test("does not infer assistant parents across history pages or direct fetches", async () => {
+    const assistant = { id: "assistant", type: "assistant", time: { created: 2 }, agent: "build", model: { id: "m", providerID: "p" }, content: [] }
+    const user = { id: "user", type: "user", time: { created: 1 }, text: "hello" }
+    const setupResult = setup((request) => {
+      const url = new URL(request.url)
+      if (url.pathname.endsWith("/message/assistant")) return json({ data: assistant })
+      if (url.searchParams.get("cursor")) return json({ data: [user], cursor: {} })
+      return json({ data: [assistant], cursor: { next: "older" } })
+    })
+
+    const first = await setupResult.backend.common.sessions.history({ sessionID: "ses_1" })
+    await setupResult.backend.common.sessions.history({ sessionID: "ses_1", cursor: first.older })
+    const direct = await setupResult.backend.common.sessions.message({ sessionID: "ses_1", messageID: "assistant" })
+
+    expect(first.items[0]).toMatchObject({ type: "assistant", parentID: undefined })
+    expect(direct).toMatchObject({ type: "assistant", parentID: undefined })
+  })
+
+  test("normalizes lifecycle and provider refresh events without HTTP fallbacks", async () => {
+    const events = [
+      { id: "moved", type: "session.next.moved", data: { timestamp: 1, sessionID: "ses_1", location: { directory: "/next" } } },
+      { id: "revert", type: "session.next.revert.staged", data: { timestamp: 2, sessionID: "ses_1", revert: { messageID: "msg_1" } } },
+      { id: "integration", type: "integration.updated", data: {} },
+      { id: "unknown", type: "session.next.context.updated", data: { timestamp: 3, sessionID: "ses_1", messageID: "msg_1", text: "x" } },
+    ]
+    const setupResult = setup(() => new Response(events.map((event) => `data: ${JSON.stringify(event)}\n\n`).join(""), { headers: { "content-type": "text/event-stream" } }))
+    const iterator = setupResult.backend.common.events.subscribe()[Symbol.asyncIterator]()
+
+    expect((await iterator.next()).value?.event).toEqual({ type: "session.moved", sessionID: "ses_1", location: { directory: "/next" } })
+    expect((await iterator.next()).value?.event).toEqual({ type: "session.revert", sessionID: "ses_1", revert: { messageID: "msg_1" } })
+    expect((await iterator.next()).value?.event).toEqual({ type: "provider.updated" })
+    expect((await iterator.next()).value?.event.type).toBe("unknown")
+    expect(setupResult.requests).toHaveLength(1)
+  })
+
+  test("normalizes native session create, update, and delete lifecycle events", async () => {
+    const info = {
+      id: "ses_1",
+      slug: "one",
+      version: "2",
+      projectID: "project",
+      directory: "/repo",
+      title: "Session",
+      time: { created: 1, updated: 2 },
+    }
+    const events = [
+      { id: "created", type: "session.created", data: { sessionID: "ses_1", info } },
+      { id: "updated", type: "session.updated", data: { sessionID: "ses_1", info: { ...info, title: "Renamed" } } },
+      { id: "deleted", type: "session.deleted", data: { sessionID: "ses_1", info } },
+    ]
+    const setupResult = setup(() => new Response(events.map((event) => `data: ${JSON.stringify(event)}\n\n`).join(""), { headers: { "content-type": "text/event-stream" } }))
+    const iterator = setupResult.backend.common.events.subscribe()[Symbol.asyncIterator]()
+
+    expect((await iterator.next()).value?.event).toMatchObject({ type: "session.created", session: { id: "ses_1", title: "Session" } })
+    expect((await iterator.next()).value?.event).toMatchObject({ type: "session.updated", session: { id: "ses_1", title: "Renamed" } })
+    expect((await iterator.next()).value?.event).toEqual({ type: "session.deleted", sessionID: "ses_1" })
+  })
+
+  test("normalizes durable session log events through the event mapper", async () => {
+    const setupResult = setup(
+      () =>
+        new Response(
+          `data: ${JSON.stringify({
+            id: "evt_started",
+            type: "session.next.step.started",
+            durable: { aggregateID: "ses_1", seq: 7, version: 1 },
+            data: {
+              timestamp: 1,
+              sessionID: "ses_1",
+              assistantMessageID: "msg_1",
+              agent: "build",
+              model: { id: "model", providerID: "provider" },
+            },
+          })}\n\n`,
+          { headers: { "content-type": "text/event-stream" } },
+        ),
+    )
+    const capability = setupResult.backend.capabilities.sessionExtrasV2
+    if (!capability) throw new Error("Missing V2 session capability")
+
+    const result = await capability.log({ sessionID: "ses_1" })[Symbol.asyncIterator]().next()
+
+    expect(result.value).toMatchObject({
+      sequence: 7,
+      event: { type: "session.activity", sessionID: "ses_1", activity: { type: "running" } },
+    })
+    expect(new URL(setupResult.requests[0].url).pathname).toBe("/api/session/ses_1/event")
+  })
+
+  test("normalizes native todo and part removal events", async () => {
+    const events = [
+      {
+        id: "evt_todo",
+        type: "todo.updated",
+        data: { sessionID: "ses_1", todos: [{ content: "Ship", status: "pending", priority: "high" }] },
+      },
+      {
+        id: "evt_removed",
+        type: "message.part.removed",
+        data: { sessionID: "ses_1", messageID: "msg_1", partID: "part_1" },
+      },
+    ]
+    const setupResult = setup(
+      () =>
+        new Response(events.map((event) => `data: ${JSON.stringify(event)}\n\n`).join(""), {
+          headers: { "content-type": "text/event-stream" },
+        }),
+    )
+    const iterator = setupResult.backend.common.events.subscribe()[Symbol.asyncIterator]()
+
+    expect((await iterator.next()).value?.event).toEqual({
+      type: "todo.updated",
+      sessionID: "ses_1",
+      todos: [{ content: "Ship", status: "pending", priority: "high" }],
+    })
+    expect((await iterator.next()).value?.event).toEqual({
+      type: "timeline.part.removed",
+      sessionID: "ses_1",
+      itemID: "msg_1",
+      contentID: "part_1",
+    })
+  })
+
+  test("preserves streamed V2 timeline deltas without projection refresh", async () => {
+    const setupResult = setup((request) => {
+      if (new URL(request.url).pathname === "/api/event") {
+        return new Response(
+          `data: ${JSON.stringify({
+            id: "evt_1",
+            type: "session.next.text.delta",
+            location: { directory: "/repo" },
+            data: {
+              timestamp: 1,
+              sessionID: "ses_1",
+              assistantMessageID: "msg_1",
+              textID: "text_1",
+              delta: "hi",
+            },
+          })}\n\n`,
+          { headers: { "content-type": "text/event-stream" } },
+        )
+      }
+      return json({
+        data: {
+          id: "msg_1",
+          type: "assistant",
+          time: { created: 1 },
+          agent: "build",
+          model: { id: "model", providerID: "provider" },
+          content: [{ type: "text", id: "text_1", text: "hello" }],
+        },
+      })
+    })
+
+    const result = await setupResult.backend.common.events.subscribe()[Symbol.asyncIterator]().next()
+
+    expect(result.value).toEqual({
+      location: { directory: "/repo" },
+      event: {
+        type: "timeline.delta",
+        sessionID: "ses_1",
+        itemID: "msg_1",
+        contentID: "text_1",
+        field: "text",
+        delta: "hi",
+      },
+    })
+    expect(setupResult.requests).toHaveLength(1)
+  })
+
+  test("projects native fragment starts without blocking the event stream on HTTP", async () => {
+    const events = [
+      {
+        id: "evt_step",
+        type: "session.next.step.started",
+        data: {
+          timestamp: 1,
+          sessionID: "ses_1",
+          assistantMessageID: "msg_1",
+          agent: "build",
+          model: { id: "model", providerID: "provider" },
+        },
+      },
+      {
+        id: "evt_text",
+        type: "session.next.text.started",
+        data: { timestamp: 2, sessionID: "ses_1", assistantMessageID: "msg_1", textID: "text_1" },
+      },
+    ]
+    const setupResult = setup(
+      () =>
+        new Response(events.map((event) => `data: ${JSON.stringify(event)}\n\n`).join(""), {
+          headers: { "content-type": "text/event-stream" },
+        }),
+    )
+    const iterator = setupResult.backend.common.events.subscribe()[Symbol.asyncIterator]()
+
+    await iterator.next()
+    expect((await iterator.next()).value?.event).toEqual({
+      type: "timeline.content.updated",
+      sessionID: "ses_1",
+      itemID: "msg_1",
+      content: { type: "text", id: "text_1", text: "" },
+    })
+    expect(setupResult.requests).toHaveLength(1)
+  })
+})

packages/app/src/context/backend.test-fixture.ts

@@ -0,0 +1,56 @@
+import type { AppClient, Capabilities, CommonClient } from "./backend"
+
+type PartialApi<T> = {
+  [K in keyof T]?: T[K] extends (...args: never[]) => unknown ? T[K] : PartialApi<T[K]>
+}
+
+export function createAppClient(input: {
+  version?: AppClient["version"]
+  common?: PartialApi<CommonClient>
+  capabilities?: Capabilities
+} = {}): AppClient {
+  const unsupported = async () => {
+    throw new Error("Backend fixture method is not configured")
+  }
+  const defaults: CommonClient = {
+    health: { get: unsupported },
+    projects: { current: unsupported },
+    catalog: { providers: unsupported, agents: unsupported },
+    commands: { list: unsupported },
+    references: { list: unsupported },
+    sessions: {
+      list: unsupported,
+      create: unsupported,
+      get: unsupported,
+      interrupt: unsupported,
+      activity: unsupported,
+      history: unsupported,
+      message: unsupported,
+      prompt: unsupported,
+    },
+    files: { list: unsupported, find: unsupported, read: unsupported },
+    permissions: { pending: unsupported, reply: unsupported },
+    questions: { pending: unsupported, reply: unsupported, reject: unsupported },
+    pty: { list: unsupported, create: unsupported, get: unsupported, update: unsupported, remove: unsupported },
+    events: {
+      async *subscribe() {},
+    },
+  }
+  return {
+    version: input.version ?? "v1",
+    capabilities: input.capabilities ?? {},
+    common: {
+      health: { ...defaults.health, ...input.common?.health },
+      projects: { ...defaults.projects, ...input.common?.projects },
+      catalog: { ...defaults.catalog, ...input.common?.catalog },
+      commands: { ...defaults.commands, ...input.common?.commands },
+      references: { ...defaults.references, ...input.common?.references },
+      sessions: { ...defaults.sessions, ...input.common?.sessions },
+      files: { ...defaults.files, ...input.common?.files },
+      permissions: { ...defaults.permissions, ...input.common?.permissions },
+      questions: { ...defaults.questions, ...input.common?.questions },
+      pty: { ...defaults.pty, ...input.common?.pty },
+      events: { ...defaults.events, ...input.common?.events },
+    },
+  }
+}

packages/app/src/context/directory-sync.ts

@@ -1,7 +1,7 @@
 import { Binary } from "@opencode-ai/core/util/binary"
-import type { Message, Part, Session } from "@opencode-ai/sdk/v2/client"
+import type { AppMessage, AppPart, AppSession } from "./backend"
 import { createMemo } from "solid-js"
-import { produce, reconcile, type SetStoreFunction } from "solid-js/store"
+import { createStore, produce, reconcile, type SetStoreFunction } from "solid-js/store"
 import type { createServerSdkContext } from "./server-sdk"
 import type { createServerSyncContextInner } from "./server-sync"
 import type { State } from "./global-sync/types"
@@ -23,8 +23,8 @@ export const createDirSyncContext = (
   serverSync: ReturnType<typeof createServerSyncContextInner>,
   serverSDK: ReturnType<typeof createServerSdkContext>,
 ) => {
-  const client = serverSDK.createClient({ directory, throwOnError: true })
   const current = createMemo(() => serverSync.child(directory, { mcp: true }))
+  const [sessionPage, setSessionPage] = createStore({ cursor: undefined as string | undefined, complete: false })
   const absolute = (path: string) => (current()[0].path.directory + "/" + path).replace("//", "/")
   const data = new Proxy({} as State, {
     get(_, property: keyof State) {
@@ -72,7 +72,7 @@ export const createDirSyncContext = (
       if (match.found) return serverSync.data.project[match.index]
     },
     session: {
-      remember(session: Session) {
+      remember(session: AppSession) {
         serverSync.session.remember(session)
         index(session.id)
       },
@@ -81,7 +81,7 @@ export const createDirSyncContext = (
         if (session?.directory === directory) return session
       },
       optimistic: {
-        add(input: { directory?: string; sessionID: string; message: Message; parts: Part[] }) {
+        add(input: { directory?: string; sessionID: string; message: AppMessage; parts: AppPart[] }) {
           serverSync.session.optimistic.add(input)
         },
         remove(input: { directory?: string; sessionID: string; messageID: string }) {
@@ -91,7 +91,7 @@ export const createDirSyncContext = (
       addOptimisticMessage(input: {
         sessionID: string
         messageID: string
-        parts: Part[]
+        parts: AppPart[]
         agent: string
         model: { providerID: string; modelID: string }
         variant?: string
@@ -110,7 +110,7 @@ export const createDirSyncContext = (
         })
       },
       async sync(sessionID: string, options?: { force?: boolean }) {
-        await serverSync.session.sync(sessionID, options)
+        await serverSync.session.sync(sessionID, { ...options, location: { directory } })
         index(sessionID)
       },
       diff: serverSync.session.diff,
@@ -121,17 +121,25 @@ export const createDirSyncContext = (
       fetch: async (count = 10) => {
         const [store, setStore] = current()
         setStore("limit", (value) => value + count)
-        const response = await client.session.list()
-        const sessions = (response.data ?? [])
-          .filter((session) => !!session?.id)
+        const backend = await serverSDK.backend
+        const response = await backend.common.sessions.list({
+          location: { directory },
+          roots: true,
+          limit: count,
+          cursor: sessionPage.cursor,
+        })
+        const sessions = [...new Map([...store.session, ...response.items].map((session) => [session.id, session])).values()]
           .sort((a, b) => cmp(a.id, b.id))
-          .slice(0, store.limit)
         sessions.forEach(serverSync.session.remember)
         setStore("session", reconcile(sessions, { key: "id" }))
+        setSessionPage({ cursor: response.older, complete: !response.older })
       },
-      more: createMemo(() => current()[0].session.length >= current()[0].limit),
+      more: createMemo(() => !sessionPage.complete),
       archive: async (sessionID: string) => {
-        await serverSDK.client.session.update({ sessionID, time: { archived: Date.now() } })
+        const backend = await serverSDK.backend
+        const capability = backend.capabilities.sessionExtrasV1
+        if (!capability) throw new Error("Server does not support session archiving")
+        await capability.archive({ sessionID, archivedAt: Date.now(), location: { directory } })
         current()[1](
           "session",
           produce((draft) => {

packages/app/src/context/file.tsx

@@ -79,10 +79,16 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
     const tree = createFileTreeStore({
       scope,
       normalizeDir: path.normalizeDir,
-      list: (dir) =>
-        sdk()
-          .client.file.list({ path: dir })
-          .then((x) => x.data ?? []),
+      list: async (dir) =>
+        [...(await (await sdk().backend).common.files.list({ location: { directory: scope() }, path: dir }))].map(
+          (node) => ({
+            name: node.name ?? getFilename(node.path),
+            path: node.path,
+            absolute: node.absolute ?? node.path,
+            type: node.type,
+            ignored: node.ignored,
+          }),
+        ),
       onError: (message) => {
         showToast({
           variant: "error",
@@ -181,10 +187,18 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
       setLoading(file)
 
       const promise = sdk()
-        .client.file.read({ path: file })
-        .then((x) => {
+        .backend.then(async (client) => {
           if (scope() !== directory) return
-          const content = x.data
+          const content: FileState["content"] = client.capabilities.decoratedFiles
+            ? await client.capabilities.decoratedFiles.read({ location: { directory }, path: file })
+            : await client.common.files.read({ location: { directory }, path: file }).then((value) => {
+                if (value.kind !== "text") return
+                return {
+                  type: "text" as const,
+                  content: new TextDecoder().decode(value.bytes),
+                  mimeType: value.mimeType,
+                }
+              })
           setLoaded(file, content)
 
           if (!content) return
@@ -205,9 +219,19 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
 
     const search = (query: string, dirs: "true" | "false", options?: { limit?: number; signal?: AbortSignal }) =>
       sdk()
-        .client.find.files({ query, dirs, limit: options?.limit }, { signal: options?.signal })
+        .backend.then((client) =>
+          client.common.files.find(
+            {
+              location: { directory: scope() },
+              query,
+              type: dirs === "true" ? undefined : "file",
+              limit: options?.limit,
+            },
+            { signal: options?.signal },
+          ),
+        )
         .then(
-          (x) => (x.data ?? []).map(path.normalize),
+          (items) => items.map((item) => path.normalize(item.path)),
           (error) => {
             if (options?.signal?.aborted) throw error
             return []

packages/app/src/context/file/content-cache.ts

@@ -1,4 +1,4 @@
-import type { FileContent } from "@opencode-ai/sdk/v2"
+import type { DecoratedFileContent as FileContent } from "../backend"
 
 const MAX_FILE_CONTENT_ENTRIES = 40
 const MAX_FILE_CONTENT_BYTES = 20 * 1024 * 1024

packages/app/src/context/file/tree-store.ts

@@ -1,5 +1,5 @@
 import { createStore, produce, reconcile } from "solid-js/store"
-import type { FileNode } from "@opencode-ai/sdk/v2"
+import type { AppFileNode as FileNode } from "../backend"
 
 type DirectoryState = {
   expanded: boolean

packages/app/src/context/file/types.ts

@@ -1,4 +1,4 @@
-import type { FileContent } from "@opencode-ai/sdk/v2"
+import type { DecoratedFileContent as FileContent } from "../backend"
 
 export type FileSelection = {
   startLine: number

packages/app/src/context/file/watcher.ts

@@ -1,8 +1,10 @@
-import type { FileNode } from "@opencode-ai/sdk/v2"
+import type { AppFileNode as FileNode } from "../backend"
 
 type WatcherEvent = {
   type: string
-  properties: unknown
+  path?: string
+  change?: string
+  properties?: unknown
 }
 
 type WatcherOps = {
@@ -16,11 +18,11 @@ type WatcherOps = {
 }
 
 export function invalidateFromWatcher(event: WatcherEvent, ops: WatcherOps) {
-  if (event.type !== "filesystem.changed") return
+  if (event.type !== "filesystem.changed" && event.type !== "file.changed" && event.type !== "file.watcher.updated") return
   const props =
     typeof event.properties === "object" && event.properties ? (event.properties as Record<string, unknown>) : undefined
-  const rawPath = typeof props?.file === "string" ? props.file : undefined
-  const kind = typeof props?.event === "string" ? props.event : undefined
+  const rawPath = event.path ?? (typeof props?.file === "string" ? props.file : undefined)
+  const kind = event.change ?? (typeof props?.event === "string" ? props.event : undefined)
   if (!rawPath) return
   if (!kind) return
 

packages/app/src/context/global-sync/bootstrap.test.ts

@@ -1,14 +1,15 @@
 import { describe, expect, test } from "bun:test"
 import { createStore } from "solid-js/store"
 import { QueryClient } from "@tanstack/solid-query"
-import type { Config, OpencodeClient, Project, Session } from "@opencode-ai/sdk/v2/client"
-import type { NormalizedProviderListResponse } from "@opencode-ai/session-ui/context"
+import type { AppClient, AppProject as Project, AppSession as Session } from "../backend"
+import { createAppClient } from "../backend.test-fixture"
+import type { ProviderStore } from "./types"
 import { bootstrapDirectory, loadPathQuery, loadProvidersQuery } from "./bootstrap"
 import type { State, VcsCache } from "./types"
 import { createServerSession } from "../server-session"
 import { ServerScope } from "@/utils/server-scope"
 
-const provider = { all: new Map(), connected: [], default: {} } satisfies NormalizedProviderListResponse
+const provider = { all: new Map(), connected: [], default: {} } satisfies ProviderStore
 
 function directoryState() {
   return createStore<State>({
@@ -30,6 +31,7 @@ function directoryState() {
       return this.session_status[id]?.type !== "idle"
     },
     session_diff: {},
+    todo: {},
     permission: {},
     question: {},
     mcp_ready: true,
@@ -55,33 +57,35 @@ describe("bootstrapDirectory", () => {
       scope: ServerScope.local,
       mcp: false,
       global: {
-        config: {} satisfies Config,
+        config: {},
         path: { state: "", config: "", worktree: "/project", directory: "/project", home: "/home" },
         project: [{ id: "project", worktree: "/project" } as Project],
         provider,
       },
-      sdk: {
-        app: { agents: async () => ({ data: [{ name: "build", mode: "primary" }] }) },
-        config: { get: async () => ({ data: {} }) },
-        session: { status: async () => ({ data: {} }) },
-        vcs: { get: async () => ({ data: undefined }) },
-        command: {
-          list: async () => {
-            mcpReads.push("command")
-            return { data: [] }
-          },
+      backend: {
+        version: "v1",
+        capabilities: {
+          configuration: { get: async () => ({}), getGlobal: async () => ({}), updateGlobal: async () => {} },
+          vcsInfo: { get: async () => ({}) },
         },
-        permission: { list: async () => ({ data: [] }) },
-        question: { list: async () => ({ data: [] }) },
-        v2: { reference: { list: async () => ({ data: { data: [] } }) } },
-        mcp: {
-          status: async () => {
-            mcpReads.push("status")
-            return { data: {} }
+        common: {
+          catalog: {
+            agents: async () => [{ id: "build", name: "build", mode: "primary", hidden: false }],
+            providers: async () => ({ providers: new Map(), connected: [], defaults: {} }),
           },
+          sessions: { activity: async () => ({}) },
+          projects: { current: async () => ({ id: "project", directory: "/project" }) },
+          commands: {
+            list: async () => {
+              mcpReads.push("command")
+              return []
+            },
+          },
+          permissions: { pending: async () => [] },
+          questions: { pending: async () => [] },
+          references: { list: async () => [] },
         },
-        provider: { list: async () => ({ data: { all: [], connected: [], default: {} } }) },
-      } as unknown as OpencodeClient,
+      } as unknown as AppClient,
       store,
       setStore,
       vcsCache: { setStore() {} } as unknown as VcsCache,
@@ -101,22 +105,26 @@ describe("bootstrapDirectory", () => {
   test("seeds session status even while warming session info stalls", async () => {
     const [store, setStore] = directoryState()
     const stalled = Promise.withResolvers<never>()
-    const client = {
-      app: { agents: async () => ({ data: [{ name: "build", mode: "primary" }] }) },
-      config: { get: async () => ({ data: {} }) },
-      session: {
-        status: async () => ({ data: { ses_busy: { type: "busy" } } }),
-        get: () => stalled.promise,
+    const backend = createAppClient({
+      version: "v1",
+      capabilities: {
+        configuration: { get: async () => ({}), getGlobal: async () => ({}), updateGlobal: async () => {} },
+        vcsInfo: { get: async () => ({}) },
       },
-      vcs: { get: async () => ({ data: undefined }) },
-      command: { list: async () => ({ data: [] }) },
-      permission: { list: async () => ({ data: [] }) },
-      question: { list: async () => ({ data: [] }) },
-      v2: { reference: { list: async () => ({ data: { data: [] } }) } },
-      mcp: { status: async () => ({ data: {} }) },
-      provider: { list: async () => ({ data: { all: [], connected: [], default: {} } }) },
-    } as unknown as OpencodeClient
-    const session = createServerSession(client)
+      common: {
+        catalog: {
+          agents: async () => [{ id: "build", name: "build", mode: "primary", hidden: false }],
+          providers: async () => ({ providers: new Map(), connected: [], defaults: {} }),
+        },
+        sessions: { activity: async () => ({ ses_busy: { type: "busy" } }), get: () => stalled.promise },
+        projects: { current: async () => ({ id: "project", directory: "/project" }) },
+        commands: { list: async () => [] },
+        permissions: { pending: async () => [] },
+        questions: { pending: async () => [] },
+        references: { list: async () => [] },
+      },
+    })
+    const session = createServerSession(backend)
     const stale: Session = {
       id: "ses_stale",
       slug: "ses_stale",
@@ -134,12 +142,12 @@ describe("bootstrapDirectory", () => {
       scope: ServerScope.local,
       mcp: false,
       global: {
-        config: {} satisfies Config,
+        config: {},
         path: { state: "", config: "", worktree: "/project", directory: "/project", home: "/home" },
         project: [{ id: "project", worktree: "/project" } as Project],
         provider,
       },
-      sdk: client,
+      backend,
       store,
       setStore,
       vcsCache: { setStore() {} } as unknown as VcsCache,
@@ -161,12 +169,12 @@ describe("bootstrapDirectory", () => {
 
 describe("query keys", () => {
   test("partitions identical directories by server scope", () => {
-    const client = {} as OpencodeClient
+    const backend = Promise.resolve({} as AppClient)
     const remote = "https://debian.example" as typeof ServerScope.local
 
-    expect([...loadPathQuery(ServerScope.local, "/repo", client).queryKey]).toEqual(["local", "/repo", "path"])
-    expect([...loadPathQuery(remote, "/repo", client).queryKey]).toEqual(["https://debian.example", "/repo", "path"])
-    expect([...loadProvidersQuery(remote, null, client).queryKey]).toEqual([
+    expect([...loadPathQuery(ServerScope.local, "/repo", backend).queryKey]).toEqual(["local", "/repo", "path"])
+    expect([...loadPathQuery(remote, "/repo", backend).queryKey]).toEqual(["https://debian.example", "/repo", "path"])
+    expect([...loadProvidersQuery(remote, null, backend).queryKey]).toEqual([
       "https://debian.example",
       null,
       "providers",

packages/app/src/context/global-sync/bootstrap.ts

@@ -1,35 +1,35 @@
 import type {
-  Config,
-  OpencodeClient,
-  Path,
-  PermissionRequest,
-  Project,
-  ProviderAuthResponse,
-  QuestionRequest,
-  ReferenceInfo,
-  Session,
-} from "@opencode-ai/sdk/v2/client"
+  AppClient,
+  AppConfig,
+  AppPathInfo,
+  AppPermissionRequest,
+  AppProject,
+  AppProviderAuthResponse,
+  AppQuestionRequest,
+  AppReference,
+  AppSession,
+  ProviderCatalog,
+} from "../backend"
 import { showToast } from "@/utils/toast"
 import { getFilename } from "@opencode-ai/core/util/path"
 import { retry } from "@opencode-ai/core/util/retry"
 import { batch } from "solid-js"
 import { produce, reconcile, type SetStoreFunction, type Store } from "solid-js/store"
-import type { State, VcsCache } from "./types"
+import type { ProviderStore, State, StoreConfig, VcsCache } from "./types"
 import type { ServerSession } from "../server-session"
-import { cmp, normalizeAgentList, normalizeProviderList } from "./utils"
+import { cmp } from "./utils"
 import { formatServerError } from "@/utils/server-errors"
 import { QueryClient, queryOptions } from "@tanstack/solid-query"
 import { loadMcpQuery, loadMcpResourcesQuery } from "../server-sync"
-import { NormalizedProviderListResponse } from "@opencode-ai/session-ui/context"
 import { ScopedKey, type ServerScope } from "@/utils/server-scope"
 
 type GlobalStore = {
   ready: boolean
-  path: Path
-  project: Project[]
-  provider: NormalizedProviderListResponse
-  provider_auth: ProviderAuthResponse
-  config: Config
+  path: AppPathInfo
+  project: AppProject[]
+  provider: ProviderStore
+  provider_auth: AppProviderAuthResponse
+  config: StoreConfig
   reload: undefined | "pending" | "complete"
 }
 
@@ -82,29 +82,31 @@ function showErrors(input: {
   })
 }
 
-export const loadGlobalConfigQuery = (scope: ServerScope, sdk: OpencodeClient) =>
+export const loadGlobalConfigQuery = (scope: ServerScope, backend: Promise<AppClient>) =>
   queryOptions({
     queryKey: [scope, "config"],
-    queryFn: () => retry(() => sdk.global.config.get().then((x) => x.data!)),
+    queryFn: () => retry(async () => (await backend).capabilities.configuration?.getGlobal() ?? {}),
   })
 
-export const loadProjectsQuery = (scope: ServerScope, sdk: OpencodeClient) =>
+export const loadProjectsQuery = (scope: ServerScope, backend: Promise<AppClient>) =>
   queryOptions({
     queryKey: [scope, "project"],
     queryFn: () =>
       retry(() =>
-        sdk.project.list().then((x) => {
-          return (x.data ?? [])
-            .filter((p) => !!p?.id)
-            .filter((p) => !!p.worktree && !p.worktree.includes("opencode-test"))
-            .slice()
-            .sort((a, b) => cmp(a.id, b.id))
-        }),
+        backend
+          .then((client) => client.capabilities.projectList?.list() ?? [])
+          .then((projects) => {
+            return projects
+              .filter((p) => !!p?.id)
+              .filter((p) => !!p.worktree && !p.worktree.includes("opencode-test"))
+              .slice()
+              .sort((a, b) => cmp(a.id, b.id))
+          }),
       ),
   })
 
 export async function bootstrapGlobal(input: {
-  serverSDK: OpencodeClient
+  backend: Promise<AppClient>
   scope: ServerScope
   requestFailedTitle: string
   translate: (key: string, vars?: Record<string, string | number>) => string
@@ -113,12 +115,12 @@ export async function bootstrapGlobal(input: {
   queryClient: QueryClient
 }) {
   const slow = [
-    () => input.queryClient.fetchQuery(loadGlobalConfigQuery(input.scope, input.serverSDK)),
-    () => input.queryClient.fetchQuery(loadProvidersQuery(input.scope, null, input.serverSDK)),
-    () => input.queryClient.fetchQuery(loadPathQuery(input.scope, null, input.serverSDK)),
+    () => input.queryClient.fetchQuery(loadGlobalConfigQuery(input.scope, input.backend)),
+    () => input.queryClient.fetchQuery(loadProvidersQuery(input.scope, null, input.backend)),
+    () => input.queryClient.fetchQuery(loadPathQuery(input.scope, null, input.backend)),
     () =>
       input.queryClient
-        .fetchQuery(loadProjectsQuery(input.scope, input.serverSDK))
+        .fetchQuery(loadProjectsQuery(input.scope, input.backend))
         .then((data) => input.setGlobalStore("project", data)),
   ]
   await runAll(slow)
@@ -140,11 +142,11 @@ function groupBySession<T extends { id: string; sessionID: string }>(input: T[])
   }, {})
 }
 
-function projectID(directory: string, projects: Project[]) {
+function projectID(directory: string, projects: readonly AppProject[]) {
   return projects.find((project) => project.worktree === directory || project.sandboxes?.includes(directory))?.id
 }
 
-function mergeSession(setStore: SetStoreFunction<State>, session: Session) {
+function mergeSession(setStore: SetStoreFunction<State>, session: AppSession) {
   setStore("session", (list) => {
     const next = list.slice()
     const idx = next.findIndex((item) => item.id >= session.id)
@@ -162,44 +164,54 @@ function warmSessions(input: {
   ids: string[]
   store: Store<State>
   setStore: SetStoreFunction<State>
-  sdk: OpencodeClient
+  backend: AppClient
+  location: { directory: string }
 }) {
   const known = new Set(input.store.session.map((item) => item.id))
   const ids = [...new Set(input.ids)].filter((id) => !!id && !known.has(id))
   if (ids.length === 0) return Promise.resolve()
   return Promise.all(
     ids.map((sessionID) =>
-      retry(() => input.sdk.session.get({ sessionID })).then((x) => {
-        const session = x.data
-        if (!session?.id) return
-        mergeSession(input.setStore, session)
+      retry(() => input.backend.common.sessions.get({ sessionID, location: input.location })).then((x) => {
+        if (!x?.id) return
+        mergeSession(input.setStore, x)
       }),
     ),
   ).then(() => undefined)
 }
 
-export const loadProvidersQuery = (scope: ServerScope, directory: string | null, sdk: OpencodeClient) =>
+export const loadProvidersQuery = (scope: ServerScope, directory: string | null, backend: Promise<AppClient>) =>
   queryOptions({
     queryKey: [scope, directory, "providers"],
-    queryFn: () => retry(() => sdk.provider.list().then((x) => normalizeProviderList(x.data!))),
+    queryFn: () =>
+      retry(() => backend.then((client) => client.common.catalog.providers(location(directory)).then(toProviderStore))),
   })
 
-export const loadAgentsQuery = (scope: ServerScope, directory: string | null, sdk: OpencodeClient) =>
+export const loadAgentsQuery = (scope: ServerScope, directory: string, backend: Promise<AppClient>) =>
   queryOptions({
     queryKey: [scope, directory, "agents"],
-    queryFn: () => retry(() => sdk.app.agents().then((x) => normalizeAgentList(x.data))),
+    queryFn: () =>
+      retry(() =>
+        backend.then((client) => client.common.catalog.agents(location(directory)).then((agents) => [...agents])),
+      ),
   })
 
-export const loadPathQuery = (scope: ServerScope, directory: string | null, sdk: OpencodeClient) =>
-  queryOptions<Path>({
+export const loadPathQuery = (scope: ServerScope, directory: string | null, backend: Promise<AppClient>) =>
+  queryOptions<AppPathInfo>({
     queryKey: [scope, directory, "path"],
-    queryFn: () => retry(() => sdk.path.get().then((x) => x.data!)),
+    queryFn: async () => {
+      const client = await backend
+      return retry(
+        () => client.capabilities.pathInfo?.get(location(directory)) ?? Promise.resolve(emptyPath(directory)),
+      )
+    },
   })
 
-export const loadReferencesQuery = (scope: ServerScope, directory: string, sdk: OpencodeClient) =>
-  queryOptions<ReferenceInfo[]>({
+export const loadReferencesQuery = (scope: ServerScope, directory: string, backend: Promise<AppClient>) =>
+  queryOptions<readonly AppReference[]>({
     queryKey: [scope, directory, "references"] as const,
-    queryFn: () => retry(() => sdk.v2.reference.list().then((x) => x.data?.data ?? [])).catch(() => []),
+    queryFn: () =>
+      retry(() => backend.then((client) => client.common.references.list(location(directory)))).catch(() => []),
     placeholderData: [],
   })
 
@@ -207,17 +219,17 @@ export async function bootstrapDirectory(input: {
   directory: string
   scope: ServerScope
   mcp: boolean
-  sdk: OpencodeClient
+  backend: AppClient
   store: Store<State>
   setStore: SetStoreFunction<State>
   vcsCache: VcsCache
   loadSessions: (directory: string) => Promise<void> | void
   translate: (key: string, vars?: Record<string, string | number>) => string
   global: {
-    config: Config
-    path: Path
-    project: Project[]
-    provider: NormalizedProviderListResponse
+    config: StoreConfig
+    path: AppPathInfo
+    project: readonly AppProject[]
+    provider: ProviderStore
   }
   queryClient: QueryClient
   session?: ServerSession
@@ -240,66 +252,90 @@ export async function bootstrapDirectory(input: {
       () => Promise.resolve(input.loadSessions(input.directory)),
       () =>
         input.queryClient
-          .ensureQueryData(loadAgentsQuery(input.scope, input.directory, input.sdk))
+          .ensureQueryData(loadAgentsQuery(input.scope, input.directory, Promise.resolve(input.backend)))
           .then((data) => input.setStore("agent", data)),
       () =>
-        retry(() => input.sdk.config.get().then((x) => input.setStore("config", reconcile(x.data!, { merge: false })))),
+        retry(
+          () =>
+            input.backend.capabilities.configuration
+              ?.get(location(input.directory))
+              .then((config) => input.setStore("config", reconcile(config, { merge: false }))) ?? Promise.resolve(),
+        ),
       () =>
         retry(() =>
-          input.sdk.session.status().then(async (x) => {
+          input.backend.common.sessions.activity(location(input.directory)).then(async (statuses) => {
             if (!input.session) {
-              input.setStore("session_status", x.data!)
+              input.setStore("session_status", mapActivity(statuses))
               return
             }
-            const statuses = x.data ?? {}
+            const mapped = mapActivity(statuses)
             input.session.set(
               "session_status",
               produce((draft) => {
                 for (const sessionID of Object.keys(draft)) {
-                  if (statuses[sessionID]) continue
+                  if (mapped[sessionID]) continue
                   if (input.session?.get(sessionID)?.directory === input.directory) delete draft[sessionID]
                 }
               }),
             )
-            for (const [sessionID, status] of Object.entries(statuses)) {
+            for (const [sessionID, status] of Object.entries(mapped)) {
               input.session.set("session_status", sessionID, reconcile(status))
             }
             // Warm session info only after seeding statuses so a stalled session
             // fetch cannot park busy indicators behind it, mirroring how live
             // session.status events apply first and resolve info in the background.
             await Promise.all(
-              Object.keys(statuses).map((sessionID) => input.session!.resolve(sessionID).catch(() => undefined)),
+              Object.keys(mapped).map((sessionID) => input.session!.resolve(sessionID).catch(() => undefined)),
             )
           }),
         ),
       !seededProject &&
-        (() => retry(() => input.sdk.project.current()).then((x) => input.setStore("project", x.data!.id))),
+        (() =>
+          retry(() => input.backend.common.projects.current(location(input.directory))).then((project) =>
+            input.setStore("project", project.id),
+          )),
       !seededPath &&
         (() =>
-          input.queryClient.ensureQueryData(loadPathQuery(input.scope, input.directory, input.sdk)).then((data) => {
-            const next = projectID(data.directory ?? input.directory, input.global.project)
-            if (next) input.setStore("project", next)
-          })),
+          input.queryClient
+            .ensureQueryData(loadPathQuery(input.scope, input.directory, Promise.resolve(input.backend)))
+            .then((data) => {
+              const next = projectID(data.directory ?? input.directory, input.global.project)
+              if (next) input.setStore("project", next)
+            })),
       () =>
         retry(() =>
-          input.sdk.vcs.get().then((x) => {
-            const next = x.data ?? input.store.vcs
-            input.setStore("vcs", next)
-            if (next) input.vcsCache.setStore("value", next)
-          }),
+          (input.backend.capabilities.vcsInfo?.get(location(input.directory)) ?? Promise.resolve(undefined)).then(
+            (data) => {
+              const next = data ?? input.store.vcs
+              input.setStore("vcs", next)
+              if (next) input.vcsCache.setStore("value", next)
+            },
+          ),
         ),
-      input.mcp && (() => retry(() => input.sdk.command.list().then((x) => input.setStore("command", x.data ?? [])))),
-      () => input.queryClient.fetchQuery(loadReferencesQuery(input.scope, input.directory, input.sdk)),
+      input.mcp &&
+        (() =>
+          retry(() => input.backend.common.commands.list(location(input.directory))).then((commands) =>
+            input.setStore("command", reconcile(commands)),
+          )),
+      () =>
+        input.queryClient.fetchQuery(loadReferencesQuery(input.scope, input.directory, Promise.resolve(input.backend))),
       () =>
         retry(() =>
-          input.sdk.permission.list().then((x) => {
-            const ids = (x.data ?? []).map((perm) => perm?.sessionID).filter((id): id is string => !!id)
-            const grouped = groupBySession(
-              (x.data ?? []).filter((perm): perm is PermissionRequest => !!perm?.id && !!perm.sessionID),
+          input.backend.common.permissions.pending(location(input.directory)).then((data) => {
+            const permissions = data.map(
+              (perm): AppPermissionRequest => perm,
             )
+            const ids = permissions.map((perm) => perm.sessionID)
+            const grouped = groupBySession(permissions)
             const warm = input.session
               ? Promise.all(ids.map((sessionID) => input.session!.resolve(sessionID))).then(() => undefined)
-              : warmSessions({ ids, store: input.store, setStore: input.setStore, sdk: input.sdk })
+              : warmSessions({
+                  ids,
+                  store: input.store,
+                  setStore: input.setStore,
+                  backend: input.backend,
+                  location: { directory: input.directory },
+                })
             return warm.then(() =>
               batch(() => {
                 const current = input.session?.data.permission ?? input.store.permission
@@ -323,12 +359,21 @@ export async function bootstrapDirectory(input: {
         ),
       () =>
         retry(() =>
-          input.sdk.question.list().then((x) => {
-            const ids = (x.data ?? []).map((question) => question?.sessionID).filter((id): id is string => !!id)
-            const grouped = groupBySession((x.data ?? []).filter((q): q is QuestionRequest => !!q?.id && !!q.sessionID))
+          input.backend.common.questions.pending(location(input.directory)).then((data) => {
+            const questions = data.map(
+              (question): AppQuestionRequest => question,
+            )
+            const ids = questions.map((question) => question.sessionID)
+            const grouped = groupBySession(questions)
             const warm = input.session
               ? Promise.all(ids.map((sessionID) => input.session!.resolve(sessionID))).then(() => undefined)
-              : warmSessions({ ids, store: input.store, setStore: input.setStore, sdk: input.sdk })
+              : warmSessions({
+                  ids,
+                  store: input.store,
+                  setStore: input.setStore,
+                  backend: input.backend,
+                  location: { directory: input.directory },
+                })
             return warm.then(() =>
               batch(() => {
                 const current = input.session?.data.question ?? input.store.question
@@ -351,17 +396,25 @@ export async function bootstrapDirectory(input: {
           }),
         ),
       () => Promise.resolve(input.loadSessions(input.directory)),
-      input.mcp && (() => input.queryClient.fetchQuery(loadMcpQuery(input.scope, input.directory, input.sdk))),
-      input.mcp && (() => input.queryClient.fetchQuery(loadMcpResourcesQuery(input.scope, input.directory, input.sdk))),
+      input.mcp &&
+        (() =>
+          input.queryClient.fetchQuery(loadMcpQuery(input.scope, input.directory, Promise.resolve(input.backend)))),
+      input.mcp &&
+        (() =>
+          input.queryClient.fetchQuery(
+            loadMcpResourcesQuery(input.scope, input.directory, Promise.resolve(input.backend)),
+          )),
       () =>
-        input.queryClient.fetchQuery(loadProvidersQuery(input.scope, input.directory, input.sdk)).catch((err) => {
-          const project = getFilename(input.directory)
-          showToast({
-            variant: "error",
-            title: input.translate("toast.project.reloadFailed.title", { project }),
-            description: formatServerError(err, input.translate),
-          })
-        }),
+        input.queryClient
+          .fetchQuery(loadProvidersQuery(input.scope, input.directory, Promise.resolve(input.backend)))
+          .catch((err) => {
+            const project = getFilename(input.directory)
+            showToast({
+              variant: "error",
+              title: input.translate("toast.project.reloadFailed.title", { project }),
+              description: formatServerError(err, input.translate),
+            })
+          }),
     ].filter(Boolean) as (() => Promise<any>)[]
 
     await waitForPaint()
@@ -379,3 +432,23 @@ export async function bootstrapDirectory(input: {
     if (loading && slowErrs.length === 0) input.setStore("status", "complete")
   })()
 }
+
+function location(directory: string | null) {
+  return directory === null ? undefined : { location: { directory } }
+}
+
+function emptyPath(directory: string | null): AppPathInfo {
+  return { home: "", directory: directory ?? "", state: "", config: "", worktree: "" }
+}
+
+function toProviderStore(input: ProviderCatalog): ProviderStore {
+  return {
+    all: input.providers,
+    connected: [...input.connected],
+    default: { ...input.defaults },
+  }
+}
+
+function mapActivity(input: Awaited<ReturnType<AppClient["common"]["sessions"]["activity"]>>) {
+  return input
+}