fix(tui): reconcile shells after reconnect

fix(plugin): restore package publishing
refactor(core): simplify tool admission flow (#36180 )
2026-07-26 13:15:26 -04:00 · 2026-07-09 22:24:18 -04:00 · 2026-07-09 22:18:58 -04:00 · 2026-07-09 22:01:31 -04:00 · 2026-07-09 21:16:00 -04:00 · 2026-07-09 21:12:15 -04:00
1543 changed files with 242574 additions and 226615 deletions
@@ -6,6 +6,7 @@ on:
    branches:
      - ci
      - dev
+      - v2
      - beta
      - fix/npm-native-binary-install
      - snapshot-*
@@ -31,6 +32,9 @@ permissions:
  contents: write
  packages: write

+env:
+  OPENCODE_CHANNEL: ${{ (github.ref_name == 'v2' && 'next') || '' }}
+
 jobs:
  version:
    runs-on: blacksmith-4vcpu-ubuntu-2404
@@ -122,7 +126,7 @@ jobs:
      - build-cli
      - version
    runs-on: blacksmith-4vcpu-windows-2025
-    if: github.repository == 'anomalyco/opencode'
+    if: github.repository == 'anomalyco/opencode' && github.ref_name != 'v2'
    env:
      AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
      AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
@@ -221,7 +225,7 @@ jobs:
    needs:
      - build-cli
      - version
-    if: github.repository == 'anomalyco/opencode'
+    if: github.repository == 'anomalyco/opencode' && github.ref_name != 'v2'
    continue-on-error: false
    env:
      AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
@@ -447,6 +451,7 @@ jobs:
          path: packages/opencode/dist

      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        if: github.ref_name != 'v2'
        with:
          name: opencode-cli-signed-windows
          path: packages/opencode/dist
@@ -4,6 +4,7 @@ on:
  push:
    branches:
      - dev
+      - v2
  pull_request:
  workflow_dispatch:

@@ -74,13 +75,9 @@ jobs:
        working-directory: packages/client
        run: bun run check:generated

-      - name: Run HttpApi exerciser gates
-        if: runner.os == 'Linux'
-        working-directory: packages/opencode
-        run: bun run test:httpapi
-
  e2e:
    name: e2e (${{ matrix.settings.name }})
+    if: github.ref_name != 'v2' && github.head_ref != 'v2'
    strategy:
      fail-fast: false
      matrix:
@@ -2,9 +2,9 @@ name: typecheck

 on:
  push:
-    branches: [dev]
+    branches: [dev, v2]
  pull_request:
-    branches: [dev]
+    branches: [dev, v2]
  workflow_dispatch:

 jobs:
@@ -13,6 +13,7 @@ tmp
 dist
 ts-dist
 .turbo
+.typecheck-profiles
 **/.serena
 .serena/
 **/.omo
@@ -0,0 +1,31 @@
+---
+name: sample-skill
+description: Use when the user says sample skill, skill demo, or asks how an opencode SKILL.md should be structured; demonstrates a tiny project-local skill with practical assistant workflow guidance.
+---
+
+# Sample Skill
+
+This is a minimal project-local opencode skill. It exists as a reference for how a skill is structured and as a tiny reusable workflow the assistant can load when the user asks for a skill example.
+
+## When To Use
+
+- Use when the user asks for a sample skill or skill template.
+- Use when demonstrating the required `SKILL.md` frontmatter and body format.
+- Do not use for unrelated coding tasks just because a skill exists.
+
+## Workflow
+
+- Confirm the specific outcome the user wants if the request is ambiguous.
+- Inspect the relevant files before changing anything.
+- Make the smallest correct change.
+- Verify the result with a focused read, typecheck, test, or other lightweight check when available.
+- Summarize the changed files and any required restart or reload step.
+
+## Example Response Style
+
+When this skill is relevant, keep responses direct and actionable:
+
+```text
+I created a project-local skill at .opencode/skills/sample-skill/SKILL.md.
+Restart opencode for the new skill to be discovered by future sessions.
+```
@@ -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
@@ -1,6 +1,7 @@
 - To regenerate the legacy JavaScript SDK, run `./packages/sdk/js/script/build.ts`.
 - After changing the public Protocol or Server `HttpApi`, run `bun run generate` from `packages/client`. Do not edit `src/generated` or `src/generated-effect` directly.
 - Keep runtime dependencies directed from Schema to Core and Protocol, then from Core and Protocol to Server. Client runtime code may depend on Schema and Protocol but never Core or Server; `sdk-next` composes Client, Core, and Server.
+- Do not modify `packages/opencode` unless the user explicitly asks for V1 work. `packages/opencode` is the V1 implementation and is present for reference only. New implementation changes should land in the V2 package set: `packages/core`, `packages/cli`, `packages/server`, `packages/protocol`, `packages/schema`, and related generated client surfaces when required.
 - The default branch in this repo is `dev`.
 - Local `main` ref may not exist; use `dev` or `origin/dev` for diffs.

@@ -18,6 +19,8 @@ Valid types are `feat`, `fix`, `docs`, `chore`, `refactor`, and `test`. Scopes a

 Examples: `fix(tui): simplify thinking toggle styling`, `docs: update contributing guide`, `chore(sdk): regenerate types`.

+Never bypass Git hooks. Do not use `--no-verify` or otherwise disable, skip, or circumvent commit or push hooks. If a hook fails, fix the failure or stop and report it to the user.
+
 ## Style Guide

 ### General Principles
@@ -150,12 +153,15 @@ const table = sqliteTable("session", {

 ## V2 Session Core

- Keep durable prompt admission separate from model execution. `SessionV2.prompt(...)` admits one durable `session_input` row before scheduling advisory `SessionExecution.wake(sessionID)` unless `resume: false` requests admit-only behavior. The serialized runner promotes admitted inputs into visible user messages at safe boundaries.
- Reusing a Session ID adopts the existing Session. Reusing a prompt message ID reconciles an exact retry only when Session, prompt, and delivery mode match; conflicting reuse fails. Historical projected prompts lazily synthesize promoted inbox records during exact retry.
+- Keep durable events minimal: record irreducible new facts and do not repeat state derivable by folding the ordered aggregate history. Enrich projections and read models with previous or derived state when consumers need self-contained views.
+- Keep durable prompt admission separate from model execution. `SessionV2.prompt(...)` admits one durable `session_pending` row before scheduling advisory `SessionExecution.wake(sessionID)` unless `resume: false` requests admit-only behavior. The serialized runner promotes admitted inputs into visible user messages at safe boundaries, consuming the pending row in the same event transaction; `session_pending` stores only unconsumed work.
+- Reusing a Session ID adopts the existing Session. Reusing a prompt message ID reconciles an exact retry only when Session, prompt, and delivery mode match; conflicting reuse fails. Retry of an already-promoted input reconciles against the projected message and the durable admitted event rather than a retained row.
 - Keep `SessionExecution` process-global and Session-ID based. Its local implementation owns the process-local Session coordinator and discovers placement through `SessionStore` plus `LocationServiceMap.get(session.location)` only when a drain starts; no layer should take a Session ID. V2 interruption targets the active process-local ownership chain for that Session; idle or missing interruption is a no-op.
 - Keep `SessionRunner`, model resolution, tool registry, permissions, and filesystem Location-scoped. Omitted `Location.workspaceID` means implicit-local placement; explicit workspace identity remains reserved for future placement semantics.
- Preserve one explicit `llm.stream(request)` call per provider turn and reload projected history before durable continuation. Do not bridge through legacy `SessionPrompt.loop(...)` or delegate orchestration to an in-memory tool loop.
+- Preserve one explicit `llm.stream(request)` call per step and reload projected history before durable continuation. Do not bridge through legacy `SessionPrompt.loop(...)` or delegate orchestration to an in-memory tool loop.
 - Keep local Session drains process-local until clustering is implemented. `SessionRunCoordinator` joins explicit same-Session resumes, coalesces prompt wakeups, and allows different Sessions to run concurrently. Advisory wakes drain eligible durable inbox rows only; post-crash continuation recovery requires a separate explicit design before it may retry provider work. A drain has no durable identity or transcript boundary.
- Keep delivery vocabulary explicit. Prompts steer by default and promote at the next safe provider-turn boundary while the current drain requires continuation. An explicit `queue` input remains pending until the Session would otherwise become idle; promote one queued input at that boundary, then reevaluate continuation before promoting another. Promoting any new user input resets the selected agent's provider-turn allowance; a batch of steers resets it once.
+- Keep delivery vocabulary explicit. Prompts steer by default and promote at the next safe step boundary while the current drain requires continuation. An explicit `queue` input remains pending until the Session would otherwise become idle; promote one queued input at that boundary, then reevaluate continuation before promoting another. Promoting any new user input resets the selected agent's step allowance; a batch of steers resets it once.
+- One step is one logical LLM call; its durable record covers only the model-visible span. Do not write "provider turn", and do not use bare "turn" for a single call: "turn" is reserved for the future assistant-turn unit containing all steps from prompt promotion until the session would go idle.
 - Keep EventV2 replay owner claims separate from clustered Session execution ownership.
- Keep the System Context algebra, registry, and built-ins in `src/system-context`; keep Context Source producers with their observed domains, and keep Session History selection plus Context Epoch persistence Session-owned.
+- Keep the Instructions algebra and built-ins in `src/instructions`; keep instruction producers with their observed domains, and keep Session History selection plus `InstructionCheckpoint` and `InstructionEntry` persistence Session-owned. `InstructionDiscovery` observes ambient global and upward-project instructions. The runner composes built-ins, discovery, guidance, and entries explicitly in `loadInstructions`; there is no instruction registry.
+- The durable `Instructions.Applied` record is what the model was last told, per instruction source. Reconciliation narrates drift through `session.instructions.updated` and never rewrites the baseline; only completed compaction rebaselines, while Session movement or committed revert resets the `InstructionCheckpoint`. Unavailable sources keep the model's prior belief, blocking only a Session's first instruction baseline.
@@ -4,40 +4,47 @@ OpenCode sessions preserve durable conversational history while assembling the r

 ## Language

-**System Context**:
-The structured collection of contextual facts presented to the model as initial instructions and chronological updates.
-_Avoid_: System prompt
+**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 provider turn after applying the active compaction and **Context Epoch** cutoffs.
+The projected chronological conversation selected for a **Step** after applying the active compaction and **InstructionCheckpoint** baseline cutoffs.
 _Avoid_: Session Context

-**Context Source**:
-One independently observed typed value within the **System Context**, represented by a stable key, JSON codec, infallible loader, pure baseline/update renderers, and an optional removal renderer for dynamic sources.
+**Instruction Source**:
+One independently observed typed value within **Instructions**, represented by a stable namespaced key, JSON codec, loader, pure baseline/update renderers, and an optional removal renderer.
 _Avoid_: Prompt fragment

-**System Context Registry**:
-The Location-scoped registry of ordered, scoped producers that contribute to the current **System Context**.
+**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.

-**Mid-Conversation System Message**:
-A durable chronological instruction that tells the model the newly effective state of a changed **Context Source**.
-_Avoid_: System update, system notification, raw text diff
+**InstructionDiscovery**:
+The Location-scoped service that observes ambient global and upward-project `AGENTS.md` files as one ordered aggregate **Instruction Source**.

-**Context Epoch**:
-The span during which one initially rendered **System Context** remains the immutable provider-cache baseline, ending at completed compaction, Session movement, or an incompatible context transition that requires a fresh baseline.
+**InstructionCheckpoint**:
+The Session-owned durable instruction baseline, baseline sequence, and `Instructions.Applied` record used to prepare later Steps.

-**Baseline System Context**:
-The full **System Context** rendered at the start of a **Context Epoch**.
+**Instruction Update**:
+A durable chronological System message published as `session.instructions.updated` that tells the model the newly effective state of one or more changed **Instruction Sources**.
+_Avoid_: System notification, raw text diff
+
+**Instruction Baseline**:
+The exact joined instruction text stored by **InstructionCheckpoint** and sent as immutable provider-cache prefix state until completed compaction rebaselines it or Session movement or committed revert resets it.
 _Avoid_: Live system prompt

-**Context Snapshot**:
-The overwriteable model-hidden JSON state used to compare each **Context Source** with the value last admitted to a provider turn.
+**Applied Instructions**:
+The overwriteable model-hidden `Instructions.Applied` record in **InstructionCheckpoint**, containing what the model was last told per **Instruction Source**.

-**Unavailable Context**:
-An expected temporary inability to observe a **Context Source** value; the runtime retains its prior effective state and emits no update, or omits it until first successfully loaded.
+**Unavailable Instruction Source**:
+An expected temporary inability to observe an **Instruction Source** value; the runtime retains its prior effective state and emits no update, while an unavailable source blocks creation of the first complete **Instruction Baseline**.

-**Safe Provider-Turn Boundary**:
-The point immediately before a provider call, after durable input promotion and any required tool settlement, where context changes may be admitted chronologically.
+**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**.
@@ -45,11 +52,24 @@ A durable user input accepted into the Session inbox but not yet included in **S
 **Prompt Promotion**:
 The durable transition that removes an **Admitted Prompt** from pending input and appends its user message to **Session History**.

-**Provider Turn**:
-One request to a model provider and the response projected from that request.
+**Step**:
+One logical LLM call spanning pre-flight instruction checkpoint preparation, 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 **Provider Turns** until no immediate continuation remains. A Session Drain has no durable identity or transcript boundary.
+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.
@@ -87,52 +107,52 @@ _Avoid_: Response envelope

 ## Relationships

- A **System Context** is an opaque carrier composed from zero or more **Context Sources**.
- **Session History** contains projected conversational messages and admitted **Mid-Conversation System Messages**; the active **Baseline System Context** remains separate provider-request state.
- The **System Context Registry** uses stable-keyed scoped contributions to assemble the current **System Context**; contributor removal naturally removes its sources at the next **Safe Provider-Turn Boundary**.
- A changed **Context Source** may produce one **Mid-Conversation System Message** containing its newly effective state.
- A **Mid-Conversation System Message** persists the exact combined rendered text sent to the model.
- The current **Context Snapshot** advances atomically with the corresponding durable **Mid-Conversation System Message**.
- A **Context Snapshot** stores one codec-encoded JSON value and, for removable dynamic sources, a pre-rendered removal message per stable **Context Source** key.
- Changes from multiple **Context Sources** admitted at one safe boundary combine into one **Mid-Conversation System Message**.
- Context changes are sampled and admitted lazily at a **Safe Provider-Turn Boundary**, never pushed asynchronously when their source changes.
- At a **Safe Provider-Turn Boundary**, newly promoted user input or settled tool results precede any combined **Mid-Conversation System Message**.
+- **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, the **Instruction Baseline**, **Session History**, available tools, and step-local additions into one model request.
+- **Session History** contains projected conversational messages and admitted **Instruction Updates**; the active **Instruction Baseline** remains 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** loader returns one coherent typed value or explicitly reports unavailability. `Instructions.make(...)` hides the value type so differently typed sources compose uniformly; its codec compares and stores the value, while pure renderers produce baseline, update, and optional removal text.
+- `Instructions.initialize(...)` observes composed **Instructions** once and produces a complete **Instruction Baseline** with **Applied Instructions**.
+- `Instructions.reconcile(...)` observes composed **Instructions** once and returns either unchanged or one combined chronological update. It never rewrites the baseline.
+- `Instructions.rebaseline(...)` renders a fresh baseline after completed compaction, recalling previously applied values for sources that are temporarily unavailable.
+- A changed **Instruction Source** may contribute text to one **Instruction Update** containing the newly effective state.
+- An **Instruction Update** persists the exact combined rendered text sent to the model through `session.instructions.updated`.
+- **Applied Instructions** advances atomically with the corresponding durable **Instruction Update**.
+- **Applied Instructions** stores one codec-encoded JSON value and, for removable sources, a pre-rendered removal message per stable **Instruction Source** key.
+- 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 Provider-Turn Boundary** while the current **Session Drain** still requires continuation. Promoting any newly admitted user input resets the selected agent's provider-turn allowance; multiple prompts promoted at one boundary reset it once.
+- 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, provider attempts, and tool state rather than inventing an enclosing execution identity.
- The first provider turn renders the latest complete **Baseline System Context** and initializes its **Context Snapshot** without emitting a redundant **Mid-Conversation System Message**; unavailable initial context blocks the turn instead of persisting an incomplete baseline.
- Initial **System Context** preparation precedes the first durable input promotion so an unavailable baseline leaves that input pending and retryable; ordinary reconciliation remains after promotion.
- Compaction starts a new **Context Epoch** with a freshly rendered **Baseline System Context** and **Context Snapshot**; prior **Mid-Conversation System Messages** remain durable audit history but leave projected model history.
- A newly registered core or plugin-defined **Context Source** absent from the current snapshot emits its baseline rendering once at the next **Safe Provider-Turn Boundary**.
- **Context Source** keys are stable and namespaced; duplicate keys fail composition. `SystemContext.combine(...)` preserves caller order; the **System Context Registry** evaluates producers concurrently and combines them in stable contribution-key order so rendered context remains deterministic.
- Each **Context Source** loader returns one coherent typed value. `SystemContext.make(...)` hides that value type so differently typed sources compose uniformly. Its codec compares and stores that value; its pure renderers produce model-visible baseline, update, and removal text only when needed.
- `SystemContext.initialize(...)` observes a composed **System Context** once and produces a fresh **Baseline System Context** with its **Context Snapshot**.
- `SystemContext.reconcile(...)` observes a composed **System Context** once and returns exactly one next action: unchanged, updated, replacement ready, or replacement blocked.
- `SystemContext.replace(...)` renders a fresh generation after completed compaction or another baseline-replacing transition; it reports replacement blocked while previously admitted context is unavailable.
- **Unavailable Context** uses stale-while-revalidate semantics and is distinct from a successfully loaded absence, which may emit removal text.
- Ordinary **Context Source** loaders return values directly; loaders that intentionally use stale-while-revalidate may explicitly return **Unavailable Context**.
- Nested project instruction discovery after successful reads remains a follow-up; when implemented, discovered instructions must be admitted durably at the next **Safe Provider-Turn Boundary**.
- Location-scoped services naturally re-resolve effective context when a moved session next runs in its destination location.
- Moving a Session clears its active **Context Epoch**, so the destination must initialize a complete baseline before another prompt can promote.
- Instruction discovery, source identity, persistence, and file loading belong to the instruction service; the **System Context** abstraction only composes effectful producers and renders loaded values.
- The first instruction-service slice observes global and upward project `AGENTS.md` files as one ordered aggregate **Context Source** at each **Safe Provider-Turn Boundary**.
- Built-in and instruction context producers register through the **System Context Registry** with stable contribution keys. Plugin-defined context registration and hot-reload lifecycle remain a follow-up built on the same scoped registry seam.
- Selected-agent available-skill guidance is a **Context Source** composed with Location-wide registry sources immediately before Context Epoch admission. 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 provider turn starts. Changes admitted after that boundary apply to the next provider turn and do not restart the current turn.
- Selected-agent available-skill guidance remains a **Context Source**. An agent switch that changes that guidance produces a **Mid-Conversation System Message** while preserving the current baseline.
- Local tool authorization and pending permission requests retain the effective agent of the provider turn that issued the call; a later agent switch cannot change that call's policy.
- Context source changes never wake idle sessions; the next naturally scheduled **Safe Provider-Turn Boundary** loads and compares current values lazily.
- Once admitted, a **Mid-Conversation System Message** remains durable even if the following provider attempt fails and is replayed unchanged on retry.
- **Mid-Conversation System Messages** remain durable Session-message history; normal user-facing transcript surfaces may hide them.
- The date **Context Source** initially preserves host-local calendar-date behavior; a configured user timezone may replace that default later.
- A **Context Epoch** begins with one immutable **Baseline System Context**.
- A **Baseline System Context** is stored durably and reused verbatim across process restarts within its **Context Epoch**.
- A **Baseline System Context** durably preserves the exact joined text used for the active provider-cache prefix.
- Completed compaction starts a new **Context Epoch** on the next provider attempt, folding the current complete **System Context** into a fresh baseline and removing earlier **Mid-Conversation System Messages** from active model history.
- A model/provider switch preserves the current **Context Epoch** and chronological conversation history; the new selection applies to the next provider turn.
- **Native Continuation Metadata** remains in durable history. Provider-turn projection includes it only for a successful exact originating provider/model match; failed turns 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.
+- 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** renders the latest complete **Instruction Baseline** and creates its **InstructionCheckpoint** without emitting a redundant **Instruction Update**; an unavailable initial source blocks the Step instead of persisting an incomplete baseline.
+- 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 rebaselines the **InstructionCheckpoint** from current **Instructions** and removes earlier **Instruction Updates** from active projected model history while preserving durable audit history.
+- A newly composed **Instruction Source** absent from **Applied Instructions** emits its baseline 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 resets its **InstructionCheckpoint**, so the destination must initialize a complete baseline before another prompt can promote. Committed revert also resets the checkpoint.
+- 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 Session-message history; normal user-facing transcript surfaces may hide them.
+- The date **Instruction Source** initially preserves host-local calendar-date behavior; a configured user timezone may replace that default later.
+- An **Instruction Baseline** is stored durably and reused verbatim across process restarts until rebaseline or reset.
+- An **Instruction Baseline** durably preserves the exact joined text used for its part of the active provider-cache prefix.
+- A model/provider switch preserves the current **InstructionCheckpoint** 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`.
@@ -175,16 +195,16 @@ _Avoid_: Response envelope
 - `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 conversational messages selected as Session context; it does not include or represent the complete provider request context, whose baseline system context and other contributions remain separate.
- **Open question**: Should a future, separately named operation expose the complete provider request context, including baseline system context, selected source contributions, and context-epoch metadata?
+- `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 system text, **Instruction Baseline**, 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(...)`; `SessionInput.admit` is the internal primitive, while the public `Admission` result and `resume` option express its durable admission semantics.
+- 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.
- A **Mid-Conversation System Message** lowers to the provider's native chronological instruction role when supported and to a wrapped chronological fallback otherwise.
- When the effective aggregate instruction set changes, its **Mid-Conversation System Message** includes the complete current ordered set and supersedes the prior aggregate value; when no ambient instructions remain, the message states that previously loaded instructions no longer apply.
+- 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.
@@ -217,9 +237,9 @@ Before stabilizing the client API:

 ## Example dialogue

-> **Dev:** "The date changed while the session was active. Should the **Mid-Conversation System Message** say what the old date was?"
-> **Domain expert:** "No. Emit the newly effective date so the agent can act on the current **System Context**."
+> **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 the assembled baseline system prompt arbitrarily, but V2 plugins do not yet expose an equivalent hook. Decide separately whether to port it, replace dynamic uses with plugin-defined **Context Sources**, or narrow its semantics.
+- 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.
@@ -1,10 +0,0 @@
-/* This file is auto-generated by SST. Do not edit. */
-/* tslint:disable */
-/* eslint-disable */
-/* deno-fmt-ignore-file */
-/* biome-ignore-all lint: auto-generated */
-
-/// <reference path="../../sst-env.d.ts" />
-
-import "sst"
-export {}
@@ -495,7 +495,6 @@ async function subscribeSessionEvents() {
  console.log("Subscribing to session events...")

  const TOOL: Record<string, [string, string]> = {
-    todowrite: ["Todo", "\x1b[33m\x1b[1m"],
    bash: ["Bash", "\x1b[31m\x1b[1m"],
    edit: ["Edit", "\x1b[32m\x1b[1m"],
    glob: ["Glob", "\x1b[34m\x1b[1m"],
@@ -67,10 +67,6 @@ const athenaWorkgroup = new aws.athena.Workgroup("LakeAthenaWorkgroup", {
  configuration: {
    enforceWorkgroupConfiguration: true,
    publishCloudwatchMetricsEnabled: true,
-    // Athena bills $5/TB scanned; kill any query that would scan more than 2 TB
-    // so a regression cannot silently burn money. Stats sync full passes scan
-    // ~250 GB as of 2026-07.
-    bytesScannedCutoffPerQuery: 2 * 1024 ** 4,
    resultConfiguration: {
      outputLocation: $interpolate`s3://${athenaResultsBucket.bucket}/`,
    },
@@ -185,9 +185,7 @@ export const statSync = new sst.aws.Service("StatsSyncService", {
  cluster: lakeCluster,
  architecture: "arm64",
  cpu: "0.25 vCPU",
-  // 0.5 GB caused an OOM crash loop: every restart immediately re-ran the 4 Athena
-  // stats queries (~$5/pass) every ~5 minutes instead of hourly.
-  memory: "2 GB",
+  memory: "0.5 GB",
  image: {
    context: ".",
    dockerfile: "packages/stats/server/Dockerfile",
@@ -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="
  }
 }
@@ -2,18 +2,23 @@
  "$schema": "https://json.schemastore.org/package.json",
  "name": "opencode",
  "description": "AI-powered development tool",
+  "version": "0.0.0",
  "private": true,
  "type": "module",
  "packageManager": "bun@1.3.14",
  "scripts": {
-    "dev": "bun run --cwd packages/opencode --conditions=browser src/index.ts",
+    "dev": "bun run --cwd packages/cli --conditions=browser src/index.ts",
    "dev:desktop": "bun --cwd packages/desktop dev",
    "dev:web": "bun --cwd packages/app dev",
    "dev:console": "ulimit -n 10240 2>/dev/null; bun run --cwd packages/console/app dev",
    "dev:stats": "bun sst shell --stage=production -- bun run --cwd packages/stats/app dev",
    "dev:storybook": "bun --cwd packages/storybook storybook",
    "lint": "oxlint",
-    "typecheck": "bun turbo typecheck",
+    "lint:effect-patterns": "ast-grep scan -c script/ast-grep/sgconfig.yml packages/core/src packages/server/src packages/protocol/src packages/cli/src",
+    "test:lint-rules": "ast-grep test -c script/ast-grep/sgconfig.yml",
+    "typecheck": "bun turbo typecheck --concurrency=3",
+    "typecheck:profile": "bun script/profile-typecheck.ts",
+    "typecheck:profile:packages": "bun script/profile-typecheck-packages.ts",
    "upgrade-opentui": "bun run script/upgrade-opentui.ts",
    "postinstall": "bun run --cwd packages/core fix-node-pty",
    "prepare": "husky",
@@ -43,7 +48,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",
@@ -70,7 +75,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",
@@ -96,6 +101,7 @@
  },
  "devDependencies": {
    "@actions/artifact": "5.0.1",
+    "@ast-grep/cli": "0.44.0",
    "@tsconfig/bun": "catalog:",
    "@types/mime-types": "3.0.1",
    "@typescript/native-preview": "catalog:",
@@ -152,9 +158,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"
  }
 }
@@ -20,7 +20,7 @@ const profiles = [
  { name: "edit", tool: "edit", input: { filePath: "src/edit.ts" } },
  {
    name: "multi patch",
-    tool: "apply_patch",
+    tool: "patch",
    input: { files: ["src/a.ts", "src/b.ts", "src/old.ts", "src/moved.ts"] },
  },
 ] as const
@@ -25,7 +25,7 @@ test("adds patch files incrementally without resetting outer expansion", async (
      userMessage(),
      assistantMessage(
        [
-          toolPart(patchID, "apply_patch", "running", { files: [first.filePath] }, { metadata: { files: [first] } }),
+          toolPart(patchID, "patch", "running", { files: [first.filePath] }, { metadata: { files: [first] } }),
          textPart(followingID, "Following incremental patch"),
        ],
        { completed: false },
@@ -49,7 +49,7 @@ test("adds patch files incrementally without resetting outer expansion", async (
    partUpdated(
      toolPart(
        patchID,
-        "apply_patch",
+        "patch",
        "running",
        { files: [first.filePath, second.filePath] },
        { metadata: { files: [first, second] } },
@@ -61,7 +61,7 @@ test("adds patch files incrementally without resetting outer expansion", async (
    partUpdated(
      toolPart(
        patchID,
-        "apply_patch",
+        "patch",
        "completed",
        { files: [first.filePath, second.filePath, third.filePath] },
        { metadata: { files: [first, second, third] } },
@@ -33,11 +33,9 @@ test.describe("timeline tool state stability", () => {
    }
    const names = { webfetch: "webfetch", websearch: "websearch", task: "task", skill: "skill", custom: "mcp_probe" }
    const questionID = "prt_state_question"
-    const todoID = "prt_state_todo"
    const initial = [
      ...ids.map((id) => toolPart(`prt_state_${id}`, names[id], "pending", inputs[id])),
      toolPart(questionID, "question", "pending", questionInput()),
-      toolPart(todoID, "todowrite", "pending", { todos: [{ content: "Hidden", status: "pending" }] }),
      textPart("prt_state_following", "Following lightweight tools"),
    ]
    const childID = "ses_timeline_child"
@@ -49,7 +47,6 @@ test.describe("timeline tool state stability", () => {
    await timeline.send(status("busy"), 120)
    for (const id of ids) await timeline.waitForPart(`prt_state_${id}`)
    await expect(page.locator(`[data-timeline-part-id="${questionID}"]`)).toHaveCount(0)
-    await expect(page.locator(`[data-timeline-part-id="${todoID}"]`)).toHaveCount(0)

    const regionIDs = [
      "prt_state_webfetch",
@@ -105,7 +102,6 @@ test.describe("timeline tool state stability", () => {
      ]),
    )
    await expect(page.locator(`[data-timeline-part-id="${questionID}"]`)).toContainText("Keep it stable")
-    await expect(page.locator(`[data-timeline-part-id="${todoID}"]`)).toHaveCount(0)
    await expect(
      page.locator(`a[href$="/session/${childID}"]`, { has: page.locator('[data-component="task-tool-card"]') }),
    ).toBeVisible()
@@ -295,7 +295,7 @@ function performanceTurn(index: number) {
            messageID: assistantID,
            type: "tool",
            callID: `call_0000_${suffix}_patch`,
-            tool: "apply_patch",
+            tool: "patch",
            state: {
              status: "completed",
              input: { patchText: realisticPatch(index) },
@@ -131,7 +131,7 @@ function toolPart(
 ): MessagePart {
  const metadata =
    metadataOverride ??
-    (tool === "apply_patch"
+    (tool === "patch"
      ? { files: [patchFile(index, "update"), patchFile(index + 1, index % 2 === 0 ? "add" : "delete")] }
      : tool === "edit" || tool === "write"
        ? {
@@ -219,7 +219,7 @@ function turn(index: number): Message[] {
      ? [toolPart(index, 7, "write", { filePath: `src/generated/write-${index}.ts`, content: code(index, 28) }, 560)]
      : []),
    ...(index % 8 === 0
-      ? [toolPart(index, 8, "apply_patch", { files: [`src/generated/patch-${index}.ts`] }, 620)]
+      ? [toolPart(index, 8, "patch", { files: [`src/generated/patch-${index}.ts`] }, 620)]
      : []),
    ...(index % 7 === 0
      ? [toolPart(index, 4, "bash", { command: "bun typecheck", description: "Verify generated output" }, 620)]
@@ -269,7 +269,6 @@ const childMessages = Array.from({ length: 4 }, (_, index) => [
 ]).flat()

 function renderable(part: MessagePart) {
-  if (part.type === "tool" && part.tool === "todowrite") return false
  if (part.type === "text") return !!part.text.trim()
  if (part.type === "reasoning") return !!part.text.trim()
  return part.type !== "step-start" && part.type !== "step-finish" && part.type !== "patch"
@@ -90,7 +90,7 @@ async function mockServers(page: Page, requests: string[]) {
    if (url.pathname === `/session/${current.id}`) return json(route, current)
    if (/^\/session\/[^/]+$/.test(url.pathname)) return json(route, { name: "NotFoundError" }, 404)
    if (url.pathname === `/session/${current.id}/message`) return json(route, [])
-    if (/^\/session\/[^/]+\/(children|todo|diff)$/.test(url.pathname)) return json(route, [])
+    if (/^\/session\/[^/]+\/(children|diff)$/.test(url.pathname)) return json(route, [])
    if (["/skill", "/command", "/lsp", "/formatter", "/permission", "/question", "/vcs/diff"].includes(url.pathname))
      return json(route, [])
    if (["/global/config", "/config", "/provider/auth", "/mcp", "/session/status"].includes(url.pathname))
@@ -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 },
-  )
-}
@@ -65,7 +65,7 @@ async function mockServers(page: Page) {
    if (url.pathname === `/session/${current.id}`) return json(route, current)
    if (/^\/session\/[^/]+$/.test(url.pathname)) return json(route, { name: "NotFoundError" }, 404)
    if (url.pathname === `/session/${current.id}/message`) return json(route, [])
-    if (/^\/session\/[^/]+\/(children|todo|diff)$/.test(url.pathname)) return json(route, [])
+    if (/^\/session\/[^/]+\/(children|diff)$/.test(url.pathname)) return json(route, [])
    if (["/skill", "/command", "/lsp", "/formatter", "/permission", "/question", "/vcs/diff"].includes(url.pathname))
      return json(route, [])
    if (["/global/config", "/config", "/provider/auth", "/mcp"].includes(url.pathname)) return json(route, {})
@@ -74,10 +74,6 @@ test("opens and searches project files inline", async ({ page }) => {
        "opencode.global.dat:layout",
        JSON.stringify({ review: { diffStyle: "split", panelOpened: true } }),
      )
-      localStorage.setItem(
-        "opencode.global.dat:review-panel-v2",
-        JSON.stringify({ sidebarOpened: false, sidebarWidth: 240, expandMode: "collapse" }),
-      )
      localStorage.setItem(
        "opencode.window.browser.dat:tabs",
        JSON.stringify([{ type: "session", server, sessionId: sessionID }]),
@@ -90,18 +86,13 @@ test("opens and searches project files inline", async ({ page }) => {
  await expectSessionTitle(page, title)

  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 panel.getByRole("button", { name: "Open file" }).click()
  const filter = panel.getByRole("combobox", { name: "Filter files" })
  await expect(filter).toBeFocused()
@@ -110,13 +101,10 @@ 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)

  await panel.getByRole("button", { name: "Open file" }).click()
  await expect(panel.getByRole("tab", { name: "README.md" })).toHaveCount(0)
-  await expect(sidebar).toBeVisible()
  await filter.fill("nested")
  const result = panel.getByRole("option", { name: /nested\.ts/ })
  await expect(result).toBeVisible()
@@ -125,17 +113,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", "")
@@ -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"]')
@@ -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")
@@ -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: {
@@ -24,7 +24,7 @@ test("renders a completed single-file patch", async ({ page }) => {
      assistantMessage([
        toolPart(
          id,
-          "apply_patch",
+          "patch",
          "completed",
          { files: ["src/a.ts"] },
          {
@@ -35,7 +35,7 @@ test("preserves nested patch file state through outer collapse and reopen", asyn
      assistantMessage([
        toolPart(
          patchID,
-          "apply_patch",
+          "patch",
          "completed",
          { files: files.map((file) => file.filePath) },
          { metadata: { files } },
@@ -35,7 +35,6 @@ test.describe("session timeline projection", () => {
      editPart("prt_edit"),
      toolPart("prt_write", "write", "completed", { filePath: "src/new.ts", content: "export const stable = true\n" }),
      patchPart("prt_patch"),
-      toolPart("prt_todo", "todowrite", "completed", { todos: [{ content: "Hidden", status: "pending" }] }),
      toolPart(
        "prt_question",
        "question",
@@ -65,7 +64,6 @@ test.describe("session timeline projection", () => {
    ]) {
      await expect(page.locator(`[data-timeline-part-id="${id}"]`).first(), id).toBeVisible()
    }
-    await expect(page.locator('[data-timeline-part-id="prt_todo"]')).toHaveCount(0)
  })

  test("projects gaps, dividers, assistant parts, and errors together", async ({ page }) => {
@@ -152,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))

@@ -249,7 +244,7 @@ function editPart(id: string) {
 function patchPart(id: string) {
  return toolPart(
    id,
-    "apply_patch",
+    "patch",
    "completed",
    { files: ["src/a.ts", "src/b.ts"] },
    {
@@ -1,228 +0,0 @@
-import { expect, test, type Locator, type Page } from "@playwright/test"
-import {
-  assistantMessage,
-  setupTimeline,
-  shell,
-  textPart,
-  toolPart,
-  userMessage,
-} from "../performance/timeline-stability/fixture"
-
-for (const deviceScaleFactor of [1.25, 1.5]) {
-  test(`keeps the shell outline inside a fractionally short virtual row at ${deviceScaleFactor}x`, async ({ page }) => {
-    const shellID = "prt_shell_outline"
-    const timeline = await setupTimeline(page, {
-      messages: [userMessage(), assistantMessage([shell(shellID, "completed", "shell output")])],
-      settings: { newLayoutDesigns: true, shellToolPartsExpanded: true },
-      reducedMotion: true,
-      deviceScaleFactor,
-    })
-    const part = page.locator(`[data-timeline-part-id="${shellID}"]`)
-    const output = part.locator('[data-component="bash-output"]')
-    const row = page.locator("[data-timeline-key]", { has: part })
-    await expect(output).toBeVisible()
-    await timeline.settle()
-
-    const geometry = await row.evaluate((element) => {
-      const output = element.querySelector<HTMLElement>('[data-component="bash-output"]')
-      if (!output) throw new Error("Shell output is unavailable")
-      const rowRect = element.getBoundingClientRect()
-      const outputRect = output.getBoundingClientRect()
-      // Match a rounded-down measurement at a fractional device-pixel phase.
-      element.style.height = `${outputRect.bottom - rowRect.top - 0.49}px`
-      element.style.transform = "translateY(0.25px)"
-      output.style.setProperty("--v2-border-border-base", "rgb(255, 0, 255)")
-      output.style.setProperty("background", "rgb(0, 0, 0)", "important")
-      const style = getComputedStyle(output)
-      return {
-        outputWidth: outputRect.width,
-        outputHeight: outputRect.height,
-        borderColor: style.borderTopColor,
-        boxShadow: style.boxShadow,
-        clipMargin: getComputedStyle(element).overflowClipMargin,
-      }
-    })
-    await timeline.settle()
-
-    const clipped = await row.evaluate((element) => {
-      const output = element.querySelector<HTMLElement>('[data-component="bash-output"]')!
-      return output.getBoundingClientRect().bottom - element.getBoundingClientRect().bottom
-    })
-    expect(clipped).toBeCloseTo(0.49, 1)
-
-    expect(await page.evaluate(() => devicePixelRatio)).toBe(deviceScaleFactor)
-    const edges = await captureCardEdges(page, output)
-
-    expect(edges.box.width).toBeCloseTo(geometry.outputWidth, 2)
-    expect(edges.box.height).toBeCloseTo(geometry.outputHeight, 2)
-    expect(geometry.borderColor).toBe("rgb(255, 0, 255)")
-    expect(geometry.boxShadow).toBe("none")
-    expect(geometry.clipMargin).toBe("0.5px")
-    expect(edges.magenta.top).toBeGreaterThan(0.75)
-    expect(edges.magenta.bottom).toBeGreaterThan(0.75)
-    expect(edges.magenta.vertical).toBeGreaterThanOrEqual(2)
-  })
-}
-
-test("keeps the patch card inside a fractionally short virtual row", async ({ page }) => {
-  const patchID = "prt_patch_outline"
-  const file = {
-    filePath: "src/outline.ts",
-    relativePath: "src/outline.ts",
-    type: "update",
-    additions: 1,
-    deletions: 1,
-    before: "const outline = false\n",
-    after: "const outline = true\n",
-  }
-  const timeline = await setupTimeline(page, {
-    messages: [
-      userMessage(),
-      assistantMessage([
-        toolPart(patchID, "apply_patch", "completed", { files: [file.filePath] }, { metadata: { files: [file] } }),
-      ]),
-    ],
-    settings: { editToolPartsExpanded: true, newLayoutDesigns: true },
-    reducedMotion: true,
-  })
-  const part = page.locator(`[data-timeline-part-id="${patchID}"]`)
-  const card = part.locator('[data-component="accordion"][data-scope="apply-patch"]')
-  const row = page.locator("[data-timeline-key]", { has: part })
-  await expect(card).toBeVisible()
-  await timeline.settle()
-
-  const geometry = await row.evaluate((element) => {
-    const card = element.querySelector<HTMLElement>('[data-component="accordion"][data-scope="apply-patch"]')
-    if (!card) throw new Error("Patch card is unavailable")
-    const rowRect = element.getBoundingClientRect()
-    const cardRect = card.getBoundingClientRect()
-    element.style.height = `${cardRect.bottom - rowRect.top - 0.49}px`
-    const clipMargin = getComputedStyle(element).overflowClipMargin
-    const bottom = element.getBoundingClientRect().bottom
-    return {
-      overflow: card.getBoundingClientRect().bottom - bottom,
-      paintOverflow: card.getBoundingClientRect().bottom - bottom - Number.parseFloat(clipMargin),
-      clipMargin,
-      cardWidth: cardRect.width,
-      cardHeight: cardRect.height,
-    }
-  })
-  await timeline.settle()
-
-  expect(geometry.overflow).toBeCloseTo(0.49, 1)
-  expect(geometry.paintOverflow).toBeLessThanOrEqual(0)
-  const edges = await captureCardEdges(page, card)
-  expect(edges.box.width).toBeCloseTo(geometry.cardWidth, 2)
-  expect(edges.box.height).toBeCloseTo(geometry.cardHeight, 2)
-  expect(edges.luminance.top).toBeLessThan(245)
-  expect(edges.luminance.bottom).toBeLessThan(245)
-  expect(Math.abs(edges.luminance.bottom - edges.luminance.top)).toBeLessThan(10)
-  expect(geometry.clipMargin).toBe("0.5px")
-})
-
-test("allows paint rounding for every framed row but not fixed turn gaps", async ({ page }) => {
-  const secondUserID = "msg_outline_second_user"
-  await setupTimeline(page, {
-    messages: [
-      userMessage(undefined, {
-        summary: {
-          diffs: [
-            {
-              file: "src/summary.ts",
-              additions: 1,
-              deletions: 1,
-              patch: "@@ -1 +1 @@\n-export const value = 1\n+export const value = 2",
-            },
-          ],
-        },
-      }),
-      assistantMessage([textPart("prt_outline_text", "Assistant text")]),
-      userMessage(undefined, { id: secondUserID, created: 1700000010000 }),
-      assistantMessage([], {
-        id: "msg_outline_second_assistant",
-        parentID: secondUserID,
-        created: 1700000011000,
-      }),
-    ],
-  })
-  await expect(page.locator('[data-timeline-row="DiffSummary"]')).toBeVisible()
-  await expect(page.locator('[data-timeline-row="TurnGap"]')).toBeVisible()
-
-  const rows = await page.locator("[data-timeline-key]").evaluateAll((elements) =>
-    elements.map((element) => ({
-      tag: element.querySelector<HTMLElement>("[data-timeline-row]")?.dataset.timelineRow,
-      clipMargin: getComputedStyle(element).overflowClipMargin,
-    })),
-  )
-  expect(rows.filter((row) => row.tag !== "TurnGap").every((row) => row.clipMargin === "0.5px")).toBe(true)
-  expect(rows.filter((row) => row.tag === "TurnGap")).toEqual([{ tag: "TurnGap", clipMargin: "0px" }])
-})
-
-async function captureCardEdges(page: Page, card: Locator) {
-  const box = await card.boundingBox()
-  if (!box) throw new Error("Tool card bounds are unavailable")
-  const viewport = page.viewportSize()
-  if (!viewport) throw new Error("Viewport bounds are unavailable")
-  const screenshot = await page.screenshot()
-  return page.evaluate(
-    async ({ source, box, viewport }) => {
-      const image = new Image()
-      image.src = source
-      await image.decode()
-      const canvas = document.createElement("canvas")
-      canvas.width = image.naturalWidth
-      canvas.height = image.naturalHeight
-      const context = canvas.getContext("2d")
-      if (!context) throw new Error("2D canvas is unavailable")
-      context.drawImage(image, 0, 0)
-      const scale = {
-        x: image.naturalWidth / viewport.width,
-        y: image.naturalHeight / viewport.height,
-      }
-      const rows = (candidates: number[]) => {
-        const left = Math.floor((box.x + 8) * scale.x)
-        const width = Math.floor((box.width - 16) * scale.x)
-        return candidates.map((row) => {
-          const pixels = context.getImageData(left, row, width, 1).data
-          const indexes = Array.from({ length: width }, (_, index) => index * 4)
-          return {
-            luminance:
-              indexes
-                .map((index) => (pixels[index]! + pixels[index + 1]! + pixels[index + 2]!) / 3)
-                .reduce((sum, value) => sum + value, 0) / width,
-            magenta:
-              indexes.filter((index) => pixels[index]! > 200 && pixels[index + 1]! < 180 && pixels[index + 2]! > 200)
-                .length / width,
-          }
-        })
-      }
-      const pixels = context.getImageData(0, 0, image.naturalWidth, image.naturalHeight).data
-      const columns = new Uint32Array(image.naturalWidth)
-      for (let index = 0; index < pixels.length; index += 4) {
-        if (pixels[index]! <= 200 || pixels[index + 1]! >= 180 || pixels[index + 2]! <= 200) continue
-        columns[(index / 4) % image.naturalWidth] = columns[(index / 4) % image.naturalWidth]! + 1
-      }
-      const top = box.y * scale.y
-      const bottom = (box.y + box.height) * scale.y
-      const topRows = rows([Math.floor(top) - 1, Math.floor(top), Math.ceil(top)])
-      const bottomRows = rows([Math.floor(bottom) - 2, Math.floor(bottom) - 1, Math.ceil(bottom) - 1])
-      return {
-        box,
-        luminance: {
-          top: Math.min(...topRows.map((row) => row.luminance)),
-          bottom: rows([Math.ceil(bottom) - 1])[0]!.luminance,
-        },
-        magenta: {
-          top: Math.max(...topRows.map((row) => row.magenta)),
-          bottom: Math.max(...bottomRows.map((row) => row.magenta)),
-          vertical: Array.from(columns).filter((count) => count > box.height * scale.y * 0.75).length,
-        },
-      }
-    },
-    {
-      source: `data:image/png;base64,${screenshot.toString("base64")}`,
-      viewport,
-      box,
-    },
-  )
-}
@@ -8,7 +8,7 @@ import {
 } from "../performance/timeline-stability/fixture"

 test("renders every tool error outcome without leaking hidden tools", async ({ page }) => {
-  const ordinary = ["bash", "edit", "write", "apply_patch", "webfetch", "websearch", "task", "skill", "mcp_probe"]
+  const ordinary = ["bash", "edit", "write", "patch", "webfetch", "websearch", "task", "skill", "mcp_probe"]
  const parts = ordinary.map((tool, index) =>
    toolPart(`prt_error_${index}`, tool, "error", errorInput(tool), { error: `${tool} failed visibly` }),
  )
@@ -17,13 +17,11 @@ test("renders every tool error outcome without leaking hidden tools", async ({ p
      error: "The user dismissed this question",
    }),
    toolPart("prt_question_error", "question", "error", questionInput(), { error: "Question transport failed" }),
-    toolPart("prt_todo_error", "todowrite", "error", { todos: [] }, { error: "Hidden todo failure" }),
  )
  await setupTimeline(page, { messages: [userMessage(), assistantMessage(parts)] })

  await expect(page.locator('[data-kind="tool-error-card"]')).toHaveCount(ordinary.length + 1)
  await expect(page.getByText(/dismissed/i)).toBeVisible()
-  await expect(page.locator('[data-timeline-part-id="prt_todo_error"]')).toHaveCount(0)
  for (let index = 0; index < ordinary.length; index++) {
    await expect(page.locator(`[data-timeline-part-id="prt_error_${index}"]`)).toBeVisible()
  }
@@ -90,7 +88,7 @@ function questionInput() {
 function errorInput(tool: string) {
  if (tool === "bash") return { command: "exit 1" }
  if (["edit", "write"].includes(tool)) return { filePath: "src/error.ts", content: "" }
-  if (tool === "apply_patch") return { files: ["src/error.ts"] }
+  if (tool === "patch") return { files: ["src/error.ts"] }
  if (tool === "webfetch") return { url: "https://example.com" }
  if (tool === "websearch") return { query: "failure" }
  if (tool === "task") return { description: "Fail task", subagent_type: "explore" }
@@ -1,186 +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/TodoDockNavigation"
-const projectID = "proj_todo_dock_navigation"
-const sourceID = "ses_todo_dock_source"
-const otherID = "ses_todo_dock_other"
-const sourceTitle = "Todo dock animation"
-const otherTitle = "Separate session"
-
-const activeTodos = [
-  { id: "todo-1", content: "Receive todos in the active session", status: "completed", priority: "high" },
-  { id: "todo-2", content: "Keep the dock visible across tabs", status: "completed", priority: "high" },
-  { id: "todo-3", content: "Close after the final todo", status: "in_progress", priority: "high" },
-]
-
-type EventPayload = {
-  directory: string
-  payload: Record<string, unknown>
-}
-
-test.use({ viewport: { width: 1440, height: 900 }, reducedMotion: "no-preference" })
-
-test("animates todo lifecycle without replaying it across session tabs", async ({ page }) => {
-  test.setTimeout(90_000)
-  const events: EventPayload[] = []
-  const todos: Record<string, typeof activeTodos> = { [sourceID]: [], [otherID]: [] }
-
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: projectID,
-      worktree: directory,
-      vcs: "git",
-      name: "todo-dock-navigation",
-      time: { created: 1700000000000, updated: 1700000000000 },
-      sandboxes: [],
-    },
-    provider: {
-      all: [
-        {
-          id: "opencode",
-          name: "OpenCode",
-          models: {
-            "claude-opus-4-6": {
-              id: "claude-opus-4-6",
-              name: "Claude Opus 4.6",
-              limit: { context: 200_000 },
-            },
-          },
-        },
-      ],
-      connected: ["opencode"],
-      default: { providerID: "opencode", modelID: "claude-opus-4-6" },
-    },
-    sessions: [session(sourceID, sourceTitle, 1700000000000), session(otherID, otherTitle, 1700000001000)],
-    pageMessages: () => ({ items: [] }),
-    events: () => events.splice(0, 1),
-    eventRetry: 16,
-    todos: (sessionID) => todos[sessionID] ?? [],
-  })
-  await configurePage(page)
-
-  await page.goto(sessionHref(sourceID))
-  await expectSessionTitle(page, sourceTitle)
-  const dock = page.locator('[data-component="session-todo-dock"]')
-  await expect(dock).toHaveCount(0)
-
-  events.push(statusEvent(sourceID, "busy"))
-  await expect(page.getByRole("button", { name: "Stop" })).toBeVisible()
-
-  await page.waitForTimeout(700)
-  const opening = sampleDock(page, 1_000)
-  todos[sourceID] = activeTodos
-  events.push(todoEvent(sourceID, activeTodos))
-  await expect(dock).toBeVisible()
-  await expect(dock.locator('[data-state="in_progress"]')).toHaveCount(1)
-  expect((await opening).some((sample) => sample.opacity > 0.05 && sample.opacity < 0.95)).toBe(true)
-
-  await switchSession(page, otherID, otherTitle)
-  await expect(dock).toHaveCount(0)
-
-  const returningOpen = sampleDock(page, 700)
-  await switchSession(page, sourceID, sourceTitle)
-  const openSamples = (await returningOpen).filter((sample) => sample.present)
-  expect(openSamples.length).toBeGreaterThan(0)
-  expect(openSamples[0]!.opacity).toBeGreaterThan(0.98)
-  expect(openSamples[0]!.height).toBeGreaterThan(70)
-  await expect(dock.locator('[data-state="in_progress"]')).toHaveCount(1)
-
-  const completedTodos = activeTodos.map((todo) => ({ ...todo, status: "completed" }))
-  const closing = sampleDock(page, 1_000)
-  todos[sourceID] = completedTodos
-  events.push(todoEvent(sourceID, completedTodos))
-  await expect(dock).toHaveCount(0)
-  expect((await closing).some((sample) => sample.opacity > 0.05 && sample.opacity < 0.95)).toBe(true)
-  todos[sourceID] = []
-  events.push(todoEvent(sourceID, []))
-
-  await switchSession(page, otherID, otherTitle)
-  const returningEmpty = sampleDock(page, 700)
-  await switchSession(page, sourceID, sourceTitle)
-  await expect(dock).toHaveCount(0)
-  expect((await returningEmpty).every((sample) => !sample.present)).toBe(true)
-})
-
-function session(id: string, title: string, created: number) {
-  return {
-    id,
-    slug: id,
-    projectID,
-    directory,
-    title,
-    version: "dev",
-    time: { created, updated: created },
-  }
-}
-
-function statusEvent(sessionID: string, type: "busy" | "idle"): EventPayload {
-  return {
-    directory,
-    payload: { type: "session.status", properties: { sessionID, status: { type } } },
-  }
-}
-
-function todoEvent(sessionID: string, next: typeof activeTodos): EventPayload {
-  return {
-    directory,
-    payload: { type: "todo.updated", properties: { sessionID, todos: next } },
-  }
-}
-
-async function configurePage(page: Page) {
-  const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-  await page.addInitScript(
-    ({ directory, dirBase64, server, sessionIDs }) => {
-      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.window.browser.dat:tabs",
-        JSON.stringify(sessionIDs.map((sessionId) => ({ type: "session", server, dirBase64, sessionId }))),
-      )
-    },
-    { directory, dirBase64: base64Encode(directory), server, sessionIDs: [sourceID, otherID] },
-  )
-}
-
-function sessionHref(sessionID: string) {
-  const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-  return `/server/${base64Encode(server)}/session/${sessionID}`
-}
-
-async function switchSession(page: Page, sessionID: string, title: string) {
-  const href = sessionHref(sessionID)
-  const tab = page.locator(`[data-slot="titlebar-tabs"] a[href="${href}"]`).first()
-  await expect(tab).toBeVisible()
-  await tab.click()
-  await expectSessionTitle(page, title)
-}
-
-function sampleDock(page: Page, duration: number) {
-  return page.evaluate(async (duration) => {
-    const samples: { present: boolean; height: number; opacity: number }[] = []
-    const start = performance.now()
-    while (performance.now() - start < duration) {
-      const dock = document.querySelector<HTMLElement>('[data-component="session-todo-dock"]')
-      const clip = dock?.parentElement?.parentElement
-      const label = dock?.querySelector<HTMLElement>('[data-action="session-todo-toggle"] span[aria-label]')
-      samples.push({
-        present: !!dock,
-        height: clip?.getBoundingClientRect().height ?? 0,
-        opacity: label ? Number.parseFloat(getComputedStyle(label).opacity) : 0,
-      })
-      await new Promise(requestAnimationFrame)
-    }
-    return samples
-  }, duration)
-}
@@ -63,7 +63,7 @@ async function mockServer(page: Page) {
    if (byId) return json(route, byId)
    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 (/^\/session\/[^/]+\/(children|diff)$/.test(url.pathname)) return json(route, [])
    if (["/skill", "/command", "/lsp", "/formatter", "/permission", "/question", "/vcs/diff"].includes(url.pathname))
      return json(route, [])
    if (["/global/config", "/config", "/provider/auth", "/mcp", "/session/status"].includes(url.pathname))
@@ -120,7 +120,7 @@ function toolPart(
  outputLength = 160,
 ): MessagePart {
  const metadata =
-    tool === "apply_patch"
+    tool === "patch"
      ? { files: [patchFile(index, "update"), patchFile(index + 1, index % 2 === 0 ? "add" : "delete")] }
      : tool === "edit" || tool === "write"
        ? {
@@ -199,7 +199,7 @@ function turn(index: number): Message[] {
      ? [toolPart(index, 7, "write", { filePath: `src/generated/write-${index}.ts`, content: code(index, 28) }, 560)]
      : []),
    ...(index % 8 === 0
-      ? [toolPart(index, 8, "apply_patch", { files: [`src/generated/patch-${index}.ts`] }, 620)]
+      ? [toolPart(index, 8, "patch", { files: [`src/generated/patch-${index}.ts`] }, 620)]
      : []),
    ...(index % 7 === 0 ? [toolPart(index, 4, "bash", { command: "bun typecheck" }, 620)] : []),
    ...(index % 10 === 0 ? [toolPart(index, 9, "webfetch", { url: "https://example.com/docs/sample" }, 120)] : []),
@@ -229,7 +229,6 @@ const sourceMessages = Array.from({ length: 12 }, (_, index) => [
 ]).flat()

 function renderable(part: MessagePart) {
-  if (part.type === "tool" && part.tool === "todowrite") return false
  if (part.type === "text") return !!part.text.trim()
  if (part.type === "reasoning") return !!part.text.trim()
  return part.type !== "step-start" && part.type !== "step-finish" && part.type !== "patch"
@@ -17,7 +17,6 @@ export interface MockServerConfig {
  onMessage?: (input: { sessionID: string; messageID: string }) => void
  events?: () => unknown[]
  eventRetry?: number
-  todos?: (sessionID: string) => unknown[]
  permissions?: unknown[] | (() => unknown[])
  questions?: unknown[] | (() => unknown[])
  fileList?: (path: string) => unknown | Promise<unknown>
@@ -56,12 +55,7 @@ export async function mockOpenCodeServer(page: Page, config: MockServerConfig) {
    const path = url.pathname
    if (path === "/global/event" || path === "/event") return sse(route, config.events?.(), config.eventRetry)
    if (path === "/global/health") return json(route, { healthy: true })
-    if (path === "/api/session")
-      return json(route, {
-        data: config.sessions.map((session) => v2Session(session, config.directory)),
-        cursor: {},
-      })
-    if (path === "/experimental/capabilities") return json(route, { backgroundSubagents: false })
+    if (path === "/experimental/capabilities") return json(route, { backgroundSubagents: true })
    if (path === "/permission")
      return json(route, typeof config.permissions === "function" ? config.permissions() : (config.permissions ?? []))
    if (path === "/question")
@@ -111,8 +105,6 @@ export async function mockOpenCodeServer(page: Page, config: MockServerConfig) {
      return json(route, message)
    }

-    const todoMatch = path.match(/^\/session\/([^/]+)\/todo$/)
-    if (todoMatch) return json(route, config.todos?.(todoMatch[1]!) ?? [])
    if (/^\/session\/[^/]+\/(children|diff)$/.test(path)) return json(route, [])

    const messagesMatch = path.match(/^\/session\/([^/]+)\/message$/)
@@ -137,30 +129,6 @@ export async function mockOpenCodeServer(page: Page, config: MockServerConfig) {
  })
 }

-function v2Session(session: { id: string } & Record<string, unknown>, fallbackDirectory: string) {
-  const time = session.time && typeof session.time === "object" ? session.time : {}
-  return {
-    id: session.id,
-    parentID: session.parentID,
-    projectID: session.projectID ?? "project",
-    cost: session.cost ?? 0,
-    tokens: session.tokens ?? { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
-    time: {
-      created: "created" in time && typeof time.created === "number" ? time.created : 0,
-      updated: "updated" in time && typeof time.updated === "number" ? time.updated : 0,
-      ...(session.time && typeof session.time === "object" && "archived" in session.time
-        ? { archived: session.time.archived }
-        : {}),
-    },
-    title: session.title ?? session.id,
-    location: {
-      directory: typeof session.directory === "string" ? session.directory : fallbackDirectory,
-      ...(typeof session.workspaceID === "string" ? { workspaceID: session.workspaceID } : {}),
-    },
-    ...(typeof session.path === "string" ? { subpath: session.path } : {}),
-  }
-}
-
 function json(route: Route, body: unknown, headers?: Record<string, string>, status = 200) {
  return route.fulfill({
    status,
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.17.20",
+  "version": "1.17.18",
  "description": "",
  "type": "module",
  "exports": {
@@ -177,7 +177,7 @@ export function CustomProviderForm() {
  return (
    <div class="flex flex-col gap-6 px-2.5 pb-3 overflow-y-auto max-h-[60vh]">
      <div class="px-2.5 flex gap-4 items-center">
-        <ProviderIcon id="synthetic" class="size-5 shrink-0 icon-strong-base" />
+        <ProviderIcon id="session.synthetic" class="size-5 shrink-0 icon-strong-base" />
        <div class="text-16-medium text-text-strong">{language.t("provider.custom.title")}</div>
      </div>

@@ -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>
-  )
-}
@@ -1,32 +1,123 @@
 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") {
+        await serverSDK().client.project.update({
+          projectID: props.project.id,
+          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 +125,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 +174,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 +183,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 +193,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 +207,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 +216,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 +246,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>
@@ -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
-    },
-  }
-}
@@ -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],
-    ])
-  })
-})
@@ -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,
-  }
-}
@@ -16,13 +16,7 @@ import type { FileNode } from "@opencode-ai/sdk/v2"
 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" />
@@ -5,8 +5,6 @@ import { createStore } from "solid-js/store"
 import { Drawer, DrawerClose, DrawerContent } from "@/components/ui/drawer"
 import { usePlatform } from "@/context/platform"
 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 = (
@@ -67,7 +65,7 @@ export function TabsInfoPopup() {
      <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"
@@ -109,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>
@@ -129,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>
@@ -1,8 +1,6 @@
 // @ts-nocheck
 import { createStore } from "solid-js/store"
-import type { Todo } from "@opencode-ai/sdk/v2"
 import { createPromptState } from "@/context/prompt"
-import { SessionComposerRegion, createSessionComposerRegionController } from "@/pages/session/composer"
 import { createPromptInputHistory, PromptInput } from "./prompt-input"

 function createPromptInputStoryRuntime() {
@@ -104,94 +102,6 @@ function PromptInputExample() {
  )
 }

-const todos: Todo[] = [
-  { id: "todo-1", content: "Inspect the session composer animation", status: "completed" },
-  { id: "todo-2", content: "Keep the dock settled on initial render", status: "in_progress" },
-  { id: "todo-3", content: "Verify session navigation behavior", status: "pending" },
-]
-
-function PromptInputWithOpenDock() {
-  const input = createPromptInputStoryRuntime()
-  const [controls, setControls] = createStore({
-    agent: "build",
-    activeTab: undefined as string | undefined,
-    todoCollapsed: false,
-  })
-  const inputControls = {
-    agents: {
-      available: [],
-      options: ["build"],
-      get current() {
-        return controls.agent
-      },
-      loading: false,
-      visible: true,
-      select: (agent?: string) => setControls("agent", agent ?? "build"),
-    },
-    model: {
-      selection: {
-        current: () => ({ id: "claude-3-7-sonnet", name: "Claude 3.7 Sonnet", provider: { id: "anthropic" } }),
-        variant: { list: () => [], current: () => undefined, set: () => {} },
-      },
-      paid: true,
-      loading: false,
-    },
-    session: {
-      id: "story-session",
-      tabs: {
-        active: () => controls.activeTab,
-        all: () => [],
-        open: () => {},
-        setActive: (tab: string) => setControls("activeTab", tab),
-      },
-      reviewPanel: { opened: () => false, open: () => {} },
-    },
-    newLayoutDesigns: true,
-  }
-  const state = {
-    blocked: () => false,
-    questionRequest: () => undefined,
-    permissionRequest: () => undefined,
-    permissionResponding: () => false,
-    decide: () => {},
-    todos: () => todos,
-    dock: () => true,
-    closing: () => false,
-    opening: () => false,
-  }
-  return (
-    <SessionComposerRegion
-      controller={createSessionComposerRegionController({
-        state,
-        sessionKey: () => "story-session",
-        sessionID: () => "story-session",
-        prompt: input.state,
-        ready: () => true,
-        centered: () => false,
-        todo: {
-          collapsed: () => controls.todoCollapsed,
-          onToggle: () => setControls("todoCollapsed", (collapsed) => !collapsed),
-        },
-        followup: () => undefined,
-        revert: () => undefined,
-        onResponseSubmit: () => {},
-        openParent: () => {},
-        setPromptRef: () => {},
-        setDockRef: () => {},
-      })}
-      promptInput={
-        <PromptInput
-          controls={inputControls}
-          {...input}
-          ref={() => {}}
-          newSessionWorktree=""
-          onNewSessionWorktreeReset={() => {}}
-        />
-      }
-    />
-  )
-}
-
 export default {
  title: "App/PromptInput",
  id: "app-prompt-input",
@@ -206,12 +116,3 @@ export const Basic = {
    </div>
  ),
 }
-
-export const DockAlreadyOpen = {
-  render: () => (
-    <div class="pt-10">
-      <h1 class="mb-4">Prompt Input with open Todo dock</h1>
-      <PromptInputWithOpenDock />
-    </div>
-  ),
-}
@@ -19,7 +19,6 @@ import { selectionFromLines, type SelectedLineRange, useFile } from "@/context/f
 import {
  ContentPart,
  DEFAULT_PROMPT,
-  isCommentItem,
  isPromptEqual,
  Prompt,
  usePrompt,
@@ -37,8 +36,6 @@ import { Icon } from "@opencode-ai/ui/icon"
 import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
 import { Tooltip, TooltipKeybind } from "@opencode-ai/ui/tooltip"
 import { ButtonV2 } from "@opencode-ai/ui/v2/button-v2"
-import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
-import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
 import { KeybindV2 } from "@opencode-ai/ui/v2/keybind-v2"
 import { MenuV2 } from "@opencode-ai/ui/v2/menu-v2"
 import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
@@ -633,9 +630,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)
  }
@@ -1338,7 +1333,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
      onQueue: props.onQueue,
      onAbort: props.onAbort,
      onSubmit: props.onSubmit,
-      model: props.controls.model.selection,
    })

  const handleKeyDown = (event: KeyboardEvent) => {
@@ -1629,7 +1623,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 +1633,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 +1642,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]"
@@ -1722,19 +1704,22 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                  >
                    <MenuV2 gutter={6} modal={false} placement="top-start">
                      <MenuV2.Trigger
-                        as={IconButtonV2}
+                        as={IconButton}
                        data-action="prompt-attach"
                        type="button"
-                        icon={<IconV2 name="plus" />}
-                        variant="ghost-muted"
-                        size="large"
+                        icon="plus"
+                        variant="ghost"
+                        class="size-7 rounded-md p-[6px] text-v2-icon-icon-muted"
                        style={buttons()}
                        disabled={store.mode !== "normal"}
                        tabIndex={store.mode === "normal" ? undefined : -1}
                        aria-label={language.t("prompt.menu.addImagesAndFiles")}
                      />
                      <MenuV2.Portal>
-                        <MenuV2.Content style={{ "min-width": "180px" }}>
+                        <MenuV2.Content
+                          class="[&_[data-slot=menu-v2-item-shortcut]]:w-5 [&_[data-slot=menu-v2-item-shortcut]]:justify-center"
+                          style={{ "min-width": "180px" }}
+                        >
                          <MenuV2.Item onSelect={pick} shortcut={command.keybind("file.attach")}>
                            {language.t("prompt.menu.imagesAndFiles")}
                          </MenuV2.Item>
@@ -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"
@@ -2358,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>
@@ -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>
@@ -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);
-  }
-}
@@ -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>
  )
@@ -1,6 +1,5 @@
 import { beforeAll, beforeEach, describe, expect, mock, test } from "bun:test"
 import type { Prompt } from "@/context/prompt"
-import type { ModelSelection } from "@/context/local"

 let createPromptSubmit: typeof import("./submit").createPromptSubmit

@@ -34,10 +33,6 @@ const prompt = {
  current: () => promptValue,
  cursor: () => 0,
  dirty: () => true,
-  model: {
-    current: () => undefined,
-    set: () => undefined,
-  },
  reset: () => undefined,
  set: () => undefined,
  context: {
@@ -383,39 +378,6 @@ describe("prompt submit worktree selection", () => {
    })
  })

-  test("uses an injected model selection", async () => {
-    params = { id: "session-1" }
-    const model = {
-      current: () => ({ id: "draft-model", provider: { id: "draft-provider" } }),
-      variant: { current: () => "draft-variant" },
-    } as unknown as ModelSelection
-    const submit = createPromptSubmit({
-      prompt,
-      info: () => ({ id: "session-1" }),
-      imageAttachments: () => [],
-      commentCount: () => 0,
-      autoAccept: () => false,
-      mode: () => "normal",
-      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,
-      model,
-    })
-
-    await submit.handleSubmit({ preventDefault: () => undefined } as unknown as Event)
-
-    expect(optimistic[0]).toMatchObject({
-      message: {
-        model: { providerID: "draft-provider", modelID: "draft-model", variant: "draft-variant" },
-      },
-    })
-  })
-
  test("seeds new sessions before optimistic prompts are added", async () => {
    const submit = createPromptSubmit({
      prompt,
@@ -3,12 +3,12 @@ import { showToast } from "@/utils/toast"
 import { base64Encode } from "@opencode-ai/core/util/encode"
 import { Binary } from "@opencode-ai/core/util/binary"
 import { useNavigate, useParams, useSearchParams } from "@solidjs/router"
-import { batch, startTransition, type Accessor } from "solid-js"
+import { batch, type Accessor } from "solid-js"
 import { useTabs } from "@/context/tabs"
 import { useServerSync, type ServerSync } from "@/context/server-sync"
 import { useLanguage } from "@/context/language"
 import { useLayout } from "@/context/layout"
-import { useLocal, type ModelSelection } from "@/context/local"
+import { useLocal } 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"
@@ -191,7 +191,6 @@ type PromptSubmitInput = {
  onQueue?: (draft: FollowupDraft) => void
  onAbort?: () => void
  onSubmit?: () => void
-  model?: ModelSelection
 }

 export function createPromptSubmit(input: PromptSubmitInput) {
@@ -222,8 +221,6 @@ export function createPromptSubmit(input: PromptSubmitInput) {
    const sessionID = params.id
    if (!sessionID) return Promise.resolve()

-    serverSync().session.set("todo", sessionID, [])
-
    input.onAbort?.()

    const key = pendingKey(sessionID)
@@ -299,10 +296,9 @@ export function createPromptSubmit(input: PromptSubmitInput) {
      return
    }

-    const modelSelection = input.model ?? local.model
-    const currentModel = modelSelection.current()
+    const currentModel = local.model.current()
    const currentAgent = local.agent.current()
-    const variant = modelSelection.variant.current()
+    const variant = local.model.variant.current()
    if (!currentModel || !currentAgent) {
      showToast({
        title: language.t("prompt.toast.modelAgentRequired.title"),
@@ -376,20 +372,13 @@ export function createPromptSubmit(input: PromptSubmitInput) {
      if (created) {
        seed(sessionDirectory, created)
        session = created
-        await startTransition(() => {
-          if (!session) return
-          if (shouldAutoAccept) permission.enableAutoAccept(session.id, sessionDirectory)
-          local.session.promote(sessionDirectory, session.id, {
-            agent: currentAgent.name,
-            model: { providerID: currentModel.provider.id, modelID: currentModel.id },
-            variant: variant ?? null,
-          })
-          layout.handoff.setTabs(base64Encode(sessionDirectory), session.id)
-          const draftID = search.draftId
-          if (draftID) tabs.promoteDraft(draftID, { server: tabs.draft(draftID).server, sessionId: session.id })
-          else navigate(`/${base64Encode(sessionDirectory)}/session/${session.id}`)
-          submission.retarget(prompt.capture({ dir: base64Encode(sessionDirectory), id: session.id }))
-        })
+        if (shouldAutoAccept) permission.enableAutoAccept(session.id, sessionDirectory)
+        local.session.promote(sessionDirectory, session.id)
+        layout.handoff.setTabs(base64Encode(sessionDirectory), session.id)
+        const draftID = search.draftId
+        if (draftID) tabs.promoteDraft(draftID, { server: tabs.draft(draftID).server, sessionId: session.id })
+        else navigate(`/${base64Encode(sessionDirectory)}/session/${session.id}`)
+        submission.retarget(prompt.capture({ dir: base64Encode(sessionDirectory), id: session.id }))
      }
    }
    if (!session) {
@@ -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>
@@ -1,21 +0,0 @@
-[data-component="server-status-icon"] {
-  color: var(--v2-icon-icon-muted);
-
-  [data-slot="server-status-left"],
-  [data-slot="server-status-right"] {
-    fill: none;
-    stroke: currentColor;
-  }
-
-  [data-slot="server-status-dot"] {
-    fill: var(--server-status-color);
-  }
-
-  &[data-state="reconnecting"] {
-    --server-status-color: var(--v2-state-fg-warning);
-  }
-
-  &[data-state="disconnected"] {
-    --server-status-color: var(--v2-state-fg-danger);
-  }
-}
@@ -1,33 +0,0 @@
-import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
-import { ServerStatusIcon, type ServerStatusIconState } from "./server-status-icon"
-
-export default {
-  title: "Desktop V2/Server Status Icon",
-  id: "desktop-v2-server-status-icon",
-  component: ServerStatusIcon,
-  tags: ["autodocs"],
-}
-
-function Preview(props: { state: ServerStatusIconState; label: string }) {
-  return (
-    <div class="flex items-center gap-3">
-      <IconButtonV2
-        type="button"
-        variant="ghost-muted"
-        size="large"
-        class="!w-9 shrink-0"
-        aria-label={props.label}
-        icon={<ServerStatusIcon state={props.state} />}
-      />
-      <span class="text-[13px] text-v2-text-text-muted">{props.label}</span>
-    </div>
-  )
-}
-
-export const Reconnecting = {
-  render: () => <Preview state="reconnecting" label="Retrying automatically..." />,
-}
-
-export const Disconnected = {
-  render: () => <Preview state="disconnected" label="Server disconnected" />,
-}
@@ -1,17 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { resolveServerStatus } from "./server-status-icon"
-
-describe("resolveServerStatus", () => {
-  test("prioritizes a disconnected server over stream reconnection", () => {
-    expect(resolveServerStatus(false, "reconnecting")).toBe("disconnected")
-  })
-
-  test("shows reconnection while the server remains reachable", () => {
-    expect(resolveServerStatus(true, "reconnecting")).toBe("reconnecting")
-  })
-
-  test("stays hidden for healthy and initial connections", () => {
-    expect(resolveServerStatus(true, "connected")).toBeUndefined()
-    expect(resolveServerStatus(undefined, "connecting")).toBeUndefined()
-  })
-})
@@ -1,35 +0,0 @@
-import "./server-status-icon.css"
-
-export type ServerStatusIconState = "reconnecting" | "disconnected"
-export type ServerConnectionState = "connecting" | "connected" | "reconnecting"
-
-export function resolveServerStatus(healthy: boolean | undefined, connection: ServerConnectionState) {
-  if (healthy === false) return "disconnected" as const
-  if (connection === "reconnecting") return "reconnecting" as const
-}
-
-export function ServerStatusIcon(props: { state: ServerStatusIconState }) {
-  return (
-    <svg
-      data-component="server-status-icon"
-      data-state={props.state}
-      width="16"
-      height="16"
-      viewBox="0 0 16 16"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      aria-hidden="true"
-    >
-      <path
-        d="M13.3141 6.00001V14.4572H2.68555V1.54285H9.5M13.3141 14.4572V9.54285H2.68555V14.4572"
-        stroke="currentColor"
-      />
-      <path data-slot="server-status-left" d="M8.5 11.75H8V12.25H8.5Z" />
-      <path data-slot="server-status-right" d="M11 11.75H10.5V12.25H11Z" />
-      <path
-        data-slot="server-status-dot"
-        d="M13 5C14.3807 5 15.5 3.88071 15.5 2.5C15.5 1.11929 14.3807 0 13 0C11.6193 0 10.5 1.11929 10.5 2.5C10.5 3.88071 11.6193 5 13 5Z"
-      />
-    </svg>
-  )
-}
@@ -12,7 +12,7 @@ import { useSync } from "@/context/sync"
 import { useLanguage } from "@/context/language"
 import { useProviders } from "@/hooks/use-providers"
 import { useSDK } from "@/context/sdk"
-import { getSessionContext } from "@/components/session/session-context-metrics"
+import { getSessionContext, getSessionTokenTotal } from "@/components/session/session-context-metrics"
 import { useSessionLayout } from "@/pages/session/session-layout"
 import { createSessionTabs } from "@/pages/session/helpers"
 import { useSettings } from "@/context/settings"
@@ -74,6 +74,7 @@ export function SessionContextUsage(props: SessionContextUsageProps) {
  )

  const context = createMemo(() => getSessionContext(messages(), [...providers.all().values()]))
+  const tokens = createMemo(() => info()?.tokens)
  const cost = createMemo(() => {
    return usd().format(info()?.cost ?? 0)
  })
@@ -131,7 +132,7 @@ export function SessionContextUsage(props: SessionContextUsageProps) {
      <ContextTooltipRow name={language.t("context.usage.usage")} value={`${context()?.usage ?? 0}%`} />
      <ContextTooltipRow
        name={language.t("context.usage.tokens")}
-        value={context()?.total.toLocaleString(language.intl()) ?? "0"}
+        value={getSessionTokenTotal(tokens())?.toLocaleString(language.intl()) ?? "0"}
      />
    </div>
  )
@@ -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"
@@ -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>
-  )
-}
@@ -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,
-  }
-}
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test"
 import type { Message } from "@opencode-ai/sdk/v2/client"
-import { getSessionContext } from "./session-context-metrics"
+import { getSessionContext, getSessionTokenTotal } from "./session-context-metrics"

 const assistant = (
  id: string,
@@ -38,10 +38,10 @@ const user = (id: string) => {
 }

 describe("getSessionContext", () => {
-  test("computes token totals and usage from latest assistant with tokens", () => {
+  test("computes usage from latest assistant with tokens", () => {
    const messages = [
      user("u1"),
-      assistant("a1", { input: 600, output: 200, reasoning: 100, read: 50, write: 50 }, 0.5),
+      assistant("a1", { input: 0, output: 0, reasoning: 0, read: 0, write: 0 }, 0.5),
      assistant("a2", { input: 300, output: 100, reasoning: 50, read: 25, write: 25 }, 1.25),
    ]
    const providers = [
@@ -60,8 +60,6 @@ describe("getSessionContext", () => {
    const ctx = getSessionContext(messages, providers)

    expect(ctx?.message.id).toBe("a2")
-    expect(ctx?.total).toBe(500)
-    expect(ctx?.input).toBe(300)
    expect(ctx?.usage).toBe(50)
    expect(ctx?.providerLabel).toBe("OpenAI")
    expect(ctx?.modelLabel).toBe("GPT-4.1")
@@ -96,4 +94,15 @@ describe("getSessionContext", () => {

    expect(ctx).toBeUndefined()
  })
+
+  test("computes stored session token totals", () => {
+    expect(
+      getSessionTokenTotal({
+        input: 10,
+        output: 20,
+        reasoning: 30,
+        cache: { read: 40, write: 50 },
+      }),
+    ).toBe(150)
+  })
 })
@@ -1,4 +1,4 @@
-import type { AssistantMessage, Message } from "@opencode-ai/sdk/v2/client"
+import type { AssistantMessage, Message, Session } from "@opencode-ai/sdk/v2/client"

 type Provider = {
  id: string
@@ -21,7 +21,6 @@ type Context = {
  modelLabel: string
  limit: number | undefined
  input: number
-  total: number
  usage: number | null
 }

@@ -55,7 +54,6 @@ const build = (messages: Message[] = [], providers: Provider[] = []): Context |
    modelLabel: model?.name ?? message.modelID,
    limit,
    input: message.tokens.input,
-    total,
    usage: limit ? Math.round((total / limit) * 100) : null,
  }
 }
@@ -63,3 +61,8 @@ const build = (messages: Message[] = [], providers: Provider[] = []): Context |
 export function getSessionContext(messages: Message[] = [], providers: Provider[] = []) {
  return build(messages, providers)
 }
+
+export function getSessionTokenTotal(tokens: Session["tokens"] | undefined) {
+  if (!tokens) return undefined
+  return tokens.input + tokens.output + tokens.reasoning + tokens.cache.read + tokens.cache.write
+}
@@ -15,7 +15,7 @@ import { useLanguage } from "@/context/language"
 import { useProviders } from "@/hooks/use-providers"
 import { useSDK } from "@/context/sdk"
 import { useSessionLayout } from "@/pages/session/session-layout"
-import { getSessionContext } from "./session-context-metrics"
+import { getSessionContext, getSessionTokenTotal } from "./session-context-metrics"
 import { estimateSessionContextBreakdown, type SessionContextBreakdownKey } from "./session-context-breakdown"
 import { createSessionContextFormatter } from "./session-context-format"

@@ -135,6 +135,7 @@ export function SessionContextTab() {
  )

  const ctx = createMemo(() => getSessionContext(messages(), [...providers.all().values()]))
+  const tokens = createMemo(() => info()?.tokens)
  const formatter = createMemo(() => createSessionContextFormatter(language.intl()))

  const cost = createMemo(() => {
@@ -203,15 +204,14 @@ export function SessionContextTab() {
    { label: "context.stats.provider", value: providerLabel },
    { label: "context.stats.model", value: modelLabel },
    { label: "context.stats.limit", value: () => formatter().number(ctx()?.limit) },
-    { label: "context.stats.totalTokens", value: () => formatter().number(ctx()?.total) },
+    { label: "context.stats.totalTokens", value: () => formatter().number(getSessionTokenTotal(tokens())) },
    { label: "context.stats.usage", value: () => formatter().percent(ctx()?.usage) },
-    { label: "context.stats.inputTokens", value: () => formatter().number(ctx()?.input) },
-    { label: "context.stats.outputTokens", value: () => formatter().number(ctx()?.message.tokens.output) },
-    { label: "context.stats.reasoningTokens", value: () => formatter().number(ctx()?.message.tokens.reasoning) },
+    { label: "context.stats.inputTokens", value: () => formatter().number(tokens()?.input) },
+    { label: "context.stats.outputTokens", value: () => formatter().number(tokens()?.output) },
+    { label: "context.stats.reasoningTokens", value: () => formatter().number(tokens()?.reasoning) },
    {
      label: "context.stats.cacheTokens",
-      value: () =>
-        `${formatter().number(ctx()?.message.tokens.cache.read)} / ${formatter().number(ctx()?.message.tokens.cache.write)}`,
+      value: () => `${formatter().number(tokens()?.cache.read)} / ${formatter().number(tokens()?.cache.write)}`,
    },
    { label: "context.stats.userMessages", value: () => counts().user.toLocaleString(language.intl()) },
    { label: "context.stats.assistantMessages", value: () => counts().assistant.toLocaleString(language.intl()) },
@@ -1,4 +1,3 @@
-// @refresh reload
 import { AppIcon } from "@opencode-ai/ui/app-icon"
 import { Button } from "@opencode-ai/ui/button"
 import { DropdownMenu } from "@opencode-ai/ui/dropdown-menu"
@@ -17,9 +16,7 @@ import { useCommand } from "@/context/command"
 import { useLanguage } from "@/context/language"
 import { useLayout } from "@/context/layout"
 import { usePlatform } from "@/context/platform"
-import { ServerConnection, serverName, useServer } from "@/context/server"
-import { useServerSDK } from "@/context/server-sdk"
-import { useGlobal } from "@/context/global"
+import { useServer } from "@/context/server"
 import { useSettings } from "@/context/settings"
 import { useSync } from "@/context/sync"
 import { useTerminal } from "@/context/terminal"
@@ -36,8 +33,6 @@ import { KeybindV2 } from "@opencode-ai/ui/v2/keybind-v2"
 import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
 import { reviewTooltipKeybind } from "../command-tooltip-keybind"
 import { useTitlebarRightMount } from "../titlebar"
-import { useSettingsDialog } from "../settings-dialog"
-import { resolveServerStatus, ServerStatusIcon, type ServerStatusIconState } from "../server-status-icon"

 const OPEN_APPS = [
  "vscode",
@@ -149,8 +144,6 @@ export function SessionHeader() {
  const platform = usePlatform()
  const language = useLanguage()
  const settings = useSettings()
-  const global = useGlobal()
-  const serverSDK = useServerSDK()
  const sync = useSync()
  const terminal = useTerminal()
  const { params, view } = useSessionLayout()
@@ -172,7 +165,6 @@ export function SessionHeader() {
  const search = settings.visibility.search
  const status = settings.visibility.status
  const isDesktop = createMediaQuery("(min-width: 768px)")
-  const openServerSettings = useSettingsDialog("servers")

  const [exists, setExists] = createStore<Partial<Record<OpenApp, boolean>>>({
    finder: true,
@@ -242,25 +234,9 @@ export function SessionHeader() {
  const tint = createMemo(() =>
    messageAgentColor(params.id ? sync().data.message[params.id] : undefined, sync().data.agent),
  )
-  const serverStatus = createMemo<ServerStatusIconState | undefined>(() => {
-    const current = serverSDK()
-    return resolveServerStatus(
-      global.servers.health[ServerConnection.key(current.server)]?.healthy,
-      current.connection.status,
-    )
-  })
-  const serverStatusLabel = createMemo(() => {
-    if (serverStatus() === "disconnected") {
-      return language.t("app.server.status.disconnected", { server: serverName(serverSDK().server) })
-    }
-    return language.t("app.server.status.reconnecting", { server: serverName(serverSDK().server) })
-  })
  const v2ActionsState = createMemo<SessionHeaderV2ActionsState>(() => ({
-    serverStatus: isDesktop() ? serverStatus() : undefined,
-    serverStatusLabel: serverStatusLabel(),
-    onServerStatusClick: openServerSettings,
-    toolsVisible: isDesktop() && status(),
-    statusLabel: language.t("status.popover.tools.trigger"),
+    statusVisible: status(),
+    statusLabel: language.t("status.popover.trigger"),
    reviewLabel: language.t("command.review.toggle"),
    reviewKeybind: reviewTooltipKeybind(command),
    reviewVisible: isDesktop(),
@@ -541,10 +517,7 @@ export function SessionHeader() {
 }

 type SessionHeaderV2ActionsState = {
-  serverStatus?: ServerStatusIconState
-  serverStatusLabel: string
-  onServerStatusClick: () => void
-  toolsVisible: boolean
+  statusVisible: boolean
  statusLabel: string
  reviewLabel: string
  reviewKeybind: string[]
@@ -557,26 +530,11 @@ function SessionHeaderV2Actions(props: { state: SessionHeaderV2ActionsState }) {
  const language = useLanguage()

  return (
-    <div class="flex items-center gap-[6px]">
-      <Show when={props.state.serverStatus}>
-        {(status) => (
-          <TooltipV2 placement="bottom" value={props.state.serverStatusLabel}>
-            <IconButtonV2
-              type="button"
-              variant="ghost-muted"
-              size="large"
-              class="!w-9 shrink-0"
-              onClick={props.state.onServerStatusClick}
-              aria-label={props.state.serverStatusLabel}
-              icon={<ServerStatusIcon state={status()} />}
-            />
-          </TooltipV2>
-        )}
-      </Show>
-      <Show when={props.state.toolsVisible}>
-        <TooltipV2 placement="bottom" value={props.state.statusLabel}>
+    <div class="flex items-center gap-2">
+      <Show when={props.state.statusVisible}>
+        <Tooltip placement="bottom" value={props.state.statusLabel}>
          <StatusPopoverV2 />
-        </TooltipV2>
+        </Tooltip>
      </Show>
      <Show when={props.state.reviewVisible}>
        <TooltipV2
@@ -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>
-  )
-}
@@ -211,17 +211,7 @@ export function SortableTerminalTabV2(props: {
          <MenuV2.Context.Trigger class="relative" as="div">
            <Tabs.Trigger
              value={props.terminal.id}
-              onMouseDown={(e) => {
-                // Switch on mousedown to shave the press-release delay off tab switches.
-                if (e.button !== 0) return
-                if (store.editing) return
-                focus()
-              }}
-              onClick={(e) => {
-                // Mouse navigation already happened on mousedown; detail 0 means keyboard activation.
-                if (e.detail > 0) return
-                focus()
-              }}
+              onClick={focus}
              closeButton={
                <IconButton
                  icon="close-small"
@@ -224,7 +224,7 @@ const SettingsProvidersContent: Component<{ onBack?: () => void }> = (props) =>
            >
              <div class="flex flex-col min-w-0">
                <div class="flex flex-wrap items-center gap-x-3 gap-y-1">
-                  <ProviderIcon id="synthetic" class="size-5 shrink-0 icon-strong-base" />
+                  <ProviderIcon id="session.synthetic" class="size-5 shrink-0 icon-strong-base" />
                  <span class="text-14-medium text-text-strong">{language.t("provider.custom.title")}</span>
                  <Tag>{language.t("settings.providers.tag.custom")}</Tag>
                </div>
@@ -377,8 +377,8 @@ export const SettingsGeneralV2: Component<{
        </SettingsRowV2>

        <SettingsRowV2
-          title={language.t("settings.general.row.showTools.title")}
-          description={language.t("settings.general.row.showTools.description")}
+          title={language.t("settings.general.row.showStatus.title")}
+          description={language.t("settings.general.row.showStatus.description")}
        >
          <div data-action="settings-show-status">
            <Switch
@@ -221,7 +221,7 @@ export const SettingsProvidersV2: Component<{ onBack?: () => void }> = (props) =
            <div class="settings-v2-provider-row" data-component="custom-provider-section">
              <div class="settings-v2-provider-lead">
                <ProviderIcon
-                  id="synthetic"
+                  id="session.synthetic"
                  width={PROVIDER_ICON_SIZE}
                  height={PROVIDER_ICON_SIZE}
                  class="settings-v2-provider-icon shrink-0"
@@ -20,11 +20,6 @@
  height: 100%;
  overflow-y: auto;
  scrollbar-width: none;
-  user-select: none;
-}
-
-.settings-v2-panel :is(input, textarea, [contenteditable="true"]) {
-  user-select: text;
 }

 .settings-v2-panel::-webkit-scrollbar {
@@ -186,7 +181,6 @@
  flex-direction: column;
  gap: 8px;
  padding: 4px 0 4px 4px;
-  user-select: none;
 }

 .settings-v2-nav-footer > span {
@@ -16,7 +16,6 @@ import { type ServerHealth } from "@/utils/server-health"
 import { useGlobal } from "@/context/global"
 import { useSettings } from "@/context/settings"
 import { useMcpToggle } from "@/context/mcp"
-import { ToolsMenu } from "./tools-menu"

 const pluginEmptyMessage = (value: string, file: string): JSXElement => {
  const parts = value.split(file)
@@ -281,14 +280,7 @@ export function StatusPopoverBody(props: { shown: Accessor<boolean> }) {
  const toggleMcp = useMcpToggle()
  const defaultServer = useDefaultServerKey(platform.getDefaultServer)
  const mcpNames = createMemo(() => Object.keys(sync().data.mcp ?? {}).sort((a, b) => a.localeCompare(b)))
-  const configuredMcpNames = createMemo(() =>
-    Object.keys(sync().data.config.mcp ?? {}).sort((a, b) => a.localeCompare(b)),
-  )
  const mcpStatus = (name: string) => sync().data.mcp?.[name]?.status
-  const mcpError = (name: string) => {
-    const status = sync().data.mcp?.[name]
-    if (status?.status === "failed" || status?.status === "needs_client_registration") return status.error
-  }
  const mcpConnected = createMemo(() => mcpNames().filter((name) => mcpStatus(name) === "connected").length)
  const lspItems = createMemo(() => sync().data.lsp ?? [])
  const lspCount = createMemo(() => lspItems().length)
@@ -297,42 +289,6 @@ export function StatusPopoverBody(props: { shown: Accessor<boolean> }) {
  )
  const pluginCount = createMemo(() => plugins().length)
  const pluginEmpty = createMemo(() => pluginEmptyMessage(language.t("dialog.plugins.empty"), "opencode.json"))
-  if (settings.general.newLayoutDesigns()) {
-    return (
-      <ToolsMenu
-        labels={{
-          menu: language.t("status.popover.tools.trigger"),
-          mcp: language.t("status.popover.tab.mcp"),
-          lsp: language.t("status.popover.tab.lsp"),
-          plugins: language.t("status.popover.tab.plugins"),
-          mcpDescription: language.t("status.popover.tools.mcp.description"),
-          lspDescription: language.t("status.popover.tools.lsp.description"),
-          pluginsDescription: language.t("status.popover.tools.plugins.description"),
-          disabled: language.t("mcp.status.disabled"),
-          failed: language.t("mcp.status.failed"),
-          reauthenticate: language.t("status.popover.tools.reauthenticate"),
-        }}
-        empty={{
-          mcp: language.t("status.popover.tools.mcp.empty"),
-          lsp: language.t("status.popover.tools.lsp.empty"),
-          plugins: language.t("status.popover.tools.plugins.empty"),
-        }}
-        mcp={configuredMcpNames().map((name) => ({
-          name,
-          status: mcpStatus(name),
-          error: mcpError(name),
-          loading: !mcpStatus(name),
-          pending: toggleMcp.isPending && toggleMcp.variables === name,
-          onToggle: () => {
-            if (toggleMcp.isPending) return
-            toggleMcp.mutate(name)
-          },
-        }))}
-        lsp={lspItems().map((item) => ({ name: item.name || item.id, status: item.status }))}
-        plugins={plugins()}
-      />
-    )
-  }

  return (
    <div class="flex items-center gap-1 w-[360px] rounded-xl shadow-[var(--shadow-lg-border-base)]">
@@ -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)
-  })
-})
@@ -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"
-}
@@ -1,7 +1,7 @@
-// @refresh reload
 import { Button } from "@opencode-ai/ui/button"
 import { Icon } from "@opencode-ai/ui/icon"
 import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
+import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
 import { Popover } from "@opencode-ai/ui/popover"
 import { Suspense, createMemo, createSignal, lazy, Show, type JSX } from "solid-js"
 import { useLanguage } from "@/context/language"
@@ -9,8 +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 { ToolsMenuIcon } from "./tools-menu"
-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 })))
@@ -21,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
@@ -47,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>
      }
@@ -85,22 +87,22 @@ 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.keys(sync().data.config.mcp ?? {}).flatMap((name) => {
-        const status = sync().data.mcp?.[name]
-        return status ? [status.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(),
-    label: language.t("status.popover.tools.trigger"),
+    issue: mcpIssue(),
+    label: language.t("status.popover.trigger"),
    onOpenChange: setShown,
    body: () => (
      <StatusPopoverBody shown={shown()}>
@@ -121,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: () => (
@@ -138,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
@@ -158,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 +191,15 @@ function StatusPopoverView(props: { state: StatusPopoverState }) {
        state: props.state.shown ? "pressed" : undefined,
        "aria-label": props.state.label,
      }}
-      trigger={<ToolsMenuIcon warning={props.state.issue} />}
+      trigger={
+        <div class="relative size-4">
+          <IconV2 name={props.state.shown ? "status-active" : "status"} />
+          <div
+            classList={statusDotClass()}
+            class="-top-1 -right-1 size-2 border border-[var(--v2-background-bg-deep)]"
+          />
+        </div>
+      }
      {...popoverProps}
    >
      {props.state.body()}
@@ -1,8 +1,7 @@
 import { withAlpha } from "@opencode-ai/ui/theme/color"
 import { useTheme } from "@opencode-ai/ui/theme/context"
 import { resolveThemeVariant } from "@opencode-ai/ui/theme/resolve"
-import { resolveThemeVariantV2 } from "@opencode-ai/ui/theme/v2/resolve"
-import type { HexColor, ResolvedV2Theme } from "@opencode-ai/ui/theme/types"
+import type { HexColor } from "@opencode-ai/ui/theme/types"
 import { showToast } from "@/utils/toast"
 import type { FitAddon, Ghostty, Terminal as Term } from "ghostty-web"
 import { type ComponentProps, createEffect, createMemo, onCleanup, onMount, splitProps } from "solid-js"
@@ -69,19 +68,6 @@ const debugTerminal = (...values: unknown[]) => {
  console.debug("[terminal]", ...values)
 }

-const resolveV2Token = (tokens: ResolvedV2Theme, key: string) => {
-  let current = tokens[key]
-  for (let i = 0; i < 8 && current; i++) {
-    const match = /^var\(--([^)]+)\)$/.exec(current.trim())
-    if (!match) {
-      const hex = current.trim()
-      if (/^#[0-9a-fA-F]{8}$/.test(hex)) return hex.slice(0, 7)
-      return hex
-    }
-    current = tokens[match[1]]
-  }
-}
-
 const useTerminalUiBindings = (input: {
  container: HTMLDivElement
  term: Term
@@ -252,10 +238,7 @@ export const Terminal = (props: TerminalProps) => {
    if (!variant?.seeds && !variant?.palette) return fallback
    const resolved = resolveThemeVariant(variant, mode === "dark")
    const text = resolved["text-stronger"] ?? fallback.foreground
-    const background = settings.general.newLayoutDesigns()
-      ? (resolveV2Token(resolveThemeVariantV2(variant, mode === "dark"), "v2-background-bg-base") ??
-        fallback.background)
-      : (resolved["background-stronger"] ?? fallback.background)
+    const background = resolved["background-stronger"] ?? fallback.background
    const alpha = mode === "dark" ? 0.25 : 0.2
    const base = text.startsWith("#") ? (text as HexColor) : (fallback.foreground as HexColor)
    const selectionBackground = withAlpha(base, alpha)
@@ -25,7 +25,6 @@ import { readSessionTabsRemovedDetail, SESSION_TABS_REMOVED_EVENT } from "@/comp
 import { useGlobal } from "@/context/global"
 import { ServerConnection, useServer } from "@/context/server"
 import { tabKey, useTabs } from "@/context/tabs"
-import type { PromptSession } from "@/context/prompt"
 import "./titlebar.css"
 import { newTabTooltipKeybind } from "./command-tooltip-keybind"

@@ -325,20 +324,13 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
              const route = layout.route()
              const activeSession = session()
              if (route.type === "session" && activeSession) {
-                const sessionTab = {
-                  type: "session" as const,
-                  server: route.server ?? server.key,
-                  sessionId: activeSession.id,
-                }
-                const model = tabs.stateValue<PromptSession>(sessionTab, "prompt")?.model.current()
-                tabs.newDraft({ server: sessionTab.server, directory: activeSession.directory }, "", model)
+                tabs.newDraft({ server: route.server ?? server.key, directory: activeSession.directory }, "")
                return
              }

              const activeTab = currentTab()
              if (activeTab?.type === "draft") {
-                const model = tabs.stateValue<PromptSession>(activeTab, "prompt")?.model.current()
-                tabs.newDraft({ server: activeTab.server, directory: activeTab.directory }, "", model)
+                tabs.newDraft({ server: activeTab.server, directory: activeTab.directory }, "")
                return
              }

@@ -1,136 +0,0 @@
-import { For, type JSXElement } from "solid-js"
-import { createStore } from "solid-js/store"
-import { ToolsMenu, ToolsMenuIcon, type ToolsMenuProps, type ToolsMenuStatus, type ToolsMenuTab } from "./tools-menu"
-
-export default {
-  title: "Desktop V2/Tools Menu",
-  id: "desktop-v2-tools-menu",
-  component: ToolsMenu,
-  tags: ["autodocs"],
-  parameters: {
-    docs: {
-      description: {
-        component: `The desktop V2 Tools menu shown in the titlebar. Stories cover every MCP status, both LSP states, populated plugin rows, and empty states for all tabs.`,
-      },
-    },
-  },
-}
-
-const labels = {
-  menu: "Tools",
-  mcp: "MCP",
-  lsp: "LSP",
-  plugins: "Plugins",
-  mcpDescription: "Add MCP servers in opencode.json",
-  lspDescription: "LSPs are auto-detected as you open files",
-  pluginsDescription: "Add plugins in opencode.json",
-  disabled: "Disabled",
-  failed: "Failed",
-  reauthenticate: "Reauthenticate",
-}
-
-const empty = {
-  mcp: "No MCPs configured yet",
-  lsp: "No active language servers yet",
-  plugins: "No plugins configured yet",
-}
-
-const mcp = [
-  { name: "ui-docs", status: "needs_auth" },
-  { name: "browser-tools", status: "needs_client_registration" },
-  { name: "brave-search", status: "disabled" },
-  { name: "fastmail-mcp", status: "connected" },
-  { name: "puppeteer", status: "failed" },
-  { name: "figma", status: "connected" },
-  { name: "playwright", status: "failed" },
-] satisfies Array<{ name: string; status: ToolsMenuStatus }>
-
-const lsp = [
-  { name: "typescript", status: "connected" },
-  { name: "eslint", status: "connected" },
-  { name: "rust-analyzer", status: "error" },
-] satisfies ToolsMenuProps["lsp"]
-
-const plugins = ["opencode-devcontainers", "opencode-daytona", "~/.config/opencode/plugins/ping.ts"]
-
-const populated = {
-  labels,
-  empty,
-  mcp,
-  lsp,
-  plugins,
-} satisfies Omit<ToolsMenuProps, "defaultTab">
-
-function InteractiveMenu() {
-  const [state, setState] = createStore({ mcp: mcp.map((item) => ({ ...item, pending: false })) })
-  return (
-    <MenuPreview warning>
-      <ToolsMenu
-        {...populated}
-        mcp={state.mcp.map((item, index) => ({
-          ...item,
-          onToggle: () => {
-            if (item.status === "needs_auth" || item.status === "needs_client_registration") return
-            setState("mcp", index, "status", item.status === "connected" ? "disabled" : "connected")
-          },
-        }))}
-      />
-    </MenuPreview>
-  )
-}
-
-function MenuPreview(props: { warning?: boolean; children: JSXElement }) {
-  return (
-    <div class="flex flex-col gap-2">
-      <div class="flex h-7 items-center gap-2 text-[11px] font-[530] uppercase tracking-[0.05px] text-v2-text-text-faint">
-        <ToolsMenuIcon warning={props.warning} />
-        {props.warning ? "warning" : "normal"}
-      </div>
-      {props.children}
-    </div>
-  )
-}
-
-function Gallery(props: { empty?: boolean }) {
-  const tabs: ToolsMenuTab[] = ["mcp", "lsp", "plugins"]
-  return (
-    <div class="flex flex-wrap items-start gap-6">
-      <For each={tabs}>
-        {(tab) => (
-          <MenuPreview warning={!props.empty && tab !== "plugins"}>
-            <ToolsMenu
-              {...populated}
-              defaultTab={tab}
-              mcp={props.empty ? [] : populated.mcp}
-              lsp={props.empty ? [] : populated.lsp}
-              plugins={props.empty ? [] : populated.plugins}
-            />
-          </MenuPreview>
-        )}
-      </For>
-    </div>
-  )
-}
-
-export const Interactive = {
-  render: () => <InteractiveMenu />,
-}
-
-export const AllTabs = {
-  name: "All populated tabs",
-  render: () => <Gallery />,
-}
-
-export const EmptyStates = {
-  name: "All empty tabs",
-  render: () => <Gallery empty />,
-}
-
-export const McpPending = {
-  name: "MCP pending toggle",
-  render: () => (
-    <MenuPreview warning>
-      <ToolsMenu {...populated} mcp={populated.mcp.map((item) => ({ ...item, pending: item.name === "figma" }))} />
-    </MenuPreview>
-  ),
-}
@@ -1,202 +0,0 @@
-import { ButtonV2 } from "@opencode-ai/ui/v2/button-v2"
-import { Icon } from "@opencode-ai/ui/v2/icon"
-import { SegmentedControlItemV2, SegmentedControlV2 } from "@opencode-ai/ui/v2/segmented-control-v2"
-import { Switch } from "@opencode-ai/ui/v2/switch-v2"
-import { For, Index, Show, type JSXElement } from "solid-js"
-import { createStore } from "solid-js/store"
-
-export type ToolsMenuTab = "mcp" | "lsp" | "plugins"
-export type ToolsMenuStatus = "connected" | "failed" | "error" | "needs_auth" | "needs_client_registration" | "disabled"
-
-export type ToolsMenuProps = {
-  defaultTab?: ToolsMenuTab
-  labels: {
-    menu: string
-    mcp: string
-    lsp: string
-    plugins: string
-    mcpDescription: string
-    lspDescription: string
-    pluginsDescription: string
-    disabled: string
-    failed: string
-    reauthenticate: string
-  }
-  empty: {
-    mcp: JSXElement
-    lsp: JSXElement
-    plugins: JSXElement
-  }
-  mcp: Array<{
-    name: string
-    status?: ToolsMenuStatus
-    error?: string
-    loading?: boolean
-    pending?: boolean
-    onToggle?: () => void
-  }>
-  lsp: Array<{
-    name: string
-    status: "connected" | "error"
-  }>
-  plugins: string[]
-}
-
-export function ToolsMenuIcon(props: { warning?: boolean }) {
-  return (
-    <div class="relative size-4 text-v2-icon-icon-muted">
-      <Icon name={props.warning ? "tools-warning" : "tools"} />
-      <Show when={props.warning}>
-        <div class="absolute right-0 top-0 size-[5px] rounded-full bg-icon-warning-base" />
-      </Show>
-    </div>
-  )
-}
-
-export function ToolsMenu(props: ToolsMenuProps) {
-  const [state, setState] = createStore({ tab: props.defaultTab ?? ("mcp" as ToolsMenuTab) })
-
-  return (
-    <div class="w-[360px] max-w-[calc(100vw-40px)] rounded-xl bg-v2-background-bg-base p-4 [font-family:var(--v2-font-family-sans)] shadow-[var(--v2-elevation-floating)]">
-      <SegmentedControlV2
-        value={state.tab}
-        onChange={(value) => value && setState("tab", value as ToolsMenuTab)}
-        class="segmented-control-v2--full-width"
-        aria-label={props.labels.menu}
-      >
-        <SegmentedControlItemV2 value="mcp">{props.labels.mcp}</SegmentedControlItemV2>
-        <SegmentedControlItemV2 value="lsp">{props.labels.lsp}</SegmentedControlItemV2>
-        <SegmentedControlItemV2 value="plugins">{props.labels.plugins}</SegmentedControlItemV2>
-      </SegmentedControlV2>
-
-      <Show when={state.tab === "mcp"}>
-        <Show
-          when={props.mcp.length > 0}
-          fallback={<ToolsEmpty title={props.empty.mcp} description={props.labels.mcpDescription} />}
-        >
-          <ToolsList description={props.labels.mcpDescription}>
-            <Index each={props.mcp}>
-              {(item) => (
-                <div class="flex h-8 items-center gap-2 px-2">
-                  <StatusDot status={item().status} />
-                  <span class="min-w-0 flex-1 truncate text-[13px] font-[530] leading-4 tracking-[-0.04px] text-v2-text-text-base">
-                    {item().name}
-                  </span>
-                  <Show
-                    when={item().status === "needs_auth"}
-                    fallback={
-                      <>
-                        <Show when={item().status === "needs_client_registration"}>
-                          <span
-                            class="max-w-40 truncate text-[11px] font-[440] leading-4 tracking-[0.05px] text-v2-text-text-faint"
-                            title={item().error}
-                          >
-                            {item().error ?? props.labels.failed}
-                          </span>
-                        </Show>
-                        <Show when={item().status !== "needs_client_registration"}>
-                          <Show when={item().status === "disabled" || item().status === "failed"}>
-                            <span class="text-[11px] font-[440] capitalize leading-4 tracking-[0.05px] text-v2-text-text-faint">
-                              {item().status === "disabled" ? props.labels.disabled : props.labels.failed}
-                            </span>
-                          </Show>
-                          <Switch
-                            checked={item().status === "connected"}
-                            disabled={item().loading}
-                            hideLabel
-                            onChange={item().onToggle}
-                            readOnly={item().pending}
-                          >
-                            {item().name}
-                          </Switch>
-                        </Show>
-                      </>
-                    }
-                  >
-                    <ButtonV2 size="small" variant="outline" disabled={item().pending} onClick={item().onToggle}>
-                      {props.labels.reauthenticate}
-                    </ButtonV2>
-                  </Show>
-                </div>
-              )}
-            </Index>
-          </ToolsList>
-        </Show>
-      </Show>
-
-      <Show when={state.tab === "lsp"}>
-        <Show
-          when={props.lsp.length > 0}
-          fallback={<ToolsEmpty title={props.empty.lsp} description={props.labels.lspDescription} />}
-        >
-          <ToolsList description={props.labels.lspDescription}>
-            <For each={props.lsp}>
-              {(item) => (
-                <div class="flex h-8 items-center gap-2 px-2">
-                  <StatusDot status={item.status} />
-                  <span class="min-w-0 flex-1 truncate text-[13px] font-[530] leading-4 tracking-[-0.04px] text-v2-text-text-base">
-                    {item.name}
-                  </span>
-                </div>
-              )}
-            </For>
-          </ToolsList>
-        </Show>
-      </Show>
-
-      <Show when={state.tab === "plugins"}>
-        <Show
-          when={props.plugins.length > 0}
-          fallback={<ToolsEmpty title={props.empty.plugins} description={props.labels.pluginsDescription} />}
-        >
-          <ToolsList description={props.labels.pluginsDescription}>
-            <For each={props.plugins}>
-              {(plugin) => (
-                <div class="flex h-8 items-center gap-2 px-2">
-                  <StatusDot status="connected" />
-                  <span class="min-w-0 flex-1 truncate text-[13px] font-[530] leading-4 tracking-[-0.04px] text-v2-text-text-base">
-                    {plugin}
-                  </span>
-                </div>
-              )}
-            </For>
-          </ToolsList>
-        </Show>
-      </Show>
-    </div>
-  )
-}
-
-function ToolsList(props: { description: string; children: JSXElement }) {
-  return (
-    <div class="mt-2 flex flex-col">
-      <div class="flex h-8 items-center px-2 text-[11px] font-[440] leading-4 tracking-[0.05px] text-v2-text-text-faint">
-        {props.description}
-      </div>
-      {props.children}
-    </div>
-  )
-}
-
-function ToolsEmpty(props: { title: JSXElement; description: string }) {
-  return (
-    <div class="mt-4 flex flex-col gap-2 text-center text-[13px] leading-4 tracking-[-0.04px]">
-      <div class="h-4 font-[530] text-v2-text-text-muted">{props.title}</div>
-      <div class="h-4 font-[440] text-v2-text-text-faint">{props.description}</div>
-    </div>
-  )
-}
-
-function StatusDot(props: { status?: ToolsMenuStatus }) {
-  return (
-    <div
-      classList={{
-        "size-1.5 shrink-0 rounded-full": true,
-        "bg-v2-state-fg-success": props.status === "connected",
-        "bg-v2-state-fg-danger": props.status === "failed" || props.status === "error",
-        "bg-v2-state-fg-warning": props.status === "needs_auth" || props.status === "needs_client_registration",
-        "bg-v2-border-border-base": props.status === "disabled",
-      }}
-    />
-  )
-}
@@ -11,7 +11,6 @@ const sessionFields = new Set([
  "session_status",
  "session_working",
  "session_diff",
-  "todo",
  "permission",
  "question",
  "message",
@@ -115,7 +114,6 @@ export const createDirSyncContext = (
        index(sessionID)
      },
      diff: serverSync.session.diff,
-      todo: serverSync.session.todo,
      history: serverSync.session.history,
      evict(sessionID: string) {
        serverSync.session.evict(sessionID)
@@ -7,7 +7,7 @@ describe("file watcher invalidation", () => {
    const refresh: string[] = []
    invalidateFromWatcher(
      {
-        type: "file.watcher.updated",
+        type: "filesystem.changed",
        properties: {
          file: "src/new.ts",
          event: "add",
@@ -32,7 +32,7 @@ describe("file watcher invalidation", () => {

    invalidateFromWatcher(
      {
-        type: "file.watcher.updated",
+        type: "filesystem.changed",
        properties: {
          file: "src/open.ts",
          event: "change",
@@ -63,7 +63,7 @@ describe("file watcher invalidation", () => {

    invalidateFromWatcher(
      {
-        type: "file.watcher.updated",
+        type: "filesystem.changed",
        properties: {
          file: "src",
          event: "change",
@@ -81,7 +81,7 @@ describe("file watcher invalidation", () => {

    invalidateFromWatcher(
      {
-        type: "file.watcher.updated",
+        type: "filesystem.changed",
        properties: {
          file: "src/file.ts",
          event: "change",
@@ -111,7 +111,7 @@ describe("file watcher invalidation", () => {

    invalidateFromWatcher(
      {
-        type: "file.watcher.updated",
+        type: "filesystem.changed",
        properties: {
          file: ".git/index.lock",
          event: "change",
@@ -16,7 +16,7 @@ type WatcherOps = {
 }

 export function invalidateFromWatcher(event: WatcherEvent, ops: WatcherOps) {
-  if (event.type !== "file.watcher.updated") return
+  if (event.type !== "filesystem.changed") 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
@@ -30,7 +30,6 @@ function directoryState() {
      return this.session_status[id]?.type !== "idle"
    },
    session_diff: {},
-    todo: {},
    permission: {},
    question: {},
    mcp_ready: true,
@@ -221,56 +221,4 @@ describe("createChildStoreManager", () => {
      dispose()
    }
  })
-
-  test("keeps non-bootstrapping children passive until a real directory access", () => {
-    let manager: ReturnType<typeof createChildStoreManager> | undefined
-    const offset = querySingles.length
-    const bootstraps: string[] = []
-
-    const dispose = createOwner((owner) => {
-      manager = createChildStoreManager({
-        owner,
-        scope: ServerScope.local,
-        persist,
-        isBooting: () => false,
-        isLoadingSessions: () => false,
-        onBootstrap(directory) {
-          bootstraps.push(directory)
-        },
-        onMcp() {},
-        onDispose() {},
-        translate: (key) => key,
-        queryOptions: queryOptionsApi,
-        global: { provider },
-      })
-    })
-
-    try {
-      if (!manager) throw new Error("manager required")
-      const [store] = manager.child("/project", { bootstrap: false })
-      const queries = querySingles.slice(offset)
-
-      expect(queries).toHaveLength(6)
-      expect(queries[0]?.().enabled).toBe(false)
-      expect(queries[3]?.().enabled).toBe(false)
-      expect(queries[4]?.().enabled).toBe(false)
-      expect(queries[5]?.().enabled).toBe(false)
-      expect(store.path.directory).toBe("/project")
-      expect(store.provider_ready).toBe(false)
-      expect(store.lsp_ready).toBe(false)
-      expect(bootstraps).toEqual([])
-
-      manager.child("/project")
-      expect(queries[0]?.().enabled).toBe(true)
-      expect(queries[3]?.().enabled).toBe(true)
-      expect(queries[4]?.().enabled).toBe(true)
-      expect(queries[5]?.().enabled).toBe(true)
-      expect(bootstraps).toEqual(["/project"])
-
-      manager.child("/project", { bootstrap: false })
-      expect(queries[0]?.().enabled).toBe(true)
-    } finally {
-      dispose()
-    }
-  })
 })
@@ -45,8 +45,6 @@ export function createChildStoreManager(input: {
  const disposers = new Map<string, () => void>()
  const mcpDirectories = new Set<string>()
  const mcpToggles = new Map<string, (enabled: boolean) => void>()
-  const activeDirectories = new Set<string>()
-  const activationToggles = new Map<string, (enabled: boolean) => void>()

  const markKey = (key: DirectoryKey) => {
    if (!key) return
@@ -120,8 +118,6 @@ export function createChildStoreManager(input: {
    lifecycle.delete(key)
    mcpDirectories.delete(key)
    mcpToggles.delete(key)
-    activeDirectories.delete(key)
-    activationToggles.delete(key)
    const dispose = disposers.get(key)
    if (dispose) {
      dispose()
@@ -186,27 +182,20 @@ export function createChildStoreManager(input: {
          const initialMeta = meta[0].value
          const initialIcon = icon[0].value
          const [mcpEnabled, setMcpEnabled] = createSignal(false)
-          const [instanceQueriesEnabled, setInstanceQueriesEnabled] = createSignal(false)

-          const pathQuery = useQuery(() => ({ ...input.queryOptions.path(key), enabled: instanceQueriesEnabled() }))
+          const pathQuery = useQuery(() => input.queryOptions.path(key))
          const mcpQuery = useQuery(() => ({ ...input.queryOptions.mcp(key), enabled: mcpEnabled() }))
          const mcpResourceQuery = useQuery(() => ({ ...input.queryOptions.mcpResources(key), enabled: mcpEnabled() }))
-          const lspQuery = useQuery(() => ({ ...input.queryOptions.lsp(key), enabled: instanceQueriesEnabled() }))
-          const providerQuery = useQuery(() => ({
-            ...input.queryOptions.providers(key),
-            enabled: instanceQueriesEnabled(),
-          }))
-          const referenceQuery = useQuery(() => ({
-            ...input.queryOptions.references(key),
-            enabled: instanceQueriesEnabled(),
-          }))
+          const lspQuery = useQuery(() => input.queryOptions.lsp(key))
+          const providerQuery = useQuery(() => input.queryOptions.providers(key))
+          const referenceQuery = useQuery(() => input.queryOptions.references(key))

          const child = createStore<State>({
            project: "",
            projectMeta: initialMeta,
            icon: initialIcon,
            get provider_ready() {
-              return instanceQueriesEnabled() && !providerQuery.isLoading
+              return !providerQuery.isLoading
            },
            get provider() {
              const EMPTY = { all: new Map(), connected: [], default: {} }
@@ -234,7 +223,6 @@ export function createChildStoreManager(input: {
              return (type ?? "idle") !== "idle"
            },
            session_diff: {},
-            todo: {},
            permission: {},
            question: {},
            get mcp_ready() {
@@ -247,7 +235,7 @@ export function createChildStoreManager(input: {
              return mcpResourceQuery.isLoading ? {} : (mcpResourceQuery.data ?? {})
            },
            get lsp_ready() {
-              return instanceQueriesEnabled() && !lspQuery.isLoading
+              return !lspQuery.isLoading
            },
            get lsp() {
              return lspQuery.isLoading ? [] : (lspQuery.data ?? [])
@@ -261,7 +249,6 @@ export function createChildStoreManager(input: {
          children[key] = child
          disposers.set(key, dispose)
          mcpToggles.set(key, setMcpEnabled)
-          activationToggles.set(key, setInstanceQueriesEnabled)

          const onPersistedInit = (init: Promise<string> | string | null, run: () => void) => {
            if (!(init instanceof Promise)) return
@@ -302,7 +289,6 @@ export function createChildStoreManager(input: {
    pinForOwner(key)
    if (options.mcp) enableMcp(directory, key, childStore)
    const shouldBootstrap = options.bootstrap ?? true
-    if (shouldBootstrap) activate(key)
    if (shouldBootstrap && childStore[0].status === "loading") {
      input.onBootstrap(directory)
    }
@@ -314,7 +300,6 @@ export function createChildStoreManager(input: {
    const childStore = ensureChild(directory)
    if (options.mcp) enableMcp(directory, key, childStore)
    const shouldBootstrap = options.bootstrap ?? true
-    if (shouldBootstrap) activate(key)
    if (shouldBootstrap && childStore[0].status === "loading") {
      input.onBootstrap(directory)
    }
@@ -328,16 +313,6 @@ export function createChildStoreManager(input: {
    if (childStore[0].status !== "loading") input.onMcp(directory, childStore[1])
  }

-  // Passive Home/project metadata reads must not initialize the directory.
-  // A real directory access enables these queries once for the store lifetime.
-  // TODO(v2): After Home switches to v2.project.list and root-filtered,
-  // updated-time v2.session.list, remove any Home-only passive child creation.
-  function activate(key: DirectoryKey) {
-    if (activeDirectories.has(key)) return
-    activeDirectories.add(key)
-    activationToggles.get(key)?.(true)
-  }
-
  function disableMcp(directory: string) {
    const key = directoryKey(directory)
    if (!mcpDirectories.delete(key)) return
@@ -384,7 +359,6 @@ export function createChildStoreManager(input: {
    unpin,
    pinned,
    mcp: (directory: string) => mcpDirectories.has(directoryKey(directory)),
-    active: (directory: string) => activeDirectories.has(directoryKey(directory)),
    disableMcp,
    disposeDirectory,
    runEviction,
@@ -72,7 +72,6 @@ const baseState = (input: Partial<State> = {}) =>
    sessionTotal: 0,
    session_status: {},
    session_diff: {},
-    todo: {},
    permission: {},
    question: {},
    mcp: {},
@@ -216,7 +215,6 @@ describe("applyDirectoryEvent", () => {
        message: { ses_1: [message] },
        part: { [message.id]: [textPart("prt_1", "ses_1", message.id)] },
        session_diff: { ses_1: [] },
-        todo: { ses_1: [] },
        permission: { ses_1: [] },
        question: { ses_1: [] },
        session_status: { ses_1: { type: "busy" } },
@@ -237,28 +235,11 @@ describe("applyDirectoryEvent", () => {
    expect(store.message.ses_1).toBeUndefined()
    expect(store.part[message.id]).toBeUndefined()
    expect(store.session_diff.ses_1).toBeUndefined()
-    expect(store.todo.ses_1).toBeUndefined()
    expect(store.permission.ses_1).toBeUndefined()
    expect(store.question.ses_1).toBeUndefined()
    expect(store.session_status.ses_1).toBeUndefined()
  })

-  test("ignores an archived session absent from a passive directory store", () => {
-    const [store, setStore] = createStore(baseState({ session: [], sessionTotal: 0 }))
-
-    applyDirectoryEvent({
-      event: { type: "session.updated", properties: { info: rootSession({ id: "missing", archived: 10 }) } },
-      store,
-      setStore,
-      push() {},
-      directory: "/tmp",
-      loadLsp() {},
-    })
-
-    expect(store.session).toEqual([])
-    expect(store.sessionTotal).toBe(0)
-  })
-
  test("cleans session caches when deleted and decrements only root totals", () => {
    const cases = [
      { info: rootSession({ id: "ses_1" }), expectedTotal: 1 },
@@ -278,7 +259,6 @@ describe("applyDirectoryEvent", () => {
          message: { [item.info.id]: [message] },
          part: { [message.id]: [textPart("prt_1", item.info.id, message.id)] },
          session_diff: { [item.info.id]: [] },
-          todo: { [item.info.id]: [] },
          permission: { [item.info.id]: [] },
          question: { [item.info.id]: [] },
          session_status: { [item.info.id]: { type: "busy" } },
@@ -299,7 +279,6 @@ describe("applyDirectoryEvent", () => {
      expect(store.message[item.info.id]).toBeUndefined()
      expect(store.part[message.id]).toBeUndefined()
      expect(store.session_diff[item.info.id]).toBeUndefined()
-      expect(store.todo[item.info.id]).toBeUndefined()
      expect(store.permission[item.info.id]).toBeUndefined()
      expect(store.question[item.info.id]).toBeUndefined()
      expect(store.session_status[item.info.id]).toBeUndefined()
@@ -310,7 +289,6 @@ describe("applyDirectoryEvent", () => {
    const dropped = rootSession({ id: "ses_b" })
    const kept = rootSession({ id: "ses_a" })
    const message = userMessage("msg_1", dropped.id)
-    const todos: string[] = []
    const [store, setStore] = createStore(
      baseState({
        limit: 1,
@@ -318,7 +296,6 @@ describe("applyDirectoryEvent", () => {
        message: { [dropped.id]: [message] },
        part: { [message.id]: [textPart("prt_1", dropped.id, message.id)] },
        session_diff: { [dropped.id]: [] },
-        todo: { [dropped.id]: [] },
        permission: { [dropped.id]: [] },
        question: { [dropped.id]: [] },
        session_status: { [dropped.id]: { type: "busy" } },
@@ -332,21 +309,15 @@ describe("applyDirectoryEvent", () => {
      push() {},
      directory: "/tmp",
      loadLsp() {},
-      setSessionTodo(sessionID, value) {
-        if (value !== undefined) return
-        todos.push(sessionID)
-      },
    })

    expect(store.session.map((x) => x.id)).toEqual([kept.id])
    expect(store.message[dropped.id]).toBeUndefined()
    expect(store.part[message.id]).toBeUndefined()
    expect(store.session_diff[dropped.id]).toBeUndefined()
-    expect(store.todo[dropped.id]).toBeUndefined()
    expect(store.permission[dropped.id]).toBeUndefined()
    expect(store.question[dropped.id]).toBeUndefined()
    expect(store.session_status[dropped.id]).toBeUndefined()
-    expect(todos).toEqual([dropped.id])
  })

  test("cleanupDroppedSessionCaches clears part-only orphan state", () => {
@@ -8,8 +8,7 @@ import type {
  QuestionRequest,
  Session,
  SessionStatus,
-  SnapshotFileDiff,
-  Todo,
+  FileDiffInfo,
 } from "@opencode-ai/sdk/v2/client"
 import type { State, VcsCache } from "./types"
 import { trimSessions } from "./session-trim"
@@ -19,7 +18,6 @@ import { diffs as list, message as clean } from "@/utils/diffs"
 const SKIP_PARTS = new Set(["patch", "step-start", "step-finish"])
 const SESSION_CONTENT_EVENTS = new Set([
  "session.diff",
-  "todo.updated",
  "session.status",
  "message.updated",
  "message.removed",
@@ -62,13 +60,8 @@ export function applyGlobalEvent(input: {
  )
 }

-function cleanupSessionCaches(
-  setStore: SetStoreFunction<State>,
-  sessionID: string,
-  setSessionTodo?: (sessionID: string, todos: Todo[] | undefined) => void,
-) {
+function cleanupSessionCaches(setStore: SetStoreFunction<State>, sessionID: string) {
  if (!sessionID) return
-  setSessionTodo?.(sessionID, undefined)
  setStore(
    produce((draft) => {
      dropSessionCaches(draft, [sessionID])
@@ -76,17 +69,11 @@ function cleanupSessionCaches(
  )
 }

-export function cleanupDroppedSessionCaches(
-  store: Store<State>,
-  setStore: SetStoreFunction<State>,
-  next: Session[],
-  setSessionTodo?: (sessionID: string, todos: Todo[] | undefined) => void,
-) {
+export function cleanupDroppedSessionCaches(store: Store<State>, setStore: SetStoreFunction<State>, next: Session[]) {
  const keep = new Set(next.map((item) => item.id))
  const stale = [
    ...Object.keys(store.message),
    ...Object.keys(store.session_diff),
-    ...Object.keys(store.todo),
    ...Object.keys(store.permission),
    ...Object.keys(store.question),
    ...Object.keys(store.session_status),
@@ -95,9 +82,6 @@ export function cleanupDroppedSessionCaches(
      .filter((sessionID): sessionID is string => !!sessionID),
  ].filter((sessionID, index, list) => !keep.has(sessionID) && list.indexOf(sessionID) === index)
  if (stale.length === 0) return
-  for (const sessionID of stale) {
-    setSessionTodo?.(sessionID, undefined)
-  }
  setStore(
    produce((draft) => {
      dropSessionCaches(draft, stale)
@@ -114,7 +98,6 @@ export function applyDirectoryEvent(input: {
  loadLsp: () => void
  loadReferences?: () => void
  vcsCache?: VcsCache
-  setSessionTodo?: (sessionID: string, todos: Todo[] | undefined) => void
  retainedLimit?: number
  sessionContent?: boolean
  permission?: State["permission"]
@@ -138,7 +121,7 @@ export function applyDirectoryEvent(input: {
      next.splice(result.index, 0, info)
      const trimmed = trimSessions(next, { limit, permission: input.permission ?? input.store.permission })
      input.setStore("session", reconcile(trimmed, { key: "id" }))
-      cleanupDroppedSessionCaches(input.store, input.setStore, trimmed, input.setSessionTodo)
+      cleanupDroppedSessionCaches(input.store, input.setStore, trimmed)
      if (!info.parentID) input.setStore("sessionTotal", (value) => value + 1)
      break
    }
@@ -146,15 +129,16 @@ export function applyDirectoryEvent(input: {
      const info = (event.properties as { info: Session }).info
      const result = Binary.search(input.store.session, info.id, (s) => s.id)
      if (info.time.archived) {
-        if (!result.found) break
        if (input.store.session[result.index]!.time.archived === info.time.archived) break
-        input.setStore(
-          "session",
-          produce((draft) => {
-            draft.splice(result.index, 1)
-          }),
-        )
-        cleanupSessionCaches(input.setStore, info.id, input.setSessionTodo)
+        if (result.found) {
+          input.setStore(
+            "session",
+            produce((draft) => {
+              draft.splice(result.index, 1)
+            }),
+          )
+        }
+        cleanupSessionCaches(input.setStore, info.id)
        if (info.parentID) break
        input.setStore("sessionTotal", (value) => Math.max(0, value - 1))
        break
@@ -167,7 +151,7 @@ export function applyDirectoryEvent(input: {
      next.splice(result.index, 0, info)
      const trimmed = trimSessions(next, { limit, permission: input.permission ?? input.store.permission })
      input.setStore("session", reconcile(trimmed, { key: "id" }))
-      cleanupDroppedSessionCaches(input.store, input.setStore, trimmed, input.setSessionTodo)
+      cleanupDroppedSessionCaches(input.store, input.setStore, trimmed)
      break
    }
    case "session.deleted": {
@@ -181,22 +165,16 @@ export function applyDirectoryEvent(input: {
          }),
        )
      }
-      cleanupSessionCaches(input.setStore, info.id, input.setSessionTodo)
+      cleanupSessionCaches(input.setStore, info.id)
      if (info.parentID) break
      input.setStore("sessionTotal", (value) => Math.max(0, value - 1))
      break
    }
    case "session.diff": {
-      const props = event.properties as { sessionID: string; diff: SnapshotFileDiff[] }
+      const props = event.properties as { sessionID: string; diff: FileDiffInfo[] }
      input.setStore("session_diff", props.sessionID, reconcile(list(props.diff), { key: "file" }))
      break
    }
-    case "todo.updated": {
-      const props = event.properties as { sessionID: string; todos: Todo[] }
-      input.setStore("todo", props.sessionID, reconcile(props.todos, { key: "id" }))
-      input.setSessionTodo?.(props.sessionID, props.todos)
-      break
-    }
    case "session.status": {
      const props = event.properties as { sessionID: string; status: SessionStatus }
      input.setStore("session_status", props.sessionID, reconcile(props.status))
@@ -1,144 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import {
-  applyHomeSessionEvent,
-  appendHomeSessionEvent,
-  HOME_V2_SESSION_PAGE_LIMIT,
-  loadHomeSessionIndex,
-  homeSessionIndexSessions,
-  homeSessionIndexRefresh,
-  parseHomeSessionIndex,
-  retainHomeSessions,
-} from "./home-session-index"
-
-const session = (input: {
-  id: string
-  directory?: string
-  parentID?: string
-  archived?: number
-  updated?: number
-}) => ({
-  id: input.id,
-  parentID: input.parentID,
-  projectID: "project",
-  cost: 0,
-  tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
-  time: { created: 1, updated: input.updated ?? 1, archived: input.archived },
-  title: input.id,
-  location: { directory: input.directory ?? "/project" },
-})
-
-describe("Home V2 session index", () => {
-  test("loads the Home index with one global V2 request", async () => {
-    const calls: unknown[] = []
-    const result = await loadHomeSessionIndex(async (input) => {
-      calls.push(input)
-      return { data: { data: [session({ id: "root" })], cursor: {} } }
-    })
-
-    expect(result.sessions).toHaveLength(1)
-    expect(calls).toEqual([{ limit: HOME_V2_SESSION_PAGE_LIMIT, order: "desc" }])
-  })
-
-  test("loads subsequent pages until the session index is complete", async () => {
-    const calls: unknown[] = []
-    const controller = new AbortController()
-    const result = await loadHomeSessionIndex(
-      async (input, options) => {
-        calls.push({ input, signal: options.signal })
-        if (!("cursor" in input)) {
-          return {
-            data: {
-              data: Array.from({ length: HOME_V2_SESSION_PAGE_LIMIT }, (_, index) =>
-                session({ id: `page-1-${index}` }),
-              ),
-              cursor: { next: "next-page" },
-            },
-          }
-        }
-        return { data: { data: [session({ id: "page-2" })], cursor: {} } }
-      },
-      0,
-      controller.signal,
-    )
-
-    expect(result.sessions).toHaveLength(HOME_V2_SESSION_PAGE_LIMIT + 1)
-    expect(calls).toEqual([
-      { input: { limit: HOME_V2_SESSION_PAGE_LIMIT, order: "desc" }, signal: controller.signal },
-      {
-        input: { limit: HOME_V2_SESSION_PAGE_LIMIT, order: "desc", cursor: "next-page" },
-        signal: controller.signal,
-      },
-    ])
-  })
-
-  test("maps visible roots to Home session summaries", () => {
-    const result = parseHomeSessionIndex([
-      session({ id: "root", updated: 30 }),
-      session({ id: "child", parentID: "root", updated: 40 }),
-      session({ id: "archived", archived: 50, updated: 50 }),
-    ])
-
-    expect(result).toEqual([
-      expect.objectContaining({
-        id: "root",
-        slug: "root",
-        version: "",
-        directory: "/project",
-        projectID: "project",
-        title: "root",
-        time: { created: 1, updated: 30 },
-      }),
-    ])
-  })
-
-  test("preserves the per-directory Home retention limit", () => {
-    const now = 10 * 60 * 60 * 1000
-    const sessions = Array.from({ length: 80 }, (_, index) => ({
-      ...parseHomeSessionIndex([session({ id: `session-${index}`, updated: index + 1 })])[0],
-      directory: index % 2 === 0 ? "/one" : "/two",
-    }))
-
-    const retained = retainHomeSessions(sessions, 10, now)
-    expect(retained.filter((item) => item.directory === "/one")).toHaveLength(10)
-    expect(retained.filter((item) => item.directory === "/two")).toHaveLength(10)
-  })
-
-  test("replays session events over the loaded index", () => {
-    const initial = parseHomeSessionIndex([session({ id: "old" })])
-    const created = { ...initial[0], id: "new", slug: "new", title: "new", time: { created: 2, updated: 2 } }
-
-    const afterCreate = applyHomeSessionEvent(initial, {
-      type: "session.created",
-      properties: { sessionID: created.id, info: created },
-    })
-    expect(
-      applyHomeSessionEvent(afterCreate, {
-        type: "session.deleted",
-        properties: { sessionID: initial[0]!.id, info: initial[0]! },
-      }),
-    ).toEqual([created])
-  })
-
-  test("applies only events newer than the index baseline", () => {
-    const initial = parseHomeSessionIndex([session({ id: "old" })])
-    const stale = { ...initial[0], title: "stale" }
-    const current = { ...initial[0], title: "current" }
-    const first = appendHomeSessionEvent(undefined, {
-      type: "session.updated",
-      properties: { sessionID: stale.id, info: stale },
-    })
-    const events = appendHomeSessionEvent(first, {
-      type: "session.updated",
-      properties: { sessionID: current.id, info: current },
-    })
-
-    expect(homeSessionIndexSessions({ sessions: initial, eventSequence: 1 }, events)[0]?.title).toBe("current")
-  })
-
-  test("refetches after reconnect, disposal, and session moves", () => {
-    expect(homeSessionIndexRefresh("server.connected", false)).toEqual({ connected: true, refetch: false })
-    expect(homeSessionIndexRefresh("server.connected", true)).toEqual({ connected: true, refetch: true })
-    expect(homeSessionIndexRefresh("global.disposed", true).refetch).toBe(true)
-    expect(homeSessionIndexRefresh("session.next.moved", true).refetch).toBe(true)
-  })
-})
@@ -1,174 +0,0 @@
-import type { Event, Session, SessionV2Info, V2SessionListResponse } from "@opencode-ai/sdk/v2/client"
-import type { QueryClient } from "@tanstack/solid-query"
-import { trimSessions } from "./session-trim"
-import { pathKey } from "@/utils/path-key"
-
-export const HOME_V2_SESSION_PAGE_LIMIT = 5_000
-
-export type HomeSessionEvent = {
-  type: "session.created" | "session.updated" | "session.deleted"
-  properties: { sessionID: string; info: Session }
-}
-export type HomeSessionEvents = {
-  sequence: number
-  entries: Array<{ sequence: number; event: HomeSessionEvent }>
-}
-export type HomeSessionIndex = {
-  sessions: Session[]
-  eventSequence: number
-}
-
-export const homeSessionIndexKey = (server: string) => ["home", "session-index", server] as const
-export const homeSessionEventsKey = (server: string) => ["home", "session-events", server] as const
-
-type HomeSessionPage = { data?: V2SessionListResponse }
-
-export async function loadHomeSessionIndex(
-  list: (
-    input: { limit: number; order: "desc"; cursor?: string },
-    options: { signal?: AbortSignal },
-  ) => Promise<HomeSessionPage>,
-  eventSequence = 0,
-  signal?: AbortSignal,
-) {
-  const data: SessionV2Info[] = []
-  let cursor: string | undefined
-
-  for (;;) {
-    const response = await list(
-      {
-        limit: HOME_V2_SESSION_PAGE_LIMIT,
-        order: "desc",
-        ...(cursor ? { cursor } : {}),
-      },
-      { signal },
-    )
-    const page = response.data!
-    data.push(...page.data)
-    if (page.data.length < HOME_V2_SESSION_PAGE_LIMIT || !page.cursor.next)
-      return { sessions: parseHomeSessionIndex(data), eventSequence }
-    cursor = page.cursor.next
-  }
-}
-
-export function appendHomeSessionEvent(current: HomeSessionEvents | undefined, event: HomeSessionEvent) {
-  const sequence = (current?.sequence ?? 0) + 1
-  return {
-    sequence,
-    entries: [...(current?.entries ?? []), { sequence, event }],
-  }
-}
-
-export function trimHomeSessionEvents(current: HomeSessionEvents | undefined, sequence: number): HomeSessionEvents {
-  return {
-    sequence: current?.sequence ?? sequence,
-    entries: (current?.entries ?? []).filter((entry) => entry.sequence > sequence),
-  }
-}
-
-export function homeSessionIndexSessions(index: HomeSessionIndex | undefined, events: HomeSessionEvents | undefined) {
-  if (!index) return []
-  return (events?.entries ?? [])
-    .filter((entry) => entry.sequence > index.eventSequence)
-    .reduce((sessions, entry) => applyHomeSessionEvent(sessions, entry.event), index.sessions)
-}
-
-export function homeSessionIndexRefresh(event: Event["type"], connected: boolean) {
-  if (event === "server.connected") return { connected: true, refetch: connected }
-  return {
-    connected,
-    refetch: event === "global.disposed" || event === "session.next.moved",
-  }
-}
-
-export function createHomeSessionIndexCache(queryClient: QueryClient, server: string) {
-  const indexKey = homeSessionIndexKey(server)
-  const eventsKey = homeSessionEventsKey(server)
-  let connected = false
-
-  return {
-    indexKey,
-    eventsKey,
-    eventSequence() {
-      return queryClient.getQueryData<HomeSessionEvents>(eventsKey)?.sequence ?? 0
-    },
-    complete(sequence: number) {
-      // Keep events received after the fetch began so its response cannot overwrite them.
-      queryClient.setQueryData<HomeSessionEvents>(eventsKey, (current) => trimHomeSessionEvents(current, sequence))
-    },
-    sessions(index: HomeSessionIndex | undefined, events: HomeSessionEvents | undefined) {
-      return homeSessionIndexSessions(index, events)
-    },
-    apply(event: HomeSessionEvent) {
-      if (!queryClient.getQueryState(indexKey)) return
-      const next = appendHomeSessionEvent(queryClient.getQueryData<HomeSessionEvents>(eventsKey), event)
-      if (queryClient.isFetching({ queryKey: indexKey, exact: true }) > 0) {
-        queryClient.setQueryData(eventsKey, next)
-        return
-      }
-
-      const index = queryClient.getQueryData<HomeSessionIndex>(indexKey)
-      if (index) {
-        queryClient.setQueryData<HomeSessionIndex>(indexKey, {
-          sessions: homeSessionIndexSessions(index, next),
-          eventSequence: next.sequence,
-        })
-      }
-      queryClient.setQueryData<HomeSessionEvents>(eventsKey, { sequence: next.sequence, entries: [] })
-    },
-    refresh(event: Event["type"]) {
-      const result = homeSessionIndexRefresh(event, connected)
-      connected = result.connected
-      if (!result.refetch) return
-      void queryClient.refetchQueries({ queryKey: indexKey, exact: true, type: "active" })
-    },
-  }
-}
-
-// TODO(v2): This deliberately dumb full-table scan is necessary because the
-// current V2 API orders by creation time and cannot filter roots, archives, or
-// multiple directories. A bounded page could omit an old session updated today.
-// Once released, use client.v2.project.list() and client.v2.session.list({
-// parentID: null, order: "desc" }), then remove this adapter and its V1 fields.
-export function parseHomeSessionIndex(sessions: SessionV2Info[]): Session[] {
-  return sessions.flatMap((item) => {
-    if (item.parentID || item.time.archived !== undefined) return []
-    return [toLegacySummary(item)]
-  })
-}
-
-export function retainHomeSessions(sessions: Session[], limit: number, now: number) {
-  const grouped = Map.groupBy(sessions, (session) => pathKey(session.directory))
-  return [...grouped.values()].flatMap((items) => trimSessions(items, { limit, permission: {}, now }))
-}
-
-export function applyHomeSessionEvent(sessions: Session[], event: HomeSessionEvent) {
-  const info = event.properties.info
-  const index = sessions.findIndex((session) => session.id === info.id)
-  if (event.type === "session.deleted" || info.parentID || info.time.archived !== undefined) {
-    if (index === -1) return sessions
-    return sessions.toSpliced(index, 1)
-  }
-  if (event.type !== "session.created" && event.type !== "session.updated") return sessions
-  if (index === -1) return [...sessions, info]
-  return sessions.with(index, info)
-}
-
-function toLegacySummary(session: SessionV2Info): Session {
-  return {
-    id: session.id,
-    slug: session.id,
-    projectID: session.projectID,
-    workspaceID: session.location.workspaceID,
-    directory: session.location.directory,
-    path: session.subpath,
-    parentID: session.parentID,
-    cost: session.cost,
-    tokens: session.tokens,
-    title: session.title,
-    agent: session.agent,
-    model: session.model,
-    version: "",
-    time: session.time,
-  }
-}
@@ -5,8 +5,7 @@ import type {
  PermissionRequest,
  QuestionRequest,
  SessionStatus,
-  SnapshotFileDiff,
-  Todo,
+  FileDiffInfo,
 } from "@opencode-ai/sdk/v2/client"
 import { dropSessionCaches, pickSessionCacheEvictions } from "./session-cache"

@@ -33,8 +32,7 @@ describe("app session cache", () => {
  test("dropSessionCaches clears orphaned parts without message rows", () => {
    const store: {
      session_status: Record<string, SessionStatus | undefined>
-      session_diff: Record<string, SnapshotFileDiff[] | undefined>
-      todo: Record<string, Todo[] | undefined>
+      session_diff: Record<string, FileDiffInfo[] | undefined>
      message: Record<string, Message[] | undefined>
      part: Record<string, Part[] | undefined>
      permission: Record<string, PermissionRequest[] | undefined>
@@ -43,7 +41,6 @@ describe("app session cache", () => {
    } = {
      session_status: { ses_1: { type: "busy" } as SessionStatus },
      session_diff: { ses_1: [] },
-      todo: { ses_1: [] as Todo[] },
      message: {},
      part: { msg_1: [part("prt_1", "ses_1", "msg_1")] },
      permission: { ses_1: [] as PermissionRequest[] },
@@ -56,7 +53,6 @@ describe("app session cache", () => {
    expect(store.message.ses_1).toBeUndefined()
    expect(store.part.msg_1).toBeUndefined()
    expect(store.part_text_accum_delta.prt_1).toBeUndefined()
-    expect(store.todo.ses_1).toBeUndefined()
    expect(store.session_diff.ses_1).toBeUndefined()
    expect(store.session_status.ses_1).toBeUndefined()
    expect(store.permission.ses_1).toBeUndefined()
@@ -67,8 +63,7 @@ describe("app session cache", () => {
    const m = msg("msg_1", "ses_1")
    const store: {
      session_status: Record<string, SessionStatus | undefined>
-      session_diff: Record<string, SnapshotFileDiff[] | undefined>
-      todo: Record<string, Todo[] | undefined>
+      session_diff: Record<string, FileDiffInfo[] | undefined>
      message: Record<string, Message[] | undefined>
      part: Record<string, Part[] | undefined>
      permission: Record<string, PermissionRequest[] | undefined>
@@ -77,7 +72,6 @@ describe("app session cache", () => {
    } = {
      session_status: {},
      session_diff: {},
-      todo: {},
      message: { ses_1: [m] },
      part: { [m.id]: [part("prt_1", "ses_1", m.id)] },
      permission: {},
@@ -4,16 +4,14 @@ import type {
  PermissionRequest,
  QuestionRequest,
  SessionStatus,
-  SnapshotFileDiff,
-  Todo,
+  FileDiffInfo,
 } from "@opencode-ai/sdk/v2/client"

 export const SESSION_CACHE_LIMIT = 40

 type SessionCache = {
  session_status: Record<string, SessionStatus | undefined>
-  session_diff: Record<string, SnapshotFileDiff[] | undefined>
-  todo: Record<string, Todo[] | undefined>
+  session_diff: Record<string, FileDiffInfo[] | undefined>
  message: Record<string, Message[] | undefined>
  part: Record<string, Part[] | undefined>
  permission: Record<string, PermissionRequest[] | undefined>
@@ -36,7 +34,6 @@ export function dropSessionCaches(store: SessionCache, sessionIDs: Iterable<stri

  for (const sessionID of stale) {
    delete store.message[sessionID]
-    delete store.todo[sessionID]
    delete store.session_diff[sessionID]
    delete store.session_status[sessionID]
    delete store.permission[sessionID]
@@ -13,8 +13,7 @@ import type {
  ReferenceInfo,
  Session,
  SessionStatus,
-  SnapshotFileDiff,
-  Todo,
+  FileDiffInfo,
  VcsInfo,
 } from "@opencode-ai/sdk/v2/client"
 import { NormalizedProviderListResponse } from "@opencode-ai/session-ui/context"
@@ -51,10 +50,7 @@ export type State = {
  }
  session_working(id: string): boolean
  session_diff: {
-    [sessionID: string]: SnapshotFileDiff[]
-  }
-  todo: {
-    [sessionID: string]: Todo[]
+    [sessionID: string]: FileDiffInfo[]
  }
  permission: {
    [sessionID: string]: PermissionRequest[]
@@ -47,20 +47,12 @@ export function getAvatarColors(key?: string) {
 }

 export function getProjectAvatarVariant(key?: string): ProjectAvatarVariant {
+  if (key === "orange") return "orange"
+  if (key === "pink") return "pink"
+  if (key === "cyan") return "cyan"
+  if (key === "purple") return "purple"
  if (key === "mint") return "cyan"
  if (key === "lime") return "green"
-  if (
-    key === "orange" ||
-    key === "yellow" ||
-    key === "cyan" ||
-    key === "green" ||
-    key === "red" ||
-    key === "pink" ||
-    key === "blue" ||
-    key === "purple" ||
-    key === "gray"
-  )
-    return key
  return "gray"
 }

@@ -71,7 +63,6 @@ type SessionView = {
  reviewFile?: string
  pendingMessage?: string
  pendingMessageAt?: number
-  todoCollapsed?: boolean
 }

 type TabHandoff = {
@@ -850,18 +841,6 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
          setScroll(tab: string, pos: SessionScroll) {
            scroll.setScroll(key(), tab, pos)
          },
-          todoCollapsed: {
-            get: () => s().todoCollapsed ?? false,
-            set(collapsed: boolean) {
-              const session = key()
-              const current = store.sessionView[session]
-              if (!current) {
-                setStore("sessionView", session, { scroll: {}, todoCollapsed: collapsed })
-              } else {
-                setStore("sessionView", session, "todoCollapsed", collapsed)
-              }
-            },
-          },
          terminal: {
            opened: terminalOpened,
            open() {
@@ -67,7 +67,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
    const list = createMemo(() => sync().data.agent.filter((item) => item.mode !== "subagent" && !item.hidden))
    const connected = createMemo(() => new Set(providers.connected().map((item) => item.id)))

-    const [saved, setSaved, , savedReady] = persisted(
+    const [saved, setSaved] = persisted(
      {
        ...Persist.serverWorkspace(serverSDK().scope, sdk().directory, "model-selection", ["model-selection.v1"]),
        migrate,
@@ -375,12 +375,11 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
      model,
      agent,
      session: {
-        ready: savedReady,
        reset() {
          setStore({ draft: undefined, promoting: undefined })
        },
-        promote(dir: string, session: string, state?: State) {
-          const next = clone(state ?? snapshot())
+        promote(dir: string, session: string) {
+          const next = clone(snapshot())
          if (!next) return
          const key = handoffKey(serverSDK().scope, dir, session)
          handoff.set(key, next)
@@ -410,5 +409,3 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
    return result
  },
 })
-
-export type ModelSelection = ReturnType<typeof useLocal>["model"]
@@ -37,9 +37,6 @@ type PlatformBase = {
  /** Open a local path in a local app (desktop only) */
  openPath?(path: string, app?: string): Promise<void>

-  /** Reveal a local path in the system file manager; false when the path does not exist (desktop only) */
-  revealPath?(path: string): Promise<boolean>
-
  /** Restart the app  */
  restart(): Promise<void>

@@ -1,29 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { createRoot } from "solid-js"
-import { createPromptState, DEFAULT_PROMPT } from "./prompt-state"
-
-describe("prompt state initialization", () => {
-  test("initializes prompt text, cursor, and model together", () => {
-    createRoot((dispose) => {
-      const model = { providerID: "anthropic", modelID: "claude", variant: "high" }
-      const prompt = createPromptState({ prompt: "hello", model })
-
-      expect(prompt.current()).toEqual([{ type: "text", content: "hello", start: 0, end: 5 }])
-      expect(prompt.cursor()).toBe(5)
-      expect(prompt.model.current()).toEqual(model)
-      expect(prompt.model.current()).not.toBe(model)
-      dispose()
-    })
-  })
-
-  test("uses the default prompt without initial values", () => {
-    createRoot((dispose) => {
-      const prompt = createPromptState()
-
-      expect(prompt.current()).toEqual(DEFAULT_PROMPT)
-      expect(prompt.cursor()).toBeUndefined()
-      expect(prompt.model.current()).toBeUndefined()
-      dispose()
-    })
-  })
-})
@@ -1,265 +0,0 @@
-import { checksum } from "@opencode-ai/core/util/encode"
-import type { FilePartSource } from "@opencode-ai/sdk/v2/client"
-import { batch, createMemo, type Accessor } from "solid-js"
-import { createStore, type SetStoreFunction } from "solid-js/store"
-import type { FileSelection } from "@/context/file"
-import { Persist, persisted } from "@/utils/persist"
-import type { ServerScope } from "@/utils/server-scope"
-
-interface PartBase {
-  content: string
-  start: number
-  end: number
-}
-
-export interface TextPart extends PartBase {
-  type: "text"
-}
-
-export interface FileAttachmentPart extends PartBase {
-  type: "file"
-  path: string
-  selection?: FileSelection
-  mime?: string
-  filename?: string
-  url?: string
-  source?: FilePartSource
-}
-
-export interface AgentPart extends PartBase {
-  type: "agent"
-  name: string
-}
-
-export interface ImageAttachmentPart {
-  type: "image"
-  id: string
-  filename: string
-  sourcePath?: string
-  mime: string
-  dataUrl: string
-}
-
-export type ContentPart = TextPart | FileAttachmentPart | AgentPart | ImageAttachmentPart
-export type Prompt = ContentPart[]
-
-export type PromptModel = {
-  providerID: string
-  modelID: string
-  variant?: string | null
-}
-
-export type FileContextItem = {
-  type: "file"
-  path: string
-  selection?: FileSelection
-  comment?: string
-  commentID?: string
-  commentOrigin?: "review" | "file"
-  preview?: string
-}
-
-export type ContextItem = FileContextItem
-export type PromptScope = { draftID: string } | { dir: string; id?: string }
-
-export const DEFAULT_PROMPT: Prompt = [{ type: "text", content: "", start: 0, end: 0 }]
-
-type PromptStore = {
-  prompt: Prompt
-  cursor?: number
-  model?: PromptModel
-  context: {
-    items: (ContextItem & { key: string })[]
-  }
-}
-
-type InitialPrompt = {
-  prompt?: string
-  model?: PromptModel
-}
-
-function isSelectionEqual(a?: FileSelection, b?: FileSelection) {
-  if (!a && !b) return true
-  if (!a || !b) return false
-  return (
-    a.startLine === b.startLine && a.startChar === b.startChar && a.endLine === b.endLine && a.endChar === b.endChar
-  )
-}
-
-function isPartEqual(partA: ContentPart, partB: ContentPart) {
-  switch (partA.type) {
-    case "text":
-      return partB.type === "text" && partA.content === partB.content
-    case "file":
-      return (
-        partB.type === "file" &&
-        partA.path === partB.path &&
-        partA.mime === partB.mime &&
-        partA.filename === partB.filename &&
-        isSelectionEqual(partA.selection, partB.selection)
-      )
-    case "agent":
-      return partB.type === "agent" && partA.name === partB.name
-    case "image":
-      return partB.type === "image" && partA.id === partB.id
-  }
-}
-
-export function isPromptEqual(promptA: Prompt, promptB: Prompt): boolean {
-  if (promptA.length !== promptB.length) return false
-  for (let i = 0; i < promptA.length; i++) {
-    if (!isPartEqual(promptA[i], promptB[i])) return false
-  }
-  return true
-}
-
-function cloneSelection(selection?: FileSelection) {
-  if (!selection) return undefined
-  return { ...selection }
-}
-
-function clonePart(part: ContentPart): ContentPart {
-  if (part.type === "text") return { ...part }
-  if (part.type === "image") return { ...part }
-  if (part.type === "agent") return { ...part }
-  return {
-    ...part,
-    selection: cloneSelection(part.selection),
-  }
-}
-
-function clonePrompt(prompt: Prompt): Prompt {
-  return prompt.map(clonePart)
-}
-
-function contextItemKey(item: ContextItem) {
-  if (item.type !== "file") return item.type
-  const start = item.selection?.startLine
-  const end = item.selection?.endLine
-  const key = `${item.type}:${item.path}:${start}:${end}`
-
-  if (item.commentID) return `${key}:c=${item.commentID}`
-  const comment = item.comment?.trim()
-  if (!comment) return key
-  const digest = checksum(comment) ?? comment
-  return `${key}:c=${digest.slice(0, 8)}`
-}
-
-export function isCommentItem(item: ContextItem | (ContextItem & { key: string })) {
-  return item.type === "file" && !!item.comment?.trim()
-}
-
-function createPromptActions(setStore: SetStoreFunction<PromptStore>) {
-  return {
-    set(prompt: Prompt, cursorPosition?: number) {
-      const next = clonePrompt(prompt)
-      batch(() => {
-        setStore("prompt", next)
-        if (cursorPosition !== undefined) setStore("cursor", cursorPosition)
-      })
-    },
-    reset() {
-      batch(() => {
-        setStore("prompt", clonePrompt(DEFAULT_PROMPT))
-        setStore("cursor", 0)
-      })
-    },
-  }
-}
-
-function promptTarget(serverScope: ServerScope, scope: PromptScope) {
-  if ("draftID" in scope) return Persist.draft(scope.draftID, "prompt")
-  const legacy = `${scope.dir}/prompt${scope.id ? "/" + scope.id : ""}.v2`
-  return Persist.serverScoped(serverScope, scope.dir, scope.id, "prompt", [legacy])
-}
-
-function promptStore(initial?: InitialPrompt): PromptStore {
-  const text = initial?.prompt
-  return {
-    prompt:
-      text === undefined ? clonePrompt(DEFAULT_PROMPT) : [{ type: "text", content: text, start: 0, end: text.length }],
-    cursor: text === undefined ? undefined : text.length,
-    model: initial?.model ? { ...initial.model } : undefined,
-    context: {
-      items: [],
-    },
-  }
-}
-
-function createPromptStateValue(store: PromptStore, setStore: SetStoreFunction<PromptStore>) {
-  const actions = createPromptActions(setStore)
-  const value = {
-    current: () => store.prompt,
-    cursor: createMemo(() => store.cursor),
-    dirty: () => !isPromptEqual(store.prompt, DEFAULT_PROMPT),
-    model: {
-      current: () => store.model,
-      set: (model: PromptModel | undefined) => setStore("model", model),
-    },
-    context: {
-      items: createMemo(() => store.context.items),
-      add(item: ContextItem) {
-        const key = contextItemKey(item)
-        if (store.context.items.find((x) => x.key === key)) return
-        setStore("context", "items", (items) => [...items, { key, ...item }])
-      },
-      remove(key: string) {
-        setStore("context", "items", (items) => items.filter((x) => x.key !== key))
-      },
-      removeComment(path: string, commentID: string) {
-        setStore("context", "items", (items) =>
-          items.filter((item) => !(item.type === "file" && item.path === path && item.commentID === commentID)),
-        )
-      },
-      updateComment(path: string, commentID: string, next: Partial<FileContextItem> & { comment?: string }) {
-        setStore("context", "items", (items) =>
-          items.map((item) => {
-            if (item.type !== "file" || item.path !== path || item.commentID !== commentID) return item
-            const value = { ...item, ...next }
-            return { ...value, key: contextItemKey(value) }
-          }),
-        )
-      },
-      replaceComments(items: FileContextItem[]) {
-        setStore("context", "items", (current) => [
-          ...current.filter((item) => !isCommentItem(item)),
-          ...items.map((item) => ({ ...item, key: contextItemKey(item) })),
-        ])
-      },
-    },
-    set: actions.set,
-    reset: actions.reset,
-    capture: () => value,
-  }
-  return value
-}
-
-function createPersistedPrompt(target: ReturnType<typeof promptTarget>, initial?: InitialPrompt) {
-  const [store, setStore, _, ready] = persisted(target, createStore<PromptStore>(promptStore(initial)))
-  return { ready, ...createPromptStateValue(store, setStore) }
-}
-
-export function createPromptSession(serverScope: ServerScope, scope: PromptScope, initial?: InitialPrompt) {
-  return createPersistedPrompt(promptTarget(serverScope, scope), initial)
-}
-
-export function createDraftPromptSession(draftID: string, initial?: InitialPrompt) {
-  return createPersistedPrompt(Persist.draft(draftID, "prompt"), initial)
-}
-
-export type PromptSession = ReturnType<typeof createPromptSession>
-
-export function createPromptReady(session: Accessor<PromptSession>) {
-  return Object.defineProperty(() => session().ready(), "promise", {
-    get: () => session().ready.promise,
-  }) as (() => boolean) & { readonly promise: Promise<unknown> | undefined }
-}
-
-export function createPromptState(initial?: InitialPrompt) {
-  const [store, setStore] = createStore<PromptStore>(promptStore(initial))
-  const ready = Object.assign(() => true, { promise: Promise.resolve(true) })
-  return {
-    ready,
-    ...createPromptStateValue(store, setStore),
-  }
-}
--- a/Show More
+++ b/Show More