fix(tui): clarify session move copy

bun.lock

@@ -53,7 +53,7 @@
     },
     "packages/app": {
       "name": "@opencode-ai/app",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@corvu/drawer": "catalog:",
         "@dnd-kit/abstract": "0.5.0",
@@ -119,7 +119,7 @@
     },
     "packages/cli": {
       "name": "@opencode-ai/cli",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "bin": {
         "opencode2": "./bin/opencode2.cjs",
       },
@@ -179,7 +179,7 @@
     },
     "packages/codemode": {
       "name": "@opencode-ai/codemode",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "acorn": "8.15.0",
         "effect": "catalog:",
@@ -193,7 +193,7 @@
     },
     "packages/console/app": {
       "name": "@opencode-ai/console-app",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@cloudflare/vite-plugin": "1.15.2",
         "@ibm/plex": "6.4.1",
@@ -229,7 +229,7 @@
     },
     "packages/console/core": {
       "name": "@opencode-ai/console-core",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@aws-sdk/client-sts": "3.782.0",
         "@jsx-email/render": "1.1.1",
@@ -256,7 +256,7 @@
     },
     "packages/console/function": {
       "name": "@opencode-ai/console-function",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@ai-sdk/anthropic": "3.0.82",
         "@ai-sdk/openai": "3.0.48",
@@ -278,7 +278,7 @@
     },
     "packages/console/mail": {
       "name": "@opencode-ai/console-mail",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@jsx-email/all": "2.2.3",
         "@jsx-email/cli": "1.4.3",
@@ -302,7 +302,7 @@
     },
     "packages/console/support": {
       "name": "@opencode-ai/console-support",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@cloudflare/vite-plugin": "1.15.2",
         "@opencode-ai/console-core": "workspace:*",
@@ -322,7 +322,7 @@
     },
     "packages/core": {
       "name": "@opencode-ai/core",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "bin": {
         "opencode": "./bin/opencode",
       },
@@ -418,7 +418,7 @@
     },
     "packages/desktop": {
       "name": "@opencode-ai/desktop",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@zip.js/zip.js": "2.7.62",
         "effect": "catalog:",
@@ -478,7 +478,7 @@
     },
     "packages/effect-drizzle-sqlite": {
       "name": "@opencode-ai/effect-drizzle-sqlite",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "drizzle-orm": "catalog:",
         "effect": "catalog:",
@@ -492,7 +492,7 @@
     },
     "packages/effect-sqlite-node": {
       "name": "@opencode-ai/effect-sqlite-node",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "effect": "catalog:",
       },
@@ -504,7 +504,7 @@
     },
     "packages/enterprise": {
       "name": "@opencode-ai/enterprise",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@hono/standard-validator": "catalog:",
         "@opencode-ai/core": "workspace:*",
@@ -536,7 +536,7 @@
     },
     "packages/function": {
       "name": "@opencode-ai/function",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@octokit/auth-app": "8.0.1",
         "@octokit/rest": "catalog:",
@@ -552,7 +552,7 @@
     },
     "packages/http-recorder": {
       "name": "@opencode-ai/http-recorder",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@effect/platform-node-shared": "4.0.0-beta.83",
       },
@@ -584,7 +584,7 @@
     },
     "packages/opencode": {
       "name": "opencode",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "bin": {
         "opencode": "./bin/opencode",
       },
@@ -717,7 +717,7 @@
     },
     "packages/plugin": {
       "name": "@opencode-ai/plugin",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@ai-sdk/provider": "3.0.8",
         "@opencode-ai/ai": "workspace:*",
@@ -806,7 +806,7 @@
     },
     "packages/sdk/js": {
       "name": "@opencode-ai/sdk",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "cross-spawn": "catalog:",
       },
@@ -821,7 +821,7 @@
     },
     "packages/server": {
       "name": "@opencode-ai/server",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@effect/platform-node": "catalog:",
         "@opencode-ai/core": "workspace:*",
@@ -838,7 +838,7 @@
     },
     "packages/session-ui": {
       "name": "@opencode-ai/session-ui",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@kobalte/core": "catalog:",
         "@opencode-ai/core": "workspace:*",
@@ -899,7 +899,7 @@
     },
     "packages/slack": {
       "name": "@opencode-ai/slack",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@opencode-ai/sdk": "workspace:*",
         "@slack/bolt": "^3.17.1",
@@ -912,7 +912,7 @@
     },
     "packages/stats/app": {
       "name": "@opencode-ai/stats-app",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@ibm/plex": "6.4.1",
         "@kobalte/core": "catalog:",
@@ -946,7 +946,7 @@
     },
     "packages/stats/core": {
       "name": "@opencode-ai/stats-core",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@aws-sdk/client-athena": "3.933.0",
         "@planetscale/database": "1.19.0",
@@ -965,7 +965,7 @@
     },
     "packages/stats/server": {
       "name": "@opencode-ai/stats-server",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@aws-sdk/client-firehose": "3.933.0",
         "@effect/platform-node": "catalog:",
@@ -1006,7 +1006,7 @@
     },
     "packages/tui": {
       "name": "@opencode-ai/tui",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@opencode-ai/client": "workspace:*",
         "@opencode-ai/core": "workspace:*",
@@ -1036,7 +1036,7 @@
     },
     "packages/ui": {
       "name": "@opencode-ai/ui",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@kobalte/core": "catalog:",
         "@pierre/diffs": "catalog:",
@@ -1087,7 +1087,7 @@
     },
     "packages/web": {
       "name": "@opencode-ai/web",
-      "version": "1.18.3",
+      "version": "1.18.2",
       "dependencies": {
         "@astrojs/cloudflare": "12.6.3",
         "@astrojs/markdown-remark": "6.3.1",

docs/design/app-v2-api-migration.md

@@ -1,428 +0,0 @@
-# V2 Desktop and Web API Migration
-
-## Decision
-
-Desktop and web should move from the legacy `@opencode-ai/sdk` transport to
-`@opencode-ai/client` and the standalone V2 server. Metadata, lifecycle,
-location, integration, and project-copy state should use V2 models directly.
-
-The existing app timeline should remain on its V1 `Message` and `Part` shape
-during this migration. A narrow app-side compatibility projection should map
-V2 session messages and events into that shape. This is not runtime V1 support:
-the app will call only V2 endpoints, and the standalone server will expose only
-V2 APIs. The compatibility boundary exists solely to avoid rewriting the mature
-timeline and message-part UI at the same time as the transport migration.
-
-The migration is larger than changing HTTP paths. The important contract
-changes are:
-
-- A prompt is durable asynchronous admission, not a request that returns a
-  completed assistant message.
-- Session messages are V2 projections on the wire. The app adapter projects
-  them into a legacy message plus parts without treating that shape as durable
-  server state.
-- The global event stream carries `{ type, data, location }`, not
-  `{ directory, payload: { type, properties } }`.
-- Location is explicit on requests and session placement is durable.
-- Most mutations return `204`; read responses use `{ data }`, pagination uses
-  `{ data, cursor }`, and location reads use `{ location, data }`.
-- Provider authentication is integration and credential management.
-- Revert is a staged operation.
-
-This document compares the 125 legacy endpoints in `packages/opencode` with the
-105 endpoints assembled by `packages/protocol/src/api.ts`. The standalone V2
-server mounts the latter through `packages/server/src/routes.ts`.
-
-## Current Architecture
-
-The browser and desktop renderer both use `packages/app`. The app currently:
-
-- creates `@opencode-ai/sdk/v2/client` clients in
-  `packages/app/src/utils/server.ts`;
-- creates implicit directory-scoped clients in
-  `packages/app/src/context/server-sdk.tsx`;
-- consumes the legacy `/global/event` envelope;
-- stores legacy `Session`, `Message`, and `Part` values in
-  `packages/app/src/context/server-session.ts` and global sync;
-- submits with `/session/:id/prompt_async` and observes legacy message-part
-  events.
-
-The `v2` import path in `@opencode-ai/sdk` is the generated client for the V1
-server API. It is not the client for the V2 architecture. The V2 Promise client
-is exported by `@opencode-ai/client` from `packages/client/src/promise`.
-
-Desktop embeds the same app but starts the V1 backend:
-
-- `packages/desktop/electron.vite.config.ts` bundles
-  `packages/opencode/dist/node/node.js`;
-- `packages/desktop/src/main/sidecar.ts` calls legacy `Server.listen`;
-- `packages/desktop/src/main/server.ts` probes `/global/health`.
-
-The V2 process entry is `packages/server/src/process.ts`. It requires a
-password, exposes `/api/health`, and returns an address plus a shutdown effect.
-
-## Complete Endpoint Comparison
-
-The tables group every public endpoint by domain. `Direct` means the app can
-adopt the V2 operation after request and response shape changes. `Redesign`
-means the user workflow exists but its semantics or state model changed.
-`Gap` means V2 has no corresponding operation and a product or protocol
-decision is required.
-
-### Server, Configuration, and Discovery
-
-| V1 endpoints | V2 endpoints | Result |
-| --- | --- | --- |
-| `GET /global/health` | `GET /api/health` | Direct. V2 adds `pid`. |
-| `POST /global/dispose`, `POST /instance/dispose` | `POST /api/service/stop` | Redesign. V2 stops a managed instance by `instanceID`; it does not expose location disposal as an app command. |
-| `POST /global/upgrade` | None | Gap. Desktop updater should own application upgrades; remote server upgrade needs a separate decision. |
-| `GET/PATCH /global/config`, `GET/PATCH /config` | None | Gap. Configuration editing is used throughout settings and provider UI. Add a V2 config group or remove those controls. |
-| `GET /path` | `GET /api/location` | Redesign. V2 returns placement identity, not host config/state/home paths. |
-| None | `GET /api/server` | New. Returns advertised server URLs. |
-| None | `GET/DELETE /api/debug/location` | New diagnostics; not an app bootstrap dependency. |
-| `POST /log` | None | Gap. Client telemetry should use its own transport rather than a compatibility route. |
-
-### Catalog, Providers, and Integrations
-
-| V1 endpoints | V2 endpoints | Result |
-| --- | --- | --- |
-| `GET /agent` | `GET /api/agent` | Direct. |
-| `GET /command` | `GET /api/command` | Direct. |
-| `GET /skill` | `GET /api/skill` | Direct. |
-| None | `GET /api/plugin`, `GET /api/reference` | New catalogs. |
-| `GET /provider`, `GET /config/providers` | `GET /api/provider`, `GET /api/provider/:providerID`, `GET /api/model`, `GET /api/model/default` | Redesign around separate provider and model catalogs. |
-| `GET /provider/auth`, `POST /provider/:id/oauth/authorize`, `POST /provider/:id/oauth/callback`, `PUT/DELETE /auth/:id` | Integration and credential routes below | Redesign. Do not carry legacy auth calls forward. |
-| None | `GET /api/integration`, `GET /api/integration/:id` | New integration catalog and connection state. |
-| None | `POST /api/experimental/integration/wellknown` | New discovery operation. |
-| None | `POST /api/integration/:id/connect/key` | Replaces direct API-key storage. |
-| None | `POST /api/integration/:id/connect/oauth`, `GET/DELETE /api/integration/:id/connect/oauth/:attemptID`, `POST /api/integration/:id/connect/oauth/:attemptID/complete` | Replaces legacy OAuth with explicit attempts. |
-| None | `POST /api/integration/:id/connect/command`, `GET/DELETE /api/integration/:id/connect/command/:attemptID` | New command-based connection flow. |
-| None | `PATCH/DELETE /api/credential/:credentialID` | New credential lifecycle. |
-| None | `POST /api/generate` | New stateless generation endpoint. |
-
-### Projects, Copies, Workspaces, and Sync
-
-| V1 endpoints | V2 endpoints | Result |
-| --- | --- | --- |
-| `GET /project`, `GET /project/current`, `GET /project/:id/directories` | Same operations under `/api` | Direct, with V2 response shapes and explicit location. |
-| `PATCH /project/:id` | None | Gap. The app edits project name and icon. Add project metadata mutation if this remains a server-owned feature. |
-| `POST /project/git/init` | None | Gap. Add a VCS initialization operation or remove the action. |
-| `POST /experimental/project/:id/copy/generate-name` | None | Gap. Name generation can be client-side or a separate generation request. |
-| `GET/POST/DELETE /experimental/worktree`, `POST /experimental/worktree/reset` | Project-copy routes below | Redesign around project copies and strategies. |
-| None | `POST/DELETE /experimental/project/:id/copy`, `POST /experimental/project/:id/copy/refresh` | New project-copy model. These are currently missing the `/api` prefix and must be fixed before cutover. |
-| All seven `/experimental/workspace*` endpoints | None | Gap by design unless remote workspace placement remains a product requirement. |
-| All four `/sync/*` endpoints | Native V2 durable storage and location | Remove. These are V1 synchronization internals, not client API equivalents. |
-| `POST /experimental/control-plane/move-session` | `POST /api/session/:id/move` | Direct at the session API level. |
-
-### Sessions and Messages
-
-| V1 endpoints | V2 endpoints | Result |
-| --- | --- | --- |
-| `GET /session` | `GET /api/session` | Direct with cursor pagination and different filters. |
-| `GET /session/status` | `GET /api/session/active` | Redesign. V2 reports process-local active drains, not a status for every session. Idle state comes from projection and events. |
-| `GET /session/:id` | `GET /api/session/:id` | Direct. |
-| `GET /session/:id/children` | `GET /api/session?parentID=...` | Direct through list filtering. |
-| `POST /session` | `POST /api/session` | Direct; pass durable location, agent, and model. |
-| `DELETE /session/:id` | `DELETE /api/session/:id` | Direct; V2 also removes children. |
-| `PATCH /session/:id` | `POST /api/session/:id/rename`, `/agent`, `/model`, `/move` | Redesign. Metadata, permission, and archive mutation have no equivalent. |
-| `POST /session/:id/fork` | `POST /api/session/:id/fork` | Direct. |
-| `POST /session/:id/abort` | `POST /api/session/:id/interrupt` | Redesign. Interrupt is an idle-safe, process-local operation returning `204`. |
-| `POST /session/:id/init` | None | Gap. Remove AGENTS generation or add it as a named V2 command/workflow. |
-| `POST/DELETE /session/:id/share` | None | Gap. Sharing needs a V2 design rather than retaining V1 session mutation. |
-| `POST /session/:id/summarize` | `POST /api/session/:id/compact` | Redesign around durable compaction. |
-| `POST /session/:id/message`, `POST /session/:id/prompt_async` | `POST /api/session/:id/prompt` | Redesign. V2 returns admitted pending input; completion is observed asynchronously. |
-| `POST /session/:id/command` | `POST /api/session/:id/command` | Redesign request fields and delivery semantics. |
-| `POST /session/:id/shell` | `POST /api/session/:id/shell` | Redesign. V2 emits shell lifecycle events and returns `204`. |
-| None | `POST /api/session/:id/skill`, `/synthetic`, `/background`, `/wait` | New session operations. |
-| `POST /session/:id/revert`, `/unrevert` | `POST /api/session/:id/revert/stage`, `/clear`, `/commit` | Redesign the undo UI around staged revert. |
-| `GET /session/:id/message` | `GET /api/session/:id/message` | Redesign around `SessionMessage.Info[]` and body cursors. |
-| `GET /session/:id/message/:messageID` | Same operation under `/api` | Direct after adopting V2 message types. |
-| `DELETE /session/:id/message/:messageID`, `DELETE/PATCH .../part/:partID` | None | Remove. V2 projections are not directly mutable transcript storage. |
-| `GET /session/:id/diff` | `GET /api/vcs/diff` only | Gap. Decide whether the review UI needs a session-scoped derived diff endpoint. |
-| None | `GET /api/session/:id/context`, `/pending` | New projection and inbox reads. |
-| None | `GET/PUT/DELETE /api/session/:id/instructions/entries[/key]` | New durable instruction entries. |
-| None | `GET /api/experimental/session/:id/log` | New durable event log for diagnostics/recovery views. |
-
-### Permission, Question, and Form
-
-| V1 endpoints | V2 endpoints | Result |
-| --- | --- | --- |
-| `GET /permission` | `GET /api/permission/request` | Direct for cross-location bootstrap. |
-| Deprecated `POST /session/:id/permissions/:permissionID` and `POST /permission/:requestID/reply` | `POST /api/session/:id/permission/:requestID/reply` | Redesign around current replies and required session identity. |
-| None | `POST/GET /api/session/:id/permission`, `GET .../:requestID` | New session-scoped request API. |
-| None | `GET /api/permission/saved`, `DELETE /api/permission/saved/:id` | New saved decisions. |
-| `GET /question`, `POST /question/:id/reply`, `POST /question/:id/reject` | `GET /api/question/request`, `GET /api/session/:id/question`, session-scoped reply/reject | Direct after adding session identity and new types. |
-| None | `GET /api/form/request`, all six `/api/session/:id/form*` operations | New structured interaction surface. |
-
-### Filesystem and VCS
-
-| V1 endpoints | V2 endpoints | Result |
-| --- | --- | --- |
-| `GET /file` | `GET /api/fs/list` | Direct with new entry types. |
-| `GET /file/content` | `GET /api/fs/read/*` | Redesign. V2 returns bytes; the app must decode text and model binary/media content. |
-| `GET /find/file` | `GET /api/fs/find` | Direct with a unified entry result. |
-| `GET /find`, `GET /find/symbol` | None | Gap. Add text/symbol search only if required by current UI. |
-| `GET /file/status` | `GET /api/vcs/status` | Direct. |
-| `GET /vcs/status`, `GET /vcs/diff` | Same operations under `/api` | Direct. |
-| `GET /vcs`, `GET /vcs/diff/raw`, `POST /vcs/apply` | None | Gap. Branch display, raw patch, and apply actions need explicit V2 endpoints or removal. |
-| `GET /lsp`, `GET /formatter` | None | Gap. Status UI must be removed or supported by new read models. |
-
-### PTY and Shell
-
-| V1 endpoints | V2 endpoints | Result |
-| --- | --- | --- |
-| `GET/POST /pty`, `GET/PUT/DELETE /pty/:id` | Same operations under `/api` | Direct with explicit location and location envelopes. |
-| `POST /pty/:id/connect-token`, `GET /pty/:id/connect` | Same operations under `/api` | Direct. Require ticket flow and remove legacy query-auth fallback. |
-| `GET /pty/shells` | None | Gap. Use a client default shell or add server shell discovery. |
-| None | `GET/POST /api/shell`, `GET /api/shell/:id`, `PATCH .../timeout`, `GET .../output`, `DELETE .../:id` | New background noninteractive shell API. |
-
-### MCP, Events, and Experimental Controls
-
-| V1 endpoints | V2 endpoints | Result |
-| --- | --- | --- |
-| `GET /mcp` | `GET /api/mcp` | Redesign around server catalog values rather than a status map. |
-| `GET /experimental/resource` | `GET /api/mcp/resource` | Direct with a location envelope. |
-| The seven V1 MCP add/connect/disconnect/auth endpoints | None | Redesign through integrations. Add MCP-specific mutations only for behavior integrations cannot represent. |
-| `GET /global/event`, `GET /event` | `GET /api/event` | Redesign event routing and reducers. V2 intentionally uses one global cross-location stream. |
-| All twelve `/tui/*` endpoints | None | Remove from desktop/web scope. They are TUI remote-control APIs. |
-| `/experimental/capabilities`, `/console*`, `/tool*`, global experimental session/background endpoints | Session background and catalog APIs where applicable | Remove or redesign per feature. These are not general app bootstrap contracts. |
-
-## Required Protocol Work Before Cutover
-
-The app cannot reach feature parity against the current V2 surface. Resolve
-these items before switching production desktop/web:
-
-1. Add V2 configuration read/update operations, or deliberately remove server
-   configuration editing from the app.
-2. Decide whether project metadata mutation and git initialization remain app
-   features; add narrow V2 operations if they do.
-3. Decide archive semantics. Do not encode archive as a hidden compatibility
-   field on session rename.
-4. Decide whether sharing is part of V2. Remove the UI until a V2 sharing model
-   exists.
-5. Decide whether session-derived diffs are required. VCS working-tree diff is
-   not equivalent to a session range diff.
-6. Decide whether branch, LSP, formatter, text-search, symbol-search, and shell
-   discovery status remain visible in the app.
-7. Move project-copy routes from `/experimental/project/...` to
-   `/api/experimental/project/...`. They are currently the only V2 group outside
-   the V2 namespace and are normalized as legacy routes by the combined server.
-
-Missing features should be removed or implemented as native V2 contracts. They
-should not be routed through `packages/opencode`, which is V1 reference code.
-
-## Application Design
-
-### Client and Location
-
-Replace `@opencode-ai/sdk` for runtime calls with `@opencode-ai/client` in
-`packages/app`. `createSdkForServer` should construct the generated Promise
-client with the existing Basic authorization and platform fetch behavior. Keep
-the V1 session types as a type-only compatibility dependency while the existing
-timeline consumes them.
-
-Keep one server client. Replace implicit directory clients with a small
-application context containing:
-
-```ts
-{
-  client: OpenCodeClient
-  location: Location.Ref
-}
-```
-
-Every location-scoped call should pass that location. Session-scoped calls use
-the session's durable placement and should not infer placement from the active
-route after creation.
-
-### Event Stream
-
-Subscribe with `client.event.subscribe()`. Route an event to location state by
-`event.location?.directory`, with a separate global channel when location is
-absent. Preserve the current bounded UI batching and reconnect behavior, but
-remove conversion to legacy `payload.properties`.
-
-Metadata reducers should consume V2 definitions directly. Transcript events
-should go through the timeline adapter, which updates its V1-shaped projection
-from session step, text, reasoning, tool, input, retry, compaction, and
-execution events. Do not manufacture legacy `message.*` events and feed them
-back through the old reducer; apply the V2 event once at the compatibility
-boundary and replace only the affected projected message and parts.
-
-The live stream is lossy across disconnects. On reconnect, reload active
-session projections and request lists rather than assuming event replay. The
-durable experimental session log is useful for diagnostics but should not be a
-hidden replacement for projection reads.
-
-### Session Store and Timeline
-
-Keep the legacy normalized `Message` and `Part` stores and existing timeline
-components. Add the compatibility boundary at
-`packages/app/src/context/v2/session-timeline-adapter.ts`. Paging should call the
-V2 message endpoint with body cursors, then replace the adapter from the returned
-`SessionMessage.Info[]` projection.
-
-The adapter should expose a complete projection for one session:
-
-```ts
-type LegacyTimelineProjection = {
-  messages: Message[]
-  parts: Record<string, Part[]>
-  status: SessionStatus
-  notices: SessionMessageInfo[]
-}
-
-type TimelineAdapter = {
-  replace(messages: readonly SessionMessageInfo[]): LegacyTimelineProjection
-  apply(event: OpenCodeEvent): LegacyTimelineProjection
-  sourceMessageID(legacyID: string): string | undefined
-  legacyMessageID(sourceID: string): string | undefined
-  reset(): void
-}
-```
-
-Use `packages/core/src/session/message-updater.ts` as the authoritative event
-fold and `packages/tui/src/context/data.tsx` as the browser-side live-update
-reference. There is currently no reusable V2-to-V1 converter.
-
-Projection rules:
-
-- Preserve V2 user and assistant IDs where doing so does not violate app
-  ordering assumptions. Map user text, files, and agents to the corresponding
-  V1 parts.
-- Map assistant text and reasoning content to V1 text and reasoning parts. V2
-  content has no part ID, so derive a stable part ID from source message ID and
-  absolute content index.
-- Map V2 tool `streaming`, `running`, `completed`, and `error` states to V1
-  `pending`, `running`, `completed`, and `error`. Preserve the V2 tool ID as the
-  V1 `callID`; derive the V1 part ID independently.
-- Serialize textual tool content into V1 output and map file content to
-  attachments. Preserve structured values and V2-only state under compatibility
-  metadata only when an existing component needs it.
-- Map V2 retry state to a V1 retry part and retry session status. Map assistant
-  errors to the closest V1 error type while retaining the source error type.
-- Map V2 compaction to a synthetic V1 user message with a compaction part so the
-  existing divider remains intact.
-- Keep agent/model switches as adapter selection state. Do not fabricate false
-  user turns for them.
-- Keep synthetic, system, skill, and shell messages in `notices` until a narrow
-  display mapping is defined. Fabricating user messages for them would corrupt
-  assistant parent and turn semantics.
-
-The conversion is intentionally lossy for historical path, parent identity,
-structured tool result values, and some provider error details. These fields do
-not have V2 equivalents. Defaults should be isolated in the adapter and tested,
-not spread through timeline components.
-
-V2 projection order is authoritative and is not guaranteed to match message ID
-order. Queued input may be promoted after a later steer, and compaction may
-reuse an admitted ID. `server-session.ts` currently uses sorted-ID binary
-searches, so it must preserve array order independently of IDs. If a generated
-legacy ID is needed, retain a bidirectional source-ID map for fork, revert, deep
-links, and optimistic reconciliation.
-
-With this boundary, most files under
-`packages/app/src/pages/session/timeline/` and the legacy message-part renderers
-can remain unchanged. Necessary changes are concentrated in:
-
-- `packages/app/src/context/server-session.ts`;
-- `packages/app/src/context/global-sync/event-reducer.ts`;
-- `packages/app/src/context/global-sync/types.ts` for V2 session metadata while
-  retaining V1 transcript types;
-- `packages/app/src/context/server-sdk.tsx`;
-- `packages/app/src/context/sync.tsx`.
-
-### Prompt and Execution
-
-Build V2 prompt input as text plus file and agent attachments. Map the existing
-steer/queue UI directly to `delivery`. Use `session.prompt` for admission and
-observe execution through projection/events. Use `session.interrupt`, staged
-revert operations, and `session.compact` for their corresponding controls.
-
-The app must not wait for prompt HTTP completion to obtain the assistant
-message. An optional `session.wait` is suitable for explicit blocking workflows,
-not the interactive composer.
-
-### Integrations and Requests
-
-Rebuild provider settings around integration connection methods and credential
-records. Migrate permission and question bootstrap to cross-location request
-lists, while replies use session-scoped endpoints. Add form handling as a new
-request-dock type rather than forcing forms into question types.
-
-### Files and Terminals
-
-Decode `fs.read` bytes according to the UI use case and preserve binary/media
-detection in one application boundary. Move terminal HTTP and WebSocket paths
-to `/api/pty`, pass nested location query values, and require connect tickets.
-
-## Desktop Design
-
-Desktop should bundle a V2 entry that runs `ServerProcess.start`, not the V1
-`Server.listen`. The sidecar needs a narrow Promise-facing wrapper that:
-
-1. builds and runs the Effect server layer in the worker;
-2. reports ready only after `ServerProcess.start` returns its bound address;
-3. retains the running fiber/scope for shutdown;
-4. passes the existing password, loopback hostname, selected port, and desktop
-   origin CORS policy;
-5. preserves the existing sidecar worker isolation and crash reporting.
-
-Then update desktop health checks to `/api/health`. The renderer remains a
-normal authenticated HTTP client and does not need a new preload API.
-
-Likely files:
-
-- `packages/desktop/electron.vite.config.ts`;
-- `packages/desktop/src/main/env.d.ts`;
-- `packages/desktop/src/main/sidecar.ts`;
-- `packages/desktop/src/main/server.ts`;
-- `packages/desktop/package.json`.
-
-The standalone server currently receives CORS through its route construction,
-so the wrapper must verify `oc://renderer` is accepted before replacing the V1
-sidecar.
-
-## Migration Sequence
-
-1. Resolve the protocol gaps required for the retained product scope, fix the
-   project-copy namespace, and regenerate `packages/client`.
-2. Add V2 client construction, explicit location context, `/api/health`, and the
-   native event subscription behind a development-only entry point.
-3. Add the V2-to-V1 timeline adapter, switch transcript paging and live events
-   to V2, and retain the existing timeline renderers. Record the required
-   production timeline benchmark baseline before this step and compare it
-   afterward.
-4. Migrate prompt, command, shell, interrupt, compact, fork, revert, permission,
-   question, and form workflows.
-5. Migrate filesystem, VCS, PTY, projects, project copies, catalogs, integrations,
-   and credentials.
-6. Switch desktop packaging and lifecycle to the V2 server process.
-7. Remove runtime `@opencode-ai/sdk` calls, V1 event handling, directory-scoped
-   SDK clients, fallback endpoint probes, and unsupported V1-only UI. Retain
-   only the type-level V1 transcript compatibility surface used by the adapter.
-8. Remove transitional V1 event definitions from the V2 public event manifest
-   after all current consumers stop depending on them, then regenerate clients.
-
-This order isolates the deliberate V1 timeline shape behind one V2 projection
-boundary. Transcript and event conversion is the highest-risk work and should
-land before the broad set of mechanical endpoint migrations.
-
-## Verification
-
-Each migration slice should verify:
-
-- generated Promise client request and response types;
-- app typecheck and focused state/timeline tests;
-- event reconnect followed by projection reconciliation;
-- simultaneous sessions in different locations;
-- prompt steer, queue, interrupt, retry, tool, permission, question, and form
-  flows;
-- PTY ticket connection and reconnect;
-- desktop worker startup, authenticated `/api/health`, graceful shutdown, and
-  crash recovery;
-- browser and desktop behavior on both mobile-sized and desktop viewports.
-
-Run package checks from their package directories. Public Protocol or Server
-`HttpApi` changes require `bun run generate` from `packages/client`; generated
-files must not be edited directly.

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/app",
-  "version": "1.18.3",
+  "version": "1.18.2",
   "description": "",
   "type": "module",
   "exports": {

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

@@ -1,18 +1,17 @@
+import { base64Encode } from "@opencode-ai/core/util/encode"
 import { getFilename } from "@opencode-ai/core/util/path"
-import type { GlobalSession, Project } from "@opencode-ai/sdk/v2/client"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
+import { useNavigate } from "@solidjs/router"
 import { createMemo, onCleanup } from "solid-js"
-import { commandPaletteOptions, useCommand, type CommandOption } from "@/context/command"
+import { useCommand, type CommandOption } from "@/context/command"
 import { useFile } from "@/context/file"
-import { useGlobal } from "@/context/global"
 import { useLanguage } from "@/context/language"
-import { useLayout, type LocalProject } from "@/context/layout"
-import { ServerConnection } from "@/context/server"
-import { useServerSDK } from "@/context/server-sdk"
-import { useTabs } from "@/context/tabs"
-import { displayName, projectForSession } from "@/pages/layout/helpers"
+import { useLayout } from "@/context/layout"
+import { useServerSDK, type ServerSDK } from "@/context/server-sdk"
+import { useServerSync } from "@/context/server-sync"
 import { createSessionTabs } from "@/pages/session/helpers"
 import { useSessionLayout } from "@/pages/session/session-layout"
+import { decode64 } from "@/utils/base64"
 
 export type CommandPaletteEntry = {
   id: string
@@ -25,8 +24,6 @@ export type CommandPaletteEntry = {
   path?: string
   directory?: string
   sessionID?: string
-  server?: ServerConnection.Key
-  project?: LocalProject
   archived?: number
   updated?: number
 }
@@ -78,25 +75,28 @@ export function createCommandPaletteFileOpener(onOpenFile?: (path: string) => vo
 
 export function createCommandPaletteModel(props: { filesOnly?: () => boolean; onOpenFile?: (path: string) => void }) {
   const command = useCommand()
-  const global = useGlobal()
   const language = useLanguage()
+  const layout = useLayout()
   const file = useFile()
   const dialog = useDialog()
+  const navigate = useNavigate()
   const serverSDK = useServerSDK()()
-  const serverCtx = global.ensureServerCtx(serverSDK.server)
-  const appTabs = useTabs()
-  const { tabs: sessionTabs } = useSessionLayout()
+  const serverSync = useServerSync()
+  const { params, tabs } = useSessionLayout()
   const openFile = createCommandPaletteFileOpener(props.onOpenFile)
   const state = { cleanup: undefined as (() => void) | void, committed: false }
   const filesOnly = () => props.filesOnly?.() ?? false
 
   const allowedCommands = createMemo(() => {
     if (filesOnly()) return []
-    return commandPaletteOptions(command.options)
+    return command.options.filter(
+      (option) =>
+        !option.disabled && !option.hidden && !option.id.startsWith("suggested.") && option.id !== "file.open",
+    )
   })
   const commandEntries = createMemo(() => {
     const category = language.t("palette.group.commands")
-    return allowedCommands().map((option) => createCommandPaletteCommandEntry(option, category))
+    return allowedCommands().map((option) => createCommandEntry(option, category))
   })
   const preferredCommandEntries = createMemo(() => {
     const all = allowedCommands()
@@ -105,11 +105,11 @@ export function createCommandPaletteModel(props: { filesOnly?: () => boolean; on
     const base = picked.length ? picked : all.slice(0, ENTRY_LIMIT)
     const sorted = picked.length ? [...base].sort((a, b) => (order.get(a.id) ?? 0) - (order.get(b.id) ?? 0)) : base
     const category = language.t("palette.group.commands")
-    return sorted.map((option) => createCommandPaletteCommandEntry(option, category))
+    return sorted.map((option) => createCommandEntry(option, category))
   })
 
   const tabState = createSessionTabs({
-    tabs: sessionTabs,
+    tabs,
     pathFromTab: file.pathFromTab,
     normalizeTab: (tab) => (tab.startsWith("file://") ? file.tab(tab) : tab),
   })
@@ -140,12 +140,36 @@ export function createCommandPaletteModel(props: { filesOnly?: () => boolean; on
       .map((path) => createCommandPaletteFileEntry(path, category))
   })
 
-  const sessions = createServerSessionEntries({
-    server: ServerConnection.key(serverSDK.server),
-    opened: serverCtx.projects.list,
-    stored: () => serverCtx.sync.data.project,
-    load: (search, signal) =>
-      serverSDK.client.experimental.session.list({ roots: true, search, limit: 50 }, { signal }),
+  const projectDirectory = createMemo(() => decode64(params.dir) ?? "")
+  const project = createMemo(() => {
+    const directory = projectDirectory()
+    if (!directory) return undefined
+    return layout.projects.list().find((item) => item.worktree === directory || item.sandboxes?.includes(directory))
+  })
+  const workspaces = createMemo(() => {
+    const directory = projectDirectory()
+    const current = project()
+    if (!current) return directory ? [directory] : []
+    const dirs = [current.worktree, ...(current.sandboxes ?? [])]
+    if (directory && !dirs.includes(directory)) return [...dirs, directory]
+    return dirs
+  })
+  const homedir = createMemo(() => serverSync().data.path.home)
+  const sessions = createSessionEntries({
+    workspaces,
+    label: (directory) => {
+      const current = project()
+      const kind =
+        current && directory === current.worktree
+          ? language.t("workspace.type.local")
+          : language.t("workspace.type.sandbox")
+      const [store] = serverSync().child(directory, { bootstrap: false })
+      const home = homedir()
+      const path = home ? directory.replace(home, "~") : directory
+      const name = store.vcs?.branch ?? getFilename(directory)
+      return `${kind} : ${name || path}`
+    },
+    load: (directory) => serverSDK.client.session.list({ directory, roots: true }),
     untitled: () => language.t("command.session.new"),
     category: () => language.t("command.category.session"),
   })
@@ -167,17 +191,8 @@ export function createCommandPaletteModel(props: { filesOnly?: () => boolean; on
       return
     }
     if (item.type === "session") {
-      if (!item.sessionID || !item.server) return
-      const directory = item.project?.worktree ?? item.directory
-      if (directory) {
-        serverCtx.projects.open(directory)
-        serverCtx.projects.touch(directory)
-      }
-      const tab = appTabs.addSessionTab({
-        server: item.server,
-        sessionId: item.sessionID,
-      })
-      appTabs.select(tab)
+      if (!item.directory || !item.sessionID) return
+      navigate(`/${base64Encode(item.directory)}/session/${item.sessionID}`)
       return
     }
     if (!item.path) return
@@ -203,7 +218,7 @@ export function createCommandPaletteModel(props: { filesOnly?: () => boolean; on
   }
 }
 
-export function createCommandPaletteCommandEntry(option: CommandOption, category: string): CommandPaletteEntry {
+function createCommandEntry(option: CommandOption, category: string): CommandPaletteEntry {
   return {
     id: "command:" + option.id,
     type: "command",
@@ -215,65 +230,96 @@ export function createCommandPaletteCommandEntry(option: CommandOption, category
   }
 }
 
-export function createServerSessionEntries(props: {
-  server: ServerConnection.Key
-  opened: () => LocalProject[]
-  stored: () => Project[]
-  load: (search: string, signal: AbortSignal) => Promise<{ data?: GlobalSession[] }>
+function createSessionEntries(props: {
+  workspaces: () => string[]
+  label: (directory: string) => string
+  load: (directory: string) => ReturnType<ServerSDK["client"]["session"]["list"]>
   untitled: () => string
   category: () => string
 }) {
-  let abort: AbortController | undefined
+  const state: {
+    token: number
+    inflight: Promise<CommandPaletteEntry[]> | undefined
+    cached: CommandPaletteEntry[] | undefined
+  } = { token: 0, inflight: undefined, cached: undefined }
 
-  onCleanup(() => abort?.abort())
-
-  return async (text: string): Promise<CommandPaletteEntry[]> => {
-    const search = text.trim()
-    if (!search) {
-      abort?.abort()
-      return []
+  return (text: string) => {
+    if (!text.trim()) {
+      state.token += 1
+      state.inflight = undefined
+      state.cached = undefined
+      return [] as CommandPaletteEntry[]
     }
-    abort?.abort()
-    const current = new AbortController()
-    abort = current
-    await new Promise<void>((resolve) => {
-      const timer = setTimeout(resolve, 100)
-      current.signal.addEventListener(
-        "abort",
-        () => {
-          clearTimeout(timer)
-          resolve()
-        },
-        { once: true },
-      )
-    })
-    if (current.signal.aborted) return []
-    const opened = props.opened()
-    const openedByID = new Map(opened.flatMap((project) => (project.id ? [[project.id, project] as const] : [])))
-    const stored = props.stored().map((project) => ({ ...project, expanded: false }))
-    const storedByID = new Map(stored.map((project) => [project.id, project] as const))
-    return props
-      .load(search, current.signal)
-      .then((result) =>
-        (result.data ?? [])
-          .filter((session) => !session.time.archived)
-          .map((session) => {
-            const project =
-              projectForSession(session, opened, openedByID) ?? projectForSession(session, stored, storedByID)
-            return {
-              id: `session:${props.server}:${session.id}`,
-              type: "session" as const,
-              title: session.title || props.untitled(),
-              description: project ? displayName(project) : session.project?.name || getFilename(session.directory),
-              category: props.category(),
-              directory: session.directory,
-              sessionID: session.id,
-              server: props.server,
-              project,
-              updated: session.time.updated,
-            }
-          }),
-      )
+    if (state.cached) return state.cached
+    if (state.inflight) return state.inflight
+
+    const current = state.token
+    const dirs = props.workspaces()
+    if (dirs.length === 0) return [] as CommandPaletteEntry[]
+
+    state.inflight = Promise.all(
+      dirs.map((directory) => {
+        const description = props.label(directory)
+        return props
+          .load(directory)
+          .then((result) =>
+            (result.data ?? [])
+              .filter((session) => !!session?.id)
+              .map((session) => ({
+                id: session.id,
+                title: session.title ?? props.untitled(),
+                description,
+                directory,
+                archived: session.time?.archived,
+                updated: session.time?.updated,
+              })),
+          )
+          .catch(() => [] as SessionEntryInput[])
+      }),
+    )
+      .then((results) => {
+        if (state.token !== current) return [] as CommandPaletteEntry[]
+        const seen = new Set<string>()
+        const next = results
+          .flat()
+          .filter((item) => {
+            const key = `${item.directory}:${item.id}`
+            if (seen.has(key)) return false
+            seen.add(key)
+            return true
+          })
+          .map((item) => createSessionEntry(item, props.category()))
+        state.cached = next
+        return next
+      })
       .catch(() => [] as CommandPaletteEntry[])
+      .finally(() => {
+        state.inflight = undefined
+      })
+
+    return state.inflight
+  }
+}
+
+type SessionEntryInput = {
+  directory: string
+  id: string
+  title: string
+  description: string
+  archived?: number
+  updated?: number
+}
+
+function createSessionEntry(input: SessionEntryInput, category: string): CommandPaletteEntry {
+  return {
+    id: `session:${input.directory}:${input.id}`,
+    type: "session",
+    title: input.title,
+    description: input.description,
+    category,
+    directory: input.directory,
+    sessionID: input.id,
+    archived: input.archived,
+    updated: input.updated,
   }
 }

packages/app/src/components/dialog-command-palette-v2.tsx

@@ -5,20 +5,13 @@ import { Dialog, DialogBody } from "@opencode-ai/ui/v2/dialog-v2"
 import { Icon } from "@opencode-ai/ui/v2/icon"
 import { KeybindV2 } from "@opencode-ai/ui/v2/keybind-v2"
 import { TextInputV2 } from "@opencode-ai/ui/v2/text-input-v2"
-import { useDialog } from "@opencode-ai/ui/context/dialog"
-import { createEffect, createMemo, createResource, createSignal, For, Match, onCleanup, Show, Switch } from "solid-js"
-import { commandPaletteOptions, formatKeybindParts, useCommand } from "@/context/command"
-import { useGlobal } from "@/context/global"
+import { createEffect, createMemo, createResource, createSignal, For, Match, Show, Switch } from "solid-js"
+import { formatKeybindParts } from "@/context/command"
 import { useLanguage } from "@/context/language"
-import { ServerConnection } from "@/context/server"
-import { useTabs } from "@/context/tabs"
-import { SessionTabAvatar } from "@/pages/layout/session-tab-avatar"
 import { getRelativeTime } from "@/utils/time"
 import {
-  createCommandPaletteCommandEntry,
   createCommandPaletteFileEntry,
   createCommandPaletteModel,
-  createServerSessionEntries,
   uniqueCommandPaletteEntries,
   type CommandPaletteEntry,
 } from "./command-palette"
@@ -37,6 +30,9 @@ function matchesEntry(entry: CommandPaletteEntry, query: string) {
 
 export function DialogCommandPaletteV2(props: { onOpenFile?: (path: string) => void }) {
   const palette = createCommandPaletteModel(props)
+  const [query, setQuery] = createSignal("")
+  const [active, setActive] = createSignal(0)
+
   const loadItems = async (text: string) => {
     const q = text.trim()
     if (!q) return [...palette.preferredCommandEntries(), ...palette.recentFileEntries()]
@@ -45,105 +41,16 @@ export function DialogCommandPaletteV2(props: { onOpenFile?: (path: string) => v
     const category = palette.language.t("palette.group.files")
     return [
       ...palette.commandEntries().filter((entry) => matchesEntry(entry, q)),
-      ...nextSessions,
+      ...nextSessions.filter((entry) => matchesEntry(entry, q)),
       ...files.map((path) => createCommandPaletteFileEntry(path, category)),
     ]
   }
 
-  return (
-    <CommandPaletteView
-      placeholder={palette.language.t("palette.search.placeholder")}
-      loadItems={loadItems}
-      highlight={palette.highlight}
-      select={palette.select}
-      close={palette.close}
-    />
-  )
-}
-
-export function DialogHomeCommandPaletteV2(props: {
-  server: ServerConnection.Any
-  onSelectSession: (entry: CommandPaletteEntry) => void
-}) {
-  const command = useCommand()
-  const dialog = useDialog()
-  const global = useGlobal()
-  const language = useLanguage()
-  const serverCtx = global.ensureServerCtx(props.server)
-  const state = { cleanup: undefined as (() => void) | void, committed: false }
-  const commandEntries = createMemo(() => {
-    const category = language.t("palette.group.commands")
-    return commandPaletteOptions(command.options).map((option) => createCommandPaletteCommandEntry(option, category))
-  })
-  const sessions = createServerSessionEntries({
-    server: ServerConnection.key(props.server),
-    opened: serverCtx.projects.list,
-    stored: () => serverCtx.sync.data.project,
-    load: (search, signal) =>
-      serverCtx.sdk.client.experimental.session.list({ roots: true, search, limit: 50 }, { signal }),
-    untitled: () => language.t("command.session.new"),
-    category: () => language.t("command.category.session"),
-  })
-
-  const highlight = (item: CommandPaletteEntry | undefined) => {
-    state.cleanup?.()
-    state.cleanup = undefined
-    if (item?.type !== "command") return
-    state.cleanup = item.option?.onHighlight?.()
-  }
-  const select = (item: CommandPaletteEntry | undefined) => {
-    if (!item) return
-    state.committed = true
-    state.cleanup = undefined
-    dialog.close()
-    if (item.type === "command") {
-      item.option?.onSelect?.("palette")
-      return
-    }
-    if (item.type === "session") props.onSelectSession(item)
-  }
-  const loadItems = async (text: string) => {
-    const query = text.trim()
-    if (!query) return commandEntries().slice(0, 5)
-    return [...commandEntries().filter((entry) => matchesEntry(entry, query)), ...(await sessions(query))]
-  }
-
-  onCleanup(() => {
-    if (state.committed) return
-    state.cleanup?.()
-  })
-
-  return (
-    <CommandPaletteView
-      placeholder={language.t("palette.search.placeholder.home")}
-      loadItems={loadItems}
-      highlight={highlight}
-      select={select}
-      close={() => dialog.close()}
-    />
-  )
-}
-
-function CommandPaletteView(props: {
-  placeholder: string
-  loadItems: (text: string) => CommandPaletteEntry[] | Promise<CommandPaletteEntry[]>
-  highlight: (item: CommandPaletteEntry | undefined) => void
-  select: (item: CommandPaletteEntry | undefined) => void
-  close: () => void
-}) {
-  const language = useLanguage()
-  const tabs = useTabs()
-  const [query, setQuery] = createSignal("")
-  const [active, setActive] = createSignal(0)
-
-  const [entries] = createResource(query, props.loadItems, { initialValue: [] as CommandPaletteEntry[] })
+  const [entries] = createResource(query, loadItems, { initialValue: [] as CommandPaletteEntry[] })
   // Render stale results while a new query loads to avoid flashing "Loading" per keystroke.
   const visibleEntries = createMemo(() => uniqueCommandPaletteEntries(entries.latest ?? []))
   const groupedEntries = createMemo(() => groups(visibleEntries()))
   const activeEntry = createMemo(() => visibleEntries()[active()])
-  const openSessions = createMemo(
-    () => new Set(tabs.store.flatMap((tab) => (tab.type === "session" ? [`${tab.server}\0${tab.sessionId}`] : []))),
-  )
 
   createEffect(() => {
     query()
@@ -152,7 +59,7 @@ function CommandPaletteView(props: {
   })
 
   createEffect(() => {
-    props.highlight(activeEntry())
+    palette.highlight(activeEntry())
   })
 
   let resultsRef: HTMLDivElement | undefined
@@ -179,12 +86,12 @@ function CommandPaletteView(props: {
     }
     if (event.key === "Enter") {
       event.preventDefault()
-      props.select(activeEntry())
+      palette.select(activeEntry())
       return
     }
     if (event.key === "Escape") {
       event.preventDefault()
-      props.close()
+      palette.close()
     }
   }
 
@@ -198,7 +105,7 @@ function CommandPaletteView(props: {
             autocomplete="off"
             spellcheck={false}
             appearance="large"
-            placeholder={props.placeholder}
+            placeholder={palette.language.t("palette.search.placeholder")}
             leadingIcon={<Icon name="magnifying-glass" />}
             onInput={(event) => setQuery(event.currentTarget.value)}
             onKeyDown={handleKeyDown}
@@ -210,7 +117,7 @@ function CommandPaletteView(props: {
               when={visibleEntries().length > 0}
               fallback={
                 <div class="command-palette-v2-state">
-                  {entries.loading ? language.t("common.loading") : language.t("palette.empty")}
+                  {entries.loading ? palette.language.t("common.loading") : palette.language.t("palette.empty")}
                 </div>
               }
             >
@@ -225,14 +132,9 @@ function CommandPaletteView(props: {
                         <PaletteRow
                           item={item}
                           active={activeEntry()?.id === item.id}
-                          language={language}
-                          sessionOpen={
-                            item.server && item.sessionID
-                              ? openSessions().has(`${item.server}\0${item.sessionID}`)
-                              : false
-                          }
+                          language={palette.language}
                           onActive={() => setActive(visibleEntries().findIndex((entry) => entry.id === item.id))}
-                          onSelect={() => props.select(item)}
+                          onSelect={() => palette.select(item)}
                         />
                       )}
                     </For>
@@ -251,19 +153,13 @@ function PaletteRow(props: {
   item: CommandPaletteEntry
   active: boolean
   language: ReturnType<typeof useLanguage>
-  sessionOpen: boolean
   onActive: () => void
   onSelect: () => void
 }) {
-  const session = () =>
-    props.item.server && props.item.directory && props.item.sessionID
-      ? { server: props.item.server, directory: props.item.directory, sessionID: props.item.sessionID }
-      : undefined
-
   return (
     <button
       type="button"
-      class="command-palette-v2-row group"
+      class="command-palette-v2-row"
       role="option"
       aria-selected={props.active}
       data-active={props.active ? "" : undefined}
@@ -301,25 +197,7 @@ function PaletteRow(props: {
         </Match>
         <Match when={props.item.type === "session"}>
           <div class="command-palette-v2-row-main">
-            <div class="relative shrink-0">
-              <Show when={props.sessionOpen}>
-                <span
-                  aria-hidden="true"
-                  class="pointer-events-none absolute top-1/2 h-3 w-0.5 -translate-y-1/2 rounded-[2px] bg-v2-background-bg-layer-04"
-                  style={{ right: "calc(100% + 4px)" }}
-                />
-              </Show>
-              <Show when={session()}>
-                {(session) => (
-                  <SessionTabAvatar
-                    project={props.item.project}
-                    directory={session().directory}
-                    sessionId={session().sessionID}
-                    server={session().server}
-                  />
-                )}
-              </Show>
-            </div>
+            <Icon name="status" class="command-palette-v2-row-icon" />
             <div class="command-palette-v2-row-text">
               <span class="command-palette-v2-title" classList={{ "opacity-70": !!props.item.archived }}>
                 {props.item.title}

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

@@ -8,9 +8,49 @@ import introducingTabsVideo from "@/assets/help/introducing-tabs.mp4"
 import homeImage from "@/assets/help/home.png"
 import tabsImage from "@/assets/help/tabs.png"
 
+const helpIcon = (
+  <svg
+    width="16"
+    height="16"
+    viewBox="0 0 16 16"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+    aria-hidden="true"
+    data-slot="icon-svg"
+  >
+    <path
+      d="M6.94235 10.5714V10.4854C6.94617 9.76302 7.01879 9.18777 7.16022 8.75968C7.30546 8.33158 7.50804 7.98567 7.76796 7.72193C8.02787 7.45819 8.34321 7.21548 8.71397 6.99379C8.93948 6.85619 9.14206 6.69374 9.32171 6.50645C9.50518 6.31916 9.64851 6.10511 9.75171 5.86431C9.85874 5.62351 9.91225 5.35404 9.91225 5.0559C9.91225 4.69661 9.82625 4.38509 9.65424 4.12136C9.48607 3.85762 9.26055 3.65504 8.9777 3.51362C8.69486 3.36837 8.38143 3.29575 8.03743 3.29575C7.73165 3.29575 7.43733 3.35882 7.15448 3.48495C6.87546 3.61108 6.6423 3.80984 6.45501 4.08122C6.26772 4.3526 6.15878 4.70425 6.12821 5.13617H4.56299C4.59357 4.47109 4.76557 3.9054 5.07899 3.43908C5.39242 2.96894 5.80522 2.61156 6.31741 2.36694C6.83341 2.12231 7.40675 2 8.03743 2C8.72161 2 9.31789 2.13378 9.82625 2.40134C10.3384 2.66507 10.734 3.0301 11.0131 3.49642C11.2959 3.96273 11.4373 4.49976 11.4373 5.1075C11.4373 5.53177 11.3724 5.914 11.2424 6.25418C11.1124 6.59436 10.9251 6.89823 10.6805 7.16579C10.4397 7.43335 10.1492 7.67033 9.80905 7.87673C9.48033 8.08313 9.21468 8.301 9.0121 8.53034C8.80952 8.75585 8.66237 9.02341 8.57063 9.33302C8.4789 9.64262 8.42921 10.0268 8.42156 10.4854V10.5714H6.94235ZM7.72782 14C7.43351 14 7.17933 13.8949 6.96528 13.6847C6.75506 13.4744 6.64994 13.2203 6.64994 12.9221C6.64994 12.6278 6.75506 12.3755 6.96528 12.1653C7.17933 11.9551 7.43351 11.85 7.72782 11.85C8.02214 11.85 8.27441 11.9551 8.48463 12.1653C8.69868 12.3755 8.8057 12.6278 8.8057 12.9221C8.8057 13.1209 8.75601 13.3024 8.65663 13.4668C8.55726 13.6273 8.4273 13.7573 8.26676 13.8567C8.10623 13.9522 7.92658 14 7.72782 14Z"
+      fill="var(--v2-icon-icon-base)"
+    />
+  </svg>
+)
+
+const triggerClass =
+  "size-7 !rounded-full shrink-0 bg-v2-background-bg-base shadow-[var(--v2-elevation-button-neutral)]"
+
 // TODO: wire to changelog / seen-state when available
 const showPopover = () => true
 
+export function HelpButton() {
+  const platform = usePlatform()
+
+  return (
+    <a
+      href="https://opencode.ai"
+      aria-label="Open the OpenCode website"
+      data-component="icon-button-v2"
+      data-size="large"
+      class={`${triggerClass} fixed bottom-5 right-5 z-50 flex items-center justify-center`}
+      onClick={(event) => {
+        event.preventDefault()
+        platform.openLink(event.currentTarget.href)
+      }}
+    >
+      {helpIcon}
+    </a>
+  )
+}
+
 // can remove this after the tabs rollout has been out for a while
 export function TabsInfoPopup() {
   const settings = useSettings()
@@ -21,7 +61,7 @@ export function TabsInfoPopup() {
     <Drawer open={drawerOpen()} onOpenChange={setDrawerOpen} side="right">
       <Show when={settings.general.shouldDisplayTabsToast()}>
         <div
-          class="fixed bottom-5 right-5 z-50 h-[240px] w-[192px] rounded-[8px] bg-v2-background-bg-base p-1 shadow-[var(--v2-elevation-floating)]"
+          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"
         >
           <button

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

@@ -10,7 +10,7 @@ import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
 import { TextInputV2 } from "@opencode-ai/ui/v2/text-input-v2"
 import { showToast } from "@/utils/toast"
 import fuzzysort from "fuzzysort"
-import { DEFAULT_PALETTE_KEYBIND, formatKeybind, parseKeybind, useCommand } from "@/context/command"
+import { formatKeybind, parseKeybind, useCommand } from "@/context/command"
 import { useLanguage } from "@/context/language"
 import { useSettings } from "@/context/settings"
 import { SettingsList } from "./settings-list"
@@ -20,6 +20,7 @@ const IconV2 = lazy(() => import("@opencode-ai/ui/v2/icon").then((module) => ({
 
 const IS_MAC = typeof navigator === "object" && /(Mac|iPod|iPhone|iPad)/.test(navigator.platform)
 const PALETTE_ID = "command.palette"
+const DEFAULT_PALETTE_KEYBIND = "mod+shift+p"
 
 type KeybindGroup = "General" | "Session" | "Navigation" | "Model and agent" | "Terminal" | "Prompt"
 

packages/app/src/context/command.test.ts

@@ -1,19 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { commandPaletteOptions, resolveKeybindOption, upsertCommandRegistration, type CommandOption } from "./command"
-
-const paletteOptions: CommandOption[] = [
-  { id: "settings.open", title: "Open settings" },
-  { id: "session.undo", title: "Undo" },
-  { id: "file.open", title: "Open file" },
-  { id: "hidden", title: "Hidden", hidden: true },
-  { id: "disabled", title: "Disabled", disabled: true },
-]
-
-describe("commandPaletteOptions", () => {
-  test("keeps visible enabled commands", () => {
-    expect(commandPaletteOptions(paletteOptions).map((option) => option.id)).toEqual(["settings.open", "session.undo"])
-  })
-})
+import { resolveKeybindOption, upsertCommandRegistration } from "./command"
 
 describe("upsertCommandRegistration", () => {
   test("replaces keyed registrations", () => {

packages/app/src/context/command.tsx

@@ -11,7 +11,7 @@ import { Persist, persisted } from "@/utils/persist"
 const IS_MAC = typeof navigator === "object" && /(Mac|iPod|iPhone|iPad)/.test(navigator.platform)
 
 const PALETTE_ID = "command.palette"
-export const DEFAULT_PALETTE_KEYBIND = "mod+k,mod+shift+p"
+const DEFAULT_PALETTE_KEYBIND = "mod+shift+p"
 const SUGGESTED_PREFIX = "suggested."
 const EDITABLE_KEYBIND_IDS = new Set(["terminal.toggle", "terminal.new", "file.attach"])
 
@@ -87,13 +87,6 @@ export interface CommandOption {
   onHighlight?: () => (() => void) | void
 }
 
-export function commandPaletteOptions(options: CommandOption[]) {
-  return options.filter(
-    (option) =>
-      !option.disabled && !option.hidden && !option.id.startsWith(SUGGESTED_PREFIX) && option.id !== "file.open",
-  )
-}
-
 export function resolveKeybindOption(candidates: CommandOption[] | undefined, event: KeyboardEvent) {
   return candidates?.find((option) => option.when?.(event)) ?? candidates?.find((option) => !option.when)
 }
@@ -382,7 +375,7 @@ export const { use: useCommand, provider: CommandProvider } = createSimpleContex
     }
 
     const showPalette = () => {
-      run(PALETTE_ID, "palette")
+      run("file.open", "palette")
     }
 
     const handleKeyDown = (event: KeyboardEvent) => {

packages/app/src/context/local-agent.test.ts

@@ -1,29 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { hasCustomAgent, resolveAgent } from "./local-agent"
-
-describe("hasCustomAgent", () => {
-  test("detects explicitly custom agents", () => {
-    expect(hasCustomAgent([{ native: true }, { native: false }])).toBe(true)
-  })
-
-  test("ignores built-in and unclassified agents", () => {
-    expect(hasCustomAgent([{ native: true }, {}])).toBe(false)
-  })
-})
-
-describe("resolveAgent", () => {
-  const agents = [{ name: "plan" }, { name: "build" }, { name: "custom" }]
-
-  test("uses the requested available agent", () => {
-    expect(resolveAgent(agents, "custom")?.name).toBe("custom")
-  })
-
-  test("defaults to build", () => {
-    expect(resolveAgent(agents)?.name).toBe("build")
-    expect(resolveAgent(agents, "missing")?.name).toBe("build")
-  })
-
-  test("uses the first agent when build is unavailable", () => {
-    expect(resolveAgent([{ name: "custom" }], "missing")?.name).toBe("custom")
-  })
-})

packages/app/src/context/local-agent.ts

@@ -1,7 +0,0 @@
-export function hasCustomAgent(items: Array<{ native?: boolean }>) {
-  return items.some((item) => item.native === false)
-}
-
-export function resolveAgent<T extends { name: string }>(items: T[], name?: string) {
-  return items.find((item) => item.name === name) ?? items.find((item) => item.name === "build") ?? items[0]
-}

packages/app/src/context/local.tsx

@@ -4,10 +4,8 @@ import { useParams } from "@solidjs/router"
 import { batch, createEffect, createMemo, startTransition } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useModels } from "@/context/models"
-import { useSettings } from "@/context/settings"
 import { useProviders } from "@/hooks/use-providers"
 import { Persist, persisted } from "@/utils/persist"
-import { hasCustomAgent, resolveAgent } from "./local-agent"
 import { cycleModelVariant, getConfiguredAgentVariant, resolveModelVariant } from "./model-variant"
 import { useSDK } from "./sdk"
 import { useSync } from "./sync"
@@ -64,11 +62,9 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
     const serverSDK = useServerSDK()
     const providers = useProviders(() => sdk().directory)
     const models = useModels()
-    const settings = useSettings()
 
     const id = createMemo(() => params.id || undefined)
     const list = createMemo(() => sync().data.agent.filter((item) => item.mode !== "subagent" && !item.hidden))
-    const agentsVisible = createMemo(() => settings.visibility.customAgents() || hasCustomAgent(list()))
     const connected = createMemo(() => new Set(providers.connected().map((item) => item.id)))
 
     const [saved, setSaved, , savedReady] = persisted(
@@ -111,7 +107,9 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
     }
 
     const pickAgent = (name: string | undefined) => {
-      return resolveAgent(list(), name)
+      const items = list()
+      if (items.length === 0) return
+      return items.find((item) => item.name === name) ?? items[0]
     }
 
     createEffect(() => {
@@ -182,9 +180,8 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
 
     const agent = {
       list,
-      visible: agentsVisible,
       current() {
-        return pickAgent(agentsVisible() ? (scope()?.agent ?? store.current) : "build")
+        return pickAgent(scope()?.agent ?? store.current)
       },
       set(name: string | undefined) {
         const item = pickAgent(name)

packages/app/src/i18n/ar.ts

@@ -86,7 +86,6 @@ export const dict = {
   "command.session.unshare": "إلغاء مشاركة الجلسة",
   "command.session.unshare.description": "إيقاف مشاركة هذه الجلسة",
   "palette.search.placeholder": "البحث في الملفات والأوامر والجلسات",
-  "palette.search.placeholder.home": "البحث في الأوامر والجلسات",
   "palette.empty": "لا توجد نتائج",
   "palette.group.commands": "الأوامر",
   "palette.group.files": "الملفات",

packages/app/src/i18n/br.ts

@@ -86,7 +86,6 @@ export const dict = {
   "command.session.unshare": "Parar de compartilhar sessão",
   "command.session.unshare.description": "Parar de compartilhar esta sessão",
   "palette.search.placeholder": "Buscar arquivos, comandos e sessões",
-  "palette.search.placeholder.home": "Buscar comandos e sessões",
   "palette.empty": "Nenhum resultado encontrado",
   "palette.group.commands": "Comandos",
   "palette.group.files": "Arquivos",

packages/app/src/i18n/bs.ts

@@ -93,7 +93,6 @@ export const dict = {
   "command.session.unshare.description": "Zaustavi dijeljenje ove sesije",
 
   "palette.search.placeholder": "Pretraži datoteke, komande i sesije",
-  "palette.search.placeholder.home": "Pretraži komande i sesije",
   "palette.empty": "Nema rezultata",
   "palette.group.commands": "Komande",
   "palette.group.files": "Datoteke",

packages/app/src/i18n/da.ts

@@ -93,7 +93,6 @@ export const dict = {
   "command.session.unshare.description": "Stop med at dele denne session",
 
   "palette.search.placeholder": "Søg i filer, kommandoer og sessioner",
-  "palette.search.placeholder.home": "Søg i kommandoer og sessioner",
   "palette.empty": "Ingen resultater fundet",
   "palette.group.commands": "Kommandoer",
   "palette.group.files": "Filer",

packages/app/src/i18n/de.ts

@@ -90,7 +90,6 @@ export const dict = {
   "command.session.unshare": "Teilen der Sitzung aufheben",
   "command.session.unshare.description": "Teilen dieser Sitzung beenden",
   "palette.search.placeholder": "Dateien, Befehle und Sitzungen durchsuchen",
-  "palette.search.placeholder.home": "Befehle und Sitzungen durchsuchen",
   "palette.empty": "Keine Ergebnisse gefunden",
   "palette.group.commands": "Befehle",
   "palette.group.files": "Dateien",

packages/app/src/i18n/en.ts

@@ -93,7 +93,6 @@ export const dict = {
   "command.session.unshare.description": "Stop sharing this session",
 
   "palette.search.placeholder": "Search files, commands, and sessions",
-  "palette.search.placeholder.home": "Search commands and sessions",
   "palette.empty": "No results found",
   "palette.group.commands": "Commands",
   "palette.group.files": "Files",

packages/app/src/i18n/es.ts

@@ -93,7 +93,6 @@ export const dict = {
   "command.session.unshare.description": "Dejar de compartir esta sesión",
 
   "palette.search.placeholder": "Buscar archivos, comandos y sesiones",
-  "palette.search.placeholder.home": "Buscar comandos y sesiones",
   "palette.empty": "No se encontraron resultados",
   "palette.group.commands": "Comandos",
   "palette.group.files": "Archivos",

packages/app/src/i18n/fr.ts

@@ -86,7 +86,6 @@ export const dict = {
   "command.session.unshare": "Ne plus partager la session",
   "command.session.unshare.description": "Arrêter de partager cette session",
   "palette.search.placeholder": "Rechercher des fichiers, des commandes et des sessions",
-  "palette.search.placeholder.home": "Rechercher des commandes et des sessions",
   "palette.empty": "Aucun résultat trouvé",
   "palette.group.commands": "Commandes",
   "palette.group.files": "Fichiers",

packages/app/src/i18n/ja.ts

@@ -86,7 +86,6 @@ export const dict = {
   "command.session.unshare": "セッションの共有を停止",
   "command.session.unshare.description": "このセッションの共有を停止",
   "palette.search.placeholder": "ファイル、コマンド、セッションを検索",
-  "palette.search.placeholder.home": "コマンドとセッションを検索",
   "palette.empty": "結果が見つかりません",
   "palette.group.commands": "コマンド",
   "palette.group.files": "ファイル",

packages/app/src/i18n/ko.ts

@@ -82,7 +82,6 @@ export const dict = {
   "command.session.unshare": "세션 공유 중지",
   "command.session.unshare.description": "이 세션 공유 중지",
   "palette.search.placeholder": "파일, 명령어 및 세션 검색",
-  "palette.search.placeholder.home": "명령어 및 세션 검색",
   "palette.empty": "결과 없음",
   "palette.group.commands": "명령어",
   "palette.group.files": "파일",

packages/app/src/i18n/no.ts

@@ -92,7 +92,6 @@ export const dict = {
   "command.session.unshare.description": "Slutt å dele denne sesjonen",
 
   "palette.search.placeholder": "Søk i filer, kommandoer og sesjoner",
-  "palette.search.placeholder.home": "Søk i kommandoer og sesjoner",
   "palette.empty": "Ingen resultater funnet",
   "palette.group.commands": "Kommandoer",
   "palette.group.files": "Filer",

packages/app/src/i18n/pl.ts

@@ -86,7 +86,6 @@ export const dict = {
   "command.session.unshare": "Przestań udostępniać sesję",
   "command.session.unshare.description": "Zatrzymaj udostępnianie tej sesji",
   "palette.search.placeholder": "Szukaj plików, poleceń i sesji",
-  "palette.search.placeholder.home": "Szukaj poleceń i sesji",
   "palette.empty": "Brak wyników",
   "palette.group.commands": "Polecenia",
   "palette.group.files": "Pliki",

packages/app/src/i18n/ru.ts

@@ -93,7 +93,6 @@ export const dict = {
   "command.session.unshare.description": "Прекратить публикацию сессии",
 
   "palette.search.placeholder": "Поиск файлов, команд и сессий",
-  "palette.search.placeholder.home": "Поиск команд и сессий",
   "palette.empty": "Ничего не найдено",
   "palette.group.commands": "Команды",
   "palette.group.files": "Файлы",

packages/app/src/i18n/th.ts

@@ -93,7 +93,6 @@ export const dict = {
   "command.session.unshare.description": "หยุดการแชร์เซสชันนี้",
 
   "palette.search.placeholder": "ค้นหาไฟล์ คำสั่ง และเซสชัน",
-  "palette.search.placeholder.home": "ค้นหาคำสั่งและเซสชัน",
   "palette.empty": "ไม่พบผลลัพธ์",
   "palette.group.commands": "คำสั่ง",
   "palette.group.files": "ไฟล์",

packages/app/src/i18n/tr.ts

@@ -97,7 +97,6 @@ export const dict = {
   "command.session.unshare.description": "Bu oturumun paylaşımını durdur",
 
   "palette.search.placeholder": "Dosya, komut ve oturum ara",
-  "palette.search.placeholder.home": "Komut ve oturum ara",
   "palette.empty": "Sonuç bulunamadı",
   "palette.group.commands": "Komutlar",
   "palette.group.files": "Dosyalar",

packages/app/src/i18n/uk.ts

@@ -93,7 +93,6 @@ export const dict = {
   "command.session.unshare.description": "Припинити поширення цієї сесії",
 
   "palette.search.placeholder": "Пошук файлів, команд і сесій",
-  "palette.search.placeholder.home": "Пошук команд і сесій",
   "palette.empty": "Результатів не знайдено",
   "palette.group.commands": "Команди",
   "palette.group.files": "Файли",

packages/app/src/i18n/zh.ts

@@ -120,7 +120,6 @@ export const dict = {
   "command.session.unshare.description": "停止分享此会话",
 
   "palette.search.placeholder": "搜索文件、命令和会话",
-  "palette.search.placeholder.home": "搜索命令和会话",
   "palette.empty": "未找到结果",
   "palette.group.commands": "命令",
   "palette.group.files": "文件",

packages/app/src/i18n/zht.ts

@@ -97,7 +97,6 @@ export const dict = {
   "command.session.unshare.description": "停止分享此工作階段",
 
   "palette.search.placeholder": "搜尋檔案、命令和工作階段",
-  "palette.search.placeholder.home": "搜尋命令和工作階段",
   "palette.empty": "找不到結果",
   "palette.group.commands": "命令",
   "palette.group.files": "檔案",

packages/app/src/pages/home.tsx

@@ -5,7 +5,6 @@ import {
   createMemo,
   createResource,
   createRoot,
-  createSignal,
   For,
   Match,
   on,
@@ -75,23 +74,6 @@ const HOME_SESSION_LIMIT = 64
 const HOME_SESSION_HEADER_STICKY_TOP = 12
 const HOME_SESSION_HEADER_TEXT_HEIGHT = 16
 const HOME_SESSION_HEADER_FADE_DISTANCE = 16
-
-function containHomeWheel(event: WheelEvent, viewport: HTMLElement) {
-  if (event.defaultPrevented || event.ctrlKey || !event.deltaY) return
-  if (!(event.target instanceof Element)) return
-
-  const scrollable = event.target.closest<HTMLElement>("[data-scrollable]")
-  if (
-    scrollable !== viewport &&
-    scrollable &&
-    (event.deltaY < 0
-      ? scrollable.scrollTop > 0
-      : scrollable.scrollTop < scrollable.scrollHeight - scrollable.clientHeight)
-  )
-    return
-
-  event.preventDefault()
-}
 const SHOW_HOME_SESSION_ARCHIVE = false
 const HOME_ROW_LAYOUT =
   "flex min-w-0 w-full shrink-0 cursor-default items-center rounded-[6px] bg-transparent text-left transition-[background-color,color,box-shadow] duration-[120ms] ease-in-out focus-visible:outline-none"
@@ -162,7 +144,6 @@ function useHomeSessionHeaderOpacity(groups: () => HomeSessionGroup[]) {
   let content: HTMLDivElement | undefined
   let positionFrame: number | undefined
   let resizeObserver: ResizeObserver | undefined
-  let stickyTop = HOME_SESSION_HEADER_STICKY_TOP
   const headerRefs = new Map<HomeSessionGroup["id"], HTMLDivElement>()
   const headerOffsets = new Map<HomeSessionGroup["id"], number>()
   const [state, setState] = createStore({
@@ -221,13 +202,6 @@ function useHomeSessionHeaderOpacity(groups: () => HomeSessionGroup[]) {
 
   function updatePositionCache() {
     if (!viewport) return
-    const header = groups()
-      .map((group) => headerRefs.get(group.id))
-      .find((el) => el !== undefined)
-    if (header && typeof getComputedStyle === "function") {
-      const top = Number.parseFloat(getComputedStyle(header).top)
-      if (Number.isFinite(top)) stickyTop = top
-    }
     groups().forEach((group) => {
       const el = headerRefs.get(group.id)
       if (!el) return
@@ -243,7 +217,7 @@ function useHomeSessionHeaderOpacity(groups: () => HomeSessionGroup[]) {
         .slice(index + 1)
         .map((item) => headerOffsets.get(item.id))
         .find((offset) => offset !== undefined)
-      const fadeEnd = stickyTop + HOME_SESSION_HEADER_TEXT_HEIGHT
+      const fadeEnd = HOME_SESSION_HEADER_STICKY_TOP + HOME_SESSION_HEADER_TEXT_HEIGHT
       const nextTop = nextOffset === undefined ? undefined : nextOffset - scrollTop
       const opacity =
         nextTop === undefined ? 1 : Math.max(0, Math.min(1, (nextTop - fadeEnd) / HOME_SESSION_HEADER_FADE_DISTANCE))
@@ -297,9 +271,6 @@ export function NewHome() {
   const marked = useMarked()
   const openSettings = useSettingsCommand()
   let focusSessionSearch: (() => void) | undefined
-  let sessionViewport: HTMLDivElement | undefined
-  const [sessionThumbTrack, setSessionThumbTrack] = createSignal<HTMLDivElement>()
-  const [sessionHoverTarget, setSessionHoverTarget] = createSignal<HTMLElement>()
   const [state, setState] = createStore({
     search: "",
     searchFocused: false,
@@ -431,34 +402,6 @@ export function NewHome() {
   }
 
   command.register("home", () => [
-    {
-      id: "command.palette",
-      title: language.t("command.palette"),
-      hidden: true,
-      onSelect: async () => {
-        const conn = focusedServer()
-        if (!conn) return
-        const ctx = global.ensureServerCtx(conn)
-        const { DialogHomeCommandPaletteV2 } = await import("@/components/dialog-command-palette-v2")
-        void dialog.show(() => (
-          <DialogHomeCommandPaletteV2
-            server={conn}
-            onSelectSession={(entry) => {
-              if (!entry.sessionID || !entry.directory || !entry.server) return
-              const sessionID = entry.sessionID
-              const server = entry.server
-              const directory = entry.project?.worktree ?? entry.directory
-              ctx.projects.open(directory)
-              ctx.projects.touch(directory)
-              void startTransition(() => {
-                const tab = tabs.addSessionTab({ server, sessionId: sessionID })
-                tabs.select(tab)
-              })
-            }}
-          />
-        ))
-      },
-    },
     {
       id: "home.sessions.search.focus",
       title: searchPlaceholder(),
@@ -598,158 +541,127 @@ export function NewHome() {
   }
 
   return (
-    <div class="rounded-[10px] shadow-[var(--v2-elevation-raised)] m-2 min-h-0 overflow-hidden bg-v2-background-bg-base self-stretch flex-1">
-      <ScrollView
-        class="h-full [container-type:size]"
-        thumbContainer={sessionThumbTrack}
-        thumbHoverTarget={sessionHoverTarget}
-        viewportRef={(el) => {
-          sessionViewport = el
-          sessionHeaderOpacity.setViewport(el)
-        }}
-        onScroll={(event) => sessionHeaderOpacity.update(event.currentTarget.scrollTop)}
-        onWheel={(event) => {
-          if (!sessionViewport) return
-          if (event.target instanceof Node && sessionViewport.contains(event.target)) return
-          containHomeWheel(event, sessionViewport)
-        }}
-      >
-        <div class="mx-auto grid min-h-full w-full max-w-[1080px] grid-rows-[auto_minmax(0,1fr)_auto] gap-4 px-3 lg:grid-cols-[280px_minmax(0,720px)] lg:grid-rows-1 lg:gap-8 lg:px-6">
-          <HomeProjectColumn
-            projects={projects()}
-            recentlyClosed={recentlyClosed()}
-            homedir={homedir()}
-            selected={selection()}
-            focusServer={focusServer}
-            selectProject={selectProject}
-            openNewSession={openProjectNewSession}
-            openRecentProject={(conn, directory) => addProjects(conn, [directory])}
-            chooseProject={(conn) => void chooseProject(conn)}
-            editProject={editProject}
-            closeProject={(conn, directory) => {
-              const next = closeHomeProject(
-                selection(),
-                ServerConnection.key(conn),
-                global.ensureServerCtx(conn).projects,
-                directory,
-              )
-              if (next) setSelection(next)
-            }}
-            clearNotifications={clearNotifications}
-            unseenCount={unseenCount}
-            openSettings={openSettings}
-            openHelp={() => platform.openLink("https://opencode.ai/desktop-feedback")}
-            language={language}
-            onWheel={(event) => {
-              if (sessionViewport) containHomeWheel(event, sessionViewport)
-            }}
-          />
+    <div class="rounded-[10px] shadow-[var(--v2-elevation-raised)] m-2 min-h-0 lg:overflow-hidden bg-v2-background-bg-base self-stretch flex-1">
+      <div class="mx-auto grid h-full w-full max-w-[1080px] grid-rows-[auto_minmax(0,1fr)_auto] gap-4 px-3 lg:grid-cols-[280px_minmax(0,720px)] lg:grid-rows-1 lg:gap-8 lg:px-6">
+        <HomeProjectColumn
+          projects={projects()}
+          recentlyClosed={recentlyClosed()}
+          homedir={homedir()}
+          selected={selection()}
+          focusServer={focusServer}
+          selectProject={selectProject}
+          openNewSession={openProjectNewSession}
+          openRecentProject={(conn, directory) => addProjects(conn, [directory])}
+          chooseProject={(conn) => void chooseProject(conn)}
+          editProject={editProject}
+          closeProject={(conn, directory) => {
+            const next = closeHomeProject(
+              selection(),
+              ServerConnection.key(conn),
+              global.ensureServerCtx(conn).projects,
+              directory,
+            )
+            if (next) setSelection(next)
+          }}
+          clearNotifications={clearNotifications}
+          unseenCount={unseenCount}
+          openSettings={openSettings}
+          openHelp={() => platform.openLink("https://opencode.ai/desktop-feedback")}
+          language={language}
+        />
 
-          <section
-            ref={setSessionHoverTarget}
-            class="min-h-0 min-w-0 flex-1 flex flex-col"
-            aria-label={language.t("sidebar.project.recentSessions")}
+        <section
+          class="min-h-0 min-w-0 flex-1 flex flex-col pt-6 lg:pt-12 relative"
+          aria-label={language.t("sidebar.project.recentSessions")}
+        >
+          <HomeSessionSearch
+            value={state.search}
+            placeholder={searchPlaceholder()}
+            open={searchOpen()}
+            loading={sessionLoad.isLoading}
+            results={searchResults()}
+            showProjectName={!selectedProject()}
+            server={selection().server}
+            noResultsLabel={language.t("home.sessions.search.noResults", { query: search() })}
+            bindFocus={(focus) => {
+              focusSessionSearch = focus
+            }}
+            onInput={(value) => setState("search", value)}
+            onFocus={() => setState("searchFocused", true)}
+            onClose={closeSearch}
+            onSelect={selectSearchSession}
+          />
+          <ScrollView
+            class="mt-3 -mr-3 min-h-0 flex-1 relative"
+            viewportRef={sessionHeaderOpacity.setViewport}
+            onScroll={(event) => sessionHeaderOpacity.update(event.currentTarget.scrollTop)}
           >
-            <div
-              class="sticky top-0 z-30 shrink-0 bg-v2-background-bg-base pb-3 pt-6 lg:pt-12"
-              onWheel={(event) => {
-                if (sessionViewport) containHomeWheel(event, sessionViewport)
-              }}
+            <Show when={groups().length > 0 && newSessionProject()}>
+              <div class="pointer-events-none absolute top-3 right-3 z-20 flex">
+                <ButtonV2
+                  data-action="home-new-session"
+                  variant="ghost-muted"
+                  size="normal"
+                  icon="edit"
+                  class="pointer-events-auto h-7 px-2 [font-weight:530]"
+                  onClick={openNewSession}
+                >
+                  {language.t("command.session.new")}
+                </ButtonV2>
+              </div>
+            </Show>
+            <Show
+              when={!sessionLoad.isLoading}
+              fallback={
+                <div class="pt-3">
+                  <HomeSessionSkeleton label={language.t("common.loading")} />
+                </div>
+              }
             >
-              <HomeSessionSearch
-                value={state.search}
-                placeholder={searchPlaceholder()}
-                open={searchOpen()}
-                loading={sessionLoad.isLoading}
-                results={searchResults()}
-                showProjectName={!selectedProject()}
-                server={selection().server}
-                noResultsLabel={language.t("home.sessions.search.noResults", { query: search() })}
-                bindFocus={(focus) => {
-                  focusSessionSearch = focus
-                }}
-                onInput={(value) => setState("search", value)}
-                onFocus={() => setState("searchFocused", true)}
-                onClose={closeSearch}
-                onSelect={selectSearchSession}
-              />
-              <Show when={groups().length > 0 && newSessionProject()}>
-                <div class="pointer-events-none absolute right-0 top-[84px] z-20 flex lg:top-[108px]">
-                  <ButtonV2
-                    data-action="home-new-session"
-                    variant="ghost-muted"
-                    size="normal"
-                    icon="edit"
-                    class="pointer-events-auto h-7 px-2 [font-weight:530]"
-                    onClick={openNewSession}
-                  >
-                    {language.t("command.session.new")}
-                  </ButtonV2>
+              <Show
+                when={groups().length > 0}
+                fallback={<HomeSessionsEmpty onNewSession={newSessionProject() ? openNewSession : undefined} />}
+              >
+                <div ref={sessionHeaderOpacity.setContentRef} class="flex flex-col pt-3 pr-3 pb-16">
+                  <For each={groups()}>
+                    {(group, index) => (
+                      <>
+                        <HomeSessionGroupHeader
+                          title={group.title}
+                          titleOpacity={sessionHeaderOpacity.titleOpacity(group.id)}
+                          ref={(el) => sessionHeaderOpacity.setHeaderRef(group.id, el)}
+                          elevated={index() === 0}
+                        />
+                        <div
+                          class={`flex min-w-0 flex-col gap-px pt-4 ${index() === groups().length - 1 ? "" : "mb-6"}`}
+                        >
+                          <For each={group.sessions}>
+                            {(record) => (
+                              <HomeSessionRow
+                                record={record}
+                                showProjectName={!selectedProject()}
+                                server={selection().server}
+                                openSession={openSession}
+                                archiveSession={archiveSession}
+                              />
+                            )}
+                          </For>
+                        </div>
+                      </>
+                    )}
+                  </For>
                 </div>
               </Show>
-            </div>
-            {/* Sticky chrome for the portaled session scrollbar — matches old sessions ScrollView bounds */}
-            <div class="pointer-events-none sticky top-[84px] z-40 h-0 -mr-3 lg:top-[108px]">
-              <div
-                ref={setSessionThumbTrack}
-                data-component="home-session-scroll-track"
-                class="relative ml-auto h-[calc(100cqh-84px)] w-3 lg:h-[calc(100cqh-108px)]"
-              />
-            </div>
-            <div class="-mr-3 min-h-[calc(100cqh-72px)] lg:min-h-[calc(100cqh-96px)]">
-              <Show
-                when={!sessionLoad.isLoading}
-                fallback={
-                  <div class="pt-3">
-                    <HomeSessionSkeleton label={language.t("common.loading")} />
-                  </div>
-                }
-              >
-                <Show
-                  when={groups().length > 0}
-                  fallback={<HomeSessionsEmpty onNewSession={newSessionProject() ? openNewSession : undefined} />}
-                >
-                  <div ref={sessionHeaderOpacity.setContentRef} class="flex flex-col pt-3 pr-3 pb-16">
-                    <For each={groups()}>
-                      {(group, index) => (
-                        <>
-                          <HomeSessionGroupHeader
-                            title={group.title}
-                            titleOpacity={sessionHeaderOpacity.titleOpacity(group.id)}
-                            ref={(el) => sessionHeaderOpacity.setHeaderRef(group.id, el)}
-                            elevated={index() === 0}
-                          />
-                          <div
-                            class={`flex min-w-0 flex-col gap-px pt-4 ${index() === groups().length - 1 ? "" : "mb-6"}`}
-                          >
-                            <For each={group.sessions}>
-                              {(record) => (
-                                <HomeSessionRow
-                                  record={record}
-                                  showProjectName={!selectedProject()}
-                                  server={selection().server}
-                                  openSession={openSession}
-                                  archiveSession={archiveSession}
-                                />
-                              )}
-                            </For>
-                          </div>
-                        </>
-                      )}
-                    </For>
-                  </div>
-                </Show>
-              </Show>
-            </div>
-          </section>
-          <HomeUtilityNav
-            class="flex lg:hidden"
-            openSettings={openSettings}
-            openHelp={() => platform.openLink("https://opencode.ai/desktop-feedback")}
-            language={language}
-          />
-        </div>
-      </ScrollView>
+            </Show>
+          </ScrollView>
+        </section>
+        <HomeUtilityNav
+          class="flex lg:hidden"
+          openSettings={openSettings}
+          openHelp={() => platform.openLink("https://opencode.ai/desktop-feedback")}
+          language={language}
+        />
+      </div>
     </div>
   )
 }
@@ -771,7 +683,6 @@ function HomeProjectColumn(props: {
   openSettings: () => void
   openHelp: () => void
   language: ReturnType<typeof useLanguage>
-  onWheel: (event: WheelEvent) => void
 }) {
   const global = useGlobal()
   const dialog = useDialog()
@@ -788,12 +699,8 @@ function HomeProjectColumn(props: {
 
   return (
     <aside
-      class="mt-6 flex min-h-0 min-w-0 flex-col gap-4 overflow-hidden lg:sticky lg:top-14 lg:mt-14 lg:h-[calc(100cqh-56px)] lg:self-start lg:pt-[52px]"
+      class="mt-6 flex min-h-0 min-w-0 flex-col gap-4 overflow-hidden lg:mt-14 lg:pt-[52px]"
       aria-label={props.language.t("home.projects")}
-      onWheel={(event) => {
-        if (event.target === event.currentTarget) return
-        props.onWheel(event)
-      }}
     >
       <div class="flex h-7 min-w-0 shrink-0 items-center justify-between pl-1.5 pr-3">
         <div class="text-v2-text-text-muted [font-weight:530]">{props.language.t("home.projects")}</div>
@@ -1511,7 +1418,7 @@ function HomeSessionGroupHeader(props: {
   return (
     <div
       ref={props.ref}
-      class={`pointer-events-none sticky top-[84px] lg:top-[108px] flex h-7 min-w-0 items-center justify-between pl-3 bg-v2-background-bg-base ${props.elevated ? "home-session-group-header z-[5]" : "z-10"}`}
+      class={`pointer-events-none sticky top-3 flex h-7 min-w-0 items-center justify-between pl-3 bg-v2-background-bg-base ${props.elevated ? "home-session-group-header z-[5]" : "z-10"}`}
     >
       <div class={HOME_SECTION_LABEL} style={{ opacity: props.titleOpacity }}>
         {props.title}

packages/app/src/pages/layout-new.tsx

@@ -1,7 +1,7 @@
 import { createEffect, Suspense, type ParentProps } from "solid-js"
 import { useNavigate } from "@solidjs/router"
 import { DebugBar } from "@/components/debug-bar"
-import { TabsInfoPopup } from "@/components/help-button"
+import { HelpButton, TabsInfoPopup } from "@/components/help-button"
 import { Titlebar, type TitlebarUpdate } from "@/components/titlebar"
 import { usePlatform } from "@/context/platform"
 import { setNavigate } from "@/utils/notification-click"
@@ -38,6 +38,7 @@ export default function NewLayout(props: ParentProps) {
       </main>
       {import.meta.env.DEV && <DebugBar inline />}
       <TabsInfoPopup />
+      <HelpButton />
       <ToastRegion v2 />
     </div>
   )

packages/app/src/pages/layout.tsx

@@ -54,7 +54,7 @@ import { useTheme, type ColorScheme } from "@opencode-ai/ui/theme/context"
 import { useCommand, type CommandOption } from "@/context/command"
 import { ConstrainDragXAxis, getDraggableId } from "@/utils/solid-dnd"
 import { DebugBar } from "@/components/debug-bar"
-import { TabsInfoPopup } from "@/components/help-button"
+import { HelpButton, TabsInfoPopup } from "@/components/help-button"
 import { Titlebar, type TitlebarUpdate } from "@/components/titlebar"
 import { useDirectoryPicker } from "@/components/directory-picker"
 import { ServerConnection, useServer } from "@/context/server"
@@ -2396,6 +2396,7 @@ export default function LegacyLayout(props: ParentProps) {
         {import.meta.env.DEV && import.meta.env.VITE_DISABLE_DEBUG_BAR !== "1" && <DebugBar />}
       </div>
       <TabsInfoPopup />
+      <HelpButton />
       <ToastRegion v2={false} />
     </div>
   )

packages/app/src/pages/new-session.tsx

@@ -3,7 +3,6 @@ import { createStore } from "solid-js/store"
 import { Portal } from "solid-js/web"
 import { useSearchParams } from "@solidjs/router"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
-import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
 import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
 import { NewSessionDesignView } from "@/components/session"
@@ -52,7 +51,6 @@ export default function NewSessionPage() {
   const comments = useComments()
   const language = useLanguage()
   const settings = useSettings()
-  const dialog = useDialog()
   const command = useCommand()
   const providers = useProviders(() => sdk().directory)
   const openProviderSettings = useSettingsDialog("providers")
@@ -79,15 +77,6 @@ export default function NewSessionPage() {
   })
 
   command.register("new-session", () => [
-    {
-      id: "command.palette",
-      title: language.t("command.palette"),
-      hidden: true,
-      onSelect: async () => {
-        const { DialogSelectFile } = await import("@/components/dialog-select-file")
-        void dialog.show(() => <DialogSelectFile />)
-      },
-    },
     {
       id: "input.focus",
       title: language.t("command.input.focus"),

packages/app/src/pages/session.tsx

@@ -41,7 +41,6 @@ import { useLocation, useNavigate, useParams, useSearchParams } from "@solidjs/r
 import { NewSessionView, SessionHeader } from "@/components/session"
 import { ErrorPage } from "@/pages/error"
 import { CommentsProvider, useComments } from "@/context/comments"
-import { useCommand } from "@/context/command"
 import { DirectoryDataProvider } from "@/pages/directory-layout"
 import { useServerSync } from "@/context/server-sync"
 import { useLanguage } from "@/context/language"
@@ -363,7 +362,6 @@ export default function Page() {
   const platform = usePlatform()
   const prompt = usePrompt()
   const comments = useComments()
-  const command = useCommand()
   const terminal = useTerminal()
   const [searchParams, setSearchParams] = useSearchParams<{ prompt?: string }>()
   const location = useLocation()
@@ -1100,14 +1098,6 @@ export default function Page() {
     review: reviewTab,
     fileBrowser: () => newSessionDesign() && isDesktop() && !!params.id,
   })
-  command.register("session-palette", () => [
-    {
-      id: "command.palette",
-      title: language.t("command.palette"),
-      hidden: true,
-      onSelect: () => command.trigger("file.open", "palette"),
-    },
-  ])
 
   const openReviewFile = createOpenReviewFile({
     showAllFiles,

packages/app/src/pages/session/composer/session-composer-controls.ts

@@ -41,7 +41,7 @@ export function createPromptInputController(input: {
       options: local.agent.list().map((agent) => agent.name),
       current: local.agent.current()?.name ?? "",
       loading: agentsQuery.isLoading,
-      visible: local.agent.visible(),
+      visible: settings.visibility.customAgents(),
       select: local.agent.set,
     },
     model: {

packages/app/src/pages/session/use-composer-commands.tsx

@@ -1,6 +1,7 @@
 import { useCommand, type CommandOption } from "@/context/command"
 import { useLanguage } from "@/context/language"
 import { useLocal, type ModelSelection } from "@/context/local"
+import { useSettings } from "@/context/settings"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { getCursorPosition, setCursorPosition } from "@/components/prompt-input/editor-dom"
 import { useSessionLayout } from "./session-layout"
@@ -18,6 +19,7 @@ export const useComposerCommands = (input: { model?: ModelSelection } = {}) => {
   const dialog = useDialog()
   const language = useLanguage()
   const local = useLocal()
+  const settings = useSettings()
   const { sessionKey } = useSessionLayout()
   const sessionOwnership = createSessionOwnership(sessionKey)
   const model = input.model ?? local.model
@@ -68,7 +70,7 @@ export const useComposerCommands = (input: { model?: ModelSelection } = {}) => {
       description: language.t("command.agent.cycle.description"),
       keybind: "mod+.",
       slash: "agent",
-      disabled: !local.agent.visible(),
+      disabled: !settings.visibility.customAgents(),
       onSelect: () => local.agent.move(1),
     }),
     agentCommand({
@@ -76,7 +78,7 @@ export const useComposerCommands = (input: { model?: ModelSelection } = {}) => {
       title: language.t("command.agent.cycle.reverse"),
       description: language.t("command.agent.cycle.reverse.description"),
       keybind: "shift+mod+.",
-      disabled: !local.agent.visible(),
+      disabled: !settings.visibility.customAgents(),
       onSelect: () => local.agent.move(-1),
     }),
   ])

packages/app/src/pages/session/use-session-commands.tsx

@@ -468,7 +468,7 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
         id: "file.open",
         title: language.t("command.file.open"),
         description: language.t("palette.search.placeholder"),
-        keybind: "mod+p",
+        keybind: "mod+k,mod+p",
         slash: "open",
         onSelect: openFile,
       }),

packages/app/test-browser/command-palette.test.ts

@@ -1,76 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import type { GlobalSession, Project } from "@opencode-ai/sdk/v2/client"
-import { createRoot } from "solid-js"
-import { createServerSessionEntries } from "@/components/command-palette"
-import type { LocalProject } from "@/context/layout"
-import { ServerConnection } from "@/context/server"
-import { getProjectAvatarSource } from "@/pages/layout/helpers"
-
-const stored: Project = {
-  id: "project-1",
-  name: "Palette project",
-  worktree: "/workspace/project",
-  sandboxes: [],
-  time: { created: 1, updated: 1 },
-}
-
-const session: GlobalSession = {
-  id: "session-1",
-  slug: "session-1",
-  projectID: stored.id,
-  directory: stored.worktree,
-  title: "Palette session",
-  version: "1",
-  time: { created: 1, updated: 2 },
-  project: { id: stored.id, name: stored.name, worktree: stored.worktree },
-}
-
-describe("command palette sessions", () => {
-  test("uses the home project avatar and cancels superseded searches", async () => {
-    const server = ServerConnection.Key.make("selected-server")
-    const opened: LocalProject = {
-      ...stored,
-      icon: { override: "home-project-avatar" },
-      expanded: true,
-    }
-    const searches: string[] = []
-    const result = await new Promise<Awaited<ReturnType<ReturnType<typeof createServerSessionEntries>>>>(
-      (resolve, reject) => {
-        createRoot((dispose) => {
-          const search = createServerSessionEntries({
-            server,
-            opened: () => [opened],
-            stored: () => [{ ...stored, icon: { url: "stored-project-avatar" } }],
-            load: async (text) => {
-              searches.push(text)
-              return {
-                data: [session, { ...session, id: "archived-session", time: { ...session.time, archived: 3 } }],
-              }
-            },
-            untitled: () => "Untitled",
-            category: () => "Sessions",
-          })
-          const first = search("palette")
-          const second = search("palette session")
-          Promise.all([first, second])
-            .then(([cancelled, entries]) => {
-              expect(cancelled).toEqual([])
-              resolve(entries)
-            })
-            .catch(reject)
-            .finally(dispose)
-        })
-      },
-    )
-
-    expect(searches).toEqual(["palette session"])
-    expect(result).toHaveLength(1)
-    expect(getProjectAvatarSource(result[0]?.project?.id, result[0]?.project?.icon)).toBe("home-project-avatar")
-    expect(result[0]).toMatchObject({
-      server,
-      sessionID: session.id,
-      description: stored.name,
-      project: { id: stored.id, icon: opened.icon },
-    })
-  })
-})

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/cli",
-  "version": "1.18.3",
+  "version": "1.18.2",
   "type": "module",
   "license": "MIT",
   "bin": {

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

@@ -5,7 +5,7 @@ import { ServerProcess } from "../../server-process"
 
 export default Runtime.handler(
   Commands.commands.serve,
-  Effect.fnUntraced(function* (input) {
+  Effect.fn("cli.serve")(function* (input) {
     if (input.service && input.stdio) return yield* Effect.fail(new Error("--service and --stdio cannot be combined"))
     return yield* ServerProcess.run({
       mode: input.service ? "service" : input.stdio ? "stdio" : "default",

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

@@ -633,12 +633,6 @@ export function RunSubagentSelectBody(props: {
       return
     }
 
-    if (event.name.toLowerCase() === "up" && menu.selected() === 0) {
-      event.preventDefault()
-      props.onClose()
-      return
-    }
-
     handleKey({ event, menu, field: () => field, setQuery, select, close: props.onClose })
   })
 

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

@@ -23,7 +23,7 @@ import {
   movePromptHistory,
   pushPromptHistory,
 } from "./prompt.shared"
-import { Keymap } from "@opencode-ai/tui/context/keymap"
+import { OPENCODE_BASE_MODE, useBindings } from "@opencode-ai/tui/keymap"
 import { realignEditorPromptParts, resolveEditorSlashValue } from "./prompt.editor"
 import { FOOTER_MENU_ROWS, createFooterMenuState, type RunFooterMenuItem } from "./footer.menu"
 import type { RunFooterTheme } from "./theme"
@@ -993,83 +993,93 @@ export function createPromptState(input: PromptInput): PromptState {
     return true
   }
 
-  Keymap.createLayer(() => ({
+  useBindings(() => ({
+    mode: OPENCODE_BASE_MODE,
     enabled: baseBindingsEnabled(),
     commands: [
       {
-        id: "prompt.clear",
+        name: "prompt.clear",
         title: "Clear prompt or exit",
-        group: "Prompt",
+        category: "Prompt",
         run() {
           if (requestExit()) return
           return false
         },
       },
     ],
+    bindings: input.tuiConfig.keybinds.get("prompt.clear"),
   }))
 
-  Keymap.createLayer(() => ({
+  useBindings(() => ({
+    mode: OPENCODE_BASE_MODE,
     enabled: input.prompt(),
     commands: [
       {
-        id: "session.interrupt",
+        name: "session.interrupt",
         title: "Interrupt session",
-        group: "Session",
+        category: "Session",
         run() {
           if (input.onInterrupt()) return
           return false
         },
       },
     ],
+    bindings: input.tuiConfig.keybinds.get("session.interrupt"),
   }))
 
-  Keymap.createLayer(() => ({
+  useBindings(() => ({
+    mode: OPENCODE_BASE_MODE,
     enabled: input.prompt() && !visible(),
     commands: [
       {
-        id: "prompt.editor",
+        name: "prompt.editor",
         title: "Open editor",
-        group: "Prompt",
+        category: "Prompt",
         run() {
           void openEditor()
         },
       },
     ],
+    bindings: input.tuiConfig.keybinds.get("prompt.editor"),
   }))
 
-  Keymap.createLayer(() => ({
+  useBindings(() => ({
     priority: 1,
+    mode: OPENCODE_BASE_MODE,
     enabled: input.prompt() && !visible(),
     commands: [
       {
-        id: "prompt.history.previous",
+        name: "prompt.history.previous",
         title: "Previous prompt history",
-        group: "Prompt",
-        run(_input: string | undefined, event?: KeyEvent) {
-          if (!event) return false
-          return historyCommand(-1, event)
+        category: "Prompt",
+        run(ctx: { event: KeyEvent }) {
+          return historyCommand(-1, ctx.event)
         },
       },
       {
-        id: "prompt.history.next",
+        name: "prompt.history.next",
         title: "Next prompt history",
-        group: "Prompt",
-        run(_input: string | undefined, event?: KeyEvent) {
-          if (!event) return false
-          return historyCommand(1, event)
+        category: "Prompt",
+        run(ctx: { event: KeyEvent }) {
+          return historyCommand(1, ctx.event)
         },
       },
     ],
+    bindings: [
+      ...input.tuiConfig.keybinds.get("prompt.history.previous"),
+      ...input.tuiConfig.keybinds.get("prompt.history.next"),
+    ],
   }))
 
-  Keymap.createLayer(() => ({
+  useBindings(() => ({
+    mode: OPENCODE_BASE_MODE,
     enabled: input.prompt() && !visible(),
-    commands: [
+    bindings: [
       {
-        bind: "!",
-        title: "Shell mode",
+        key: "!",
+        desc: "Shell mode",
         group: "Prompt",
-        run() {
+        cmd() {
           if (shell()) return false
           if (!area || area.isDestroyed) return false
           if (area.cursorOffset !== 0) return false
@@ -1079,20 +1089,21 @@ export function createPromptState(input: PromptInput): PromptState {
     ],
   }))
 
-  Keymap.createLayer(() => ({
+  useBindings(() => ({
+    mode: OPENCODE_BASE_MODE,
     enabled: input.prompt() && shell() && !visible(),
-    commands: [
+    bindings: [
       {
-        bind: "escape",
-        title: "Exit shell mode",
+        key: "escape",
+        desc: "Exit shell mode",
         group: "Prompt",
-        run: () => setShellMode(false),
+        cmd: () => setShellMode(false),
       },
       {
-        bind: "backspace",
-        title: "Exit shell mode",
+        key: "backspace",
+        desc: "Exit shell mode",
         group: "Prompt",
-        run() {
+        cmd() {
           if (!area || area.isDestroyed) return false
           if (area.cursorOffset !== 0) return false
           setShellMode(false)
@@ -1101,31 +1112,32 @@ export function createPromptState(input: PromptInput): PromptState {
     ],
   }))
 
-  Keymap.createLayer(() => ({
+  useBindings(() => ({
+    mode: OPENCODE_BASE_MODE,
     enabled: input.prompt() && visible(),
     commands: [
       {
-        id: "prompt.autocomplete.prev",
+        name: "prompt.autocomplete.prev",
         title: "Previous autocomplete item",
-        group: "Autocomplete",
+        category: "Autocomplete",
         run: () => menu.move(-1),
       },
       {
-        id: "prompt.autocomplete.next",
+        name: "prompt.autocomplete.next",
         title: "Next autocomplete item",
-        group: "Autocomplete",
+        category: "Autocomplete",
         run: () => menu.move(1),
       },
       {
-        id: "prompt.autocomplete.hide",
+        name: "prompt.autocomplete.hide",
         title: "Hide autocomplete",
-        group: "Autocomplete",
+        category: "Autocomplete",
         run: cancelAutocomplete,
       },
       {
-        id: "prompt.autocomplete.select",
+        name: "prompt.autocomplete.select",
         title: "Select autocomplete item",
-        group: "Autocomplete",
+        category: "Autocomplete",
         run() {
           if (mode() === "slash" && options().length === 0) {
             hide()
@@ -1135,9 +1147,9 @@ export function createPromptState(input: PromptInput): PromptState {
         },
       },
       {
-        id: "prompt.autocomplete.complete",
+        name: "prompt.autocomplete.complete",
         title: "Complete autocomplete item",
-        group: "Autocomplete",
+        category: "Autocomplete",
         run() {
           if (mode() === "slash" && options().length === 0) {
             hide()
@@ -1152,6 +1164,13 @@ export function createPromptState(input: PromptInput): PromptState {
         },
       },
     ],
+    bindings: [
+      "prompt.autocomplete.prev",
+      "prompt.autocomplete.next",
+      "prompt.autocomplete.hide",
+      "prompt.autocomplete.select",
+      "prompt.autocomplete.complete",
+    ].flatMap((command) => input.tuiConfig.keybinds.get(command)),
   }))
 
   const onKeyDown = (event: KeyEvent) => {

packages/cli/src/mini/footer.ts

@@ -24,11 +24,12 @@
 // Ctrl-c clears a live prompt draft first; otherwise interrupt and exit use a
 // two-press pattern where the first press shows a hint and the second press
 // within 5 seconds actually fires the action.
-import { CliRenderEvents, type CliRenderer, type TreeSitterClient } from "@opentui/core"
+import { CliRenderEvents, type CliRenderer, type KeyEvent, type Renderable, type TreeSitterClient } from "@opentui/core"
+import type { Keymap } from "@opentui/keymap"
 import { render } from "@opentui/solid"
 import { createComponent, createSignal, type Accessor, type Setter } from "solid-js"
 import { createStore, reconcile } from "solid-js/store"
-import { Keymap } from "@opencode-ai/tui/context/keymap"
+import { OpencodeKeymapProvider } from "@opencode-ai/tui/keymap"
 import { RUN_COMMAND_PANEL_ROWS, RUN_SUBAGENT_PANEL_ROWS } from "./footer.command"
 import { SUBAGENT_INSPECTOR_ROWS } from "./footer.subagent"
 import { PROMPT_MAX_ROWS, TEXTAREA_MIN_ROWS } from "./footer.prompt"
@@ -81,6 +82,7 @@ type RunFooterOptions = {
   first: boolean
   history?: RunPrompt[]
   theme: RunTheme
+  keymap: Keymap<Renderable, KeyEvent>
   tuiConfig: RunTuiConfig
   diffStyle: RunDiffStyle
   onPermissionReply: (input: PermissionReply) => void | Promise<void>
@@ -303,8 +305,8 @@ export class RunFooter implements FooterApi {
     const footer = this
     void render(
       () =>
-        createComponent(Keymap.Provider, {
-          config: options.tuiConfig,
+        createComponent(OpencodeKeymapProvider, {
+          keymap: options.keymap,
           get children() {
             return createComponent(RunFooterView, {
               directory: options.directory,

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

@@ -27,8 +27,14 @@ import { RunPromptBody, createPromptState } from "./footer.prompt"
 import { RunPermissionBody } from "./footer.permission"
 import { RunQuestionBody } from "./footer.question"
 import { footerWidthPolicy } from "./footer.width"
-import { Keymap } from "@opencode-ai/tui/context/keymap"
-
+import {
+  OPENCODE_BASE_MODE,
+  formatKeyBindings,
+  formatKeySequence,
+  useBindings,
+  useKeymapSelector,
+  type OpenTuiKeymap,
+} from "@opencode-ai/tui/keymap"
 import type {
   FooterPromptRoute,
   FooterQueuedPrompt,
@@ -171,15 +177,75 @@ export function RunFooterView(props: RunFooterViewProps) {
     const current = route()
     return current.type === "subagent" ? subagent().details[current.sessionID] : undefined
   })
-  const shortcuts = Keymap.useShortcuts()
-  const command = () => shortcuts.get("command.palette.show") ?? ""
-  const subagentShortcut = () => shortcuts.get("session.child.first") ?? ""
-  const queuedShortcut = () => shortcuts.get("session.queued_prompts") ?? ""
-  const backgroundShortcut = () => shortcuts.get("session.background") ?? ""
-  const subagentInterruptShortcut = () => shortcuts.get("subagent.interrupt") ?? ""
-  const interrupt = () => shortcuts.get("session.interrupt") ?? ""
-  const variantCycle = () => shortcuts.all("variant.cycle") ?? ""
-  const clearShortcut = () => shortcuts.get("prompt.clear") ?? ""
+  const command = useKeymapSelector(
+    (keymap: OpenTuiKeymap) =>
+      formatKeySequence(
+        keymap
+          .getCommandBindings({ visibility: "registered", commands: ["command.palette.show"] })
+          .get("command.palette.show")?.[0]?.sequence,
+        props.tuiConfig,
+      ) ?? "",
+  )
+  const subagentShortcut = useKeymapSelector(
+    (keymap: OpenTuiKeymap) =>
+      formatKeySequence(
+        keymap
+          .getCommandBindings({ visibility: "registered", commands: ["session.child.first"] })
+          .get("session.child.first")?.[0]?.sequence,
+        props.tuiConfig,
+      ) ?? "",
+  )
+  const queuedShortcut = useKeymapSelector(
+    (keymap: OpenTuiKeymap) =>
+      formatKeySequence(
+        keymap
+          .getCommandBindings({ visibility: "registered", commands: ["session.queued_prompts"] })
+          .get("session.queued_prompts")?.[0]?.sequence,
+        props.tuiConfig,
+      ) ?? "",
+  )
+  const backgroundShortcut = useKeymapSelector(
+    (keymap: OpenTuiKeymap) =>
+      formatKeySequence(
+        keymap
+          .getCommandBindings({ visibility: "registered", commands: ["session.background"] })
+          .get("session.background")?.[0]?.sequence,
+        props.tuiConfig,
+      ) ?? "",
+  )
+  const subagentInterruptShortcut = useKeymapSelector(
+    (keymap: OpenTuiKeymap) =>
+      formatKeySequence(
+        keymap
+          .getCommandBindings({ visibility: "registered", commands: ["subagent.interrupt"] })
+          .get("subagent.interrupt")?.[0]?.sequence,
+        props.tuiConfig,
+      ) ?? "",
+  )
+  const interrupt = useKeymapSelector(
+    (keymap: OpenTuiKeymap) =>
+      formatKeySequence(
+        keymap
+          .getCommandBindings({ visibility: "registered", commands: ["session.interrupt"] })
+          .get("session.interrupt")?.[0]?.sequence,
+        props.tuiConfig,
+      ) ?? "",
+  )
+  const variantCycle = useKeymapSelector(
+    (keymap: OpenTuiKeymap) =>
+      formatKeyBindings(
+        keymap.getCommandBindings({ visibility: "registered", commands: ["variant.cycle"] }).get("variant.cycle"),
+        props.tuiConfig,
+      ) ?? "",
+  )
+  const clearShortcut = useKeymapSelector(
+    (keymap: OpenTuiKeymap) =>
+      formatKeySequence(
+        keymap.getCommandBindings({ visibility: "registered", commands: ["prompt.clear"] }).get("prompt.clear")?.[0]
+          ?.sequence,
+        props.tuiConfig,
+      ) ?? "",
+  )
   const busy = createMemo(() => props.state().phase === "running")
   const armed = createMemo(() => props.state().interrupt > 0)
   const exiting = createMemo(() => props.state().exit > 0)
@@ -438,62 +504,74 @@ export function RunFooterView(props: RunFooterViewProps) {
     props.onRequestExit?.(undefined)
   })
 
-  Keymap.createLayer(() => ({
+  useBindings(() => ({
+    mode: OPENCODE_BASE_MODE,
     enabled: active().type === "prompt" && route().type === "composer" && !composer.visible(),
     commands: [
       {
-        id: "command.palette.show",
+        name: "command.palette.show",
         title: "Open command palette",
-        group: "Prompt",
+        category: "Prompt",
         run: openCommand,
       },
       {
-        id: "variant.cycle",
+        name: "variant.cycle",
         title: "Cycle model variant",
-        group: "Model",
+        category: "Model",
         run: props.onCycle,
       },
     ],
+    bindings: [
+      ...props.tuiConfig.keybinds.get("command.palette.show"),
+      ...props.tuiConfig.keybinds.get("variant.cycle"),
+    ],
   }))
 
-  Keymap.createLayer(() => ({
+  useBindings(() => ({
+    mode: OPENCODE_BASE_MODE,
     enabled: active().type === "prompt" && route().type === "composer" && foregroundSubagents() && !!props.onBackground,
     priority: 1,
     commands: [
       {
-        id: "session.background",
+        name: "session.background",
         title: "Background subagents",
-        group: "Session",
+        category: "Session",
         run: () => props.onBackground?.(),
       },
     ],
+    bindings: props.tuiConfig.keybinds.get("session.background"),
   }))
 
-  Keymap.createLayer(() => ({
+  useBindings(() => ({
+    mode: OPENCODE_BASE_MODE,
     enabled: active().type === "prompt" && route().type === "composer" && tabs().length > 0,
     commands: [
       {
-        id: "session.child.first",
+        name: "session.child.first",
         title: "View subagents",
-        group: "Session",
+        category: "Session",
         run: openSubagentMenu,
       },
     ],
+    bindings: props.tuiConfig.keybinds.get("session.child.first"),
   }))
 
-  Keymap.createLayer(() => ({
+  useBindings(() => ({
+    mode: OPENCODE_BASE_MODE,
     enabled: active().type === "prompt" && route().type === "composer" && queuedPrompts().length > 0,
     commands: [
       {
-        id: "session.queued_prompts",
+        name: "session.queued_prompts",
         title: "Manage queued prompts",
-        group: "Session",
+        category: "Session",
         run: openQueuedMenu,
       },
     ],
+    bindings: props.tuiConfig.keybinds.get("session.queued_prompts"),
   }))
 
-  Keymap.createLayer(() => ({
+  useBindings(() => ({
+    mode: OPENCODE_BASE_MODE,
     enabled:
       active().type === "prompt" &&
       route().type === "subagent" &&
@@ -502,10 +580,9 @@ export function RunFooterView(props: RunFooterViewProps) {
     priority: 1,
     commands: [
       {
-        id: "subagent.interrupt",
+        name: "subagent.interrupt",
         title: "Interrupt subagent",
-        group: "Session",
-        bind: "ctrl+d",
+        category: "Session",
         run: () => {
           const current = selectedTab()
           if (current?.status !== "running") {
@@ -516,6 +593,7 @@ export function RunFooterView(props: RunFooterViewProps) {
         },
       },
     ],
+    bindings: [{ key: "ctrl+d", desc: "Interrupt subagent", group: "Subagents", cmd: "subagent.interrupt" }],
   }))
 
   createEffect(() => {

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

@@ -10,7 +10,9 @@
 // back to the usual two-press exit sequence through RunFooter.requestExit().
 import path from "path"
 import { CliRenderEvents, createCliRenderer, type CliRenderer, type ScrollbackWriter } from "@opentui/core"
+import { createDefaultOpenTuiKeymap } from "@opentui/keymap/opentui"
 import { Global } from "@opencode-ai/core/global"
+import { registerOpencodeKeymap } from "@opencode-ai/tui/keymap"
 import { isDefaultTitle } from "@opencode-ai/tui/util/session"
 import { Locale } from "@opencode-ai/tui/util/locale"
 import { resolveInteractiveStdin } from "./runtime.stdin"
@@ -165,6 +167,8 @@ function queueSplash(
 export async function createRuntimeLifecycle(input: LifecycleInput): Promise<Lifecycle> {
   const source = resolveInteractiveStdin()
   const footerTask = import("./footer")
+  let unregisterKeymap: (() => void) | undefined
+
   try {
     const renderer = await createCliRenderer({
       stdin: source.stdin,
@@ -183,6 +187,8 @@ export async function createRuntimeLifecycle(input: LifecycleInput): Promise<Lif
     })
     const [theme, tuiConfig] = await Promise.all([resolveRunTheme(renderer), input.tuiConfig])
     renderer.setBackgroundColor(theme.background)
+    const keymap = createDefaultOpenTuiKeymap(renderer)
+    unregisterKeymap = registerOpencodeKeymap(keymap, renderer, tuiConfig)
     const state: SplashState = {
       entry: false,
       exit: false,
@@ -227,6 +233,7 @@ export async function createRuntimeLifecycle(input: LifecycleInput): Promise<Lif
       history: input.history,
       theme,
       wrote,
+      keymap,
       tuiConfig,
       diffStyle: tuiConfig.diff_style ?? "auto",
       onPermissionReply: input.onPermissionReply,
@@ -326,6 +333,7 @@ export async function createRuntimeLifecycle(input: LifecycleInput): Promise<Lif
         footer.close()
         await footer.idle().catch(() => {})
         footer.destroy()
+        unregisterKeymap?.()
         shutdown(renderer)
         if (!wroteExit) {
           process.stdout.write("\n")
@@ -383,6 +391,7 @@ export async function createRuntimeLifecycle(input: LifecycleInput): Promise<Lif
       close,
     }
   } catch (error) {
+    unregisterKeymap?.()
     source.cleanup?.()
     throw error
   }

packages/cli/src/server-process.ts

@@ -24,14 +24,13 @@ export type Options = {
   readonly port?: number
 }
 
-// The process effect lives until server shutdown; tracing it would parent every request to one process-lifetime trace.
-export const run = Effect.fnUntraced(function* (options: Options) {
-  return yield* processEffect(options).pipe(
+export const run = Effect.fn("cli.server-process.run")((options: Options) =>
+  processEffect(options).pipe(
     Effect.provide(Updater.layer),
     Effect.provide(AppNodeBuilder.build(LayerNode.group([Global.node, AppProcess.node]))),
     Effect.provide(NodeServices.layer),
-  )
-})
+  ),
+)
 
 const processEffect = Effect.fnUntraced(function* (options: Options) {
   if (options.mode === "service") yield* Effect.sync(() => process.chdir(Global.Path.home))

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

@@ -1,9 +1,10 @@
 /** @jsxImportSource @opentui/solid */
-import { testRender } from "@opentui/solid"
-import { Keymap } from "@opencode-ai/tui/context/keymap"
+import { createDefaultOpenTuiKeymap } from "@opentui/keymap/opentui"
+import { testRender, useRenderer } from "@opentui/solid"
+import { OpencodeKeymapProvider, registerOpencodeKeymap } from "@opencode-ai/tui/keymap"
 import { resolve } from "@opencode-ai/tui/config/v1"
 import { expect, test } from "bun:test"
-import { createSignal } from "solid-js"
+import { createComponent, createSignal } from "solid-js"
 import { RunFooterView } from "../src/mini/footer.view"
 import { RUN_THEME_FALLBACK } from "../src/mini/theme"
 import type { FooterState, FooterSubagentState, FooterView } from "../src/mini/types"
@@ -41,43 +42,52 @@ test("down opens subagents from an empty prompt", async () => {
     { keybinds: { editor_open: "none", session_queued_prompts: "none" } },
     { terminalSuspend: true },
   )
+  let offKeymap: (() => void) | undefined
+
   function Harness() {
-    return (
-      <Keymap.Provider config={config}>
-        <RunFooterView
-          directory="/tmp"
-          findFiles={async () => []}
-          agents={() => []}
-          references={() => []}
-          commands={() => []}
-          providers={() => undefined}
-          currentModel={() => undefined}
-          variants={() => []}
-          currentVariant={() => undefined}
-          state={state}
-          view={view}
-          subagent={subagents}
-          theme={() => RUN_THEME_FALLBACK}
-          tuiConfig={config}
-          agent="opencode"
-          onSubmit={() => true}
-          onPermissionReply={() => {}}
-          onQuestionReply={() => {}}
-          onQuestionReject={() => {}}
-          onCycle={() => {}}
-          onInterrupt={() => false}
-          onEditorOpen={async () => undefined}
-          onInputClear={() => {}}
-          onExit={() => {}}
-          onModelSelect={() => {}}
-          onVariantSelect={() => {}}
-          onRows={() => {}}
-          onLayout={() => {}}
-          onStatus={() => {}}
-          onQueuedRemove={async () => true}
-        />
-      </Keymap.Provider>
-    )
+    const renderer = useRenderer()
+    const keymap = createDefaultOpenTuiKeymap(renderer)
+    offKeymap = registerOpencodeKeymap(keymap, renderer, config)
+
+    return createComponent(OpencodeKeymapProvider, {
+      keymap,
+      get children() {
+        return (
+          <RunFooterView
+            directory="/tmp"
+            findFiles={async () => []}
+            agents={() => []}
+            references={() => []}
+            commands={() => []}
+            providers={() => undefined}
+            currentModel={() => undefined}
+            variants={() => []}
+            currentVariant={() => undefined}
+            state={state}
+            view={view}
+            subagent={subagents}
+            theme={() => RUN_THEME_FALLBACK}
+            tuiConfig={config}
+            agent="opencode"
+            onSubmit={() => true}
+            onPermissionReply={() => {}}
+            onQuestionReply={() => {}}
+            onQuestionReject={() => {}}
+            onCycle={() => {}}
+            onInterrupt={() => false}
+            onEditorOpen={async () => undefined}
+            onInputClear={() => {}}
+            onExit={() => {}}
+            onModelSelect={() => {}}
+            onVariantSelect={() => {}}
+            onRows={() => {}}
+            onLayout={() => {}}
+            onStatus={() => {}}
+            onQueuedRemove={async () => true}
+          />
+        )
+      },
+    })
   }
 
   const app = await testRender(() => <Harness />, { width: 100, height: 8, kittyKeyboard: true })
@@ -90,6 +100,7 @@ test("down opens subagents from an empty prompt", async () => {
   } finally {
     app.renderer.currentFocusedRenderable?.blur()
     app.renderer.currentFocusedEditor?.blur()
+    offKeymap?.()
     app.renderer.destroy()
   }
 })

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

@@ -803,16 +803,6 @@ export type SessionRevertCommitted = {
   data: { sessionID: string; to: string }
 }
 
-export type SessionUsageRecorded = {
-  id: string
-  created: number
-  metadata?: { [x: string]: any }
-  type: "session.usage.recorded"
-  durable: { aggregateID: string; seq: number; version: 1 }
-  location?: LocationRef
-  data: { sessionID: string; source: "title" | "compaction"; cost: MoneyUSD; tokens: TokenUsageInfo }
-}
-
 export type ModelsDevRefreshed = {
   id: string
   created: number
@@ -2226,7 +2216,6 @@ export type SessionEventDurable =
   | SessionRevertStaged
   | SessionRevertCleared
   | SessionRevertCommitted
-  | SessionUsageRecorded
 
 export type SessionMessagesResponse = {
   data: Array<SessionMessageInfo>

packages/codemode/interpreter-support.md

@@ -4,9 +4,10 @@ This is the checkable support matrix for CodeMode's confined JavaScript interpre
 standard-library surface that programs can use today, plus concrete gaps that may be implemented later.
 
 - `[x]` means the feature is implemented at the scope described here.
-- `[ ]` means a concrete compatibility gap remains.
-- Checked items do not promise complete ECMAScript edge-case parity; known differences are stated explicitly.
-- Intentional boundaries are not listed as compatibility work.
+- `[ ]` means the feature is unavailable, incomplete, or intentionally divergent as described.
+- A checked item does not promise complete ECMAScript edge-case parity. Known differences are listed next to the
+  supported surface or under [Known semantic gaps](#known-semantic-gaps).
+- [Intentional exclusions](#intentional-exclusions) are boundaries, not backlog.
 
 When behavior changes, update this file and the tests in the same change. The implementation and tests remain the
 ultimate source of truth.
@@ -18,45 +19,42 @@ ultimate source of truth.
       TypeScript is transpiled first; the emitted JavaScript must still use the supported subset.
 - [x] Top-level `await` and `return` through the program's implicit async-function scope.
 - [x] Explicit `return`, final top-level expression as a REPL-style result, and `null` when no value is produced.
-- [x] Program results use JSON-like boundaries, with `undefined` and non-finite numbers normalized to `null`. Tool
-      arguments remain subject to their schema and the outbound-handling gap listed below.
+- [x] JSON-like host boundaries with `undefined` and non-finite numbers normalized to `null`.
 - [x] Live Date, RegExp, Map, Set, URL, and URLSearchParams values inside CodeMode.
 - [x] Tool calls through the host-provided `tools` tree only.
 - [x] The global `search(...)` built-in: synchronous tool discovery that counts as an admitted tool call and is
       shadowable by program declarations like other globals.
 - [x] Cooperative timeout, an optional total tool-call limit, output bounding, and unrestricted tool-call concurrency.
+- [ ] Full JavaScript or TypeScript compatibility. CodeMode is a bounded orchestration language.
 
 ## Values and literals
 
 - [x] `null`, `undefined`, booleans, finite and non-finite numbers, and strings.
 - [x] Array literals, including holes and spread from arrays, strings, Maps, Sets, and URLSearchParams.
-- [x] Object literals with shorthand, computed string/number keys, and spread from plain data objects; `null` and
-      `undefined` are no-ops, while arrays are rejected.
+- [x] Object literals with shorthand, computed string/number keys, and object spread.
 - [x] Template literals with interpolation.
 - [x] Regular-expression literals.
 - [x] `NaN` and `Infinity` globals.
-- [ ] BigInt literals and in-interpreter BigInt arithmetic; BigInt remains invalid at JSON-like host boundaries.
-- [ ] Symbol primitive values and symbol-keyed properties.
-- [ ] Tagged-template calls.
-- [ ] Getter and setter definitions in object literals.
+- [ ] BigInt literals and values.
+- [ ] Symbols.
+- [ ] Tagged template literals.
+- [ ] Getters and setters in object literals.
 
 ## Bindings and destructuring
 
 - [x] `const`, `let`, and accepted `var` declarations.
 - [x] Object and array destructuring in declarations, parameters, assignment expressions, and `for...of` bindings.
 - [x] Nested patterns, defaults, elisions, and rest elements.
-- [x] Assignment to identifiers, unblocked plain-object fields, non-negative integer array indexes, and writable URL
-      fields.
-- [x] Direct function declarations are hoisted in program and block statement lists.
+- [x] Assignment to identifiers, object fields, array indexes, and writable URL fields.
+- [x] Function declarations are hoisted within their interpreted scope.
 - [x] Parameter defaults observe a temporal dead zone for later parameters.
-- [ ] JavaScript-correct function scoping, hoisting, and redeclaration for accepted `var` declarations.
-- [x] Predeclare `let` and `const` bindings in every lexical scope, including program/block bodies, switch bodies, and
-      loop headers, so reads before initialization and self- or cross-referential initializers observe the JavaScript
-      temporal dead zone.
-- [ ] Hoist function declarations accepted directly in switch cases.
-- [x] Computed object destructuring keys such as `const { [field]: value } = record`.
-- [x] Object destructuring from arrays, such as `const { length } = values`.
-- [x] Array destructuring from supported non-array iterables: strings, Maps, Sets, and URLSearchParams.
+- [ ] JavaScript-correct `var` function scope, hoisting, and redeclaration. Accepted `var` currently behaves like a
+      lexical declaration; prefer `let` or `const`.
+- [ ] Complete `let`/`const` temporal-dead-zone and declaration-hoisting semantics.
+- [ ] Computed object destructuring keys such as `const { [field]: value } = record`.
+- [ ] Object destructuring from arrays, such as `const { length } = values`.
+- [ ] Iterable array destructuring from Map, Set, string, or URLSearchParams values.
+- [ ] Dynamic property deletion with `delete object[key]`.
 
 ## Statements and control flow
 
@@ -71,6 +69,7 @@ ultimate source of truth.
 - [x] `throw` with arbitrary values.
 - [ ] Labeled statements, labeled `break`, and labeled `continue`.
 - [ ] `for await...of` and async iteration.
+- [ ] `with` and `debugger` statements.
 
 ## Functions and callbacks
 
@@ -91,15 +90,15 @@ ultimate source of truth.
       like JS.
 - [x] Tool references and detached `Promise` statics are rejected as callbacks with a hint to wrap them in an
       arrow function.
-- [ ] Stop automatically awaiting promise-returning string replacers; match JavaScript's synchronous callback-result
-      coercion.
+- [x] Async string replacement callbacks; replacements are evaluated sequentially.
 - [x] The optional `thisArg` of iteration methods is accepted and ignored: CodeMode functions have no `this`, so
       ignoring it matches JS arrow-function semantics exactly.
-- [ ] `this` in non-arrow CodeMode functions and callbacks.
-- [ ] User-defined constructor calls.
-- [ ] `Function.prototype.call`, `apply`, and `bind` for CodeMode functions.
+- [ ] `this`, `super`, user-defined constructor functions, or function prototype methods such as `call`, `apply`,
+      and `bind`.
 - [ ] Classes and private fields.
 - [ ] Generator functions and `yield`.
+- [ ] Async predicates, reducers, and comparators with automatic awaiting. Async mapping can be joined explicitly with
+      `Promise.all`, but a promise is not a meaningful predicate or sort result.
 
 ## Expressions and operators
 
@@ -109,16 +108,16 @@ ultimate source of truth.
 - [x] Sequence expressions (the comma operator).
 - [x] `await` for CodeMode promises; a plain value passes through unchanged, though every `await` still defers its
       continuation one reaction turn.
-- [x] `new` for Array, Object, Error types, Date, RegExp, Map, Set, URL, URLSearchParams, and Promise.
+- [x] `new` for Error types, Date, RegExp, Map, Set, URL, URLSearchParams, and Promise.
 - [x] Arithmetic operators: `+`, `-`, `*`, `/`, `%`, and `**`.
 - [x] Equality and ordering: `==`, `!=`, `===`, `!==`, `<`, `<=`, `>`, and `>=`.
 - [x] Bitwise operators: `&`, `|`, `^`, `~`, `<<`, `>>`, and `>>>`.
 - [x] Logical operators: `&&`, `||`, `??`, and `!`, with short-circuiting.
-- [x] Unary `+`, unary `-`, `void`, `typeof`, `instanceof`, and own-property-only `in`.
+- [x] Unary `+`, unary `-`, `typeof`, `instanceof`, and own-property-only `in`.
 - [x] Prefix and postfix `++` and `--`.
 - [x] Plain, arithmetic, bitwise, and logical assignment operators.
-- [x] Property deletion on plain data objects and arrays, including computed and optional forms; deleting an array index
-      creates a hole without changing its length.
+- [ ] Unary `void` and `delete`.
+- [ ] Arbitrary constructors.
 
 ## Promises and tools
 
@@ -153,13 +152,8 @@ ultimate source of truth.
       promise itself rejects with a `TypeError`. Resolver callables work anywhere callbacks are accepted, including
       `.then`/`.catch` handlers and collection callbacks, but remain opaque references that cannot cross the data
       boundary.
-- [ ] Thenable assimilation; objects with a callable `then` field remain plain data.
-- [x] Dotted tool names are canonicalized into namespace paths; a path can be both callable and a namespace, and the
-      last definition supplied for a canonical path wins.
-- [x] Tool path segments may be named `constructor`, `prototype`, or `__proto__` because paths use inert Map keys.
-- [ ] Reject `undefined` and non-finite numbers in outbound tool arguments before render-only and OpenAPI tools run;
-      retain null normalization for program results and JSON serialization.
-- [ ] Tokenize and case-fold non-ASCII tool paths, descriptions, and queries for tool search.
+- [ ] Thenable assimilation (objects with a `then` method are plain data, not promises).
+- [ ] Async iterables, host streams, and stream consumption.
 
 ## Objects and properties
 
@@ -170,17 +164,19 @@ ultimate source of truth.
 - [x] `Object.keys`, `Object.values`, `Object.entries`, `Object.hasOwn`, `Object.assign`, and `Object.fromEntries`.
 - [x] `Object.keys` over arrays and tool references.
 - [x] Object identity is preserved by in-CodeMode Object helpers.
-- [x] Prototype traversal and mutation through `__proto__`, `constructor`, and `prototype` are blocked.
-- [ ] Legal own data fields named `__proto__`, `constructor`, or `prototype` are rejected at JSON/tool boundaries and
-      cannot be created, read, or written in CodeMode; tool path segments with those names remain supported.
-- [x] `Object.is` for supported data values.
+- [x] Blocked access to `__proto__`, `constructor`, and `prototype`.
+- [ ] `Object.is`; runtime and tool-reference identity semantics need to be defined first.
 - [ ] `Object.groupBy`.
+- [ ] Object creation, descriptors, freezing/sealing, prototype APIs, and reflection APIs.
+- [ ] A final policy for legal data keys named `__proto__`, `constructor`, or `prototype` (tool path segments
+      already allow them; see known semantic gaps).
 
 ## Arrays
 
-- [x] The `Array` constructor with or without `new`: `Array(a, b)` collects arguments and `Array(n)` creates a sparse
-      array of that length; invalid lengths throw `RangeError`. Iteration, spread, join, and JSON handle holes like
-      JavaScript, and host results normalize holes to `null`.
+- [x] The `Array` constructor with or without `new`: `Array(a, b)` collects arguments, `Array(n)` creates a
+      sparse array of that length (invalid lengths throw a `RangeError`). Holes behave like JS in iteration,
+      spread, join, and JSON; `sort` densifies holes into trailing `undefined`, and results returned to the
+      host normalize holes to `null`.
 - [x] Static methods: `Array.isArray`, `Array.of`, and `Array.from`, including the `Array.from` mapper form with
       `(value, index)` arguments.
 - [x] Iteration/transformation: `map`, `filter`, `flatMap`, and `forEach`.
@@ -194,10 +190,8 @@ ultimate source of truth.
 - [x] `length`, numeric indexing, index assignment, spread, and `for...of`.
 - [x] The `thisArg` argument of `Array.from` is accepted and ignored, like JS arrows.
 - [ ] `Array.prototype.toSpliced`.
-- [ ] Canonical array/string index parsing: a key such as `"01"` must remain an ordinary property key rather than
-      aliasing index `1`.
-- [ ] `Array.prototype.sort` and `toSorted` must preserve trailing holes; they currently turn holes into own
-      `undefined` elements.
+- [ ] Canonical index handling: a key such as `"01"` must not alias index `1`.
+- [ ] Complete sparse-array parity. Promise combinators do consume holes as `undefined` members, as in JS.
 
 ## Strings
 
@@ -210,8 +204,8 @@ ultimate source of truth.
 - [x] `localeCompare`; locale and options arguments are currently ignored.
 - [x] `toString`, `length`, numeric indexing, spread, and `for...of` by Unicode code point.
 - [x] Static `String.fromCharCode` and `String.fromCodePoint`.
-- [ ] Native argument coercion for supported String methods; for example, `includes(1)` and `slice("1")` currently
-      reject instead of coercing.
+- [ ] Locale/options-aware `localeCompare` and locale formatting APIs.
+- [ ] Exact native coercion across every string method; CodeMode often requires explicit strings/numbers.
 - [ ] Native no-argument parity for `match()` and `search()`.
 
 ## Numbers and Math
@@ -227,21 +221,20 @@ ultimate source of truth.
       `floor`, `ceil`, `round`, `trunc`, `sign`, `sqrt`, `cbrt`, `pow`, `hypot`, `cos`, `cosh`, `sin`, `sinh`,
       `tan`, `tanh`, `log`, `log2`, `log10`, `log1p`, `exp`, `expm1`, `f16round`, `fround`, `clz32`, and `imul`.
 - [ ] Native zero-argument behavior for `Number()` and `String()`; they currently do not produce `0` and `""`.
-- [ ] `++` and `--` must use CodeMode numeric coercion and reject opaque runtime references; they currently call host
-      `Number(...)` directly.
-- [ ] Unknown static members must read as `undefined` for feature detection; some currently appear callable or throw
-      during property access.
+- [ ] Safe interpreter coercion for `++` and `--` rather than host `Number(...)` coercion.
+- [ ] Reliable feature detection for unknown static members.
 - [ ] `Math.sumPrecise`.
 - [ ] Global coercing `isFinite` and `isNaN`.
 
 ## JSON and console
 
-- [x] `JSON.parse` and `JSON.stringify` for supported data objects; the blocked data-key gap listed above still applies.
+- [x] `JSON.parse` and `JSON.stringify`.
 - [x] Numeric/string indentation for `JSON.stringify`.
 - [x] Captured `console.log`, `console.info`, `console.debug`, `console.warn`, and `console.error`.
 - [x] Captured `console.dir` and `console.table`.
 - [ ] `JSON.parse` reviver callbacks.
 - [ ] `JSON.stringify` function/array replacers.
+- [ ] Other console methods, timers, counters, groups, and host console access.
 
 ## Date
 
@@ -257,22 +250,22 @@ ultimate source of truth.
 - [x] `getTimezoneOffset`, arithmetic, relational comparison, and `instanceof Date`.
 - [x] Date values serialize to ISO strings; invalid dates serialize to `null`.
 - [ ] Date setters.
-- [ ] `Date.prototype.toUTCString` and its `toGMTString` alias.
-- [ ] Native one-argument Date coercion; unsupported boolean/object inputs currently become invalid dates instead of
-      being coerced.
-- [ ] Native Date loose-equality and default primitive-coercion semantics.
+- [ ] `toUTCString`, locale methods, and other Date formatting methods.
+- [ ] Exact native constructor coercion, local-time, and loose-equality semantics.
 - [ ] Native `RangeError` branding for invalid `toISOString()` calls.
+- [ ] Temporal and Intl date/time APIs.
 
 ## Regular expressions
 
 - [x] Literal and `RegExp(pattern, flags)` construction, with or without `new`.
 - [x] `test`, `exec`, and `toString`.
 - [x] Readable `source`, `flags`, `lastIndex`, `global`, `ignoreCase`, `multiline`, `sticky`, `unicode`, and `dotAll`.
-- [x] Captures, safe named groups (blocked member names are omitted), match `.index`, and stateful global matching.
-- [x] Integration with supported String methods, including function replacers.
+- [x] Captures, named groups, match indexes, and stateful global matching.
+- [x] Integration with supported String methods, including async function replacers.
 - [ ] Writable `lastIndex`.
-- [ ] `hasIndices`, match `indices`, and `unicodeSets` metadata for the `d` and `v` flags.
+- [ ] Exposed metadata for the `d` and `v` flags.
 - [ ] `RegExp.escape`.
+- [ ] Protection from pathological host-regex backtracking beyond the cooperative execution timeout.
 
 ## Map and Set
 
@@ -283,8 +276,9 @@ ultimate source of truth.
 - [x] Materialized `keys`, `values`, and `entries` arrays for Map and Set.
 - [x] Spread, `for...of`, `Array.from`, and `Object.fromEntries` integration.
 - [x] Map and Set values serialize to `{}` at host/JSON boundaries.
-- [ ] Set composition and relation methods: `union`, `intersection`, `difference`, `symmetricDifference`, `isSubsetOf`,
-      `isSupersetOf`, and `isDisjointFrom`.
+- [ ] Set composition methods such as `union`, `intersection`, `difference`, and relation predicates.
+- [ ] WeakMap and WeakSet.
+- [ ] Native iterator objects and custom iterators.
 
 ## URL and URI helpers
 
@@ -307,12 +301,48 @@ ultimate source of truth.
       an all-rejected `Promise.any`.
 - [x] Error `name`/`message`, error inheritance through `instanceof`, and plain-data serialization.
 - [x] `instanceof` for Date, RegExp, Map, Set, URL, URLSearchParams, Array, Object, Promise, and Error types.
-- [x] Catchable user throws, runtime failures raised during interpreted evaluation, awaited tool failures, and awaited
-      tool-call-limit failures; parse/compile failures, cooperative timeout, and output bounding remain outside program
-      `catch`.
-- [x] Source locations on unsupported-syntax diagnostics for JavaScript-shaped input; TypeScript transpilation may
-      shift them.
+- [x] Catchable interpreter failures and awaited tool failures.
+- [x] Source locations on unsupported-syntax diagnostics when available.
 - [x] Sanitized model-visible diagnostics and explicit safe `ToolError` messages.
-- [ ] Distinguish user-thrown failures from interpreter defects and explicit tool refusals from sanitized internal tool
-      failures; preserve those categories in caught errors, promise rejection handlers, and `Promise.allSettled`
-      reasons.
+- [ ] Distinct public categories for user throws, tool refusal, tool internal failure, invalid returned data, compile
+      failures, and genuine interpreter defects.
+- [ ] Preservation of detailed recoverable failure categories inside `catch` and `Promise.allSettled`.
+
+## Known semantic gaps
+
+These are actionable implementation items. Check them off only when behavior and direct tests land.
+
+- [x] Return real promises from `Promise.all`, `Promise.allSettled`, and `Promise.race`.
+- [x] Canonicalize dotted tool names into namespace paths so every advertised dotted path is executable, one
+      canonical path can be both a callable tool and a namespace, and the last definition supplied for a canonical
+      path wins.
+- [x] Allow blocked member names (`constructor`, `prototype`, `__proto__`) as tool path segments: segments are Map
+      keys and inert strings, never plain-object property accesses, so every advertised path is executable. Blocked
+      member access on data values stays rejected. Tool names with empty segments are rejected at construction.
+- [ ] Define safe outbound handling for non-finite numbers and `undefined` so invalid values cannot silently become
+      `null` in render-only or OpenAPI tool calls.
+- [ ] Make regular-expression execution genuinely timeout-safe, or narrow the timeout guarantee explicitly.
+- [ ] Complete lexical declaration and destructuring semantics listed above.
+- [x] Make callback acceptance consistent across built-ins: collections, sort, string replacers, `Array.from`
+      mappers, and promise reactions share one acceptance rule.
+- [x] Reject every unsupported callable callback argument explicitly rather than silently ignoring it
+      (`JSON.stringify` replacers and `JSON.parse` revivers fail loudly). The iteration-method `thisArg` is
+      accepted and ignored: CodeMode functions have no `this`, so ignoring it matches JS arrow semantics.
+- [ ] Make async callback behavior consistent across built-ins; only string replacers settle async callback results
+      today.
+- [ ] Resolve the built-in correctness gaps listed in the Array, String, Number, Date, and RegExp sections.
+- [ ] Make tool search tokenization Unicode-aware.
+- [ ] Design explicit tagged representations and size limits before adding binary values or streams.
+
+## Intentional exclusions
+
+These constraints preserve CodeMode's confinement and host-neutral scope. They are not TODO items.
+
+- Ambient filesystem, process, environment, credential, network, or application access.
+- `fetch`, timers, crypto, or other host globals unless a future host explicitly supplies a bounded capability.
+- Static imports, dynamic imports, modules, npm packages, and module loading.
+- `eval`, `Function(...)`, arbitrary host execution, and prototype mutation.
+- Generic permission prompts, authorization policy, persistence, replay, or exactly-once side effects.
+- Arbitrary method dispatch outside the documented allowlists.
+- Automatic parsing of text tool results as JSON.
+- Full browser, Node.js, Bun, or ECMAScript runtime compatibility.

packages/codemode/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/codemode",
-  "version": "1.18.3",
+  "version": "1.18.2",
   "description": "Effect-native confined code execution over schema-described tools",
   "private": true,
   "type": "module",

packages/codemode/src/interpreter/runtime.ts

@@ -144,20 +144,6 @@ const collectPatternNames = (pattern: AstNode, out: Array<string> = []): Array<s
   return out
 }
 
-const loopDeclaration = (left: AstNode, statement: "for...of" | "for...in") => {
-  if (left.type !== "VariableDeclaration") return undefined
-  const declarations = getArray(left, "declarations")
-  if (declarations.length !== 1) {
-    throw new InterpreterRuntimeError(`${statement} supports one declared binding.`, left)
-  }
-  const kind = getString(left, "kind")
-  return {
-    pattern: getNode(asNode(declarations[0], "declarations[0]"), "id"),
-    mutable: kind !== "const",
-    lexical: kind !== "var",
-  }
-}
-
 export class Interpreter<R> {
   private scopes: ScopeStack
   private readonly invokeTool: (path: ReadonlyArray<string>, args: Array<unknown>) => Effect.Effect<unknown, unknown, R>
@@ -221,7 +207,6 @@ export class Interpreter<R> {
     // Keep top-level declarations separate so they can shadow builtins.
     this.scopes.push()
     return Effect.gen(function* () {
-      self.predeclareLexical(program.body)
       self.hoistFunctions(program.body)
       let value: unknown = undefined
       for (const [index, statement] of program.body.entries()) {
@@ -318,7 +303,6 @@ export class Interpreter<R> {
     const self = this
     return Effect.gen(function* () {
       const body = getArray(node, "body")
-      self.predeclareLexical(body)
       self.hoistFunctions(body)
 
       for (const statementValue of body) {
@@ -359,25 +343,6 @@ export class Interpreter<R> {
     }
   }
 
-  private predeclareLexical(statements: Array<unknown>): void {
-    for (const statementValue of statements) {
-      if (!isRecord(statementValue) || statementValue.type !== "VariableDeclaration") continue
-      const statement = statementValue as AstNode
-      const kind = getString(statement, "kind")
-      if (kind === "var") continue
-      for (const declarationValue of getArray(statement, "declarations")) {
-        const declaration = asNode(declarationValue, "declarations")
-        for (const name of collectPatternNames(getNode(declaration, "id"))) {
-          this.scopes.reserve(name, kind !== "const", declaration)
-        }
-      }
-    }
-  }
-
-  private predeclarePattern(pattern: AstNode, mutable: boolean, node: AstNode): void {
-    for (const name of collectPatternNames(pattern)) this.scopes.reserve(name, mutable, node)
-  }
-
   private evaluateIfStatement(node: AstNode): Effect.Effect<StatementResult, unknown, R> {
     const testNode = getNode(node, "test")
     const consequentNode = getNode(node, "consequent")
@@ -394,6 +359,7 @@ export class Interpreter<R> {
 
   private evaluateSwitchStatement(node: AstNode): Effect.Effect<StatementResult, unknown, R> {
     const self = this
+    this.scopes.push()
     return Effect.gen(function* () {
       const discriminant = yield* self.evaluateExpression(getNode(node, "discriminant"))
       if (containsOpaqueReference(discriminant)) {
@@ -403,43 +369,39 @@ export class Interpreter<R> {
           "InvalidDataValue",
         )
       }
-      self.scopes.push()
-      return yield* Effect.gen(function* () {
-        const cases = getArray(node, "cases").map((value, index) => asNode(value, `cases[${index}]`))
-        self.predeclareLexical(cases.flatMap((branch) => getArray(branch, "consequent")))
-        let defaultIndex: number | undefined
-        let selected: number | undefined
-        for (const [index, branch] of cases.entries()) {
-          const test = getOptionalNode(branch, "test")
-          if (!test) {
-            defaultIndex = index
-            continue
-          }
-          const candidate = yield* self.evaluateExpression(test)
-          if (containsOpaqueReference(candidate)) {
-            throw new InterpreterRuntimeError(
-              "Switch case values must be data values in CodeMode.",
-              test,
-              "InvalidDataValue",
-            )
-          }
-          if (candidate === discriminant) {
-            selected = index
-            break
-          }
+      const cases = getArray(node, "cases").map((value, index) => asNode(value, `cases[${index}]`))
+      let defaultIndex: number | undefined
+      let selected: number | undefined
+      for (const [index, branch] of cases.entries()) {
+        const test = getOptionalNode(branch, "test")
+        if (!test) {
+          defaultIndex = index
+          continue
         }
-        const start = selected ?? defaultIndex
-        if (start === undefined) return { kind: "none" } satisfies StatementResult
-        for (let index = start; index < cases.length; index += 1) {
-          for (const statementValue of getArray(cases[index]!, "consequent")) {
-            const result = yield* self.evaluateStatement(asNode(statementValue, "consequent"))
-            if (result.kind === "break") return { kind: "none" } satisfies StatementResult
-            if (result.kind === "return" || result.kind === "continue") return result
-          }
+        const candidate = yield* self.evaluateExpression(test)
+        if (containsOpaqueReference(candidate)) {
+          throw new InterpreterRuntimeError(
+            "Switch case values must be data values in CodeMode.",
+            test,
+            "InvalidDataValue",
+          )
         }
-        return { kind: "none" } satisfies StatementResult
-      }).pipe(Effect.ensuring(Effect.sync(() => self.scopes.pop())))
-    })
+        if (candidate === discriminant) {
+          selected = index
+          break
+        }
+      }
+      const start = selected ?? defaultIndex
+      if (start === undefined) return { kind: "none" } satisfies StatementResult
+      for (let index = start; index < cases.length; index += 1) {
+        for (const statementValue of getArray(cases[index]!, "consequent")) {
+          const result = yield* self.evaluateStatement(asNode(statementValue, "consequent"))
+          if (result.kind === "break") return { kind: "none" } satisfies StatementResult
+          if (result.kind === "return" || result.kind === "continue") return result
+        }
+      }
+      return { kind: "none" } satisfies StatementResult
+    }).pipe(Effect.ensuring(Effect.sync(() => self.scopes.pop())))
   }
 
   private evaluateWhileStatement(node: AstNode): Effect.Effect<StatementResult, unknown, R> {
@@ -503,10 +465,6 @@ export class Interpreter<R> {
       const updateNode = getOptionalNode(node, "update")
       const bodyNode = getNode(node, "body")
 
-      if (initNode?.type === "VariableDeclaration" && getString(initNode, "kind") !== "var") {
-        self.predeclareLexical([initNode])
-      }
-
       if (initNode) {
         if (initNode.type === "VariableDeclaration") {
           yield* self.evaluateVariableDeclaration(initNode)
@@ -520,18 +478,21 @@ export class Interpreter<R> {
           ? Array.from(self.scopes.current().keys())
           : []
 
-      const nextIteration = () => {
-        if (perIterationBindings.length === 0) return
-        const current = self.scopes.current()
-        self.scopes.pop()
-        self.scopes.push(
-          new Map(perIterationBindings.map((name): [string, Binding] => [name, { ...current.get(name)! }])),
-        )
-      }
-      nextIteration()
-
       while (testNode ? yield* self.evaluateExpression(testNode) : true) {
-        const result = yield* self.evaluateStatement(bodyNode)
+        const iterationScope =
+          perIterationBindings.length > 0
+            ? new Map(
+                perIterationBindings.map((name): [string, Binding] => [name, { ...self.scopes.current().get(name)! }]),
+              )
+            : undefined
+        if (iterationScope) self.scopes.push(iterationScope)
+        const result = yield* self.evaluateStatement(bodyNode).pipe(
+          Effect.ensuring(
+            Effect.sync(() => {
+              if (iterationScope) self.scopes.pop()
+            }),
+          ),
+        )
 
         if (result.kind === "return") {
           return result
@@ -541,7 +502,13 @@ export class Interpreter<R> {
           return { kind: "none" } satisfies StatementResult
         }
 
-        nextIteration()
+        if (iterationScope) {
+          const loopScope = self.scopes.current()
+          for (const name of perIterationBindings) {
+            loopScope.set(name, { ...iterationScope.get(name)! })
+          }
+        }
+
         if (updateNode) {
           yield* self.evaluateExpression(updateNode)
         }
@@ -560,13 +527,9 @@ export class Interpreter<R> {
       throw new InterpreterRuntimeError("for await...of is not supported.", node)
     }
 
-    const left = getNode(node, "left")
-    const declared = loopDeclaration(left, "for...of")
-    if (declared?.lexical) this.scopes.push()
-
     const self = this
     return Effect.gen(function* () {
-      if (declared?.lexical) self.predeclarePattern(declared.pattern, declared.mutable, left)
+      const left = getNode(node, "left")
       const right = yield* self.evaluateExpression(getNode(node, "right"))
       const body = getNode(node, "body")
 
@@ -575,34 +538,40 @@ export class Interpreter<R> {
         throw new InterpreterRuntimeError("for...of requires an array, string, Map, or Set value in CodeMode.", node)
       }
 
+      let declaration: { readonly pattern: AstNode; readonly mutable: boolean } | undefined
       let assignment: AstNode | undefined
 
-      if (
-        left.type !== "VariableDeclaration" &&
-        (left.type === "Identifier" ||
-          left.type === "MemberExpression" ||
-          left.type === "ArrayPattern" ||
-          left.type === "ObjectPattern")
+      if (left.type === "VariableDeclaration") {
+        const declarations = getArray(left, "declarations")
+        if (declarations.length !== 1) {
+          throw new InterpreterRuntimeError("for...of supports one declared binding.", left)
+        }
+
+        const declarator = asNode(declarations[0], "declarations[0]")
+        declaration = { pattern: getNode(declarator, "id"), mutable: getString(left, "kind") !== "const" }
+      } else if (
+        left.type === "Identifier" ||
+        left.type === "MemberExpression" ||
+        left.type === "ArrayPattern" ||
+        left.type === "ObjectPattern"
       ) {
         assignment = left
-      } else if (left.type !== "VariableDeclaration") {
+      } else {
         throw new InterpreterRuntimeError("Unsupported for...of binding.", left)
       }
 
       for (const value of iterable) {
-        const result = yield* Effect.gen(function* () {
-          if (declared) {
-            self.scopes.push()
-            if (declared.lexical) self.predeclarePattern(declared.pattern, declared.mutable, left)
-            yield* self.declarePattern(declared.pattern, value, declared.mutable, left, declared.lexical)
-          } else if (assignment) {
-            yield* self.assignPattern(assignment, value, left)
-          }
-          return yield* self.evaluateStatement(body)
-        }).pipe(
+        if (declaration) {
+          self.scopes.push()
+          yield* self.declarePattern(declaration.pattern, value, declaration.mutable, left)
+        } else if (assignment) {
+          yield* self.assignPattern(assignment, value, left)
+        }
+
+        const result = yield* self.evaluateStatement(body).pipe(
           Effect.ensuring(
             Effect.sync(() => {
-              if (declared) self.scopes.pop()
+              if (declaration) self.scopes.pop()
             }),
           ),
         )
@@ -612,7 +581,7 @@ export class Interpreter<R> {
         }
 
         if (result.kind === "break") {
-          return { kind: "none" } satisfies StatementResult
+          return { kind: "none" }
         }
 
         if (result.kind === "continue") {
@@ -620,14 +589,8 @@ export class Interpreter<R> {
         }
       }
 
-      return { kind: "none" } satisfies StatementResult
-    }).pipe(
-      Effect.ensuring(
-        Effect.sync(() => {
-          if (declared?.lexical) self.scopes.pop()
-        }),
-      ),
-    )
+      return { kind: "none" }
+    })
   }
 
   private enumerableKeys(value: unknown): Array<string> | undefined {
@@ -644,13 +607,9 @@ export class Interpreter<R> {
   }
 
   private evaluateForInStatement(node: AstNode): Effect.Effect<StatementResult, unknown, R> {
-    const left = getNode(node, "left")
-    const declared = loopDeclaration(left, "for...in")
-    if (declared?.lexical) this.scopes.push()
-
     const self = this
     return Effect.gen(function* () {
-      if (declared?.lexical) self.predeclarePattern(declared.pattern, declared.mutable, left)
+      const left = getNode(node, "left")
       const right = yield* self.evaluateExpression(getNode(node, "right"))
       const body = getNode(node, "body")
 
@@ -662,28 +621,35 @@ export class Interpreter<R> {
         )
       }
 
+      let declaration: { readonly pattern: AstNode; readonly mutable: boolean } | undefined
       let assignmentName: string | undefined
 
-      if (left.type === "Identifier") {
+      if (left.type === "VariableDeclaration") {
+        const declarations = getArray(left, "declarations")
+        if (declarations.length !== 1) {
+          throw new InterpreterRuntimeError("for...in supports one declared binding.", left)
+        }
+
+        const declarator = asNode(declarations[0], "declarations[0]")
+        declaration = { pattern: getNode(declarator, "id"), mutable: getString(left, "kind") !== "const" }
+      } else if (left.type === "Identifier") {
         assignmentName = getString(left, "name")
-      } else if (left.type !== "VariableDeclaration") {
+      } else {
         throw new InterpreterRuntimeError("Unsupported for...in binding.", left)
       }
 
       for (const key of keys) {
-        const result = yield* Effect.gen(function* () {
-          if (declared) {
-            self.scopes.push()
-            if (declared.lexical) self.predeclarePattern(declared.pattern, declared.mutable, left)
-            yield* self.declarePattern(declared.pattern, key, declared.mutable, left, declared.lexical)
-          } else if (assignmentName) {
-            self.scopes.set(assignmentName, key, left)
-          }
-          return yield* self.evaluateStatement(body)
-        }).pipe(
+        if (declaration) {
+          self.scopes.push()
+          yield* self.declarePattern(declaration.pattern, key, declaration.mutable, left)
+        } else if (assignmentName) {
+          self.scopes.set(assignmentName, key, left)
+        }
+
+        const result = yield* self.evaluateStatement(body).pipe(
           Effect.ensuring(
             Effect.sync(() => {
-              if (declared) self.scopes.pop()
+              if (declaration) self.scopes.pop()
             }),
           ),
         )
@@ -693,7 +659,7 @@ export class Interpreter<R> {
         }
 
         if (result.kind === "break") {
-          return { kind: "none" } satisfies StatementResult
+          return { kind: "none" }
         }
 
         if (result.kind === "continue") {
@@ -701,14 +667,8 @@ export class Interpreter<R> {
         }
       }
 
-      return { kind: "none" } satisfies StatementResult
-    }).pipe(
-      Effect.ensuring(
-        Effect.sync(() => {
-          if (declared?.lexical) self.scopes.pop()
-        }),
-      ),
-    )
+      return { kind: "none" }
+    })
   }
 
   private evaluateBreakStatement(node: AstNode): StatementResult {
@@ -792,7 +752,7 @@ export class Interpreter<R> {
 
         const init = getOptionalNode(declaration, "init")
         const value = init ? yield* self.evaluateExpression(init) : undefined
-        yield* self.declarePattern(getNode(declaration, "id"), value, kind !== "const", declaration, kind !== "var")
+        yield* self.declarePattern(getNode(declaration, "id"), value, kind !== "const", declaration)
       }
     })
   }
@@ -802,27 +762,24 @@ export class Interpreter<R> {
     value: unknown,
     mutable: boolean,
     node: AstNode,
-    initialize = false,
   ): Effect.Effect<void, unknown, R> {
     const self = this
     return Effect.gen(function* () {
       if (pattern.type === "Identifier") {
-        const name = getString(pattern, "name")
-        if (initialize) self.scopes.initialize(name, value, node)
-        else self.scopes.declare(name, value, mutable, node)
+        self.scopes.declare(getString(pattern, "name"), value, mutable, node)
         return
       }
 
       if (pattern.type === "AssignmentPattern") {
         const resolved = value === undefined ? yield* self.evaluateExpression(getNode(pattern, "right")) : value
-        yield* self.declarePattern(getNode(pattern, "left"), resolved, mutable, node, initialize)
+        yield* self.declarePattern(getNode(pattern, "left"), resolved, mutable, node)
         return
       }
 
       if (pattern.type === "ObjectPattern") {
-        if (value === null || typeof value !== "object" || isRuntimeReference(value)) {
+        if (value === null || typeof value !== "object" || Array.isArray(value) || isRuntimeReference(value)) {
           throw new InterpreterRuntimeError(
-            "Object destructuring requires a data object or array value.",
+            "Object destructuring requires a data object value.",
             pattern,
             "InvalidDataValue",
           )
@@ -837,40 +794,42 @@ export class Interpreter<R> {
             for (const [key, item] of Object.entries(value as SafeObject)) {
               if (!consumed.has(key) && !isBlockedMember(key)) rest[key] = item
             }
-            yield* self.declarePattern(getNode(property, "argument"), rest, mutable, property, initialize)
+            yield* self.declarePattern(getNode(property, "argument"), rest, mutable, property)
             continue
           }
 
-          const key = yield* self.destructuringPropertyKey(property)
-          if (isBlockedMember(String(key))) {
-            throw new InterpreterRuntimeError(`Property '${String(key)}' is not available in CodeMode.`, property)
+          if (
+            property.type !== "Property" ||
+            getBoolean(property, "computed") ||
+            getString(property, "kind") !== "init"
+          ) {
+            throw new InterpreterRuntimeError("Only named object destructuring properties are supported.", property)
           }
-          consumed.add(String(key))
-          yield* self.declarePattern(
-            getNode(property, "value"),
-            self.destructuringPropertyValue(value as SafeObject | Array<unknown>, key),
-            mutable,
-            property,
-            initialize,
-          )
+
+          const keyNode = getNode(property, "key")
+          const key = keyNode.type === "Identifier" ? getString(keyNode, "name") : String(keyNode.value)
+          if (isBlockedMember(key)) {
+            throw new InterpreterRuntimeError(`Property '${key}' is not available in CodeMode.`, keyNode)
+          }
+          consumed.add(key)
+          yield* self.declarePattern(getNode(property, "value"), (value as SafeObject)[key], mutable, property)
         }
         return
       }
 
       if (pattern.type === "ArrayPattern") {
-        const items = spreadItems(value)
-        if (items === undefined) {
-          throw new InterpreterRuntimeError("Array destructuring requires a supported iterable value.", pattern)
+        if (!Array.isArray(value)) {
+          throw new InterpreterRuntimeError("Array destructuring requires an array value.", pattern)
         }
 
         for (const [index, item] of getArray(pattern, "elements").entries()) {
           if (item === null) continue
           const element = asNode(item, `elements[${index}]`)
           if (element.type === "RestElement") {
-            yield* self.declarePattern(getNode(element, "argument"), items.slice(index), mutable, element, initialize)
+            yield* self.declarePattern(getNode(element, "argument"), value.slice(index), mutable, element)
             break
           }
-          yield* self.declarePattern(element, items[index], mutable, pattern, initialize)
+          yield* self.declarePattern(element, value[index], mutable, pattern)
         }
         return
       }
@@ -899,15 +858,15 @@ export class Interpreter<R> {
       }
 
       if (pattern.type === "ObjectPattern") {
-        if (value === null || typeof value !== "object" || isRuntimeReference(value)) {
+        if (value === null || typeof value !== "object" || Array.isArray(value) || isRuntimeReference(value)) {
           throw new InterpreterRuntimeError(
-            "Object destructuring requires a data object or array value.",
+            "Object destructuring requires a data object value.",
             pattern,
             "InvalidDataValue",
           )
         }
 
-        const source = value as SafeObject | Array<unknown>
+        const source = value as SafeObject
         const consumed = new Set<string>()
         for (const propertyValue of getArray(pattern, "properties")) {
           const property = asNode(propertyValue, "properties")
@@ -919,29 +878,36 @@ export class Interpreter<R> {
             yield* self.assignPattern(getNode(property, "argument"), rest, property)
             continue
           }
-          const key = yield* self.destructuringPropertyKey(property)
-          if (isBlockedMember(String(key))) {
-            throw new InterpreterRuntimeError(`Property '${String(key)}' is not available in CodeMode.`, property)
+          if (
+            property.type !== "Property" ||
+            getBoolean(property, "computed") ||
+            getString(property, "kind") !== "init"
+          ) {
+            throw new InterpreterRuntimeError("Only named object destructuring properties are supported.", property)
           }
-          consumed.add(String(key))
-          yield* self.assignPattern(getNode(property, "value"), self.destructuringPropertyValue(source, key), property)
+          const keyNode = getNode(property, "key")
+          const key = keyNode.type === "Identifier" ? getString(keyNode, "name") : String(keyNode.value)
+          if (isBlockedMember(key)) {
+            throw new InterpreterRuntimeError(`Property '${key}' is not available in CodeMode.`, keyNode)
+          }
+          consumed.add(key)
+          yield* self.assignPattern(getNode(property, "value"), source[key], property)
         }
         return
       }
 
       if (pattern.type === "ArrayPattern") {
-        const items = spreadItems(value)
-        if (items === undefined) {
-          throw new InterpreterRuntimeError("Array destructuring requires a supported iterable value.", pattern)
+        if (!Array.isArray(value)) {
+          throw new InterpreterRuntimeError("Array destructuring requires an array value.", pattern)
         }
         for (const [index, item] of getArray(pattern, "elements").entries()) {
           if (item === null) continue
           const element = asNode(item, `elements[${index}]`)
           if (element.type === "RestElement") {
-            yield* self.assignPattern(getNode(element, "argument"), items.slice(index), element)
+            yield* self.assignPattern(getNode(element, "argument"), value.slice(index), element)
             break
           }
-          yield* self.assignPattern(element, items[index], pattern)
+          yield* self.assignPattern(element, value[index], pattern)
         }
         return
       }
@@ -950,26 +916,6 @@ export class Interpreter<R> {
     })
   }
 
-  private destructuringPropertyKey(property: AstNode): Effect.Effect<string | number, unknown, R> {
-    if (property.type !== "Property" || getString(property, "kind") !== "init") {
-      throw new InterpreterRuntimeError("Unsupported object destructuring property.", property)
-    }
-    const keyNode = getNode(property, "key")
-    if (getBoolean(property, "computed")) {
-      return Effect.map(this.evaluateExpression(keyNode), (value) => this.toPropertyKey(value, keyNode))
-    }
-    return Effect.succeed(keyNode.type === "Identifier" ? getString(keyNode, "name") : String(keyNode.value))
-  }
-
-  private destructuringPropertyValue(source: SafeObject | Array<unknown>, key: string | number): unknown {
-    if (!Array.isArray(source)) return source[String(key)]
-    if (key === "length") return source.length
-    if (typeof key === "number") return source[key]
-    if (Object.hasOwn(source, key)) return (source as Record<string, unknown> & Array<unknown>)[key]
-    if (arrayMethods.has(key)) return new IntrinsicReference(source, key)
-    return undefined
-  }
-
   private evaluateExpression(node: AstNode): Effect.Effect<unknown, unknown, R> {
     switch (node.type) {
       case "Literal": {
@@ -1333,7 +1279,6 @@ export class Interpreter<R> {
   private evaluateUnaryExpression(node: AstNode): Effect.Effect<unknown, unknown, R> {
     const operator = getString(node, "operator")
     const argument = getNode(node, "argument")
-    if (operator === "delete") return this.evaluateDeleteExpression(argument)
     // Undeclared names short-circuit, but declared TDZ bindings must still throw.
     if (operator === "typeof" && argument.type === "Identifier" && !this.scopes.resolve(getString(argument, "name"))) {
       return Effect.succeed("undefined")
@@ -1341,7 +1286,6 @@ export class Interpreter<R> {
     return Effect.map(this.evaluateExpression(argument), (value) => {
       if (operator === "typeof") return typeofValue(value)
       if (operator === "!") return !value
-      if (operator === "void") return undefined
       if (containsOpaqueReference(value)) {
         throw new InterpreterRuntimeError("Unary operators require data values in CodeMode.", node, "InvalidDataValue")
       }
@@ -1621,10 +1565,10 @@ export class Interpreter<R> {
       }
       for (const [index, parameter] of fn.parameters.entries()) {
         if (parameter.type === "RestElement") {
-          yield* invocation.declarePattern(getNode(parameter, "argument"), args.slice(index), true, parameter, true)
+          yield* invocation.declarePattern(getNode(parameter, "argument"), args.slice(index), true, parameter)
           break
         }
-        yield* invocation.declarePattern(parameter, args[index], true, parameter, true)
+        yield* invocation.declarePattern(parameter, args[index], true, parameter)
       }
 
       if (fn.body.type === "BlockStatement") {
@@ -1785,7 +1729,6 @@ export class Interpreter<R> {
 
   private getMemberReference(
     node: AstNode,
-    operation: "read" | "delete" = "read",
   ): Effect.Effect<
     | MemberReference
     | ToolReference
@@ -1932,7 +1875,6 @@ export class Interpreter<R> {
       }
 
       if (Array.isArray(objectValue)) {
-        if (operation === "delete") return { target: objectValue, key }
         if (
           key !== "length" &&
           !(typeof key === "string" && arrayMethods.has(key)) &&
@@ -1981,29 +1923,6 @@ export class Interpreter<R> {
     return this.modifyMember(node, () => Effect.succeed({ write: true, next: value, result: value }))
   }
 
-  private evaluateDeleteExpression(argument: AstNode): Effect.Effect<boolean, unknown, R> {
-    const target = argument.type === "ChainExpression" ? getNode(argument, "expression") : argument
-    if (target.type !== "MemberExpression") {
-      throw new InterpreterRuntimeError("Only data fields may be deleted in CodeMode.", argument)
-    }
-    return Effect.map(this.getMemberReference(target, "delete"), (reference) => {
-      if (reference === OptionalShortCircuit) return true
-      if (
-        reference instanceof ComputedValue ||
-        reference === undefined ||
-        reference instanceof ToolReference ||
-        reference instanceof PromiseMethodReference ||
-        reference instanceof PromiseInstanceMethodReference ||
-        reference instanceof IntrinsicReference ||
-        reference instanceof GlobalMethodReference ||
-        reference.target instanceof CodeModeURL
-      ) {
-        throw new InterpreterRuntimeError("Only data fields may be deleted in CodeMode.", target, "InvalidDataValue")
-      }
-      return Reflect.deleteProperty(reference.target, reference.key)
-    })
-  }
-
   // Resolve side-effecting object and key expressions exactly once.
   private modifyMember(
     node: AstNode,

packages/codemode/src/interpreter/scope.ts

@@ -7,28 +7,14 @@ export class ScopeStack {
     this.scopes = scopes
   }
 
-  reserve(name: string, mutable: boolean, node: AstNode): void {
-    const scope = this.current()
-    if (scope.has(name)) {
-      throw new InterpreterRuntimeError(`Identifier '${name}' has already been declared.`, node)
-    }
-    scope.set(name, { mutable, value: undefined, initialized: false })
-  }
-
-  initialize(name: string, value: unknown, node: AstNode): void {
-    const binding = this.current().get(name)
-    if (!binding || binding.initialized !== false) {
-      throw new InterpreterRuntimeError(`Identifier '${name}' has not been reserved for initialization.`, node)
-    }
-    binding.value = value
-    binding.initialized = true
-  }
-
   declare(name: string, value: unknown, mutable: boolean, node: AstNode): void {
     const scope = this.current()
-    if (scope.has(name)) {
+
+    const existing = scope.get(name)
+    if (existing && existing.initialized !== false) {
       throw new InterpreterRuntimeError(`Identifier '${name}' has already been declared.`, node)
     }
+
     scope.set(name, { mutable, value, initialized: true })
   }
 
@@ -53,10 +39,6 @@ export class ScopeStack {
       throw new InterpreterRuntimeError(`Unknown identifier '${name}'.`, node).as("ReferenceError")
     }
 
-    if (binding.initialized === false) {
-      throw new InterpreterRuntimeError(`Cannot access '${name}' before initialization.`, node).as("ReferenceError")
-    }
-
     if (!binding.mutable) {
       throw new InterpreterRuntimeError(`Cannot assign to constant '${name}'.`, node).as("TypeError")
     }

packages/codemode/src/stdlib/object.ts

@@ -1,5 +1,4 @@
 import { type AstNode, InterpreterRuntimeError } from "../interpreter/model.js"
-import { containsOpaqueReference } from "../interpreter/references.js"
 import { isBlockedMember } from "../tool-runtime.js"
 import { isCodeModeValue, CodeModeMap, CodeModePromise, CodeModeSet, CodeModeURLSearchParams } from "../values.js"
 import { boundedData, coerceToString } from "./value.js"
@@ -45,11 +44,6 @@ export const invokeObjectMethod = (name: string, args: Array<unknown>, node: Ast
       return Object.entries(requireObject()).map(([key, item]) => [key, item])
     case "hasOwn":
       return Object.hasOwn(requireObject(), String(args[1]))
-    case "is":
-      if (containsOpaqueReference(args[0]) || containsOpaqueReference(args[1])) {
-        throw new InterpreterRuntimeError("Object.is requires data values in CodeMode.", node, "InvalidDataValue")
-      }
-      return Object.is(args[0], args[1])
     case "assign": {
       const target = args[0]
       if (target === null || typeof target !== "object" || Array.isArray(target) || isCodeModeValue(target)) {

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

@@ -1,188 +0,0 @@
-/*
- * Portions adapted from Test262 at revision 250f204f23a9249ff204be2baec29600faae7b75:
- * - test/language/statements/let/global-use-before-initialization-in-prior-statement.js
- * - test/language/statements/let/block-local-use-before-initialization-in-prior-statement.js
- * - test/language/statements/const/global-use-before-initialization-in-prior-statement.js
- * - test/language/statements/const/block-local-use-before-initialization-in-prior-statement.js
- * - test/language/statements/let/block-local-use-before-initialization-in-declaration-statement.js
- * - test/language/statements/const/block-local-use-before-initialization-in-declaration-statement.js
- * - test/language/statements/let/block-local-closure-set-before-initialization.js
- * - test/language/statements/for-of/head-let-bound-names-fordecl-tdz.js
- * - test/language/statements/for-in/head-let-bound-names-fordecl-tdz.js
- * - test/language/statements/let/syntax/let-iteration-variable-is-freshly-allocated-for-each-iteration-single-let-binding.js
- * - test/language/statements/let/syntax/let-iteration-variable-is-freshly-allocated-for-each-iteration-multi-let-binding.js
- * - test/language/statements/for-of/head-let-fresh-binding-per-iteration.js
- * - test/language/statements/for-in/head-let-fresh-binding-per-iteration.js
- * - test/language/statements/for/scope-head-lex-open.js
- * - test/language/statements/for/scope-body-lex-open.js
- * - test/language/statements/switch/scope-lex-open-case.js
- * - test/language/statements/switch/scope-lex-close-case.js
- * - test/language/statements/function/dflt-params-ref-prior.js
- * - test/language/statements/function/dflt-params-ref-later.js
- * - test/language/statements/function/dflt-params-ref-self.js
- *
- * Copyright (C) 2011, 2014, 2016 the V8 project authors. All rights reserved.
- * Test262 portions are governed by the BSD license in LICENSE.test262.
- */
-import { describe, expect, test } from "bun:test"
-import { Effect } from "effect"
-import { CodeMode } from "../src/index.js"
-
-const value = async (code: string) => {
-  const result = await Effect.runPromise(CodeMode.execute({ code, tools: {} }))
-  if (!result.ok) throw new Error(`expected success, got ${result.error.kind}: ${result.error.message}`)
-  return result.value
-}
-
-describe("Test262 lexical temporal dead zones", () => {
-  test("program and block bindings exist before initialization", async () => {
-    expect(
-      await value(`
-        const errors = []
-        try { programLet; let programLet } catch (error) { errors.push(error.name) }
-        try { programConst; const programConst = 1 } catch (error) { errors.push(error.name) }
-        try { { blockLet; let blockLet } } catch (error) { errors.push(error.name) }
-        try { { blockConst; const blockConst = 1 } } catch (error) { errors.push(error.name) }
-        return errors
-      `),
-    ).toEqual(["ReferenceError", "ReferenceError", "ReferenceError", "ReferenceError"])
-  })
-
-  test("self-initialization and closure assignment observe the TDZ", async () => {
-    expect(
-      await value(`
-        const errors = []
-        try { { let item = item + 1 } } catch (error) { errors.push(error.name) }
-        try { { const item = item + 1 } } catch (error) { errors.push(error.name) }
-        try {
-          {
-            function assign() { item = 1 }
-            assign()
-            let item
-          }
-        } catch (error) { errors.push(error.name) }
-        return errors
-      `),
-    ).toEqual(["ReferenceError", "ReferenceError", "ReferenceError"])
-  })
-
-  test("for-of and for-in bound names are in the head TDZ", async () => {
-    expect(
-      await value(`
-        const errors = []
-        try { let item = [1]; for (let item of item) {} } catch (error) { errors.push(error.name) }
-        try { let item = { value: 1 }; for (let item in item) {} } catch (error) { errors.push(error.name) }
-        return errors
-      `),
-    ).toEqual(["ReferenceError", "ReferenceError"])
-  })
-})
-
-describe("Test262 lexical loop environments", () => {
-  test("classic for creates fresh single and multiple bindings", async () => {
-    expect(
-      await value(`
-        const single = []
-        for (let index = 0; index < 5; ++index) single.push(() => index)
-
-        const left = []
-        const right = []
-        for (let first = 0, second = 10; first < 5; ++first, ++second) {
-          left.push(() => first)
-          right.push(() => second)
-        }
-        return [
-          single.map((read) => read()),
-          left.map((read) => read()),
-          right.map((read) => read()),
-        ]
-      `),
-    ).toEqual([
-      [0, 1, 2, 3, 4],
-      [0, 1, 2, 3, 4],
-      [10, 11, 12, 13, 14],
-    ])
-  })
-
-  test("for-of and for-in create fresh bindings", async () => {
-    expect(
-      await value(`
-        const values = []
-        for (let item of [1, 2, 3]) values.push(() => item)
-
-        const keys = {}
-        for (let key in { first: 1, second: 2, third: 3 }) keys[key] = () => key
-        return [values.map((read) => read()), keys.first(), keys.second(), keys.third()]
-      `),
-    ).toEqual([[1, 2, 3], "first", "second", "third"])
-  })
-
-  test("classic for separates declaration and per-iteration environments", async () => {
-    expect(
-      await value(`
-        let before
-        let testRead
-        let bodyRead
-        let updateRead
-        let run = true
-        for (
-          let item = "outside", ignored = before = () => item;
-          run && (item = "inside", testRead = () => item);
-          updateRead = () => item
-        ) bodyRead = () => item, run = false
-        return [before(), testRead(), bodyRead(), updateRead()]
-      `),
-    ).toEqual(["outside", "inside", "inside", "inside"])
-  })
-})
-
-describe("Test262 switch and parameter environments", () => {
-  test("switch creates its lexical environment after the discriminant", async () => {
-    expect(
-      await value(`
-        let item = "outside"
-        let discriminantRead
-        let selectorRead
-        let statementRead
-        switch ((discriminantRead = () => item, null)) {
-          case (selectorRead = () => item, null):
-            statementRead = () => item
-            let item = "inside"
-        }
-        return [discriminantRead(), selectorRead(), statementRead()]
-      `),
-    ).toEqual(["outside", "inside", "inside"])
-  })
-
-  test("all switch cases share one lexical environment that closes afterward", async () => {
-    expect(
-      await value(`
-        let item = "outside"
-        let firstRead
-        let secondRead
-        switch (null) {
-          case null:
-            let item = "inside"
-            firstRead = () => item
-          case null:
-            secondRead = () => item
-        }
-        return [firstRead(), secondRead(), item]
-      `),
-    ).toEqual(["inside", "inside", "outside"])
-  })
-
-  test("parameter defaults see prior bindings but not self or later bindings", async () => {
-    expect(
-      await value(`
-        function prior(first, second = first, third = second) { return [first, second, third] }
-        function later(first = second, second) { return first }
-        function self(item = item) { return item }
-        function failure(run) {
-          try { return run() } catch (error) { return error.name }
-        }
-        return [prior(3), failure(later), failure(self)]
-      `),
-    ).toEqual([[3, 3, 3], "ReferenceError", "ReferenceError"])
-  })
-})

packages/codemode/test/parity.test.ts

@@ -99,137 +99,6 @@ describe("H4: typeof on an undeclared identifier is 'undefined'", () => {
   })
 })
 
-describe("CodeMode lexical scope integration", () => {
-  test("keeps self, cross, and destructuring defaults in the TDZ", async () => {
-    expect(
-      await value(`
-        const outer = 1
-        const errors = []
-        try { const first = second, second = 2 } catch (error) { errors.push(error.name) }
-        try { const [first = second, second = 2] = [] } catch (error) { errors.push(error.name) }
-        return errors
-      `),
-    ).toEqual(["ReferenceError", "ReferenceError"])
-  })
-
-  test("keeps typeof and constant assignment inside the TDZ", async () => {
-    expect(
-      await value(`
-        const errors = []
-        try { { errors.push(typeof item); let item } } catch (error) { errors.push(error.name) }
-        try { { constant = 1; const constant = 2 } } catch (error) { errors.push(error.name) }
-        return errors
-      `),
-    ).toEqual(["ReferenceError", "ReferenceError"])
-  })
-
-  test("shadows builtins from the start of the program scope", async () => {
-    expect(
-      await value(`
-        let observed
-        try { observed = typeof Promise } catch (error) { observed = error.name }
-        const Promise = 1
-        return observed
-      `),
-    ).toBe("ReferenceError")
-  })
-
-  test("keeps classic for initializers inside the header TDZ", async () => {
-    expect(
-      await value(`
-        let index = 1
-        try { for (let index = index; index < 2; index++) {} } catch (error) { return error.name }
-      `),
-    ).toBe("ReferenceError")
-  })
-
-  test("removes loop scopes when per-iteration initialization fails", async () => {
-    expect(
-      await value(`
-        const value = "outer"
-        try { for (let [value] of [1]) {} } catch {}
-        return value
-      `),
-    ).toBe("outer")
-  })
-})
-
-describe("unary void", () => {
-  test("evaluates its operand and returns undefined", async () => {
-    expect(
-      await value(`let count = 0; const result = void (count += 1); return [count, result === undefined]`),
-    ).toEqual([1, true])
-  })
-
-  test("discards opaque values", async () => {
-    expect(await value(`return void tools === undefined`)).toBe(true)
-  })
-})
-
-describe("property deletion", () => {
-  test("deletes plain object fields and reports missing fields as successful", async () => {
-    expect(
-      await value(`
-        const object = { keep: 1, remove: 2 }
-        return [delete object.remove, delete object.missing, object]
-      `),
-    ).toEqual([true, true, { keep: 1 }])
-  })
-
-  test("evaluates computed object and key expressions once", async () => {
-    expect(
-      await value(`
-        const object = { remove: true }
-        let objectReads = 0
-        let keyReads = 0
-        function getObject() { objectReads++; return object }
-        function getKey() { keyReads++; return "remove" }
-        const removed = delete getObject()[getKey()]
-        return [removed, objectReads, keyReads, Object.hasOwn(object, "remove")]
-      `),
-    ).toEqual([true, 1, 1, false])
-  })
-
-  test("deleting an array index creates a hole without changing its length", async () => {
-    expect(
-      await value(
-        `const values = [1, 2, 3]; const removed = delete values[1]; return [removed, values.length, 1 in values, values]`,
-      ),
-    ).toEqual([true, 3, false, [1, null, 3]])
-  })
-
-  test("array length is not configurable", async () => {
-    expect(await value(`const values = [1, 2]; return [delete values.length, values.length]`)).toEqual([false, 2])
-  })
-
-  test("does not broaden unsupported array property assignment", async () => {
-    expect(
-      await value(`
-        const values = []
-        let rightHandSideRuns = 0
-        function next() { rightHandSideRuns++; return 1 }
-        try { values.field = next() } catch {}
-        return rightHandSideRuns
-      `),
-    ).toBe(0)
-  })
-
-  test("optional deletion short-circuits without evaluating the key", async () => {
-    expect(
-      await value(`let keyReads = 0; const object = null; return [delete object?.[keyReads++], keyReads]`),
-    ).toEqual([true, 0])
-  })
-
-  test("rejects deletion from opaque runtime references", async () => {
-    expect((await error(`return delete tools.example`)).kind).toBe("InvalidDataValue")
-  })
-
-  test("keeps blocked property names unavailable", async () => {
-    expect((await error(`const object = {}; return delete object.__proto__`)).kind).toBe("ExecutionFailure")
-    expect((await error(`const values = []; return delete values["constructor"]`)).kind).toBe("ExecutionFailure")
-  })
-})
-
 describe("H1: NaN/Infinity flow as intermediates and normalize to null at the boundary", () => {
   test("guards run instead of the program crashing on a transient NaN", async () => {
     expect(await value(`return parseInt("abc") || 0`)).toBe(0)
@@ -601,71 +470,4 @@ describe("destructuring assignment", () => {
   test("returns the assigned value", async () => {
     expect(await value(`let a = 0; const result = ([a] = [7]); return [a, result]`)).toEqual([7, [7]])
   })
-
-  test("supports computed object keys and evaluates them once", async () => {
-    expect(
-      await value(`
-        let calls = 0
-        const field = () => { calls++; return "name" }
-        const { [field()]: name, ...rest } = { name: "Ada", role: "engineer" }
-        return { calls, name, rest }
-      `),
-    ).toEqual({ calls: 1, name: "Ada", rest: { role: "engineer" } })
-  })
-
-  test("supports object patterns over arrays", async () => {
-    expect(
-      await value(`
-        const { 0: first, length, slice, ...rest } = ["a", "b", "c"]
-        return { first, length, sliced: slice(1), rest }
-      `),
-    ).toEqual({ first: "a", length: 3, sliced: ["b", "c"], rest: { 1: "b", 2: "c" } })
-  })
-
-  test("preserves exact computed property names on arrays", async () => {
-    expect(
-      await value(`
-        const { ["01"]: item, ...rest } = [10, 20]
-        return { missing: item === undefined, rest }
-      `),
-    ).toEqual({ missing: true, rest: { 0: 10, 1: 20 } })
-  })
-
-  test("supports array patterns over strings, Maps, Sets, and URLSearchParams", async () => {
-    expect(
-      await value(`
-        const [letter, ...letters] = "A😀B"
-        const [[mapKey, mapValue]] = new Map([["key", 1]])
-        const [setFirst, setSecond] = new Set([2, 3])
-        const [[queryKey, queryValue]] = new URLSearchParams("q=test&page=2")
-        return { letter, letters, mapKey, mapValue, setFirst, setSecond, queryKey, queryValue }
-      `),
-    ).toEqual({
-      letter: "A",
-      letters: ["😀", "B"],
-      mapKey: "key",
-      mapValue: 1,
-      setFirst: 2,
-      setSecond: 3,
-      queryKey: "q",
-      queryValue: "test",
-    })
-  })
-
-  test("supports iterable patterns in assignment and parameters", async () => {
-    expect(
-      await value(`
-        let first
-        let rest
-        ;[first, ...rest] = new Set([1, 2, 3])
-        const read = ([[key, value]]) => key + value
-        return { first, rest, entry: read(new Map([["a", 4]])) }
-      `),
-    ).toEqual({ first: 1, rest: [2, 3], entry: "a4" })
-  })
-
-  test("rejects computed keys that are not confined property keys", async () => {
-    const err = await error(`const key = {}; const { [key]: value } = {}`)
-    expect(err.message).toContain("Property key must be a string or number")
-  })
 })

packages/codemode/test/stdlib.test.ts

@@ -593,24 +593,6 @@ describe("Set", () => {
 })
 
 describe("stdlib integration", () => {
-  test("Object.is uses SameValue semantics", async () => {
-    expect(
-      await value(`
-        const object = {}
-        return [
-          Object.is(NaN, NaN),
-          Object.is(0, -0),
-          Object.is(object, object),
-          Object.is({}, {}),
-        ]
-      `),
-    ).toEqual([true, false, true, false])
-  })
-
-  test("Object.is rejects opaque runtime references", async () => {
-    expect((await error(`return Object.is(Math.max, Math.max)`)).kind).toBe("InvalidDataValue")
-  })
-
   test("Object values and entries accept arrays", async () => {
     expect(await value(`return [Object.values(["a", "b"]), Object.entries(["a", "b"])]`)).toEqual([
       ["a", "b"],

packages/console/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-app",
-  "version": "1.18.3",
+  "version": "1.18.2",
   "type": "module",
   "license": "MIT",
   "scripts": {

packages/console/core/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/console-core",
-  "version": "1.18.3",
+  "version": "1.18.2",
   "private": true,
   "type": "module",
   "license": "MIT",

packages/console/function/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-function",
-  "version": "1.18.3",
+  "version": "1.18.2",
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
   "type": "module",

packages/console/mail/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-mail",
-  "version": "1.18.3",
+  "version": "1.18.2",
   "dependencies": {
     "@jsx-email/all": "2.2.3",
     "@jsx-email/cli": "1.4.3",

packages/console/support/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-support",
-  "version": "1.18.3",
+  "version": "1.18.2",
   "type": "module",
   "license": "MIT",
   "scripts": {

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.18.3",
+  "version": "1.18.2",
   "name": "@opencode-ai/core",
   "type": "module",
   "license": "MIT",

packages/core/script/wellknown-server.ts

@@ -1,112 +0,0 @@
-const token = "dummy-wellknown-token"
-const port = Number(process.env.PORT ?? 8787)
-const config = {
-  $schema: "https://opencode.ai/config.json",
-  share: "manual",
-  model: "example-primary/example-chat",
-  enabled_providers: ["example-primary", "example-secondary"],
-  disabled_providers: ["opencode", "anthropic", "openai", "google", "xai", "amazon-bedrock", "azure"],
-  provider: {
-    "example-primary": {
-      name: "Example Primary",
-      npm: "@ai-sdk/openai-compatible",
-      whitelist: ["example-chat", "example-code"],
-      options: {
-        baseURL: "https://models.example.com/v1",
-        apiKey: "{env:TOKEN}",
-      },
-      models: {
-        "example-chat": {
-          name: "Example Chat",
-          reasoning: true,
-          tool_call: true,
-          attachment: true,
-          modalities: {
-            input: ["text", "image"],
-            output: ["text"],
-          },
-          limit: {
-            context: 128000,
-            output: 16000,
-          },
-        },
-        "example-code": {
-          name: "Example Code",
-          reasoning: true,
-          tool_call: true,
-          limit: {
-            context: 200000,
-            output: 32000,
-          },
-        },
-      },
-    },
-    "example-secondary": {
-      name: "Example Secondary",
-      npm: "@ai-sdk/openai-compatible",
-      whitelist: ["example-fast"],
-      options: {
-        baseURL: "https://inference.example.org/v1",
-        apiKey: "{env:TOKEN}",
-      },
-      models: {
-        "example-fast": {
-          name: "Example Fast",
-          tool_call: true,
-          limit: {
-            context: 64000,
-            output: 8000,
-          },
-        },
-      },
-    },
-  },
-  mcp: {
-    "example-tools": {
-      type: "remote",
-      url: "https://tools.example.net/mcp",
-      enabled: false,
-    },
-  },
-  permission: {
-    bash: "ask",
-    edit: "ask",
-    webfetch: "ask",
-    read: {
-      "*": "allow",
-      "*.env": "deny",
-      "*.env.*": "deny",
-      "*.env.example": "allow",
-    },
-  },
-}
-
-const server = Bun.serve({
-  hostname: "127.0.0.1",
-  port,
-  async fetch(request) {
-    const url = new URL(request.url)
-    if (url.pathname === "/.well-known/opencode") {
-      return Response.json({
-        auth: {
-          command: ["bun", "-e", `await Bun.sleep(5000); process.stdout.write(${JSON.stringify(token)})`],
-          env: "TOKEN",
-        },
-        remote_config: {
-          url: `${url.origin}/config/opencode.json`,
-          headers: { authorization: "Bearer {env:TOKEN}" },
-        },
-      })
-    }
-    if (url.pathname === "/config/opencode.json") {
-      if (request.headers.get("authorization") !== `Bearer ${token}`) {
-        return new Response("Unauthorized", { status: 401 })
-      }
-      return Response.json(config)
-    }
-    return new Response("Not found", { status: 404 })
-  },
-})
-
-console.log(`Well-known fixture listening at ${server.url.origin}`)
-console.log(`Test with: bun run dev auth connect ${server.url.origin}`)

packages/core/src/config.ts

@@ -2,9 +2,8 @@ export * as Config from "./config"
 
 import { makeLocationNode } from "./effect/app-node"
 import path from "path"
-import { isDeepStrictEqual } from "node:util"
 import { type ParseError, parse } from "jsonc-parser"
-import { Context, Effect, Fiber, Layer, Option, PubSub, Schema, Semaphore, Stream } from "effect"
+import { Context, Effect, Fiber, Layer, Option, PubSub, Schema, Stream } from "effect"
 import { Permission } from "@opencode-ai/schema/permission"
 import { Config as ConfigSchema } from "@opencode-ai/schema/config"
 import { Integration } from "@opencode-ai/schema/integration"
@@ -166,7 +165,6 @@ const layer = Layer.effect(
     const credentials = yield* Credential.Service
     const wellknown = yield* WellKnown.Service
     const names = ["opencode.json", "opencode.jsonc"]
-    const reloadLock = Semaphore.makeUnsafe(1)
     const decodeOptions = { errors: "all", onExcessProperty: "ignore", propertyOrder: "original" } as const
     const decodeInfo = Schema.decodeUnknownOption(Info, decodeOptions)
     const decodeV1Info = Schema.decodeUnknownOption(ConfigV1.Info, decodeOptions)
@@ -328,17 +326,12 @@ const layer = Layer.effect(
       }
     })
 
-    const reload = Effect.fn("Config.reload")(() =>
-      reloadLock.withPermit(
-        Effect.gen(function* () {
-          const next = yield* discover()
-          if (isDeepStrictEqual(configs, next)) return
-          configs = next
-          yield* reconcile(next)
-          yield* events.publish(ConfigSchema.Event.Updated, {})
-        }),
-      ),
-    )
+    const reload = Effect.fn("Config.reload")(function* () {
+      const next = yield* discover()
+      configs = next
+      yield* reconcile(next)
+      yield* events.publish(ConfigSchema.Event.Updated, {})
+    })
 
     yield* Stream.fromPubSub(updates).pipe(
       Stream.debounce("100 millis"),
@@ -361,29 +354,12 @@ const layer = Layer.effect(
       ),
       Effect.forkScoped({ startImmediately: true }),
     )
-    yield* events.subscribe(WellKnown.Event.Updated).pipe(
+    yield* wellknown.changes.pipe(
       Stream.runForEach(() =>
         reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload wellknown sources", { cause }))),
       ),
       Effect.forkScoped({ startImmediately: true }),
     )
-    yield* Effect.sleep("10 minutes").pipe(
-      Effect.andThen(
-        Effect.suspend(() => {
-          if (!wellknown.snapshot().length) return Effect.void
-          return Effect.gen(function* () {
-            const changed = yield* wellknown.refresh().pipe(
-              Effect.catch((error) =>
-                Effect.logWarning("failed to refresh wellknown manifests", { error }).pipe(Effect.as(false)),
-              ),
-            )
-            if (!changed) yield* reload()
-          }).pipe(Effect.catchCause((cause) => Effect.logWarning("failed to refresh wellknown config", { cause })))
-        }),
-      ),
-      Effect.forever,
-      Effect.forkScoped({ startImmediately: true }),
-    )
     yield* reconcile(initial)
 
     return Service.of({

packages/core/src/config/compaction.ts

@@ -9,6 +9,7 @@ export class Keep extends Schema.Class<Keep>("ConfigV2.Compaction.Keep")({
 
 export class Info extends Schema.Class<Info>("ConfigV2.Compaction")({
   auto: Schema.Boolean.pipe(Schema.optional),
+  prune: Schema.Boolean.pipe(Schema.optional),
   keep: Keep.pipe(Schema.optional),
   buffer: NonNegativeInt.pipe(Schema.optional),
 }) {}

packages/core/src/config/experimental.ts

@@ -2,13 +2,9 @@ export * as ConfigExperimental from "./experimental"
 
 import { Schema } from "effect"
 import { NonNegativeInt } from "../schema"
-import { ConfigPolicy } from "./policy"
 
 export class Info extends Schema.Class<Info>("ConfigExperimental.Info")({
   subagent_depth: NonNegativeInt.pipe(Schema.optional).annotate({
     description: "Maximum subagent nesting depth. Defaults to 1.",
   }),
-  policies: ConfigPolicy.Info.pipe(Schema.Array, Schema.optional).annotate({
-    description: "Ordered policies controlling access to configured resources",
-  }),
 }) {}

packages/core/src/config/plugin/policy.ts

@@ -1,35 +0,0 @@
-export * as ConfigPolicyPlugin from "./policy"
-
-import { define } from "@opencode-ai/plugin/v2/effect/plugin"
-import { Effect, Stream } from "effect"
-import { Config } from "../../config"
-import { Wildcard } from "../../util/wildcard"
-
-export const Plugin = define({
-  id: "opencode.config.policy",
-  effect: Effect.fn(function* (ctx) {
-    const config = yield* Config.Service
-    const loaded = { entries: yield* config.entries() }
-    yield* ctx.catalog.transform((catalog) => {
-      // User-global policy takes priority over policy authored by a repository.
-      const policies = loaded.entries
-        .filter((entry): entry is Config.Document => entry.type === "document")
-        .toReversed()
-        .flatMap((entry) => entry.info.experimental?.policies ?? [])
-      for (const record of catalog.provider.list()) {
-        const policy = policies.findLast((policy) => Wildcard.match(record.provider.id, policy.resource))
-        if (policy?.effect === "deny") catalog.provider.remove(record.provider.id)
-      }
-    })
-    yield* ctx.event.subscribe().pipe(
-      Stream.filter((event) => event.type === "config.updated"),
-      Stream.runForEach(() =>
-        config.entries().pipe(
-          Effect.tap((entries) => Effect.sync(() => (loaded.entries = entries))),
-          Effect.andThen(ctx.catalog.reload()),
-        ),
-      ),
-      Effect.forkScoped({ startImmediately: true }),
-    )
-  }),
-})

packages/core/src/config/policy.ts

@@ -1,13 +0,0 @@
-export * as ConfigPolicy from "./policy"
-
-import { Schema } from "effect"
-
-export const Effect = Schema.Literals(["allow", "deny"])
-export type Effect = typeof Effect.Type
-
-export const Info = Schema.Struct({
-  action: Schema.Literal("provider.use"),
-  resource: Schema.String,
-  effect: Effect,
-})
-export type Info = typeof Info.Type

packages/core/src/location-services.ts

@@ -39,7 +39,6 @@ import { InstructionDiscovery } from "./instruction-discovery"
 import { InstructionBuiltIns } from "./instructions/builtins"
 import { InstructionEntry } from "./session/instruction-entry"
 import { SessionInstructions } from "./session/instructions"
-import { SessionGenerateNode } from "./session/generate-node"
 import { McpTool } from "./tool/mcp"
 import { ReadToolFileSystem } from "./tool/read-filesystem"
 import { ToolRegistry } from "./tool/registry"
@@ -82,7 +81,6 @@ const locationServiceNodes = [
   Form.node,
   QuestionV2.node,
   Generate.node,
-  SessionGenerateNode.node,
   ReadToolFileSystem.node,
   McpTool.node,
   SessionInstructions.node,

packages/core/src/plugin/internal.ts

@@ -10,7 +10,6 @@ import { Config } from "../config"
 import { ConfigAgentPlugin } from "../config/plugin/agent"
 import { ConfigCommandPlugin } from "../config/plugin/command"
 import { ConfigProviderPlugin } from "../config/plugin/provider"
-import { ConfigPolicyPlugin } from "../config/plugin/policy"
 import { ConfigReferencePlugin } from "../config/plugin/reference"
 import { ConfigSkillPlugin } from "../config/plugin/skill"
 import { EventV2 } from "../event"
@@ -152,7 +151,6 @@ const post = [
   ConfigSkillPlugin.Plugin,
   ConfigProviderPlugin.Plugin,
   VariantPlugin.Plugin,
-  ConfigPolicyPlugin.Plugin,
 ] as const satisfies readonly InternalPlugin[]
 
 export const list = Effect.fn("PluginInternal.list")(function* () {

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

@@ -176,7 +176,6 @@ export const OpenAIPlugin = define({
       draft.method.update(browser)
       draft.method.update(headless)
     })
-    yield* load()
     yield* ctx.catalog.transform((evt) => {
       for (const item of evt.provider.list()) {
         if (!ProviderV2.isAISDK(item.provider.package)) continue
@@ -214,6 +213,7 @@ export const OpenAIPlugin = define({
       Stream.runForEach(refresh),
       Effect.forkScoped({ startImmediately: true }),
     )
+    yield* refresh().pipe(Effect.forkScoped)
     yield* ctx.aisdk.hook(
       "sdk",
       Effect.fn(function* (evt) {

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

@@ -114,7 +114,7 @@ export const OpencodePlugin = define<HttpClient.HttpClient | EventV2.Service | S
       draft.method.update({ integrationID: "opencode", method: { type: "key", label: "API key (service account)" } })
     })
 
-    yield* load()
+    connected = (yield* ctx.integration.connection.active("opencode")) !== undefined
     yield* ctx.catalog.transform((catalog) => {
       for (const [providerID, item] of Object.entries(providers ?? {})) {
         catalog.provider.update(providerID, (provider) => {
@@ -194,6 +194,7 @@ export const OpencodePlugin = define<HttpClient.HttpClient | EventV2.Service | S
       Stream.runForEach(refresh),
       Effect.forkScoped({ startImmediately: true }),
     )
+    yield* refresh()
   }),
 })
 

packages/core/src/session.ts

@@ -33,12 +33,10 @@ import { LocationServiceMap } from "./location-service-map"
 import { MessageDecodeError } from "./session/error"
 import { SessionEvent } from "./session/event"
 import { SessionPending } from "./session/pending"
-import { SessionGenerate } from "./session/generate"
 import { Snapshot } from "./snapshot"
 import { SessionRevert } from "./session/revert"
 import { Session } from "@opencode-ai/schema/session"
 import { FSUtil } from "./fs-util"
-import { Image } from "./image"
 import { Mime } from "./mime"
 import type { EventLog } from "@opencode-ai/schema/event-log"
 import { SkillV2 } from "./skill"
@@ -177,7 +175,6 @@ export type Error =
   | CommandV2.NotFoundError
   | CommandV2.EvaluationError
   | MessageNotFoundError
-  | SessionGenerate.Error
 
 export interface Interface {
   readonly list: (input?: ListInput) => Effect.Effect<{
@@ -210,11 +207,12 @@ export interface Interface {
    */
   readonly pending: (sessionID: SessionSchema.ID) => Effect.Effect<SessionPending.Info[], NotFoundError>
   /**
-   * Durable, ordered session log read. Replays durable session events after
-   * the exclusive `after` cursor, emits a `Synced` marker at the captured
-   * replay watermark, then continues live when `follow` is set.
-   * The marker's seq may exceed the last emitted event because other durable
-   * events share the aggregate's sequence space.
+   * Durable, ordered session log read. Replays public durable
+   * session events after the exclusive `after` cursor, emits a `Synced`
+   * marker at the captured replay watermark, then continues live when `follow`
+   * is set.
+   * The marker's seq may exceed the last emitted event because non-public
+   * durable events share the aggregate's sequence space.
    */
   readonly log: (input: {
     sessionID: SessionSchema.ID
@@ -245,11 +243,6 @@ export interface Interface {
     delivery?: SessionPending.Delivery
     resume?: boolean
   }) => Effect.Effect<SessionPending.User, NotFoundError | PromptConflictError | AttachmentError>
-  /** Generates text from current Session context without admitting input or mutating history. */
-  readonly generate: (input: {
-    sessionID: SessionSchema.ID
-    prompt: string
-  }) => Effect.Effect<string, NotFoundError | SessionGenerate.Error>
   readonly command: (input: {
     id?: SessionMessage.ID
     sessionID: SessionSchema.ID
@@ -538,13 +531,9 @@ const layer = Layer.effect(
             // continues from the reverted boundary rather than stale post-boundary history.
             if (session.revert)
               yield* SessionRevert.commit(session).pipe(Effect.provideService(EventV2.Service, events))
-            // Resolved lazily so prompt admission only boots location services when an
-            // image attachment actually needs the resizer.
-            const image = Image.Service.pipe(Effect.provide(locations.get(session.location)))
-            const prompt = yield* resolvePrompt(
-              { text: input.text, files: input.files, agents: input.agents },
-              image,
-            ).pipe(Effect.provideService(FSUtil.Service, fs))
+            const prompt = yield* resolvePrompt({ text: input.text, files: input.files, agents: input.agents }).pipe(
+              Effect.provideService(FSUtil.Service, fs),
+            )
             const messageID = input.id ?? SessionMessage.ID.create()
             const admittedInput = SessionPending.Message.make({
               type: "user",
@@ -575,11 +564,6 @@ const layer = Layer.effect(
           }),
         ),
       ),
-      generate: Effect.fn("V2Session.generate")(function* (input) {
-        const session = yield* result.get(input.sessionID)
-        const generate = yield* SessionGenerate.Service.pipe(Effect.provide(locations.get(session.location)))
-        return yield* generate.generate(input)
-      }),
       command: Effect.fn("V2Session.command")(function* (input) {
         const session = yield* result.get(input.sessionID)
         const commands = yield* CommandV2.Service.pipe(Effect.provide(locations.get(session.location)))
@@ -875,13 +859,10 @@ function synthesizeTerminalShellInfo(started: ShellSchema.Info): ShellSchema.Inf
   }
 }
 
-const resolvePrompt = Effect.fn("V2Session.resolvePrompt")(function* (
-  input: PromptInput.Prompt,
-  image: Effect.Effect<Image.Interface>,
-) {
+const resolvePrompt = Effect.fn("V2Session.resolvePrompt")(function* (input: PromptInput.Prompt) {
   const fs = yield* FSUtil.Service
   const files = input.files
-    ? yield* Effect.forEach(input.files, (file) => materializeAttachment(fs, file, image), { concurrency: 8 })
+    ? yield* Effect.forEach(input.files, (file) => materializeAttachment(fs, file), { concurrency: 8 })
     : undefined
   return Prompt.make({ text: input.text, agents: input.agents, files })
 })
@@ -891,7 +872,6 @@ const MAX_ATTACHMENT_BYTES = 20 * 1024 * 1024
 const materializeAttachment = Effect.fn("V2Session.materializeAttachment")(function* (
   fs: FSUtil.Interface,
   input: PromptInput.FileAttachment,
-  image: Effect.Effect<Image.Interface>,
 ) {
   const resolved = input.uri.startsWith("data:")
     ? {
@@ -920,15 +900,9 @@ const materializeAttachment = Effect.fn("V2Session.materializeAttachment")(funct
             .join("\n"),
         )
       : resolved.bytes
-  const normalized = yield* normalizeImageAttachment(
-    input,
-    Base64.make(Buffer.from(content).toString("base64")),
-    mime,
-    image,
-  )
   return FileAttachment.create({
-    data: normalized.data,
-    mime: normalized.mime,
+    data: Base64.make(Buffer.from(content).toString("base64")),
+    mime,
     source: resolved.source,
     name: input.name ?? resolved.name,
     description: input.description,
@@ -936,23 +910,6 @@ const materializeAttachment = Effect.fn("V2Session.materializeAttachment")(funct
   })
 })
 
-const normalizeImageAttachment = Effect.fn("V2Session.normalizeImageAttachment")(function* (
-  input: PromptInput.FileAttachment,
-  data: Base64,
-  mime: string,
-  image: Effect.Effect<Image.Interface>,
-) {
-  if (!mime.startsWith("image/")) return { data, mime }
-  const service = yield* image
-  const label = input.name ?? (input.uri.startsWith("data:") ? "inline attachment" : input.uri)
-  const content = { uri: label, content: data, encoding: "base64" as const, mime }
-  const normalized = yield* service.normalize(label, content).pipe(
-    Effect.catchTag("Image.ResizerUnavailableError", () => Effect.succeed(content)),
-    Effect.mapError((error) => new AttachmentError({ uri: label, message: error.message })),
-  )
-  return { data: Base64.make(normalized.content), mime: normalized.mime }
-})
-
 const readFileAttachment = Effect.fn("V2Session.readFileAttachment")(function* (fs: FSUtil.Interface, uri: string) {
   const url = yield* Effect.try({
     try: () => new URL(uri),

packages/core/src/session/compaction.ts

@@ -14,8 +14,6 @@ import { SessionRunnerModel } from "./runner/model"
 import { SessionSchema } from "./schema"
 import { toSessionError } from "./to-session-error"
 import { Token } from "../util/token"
-import type { ModelV2 } from "../model"
-import { SessionUsage } from "./usage"
 
 const DEFAULT_BUFFER = 20_000
 const DEFAULT_KEEP_TOKENS = 8_000
@@ -72,7 +70,6 @@ export type AutoInput = {
   readonly session: SessionSchema.Info
   readonly messages: readonly SessionMessage.Info[]
   readonly model: Model
-  readonly cost: ModelV2.Info["cost"]
 }
 
 export type ManualInput = {
@@ -84,7 +81,6 @@ export type ManualInput = {
 type Plan = {
   readonly session: SessionSchema.Info
   readonly model: Model
-  readonly cost: ModelV2.Info["cost"]
   readonly reason: SessionMessage.Compaction["reason"]
   readonly prompt: string
   readonly recent: string
@@ -244,16 +240,6 @@ const make = (dependencies: Dependencies) => {
 
     const chunks: string[] = []
     let failure: SessionError.Error | undefined
-    let usage: SessionUsage.Recorded | undefined
-    const recordUsage = Effect.suspend(() =>
-      usage
-        ? dependencies.events.publish(SessionEvent.UsageRecorded, {
-            sessionID: plan.session.id,
-            source: "compaction",
-            ...usage,
-          })
-        : Effect.void,
-    )
     yield* dependencies.llm
       .stream(
         LLM.request({
@@ -277,10 +263,6 @@ const make = (dependencies: Dependencies) => {
               text: event.text,
             })
           }
-          if (LLMEvent.is.stepFinish(event)) {
-            const step = SessionUsage.record(event.usage, plan.cost)
-            usage = usage ? SessionUsage.add(usage, step) : step
-          }
           return Effect.void
         }),
         Effect.catchTag("LLM.Error", (error) =>
@@ -289,21 +271,16 @@ const make = (dependencies: Dependencies) => {
           }),
         ),
         Effect.onInterrupt(() =>
-          recordUsage.pipe(
-            Effect.andThen(
-              plan.reason === "auto"
-                ? failed({
-                    sessionID: plan.session.id,
-                    reason: plan.reason,
-                    error: { type: "compaction.interrupted", message: "Compaction was interrupted" },
-                    inputID: plan.inputID,
-                  }).pipe(Effect.asVoid)
-                : Effect.void,
-            ),
-          ),
+          plan.reason === "auto"
+            ? failed({
+                sessionID: plan.session.id,
+                reason: plan.reason,
+                error: { type: "compaction.interrupted", message: "Compaction was interrupted" },
+                inputID: plan.inputID,
+              }).pipe(Effect.asVoid)
+            : Effect.void,
         ),
       )
-    yield* recordUsage
     const summary = chunks.join("")
     if (failure || !summary.trim()) {
       const error = failure ?? { type: "compaction.failed" as const, message: "Compaction produced no summary" }
@@ -328,7 +305,6 @@ const make = (dependencies: Dependencies) => {
       return yield* execute({
         session: input.session,
         model: input.model,
-        cost: input.cost,
         reason: "auto",
         ...content,
       })
@@ -377,7 +353,6 @@ const make = (dependencies: Dependencies) => {
     return yield* execute({
       session: input.session,
       model: resolved.model,
-      cost: resolved.cost,
       reason: "manual",
       inputID: input.inputID,
       ...content,

packages/core/src/session/context.ts

@@ -34,19 +34,13 @@ export interface Loaded {
   readonly messages: ReadonlyArray<SessionMessage.Info>
 }
 
-/**
- * Resolves model-request state in two phases: `select` fixes the Session,
- * agent, and instruction sources; `load` adds the model and active history for
- * that selection. This module does not build or execute the model request.
- */
 export interface Interface {
-  /** Selects the Session, agent, and instruction sources used by subsequent work. */
+  /** Resolves the Session, selected agent, and current instruction sources before durable Step preparation. */
   readonly select: (sessionID: SessionSchema.ID) => Effect.Effect<Selection, AgentNotFoundError>
-  /** Resolves the model and active history for that selection. */
+  /** Loads the selected model and active history after instruction sync and pending-input promotion. */
   readonly load: (selection: Selection) => Effect.Effect<Loaded, SessionRunnerModel.Error>
 }
 
-/** Location-scoped model-context loader for durable Session Steps. */
 export class Service extends Context.Service<Service, Interface>()("@opencode/v2/SessionContext") {}
 
 const layer = Layer.effect(

packages/core/src/session/generate-node.ts

@@ -1,69 +0,0 @@
-export * as SessionGenerateNode from "./generate-node"
-
-import { LLM, LLMClient, Message, SystemPart } from "@opencode-ai/ai"
-import { Effect, Layer } from "effect"
-import { Database } from "../database/database"
-import { makeLocationNode } from "../effect/app-node"
-import { llmClient } from "../effect/app-node-platform"
-import { PluginHooks } from "../plugin/hooks"
-import { SessionContext } from "./context"
-import { SessionGenerate } from "./generate"
-import { SessionHistory } from "./history"
-import { SessionModelHeaders } from "./model-headers"
-import { SessionRunnerModel } from "./runner/model"
-import PROMPT_DEFAULT from "./runner/prompt/base.txt"
-import { toLLMMessages } from "./runner/to-llm-message"
-
-const layer = Layer.effect(
-  SessionGenerate.Service,
-  Effect.gen(function* () {
-    const context = yield* SessionContext.Service
-    const database = yield* Database.Service
-    const hooks = yield* PluginHooks.Service
-    const llm = yield* LLMClient.Service
-    const models = yield* SessionRunnerModel.Service
-
-    return SessionGenerate.Service.of({
-      generate: Effect.fn("SessionGenerate.generate")(function* (input) {
-        const selection = yield* context.select(input.sessionID)
-        const model = yield* models.resolve(selection.session)
-        const history = yield* SessionHistory.preview(database.db, selection.session.id, selection.instructions)
-        const providerMetadataKey = model.model.route.providerMetadataKey ?? model.model.provider
-        const promptCacheKey = /^ses_[0-9a-f]{64}$/.test(selection.session.id)
-          ? selection.session.id.slice(4)
-          : selection.session.id
-        const contextEvent = yield* hooks.trigger("session", "context", {
-          sessionID: selection.session.id,
-          agent: selection.agent.id,
-          model: model.ref,
-          system: [selection.agent.info.system ? selection.agent.info.system : PROMPT_DEFAULT, history.initial]
-            .filter((part) => part.length > 0)
-            .map(SystemPart.make),
-          messages: [
-            ...toLLMMessages(history.messages, model.ref, providerMetadataKey),
-            ...(history.instructionUpdate ? [Message.system(history.instructionUpdate)] : []),
-            Message.user(input.prompt),
-          ],
-          tools: {},
-        })
-        return (yield* llm.generate(
-          LLM.request({
-            model: model.model,
-            http: { headers: SessionModelHeaders.make(selection.session) },
-            providerOptions: { openai: { promptCacheKey } },
-            system: contextEvent.system,
-            messages: contextEvent.messages,
-            tools: [],
-            toolChoice: "none",
-          }),
-        )).text
-      }),
-    })
-  }),
-)
-
-export const node = makeLocationNode({
-  service: SessionGenerate.Service,
-  layer,
-  deps: [SessionContext.node, Database.node, PluginHooks.node, SessionRunnerModel.node, llmClient],
-})

packages/core/src/session/generate.ts

@@ -1,21 +0,0 @@
-export * as SessionGenerate from "./generate"
-
-import type { LLMError } from "@opencode-ai/ai"
-import { Context, type Effect } from "effect"
-import type { Instructions } from "../instructions"
-import type { AgentNotFoundError } from "./error"
-import type { SessionRunnerModel } from "./runner/model"
-import type { SessionSchema } from "./schema"
-
-export type Error = AgentNotFoundError | Instructions.InitializationBlocked | SessionRunnerModel.Error | LLMError
-
-export interface Interface {
-  /** Generates text from current Session context without mutating the Session. */
-  readonly generate: (input: {
-    readonly sessionID: SessionSchema.ID
-    readonly prompt: string
-  }) => Effect.Effect<string, Error>
-}
-
-/** Location-scoped transient generation from Session context. */
-export class Service extends Context.Service<Service, Interface>()("@opencode/v2/SessionGenerate") {}

packages/core/src/session/history.ts

@@ -60,15 +60,11 @@ const decodeMessageRow = (row: typeof SessionMessageTable.$inferSelect) =>
     ),
   )
 
-const messageEntries = Effect.fnUntraced(function* (db: DatabaseService, sessionID: SessionSchema.ID) {
-  const rows = yield* messageRows(db, sessionID, yield* latestCompaction(db, sessionID))
-  return yield* Effect.forEach(rows, (row) =>
-    decodeMessageRow(row).pipe(Effect.map((message) => ({ seq: row.seq, message }))),
-  )
-})
-
 export const load = Effect.fn("SessionHistory.load")(function* (db: DatabaseService, sessionID: SessionSchema.ID) {
-  return (yield* messageEntries(db, sessionID)).map((entry) => entry.message)
+  return yield* Effect.forEach(
+    yield* messageRows(db, sessionID, yield* latestCompaction(db, sessionID)),
+    decodeMessageRow,
+  )
 })
 
 export const entriesForRunner = Effect.fn("SessionHistory.entriesForRunner")(function* (
@@ -79,7 +75,10 @@ export const entriesForRunner = Effect.fn("SessionHistory.entriesForRunner")(fun
   return yield* db
     .transaction(() =>
       Effect.gen(function* () {
-        const messages = yield* messageEntries(db, sessionID)
+        const rows = yield* messageRows(db, sessionID, yield* latestCompaction(db, sessionID))
+        const messages = yield* Effect.forEach(rows, (row) =>
+          decodeMessageRow(row).pipe(Effect.map((message) => ({ seq: row.seq, message }))),
+        )
         const assembled = yield* InstructionState.assemble(db, sessionID, instructions)
         return {
           initial: assembled.initial,
@@ -90,33 +89,6 @@ export const entriesForRunner = Effect.fn("SessionHistory.entriesForRunner")(fun
     .pipe(Effect.orDie)
 })
 
-export const preview = Effect.fn("SessionHistory.preview")(function* (
-  db: DatabaseService,
-  sessionID: SessionSchema.ID,
-  instructions: Instructions.Instructions,
-) {
-  const observed = yield* Instructions.read(instructions)
-  return yield* db
-    .transaction(() =>
-      Effect.gen(function* () {
-        const messages = yield* messageEntries(db, sessionID)
-        // An active assistant may contain an unresolved tool call, so only preview the settled prefix.
-        const unsettled = messages.findIndex(
-          (entry) => entry.message.type === "assistant" && entry.message.time.completed === undefined,
-        )
-        const settled = unsettled === -1 ? messages : messages.slice(0, unsettled)
-        const assembled = yield* InstructionState.preview(db, sessionID, instructions, observed)
-        const entries = [...settled, ...assembled.updates].toSorted((a, b) => a.seq - b.seq)
-        return {
-          initial: assembled.initial,
-          messages: entries.map((entry) => entry.message),
-          instructionUpdate: assembled.update,
-        }
-      }),
-    )
-    .pipe(Effect.catch((error) => (error instanceof Instructions.InitializationBlocked ? error : Effect.die(error))))
-})
-
 /** Returns the session's sole user message, or `undefined` once a second one exists. */
 export const firstUserMessageIfOnly = Effect.fn("SessionHistory.firstUserMessageIfOnly")(function* (
   db: DatabaseService,

packages/core/src/session/instruction-state.ts

@@ -29,11 +29,12 @@ export const observe = Effect.fn("InstructionState.observe")(function* (
   const [observed, stored] = yield* Effect.all([Instructions.read(instructions), ensure(db, sessionID)], {
     concurrency: "unbounded",
   })
-  const result = yield* observeAgainst(observed, stored?.current_values)
+  const admission = yield* Instructions.diff(observed, stored?.current_values)
   return {
     sessionID,
     initial: !stored,
-    ...result,
+    current: Instructions.applyHashDelta(stored?.current_values ?? {}, admission.delta),
+    ...admission,
   }
 })
 
@@ -122,21 +123,28 @@ export const rebuild = Effect.fn("InstructionState.rebuild")(function* (
   db: DatabaseService,
   sessionID: SessionSchema.ID,
 ) {
-  const state = yield* stateFromEvents(db, sessionID)
-  if (!state) {
+  const folded = fold(yield* instructionEvents(db, sessionID))
+  if (!folded) {
     yield* reset(db, sessionID)
     return undefined
   }
+  const state = {
+    session_id: sessionID,
+    epoch_start: folded.epochStart,
+    through_seq: folded.throughSeq,
+    initial_values: folded.initial,
+    current_values: folded.current,
+  }
   yield* db
     .insert(InstructionStateTable)
     .values(state)
     .onConflictDoUpdate({
       target: InstructionStateTable.session_id,
       set: {
-        epoch_start: state.epoch_start,
-        through_seq: state.through_seq,
-        initial_values: state.initial_values,
-        current_values: state.current_values,
+        epoch_start: folded.epochStart,
+        through_seq: folded.throughSeq,
+        initial_values: folded.initial,
+        current_values: folded.current,
       },
     })
     .run()
@@ -144,12 +152,13 @@ export const rebuild = Effect.fn("InstructionState.rebuild")(function* (
   return state
 })
 
-const assembleState = Effect.fnUntraced(function* (
+export const assemble = Effect.fn("InstructionState.assemble")(function* (
   db: DatabaseService,
   sessionID: SessionSchema.ID,
   instructions: Instructions.Instructions,
-  state: typeof InstructionStateTable.$inferSelect,
 ) {
+  const state = yield* find(db, sessionID)
+  if (!state) return yield* Effect.die(new Error(`Instruction state not found during assembly: ${sessionID}`))
   const rows = yield* instructionUpdatesAfter(db, sessionID, state.epoch_start)
   const updates = rows.map((row) => ({
     row,
@@ -179,49 +188,7 @@ const assembleState = Effect.fnUntraced(function* (
       })
     values = Instructions.applyDelta(values, delta)
   }
-  return { initial: Instructions.renderInitial(instructions, valuesAtStart), updates: result, current: values }
-})
-
-export const assemble = Effect.fn("InstructionState.assemble")(function* (
-  db: DatabaseService,
-  sessionID: SessionSchema.ID,
-  instructions: Instructions.Instructions,
-) {
-  const state = yield* find(db, sessionID)
-  if (!state) return yield* Effect.die(new Error(`Instruction state not found during assembly: ${sessionID}`))
-  const assembled = yield* assembleState(db, sessionID, instructions, state)
-  return { initial: assembled.initial, updates: assembled.updates }
-})
-
-export const preview = Effect.fn("InstructionState.preview")(function* (
-  db: DatabaseService,
-  sessionID: SessionSchema.ID,
-  instructions: Instructions.Instructions,
-  observed: Instructions.ReadResult,
-) {
-  const state = yield* readState(db, sessionID)
-  const result = yield* observeAgainst(observed, state?.current_values)
-  const blobs = new Map<Instructions.Hash, Schema.Json>(
-    Object.entries(result.blobs).map(([hash, value]) => [Instructions.Hash.make(hash), value]),
-  )
-  if (!state) {
-    const values = dereference(result.current, blobs)
-    return { initial: Instructions.renderInitial(instructions, values), updates: [], update: "" }
-  }
-  const assembled = yield* assembleState(db, sessionID, instructions, state)
-  return {
-    initial: assembled.initial,
-    updates: assembled.updates,
-    update: Instructions.renderUpdate(instructions, assembled.current, dereferenceDelta(result.delta, blobs)),
-  }
-})
-
-const observeAgainst = Effect.fnUntraced(function* (observed: Instructions.ReadResult, previous?: Instructions.Values) {
-  const admission = yield* Instructions.diff(observed, previous)
-  return {
-    current: Instructions.applyHashDelta(previous ?? {}, admission.delta),
-    ...admission,
-  }
+  return { initial: Instructions.renderInitial(instructions, valuesAtStart), updates: result }
 })
 
 const find = Effect.fnUntraced(function* (db: DatabaseService, sessionID: SessionSchema.ID) {
@@ -236,26 +203,7 @@ const find = Effect.fnUntraced(function* (db: DatabaseService, sessionID: Sessio
 const ensure = Effect.fnUntraced(function* (db: DatabaseService, sessionID: SessionSchema.ID) {
   const stored = yield* find(db, sessionID)
   if (!stored) return yield* rebuild(db, sessionID)
-  const latest = yield* latestRelevantSequence(db, sessionID)
-  if (!latest || latest.seq <= stored.through_seq) return stored
-  return yield* rebuild(db, sessionID)
-})
-
-const readState = Effect.fnUntraced(function* (db: DatabaseService, sessionID: SessionSchema.ID) {
-  const stored = yield* find(db, sessionID)
-  if (!stored) return yield* stateFromEvents(db, sessionID)
-  const latest = yield* latestRelevantSequence(db, sessionID)
-  if (!latest || latest.seq <= stored.through_seq) return stored
-  return yield* stateFromEvents(db, sessionID)
-})
-
-const stateFromEvents = Effect.fnUntraced(function* (db: DatabaseService, sessionID: SessionSchema.ID) {
-  const folded = fold(yield* instructionEvents(db, sessionID))
-  return folded ? foldedState(sessionID, folded) : undefined
-})
-
-const latestRelevantSequence = Effect.fnUntraced(function* (db: DatabaseService, sessionID: SessionSchema.ID) {
-  return yield* db
+  const latest = yield* db
     .select({ seq: EventTable.seq })
     .from(EventTable)
     .where(and(eq(EventTable.aggregate_id, sessionID), inArray(EventTable.type, relevantEventTypes)))
@@ -263,6 +211,8 @@ const latestRelevantSequence = Effect.fnUntraced(function* (db: DatabaseService,
     .limit(1)
     .get()
     .pipe(Effect.orDie)
+  if (!latest || latest.seq <= stored.through_seq) return stored
+  return yield* rebuild(db, sessionID)
 })
 
 const insertBlobs = Effect.fnUntraced(function* (db: DatabaseService, blobs: Readonly<Record<string, Schema.Json>>) {
@@ -414,13 +364,3 @@ function fold(rows: ReadonlyArray<InstructionEventRow>) {
       : { epochStart: row.seq, throughSeq: row.seq, initial: current, current }
   }, undefined)
 }
-
-function foldedState(sessionID: SessionSchema.ID, folded: NonNullable<ReturnType<typeof fold>>) {
-  return {
-    session_id: sessionID,
-    epoch_start: folded.epochStart,
-    through_seq: folded.throughSeq,
-    initial_values: folded.initial,
-    current_values: folded.current,
-  }
-}

packages/core/src/session/message-updater.ts

@@ -142,7 +142,6 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
   return Effect.gen(function* () {
     yield* SessionEvent.All.match(event, {
       "session.usage.updated": () => Effect.void,
-      "session.usage.recorded": () => Effect.void,
       "session.agent.selected": (event) => {
         return adapter.appendMessage(
           SessionMessage.AgentSelected.make({

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

@@ -1,119 +0,0 @@
-export * as SessionModelRequest from "./model-request"
-
-import { LLM, Message, SystemPart, type LLMRequest } from "@opencode-ai/ai"
-import { SessionError } from "@opencode-ai/schema/session-error"
-import { Context, Effect, Layer } from "effect"
-import { makeLocationNode } from "../effect/app-node"
-import { PluginHooks } from "../plugin/hooks"
-import { ToolRegistry } from "../tool/registry"
-import { SessionContext } from "./context"
-import { SessionModelHeaders } from "./model-headers"
-import { MAX_STEPS_PROMPT } from "./runner/max-steps"
-import PROMPT_DEFAULT from "./runner/prompt/base.txt"
-import { toLLMMessages } from "./runner/to-llm-message"
-
-type ToolCallResolution =
-  | { readonly type: "reject"; readonly error: SessionError.Error }
-  | { readonly type: "settle"; readonly settle: ToolRegistry.Materialization["settle"] }
-
-interface Prepared {
-  readonly request: LLMRequest
-  readonly resolveToolCall: (name: string) => ToolCallResolution
-}
-
-interface PrepareInput {
-  readonly context: SessionContext.Loaded
-  readonly step: number
-}
-
-/**
- * Builds an outbound model request and captures the tool-call capability that
- * must remain paired with it. It does not execute the request or mutate
- * Session state.
- */
-export interface Interface {
-  /** Builds one outbound model request and its matching tool-call capability. */
-  readonly prepare: (input: PrepareInput) => Effect.Effect<Prepared>
-}
-
-/** Location-scoped outbound model-request preparation. */
-export class Service extends Context.Service<Service, Interface>()("@opencode/v2/SessionModelRequest") {}
-
-const layer = Layer.effect(
-  Service,
-  Effect.gen(function* () {
-    const hooks = yield* PluginHooks.Service
-    const registry = yield* ToolRegistry.Service
-
-    const prepare = Effect.fn("SessionModelRequest.prepare")(function* (input: PrepareInput) {
-      const session = input.context.session
-      const agent = input.context.agent
-      const resolved = input.context.model
-      const model = resolved.model
-      const providerMetadataKey = model.route.providerMetadataKey ?? model.provider
-      const stepLimitReached = agent.info.steps !== undefined && input.step >= agent.info.steps
-      const executableTools = stepLimitReached ? undefined : yield* registry.materialize(agent.info.permissions)
-      const promptCacheKey = /^ses_[0-9a-f]{64}$/.test(session.id) ? session.id.slice(4) : session.id
-      const system = [agent.info.system ? agent.info.system : PROMPT_DEFAULT, input.context.initial]
-        .filter((part) => part.length > 0)
-        .map(SystemPart.make)
-      const history = toLLMMessages(input.context.messages, resolved.ref, providerMetadataKey)
-      const messages = stepLimitReached ? [...history, Message.assistant(MAX_STEPS_PROMPT)] : history
-      const toolDefinitions = executableTools?.definitions ?? []
-      const toolsByName = new Map(toolDefinitions.map((tool) => [tool.name, tool]))
-      // Hooks may reshape available definitions but cannot advertise tools omitted by permissions or the Step limit.
-      const contextEvent = yield* hooks.trigger("session", "context", {
-        sessionID: session.id,
-        agent: agent.id,
-        model: resolved.ref,
-        system,
-        messages,
-        tools: Object.fromEntries(
-          toolDefinitions.map((tool) => [tool.name, { description: tool.description, input: { ...tool.inputSchema } }]),
-        ),
-      })
-      const hookedTools = Object.entries(contextEvent.tools).flatMap(([name, tool]) => {
-        const registered = toolsByName.get(name)
-        return registered
-          ? [Object.assign({}, registered, { description: tool.description, inputSchema: tool.input })]
-          : []
-      })
-      const request = LLM.request({
-        model,
-        http: {
-          headers: SessionModelHeaders.make(session),
-        },
-        providerOptions: { openai: { promptCacheKey } },
-        system: contextEvent.system,
-        messages: contextEvent.messages,
-        tools: hookedTools,
-        toolChoice: stepLimitReached ? "none" : undefined,
-      })
-      const resolveToolCall = (name: string): ToolCallResolution => {
-        if (!executableTools)
-          return {
-            type: "reject",
-            error: { type: "tool.execution", message: "Tools are disabled after the maximum agent steps" },
-          }
-        if (toolsByName.has(name) && !Object.hasOwn(contextEvent.tools, name))
-          return {
-            type: "reject",
-            error: { type: "tool.execution", message: `Tool is not available for this request: ${name}` },
-          }
-        return { type: "settle", settle: executableTools.settle }
-      }
-      return {
-        request,
-        resolveToolCall,
-      }
-    })
-
-    return Service.of({ prepare })
-  }),
-)
-
-export const node = makeLocationNode({
-  service: Service,
-  layer,
-  deps: [PluginHooks.node, ToolRegistry.node],
-})

packages/core/src/session/projector.ts

@@ -609,7 +609,6 @@ const layer = Layer.effectDiscard(
         .run()
         .pipe(Effect.orDie),
     )
-    yield* events.project(SessionEvent.UsageRecorded, (event) => applyUsage(db, event.data.sessionID, event.data))
     yield* events.project(SessionEvent.Forked, (event) => projectFork(db, event))
     yield* events.project(SessionEvent.InputPromoted, (event) =>
       Effect.gen(function* () {
@@ -782,7 +781,7 @@ const layer = Layer.effectDiscard(
         yield* InstructionState.reset(db, event.data.sessionID)
       }),
     )
-    yield* events.subscribe([SessionEvent.Step.Ended, SessionEvent.Step.Failed, SessionEvent.UsageRecorded]).pipe(
+    yield* events.subscribe([SessionEvent.Step.Ended, SessionEvent.Step.Failed]).pipe(
       Stream.runForEach((event) => {
         if (
           event.type === SessionEvent.Step.Failed.type &&

packages/core/src/session/runner/llm.ts

@@ -1,41 +1,87 @@
 export * as SessionRunnerLLM from "./llm"
 
-import { LLMClient, LLMError, LLMEvent, isContextOverflowFailure, type ProviderErrorEvent } from "@opencode-ai/ai"
+import {
+  LLM,
+  LLMClient,
+  LLMError,
+  LLMEvent,
+  Message,
+  SystemPart,
+  isContextOverflowFailure,
+  type ProviderErrorEvent,
+} from "@opencode-ai/ai"
+import type { SessionHooks } from "@opencode-ai/plugin/v2/effect/session"
 import { SessionError } from "@opencode-ai/schema/session-error"
+import { Money } from "@opencode-ai/schema/money"
 import { Cause, Effect, Exit, Fiber, FiberSet, Layer, Option, Semaphore, Stream } from "effect"
 import { Database } from "../../database/database"
 import { EventV2 } from "../../event"
+import { ModelV2 } from "../../model"
 import { PermissionV2 } from "../../permission"
 import { QuestionTool } from "../../tool/question"
+import { ToolRegistry } from "../../tool/registry"
 import { ToolOutputStore } from "../../tool-output-store"
 import { InstructionState } from "../instruction-state"
 import { SessionCompaction } from "../compaction"
 import { SessionContext } from "../context"
 import { SessionEvent } from "../event"
 import { SessionPending } from "../pending"
-import { SessionModelRequest } from "../model-request"
 import { SessionMessage } from "../message"
 import { SessionSchema } from "../schema"
 import { SessionStore } from "../store"
 import { SessionTitle } from "../title"
 import { Service } from "./index"
 import { createLLMEventPublisher } from "./publish-llm-event"
+import { toLLMMessages } from "./to-llm-message"
+import { MAX_STEPS_PROMPT } from "./max-steps"
+import PROMPT_DEFAULT from "./prompt/base.txt"
 import { Snapshot } from "../../snapshot"
 import { makeLocationNode } from "../../effect/app-node"
 import { llmClient } from "../../effect/app-node-platform"
 import { StepFailedError } from "../error"
 import { toSessionError } from "../to-session-error"
 import { SessionRunnerRetry } from "./retry"
-import { SessionUsage } from "../usage"
+import { PluginHooks } from "../../plugin/hooks"
+import { SessionModelHeaders } from "../model-headers"
+
+type StepTokens = {
+  readonly input: number
+  readonly output: number
+  readonly reasoning: number
+  readonly cache: { readonly read: number; readonly write: number }
+}
+
+// TODO(#35765): Use Copilot's reported billed amount once billing has a dedicated typed runtime contract.
+export function calculateCost(costs: ModelV2.Info["cost"], tokens: StepTokens) {
+  const context = tokens.input + tokens.cache.read + tokens.cache.write
+  const tier = costs
+    .filter((cost) => cost.tier?.type === "context" && context > cost.tier.size)
+    .toSorted((a, b) => (b.tier?.size ?? 0) - (a.tier?.size ?? 0))[0]
+  const cost = tier ?? costs.find((cost) => cost.tier === undefined)
+  if (!cost) return Money.USD.zero
+  return Money.USD.make(
+    (tokens.input * cost.input +
+      (tokens.output + tokens.reasoning) * cost.output +
+      tokens.cache.read * cost.cache.read +
+      tokens.cache.write * cost.cache.write) /
+      1_000_000,
+  )
+}
+
+/**
+ * Runs one durable coding-agent Session until it settles. Each step reloads projected history,
+ * materializes tools, makes one model request, and settles local calls before continuation.
+ */
 
 const layer = Layer.effect(
   Service,
   Effect.gen(function* () {
     const events = yield* EventV2.Service
     const llm = yield* LLMClient.Service
+    const tools = yield* ToolRegistry.Service
+    const hooks = yield* PluginHooks.Service
     const store = yield* SessionStore.Service
     const context = yield* SessionContext.Service
-    const modelRequests = yield* SessionModelRequest.Service
     const snapshots = yield* Snapshot.Service
     const db = (yield* Database.Service).db
     const compaction = yield* SessionCompaction.Service
@@ -100,18 +146,59 @@ const layer = Layer.effect(
       const loaded = yield* context.load(selected)
       const session = loaded.session
       const agent = loaded.agent
+      const agentInfo = agent.info
       const resolved = loaded.model
       const model = resolved.model
-      const compactionInput = { session, messages: loaded.messages, model, cost: resolved.cost }
+      const providerMetadataKey = model.route.providerMetadataKey ?? model.provider
+      const compactionInput = { session, messages: loaded.messages, model }
       if (compaction.required(compactionInput) && !(yield* SessionPending.compaction(db, session.id))) {
         const compacted = yield* compaction.compact(compactionInput)
         if (compacted.status === "completed") return { _tag: "RestartAfterCompaction", step: currentStep } as const
         return yield* new StepFailedError({ error: compacted.error })
       }
-      const prepared = yield* modelRequests.prepare({
-        context: loaded,
-        step: currentStep,
+      const isLastStep = agentInfo.steps !== undefined && currentStep >= agentInfo.steps
+      const toolMaterialization = isLastStep ? undefined : yield* tools.materialize(agentInfo.permissions)
+      const promptCacheKey = /^ses_[0-9a-f]{64}$/.test(session.id) ? session.id.slice(4) : session.id
+      const request = LLM.request({
+        model,
+        http: {
+          headers: SessionModelHeaders.make(session),
+        },
+        providerOptions: { openai: { promptCacheKey } },
+        system: [agentInfo.system ? agentInfo.system : PROMPT_DEFAULT, loaded.initial]
+          .filter((part): part is string => part !== undefined && part.length > 0)
+          .map(SystemPart.make),
+        messages: [
+          ...toLLMMessages(loaded.messages, resolved.ref, providerMetadataKey),
+          ...(isLastStep ? [Message.assistant(MAX_STEPS_PROMPT)] : []),
+        ],
+        tools: toolMaterialization?.definitions ?? [],
+        toolChoice: isLastStep ? "none" : undefined,
       })
+      const availableTools = new Map(request.tools.map((tool) => [tool.name, tool]))
+      const contextEvent: SessionHooks["context"] = {
+        sessionID: session.id,
+        agent: agent.id,
+        model: resolved.ref,
+        system: [...request.system],
+        messages: [...request.messages],
+        tools: Object.fromEntries(
+          request.tools.map((tool) => [tool.name, { description: tool.description, input: { ...tool.inputSchema } }]),
+        ),
+      }
+      // Plugins may reshape the draft but cannot advertise tools excluded by
+      // permissions, registration state, or the selected agent's step limit.
+      yield* hooks.trigger("session", "context", contextEvent)
+      const hookedRequest = LLM.updateRequest(request, {
+        system: contextEvent.system,
+        messages: contextEvent.messages,
+        tools: Object.entries(contextEvent.tools).flatMap(([name, tool]) => {
+          const registered = availableTools.get(name)
+          if (!registered) return []
+          return [{ ...registered, description: tool.description, inputSchema: tool.input }]
+        }),
+      })
+      const advertisedTools = new Set(hookedRequest.tools.map((tool) => tool.name))
       const toolFibers = yield* FiberSet.make<void, ToolOutputStore.Error>()
       const ownedToolFibers: Array<Fiber.Fiber<void, ToolOutputStore.Error>> = []
       let needsContinuation = false
@@ -122,7 +209,7 @@ const layer = Layer.effect(
         // The selected catalog identity, not model.id: route-level ids are provider API
         // model ids (for example gpt-5.5-fast resolves to api id gpt-5.5).
         model: resolved.ref,
-        providerMetadataKey: model.route.providerMetadataKey ?? model.provider,
+        providerMetadataKey,
         snapshot: startSnapshot,
         assistantMessageID,
       })
@@ -132,7 +219,7 @@ const layer = Layer.effect(
       const serialized = <A, E, R>(effect: Effect.Effect<A, E, R>) => publication.withPermit(effect)
       const publish = (event: LLMEvent, error?: SessionError.Error) => serialized(publisher.publish(event, error))
       let overflowFailure: ProviderErrorEvent | undefined
-      const providerStream = llm.stream(prepared.request).pipe(
+      const providerStream = llm.stream(hookedRequest).pipe(
         Stream.runForEach((event) =>
           Effect.gen(function* () {
             if (overflowFailure || publisher.hasProviderError()) return
@@ -144,9 +231,15 @@ const layer = Layer.effect(
             }
             yield* publish(event)
             if (event.type !== "tool-call" || event.providerExecuted) return
-            const tool = prepared.resolveToolCall(event.name)
-            if (tool.type === "reject") {
-              yield* serialized(publisher.failUnsettledTools(tool.error))
+            if (!toolMaterialization || (availableTools.has(event.name) && !advertisedTools.has(event.name))) {
+              yield* serialized(
+                publisher.failUnsettledTools({
+                  type: "tool.execution",
+                  message: toolMaterialization
+                    ? `Tool is not available for this request: ${event.name}`
+                    : "Tools are disabled after the maximum agent steps",
+                }),
+              )
               return
             }
             needsContinuation = true
@@ -154,7 +247,7 @@ const layer = Layer.effect(
             ownedToolFibers.push(
               yield* Effect.uninterruptibleMask((restore) =>
                 restore(
-                  tool.settle({
+                  toolMaterialization.settle({
                     sessionID: session.id,
                     agent: agent.id,
                     messageID: assistantMessageID,
@@ -191,7 +284,7 @@ const layer = Layer.effect(
       )
 
       const stepUsage = (settlement: NonNullable<ReturnType<typeof publisher.stepSettlement>>) => ({
-        cost: SessionUsage.calculateCost(resolved.cost, settlement.tokens),
+        cost: calculateCost(resolved.cost, settlement.tokens),
         tokens: settlement.tokens,
       })
 
@@ -233,8 +326,7 @@ const layer = Layer.effect(
             recoverOverflow &&
             !publisher.hasRetryEvidence() &&
             isContextOverflowFailure(overflowFailure ?? streamFailure) &&
-            (yield* restore(recoverOverflow({ session, messages: loaded.messages, model, cost: resolved.cost })))
-              .status === "completed"
+            (yield* restore(recoverOverflow({ session, messages: loaded.messages, model }))).status === "completed"
           )
             return { _tag: "RestartAfterOverflowCompaction", step: currentStep } as const
 
@@ -245,7 +337,11 @@ const layer = Layer.effect(
           const llmFailure = streamFailure instanceof LLMError ? streamFailure : undefined
           if (llmFailure && !publisher.hasProviderError()) {
             const error = toSessionError(llmFailure)
-            if (SessionRunnerRetry.isRetryable(llmFailure) && !publisher.hasRetryEvidence()) {
+            if (
+              SessionRunnerRetry.isRetryable(llmFailure) &&
+              !publisher.hasRetryEvidence() &&
+              (agentInfo.steps === undefined || currentStep < agentInfo.steps)
+            ) {
               return yield* new SessionRunnerRetry.RetryableFailure({
                 cause: llmFailure,
                 assistantMessageID: yield* publisher.startAssistant(),
@@ -361,7 +457,7 @@ const layer = Layer.effect(
           Effect.tapError((error) =>
             error instanceof SessionRunnerRetry.RetryableFailure
               ? Effect.sync(() => {
-                  currentStep = error.step
+                  currentStep = error.step + 1
                   assistantMessageID = error.assistantMessageID
                   currentPromotion = undefined
                 })
@@ -475,8 +571,9 @@ export const node = makeLocationNode({
   deps: [
     EventV2.node,
     llmClient,
+    ToolRegistry.node,
+    PluginHooks.node,
     SessionContext.node,
-    SessionModelRequest.node,
     SessionStore.node,
     SessionCompaction.node,
     SessionTitle.node,

packages/core/src/session/runner/publish-llm-event.ts

@@ -1,4 +1,4 @@
-import { ToolOutput, type LLMEvent, type ProviderMetadata, type ToolResultValue } from "@opencode-ai/ai"
+import { ToolOutput, type LLMEvent, type ProviderMetadata, type ToolResultValue, type Usage } from "@opencode-ai/ai"
 import { Effect } from "effect"
 import { EventV2 } from "../../event"
 import { ModelV2 } from "../../model"
@@ -9,7 +9,6 @@ import { SessionError } from "@opencode-ai/schema/session-error"
 import { Money } from "@opencode-ai/schema/money"
 import { AgentV2 } from "../../agent"
 import { Snapshot } from "../../snapshot"
-import { SessionUsage } from "../usage"
 
 type Input = {
   readonly sessionID: SessionSchema.ID
@@ -20,6 +19,20 @@ type Input = {
   readonly assistantMessageID?: SessionMessage.ID
 }
 
+const safe = (value: number | undefined) => Math.max(0, Number.isFinite(value) ? (value ?? 0) : 0)
+
+const tokens = (usage: Usage | undefined) => {
+  const reasoning = safe(usage?.reasoningTokens)
+  const read = safe(usage?.cacheReadInputTokens)
+  const write = safe(usage?.cacheWriteInputTokens)
+  return {
+    input: safe(usage?.nonCachedInputTokens),
+    output: safe(usage?.visibleOutputTokens),
+    reasoning,
+    cache: { read, write },
+  }
+}
+
 const record = (value: unknown): Record<string, unknown> =>
   typeof value === "object" && value !== null && !Array.isArray(value) ? (value as Record<string, unknown>) : { value }
 
@@ -64,7 +77,7 @@ export const createLLMEventPublisher = (events: Pick<EventV2.Interface, "publish
   let stepSettlement:
     | {
         readonly finish: Extract<LLMEvent, { type: "step-finish" }>["reason"]
-        readonly tokens: ReturnType<typeof SessionUsage.tokens>
+        readonly tokens: ReturnType<typeof tokens>
       }
     | undefined
 
@@ -238,7 +251,7 @@ export const createLLMEventPublisher = (events: Pick<EventV2.Interface, "publish
 
   const publishStepFailure = Effect.fnUntraced(function* (usage?: {
     readonly cost: Money.USD
-    readonly tokens: ReturnType<typeof SessionUsage.tokens>
+    readonly tokens: ReturnType<typeof tokens>
   }) {
     if (stepFailed || stepFailure === undefined) return
     const assistantMessageID = yield* startAssistant()
@@ -416,7 +429,7 @@ export const createLLMEventPublisher = (events: Pick<EventV2.Interface, "publish
       case "step-finish":
         yield* flush()
         if (stepSettlement) return yield* Effect.die(new Error("Duplicate step finish"))
-        stepSettlement = { finish: event.reason, tokens: SessionUsage.tokens(event.usage) }
+        stepSettlement = { finish: event.reason, tokens: tokens(event.usage) }
         if (event.reason === "content-filter") {
           providerFailed = true
           yield* failAssistant({ type: "provider.content-filter", message: "Provider blocked the response" }, true)

packages/core/src/session/title.ts

@@ -1,7 +1,7 @@
 export * as SessionTitle from "./title"
 
 import { LLM, LLMClient, LLMError, LLMEvent, Message, type LLMRequest } from "@opencode-ai/ai"
-import { Context, Effect, Layer, Stream } from "effect"
+import { Context, DateTime, Effect, Layer, Stream } from "effect"
 import { AgentV2 } from "../agent"
 import { Database } from "../database/database"
 import { EventV2 } from "../event"
@@ -12,7 +12,6 @@ import { SessionHistory } from "./history"
 import { SessionModelHeaders } from "./model-headers"
 import { SessionRunnerModel } from "./runner/model"
 import { SessionSchema } from "./schema"
-import { SessionUsage } from "./usage"
 
 const MAX_LENGTH = 100
 
@@ -52,16 +51,6 @@ const make = (dependencies: Dependencies) => {
     if (!resolved) return
     const chunks: string[] = []
     let failed = false
-    let usage: SessionUsage.Recorded | undefined
-    const recordUsage = Effect.suspend(() =>
-      usage
-        ? dependencies.events.publish(SessionEvent.UsageRecorded, {
-            sessionID: session.id,
-            source: "title",
-            ...usage,
-          })
-        : Effect.void,
-    )
     const streamed = yield* dependencies.llm
       .stream(
         LLM.request({
@@ -76,17 +65,11 @@ const make = (dependencies: Dependencies) => {
         Stream.runForEach((event) => {
           if (LLMEvent.is.providerError(event)) failed = true
           if (LLMEvent.is.textDelta(event)) chunks.push(event.text)
-          if (LLMEvent.is.stepFinish(event)) {
-            const step = SessionUsage.record(event.usage, resolved.cost)
-            usage = usage ? SessionUsage.add(usage, step) : step
-          }
           return Effect.void
         }),
         Effect.as(true),
         Effect.catchTag("LLM.Error", () => Effect.succeed(false)),
-        Effect.onInterrupt(() => recordUsage.pipe(Effect.asVoid)),
       )
-    yield* recordUsage
     if (!streamed || failed) return
     const title = chunks
       .join("")

packages/core/src/session/usage.ts

@@ -1,55 +0,0 @@
-export * as SessionUsage from "./usage"
-
-import type { Usage } from "@opencode-ai/ai"
-import { Money } from "@opencode-ai/schema/money"
-import type { TokenUsage } from "@opencode-ai/schema/token-usage"
-import type { ModelV2 } from "../model"
-
-const safe = (value: number | undefined) => Math.max(0, Number.isFinite(value) ? (value ?? 0) : 0)
-
-export const tokens = (usage: Usage | undefined): TokenUsage.Info => ({
-  input: safe(usage?.nonCachedInputTokens),
-  output: safe(usage?.visibleOutputTokens),
-  reasoning: safe(usage?.reasoningTokens),
-  cache: {
-    read: safe(usage?.cacheReadInputTokens),
-    write: safe(usage?.cacheWriteInputTokens),
-  },
-})
-
-// TODO(#35765): Use Copilot's reported billed amount once billing has a dedicated typed runtime contract.
-export function calculateCost(costs: ModelV2.Info["cost"], usage: TokenUsage.Info) {
-  const context = usage.input + usage.cache.read + usage.cache.write
-  const tier = costs
-    .filter((cost) => cost.tier?.type === "context" && context > cost.tier.size)
-    .toSorted((a, b) => (b.tier?.size ?? 0) - (a.tier?.size ?? 0))[0]
-  const cost = tier ?? costs.find((cost) => cost.tier === undefined)
-  if (!cost) return Money.USD.zero
-  return Money.USD.make(
-    (usage.input * cost.input +
-      (usage.output + usage.reasoning) * cost.output +
-      usage.cache.read * cost.cache.read +
-      usage.cache.write * cost.cache.write) /
-      1_000_000,
-  )
-}
-
-export type Recorded = { readonly tokens: TokenUsage.Info; readonly cost: Money.USD }
-
-export const record = (usage: Usage | undefined, costs: ModelV2.Info["cost"]): Recorded => {
-  const normalized = tokens(usage)
-  return { tokens: normalized, cost: calculateCost(costs, normalized) }
-}
-
-export const add = (a: Recorded, b: Recorded): Recorded => ({
-  cost: Money.USD.make(a.cost + b.cost),
-  tokens: {
-    input: a.tokens.input + b.tokens.input,
-    output: a.tokens.output + b.tokens.output,
-    reasoning: a.tokens.reasoning + b.tokens.reasoning,
-    cache: {
-      read: a.tokens.cache.read + b.tokens.cache.read,
-      write: a.tokens.cache.write + b.tokens.cache.write,
-    },
-  },
-})

packages/core/src/state.ts

@@ -1,14 +1,14 @@
 export * as State from "./state"
 
-import { Clock, Context, Deferred, Effect, Scope, Semaphore } from "effect"
+import { Context, Effect, Scope, Semaphore } from "effect"
 
 /**
  * A replayable transform applied to a draft during reload.
  *
  * Domain drafts expose readable and writable state while preserving concise
- * plugin/config code. Transforms synchronously rebuild derived state.
+ * plugin/config code. Transforms may perform Effects before returning.
  */
-type TransformCallback<DraftApi> = (draft: DraftApi) => void
+type TransformCallback<DraftApi> = (draft: DraftApi) => Effect.Effect<void> | void
 export type MakeDraft<State, DraftApi> = (state: State) => DraftApi
 
 export interface Registration {
@@ -34,7 +34,6 @@ type Batch = {
 const CurrentBatch = Context.Reference<Batch | undefined>("@opencode/State/CurrentBatch", {
   defaultValue: () => undefined,
 })
-const reloadDebounce = 500
 
 export function batch<A, E, R>(effect: Effect.Effect<A, E, R>) {
   return Effect.gen(function* () {
@@ -74,10 +73,6 @@ export interface Interface<State, DraftApi> extends Transformable<DraftApi> {
 export function create<State, DraftApi>(options: Options<State, DraftApi>): Interface<State, DraftApi> {
   let state = options.initial()
   let transforms: { run: TransformCallback<DraftApi> }[] = []
-  let generation = 0
-  let requestedAt = 0
-  let running = false
-  let waiters: { generation: number; done: Deferred.Deferred<void> }[] = []
   const semaphore = Semaphore.makeUnsafe(1)
 
   const commit = Effect.fn("State.commit")(function* (next: State) {
@@ -87,8 +82,9 @@ export function create<State, DraftApi>(options: Options<State, DraftApi>): Inte
   })
 
   const apply = (transform: TransformCallback<DraftApi>, draft: DraftApi) =>
-    Effect.sync(() => {
-      transform(draft)
+    Effect.suspend(() => {
+      const result = transform(draft)
+      return Effect.isEffect(result) ? Effect.asVoid(result).pipe(Effect.orDie) : Effect.void
     })
 
   const materialize = Effect.fnUntraced(function* () {
@@ -101,39 +97,7 @@ export function create<State, DraftApi>(options: Options<State, DraftApi>): Inte
     yield* commit(next)
   })
 
-  const materializeReload = () => semaphore.withPermit(materialize())
-
-  const rebuild = (): Effect.Effect<void> =>
-    Effect.gen(function* () {
-      const clock = yield* Clock.Clock
-      const remaining = requestedAt + reloadDebounce - clock.currentTimeMillisUnsafe()
-      if (remaining > 0) yield* Effect.sleep(remaining)
-      if (clock.currentTimeMillisUnsafe() < requestedAt + reloadDebounce) return yield* rebuild()
-
-      const target = generation
-      const exit = yield* materializeReload().pipe(Effect.exit)
-      const completed = waiters.filter((waiter) => waiter.generation <= target)
-      waiters = waiters.filter((waiter) => waiter.generation > target)
-      yield* Effect.forEach(completed, (waiter) => Deferred.done(waiter.done, exit), {
-        concurrency: "unbounded",
-        discard: true,
-      })
-      if (generation > target) return yield* rebuild()
-      running = false
-    })
-
-  const reload = Effect.fnUntraced(function* () {
-    const done = Deferred.makeUnsafe<void>()
-    const clock = yield* Clock.Clock
-    generation++
-    requestedAt = clock.currentTimeMillisUnsafe()
-    waiters.push({ generation, done })
-    if (!running) {
-      running = true
-      yield* rebuild().pipe(Effect.forkDetach)
-    }
-    return yield* Deferred.await(done)
-  })
+  const reload = () => semaphore.withPermit(materialize())
 
   const result: Interface<State, DraftApi> = {
     get: () => state,
@@ -153,7 +117,7 @@ export function create<State, DraftApi>(options: Options<State, DraftApi>): Inte
                 return Effect.gen(function* () {
                   const batch = yield* CurrentBatch
                   if (batch?.active) {
-                    batch.reloads.add(materializeReload)
+                    batch.reloads.add(reload)
                     return
                   }
                   yield* materialize()
@@ -168,8 +132,8 @@ export function create<State, DraftApi>(options: Options<State, DraftApi>): Inte
           )
           yield* Scope.addFinalizer(scope, dispose)
           const batch = yield* CurrentBatch
-          if (batch?.active) batch.reloads.add(materializeReload)
-          else yield* materializeReload()
+          if (batch?.active) batch.reloads.add(reload)
+          else yield* reload()
           return { dispose }
         }),
       )

packages/core/src/tool/read.ts

@@ -6,6 +6,7 @@ import { ToolFailure } from "@opencode-ai/ai"
 import { Effect, Schema } from "effect"
 import { FileSystem } from "../filesystem"
 import { FSUtil } from "../fs-util"
+import { Image } from "../image"
 import { Location } from "../location"
 import { LocationMutation } from "../location-mutation"
 import { PermissionV2 } from "../permission"
@@ -34,6 +35,7 @@ export const Plugin = {
   effect: Effect.fn("ReadTool.Plugin")(function* (ctx: PluginContext) {
     const reader = yield* ReadToolFileSystem.Service
     const mutation = yield* LocationMutation.Service
+    const image = yield* Image.Service
     const permission = yield* PermissionV2.Service
     const sessionInstructions = yield* SessionInstructions.Service
     const fs = yield* FSUtil.Service
@@ -48,12 +50,6 @@ export const Plugin = {
               "Read a text file or supported image, page through a large UTF-8 text file by line offset, or list a directory page. Relative paths resolve from the current location; absolute paths inside it are accepted, while external absolute paths require external_directory approval.",
             input: Input,
             output: Output,
-            structured: Schema.toEncoded(Output),
-            // Image base64 reaches the model through content items (normalized generically
-            // at tool settlement); persisting a second copy in structured would store the
-            // original unresized bytes in the message row.
-            toStructuredOutput: ({ output }) =>
-              "encoding" in output && output.encoding === "base64" ? { ...output, content: "" } : output,
             toModelOutput: ({ input, output }) => {
               if (!("encoding" in output) || output.encoding !== "base64" || !SUPPORTED_IMAGE_MIMES.has(output.mime))
                 return []
@@ -121,14 +117,21 @@ export const Plugin = {
                   Effect.catch(() => Effect.void),
                   Effect.catchDefect(() => Effect.void),
                 )
-                if ("encoding" in content && content.encoding === "base64" && !SUPPORTED_IMAGE_MIMES.has(content.mime))
+                if ("encoding" in content && content.encoding === "base64" && SUPPORTED_IMAGE_MIMES.has(content.mime)) {
+                  return yield* image
+                    .normalize(resource, { ...content, encoding: "base64" })
+                    .pipe(Effect.catchTag("Image.ResizerUnavailableError", () => Effect.succeed(content)))
+                }
+                if ("encoding" in content && content.encoding === "base64")
                   return yield* Effect.fail(new ReadToolFileSystem.BinaryFileError({ resource }))
                 return content
               }).pipe(
                 Effect.mapError((error) => {
                   const message =
                     error instanceof ReadToolFileSystem.BinaryFileError ||
-                    error instanceof ReadToolFileSystem.MediaIngestLimitError
+                    error instanceof ReadToolFileSystem.MediaIngestLimitError ||
+                    error instanceof Image.DecodeError ||
+                    error instanceof Image.SizeError
                       ? error.message
                       : `Unable to read ${input.path}`
                   return new ToolFailure({ message, error })

packages/core/src/tool/registry.ts

@@ -3,7 +3,6 @@ export * as ToolRegistry from "./registry"
 import { ToolOutput, type ToolCall, type ToolDefinition, type ToolResultValue } from "@opencode-ai/ai"
 import { Context, Effect, Layer, Scope } from "effect"
 import type { AgentV2 } from "../agent"
-import { Image } from "../image"
 import { PermissionV2 } from "../permission"
 import { SessionMessage } from "../session/message"
 import { SessionSchema } from "../session/schema"
@@ -58,40 +57,6 @@ const registryLayer = Layer.effect(
   Effect.gen(function* () {
     const resources = yield* ToolOutputStore.Service
     const toolHooks = yield* ToolHooks.Service
-    const image = yield* Image.Service
-
-    type NormalizedItem = ToolOutput["content"][number] | "decode" | "size"
-    const normalizeImages = Effect.fn("ToolRegistry.normalizeImages")(function* (content: ToolOutput["content"]) {
-      const normalized = yield* Effect.forEach(content, (item): Effect.Effect<NormalizedItem> => {
-        if (item.type !== "file" || !item.mime.startsWith("image/")) return Effect.succeed(item)
-        // RFC 2397 permits parameters between the mime and ";base64".
-        const base64 = /^data:[^,]*;base64,(.*)$/s.exec(item.uri)?.[1]
-        if (base64 === undefined) return Effect.succeed(item)
-        const resource = item.name ?? `${item.mime} tool output`
-        return image
-          .normalize(resource, { uri: resource, content: base64, encoding: "base64", mime: item.mime })
-          .pipe(
-            Effect.map((result) => ({
-              ...item,
-              uri: `data:${result.mime};base64,${result.content}`,
-              mime: result.mime,
-            })),
-            Effect.catchTag("Image.ResizerUnavailableError", () => Effect.succeed(item)),
-            Effect.catchTag("Image.DecodeError", () => Effect.succeed("decode" as const)),
-            Effect.catchTag("Image.SizeError", () => Effect.succeed("size" as const)),
-          )
-      })
-      const note = (reason: "decode" | "size", text: string) => {
-        const count = normalized.filter((item) => item === reason).length
-        if (count === 0) return []
-        return [{ type: "text" as const, text: `[${count} image${count === 1 ? "" : "s"} omitted: ${text}]` }]
-      }
-      return [
-        ...normalized.filter((item) => typeof item !== "string"),
-        ...note("decode", "could not be decoded."),
-        ...note("size", "could not be resized below the image size limit."),
-      ]
-    })
     type Registration = {
       readonly tool: AnyTool
       readonly name: string
@@ -119,11 +84,10 @@ const registryLayer = Layer.effect(
           agent: input.agent,
           messageID: input.messageID,
           callID: input.call.id,
-          progress: (update) => {
-            const progress = input.progress
-            if (!progress) return Effect.void
-            return normalizeImages(
-              (update.content ?? []).map((part) =>
+          progress: (update) =>
+            input.progress?.({
+              structured: update.structured,
+              content: (update.content ?? []).map((part) =>
                 part.type === "text"
                   ? { type: "text" as const, text: part.text }
                   : {
@@ -133,8 +97,7 @@ const registryLayer = Layer.effect(
                       name: part.name,
                     },
               ),
-            ).pipe(Effect.flatMap((content) => progress({ structured: update.structured, content })))
-          },
+            }) ?? Effect.void,
         },
       ).pipe(
         Effect.map((output) => ({ output })),
@@ -152,7 +115,7 @@ const registryLayer = Layer.effect(
         const bounded = yield* resources.bound({
           sessionID: input.sessionID,
           callID: input.call.id,
-          output: { structured: pending.output.structured, content: yield* normalizeImages(pending.output.content) },
+          output: pending.output,
         })
         const result = ToolOutput.toResultValue(bounded.output)
         settlement =
@@ -269,11 +232,11 @@ function whollyDisabled(action: string, rules: PermissionV2.Ruleset) {
 export const node = makeLocationNode({
   service: Service,
   layer,
-  deps: [ToolOutputStore.node, ToolHooks.node, Image.node],
+  deps: [ToolOutputStore.node, ToolHooks.node],
 })
 
 export const toolsNode = makeLocationNode({
   service: Tools.Service,
   layer,
-  deps: [ToolOutputStore.node, ToolHooks.node, Image.node],
+  deps: [ToolOutputStore.node, ToolHooks.node],
 })

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

@@ -77,7 +77,10 @@ export function migrate(info: typeof ConfigV1.Info.Type) {
     commands: commands(info.command),
     instructions: info.instructions,
     references: info.references ?? info.reference,
-    experimental: experimental(info),
+    experimental:
+      info.experimental?.subagent_depth === undefined
+        ? undefined
+        : { subagent_depth: info.experimental.subagent_depth },
     plugins: info.plugin?.map((plugin) =>
       typeof plugin === "string" ? plugin : { package: plugin[0], options: plugin[1] },
     ),
@@ -85,31 +88,6 @@ export function migrate(info: typeof ConfigV1.Info.Type) {
   }
 }
 
-function experimental(info: typeof ConfigV1.Info.Type) {
-  const policies = [
-    ...(info.enabled_providers === undefined
-      ? []
-      : [
-          { action: "provider.use" as const, resource: "*", effect: "deny" as const },
-          ...info.enabled_providers.map((resource) => ({
-            action: "provider.use" as const,
-            resource,
-            effect: "allow" as const,
-          })),
-        ]),
-    ...(info.disabled_providers ?? []).map((resource) => ({
-      action: "provider.use" as const,
-      resource,
-      effect: "deny" as const,
-    })),
-  ]
-  if (info.experimental?.subagent_depth === undefined && !policies.length) return
-  return {
-    subagent_depth: info.experimental?.subagent_depth,
-    policies: policies.length ? policies : undefined,
-  }
-}
-
 function permissions(info?: ConfigPermissionV1.Info, tools?: Readonly<Record<string, boolean>>) {
   const rules: Array<{ action: string; resource: string; effect: ConfigPermissionV1.Action }> = Object.entries(
     tools ?? {},

packages/core/src/wellknown.ts

@@ -1,12 +1,10 @@
 export * as WellKnown from "./wellknown"
 
 import { Integration } from "@opencode-ai/schema/integration"
-import { Context, Effect, Layer, Ref, Schema, Semaphore } from "effect"
+import { Context, Effect, Layer, PubSub, Ref, Schema, Semaphore, Stream } from "effect"
 import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
-import { isDeepStrictEqual } from "node:util"
 import { makeGlobalNode } from "./effect/app-node"
 import { httpClient } from "./effect/app-node-platform"
-import { EventV2 } from "./event"
 import { KV } from "./kv"
 
 export interface Auth extends Schema.Schema.Type<typeof Auth> {}
@@ -45,18 +43,14 @@ export interface Entry {
 export interface Interface {
   readonly entries: () => Effect.Effect<readonly Entry[], Error>
   readonly snapshot: () => readonly Entry[]
-  readonly refresh: () => Effect.Effect<boolean, Error>
   readonly add: (origin: string) => Effect.Effect<Entry, Error>
   readonly remove: (origin: string) => Effect.Effect<void>
+  readonly changes: Stream.Stream<void>
   readonly resolve: (entry: Entry, variables: Readonly<Record<string, string>>) => Effect.Effect<Config[], Error>
 }
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/v2/WellKnown") {}
 
-export const Event = {
-  Updated: EventV2.ephemeral({ type: "wellknown.updated", schema: {} }),
-}
-
 export const inspect = Effect.fn("WellKnown.inspect")(function* (origin: string) {
   const url = `${origin.replace(/\/+$/, "")}/.well-known/opencode`
   const http = HttpClient.filterStatusOk(yield* HttpClient.HttpClient)
@@ -103,8 +97,8 @@ const layer = Layer.effect(
   Effect.gen(function* () {
     const http = yield* HttpClient.HttpClient
     const kv = yield* KV.Service
-    const events = yield* EventV2.Service
     const cache = yield* Ref.make(new Map<string, Entry>())
+    const changes = yield* PubSub.unbounded<void>()
     const lock = Semaphore.makeUnsafe(1)
 
     const load = Effect.fn("WellKnown.load")(function* () {
@@ -123,32 +117,9 @@ const layer = Layer.effect(
       return entries
     })
 
-    const refresh = Effect.fn("WellKnown.refresh")(function* () {
-      return yield* lock.withPermit(
-        Effect.gen(function* () {
-          const value = yield* kv.get(sourcesKey)
-          const origins = Schema.is(Sources)(value) ? value : []
-          if (!origins.length) return false
-          const entries = yield* Effect.forEach(origins, (origin) =>
-            inspect(origin).pipe(
-              Effect.provideService(HttpClient.HttpClient, http),
-              Effect.map((manifest) => ({ origin, integrationID: Integration.ID.make(origin), manifest })),
-            ),
-          )
-          const next = new Map(entries.map((entry) => [entry.origin, entry]))
-          const changed = !isDeepStrictEqual(Ref.getUnsafe(cache), next)
-          if (!changed) return false
-          yield* Ref.set(cache, next)
-          yield* events.publish(Event.Updated, {})
-          return true
-        }),
-      )
-    })
-
     return Service.of({
       entries: load,
       snapshot: () => Array.from(Ref.getUnsafe(cache).values()),
-      refresh,
       add: Effect.fn("WellKnown.add")(function* (value) {
         return yield* lock.withPermit(
           Effect.gen(function* () {
@@ -160,7 +131,7 @@ const layer = Layer.effect(
             const origins = Schema.is(Sources)(sources) ? sources : []
             yield* kv.set(sourcesKey, Array.from(new Set([...origins, origin])))
             yield* Ref.update(cache, (current) => new Map(current).set(origin, entry))
-            yield* events.publish(Event.Updated, {})
+            yield* PubSub.publish(changes, undefined)
             return entry
           }),
         )
@@ -180,10 +151,11 @@ const layer = Layer.effect(
               next.delete(origin)
               return next
             })
-            yield* events.publish(Event.Updated, {})
+            yield* PubSub.publish(changes, undefined)
           }),
         )
       }),
+      changes: Stream.fromPubSub(changes),
       resolve: Effect.fn("WellKnown.resolveEntry")(function* (entry, variables) {
         return yield* resolveEntry(entry, variables).pipe(Effect.provideService(HttpClient.HttpClient, http))
       }),
@@ -191,4 +163,4 @@ const layer = Layer.effect(
   }),
 )
 
-export const node = makeGlobalNode({ service: Service, layer, deps: [httpClient, KV.node, EventV2.node] })
+export const node = makeGlobalNode({ service: Service, layer, deps: [httpClient, KV.node] })

packages/core/src/wellknown/plugin.ts

@@ -2,13 +2,11 @@ export * as WellKnownPlugin from "./plugin"
 
 import { define } from "@opencode-ai/plugin/v2/effect/plugin"
 import { Effect, Stream } from "effect"
-import { EventV2 } from "../event"
 import { WellKnown } from "../wellknown"
 
 export const Plugin = define({
   id: "opencode.wellknown",
   effect: Effect.fn(function* (ctx) {
-    const events = yield* EventV2.Service
     const wellknown = yield* WellKnown.Service
     yield* wellknown.entries().pipe(Effect.orDie)
     yield* ctx.integration.transform((draft) => {
@@ -28,7 +26,7 @@ export const Plugin = define({
         })
       })
     })
-    yield* events.subscribe(WellKnown.Event.Updated).pipe(
+    yield* wellknown.changes.pipe(
       Stream.runForEach(() => ctx.integration.reload()),
       Effect.forkScoped({ startImmediately: true }),
     )

packages/core/test/agent.test.ts

@@ -1,6 +1,5 @@
 import { describe, expect } from "bun:test"
 import { Effect, Exit, Fiber, Layer, Scope, Stream } from "effect"
-import { TestClock } from "effect/testing"
 import { AgentV2 } from "@opencode-ai/core/agent"
 import { EventV2 } from "@opencode-ai/core/event"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
@@ -77,9 +76,7 @@ describe("AgentV2", () => {
       )
       description = "New description"
       hidden = false
-      const reload = yield* agent.reload().pipe(Effect.forkChild({ startImmediately: true }))
-      yield* TestClock.adjust("500 millis")
-      yield* Fiber.join(reload)
+      yield* agent.reload()
 
       expect(yield* agent.get(id)).toMatchObject({ description: "New description", hidden: false })
     }),

packages/core/test/catalog.test.ts

@@ -1,7 +1,6 @@
 import { describe, expect } from "bun:test"
 import { Money } from "@opencode-ai/schema/money"
 import { Effect, Fiber, Layer, Stream } from "effect"
-import { TestClock } from "effect/testing"
 import { Catalog } from "@opencode-ai/core/catalog"
 import { Integration } from "@opencode-ai/core/integration"
 import { Credential } from "@opencode-ai/core/credential"
@@ -262,9 +261,7 @@ describe("CatalogV2", () => {
       expect((yield* catalog.model.default())?.id).toBe(old)
 
       configured = false
-      const reload = yield* catalog.reload().pipe(Effect.forkChild({ startImmediately: true }))
-      yield* TestClock.adjust("500 millis")
-      yield* Fiber.join(reload)
+      yield* catalog.reload()
       expect((yield* catalog.model.default())?.id).toBe(newest)
     }),
   )

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

@@ -53,9 +53,9 @@ const emptyWellknownNode = makeGlobalNode({
     WellKnown.Service.of({
       entries: () => Effect.succeed([]),
       snapshot: () => [],
-      refresh: () => Effect.succeed(false),
       add: () => Effect.die("unused Wellknown.add"),
       remove: () => Effect.die("unused Wellknown.remove"),
+      changes: Stream.empty,
       resolve: () => Effect.die("unused Wellknown.resolve"),
     }),
   ),
@@ -216,9 +216,9 @@ describe("Config", () => {
               WellKnown.Service.of({
                 entries: () => Effect.succeed([entry]),
                 snapshot: () => [entry],
-                refresh: () => Effect.succeed(false),
                 add: () => Effect.die("unused Wellknown.add"),
                 remove: () => Effect.die("unused Wellknown.remove"),
+                changes: Stream.empty,
                 resolve: (_entry, variables) => Effect.succeed([{ shell: variables.TOKEN }]),
               }),
             ),
@@ -289,25 +289,6 @@ describe("Config", () => {
     }),
   )
 
-  it.effect("migrates v1 provider lists to policies", () =>
-    Effect.sync(() => {
-      expect(
-        ConfigMigrateV1.migrate({
-          enabled_providers: ["anthropic", "openai"],
-          disabled_providers: ["openai"],
-        }).experimental?.policies,
-      ).toEqual([
-        { action: "provider.use", resource: "*", effect: "deny" },
-        { action: "provider.use", resource: "anthropic", effect: "allow" },
-        { action: "provider.use", resource: "openai", effect: "allow" },
-        { action: "provider.use", resource: "openai", effect: "deny" },
-      ])
-      expect(ConfigMigrateV1.migrate({ enabled_providers: [] }).experimental?.policies).toEqual([
-        { action: "provider.use", resource: "*", effect: "deny" },
-      ])
-    }),
-  )
-
   it.effect("migrates v1 provider setup options into AISDK settings", () =>
     Effect.sync(() => {
       const migrated = ConfigMigrateV1.migrate({
@@ -754,6 +735,7 @@ describe("Config", () => {
             })
             expect(documents[0]?.info.compaction).toEqual({
               auto: true,
+              prune: false,
               keep: { tokens: 2000 },
               buffer: 10000,
             })
@@ -967,6 +949,7 @@ describe("Config", () => {
             })
             expect(documents[0]?.info.compaction).toEqual({
               auto: true,
+              prune: undefined,
               keep: { tokens: 2000 },
               buffer: 10000,
             })

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

@@ -1,95 +0,0 @@
-import { describe, expect } from "bun:test"
-import { Config as ConfigSchema } from "@opencode-ai/schema/config"
-import { Catalog } from "@opencode-ai/core/catalog"
-import { Config } from "@opencode-ai/core/config"
-import { ConfigPolicyPlugin } from "@opencode-ai/core/config/plugin/policy"
-import { EventV2 } from "@opencode-ai/core/event"
-import { PluginV2 } from "@opencode-ai/core/plugin"
-import { PluginHost } from "@opencode-ai/core/plugin/host"
-import { ProviderV2 } from "@opencode-ai/core/provider"
-import { Effect, Schema } from "effect"
-import { testEffect } from "../lib/effect"
-import { PluginTestLayer } from "../plugin/fixture"
-
-const it = testEffect(PluginTestLayer)
-const decode = Schema.decodeUnknownSync(Config.Info)
-
-const policies = (...items: { effect: "allow" | "deny"; resource: string }[]) =>
-  new Config.Document({
-    type: "document",
-    info: decode({
-      experimental: {
-        policies: items.map((item) => ({ action: "provider.use", ...item })),
-      },
-    }),
-  })
-
-const addPlugin = Effect.fn(function* (entries: () => Config.Entry[]) {
-  const plugin = yield* PluginV2.Service
-  const host = yield* PluginHost.make(plugin)
-  yield* ConfigPolicyPlugin.Plugin.effect(host).pipe(
-    Effect.provideService(Config.Service, Config.Service.of({ entries: () => Effect.sync(entries) })),
-  )
-})
-
-describe("ConfigPolicyPlugin.Plugin", () => {
-  it.effect("filters plugin-provided providers with ordered wildcard policies", () =>
-    Effect.gen(function* () {
-      const catalog = yield* Catalog.Service
-      yield* catalog.transform((catalog) => {
-        catalog.provider.update(ProviderV2.ID.openai, () => {})
-        catalog.provider.update(ProviderV2.ID.anthropic, () => {})
-        catalog.provider.update(ProviderV2.ID.make("company-internal"), () => {})
-      })
-      yield* addPlugin(() => [
-        policies(
-          { effect: "deny", resource: "*" },
-          { effect: "allow", resource: "anthropic" },
-          { effect: "allow", resource: "company-*" },
-        ),
-      ])
-
-      expect(yield* catalog.provider.get(ProviderV2.ID.openai)).toBeUndefined()
-      expect(yield* catalog.provider.get(ProviderV2.ID.anthropic)).toBeDefined()
-      expect(yield* catalog.provider.get(ProviderV2.ID.make("company-internal"))).toBeDefined()
-    }),
-  )
-
-  it.effect("prevents project policy from overriding user-global policy", () =>
-    Effect.gen(function* () {
-      const catalog = yield* Catalog.Service
-      yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.openai, () => {}))
-      yield* addPlugin(() => [
-        policies({ effect: "deny", resource: "openai" }),
-        policies({ effect: "allow", resource: "openai" }),
-      ])
-
-      expect(yield* catalog.provider.get(ProviderV2.ID.openai)).toBeUndefined()
-    }),
-  )
-
-  it.live("reloads changed policies", () =>
-    Effect.gen(function* () {
-      const catalog = yield* Catalog.Service
-      const events = yield* EventV2.Service
-      let entries: Config.Entry[] = [policies({ effect: "deny", resource: "openai" })]
-      yield* catalog.transform((catalog) => catalog.provider.update(ProviderV2.ID.openai, () => {}))
-      yield* addPlugin(() => entries)
-      expect(yield* catalog.provider.get(ProviderV2.ID.openai)).toBeUndefined()
-
-      entries = [policies({ effect: "allow", resource: "openai" })]
-      yield* events.publish(ConfigSchema.Event.Updated, {})
-      yield* waitUntil(
-        catalog.provider.get(ProviderV2.ID.openai).pipe(Effect.map((provider) => provider !== undefined)),
-      )
-    }),
-  )
-})
-
-const waitUntil = Effect.fnUntraced(function* (condition: Effect.Effect<boolean>) {
-  for (let attempt = 0; attempt < 200; attempt++) {
-    if (yield* condition) return
-    yield* Effect.sleep("10 millis")
-  }
-  return yield* Effect.die("Timed out waiting for policy reload")
-})

packages/core/test/instruction-state.test.ts

@@ -63,11 +63,6 @@ const instructionEvents = (db: Database.Interface["db"], sessionID: SessionSchem
     .all()
     .pipe(Effect.orDie)
 
-const preview = (db: Database.Interface["db"], sessionID: SessionSchema.ID, instructions: Instructions.Instructions) =>
-  Instructions.read(instructions).pipe(
-    Effect.flatMap((observed) => InstructionState.preview(db, sessionID, instructions, observed)),
-  )
-
 describe("InstructionState", () => {
   it.effect("observes each source once without publishing events or inserting blobs", () =>
     Effect.gen(function* () {
@@ -232,134 +227,6 @@ describe("InstructionState", () => {
     }),
   )
 
-  it.effect("assembles a fresh private update without repairing a missing cache", () =>
-    Effect.gen(function* () {
-      const sessionID = SessionSchema.ID.make("ses_instruction_generate")
-      const { db, events } = yield* setup(sessionID)
-      let value = "Initial context"
-      const instructions = source(
-        "test/context",
-        Effect.sync(() => value),
-      )
-      yield* InstructionState.prepare(db, events, instructions, sessionID)
-      yield* db
-        .delete(InstructionStateTable)
-        .where(eq(InstructionStateTable.session_id, sessionID))
-        .run()
-        .pipe(Effect.orDie)
-      value = "Changed context"
-      const beforeEvents = yield* instructionEvents(db, sessionID)
-      const beforeBlobs = yield* db.select().from(InstructionBlobTable).all().pipe(Effect.orDie)
-
-      const assembled = yield* preview(db, sessionID, instructions)
-
-      expect(assembled).toEqual({ initial: "Initial context", updates: [], update: "Changed context" })
-      expect(yield* instructionEvents(db, sessionID)).toEqual(beforeEvents)
-      expect(yield* db.select().from(InstructionBlobTable).all().pipe(Effect.orDie)).toEqual(beforeBlobs)
-      expect(
-        yield* db
-          .select()
-          .from(InstructionStateTable)
-          .where(eq(InstructionStateTable.session_id, sessionID))
-          .get()
-          .pipe(Effect.orDie),
-      ).toBeUndefined()
-    }),
-  )
-
-  it.effect("reads through a stale cache without repairing it", () =>
-    Effect.gen(function* () {
-      const sessionID = SessionSchema.ID.make("ses_instruction_generate_stale")
-      const { db, events } = yield* setup(sessionID)
-      let value = "Initial context"
-      const instructions = source(
-        "test/context",
-        Effect.sync(() => value),
-      )
-      yield* InstructionState.prepare(db, events, instructions, sessionID)
-      value = "Committed update"
-      yield* InstructionState.prepare(db, events, instructions, sessionID)
-      yield* db
-        .update(InstructionStateTable)
-        .set({ through_seq: 0, current_values: { "test/context": Instructions.hash("Initial context") } })
-        .where(eq(InstructionStateTable.session_id, sessionID))
-        .run()
-        .pipe(Effect.orDie)
-      value = "Private update"
-      const beforeEvents = yield* instructionEvents(db, sessionID)
-      const beforeBlobs = yield* db.select().from(InstructionBlobTable).all().pipe(Effect.orDie)
-      const beforeState = yield* db.select().from(InstructionStateTable).get().pipe(Effect.orDie)
-
-      const assembled = yield* preview(db, sessionID, instructions)
-
-      expect(assembled.initial).toBe("Initial context")
-      expect(assembled.updates.map((entry) => entry.message.text)).toEqual(["Committed update"])
-      expect(assembled.update).toBe("Private update")
-      expect(yield* instructionEvents(db, sessionID)).toEqual(beforeEvents)
-      expect(yield* db.select().from(InstructionBlobTable).all().pipe(Effect.orDie)).toEqual(beforeBlobs)
-      expect(yield* db.select().from(InstructionStateTable).get().pipe(Effect.orDie)).toEqual(beforeState)
-    }),
-  )
-
-  it.effect("assembles initial instructions without persisting a baseline", () =>
-    Effect.gen(function* () {
-      const sessionID = SessionSchema.ID.make("ses_instruction_generate_initial")
-      const { db } = yield* setup(sessionID)
-      const instructions = source("test/context", Effect.succeed("Initial context"))
-
-      expect(yield* preview(db, sessionID, instructions)).toEqual({
-        initial: "Initial context",
-        updates: [],
-        update: "",
-      })
-      expect(yield* instructionEvents(db, sessionID)).toEqual([])
-      expect(yield* db.select().from(InstructionBlobTable).all().pipe(Effect.orDie)).toEqual([])
-      expect(yield* db.select().from(InstructionStateTable).get().pipe(Effect.orDie)).toBeUndefined()
-    }),
-  )
-
-  it.effect("retains a committed value when fresh instructions are unavailable", () =>
-    Effect.gen(function* () {
-      const sessionID = SessionSchema.ID.make("ses_instruction_generate_unavailable")
-      const { db, events } = yield* setup(sessionID)
-      let value: string | Instructions.Unavailable = "Committed context"
-      const instructions = source(
-        "test/context",
-        Effect.sync(() => value),
-      )
-      yield* InstructionState.prepare(db, events, instructions, sessionID)
-      value = Instructions.unavailable
-      const beforeEvents = yield* instructionEvents(db, sessionID)
-      const beforeBlobs = yield* db.select().from(InstructionBlobTable).all().pipe(Effect.orDie)
-      const beforeState = yield* db.select().from(InstructionStateTable).get().pipe(Effect.orDie)
-
-      expect(yield* preview(db, sessionID, instructions)).toEqual({
-        initial: "Committed context",
-        updates: [],
-        update: "",
-      })
-      expect(yield* instructionEvents(db, sessionID)).toEqual(beforeEvents)
-      expect(yield* db.select().from(InstructionBlobTable).all().pipe(Effect.orDie)).toEqual(beforeBlobs)
-      expect(yield* db.select().from(InstructionStateTable).get().pipe(Effect.orDie)).toEqual(beforeState)
-    }),
-  )
-
-  it.effect("blocks an unavailable initial instruction without persisting a baseline", () =>
-    Effect.gen(function* () {
-      const sessionID = SessionSchema.ID.make("ses_instruction_generate_blocked")
-      const { db } = yield* setup(sessionID)
-      const instructions = source("test/context", Effect.succeed(Instructions.unavailable))
-
-      const error = yield* preview(db, sessionID, instructions).pipe(Effect.flip)
-
-      expect(error).toBeInstanceOf(Instructions.InitializationBlocked)
-      expect(error.keys).toEqual([Instructions.Key.make("test/context")])
-      expect(yield* instructionEvents(db, sessionID)).toEqual([])
-      expect(yield* db.select().from(InstructionBlobTable).all().pipe(Effect.orDie)).toEqual([])
-      expect(yield* db.select().from(InstructionStateTable).get().pipe(Effect.orDie)).toBeUndefined()
-    }),
-  )
-
   it.effect("keeps prepare equivalent to observe followed by commit", () =>
     Effect.gen(function* () {
       const observedSessionID = SessionSchema.ID.make("ses_instruction_composed")

packages/core/test/lib/image.ts

@@ -1,7 +0,0 @@
-import { Image } from "@opencode-ai/core/image"
-import { Effect, Layer } from "effect"
-
-/** Passthrough resizer for tests that build ToolRegistry.node without a Location. */
-export const imagePassthrough = Layer.mock(Image.Service, {
-  normalize: (_resource, content) => Effect.succeed(content),
-})

packages/core/test/mcp.test.ts

@@ -29,9 +29,7 @@ import { McpTool } from "@opencode-ai/core/tool/mcp"
 import { ToolRegistry } from "@opencode-ai/core/tool/registry"
 import { ToolOutputStore } from "@opencode-ai/core/tool-output-store"
 import { Deferred, Effect, Exit, Fiber, Layer, Schema, Stream } from "effect"
-import { Image } from "@opencode-ai/core/image"
 import { testEffect } from "./lib/effect"
-import { imagePassthrough } from "./lib/image"
 import { location } from "./fixture/location"
 import { settleTool, toolDefinitions, toolIdentity, waitForTool } from "./lib/tool"
 
@@ -252,7 +250,6 @@ const it = testEffect(
     [PermissionV2.node, permissions],
     [EventV2.node, events],
     [ToolOutputStore.node, ToolOutputStore.nodeWithoutConfig],
-    [Image.node, imagePassthrough],
   ]),
 )